Merge branch 'develop-rando' into infinite_upgrades_develop-rando

2024-04-12 21:24:51 +02:00 · 2024-04-12 21:24:51 +02:00 · 2eb36573ee
parent 50d25c5207 67ee5f8d0e
commit 2eb36573ee
386 changed files with 6126 additions and 5304 deletions
--- 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 ninja-build 
+libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool ninja-build 
--- a/.github/workflows/generate-builds.yml
+++ b/.github/workflows/generate-builds.yml
@ -92,14 +92,14 @@ jobs:
        if [ -d /opt/local/ ]; then
          echo "MacPorts already installed"
        else
-          wget https://github.com/macports/macports-base/releases/download/v2.7.2/MacPorts-2.7.2-12-Monterey.pkg
-          sudo installer -pkg ./MacPorts-2.7.2-12-Monterey.pkg -target /
+          wget https://github.com/macports/macports-base/releases/download/v2.9.1/MacPorts-2.9.1-12-Monterey.pkg
+          sudo installer -pkg ./MacPorts-2.9.1-12-Monterey.pkg -target /
        fi
        echo "/opt/local/bin:/opt/local/sbin" >> $GITHUB_PATH
    - name: Install dependencies
      if: ${{ !vars.MAC_RUNNER }}
      run: |
-        brew uninstall --ignore-dependencies libpng
+        brew uninstall --ignore-dependencies libpng libzip
        sudo port install $(cat .github/workflows/macports-deps.txt)
        brew install ninja
    - name: Download soh.otr
@ -175,6 +175,21 @@ jobs:
        make -j 10
        sudo make install
        sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
+    - name: Install latest libzip
+      if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) }}
+      run: |
+        sudo apt-get remove libzip-dev zipcmp zipmerge ziptool
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        if [ ! -d "libzip-1.10.1" ]; then
+          wget https://libzip.org/download/libzip-1.10.1.tar.gz
+          tar -xzvf libzip-1.10.1.tar.gz
+        fi
+        cd libzip-1.10.1
+        mkdir build
+        cd build
+        cmake ..
+        make
+        sudo make install
    - name: Install latest SDL_net
      if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) || (matrix.os == 'ubuntu-22.04' && !vars.LINUX_PERFORMANCE_RUNNER) }}
      run: |
@ -221,6 +236,17 @@ jobs:
      run: |
        sudo apt-get update
        sudo apt-get install -y ninja-build
+        sudo apt-get remove -y cmake
+        wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
+        sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
+        wget https://libzip.org/download/libzip-1.10.1.tar.gz
+        tar -xzvf libzip-1.10.1.tar.gz
+        cd libzip-1.10.1
+        mkdir build
+        cd build
+        cmake -H.. -B. -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
+        make
+        make install
    - name: Fix dubious ownership error
      if: ${{ vars.LINUX_RUNNER }}
      run: git config --global --add safe.directory '*'
@ -264,6 +290,17 @@ jobs:
      run: |
        sudo apt-get update
        sudo apt-get install -y ninja-build
+        sudo apt-get remove -y cmake
+        wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
+        sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
+        wget https://libzip.org/download/libzip-1.10.1.tar.gz
+        tar -xzvf libzip-1.10.1.tar.gz
+        cd libzip-1.10.1
+        mkdir build
+        cd build
+        cmake -H.. -B. -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/WiiU.cmake
+        make
+        make install
    - uses: actions/checkout@v3
      with:
        submodules: true
--- a/.github/workflows/macports-deps.txt
+++ b/.github/workflows/macports-deps.txt
@ -1 +1 @@
-libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal
+libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal
--- a/.github/workflows/test-builds-on-distros.yml
+++ b/.github/workflows/test-builds-on-distros.yml
@ -0,0 +1,61 @@
+name: test-builds-on-distros
+on:
+  workflow_dispatch:    # by request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  build:
+    strategy:
+      matrix:
+        image: ["archlinux:base", "opensuse/tumbleweed:latest", "ubuntu:mantic", "debian:bookworm", "fedora:39"]
+        cc: ["gcc", "clang"] 
+        include:
+        - cxx: g++
+          cc: gcc
+        - cxx: clang++
+          cc: clang
+    runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }}
+    container:
+      image: ${{ matrix.image }}
+    steps:
+    - name: Install dependencies (pacman)
+      if: ${{ matrix.image == 'archlinux:base' }}
+      run: |
+        echo arch
+        echo pacman -S ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip sdl2_net boost
+        pacman -Syu --noconfirm
+        pacman -S --noconfirm ${{ matrix.cc }} git cmake ninja lsb-release sdl2 libpng libzip sdl2_net boost
+    - name: Install dependencies (dnf)
+      if: ${{ matrix.image == 'fedora:39' }}
+      run: |
+        echo fedora
+        echo dnf install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools boost-devel
+        dnf -y upgrade
+        dnf -y install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools boost-devel
+    - name: Install dependencies (apt)
+      if: ${{ matrix.image == 'ubuntu:mantic' || matrix.image == 'debian:bookworm' }}
+      run: |
+        echo debian based
+        echo apt-get install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'g++') || '' }} git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool libboost-dev libopengl-dev
+        apt-get update
+        apt-get -y full-upgrade
+        apt-get -y install ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'g++') || '' }} git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool libboost-dev libopengl-dev
+    - name: Install dependencies (zypper)
+      if: ${{ matrix.image == 'opensuse/tumbleweed:latest' }}
+      run: |
+        echo openSUSE
+        echo zypper in ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} ${{ matrix.cc == 'clang' && 'libstdc++-devel' || '' }} git cmake ninja SDL2-devel libpng16-devel libzip-devel libzip-tools
+        zypper --non-interactive dup
+        zypper --non-interactive in ${{ matrix.cc }} ${{ (matrix.cxx == 'g++' && 'gcc-c++') || '' }} ${{ matrix.cc == 'clang' && 'libstdc++-devel' || '' }} git cmake ninja SDL2-devel libpng16-devel libzip-devel libzip-tools
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: Build SoH
+      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 -DBUILD_REMOTE_CONTROL=1
+        cmake --build build-cmake --config Release -j3
+      env:
+        CC: ${{ matrix.cc }}
+        CXX: ${{ matrix.cxx }}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 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.4 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "MacReady Echo" CACHE STRING "")
+project(Ship VERSION 8.0.5 LANGUAGES C CXX)
+set(PROJECT_BUILD_NAME "MacReady Foxtrot" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")

 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
@ -20,7 +20,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
    set(VCPKG_TARGET_TRIPLET x64-windows-static)

    vcpkg_bootstrap()
-    vcpkg_install_packages(zlib bzip2 libpng sdl2 sdl2-net glew glfw3)
+    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3)

    if (CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache|sccache")
        set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 44adc47b4da529e72d968b14cab94aefd8260f22
+Subproject commit e93bd2be062b13106fdb29d98cf4ada4d7ad6827
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit eff29036118349e142ee8efca80fd975a2a2b6ff
+Subproject commit 9f9d0be3c914354ecabab3695581f1123c13ac20
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@ -84,41 +84,66 @@ cd "build/x64"
 ```

 ## Linux
-Requires `gcc >= 10, x11, curl, python3, sdl2 >= 2.0.22, libpng, glew >= 2.2, ninja, cmake, lld, pulseaudio-libs`
+### Install dependencies
+#### 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 libboost-dev libopengl-dev

-**Important: For maximum performance make sure you have ninja build tools installed!**
+# 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 libboost-dev libopengl-dev
+```
+#### Arch
+```sh
+# using gcc
+pacman -S gcc git cmake ninja lsb-release sdl2 libpng libzip sdl2_net boost

-_Note: If you're using Visual Studio Code, the [cpack plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._
+# or using clang
+pacman -S clang git cmake ninja lsb-release sdl2 libpng libzip sdl2_net boost
+```
+#### Fedora
+```sh
+# using gcc
+dnf install gcc gcc-c++ git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools boost-devel
+
+# or using clang
+dnf install clang git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools boost-devel
+```
+#### openSUSE
+```sh
+# using gcc
+zypper in gcc gcc-c++ git cmake ninja SDL2-devel libpng16-devel libzip-devel libzip-tools
+
+# or using clang
+zypper in clang libstdc++-devel git cmake ninja SDL2-devel libpng16-devel libzip-devel libzip-tools
+```
+
+### Build
+
+_Note: If you're using Visual Studio Code, the [CMake Tools plugin](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) makes it very easy to just press run and debug._

 ```bash
-# Clone the repo
+# Clone the repo and enter the directory
 git clone https://github.com/HarbourMasters/Shipwright.git
 cd Shipwright
-# Clone the submodule libultraship
+
+# Clone the submodules
 git submodule update --init
-# Copy the baserom to the OTRExporter folder
-cp <path to your ROM> OTRExporter
+
 # Generate Ninja project
 cmake -H. -Bbuild-cmake -GNinja # -DCMAKE_BUILD_TYPE:STRING=Release (if you're packaging) -DPython3_EXECUTABLE=$(which python3) (if you are using non-standard Python installations such as PyEnv)
-# Extract assets & generate OTR (run this anytime you need to regenerate OTR)
-cmake --build build-cmake --target ExtractAssets
+
+# Generate soh.otr
+cmake --build build-cmake --target GenerateSohOtr
+
 # Compile the project
 cmake --build build-cmake # --config Release (if you're packaging)

 # Now you can run the executable in ./build-cmake/soh/soh.elf
 # To develop the project open the repository in VSCode (or your preferred editor)
-
-# If you need to clean the project you can run
-cmake --build build-cmake --target clean
-
-# If you need to regenerate the asset headers to check them into source
-cmake --build build-cmake --target ExtractAssetHeaders
-
-# If you need a newer soh.otr only
-cmake --build build-cmake --target GenerateSohOtr
 ```

-### Generating a distributable
+### Generate a distributable
 After compiling the project you can generate a distributable by running of the following:
 ```bash
 # Go to build folder
@ -129,6 +154,20 @@ cpack -G ZIP
 cpack -G External (creates appimage)
 ```

+### Additional CMake Targets
+#### Clean
+```bash
+# If you need to clean the project you can run
+cmake --build build-cmake --target clean
+```
+
+#### Regenerate Asset Headers
+```bash
+# If you need to regenerate the asset headers to check them into source
+cp <path to your ROM> OTRExporter
+cmake --build build-cmake --target ExtractAssetHeaders
+```
+
 ## macOS
 Requires Xcode (or xcode-tools) && `sdl2, libpng, glew, ninja, cmake` (can be installed via homebrew, macports, etc)

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0833afad66e96d2ec4bbc410186d7247dc243ee2
+Subproject commit b135db823aaabf6e848fcbd2796933b0771f9968
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@ -356,7 +356,13 @@ set(SDL2-INCLUDE ${SDL2_INCLUDE_DIRS})

 if (BUILD_REMOTE_CONTROL)
    find_package(SDL2_net)
-    set(SDL2-NET-INCLUDE ${SDL_NET_INCLUDE_DIRS})
+
+    if(NOT SDL2_net_FOUND)
+        message(STATUS "SDL2_net not found (it's possible the version installed is too old). Disabling BUILD_REMOTE_CONTROL.")
+        set(BUILD_REMOTE_CONTROL 0)
+    else()
+        set(SDL2-NET-INCLUDE ${SDL_NET_INCLUDE_DIRS})
+    endif()
 endif()

 target_include_directories(${PROJECT_NAME} PRIVATE assets
@ -623,6 +629,8 @@ 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-incompatible-pointer-types
--- a/soh/SHIPOFHARKINIAN.manifest
+++ b/soh/SHIPOFHARKINIAN.manifest
@ -28,4 +28,10 @@
      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
    </application>
  </compatibility>
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> <!-- legacy -->
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2,permonitor</dpiAwareness> <!-- falls back to pm if pmv2 is not available -->
+    </asmv3:windowsSettings>
+  </asmv3:application>
 </assembly>
--- a/soh/assets/custom/textures/buttons/ABtn.png
+++ b/soh/assets/custom/textures/buttons/ABtn.png
--- a/soh/assets/custom/textures/buttons/ABtnOutline.png
+++ b/soh/assets/custom/textures/buttons/ABtnOutline.png
--- a/soh/assets/custom/textures/buttons/AnalogStick.png
+++ b/soh/assets/custom/textures/buttons/AnalogStick.png
--- a/soh/assets/custom/textures/buttons/AnalogStickOutline.png
+++ b/soh/assets/custom/textures/buttons/AnalogStickOutline.png
--- a/soh/assets/custom/textures/buttons/BBtn.png
+++ b/soh/assets/custom/textures/buttons/BBtn.png
--- a/soh/assets/custom/textures/buttons/BBtnOutline.png
+++ b/soh/assets/custom/textures/buttons/BBtnOutline.png
--- a/soh/assets/custom/textures/buttons/CDown.png
+++ b/soh/assets/custom/textures/buttons/CDown.png
--- a/soh/assets/custom/textures/buttons/CDownOutline.png
+++ b/soh/assets/custom/textures/buttons/CDownOutline.png
--- a/soh/assets/custom/textures/buttons/CLeft.png
+++ b/soh/assets/custom/textures/buttons/CLeft.png
--- a/soh/assets/custom/textures/buttons/CLeftOutline.png
+++ b/soh/assets/custom/textures/buttons/CLeftOutline.png
--- a/soh/assets/custom/textures/buttons/CRight.png
+++ b/soh/assets/custom/textures/buttons/CRight.png
--- a/soh/assets/custom/textures/buttons/CRightOutline.png
+++ b/soh/assets/custom/textures/buttons/CRightOutline.png
--- a/soh/assets/custom/textures/buttons/CUp.png
+++ b/soh/assets/custom/textures/buttons/CUp.png
--- a/soh/assets/custom/textures/buttons/CUpOutline.png
+++ b/soh/assets/custom/textures/buttons/CUpOutline.png
--- a/soh/assets/custom/textures/buttons/DPadDown.png
+++ b/soh/assets/custom/textures/buttons/DPadDown.png
--- a/soh/assets/custom/textures/buttons/DPadDownOutline.png
+++ b/soh/assets/custom/textures/buttons/DPadDownOutline.png
--- a/soh/assets/custom/textures/buttons/DPadLeft.png
+++ b/soh/assets/custom/textures/buttons/DPadLeft.png
--- a/soh/assets/custom/textures/buttons/DPadLeftOutline.png
+++ b/soh/assets/custom/textures/buttons/DPadLeftOutline.png
--- a/soh/assets/custom/textures/buttons/DPadRight.png
+++ b/soh/assets/custom/textures/buttons/DPadRight.png
--- a/soh/assets/custom/textures/buttons/DPadRightOutline.png
+++ b/soh/assets/custom/textures/buttons/DPadRightOutline.png
--- a/soh/assets/custom/textures/buttons/DPadUp.png
+++ b/soh/assets/custom/textures/buttons/DPadUp.png
--- a/soh/assets/custom/textures/buttons/DPadUpOutline.png
+++ b/soh/assets/custom/textures/buttons/DPadUpOutline.png
--- a/soh/assets/custom/textures/buttons/InputViewerBackground.png
+++ b/soh/assets/custom/textures/buttons/InputViewerBackground.png
--- a/soh/assets/custom/textures/buttons/LBtn.png
+++ b/soh/assets/custom/textures/buttons/LBtn.png
--- a/soh/assets/custom/textures/buttons/LBtnOutline.png
+++ b/soh/assets/custom/textures/buttons/LBtnOutline.png
--- a/soh/assets/custom/textures/buttons/RBtn.png
+++ b/soh/assets/custom/textures/buttons/RBtn.png
--- a/soh/assets/custom/textures/buttons/RBtnOutline.png
+++ b/soh/assets/custom/textures/buttons/RBtnOutline.png
--- a/soh/assets/custom/textures/buttons/RightStick.png
+++ b/soh/assets/custom/textures/buttons/RightStick.png
--- a/soh/assets/custom/textures/buttons/RightStickOutline.png
+++ b/soh/assets/custom/textures/buttons/RightStickOutline.png
--- a/soh/assets/custom/textures/buttons/StartBtn.png
+++ b/soh/assets/custom/textures/buttons/StartBtn.png
--- a/soh/assets/custom/textures/buttons/StartBtnOutline.png
+++ b/soh/assets/custom/textures/buttons/StartBtnOutline.png
--- a/soh/assets/custom/textures/buttons/ZBtn.png
+++ b/soh/assets/custom/textures/buttons/ZBtn.png
--- a/soh/assets/custom/textures/buttons/ZBtnOutline.png
+++ b/soh/assets/custom/textures/buttons/ZBtnOutline.png
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@ -1230,8 +1230,8 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a);
 void Gfx_SetupFrame(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
 void func_80095974(GraphicsContext* gfxCtx);
 void func_80095AA0(PlayState* play, Room* room, Input* arg2, UNK_TYPE arg3);
-void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0,
-                   u16 tlutCount, f32 frameX, f32 frameY);
+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);
 void func_80096FD4(PlayState* play, Room* room);
 u32 func_80096FE8(PlayState* play, RoomContext* roomCtx);
 s32 func_8009728C(PlayState* play, RoomContext* roomCtx, s32 roomNum);
@ -1828,8 +1828,8 @@ MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line);
 void Matrix_SetTranslateScaleMtx2(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, f32 translateX, f32 translateY,
                                  f32 translateZ);
 uintptr_t SysUcode_GetUCodeBoot(void);
-uintptr_t SysUcode_GetUCodeBootSize(void);
-uintptr_t SysUcode_GetUCode(void);
+size_t SysUcode_GetUCodeBootSize(void);
+uint32_t SysUcode_GetUCode(void);
 uintptr_t SysUcode_GetUCodeData(void);
 void func_800D2E30(UnkRumbleStruct* arg0);
 void func_800D3140(UnkRumbleStruct* arg0);
@ -2467,6 +2467,10 @@ void Message_DrawText(PlayState* play, Gfx** gfxP);
 void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH);
 void Interface_RandoRestoreSwordless(void);

+//Pause Warp
+void PauseWarp_HandleSelection();
+void PauseWarp_Execute();
+
 // #endregion

 #ifdef __cplusplus
--- a/soh/include/z64player.h
+++ b/soh/include/z64player.h
@ -345,7 +345,7 @@ typedef enum {
 #define PLAYER_LIMB_BUF_COUNT LIMB_BUF_COUNT(PLAYER_LIMB_MAX)

 typedef struct {
-    /* 0x00 */ f32 unk_00;
+    /* 0x00 */ f32 ceilingCheckHeight;
    /* 0x04 */ f32 unk_04;
    /* 0x08 */ f32 unk_08;
    /* 0x0C */ f32 unk_0C;
@ -359,7 +359,7 @@ typedef struct {
    /* 0x2C */ f32 unk_2C;
    /* 0x30 */ f32 unk_30;
    /* 0x34 */ f32 unk_34;
-    /* 0x38 */ f32 unk_38;
+    /* 0x38 */ f32 wallCheckRadius;
    /* 0x3C */ f32 unk_3C;
    /* 0x40 */ f32 unk_40;
    /* 0x44 */ Vec3s unk_44;
@ -489,180 +489,187 @@ typedef s32 (*UpperActionFunc)(struct Player*, struct PlayState*);
 typedef void (*PlayerFuncA74)(struct PlayState*, struct Player*);

 typedef struct Player {
-    /* 0x0000 */ Actor      actor;
-    /* 0x014C */ s8         currentTunic; // current tunic from `PlayerTunic`
-    /* 0x014D */ s8         currentSwordItemId;
-    /* 0x014E */ s8         currentShield; // current shield from `PlayerShield`
-    /* 0x014F */ s8         currentBoots; // current boots from `PlayerBoots`
-    /* 0x0150 */ s8         heldItemButton; // Button index for the item currently used
-    /* 0x0151 */ s8         heldItemAction; // Item action for the item currently used
-    /* 0x0152 */ u8         heldItemId; // Item id for the item currently used
-    /* 0x0153 */ s8         prevBoots; // previous boots from `PlayerBoots`
-    /* 0x0154 */ s8         itemAction; // the difference between this and heldItemAction is unclear
-    /* 0x0155 */ char       unk_155[0x003];
-    /* 0x0158 */ u8         modelGroup;
-    /* 0x0159 */ u8         nextModelGroup;
-    /* 0x015A */ s8         itemChangeType;
-    /* 0x015B */ u8         modelAnimType;
-    /* 0x015C */ u8         leftHandType;
-    /* 0x015D */ u8         rightHandType;
-    /* 0x015E */ u8         sheathType;
-    /* 0x015F */ u8         currentMask; // current mask equipped from `PlayerMask`
-    /* 0x0160 */ Gfx**      rightHandDLists;
-    /* 0x0164 */ Gfx**      leftHandDLists;
-    /* 0x0168 */ Gfx**      sheathDLists;
-    /* 0x016C */ Gfx**      waistDLists;
-    /* 0x0170 */ u8         giObjectLoading;
+    /* 0x0000 */ Actor actor;
+    /* 0x014C */ s8 currentTunic; // current tunic from `PlayerTunic`
+    /* 0x014D */ s8 currentSwordItemId;
+    /* 0x014E */ s8 currentShield; // current shield from `PlayerShield`
+    /* 0x014F */ s8 currentBoots; // current boots from `PlayerBoots`
+    /* 0x0150 */ s8 heldItemButton; // Button index for the item currently used
+    /* 0x0151 */ s8 heldItemAction; // Item action for the item currently used
+    /* 0x0152 */ u8 heldItemId; // Item id for the item currently used
+    /* 0x0153 */ s8 prevBoots; // previous boots from `PlayerBoots`
+    /* 0x0154 */ s8 itemAction; // the difference between this and heldItemAction is unclear
+    /* 0x0155 */ char unk_155[0x003];
+    /* 0x0158 */ u8 modelGroup;
+    /* 0x0159 */ u8 nextModelGroup;
+    /* 0x015A */ s8 itemChangeType;
+    /* 0x015B */ u8 modelAnimType;
+    /* 0x015C */ u8 leftHandType;
+    /* 0x015D */ u8 rightHandType;
+    /* 0x015E */ u8 sheathType;
+    /* 0x015F */ u8 currentMask; // current mask equipped from `PlayerMask`
+    /* 0x0160 */ Gfx** rightHandDLists;
+    /* 0x0164 */ Gfx** leftHandDLists;
+    /* 0x0168 */ Gfx** sheathDLists;
+    /* 0x016C */ Gfx** waistDLists;
+    /* 0x0170 */ u8 giObjectLoading;
    /* 0x0174 */ DmaRequest giObjectDmaRequest;
    /* 0x0194 */ OSMesgQueue giObjectLoadQueue;
-    /* 0x01AC */ OSMesg     giObjectLoadMsg;
-    /* 0x01B0 */ void*      giObjectSegment; // also used for title card textures
-    /* 0x01B4 */ SkelAnime  skelAnime;
-    /* 0x01F8 */ Vec3s      jointTable[PLAYER_LIMB_BUF_COUNT];
-    /* 0x0288 */ Vec3s      morphTable[PLAYER_LIMB_BUF_COUNT];
-    /* 0x0318 */ Vec3s      blendTable[PLAYER_LIMB_BUF_COUNT];
-    /* 0x03A8 */ s16        unk_3A8[2];
-    /* 0x03AC */ Actor*     heldActor;
-    /* 0x03B0 */ Vec3f      leftHandPos;
-    /* 0x03BC */ Vec3s      unk_3BC;
-    /* 0x03C4 */ Actor*     unk_3C4;
-    /* 0x03C8 */ Vec3f      unk_3C8;
-    /* 0x03D4 */ char       unk_3D4[0x058];
-    /* 0x042C */ s8         doorType;
-    /* 0x042D */ s8         doorDirection;
-    /* 0x042E */ s16        doorTimer;
-    /* 0x0430 */ Actor*     doorActor;
-    /* 0x0434 */ s16        getItemId; // Upstream TODO: Document why this is s16 while it's s8 upstream
-    /* 0x0436 */ u16        getItemDirection;
-    /* 0x0438 */ Actor*     interactRangeActor;
-    /* 0x043C */ s8         mountSide;
-    /* 0x043D */ char       unk_43D[0x003];
-    /* 0x0440 */ Actor*     rideActor;
-    /* 0x0444 */ u8         csAction;
-    /* 0x0445 */ u8         prevCsAction;
-    /* 0x0446 */ u8         cueId;
-    /* 0x0447 */ u8         unk_447;
-    /* 0x0448 */ Actor*     csActor;
-    /* 0x044C */ char       unk_44C[0x004];
-    /* 0x0450 */ Vec3f      unk_450;
-    /* 0x045C */ Vec3f      unk_45C;
-    /* 0x0468 */ char       unk_468[0x002];
-    /* 0x046A */ s16        doorBgCamIndex;
-    /* 0x046C */ s16        subCamId;
-    /* 0x046E */ char       unk_46E[0x02A];
+    /* 0x01AC */ OSMesg giObjectLoadMsg;
+    /* 0x01B0 */ void* giObjectSegment; // also used for title card textures
+    /* 0x01B4 */ SkelAnime skelAnime;
+    /* 0x01F8 */ Vec3s jointTable[PLAYER_LIMB_BUF_COUNT];
+    /* 0x0288 */ Vec3s morphTable[PLAYER_LIMB_BUF_COUNT];
+    /* 0x0318 */ Vec3s blendTable[PLAYER_LIMB_BUF_COUNT];
+    /* 0x03A8 */ s16 unk_3A8[2];
+    /* 0x03AC */ Actor* heldActor;
+    /* 0x03B0 */ Vec3f leftHandPos;
+    /* 0x03BC */ Vec3s unk_3BC;
+    /* 0x03C4 */ Actor* unk_3C4;
+    /* 0x03C8 */ Vec3f unk_3C8;
+    /* 0x03D4 */ char unk_3D4[0x058];
+    /* 0x042C */ s8 doorType;
+    /* 0x042D */ s8 doorDirection;
+    /* 0x042E */ s16 doorTimer;
+    /* 0x0430 */ Actor* doorActor;
+    /* 0x0434 */ s16 getItemId; // Upstream TODO: Document why this is s16 while it's s8 upstream
+    /* 0x0436 */ u16 getItemDirection;
+    /* 0x0438 */ Actor* interactRangeActor;
+    /* 0x043C */ s8 mountSide;
+    /* 0x043D */ char unk_43D[0x003];
+    /* 0x0440 */ Actor* rideActor;
+    /* 0x0444 */ u8 csAction;
+    /* 0x0445 */ u8 prevCsAction;
+    /* 0x0446 */ u8 cueId;
+    /* 0x0447 */ u8 unk_447;
+    /* 0x0448 */ Actor* csActor; // Actor involved in a `csAction`. Typically the actor that invoked the cutscene.
+    /* 0x044C */ char unk_44C[0x004];
+    /* 0x0450 */ Vec3f unk_450;
+    /* 0x045C */ Vec3f unk_45C;
+    /* 0x0468 */ char unk_468[0x002];
+    /* 0x046A */ s16 doorBgCamIndex;
+    /* 0x046C */ s16 subCamId;
+    /* 0x046E */ char unk_46E[0x02A];
    /* 0x0498 */ ColliderCylinder cylinder;
    /* 0x04E4 */ ColliderQuad meleeWeaponQuads[2];
    /* 0x05E4 */ ColliderQuad shieldQuad;
-    /* 0x0664 */ Actor*     unk_664;
-    /* 0x0668 */ char       unk_668[0x004];
-    /* 0x066C */ s32        unk_66C;
-    /* 0x0670 */ s32        meleeWeaponEffectIndex;
+    /* 0x0664 */ Actor* unk_664;
+    /* 0x0668 */ char unk_668[0x004];
+    /* 0x066C */ s32 unk_66C;
+    /* 0x0670 */ s32 meleeWeaponEffectIndex;
    /* 0x0674 */ PlayerActionFunc actionFunc;
    /* 0x0678 */ PlayerAgeProperties* ageProperties;
-    /* 0x067C */ u32        stateFlags1;
-    /* 0x0680 */ u32        stateFlags2;
-    /* 0x0684 */ Actor*     unk_684;
-    /* 0x0688 */ Actor*     boomerangActor;
-    /* 0x068C */ Actor*     naviActor;
-    /* 0x0690 */ s16        naviTextId;
-    /* 0x0692 */ u8         stateFlags3;
-    /* 0x0693 */ s8         exchangeItemId;
-    /* 0x0694 */ Actor*     targetActor;
-    /* 0x0698 */ f32        targetActorDistance;
-    /* 0x069C */ char       unk_69C[0x004];
-    /* 0x06A0 */ f32        unk_6A0;
-    /* 0x06A4 */ f32        closestSecretDistSq;
-    /* 0x06A8 */ Actor*     unk_6A8;
-    /* 0x06AC */ s8         unk_6AC;
-    /* 0x06AD */ u8         unk_6AD;
-    /* 0x06AE */ u16        unk_6AE;
-    /* 0x06B0 */ s16        unk_6B0;
-    /* 0x06B2 */ char       unk_6B4[0x004];
-    /* 0x06B6 */ s16        unk_6B6;
-    /* 0x06B8 */ s16        unk_6B8;
-    /* 0x06BA */ s16        unk_6BA;
-    /* 0x06BC */ s16        unk_6BC;
-    /* 0x06BE */ s16        unk_6BE;
-    /* 0x06C0 */ s16        unk_6C0;
-    /* 0x06C2 */ s16        unk_6C2;
-    /* 0x06C4 */ f32        unk_6C4;
-    /* 0x06C8 */ SkelAnime  upperSkelAnime;
-    /* 0x070C */ Vec3s      upperJointTable[PLAYER_LIMB_BUF_COUNT];
-    /* 0x079C */ Vec3s      upperMorphTable[PLAYER_LIMB_BUF_COUNT];
+    /* 0x067C */ u32 stateFlags1;
+    /* 0x0680 */ u32 stateFlags2;
+    /* 0x0684 */ Actor* unk_684;
+    /* 0x0688 */ Actor* boomerangActor;
+    /* 0x068C */ Actor* naviActor;
+    /* 0x0690 */ s16 naviTextId;
+    /* 0x0692 */ u8 stateFlags3;
+    /* 0x0693 */ s8 exchangeItemId;
+    /* 0x0694 */ Actor* targetActor;
+    /* 0x0698 */ f32 targetActorDistance;
+    /* 0x069C */ char unk_69C[0x004];
+    /* 0x06A0 */ f32 unk_6A0;
+    /* 0x06A4 */ f32 closestSecretDistSq;
+    /* 0x06A8 */ Actor* unk_6A8;
+    /* 0x06AC */ s8 unk_6AC;
+    /* 0x06AD */ u8 unk_6AD;
+    /* 0x06AE */ u16 unk_6AE;
+    /* 0x06B0 */ s16 unk_6B0;
+    /* 0x06B2 */ char unk_6B4[0x004];
+    /* 0x06B6 */ s16 unk_6B6;
+    /* 0x06B8 */ s16 unk_6B8;
+    /* 0x06BA */ s16 unk_6BA;
+    /* 0x06BC */ s16 unk_6BC;
+    /* 0x06BE */ s16 unk_6BE;
+    /* 0x06C0 */ s16 unk_6C0;
+    /* 0x06C2 */ s16 unk_6C2;
+    /* 0x06C4 */ f32 unk_6C4;
+    /* 0x06C8 */ SkelAnime upperSkelAnime;
+    /* 0x070C */ Vec3s upperJointTable[PLAYER_LIMB_BUF_COUNT];
+    /* 0x079C */ Vec3s upperMorphTable[PLAYER_LIMB_BUF_COUNT];
    /* 0x082C */ UpperActionFunc upperActionFunc;
-    /* 0x0830 */ f32        upperAnimBlendWeight;
-    /* 0x0834 */ s16        unk_834;
-    /* 0x0836 */ s8         unk_836;
-    /* 0x0837 */ u8         unk_837;
-    /* 0x0838 */ f32        linearVelocity;
-    /* 0x083C */ s16        currentYaw;
-    /* 0x083E */ s16        targetYaw;
-    /* 0x0840 */ u16        underwaterTimer;
-    /* 0x0842 */ s8         meleeWeaponAnimation;
-    /* 0x0843 */ s8         meleeWeaponState;
-    /* 0x0844 */ s8         unk_844;
-    /* 0x0845 */ u8         unk_845;
-    /* 0x0846 */ u8         unk_846;
-    /* 0x0847 */ s8         unk_847[4];
-    /* 0x084B */ s8         unk_84B[4];
-    /* 0x084F */ s8         unk_84F;
-    /* 0x0850 */ s16        unk_850; // multipurpose timer
-    /* 0x0854 */ f32        unk_854;
-    /* 0x0858 */ f32        unk_858;
-    /* 0x085C */ f32        unk_85C; // stick length among other things
-    /* 0x0860 */ s16        unk_860; // stick flame timer among other things
-    /* 0x0862 */ s16        unk_862; // get item draw ID + 1
-    /* 0x0864 */ f32        unk_864;
-    /* 0x0868 */ f32        unk_868;
-    /* 0x086C */ f32        unk_86C;
-    /* 0x0870 */ f32        unk_870;
-    /* 0x0874 */ f32        unk_874;
-    /* 0x0878 */ f32        unk_878;
-    /* 0x087C */ s16        unk_87C;
-    /* 0x087E */ s16        unk_87E;
-    /* 0x0880 */ f32        unk_880;
-    /* 0x0884 */ f32        yDistToLedge; // y distance to ground above an interact wall. LEDGE_DIST_MAX if no ground is found
-    /* 0x0888 */ f32        distToInteractWall; // distance to the colliding wall plane
-    /* 0x088C */ u8         unk_88C;
-    /* 0x088D */ u8         unk_88D;
-    /* 0x088E */ u8         unk_88E;
-    /* 0x088F */ u8         unk_88F;
-    /* 0x0890 */ u8         unk_890;
-    /* 0x0891 */ u8         shockTimer;
-    /* 0x0892 */ u8         unk_892;
-    /* 0x0893 */ u8         hoverBootsTimer;
-    /* 0x0894 */ s16        fallStartHeight; // last truncated Y position before falling
-    /* 0x0896 */ s16        fallDistance; // truncated Y distance the player has fallen so far (positive is down)
-    /* 0x0898 */ s16        floorPitch; // angle of the floor slope in the direction of current world yaw (positive for ascending slope)
-    /* 0x089A */ s16        floorPitchAlt; // the calculation for this value is bugged and doesn't represent anything meaningful
-    /* 0x089C */ s16        unk_89C;
-    /* 0x089E */ u16        floorSfxOffset;
-    /* 0x08A0 */ u8         unk_8A0;
-    /* 0x08A1 */ u8         unk_8A1;
-    /* 0x08A2 */ s16        unk_8A2;
-    /* 0x08A4 */ f32        unk_8A4;
-    /* 0x08A8 */ f32        unk_8A8;
-    /* 0x08AC */ f32        pushedSpeed; // Pushing player, examples include water currents, floor conveyors, climbing sloped surfaces
-    /* 0x08B0 */ s16        pushedYaw; // Yaw direction of player being pushed
+    /* 0x0830 */ f32 upperAnimBlendWeight;
+    /* 0x0834 */ s16 unk_834;
+    /* 0x0836 */ s8 unk_836;
+    /* 0x0837 */ u8 unk_837;
+    /* 0x0838 */ f32 linearVelocity;
+    /* 0x083C */ s16 yaw; // General yaw value, used both for world and shape rotation. Current or target value depending on context.
+    /* 0x083E */ s16 zTargetYaw; // yaw relating to Z targeting/"parallel" mode
+    /* 0x0840 */ u16 underwaterTimer;
+    /* 0x0842 */ s8 meleeWeaponAnimation;
+    /* 0x0843 */ s8 meleeWeaponState;
+    /* 0x0844 */ s8 unk_844;
+    /* 0x0845 */ u8 unk_845;
+    /* 0x0846 */ u8 unk_846;
+    /* 0x0847 */ s8 unk_847[4];
+    /* 0x084B */ s8 unk_84B[4];
+
+    /* 0x084F */ union {
+        s8 actionVar1;
+    } av1; // "Action Variable 1": context dependent variable that has different meanings depending on what action is currently running
+
+    /* 0x0850 */ union {
+        s16 actionVar2;
+    } av2; // "Action Variable 2": context dependent variable that has different meanings depending on what action is currently running
+
+    /* 0x0854 */ f32 unk_854;
+    /* 0x0858 */ f32 unk_858;
+    /* 0x085C */ f32 unk_85C; // stick length among other things
+    /* 0x0860 */ s16 unk_860; // stick flame timer among other things
+    /* 0x0862 */ s16 unk_862; // get item draw ID + 1
+    /* 0x0864 */ f32 unk_864;
+    /* 0x0868 */ f32 unk_868;
+    /* 0x086C */ f32 unk_86C;
+    /* 0x0870 */ f32 unk_870;
+    /* 0x0874 */ f32 unk_874;
+    /* 0x0878 */ f32 unk_878;
+    /* 0x087C */ s16 unk_87C;
+    /* 0x087E */ s16 unk_87E;
+    /* 0x0880 */ f32 unk_880;
+    /* 0x0884 */ f32 yDistToLedge; // y distance to ground above an interact wall. LEDGE_DIST_MAX if no ground is found
+    /* 0x0888 */ f32 distToInteractWall; // xyz distance to the interact wall
+    /* 0x088C */ u8 ledgeClimbType;
+    /* 0x088D */ u8 ledgeClimbDelayTimer;
+    /* 0x088E */ u8 unk_88E;
+    /* 0x088F */ u8 unk_88F;
+    /* 0x0890 */ u8 unk_890;
+    /* 0x0891 */ u8 bodyShockTimer;
+    /* 0x0892 */ u8 unk_892;
+    /* 0x0893 */ u8 hoverBootsTimer;
+    /* 0x0894 */ s16 fallStartHeight; // last truncated Y position before falling
+    /* 0x0896 */ s16 fallDistance; // truncated Y distance the player has fallen so far (positive is down)
+    /* 0x0898 */ s16 floorPitch; // angle of the floor slope in the direction of current world yaw (positive for ascending slope)
+    /* 0x089A */ s16 floorPitchAlt; // the calculation for this value is bugged and doesn't represent anything meaningful
+    /* 0x089C */ s16 unk_89C;
+    /* 0x089E */ u16 floorSfxOffset;
+    /* 0x08A0 */ u8 unk_8A0;
+    /* 0x08A1 */ u8 unk_8A1;
+    /* 0x08A2 */ s16 unk_8A2;
+    /* 0x08A4 */ f32 unk_8A4;
+    /* 0x08A8 */ f32 unk_8A8;
+    /* 0x08AC */ f32 pushedSpeed; // Pushing player, examples include water currents, floor conveyors, climbing sloped surfaces
+    /* 0x08B0 */ s16 pushedYaw; // Yaw direction of player being pushed
    /* 0x08B4 */ WeaponInfo meleeWeaponInfo[3];
-    /* 0x0908 */ Vec3f      bodyPartsPos[PLAYER_BODYPART_MAX];
-    /* 0x09E0 */ MtxF       mf_9E0;
-    /* 0x0A20 */ MtxF       shieldMf;
-    /* 0x0A60 */ u8         isBurning;
-    /* 0x0A61 */ u8         flameTimers[PLAYER_BODYPART_MAX]; // one flame per body part
-    /* 0x0A73 */ u8         unk_A73;
+    /* 0x0908 */ Vec3f bodyPartsPos[PLAYER_BODYPART_MAX];
+    /* 0x09E0 */ MtxF mf_9E0;
+    /* 0x0A20 */ MtxF shieldMf;
+    /* 0x0A60 */ u8 bodyIsBurning;
+    /* 0x0A61 */ u8 bodyFlameTimers[PLAYER_BODYPART_MAX]; // one flame per body part
+    /* 0x0A73 */ u8 unk_A73;
    /* 0x0A74 */ PlayerFuncA74 func_A74;
-    /* 0x0A78 */ s8         invincibilityTimer; // prevents damage when nonzero (positive = visible, counts towards zero each frame)
-    /* 0x0A79 */ u8         unk_A79;
-    /* 0x0A7A */ u8         unk_A7A;
-    /* 0x0A7B */ u8         unk_A7B;
-    /* 0x0A7C */ f32        unk_A7C;
-    /* 0x0A80 */ s16        unk_A80;
-    /* 0x0A82 */ u16        unk_A82;
-    /* 0x0A84 */ s16        unk_A84;
-    /* 0x0A86 */ s8         unk_A86;
-    /* 0x0A87 */ u8         unk_A87;
-    /* 0x0A88 */ Vec3f      unk_A88; // previous body part 0 position
+    /* 0x0A78 */ s8 invincibilityTimer; // prevents damage when nonzero (positive = visible, counts towards zero each frame)
+    /* 0x0A79 */ u8 floorTypeTimer; // counts up every frame the current floor type is the same as the last frame
+    /* 0x0A7A */ u8 floorProperty;
+    /* 0x0A7B */ u8 prevFloorType;
+    /* 0x0A7C */ f32 prevControlStickMagnitude;
+    /* 0x0A80 */ s16 prevControlStickAngle;
+    /* 0x0A82 */ u16 prevFloorSfxOffset;
+    /* 0x0A84 */ s16 unk_A84;
+    /* 0x0A86 */ s8 unk_A86;
+    /* 0x0A87 */ u8 unk_A87;
+    /* 0x0A88 */ Vec3f unk_A88; // previous body part 0 position
    // #region SOH [General]
    // Upstream TODO: Rename these to be more obviously SoH specific
    /*        */ PendingFlag pendingFlag;
@ -670,7 +677,7 @@ typedef struct Player {
    // #endregion
    // #region SOH [Enhancements]
    // Upstream TODO: Rename this to make it more obvious it is apart of an enhancement
-    /*        */ u8         boomerangQuickRecall; // Has the player pressed the boomerang button while it's in the air still?
+    /*        */ u8 boomerangQuickRecall; // Has the player pressed the boomerang button while it's in the air still?
    // #endregion
    u8 ivanFloating;
    u8 ivanDamageMultiplier;
--- a/soh/macosx/soh-macos.sh.in
+++ b/soh/macosx/soh-macos.sh.in
@ -7,68 +7,6 @@ export RESPATH="${SNAME%/MacOS*}/Resources"
 export LIBPATH="${SNAME%/MacOS*}/Frameworks"
 export DYLD_FALLBACK_LIBRARY_PATH="$LIBPATH"

-remap_hashes ()
-{
-	# 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
-}
-
 if [ ! -e "$SHIP_HOME" ]; then	mkdir "$SHIP_HOME"; fi

 if [ ! -e "$SHIP_HOME"/mods ]; then
@ -76,178 +14,6 @@ if [ ! -e "$SHIP_HOME"/mods ]; then
 	touch "$SHIP_HOME"/mods/custom_otr_files_go_here.txt
 fi

-# If either OTR doesn't exist kick off the OTR gen process
-if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then
-
-	# If no ROMs exist kick off the file selection prompts
-	while [ ! -e "$SHIP_HOME"/*.*64 ] && [ ! -e "$SHIP_HOME"/oot*.otr ]; do
-
-		SHOULD_PROMPT_FOR_ROM=1
-		while [ $SHOULD_PROMPT_FOR_ROM -eq 1 ]; do
-			SHOULD_PROMPT_FOR_ROM=0
-			# Use osascript to prompt the user to chose a file
-			DROPROM=`osascript <<-EOF
-				set romFile to choose file of type {"b64","n64","v64","z64"} with prompt "Please select your ROM:"
-				return POSIX path of romFile
-			EOF`
-
-			# If no rom was selected, the user cancelled, so exit
-			if [[ -z $DROPROM ]] && [[ -z "$UPLOAD_ANOTHER_RESULT" ]]; then
-				echo "No ROM selected. Exiting..."
-				exit 1
-			elif [[ -z $DROPROM ]]; then
-				break;
-			fi
-
-			# If an invalid rom was selected, let the user know and ask to try again
-			ROMHASH="$(shasum "$DROPROM" | awk '{ print $1 }')"
-
-			remap_hashes
-
-			case "$ROMHASH" in
-				cee6bc3c2a634b41728f2af8da54d9bf8cc14099)
-					ROM_TYPE=0;;
-				0227d7c0074f2d0ac935631990da8ec5914597b4)
-					ROM_TYPE=0;;
-				328a1f1beba30ce5e178f031662019eb32c5f3b5)
-					ROM_TYPE=0;;
-				cfbb98d392e4a9d39da8285d10cbef3974c2f012)
-					ROM_TYPE=0;;
-				f46239439f59a2a594ef83cf68ef65043b1bffe2)
-					ROM_TYPE=1;;
-				50bebedad9e0f10746a52b07239e47fa6c284d03)
-					ROM_TYPE=1;;
-				079b855b943d6ad8bd1eb026c0ed169ecbdac7da)
-					ROM_TYPE=1;;
-				cfecfdc58d650e71a200c81f033de4e6d617a9f6)
-					ROM_TYPE=1;;
-				517bd9714c73cb96c21e7c2ef640d7b55186102f)
-					ROM_TYPE=1;;
-				*)
-					TRY_AGAIN_RESULT=`osascript <<-EOF
-						set alertText to "Incompatible ROM hash"
-						set alertMessage to "Incompatible ROM provided, would you like to try again?"
-						return display alert alertText \
-							message alertMessage \
-							as critical \
-							buttons {"Cancel", "Try Again"}
-					EOF`
-					if [[ "$TRY_AGAIN_RESULT" == "button returned:Try Again" ]]; then
-						SHOULD_PROMPT_FOR_ROM=1
-						continue;
-					else
-						echo "No ROM selected. Exiting..."
-						exit 1
-					fi
-			esac
-
-			cp "$DROPROM" "$SHIP_HOME"
-
-			# Ask user if they would also like to select the other variant (MQ/Vanilla)
-			if [ $ROM_TYPE -eq 0 ] && [[ -z "$UPLOAD_ANOTHER_RESULT" ]]; then
-				UPLOAD_ANOTHER_RESULT=`osascript <<-EOF
-					set alertText to "Success"
-					set alertMessage to "Would you also like to provide a Master Quest ROM?"
-					return display alert alertText \
-						message alertMessage \
-						buttons {"No", "Yes"}
-				EOF`
-			elif [[ -z "$UPLOAD_ANOTHER_RESULT" ]]; then
-				UPLOAD_ANOTHER_RESULT=`osascript <<-EOF
-					set alertText to "Success"
-					set alertMessage to "Would you also like to provide a Vanilla (Non Master Quest) ROM?"
-					return display alert alertText \
-						message alertMessage \
-						buttons {"No", "Yes"}
-				EOF`
-			fi
-
-			if [[ "$UPLOAD_ANOTHER_RESULT" == "button returned:Yes" ]]; then
-				UPLOAD_ANOTHER_RESULT="button returned:No"
-				SHOULD_PROMPT_FOR_ROM=1
-				continue;
-			fi
-			break
-		done
-	done
-
-	# At this point we should now have 1 or more valid roms in $SHIP_HOME directory
-
-	# Prepare tmp dir
-	for ROMPATH in "$SHIP_HOME"/*.*64
-	do
-		ASSETDIR="$(mktemp -d /tmp/assets-XXXXX)"
-		export ASSETDIR
-		cp -r "$RESPATH/assets" "$ASSETDIR"
-		mkdir -p "$ASSETDIR"/tmp
-		cp "$ROMPATH" "$ASSETDIR"/tmp/rom.z64
-		cd "$ASSETDIR" || return
-
-		# If an invalid rom was detected, let the user know
-		ROMHASH="$(shasum "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')"
-
-		remap_hashes
-
-		case "$ROMHASH" in
-			cee6bc3c2a634b41728f2af8da54d9bf8cc14099)
-				ROM=GC_NMQ_D
-				OTRNAME="oot.otr";;
-			0227d7c0074f2d0ac935631990da8ec5914597b4)
-				ROM=GC_NMQ_PAL_F
-				OTRNAME="oot.otr";;
-			328a1f1beba30ce5e178f031662019eb32c5f3b5)
-				ROM=N64_PAL_10
-				OTRNAME="oot.otr";;
-			cfbb98d392e4a9d39da8285d10cbef3974c2f012)
-				ROM=N64_PAL_11
-				OTRNAME="oot.otr";;
-			f46239439f59a2a594ef83cf68ef65043b1bffe2)
-				ROM=GC_MQ_PAL_F
-				OTRNAME="oot-mq.otr";;
-			50bebedad9e0f10746a52b07239e47fa6c284d03)
-				ROM=GC_MQ_D
-				OTRNAME="oot-mq.otr";;
-			079b855b943d6ad8bd1eb026c0ed169ecbdac7da)
-				ROM=GC_MQ_D
-				OTRNAME="oot-mq.otr";;
-			cfecfdc58d650e71a200c81f033de4e6d617a9f6)
-				ROM=GC_MQ_D
-				OTRNAME="oot-mq.otr";;
-			517bd9714c73cb96c21e7c2ef640d7b55186102f)
-				ROM=GC_MQ_D
-				OTRNAME="oot-mq.otr";;
-			*)
-				osascript -e 'display notification "One or more invalid ROM provided" with title "Ship Of Harkinian"'
-				rm -r "$ASSETDIR"
-				cd "$SNAME"
-				continue;
-		esac
-
-		# Only generate OTR if we don't have on of this type yet
-		if [ -e "$SHIP_HOME"/"$OTRNAME" ]; then
-			rm -r "$ASSETDIR"
-			cd "$SNAME"
-			continue;
-		fi
-
-		osascript -e 'display notification "Generating OTR..." with title "Ship Of Harkinian"'
-		assets/extractor/ZAPD.out ed -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 --portVer "@CMAKE_PROJECT_VERSION@"
-		if [ -e "$ASSETDIR"/oot.otr ]; then
-			osascript -e 'display notification "OTR successfully generated" with title "Ship Of Harkinian"'
-			cp "$ASSETDIR"/oot.otr "$SHIP_HOME"/"$OTRNAME"
-			rm -r "$ASSETDIR"
-			cd "$SNAME"
-		fi
-	done
-
-	if [ ! -e "$SHIP_HOME"/oot*.otr ]; then
-		osascript -e 'display notification "OTR failed to generate" with title "Ship Of Harkinian"'
-		exit 1;
-	fi
-fi
-
-cd "$SNAME"
-
 "$RESPATH"/soh-macos

 exit
--- a/soh/soh/Enhancements/controls/InputViewer.cpp
+++ b/soh/soh/Enhancements/controls/InputViewer.cpp
@ -0,0 +1,519 @@
+#include "InputViewer.h"
+
+#include "public/bridge/consolevariablebridge.h"
+#include "libultraship/libultra/controller.h"
+#include "Context.h"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <ImGui/imgui.h>
+#include <spdlog/spdlog.h>
+#include <cmath>
+
+#include "../../UIWidgets.hpp"
+
+// 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 const char* buttonOutlineOptions[4] = { "Always Shown", "Shown Only While Not Pressed",
+                                               "Shown Only While Pressed", "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);
+}
+
+InputViewer::~InputViewer() {
+    SPDLOG_TRACE("destruct input viewer");
+}
+
+void InputViewer::RenderButton(std::string btnTexture, std::string btnOutlineTexture, int state, ImVec2 size,
+                               int outlineMode) {
+    const ImVec2 pos = ImGui::GetCursorPos();
+    ImGui::SetNextItemAllowOverlap();
+    // Render Outline based on settings
+    if (outlineMode == BUTTON_OUTLINE_ALWAYS_SHOWN || (outlineMode == BUTTON_OUTLINE_NOT_PRESSED && !state) ||
+        (outlineMode == BUTTON_OUTLINE_PRESSED && state)) {
+        ImGui::Image(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(btnOutlineTexture), size,
+                     ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+    }
+    // Render button if pressed
+    if (state) {
+        ImGui::SetCursorPos(pos);
+        ImGui::SetNextItemAllowOverlap();
+        ImGui::Image(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName(btnTexture), size,
+                     ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+    }
+}
+
+void InputViewer::DrawElement() {
+    if (CVarGetInteger("gOpenWindows.InputViewer", 0)) {
+        static bool sButtonTexturesLoaded = false;
+        if (!sButtonTexturesLoaded) {
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage(
+                "Input-Viewer-Background", "textures/buttons/InputViewerBackground.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("A-Btn", "textures/buttons/ABtn.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("B-Btn", "textures/buttons/BBtn.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("L-Btn", "textures/buttons/LBtn.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("R-Btn", "textures/buttons/RBtn.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Z-Btn", "textures/buttons/ZBtn.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Start-Btn",
+                                                                            "textures/buttons/StartBtn.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Left", "textures/buttons/CLeft.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Right", "textures/buttons/CRight.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Up", "textures/buttons/CUp.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Down", "textures/buttons/CDown.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Analog-Stick",
+                                                                            "textures/buttons/AnalogStick.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Left",
+                                                                            "textures/buttons/DPadLeft.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Right",
+                                                                            "textures/buttons/DPadRight.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Up", "textures/buttons/DPadUp.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Down",
+                                                                            "textures/buttons/DPadDown.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Right-Stick",
+                                                                            "textures/buttons/RightStick.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("A-Btn Outline",
+                                                                            "textures/buttons/ABtnOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("B-Btn Outline",
+                                                                            "textures/buttons/BBtnOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("L-Btn Outline",
+                                                                            "textures/buttons/LBtnOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("R-Btn Outline",
+                                                                            "textures/buttons/RBtnOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Z-Btn Outline",
+                                                                            "textures/buttons/ZBtnOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Start-Btn Outline",
+                                                                            "textures/buttons/StartBtnOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Left Outline",
+                                                                            "textures/buttons/CLeftOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Right Outline",
+                                                                            "textures/buttons/CRightOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Up Outline",
+                                                                            "textures/buttons/CUpOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("C-Down Outline",
+                                                                            "textures/buttons/CDownOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Analog-Stick Outline",
+                                                                            "textures/buttons/AnalogStickOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Left Outline",
+                                                                            "textures/buttons/DPadLeftOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Right Outline",
+                                                                            "textures/buttons/DPadRightOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Up Outline",
+                                                                            "textures/buttons/DPadUpOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Dpad-Down Outline",
+                                                                            "textures/buttons/DPadDownOutline.png");
+            LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Right-Stick Outline",
+                                                                            "textures/buttons/RightStickOutline.png");
+            sButtonTexturesLoaded = true;
+        }
+
+        ImVec2 mainPos = ImGui::GetWindowPos();
+        ImVec2 size = ImGui::GetContentRegionAvail();
+
+#ifdef __WIIU__
+        const float scale = CVarGetFloat("gInputViewer.Scale", 1.0f) * 2.0f;
+#else
+        const float scale = CVarGetFloat("gInputViewer.Scale", 1.0f);
+#endif
+        const int showAnalogAngles = CVarGetInteger("gInputViewer.AnalogAngles.Enabled", 0);
+        const int buttonOutlineMode = CVarGetInteger("gInputViewer.ButtonOutlineMode", BUTTON_OUTLINE_NOT_PRESSED);
+
+        ImVec2 bgSize = LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureSize("Input-Viewer-Background");
+        ImVec2 scaledBGSize = ImVec2(bgSize.x * scale, bgSize.y * scale);
+
+        ImGui::SetNextWindowSize(ImVec2(
+            scaledBGSize.x + 20,
+            scaledBGSize.y +
+                (showAnalogAngles ? ImGui::CalcTextSize("X").y : 0) * scale * CVarGetFloat("gInputViewer.AnalogAngles.Scale", 1.0f) + 20));
+        ImGui::SetNextWindowContentSize(
+            ImVec2(scaledBGSize.x, scaledBGSize.y + (showAnalogAngles ? 15 : 0) * scale *
+                                                          CVarGetFloat("gInputViewer.AnalogAngles.Scale", 1.0f)));
+        ImGui::SetNextWindowPos(
+            ImVec2(mainPos.x + size.x - scaledBGSize.x - 30, mainPos.y + size.y - scaledBGSize.y - 30),
+            ImGuiCond_FirstUseEver);
+
+        ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
+        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 0.0f));
+
+        OSContPad* pads = LUS::Context::GetInstance()->GetControlDeck()->GetPads();
+
+        ImGuiWindowFlags windowFlags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollbar |
+                                       ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoBackground |
+                                       ImGuiWindowFlags_NoFocusOnAppearing;
+
+        if (!CVarGetInteger("gInputViewer.EnableDragging", 1)) {
+            windowFlags |= ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove;
+        }
+
+        if (pads != nullptr && ImGui::Begin("Input Viewer", nullptr, windowFlags)) {
+            ImGui::SetCursorPos(ImVec2(10, 10));
+            const ImVec2 aPos = ImGui::GetCursorPos();
+
+            if (CVarGetInteger("gInputViewer.ShowBackground", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                // Background
+                ImGui::Image(
+                    LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Input-Viewer-Background"),
+                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+            }
+
+            // A/B
+            if (CVarGetInteger("gInputViewer.BBtn", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("B-Btn", "B-Btn Outline", pads[0].button & BTN_B, scaledBGSize, buttonOutlineMode);
+            }
+            if (CVarGetInteger("gInputViewer.ABtn", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("A-Btn", "A-Btn Outline", pads[0].button & BTN_A, scaledBGSize, buttonOutlineMode);
+            }
+
+            // C buttons
+            if (CVarGetInteger("gInputViewer.CUp", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("C-Up", "C-Up Outline", pads[0].button & BTN_CUP, scaledBGSize, buttonOutlineMode);
+            }
+            if (CVarGetInteger("gInputViewer.CLeft", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("C-Left", "C-Left Outline", pads[0].button & BTN_CLEFT, scaledBGSize, buttonOutlineMode);
+            }
+            if (CVarGetInteger("gInputViewer.CRight", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("C-Right", "C-Right Outline", pads[0].button & BTN_CRIGHT, scaledBGSize,
+                             buttonOutlineMode);
+            }
+            if (CVarGetInteger("gInputViewer.CDown", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("C-Down", "C-Down Outline", pads[0].button & BTN_CDOWN, scaledBGSize, buttonOutlineMode);
+            }
+
+            // L/R/Z
+            if (CVarGetInteger("gInputViewer.LBtn", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("L-Btn", "L-Btn Outline", pads[0].button & BTN_L, scaledBGSize, buttonOutlineMode);
+            }
+            if (CVarGetInteger("gInputViewer.RBtn", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("R-Btn", "R-Btn Outline", pads[0].button & BTN_R, scaledBGSize, buttonOutlineMode);
+            }
+            if (CVarGetInteger("gInputViewer.ZBtn", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("Z-Btn", "Z-Btn Outline", pads[0].button & BTN_Z, scaledBGSize, buttonOutlineMode);
+            }
+
+            // Start
+            if (CVarGetInteger("gInputViewer.StartBtn", 1)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("Start-Btn", "Start-Btn Outline", pads[0].button & BTN_START, scaledBGSize,
+                             buttonOutlineMode);
+            }
+
+            // Dpad
+            if (CVarGetInteger("gInputViewer.Dpad", 0)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("Dpad-Left", "Dpad-Left Outline", pads[0].button & BTN_DLEFT, scaledBGSize,
+                             buttonOutlineMode);
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("Dpad-Right", "Dpad-Right Outline", pads[0].button & BTN_DRIGHT, scaledBGSize,
+                             buttonOutlineMode);
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("Dpad-Up", "Dpad-Up Outline", pads[0].button & BTN_DUP, scaledBGSize, buttonOutlineMode);
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                RenderButton("Dpad-Down", "Dpad-Down Outline", pads[0].button & BTN_DDOWN, scaledBGSize,
+                             buttonOutlineMode);
+            }
+
+            const bool analogStickIsInDeadzone = !pads[0].stick_x && !pads[0].stick_y;
+            const bool rightStickIsInDeadzone = !pads[0].right_stick_x && !pads[0].right_stick_y;
+
+            // Analog Stick
+            const int analogOutlineMode =
+                CVarGetInteger("gInputViewer.AnalogStick.OutlineMode", STICK_MODE_ALWAYS_SHOWN);
+            const float maxStickDistance = CVarGetInteger("gInputViewer.AnalogStick.Movement", 12);
+            if (analogOutlineMode == STICK_MODE_ALWAYS_SHOWN ||
+                (analogOutlineMode == STICK_MODE_HIDDEN_IN_DEADZONE && !analogStickIsInDeadzone)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                ImGui::Image(
+                    LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Analog-Stick Outline"),
+                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+            }
+            const int analogStickMode =
+                CVarGetInteger("gInputViewer.AnalogStick.VisibilityMode", STICK_MODE_ALWAYS_SHOWN);
+            if (analogStickMode == STICK_MODE_ALWAYS_SHOWN ||
+                (analogStickMode == STICK_MODE_HIDDEN_IN_DEADZONE && !analogStickIsInDeadzone)) {
+                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));
+                ImGui::Image(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Analog-Stick"),
+                             scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+            }
+
+            // Right Stick
+            const float maxRightStickDistance = CVarGetInteger("gInputViewer.RightStick.Movement", 7);
+            const int rightOutlineMode =
+                CVarGetInteger("gInputViewer.RightStick.OutlineMode", STICK_MODE_ALWAYS_HIDDEN);
+            if (rightOutlineMode == STICK_MODE_ALWAYS_SHOWN ||
+                (rightOutlineMode == STICK_MODE_HIDDEN_IN_DEADZONE && !rightStickIsInDeadzone)) {
+                ImGui::SetNextItemAllowOverlap();
+                ImGui::SetCursorPos(aPos);
+                ImGui::Image(
+                    LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Right-Stick Outline"),
+                    scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+            }
+            const int rightStickMode =
+                CVarGetInteger("gInputViewer.RightStick.VisibilityMode", STICK_MODE_ALWAYS_HIDDEN);
+            if (rightStickMode == STICK_MODE_ALWAYS_SHOWN ||
+                (rightStickMode == STICK_MODE_HIDDEN_IN_DEADZONE && !rightStickIsInDeadzone)) {
+                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));
+                ImGui::Image(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Right-Stick"),
+                             scaledBGSize, ImVec2(0, 0), ImVec2(1.0f, 1.0f), ImVec4(255, 255, 255, 255));
+            }
+
+            // Analog stick angle text
+            if (showAnalogAngles) {
+                ImGui::SetCursorPos(ImVec2(aPos.x + 10 + CVarGetInteger("gInputViewer.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("gInputViewer.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;
+
+                // ESS range
+                const int range1Min = CVarGetInteger("gInputViewer.AnalogAngles.Range1.Min", 8);
+                const int range1Max = CVarGetInteger("gInputViewer.AnalogAngles.Range1.Max", 27);
+                // Walking speed range
+                const int range2Min = CVarGetInteger("gInputViewer.AnalogAngles.Range2.Min", 27);
+                const int range2Max = CVarGetInteger("gInputViewer.AnalogAngles.Range2.Max", 62);
+
+                // Push color based on angle ranges
+                if (CVarGetInteger("gInputViewer.AnalogAngles.Range1.Enabled", 0) &&
+                    (rSquared >= (range1Min * range1Min)) && (rSquared < (range1Max * range1Max))) {
+                    ImGui::PushStyleColor(
+                        ImGuiCol_Text,
+                        color2Vec(CVarGetColor("gInputViewer.AnalogAngles.Range1.Color", vec2Color(range1Color))));
+                } else if (CVarGetInteger("gInputViewer.AnalogAngles.Range2.Enabled", 0) &&
+                           (rSquared >= (range2Min * range2Min)) && (rSquared < (range2Max * range2Max))) {
+                    ImGui::PushStyleColor(
+                        ImGuiCol_Text,
+                        color2Vec(CVarGetColor("gInputViewer.AnalogAngles.Range2.Color", vec2Color(range2Color))));
+                } else {
+                    ImGui::PushStyleColor(ImGuiCol_Text, color2Vec(CVarGetColor("gInputViewer.AnalogAngles.TextColor",
+                                                                                vec2Color(textColor))));
+                }
+
+                // Render text
+                ImGui::Text("X: %-3d  Y: %-3d", pads[0].stick_x, pads[0].stick_y);
+                // Restore original color
+                ImGui::PopStyleColor();
+                // Restore original font scale
+                ImGui::GetFont()->Scale = oldFontScale;
+                ImGui::PopFont();
+            }
+
+            ImGui::End();
+        }
+
+        ImGui::PopStyleVar();
+        ImGui::PopStyleColor();
+    }
+}
+
+InputViewerSettingsWindow::~InputViewerSettingsWindow() {
+    SPDLOG_TRACE("destruct input viewer settings window");
+}
+
+void InputViewerSettingsWindow::DrawElement() {
+    ImGui::SetNextWindowSize(ImVec2(450, 525), ImGuiCond_FirstUseEver);
+
+    if (ImGui::Begin("Input Viewer Settings", &mIsVisible)) {
+
+        // gInputViewer.Scale
+        UIWidgets::EnhancementSliderFloat("Input Viewer Scale: %.2f", "##Input", "gInputViewer.Scale", 0.1f, 5.0f, "",
+                                          1.0f, false, true);
+        UIWidgets::Tooltip("Sets the on screen size of the input viewer");
+
+        // gInputViewer.EnableDragging
+        UIWidgets::EnhancementCheckbox("Enable Dragging", "gInputViewer.EnableDragging", false, "",
+                                       UIWidgets::CheckboxGraphics::Checkmark, true);
+
+        UIWidgets::PaddedSeparator(true, true);
+
+        // gInputViewer.ShowBackground
+        UIWidgets::EnhancementCheckbox("Show Background Layer", "gInputViewer.ShowBackground", false, "",
+                                       UIWidgets::CheckboxGraphics::Checkmark, true);
+
+        UIWidgets::PaddedSeparator(true, true);
+
+        if (ImGui::CollapsingHeader("Buttons")) {
+            // gInputViewer.ABtn
+            UIWidgets::EnhancementCheckbox("Show A-Button Layers", "gInputViewer.ABtn", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.BBtn
+            UIWidgets::EnhancementCheckbox("Show B-Button Layers", "gInputViewer.BBtn", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.CUp
+            UIWidgets::EnhancementCheckbox("Show C-Up Layers", "gInputViewer.CUp", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.CRight
+            UIWidgets::EnhancementCheckbox("Show C-Right Layers", "gInputViewer.CRight", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.CDown
+            UIWidgets::EnhancementCheckbox("Show C-Down Layers", "gInputViewer.CDown", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.CLeft
+            UIWidgets::EnhancementCheckbox("Show C-Left Layers", "gInputViewer.CLeft", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.LBtn
+            UIWidgets::EnhancementCheckbox("Show L-Button Layers", "gInputViewer.LBtn", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.RBtn
+            UIWidgets::EnhancementCheckbox("Show R-Button Layers", "gInputViewer.RBtn", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.ZBtn
+            UIWidgets::EnhancementCheckbox("Show Z-Button Layers", "gInputViewer.ZBtn", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.StartBtn
+            UIWidgets::EnhancementCheckbox("Show Start Button Layers", "gInputViewer.StartBtn", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, true);
+            // gInputViewer.Dpad
+            UIWidgets::EnhancementCheckbox("Show D-Pad Layers", "gInputViewer.Dpad", false, "",
+                                           UIWidgets::CheckboxGraphics::Checkmark, false);
+
+            // gInputViewer.ButtonOutlineMode
+            UIWidgets::PaddedText("Button Outlines/Backgrounds", true, false);
+            UIWidgets::EnhancementCombobox("gInputViewer.ButtonOutlineMode", buttonOutlineOptions,
+                                           BUTTON_OUTLINE_NOT_PRESSED);
+            UIWidgets::Tooltip(
+                "Sets the desired visibility behavior for the button outline/background layers. Useful for "
+                "custom input viewers.");
+
+            UIWidgets::PaddedSeparator(true, true);
+        }
+
+        if (ImGui::CollapsingHeader("Analog Stick")) {
+            // gInputViewer.AnalogStick.VisibilityMode
+            UIWidgets::PaddedText("Analog Stick Visibility", true, false);
+            UIWidgets::EnhancementCombobox("gInputViewer.AnalogStick.VisibilityMode", stickModeOptions,
+                                           STICK_MODE_ALWAYS_SHOWN);
+            UIWidgets::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("gInputViewer.AnalogStick.OutlineMode", stickModeOptions,
+                                           STICK_MODE_ALWAYS_SHOWN);
+            UIWidgets::Tooltip(
+                "Determines the conditions under which the analog stick outline/background texture is visible.");
+
+            // gInputViewer.AnalogStick.Movement
+            UIWidgets::EnhancementSliderInt("Analog Stick Movement: %dpx", "##AnalogMovement",
+                                            "gInputViewer.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.");
+            UIWidgets::PaddedSeparator(true, true);
+        }
+
+        if (ImGui::CollapsingHeader("Additional (\"Right\") Stick")) {
+            // gInputViewer.RightStick.VisibilityMode
+            UIWidgets::PaddedText("Right Stick Visibility", true, false);
+            UIWidgets::EnhancementCombobox("gInputViewer.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.");
+
+            // gInputViewer.RightStick.OutlineMode
+            UIWidgets::PaddedText("Right Stick Outline/Background Visibility", true, false);
+            UIWidgets::EnhancementCombobox("gInputViewer.RightStick.OutlineMode", stickModeOptions,
+                                           STICK_MODE_HIDDEN_IN_DEADZONE);
+            UIWidgets::Tooltip(
+                "Determines the conditions under which the right stick outline/background texture is visible.");
+
+            // gInputViewer.RightStick.Movement
+            UIWidgets::EnhancementSliderInt("Right Stick Movement: %dpx", "##RightMovement",
+                                            "gInputViewer.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.");
+            UIWidgets::PaddedSeparator(true, true);
+        }
+
+        if (ImGui::CollapsingHeader("Analog Angle Values")) {
+            // gAnalogAngles
+            UIWidgets::EnhancementCheckbox("Show Analog Stick Angle Values", "gInputViewer.AnalogAngles.Enabled");
+            UIWidgets::Tooltip("Displays analog stick angle values in the input viewer");
+            if (CVarGetInteger("gInputViewer.AnalogAngles.Enabled", 0)) {
+                // gInputViewer.AnalogAngles.TextColor
+                if (ImGui::ColorEdit4("Text Color", (float*)&textColor)) {
+                    CVarSetColor("gInputViewer.AnalogAngles.TextColor", vec2Color(textColor));
+                }
+                // gAnalogAngleScale
+                UIWidgets::EnhancementSliderFloat("Angle Text Scale: %.2f%%", "##AnalogAngleScale",
+                                                  "gInputViewer.AnalogAngles.Scale", 0.1f, 5.0f, "", 1.0f, true, true);
+                // gInputViewer.AnalogAngles.Offset
+                UIWidgets::EnhancementSliderInt("Angle Text Offset: %dpx", "##AnalogAngleOffset",
+                                                "gInputViewer.AnalogAngles.Offset", 0, 400, "", 0, true);
+                UIWidgets::PaddedSeparator(true, true);
+                // gInputViewer.AnalogAngles.Range1.Enabled
+                UIWidgets::EnhancementCheckbox("Highlight ESS Position", "gInputViewer.AnalogAngles.Range1.Enabled");
+                UIWidgets::Tooltip(
+                    "Highlights the angle value text when the analog stick is in ESS position (on flat ground)");
+                if (CVarGetInteger("gInputViewer.AnalogAngles.Range1.Enabled", 0)) {
+                    // gInputViewer.AnalogAngles.Range1.Color
+                    if (ImGui::ColorEdit4("ESS Color", (float*)&range1Color)) {
+                        CVarSetColor("gInputViewer.AnalogAngles.Range1.Color", vec2Color(range1Color));
+                    }
+                }
+
+                UIWidgets::PaddedSeparator(true, true);
+                // gInputViewer.AnalogAngles.Range2.Enabled
+                UIWidgets::EnhancementCheckbox("Highlight Walking Speed Angles",
+                                               "gInputViewer.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");
+                if (CVarGetInteger("gInputViewer.AnalogAngles.Range2.Enabled", 0)) {
+                    // gInputViewer.AnalogAngles.Range2.Color
+                    if (ImGui::ColorEdit4("Walking Speed Color", (float*)&range2Color)) {
+                        CVarSetColor("gInputViewer.AnalogAngles.Range2.Color", vec2Color(range2Color));
+                    }
+                }
+            }
+        }
+
+        ImGui::End();
+    }
+}
--- a/soh/soh/Enhancements/controls/InputViewer.h
+++ b/soh/soh/Enhancements/controls/InputViewer.h
@ -0,0 +1,47 @@
+#pragma once
+
+#include <libultraship/libultraship.h>
+
+typedef enum {
+    BUTTON_OUTLINE_ALWAYS_SHOWN,
+    BUTTON_OUTLINE_NOT_PRESSED,
+    BUTTON_OUTLINE_PRESSED,
+    BUTTON_OUTLINE_ALWAYS_HIDDEN
+} ButtonOutlineMode;
+
+typedef enum {
+    STICK_MODE_ALWAYS_SHOWN,
+    STICK_MODE_HIDDEN_IN_DEADZONE,
+    STICK_MODE_ALWAYS_HIDDEN,
+} StickMode;
+
+class InputViewer : public LUS::GuiWindow {
+public:
+    using LUS::GuiWindow::GuiWindow;
+
+    void InitElement() override {};
+    void DrawElement() override;
+    void UpdateElement() override {};
+
+    InputViewer();
+    ~InputViewer();
+ 
+    void Draw();
+
+    private:
+        void RenderButton(std::string btn, std::string btnOutline, int state, ImVec2 size, int outlineMode);
+};
+
+class InputViewerSettingsWindow : public LUS::GuiWindow {
+public:
+    using LUS::GuiWindow::GuiWindow;
+
+    void InitElement() override {};
+    void DrawElement() override;
+    void UpdateElement() override {};
+
+    InputViewerSettingsWindow();
+    ~InputViewerSettingsWindow();
+
+    void Draw();
+};
--- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
+++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
@ -270,35 +270,35 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
    COSMETIC_OPTION("Hud_NameTagActorText",          "Nametag Text",         GROUP_HUD,          ImVec4(255, 255, 255, 255), true, true, false),
    COSMETIC_OPTION("Hud_NameTagActorBackground",    "Nametag Background",   GROUP_HUD,          ImVec4(0,     0,   0,  80), true, false, true),

-    COSMETIC_OPTION("Kal_ItemSelA",                  "Item Select Color A",  GROUP_KALEIDO,      ImVec4(10,   50,  80, 255), false, true, false),
-    COSMETIC_OPTION("Kal_ItemSelB",                  "Item Select Color B",  GROUP_KALEIDO,      ImVec4(70,  100, 130, 255), false, true, false),
-    COSMETIC_OPTION("Kal_ItemSelC",                  "Item Select Color C",  GROUP_KALEIDO,      ImVec4(70,  100, 130, 255), false, true, false),
-    COSMETIC_OPTION("Kal_ItemSelD",                  "Item Select Color D",  GROUP_KALEIDO,      ImVec4(10,   50,  80, 255), false, true, false),
+    COSMETIC_OPTION("Kal_ItemSelA",                  "Item Select Color",    GROUP_KALEIDO,      ImVec4(10,   50,  80, 255), false, true, false),
+    COSMETIC_OPTION("Kal_ItemSelB",                  "Item Select Color B",  GROUP_KALEIDO,      ImVec4(70,  100, 130, 255), false, true, true),
+    COSMETIC_OPTION("Kal_ItemSelC",                  "Item Select Color C",  GROUP_KALEIDO,      ImVec4(70,  100, 130, 255), false, true, true),
+    COSMETIC_OPTION("Kal_ItemSelD",                  "Item Select Color D",  GROUP_KALEIDO,      ImVec4(10,   50,  80, 255), false, true, true),

-    COSMETIC_OPTION("Kal_EquipSelA",                 "Equip Select Color A", GROUP_KALEIDO,      ImVec4(10,   50,  40, 255), false, true, false),
-    COSMETIC_OPTION("Kal_EquipSelB",                 "Equip Select Color B", GROUP_KALEIDO,      ImVec4(90,  100,  60, 255), false, true, false),
-    COSMETIC_OPTION("Kal_EquipSelC",                 "Equip Select Color C", GROUP_KALEIDO,      ImVec4(90,  100,  60, 255), false, true, false),
-    COSMETIC_OPTION("Kal_EquipSelD",                 "Equip Select Color D", GROUP_KALEIDO,      ImVec4(10,   50,  80, 255), false, true, false),
+    COSMETIC_OPTION("Kal_EquipSelA",                 "Equip Select Color",   GROUP_KALEIDO,      ImVec4(10,   50,  40, 255), false, true, false),
+    COSMETIC_OPTION("Kal_EquipSelB",                 "Equip Select Color B", GROUP_KALEIDO,      ImVec4(90,  100,  60, 255), false, true, true),
+    COSMETIC_OPTION("Kal_EquipSelC",                 "Equip Select Color C", GROUP_KALEIDO,      ImVec4(90,  100,  60, 255), false, true, true),
+    COSMETIC_OPTION("Kal_EquipSelD",                 "Equip Select Color D", GROUP_KALEIDO,      ImVec4(10,   50,  80, 255), false, true, true),

-    COSMETIC_OPTION("Kal_MapSelDunA",                "Map Dungeon Color A",  GROUP_KALEIDO,      ImVec4(80,   40,  30, 255), false, true, false),
-    COSMETIC_OPTION("Kal_MapSelDunB",                "Map Dungeon Color B",  GROUP_KALEIDO,      ImVec4(140,  60,  60, 255), false, true, false),
-    COSMETIC_OPTION("Kal_MapSelDunC",                "Map Dungeon Color C",  GROUP_KALEIDO,      ImVec4(140,  60,  60, 255), false, true, false),
-    COSMETIC_OPTION("Kal_MapSelDunD",                "Map Dungeon Color D",  GROUP_KALEIDO,      ImVec4(80,   40,  30, 255), false, true, false),
+    COSMETIC_OPTION("Kal_MapSelDunA",                "Map Dungeon Color",    GROUP_KALEIDO,      ImVec4(80,   40,  30, 255), false, true, true),
+    COSMETIC_OPTION("Kal_MapSelDunB",                "Map Dungeon Color B",  GROUP_KALEIDO,      ImVec4(140,  60,  60, 255), false, true, true),
+    COSMETIC_OPTION("Kal_MapSelDunC",                "Map Dungeon Color C",  GROUP_KALEIDO,      ImVec4(140,  60,  60, 255), false, true, true),
+    COSMETIC_OPTION("Kal_MapSelDunD",                "Map Dungeon Color D",  GROUP_KALEIDO,      ImVec4(80,   40,  30, 255), false, true, true),

-    COSMETIC_OPTION("Kal_QuestStatusA",              "Quest StatusColor A",  GROUP_KALEIDO,      ImVec4(80, 80, 50, 255),    false, true, false),
-    COSMETIC_OPTION("Kal_QuestStatusB",              "Quest StatusColor B",  GROUP_KALEIDO,      ImVec4(120, 120, 70, 255),  false, true, false),
-    COSMETIC_OPTION("Kal_QuestStatusC",              "Quest StatusColor C",  GROUP_KALEIDO,      ImVec4(120, 120, 70, 255),  false, true, false),
-    COSMETIC_OPTION("Kal_QuestStatusD",              "Quest StatusColor D",  GROUP_KALEIDO,      ImVec4(80, 80, 50, 255),    false, true, false),
+    COSMETIC_OPTION("Kal_QuestStatusA",              "Quest Status Color",   GROUP_KALEIDO,      ImVec4(80, 80, 50, 255),    false, true, false),
+    COSMETIC_OPTION("Kal_QuestStatusB",              "Quest Status Color B", GROUP_KALEIDO,      ImVec4(120, 120, 70, 255),  false, true, true),
+    COSMETIC_OPTION("Kal_QuestStatusC",              "Quest Status Color C", GROUP_KALEIDO,      ImVec4(120, 120, 70, 255),  false, true, true),
+    COSMETIC_OPTION("Kal_QuestStatusD",              "Quest Status Color D", GROUP_KALEIDO,      ImVec4(80, 80, 50, 255),    false, true, true),

-    COSMETIC_OPTION("Kal_MapSelectA",                "Map Color A",          GROUP_KALEIDO,      ImVec4(80, 40, 30, 255),    false, true, false),
-    COSMETIC_OPTION("Kal_MapSelectB",                "Map Color B",          GROUP_KALEIDO,      ImVec4(140, 60, 60, 255),   false, true, false),
-    COSMETIC_OPTION("Kal_MapSelectC",                "Map Color C",          GROUP_KALEIDO,      ImVec4(140, 60, 60, 255),   false, true, false),
-    COSMETIC_OPTION("Kal_MapSelectD",                "Map Color D",          GROUP_KALEIDO,      ImVec4(80, 40, 30, 255),    false, true, false),
+    COSMETIC_OPTION("Kal_MapSelectA",                "Map Color",            GROUP_KALEIDO,      ImVec4(80, 40, 30, 255),    false, true, false),
+    COSMETIC_OPTION("Kal_MapSelectB",                "Map Color B",          GROUP_KALEIDO,      ImVec4(140, 60, 60, 255),   false, true, true),
+    COSMETIC_OPTION("Kal_MapSelectC",                "Map Color C",          GROUP_KALEIDO,      ImVec4(140, 60, 60, 255),   false, true, true),
+    COSMETIC_OPTION("Kal_MapSelectD",                "Map Color D",          GROUP_KALEIDO,      ImVec4(80, 40, 30, 255),    false, true, true),

-    COSMETIC_OPTION("Kal_SaveA",                     "Save A",               GROUP_KALEIDO,      ImVec4(50, 50, 50, 255),    false, true, false),
-    COSMETIC_OPTION("Kal_SaveB",                     "Save B",               GROUP_KALEIDO,      ImVec4(110, 110, 110, 255), false, true, false),
-    COSMETIC_OPTION("Kal_SaveC",                     "Save C",               GROUP_KALEIDO,      ImVec4(110, 110, 110, 255), false, true, false),
-    COSMETIC_OPTION("Kal_SaveD",                     "Save D",               GROUP_KALEIDO,      ImVec4(50, 50, 50, 255),    false, true, false),
+    COSMETIC_OPTION("Kal_SaveA",                     "Save Color",           GROUP_KALEIDO,      ImVec4(50, 50, 50, 255),    false, true, false),
+    COSMETIC_OPTION("Kal_SaveB",                     "Save Color B",         GROUP_KALEIDO,      ImVec4(110, 110, 110, 255), false, true, true),
+    COSMETIC_OPTION("Kal_SaveC",                     "Save Color C",         GROUP_KALEIDO,      ImVec4(110, 110, 110, 255), false, true, true),
+    COSMETIC_OPTION("Kal_SaveD",                     "Save Color D",         GROUP_KALEIDO,      ImVec4(50, 50, 50, 255),    false, true, true),

    COSMETIC_OPTION("Kal_NamePanel",                 "Name Panel",           GROUP_KALEIDO,      ImVec4(90,100,130,255),     true, true, false),

@ -1066,12 +1066,16 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) {
    if (manualChange || CVarGetInteger(npcGoldenSkulltula.rainbowCvar, 0)) {
        static Color_RGBA8 defaultColor = {npcGoldenSkulltula.defaultColor.x, npcGoldenSkulltula.defaultColor.y, npcGoldenSkulltula.defaultColor.z, npcGoldenSkulltula.defaultColor.w};
        Color_RGBA8 color = CVarGetColor(npcGoldenSkulltula.cvar, defaultColor);
-        PATCH_GFX(gGiSkulltulaTokenDL,                            "NPC_GoldenSkulltula1",     npcGoldenSkulltula.changedCvar,       5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiSkulltulaTokenDL,                            "NPC_GoldenSkulltula2",     npcGoldenSkulltula.changedCvar,       6, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(gGiSkulltulaTokenFlameDL,                       "NPC_GoldenSkulltula3",     npcGoldenSkulltula.changedCvar,      32, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(gGiSkulltulaTokenFlameDL,                       "NPC_GoldenSkulltula4",     npcGoldenSkulltula.changedCvar,      33, gsDPSetEnvColor(color.r / 2, color.g / 2, color.b / 2, 255));
-        PATCH_GFX(object_st_DL_003FB0,                            "NPC_GoldenSkulltula5",     npcGoldenSkulltula.changedCvar,     118, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255));
-        PATCH_GFX(object_st_DL_003FB0,                            "NPC_GoldenSkulltula6",     npcGoldenSkulltula.changedCvar,     119, gsDPSetEnvColor(color.r / 4, color.g / 4, color.b / 4, 255));
+        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");
@ -1182,6 +1186,43 @@ void DrawScaleSlider(const std::string CvarName,float DefaultValue){
    //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) {
+    if (ImGui::CollapsingHeader(Header_Title)) {
+        if (ImGui::BeginTable(Table_ID, 1, FlagsTable)) {
+            ImGui::TableSetupColumn(Column_Title, FlagsCell, TablesCellsWidth);
+            Table_InitHeader(false);
+            DrawUseMarginsSlider(Slider_Title, Slider_ID);
+            DrawPositionsRadioBoxes(Slider_ID);
+            DrawPositionSlider(Slider_ID, MinY, MaxY, MinX, MaxX);
+            DrawScaleSlider(Slider_ID, Default_Value);
+            ImGui::NewLine();
+            ImGui::EndTable();
+        }
+    }
+}
+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) {
+    if (ImGui::CollapsingHeader(Header_Title)) {
+        if (ImGui::BeginTable(Table_ID, 1, FlagsTable)) {
+            ImGui::TableSetupColumn(Column_Title, FlagsCell, TablesCellsWidth);
+            Table_InitHeader(false);
+            DrawUseMarginsSlider(Slider_Title, Slider_ID);
+            DrawPositionsRadioBoxes(Slider_ID);
+            s16 Min_X_CU = 0;
+            s16 Max_X_CU = ImGui::GetWindowViewport()->Size.x/2;
+            if(CVarGetInteger(Int_Type,0) == 2){
+                Max_X_CU = 294;
+            } else if(CVarGetInteger(Int_Type,0) == 3){
+                Max_X_CU = ImGui::GetWindowViewport()->Size.x/2;
+            } else if(CVarGetInteger(Int_Type,0) == 4){
+                Min_X_CU = (ImGui::GetWindowViewport()->Size.x/2)*-1;
+            }
+            DrawPositionSlider(Slider_ID, 0, ImGui::GetWindowViewport()->Size.y/2, Min_X_CU, Max_X_CU);
+            DrawScaleSlider(Slider_ID, Slider_Scale_Value);
+            ImGui::NewLine();
+            ImGui::EndTable();
+        }
+    }
+}
 void Draw_Placements(){
    if (ImGui::BeginTable("tableMargins", 1, FlagsTable)) {
        ImGui::TableSetupColumn("General margins settings", FlagsCell, TablesCellsWidth);
@ -1248,126 +1289,13 @@ void Draw_Placements(){
            ImGui::EndTable();
        }
    }
-    if (ImGui::CollapsingHeader("B Button position")) {
-        if (ImGui::BeginTable("tablebbtn", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("B Button settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("B Button", "gBBtn");
-            DrawPositionsRadioBoxes("gBBtn");
-            DrawPositionSlider("gBBtn", 0, ImGui::GetWindowViewport()->Size.y/4+50, -1, ImGui::GetWindowViewport()->Size.x-50);
-            DrawScaleSlider("gBBtn",0.95f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("A Button position")) {
-        if (ImGui::BeginTable("tableabtn", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("A Button settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("A Button", "gABtn");
-            DrawPositionsRadioBoxes("gABtn");
-            DrawPositionSlider("gABtn", -10, ImGui::GetWindowViewport()->Size.y/4+50, -20, ImGui::GetWindowViewport()->Size.x-50);
-            DrawScaleSlider("gABtn",0.95f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Start Button position")) {
-        if (ImGui::BeginTable("tablestartbtn", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Start Button settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Start Button", "gStartBtn");
-            DrawPositionsRadioBoxes("gStartBtn");
-            DrawPositionSlider("gStartBtn", 0, ImGui::GetWindowViewport()->Size.y/2, 0, ImGui::GetWindowViewport()->Size.x/2+70);
-            DrawScaleSlider("gStartBtn",0.75f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("C Button Up position")) {
-        if (ImGui::BeginTable("tablecubtn", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("C Button Up settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("C Button Up", "gCBtnU");
-            DrawPositionsRadioBoxes("gCBtnU");
-            s16 Min_X_CU = 0;
-            s16 Max_X_CU = ImGui::GetWindowViewport()->Size.x/2;
-            if(CVarGetInteger("gCBtnUPosType",0) == 2){
-                Max_X_CU = 294;
-            } else if(CVarGetInteger("gCBtnUPosType",0) == 3){
-                Max_X_CU = ImGui::GetWindowViewport()->Size.x/2;
-            } else if(CVarGetInteger("gCBtnUPosType",0) == 4){
-                Min_X_CU = (ImGui::GetWindowViewport()->Size.x/2)*-1;
-            }
-            DrawPositionSlider("gCBtnU", 0, ImGui::GetWindowViewport()->Size.y/2, Min_X_CU, Max_X_CU);
-            DrawScaleSlider("gCBtnU",0.5f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("C Button Down position")) {
-        if (ImGui::BeginTable("tablecdbtn", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("C Button Down settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("C Button Down", "gCBtnD");
-            DrawPositionsRadioBoxes("gCBtnD");
-            s16 Min_X_CD = 0;
-            s16 Max_X_CD = ImGui::GetWindowViewport()->Size.x/2;
-            if(CVarGetInteger("gCBtnDPosType",0) == 2){
-                Max_X_CD = 294;
-            } else if(CVarGetInteger("gCBtnDPosType",0) == 3){
-                Max_X_CD = ImGui::GetWindowViewport()->Size.x/2;
-            } else if(CVarGetInteger("gCBtnDPosType",0) == 4){
-                Min_X_CD = (ImGui::GetWindowViewport()->Size.x/2)*-1;
-            }
-            DrawPositionSlider("gCBtnD", 0, ImGui::GetWindowViewport()->Size.y/2, Min_X_CD, Max_X_CD);
-            DrawScaleSlider("gCBtnD",0.87f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("C Button Left position")) {
-        if (ImGui::BeginTable("tableclbtn", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("C Button Left settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("C Button Left", "gCBtnL");
-            DrawPositionsRadioBoxes("gCBtnL");
-            s16 Min_X_CL = 0;
-            s16 Max_X_CL = ImGui::GetWindowViewport()->Size.x/2;
-            if(CVarGetInteger("gCBtnLPosType",0) == 2){
-                Max_X_CL = 294;
-            } else if(CVarGetInteger("gCBtnLPosType",0) == 3){
-                Max_X_CL = ImGui::GetWindowViewport()->Size.x/2;
-            } else if(CVarGetInteger("gCBtnLPosType",0) == 4){
-                Min_X_CL = (ImGui::GetWindowViewport()->Size.x/2)*-1;
-            }
-            DrawPositionSlider("gCBtnL", 0, ImGui::GetWindowViewport()->Size.y/2, Min_X_CL, Max_X_CL);
-            DrawScaleSlider("gCBtnL",0.87f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("C Button Right position")) {
-        if (ImGui::BeginTable("tablecrnbtn", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("C Button Right settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("C Button Right", "gCBtnR");
-            DrawPositionsRadioBoxes("gCBtnR");
-            s16 Min_X_CR = 0;
-            s16 Max_X_CR = ImGui::GetWindowViewport()->Size.x/2;
-            if(CVarGetInteger("gCBtnRPosType",0) == 2){
-                Max_X_CR = 294;
-            } else if(CVarGetInteger("gCBtnRPosType",0) == 3){
-                Max_X_CR = ImGui::GetWindowViewport()->Size.x/2;
-            } else if(CVarGetInteger("gCBtnRPosType",0) == 4){
-                Min_X_CR = (ImGui::GetWindowViewport()->Size.x/2)*-1;
-            }
-            DrawPositionSlider("gCBtnR", 0, ImGui::GetWindowViewport()->Size.y/2, Min_X_CR, Max_X_CR);
-            DrawScaleSlider("gCBtnR",0.87f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
+    Draw_Table_Dropdown("B Button position", "tablebbtn", "B Button settings", "B Button", "gBBtn", 0, ImGui::GetWindowViewport()->Size.y/4+50, -1, ImGui::GetWindowViewport()->Size.x-50, 0.95f);
+    Draw_Table_Dropdown("A Button position", "tableabtn", "A Button settings", "A Button", "gABtn", -10, ImGui::GetWindowViewport()->Size.y/4+50, -20, ImGui::GetWindowViewport()->Size.x-50, 0.95f);
+    Draw_Table_Dropdown("Start Button position", "tablestartbtn", "Start Button settings", "Start Button", "gStartBtn", 0, ImGui::GetWindowViewport()->Size.y/2, 0, ImGui::GetWindowViewport()->Size.x/2+70, 0.75f);
+    C_Button_Dropdown("C Button Up position", "tablecubtn", "C Button Up settings", "C Button Up", "gCBtnU", "gCBtnUPosType", 0.5f);
+    C_Button_Dropdown("C Button Down position", "tablecdbtn", "C Button Down settings", "C Button Down", "gCBtnD", "gCBtnDPosType", 0.87f);
+    C_Button_Dropdown("C Button Left position", "tableclbtn", "C Button Left settings", "C Button Left", "gCBtnL", "gCBtnLPosType", 0.87f);
+    C_Button_Dropdown("C Button Right position", "tablecrbtn", "C Button Right settings", "C Button Right", "gCBtnR", "gCBtnRPosType", 0.87f);
    if (CVarGetInteger("gDpadEquips",0) && ImGui::CollapsingHeader("DPad items position")) {
        if (ImGui::BeginTable("tabledpaditems", 1, FlagsTable)) {
            ImGui::TableSetupColumn("DPad items settings", FlagsCell, TablesCellsWidth);
@ -1387,115 +1315,15 @@ void Draw_Placements(){
            ImGui::EndTable();
        }
    }
-    if (ImGui::CollapsingHeader("Minimaps position")) {
-        if (ImGui::BeginTable("tableminimapspos", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("minimaps settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Minimap", "gMinimap");
-            DrawPositionsRadioBoxes("gMinimap", false);
-            DrawPositionSlider("gMinimap", (ImGui::GetWindowViewport()->Size.y/3)*-1, ImGui::GetWindowViewport()->Size.y/3, ImGui::GetWindowViewport()->Size.x*-1, ImGui::GetWindowViewport()->Size.x/2);
-            DrawScaleSlider("gMinimap",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Small Keys counter position")) {
-        if (ImGui::BeginTable("tablesmolekeys", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Small Keys counter settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Small Keys counter", "gSKC");
-            DrawPositionsRadioBoxes("gSKC");
-            DrawPositionSlider("gSKC", 0, ImGui::GetWindowViewport()->Size.y/3, -1, ImGui::GetWindowViewport()->Size.x/2);
-            DrawScaleSlider("gSKC",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Rupee counter position")) {
-        if (ImGui::BeginTable("tablerupeecount", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Rupee counter settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Rupee counter", "gRC");
-            DrawPositionsRadioBoxes("gRC");
-            DrawPositionSlider("gRC", -2, ImGui::GetWindowViewport()->Size.y/3, -3, ImGui::GetWindowViewport()->Size.x/2);
-            DrawScaleSlider("gRC",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Carrots position")) {
-        if (ImGui::BeginTable("tableCarrots", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Carrots settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Carrots", "gCarrots");
-            DrawPositionsRadioBoxes("gCarrots");
-            DrawPositionSlider("gCarrots", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2+25);
-            DrawScaleSlider("gCarrots",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Timers position")) {
-        if (ImGui::BeginTable("tabletimers", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Timers settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Timers", "gTimers");
-            DrawPositionsRadioBoxes("gTimers");
-            DrawPositionSlider("gTimers", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2-50);
-            DrawScaleSlider("gTimers",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Archery Scores position")) {
-        if (ImGui::BeginTable("tablearchery", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Archery Scores settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Archery scores", "gAS");
-            DrawPositionsRadioBoxes("gAS", false);
-            DrawPositionSlider("gAS", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2-50);
-            DrawScaleSlider("gAS",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Title cards (Maps) position")) {
-        if (ImGui::BeginTable("tabletcmaps", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Titlecard maps settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Title cards (overworld)", "gTCM");
-            DrawPositionsRadioBoxes("gTCM");
-            DrawPositionSlider("gTCM", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2+10);
-            DrawScaleSlider("gTCM",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("Title cards (Bosses) position")) {
-        if (ImGui::BeginTable("tabletcbosses", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("Title cards (Bosses) settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("Title cards (Bosses)", "gTCB");
-            DrawPositionsRadioBoxes("gTCB");
-            DrawPositionSlider("gTCB", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2+10);
-            DrawScaleSlider("gTCB",1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
-    if (ImGui::CollapsingHeader("In-game Gameplay Timer position")) {
-        if (ImGui::BeginTable("tablegameplaytimer", 1, FlagsTable)) {
-            ImGui::TableSetupColumn("In-game Gameplay Timer settings", FlagsCell, TablesCellsWidth);
-            Table_InitHeader(false);
-            DrawUseMarginsSlider("In-game Gameplay Timer", "gIGT");
-            DrawPositionsRadioBoxes("gIGT");
-            DrawPositionSlider("gIGT", 0, ImGui::GetWindowViewport()->Size.y / 2, -50,
-                               ImGui::GetWindowViewport()->Size.x / 2 + 10);
-            DrawScaleSlider("gIGT", 1.0f);
-            ImGui::NewLine();
-            ImGui::EndTable();
-        }
-    }
+    Draw_Table_Dropdown("Minimaps position", "tableminimapspos", "minimaps settings", "Minimap", "gMinimap", (ImGui::GetWindowViewport()->Size.y/3)*-1, ImGui::GetWindowViewport()->Size.y/3, ImGui::GetWindowViewport()->Size.x*-1, ImGui::GetWindowViewport()->Size.x/2, 1.0f);
+    Draw_Table_Dropdown("Small Keys counter position", "tablesmolekeys", "Small Keys counter settings", "Small Keys counter", "gSKC", 0, ImGui::GetWindowViewport()->Size.y/3, -1, ImGui::GetWindowViewport()->Size.x/2, 1.0f);
+    Draw_Table_Dropdown("Rupee counter position", "tablerupeecount", "Rupee counter settings", "Rupee counter", "gRC", -2, ImGui::GetWindowViewport()->Size.y/3, -3, ImGui::GetWindowViewport()->Size.x/2, 1.0f);
+    Draw_Table_Dropdown("Carrots position", "tableCarrots", "Carrots settings", "Carrots", "gCarrots", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2+25, 1.0f);
+    Draw_Table_Dropdown("Timers position", "tabletimers", "Timers settings", "Timers", "gTimers", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2-50, 1.0f);
+    Draw_Table_Dropdown("Archery Scores position", "tablearchery", "Archery Scores settings", "Archery scores", "gAS", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2-50, 1.0f);
+    Draw_Table_Dropdown("Title cards (Maps) position", "tabletcmaps", "Titlecard maps settings", "Title cards (overworld)", "gTCM", 0, ImGui::GetWindowViewport()->Size.y/2, -50, ImGui::GetWindowViewport()->Size.x/2+10, 1.0f);
+    Draw_Table_Dropdown("Title cards (Bosses) position", "tabletcbosses", "Title cards (Bosses) settings", "Title cards (Bosses)", "gTCB", 0, ImGui::GetWindowViewport()->Size.y/2, -50, 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", "gIGT", 0, ImGui::GetWindowViewport()->Size.y / 2, -50, 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);
@ -1523,7 +1351,21 @@ void Draw_Placements(){
        }
    }
 }
-
+void Reset_Option_Single(const char* Button_Title, const char* name) {
+    ImGui::SameLine();
+    if (ImGui::Button(Button_Title)) {
+        CVarClear(name);
+        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
+}
+void Reset_Option_Double(const char* Button_Title, const char* name) {
+    ImGui::SameLine();
+    if (ImGui::Button(Button_Title)) {
+        CVarClear((std::string(name) + ".Value").c_str());
+        CVarClear((std::string(name) + ".Changed").c_str());
+        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
+}
 void DrawSillyTab() {
    ImGui::BeginDisabled(CVarGetInteger("gDisableChangingSettings", 0));
    if (CVarGetInteger("gLetItSnow", 0)) {
@ -1549,67 +1391,28 @@ void DrawSillyTab() {
    if (UIWidgets::EnhancementSliderFloat("Link Head Scale: %.2fx", "##Link_HeadScale", "gCosmetics.Link_HeadScale.Value", 0.4f, 4.0f, "", 1.0f, false)) {
        CVarSetInteger("gCosmetics.Link_HeadScale.Changed", 1);
    }
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##Link_HeadScale")) {
-        CVarClear("gCosmetics.Link_HeadScale.Value");
-        CVarClear("gCosmetics.Link_HeadScale.Changed");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
-    if (UIWidgets::EnhancementSliderFloat("Link Sword Scale: %.3fx", "##Link_SwordScale", "gCosmetics.Link_SwordScale.Value", 1.0f, 2.5f, "", 1.0f, false)) {
+    Reset_Option_Double("Reset##Link_HeadScale", "gCosmetics.Link_HeadScale");
+    if (UIWidgets::EnhancementSliderFloat("Link Sword Scale: %f", "##Link_SwordScale", "gCosmetics.Link_SwordScale.Value", 1.0f, 2.5f, "", 1.0f, false)) {
        CVarSetInteger("gCosmetics.Link_SwordScale.Changed", 1);
    }
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##Link_SwordScale")) {
-        CVarClear("gCosmetics.Link_SwordScale.Value");
-        CVarClear("gCosmetics.Link_SwordScale.Changed");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
-    UIWidgets::EnhancementSliderFloat("Bunny Hood Length: %.0f", "##BunnyHood_EarLength", "gCosmetics.BunnyHood_EarLength", -300.0f, 1000.0f, "", 0.0f, false);
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##BunnyHood_EarLength")) {
-        CVarClear("gCosmetics.BunnyHood_EarLength");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
-    UIWidgets::EnhancementSliderFloat("Bunny Hood Spread: %.0f", "##BunnyHood_EarSpread", "gCosmetics.BunnyHood_EarSpread", -300.0f, 500.0f, "", 0.0f, false);
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##BunnyHood_EarSpread")) {
-        CVarClear("gCosmetics.BunnyHood_EarSpread");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
-    UIWidgets::EnhancementSliderFloat("Goron Neck Length: %.0f", "##Goron_NeckLength", "gCosmetics.Goron_NeckLength", 0.0f, 5000.0f, "", 0.0f, false);
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##Goron_NeckLength")) {
-        CVarClear("gCosmetics.Goron_NeckLength");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
+    Reset_Option_Double("Reset##Link_SwordScale", "gCosmetics.Link_SwordScale");
+    UIWidgets::EnhancementSliderFloat("Bunny Hood Length: %f", "##BunnyHood_EarLength", "gCosmetics.BunnyHood_EarLength", -300.0f, 1000.0f, "", 0.0f, false);
+    Reset_Option_Single("Reset##BunnyHood_EarLength", "gCosmetics.BunnyHood_EarLength");
+    UIWidgets::EnhancementSliderFloat("Bunny Hood Spread: %f", "##BunnyHood_EarSpread", "gCosmetics.BunnyHood_EarSpread", -300.0f, 500.0f, "", 0.0f, false);
+    Reset_Option_Single("Reset##BunnyHood_EarSpread", "gCosmetics.BunnyHood_EarSpread");
+    UIWidgets::EnhancementSliderFloat("Goron Neck Length: %f", "##Goron_NeckLength", "gCosmetics.Goron_NeckLength", 0.0f, 1000.0f, "", 0.0f, false);
+    Reset_Option_Single("Reset##Goron_NeckLength", "gCosmetics.Goron_NeckLength");
    UIWidgets::EnhancementCheckbox("Unfix Goron Spin", "gUnfixGoronSpin");
-    UIWidgets::EnhancementSliderFloat("Fairies Size: %.2fx", "##Fairies_Size", "gCosmetics.Fairies_Size", 0.25f, 5.0f, "", 1.0f, false);
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##Fairies_Size")) {
-        CVarClear("gCosmetics.Fairies_Size");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
-    UIWidgets::EnhancementSliderFloat("N64 Logo Spin Speed: %.2fx", "##N64Logo_SpinSpeed", "gCosmetics.N64Logo_SpinSpeed", 0.25f, 5.0f, "", 1.0f, false);
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##N64Logo_SpinSpeed")) {
-        CVarClear("gCosmetics.N64Logo_SpinSpeed");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
-    UIWidgets::EnhancementSliderFloat("Moon Size: %.1f %%", "##Moon_Size", "gCosmetics.Moon_Size", 0.5f, 2.0f, "", 1.0f, true);
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##Moon_Size")) {
-        CVarClear("gCosmetics.Moon_Size");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
-    if (UIWidgets::EnhancementSliderFloat("Kak Windmill Speed: %.0f", "##Kak_Windmill_Speed", "gCosmetics.Kak_Windmill_Speed.Value", 100.0f, 6000.0f, "", 100.0f, false)) {
+    UIWidgets::EnhancementSliderFloat("Fairies Size: %f", "##Fairies_Size", "gCosmetics.Fairies_Size", 0.25f, 5.0f, "", 1.0f, false);
+    Reset_Option_Single("Reset##Fairies_Size", "gCosmetics.Fairies_Size");
+    UIWidgets::EnhancementSliderFloat("N64 Logo Spin Speed: %f", "##N64Logo_SpinSpeed", "gCosmetics.N64Logo_SpinSpeed", 0.25f, 5.0f, "", 1.0f, false);
+    Reset_Option_Single("Reset##N64Logo_SpinSpeed", "gCosmetics.N64Logo_SpinSpeed");
+    UIWidgets::EnhancementSliderFloat("Moon Size: %f", "##Moon_Size", "gCosmetics.Moon_Size", 0.5f, 2.0f, "", 1.0f, false);
+    Reset_Option_Single("Reset##Moon_Size", "gCosmetics.Moon_Size");
+    if (UIWidgets::EnhancementSliderFloat("Kak Windmill Speed: %f", "##Kak_Windmill_Speed", "gCosmetics.Kak_Windmill_Speed.Value", 100.0f, 6000.0f, "", 100.0f, false)) {
        CVarSetInteger("gCosmetics.Kak_Windmill_Speed.Changed", 1);
    }
-    ImGui::SameLine();
-    if (ImGui::Button("Reset##Kak_Windmill_Speed")) {
-        CVarClear("gCosmetics.Kak_Windmill_Speed.Value");
-        CVarClear("gCosmetics.Kak_Windmill_Speed.Changed");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    }
+    Reset_Option_Double("Reset##Kak_Windmill_Speed", "gCosmetics.Kak_Windmill_Speed");
    ImGui::EndDisabled();
 }

@ -1632,25 +1435,20 @@ void CopyMultipliedColor(CosmeticOption& cosmeticOptionSrc, CosmeticOption& cosm
    CVarSetInteger((cosmeticOptionTarget.changedCvar), 1);
 }

-void RandomizeColor(CosmeticOption& cosmeticOption) {
-    Color_RGBA8 newColor;
-    newColor.r = Random(0, 255);
-    newColor.g = Random(0, 255);
-    newColor.b = Random(0, 255);
-    newColor.a = 255;
-    // For alpha supported options, retain the last set alpha instead of overwriting
-    if (cosmeticOption.supportsAlpha) {
-        newColor.a = cosmeticOption.currentColor.w * 255;
+void ToggleRainbow(CosmeticOption& cosmeticOption, bool state) {
+    if (state) {
+        CVarSetInteger(cosmeticOption.rainbowCvar, 1);
+        CVarSetInteger(cosmeticOption.changedCvar, 1);
+    } else {
+        CVarClear(cosmeticOption.rainbowCvar);
+        CVarClear(cosmeticOption.changedCvar);
    }
+}

-    cosmeticOption.currentColor.x = newColor.r / 255.0;
-    cosmeticOption.currentColor.y = newColor.g / 255.0;
-    cosmeticOption.currentColor.z = newColor.b / 255.0;
-    cosmeticOption.currentColor.w = newColor.a / 255.0;
-
-    CVarSetColor(cosmeticOption.cvar, newColor);
-    CVarSetInteger((cosmeticOption.rainbowCvar), 0);
-    CVarSetInteger((cosmeticOption.changedCvar), 1);
+void ApplySideEffects(CosmeticOption& cosmeticOption) {
+    if (CVarGetInteger("gCosmetics.AdvancedMode", 0)) {
+        return;
+    }

    // This bit is kind of experimental, not sure how I feel about it yet, but it allows for
    // advanced cosmetic options to be changed based on a non-advanced option.
@ -1672,9 +1470,91 @@ void RandomizeColor(CosmeticOption& cosmeticOption) {
        CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("SpinAttack_Level1Primary"), 2.0f);
    } else if (cosmeticOption.label == "Level 2 Secondary") {
        CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("SpinAttack_Level2Primary"), 2.0f);
+    } else if (cosmeticOption.label == "Item Select Color") {
+        if (CVarGetInteger(cosmeticOption.rainbowCvar, 0)) {
+            ToggleRainbow(cosmeticOptions.at("Kal_ItemSelB"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_ItemSelC"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_ItemSelD"), true);
+        } else {
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_ItemSelB"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_ItemSelC"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_ItemSelD"), 1.0f);
+        }
+    } else if (cosmeticOption.label == "Equip Select Color") {
+        if (CVarGetInteger(cosmeticOption.rainbowCvar, 0)) {
+            ToggleRainbow(cosmeticOptions.at("Kal_EquipSelB"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_EquipSelC"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_EquipSelD"), true);
+        } else {
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_EquipSelB"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_EquipSelC"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_EquipSelD"), 1.0f);
+        }
+    } else if (cosmeticOption.label == "Map Dungeon Color") {
+        if (CVarGetInteger(cosmeticOption.rainbowCvar, 0)) {
+            ToggleRainbow(cosmeticOptions.at("Kal_MapSelDunB"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_MapSelDunC"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_MapSelDunD"), true);
+        } else {
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_MapSelDunB"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_MapSelDunC"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_MapSelDunD"), 1.0f);
+        }
+    } else if (cosmeticOption.label == "Quest Status Color") {
+        if (CVarGetInteger(cosmeticOption.rainbowCvar, 0)) {
+            ToggleRainbow(cosmeticOptions.at("Kal_QuestStatusB"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_QuestStatusC"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_QuestStatusD"), true);
+        } else {
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_QuestStatusB"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_QuestStatusC"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_QuestStatusD"), 1.0f);
+        }
+    } else if (cosmeticOption.label == "Map Color") {
+        if (CVarGetInteger(cosmeticOption.rainbowCvar, 0)) {
+            ToggleRainbow(cosmeticOptions.at("Kal_MapSelectB"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_MapSelectC"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_MapSelectD"), true);
+        } else {
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_MapSelectB"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_MapSelectC"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_MapSelectD"), 1.0f);
+        }
+    } else if (cosmeticOption.label == "Save Color") {
+        if (CVarGetInteger(cosmeticOption.rainbowCvar, 0)) {
+            ToggleRainbow(cosmeticOptions.at("Kal_SaveB"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_SaveC"), true);
+            ToggleRainbow(cosmeticOptions.at("Kal_SaveD"), true);
+        } else {
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_SaveB"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_SaveC"), 2.0f);
+            CopyMultipliedColor(cosmeticOption, cosmeticOptions.at("Kal_SaveD"), 1.0f);
+        }
    }
 }

+void RandomizeColor(CosmeticOption& cosmeticOption) {
+    Color_RGBA8 newColor;
+    newColor.r = Random(0, 255);
+    newColor.g = Random(0, 255);
+    newColor.b = Random(0, 255);
+    newColor.a = 255;
+    // For alpha supported options, retain the last set alpha instead of overwriting
+    if (cosmeticOption.supportsAlpha) {
+        newColor.a = cosmeticOption.currentColor.w * 255;
+    }
+
+    cosmeticOption.currentColor.x = newColor.r / 255.0;
+    cosmeticOption.currentColor.y = newColor.g / 255.0;
+    cosmeticOption.currentColor.z = newColor.b / 255.0;
+    cosmeticOption.currentColor.w = newColor.a / 255.0;
+
+    CVarSetColor(cosmeticOption.cvar, newColor);
+    CVarSetInteger((cosmeticOption.rainbowCvar), 0);
+    CVarSetInteger((cosmeticOption.changedCvar), 1);
+    ApplySideEffects(cosmeticOption);
+}
+
 void ResetColor(CosmeticOption& cosmeticOption) {
    Color_RGBA8 defaultColor = {cosmeticOption.defaultColor.x, cosmeticOption.defaultColor.y, cosmeticOption.defaultColor.z, cosmeticOption.defaultColor.w};
    cosmeticOption.currentColor.x = defaultColor.r / 255.0;
@ -1692,7 +1572,7 @@ void ResetColor(CosmeticOption& cosmeticOption) {
    CVarClear((std::string(cosmeticOption.cvar) + ".A").c_str());
    CVarClear((std::string(cosmeticOption.cvar) + ".Type").c_str());

-    // This portion should match 1:1 the multiplied colors in `RandomizeColor()`
+    // This portion should match 1:1 the multiplied colors in `ApplySideEffect()`
    if (cosmeticOption.label == "Bow Body") {
        ResetColor(cosmeticOptions.at("Equipment_BowTips"));
        ResetColor(cosmeticOptions.at("Equipment_BowHandle"));
@ -1708,6 +1588,30 @@ void ResetColor(CosmeticOption& cosmeticOption) {
        ResetColor(cosmeticOptions.at("SpinAttack_Level1Primary"));
    } else if (cosmeticOption.label == "Level 2 Secondary") {
        ResetColor(cosmeticOptions.at("SpinAttack_Level2Primary"));
+    } else if (cosmeticOption.label == "Item Select Color") {
+        ResetColor(cosmeticOptions.at("Kal_ItemSelB"));
+        ResetColor(cosmeticOptions.at("Kal_ItemSelC"));
+        ResetColor(cosmeticOptions.at("Kal_ItemSelD"));
+    } else if (cosmeticOption.label == "Equip Select Color") {
+        ResetColor(cosmeticOptions.at("Kal_EquipSelB"));
+        ResetColor(cosmeticOptions.at("Kal_EquipSelC"));
+        ResetColor(cosmeticOptions.at("Kal_EquipSelD"));
+    } else if (cosmeticOption.label == "Map Dungeon Color") {
+        ResetColor(cosmeticOptions.at("Kal_MapSelDunB"));
+        ResetColor(cosmeticOptions.at("Kal_MapSelDunC"));
+        ResetColor(cosmeticOptions.at("Kal_MapSelDunD"));
+    } else if (cosmeticOption.label == "Quest Status Color") {
+        ResetColor(cosmeticOptions.at("Kal_QuestStatusB"));
+        ResetColor(cosmeticOptions.at("Kal_QuestStatusC"));
+        ResetColor(cosmeticOptions.at("Kal_QuestStatusD"));
+    } else if (cosmeticOption.label == "Map Color") {
+        ResetColor(cosmeticOptions.at("Kal_MapSelectB"));
+        ResetColor(cosmeticOptions.at("Kal_MapSelectC"));
+        ResetColor(cosmeticOptions.at("Kal_MapSelectD"));
+    } else if (cosmeticOption.label == "Save Color") {
+        ResetColor(cosmeticOptions.at("Kal_SaveB"));
+        ResetColor(cosmeticOptions.at("Kal_SaveC"));
+        ResetColor(cosmeticOptions.at("Kal_SaveD"));
    }
 }

@ -1728,6 +1632,7 @@ void DrawCosmeticRow(CosmeticOption& cosmeticOption) {
        CVarSetColor(cosmeticOption.cvar, color);
        CVarSetInteger((cosmeticOption.rainbowCvar), 0);
        CVarSetInteger((cosmeticOption.changedCvar), 1);
+        ApplySideEffects(cosmeticOption);
        ApplyOrResetCustomGfxPatches();
        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
    }
@ -1745,6 +1650,7 @@ void DrawCosmeticRow(CosmeticOption& cosmeticOption) {
        if (ImGui::Checkbox(("Rainbow##" + cosmeticOption.label).c_str(), &isRainbow)) {
            CVarSetInteger((cosmeticOption.rainbowCvar), isRainbow);
            CVarSetInteger((cosmeticOption.changedCvar), 1);
+            ApplySideEffects(cosmeticOption);
            ApplyOrResetCustomGfxPatches();
            LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
        }
@ -1801,7 +1707,7 @@ static const char* colorSchemes[2] = {
 };

 void CosmeticsEditorWindow::DrawElement() {
-    ImGui::SetNextWindowSize(ImVec2(480, 520), ImGuiCond_FirstUseEver);
+    ImGui::SetNextWindowSize(ImVec2(550, 520), ImGuiCond_FirstUseEver);
    if (!ImGui::Begin("Cosmetics Editor", &mIsVisible)) {
        ImGui::End();
        return;
--- a/soh/soh/Enhancements/debugger/MessageViewer.cpp
+++ b/soh/soh/Enhancements/debugger/MessageViewer.cpp
@ -0,0 +1,271 @@
+#include "MessageViewer.h"
+
+#include <soh/UIWidgets.hpp>
+#include <textures/message_static/message_static.h>
+
+#include "../custom-message/CustomMessageManager.h"
+#include "functions.h"
+#include "macros.h"
+#include "message_data_static.h"
+#include "variables.h"
+#include "soh/util.h"
+
+extern "C" u8 sMessageHasSetSfx;
+
+void MessageViewer::InitElement() {
+    CustomMessageManager::Instance->AddCustomMessageTable(TABLE_ID);
+    mTableIdBuf = static_cast<char*>(calloc(MAX_STRING_SIZE, sizeof(char)));
+    mTextIdBuf = static_cast<char*>(calloc(MAX_STRING_SIZE, sizeof(char)));
+    mCustomMessageBuf = static_cast<char*>(calloc(MAX_STRING_SIZE, sizeof(char)));
+}
+
+void MessageViewer::DrawElement() {
+    ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
+    if (!ImGui::Begin("Custom Message Debugger", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
+        ImGui::End();
+        return;
+    }
+    ImGui::Text("Table ID");
+    ImGui::SameLine();
+    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();
+    switch (mTextIdBase) {
+        case DECIMAL:
+            ImGui::InputText("##TextID", mTextIdBuf, MAX_STRING_SIZE, ImGuiInputTextFlags_CharsDecimal);
+            UIWidgets::InsertHelpHoverText("Decimal Text ID of the message to load. Decimal digits only (0-9).");
+            break;
+        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).");
+            break;
+    }
+    if (ImGui::RadioButton("Hexadecimal", &mTextIdBase, HEXADECIMAL)) {
+        memset(mTextIdBuf, 0, sizeof(char) * MAX_STRING_SIZE);
+    }
+    ImGui::SameLine();
+    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");
+    if (ImGui::Button("Display Message##ExistingMessage")) {
+        mDisplayExistingMessageClicked = true;
+    }
+    ImGui::Text("Custom Message");
+    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.");
+    ImGui::InputTextMultiline("##CustomMessage", mCustomMessageBuf, MAX_STRING_SIZE);
+    if (ImGui::Button("Display Message##CustomMessage")) {
+        mDisplayCustomMessageClicked = true;
+    }
+    ImGui::End();
+    // ReSharper restore CppDFAUnreachableCode
+}
+
+void MessageViewer::UpdateElement() {
+    if (mDisplayExistingMessageClicked) {
+        mTableId = std::string(mTableIdBuf);
+        switch (mTextIdBase) {
+            case DECIMAL:
+                mTextId = std::stoi(std::string(mTextIdBuf), nullptr, 10);
+                break;
+            case HEXADECIMAL:
+            default:
+                mTextId = std::stoi(std::string(mTextIdBuf), nullptr, 16);
+                break;
+        }
+        DisplayExistingMessage();
+        mDisplayExistingMessageClicked = false;
+    }
+    if (mDisplayCustomMessageClicked) {
+        mCustomMessageString = std::string(mCustomMessageBuf);
+        std::erase(mCustomMessageString, '\n');
+        DisplayCustomMessage();
+        mDisplayCustomMessageClicked = false;
+    }
+}
+
+void MessageViewer::DisplayExistingMessage() const {
+    MessageDebug_StartTextBox(mTableId.c_str(), mTextId, mLanguage);
+}
+
+void MessageViewer::DisplayCustomMessage() const {
+    MessageDebug_DisplayCustomMessage(mCustomMessageString.c_str());
+}
+
+extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
+extern "C" MessageTableEntry* sGerMessageEntryTablePtr;
+extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
+extern "C" MessageTableEntry* sStaffMessageEntryTablePtr;
+
+void FindMessage(PlayState* play, const uint16_t textId, const uint8_t language) {
+    const char* foundSeg;
+    const char* nextSeg;
+    MessageTableEntry* messageTableEntry = sNesMessageEntryTablePtr;
+    Font* font;
+    u16 bufferId = textId;
+    // Use the better owl message if better owl is enabled
+    if (CVarGetInteger("gBetterOwl", 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;
+
+    // If PAL languages are not present in the OTR file, default to English
+    if (messageTableEntry == nullptr)
+        messageTableEntry = sNesMessageEntryTablePtr;
+
+    const char* seg = messageTableEntry->segment;
+
+    while (messageTableEntry->textId != 0xFFFF) {
+        font = &play->msgCtx.font;
+
+        if (messageTableEntry->textId == bufferId) {
+            foundSeg = messageTableEntry->segment;
+            font->charTexBuf[0] = messageTableEntry->typePos;
+
+            nextSeg = messageTableEntry->segment;
+            font->msgOffset = reinterpret_cast<uintptr_t>(messageTableEntry->segment);
+            font->msgLength = messageTableEntry->msgSize;
+            return;
+        }
+        messageTableEntry++;
+    }
+
+    font = &play->msgCtx.font;
+    messageTableEntry = sNesMessageEntryTablePtr;
+
+    foundSeg = messageTableEntry->segment;
+    font->charTexBuf[0] = messageTableEntry->typePos;
+    messageTableEntry++;
+    nextSeg = messageTableEntry->segment;
+    font->msgOffset = foundSeg - seg;
+    font->msgLength = nextSeg - foundSeg;
+}
+
+static const char* msgStaticTbl[] =
+{
+    gDefaultMessageBackgroundTex,
+    gSignMessageBackgroundTex,
+    gNoteStaffMessageBackgroundTex,
+    gFadingMessageBackgroundTex,
+    gMessageContinueTriangleTex,
+    gMessageEndSquareTex,
+    gMessageArrowTex
+};
+
+void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t language) {
+    PlayState* play = gPlayState;
+    static int16_t messageStaticIndices[] = { 0, 1, 3, 2 };
+    const auto player = GET_PLAYER(gPlayState);
+    player->actor.flags |= ACTOR_FLAG_PLAYER_TALKED_TO;
+    MessageContext* msgCtx = &play->msgCtx;
+    msgCtx->ocarinaAction = 0xFFFF;
+    Font* font = &msgCtx->font;
+    sMessageHasSetSfx = 0;
+    for (u32 i = 0; i < FONT_CHAR_TEX_SIZE * 120; i += FONT_CHAR_TEX_SIZE) {
+        if (&font->charTexBuf[i] != nullptr) {
+            gSPInvalidateTexCache(play->state.gfxCtx->polyOpa.p++, reinterpret_cast<uintptr_t>(&font->charTexBuf[i]));
+        }
+    }
+    R_TEXT_CHAR_SCALE = 75;
+    R_TEXT_LINE_SPACING = 12;
+    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);
+    } 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) {
+            case LANGUAGE_FRA:
+                font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetFrench(), maxBufferSize);
+                break;
+            case LANGUAGE_GER:
+                font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetGerman(), maxBufferSize);
+                break;
+            case LANGUAGE_ENG:
+            default:
+                font->msgLength = SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetEnglish(), maxBufferSize);
+                break;
+        }
+        msgCtx->msgLength = static_cast<int32_t>(font->msgLength);
+    }
+    msgCtx->textBoxProperties = font->charTexBuf[0];
+    msgCtx->textBoxType = msgCtx->textBoxProperties >> 4;
+    msgCtx->textBoxPos = msgCtx->textBoxProperties & 0xF;
+    const int16_t textBoxType = msgCtx->textBoxType;
+    // "Text Box Type"
+    osSyncPrintf("吹き出し種類＝%d\n", msgCtx->textBoxType);
+    if (textBoxType < TEXTBOX_TYPE_NONE_BOTTOM) {
+        const char* textureName = msgStaticTbl[messageStaticIndices[textBoxType]];
+        memcpy(msgCtx->textboxSegment, textureName, strlen(textureName) + 1);
+        if (textBoxType == TEXTBOX_TYPE_BLACK) {
+            msgCtx->textboxColorRed = 0;
+            msgCtx->textboxColorGreen = 0;
+            msgCtx->textboxColorBlue = 0;
+        } else if (textBoxType == TEXTBOX_TYPE_WOODEN) {
+            msgCtx->textboxColorRed = 70;
+            msgCtx->textboxColorGreen = 50;
+            msgCtx->textboxColorBlue = 30;
+        } else if (textBoxType == TEXTBOX_TYPE_BLUE) {
+            msgCtx->textboxColorRed = 0;
+            msgCtx->textboxColorGreen = 10;
+            msgCtx->textboxColorBlue = 50;
+        } else {
+            msgCtx->textboxColorRed = 255;
+            msgCtx->textboxColorGreen = 0;
+            msgCtx->textboxColorBlue = 0;
+        }
+        if (textBoxType == TEXTBOX_TYPE_WOODEN) {
+            msgCtx->textboxColorAlphaTarget = 230;
+        } else if (textBoxType == TEXTBOX_TYPE_OCARINA) {
+            msgCtx->textboxColorAlphaTarget = 180;
+        } else {
+            msgCtx->textboxColorAlphaTarget = 170;
+        }
+        msgCtx->textboxColorAlphaCurrent = 0;
+    }
+    msgCtx->choiceNum = msgCtx->textUnskippable = msgCtx->textboxEndType = 0;
+    msgCtx->msgBufPos = msgCtx->unk_E3D0 = msgCtx->textDrawPos = 0;
+    msgCtx->talkActor = &player->actor;
+    msgCtx->msgMode = MSGMODE_TEXT_START;
+    msgCtx->stateTimer = 0;
+    msgCtx->textDelayTimer = 0;
+    msgCtx->ocarinaMode = OCARINA_MODE_00;
+}
+
+void MessageDebug_DisplayCustomMessage(const char* customMessage) {
+    CustomMessageManager::Instance->ClearMessageTable(MessageViewer::TABLE_ID);
+    CustomMessageManager::Instance->CreateMessage(MessageViewer::TABLE_ID, 0,
+        CustomMessage(customMessage, customMessage, customMessage));
+    MessageDebug_StartTextBox(MessageViewer::TABLE_ID, 0, 0);
+}
+
+
--- a/soh/soh/Enhancements/debugger/MessageViewer.h
+++ b/soh/soh/Enhancements/debugger/MessageViewer.h
@ -0,0 +1,62 @@
+#ifndef CUSTOMMESSAGEDEBUGGER_H
+#define CUSTOMMESSAGEDEBUGGER_H
+#include "z64.h"
+
+#ifdef __cplusplus
+#include "GuiWindow.h"
+#include <array>
+extern "C" {
+#endif
+/**
+ * \brief Pulls a message from the specified message table and kicks off the process of displaying that message
+ * in a text box on screen.
+ * \param tableId the tableId string for the table we want to pull from. Empty string for authentic/vanilla messages
+ * \param textId The textId corresponding to the message to display. Putting in a textId that doesn't exist will
+ * probably result in a crash.
+ * \param language The Language to display on the screen.
+ */
+void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t language);
+
+/**
+ * \brief
+ * \param customMessage A string using Custom Message Syntax.
+ */
+void MessageDebug_DisplayCustomMessage(const char* customMessage);
+#ifdef __cplusplus
+}
+
+
+class MessageViewer : public LUS::GuiWindow {
+public:
+    static inline const char* TABLE_ID = "MessageViewer";
+    using GuiWindow::GuiWindow;
+
+    void InitElement() override;
+    void DrawElement() override;
+    void UpdateElement() override;
+
+    virtual ~MessageViewer() = default;
+
+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;
+    std::string mTableId;
+    char* mTextIdBuf;
+    uint16_t mTextId;
+    int mTextIdBase = HEXADECIMAL;
+    size_t mLanguage = LANGUAGE_ENG;
+    char* mCustomMessageBuf;
+    std::string mCustomMessageString;
+    bool mDisplayExistingMessageClicked = false;
+    bool mDisplayCustomMessageClicked = false;
+};
+
+
+#endif //__cplusplus
+#endif //CUSTOMMESSAGEDEBUGGER_H
--- a/soh/soh/Enhancements/debugger/dlViewer.cpp
+++ b/soh/soh/Enhancements/debugger/dlViewer.cpp
@ -9,7 +9,6 @@
 #include <bit>
 #include <map>
 #include <string>
-#include <regex>
 #include <libultraship/libultraship.h>
 #include "dlViewer.h"

@ -66,16 +65,14 @@ std::map<int, std::string> cmdMap = {
 };

 void PerformDisplayListSearch() {
-    auto result = LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->ListFiles("*" + std::string(searchString) + "*DL*");
-
-    std::regex dlSearch(".*((DL)|(DL_.*))$");
+    auto result = LUS::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->ListFiles("*" + std::string(searchString) + "*DL*");

    displayListSearchResults.clear();

    // Filter the file results even further as StormLib can only use wildcard searching
    for (size_t i = 0; i < result->size(); i++) {
        std::string val = result->at(i);
-        if (std::regex_search(val.c_str(), dlSearch)) {
+        if (val.ends_with("DL") || val.find("DL_") != std::string::npos) {
            displayListSearchResults.push_back(val);
        }
    }
@ -99,8 +96,6 @@ void DLViewerWindow::DrawElement() {
        return;
    }

-    ImGui::Text("%d", searchDebounceFrames);
-
    // Debounce the search field as listing otr files is expensive
    if (ImGui::InputText("Search Display Lists", searchString, ARRAY_COUNT(searchString))) {
        doSearch = true;
@ -134,7 +129,7 @@ void DLViewerWindow::DrawElement() {
    try {
        auto res = std::static_pointer_cast<LUS::DisplayList>(LUS::Context::GetInstance()->GetResourceManager()->LoadResource(activeDisplayList));

-        if (res->GetInitData()->Type != LUS::ResourceType::DisplayList) {
+        if (res->GetInitData()->Type != static_cast<uint32_t>(LUS::ResourceType::DisplayList)) {
            ImGui::Text("Resource type is not a Display List. Please choose another.");
            ImGui::End();
            return;
--- a/soh/soh/Enhancements/enhancementTypes.h
+++ b/soh/soh/Enhancements/enhancementTypes.h
@ -78,4 +78,10 @@ typedef enum {
    DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE,
 } DekuStickType;

+typedef enum {
+    SWORD_TOGGLE_NONE,
+    SWORD_TOGGLE_CHILD,
+    SWORD_TOGGLE_BOTH_AGES,
+} SwordToggleMode;
+
 #endif
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
@ -37,12 +37,19 @@ GameInteractionEffectQueryResult GameInteractor::RemoveEffect(RemovableGameInter

 // MARK: - Helpers

-bool GameInteractor::IsSaveLoaded() {
+bool GameInteractor::IsSaveLoaded(bool allowDbgSave) {
    Player* player;
    if (gPlayState != NULL) {
        player = GET_PLAYER(gPlayState);
    }
-    return (gPlayState == NULL || player == NULL || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2) ? false : true;
+
+    // Checking for normal game mode prevents debug saves from reporting true on title screen
+    if (gPlayState == NULL || player == NULL || gSaveContext.gameMode != GAMEMODE_NORMAL) {
+        return false;
+    }
+
+    // Valid save file or debug save
+    return (gSaveContext.fileNum >= 0 && gSaveContext.fileNum <= 2) || (allowDbgSave && gSaveContext.fileNum == 0xFF);
 }

 bool GameInteractor::IsGameplayPaused() {
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@ -163,11 +163,30 @@ public:
    static GameInteractionEffectQueryResult RemoveEffect(RemovableGameInteractionEffect* effect);

    // Game Hooks
-    template <typename H> struct RegisteredGameHooks { inline static std::vector<typename H::fn> functions; };
-    template <typename H> void RegisterGameHook(typename H::fn h) { RegisteredGameHooks<H>::functions.push_back(h); }
+    uint32_t nextHookId = 1;
+    template <typename H> struct RegisteredGameHooks { inline static std::unordered_map<uint32_t, typename H::fn> functions; };
+    template <typename H> struct HooksToUnregister { inline static std::vector<uint32_t> hooks; };
+    template <typename H> uint32_t RegisterGameHook(typename H::fn h) {
+        // 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;
+        while (RegisteredGameHooks<H>::functions.find(this->nextHookId) != RegisteredGameHooks<H>::functions.end()) {
+            this->nextHookId++;
+        }
+
+        RegisteredGameHooks<H>::functions[this->nextHookId] = h;
+        return this->nextHookId++;
+    }
+    template <typename H> void UnregisterGameHook(uint32_t id) {
+        HooksToUnregister<H>::hooks.push_back(id);
+    }
+
    template <typename H, typename... Args> void ExecuteHooks(Args&&... args) {
-        for (auto& fn : RegisteredGameHooks<H>::functions) {
-            fn(std::forward<Args>(args)...);
+        for (auto& hookId : HooksToUnregister<H>::hooks) {
+            RegisteredGameHooks<H>::functions.erase(hookId);
+        }
+        HooksToUnregister<H>::hooks.clear();
+        for (auto& hook : RegisteredGameHooks<H>::functions) {
+            hook.second(std::forward<Args>(args)...);
        }
    }

@ -221,9 +240,10 @@ public:

    DEFINE_HOOK(OnFileDropped, void(std::string filePath));
    DEFINE_HOOK(OnAssetAltChange, void());
+    DEFINE_HOOK(OnKaleidoUpdate, void());

    // Helpers
-    static bool IsSaveLoaded();
+    static bool IsSaveLoaded(bool allowDbgSave = false);
    static bool IsGameplayPaused();
    static bool CanSpawnActor();
    static bool CanAddOrTakeAmmo(int16_t amount, int16_t item);
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@ -187,3 +187,9 @@ void GameInteractor_ExecuteOnSetGameLanguage() {
 void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)) {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnAssetAltChange>(fn);
 }
+
+//MARK: Pause Menu
+
+void GameInteractor_ExecuteOnKaleidoUpdate() {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnKaleidoUpdate>();
+}
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@ -60,6 +60,9 @@ void GameInteractor_ExecuteOnSetGameLanguage();
 // MARK: - System
 void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void));

+//Mark: - Pause Menu
+void GameInteractor_ExecuteOnKaleidoUpdate();
+
 #ifdef __cplusplus
 }
 #endif
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
@ -111,9 +111,9 @@ void GameInteractor::RawAction::FreezePlayer() {
 void GameInteractor::RawAction::BurnPlayer() {
    Player* player = GET_PLAYER(gPlayState);
    for (int i = 0; i < 18; i++) {
-        player->flameTimers[i] = Rand_S16Offset(0, 200);
+        player->bodyFlameTimers[i] = Rand_S16Offset(0, 200);
    }
-    player->isBurning = true;
+    player->bodyIsBurning = true;
    func_80837C0C(gPlayState, player, 0, 0, 0, 0, 0);
 }

--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@ -10,6 +10,7 @@
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/nametag.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"
@ -25,6 +26,7 @@
 #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h"
 #include "src/overlays/actors/ovl_En_Xc/z_en_xc.h"
 #include "src/overlays//actors/ovl_Fishing/z_fishing.h"
+#include "src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h"
 #include "objects/object_link_boy/object_link_boy.h"
 #include "objects/object_link_child/object_link_child.h"

@ -35,6 +37,7 @@ extern "C" {
 #include "functions.h"
 #include "variables.h"
 #include "functions.h"
+#include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
 void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);

@ -65,7 +68,7 @@ void ReloadSceneTogglingLinkAge() {

 void RegisterInfiniteMoney() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;
        if (CVarGetInteger("gInfiniteMoney", 0) != 0 && (!IS_RANDO || Flags_GetRandomizerInf(RAND_INF_HAS_WALLET))) {
            if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) {
                gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
@ -76,7 +79,7 @@ void RegisterInfiniteMoney() {

 void RegisterInfiniteHealth() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;
        if (CVarGetInteger("gInfiniteHealth", 0) != 0) {
            if (gSaveContext.health < gSaveContext.healthCapacity) {
                gSaveContext.health = gSaveContext.healthCapacity;
@ -87,7 +90,7 @@ void RegisterInfiniteHealth() {

 void RegisterInfiniteAmmo() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;
        if (CVarGetInteger("gInfiniteAmmo", 0) != 0) {
            // Deku Sticks
            if (AMMO(ITEM_STICK) < CUR_CAPACITY(UPG_STICKS)) {
@ -124,7 +127,7 @@ void RegisterInfiniteAmmo() {

 void RegisterInfiniteMagic() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;
        if (CVarGetInteger("gInfiniteMagic", 0) != 0) {
            if (gSaveContext.isMagicAcquired && gSaveContext.magic != (gSaveContext.isDoubleMagicAcquired + 1) * 0x30) {
                gSaveContext.magic = (gSaveContext.isDoubleMagicAcquired + 1) * 0x30;
@ -135,7 +138,7 @@ void RegisterInfiniteMagic() {

 void RegisterInfiniteNayrusLove() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;
        if (CVarGetInteger("gInfiniteNayru", 0) != 0) {
            gSaveContext.nayrusLoveTimer = 0x44B;
        }
@ -144,7 +147,7 @@ void RegisterInfiniteNayrusLove() {

 void RegisterMoonJumpOnL() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;
        
        if (CVarGetInteger("gMoonJumpOnL", 0) != 0) {
            Player* player = GET_PLAYER(gPlayState);
@ -159,7 +162,7 @@ void RegisterMoonJumpOnL() {

 void RegisterInfiniteISG() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;

        if (CVarGetInteger("gEzISG", 0) != 0) {
            Player* player = GET_PLAYER(gPlayState);
@ -171,7 +174,7 @@ void RegisterInfiniteISG() {
 //Permanent quick put away (QPA) glitched damage value
 void RegisterEzQPA() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;

        if (CVarGetInteger("gEzQPA", 0) != 0) {
            Player* player = GET_PLAYER(gPlayState);
@ -183,7 +186,7 @@ void RegisterEzQPA() {

 void RegisterUnrestrictedItems() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;

        if (CVarGetInteger("gNoRestrictItems", 0) != 0) {
            u8 sunsBackup = gPlayState->interfaceCtx.restrictions.sunsSong;
@ -211,11 +214,14 @@ void RegisterFreezeTime() {
 /// Switches Link's age and respawns him at the last entrance he entered.
 void RegisterSwitchAge() {
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
-        if (!GameInteractor::IsSaveLoaded()) {
+        static bool warped = false;
+
+        if (!GameInteractor::IsSaveLoaded(true)) {
            CVarClear("gSwitchAge");
+            warped = false;
            return;
        }
-        static bool warped = false;
+
        static Vec3f playerPos;
        static int16_t playerYaw;
        static RoomContext* roomCtx;
@ -249,7 +255,7 @@ void RegisterSwitchAge() {
 void RegisterOcarinaTimeTravel() {

    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnOcarinaSongAction>([]() {
-        if (!GameInteractor::IsSaveLoaded()) {
+        if (!GameInteractor::IsSaveLoaded(true)) {
            CVarClear("gTimeTravel");
            return;
        }
@ -520,70 +526,93 @@ void RegisterDaytimeGoldSkultullas() {
    });
 }

-void RegisterHyperBosses() {
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorUpdate>([](void* refActor) {
-        // Run the update function a second time to make bosses move and act twice as fast.
+bool IsHyperBossesActive() {
+    return CVarGetInteger("gHyperBosses", 0) ||
+           (IS_BOSS_RUSH && gSaveContext.bossRushOptions[BR_OPTIONS_HYPERBOSSES] == BR_CHOICE_HYPERBOSSES_YES);
+}

-        Player* player = GET_PLAYER(gPlayState);
-        Actor* actor = static_cast<Actor*>(refActor);
+void UpdateHyperBossesState() {
+    static uint32_t actorUpdateHookId = 0;
+    if (actorUpdateHookId != 0) {
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(actorUpdateHookId);
+        actorUpdateHookId = 0;
+    }

-        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
+    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.

-        uint8_t hyperBossesActive =
-            CVarGetInteger("gHyperBosses", 0) ||
-            (IS_BOSS_RUSH &&
-             gSaveContext.bossRushOptions[BR_OPTIONS_HYPERBOSSES] == BR_CHOICE_HYPERBOSSES_YES);
+            Player* player = GET_PLAYER(gPlayState);
+            Actor* actor = static_cast<Actor*>(refActor);

-        // Don't apply during cutscenes because it causes weird behaviour and/or crashes on some bosses.
-        if (hyperBossesActive && 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;
+            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;
+                        }
                    }
+                } else {
+                    GameInteractor::RawAction::UpdateActor(actor);
                }
-            } else {
-                GameInteractor::RawAction::UpdateActor(actor);
            }
-        }
+        });
+    }
+}
+
+void RegisterHyperBosses() {
+    UpdateHyperBossesState();
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int16_t fileNum) {
+        UpdateHyperBossesState();
    });
 }

-void RegisterHyperEnemies() {
-    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.
+void UpdateHyperEnemiesState() {
+    static uint32_t actorUpdateHookId = 0;
+    if (actorUpdateHookId != 0) {
+        GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(actorUpdateHookId);
+        actorUpdateHookId = 0;
+    }

-        Player* player = GET_PLAYER(gPlayState);
-        Actor* actor = static_cast<Actor*>(refActor);
+    if (CVarGetInteger("gHyperEnemies", 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.

-        // 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;
+            Player* player = GET_PLAYER(gPlayState);
+            Actor* actor = static_cast<Actor*>(refActor);

-        // Don't apply during cutscenes because it causes weird behaviour and/or crashes on some cutscenes.
-        if (CVarGetInteger("gHyperEnemies", 0) && isEnemy && !isExcludedEnemy &&
-            !Player_InBlockingCsMode(gPlayState, player)) {
-            GameInteractor::RawAction::UpdateActor(actor);
-        }
-    });
+            // 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("gHyperEnemies", 0) && isEnemy && !isExcludedEnemy &&
+                !Player_InBlockingCsMode(gPlayState, player)) {
+                GameInteractor::RawAction::UpdateActor(actor);
+            }
+        });
+    }
 }

 void RegisterBonkDamage() {
@ -1282,6 +1311,34 @@ void RegisterRandomizedEnemySizes() {
    });
 }

+void RegisterOpenAllHours() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
+        Actor* actor = static_cast<Actor*>(refActor);
+
+        if (CVarGetInteger("gEnhancements.OpenAllHours", 0) && (actor->id == ACTOR_EN_DOOR)) {
+            switch (actor->params) {
+                case 4753: // Night Market Bazaar
+                case 1678: // Night Potion Shop
+                case 2689: // Day Bombchu Shop
+                case 2703: // Night Slingshot Game
+                case 653:  // Day Chest Game
+                case 6801: // Night Kak Bazaar
+                case 7822: // Night Kak Potion Shop
+                case 4751: // Night Kak Archery Game
+                case 3728: // Night Mask Shop
+                {
+                    actor->params = (actor->params & 0xFC00) | (DOOR_SCENEEXIT << 7) | 0x3F;
+                    EnDoor* enDoor = static_cast<EnDoor*>(refActor);
+                    EnDoor_SetupType(enDoor, gPlayState);
+                    break;
+                }
+                default:
+                    break;
+            }
+        }
+    });
+}
+
 void PatchToTMedallions() {
    // TODO: Refactor the DemoEffect_UpdateJewelAdult and DemoEffect_UpdateJewelChild from z_demo_effect
    // effects to take effect in there
@ -1364,6 +1421,40 @@ void RegisterToTMedallions() {
    });
 }

+
+void RegisterFloorSwitchesHook() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
+        Actor* actor = static_cast<Actor*>(refActor);
+        if (actor->id != ACTOR_OBJ_SWITCH || !CVarGetInteger("gEnhancements.FixFloorSwitches", 0)) {
+            return;
+        }
+
+        ObjSwitch* switchActor = reinterpret_cast<ObjSwitch*>(actor);
+        s32 type = (switchActor->dyna.actor.params & 7);
+
+        if (switchActor->dyna.actor.params == 0x1200 || switchActor->dyna.actor.params == 0x3A00) {
+            switchActor->dyna.actor.world.pos.y -= 1;
+        }
+    });
+}
+
+void RegisterPauseMenuHooks() {
+    static bool pauseWarpHooksRegistered = false;
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([&]() {
+        if (!GameInteractor::IsSaveLoaded() || !CVarGetInteger("gPauseWarp", 0)) {
+            pauseWarpHooksRegistered = false;
+            return;
+        }
+        if (!pauseWarpHooksRegistered) {
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoUpdate>([]() {PauseWarp_HandleSelection();});
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
+                    PauseWarp_Execute();
+            });
+            pauseWarpHooksRegistered = true;
+        }
+    });
+}
+
 //from z_player.c
 typedef struct {
    /* 0x00 */ Vec3f pos;
@ -1635,6 +1726,26 @@ void RegisterInfiniteUpgrades() {
    });
 }

+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("gRandoEnhancement.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 InitMods() {
    RegisterTTS();
    RegisterInfiniteMoney();
@ -1656,7 +1767,7 @@ void InitMods() {
    RegisterPermanentHeartLoss();
    RegisterDeleteFileOnDeath();
    RegisterHyperBosses();
-    RegisterHyperEnemies();
+    UpdateHyperEnemiesState();
    RegisterBonkDamage();
    RegisterMenuPathFix();
    RegisterMirrorModeHandler();
@ -1668,12 +1779,16 @@ void InitMods() {
    RegisterRandomizerSheikSpawn();
    RegisterBossSouls();
    RegisterRandomizedEnemySizes();
+    RegisterOpenAllHours();
    RegisterToTMedallions();
    RegisterNoSwim();
    RegisterNoWallet();
    RegisterFishsanity();
    RegisterInfiniteUpgrades();
+    RegisterRandomizerCompasses();
    NameTag_RegisterHooks();
+    RegisterFloorSwitchesHook();
    RegisterPatchHandHandler();
    RegisterHurtContainerModeHandler();
+    RegisterPauseMenuHooks();
 }
--- a/soh/soh/Enhancements/mods.h
+++ b/soh/soh/Enhancements/mods.h
@ -11,7 +11,10 @@ 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(); 

--- a/soh/soh/Enhancements/pausewarp.c
+++ b/soh/soh/Enhancements/pausewarp.c
@ -0,0 +1,92 @@
+#include "custom-message/CustomMessageTypes.h"
+#include "global.h"
+#include "z64.h"
+#include "game-interactor/GameInteractor.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 ocarinaSongMap[] = {
+    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_2, // Minuet
+    ENTR_DEATH_MOUNTAIN_CRATER_4, // Bolero
+    ENTR_LAKE_HYLIA_8, // Serenade
+    ENTR_DESERT_COLOSSUS_5, // Requiem
+    ENTR_GRAVEYARD_7, // Nocturne
+    ENTR_TEMPLE_OF_TIME_7 // 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 bool isWarpActive = false; 
+
+void PauseWarp_Execute() {
+    if (!isWarpActive || gPlayState->msgCtx.msgMode != MSGMODE_NONE) {
+        return;
+    }
+    isWarpActive = false; 
+    GET_PLAYER(gPlayState)->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
+    if (gPlayState->msgCtx.choiceIndex != 0) {
+        return;
+    }
+    if (IS_RANDO) {
+        Entrance_SetWarpSongEntrance();
+        return;
+    }
+    gPlayState->transitionTrigger = TRANS_TRIGGER_START;
+    gPlayState->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
+    for (int i = 0; i < ARRAY_COUNT(ocarinaSongMap); i++) {
+        if (gPlayState->msgCtx.lastPlayedSong == ocarinaSongMap[i]) {
+            gPlayState->nextEntranceIndex = entranceIndexMap[i];
+            return;
+        }
+    }
+    gPlayState->transitionTrigger = TRANS_TRIGGER_OFF;
+}
+
+void ActivateWarp(PauseContext* pauseCtx, int song) {
+    Audio_OcaSetInstrument(0);
+    Interface_SetDoAction(gPlayState, DO_ACTION_NONE);
+    pauseCtx->state = 0x12;
+    WREG(2) = -6240;
+    func_800F64E0(0);
+    pauseCtx->unk_1E4 = 0;
+    int idx = song - QUEST_SONG_MINUET;
+    gPlayState->msgCtx.lastPlayedSong = ocarinaSongMap[idx];
+    Audio_SetSoundBanksMute(0x20);
+    Audio_PlayFanfare(songAudioMap[idx]);
+    Message_StartTextbox(gPlayState, songMessageMap[idx], NULL);
+    GET_PLAYER(gPlayState)->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
+    isWarpActive = true;
+}
+
+void PauseWarp_HandleSelection() {
+    if (gSaveContext.inventory.items[SLOT_OCARINA] != ITEM_NONE) {
+        int aButtonPressed = CHECK_BTN_ALL(gPlayState->state.input->press.button, BTN_A);
+        int song = gPlayState->pauseCtx.cursorPoint[PAUSE_QUEST];
+        if (aButtonPressed && CHECK_QUEST_ITEM(song) && song >= QUEST_SONG_MINUET && song <= QUEST_SONG_PRELUDE) {
+            ActivateWarp(&gPlayState->pauseCtx, song);
+        }
+    }
+}
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@ -262,6 +262,24 @@ const std::vector<const char*> enhancementsCvars = {
    "gAddTraps.Tele",
    "gAddTraps.Void",
    "gToTMedallionsColors", 
+    "gCuccoStayDurationMultiplier",
+    "gDeleteFileOnDeath",
+    "gEnemySizeScalesHealth",
+    "gEnhancements.BetterAmmoRendering",
+    "gEnhancements.EquimentAlwaysVisible",
+    "gEnhancements.FixDaruniaDanceSpeed",
+    "gEnhancements.OpenAllHours",
+    "gEnhancements.ResetNaviTimer",
+    "gEnhancements.ScaleAdultEquimentAsChild",
+    "gEnhancements.LeeverSpawnRate",
+    "gEnhancements.SwordToggle",
+    "gEnhancements.FixFloorSwitches", 
+    "gFixZoraHintDialogue",
+    "gHurtContainer",
+    "gPauseWarp",
+    "gPermanentHeartLoss",
+    "gRemoveExplosiveLimit",
+    "gToggleStrength",
 };

 const std::vector<const char*> cheatCvars = {
@ -314,6 +332,7 @@ const std::vector<const char*> cheatCvars = {
    "gSwitchAge",
    "gSwitchTimeline",
    "gNoRedeadFreeze",
+    "gNoKeeseGuayTarget",
    "gBombTimerMultiplier",
    "gNoFishDespawn",
    "gNoBugsDespawn",
@ -333,6 +352,7 @@ const std::vector<const char*> cheatCvars = {
    "gCosmetics.Link_HeadScale.Value",
    "gCosmetics.Link_SwordScale.Changed",
    "gCosmetics.Link_SwordScale.Value",
+    "gEnhancements.RememberMapToggleState",
 };

 const std::vector<const char*> randomizerCvars = {
@ -532,6 +552,8 @@ const std::vector<PresetEntry> vanillaPlusPresetEntries = {
    PRESET_ENTRY_S32("gNaviTextFix", 1),
    // Extend Silver Rupee Jingle
    PRESET_ENTRY_S32("gSilverRupeeJingleExtend", 1),
+    // Fix some Floor Switches
+    PRESET_ENTRY_S32("gEnhancements.FixFloorSwitches", 1),

    // Red Ganon blood
    PRESET_ENTRY_S32("gRedGanonBlood", 1),
@ -603,6 +625,8 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
    PRESET_ENTRY_S32("gSilverRupeeJingleExtend", 1),
    // Fix enemies not spawning on ground over water
    PRESET_ENTRY_S32("gEnemySpawnsOverWaterboxes", 1),
+    // Fix some Floor Switches
+    PRESET_ENTRY_S32("gEnhancements.FixFloorSwitches", 1),

    // Red Ganon blood
    PRESET_ENTRY_S32("gRedGanonBlood", 1),
@ -725,6 +749,8 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
    PRESET_ENTRY_S32("gNaviTextFix", 1),
    // Extend Silver Rupee Jingle
    PRESET_ENTRY_S32("gSilverRupeeJingleExtend", 1),
+    // Fix some Floor Switches
+    PRESET_ENTRY_S32("gEnhancements.FixFloorSwitches", 1),

    // Red Ganon blood
    PRESET_ENTRY_S32("gRedGanonBlood", 1),
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@ -324,7 +324,12 @@ std::vector<RandomizerCheck> GetAccessibleLocations(const std::vector<Randomizer
        }

        // Add shuffled entrances to the entrance playthrough
-        if (mode == SearchMode::GeneratePlaythrough && exit.IsShuffled() && !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
+        // Include bluewarps when unshuffled but dungeon or boss shuffle is on
+        if (mode == SearchMode::GeneratePlaythrough &&
+            (exit.IsShuffled() ||
+             (exit.GetType() == Rando::EntranceType::BlueWarp &&
+              (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES)))) &&
+            !exit.IsAddedToPool() && !ctx->GetEntranceShuffler()->HasNoRandomEntrances()) {
          entranceSphere.push_back(&exit);
          exit.AddToPool();
          // Don't list a two-way coupled entrance from both directions
@ -888,7 +893,7 @@ static void RandomizeDungeonItems() {
  std::vector<RandomizerGet> overworldItems;

  for (auto dungeon : ctx->GetDungeons()->GetDungeonList()) {
-    if (ctx->GetOption(RSK_KEYSANITY).Is(RO_DUNGEON_ITEM_LOC_OWN_DUNGEON)) {
+    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)) {
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.cpp
@ -501,8 +501,8 @@ Area* AreaTable(const RandomizerRegion areaKey) {
 //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 area : Areas::GetAllAreas()) {
-    for (auto& exit: AreaTable(area)->exits) {
+  for (RandomizerRegion area : Areas::GetAllAreas()) {
+    for (auto& exit : AreaTable(area)->exits) {
      if ((exit.GetType() == type || type == Rando::EntranceType::All) && (exit.IsPrimary() || !onlyPrimary) && exit.GetType() != Rando::EntranceType::None) {
        entrancesToShuffle.push_back(&exit);
      }
@ -510,3 +510,16 @@ 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 area : Areas::GetAllAreas()) {
+    for (auto& exit : AreaTable(area)->exits) {
+      if (exit.GetName() == name) {
+        return &exit;
+      }
+    }
+  }
+
+  return nullptr;
+}
--- a/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access.hpp
@ -251,6 +251,7 @@ namespace Areas {
 void  AreaTable_Init();
 Area* AreaTable(const RandomizerRegion areaKey);
 std::vector<Rando::Entrance*> GetShuffleableEntrances(Rando::EntranceType type, bool onlyPrimary = true);
+Rando::Entrance* GetEntrance(const std::string name);

 // Overworld
 void AreaTable_Init_LostWoods();
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp
@ -270,5 +270,6 @@ void AreaTable_Init_DekuTree() {
             {
                 // Exits
                 Entrance(RR_DEKU_TREE_BOSS_ENTRYWAY, { [] { return true; } }),
+                 Entrance(RR_KF_OUTSIDE_DEKU_TREE, { [] { return logic->DekuTreeClear; } }),
             });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp
@ -307,5 +307,6 @@ void AreaTable_Init_DodongosCavern() {
             {
                 // Exits
                 Entrance(RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, { [] { return true; } }),
+                 Entrance(RR_DEATH_MOUNTAIN_TRAIL, { [] { return logic->DodongosCavernClear; } }),
             });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp
@ -418,5 +418,6 @@ void AreaTable_Init_FireTemple() {
             {
                 // Exits
                 Entrance(RR_FIRE_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+                 Entrance(RR_DMC_CENTRAL_LOCAL, { [] { return logic->FireTempleClear; } }),
             });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp
@ -170,7 +170,7 @@ void AreaTable_Init_ForestTemple() {
                  Entrance(RR_FOREST_TEMPLE_WEST_CORRIDOR,            {[]{return true;}}),
                  Entrance(RR_FOREST_TEMPLE_NW_OUTDOORS_UPPER,        {[]{return logic->CanUse(RG_HOVER_BOOTS) || (randoCtx->GetTrickOption(RT_FOREST_OUTSIDE_BACKDOOR) && logic->CanJumpslash && logic->GoronBracelet);}}),
                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED,      {[]{return logic->IsAdult && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
-                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
+                  Entrance(RR_FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return logic->IsAdult && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_FAIRY_SLINGSHOT)) && logic->GoronBracelet && logic->SmallKeys(RR_FOREST_TEMPLE, 2);}}),
  });

  areaTable[RR_FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", RA_FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
@ -431,5 +431,6 @@ void AreaTable_Init_ForestTemple() {
        {
            // Exits
            Entrance(RR_FOREST_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+            Entrance(RR_SACRED_FOREST_MEADOW, { [] { return logic->ForestTempleClear; } }),
        });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp
@ -177,17 +177,17 @@ void AreaTable_Init_JabuJabusBelly() {
                  //Locations
                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_LOWER_CHEST,      {[]{return true;}}),
                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST,      {[]{return (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_HOOKSHOT))) || ChildCanAccess(RR_JABU_JABUS_BELLY_MQ_BOSS_AREA);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COMPASS_CHEST,                {[]{return (logic->IsChild || logic->CanDive || logic->CanUse(RG_IRON_BOOTS) || randoCtx->GetTrickOption(RT_JABU_ALCOVE_JUMP_DIVE)) && (logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT) || logic->HasBombchus || (randoCtx->GetTrickOption(RT_JABU_MQ_RANG_JUMP) && logic->CanUse(RG_BOOMERANG)));}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_VINES_CHEST,    {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BASEMENT_NEAR_SWITCHES_CHEST, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_ROOM_SMALL_CHEST,   {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_BOOMERANG_CHEST,              {[]{return logic->CanUse(RG_KOKIRI_SWORD) || logic->CanUse(RG_MASTER_SWORD) || logic->CanUse(RG_BIGGORON_SWORD) || logic->CanUse(RG_MEGATON_HAMMER) || logic->CanUse(RG_FAIRY_SLINGSHOT) || logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_STICKS) || logic->Bombs;}}),
                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,      {[]{return logic->CanUse(RG_SONG_OF_TIME) || (randoCtx->GetTrickOption(RT_JABU_MQ_SOT_GS) && logic->IsChild && logic->CanUse(RG_BOOMERANG));}}),
                    //Trick: logic->CanUse(RG_SONG_OF_TIME) || (LogicJabuMQSoTGS && logic->IsChild && logic->CanUse(RG_BOOMERANG))
  }, {
                  //Exits
                  Entrance(RR_JABU_JABUS_BELLY_MQ_BEGINNING, {[]{return true;}}),
-                  Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return logic->HasExplosives && logic->IsChild && logic->CanUse(RG_BOOMERANG);}}),
+                  Entrance(RR_JABU_JABUS_BELLY_MQ_DEPTHS,    {[]{return logic->HasExplosives && logic->CanUse(RG_FAIRY_SLINGSHOT) && logic->CanUse(RG_BOOMERANG);}}),
  });

  areaTable[RR_JABU_JABUS_BELLY_MQ_DEPTHS] = Area("Jabu Jabus Belly MQ Depths", "Jabu Jabus Belly", RA_JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, {
@ -207,8 +207,8 @@ void AreaTable_Init_JabuJabusBelly() {
  }, {
                  //Locations
                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_COW,             {[]{return logic->CanUse(RG_EPONAS_SONG);}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, {[]{return true;}}),
-                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    {[]{return true;}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_NEAR_BOSS_CHEST, {[]{return logic->CanUse(RG_FAIRY_SLINGSHOT);}}),
+                  LocationAccess(RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,    {[]{return logic->CanUse(RG_BOOMERANG) || (randoCtx->GetTrickOption(RT_JABU_NEAR_BOSS_RANGED) && logic->CanUse(RG_HOOKSHOT));}}),
  }, {
                  //Exits
                  Entrance(RR_JABU_JABUS_BELLY_MQ_MAIN, {[]{return true;}}),
@ -243,5 +243,6 @@ void AreaTable_Init_JabuJabusBelly() {
             {
                 // Exits
                 Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, { [] { return false; } }),
+                 Entrance(RR_ZORAS_FOUNTAIN, { [] { return logic->JabuJabusBellyClear; } }),
             });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@ -24,7 +24,7 @@ void AreaTable_Init_LostWoods() {
                  Entrance(RR_KF_HOUSE_OF_TWINS,     {[]{return true;}}),
                  Entrance(RR_KF_KNOW_IT_ALL_HOUSE,  {[]{return true;}}),
                  Entrance(RR_KF_KOKIRI_SHOP,        {[]{return true;}}),
-                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KF_OUTSIDE_DEKU_TREE,  {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
                  Entrance(RR_THE_LOST_WOODS,        {[]{return true;}}),
                  Entrance(RR_LW_BRIDGE_FROM_FOREST, {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).IsNot(RO_FOREST_CLOSED) || logic->DekuTreeClear;}}),
                  Entrance(RR_KF_STORMS_GROTTO,      {[]{return logic->CanOpenStormGrotto;}}),
@ -42,7 +42,7 @@ void AreaTable_Init_LostWoods() {
                }, {
                  //Exits
                  Entrance(RR_DEKU_TREE_ENTRYWAY, {[]{return logic->IsChild || (randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).IsNot(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF) && (randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield));}}),
-                  Entrance(RR_KOKIRI_FOREST,      {[]{return logic->IsAdult || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
+                  Entrance(RR_KOKIRI_FOREST,      {[]{return (logic->IsAdult && (logic->CanPassEnemy("Big Skulltula") || logic->ForestTempleClear)) || randoCtx->GetOption(RSK_FOREST).Is(RO_FOREST_OPEN) || logic->ShowedMidoSwordAndShield;}}),
  });

  areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp
@ -207,5 +207,6 @@ void AreaTable_Init_ShadowTemple() {
             {
                 // Exits
                 Entrance(RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+                 Entrance(RR_GRAVEYARD_WARP_PAD_REGION, { [] { return logic->ShadowTempleClear; } }),
             });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp
@ -269,5 +269,6 @@ void AreaTable_Init_SpiritTemple() {
        {
            // Exits
            Entrance(RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+            Entrance(RR_DESERT_COLOSSUS, { [] { return logic->SpiritTempleClear; } }),
        });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp
@ -329,5 +329,6 @@ void AreaTable_Init_WaterTemple() {
        {
            // Exits
            Entrance(RR_WATER_TEMPLE_BOSS_ENTRYWAY, { [] { return false; } }),
+            Entrance(RR_LAKE_HYLIA, { [] { return logic->WaterTempleClear; } }),
        });
 }
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@ -316,35 +316,36 @@ static void WriteLocation(
 static void WriteShuffledEntrance(std::string sphereString, Entrance* entrance) {
  int16_t originalIndex = entrance->GetIndex();
  int16_t destinationIndex = -1;
-  int16_t originalBlueWarp = entrance->GetBlueWarp();
-  int16_t replacementBlueWarp = -1;
  int16_t replacementIndex = entrance->GetReplacement()->GetIndex();
  int16_t replacementDestinationIndex = -1;
  std::string name = entrance->GetName();
  std::string text = entrance->GetConnectedRegion()->regionName + " from " + entrance->GetReplacement()->GetParentRegion()->regionName;

-  if (entrance->GetReverse() != nullptr && !entrance->IsDecoupled()) {
+  // Track the reverse destination, useful for savewarp handling
+  if (entrance->GetReverse() != nullptr) {
    destinationIndex = entrance->GetReverse()->GetIndex();
-    replacementDestinationIndex = entrance->GetReplacement()->GetReverse()->GetIndex();
-    replacementBlueWarp = entrance->GetReplacement()->GetReverse()->GetBlueWarp();
+    // 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},
-    {"blueWarp", originalBlueWarp},
    {"override", replacementIndex},
    {"overrideDestination", replacementDestinationIndex},
  });

  jsonData["entrances"].push_back(entranceJson);

-  // When decoupled entrances is off, handle saving reverse entrances with blue warps
+  // 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},
-      {"blueWarp", replacementBlueWarp},
      {"override", destinationIndex},
      {"overrideDestination", originalIndex},
    });
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@ -9,6 +9,7 @@
 #include <array>
 #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_hearts/object_gi_hearts.h"
 #include "objects/object_gi_scale/object_gi_scale.h"
 #include "objects/object_gi_fire/object_gi_fire.h"
@ -63,6 +64,49 @@ 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_DrawCompass(PlayState* play, GetItemEntry* getItemEntry) {
+
+    s16 color_slot = getItemEntry->getItemId - RG_DEKU_TREE_COMPASS;
+    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
+        { 221, 212, 60 },  // Gerudo Training Grounds
+        { 255, 255, 255 }, // Thieves' Hideout
+        { 80, 80, 80 }     // Ganon's Castle
+    };
+
+    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);
+    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);
+
+    POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, 5);
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+              G_MTX_MODELVIEW | G_MTX_LOAD);
+    gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiCompassGlassDL);
+
+    CLOSE_DISPS(play->state.gfxCtx);
+}
+
 extern "C" void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry) {
    s8 keysCanBeOutsideDungeon = getItemEntry->getItemId == RG_GANONS_CASTLE_BOSS_KEY ?
        DUNGEON_ITEMS_CAN_BE_OUTSIDE_DUNGEON(RSK_GANONS_BOSS_KEY) :
--- 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_DrawCompass(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawKeyRing(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBossKey(PlayState* play, GetItemEntry* getItemEntry);
 void Randomizer_DrawBossSoul(PlayState* play, GetItemEntry* getItemEntry);
--- a/soh/soh/Enhancements/randomizer/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/entrance.cpp
@ -10,6 +10,7 @@ EntranceLinkInfo NO_RETURN_ENTRANCE = { EntranceType::None, RR_NONE, RR_NONE, -1

 Entrance::Entrance(RandomizerRegion connectedRegion_, std::vector<ConditionFn> conditions_met_)
    : connectedRegion(connectedRegion_) {
+    originalConnectedRegion = connectedRegion_;
    conditions_met.resize(2);
    for (size_t i = 0; i < conditions_met_.size(); i++) {
        conditions_met[i] = conditions_met_[i];
@ -109,6 +110,10 @@ RandomizerRegion Entrance::GetConnectedRegionKey() const {
    return connectedRegion;
 }

+RandomizerRegion Entrance::GetOriginalConnectedRegionKey() const {
+    return originalConnectedRegion;
+}
+
 Area* Entrance::GetConnectedRegion() const {
    return AreaTable(connectedRegion);
 }
@ -173,14 +178,6 @@ void Entrance::SetIndex(int16_t newIndex) {
    index = newIndex;
 }

-int16_t Entrance::GetBlueWarp() const {
-    return blueWarp;
-}
-
-void Entrance::SetBlueWarp(int16_t newBlueWarp) {
-    blueWarp = newBlueWarp;
-}
-
 Entrance* Entrance::GetAssumed() const {
    return assumed;
 }
@ -226,7 +223,7 @@ Entrance* Entrance::GetNewTarget() {
    AreaTable(RR_ROOT)->AddExit(RR_ROOT, connectedRegion, [] { return true; });
    Entrance* targetEntrance = AreaTable(RR_ROOT)->GetExit(connectedRegion);
    targetEntrance->SetReplacement(this);
-    targetEntrance->SetName(GetParentRegion()->regionName + " -> " + GetConnectedRegion()->regionName);
+    targetEntrance->SetName(AreaTable(RR_ROOT)->regionName + " -> " + GetConnectedRegion()->regionName);
    return targetEntrance;
 }

@ -246,6 +243,11 @@ void EntranceShuffler::SetNoRandomEntrances(bool noRandomEntrances) {
    mNoRandomEntrances = noRandomEntrances;
 }

+// Construct entrance name from parent and connected region keys
+std::string EntranceNameByRegions(RandomizerRegion parentRegion, RandomizerRegion connectedRegion) {
+    return AreaTable(parentRegion)->regionName + " -> " + AreaTable(connectedRegion)->regionName;
+}
+
 void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
    auto ctx = Rando::Context::GetInstance();
    for (auto& entrancePair : entranceShuffleTable) {
@ -256,26 +258,22 @@ void SetAllEntrancesData(std::vector<EntranceInfoPair>& entranceShuffleTable) {
        // set data
        Entrance* forwardEntrance = AreaTable(forwardEntry.parentRegion)->GetExit(forwardEntry.connectedRegion);
        forwardEntrance->SetIndex(forwardEntry.index);
-        forwardEntrance->SetBlueWarp(forwardEntry.blueWarp);
        forwardEntrance->SetType(forwardEntry.type);
        forwardEntrance->SetAsPrimary();

-        // When decouple entrances is on, mark it for entrances except boss rooms
-        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES) && forwardEntry.type != EntranceType::ChildBoss &&
-            forwardEntry.type != EntranceType::AdultBoss) {
+        // When decouple entrances is on, mark the forward entrance
+        if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
            forwardEntrance->SetDecoupled();
        }

        if (returnEntry.parentRegion != RR_NONE) {
            Entrance* returnEntrance = AreaTable(returnEntry.parentRegion)->GetExit(returnEntry.connectedRegion);
            returnEntrance->SetIndex(returnEntry.index);
-            returnEntrance->SetBlueWarp(returnEntry.blueWarp);
            returnEntrance->SetType(returnEntry.type);
            forwardEntrance->BindTwoWay(returnEntrance);

            // Mark reverse entrance as decoupled
-            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES) && returnEntry.type != EntranceType::ChildBoss &&
-                returnEntry.type != EntranceType::AdultBoss) {
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
                returnEntrance->SetDecoupled();
            }
        }
@ -925,24 +923,23 @@ int EntranceShuffler::ShuffleAllEntrances() {
    mCurNumRandomizedEntrances = 0;

    std::vector<EntranceInfoPair> entranceShuffleTable = {
-        // Parent Region                     Connected Region                      index   blue warp
+        // Type                    Parent Region            Connected Region       Index
        { { EntranceType::Dungeon, RR_KF_OUTSIDE_DEKU_TREE, RR_DEKU_TREE_ENTRYWAY, 0x0000 },
-          { EntranceType::Dungeon, RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE, 0x0209, 0x0457 } },
+          { EntranceType::Dungeon, RR_DEKU_TREE_ENTRYWAY, RR_KF_OUTSIDE_DEKU_TREE, 0x0209 } },
        { { EntranceType::Dungeon, RR_DEATH_MOUNTAIN_TRAIL, RR_DODONGOS_CAVERN_ENTRYWAY, 0x0004 },
-          { EntranceType::Dungeon, RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL, 0x0242, 0x047A } },
+          { EntranceType::Dungeon, RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL, 0x0242 } },
        { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_JABU_JABUS_BELLY_ENTRYWAY, 0x0028 },
-          { EntranceType::Dungeon, RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x0221, 0x010E } },
+          { EntranceType::Dungeon, RR_JABU_JABUS_BELLY_ENTRYWAY, RR_ZORAS_FOUNTAIN, 0x0221 } },
        { { EntranceType::Dungeon, RR_SACRED_FOREST_MEADOW, RR_FOREST_TEMPLE_ENTRYWAY, 0x0169 },
-          { EntranceType::Dungeon, RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW, 0x0215, 0x0608 } },
+          { EntranceType::Dungeon, RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW, 0x0215 } },
        { { EntranceType::Dungeon, RR_DMC_CENTRAL_LOCAL, RR_FIRE_TEMPLE_ENTRYWAY, 0x0165 },
-          { EntranceType::Dungeon, RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL, 0x024A, 0x0564 } },
+          { EntranceType::Dungeon, RR_FIRE_TEMPLE_ENTRYWAY, RR_DMC_CENTRAL_LOCAL, 0x024A } },
        { { EntranceType::Dungeon, RR_LAKE_HYLIA, RR_WATER_TEMPLE_ENTRYWAY, 0x0010 },
-          { EntranceType::Dungeon, RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA, 0x021D, 0x060C } },
+          { EntranceType::Dungeon, RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA, 0x021D } },
        { { EntranceType::Dungeon, RR_DESERT_COLOSSUS, RR_SPIRIT_TEMPLE_ENTRYWAY, 0x0082 },
-          { EntranceType::Dungeon, RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1,
-            0x0610 } },
+          { EntranceType::Dungeon, RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY, 0x01E1 } },
        { { EntranceType::Dungeon, RR_GRAVEYARD_WARP_PAD_REGION, RR_SHADOW_TEMPLE_ENTRYWAY, 0x0037 },
-          { EntranceType::Dungeon, RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION, 0x0205, 0x0580 } },
+          { EntranceType::Dungeon, RR_SHADOW_TEMPLE_ENTRYWAY, RR_GRAVEYARD_WARP_PAD_REGION, 0x0205 } },
        { { EntranceType::Dungeon, RR_KAKARIKO_VILLAGE, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, 0x0098 },
          { EntranceType::Dungeon, RR_BOTTOM_OF_THE_WELL_ENTRYWAY, RR_KAKARIKO_VILLAGE, 0x02A6 } },
        { { EntranceType::Dungeon, RR_ZORAS_FOUNTAIN, RR_ICE_CAVERN_ENTRYWAY, 0x0088 },
@ -1190,22 +1187,32 @@ int EntranceShuffler::ShuffleAllEntrances() {
        { { EntranceType::WarpSong, RR_PRELUDE_OF_LIGHT_WARP, RR_TEMPLE_OF_TIME, 0x05F4 }, NO_RETURN_ENTRANCE },

        { { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ENTRYWAY, RR_DEKU_TREE_BOSS_ROOM, 0x040F },
-          { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY, 0x0252, 0x0457 } },
+          { EntranceType::ChildBoss, RR_DEKU_TREE_BOSS_ROOM, RR_DEKU_TREE_BOSS_ENTRYWAY, 0x0252 } },
        { { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, RR_DODONGOS_CAVERN_BOSS_ROOM, 0x040B },
-          { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, 0x00C5, 0x047A } },
+          { EntranceType::ChildBoss, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DODONGOS_CAVERN_BOSS_ENTRYWAY, 0x00C5 } },
        { { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, RR_JABU_JABUS_BELLY_BOSS_ROOM, 0x0301 },
-          { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407,
-            0x010E } },
+          { EntranceType::ChildBoss, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY, 0x0407 } },
        { { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, RR_FOREST_TEMPLE_BOSS_ROOM, 0x000C },
-          { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, 0x024E, 0x0608 } },
+          { EntranceType::AdultBoss, RR_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY, 0x024E } },
        { { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, RR_FIRE_TEMPLE_BOSS_ROOM, 0x0305 },
-          { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, 0x0175, 0x0564 } },
+          { EntranceType::AdultBoss, RR_FIRE_TEMPLE_BOSS_ROOM, RR_FIRE_TEMPLE_BOSS_ENTRYWAY, 0x0175 } },
        { { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ENTRYWAY, RR_WATER_TEMPLE_BOSS_ROOM, 0x0417 },
-          { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY, 0x0423, 0x060C } },
+          { EntranceType::AdultBoss, RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY, 0x0423 } },
        { { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, RR_SPIRIT_TEMPLE_BOSS_ROOM, 0x008D },
-          { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, 0x02F5, 0x0610 } },
+          { EntranceType::AdultBoss, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY, 0x02F5 } },
        { { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, RR_SHADOW_TEMPLE_BOSS_ROOM, 0x0413 },
-          { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, 0x02B2, 0x0580 } },
+          { EntranceType::AdultBoss, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY, 0x02B2 } },
+
+        { { EntranceType::BlueWarp, RR_DEKU_TREE_BOSS_ROOM, RR_KF_OUTSIDE_DEKU_TREE, 0x0457 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_DODONGOS_CAVERN_BOSS_ROOM, RR_DEATH_MOUNTAIN_TRAIL, 0x047A },
+          NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_JABU_JABUS_BELLY_BOSS_ROOM, RR_ZORAS_FOUNTAIN, 0x010E }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_FOREST_TEMPLE_BOSS_ROOM, RR_SACRED_FOREST_MEADOW, 0x0608 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_FIRE_TEMPLE_BOSS_ROOM, RR_DMC_CENTRAL_LOCAL, 0x0564 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_WATER_TEMPLE_BOSS_ROOM, RR_LAKE_HYLIA, 0x060C }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_DESERT_COLOSSUS, 0x0610 }, NO_RETURN_ENTRANCE },
+        { { EntranceType::BlueWarp, RR_SHADOW_TEMPLE_BOSS_ROOM, RR_GRAVEYARD_WARP_PAD_REGION, 0x0580 },
+          NO_RETURN_ENTRANCE },
    };

    std::map<std::string, PriorityEntrance> priorityEntranceTable = {
@ -1262,6 +1269,11 @@ int EntranceShuffler::ShuffleAllEntrances() {
                           entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;
                });
            }
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                for (Entrance* entrance : entrancePools[EntranceType::Boss]) {
+                    entrancePools[EntranceType::BossReverse].push_back(entrance->GetReverse());
+                }
+            }
        } else {
            entrancePools[EntranceType::ChildBoss] = GetShuffleableEntrances(EntranceType::ChildBoss);
            entrancePools[EntranceType::AdultBoss] = GetShuffleableEntrances(EntranceType::AdultBoss);
@ -1273,6 +1285,14 @@ int EntranceShuffler::ShuffleAllEntrances() {
                           entrance->GetConnectedRegionKey() == RR_DEKU_TREE_BOSS_ROOM;
                });
            }
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                for (Entrance* entrance : entrancePools[EntranceType::ChildBoss]) {
+                    entrancePools[EntranceType::ChildBossReverse].push_back(entrance->GetReverse());
+                }
+                for (Entrance* entrance : entrancePools[EntranceType::AdultBoss]) {
+                    entrancePools[EntranceType::AdultBossReverse].push_back(entrance->GetReverse());
+                }
+            }
        }
    }

@ -1346,11 +1366,13 @@ int EntranceShuffler::ShuffleAllEntrances() {

    // combine entrance pools if mixing pools. Only continue if more than one pool is selected.
    int totalMixedPools =
-        (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES) ? 1 : 0) +
-        (ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES) ? 1 : 0);
+        (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_BOSS_ENTRANCES) ? 1 : 0) +
+        (ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES) ? 1 : 0) + (ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES) ? 1 : 0) +
+        (ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES) ? 1 : 0);
    if (totalMixedPools < 2) {
        ctx->GetOption(RSK_MIXED_ENTRANCE_POOLS).SetSelectedIndex(RO_GENERIC_OFF);
        ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
+        ctx->GetOption(RSK_MIX_BOSS_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
        ctx->GetOption(RSK_MIX_OVERWORLD_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
        ctx->GetOption(RSK_MIX_INTERIOR_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
        ctx->GetOption(RSK_MIX_GROTTO_ENTRANCES).SetSelectedIndex(RO_GENERIC_OFF);
@ -1364,6 +1386,12 @@ int EntranceShuffler::ShuffleAllEntrances() {
                poolsToMix.insert(EntranceType::DungeonReverse);
            }
        }
+        if (ctx->GetOption(RSK_MIX_DUNGEON_ENTRANCES)) {
+            poolsToMix.insert(EntranceType::Boss);
+            if (ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                poolsToMix.insert(EntranceType::BossReverse);
+            }
+        }
        if (ctx->GetOption(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
            poolsToMix.insert(EntranceType::Overworld);
        }
@ -1503,6 +1531,94 @@ int EntranceShuffler::ShuffleAllEntrances() {
        }
    }

+    // Determine blue warp targets
+    // RANDOTODO: add bluewarp shuffle
+    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_FOREST_TEMPLE_BOSS_ROOM, RR_FOREST_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(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)) },
+            { EntranceNameByRegions(RR_WATER_TEMPLE_BOSS_ROOM, RR_WATER_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_WATER_TEMPLE_ENTRYWAY, RR_LAKE_HYLIA)) },
+            { EntranceNameByRegions(RR_SPIRIT_TEMPLE_BOSS_ROOM, RR_SPIRIT_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY)) },
+            { EntranceNameByRegions(RR_SHADOW_TEMPLE_BOSS_ROOM, RR_SHADOW_TEMPLE_BOSS_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(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)) },
+            { EntranceNameByRegions(RR_DODONGOS_CAVERN_ENTRYWAY, RR_DEATH_MOUNTAIN_TRAIL),
+              GetEntrance(EntranceNameByRegions(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)) },
+            { EntranceNameByRegions(RR_FOREST_TEMPLE_ENTRYWAY, RR_SACRED_FOREST_MEADOW),
+              GetEntrance(EntranceNameByRegions(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)) },
+            { EntranceNameByRegions(RR_SPIRIT_TEMPLE_ENTRYWAY, RR_DESERT_COLOSSUS_FROM_SPIRIT_ENTRYWAY),
+              GetEntrance(EntranceNameByRegions(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)) },
+        };
+
+        // 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)) },
+        };
+
+        for (EntrancePair pair : bossRoomExitPairs) {
+            Entrance* target = pair.second->GetReplacement() != nullptr ? pair.second->GetReplacement() : pair.second;
+
+            if (!ctx->GetOption(RSK_DECOUPLED_ENTRANCES)) {
+                while (bossExits.find(target->GetName()) != bossExits.end()) {
+                    Entrance* next = bossExits.at(target->GetName());
+                    target = next->GetReplacement() != nullptr ? next->GetReplacement() : next;
+                }
+
+                if (dungeonExits.find(target->GetName()) != dungeonExits.end()) {
+                    target = dungeonExits.at(target->GetName());
+                }
+            }
+
+            pair.first->Connect(target->GetOriginalConnectedRegionKey());
+            pair.first->SetReplacement(target);
+        }
+    }
+
+    // Validate the world one last time to ensure all special conditions are still valid
+    if (!ValidateWorld(nullptr)) {
+        return ENTRANCE_SHUFFLE_FAILURE;
+    }
+
    return ENTRANCE_SHUFFLE_SUCCESS;
 }

@ -1518,16 +1634,21 @@ void EntranceShuffler::CreateEntranceOverrides() {
    int i = 0;
    for (Entrance* entrance : allShuffleableEntrances) {

+        // Include blue warps when dungeons or bosses are shuffled
+        bool includeBluewarps =
+            entrance->GetType() == Rando::EntranceType::BlueWarp &&
+            (ctx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES) || ctx->GetOption(RSK_SHUFFLE_BOSS_ENTRANCES));
+
        // Double-check to make sure the entrance is actually shuffled
-        if (!entrance->IsShuffled()) {
+        if (!entrance->IsShuffled() && !includeBluewarps) {
            continue;
        }

        auto message = "Setting " + entrance->to_string() + "\n";
        SPDLOG_DEBUG(message);

+        uint8_t type = (uint8_t)entrance->GetType();
        int16_t originalIndex = entrance->GetIndex();
-        int16_t originalBlueWarp = entrance->GetBlueWarp();
        int16_t replacementIndex = entrance->GetReplacement()->GetIndex();

        int16_t destinationIndex = -1;
@ -1541,9 +1662,9 @@ void EntranceShuffler::CreateEntranceOverrides() {
        }

        entranceOverrides[i] = {
+            .type = type,
            .index = originalIndex,
            .destination = destinationIndex,
-            .blueWarp = originalBlueWarp,
            .override = replacementIndex,
            .overrideDestination = replacementDestinationIndex,
        };
@ -1559,9 +1680,9 @@ void EntranceShuffler::CreateEntranceOverrides() {
 /// @brief set all the entrances to be 0 to indicate an unshuffled entrance
 void EntranceShuffler::UnshuffleAllEntrances() {
    for (auto& entranceOveride : entranceOverrides) {
+        entranceOveride.type = 0;
        entranceOveride.index = 0;
        entranceOveride.destination = 0;
-        entranceOveride.blueWarp = 0;
        entranceOveride.override = 0;
        entranceOveride.overrideDestination = 0;
    }
@ -1575,12 +1696,12 @@ void EntranceShuffler::ParseJson(nlohmann::json spoilerFileJson) {
        for (auto it = entrancesJson.begin(); it != entrancesJson.end(); ++it, i++) {
            nlohmann::json entranceJson = *it;
            for (auto entranceIt = entranceJson.begin(); entranceIt != entranceJson.end(); ++entranceIt) {
-                if (entranceIt.key() == "index") {
+                if (entranceIt.key() == "type") {
+                    entranceOverrides[i].type = entranceIt.value();
+                } else if (entranceIt.key() == "index") {
                    entranceOverrides[i].index = entranceIt.value();
                } else if (entranceIt.key() == "destination") {
                    entranceOverrides[i].destination = entranceIt.value();
-                } else if (entranceIt.key() == "blueWarp") {
-                    entranceOverrides[i].blueWarp = entranceIt.value();
                } else if (entranceIt.key() == "override") {
                    entranceOverrides[i].override = entranceIt.value();
                } else if (entranceIt.key() == "overrideDestination") {
@ -1593,5 +1714,5 @@ void EntranceShuffler::ParseJson(nlohmann::json spoilerFileJson) {
 } // namespace Rando

 extern "C" EntranceOverride* Randomizer_GetEntranceOverrides() {
-  return Rando::Context::GetInstance()->GetEntranceShuffler()->entranceOverrides.data();
+    return Rando::Context::GetInstance()->GetEntranceShuffler()->entranceOverrides.data();
 }
--- a/soh/soh/Enhancements/randomizer/entrance.h
+++ b/soh/soh/Enhancements/randomizer/entrance.h
@ -15,12 +15,16 @@ enum class EntranceType {
    OwlDrop,
    Spawn,
    WarpSong,
+    BlueWarp,
    Dungeon,
    GanonDungeon,
    DungeonReverse,
    Boss,
+    BossReverse,
    ChildBoss,
+    ChildBossReverse,
    AdultBoss,
+    AdultBossReverse,
    Interior,
    InteriorReverse,
    SpecialInterior,
@ -45,6 +49,7 @@ class Entrance {
    uint32_t Getuint32_t() const;
    bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const;
    RandomizerRegion GetConnectedRegionKey() const;
+    RandomizerRegion GetOriginalConnectedRegionKey() const;
    Area* GetConnectedRegion() const;
    void SetParentRegion(RandomizerRegion newParent);
    RandomizerRegion GetParentRegionKey() const;
@ -61,8 +66,6 @@ class Entrance {
    void SetDecoupled();
    int16_t GetIndex() const;
    void SetIndex(int16_t newIndex);
-    int16_t GetBlueWarp() const;
-    void SetBlueWarp(int16_t newBlueWarp);
    Entrance* GetAssumed() const;
    void SetReplacement(Entrance* newReplacement);
    Entrance* GetReplacement() const;
@ -78,6 +81,7 @@ class Entrance {
  private:
    RandomizerRegion parentRegion;
    RandomizerRegion connectedRegion;
+    RandomizerRegion originalConnectedRegion;
    std::vector<ConditionFn> conditions_met;

    EntranceType type = EntranceType::None;
@ -86,7 +90,6 @@ class Entrance {
    Entrance* assumed = nullptr;
    Entrance* replacement = nullptr;
    int16_t index = 0xFFFF;
-    int16_t blueWarp = 0;
    bool shuffled = false;
    bool primary = false;
    bool addedToPool = false;
@ -99,7 +102,6 @@ typedef struct {
    RandomizerRegion parentRegion;
    RandomizerRegion connectedRegion;
    int16_t index;
-    int16_t blueWarp;
 } EntranceLinkInfo;

 typedef struct {
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@ -107,15 +107,25 @@ void Rando::StaticData::InitItemTable() {
    itemTable[RG_BOTTOM_OF_THE_WELL_MAP] =              Item(RG_BOTTOM_OF_THE_WELL_MAP,           Text{ "Bottom of the Well Map", "Carte du Puits", "Boden des Brunnens Karte" },                                   ITEMTYPE_MAP,               0xAD,               false, &logic->noVariable,          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", "Eishöhle Karte" },                                        ITEMTYPE_MAP,               0xAE,               false, &logic->noVariable,          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", "Kompass des Deku-Baums" },                          ITEMTYPE_COMPASS,           0x9B,               false, &logic->noVariable,          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", "Kompass der Dodongo-Höhle" },                ITEMTYPE_COMPASS,           0x9C,               false, &logic->noVariable,          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", "Kompass des Jabu-Jabu-Bauchs" },           ITEMTYPE_COMPASS,           0x9D,               false, &logic->noVariable,          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", "Waldtempel-Kompass" },                          ITEMTYPE_COMPASS,           0x9E,               false, &logic->noVariable,          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", "Feuertempel-Kompass" },                                ITEMTYPE_COMPASS,           0x9F,               false, &logic->noVariable,          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", "Wassertempel-Kompass" },                            ITEMTYPE_COMPASS,           0xA0,               false, &logic->noVariable,          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", "Geistiger Tempelkompass" },                    ITEMTYPE_COMPASS,           0xA1,               false, &logic->noVariable,          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", "Kompass des Schattentempels" },                  ITEMTYPE_COMPASS,           0xA2,               false, &logic->noVariable,          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", "Boden des Brunnenkompasses" },                          ITEMTYPE_COMPASS,           0xA3,               false, &logic->noVariable,          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", "Eishöhlenkompass" },                               ITEMTYPE_COMPASS,           0xA4,               false, &logic->noVariable,          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", "Waldtempel-Boss-Schlüssel" },                  ITEMTYPE_BOSSKEY,           0x95,               true,  &logic->BossKeyForestTemple, 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);
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@ -230,6 +230,26 @@ namespace Rando {
        return false;
    }

+    bool Logic::CanKillEnemy(std::string enemy) {
+        //switch(enemy) {} RANDOTODO implement enemies enum
+        if (enemy == "Big Skulltula"){
+            return CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || CanJumpslash || CanUse(RG_MEGATON_HAMMER) || CanUse(RG_HOOKSHOT) || CanUse(RG_DINS_FIRE) || HasExplosives;
+        }
+        //Shouldn't be reached
+        return false;
+    }
+
+    bool Logic::CanPassEnemy(std::string enemy) {
+        //switch(enemy) {} RANDOTODO implement enemies enum
+        if (CanKillEnemy(enemy)){
+            return true;
+        }
+        if (enemy == "Big Skulltula"){
+            return Nuts || CanUse(RG_BOOMERANG);
+        }
+        return false;
+    }
+
    Logic::Logic() {
        
    }
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@ -422,6 +422,8 @@ class Logic {
    bool SmallKeys(RandomizerRegion dungeon, uint8_t requiredAmountGlitchless, uint8_t requiredAmountGlitched);
    bool CanDoGlitch(GlitchType glitch);
    bool CanEquipSwap(RandomizerGet itemName);
+    bool CanKillEnemy(std::string enemy);
+    bool CanPassEnemy(std::string enemy);
    bool EventsUpdated();
    void Reset();

--- a/soh/soh/Enhancements/randomizer/option_descriptions.cpp
+++ b/soh/soh/Enhancements/randomizer/option_descriptions.cpp
@ -170,12 +170,14 @@ void Settings::CreateOptionDescriptions() {
        "This also adds the one-way entrance from Gerudo Valley to Lake Hylia in the pool of "
        "overworld entrances when they are shuffled.";
    mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS] =
-        "Shuffle entrances into a mixed pool instead of separate ones.\n"
+        "Shuffle entrances into a mixed pool instead of separate ones. Has no affect on pools whose "
+        "entrances aren't shuffled, and \"Shuffle Boss Entrances\" must be set to \"Full\" to include them.\n"
        "\n"
        "For example, enabling the settings to shuffle grotto, dungeon, and overworld entrances and "
        "selecting grotto and dungeon entrances here will allow a dungeon to be inside a grotto or "
        "vice versa, while overworld entrances are shuffled in their own separate pool and indoors stay vanilla.";
    mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES] = "Dungeon entrances will be part of the mixed pool";
+    mOptionDescriptions[RSK_MIX_BOSS_ENTRANCES] = "Boss entrances will be part of the mixed pool";
    mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES] = "Overworld entrances will be part of the mixed pool";
    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";
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@ -236,23 +236,6 @@ std::unordered_map<s16, s16> getItemIdToItemId = {
    { GI_CLAIM_CHECK, ITEM_CLAIM_CHECK } 
 };

-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.
-    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;
-}
-
 #pragma optimize("", off)
 #pragma GCC push_options
 #pragma GCC optimize ("O0")
@ -542,6 +525,11 @@ void Randomizer::LoadMerchantMessages() {
        CustomMessage(ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetEnglish(),
            ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetGerman(),
            ctx->GetHint(RH_BEAN_SALESMAN)->GetText().GetFrench()));
+    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 %rMagic Bean%w. %r99%w Rupees...\x1B&%gYes&No%w",
+            "\x1B&%gJa&Nein%w",
+            "Je te vends mon dernier %rHaricot&magique%w pour %r99 Rubis%w.\x1B&%gAcheter&Ne pas acheter%w"));


    //Setup for merchant text boxes
@ -553,7 +541,7 @@ void Randomizer::LoadMerchantMessages() {
            ctx->GetHint(RH_MEDIGORON)->GetText().GetGerman(),
            ctx->GetHint(RH_MEDIGORON)->GetText().GetFrench()));

-    //Granny Shopy
+    //Granny Shop
    //RANDOTODO: Implement obscure/ambiguous hints
    CustomMessageManager::Instance->CreateMessage(
        Randomizer::merchantMessageTableID, TEXT_GRANNYS_SHOP,
@ -2258,7 +2246,11 @@ void RandomizerSettingsWindow::DrawElement() {
                                            excludedLocationString += std::to_string(excludedLocationIt);
                                            excludedLocationString += ",";
                                        }
-                                        CVarSetString("gRandomizeExcludedLocations", excludedLocationString.c_str());
+                                        if (excludedLocationString == "") {
+                                            CVarClear("gRandomizeExcludedLocations");
+                                        } else {
+                                            CVarSetString("gRandomizeExcludedLocations", excludedLocationString.c_str());
+                                        }
                                        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                                    }
                                    ImGui::SameLine();
@ -2428,7 +2420,7 @@ void RandomizerSettingsWindow::DrawElement() {
                        enabledTrickString += std::to_string(enabledTrickIt);
                        enabledTrickString += ",";
                    }
-                    CVarSetString("gRandomizeEnabledTricks", enabledTrickString.c_str());
+                    CVarClear("gRandomizeEnabledTricks");
                    LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                }
                ImGui::SameLine();
@ -2600,7 +2592,7 @@ void RandomizerSettingsWindow::DrawElement() {
                            enabledTrickString += std::to_string(enabledTrickIt);
                            enabledTrickString += ",";
                        }
-                        CVarSetString("gRandomizeEnabledTricks", enabledTrickString.c_str());
+                        CVarClear("gRandomizeEnabledTricks");
                        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                    }
                    
@ -2635,7 +2627,11 @@ void RandomizerSettingsWindow::DrawElement() {
                                                enabledTrickString += std::to_string(enabledTrickIt);
                                                enabledTrickString += ",";
                                        }
-                                        CVarSetString("gRandomizeEnabledTricks", enabledTrickString.c_str());
+                                        if (enabledTrickString == "") {
+                                            CVarClear("gRandomizeEnabledTricks");
+                                        } else {
+                                            CVarSetString("gRandomizeEnabledTricks", enabledTrickString.c_str());
+                                        }
                                        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                                    }
                                    Rando::Tricks::DrawTagChips(option.GetTags());
@ -2790,7 +2786,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
 }

 CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
-    if (originalTextId == TEXT_SARIA_SFM || (originalTextId == TEXT_SARIAS_SONG_FOREST_SOUNDS && originalTextId == TEXT_SARIAS_SONG_FOREST_TEMPLE)) {
+    if (originalTextId == TEXT_SARIA_SFM || (originalTextId >= TEXT_SARIAS_SONG_FACE_TO_FACE && originalTextId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
        CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE);
        CustomMessage messageEntry2 = messageEntry;
        std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B";
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@ -3659,6 +3659,7 @@ typedef enum {
    RSK_SHUFFLE_OVERWORLD_SPAWNS,
    RSK_MIXED_ENTRANCE_POOLS,
    RSK_MIX_DUNGEON_ENTRANCES,
+    RSK_MIX_BOSS_ENTRANCES,
    RSK_MIX_OVERWORLD_ENTRANCES,
    RSK_MIX_INTERIOR_ENTRANCES,
    RSK_MIX_GROTTO_ENTRANCES,
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@ -781,7 +781,6 @@ void InitTrackerData(bool isDebug) {
        }
    }
    UpdateAllOrdering();
-    UpdateInventoryChecks();
 }

 void SaveTrackerData(SaveContext* saveContext, int sectionID, bool gameSave) {
@ -1381,7 +1380,7 @@ void DrawLocation(RandomizerCheck rc) {
                : CVarGetColor("gCheckTrackerSeenMainColor", Color_Main_Default);
        extraColor = CVarGetColor("gCheckTrackerSeenExtraColor", Color_Seen_Extra_Default);
    } else if (status == RCSHOW_SCUMMED) {
-        if (!showHidden && CVarGetInteger("gCheckTrackerKnownHide", 0)) {
+        if (!showHidden && CVarGetInteger("gCheckTrackerScummedHide", 0)) {
            return;
        }
        mainColor =
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
@ -40,17 +40,12 @@ s16 dynamicExitList[] = {
 // Owl Flights : 0x492064 and 0x492080

 static s16 entranceOverrideTable[ENTRANCE_TABLE_SIZE] = {0};
-// Boss scenes (normalize boss scene range to 0 on lookup) to the replaced dungeon scene it is connected to
-static s16 dungeonBossSceneOverrides[SHUFFLEABLE_BOSS_COUNT] = {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};

 EntranceInfo originalEntranceTable[ENTRANCE_TABLE_SIZE] = {0};

-typedef struct {
-    s16 blueWarp;
-    s16 destination;
-} BlueWarpReplacement;
-
 typedef struct {
    s16 entryway;
    s16 exit;
@ -62,40 +57,25 @@ typedef struct {
 } DungeonEntranceInfo;

 static DungeonEntranceInfo dungeons[] = {
-    //entryway                   exit,                         boss,                        reverse,                  bluewarp,                         dungeon scene,         boss scene
-    { DEKU_TREE_ENTRANCE,        ENTR_KOKIRI_FOREST_1,         ENTR_DEKU_TREE_BOSS_0,       ENTR_DEKU_TREE_1,         ENTR_KOKIRI_FOREST_11,            SCENE_DEKU_TREE,       SCENE_DEKU_TREE_BOSS },
-    { DODONGOS_CAVERN_ENTRANCE,  ENTR_DEATH_MOUNTAIN_TRAIL_3,  ENTR_DODONGOS_CAVERN_BOSS_0, ENTR_DODONGOS_CAVERN_1,   ENTR_DEATH_MOUNTAIN_TRAIL_5,      SCENE_DODONGOS_CAVERN, SCENE_DODONGOS_CAVERN_BOSS },
-    { JABU_JABUS_BELLY_ENTRANCE, ENTR_ZORAS_FOUNTAIN_1,        ENTR_JABU_JABU_BOSS_0,       ENTR_JABU_JABU_1,         ENTR_ZORAS_FOUNTAIN_0,            SCENE_JABU_JABU,       SCENE_JABU_JABU_BOSS },
-    { FOREST_TEMPLE_ENTRANCE,    ENTR_SACRED_FOREST_MEADOW_1,  ENTR_FOREST_TEMPLE_BOSS_0,   ENTR_FOREST_TEMPLE_1,     ENTR_SACRED_FOREST_MEADOW_3,      SCENE_FOREST_TEMPLE,   SCENE_FOREST_TEMPLE_BOSS },
-    { FIRE_TEMPLE_ENTRANCE,      ENTR_DEATH_MOUNTAIN_CRATER_2, ENTR_FIRE_TEMPLE_BOSS_0,     ENTR_FIRE_TEMPLE_1,       ENTR_DEATH_MOUNTAIN_CRATER_5,     SCENE_FIRE_TEMPLE,     SCENE_FIRE_TEMPLE_BOSS },
-    { WATER_TEMPLE_ENTRANCE,     ENTR_LAKE_HYLIA_2,            ENTR_WATER_TEMPLE_BOSS_0,    ENTR_WATER_TEMPLE_1,      ENTR_LAKE_HYLIA_9,                SCENE_WATER_TEMPLE,    SCENE_WATER_TEMPLE_BOSS },
-    { SPIRIT_TEMPLE_ENTRANCE,    ENTR_DESERT_COLOSSUS_1,       ENTR_SPIRIT_TEMPLE_BOSS_0,   ENTR_SPIRIT_TEMPLE_1,     ENTR_DESERT_COLOSSUS_8,           SCENE_SPIRIT_TEMPLE,   SCENE_SPIRIT_TEMPLE_BOSS },
-    { SHADOW_TEMPLE_ENTRANCE,    ENTR_GRAVEYARD_1,             ENTR_SHADOW_TEMPLE_BOSS_0,   ENTR_SHADOW_TEMPLE_1,     ENTR_GRAVEYARD_8,                 SCENE_SHADOW_TEMPLE,   SCENE_SHADOW_TEMPLE_BOSS },
+    //entryway                exit,                         boss,                        reverse,                bluewarp,                     dungeon scene,         boss scene
+    { ENTR_DEKU_TREE_0,       ENTR_KOKIRI_FOREST_1,         ENTR_DEKU_TREE_BOSS_0,       ENTR_DEKU_TREE_1,       ENTR_KOKIRI_FOREST_11,        SCENE_DEKU_TREE,       SCENE_DEKU_TREE_BOSS },
+    { ENTR_DODONGOS_CAVERN_0, ENTR_DEATH_MOUNTAIN_TRAIL_3,  ENTR_DODONGOS_CAVERN_BOSS_0, ENTR_DODONGOS_CAVERN_1, ENTR_DEATH_MOUNTAIN_TRAIL_5,  SCENE_DODONGOS_CAVERN, SCENE_DODONGOS_CAVERN_BOSS },
+    { ENTR_JABU_JABU_0,       ENTR_ZORAS_FOUNTAIN_1,        ENTR_JABU_JABU_BOSS_0,       ENTR_JABU_JABU_1,       ENTR_ZORAS_FOUNTAIN_0,        SCENE_JABU_JABU,       SCENE_JABU_JABU_BOSS },
+    { ENTR_FOREST_TEMPLE_0,   ENTR_SACRED_FOREST_MEADOW_1,  ENTR_FOREST_TEMPLE_BOSS_0,   ENTR_FOREST_TEMPLE_1,   ENTR_SACRED_FOREST_MEADOW_3,  SCENE_FOREST_TEMPLE,   SCENE_FOREST_TEMPLE_BOSS },
+    { ENTR_FIRE_TEMPLE_0,     ENTR_DEATH_MOUNTAIN_CRATER_2, ENTR_FIRE_TEMPLE_BOSS_0,     ENTR_FIRE_TEMPLE_1,     ENTR_DEATH_MOUNTAIN_CRATER_5, SCENE_FIRE_TEMPLE,     SCENE_FIRE_TEMPLE_BOSS },
+    { ENTR_WATER_TEMPLE_0,    ENTR_LAKE_HYLIA_2,            ENTR_WATER_TEMPLE_BOSS_0,    ENTR_WATER_TEMPLE_1,    ENTR_LAKE_HYLIA_9,            SCENE_WATER_TEMPLE,    SCENE_WATER_TEMPLE_BOSS },
+    { ENTR_SPIRIT_TEMPLE_0,   ENTR_DESERT_COLOSSUS_1,       ENTR_SPIRIT_TEMPLE_BOSS_0,   ENTR_SPIRIT_TEMPLE_1,   ENTR_DESERT_COLOSSUS_8,       SCENE_SPIRIT_TEMPLE,   SCENE_SPIRIT_TEMPLE_BOSS },
+    { ENTR_SHADOW_TEMPLE_0,   ENTR_GRAVEYARD_1,             ENTR_SHADOW_TEMPLE_BOSS_0,   ENTR_SHADOW_TEMPLE_1,   ENTR_GRAVEYARD_8,             SCENE_SHADOW_TEMPLE,   SCENE_SHADOW_TEMPLE_BOSS },
 };

-//These variables store the new entrance indices for dungeons so that
-//savewarping and game overs respawn players at the proper entrance.
-//By default, these will be their vanilla values.
-static s16 newDekuTreeEntrance              = DEKU_TREE_ENTRANCE;
-static s16 newDodongosCavernEntrance        = DODONGOS_CAVERN_ENTRANCE;
-static s16 newJabuJabusBellyEntrance        = JABU_JABUS_BELLY_ENTRANCE;
-static s16 newForestTempleEntrance          = FOREST_TEMPLE_ENTRANCE;
-static s16 newFireTempleEntrance            = FIRE_TEMPLE_ENTRANCE;
-static s16 newWaterTempleEntrance           = WATER_TEMPLE_ENTRANCE;
-static s16 newSpiritTempleEntrance          = SPIRIT_TEMPLE_ENTRANCE;
-static s16 newShadowTempleEntrance          = SHADOW_TEMPLE_ENTRANCE;
-static s16 newBottomOfTheWellEntrance       = BOTTOM_OF_THE_WELL_ENTRANCE;
-static s16 newGerudoTrainingGroundsEntrance = GERUDO_TRAINING_GROUNDS_ENTRANCE;
-static s16 newIceCavernEntrance             = ICE_CAVERN_ENTRANCE;
-
 static s8 hasCopiedEntranceTable = 0;
 static s8 hasModifiedEntranceTable = 0;

 void Entrance_SetEntranceDiscovered(u16 entranceIndex, u8 isReversedEntrance);

 u8 Entrance_EntranceIsNull(EntranceOverride* entranceOverride) {
-    return entranceOverride->index == 0 && entranceOverride->destination == 0 && entranceOverride->blueWarp == 0
-        && entranceOverride->override == 0 && entranceOverride->overrideDestination == 0;
+    return entranceOverride->index == 0 && entranceOverride->destination == 0 && entranceOverride->override == 0 &&
+           entranceOverride->overrideDestination == 0;
 }

 static void Entrance_SeparateOGCFairyFountainExit(void) {
@ -114,6 +94,28 @@ static void Entrance_SeparateAdultSpawnAndPrelude() {
    }
 }

+// Fix Adult dungeon blue warps as Child by assigning the child values for the warp pads
+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_3] = gEntranceTable[ENTR_SACRED_FOREST_MEADOW_2];
+        gEntranceTable[ENTR_SACRED_FOREST_MEADOW_3_1] = gEntranceTable[ENTR_SACRED_FOREST_MEADOW_2_1];
+        // Fire Temple
+        gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_5] = gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_4];
+        gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_5_1] = gEntranceTable[ENTR_DEATH_MOUNTAIN_CRATER_4_1];
+        // Water Temple
+        gEntranceTable[ENTR_LAKE_HYLIA_9] = gEntranceTable[ENTR_LAKE_HYLIA_8];
+        gEntranceTable[ENTR_LAKE_HYLIA_9_1] = gEntranceTable[ENTR_LAKE_HYLIA_8_1];
+        // Shadow Temple
+        gEntranceTable[ENTR_GRAVEYARD_8] = gEntranceTable[ENTR_GRAVEYARD_7];
+        gEntranceTable[ENTR_GRAVEYARD_8_1] = gEntranceTable[ENTR_GRAVEYARD_7_1];
+        // Spirit Temple
+        gEntranceTable[ENTR_DESERT_COLOSSUS_8] = gEntranceTable[ENTR_DESERT_COLOSSUS_5];
+        gEntranceTable[ENTR_DESERT_COLOSSUS_8_1] = gEntranceTable[ENTR_DESERT_COLOSSUS_5_1];
+    }
+}
+
 void Entrance_CopyOriginalEntranceTable(void) {
    if (!hasCopiedEntranceTable) {
        memcpy(originalEntranceTable, gEntranceTable, sizeof(EntranceInfo) * ENTRANCE_TABLE_SIZE);
@ -132,9 +134,6 @@ void Entrance_Init(void) {
    EntranceOverride* entranceOverrides = Randomizer_GetEntranceOverrides();
    s32 index;

-    size_t blueWarpRemapIdx = 0;
-    BlueWarpReplacement bluewarps[SHUFFLEABLE_BOSS_COUNT] = {0};
-
    Entrance_CopyOriginalEntranceTable();

    // Skip Child Stealth if given by settings
@ -151,6 +150,7 @@ void Entrance_Init(void) {

    Entrance_SeparateOGCFairyFountainExit();
    Entrance_SeparateAdultSpawnAndPrelude();
+    Entrance_ReplaceChildTempleWarps();

    // Initialize the entrance override table with each index leading to itself. An
    // index referring to itself means that the entrance is not currently shuffled.
@ -158,9 +158,9 @@ void Entrance_Init(void) {
        entranceOverrideTable[i] = i;
    }

-    // Initialize all boss rooms connected to their vanilla dungeon
+    // Initialize all boss room save/death warps with their vanilla dungeon entryway
    for (s16 i = 1; i < SHUFFLEABLE_BOSS_COUNT; i++) {
-        dungeonBossSceneOverrides[i] = i;
+        bossSceneSaveDeathWarps[i] = dungeons[i].entryway;
    }

    // Initialize the grotto exit and load lists
@ -174,9 +174,30 @@ void Entrance_Init(void) {
        }

        s16 originalIndex = entranceOverrides[i].index;
-        s16 blueWarpIndex = entranceOverrides[i].blueWarp;
+        s16 originalDestination = entranceOverrides[i].destination;
        s16 overrideIndex = entranceOverrides[i].override;

+        int16_t bossScene = -1;
+        int16_t saveWarpEntrance = originalDestination; // Default save warp to the original return entrance
+
+        // Search for boss room overrides and look for the matching save/death warp value to use
+        // If the boss room is in a dungeon, use the dungeons entryway as the save warp
+        // Otherwise use the "exit" value for the entrance that lead to the boss room
+        for (int j = 0; j <= SHUFFLEABLE_BOSS_COUNT; j++) {
+            if (overrideIndex == dungeons[j].bossDoor) {
+                bossScene = dungeons[j].bossScene;
+            }
+
+            if (index == dungeons[j].bossDoor) {
+                saveWarpEntrance = dungeons[j].entryway;
+            }
+        }
+
+        // Found a boss scene and a valid save/death warp value
+        if (bossScene != -1 && saveWarpEntrance != -1) {
+            bossSceneSaveDeathWarps[bossScene - SCENE_DEKU_TREE_BOSS] = saveWarpEntrance;
+        }
+
        //Overwrite grotto related indices
        if (originalIndex >= ENTRANCE_RANDO_GROTTO_EXIT_START) {
            Grotto_SetExitOverride(originalIndex, overrideIndex);
@ -191,36 +212,6 @@ void Entrance_Init(void) {
        // Overwrite the indices which we want to shuffle, leaving the rest as they are
        entranceOverrideTable[originalIndex] = overrideIndex;

-        if (blueWarpIndex != 0) {
-            // When boss shuffle is enabled, we need to know what dungeon the boss room is connected to for
-            // death/save warping, and for the blue warp
-            if (Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_ENTRANCES) != RO_BOSS_ROOM_ENTRANCE_SHUFFLE_OFF) {
-                s16 bossScene = -1;
-                s16 replacedDungeonScene = -1;
-                s16 replacedDungeonExit = -1;
-                // Search for the boss scene and replaced blue warp exits
-                for (s16 j = 0; j <= SHUFFLEABLE_BOSS_COUNT; j++) {
-                    if (blueWarpIndex == dungeons[j].blueWarp) {
-                        bossScene = dungeons[j].bossScene;
-                    }
-                    if (overrideIndex == dungeons[j].bossDoorReverse) {
-                        replacedDungeonScene = dungeons[j].scene;
-                        replacedDungeonExit = dungeons[j].exit;
-                    }
-                }
-
-                // assign the boss scene override
-                if (bossScene != -1 && replacedDungeonScene != -1 && replacedDungeonExit != -1) {
-                    dungeonBossSceneOverrides[bossScene - SCENE_DEKU_TREE_BOSS] = replacedDungeonScene;
-                    bluewarps[blueWarpRemapIdx].blueWarp = blueWarpIndex;
-                    bluewarps[blueWarpRemapIdx].destination = replacedDungeonExit;
-                    blueWarpRemapIdx++;
-                }
-            } else {
-                entranceOverrideTable[blueWarpIndex] = overrideIndex;
-            }
-        }
-
        //Override both land and water entrances for Hyrule Field -> ZR Front and vice versa
        if (originalIndex == ENTR_ZORAS_RIVER_0) { //Hyrule Field -> ZR Front land entrance
            entranceOverrideTable[ENTR_ZORAS_RIVER_3] = overrideIndex;
@ -229,14 +220,6 @@ void Entrance_Init(void) {
        }
    }

-    // If we have remapped blue warps from boss shuffle, handle setting those and grabbing the override for
-    // the replaced dungeons exit in the event that dungeon shuffle is also turned on
-    for (size_t i = 0; i < ARRAY_COUNT(bluewarps); i++) {
-        if (bluewarps[i].blueWarp != 0 && bluewarps[i].destination != 0) {
-            entranceOverrideTable[bluewarps[i].blueWarp] = Entrance_GetOverride(bluewarps[i].destination);
-        }
-    }
-
    // Stop playing background music during shuffled entrance transitions
    // so that we don't get duplicated or overlapping music tracks
    if (Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) {
@ -330,40 +313,39 @@ void Entrance_SetGameOverEntrance(void) {

    s16 scene = gPlayState->sceneNum;

-    // When in a boss room and boss shuffle is on, get the connected dungeon's original boss room entrance
-    // then run the normal game over overrides on it
+    // When in a boss room and boss shuffle is on, use the boss scene to find the death warp entrance
    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
-        scene = dungeonBossSceneOverrides[scene - SCENE_DEKU_TREE_BOSS];
-        gSaveContext.entranceIndex = dungeons[scene].bossDoor;
+        // Normalize boss scene range to 0 on lookup and handle for grotto entrances
+        gSaveContext.entranceIndex = Grotto_OverrideSpecialEntrance(bossSceneSaveDeathWarps[scene - SCENE_DEKU_TREE_BOSS]);
+        return;
    }

    //Set the current entrance depending on which entrance the player last came through
    switch (gSaveContext.entranceIndex) {
        case ENTR_DEKU_TREE_BOSS_0 : //Deku Tree Boss Room
-            gSaveContext.entranceIndex = newDekuTreeEntrance;
+            gSaveContext.entranceIndex = ENTR_DEKU_TREE_0;
            return;
        case ENTR_DODONGOS_CAVERN_BOSS_0 : //Dodongos Cavern Boss Room
-            gSaveContext.entranceIndex = newDodongosCavernEntrance;
+            gSaveContext.entranceIndex = ENTR_DODONGOS_CAVERN_0;
            return;
        case ENTR_JABU_JABU_BOSS_0 : //Jabu Jabus Belly Boss Room
-            gSaveContext.entranceIndex = newJabuJabusBellyEntrance;
+            gSaveContext.entranceIndex = ENTR_JABU_JABU_0;
            return;
        case ENTR_FOREST_TEMPLE_BOSS_0 : //Forest Temple Boss Room
-            gSaveContext.entranceIndex = newForestTempleEntrance;
+            gSaveContext.entranceIndex = ENTR_FOREST_TEMPLE_0;
            return;
        case ENTR_FIRE_TEMPLE_BOSS_0 : //Fire Temple Boss Room
-            gSaveContext.entranceIndex = newFireTempleEntrance;
+            gSaveContext.entranceIndex = ENTR_FIRE_TEMPLE_0;
            return;
        case ENTR_WATER_TEMPLE_BOSS_0 : //Water Temple Boss Room
-            gSaveContext.entranceIndex = newWaterTempleEntrance;
+            gSaveContext.entranceIndex = ENTR_WATER_TEMPLE_0;
            return;
        case ENTR_SPIRIT_TEMPLE_BOSS_0 : //Spirit Temple Boss Room
-            gSaveContext.entranceIndex = newSpiritTempleEntrance;
+            gSaveContext.entranceIndex = ENTR_SPIRIT_TEMPLE_0;
            return;
        case ENTR_SHADOW_TEMPLE_BOSS_0 : //Shadow Temple Boss Room
-            gSaveContext.entranceIndex = newShadowTempleEntrance;
+            gSaveContext.entranceIndex = ENTR_SHADOW_TEMPLE_0;
            return;
        case ENTR_GANONDORF_BOSS_0 : //Ganondorf Boss Room
            gSaveContext.entranceIndex = ENTR_GANONS_TOWER_0; // Inside Ganon's Castle -> Ganon's Tower Climb
@ -376,46 +358,51 @@ void Entrance_SetSavewarpEntrance(void) {

    s16 scene = gSaveContext.savedSceneNum;

-    // When in a boss room and boss shuffle is on, use the boss scene override to remap to its
-    // connected dungeon and use that for the final entrance
+    // When in a boss room and boss shuffle is on, use the boss scene to find the savewarp entrance
    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
-        scene = dungeonBossSceneOverrides[scene - SCENE_DEKU_TREE_BOSS];
+        // Normalize boss scene range to 0 on lookup and handle for grotto entrances
+        gSaveContext.entranceIndex = Grotto_OverrideSpecialEntrance(bossSceneSaveDeathWarps[scene - SCENE_DEKU_TREE_BOSS]);
+        return;
    }

    if (scene == SCENE_DEKU_TREE || scene == SCENE_DEKU_TREE_BOSS) {
-        gSaveContext.entranceIndex = newDekuTreeEntrance;
+        gSaveContext.entranceIndex = ENTR_DEKU_TREE_0;
    } else if (scene == SCENE_DODONGOS_CAVERN || scene == SCENE_DODONGOS_CAVERN_BOSS) {
-        gSaveContext.entranceIndex = newDodongosCavernEntrance;
+        gSaveContext.entranceIndex = ENTR_DODONGOS_CAVERN_0;
    } else if (scene == SCENE_JABU_JABU || scene == SCENE_JABU_JABU_BOSS) {
-        gSaveContext.entranceIndex = newJabuJabusBellyEntrance;
+        gSaveContext.entranceIndex = ENTR_JABU_JABU_0;
    } else if (scene == SCENE_FOREST_TEMPLE || scene == SCENE_FOREST_TEMPLE_BOSS) { //Forest Temple Boss Room
-        gSaveContext.entranceIndex = newForestTempleEntrance;
+        gSaveContext.entranceIndex = ENTR_FOREST_TEMPLE_0;
    } else if (scene == SCENE_FIRE_TEMPLE || scene == SCENE_FIRE_TEMPLE_BOSS) { //Fire Temple Boss Room
-        gSaveContext.entranceIndex = newFireTempleEntrance;
+        gSaveContext.entranceIndex = ENTR_FIRE_TEMPLE_0;
    } else if (scene == SCENE_WATER_TEMPLE || scene == SCENE_WATER_TEMPLE_BOSS) { //Water Temple Boss Room
-        gSaveContext.entranceIndex = newWaterTempleEntrance;
+        gSaveContext.entranceIndex = ENTR_WATER_TEMPLE_0;
    } else if (scene == SCENE_SPIRIT_TEMPLE || scene == SCENE_SPIRIT_TEMPLE_BOSS) { //Spirit Temple Boss Room
-        gSaveContext.entranceIndex = newSpiritTempleEntrance;
+        gSaveContext.entranceIndex = ENTR_SPIRIT_TEMPLE_0;
    } else if (scene == SCENE_SHADOW_TEMPLE || scene == SCENE_SHADOW_TEMPLE_BOSS) { //Shadow Temple Boss Room
-        gSaveContext.entranceIndex = newShadowTempleEntrance;
+        gSaveContext.entranceIndex = ENTR_SHADOW_TEMPLE_0;
    } else if (scene == SCENE_BOTTOM_OF_THE_WELL) { // BOTW
-        gSaveContext.entranceIndex = newBottomOfTheWellEntrance;
+        gSaveContext.entranceIndex = ENTR_BOTTOM_OF_THE_WELL_0;
    } else if (scene == SCENE_GERUDO_TRAINING_GROUND) { // GTG
-        gSaveContext.entranceIndex = newGerudoTrainingGroundsEntrance;
+        gSaveContext.entranceIndex = ENTR_GERUDO_TRAINING_GROUND_0;
    } else if (scene == SCENE_ICE_CAVERN) { // Ice cavern
-        gSaveContext.entranceIndex = newIceCavernEntrance;
+        gSaveContext.entranceIndex = ENTR_ICE_CAVERN_0;
    } else if (scene == SCENE_INSIDE_GANONS_CASTLE) {
-        gSaveContext.entranceIndex = GANONS_CASTLE_ENTRANCE;
+        gSaveContext.entranceIndex = ENTR_INSIDE_GANONS_CASTLE_0;
    } 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
        gSaveContext.entranceIndex = ENTR_THIEVES_HIDEOUT_0; // Gerudo Fortress -> Thieve's Hideout spawn 0
    } else if (scene == SCENE_LINKS_HOUSE) {
-        gSaveContext.entranceIndex = Entrance_OverrideNextIndex(LINK_HOUSE_SAVEWARP_ENTRANCE);
+        gSaveContext.entranceIndex = Entrance_OverrideNextIndex(ENTR_LINKS_HOUSE_0);
+    } else if (CVarGetInteger("gRememberSaveLocation", 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(LINK_HOUSE_SAVEWARP_ENTRANCE); // Child Overworld Spawn
+        gSaveContext.entranceIndex = Entrance_OverrideNextIndex(ENTR_LINKS_HOUSE_0); // Child Overworld Spawn
    } else {
        gSaveContext.entranceIndex = Entrance_OverrideNextIndex(ENTR_HYRULE_FIELD_10); // Adult Overworld Spawn (Normally 0x5F4 (ENTR_TEMPLE_OF_TIME_7), but 0x282 (ENTR_HYRULE_FIELD_10) has been repurposed to differentiate from Prelude which also uses 0x5F4)
    }
@ -496,7 +483,7 @@ void Entrance_OverrideBlueWarp(void) {
 void Entrance_OverrideCutsceneEntrance(u16 cutsceneCmd) {
    switch (cutsceneCmd) {
        case 24: // Dropping a fish for Jabu Jabu
-            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(newJabuJabusBellyEntrance);
+            gPlayState->nextEntranceIndex = Entrance_OverrideNextIndex(ENTR_JABU_JABU_0);
            gPlayState->transitionTrigger = TRANS_TRIGGER_START;
            gPlayState->transitionType = TRANS_TYPE_FADE_BLACK;
            // In case Jabu's mouth leads to a grotto return
@ -515,8 +502,8 @@ void Entrance_EnableFW(void) {
        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 & 0x08A02000 || // Swimming, riding horse, Down A, hanging from a ledge
-        player->stateFlags2 & 0x00040000    // Blank A
+        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;
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.h
@ -8,20 +8,6 @@

 #define ENTRANCE_TABLE_SIZE ENTR_MAX

-#define DEKU_TREE_ENTRANCE ENTR_DEKU_TREE_0
-#define DODONGOS_CAVERN_ENTRANCE ENTR_DODONGOS_CAVERN_0
-#define JABU_JABUS_BELLY_ENTRANCE ENTR_JABU_JABU_0
-#define FOREST_TEMPLE_ENTRANCE ENTR_FOREST_TEMPLE_0
-#define FIRE_TEMPLE_ENTRANCE ENTR_FIRE_TEMPLE_0
-#define WATER_TEMPLE_ENTRANCE ENTR_WATER_TEMPLE_0
-#define SPIRIT_TEMPLE_ENTRANCE ENTR_SPIRIT_TEMPLE_0
-#define SHADOW_TEMPLE_ENTRANCE ENTR_SHADOW_TEMPLE_0
-#define BOTTOM_OF_THE_WELL_ENTRANCE ENTR_BOTTOM_OF_THE_WELL_0
-#define GERUDO_TRAINING_GROUNDS_ENTRANCE ENTR_GERUDO_TRAINING_GROUND_0
-#define ICE_CAVERN_ENTRANCE ENTR_ICE_CAVERN_0
-#define GANONS_CASTLE_ENTRANCE ENTR_INSIDE_GANONS_CASTLE_0
-#define LINK_HOUSE_SAVEWARP_ENTRANCE ENTR_LINKS_HOUSE_0
-
 #define ENTRANCE_RANDO_GROTTO_LOAD_START 0x0700
 #define ENTRANCE_RANDO_GROTTO_EXIT_START 0x0800
 #define MAX_ENTRANCE_RANDO_USED_INDEX 0x0820
@ -66,7 +52,7 @@ typedef enum {
 #define ENTRANCE_RANDO_GROTTO_LOAD(index) ENTRANCE_RANDO_GROTTO_LOAD_START + index
 #define ENTRANCE_RANDO_GROTTO_EXIT(index) ENTRANCE_RANDO_GROTTO_EXIT_START + index

-#define ENTRANCE_OVERRIDES_MAX_COUNT 259 // 11 one-way entrances + 124 two-way entrances (x2)
+#define ENTRANCE_OVERRIDES_MAX_COUNT 267 // 19 one-way entrances + 124 two-way entrances (x2)
 #define SHUFFLEABLE_BOSS_COUNT 8

 #define SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT 66 // Max entrance rando index is 0x0820, (2080 / 32 == 65) + 1
@ -79,9 +65,9 @@ typedef enum {
     (((startTransType) << ENTRANCE_INFO_START_TRANS_TYPE_SHIFT) & ENTRANCE_INFO_START_TRANS_TYPE_MASK))

 typedef struct {
+    uint16_t type;
    int16_t index;
    int16_t destination;
-    int16_t blueWarp;
    int16_t override;
    int16_t overrideDestination;
 } EntranceOverride;
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@ -105,6 +105,7 @@ const EntranceData entranceData[] = {
    { ENTR_KOKIRI_FOREST_1,                                 ENTR_DEKU_TREE_0,                                    SINGLE_SCENE_INFO(SCENE_DEKU_TREE),              "Deku Tree",           "KF",                  ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON,   ""},
    { ENTR_DEKU_TREE_BOSS_0,                                ENTR_DEKU_TREE_1,                                    SINGLE_SCENE_INFO(SCENE_DEKU_TREE),              "Deku Tree Boss Door", "Gohma",               ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON,   "", 1},
    { ENTR_DEKU_TREE_1,                                     ENTR_DEKU_TREE_BOSS_0,                               SINGLE_SCENE_INFO(SCENE_DEKU_TREE_BOSS),         "Gohma",               "Deku Tree Boss Door", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_DUNGEON,   "", 1},
+    { ENTR_KOKIRI_FOREST_11,                                -1,                                                  SINGLE_SCENE_INFO(SCENE_DEKU_TREE_BOSS),         "Gohma",               "Deku Tree Blue Warp", ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_ONE_WAY,   "bw", 1},

    // Lost Woods
    { ENTR_KOKIRI_FOREST_2,                                        ENTR_LOST_WOODS_9,                                           SINGLE_SCENE_INFO(SCENE_LOST_WOODS), "Lost Woods Bridge",        "KF",                       ENTRANCE_GROUP_LOST_WOODS, ENTRANCE_GROUP_KOKIRI_FOREST, ENTRANCE_TYPE_OVERWORLD, "lw"},
@ -132,6 +133,7 @@ const EntranceData entranceData[] = {
    { ENTR_SACRED_FOREST_MEADOW_1,                          ENTR_FOREST_TEMPLE_0,                                 SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE),        "Forest Temple",           "SFM",                     ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_DUNGEON},
    { ENTR_FOREST_TEMPLE_BOSS_0,                            ENTR_FOREST_TEMPLE_1,                                 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_1,                                 ENTR_FOREST_TEMPLE_BOSS_0,                            SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE_BOSS),   "Phantom Ganon",           "Forest Temple Boss Door", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_DUNGEON, "", 1},
+    { ENTR_SACRED_FOREST_MEADOW_3,                          -1,                                                   SINGLE_SCENE_INFO(SCENE_FOREST_TEMPLE_BOSS),   "Phantom Ganon",           "Forest Temple Blue Warp", ENTRANCE_GROUP_SFM, ENTRANCE_GROUP_SFM,        ENTRANCE_TYPE_ONE_WAY, "bw", 1},

    // Kakariko Village
    { ENTR_HYRULE_FIELD_1,                                  ENTR_KAKARIKO_VILLAGE_0,                              SINGLE_SCENE_INFO(SCENE_KAKARIKO_VILLAGE),            "Kakariko",              "Hyrule Field",          ENTRANCE_GROUP_KAKARIKO, ENTRANCE_GROUP_HYRULE_FIELD,         ENTRANCE_TYPE_OVERWORLD, "hf"},
@ -180,6 +182,7 @@ const EntranceData entranceData[] = {
    { ENTR_GRAVEYARD_1,                  ENTR_SHADOW_TEMPLE_0,              SINGLE_SCENE_INFO(SCENE_SHADOW_TEMPLE),              "Shadow Temple",           "Graveyard",               ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON},
    { ENTR_SHADOW_TEMPLE_BOSS_0,         ENTR_SHADOW_TEMPLE_1,              SINGLE_SCENE_INFO(SCENE_SHADOW_TEMPLE),              "Shadow Temple Boss Door", "Bongo-Bongo",             ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1},
    { ENTR_SHADOW_TEMPLE_1,              ENTR_SHADOW_TEMPLE_BOSS_0,         SINGLE_SCENE_INFO(SCENE_SHADOW_TEMPLE_BOSS),         "Bongo-Bongo",             "Shadow Temple Boss Door", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_DUNGEON, "", 1},
+    { ENTR_GRAVEYARD_8,                  -1,                                SINGLE_SCENE_INFO(SCENE_SHADOW_TEMPLE_BOSS),         "Bongo-Bongo",             "Shadow Temple Blue Warp", ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_GROUP_GRAVEYARD, ENTRANCE_TYPE_ONE_WAY, "bw", 1},

    // Death Mountain Trail
    { ENTR_GORON_CITY_0,                                    ENTR_DEATH_MOUNTAIN_TRAIL_1,                          SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_TRAIL), "DMT",                        "Goron City",                 ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_GORON_CITY,            ENTRANCE_TYPE_OVERWORLD, "gc"},
@ -195,6 +198,7 @@ const EntranceData entranceData[] = {
    { ENTR_DEATH_MOUNTAIN_TRAIL_3,                          ENTR_DODONGOS_CAVERN_0,                               SINGLE_SCENE_INFO(SCENE_DODONGOS_CAVERN),      "Dodongo's Cavern",           "DMT",                        ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL,  ENTRANCE_TYPE_DUNGEON,   "dc"},
    { ENTR_DODONGOS_CAVERN_BOSS_0,                          ENTR_DODONGOS_CAVERN_1,                               SINGLE_SCENE_INFO(SCENE_DODONGOS_CAVERN),      "Dodongo's Cavern Boss Door", "King Dodongo",               ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL,  ENTRANCE_TYPE_DUNGEON,   "dc", 1},
    { ENTR_DODONGOS_CAVERN_1,                               ENTR_DODONGOS_CAVERN_BOSS_0,                          SINGLE_SCENE_INFO(SCENE_DODONGOS_CAVERN_BOSS), "King Dodongo",               "Dodongo's Cavern Boss Door", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL,  ENTRANCE_TYPE_DUNGEON,   "dc", 1},
+    { ENTR_DEATH_MOUNTAIN_TRAIL_5,                          -1,                                                   SINGLE_SCENE_INFO(SCENE_DODONGOS_CAVERN_BOSS), "King Dodongo",               "Dodongo's Cavern Blue Warp", ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL,  ENTRANCE_TYPE_ONE_WAY,   "dc,bw", 1},

    // Death Mountain Crater
    { ENTR_GORON_CITY_1,                                    ENTR_DEATH_MOUNTAIN_CRATER_1,                         SINGLE_SCENE_INFO(SCENE_DEATH_MOUNTAIN_CRATER), "DMC",                      "Goron City",               ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_GORON_CITY,            ENTRANCE_TYPE_OVERWORLD, "gc"},
@ -209,6 +213,7 @@ const EntranceData entranceData[] = {
    { ENTR_DEATH_MOUNTAIN_CRATER_2,                         ENTR_FIRE_TEMPLE_0,                                   SINGLE_SCENE_INFO(SCENE_FIRE_TEMPLE),           "Fire Temple",              "DMC",                      ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON},
    { ENTR_FIRE_TEMPLE_BOSS_0,                              ENTR_FIRE_TEMPLE_1,                                   SINGLE_SCENE_INFO(SCENE_FIRE_TEMPLE),           "Fire Temple Boss Door",    "Volvagia",                 ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON,   "", 1},
    { ENTR_FIRE_TEMPLE_1,                                   ENTR_FIRE_TEMPLE_BOSS_0,                              SINGLE_SCENE_INFO(SCENE_FIRE_TEMPLE_BOSS),      "Volvagia",                 "Fire Temple Boss Door",    ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_DUNGEON,   "", 1},
+    { ENTR_DEATH_MOUNTAIN_CRATER_5,                         -1,                                                   SINGLE_SCENE_INFO(SCENE_FIRE_TEMPLE_BOSS),      "Volvagia",                 "Fire Temple Blue Warp",    ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_GROUP_DEATH_MOUNTAIN_CRATER, ENTRANCE_TYPE_ONE_WAY,   "bw", 1},

    // Goron City
    { ENTR_DEATH_MOUNTAIN_TRAIL_1,                          ENTR_GORON_CITY_0,                                    SINGLE_SCENE_INFO(SCENE_GORON_CITY), "Goron City",        "DMT",               ENTRANCE_GROUP_GORON_CITY, ENTRANCE_GROUP_DEATH_MOUNTAIN_TRAIL,  ENTRANCE_TYPE_OVERWORLD, "gc"},
@ -248,6 +253,7 @@ const EntranceData entranceData[] = {
    { ENTR_ZORAS_FOUNTAIN_1,               ENTR_JABU_JABU_0,                    SINGLE_SCENE_INFO(SCENE_JABU_JABU),             "Jabu Jabu's Belly",           "ZF",                          ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON},
    { ENTR_JABU_JABU_BOSS_0,               ENTR_JABU_JABU_1,                    SINGLE_SCENE_INFO(SCENE_JABU_JABU),             "Jabu Jabu's Belly Boss Door", "Barinade",                    ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1},
    { ENTR_JABU_JABU_1,                    ENTR_JABU_JABU_BOSS_0,               SINGLE_SCENE_INFO(SCENE_JABU_JABU_BOSS),        "Barinade",                    "Jabu Jabu's Belly Boss Door", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON, "", 1},
+    { ENTR_ZORAS_FOUNTAIN_0,               -1,                                  SINGLE_SCENE_INFO(SCENE_JABU_JABU_BOSS),        "Barinade",                    "Jabu Jabu's Belly Blue Warp", ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_ONE_WAY, "bw", 1},
    { ENTR_ZORAS_FOUNTAIN_3,               ENTR_ICE_CAVERN_0,                   SINGLE_SCENE_INFO(SCENE_ICE_CAVERN),            "Ice Cavern",                  "ZF",                          ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_GROUP_ZORAS_FOUNTAIN, ENTRANCE_TYPE_DUNGEON},

    // Hyrule Field
@ -299,6 +305,7 @@ const EntranceData entranceData[] = {
    { ENTR_LAKE_HYLIA_2,                            ENTR_WATER_TEMPLE_0,                          SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE),        "Water Temple",           "Lake Hylia",             ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_DUNGEON,   "lh"},
    { ENTR_WATER_TEMPLE_BOSS_0,                     ENTR_WATER_TEMPLE_1,                          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_1,                          ENTR_WATER_TEMPLE_BOSS_0,                     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},
+    { ENTR_LAKE_HYLIA_9,                            -1,                                           SINGLE_SCENE_INFO(SCENE_WATER_TEMPLE_BOSS),   "Morpha",                 "Water Temple Blue Warp", ENTRANCE_GROUP_LAKE_HYLIA, ENTRANCE_GROUP_LAKE_HYLIA,   ENTRANCE_TYPE_ONE_WAY,   "lh,bw", 1},

    // Gerudo Area
    { ENTR_HYRULE_FIELD_5,                                  ENTR_GERUDO_VALLEY_0,                                 SINGLE_SCENE_INFO(SCENE_GERUDO_VALLEY),          "GV",                      "Hyrule Field",            ENTRANCE_GROUP_GERUDO_VALLEY, ENTRANCE_GROUP_HYRULE_FIELD,      ENTRANCE_TYPE_OVERWORLD, "hf"},
@ -329,6 +336,7 @@ const EntranceData entranceData[] = {
    { ENTR_DESERT_COLOSSUS_1,                             ENTR_SPIRIT_TEMPLE_0,                               SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE),         "Spirit Temple",                 "Desert Colossus",               ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON,   "dc"},
    { ENTR_SPIRIT_TEMPLE_BOSS_0,                          ENTR_SPIRIT_TEMPLE_1,                               SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE),         "Spirit Temple Boss Door",       "Twinrova",                      ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON,   "", 1},
    { ENTR_SPIRIT_TEMPLE_1,                               ENTR_SPIRIT_TEMPLE_BOSS_0,                          SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE_BOSS),    "Twinrova",                      "Spirit Temple Boss Door",       ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_DUNGEON,   "", 1},
+    { ENTR_DESERT_COLOSSUS_8,                             -1,                                                 SINGLE_SCENE_INFO(SCENE_SPIRIT_TEMPLE_BOSS),    "Twinrova",                      "Spirit Temple Blue Warp",       ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_GROUP_HAUNTED_WASTELAND, ENTRANCE_TYPE_ONE_WAY,   "bw", 1},

    // Market
    { ENTR_HYRULE_FIELD_7,                ENTR_MARKET_ENTRANCE_DAY_1,         {SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_DAY), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_NIGHT), SCENE_NO_SPAWN(SCENE_MARKET_ENTRANCE_RUINS)},                                                    "Market Entrance",        "Hyrule Field",           ENTRANCE_GROUP_MARKET, ENTRANCE_GROUP_HYRULE_FIELD,  ENTRANCE_TYPE_OVERWORLD, "hf"},
@ -800,6 +808,11 @@ void EntranceTrackerWindow::DrawElement() {
                    continue;
            }

+            // RANDOTODO: Only show blue warps if bluewarp shuffle is on
+            if (original->metaTag.ends_with("bw") || override->metaTag.ends_with("bw")) {
+                continue;
+            }
+
            bool isDiscovered = IsEntranceDiscovered(entrance.index);

            bool showOriginal = (!destToggle ? CVarGetInteger("gEntranceTrackerShowTo", 0) : CVarGetInteger("gEntranceTrackerShowFrom", 0)) || isDiscovered;
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@ -30,6 +30,8 @@ void DrawBottle(ItemTrackerItem item);
 void DrawQuest(ItemTrackerItem item);
 void DrawSong(ItemTrackerItem item);

+int itemTrackerSectionId;
+
 bool shouldUpdateVectors = true;

 std::vector<ItemTrackerItem> mainWindowItems = {};
@ -330,11 +332,6 @@ void ItemTrackerOnFrame() {
    }
 }

-void SaveNotes(uint32_t fileNum) {
-    CVarSetString(("gItemTrackerNotes" + std::to_string(fileNum)).c_str(), std::string(std::begin(itemTrackerNotes), std::end(itemTrackerNotes)).c_str());
-    LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-}
-
 bool IsValidSaveFile() {
    bool validSave = gSaveContext.fileNum >= 0 && gSaveContext.fileNum <= 2;
    return validSave;
@ -900,7 +897,7 @@ void DrawNotes(bool resizeable = false) {
    }
    if ((ImGui::IsItemDeactivatedAfterEdit() || (notesNeedSave && notesIdleFrames > notesMaxIdleFrames)) && IsValidSaveFile()) {
        notesNeedSave = false;
-        SaveNotes(gSaveContext.fileNum);
+        SaveManager::Instance->SaveSection(gSaveContext.fileNum, itemTrackerSectionId, true);
    }
    ImGui::EndGroup();
 }
@ -1165,6 +1162,26 @@ void UpdateVectors() {
    shouldUpdateVectors = false;
 }

+void ItemTrackerInitFile(bool isDebug) {
+    itemTrackerNotes.clear();
+    itemTrackerNotes.push_back(0);
+}
+
+void ItemTrackerSaveFile(SaveContext* saveContext, int sectionID, bool fullSave) {
+    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);
+    if (initialTrackerNotes != "") {
+        SohUtils::CopyStringToCharArray(itemTrackerNotes.Data, initialTrackerNotes.c_str(), itemTrackerNotes.size());
+    } else {
+        itemTrackerNotes.push_back(0);
+    }
+}
+
 void ItemTrackerWindow::DrawElement() {
    UpdateVectors();

@ -1465,14 +1482,9 @@ void ItemTrackerWindow::InitElement() {
        itemTrackerNotes.push_back(0);
    }

-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadFile>([](uint32_t fileNum) {
-        const char* initialTrackerNotes = CVarGetString(("gItemTrackerNotes" + std::to_string(fileNum)).c_str(), "");
-        itemTrackerNotes.resize(strlen(initialTrackerNotes) + 1);
-        strcpy(itemTrackerNotes.Data, initialTrackerNotes);
-    });
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnDeleteFile>([](uint32_t fileNum) {
-        CVarSetString(("gItemTrackerNotes" + std::to_string(fileNum)).c_str(), "");
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-    });
+    SaveManager::Instance->AddInitFunction(ItemTrackerInitFile);
+    itemTrackerSectionId = SaveManager::Instance->AddSaveFunction("itemTrackerData", 1, ItemTrackerSaveFile, true, -1);
+    SaveManager::Instance->AddLoadFunction("itemTrackerData", 1, ItemTrackerLoadFile);
+
    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(ItemTrackerOnFrame);
 }
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@ -68,6 +68,7 @@ void Settings::CreateOptions() {
    mOptions[RSK_SHUFFLE_OVERWORLD_SPAWNS] = Option::Bool("Overworld Spawns", "gRandomizeShuffleOverworldSpanws", mOptionDescriptions[RSK_SHUFFLE_OVERWORLD_SPAWNS]);
    mOptions[RSK_MIXED_ENTRANCE_POOLS] = Option::Bool("Mixed Entrance Pools", "gRandomizeMixedEntrances", mOptionDescriptions[RSK_MIXED_ENTRANCE_POOLS]);
    mOptions[RSK_MIX_DUNGEON_ENTRANCES] = Option::Bool("Mix Dungeons", "gRandomizeMixDungeons", mOptionDescriptions[RSK_MIX_DUNGEON_ENTRANCES], IMFLAG_NONE);
+    mOptions[RSK_MIX_BOSS_ENTRANCES] = Option::Bool("Mix Bosses", "gRandomizeMixBosses", mOptionDescriptions[RSK_MIX_BOSS_ENTRANCES], IMFLAG_NONE);
    mOptions[RSK_MIX_OVERWORLD_ENTRANCES] = Option::Bool("Mix Overworld", "gRandomizeMixOverworld", mOptionDescriptions[RSK_MIX_OVERWORLD_ENTRANCES], IMFLAG_NONE);
    mOptions[RSK_MIX_INTERIOR_ENTRANCES] = Option::Bool("Mix Interiors", "gRandomizeMixInteriors", mOptionDescriptions[RSK_MIX_INTERIOR_ENTRANCES], IMFLAG_NONE);
    mOptions[RSK_MIX_GROTTO_ENTRANCES] = Option::Bool("Mix Grottos", "gRandomizeMixGrottos", mOptionDescriptions[RSK_MIX_GROTTO_ENTRANCES]);
@ -639,6 +640,7 @@ void Settings::CreateOptions() {
        &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]
@ -830,6 +832,7 @@ void Settings::CreateOptions() {
        &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],
@ -1162,6 +1165,7 @@ void Settings::CreateOptions() {
        { "World Settings:Overworld Spawns", RSK_SHUFFLE_OVERWORLD_SPAWNS },
        { "World Settings:Mixed Entrance Pools", RSK_MIXED_ENTRANCE_POOLS },
        { "World Settings:Mix Dungeons", RSK_MIX_DUNGEON_ENTRANCES },
+        { "World Settings:Mix Bosses", RSK_MIX_BOSS_ENTRANCES },
        { "World Settings:Mix Overworld", RSK_MIX_OVERWORLD_ENTRANCES },
        { "World Settings:Mix Interiors", RSK_MIX_INTERIOR_ENTRANCES },
        { "World Settings:Mix Grottos", RSK_MIX_GROTTO_ENTRANCES },
@ -1538,12 +1542,14 @@ void Settings::UpdateOptionProperties() {
    if (CVarGetInteger("gRandomizeMixedEntrances", RO_GENERIC_OFF)) {
        mOptions[RSK_MIXED_ENTRANCE_POOLS].RemoveFlag(IMFLAG_SEPARATOR_BOTTOM);
        mOptions[RSK_MIX_DUNGEON_ENTRANCES].Unhide();
+        mOptions[RSK_MIX_BOSS_ENTRANCES].Unhide();
        mOptions[RSK_MIX_OVERWORLD_ENTRANCES].Unhide();
        mOptions[RSK_MIX_INTERIOR_ENTRANCES].Unhide();
        mOptions[RSK_MIX_GROTTO_ENTRANCES].Unhide();
    } else {
        mOptions[RSK_MIXED_ENTRANCE_POOLS].AddFlag(IMFLAG_SEPARATOR_BOTTOM);
        mOptions[RSK_MIX_DUNGEON_ENTRANCES].Hide();
+        mOptions[RSK_MIX_BOSS_ENTRANCES].Hide();
        mOptions[RSK_MIX_OVERWORLD_ENTRANCES].Hide();
        mOptions[RSK_MIX_INTERIOR_ENTRANCES].Hide();
        mOptions[RSK_MIX_GROTTO_ENTRANCES].Hide();
@ -2314,6 +2320,7 @@ void Settings::ParseJson(nlohmann::json spoilerFileJson) {
                case RSK_SHUFFLE_OVERWORLD_SPAWNS:
                case RSK_MIXED_ENTRANCE_POOLS:
                case RSK_MIX_DUNGEON_ENTRANCES:
+                case RSK_MIX_BOSS_ENTRANCES:
                case RSK_MIX_OVERWORLD_ENTRANCES:
                case RSK_MIX_INTERIOR_ENTRANCES:
                case RSK_MIX_GROTTO_ENTRANCES:
--- a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp
+++ b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp
@ -0,0 +1,16 @@
+#include "SpeechLogger.h"
+#include <libultraship/libultraship.h>
+
+SpeechLogger::SpeechLogger() {
+}
+
+void SpeechLogger::Speak(const char* text, const char* language) {
+    lusprintf(__FILE__, __LINE__, 2, "Spoken Text (%s): %s", language, text);
+}
+
+bool SpeechLogger::DoInit() {
+    return true;
+}
+
+void SpeechLogger::DoUninitialize() {
+}
--- a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.h
+++ b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.h
@ -0,0 +1,17 @@
+#ifndef SOHSpeechLogger_h
+#define SOHSpeechLogger_h
+
+#include "SpeechSynthesizer.h"
+
+class SpeechLogger : public SpeechSynthesizer {
+  public:
+    SpeechLogger();
+
+    void Speak(const char* text, const char* language);
+
+  protected:
+    bool DoInit(void);
+    void DoUninitialize(void);
+};
+
+#endif
--- a/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
+++ b/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
@ -36,3 +36,5 @@ class SpeechSynthesizer {
 #elif defined(__APPLE__)
 #include "DarwinSpeechSynthesizer.h"
 #endif
+
+#include "SpeechLogger.h"
--- a/soh/soh/Enhancements/tts/tts.cpp
+++ b/soh/soh/Enhancements/tts/tts.cpp
@ -11,6 +11,8 @@
 #include "message_data_static.h"
 #include "overlays/gamestates/ovl_file_choose/file_choose.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"
+#include "soh/resource/type/SohResourceType.h"
+#include "soh/resource/type/RawJson.h"

 extern "C" {
 extern MapData* gMapData;
@ -168,7 +170,7 @@ void RegisterOnInterfaceUpdateHook() {
        
        prevTimer = timer;
        
-        if (!GameInteractor::IsSaveLoaded()) return;
+        if (!GameInteractor::IsSaveLoaded(true)) return;
        
        static int16_t lostHealth = 0;
        static int16_t prevHealth = 0;
@ -1037,25 +1039,22 @@ void InitTTSBank() {
            break;
    }

-    auto sceneFile = LUS::Context::GetInstance()->GetResourceManager()->LoadFile("accessibility/texts/scenes" + languageSuffix);
-    if (sceneFile != nullptr) {
-        sceneMap = nlohmann::json::parse(sceneFile->Buffer, nullptr, true, true);
-    }
+    auto initData = std::make_shared<LUS::ResourceInitData>();
+    initData->Format = RESOURCE_FORMAT_BINARY;
+    initData->Type = static_cast<uint32_t>(SOH::ResourceType::SOH_RawJson);
+    initData->ResourceVersion = 0;
    
-    auto miscFile = LUS::Context::GetInstance()->GetResourceManager()->LoadFile("accessibility/texts/misc" + languageSuffix);
-    if (miscFile != nullptr) {
-        miscMap = nlohmann::json::parse(miscFile->Buffer, nullptr, true, true);
-    }
-    
-    auto kaleidoFile = LUS::Context::GetInstance()->GetResourceManager()->LoadFile("accessibility/texts/kaleidoscope" + languageSuffix);
-    if (kaleidoFile != nullptr) {
-        kaleidoMap = nlohmann::json::parse(kaleidoFile->Buffer, nullptr, true, true);
-    }
-    
-    auto fileChooseFile = LUS::Context::GetInstance()->GetResourceManager()->LoadFile("accessibility/texts/filechoose" + languageSuffix);
-    if (fileChooseFile != nullptr) {
-        fileChooseMap = nlohmann::json::parse(fileChooseFile->Buffer, nullptr, true, true);
-    }
+    sceneMap = std::static_pointer_cast<SOH::RawJson>(
+        LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/scenes" + languageSuffix, true, initData))->Data;
+
+    miscMap = std::static_pointer_cast<SOH::RawJson>(
+        LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/misc" + languageSuffix, true, initData))->Data;
+
+    kaleidoMap = std::static_pointer_cast<SOH::RawJson>(
+        LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/kaleidoscope" + languageSuffix, true, initData))->Data;
+
+    fileChooseMap = std::static_pointer_cast<SOH::RawJson>(
+        LUS::Context::GetInstance()->GetResourceManager()->LoadResource("accessibility/texts/filechoose" + languageSuffix, true, initData))->Data;
 }

 void RegisterOnSetGameLanguageHook() {
--- a/soh/soh/Extractor/Extract.cpp
+++ b/soh/soh/Extractor/Extract.cpp
@ -107,7 +107,8 @@ void Extractor::ShowSizeErrorBox() const {
 }

 void Extractor::ShowCrcErrorBox() const {
-    ShowErrorBox("Rom CRC invalid", "Rom CRC did not match the list of known good roms. Please find another.");
+    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 {
@ -479,7 +480,8 @@ bool Extractor::Run(std::string searchPath, RomSearchMode searchMode) {
                    ShowCrcErrorBox();
                } else {
                    ShowErrorBox("Rom CRC invalid",
-                                 "Rom CRC did not match the list of known good roms. Trying the next one...");
+                                 "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;
            }
--- a/soh/soh/GbiWrap.cpp
+++ b/soh/soh/GbiWrap.cpp
@ -14,8 +14,6 @@ void OTRGetPixelDepthPrepare(float x, float y);
 uint16_t OTRGetPixelDepth(float x, float y);
 int32_t OTRGetLastScancode();
 void ResourceMgr_LoadDirectory(const char* resName);
-void ResourceMgr_LoadFile(const char* resName);
-char* ResourceMgr_LoadFileFromDisk(const char* filePath);
 uint16_t ResourceMgr_LoadTexWidthByName(char* texPath);
 uint16_t ResourceMgr_LoadTexHeightByName(char* texPath);
 size_t ResourceGetTexSizeByName(const char* name);
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@ -94,6 +94,7 @@ GameInteractorSail* GameInteractorSail::Instance;
 #include <libultraship/libultraship.h>

 // Resource Types/Factories
+#include "soh/resource/type/SohResourceType.h"
 #include "soh/resource/type/Animation.h"
 #include "soh/resource/type/AudioSample.h"
 #include "soh/resource/type/AudioSequence.h"
@ -119,6 +120,7 @@ GameInteractorSail* GameInteractorSail::Instance;
 #include "soh/resource/importer/SkeletonLimbFactory.h"
 #include "soh/resource/importer/TextFactory.h"
 #include "soh/resource/importer/BackgroundFactory.h"
+#include "soh/resource/importer/RawJsonFactory.h"

 #include "soh/config/ConfigUpdaters.h"

@ -266,7 +268,10 @@ OTRGlobals::OTRGlobals() {
    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)) {
-                if (StringHelper::IEquals(p.path().extension().string(), ".otr")) {
+                if (StringHelper::IEquals(p.path().extension().string(), ".otr") ||
+                    StringHelper::IEquals(p.path().extension().string(), ".mpq") ||
+                    StringHelper::IEquals(p.path().extension().string(), ".o2r") ||
+                    StringHelper::IEquals(p.path().extension().string(), ".zip")) {
                    patchOTRs.push_back(p.path().generic_string());
                }
            }
@ -303,6 +308,7 @@ OTRGlobals::OTRGlobals() {
    context = LUS::Context::CreateUninitializedInstance("Ship of Harkinian", appShortName, "shipofharkinian.json");

    context->InitLogging();
+    context->InitGfxDebugger();
    context->InitConfiguration();
    context->InitConsoleVariables();

@ -321,19 +327,25 @@ OTRGlobals::OTRGlobals() {

    SPDLOG_INFO("Starting Ship of Harkinian version {}", (char*)gBuildVersion);

-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Animation, "Animation", std::make_shared<LUS::AnimationFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_PlayerAnimation, "PlayerAnimation", std::make_shared<LUS::PlayerAnimationFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Room, "Room", std::make_shared<LUS::SceneFactory>()); // Is room scene? maybe?
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_CollisionHeader, "CollisionHeader", std::make_shared<LUS::CollisionHeaderFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Skeleton, "Skeleton", std::make_shared<LUS::SkeletonFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_SkeletonLimb, "SkeletonLimb", std::make_shared<LUS::SkeletonLimbFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Path, "Path", std::make_shared<LUS::PathFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Cutscene, "Cutscene", std::make_shared<LUS::CutsceneFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Text, "Text", std::make_shared<LUS::TextFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_AudioSample, "AudioSample", std::make_shared<LUS::AudioSampleFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_AudioSoundFont, "AudioSoundFont", std::make_shared<LUS::AudioSoundFontFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_AudioSequence, "AudioSequence", std::make_shared<LUS::AudioSequenceFactory>());
-    context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SOH_Background, "Background", std::make_shared<LUS::BackgroundFactory>());
+    auto loader = context->GetResourceManager()->GetResourceLoader();
+    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::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::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<SOH::ResourceFactoryBinaryRawJsonV0>(), RESOURCE_FORMAT_BINARY, "RawJson", static_cast<uint32_t>(SOH::ResourceType::SOH_RawJson), 0);

    gSaveStateMgr = std::make_shared<SaveStateMgr>();
    gRandoContext = Rando::Context::CreateInstance();
@ -360,7 +372,7 @@ OTRGlobals::OTRGlobals() {
        cameraStrings[i] = dup;
    }

-    auto versions = context->GetResourceManager()->GetArchive()->GetGameVersions();
+    auto versions = context->GetResourceManager()->GetArchiveManager()->GetGameVersions();

    for (uint32_t version : versions) {
        if (!ValidHashes.contains(version)) {
@ -540,7 +552,7 @@ extern "C" void VanillaItemTable_Init() {
    static GetItemEntry getItemTable[] = {
        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_JUNK,            MOD_NONE, GI_BOMBCHUS_10),
+        GET_ITEM(ITEM_BOMBCHU,          OBJECT_GI_BOMB_2,        GID_BOMBCHU,          0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_BOMBCHUS_10),
        GET_ITEM(ITEM_BOW,              OBJECT_GI_BOW,           GID_BOW,              0x31, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_BOW),
        GET_ITEM(ITEM_SLINGSHOT,        OBJECT_GI_PACHINKO,      GID_SLINGSHOT,        0x30, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_SLINGSHOT),
        GET_ITEM(ITEM_BOOMERANG,        OBJECT_GI_BOOMERANG,     GID_BOOMERANG,        0x35, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_BOOMERANG),
@ -643,8 +655,8 @@ extern "C" void VanillaItemTable_Init() {
        GET_ITEM(ITEM_BOMBS_20,         OBJECT_GI_BOMB_1,        GID_BOMB,             0x32, 0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,            MOD_NONE, GI_BOMBS_20),
        GET_ITEM(ITEM_BOMBS_30,         OBJECT_GI_BOMB_1,        GID_BOMB,             0x32, 0x59, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,            MOD_NONE, GI_BOMBS_30),
        GET_ITEM(ITEM_SEEDS_30,         OBJECT_GI_SEED,          GID_SEEDS,            0xDC, 0x50, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,            MOD_NONE, GI_SEEDS_30),
-        GET_ITEM(ITEM_BOMBCHUS_5,       OBJECT_GI_BOMB_2,        GID_BOMBCHU,          0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,            MOD_NONE, GI_BOMBCHUS_5),
-        GET_ITEM(ITEM_BOMBCHUS_20,      OBJECT_GI_BOMB_2,        GID_BOMBCHU,          0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_JUNK,            MOD_NONE, GI_BOMBCHUS_20),
+        GET_ITEM(ITEM_BOMBCHUS_5,       OBJECT_GI_BOMB_2,        GID_BOMBCHU,          0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_BOMBCHUS_5),
+        GET_ITEM(ITEM_BOMBCHUS_20,      OBJECT_GI_BOMB_2,        GID_BOMBCHU,          0x33, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR,           MOD_NONE, GI_BOMBCHUS_20),
        GET_ITEM(ITEM_FISH,             OBJECT_GI_FISH,          GID_FISH,             0x47, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,            MOD_NONE, GI_FISH),
        GET_ITEM(ITEM_BUG,              OBJECT_GI_INSECT,        GID_BUG,              0x7A, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,            MOD_NONE, GI_BUGS),
        GET_ITEM(ITEM_BLUE_FIRE,        OBJECT_GI_FIRE,          GID_BLUE_FIRE,        0x5D, 0x80, CHEST_ANIM_LONG,  ITEM_CATEGORY_JUNK,            MOD_NONE, GI_BLUE_FIRE),
@ -842,7 +854,7 @@ extern "C" RandomizerGet RetrieveRandomizerGetFromItemID(ItemID itemID) {
 }

 extern "C" void OTRExtScanner() {
-    auto lst = *LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->ListFiles("*").get();
+    auto lst = *LUS::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->ListFiles().get();

    for (auto& rPath : lst) {
        std::vector<std::string> raw = StringHelper::Split(rPath, ".");
@ -865,11 +877,11 @@ 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<LUS::Archive>(otrPath, "", std::unordered_set<uint32_t>(), false);
-    if (archive->IsMainMPQValid()) {
-        auto t = archive->LoadFile("portVersion", false);
+    auto archive = LUS::OtrArchive(otrPath);
+    if (archive.Open()) {
+        auto t = archive.LoadFile("portVersion", std::make_shared<LUS::ResourceInitData>());
        if (t != nullptr && t->IsLoaded) {
-            auto stream = std::make_shared<LUS::MemoryStream>(t->Buffer.data(), t->Buffer.size());
+            auto stream = std::make_shared<LUS::MemoryStream>(t->Buffer->data(), t->Buffer->size());
            auto reader = std::make_shared<LUS::BinaryReader>(stream);
            LUS::Endianness endianness = (LUS::Endianness)reader->ReadUByte();
            reader->SetEndianness(endianness);
@ -877,10 +889,9 @@ OTRVersion ReadPortVersionFromOTR(std::string otrPath) {
            version.minor = reader->ReadUInt16();
            version.patch = reader->ReadUInt16();
        }
+        archive.Close();
    }

-    archive = nullptr;
-
    return version;
 }

@ -1107,6 +1118,9 @@ extern "C" void InitOTR() {
 #elif defined(_WIN32)
    SpeechSynthesizer::Instance = new SAPISpeechSynthesizer();
    SpeechSynthesizer::Instance->Init();
+#else
+    SpeechSynthesizer::Instance = new SpeechLogger();
+    SpeechSynthesizer::Instance->Init();
 #endif

 #ifdef ENABLE_REMOTE_CONTROL
@ -1397,7 +1411,7 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
        // Actually update the CVar now before runing the alt asset update listeners
        CVarSetInteger("gAltAssets", !CVarGetInteger("gAltAssets", 0));
        gfx_texture_cache_clear();
-        LUS::SkeletonPatcher::UpdateSkeletons();
+        SOH::SkeletonPatcher::UpdateSkeletons();
        GameInteractor::Instance->ExecuteHooks<GameInteractor::OnAssetAltChange>();
    }

@ -1418,15 +1432,15 @@ extern "C" uint16_t OTRGetPixelDepth(float x, float y) {
 }

 extern "C" uint32_t ResourceMgr_GetNumGameVersions() {
-    return LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->GetGameVersions().size();
+    return LUS::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions().size();
 }

 extern "C" uint32_t ResourceMgr_GetGameVersion(int index) {
-    return LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->GetGameVersions()[index];
+    return LUS::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions()[index];
 }

 extern "C" uint32_t ResourceMgr_GetGamePlatform(int index) {
-    uint32_t version = LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->GetGameVersions()[index];
+    uint32_t version = LUS::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions()[index];

    switch (version) {
        case OOT_NTSC_US_10:
@ -1449,7 +1463,7 @@ extern "C" uint32_t ResourceMgr_GetGamePlatform(int index) {
 }

 extern "C" uint32_t ResourceMgr_GetGameRegion(int index) {
-    uint32_t version = LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->GetGameVersions()[index];
+    uint32_t version = LUS::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->GetGameVersions()[index];

    switch (version) {
        case OOT_NTSC_US_10:
@ -1536,7 +1550,7 @@ extern "C" void ResourceMgr_UnloadResource(const char* resName) {
 // OTRTODO: There is probably a more elegant way to go about this...
 // Kenix: This is definitely leaking memory when it's called.
 extern "C" char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize) {
-    auto lst = LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->ListFiles(searchMask);
+    auto lst = LUS::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->ListFiles(searchMask);
    char** result = (char**)malloc(lst->size() * sizeof(char*));

    for (size_t i = 0; i < lst->size(); i++) {
@ -1580,10 +1594,6 @@ extern "C" void ResourceMgr_UnloadOriginalWhenAltExists(const char* resName) {
    }
 }

-extern "C" void ResourceMgr_LoadFile(const char* resName) {
-    LUS::Context::GetInstance()->GetResourceManager()->LoadResource(resName);
-}
-
 std::shared_ptr<LUS::IResource> GetResourceByNameHandlingMQ(const char* path) {
    std::string Path = path;
    if (ResourceMgr_IsGameMasterQuest()) {
@ -1605,20 +1615,6 @@ extern "C" char* GetResourceDataByNameHandlingMQ(const char* path) {
    return (char*)res->GetRawPointer();
 }

-extern "C" char* ResourceMgr_LoadFileFromDisk(const char* filePath) {
-    FILE* file = fopen(filePath, "r");
-    fseek(file, 0, SEEK_END);
-    int fSize = ftell(file);
-    fseek(file, 0, SEEK_SET);
-
-    char* data = (char*)malloc(fSize);
-    fread(data, 1, fSize, file);
-
-    fclose(file);
-
-    return data;
-}
-
 extern "C" uint8_t ResourceMgr_TexIsRaw(const char* texPath) {
    auto res = std::static_pointer_cast<LUS::Texture>(GetResourceByNameHandlingMQ(texPath));
    return res->Flags & TEX_FLAG_LOAD_AS_RAW;
@ -1626,7 +1622,7 @@ extern "C" uint8_t ResourceMgr_TexIsRaw(const char* texPath) {

 extern "C" uint8_t ResourceMgr_ResourceIsBackground(char* texPath) {
    auto res = GetResourceByNameHandlingMQ(texPath);
-    return res->GetInitData()->Type == LUS::ResourceType::SOH_Background;
+    return res->GetInitData()->Type == static_cast<uint32_t>(SOH::ResourceType::SOH_Background);
 }

 extern "C" char* ResourceMgr_LoadJPEG(char* data, size_t dataSize)
@ -1674,9 +1670,9 @@ extern "C" uint16_t ResourceMgr_LoadTexHeightByName(char* texPath);
 extern "C" char* ResourceMgr_LoadTexOrDListByName(const char* filePath) {
    auto res = GetResourceByNameHandlingMQ(filePath);

-    if (res->GetInitData()->Type == LUS::ResourceType::DisplayList)
+    if (res->GetInitData()->Type == static_cast<uint32_t>(LUS::ResourceType::DisplayList))
        return (char*)&((std::static_pointer_cast<LUS::DisplayList>(res))->Instructions[0]);
-    else if (res->GetInitData()->Type == LUS::ResourceType::Array)
+    else if (res->GetInitData()->Type == static_cast<uint32_t>(LUS::ResourceType::Array))
        return (char*)(std::static_pointer_cast<LUS::Array>(res))->Vertices.data();
    else {
        return (char*)GetResourceDataByNameHandlingMQ(filePath);
@ -1686,7 +1682,7 @@ extern "C" char* ResourceMgr_LoadTexOrDListByName(const char* filePath) {
 extern "C" char* ResourceMgr_LoadIfDListByName(const char* filePath) {
    auto res = GetResourceByNameHandlingMQ(filePath);

-    if (res->GetInitData()->Type == LUS::ResourceType::DisplayList)
+    if (res->GetInitData()->Type == static_cast<uint32_t>(LUS::ResourceType::DisplayList))
        return (char*)&((std::static_pointer_cast<LUS::DisplayList>(res))->Instructions[0]);
    
    return nullptr;
@ -1702,7 +1698,7 @@ extern "C" uint8_t GetSeedIconIndex(uint8_t index) {
 }

 extern "C" char* ResourceMgr_LoadPlayerAnimByName(const char* animPath) {
-    auto anim = std::static_pointer_cast<LUS::PlayerAnimation>(GetResourceByNameHandlingMQ(animPath));
+    auto anim = std::static_pointer_cast<SOH::PlayerAnimation>(GetResourceByNameHandlingMQ(animPath));

    return (char*)&anim->limbRotData[0];
 }
@ -1966,7 +1962,7 @@ extern "C" SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path, Skel
    // Therefore we can take this oppurtunity to take note of the Skeleton that is created...
    if (skelAnime != nullptr) {
        auto stringPath = std::string(path);
-        LUS::SkeletonPatcher::RegisterSkeleton(stringPath, skelAnime);
+        SOH::SkeletonPatcher::RegisterSkeleton(stringPath, skelAnime);
    }

    return skelHeader;
@ -1974,12 +1970,12 @@ extern "C" SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path, Skel

 extern "C" void ResourceMgr_UnregisterSkeleton(SkelAnime* skelAnime) {
    if (skelAnime != nullptr)
-        LUS::SkeletonPatcher::UnregisterSkeleton(skelAnime);
+        SOH::SkeletonPatcher::UnregisterSkeleton(skelAnime);
 }

 extern "C" void ResourceMgr_ClearSkeletons(SkelAnime* skelAnime) {
    if (skelAnime != nullptr)
-        LUS::SkeletonPatcher::ClearSkeletons();
+        SOH::SkeletonPatcher::ClearSkeletons();
 }

 extern "C" s32* ResourceMgr_LoadCSByName(const char* path) {
@ -2631,6 +2627,8 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
        } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT) &&
        (gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_FACE_TO_FACE && textId <= TEXT_SARIAS_SONG_CHANNELING_POWER)) {
            messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
+        } else if (textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) {
+            messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::merchantMessageTableID, TEXT_BEAN_SALESMAN_BUY_FOR_100);
        } else if (Randomizer_GetSettingValue(RSK_BIGGORON_HINT) && (textId == TEXT_BIGGORON_BETTER_AT_SMITHING || textId ==  TEXT_BIGGORON_WAITING_FOR_YOU || textId ==  TEXT_BIGGORON_RETURN_AFTER_A_FEW_DAYS)) {
            messageEntry = OTRGlobals::Instance->gRandomizer->GetMiscHintMessage(TEXT_BIGGORON_BETTER_AT_SMITHING, RC_DMT_TRADE_CLAIM_CHECK);
        } else if (Randomizer_GetSettingValue(RSK_BIG_POES_HINT) && (textId == TEXT_GHOST_SHOP_EXPLAINATION || textId == TEXT_GHOST_SHOP_CARD_HAS_POINTS)) {
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@ -97,8 +97,6 @@ uint8_t ResourceMgr_FileExists(const char* resName);
 uint8_t ResourceMgr_FileAltExists(const char* resName);
 void ResourceMgr_UnloadOriginalWhenAltExists(const char* resName);
 char* GetResourceDataByNameHandlingMQ(const char* path);
-void ResourceMgr_LoadFile(const char* resName);
-char* ResourceMgr_LoadFileFromDisk(const char* filePath);
 uint8_t ResourceMgr_TexIsRaw(const char* texPath);
 uint8_t ResourceMgr_ResourceIsBackground(char* texPath);
 char* ResourceMgr_LoadJPEG(char* data, size_t dataSize);
--- a/Show More
+++ b/Show More