Partial ratio text implementation

Fix potential memory issue
Text/Line vectors could've been added to even if Reddog was never enabled, thus only ever expanding in size as they couldn't update.
2026-06-13 22:16:01 -04:00 · 2025-01-19 04:22:12 -06:00 · 2025-01-17 19:22:04 -06:00 · 2025-01-18 00:20:05 +00:00 · 2025-01-17 18:17:50 -06:00 · 2025-01-17 23:03:02 +00:00
193 changed files with 5143 additions and 7523 deletions
@@ -1,73 +0,0 @@
-name: Build Project (Flatpak)
-
-on:
-  workflow_dispatch:
-
-env:
-  FLATPAK_ID: io.github.hedge_dev.unleashedrecomp
-  FREEDESKTOP_VERSION: 23.08
-  LLVM_VERSION: 18
-
-jobs:
-  build-flatpak:
-    name: Build Flatpak
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.ORG_TOKEN }}
-
-      - name: Checkout private repository
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.ASSET_REPO }}
-          token: ${{ secrets.ASSET_REPO_TOKEN }}
-          path: flatpak/private
-
-      - name: Install dependencies
-        run: |-
-          sudo apt update
-          sudo apt install -y flatpak-builder ccache
-
-      - name: Cache ccache directory
-        uses: actions/cache@v4
-        with:
-          path: /tmp/ccache
-          key: ccache-${{ runner.os }}
-
-      - name: Prepare Flatpak
-        run: |
-          flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak --user install -y flathub org.freedesktop.Sdk//${{ env.FREEDESKTOP_VERSION }}
-          flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm${{ env.LLVM_VERSION }}//${{ env.FREEDESKTOP_VERSION }}
-
-      - name: Build Flatpak
-        run: |
-          echo "commit_message=$(git log -1 --pretty=%s)" >> $GITHUB_ENV
-          export CCACHE_DIR=/tmp/ccache
-          flatpak-builder --user --force-clean --install-deps-from=flathub --repo=repo --ccache builddir ./flatpak/${{ env.FLATPAK_ID }}.json
-          flatpak build-bundle repo ./${{ env.FLATPAK_ID }}.flatpak ${{ env.FLATPAK_ID }} --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
-
-# Uploads the built flatpak bundle to GitHub
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: UnleashedRecomp-flatpak
-#          path: ./${{ env.FLATPAK_ID }}.flatpak
-      
-      - name: Upload artifact to Discord
-        env: 
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        if: ${{ env.DISCORD_WEBHOOK != '' }}
-        uses: tsickert/discord-webhook@v6.0.0
-        with:
-          webhook-url: ${{ env.DISCORD_WEBHOOK }}
-          content: |
-            OS: Linux
-            Summary: ${{ env.commit_message }}
-            Commit: ${{ github.sha }}
-            Branch: ${{ github.ref_name }}
-          filename: ./${{ env.FLATPAK_ID }}.flatpak
@@ -1,94 +0,0 @@
-name: Build Project (Windows)
-
-on:
-  workflow_dispatch:
-
-env:
-  CMAKE_PRESET: x64-Clang-Release
-
-jobs:
-  build:
-    name: Build Windows
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.ORG_TOKEN }}
-
-      - name: Checkout private repository
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ secrets.ASSET_REPO }}
-          token: ${{ secrets.ASSET_REPO_TOKEN }}
-          path: .\private
-
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ccache-${{ runner.os }}
-
-      - name: Cache vcpkg
-        uses: actions/cache@v4
-        with:
-          path: |
-            ./thirdparty/vcpkg/downloads
-            ./thirdparty/vcpkg/packages
-          key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
-          restore-keys: |
-              vcpkg-${{ runner.os }}-
-
-      - name: Install dependencies
-        run: |
-          choco install ninja
-          Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
-      
-      - name: Configure Developer Command Prompt
-        uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Prepare Project
-        run: |
-          $commitMessage = git log -1 --pretty=%s
-          Add-Content -Path $env:GITHUB_ENV -Value "commit_message=$commitMessage"
-          copy .\private\* .\UnleashedRecompLib\private
-
-      - name: Configure Project
-        run: cmake . --preset ${{ env.CMAKE_PRESET }} -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
-
-      - name: Build Project
-        run: cmake --build .\out\build\${{ env.CMAKE_PRESET }} --target UnleashedRecomp
-      
-      - name: Pack Release
-        run: |
-          New-Item -ItemType Directory -Path .\release
-          New-Item -ItemType Directory -Path .\release\D3D12
-
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\D3D12\D3D12Core.dll" -Destination ".\release\D3D12\D3D12Core.dll"
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\dxcompiler.dll" -Destination ".\release\dxcompiler.dll"
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\dxil.dll" -Destination ".\release\dxil.dll"
-          Move-Item -Path ".\out\build\${{ env.CMAKE_PRESET }}\UnleashedRecomp\UnleashedRecomp.exe" -Destination ".\release\UnleashedRecomp.exe"
-
-          Compress-Archive -Path .\release\* -DestinationPath .\UnleashedRecomp-Windows.zip
-
-# Uploads the packed zip file to GitHub
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: UnleashedRecomp-Windows
-#          path: .\UnleashedRecomp-Windows.zip
-      
-      - name: Upload artifact to Discord
-        env: 
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        if: ${{ env.DISCORD_WEBHOOK != '' }}
-        uses: tsickert/discord-webhook@v6.0.0
-        with:
-          webhook-url: ${{ env.DISCORD_WEBHOOK }}
-          content: |
-            OS: Windows
-            Summary: ${{ env.commit_message }}
-            Commit: ${{ github.sha }}
-            Branch: ${{ github.ref_name }}
-          filename: .\UnleashedRecomp-Windows.zip
@@ -1,12 +1,12 @@
-[submodule "tools/XenonRecomp"]
-	path = tools/XenonRecomp
-	url = https://github.com/hedge-dev/XenonRecomp.git
+[submodule "thirdparty/PowerRecomp"]
+	path = tools/PowerRecomp
+	url = https://github.com/hedge-dev/PowerRecomp
 [submodule "thirdparty/ddspp"]
 	path = thirdparty/ddspp
 	url = https://github.com/redorav/ddspp.git
-[submodule "tools/XenosRecomp"]
-	path = tools/XenosRecomp
-	url = https://github.com/hedge-dev/XenosRecomp.git
+[submodule "thirdparty/ShaderRecomp"]
+	path = tools/ShaderRecomp
+	url = https://github.com/hedge-dev/ShaderRecomp.git
 [submodule "thirdparty/libmspack"]
 	path = thirdparty/libmspack
 	url = https://github.com/kyz/libmspack
@@ -61,6 +61,3 @@
 [submodule "thirdparty/implot"]
 	path = thirdparty/implot
 	url = https://github.com/epezent/implot.git
-[submodule "thirdparty/json"]
-	path = thirdparty/json
-	url = https://github.com/nlohmann/json
@@ -5,8 +5,8 @@ if(NOT DEFINED ENV{VCPKG_ROOT})
 endif()

 include($ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
-set(UNLEASHED_RECOMP_THIRDPARTY_ROOT ${CMAKE_SOURCE_DIR}/thirdparty)
-set(UNLEASHED_RECOMP_TOOLS_ROOT ${CMAKE_SOURCE_DIR}/tools)
+set(SWA_THIRDPARTY_ROOT ${CMAKE_SOURCE_DIR}/thirdparty)
+set(SWA_TOOLS_ROOT ${CMAKE_SOURCE_DIR}/tools)
 set(CMAKE_CXX_STANDARD 20)
 set(BUILD_SHARED_LIBS OFF)

@@ -18,13 +18,8 @@ endif()

 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

-# Target Sandy Bridge for all projects
-add_compile_options(
-    -march=sandybridge
-)
-
-add_subdirectory(${UNLEASHED_RECOMP_THIRDPARTY_ROOT})
-add_subdirectory(${UNLEASHED_RECOMP_TOOLS_ROOT})
+add_subdirectory(${SWA_THIRDPARTY_ROOT})
+add_subdirectory(${SWA_TOOLS_ROOT})

 project("UnleashedRecomp-ALL")

@@ -23,7 +23,8 @@
                "type": "equals",
                "lhs": "${hostSystemName}",
                "rhs": "Windows"
-            }
+            },
+            "toolset": "ClangCL"
        },
        {
            "name": "x64-Clang-Debug",
@@ -1,13 +1,16 @@
 project("UnleashedRecomp")
+set(TARGET_NAME "SWA")

 if (WIN32)
-    option(UNLEASHED_RECOMP_D3D12 "Add D3D12 support for rendering" ON)
+    option(SWA_D3D12 "Add D3D12 support for rendering" ON)
 endif()

 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    option(UNLEASHED_RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF)
+    option(SWA_FLATPAK "Configure the build for Flatpak compatibility." OFF)
 endif()

+option(SWA_XAUDIO2 "Use XAudio2 for audio playback" OFF)
+
 function(BIN2C)
    cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN})

@@ -39,7 +42,9 @@ function(BIN2C)
 endfunction()

 add_compile_options(
+    -march=sandybridge
    -fno-strict-aliasing
+
    -Wno-switch
    -Wno-unused-function
    -Wno-unused-variable
@@ -59,15 +64,16 @@ else()
 endif()

 add_compile_definitions(
+    SWA_IMPL
    SDL_MAIN_HANDLED
    _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR # Microsoft wtf?
    _CRT_SECURE_NO_WARNINGS)

-set(UNLEASHED_RECOMP_PRECOMPILED_HEADERS
+set(SWA_PRECOMPILED_HEADERS
    "stdafx.h"
 )

-set(UNLEASHED_RECOMP_KERNEL_CXX_SOURCES
+set(SWA_KERNEL_CXX_SOURCES
    "kernel/imports.cpp"
    "kernel/xdm.cpp"
    "kernel/heap.cpp"
@@ -76,13 +82,21 @@ set(UNLEASHED_RECOMP_KERNEL_CXX_SOURCES
    "kernel/io/file_system.cpp"
 )

-set(UNLEASHED_RECOMP_LOCALE_CXX_SOURCES
+set(SWA_LOCALE_CXX_SOURCES
    "locale/config_locale.cpp"
    "locale/locale.cpp"
 )

+set(SWA_OS_CXX_SOURCES
+    "os/logger.cpp"
+    "os/media.cpp"
+    "os/process.cpp"
+    "os/user.cpp"
+    "os/version.cpp"
+)
+
 if (WIN32)
-    set(UNLEASHED_RECOMP_OS_CXX_SOURCES
+    list(APPEND SWA_OS_CXX_SOURCES
        "os/win32/logger_win32.cpp"
        "os/win32/media_win32.cpp"
        "os/win32/process_win32.cpp"
@@ -90,7 +104,7 @@ if (WIN32)
        "os/win32/version_win32.cpp"
    )
 elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(UNLEASHED_RECOMP_OS_CXX_SOURCES
+    list(APPEND SWA_OS_CXX_SOURCES
        "os/linux/logger_linux.cpp"
        "os/linux/media_linux.cpp"
        "os/linux/process_linux.cpp"
@@ -99,11 +113,11 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
    )
 endif()

-set(UNLEASHED_RECOMP_CPU_CXX_SOURCES
+set(SWA_CPU_CXX_SOURCES
    "cpu/guest_thread.cpp"
 )

-set(UNLEASHED_RECOMP_GPU_CXX_SOURCES
+set(SWA_GPU_CXX_SOURCES
    "gpu/video.cpp"
    "gpu/imgui/imgui_common.cpp"
    "gpu/imgui/imgui_font_builder.cpp"
@@ -111,34 +125,38 @@ set(UNLEASHED_RECOMP_GPU_CXX_SOURCES
    "gpu/rhi/plume_vulkan.cpp"
 )

-if (UNLEASHED_RECOMP_D3D12)
-    list(APPEND UNLEASHED_RECOMP_GPU_CXX_SOURCES
+if (SWA_D3D12)
+    list(APPEND SWA_GPU_CXX_SOURCES
        "gpu/rhi/plume_d3d12.cpp"
    )
 endif()

-set(UNLEASHED_RECOMP_APU_CXX_SOURCES
+set(SWA_APU_CXX_SOURCES
    "apu/audio.cpp"
    "apu/embedded_player.cpp"
-    "apu/driver/sdl2_driver.cpp"
 )

-set(UNLEASHED_RECOMP_HID_CXX_SOURCES
+if (SWA_XAUDIO2)
+    list(APPEND SWA_APU_CXX_SOURCES "apu/driver/xaudio_driver.cpp")
+else()
+    list(APPEND SWA_APU_CXX_SOURCES "apu/driver/sdl2_driver.cpp")
+endif()
+
+set(SWA_HID_CXX_SOURCES
    "hid/hid.cpp"
    "hid/driver/sdl_hid.cpp"
 )

-set(UNLEASHED_RECOMP_PATCHES_CXX_SOURCES
+set(SWA_PATCHES_CXX_SOURCES
+    "patches/ui/CHudPause_patches.cpp"
+    "patches/ui/CTitleStateIntro_patches.cpp"
+    "patches/ui/CTitleStateMenu_patches.cpp"
+    "patches/ui/frontend_listener.cpp"
    "patches/aspect_ratio_patches.cpp"
    "patches/audio_patches.cpp"
    "patches/camera_patches.cpp"
-    "patches/CGameModeStageTitle_patches.cpp"
-    "patches/CHudPause_patches.cpp"
-    "patches/CTitleStateIntro_patches.cpp"
-    "patches/CTitleStateMenu_patches.cpp"
+    "patches/debug_patches.cpp"
    "patches/fps_patches.cpp"
-    "patches/frontend_listener.cpp"
-    "patches/input_patches.cpp"
    "patches/inspire_patches.cpp"
    "patches/misc_patches.cpp"
    "patches/object_patches.cpp"
@@ -147,24 +165,32 @@ set(UNLEASHED_RECOMP_PATCHES_CXX_SOURCES
    "patches/video_patches.cpp"
 )

-set(UNLEASHED_RECOMP_UI_CXX_SOURCES
+set(SWA_UI_CXX_SOURCES
+    "ui/reddog/windows/counter_window.cpp"
+    "ui/reddog/windows/exports_window.cpp"
+    "ui/reddog/windows/view_window.cpp"
+    "ui/reddog/windows/welcome_window.cpp"
+    "ui/reddog/windows/window_list.cpp"
+    "ui/reddog/reddog_controls.cpp"
+    "ui/reddog/reddog_manager.cpp"
+    "ui/reddog/reddog_window.cpp"
+    "ui/reddog/debug_draw.cpp"
    "ui/achievement_menu.cpp"
    "ui/achievement_overlay.cpp"
+    "ui/installer_wizard.cpp"
    "ui/button_guide.cpp"
    "ui/fader.cpp"
-    "ui/game_window.cpp"
-    "ui/imgui_utils.cpp"
-    "ui/installer_wizard.cpp"
    "ui/message_window.cpp"
-    "ui/options_menu.cpp"
    "ui/options_menu_thumbnails.cpp"
+    "ui/options_menu.cpp"
+    "ui/sdl_listener.cpp"
+    "ui/game_window.cpp"
 )

-set(UNLEASHED_RECOMP_INSTALL_CXX_SOURCES
+set(SWA_INSTALL_CXX_SOURCES
    "install/installer.cpp"
    "install/iso_file_system.cpp"
    "install/memory_mapped_file.cpp"
-    "install/update_checker.cpp"
    "install/xcontent_file_system.cpp"
    "install/xex_patcher.cpp"
    "install/hashes/apotos_shamar.cpp"
@@ -177,145 +203,97 @@ set(UNLEASHED_RECOMP_INSTALL_CXX_SOURCES
    "install/hashes/update.cpp"
 )

-set(UNLEASHED_RECOMP_USER_CXX_SOURCES
+set(SWA_USER_CXX_SOURCES
    "user/achievement_data.cpp"
-    "user/achievement_manager.cpp"
    "user/config.cpp"
-    "user/registry.cpp"
-    "user/paths.cpp"
 )

-set(UNLEASHED_RECOMP_MOD_CXX_SOURCES
+set(SWA_MOD_CXX_SOURCES
    "mod/mod_loader.cpp"
 )

-set(UNLEASHED_RECOMP_THIRDPARTY_SOURCES
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/backends/imgui_impl_sdl2.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_demo.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_draw.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_tables.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui/imgui_widgets.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_demo.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot/implot_items.cpp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/libmspack/libmspack/mspack/lzxd.c"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/tiny-AES-c/aes.c"
-    "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source/smolv.cpp"
+set(SWA_THIRDPARTY_SOURCES
+    "${SWA_THIRDPARTY_ROOT}/imgui/backends/imgui_impl_sdl2.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_demo.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_draw.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_tables.cpp"
+    "${SWA_THIRDPARTY_ROOT}/imgui/imgui_widgets.cpp"
+    "${SWA_THIRDPARTY_ROOT}/implot/implot.cpp"
+    "${SWA_THIRDPARTY_ROOT}/implot/implot_demo.cpp"
+    "${SWA_THIRDPARTY_ROOT}/implot/implot_items.cpp"
+    "${SWA_THIRDPARTY_ROOT}/libmspack/libmspack/mspack/lzxd.c"
+    "${SWA_THIRDPARTY_ROOT}/tiny-AES-c/aes.c"
+    "${SWA_TOOLS_ROOT}/ShaderRecomp/thirdparty/smol-v/source/smolv.cpp"
 )

-set(UNLEASHED_RECOMP_THIRDPARTY_INCLUDES
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/concurrentqueue"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/ddspp"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/imgui"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/implot"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/json/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/libmspack/libmspack/mspack"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/magic_enum/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/stb"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/tiny-AES-c"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/TinySHA1"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/unordered_dense/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/volk"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/Vulkan-Headers/include"
-    "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/VulkanMemoryAllocator/include"
-    "${UNLEASHED_RECOMP_TOOLS_ROOT}/bc_diff"
-    "${UNLEASHED_RECOMP_TOOLS_ROOT}/XenosRecomp/thirdparty/smol-v/source"
+set(SWA_THIRDPARTY_INCLUDES
+    "${SWA_THIRDPARTY_ROOT}/concurrentqueue"
+    "${SWA_THIRDPARTY_ROOT}/ddspp"
+    "${SWA_THIRDPARTY_ROOT}/imgui"
+    "${SWA_THIRDPARTY_ROOT}/implot"
+    "${SWA_THIRDPARTY_ROOT}/libmspack/libmspack/mspack"
+    "${SWA_THIRDPARTY_ROOT}/magic_enum/include"
+    "${SWA_THIRDPARTY_ROOT}/stb"
+    "${SWA_THIRDPARTY_ROOT}/tiny-AES-c"
+    "${SWA_THIRDPARTY_ROOT}/TinySHA1"
+    "${SWA_THIRDPARTY_ROOT}/unordered_dense/include"
+    "${SWA_THIRDPARTY_ROOT}/volk"
+    "${SWA_THIRDPARTY_ROOT}/Vulkan-Headers/include"
+    "${SWA_THIRDPARTY_ROOT}/VulkanMemoryAllocator/include"
+    "${SWA_TOOLS_ROOT}/bc_diff"
+    "${SWA_TOOLS_ROOT}/ShaderRecomp/thirdparty/smol-v/source"
 )

-if (UNLEASHED_RECOMP_D3D12)
-    list(APPEND UNLEASHED_RECOMP_THIRDPARTY_INCLUDES "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/D3D12MemoryAllocator/include")
-    list(APPEND UNLEASHED_RECOMP_THIRDPARTY_SOURCES "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/D3D12MemoryAllocator/src/D3D12MemAlloc.cpp")
+if (SWA_D3D12)
+    list(APPEND SWA_THIRDPARTY_INCLUDES "${SWA_THIRDPARTY_ROOT}/D3D12MemoryAllocator/include")
+    list(APPEND SWA_THIRDPARTY_SOURCES "${SWA_THIRDPARTY_ROOT}/D3D12MemoryAllocator/src/D3D12MemAlloc.cpp")
 endif()

-set_source_files_properties(${UNLEASHED_RECOMP_THIRDPARTY_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+set_source_files_properties(${SWA_THIRDPARTY_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)

-set(UNLEASHED_RECOMP_CXX_SOURCES
+set(SWA_CXX_SOURCES
    "app.cpp"
    "exports.cpp"
    "main.cpp"
    "misc_impl.cpp"
-    "sdl_listener.cpp"
    "stdafx.cpp"
    "version.cpp"
    
-    ${UNLEASHED_RECOMP_KERNEL_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_LOCALE_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_OS_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_CPU_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_GPU_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_APU_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_HID_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_PATCHES_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_UI_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_INSTALL_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_USER_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_MOD_CXX_SOURCES}
-    ${UNLEASHED_RECOMP_THIRDPARTY_SOURCES}
-)
-
-include("version.cmake")
-
-set(VERSION_TXT "${PROJECT_SOURCE_DIR}/res/version.txt")
-
-# Only show Git info and build type if not Release.
-set(SHOW_GIT_INFO_AND_BUILD_TYPE 0)
-if (NOT ${CMAKE_BUILD_TYPE} MATCHES "Release")
-    set(SHOW_GIT_INFO_AND_BUILD_TYPE 1)
-endif()
-
-GenerateVersionSources(
-    OUTPUT_DIR ${PROJECT_SOURCE_DIR}
-    VERSION_TXT ${VERSION_TXT}
-    H_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.h.template"
-    CXX_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.cpp.template"
-    BUILD_TYPE ${CMAKE_BUILD_TYPE}
-    SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE}
-    SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE}
+    ${SWA_KERNEL_CXX_SOURCES}
+    ${SWA_LOCALE_CXX_SOURCES}
+    ${SWA_OS_CXX_SOURCES}
+    ${SWA_CPU_CXX_SOURCES}
+    ${SWA_GPU_CXX_SOURCES}
+    ${SWA_APU_CXX_SOURCES}
+    ${SWA_HID_CXX_SOURCES}
+    ${SWA_PATCHES_CXX_SOURCES}
+    ${SWA_UI_CXX_SOURCES}
+    ${SWA_INSTALL_CXX_SOURCES}
+    ${SWA_USER_CXX_SOURCES}
+    ${SWA_MOD_CXX_SOURCES}
+    ${SWA_THIRDPARTY_SOURCES}
 )

 if (WIN32)
-    # Create binary version number for Win32 integer attributes.
-    CreateVersionString(
-        VERSION_TXT ${VERSION_TXT}
-        OUTPUT_CSV 1
-        OUTPUT_VAR WIN32_VERSION_BINARY
-    )
-
-    # Create string version number for Win32 detailed attributes.
-    CreateVersionString(
-        VERSION_TXT ${VERSION_TXT}
-        BUILD_TYPE ${CMAKE_BUILD_TYPE}
-        SHOW_GIT_INFO ${SHOW_GIT_INFO_AND_BUILD_TYPE}
-        SHOW_BUILD_TYPE ${SHOW_GIT_INFO_AND_BUILD_TYPE}
-        OUTPUT_VAR WIN32_VERSION_STRING
-    )
-
-    # Set Win32 icon path.
-    set(WIN32_ICON_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources/images/game_icon.ico")
-
+    # Set up Win32 resources for application icon.
+    set(ICON_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources/images/game_icon.ico")
    configure_file("res/win32/res.rc.template" "${CMAKE_BINARY_DIR}/res.rc" @ONLY)
-    add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc")
-
-    # Hide console for release configurations.
-    if (${CMAKE_BUILD_TYPE} MATCHES "Release")
-        target_link_options(UnleashedRecomp PRIVATE "/SUBSYSTEM:WINDOWS" "/ENTRY:mainCRTStartup")
-    endif()
+    add_executable(UnleashedRecomp ${SWA_CXX_SOURCES} "${CMAKE_BINARY_DIR}/res.rc")
 else()
-    add_executable(UnleashedRecomp ${UNLEASHED_RECOMP_CXX_SOURCES})
+    add_executable(UnleashedRecomp ${SWA_CXX_SOURCES})
 endif()

-if (UNLEASHED_RECOMP_FLATPAK)
-    target_compile_definitions(UnleashedRecomp PRIVATE 
-        "UNLEASHED_RECOMP_FLATPAK"
-        "GAME_INSTALL_DIRECTORY=\"/var/data\""
-    )
+set_target_properties(UnleashedRecomp PROPERTIES OUTPUT_NAME ${TARGET_NAME})
+
+if (SWA_FLATPAK)
+    target_compile_definitions(UnleashedRecomp PRIVATE "GAME_INSTALL_DIRECTORY=\"/var/data\"")
 endif()

-if (UNLEASHED_RECOMP_D3D12)
+if (SWA_D3D12)
    find_package(directx-headers CONFIG REQUIRED)
    find_package(directx12-agility CONFIG REQUIRED)
-    target_compile_definitions(UnleashedRecomp PRIVATE UNLEASHED_RECOMP_D3D12)
+    target_compile_definitions(UnleashedRecomp PRIVATE SWA_D3D12)
 endif()

 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -323,9 +301,8 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 endif()

 find_package(directx-dxc REQUIRED)
-find_package(CURL REQUIRED)

-if (UNLEASHED_RECOMP_D3D12)
+if (SWA_D3D12)
    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12)
    add_custom_command(TARGET UnleashedRecomp POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Core,IMPORTED_LOCATION_RELEASE> ${CMAKE_CURRENT_BINARY_DIR}/D3D12
@@ -363,19 +340,18 @@ target_link_libraries(UnleashedRecomp PRIVATE
    msdf-atlas-gen::msdf-atlas-gen
    nfd::nfd
    o1heap
-    XenonUtils
+    PowerUtils
    SDL2::SDL2-static
    SDL2_mixer
    tomlplusplus::tomlplusplus
    UnleashedRecompLib
    xxHash::xxhash
-    CURL::libcurl
 )

 target_include_directories(UnleashedRecomp PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    "${CMAKE_CURRENT_SOURCE_DIR}/api"
-    ${UNLEASHED_RECOMP_THIRDPARTY_INCLUDES}
+    ${SWA_THIRDPARTY_INCLUDES}
 )

 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -384,12 +360,12 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
    target_link_libraries(UnleashedRecomp PRIVATE ${X11_LIBRARIES})
 endif()

-target_precompile_headers(UnleashedRecomp PUBLIC ${UNLEASHED_RECOMP_PRECOMPILED_HEADERS})
+target_precompile_headers(UnleashedRecomp PUBLIC ${SWA_PRECOMPILED_HEADERS})

 function(compile_shader FILE_PATH TARGET_NAME)
    set(FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/gpu/shader/${FILE_PATH}.hlsl)
    cmake_path(GET FILE_PATH STEM VARIABLE_NAME)
-    if (UNLEASHED_RECOMP_D3D12)
+    if (SWA_D3D12)
        add_custom_command(
            OUTPUT ${FILE_PATH}.dxil.h
            COMMAND ${DIRECTX_DXC_TOOL} -T ${TARGET_NAME} -HV 2021 -all-resources-bound -Wno-ignored-attributes -Fh ${FILE_PATH}.dxil.h ${FILE_PATH} -Vn g_${VARIABLE_NAME}_dxil
@@ -413,7 +389,6 @@ function(compile_pixel_shader FILE_PATH)
    compile_shader(${FILE_PATH} ps_6_0)
 endfunction()

-compile_pixel_shader(blend_color_alpha_ps)
 compile_vertex_shader(copy_vs)
 compile_pixel_shader(csd_filter_ps)
 compile_vertex_shader(csd_no_tex_vs)
@@ -461,6 +436,23 @@ generate_aggregate_header(
    "${CMAKE_CURRENT_SOURCE_DIR}/api/SWA.h"
 )

+# Only show build type if not Release.
+set(IS_BUILD_TYPE_IN_VER_STRING 0)
+if (NOT ${CMAKE_BUILD_TYPE} MATCHES "Release")
+    set(IS_BUILD_TYPE_IN_VER_STRING 1)
+endif()
+
+include("version.cmake")
+GenerateVersionSources(
+    OUTPUT_DIR "${PROJECT_SOURCE_DIR}"
+    VERSION_TXT "${PROJECT_SOURCE_DIR}/res/version.txt"
+    H_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.h.template"
+    CXX_TEMPLATE "${PROJECT_SOURCE_DIR}/res/version.cpp.template"
+    BUILD_TYPE ${CMAKE_BUILD_TYPE}
+    IS_BUILD_TYPE_IN_VER_STRING ${IS_BUILD_TYPE_IN_VER_STRING}
+    IS_GIT_REPO 1
+)
+
 set(RESOURCES_SOURCE_PATH "${PROJECT_SOURCE_DIR}/../UnleashedRecompResources")
 set(RESOURCES_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/res")

@@ -474,7 +466,24 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/co
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/kbm.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/kbm.dds" ARRAY_NAME "g_kbm" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select_fade.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select_fade.dds" ARRAY_NAME "g_select_fade" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/select_fill.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/select_fill.dds" ARRAY_NAME "g_select_fill" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/common/light.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/common/light.dds" ARRAY_NAME "g_light" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_close_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_close_1.dds" ARRAY_NAME "g_button_close_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_close_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_close_2.dds" ARRAY_NAME "g_button_close_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_minimum_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_minimum_1.dds" ARRAY_NAME "g_button_minimum_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_minimum_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_minimum_2.dds" ARRAY_NAME "g_button_minimum_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_pin_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_pin_1.dds" ARRAY_NAME "g_button_pin_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/button_pin_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/button_pin_2.dds" ARRAY_NAME "g_button_pin_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/checkbox_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/checkbox_1.dds" ARRAY_NAME "g_checkbox_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/checkbox_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/checkbox_2.dds" ARRAY_NAME "g_checkbox_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/common_button_1.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/common_button_1.dds" ARRAY_NAME "g_common_button_1")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/common_button_2.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/common_button_2.dds" ARRAY_NAME "g_common_button_2")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/common_icon.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/common_icon.dds" ARRAY_NAME "g_common_icon")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/debug_icon.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/debug_icon.dds" ARRAY_NAME "g_debug_icon")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor.bmp" ARRAY_NAME "g_mouse_cursor")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_h.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_h.bmp" ARRAY_NAME "g_mouse_cursor_h")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_slant_l.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_slant_l.bmp" ARRAY_NAME "g_mouse_cursor_slant_l")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_slant_r.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_slant_r.bmp" ARRAY_NAME "g_mouse_cursor_slant_r")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/mouse_cursor_v.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/mouse_cursor_v.bmp" ARRAY_NAME "g_mouse_cursor_v")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/reddog/title_bar.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/reddog/title_bar.dds" ARRAY_NAME "g_title_bar")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/arrow_circle.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/arrow_circle.dds" ARRAY_NAME "g_arrow_circle" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_001.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_001.dds" ARRAY_NAME "g_install_001" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/install_002.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/install_002.dds" ARRAY_NAME "g_install_002" COMPRESSION_TYPE "zstd")
@@ -488,6 +497,7 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/in
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/installer/pulse_install.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/installer/pulse_install.dds" ARRAY_NAME "g_pulse_install" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/achievement_notifications.dds" ARRAY_NAME "g_achievement_notifications" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_background_input.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_background_input.dds" ARRAY_NAME "g_allow_background_input" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/allow_dpad_movement.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/allow_dpad_movement.dds" ARRAY_NAME "g_allow_dpad_movement" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/antialiasing.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/antialiasing.dds" ARRAY_NAME "g_antialiasing" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/aspect_ratio.dds" ARRAY_NAME "g_aspect_ratio" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/battle_theme.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/battle_theme.dds" ARRAY_NAME "g_battle_theme" COMPRESSION_TYPE "zstd")
@@ -501,7 +511,8 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/op
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bilinear.dds" ARRAY_NAME "g_gi_texture_filtering_bilinear" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/gi_texture_filtering_bicubic.dds" ARRAY_NAME "g_gi_texture_filtering_bicubic" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/hints.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/hints.dds" ARRAY_NAME "g_hints" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/horizontal_camera.dds" ARRAY_NAME "g_horizontal_camera" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/invert_camera_x.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/invert_camera_x.dds" ARRAY_NAME "g_invert_camera_x" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/invert_camera_y.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/invert_camera_y.dds" ARRAY_NAME "g_invert_camera_y" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/language.dds" ARRAY_NAME "g_language" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/master_volume.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/master_volume.dds" ARRAY_NAME "g_master_volume" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/monitor.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/monitor.dds" ARRAY_NAME "g_monitor" COMPRESSION_TYPE "zstd")
@@ -524,12 +535,12 @@ BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/op
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_false.dds" ARRAY_NAME "g_transparency_antialiasing_false" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/transparency_antialiasing_true.dds" ARRAY_NAME "g_transparency_antialiasing_true" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/ui_scale_mode.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/ui_scale_mode.dds" ARRAY_NAME "g_ui_scale_mode" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vertical_camera.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vertical_camera.dds" ARRAY_NAME "g_vertical_camera" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/voice_language.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/voice_language.dds" ARRAY_NAME "g_voice_language" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vibration.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vibration.dds" ARRAY_NAME "g_vibration" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/vsync.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/vsync.dds" ARRAY_NAME "g_vsync" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/window_size.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/window_size.dds" ARRAY_NAME "g_window_size" COMPRESSION_TYPE "zstd")
-BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction.dds" ARRAY_NAME "g_xbox_color_correction" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction_false.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction_false.dds" ARRAY_NAME "g_xbox_color_correction_false" COMPRESSION_TYPE "zstd")
+BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/thumbnails/xbox_color_correction_true.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/thumbnails/xbox_color_correction_true.dds" ARRAY_NAME "g_xbox_color_correction_true" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/options_menu/miles_electric.dds" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/options_menu/miles_electric.dds" ARRAY_NAME "g_miles_electric" COMPRESSION_TYPE "zstd")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon.bmp" ARRAY_NAME "g_game_icon")
 BIN2C(TARGET_OBJ UnleashedRecomp SOURCE_FILE "${RESOURCES_SOURCE_PATH}/images/game_icon_night.bmp" DEST_FILE "${RESOURCES_OUTPUT_PATH}/images/game_icon_night.bmp" ARRAY_NAME "g_game_icon_night")
@@ -9,41 +9,41 @@ namespace Chao::CSD

    inline void CNode::SetText(const char* in_pText)
    {
-        GuestToHostFunction<int>(sub_830BF640, this, in_pText);
+        GuestToHostFunction<int>(0x830BF640, this, in_pText);
    }

    inline void CNode::SetText(const wchar_t* in_pText)
    {
-        GuestToHostFunction<int>(sub_830BF640, this, in_pText);
+        GuestToHostFunction<int>(0x830BF640, this, in_pText);
    }

    inline void CNode::GetPosition(Hedgehog::Math::CVector2& out_rResult) const
    {
-        GuestToHostFunction<void>(sub_830BF008, &out_rResult, this);
+        GuestToHostFunction<void>(0x830BF008, &out_rResult, this);
    }

    inline void CNode::SetPosition(float in_X, float in_Y)
    {
-        GuestToHostFunction<int>(sub_830BF078, this, in_X, in_Y);
+        GuestToHostFunction<int>(0x830BF078, this, in_X, in_Y);
    }

    inline void CNode::SetHideFlag(uint32_t in_HideFlag)
    {
-        GuestToHostFunction<int>(sub_830BF080, this, in_HideFlag);
+        GuestToHostFunction<int>(0x830BF080, this, in_HideFlag);
    }

    inline void CNode::SetRotation(float in_Rotation)
    {
-        GuestToHostFunction<int>(sub_830BF088, this, in_Rotation);
+        GuestToHostFunction<int>(0x830BF088, this, in_Rotation);
    }

    inline void CNode::SetScale(float in_X, float in_Y)
    {
-        GuestToHostFunction<int>(sub_830BF090, this, in_X, in_Y);
+        GuestToHostFunction<int>(0x830BF090, this, in_X, in_Y);
    }

    inline void CNode::SetPatternIndex(uint32_t in_PatternIndex)
    {
-        GuestToHostFunction<int>(sub_830BF300, this, in_PatternIndex);
+        GuestToHostFunction<int>(0x830BF300, this, in_PatternIndex);
    }
 }
@@ -5,20 +5,20 @@ namespace Chao::CSD
    inline RCPtr<CScene> CProject::CreateScene(const char* in_pName) const
    {
        RCPtr<CScene> rcScene;
-        GuestToHostFunction<void>(sub_830BEE00, this, rcScene, in_pName, nullptr);
+        GuestToHostFunction<void>(0x830BEE00, this, rcScene, in_pName, nullptr);
        return rcScene;
    }

    inline RCPtr<CScene> CProject::CreateScene(const char* in_pName, const char* in_pMotionName) const
    {
        RCPtr<CScene> rcScene;
-        GuestToHostFunction<void>(sub_830BECE0, this, rcScene, in_pName, in_pMotionName, nullptr);
+        GuestToHostFunction<void>(0x830BECE0, this, rcScene, in_pName, in_pMotionName, nullptr);
        return rcScene;
    }

    inline void CProject::DestroyScene(CScene* in_pScene)
    {
-        GuestToHostFunction<void>(sub_830BE298, this, in_pScene);
+        GuestToHostFunction<void>(0x830BE298, this, in_pScene);
    }

    inline void CProject::DestroyScene(RCPtr<CScene>& inout_rcScene)
@@ -30,6 +30,6 @@ namespace Chao::CSD

    inline void RCPtrAbs::RCObject::Release()
    {
-        GuestToHostFunction<void>(sub_830BA068, this);
+        GuestToHostFunction<void>(0x830BA068, this);
    }
 }
@@ -27,12 +27,12 @@ namespace Chao::CSD

    inline void RCPtrAbs::AttachAbs(void* in_pMemory)
    {
-        GuestToHostFunction<void>(sub_830BA298, this, in_pMemory);
+        GuestToHostFunction<void>(0x830BA298, this, in_pMemory);
    }

    inline void RCPtrAbs::SetAbs(const RCPtrAbs& in_rPtr)
    {
-        GuestToHostFunction<void>(sub_830BA328, this, in_rPtr);
+        GuestToHostFunction<void>(0x830BA328, this, in_rPtr);
    }

    inline void* RCPtrAbs::operator*() const
@@ -22,7 +22,7 @@ namespace Chao::CSD

    inline bool CScene::SetMotion(const char* in_pName)
    {
-        return GuestToHostFunction<bool>(sub_830BA760, this, in_pName);
+        return GuestToHostFunction<bool>(0x830BA760, this, in_pName);
    }

    inline void CScene::SetMotionFrame(float in_MotionFrame)
@@ -33,21 +33,21 @@ namespace Chao::CSD

    inline void CScene::SetPosition(float in_X, float in_Y)
    {
-        GuestToHostFunction<void>(sub_830BB550, this, in_X, in_Y);
+        GuestToHostFunction<void>(0x830BB550, this, in_X, in_Y);
    }

    inline void CScene::SetHideFlag(uint32_t in_HideFlag)
    {
-        GuestToHostFunction<void>(sub_830BB378, this, in_HideFlag);
+        GuestToHostFunction<void>(0x830BB378, this, in_HideFlag);
    }

    inline void CScene::SetRotation(float in_Angle)
    {
-        GuestToHostFunction<void>(sub_830BB5F8, this, in_Angle);
+        GuestToHostFunction<void>(0x830BB5F8, this, in_Angle);
    }

    inline void CScene::SetScale(float in_X, float in_Y)
    {
-        GuestToHostFunction<void>(sub_830BB650, this, in_X, in_Y);
+        GuestToHostFunction<void>(0x830BB650, this, in_X, in_Y);
    }
 }
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Math
+{
+    class CAabb // Eigen::AlignedBox3f
+    {
+    public:
+        Hedgehog::Math::CVector min;
+        Hedgehog::Math::CVector max;
+
+        CVector Center() const;
+    };
+
+    SWA_ASSERT_SIZEOF(CAabb, 0x18);
+}
+
+#include "Aabb.inl"
@@ -0,0 +1,12 @@
+namespace Hedgehog::Math
+{
+    inline CVector Hedgehog::Math::CAabb::Center() const
+    {
+        // return (min + max) / 2;
+        Hedgehog::Math::CVector result;
+        result.X = (max.X + min.X) * 0.5f;
+        result.Y = (max.Y + min.Y) * 0.5f;
+        result.Z = 0.5f * (max.Z + min.Z);
+        return result;
+    }
+}
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Math
+{
+    class CMatrix
+    {
+    public:
+        be<float> data[16]; // Eigen::Affine3f
+    };
+
+    class CMatrix44
+    {
+    public:
+        be<float> data[16]; // Eigen::Matrix4f
+    };
+
+    SWA_ASSERT_SIZEOF(CMatrix, 0x40);
+    SWA_ASSERT_SIZEOF(CMatrix44, 0x40);
+}
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Math
+{
+    class CQuaternion //Eigen::Quaternionf;
+    {
+    public:
+        be<float> X;
+        be<float> Y;
+        be<float> Z;
+        be<float> W;
+    };
+
+    SWA_ASSERT_SIZEOF(CQuaternion, 0x10);
+}
@@ -17,7 +17,6 @@ namespace Hedgehog::Math
        be<float> X;
        be<float> Y;
        be<float> Z;
-        be<float> W;
    };

    class CVector4
@@ -29,3 +28,5 @@ namespace Hedgehog::Math
        be<float> W;
    };
 }
+
+#include "Vector.inl"
@@ -0,0 +1,4 @@
+namespace Hedgehog::Math
+{
+
+}
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <SWA.inl>
+
+namespace Hedgehog::Mirage
+{
+    class CCamera : Base::CObject
+    {
+    public:
+        Math::CMatrix m_View;
+        Math::CMatrix44 m_Projection;
+        Math::CVector m_Position;
+        Math::CVector m_Direction;
+        be<float> m_AspectRatio;
+        be<float> m_Near;
+        be<float> m_Far;
+    };
+}
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-#include <Hedgehog/Base/hhObject.h>
-#include <Hedgehog/Universe/Engine/hhMessageProcess.h>
-#include <Hedgehog/Universe/Engine/hhStateMachineMessageReceiver.h>
-
-namespace Hedgehog::Universe
-{
-    class CStateMachineBase : public IStateMachineMessageReceiver, public Base::CObject
-    {
-    public:
-        class CStateBase : public IMessageProcess
-        {
-        public:
-            SWA_INSERT_PADDING(0x08);
-            xpointer<void> m_pContext;
-            xpointer<CStateMachineBase> m_pStateMachine;
-            be<float> m_Time;
-            SWA_INSERT_PADDING(0x4C);
-
-            void* GetContextBase() const;
-
-            template<typename T>
-            T* GetContextBase() const;
-        };
-
-        SWA_INSERT_PADDING(0x60);
-    };
-}
-
-#include <Hedgehog/Universe/Engine/hhStateMachineBase.inl>
@@ -1,13 +0,0 @@
-namespace Hedgehog::Universe
-{
-    inline void* CStateMachineBase::CStateBase::GetContextBase() const
-    {
-        return m_pContext;
-    }
-
-    template<typename T>
-    inline T* CStateMachineBase::CStateBase::GetContextBase() const
-    {
-        return (T*)m_pContext.get();
-    }
-}
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace Hedgehog::Universe
-{
-    class IStateMachineMessageReceiver
-    {
-    public:
-        IStateMachineMessageReceiver(const swa_null_ctor&) {}
-    };
-}
@@ -27,7 +27,11 @@
 #include "Hedgehog/Base/Type/hhSharedString.h"
 #include "Hedgehog/Base/hhObject.h"
 #include "Hedgehog/Database/System/hhDatabaseData.h"
+#include "Hedgehog/Math/Aabb.h"
+#include "Hedgehog/Math/Matrix.h"
+#include "Hedgehog/Math/Quaternion.h"
 #include "Hedgehog/Math/Vector.h"
+#include "Hedgehog/MirageCore/Camera/hhCamera.h"
 #include "Hedgehog/MirageCore/Misc/hhVertexDeclarationPtr.h"
 #include "Hedgehog/MirageCore/RenderData/hhMaterialData.h"
 #include "Hedgehog/MirageCore/RenderData/hhMeshData.h"
@@ -47,12 +51,9 @@
 #include "Hedgehog/Sparkle/hhParticleMaterial.h"
 #include "Hedgehog/Universe/Engine/hhMessageActor.h"
 #include "Hedgehog/Universe/Engine/hhMessageProcess.h"
-#include "Hedgehog/Universe/Engine/hhStateMachineBase.h"
-#include "Hedgehog/Universe/Engine/hhStateMachineMessageReceiver.h"
 #include "Hedgehog/Universe/Engine/hhUpdateInfo.h"
 #include "Hedgehog/Universe/Engine/hhUpdateUnit.h"
 #include "Hedgehog/Universe/Thread/hhParallelJob.h"
-#include "SWA/Achievement/AchievementID.h"
 #include "SWA/Achievement/AchievementManager.h"
 #include "SWA/Achievement/AchievementTest.h"
 #include "SWA/CSD/CsdDatabaseWrapper.h"
@@ -60,8 +61,6 @@
 #include "SWA/CSD/CsdTexListMirage.h"
 #include "SWA/CSD/GameObjectCSD.h"
 #include "SWA/Camera/Camera.h"
-#include "SWA/Camera/CameraController.h"
-#include "SWA/CharacterUtility/CharacterProxy.h"
 #include "SWA/Globals.h"
 #include "SWA/HUD/GeneralWindow/GeneralWindow.h"
 #include "SWA/HUD/Loading/Loading.h"
@@ -77,9 +76,10 @@
 #include "SWA/Inspire/InspireTextureAnimationInfo.h"
 #include "SWA/Inspire/InspireTextureOverlay.h"
 #include "SWA/Inspire/InspireTextureOverlayInfo.h"
-#include "SWA/Menu/MenuWindowBase.h"
 #include "SWA/Movie/MovieDisplayer.h"
 #include "SWA/Movie/MovieManager.h"
+#include "SWA/Path/PathController.h"
+#include "SWA/Path/Animation/PathAnimation.h"
 #include "SWA/Player/Character/EvilSonic/EvilSonic.h"
 #include "SWA/Player/Character/EvilSonic/EvilSonicContext.h"
 #include "SWA/Player/Character/EvilSonic/Hud/EvilHudGuide.h"
@@ -98,18 +98,14 @@
 #include "SWA/System/GameMode/GameMode.h"
 #include "SWA/System/GameMode/GameModeStage.h"
 #include "SWA/System/GameMode/GameModeStageMovie.h"
-#include "SWA/System/GameMode/GameModeStageTitle.h"
 #include "SWA/System/GameMode/Title/TitleMenu.h"
 #include "SWA/System/GameMode/Title/TitleStateBase.h"
-#include "SWA/System/GameMode/Title/TitleStateIntro.h"
-#include "SWA/System/GameMode/Title/TitleStateWorldMap.h"
-#include "SWA/System/GameMode/WorldMap/WorldMapCamera.h"
-#include "SWA/System/GameMode/WorldMap/WorldMapCursor.h"
 #include "SWA/System/GameObject.h"
 #include "SWA/System/GameParameter.h"
 #include "SWA/System/GammaController.h"
 #include "SWA/System/InputState.h"
 #include "SWA/System/PadState.h"
+#include "SWA/System/StageManager.h"
 #include "SWA/System/World.h"
 #include "boost/smart_ptr/make_shared_object.h"
 #include "boost/smart_ptr/shared_ptr.h"
@@ -1,55 +0,0 @@
-#pragma once
-
-enum EAchievementID : uint32_t
-{
-    eAchievementID_StillBroken = 24,
-    eAchievementID_LookingBetter,
-    eAchievementID_StillAJigsawPuzzle,
-    eAchievementID_PickingUpThePieces,
-    eAchievementID_AlmostThere,
-    eAchievementID_OneMoreToGo,
-    eAchievementID_WorldSavior = 31,
-    eAchievementID_PartlyCloudy,
-    eAchievementID_Sunny,
-    eAchievementID_HalfMoon,
-    eAchievementID_FullMoon,
-    eAchievementID_BlueStreak,
-    eAchievementID_PowerOverwhelming,
-    eAchievementID_GettingTheHangOfThings,
-    eAchievementID_CreatureOfTheNight,
-    eAchievementID_HelpingHand,
-    eAchievementID_LayTheSmackdown,
-    eAchievementID_WallCrawler,
-    eAchievementID_Airdevil,
-    eAchievementID_Hyperdrive,
-    eAchievementID_Basher,
-    eAchievementID_Smasher,
-    eAchievementID_Crasher,
-    eAchievementID_Thrasher,
-    eAchievementID_SocialButterfly,
-    eAchievementID_HungryHungryHedgehog,
-    eAchievementID_AcePilot,
-    eAchievementID_DayTripper,
-    eAchievementID_HardDaysNight,
-    eAchievementID_GetOnTheExorciseBandwagon,
-    eAchievementID_GyroWithRelish = 64,
-    eAchievementID_PigInABlanket,
-    eAchievementID_ExoticToppings,
-    eAchievementID_SausageFriedRice,
-    eAchievementID_IcedHotdog,
-    eAchievementID_KebabOnABun,
-    eAchievementID_KetchupAndMustard,
-    eAchievementID_HardBoiled,
-    eAchievementID_FriedClamRoll,
-    eAchievementID_FirstTimeCustomer,
-    eAchievementID_OhYouShouldntHave,
-    eAchievementID_ThatsEnoughSeriously,
-    eAchievementID_Hedgehunk,
-    eAchievementID_IAintAfraidOfNoGhost,
-    eAchievementID_BFFs,
-    eAchievementID_SpeedingTicket,
-    eAchievementID_ComboKing,
-    eAchievementID_RingLeader,
-    eAchievementID_KnockoutBrawler,
-    eAchievementID_BlueMeteor
-};
@@ -1,7 +1,6 @@
 #pragma once

 #include <SWA.inl>
-#include <SWA/Achievement/AchievementID.h>

 namespace SWA::Achievement
 {
@@ -12,7 +11,7 @@ namespace SWA::Achievement
        {
        public:
            SWA_INSERT_PADDING(0x08);
-            be<EAchievementID> m_AchievementID;
+            be<uint32_t> m_AchievementID;
        };

        SWA_INSERT_PADDING(0x98);
@@ -1,7 +1,6 @@
 #pragma once

 #include <SWA.inl>
-#include <SWA/Achievement/AchievementID.h>

 namespace SWA
 {
@@ -10,7 +9,7 @@ namespace SWA
    public:
        SWA_INSERT_PADDING(0x38);
        be<uint32_t> m_Unk1;
-        be<EAchievementID> m_AchievementID;
+        be<uint32_t> m_AchievementID;
        uint8_t m_Unk2;
    };
 }
@@ -3,7 +3,7 @@ namespace SWA
    inline boost::shared_ptr<CCsdProject> CCsdDatabaseWrapper::GetCsdProject(const Hedgehog::Base::CSharedString& in_rName)
    {
        boost::shared_ptr<CCsdProject> spCsdProject;
-        GuestToHostFunction<void>(sub_825E2B40, &in_rName, this, &spCsdProject, 0);
+        GuestToHostFunction<void>(0x825E2B40, &in_rName, this, &spCsdProject, 0);
        return spCsdProject;
    }
 }
@@ -9,6 +9,7 @@ namespace SWA
    {
    public:
        xpointer<void> m_pVftable;
+        // SWA::CCamera::MyCamera
        SWA_INSERT_PADDING(0xC4); 
        be<float> m_VertAspectRatio;
        SWA_INSERT_PADDING(0x48);
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CCameraController : public Hedgehog::Universe::CStateMachineBase::CStateBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x04);
-        be<float> m_FieldOfView;
-        SWA_INSERT_PADDING(0x68);
-    };
-
-    SWA_ASSERT_OFFSETOF(CCameraController, m_FieldOfView, 0x64);
-    SWA_ASSERT_SIZEOF(CCameraController, 0xD0);
-}
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <Hedgehog/Math/Vector.h>
-
-namespace SWA
-{
-    class CCharacterProxy
-    {
-    public:
-        SWA_INSERT_PADDING(0x120);
-        Hedgehog::Math::CVector m_Position;
-        Hedgehog::Math::CVector m_Velocity;
-    };
-}
@@ -21,20 +21,14 @@ namespace SWA
    {
    public:
        SWA_INSERT_PADDING(0xD8);
-        be<uint32_t> m_FieldD8;
+        be<uint32_t> m_pUnk;
        SWA_INSERT_PADDING(0x3C);
        Chao::CSD::RCPtr<Chao::CSD::CScene> m_rcNightToDay;
        SWA_INSERT_PADDING(0x0C);
        be<uint32_t> m_IsVisible;
        SWA_INSERT_PADDING(0x0C);
        be<ELoadingDisplayType> m_LoadingDisplayType;
-        SWA_INSERT_PADDING(0x61);
+        SWA_INSERT_PADDING(0x65);
        bool m_IsNightToDay;
    };
-
-    SWA_ASSERT_OFFSETOF(CLoading, m_FieldD8, 0xD8);
-    SWA_ASSERT_OFFSETOF(CLoading, m_rcNightToDay, 0x118);
-    SWA_ASSERT_OFFSETOF(CLoading, m_IsVisible, 0x12C);
-    SWA_ASSERT_OFFSETOF(CLoading, m_LoadingDisplayType, 0x13C);
-    SWA_ASSERT_OFFSETOF(CLoading, m_IsNightToDay, 0x1A1);
 }
@@ -48,7 +48,8 @@ namespace SWA
    class CHudPause : public CGameObject
    {
    public:
-        SWA_INSERT_PADDING(0x30);
+        xpointer<void> m_pVftable;
+        SWA_INSERT_PADDING(0x2C);
        RCPtr<CProject> m_rcPause;
        RCPtr<CScene> m_rcBg;
        RCPtr<CScene> m_rcBg1;
@@ -57,32 +58,12 @@ namespace SWA
        RCPtr<CScene> m_rcBg1Select_2;
        RCPtr<CScene> m_rcStatusTitle;
        RCPtr<CScene> m_rcFooterA;
-        SWA_INSERT_PADDING(0x59);
-        bool m_IsVisible;
-        SWA_INSERT_PADDING(0x02);
+        SWA_INSERT_PADDING(0x5C);
        be<EActionType> m_Action;
        be<EMenuType> m_Menu;
        be<EStatusType> m_Status;
        be<ETransitionType> m_Transition;
-        SWA_INSERT_PADDING(0x04);
-        be<uint32_t> m_Submenu;
-        SWA_INSERT_PADDING(0x18);
+        SWA_INSERT_PADDING(0x20);
        bool m_IsShown;
    };
-
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcPause, 0xEC);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg, 0xF4);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1, 0xFC);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1_2, 0x104);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1Select, 0x10C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcBg1Select_2, 0x114);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcStatusTitle, 0x11C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_rcFooterA, 0x124);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_IsVisible, 0x185);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Action, 0x188);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Menu, 0x18C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Status, 0x190);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Transition, 0x194);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_Submenu, 0x19C);
-    SWA_ASSERT_OFFSETOF(CHudPause, m_IsShown, 0x1B8);
 }
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CMenuWindowBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x10);
-    };
-}
@@ -0,0 +1,22 @@
+#pragma once
+
+
+namespace SWA::PathAnimation
+{
+    class Entity
+    {
+    public:
+        xpointer<void> m_pVftable;
+        SWA_INSERT_PADDING(0x18);
+    };
+
+
+    class Controller
+    {
+    public:
+        xpointer<void> m_pVftable;
+        SWA_INSERT_PADDING(0x1C);
+        be<float> m_DistanceAlongPath;
+    };
+    SWA_ASSERT_OFFSETOF(Controller, m_DistanceAlongPath, 0x20);
+}
@@ -0,0 +1,13 @@
+#pragma once
+#include "Animation/PathAnimation.h"
+
+namespace SWA
+{
+    class CPathController
+    {
+    public:
+        be<uint32_t> m_Field000;
+        be<uint32_t> m_Field004;
+        boost::shared_ptr<PathAnimation::Controller> m_spPathAnimationController;
+    };
+}
@@ -29,7 +29,8 @@ namespace SWA
                SWA_INSERT_PADDING(0x10);
            };

-            SWA_INSERT_PADDING(0x1C);
+            SWA_INSERT_PADDING(0x10);
+            hh::map<Hedgehog::Base::CSharedString, boost::shared_ptr<SWA::CWorld>> m_Worlds;
            boost::shared_ptr<Hedgehog::Database::CDatabase> m_spDatabase;
            SWA_INSERT_PADDING(0x88);
            Hedgehog::Base::CSharedString m_StageName;
@@ -4,9 +4,10 @@

 namespace SWA
 {
-    class CGameMode : public Hedgehog::Universe::CStateMachineBase::CStateBase
+    class CGameMode // : Hedgehog::Universe::TStateMachine<SWA::CGame>::TState
    {
    public:
+        SWA_INSERT_PADDING(0x60); // base
        SWA_INSERT_PADDING(0x08);
    };
 }
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CGameModeStageTitle : public CGameModeStage
-    {
-    public:
-        SWA_INSERT_PADDING(0x0E);
-        bool m_IsPlayingAdvertiseMovie;
-        be<float> m_AdvertiseMovieWaitTime;
-    };
-}
@@ -4,14 +4,19 @@

 namespace SWA
 {
-    class CTitleStateBase : public Hedgehog::Universe::CStateMachineBase::CStateBase
+    class CTitleStateBase // : Hedgehog::Universe::TStateMachine<SWA::CTitleManager>::TState
    {
    public:
-        class CTitleStateContext
+        class CMember
        {
        public:
            SWA_INSERT_PADDING(0x1E8);
            xpointer<CTitleMenu> m_pTitleMenu;
        };
+
+        SWA_INSERT_PADDING(0x08);
+        xpointer<CMember> m_pMember;
+        SWA_INSERT_PADDING(0x5C);
+        be<uint32_t> m_State;
    };
 }
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CTitleStateIntro : public CTitleStateBase {};
-}
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-#include <SWA/System/GameMode/WorldMap/WorldMapCursor.h>
-
-namespace SWA
-{
-    class CTitleStateWorldMap : public CTitleStateBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x08);
-        xpointer<CWorldMapCursor> m_pWorldMapCursor;
-    };
-}
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CWorldMapCamera : public CCameraController
-    {
-    public:
-        be<float> m_Pitch;
-        be<float> m_Yaw;
-        be<float> m_Distance;
-        be<float> m_RotationSpeed;
-        SWA_INSERT_PADDING(0x08);
-        bool m_CanMove;
-        SWA_INSERT_PADDING(0x34);
-        be<float> m_TiltToEarthTransitionSpeed;
-    };
-
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_Pitch, 0xD0);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_Yaw, 0xD4);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_Distance, 0xD8);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_RotationSpeed, 0xDC);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_CanMove, 0xE8);
-    SWA_ASSERT_OFFSETOF(CWorldMapCamera, m_TiltToEarthTransitionSpeed, 0x120);
-}
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <SWA.inl>
-
-namespace SWA
-{
-    class CWorldMapCursor : public CMenuWindowBase
-    {
-    public:
-        SWA_INSERT_PADDING(0x24);
-        be<float> m_LeftStickVertical;
-        be<float> m_LeftStickHorizontal;
-        bool m_IsCursorMoving;
-        SWA_INSERT_PADDING(0x07);
-        be<float> m_CursorY;
-        be<float> m_CursorX;
-    };
-
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_LeftStickVertical, 0x34);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_LeftStickHorizontal, 0x38);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_IsCursorMoving, 0x3C);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_CursorY, 0x44);
-    SWA_ASSERT_OFFSETOF(CWorldMapCursor, m_CursorX, 0x48);
-}
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "SWA.inl"
+#include "Hedgehog/Base/Thread/hhSynchronizedObject.h"
+#include "Hedgehog/Universe/Engine/hhMessageActor.h"
+#include "SWA/System/GameObject.h"
+
+
+namespace SWA
+{
+    class CStageManager //: public SWA::CGameObject, public Hedgehog::Base::CSynchronizedObject
+    {
+    public:
+        SWA_INSERT_PADDING(0xC4);
+        boost::shared_ptr<SWA::CPathController> m_spStageGuidePathController; //xpointer<SWA::CPathController> m_pStageGuidePathController;
+        SWA_INSERT_PADDING(0x4);
+        Hedgehog::Math::CVector m_PlayerPosition;
+        be<float> m_Field0DC; // Sonic's air distance from path??
+        SWA_INSERT_PADDING(0x3C);
+        be<float> m_StageGuidePathRatio; // Not updated in retail
+        be<float> m_StageGuidePathLength;
+        SWA_INSERT_PADDING(0x9C);
+    };
+
+    SWA_ASSERT_OFFSETOF(CStageManager, m_spStageGuidePathController, 0xC4);
+    SWA_ASSERT_OFFSETOF(CStageManager, m_PlayerPosition, 0xD0);
+    SWA_ASSERT_OFFSETOF(CStageManager, m_StageGuidePathRatio, 0x11C);
+    SWA_ASSERT_OFFSETOF(CStageManager, m_StageGuidePathLength, 0x120);
+    SWA_ASSERT_SIZEOF(CStageManager, 0x1C0);
+}
@@ -12,9 +12,21 @@ namespace SWA
        class CMember
        {
        public:
-            SWA_INSERT_PADDING(0x80);
+            //boost::shared_ptr<Hedgehog::Mirage::CRenderScene> m_spRenderScene;
+            //Hedgehog::Base::CSharedString m_Name;
+            SWA_INSERT_PADDING(0xC);
+            boost::shared_ptr<CCamera> m_spCamera;
+            boost::shared_ptr<CCamera> m_spOverrideCamera;
+            SWA_INSERT_PADDING(0x64);
        };

        xpointer<CMember> m_pMember;
+
+        boost::shared_ptr<CCamera> GetCamera() const;
    };
+
+    //SWA_ASSERT_OFFSETOF(CWorld::CMember, m_spCamera, 0xC);
+    //SWA_ASSERT_SIZEOF(CWorld::CMember, 0x80);
 }
+
+#include "World.inl"
@@ -0,0 +1,7 @@
+namespace SWA
+{
+    inline boost::shared_ptr<CCamera> CWorld::GetCamera() const
+    {
+        return m_pMember->m_spOverrideCamera ? m_pMember->m_spOverrideCamera : m_pMember->m_spCamera;
+    }
+}
@@ -115,7 +115,7 @@ namespace boost
        }

    public:
-        shared_ptr() : px(), pn() {}
+        shared_ptr() : px(nullptr), pn(nullptr) {}

        // TODO
        explicit shared_ptr(T* p) = delete;
@@ -1,4 +1,4 @@
-#include "app.h"
+#include <app.h>
 #include <api/SWA.h>
 #include <gpu/video.h>
 #include <install/installer.h>
@@ -8,8 +8,6 @@
 #include <patches/inspire_patches.h>
 #include <ui/game_window.h>
 #include <user/config.h>
-#include <user/paths.h>
-#include <user/registry.h>

 void App::Restart(std::vector<std::string> restartArgs)
 {
@@ -37,7 +35,6 @@ PPC_FUNC(sub_824EB490)
    App::s_language = Config::Language;

    SWA::SGlobals::Init();
-    Registry::Save();

    __imp__sub_824EB490(ctx, base);
 }
@@ -9,7 +9,6 @@ public:
    static inline bool s_isMissingDLC;
    static inline bool s_isLoading;
    static inline bool s_isWerehog;
-    static inline bool s_isSaveDataCorrupt;

    static inline ELanguage s_language;

@@ -7,10 +7,11 @@
 // Number of samples in a frame
 #define XAUDIO_NUM_SAMPLES 256

+#ifdef SWA_IMPL
 void XAudioInitializeSystem();
 void XAudioRegisterClient(PPCFunc* callback, uint32_t param);
 void XAudioSubmitFrame(void* samples);
-void XAudioConfigValueChangedCallback(class IConfigDef* configDef);
+#endif

 uint32_t XAudioRegisterRenderDriverClient(be<uint32_t>* callback, be<uint32_t>* driver);
 uint32_t XAudioUnregisterRenderDriverClient(uint32_t driver);
@@ -1,29 +1,26 @@
-#include <apu/audio.h>
+#include "sdl2_driver.h"
 #include <cpu/guest_thread.h>
 #include <kernel/heap.h>
-#include <user/config.h>

 static PPCFunc* g_clientCallback{};
 static uint32_t g_clientCallbackParam{}; // pointer in guest memory
 static SDL_AudioDeviceID g_audioDevice{};
 static bool g_downMixToStereo;

-static void CreateAudioDevice()
+void XAudioInitializeSystem()
 {
-    if (g_audioDevice != NULL)
-        SDL_CloseAudioDevice(g_audioDevice);
-
-    bool surround = Config::ChannelConfiguration == EChannelConfiguration::Surround;
-    int allowedChanges = surround ? SDL_AUDIO_ALLOW_CHANNELS_CHANGE : 0;
+    SDL_SetHint(SDL_HINT_AUDIO_CATEGORY, "playback");
+    SDL_SetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME, "Unleashed Recompiled");
+    SDL_InitSubSystem(SDL_INIT_AUDIO);

    SDL_AudioSpec desired{}, obtained{};
    desired.freq = XAUDIO_SAMPLES_HZ;
    desired.format = AUDIO_F32SYS;
-    desired.channels = surround ? XAUDIO_NUM_CHANNELS : 2;
+    desired.channels = XAUDIO_NUM_CHANNELS;
    desired.samples = XAUDIO_NUM_SAMPLES;
-    g_audioDevice = SDL_OpenAudioDevice(nullptr, 0, &desired, &obtained, allowedChanges);
+    g_audioDevice = SDL_OpenAudioDevice(nullptr, 0, &desired, &obtained, SDL_AUDIO_ALLOW_CHANNELS_CHANGE);

-    if (obtained.channels != 2 && obtained.channels != XAUDIO_NUM_CHANNELS) // This check may fail only when surround sound is enabled.
+    if (obtained.channels != 2 && obtained.channels != XAUDIO_NUM_CHANNELS)
    {
        SDL_CloseAudioDevice(g_audioDevice);
        g_audioDevice = SDL_OpenAudioDevice(nullptr, 0, &desired, &obtained, 0);
@@ -32,16 +29,7 @@ static void CreateAudioDevice()
    g_downMixToStereo = (obtained.channels == 2);
 }

-void XAudioInitializeSystem()
-{
-    SDL_SetHint(SDL_HINT_AUDIO_CATEGORY, "playback");
-    SDL_SetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME, "Unleashed Recompiled");
-    SDL_InitSubSystem(SDL_INIT_AUDIO);
-    CreateAudioDevice();
-}
-
 static std::unique_ptr<std::thread> g_audioThread;
-static volatile bool g_audioThreadShouldExit;

 static void AudioThread()
 {
@@ -51,7 +39,7 @@ static void AudioThread()

    size_t channels = g_downMixToStereo ? 2 : XAUDIO_NUM_CHANNELS;

-    while (!g_audioThreadShouldExit)
+    while (true)
    {
        uint32_t queuedAudioSize = SDL_GetQueuedAudioSize(g_audioDevice);
        constexpr size_t MAX_LATENCY = 10;
@@ -74,13 +62,6 @@ static void AudioThread()
    }
 }

-static void CreateAudioThread()
-{
-    SDL_PauseAudioDevice(g_audioDevice, 0);
-    g_audioThreadShouldExit = false;
-    g_audioThread = std::make_unique<std::thread>(AudioThread);
-}
-
 void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
 {
    auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param)));
@@ -89,13 +70,12 @@ void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
    g_clientCallbackParam = g_memory.MapVirtual(pClientParam);
    g_clientCallback = callback;

-    CreateAudioThread();
+    SDL_PauseAudioDevice(g_audioDevice, 0);
+    g_audioThread = std::make_unique<std::thread>(AudioThread);
 }

 void XAudioSubmitFrame(void* samples)
 {
-    auto floatSamples = reinterpret_cast<be<float>*>(samples);
-
    if (g_downMixToStereo)
    {
        // 0: left 1.0f, right 0.0f
@@ -105,6 +85,8 @@ void XAudioSubmitFrame(void* samples)
        // 4: left 1.0f, right 0.0f
        // 5: left 0.0f, right 1.0f

+        auto floatSamples = reinterpret_cast<be<float>*>(samples);
+
        std::array<float, 2 * XAUDIO_NUM_SAMPLES> audioFrames;

        for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
@@ -116,37 +98,24 @@ void XAudioSubmitFrame(void* samples)
            float ch4 = floatSamples[4 * XAUDIO_NUM_SAMPLES + i];
            float ch5 = floatSamples[5 * XAUDIO_NUM_SAMPLES + i];

-            audioFrames[i * 2 + 0] = (ch0 + ch2 * 0.75f + ch4) * Config::MasterVolume;
-            audioFrames[i * 2 + 1] = (ch1 + ch2 * 0.75f + ch5) * Config::MasterVolume;
+            audioFrames[i * 2 + 0] = ch0 + ch2 * 0.75f + ch4;
+            audioFrames[i * 2 + 1] = ch1 + ch2 * 0.75f + ch5;
        }

        SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames));
    }
    else
    {
-        std::array<float, XAUDIO_NUM_CHANNELS * XAUDIO_NUM_SAMPLES> audioFrames;
+        auto rawSamples = reinterpret_cast<be<uint32_t>*>(samples);
+
+        std::array<uint32_t, XAUDIO_NUM_CHANNELS * XAUDIO_NUM_SAMPLES> audioFrames;

        for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
        {
            for (size_t j = 0; j < XAUDIO_NUM_CHANNELS; j++)
-                audioFrames[i * XAUDIO_NUM_CHANNELS + j] = floatSamples[j * XAUDIO_NUM_SAMPLES + i] * Config::MasterVolume;
+                audioFrames[i * XAUDIO_NUM_CHANNELS + j] = rawSamples[j * XAUDIO_NUM_SAMPLES + i];
        }

        SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames));
    }
 }
-
-void XAudioConfigValueChangedCallback(IConfigDef* configDef)
-{
-    if (configDef == &Config::ChannelConfiguration)
-    {
-        if (g_audioThread->joinable())
-        {
-            g_audioThreadShouldExit = true;
-            g_audioThread->join();
-        }
-
-        CreateAudioDevice();
-        CreateAudioThread();
-    }
-}
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <apu/audio.h>
@@ -0,0 +1,121 @@
+#include <stdafx.h>
+#include "xaudio_driver.h"
+#include <xaudio2.h>
+#include <cpu/guest_thread.h>
+#include <cpu/ppc_context.h>
+#include <kernel/heap.h>
+
+#define XAUDIO_DRIVER_KEY (uint32_t)('XAUD')
+
+PPCFunc* volatile g_clientCallback{};
+DWORD g_clientCallbackParam{}; // pointer in guest memory
+DWORD g_driverThread{};
+
+// TODO: Should use a counted ptr
+IXAudio2* g_audio{};
+IXAudio2MasteringVoice* g_masteringVoice{};
+IXAudio2SourceVoice* g_sourceVoice{};
+
+constexpr uint32_t g_semaphoreCount = 16;
+constexpr uint32_t g_audioFrameSize = 256 * 6;
+HANDLE g_audioSemaphore{ CreateSemaphoreA(nullptr, g_semaphoreCount, g_semaphoreCount, nullptr) };
+uint32_t g_audioFrames[g_audioFrameSize * g_semaphoreCount];
+uint32_t g_audioFrameIndex = 0;
+
+class VoiceCallback : public IXAudio2VoiceCallback
+{
+    STDMETHOD_(void, OnVoiceProcessingPassStart)(UINT32 BytesRequired) override {}
+    STDMETHOD_(void, OnVoiceProcessingPassEnd)() override {}
+
+    STDMETHOD_(void, OnBufferStart)(void* pBufferContext) override {}
+    STDMETHOD_(void, OnBufferEnd)(void* pBufferContext) override
+    {
+        ReleaseSemaphore(g_audioSemaphore, 1, nullptr);
+    }
+
+    STDMETHOD_(void, OnStreamEnd)() override {}
+
+    STDMETHOD_(void, OnLoopEnd)(void* pBufferContext) override {}
+    STDMETHOD_(void, OnVoiceError)(void* pBufferContext, HRESULT Error) override {}
+} gVoiceCallback;
+
+PPC_FUNC(DriverLoop)
+{
+    GuestThread::SetThreadName(GetCurrentThreadId(), "Audio Driver");
+
+    while (true)
+    {
+        if (!g_clientCallback)
+        {
+            continue;
+        }
+
+        WaitForSingleObject(g_audioSemaphore, INFINITE);
+
+        ctx.r3.u64 = g_clientCallbackParam;
+        g_clientCallback(ctx, g_memory.base);
+    }
+}
+
+void XAudioInitializeSystem()
+{
+    if (g_audio)
+    {
+        return;
+    }
+
+    //reinterpret_cast<decltype(&XAudio2Create)>(
+    //	GetProcAddress(LoadLibraryA("XAudio2_8.dll"), "XAudio2Create"))(&gAudio, 0, 1);
+
+    XAudio2Create(&g_audio);
+    g_audio->CreateMasteringVoice(&g_masteringVoice);
+
+    WAVEFORMATIEEEFLOATEX format{};
+    format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+    format.Format.cbSize = sizeof(format) - sizeof(format.Format);
+    format.Format.nChannels = XAUDIO_NUM_CHANNELS;
+    format.Format.nSamplesPerSec = XAUDIO_SAMPLES_HZ;
+    format.Format.wBitsPerSample = XAUDIO_SAMPLE_BITS;
+    format.Format.nBlockAlign = (format.Format.nChannels * format.Format.wBitsPerSample) / 8;
+    format.Format.nAvgBytesPerSec = format.Format.nSamplesPerSec * format.Format.nBlockAlign;
+
+    format.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+    format.Samples.wValidBitsPerSample = format.Format.wBitsPerSample;
+    format.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT |
+        SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
+
+    g_audio->CreateSourceVoice(&g_sourceVoice, &format.Format, 0, 1024, &gVoiceCallback);
+    g_sourceVoice->Start();
+
+    KeInsertHostFunction(XAUDIO_DRIVER_KEY, DriverLoop);
+    GuestThread::Start({ XAUDIO_DRIVER_KEY, 0, 0 }, nullptr);
+}
+
+void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
+{
+    auto* pClientParam = static_cast<uint32_t*>(g_userHeap.Alloc(sizeof(param)));
+    ByteSwapInplace(param);
+    *pClientParam = param;
+    g_clientCallbackParam = g_memory.MapVirtual(pClientParam);
+
+    g_clientCallback = callback;
+}
+
+void XAudioSubmitFrame(void* samples)
+{
+    uint32_t* audioFrame = &g_audioFrames[g_audioFrameSize * g_audioFrameIndex];
+    g_audioFrameIndex = (g_audioFrameIndex + 1) % g_semaphoreCount;
+
+    for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
+    {
+        for (size_t j = 0; j < 6; j++)
+            audioFrame[i * XAUDIO_NUM_CHANNELS + j] = ByteSwap(((uint32_t*)samples)[j * XAUDIO_NUM_SAMPLES + i]);
+    }
+
+    XAUDIO2_BUFFER buffer{};
+    buffer.pAudioData = (BYTE*)audioFrame;
+    buffer.AudioBytes = XAUDIO_NUM_SAMPLES * XAUDIO_NUM_CHANNELS * sizeof(float);
+    buffer.PlayLength = XAUDIO_NUM_SAMPLES;
+
+    g_sourceVoice->SubmitSourceBuffer(&buffer);
+}
@@ -0,0 +1,2 @@
+#pragma once
+#include <apu/audio.h>
@@ -93,7 +93,7 @@ static void PlayEmbeddedSound(EmbeddedSound s)

 void EmbeddedPlayer::Init() 
 {
-    Mix_OpenAudio(XAUDIO_SAMPLES_HZ, AUDIO_F32SYS, 2, 256);
+    Mix_OpenAudio(XAUDIO_SAMPLES_HZ, AUDIO_F32SYS, XAUDIO_NUM_CHANNELS, 256);

    s_isActive = true;
 }
@@ -7,8 +7,6 @@
    typedef returnType _##procName(__VA_ARGS__); \
    _##procName* procName = (_##procName*)PROC_ADDRESS(libraryName, #procName);

-#define STR(x) #x
-
 template<typename T>
 inline T RoundUp(const T& in_rValue, uint32_t in_round)
 {
@@ -1,16 +1,14 @@
 #pragma once

-#define IMGUI_SHADER_MODIFIER_NONE                     0
-#define IMGUI_SHADER_MODIFIER_SCANLINE                 1
-#define IMGUI_SHADER_MODIFIER_CHECKERBOARD             2
-#define IMGUI_SHADER_MODIFIER_SCANLINE_BUTTON          3
-#define IMGUI_SHADER_MODIFIER_TEXT_SKEW                4
-#define IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE  5
-#define IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE    6
-#define IMGUI_SHADER_MODIFIER_GRAYSCALE                7
-#define IMGUI_SHADER_MODIFIER_TITLE_BEVEL              8
-#define IMGUI_SHADER_MODIFIER_CATEGORY_BEVEL           9
-#define IMGUI_SHADER_MODIFIER_RECTANGLE_BEVEL          10
+#define IMGUI_SHADER_MODIFIER_NONE            0
+#define IMGUI_SHADER_MODIFIER_SCANLINE        1
+#define IMGUI_SHADER_MODIFIER_CHECKERBOARD    2
+#define IMGUI_SHADER_MODIFIER_SCANLINE_BUTTON 3
+#define IMGUI_SHADER_MODIFIER_TEXT_SKEW       4
+#define IMGUI_SHADER_MODIFIER_MARQUEE_FADE    5
+#define IMGUI_SHADER_MODIFIER_GRAYSCALE       6
+#define IMGUI_SHADER_MODIFIER_TITLE_BEVEL     7
+#define IMGUI_SHADER_MODIFIER_CATEGORY_BEVEL  8

 #ifdef __cplusplus

@@ -24,7 +22,6 @@ enum class ImGuiCallback : int32_t
    SetOutline = -6,
    SetProceduralOrigin = -7,
    // -8 is ImDrawCallback_ResetRenderState, don't use!
-    SetAdditive = -9
 };

 union ImGuiCallbackData
@@ -33,10 +30,8 @@ union ImGuiCallbackData
    {
        float boundsMin[2];
        float boundsMax[2];
-        uint32_t gradientTopLeft;
-        uint32_t gradientTopRight;
-        uint32_t gradientBottomRight;
-        uint32_t gradientBottomLeft;
+        uint32_t gradientTop;
+        uint32_t gradientBottom;
    } setGradient;

    struct
@@ -69,11 +64,6 @@ union ImGuiCallbackData
    {
        float proceduralOrigin[2];
    } setProceduralOrigin;
-
-    struct
-    {
-        bool enabled;
-    } setAdditive;
 };

 extern ImGuiCallbackData* AddImGuiCallback(ImGuiCallback callback);
@@ -3324,14 +3324,6 @@ namespace plume {
                dynamicDepthBiasOption = d3d12Options16.DynamicDepthBiasSupported;
            }

-            // Check if the architecture has UMA.
-            bool uma = false;
-            D3D12_FEATURE_DATA_ARCHITECTURE1 architecture1 = {};
-            res = deviceOption->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE1, &architecture1, sizeof(architecture1));
-            if (SUCCEEDED(res)) {
-                uma = architecture1.UMA;
-            }
-
            // Pick this adapter and device if it has better feature support than the current one.
            bool preferOverNothing = (adapter == nullptr) || (d3d == nullptr);
            bool preferVideoMemory = adapterDesc.DedicatedVideoMemory > description.dedicatedVideoMemory;
@@ -3354,7 +3346,6 @@ namespace plume {
                capabilities.sampleLocations = samplePositionsOption;
                capabilities.triangleFan = triangleFanSupportOption;
                capabilities.dynamicDepthBias = dynamicDepthBiasOption;
-                capabilities.uma = uma;
                description.name = Utf16ToUtf8(adapterDesc.Description);
                description.dedicatedVideoMemory = adapterDesc.DedicatedVideoMemory;

@@ -475,14 +475,6 @@ namespace plume {

    typedef uint32_t RenderSampleCounts;

-    enum class RenderDeviceType {
-        UNKNOWN,
-        INTEGRATED,
-        DISCRETE,
-        VIRTUAL,
-        CPU
-    };
-
    // Global functions.

    constexpr uint32_t RenderFormatSize(RenderFormat format) {
@@ -1135,7 +1127,7 @@ namespace plume {
            desc.srcBlend = RenderBlend::SRC_ALPHA;
            desc.dstBlend = RenderBlend::INV_SRC_ALPHA;
            desc.blendOp = RenderBlendOperation::ADD;
-            desc.srcBlendAlpha = RenderBlend::SRC_ALPHA;
+            desc.srcBlendAlpha = RenderBlend::ONE;
            desc.dstBlendAlpha = RenderBlend::INV_SRC_ALPHA;
            desc.blendOpAlpha = RenderBlendOperation::ADD;
            return desc;
@@ -1277,9 +1269,9 @@ namespace plume {
        RenderFilter minFilter = RenderFilter::LINEAR;
        RenderFilter magFilter = RenderFilter::LINEAR;
        RenderMipmapMode mipmapMode = RenderMipmapMode::LINEAR;
-        RenderTextureAddressMode addressU = RenderTextureAddressMode::CLAMP;
-        RenderTextureAddressMode addressV = RenderTextureAddressMode::CLAMP;
-        RenderTextureAddressMode addressW = RenderTextureAddressMode::CLAMP;
+        RenderTextureAddressMode addressU = RenderTextureAddressMode::WRAP;
+        RenderTextureAddressMode addressV = RenderTextureAddressMode::WRAP;
+        RenderTextureAddressMode addressW = RenderTextureAddressMode::WRAP;
        float mipLODBias = 0.0f;
        uint32_t maxAnisotropy = 16;
        bool anisotropyEnabled = false;
@@ -1762,7 +1754,6 @@ namespace plume {

    struct RenderDeviceDescription {
        std::string name = "Unknown";
-        RenderDeviceType type = RenderDeviceType::UNKNOWN;
        uint32_t driverVersion = 0;
        uint64_t dedicatedVideoMemory = 0;
    };
@@ -1789,9 +1780,6 @@ namespace plume {
        // Draw.
        bool triangleFan = false;
        bool dynamicDepthBias = false;
-
-        // UMA.
-        bool uma = false;
    };

    struct RenderInterfaceCapabilities {
@@ -705,21 +705,6 @@ namespace plume {
        }
    }

-    static RenderDeviceType toDeviceType(VkPhysicalDeviceType type) {
-        switch (type) {
-        case VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU:
-            return RenderDeviceType::INTEGRATED;
-        case VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU:
-            return RenderDeviceType::DISCRETE;
-        case VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU:
-            return RenderDeviceType::VIRTUAL;
-        case VK_PHYSICAL_DEVICE_TYPE_CPU:
-            return RenderDeviceType::CPU;
-        default:
-            return RenderDeviceType::UNKNOWN;
-        }
-    }
-
    static void setObjectName(VkDevice device, VkDebugReportObjectTypeEXT objectType, uint64_t object, const std::string &name) {
 #   ifdef VULKAN_OBJECT_NAMES_ENABLED
        VkDebugMarkerObjectNameInfoEXT nameInfo = {};
@@ -3511,7 +3496,6 @@ namespace plume {
            if (preferOption) {
                physicalDevice = physicalDevices[i];
                description.name = std::string(deviceProperties.deviceName);
-                description.type = toDeviceType(deviceProperties.deviceType);
                description.driverVersion = deviceProperties.driverVersion;
                currentDeviceTypeScore = deviceTypeScore;
            }
@@ -1,41 +0,0 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
-
-#ifdef __spirv__
-
-#define g_SrcAlpha_DestAlpha vk::RawBufferLoad<float4>(g_PushConstants.PixelShaderConstants + 2400, 0x10)
-#define s0_Texture2DDescriptorIndex vk::RawBufferLoad<uint>(g_PushConstants.SharedConstants + 0)
-#define s0_SamplerDescriptorIndex vk::RawBufferLoad<uint>(g_PushConstants.SharedConstants + 192)
-
-#else
-
-cbuffer PixelShaderConstants : register(b1, space4)
-{
-    float4 g_SrcAlpha_DestAlpha : packoffset(c150);
-};
-
-cbuffer SharedConstants : register(b2, space4)
-{
-    uint s0_Texture2DDescriptorIndex : packoffset(c0.x);
-    uint s0_SamplerDescriptorIndex : packoffset(c12.x);
-    DEFINE_SHARED_CONSTANTS();
-};
-
-#endif
-
-float4 main(
-    in float4 iPos : SV_Position,
-    in float4 iTexCoord0 : TEXCOORD0) : SV_Target0
-{
-    Texture2D<float4> texture = g_Texture2DDescriptorHeap[s0_Texture2DDescriptorIndex];
-    SamplerState samplerState = g_SamplerDescriptorHeap[s0_SamplerDescriptorIndex];
-    
-    float4 color = texture.Sample(samplerState, iTexCoord0.xy);
-    
-    if (any(or(iTexCoord0.xy < 0.0, iTexCoord0.xy > 1.0)))
-        color = float4(0.0, 0.0, 0.0, 1.0);
-    
-    color.rgb *= color.a * g_SrcAlpha_DestAlpha.x;
-    color.a = g_SrcAlpha_DestAlpha.y + (1.0 - color.a) * g_SrcAlpha_DestAlpha.x;
-    
-    return color;
-}
@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"

 #ifdef __spirv__

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"

 #ifdef __spirv__

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"

 #ifdef __spirv__

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"

 #ifdef __spirv__

@@ -38,7 +38,7 @@ cbuffer SharedConstants : register(b2, space4)

 #endif

-float4 main(in float4 position : SV_Position, in float4 texCoord : TEXCOORD0) : SV_Target
+float4 main(in float4 position : SV_Position, in float2 texCoord : TEXCOORD0) : SV_Target
 {
    Texture2D<float4> sampColor = g_Texture2DDescriptorHeap[sampColor_Texture2DDescriptorIndex];
    Texture2D<float4> sampVelocityMap = g_Texture2DDescriptorHeap[sampVelocityMap_Texture2DDescriptorIndex];
@@ -48,19 +48,19 @@ float4 main(in float4 position : SV_Position, in float4 texCoord : TEXCOORD0) :
    SamplerState sampVelocityMap_s = g_SamplerDescriptorHeap[sampVelocityMap_SamplerDescriptorIndex];   
    SamplerState sampZBuffer_s = g_SamplerDescriptorHeap[sampZBuffer_SamplerDescriptorIndex];
    
-    float depth = sampZBuffer.SampleLevel(sampZBuffer_s, texCoord.xy, 0).x;
-    float4 velocityMap = sampVelocityMap.SampleLevel(sampVelocityMap_s, texCoord.xy, 0);
+    float depth = sampZBuffer.SampleLevel(sampZBuffer_s, texCoord, 0).x;
+    float4 velocityMap = sampVelocityMap.SampleLevel(sampVelocityMap_s, texCoord, 0);
    float2 velocity = (velocityMap.xz + velocityMap.yw / 255.0) * 2.0 - 1.0;

    int sampleCount = min(64, round(length(velocity * g_ViewportSize.xy)));
    float2 sampleOffset = velocity / (float) sampleCount;

-    float3 color = sampColor.SampleLevel(sampColor_s, texCoord.xy, 0).rgb;
+    float3 color = sampColor.SampleLevel(sampColor_s, texCoord, 0).rgb;
    int count = 1;

    for (int i = 1; i <= sampleCount; i++)
    {
-        float2 sampleCoord = texCoord.xy + sampleOffset * i;
+        float2 sampleCoord = texCoord + sampleOffset * i;
        float3 sampleColor = sampColor.SampleLevel(sampColor_s, sampleCoord, 0).rgb;
        float sampleDepth = sampZBuffer.SampleLevel(sampZBuffer_s, sampleCoord, 0).x;

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"

 #ifdef __spirv__

@@ -1,4 +1,4 @@
-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"

 #ifdef __spirv__

@@ -6,10 +6,8 @@ struct PushConstants
 {
    float2 BoundsMin;
    float2 BoundsMax;
-    uint GradientTopLeft;
-    uint GradientTopRight;
-    uint GradientBottomRight;
-    uint GradientBottomLeft;
+    uint GradientTop;
+    uint GradientBottom;
    uint ShaderModifier;
    uint Texture2DDescriptorIndex;
    float2 InverseDisplaySize;
@@ -61,16 +61,16 @@ float4 SampleLinear(float2 uvTexspace)

 float4 PixelAntialiasing(float2 uvTexspace)
 {
+    float2 seam = floor(uvTexspace + 0.5);
+    uvTexspace = (uvTexspace - seam) / fwidth(uvTexspace) + seam;
+    uvTexspace = clamp(uvTexspace, seam - 0.5, seam + 0.5);
+    
    if ((g_PushConstants.InverseDisplaySize.y / g_PushConstants.InverseDisplaySize.x) >= (4.0 / 3.0))
        uvTexspace *= g_PushConstants.InverseDisplaySize.y * 720.0f;
    else
        uvTexspace *= g_PushConstants.InverseDisplaySize.x * 960.0f;
    
-    float2 seam = floor(uvTexspace + 0.5);
-    uvTexspace = (uvTexspace - seam) / fwidth(uvTexspace) + seam;
-    uvTexspace = clamp(uvTexspace, seam - 0.5, seam + 0.5);
-    
-    return SampleLinear(uvTexspace - 0.5);
+    return SampleLinear(uvTexspace);
 }

 float median(float r, float g, float b)
@@ -81,7 +81,7 @@ float median(float r, float g, float b)
 float4 main(in Interpolators interpolators) : SV_Target
 {
    float4 color = interpolators.Color;
-    color *= PixelAntialiasing(interpolators.Position.xy - g_PushConstants.ProceduralOrigin);
+    color *= PixelAntialiasing(interpolators.Position.xy - (g_PushConstants.ProceduralOrigin + 0.5));
    
    if (g_PushConstants.Texture2DDescriptorIndex != 0)
    {
@@ -135,7 +135,7 @@ float4 main(in Interpolators interpolators) : SV_Target
        }
    }
    
-    if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE)
+    if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_MARQUEE_FADE)
    {
        float minAlpha = saturate((interpolators.Position.x - g_PushConstants.BoundsMin.x) / g_PushConstants.Scale.x);
        float maxAlpha = saturate((g_PushConstants.BoundsMax.x - interpolators.Position.x) / g_PushConstants.Scale.x);
@@ -143,40 +143,10 @@ float4 main(in Interpolators interpolators) : SV_Target
        color.a *= minAlpha;
        color.a *= maxAlpha;
    }
-    else if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE)
-    {
-        float minAlpha = saturate((interpolators.Position.y - g_PushConstants.BoundsMin.y) / g_PushConstants.Scale.y);
-        float maxAlpha = saturate((g_PushConstants.BoundsMax.y - interpolators.Position.y) / g_PushConstants.Scale.y);
-        
-        color.a *= minAlpha;
-        color.a *= maxAlpha;
-    }
    else if (any(g_PushConstants.BoundsMin != g_PushConstants.BoundsMax))
    {
        float2 factor = saturate((interpolators.Position.xy - g_PushConstants.BoundsMin) / (g_PushConstants.BoundsMax - g_PushConstants.BoundsMin));
-        
-        if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_RECTANGLE_BEVEL)
-        {
-            float bevelSize = 0.9;
-
-            float shadow = saturate((factor.x - bevelSize) / (1.0 - bevelSize));
-            shadow = max(shadow, saturate((factor.y - bevelSize) / (1.0 - bevelSize)));
-
-            float rim = saturate((1.0 - factor.x - bevelSize) / (1.0 - bevelSize));
-            rim = max(rim, saturate((1.0 - factor.y - bevelSize) / (1.0 - bevelSize)));
-
-            float3 rimColor = float3(1, 0.8, 0.29);
-            float3 shadowColor = float3(0.84, 0.57, 0);
-
-            color.rgb = lerp(color.rgb, rimColor, smoothstep(0.0, 1.0, rim));
-            color.rgb = lerp(color.rgb, shadowColor, smoothstep(0.0, 1.0, shadow));
-        }
-        else
-        {
-            float4 top = lerp(DecodeColor(g_PushConstants.GradientTopLeft), DecodeColor(g_PushConstants.GradientTopRight), smoothstep(0.0, 1.0, factor.x));
-            float4 bottom = lerp(DecodeColor(g_PushConstants.GradientBottomLeft), DecodeColor(g_PushConstants.GradientBottomRight), smoothstep(0.0, 1.0, factor.x));
-            color *= lerp(top, bottom, smoothstep(0.0, 1.0, factor.y));
-        }
+        color *= lerp(DecodeColor(g_PushConstants.GradientTop), DecodeColor(g_PushConstants.GradientBottom), smoothstep(0.0, 1.0, factor.y));
    }
        
    if (g_PushConstants.ShaderModifier == IMGUI_SHADER_MODIFIER_GRAYSCALE)
@@ -7,8 +7,7 @@ void main(in float2 position : POSITION, in float2 uv : TEXCOORD, in float4 colo
        if (position.y < g_PushConstants.Origin.y)
            position.x += g_PushConstants.Scale.x;
    }
-    else if (g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_HORIZONTAL_MARQUEE_FADE && 
-        g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_VERTICAL_MARQUEE_FADE)
+    else if (g_PushConstants.ShaderModifier != IMGUI_SHADER_MODIFIER_MARQUEE_FADE)
    {
        position.xy = g_PushConstants.Origin + (position.xy - g_PushConstants.Origin) * g_PushConstants.Scale;
    }
@@ -1,6 +1,6 @@
 #pragma once

-#include "../../../tools/XenosRecomp/XenosRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"

 #ifdef __spirv__

@@ -18,11 +18,14 @@ struct Video
    static inline uint32_t s_viewportWidth;
    static inline uint32_t s_viewportHeight;

-    static bool CreateHostDevice(const char *sdlVideoDriver);
+    static void CreateHostDevice(const char *sdlVideoDriver);
    static void WaitOnSwapChain();
    static void Present();
    static void StartPipelinePrecompilation();
    static void WaitForGPU();
+    static void DrawCounter();
+    static void DrawFPS(ImFont* font);
+    static struct GuestSurface* GetBackBuffer();
    static void ComputeViewportDimensions();
 };

@@ -154,15 +157,10 @@ struct GuestBaseTexture : GuestResource
 struct GuestTexture : GuestBaseTexture
 {
    uint32_t depth = 0;
-    uint32_t levels = 0;
    RenderTextureViewDimension viewDimension = RenderTextureViewDimension::UNKNOWN;
-    RenderComponentMapping componentMapping;
    void* mappedMemory = nullptr;
    std::unique_ptr<RenderFramebuffer> framebuffer;
    std::unique_ptr<GuestTexture> patchedTexture;
-    struct GuestSurface* sourceSurface = nullptr;
-
-    void CreateTexture();
 };

 struct GuestLockedRect
@@ -210,7 +208,6 @@ struct GuestSurface : GuestBaseTexture
    uint32_t guestFormat = 0;
    ankerl::unordered_dense::map<const RenderTexture*, std::unique_ptr<RenderFramebuffer>> framebuffers;
    RenderSampleCounts sampleCount = RenderSampleCount::COUNT_1;
-    ankerl::unordered_dense::set<GuestTexture*> destinationTextures;
 };

 enum GuestDeclType
@@ -291,7 +288,7 @@ struct GuestShader : GuestResource
    std::unique_ptr<RenderShader> shader;
    struct ShaderCacheEntry* shaderCacheEntry = nullptr;
    ankerl::unordered_dense::map<uint32_t, std::unique_ptr<RenderShader>> linkedShaders;
-#ifdef UNLEASHED_RECOMP_D3D12
+#ifdef SWA_D3D12
    std::vector<ComPtr<IDxcBlob>> shaderBlobs;
    ComPtr<IDxcBlobEncoding> libraryBlob;
 #endif
@@ -1,8 +1,7 @@
 #include <stdafx.h>
 #include <SDL.h>
 #include <user/config.h>
-#include <hid/hid.h>
-#include <os/logger.h>
+#include <hid/hid_detail.h>
 #include <ui/game_window.h>
 #include <kernel/xdm.h>
 #include <app.h>
@@ -41,17 +40,17 @@ public:
        return SDL_GameControllerTypeForIndex(index);
    }

-    hid::EInputDevice GetInputDevice() const
+    hid::detail::EInputDevice GetInputDevice() const
    {
        switch (GetControllerType())
        {
            case SDL_CONTROLLER_TYPE_PS3:
            case SDL_CONTROLLER_TYPE_PS4:
            case SDL_CONTROLLER_TYPE_PS5:
-                return hid::EInputDevice::PlayStation;
+                return hid::detail::EInputDevice::PlayStation;
        }

-        return hid::EInputDevice::Xbox;
+        return hid::detail::EInputDevice::Xbox;
    }

    void Close()
@@ -68,7 +67,7 @@ public:

    bool CanPoll()
    {
-        return controller;
+        return controller && (GameWindow::s_isFocused || Config::AllowBackgroundInput);
    }

    void PollAxis()
@@ -127,11 +126,6 @@ public:

        SDL_GameControllerRumble(controller, vibration.wLeftMotorSpeed * 256, vibration.wRightMotorSpeed * 256, VIBRATION_TIMEOUT_MS);
    }
-
-    void SetLED(const uint8_t r, const uint8_t g, const uint8_t b) const
-    {
-        SDL_GameControllerSetLED(controller, r, g, b);
-    }
 };

 std::array<Controller, 4> g_controllers;
@@ -174,26 +168,8 @@ static void SetControllerInputDevice(Controller* controller)
    if (App::s_isLoading)
        return;

-    hid::g_inputDevice = controller->GetInputDevice();
-    hid::g_inputDeviceController = hid::g_inputDevice;
-
-    auto controllerType = (hid::EInputDeviceExplicit)controller->GetControllerType();
-
-    if (hid::g_inputDeviceExplicit != controllerType)
-    {
-        hid::g_inputDeviceExplicit = controllerType;
-
-        LOGFN("Detected controller: {}", hid::GetInputDeviceName());
-    }
-}
-
-static void SetControllerTimeOfDayLED(Controller& controller, bool isNight)
-{
-    auto r = isNight ? 22 : 0;
-    auto g = isNight ? 0 : 37;
-    auto b = isNight ? 101 : 184;
-
-    controller.SetLED(r, g, b);
+    hid::detail::g_inputDevice = controller->GetInputDevice();
+    hid::detail::g_inputDeviceController = hid::detail::g_inputDevice;
 }

 int HID_OnSDLEvent(void*, SDL_Event* event)
@@ -205,13 +181,7 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
            const auto freeIndex = FindFreeController();

            if (freeIndex != -1)
-            {
-                auto controller = Controller(event->cdevice.which);
-
-                g_controllers[freeIndex] = controller;
-
-                SetControllerTimeOfDayLED(controller, App::s_isWerehog);
-            }
+                g_controllers[freeIndex] = Controller(event->cdevice.which);

            break;
        }
@@ -229,7 +199,6 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
        case SDL_CONTROLLERBUTTONDOWN:
        case SDL_CONTROLLERBUTTONUP:
        case SDL_CONTROLLERAXISMOTION:
-        case SDL_CONTROLLERTOUCHPADDOWN:
        {
            auto* controller = FindController(event->cdevice.which);

@@ -255,13 +224,13 @@ int HID_OnSDLEvent(void*, SDL_Event* event)

        case SDL_KEYDOWN:
        case SDL_KEYUP:
-            hid::g_inputDevice = hid::EInputDevice::Keyboard;
+            hid::detail::g_inputDevice = hid::detail::EInputDevice::Keyboard;
            break;

        case SDL_MOUSEMOTION:
        case SDL_MOUSEBUTTONDOWN:
        case SDL_MOUSEBUTTONUP:
-            hid::g_inputDevice = hid::EInputDevice::Mouse;
+            hid::detail::g_inputDevice = hid::detail::EInputDevice::Mouse;
            break;

        case SDL_WINDOWEVENT:
@@ -278,8 +247,17 @@ int HID_OnSDLEvent(void*, SDL_Event* event)

        case SDL_USER_EVILSONIC:
        {
-            for (auto& controller : g_controllers)
-                SetControllerTimeOfDayLED(controller, event->user.code);
+            auto* controller = FindController(event->cdevice.which);
+
+            if (!controller)
+                break;
+
+            auto isNight = event->user.code;
+            auto r = isNight ? 22 : 0;
+            auto g = isNight ? 0 : 37;
+            auto b = isNight ? 101 : 184;
+
+            SDL_GameControllerSetLED(controller->controller, r, g, b);

            break;
        }
@@ -288,17 +266,14 @@ int HID_OnSDLEvent(void*, SDL_Event* event)
    return 0;
 }

-void hid::Init()
+void hid::detail::Init()
 {
-    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED, "1");
-    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE, "1");
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_WII, "1");
+    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
    SDL_SetHint(SDL_HINT_XINPUT_ENABLED, "1");

    SDL_InitSubSystem(SDL_INIT_EVENTS);
@@ -307,7 +282,7 @@ void hid::Init()
    SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
 }

-uint32_t hid::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
+uint32_t hid::detail::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
 {
    static uint32_t packet;

@@ -326,7 +301,7 @@ uint32_t hid::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
    return ERROR_SUCCESS;
 }

-uint32_t hid::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
+uint32_t hid::detail::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
 {
    if (!pVibration)
        return ERROR_BAD_ARGUMENTS;
@@ -339,7 +314,7 @@ uint32_t hid::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
    return ERROR_SUCCESS;
 }

-uint32_t hid::GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps)
+uint32_t hid::detail::GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps)
 {
    if (!pCaps)
        return ERROR_BAD_ARGUMENTS;
@@ -1,81 +1,39 @@
+#include <stdafx.h>
 #include "hid.h"
-#include <ui/game_window.h>
-#include <user/config.h>
+#include "hid_detail.h"

-hid::EInputDevice hid::g_inputDevice;
-hid::EInputDevice hid::g_inputDeviceController;
-hid::EInputDeviceExplicit hid::g_inputDeviceExplicit;
+hid::detail::EInputDevice hid::detail::g_inputDevice;
+hid::detail::EInputDevice hid::detail::g_inputDeviceController;

-uint16_t hid::g_prohibitedButtons;
+uint16_t hid::detail::g_prohibitedButtons;
+
+void hid::Init()
+{
+    detail::Init();
+}

 void hid::SetProhibitedButtons(uint16_t wButtons)
 {
-    hid::g_prohibitedButtons = wButtons;
+    hid::detail::g_prohibitedButtons = wButtons;
 }

-bool hid::IsInputAllowed()
+uint32_t hid::GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState)
 {
-    return GameWindow::s_isFocused || Config::AllowBackgroundInput;
+    return detail::GetState(dwUserIndex, pState);
 }

-bool hid::IsInputDeviceController()
+uint32_t hid::SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration)
 {
-    return hid::g_inputDevice != hid::EInputDevice::Keyboard &&
-        hid::g_inputDevice != hid::EInputDevice::Mouse;
+    return detail::SetState(dwUserIndex, pVibration);
 }

-std::string hid::GetInputDeviceName()
+uint32_t hid::GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps)
 {
-    switch (g_inputDevice)
-    {
-        case EInputDevice::Keyboard:
-            return "Keyboard";
-
-        case EInputDevice::Mouse:
-            return "Mouse";
-    }
-
-    switch (g_inputDeviceExplicit)
-    {
-        case EInputDeviceExplicit::Xbox360:
-            return "Xbox 360";
-
-        case EInputDeviceExplicit::XboxOne:
-            return "Xbox One";
-
-        case EInputDeviceExplicit::DualShock3:
-            return "DualShock 3";
-
-        case EInputDeviceExplicit::DualShock4:
-            return "DualShock 4";
-
-        case EInputDeviceExplicit::SwitchPro:
-            return "Nintendo Switch Pro";
-
-        case EInputDeviceExplicit::Virtual:
-            return "Virtual";
-
-        case EInputDeviceExplicit::DualSense:
-            return "DualSense";
-
-        case EInputDeviceExplicit::Luna:
-            return "Amazon Luna";
-
-        case EInputDeviceExplicit::Stadia:
-            return "Google Stadia";
-
-        case EInputDeviceExplicit::NvShield:
-            return "NVIDIA Shield";
-
-        case EInputDeviceExplicit::SwitchJCLeft:
-            return "Nintendo Switch Joy-Con (Left)";
-
-        case EInputDeviceExplicit::SwitchJCRight:
-            return "Nintendo Switch Joy-Con (Right)";
-
-        case EInputDeviceExplicit::SwitchJCPair:
-            return "Nintendo Switch Joy-Con (Pair)";
-    }
-
-    return "Unknown";
+    return detail::GetCapabilities(dwUserIndex, pCaps);
+}
+
+bool hid::detail::IsInputDeviceController()
+{
+    return hid::detail::g_inputDevice != hid::detail::EInputDevice::Keyboard &&
+        hid::detail::g_inputDevice != hid::detail::EInputDevice::Mouse;
 }
@@ -1,47 +1,13 @@
 #pragma once

+union SDL_Event;
+
 namespace hid
 {
-    enum class EInputDevice
-    {
-        Keyboard,
-        Mouse,
-        Xbox,
-        PlayStation
-    };
-
-    enum class EInputDeviceExplicit
-    {
-        Unknown,
-        Xbox360,
-        XboxOne,
-        DualShock3,
-        DualShock4,
-        SwitchPro,
-        Virtual,
-        DualSense,
-        Luna,
-        Stadia,
-        NvShield,
-        SwitchJCLeft,
-        SwitchJCRight,
-        SwitchJCPair
-    };
-
-    extern EInputDevice g_inputDevice;
-    extern EInputDevice g_inputDeviceController;
-    extern EInputDeviceExplicit g_inputDeviceExplicit;
-
-    extern uint16_t g_prohibitedButtons;
-
    void Init();
+    void SetProhibitedButtons(uint16_t wButtons);

    uint32_t GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState);
    uint32_t SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration);
    uint32_t GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps);
-
-    void SetProhibitedButtons(uint16_t wButtons);
-    bool IsInputAllowed();
-    bool IsInputDeviceController();
-    std::string GetInputDeviceName();
 }
@@ -0,0 +1,25 @@
+#pragma once
+
+namespace hid::detail 
+{
+    enum class EInputDevice
+    {
+        Keyboard,
+        Mouse,
+        Xbox,
+        PlayStation
+    };
+
+    extern EInputDevice g_inputDevice;
+    extern EInputDevice g_inputDeviceController;
+
+    extern uint16_t g_prohibitedButtons;
+
+    void Init();
+
+    uint32_t GetState(uint32_t dwUserIndex, XAMINPUT_STATE* pState);
+    uint32_t SetState(uint32_t dwUserIndex, XAMINPUT_VIBRATION* pVibration);
+    uint32_t GetCapabilities(uint32_t dwUserIndex, XAMINPUT_CAPABILITIES* pCaps);
+
+    bool IsInputDeviceController();
+}
@@ -201,17 +201,7 @@ static DLC detectDLC(const std::filesystem::path &sourcePath, VirtualFileSystem
 bool Installer::checkGameInstall(const std::filesystem::path &baseDirectory, std::filesystem::path &modulePath)
 {
    modulePath = baseDirectory / PatchedDirectory / GameExecutableFile;
-
-    if (!std::filesystem::exists(modulePath))
-        return false;
-
-    if (!std::filesystem::exists(baseDirectory / UpdateDirectory / UpdateExecutablePatchFile))
-        return false;
-
-    if (!std::filesystem::exists(baseDirectory / GameDirectory / GameExecutableFile))
-        return false;
-
-    return true;
+    return std::filesystem::exists(modulePath);
 }

 bool Installer::checkDLCInstall(const std::filesystem::path &baseDirectory, DLC dlc)
@@ -1,170 +0,0 @@
-#include "update_checker.h"
-
-#include <curl/curl.h>
-#include <nlohmann/json.hpp>
-
-#include "version.h"
-
-#ifdef WIN32
-#include <shellapi.h>
-#endif
-
-// UpdateChecker
-
-using json = nlohmann::json;
-
-static const char *CHECK_URL = "https://api.github.com/repos/hedge-dev/UnleashedRecomp/releases/latest";
-static const char *VISIT_URL = "https://github.com/hedge-dev/UnleashedRecomp/releases/latest";
-static const char *USER_AGENT = "UnleashedRecomp-Agent";
-
-static std::atomic<bool> g_updateCheckerInProgress = false;
-static std::atomic<bool> g_updateCheckerFinished = false;
-static UpdateChecker::Result g_updateCheckerResult = UpdateChecker::Result::NotStarted;
-
-size_t updateCheckerWriteCallback(void *contents, size_t size, size_t nmemb, std::string *output)
-{
-    size_t totalSize = size * nmemb;
-    output->append((char *)contents, totalSize);
-    return totalSize;
-}
-
-static bool parseVersion(const std::string &versionStr, int &major, int &minor, int &revision)
-{
-    size_t start = 0;
-    if (versionStr[0] == 'v')
-    {
-        start = 1;
-    }
-
-    size_t firstDot = versionStr.find('.', start);
-    size_t secondDot = versionStr.find('.', firstDot + 1);
-
-    if (firstDot == std::string::npos || secondDot == std::string::npos)
-    {
-        return false;
-    }
-
-    try
-    {
-        major = std::stoi(versionStr.substr(start, firstDot - start));
-        minor = std::stoi(versionStr.substr(firstDot + 1, secondDot - firstDot - 1));
-        revision = std::stoi(versionStr.substr(secondDot + 1));
-    }
-    catch (const std::exception &e)
-    {
-        fmt::println("Error while parsing version: {}.", e.what());
-        return false;
-    }
-
-    return true;
-}
-
-void updateCheckerThread()
-{
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    int major, minor, revision;
-    std::string response;
-    curl_easy_setopt(curl, CURLOPT_URL, CHECK_URL);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, updateCheckerWriteCallback);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-    curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-    curl_easy_setopt(curl, CURLOPT_USERAGENT, USER_AGENT);
-
-    res = curl_easy_perform(curl);
-    if (res == CURLE_OK)
-    {
-        try
-        {
-            json root = json::parse(response);
-            auto tag_name_element = root.find("tag_name");
-            if (tag_name_element != root.end() && tag_name_element->is_string())
-            {
-                if (parseVersion(*tag_name_element, major, minor, revision))
-                {
-                    if ((g_versionMajor < major) || (g_versionMajor == major  && g_versionMinor < minor) || (g_versionMajor == major && g_versionMinor == minor && g_versionRevision < revision))
-                    {
-                        g_updateCheckerResult = UpdateChecker::Result::UpdateAvailable;
-                    }
-                    else
-                    {
-                        g_updateCheckerResult = UpdateChecker::Result::AlreadyUpToDate;
-                    }
-                }
-                else
-                {
-                    fmt::println("Error while parsing response: tag_name does not contain a valid version string.");
-                    g_updateCheckerResult = UpdateChecker::Result::Failed;
-                }
-            }
-            else
-            {
-                fmt::println("Error while parsing response: tag_name not found or not the right type.");
-                g_updateCheckerResult = UpdateChecker::Result::Failed;
-            }
-        }
-        catch (const json::exception &e)
-        {
-            fmt::println("Error while parsing response: {}", e.what());
-            g_updateCheckerResult = UpdateChecker::Result::Failed;
-        }
-    }
-    else
-    {
-        fmt::println("Error while performing request: {}", curl_easy_strerror(res));
-        g_updateCheckerResult = UpdateChecker::Result::Failed;
-    }
-
-    curl_easy_cleanup(curl);
-
-    g_updateCheckerFinished = true;
-    g_updateCheckerInProgress = false;
-}
-
-void UpdateChecker::initialize()
-{
-    curl_global_init(CURL_GLOBAL_DEFAULT);
-}
-
-bool UpdateChecker::start()
-{
-    if (g_updateCheckerInProgress)
-    {
-        return false;
-    }
-
-    g_updateCheckerInProgress = true;
-    g_updateCheckerFinished = false;
-    std::thread thread(&updateCheckerThread);
-    thread.detach();
-
-    return true;
-}
-
-UpdateChecker::Result UpdateChecker::check()
-{
-    if (g_updateCheckerFinished)
-    {
-        return g_updateCheckerResult;
-    }
-    else if (g_updateCheckerInProgress)
-    {
-        return UpdateChecker::Result::InProgress;
-    }
-    else
-    {
-        return UpdateChecker::Result::NotStarted;
-    }
-}
-
-void UpdateChecker::visitWebsite()
-{
-#if defined(WIN32)
-    ShellExecuteA(0, 0, VISIT_URL, 0, 0, SW_SHOW);
-#elif defined(__linux__)
-    std::string command = "xdg-open " + std::string(VISIT_URL) + " &";
-    std::system(command.c_str());
-#else
-    static_assert(false, "Visit website not implemented for this platform.");
-#endif
-}
@@ -1,18 +0,0 @@
-#pragma once
-
-struct UpdateChecker
-{
-    enum class Result
-    {
-        NotStarted,
-        InProgress,
-        AlreadyUpToDate,
-        UpdateAvailable,
-        Failed
-    };
-
-    static void initialize();
-    static bool start();
-    static Result check();
-    static void visitWebsite();
-};
@@ -2,6 +2,7 @@
 #include "xam.h"
 #include "xdm.h"
 #include <hid/hid.h>
+#include <hid/hid_detail.h>
 #include <ui/game_window.h>
 #include <cpu/guest_thread.h>
 #include <ranges>
@@ -10,6 +11,12 @@
 #include <user/paths.h>
 #include <SDL.h>

+#ifdef _WIN32
+#include <CommCtrl.h>
+// Needed for commctrl
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#endif
+
 struct XamListener : KernelObject
 {
    uint32_t id{};
@@ -201,15 +208,11 @@ bool XNotifyGetNext(uint32_t hNotification, uint32_t dwMsgFilter, be<uint32_t>*
 uint32_t XamShowMessageBoxUI(uint32_t dwUserIndex, be<uint16_t>* wszTitle, be<uint16_t>* wszText, uint32_t cButtons,
    xpointer<be<uint16_t>>* pwszButtons, uint32_t dwFocusButton, uint32_t dwFlags, be<uint32_t>* pResult, XXOVERLAPPED* pOverlapped)
 {
-    *pResult = cButtons ? cButtons - 1 : 0;
+    int button{};

-#if _DEBUG
-    assert("XamShowMessageBoxUI encountered!" && false);
-#elif _WIN32
-    // This code is Win32-only as it'll most likely crash, misbehave or
-    // cause corruption due to using a different type of memory than what
-    // wchar_t is on Linux. Windows uses 2 bytes while Linux uses 4 bytes.
+#ifdef _WIN32
    std::vector<std::wstring> texts{};
+    std::vector<TASKDIALOG_BUTTON> buttons{};

    texts.emplace_back(reinterpret_cast<wchar_t*>(wszTitle));
    texts.emplace_back(reinterpret_cast<wchar_t*>(wszText));
@@ -223,27 +226,23 @@ uint32_t XamShowMessageBoxUI(uint32_t dwUserIndex, be<uint16_t>* wszTitle, be<ui
            ByteSwapInplace(text[i]);
    }

-    wprintf(L"[XamShowMessageBoxUI] !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
-    wprintf(L"[XamShowMessageBoxUI] If you are encountering this message and the game has ceased functioning,\n");
-    wprintf(L"[XamShowMessageBoxUI] please create an issue at https://github.com/hedge-dev/UnleashedRecomp/issues.\n");
-    wprintf(L"[XamShowMessageBoxUI] !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
-    wprintf(L"[XamShowMessageBoxUI] %ls\n", texts[0].c_str());
-    wprintf(L"[XamShowMessageBoxUI] %ls\n", texts[1].c_str());
-    wprintf(L"[XamShowMessageBoxUI] ");
-
    for (size_t i = 0; i < cButtons; i++)
-    {
-        wprintf(L"%ls", texts[2 + i].c_str());
+        buttons.emplace_back(i, texts[2 + i].c_str());

-        if (i != cButtons - 1)
-            wprintf(L" | ");
-    }
+    XamNotifyEnqueueEvent(9, 1);

-    wprintf(L"\n");
-    wprintf(L"[XamShowMessageBoxUI] Defaulted to button: %d\n", pResult->get());
-    wprintf(L"[XamShowMessageBoxUI] !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    TASKDIALOGCONFIG config{};
+    config.cbSize = sizeof(config);
+    config.pszWindowTitle = texts[0].c_str();
+    config.pszContent = texts[1].c_str();
+    config.cButtons = cButtons;
+    config.pButtons = buttons.data();
+
+    TaskDialogIndirect(&config, &button, nullptr, nullptr);
 #endif

+    *pResult = button;
+
    if (pOverlapped)
    {
        pOverlapped->dwCompletionContext = GuestThread::GetCurrentThreadId();
@@ -405,66 +404,56 @@ uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_STATE* st
 {
    memset(state, 0, sizeof(*state));

-    if (hid::IsInputAllowed())
-        hid::GetState(userIndex, state);
+    uint32_t result = hid::GetState(userIndex, state);

-    auto keyboardState = SDL_GetKeyboardState(NULL);
-
-    if (GameWindow::s_isFocused && !keyboardState[SDL_SCANCODE_LALT])
+    if (GameWindow::s_isFocused)
    {
-        if (keyboardState[Config::Key_LeftStickUp])
+        auto keyboardState = SDL_GetKeyboardState(NULL);
+
+        if (keyboardState[SDL_SCANCODE_UP])
            state->Gamepad.sThumbLY = 32767;
-        if (keyboardState[Config::Key_LeftStickDown])
+        if (keyboardState[SDL_SCANCODE_DOWN])
            state->Gamepad.sThumbLY = -32768;
-        if (keyboardState[Config::Key_LeftStickLeft])
+        if (keyboardState[SDL_SCANCODE_LEFT])
            state->Gamepad.sThumbLX = -32768;
-        if (keyboardState[Config::Key_LeftStickRight])
+        if (keyboardState[SDL_SCANCODE_RIGHT])
            state->Gamepad.sThumbLX = 32767;

-        if (keyboardState[Config::Key_RightStickUp])
-            state->Gamepad.sThumbRY = 32767;
-        if (keyboardState[Config::Key_RightStickDown])
-            state->Gamepad.sThumbRY = -32768;
-        if (keyboardState[Config::Key_RightStickLeft])
-            state->Gamepad.sThumbRX = -32768;
-        if (keyboardState[Config::Key_RightStickRight])
-            state->Gamepad.sThumbRX = 32767;
-
-        if (keyboardState[Config::Key_LeftTrigger])
+        if (keyboardState[SDL_SCANCODE_1])
            state->Gamepad.bLeftTrigger = 0xFF;
-        if (keyboardState[Config::Key_RightTrigger])
+        if (keyboardState[SDL_SCANCODE_3])
            state->Gamepad.bRightTrigger = 0xFF;

-        if (keyboardState[Config::Key_DPadUp])
+        if (keyboardState[SDL_SCANCODE_I])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_DPAD_UP;
-        if (keyboardState[Config::Key_DPadDown])
+        if (keyboardState[SDL_SCANCODE_K])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_DPAD_DOWN;
-        if (keyboardState[Config::Key_DPadLeft])
+        if (keyboardState[SDL_SCANCODE_J])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_DPAD_LEFT;
-        if (keyboardState[Config::Key_DPadRight])
+        if (keyboardState[SDL_SCANCODE_L])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_DPAD_RIGHT;

-        if (keyboardState[Config::Key_Start])
+        if (keyboardState[SDL_SCANCODE_RETURN] && !keyboardState[SDL_SCANCODE_LALT])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_START;
-        if (keyboardState[Config::Key_Back])
+        if (keyboardState[SDL_SCANCODE_BACKSPACE])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_BACK;

-        if (keyboardState[Config::Key_LeftBumper])
+        if (keyboardState[SDL_SCANCODE_Q])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_LEFT_SHOULDER;
-        if (keyboardState[Config::Key_RightBumper])
+        if (keyboardState[SDL_SCANCODE_E])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_RIGHT_SHOULDER;

-        if (keyboardState[Config::Key_A])
+        if (keyboardState[SDL_SCANCODE_S])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_A;
-        if (keyboardState[Config::Key_B])
+        if (keyboardState[SDL_SCANCODE_D])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_B;
-        if (keyboardState[Config::Key_X])
+        if (keyboardState[SDL_SCANCODE_A])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_X;
-        if (keyboardState[Config::Key_Y])
+        if (keyboardState[SDL_SCANCODE_W])
            state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_Y;
    }

-    state->Gamepad.wButtons &= ~hid::g_prohibitedButtons;
+    state->Gamepad.wButtons &= ~hid::detail::g_prohibitedButtons;

    ByteSwapInplace(state->Gamepad.wButtons);
    ByteSwapInplace(state->Gamepad.sThumbLX);
@@ -477,7 +466,7 @@ uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_STATE* st

 uint32_t XamInputSetState(uint32_t userIndex, uint32_t flags, XAMINPUT_VIBRATION* vibration)
 {
-    if (!hid::IsInputDeviceController() || !Config::Vibration)
+    if (!hid::detail::IsInputDeviceController() || !Config::Vibration)
        return ERROR_SUCCESS;

    ByteSwapInplace(vibration->wLeftMotorSpeed);
@@ -19,10 +19,10 @@
 */

 #define CONFIG_DEFINE_LOCALE(name) \
-    CONFIG_LOCALE g_##name##_locale =
+    CONFIG_LOCALE Config::g_##name##_locale =

 #define CONFIG_DEFINE_ENUM_LOCALE(type) \
-    CONFIG_ENUM_LOCALE(type) g_##type##_locale =
+    CONFIG_ENUM_LOCALE(type) Config::g_##type##_locale =

 CONFIG_DEFINE_LOCALE(Language)
 {
@@ -49,52 +49,6 @@ CONFIG_DEFINE_ENUM_LOCALE(ELanguage)
    }
 };

-CONFIG_DEFINE_ENUM_LOCALE(EVoiceLanguage)
-{
-    {
-        ELanguage::English,
-        {
-            { EVoiceLanguage::English,  { "ENGLISH", "" } },
-            { EVoiceLanguage::Japanese, { "JAPANESE", "" } }
-        }
-    },
-    {
-        ELanguage::Japanese,
-        {
-            { EVoiceLanguage::English,  { "英語", "" } },
-            { EVoiceLanguage::Japanese, { "日本語", "" } }
-        }
-    },
-    {
-        ELanguage::German,
-        {
-            { EVoiceLanguage::English,  { "ENGLISCH", "" } },
-            { EVoiceLanguage::Japanese, { "JAPANISCH", "" } }
-        }
-    },
-    {
-        ELanguage::French,
-        {
-            { EVoiceLanguage::English,  { "ANGLAIS", "" } },
-            { EVoiceLanguage::Japanese, { "JAPONAIS", "" } }
-        }
-    },
-    {
-        ELanguage::Spanish,
-        {
-            { EVoiceLanguage::English,  { "INGLÉS", "" } },
-            { EVoiceLanguage::Japanese, { "JAPONÉS", "" } }
-        }
-    },
-    {
-        ELanguage::Italian,
-        {
-            { EVoiceLanguage::English,  { "INGLESE", "" } },
-            { EVoiceLanguage::Japanese, { "GIAPPONESE", "" } }
-        }
-    },
-};
-
 CONFIG_DEFINE_LOCALE(Hints)
 {
    { ELanguage::English, { "Hints", "Show hint rings in stages." } }
@@ -143,25 +97,14 @@ CONFIG_DEFINE_ENUM_LOCALE(EControllerIcons)
    }
 };

-CONFIG_DEFINE_LOCALE(HorizontalCamera)
+CONFIG_DEFINE_LOCALE(InvertCameraX)
 {
-    { ELanguage::English, { "Horizontal Camera", "Change how the camera moves left and right." } }
+    { ELanguage::English, { "Invert Camera X", "Toggle between inverted left and right camera movement." } }
 };

-CONFIG_DEFINE_LOCALE(VerticalCamera)
+CONFIG_DEFINE_LOCALE(InvertCameraY)
 {
-    { ELanguage::English, { "Vertical Camera", "Change how the camera moves up and down." } }
-};
-
-CONFIG_DEFINE_ENUM_LOCALE(ECameraRotationMode)
-{
-    {
-        ELanguage::English,
-        {
-            { ECameraRotationMode::Normal,  { "NORMAL", "" } },
-            { ECameraRotationMode::Reverse, { "REVERSE", "" } }
-        }
-    }
+    { ELanguage::English, { "Invert Camera Y", "Toggle between inverted up and down camera movement." } }
 };

 CONFIG_DEFINE_LOCALE(Vibration)
@@ -174,6 +117,11 @@ CONFIG_DEFINE_LOCALE(AllowBackgroundInput)
    { ELanguage::English, { "Allow Background Input", "Allow controller input whilst the game window is unfocused." } }
 };

+CONFIG_DEFINE_LOCALE(AllowDPadMovement)
+{
+    { ELanguage::English, { "Allow D-Pad Movement", "Allow the player to also be controlled using the directional pad." } }
+};
+
 CONFIG_DEFINE_LOCALE(MasterVolume)
 {
    { ELanguage::English, { "Master Volume", "Adjust the overall volume." } }
@@ -194,27 +142,22 @@ CONFIG_DEFINE_LOCALE(MusicAttenuation)
    { ELanguage::English, { "Music Attenuation", "Fade out the game's music when external media is playing." } }
 };

-CONFIG_DEFINE_LOCALE(ChannelConfiguration)
+CONFIG_DEFINE_LOCALE(VoiceLanguage)
 {
-    { ELanguage::English, { "Channel Configuration", "" } }
+    { ELanguage::English, { "Voice Language", "Change the language used for character voices." } }
 };

-CONFIG_DEFINE_ENUM_LOCALE(EChannelConfiguration)
+CONFIG_DEFINE_ENUM_LOCALE(EVoiceLanguage)
 {
    {
        ELanguage::English,
        {
-            { EChannelConfiguration::Stereo,   { "STEREO", "" } },
-            { EChannelConfiguration::Surround, { "SURROUND", "" } }
+            { EVoiceLanguage::English,  { "ENGLISH", "" } },
+            { EVoiceLanguage::Japanese, { "日本語", "" } }
        }
    }
 };

-CONFIG_DEFINE_LOCALE(VoiceLanguage)
-{
-    { ELanguage::English, { "Voice Language", "Change the language used for character voices." } }
-};
-
 CONFIG_DEFINE_LOCALE(Subtitles)
 {
    { ELanguage::English, { "Subtitles", "Show subtitles during dialogue." } }
@@ -24,12 +24,7 @@ std::unordered_map<std::string, std::unordered_map<ELanguage, std::string>> g_lo
    {
        "Options_Header_Name",
        {
-            { ELanguage::English, "OPTIONS" },
-            { ELanguage::Japanese, "OPTION" },
-            { ELanguage::German, "OPTIONEN" },
-            { ELanguage::French, "OPTIONS" },
-            { ELanguage::Spanish, "OPCIONES" },
-            { ELanguage::Italian, "OPZIONI" }
+            { ELanguage::English, "OPTIONS" }
        }
    },
    {
@@ -170,26 +165,26 @@ std::unordered_map<std::string, std::unordered_map<ELanguage, std::string>> g_lo
    {
        "Installer_Page_Introduction",
        {
-            { ELanguage::English, "Welcome to\nUnleashed Recompiled!\n\nYou'll need an Xbox 360 copy\nof Sonic Unleashed in order to proceed with the installation." },
-            { ELanguage::Italian, "Benvenuto a\nUnleashed Recompiled!\n\nDovrai avere una copia di\nSonic Unleashed per la Xbox 360\nper proseguire con l'installazione." }
+            { ELanguage::English, "Welcome to Unleashed Recompiled!\n\nYou'll need an Xbox 360 copy\nof Sonic Unleashed in order to proceed with the installation." },
+            { ELanguage::Italian, "Benvenuto a Unleashed Recompiled!\n\nDovrai avere una copia di\nSonic Unleashed per la Xbox 360\nper proseguire con l'installazione." }
        }
    },
    {
        "Installer_Page_SelectGameAndUpdate",
        {
-            { ELanguage::English, "Add the sources for the game and its title update." }
+            { ELanguage::English, "Add the files for the game and its title update. You can use digital dumps or an extracted folder containing the unmodified files." }
        }
    },
    {
        "Installer_Page_SelectDLC",
        {
-            { ELanguage::English, "Add the sources for the DLC." }
+            { ELanguage::English, "Add the files for the DLC. You can use digital dumps or an extracted folder containing the unmodified files." }
        }
    },
    {
        "Installer_Page_CheckSpace",
        {
-            { ELanguage::English, "The content will be installed to the program's folder.\n\nPlease confirm that you have enough free space.\n\n" },
+            { ELanguage::English, "The content will be installed to the program's folder. Please confirm you have enough free space.\n\n" },
            { ELanguage::Italian, "Il contenuto verrà installato nella cartella di questo programma. Assicurati di avere abbastanza spazio libero sul tuo hard disk.\n\n" }
        }
    },
@@ -347,48 +342,6 @@ std::unordered_map<std::string, std::unordered_map<ELanguage, std::string>> g_lo
            { ELanguage::Italian, "Sei sicuro di voler uscire?" }
        }
    },
-    {
-        // Notes: message appears when SYS-DATA is corrupted (mismatching file size) upon pressing start at the title screen.
-        // To make this occur, open the file in any editor and just remove a large chunk of data.
-        // Do not localise this unless absolutely necessary, these strings are from the XEX.
-        "Title_Message_SaveDataCorrupt",
-        {
-            { ELanguage::English, "The save file appears to be\ncorrupted and cannot be loaded." },
-            { ELanguage::Japanese, "ゲームデータの読み込みに失敗しました。\nこのまま続けるとゲームデータをセーブすることはできません" },
-            { ELanguage::German, "Diese Speicherdatei ist beschädigt\nund kann nicht geladen werden." },
-            { ELanguage::French, "Le fichier de sauvegarde semble être\nendommagé et ne peut être chargé." },
-            { ELanguage::Spanish, "El archivo parece estar dañado\ny no se puede cargar." },
-            { ELanguage::Italian, "I file di salvataggio sembrano danneggiati\ne non possono essere caricati." }
-        }
-    },
-    {
-        // Notes: message appears when ACH-DATA is corrupted (mismatching file size, bad signature, incorrect version or invalid checksum) upon pressing start at the title screen.
-        // To make this occur, open the file in any editor and just remove a large chunk of data.
-        "Title_Message_AchievementDataCorrupt",
-        {
-            { ELanguage::English, "The achievement data appears to be\ncorrupted and cannot be loaded.\n\nProceeding from this point will\nclear your achievement data." }
-        }
-    },
-    {
-        // Notes: message appears when ACH-DATA cannot be loaded upon pressing start at the title screen.
-        // To make this occur, lock the ACH-DATA file using an external program so that it cannot be accessed by the game.
-        "Title_Message_AchievementDataIOError",
-        {
-            { ELanguage::English, "The achievement data could not be loaded.\nYour achievements will not be saved." }
-        }
-    },
-    {
-        "Title_Message_UpdateAvailable",
-        {
-            { ELanguage::English, "An update is available!\n\nWould you like to visit the\nreleases page to download it?" }
-        }
-    },
-    {
-        "Video_BackendError",
-        {
-            { ELanguage::English, "Unable to create a D3D12 (Windows) or Vulkan backend.\n\nPlease make sure that:\n\n- Your system meets the minimum requirements.\n- Your GPU drivers are up to date.\n- Your operating system is on the latest version available." }
-        }
-    },
    {
        "Common_On",
        {
@@ -10,23 +10,15 @@
 #include <xex.h>
 #include <apu/audio.h>
 #include <hid/hid.h>
+#include <user/achievement_data.h>
 #include <user/config.h>
 #include <user/paths.h>
-#include <user/registry.h>
 #include <kernel/xdbf.h>
 #include <install/installer.h>
-#include <install/update_checker.h>
 #include <os/logger.h>
-#include <os/process.h>
-#include <os/registry.h>
-#include <ui/game_window.h>
 #include <ui/installer_wizard.h>
 #include <mod/mod_loader.h>

-#ifdef _WIN32
-#include <timeapi.h>
-#endif
-
 const size_t XMAIOBegin = 0x7FEA0000;
 const size_t XMAIOEnd = XMAIOBegin + 0x0000FFFF;

@@ -153,9 +145,6 @@ int main(int argc, char *argv[])
    timeBeginPeriod(1);
 #endif

-    if (!os::registry::Init())
-        LOGN_WARNING("OS doesn't support registry");
-
    os::logger::Init();

    bool forceInstaller = false;
@@ -178,21 +167,6 @@ int main(int argc, char *argv[])

    Config::Load();

-    // Check the time since the last time an update was checked. Store the new time if the difference is more than six hours.
-    constexpr double TimeBetweenUpdateChecksInSeconds = 6 * 60 * 60;
-    time_t timeNow = std::time(nullptr);
-    double timeDifferenceSeconds = difftime(timeNow, Config::LastChecked);
-    if (timeDifferenceSeconds > TimeBetweenUpdateChecksInSeconds)
-    {
-        UpdateChecker::initialize();
-        UpdateChecker::start();
-        Config::LastChecked = timeNow;
-        Config::Save();
-    }
-
-    if (Config::ShowConsole)
-        os::process::ShowConsole();
-
    HostStartup();

    std::filesystem::path modulePath;
@@ -200,11 +174,7 @@ int main(int argc, char *argv[])
    bool runInstallerWizard = forceInstaller || forceDLCInstaller || !isGameInstalled;
    if (runInstallerWizard)
    {
-        if (!Video::CreateHostDevice(sdlVideoDriver))
-        {
-            SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, GameWindow::GetTitle(), Localise("Video_BackendError").c_str(), GameWindow::s_pWindow);
-            return 1;
-        }
+        Video::CreateHostDevice(sdlVideoDriver);

        if (!InstallerWizard::Run(GAME_INSTALL_DIRECTORY, isGameInstalled && forceDLCInstaller))
        {
@@ -214,18 +184,14 @@ int main(int argc, char *argv[])

    ModLoader::Init();

+    AchievementData::Load();
+
    KiSystemStartup();

    uint32_t entry = LdrLoadModule(modulePath);

    if (!runInstallerWizard)
-    {
-        if (!Video::CreateHostDevice(sdlVideoDriver))
-        {
-            SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, GameWindow::GetTitle(), Localise("Video_BackendError").c_str(), GameWindow::s_pWindow);
-            return 1;
-        }
-    }
+        Video::CreateHostDevice(sdlVideoDriver);

    Video::StartPipelinePrecompilation();

@@ -6,7 +6,6 @@
 #include <kernel/function.h>
 #include <kernel/heap.h>
 #include <user/paths.h>
-#include <os/process.h>
 #include <xxHashMap.h>

 enum class ModType
@@ -27,6 +26,9 @@ static std::vector<Mod> g_mods;

 std::filesystem::path ModLoader::ResolvePath(std::string_view path)
 {
+    if (g_mods.empty())
+        return {};
+
    std::string_view root;

    size_t sepIndex = path.find(":\\");
@@ -49,9 +51,6 @@ std::filesystem::path ModLoader::ResolvePath(std::string_view path)
        return {};
    }

-    if (g_mods.empty())
-        return {};
-
    thread_local xxHashMap<std::filesystem::path> s_cache;

    XXH64_hash_t hash = XXH3_64bits(path.data(), path.size());
@@ -91,7 +90,7 @@ std::vector<std::filesystem::path>* ModLoader::GetIncludeDirectories(size_t modI

 void ModLoader::Init()
 {
-    const std::filesystem::path& userPath = GetUserPath();
+    std::filesystem::path userPath = GetUserPath();

    IniFile configIni;
    if (!configIni.read(userPath / "cpkredir.ini"))
@@ -111,14 +110,9 @@ void ModLoader::Init()
        if (!saveFilePathU8.empty())
            ModLoader::s_saveFilePath = std::u8string_view((const char8_t*)saveFilePathU8.c_str());
        else
-            ModLoader::s_saveFilePath = userPath / "mlsave";
-
-        ModLoader::s_saveFilePath /= "SYS-DATA";
+            ModLoader::s_saveFilePath = userPath / "mlsave/SYS-DATA";
    }

-    if (configIni.getString("CPKREDIR", "LogType", std::string()) == "console")
-        os::process::ShowConsole();
-
    std::string modsDbIniFilePathU8 = configIni.getString("CPKREDIR", "ModsDbIni", "");
    if (modsDbIniFilePathU8.empty())
        return;
@@ -193,20 +187,15 @@ void ModLoader::Init()
                modSaveFilePathU8 = modIni.getString("Main", "SaveFile", std::string());
        }

+        if (!mod.includeDirs.empty())
+            g_mods.emplace_back(std::move(mod));
+
        if (!modSaveFilePathU8.empty())
        {
            std::replace(modSaveFilePathU8.begin(), modSaveFilePathU8.end(), '\\', '/');
            ModLoader::s_saveFilePath = modDirectoryPath / std::u8string_view((const char8_t*)modSaveFilePathU8.c_str());
-
-            // Save file paths in HMM mods are treated as folders.
-            if (mod.type == ModType::HMM)
-                ModLoader::s_saveFilePath /= "SYS-DATA";
-
            foundModSaveFilePath = true;
        }
-
-        if (!mod.includeDirs.empty())
-            g_mods.emplace_back(std::move(mod));
    }
 }

@@ -1,10 +1,10 @@
-#include <os/logger.h>
+#include <os/logger_detail.h>

-void os::logger::Init()
+void os::logger::detail::Init()
 {
 }

-void os::logger::Log(const std::string_view str, ELogType type, const char* func)
+void os::logger::detail::Log(const std::string_view str, detail::ELogType type, const char* func)
 {
    if (func)
    {
@@ -1,6 +1,6 @@
-#include <os/media.h>
+#include <os/media_detail.h>

-bool os::media::IsExternalMediaPlaying()
+bool os::media::detail::IsExternalMediaPlaying()
 {
    // This functionality is not supported in Linux.
    return false;
@@ -1,8 +1,8 @@
-#include <os/process.h>
+#include <os/process_detail.h>

 #include <signal.h>

-std::filesystem::path os::process::GetExecutablePath()
+std::filesystem::path os::process::detail::GetExecutablePath()
 {
    char exePath[PATH_MAX] = {};
    if (readlink("/proc/self/exe", exePath, PATH_MAX) > 0)
@@ -15,7 +15,7 @@ std::filesystem::path os::process::GetExecutablePath()
    }
 }

-std::filesystem::path os::process::GetWorkingDirectory()
+std::filesystem::path os::process::detail::GetWorkingDirectory()
 {
    char cwd[PATH_MAX] = {};
    char *res = getcwd(cwd, sizeof(cwd));
@@ -29,12 +29,7 @@ std::filesystem::path os::process::GetWorkingDirectory()
    }
 }

-bool os::process::SetWorkingDirectory(const std::filesystem::path& path)
-{
-    return chdir(path.c_str()) == 0;
-}
-
-bool os::process::StartProcess(const std::filesystem::path& path, const std::vector<std::string>& args, std::filesystem::path work)
+bool os::process::detail::StartProcess(const std::filesystem::path path, const std::vector<std::string> args, std::filesystem::path work)
 {
    pid_t pid = fork();
    if (pid < 0)
@@ -60,8 +55,3 @@ bool os::process::StartProcess(const std::filesystem::path& path, const std::vec

    return true;
 }
-
-void os::process::ShowConsole()
-{
-    // Unnecessary on Linux.
-}
@@ -1,21 +0,0 @@
-#include <os/registry.h>
-
-// TODO: Implement
-inline bool os::registry::Init()
-{
-    return false;
-}
-
-// TODO: read from file?
-template<typename T>
-bool os::registry::ReadValue(const std::string_view& name, T& data)
-{
-    return false;
-}
-
-// TODO: write to file?
-template<typename T>
-bool os::registry::WriteValue(const std::string_view& name, const T& data)
-{
-    return false;
-}
@@ -1,6 +1,6 @@
-#include <os/user.h>
+#include <os/user_detail.h>

-bool os::user::IsDarkTheme()
+bool os::user::detail::IsDarkTheme()
 {
    return false;
 }
@@ -1,7 +1,7 @@
-#include <os/version.h>
+#include <os/version_detail.h>

-os::version::OSVersion os::version::GetOSVersion()
+os::version::detail::OSVersion os::version::detail::GetOSVersion()
 {
    assert(false && "Unimplemented.");
-    return os::version::OSVersion();
+    return os::version::detail::OSVersion();
 }
@@ -0,0 +1,12 @@
+#include <os/logger.h>
+#include <os/logger_detail.h>
+
+void os::logger::Init()
+{
+    detail::Init();
+}
+
+void os::logger::Log(const std::string_view str, detail::ELogType type, const char* func)
+{
+    detail::Log(str, type, func);
+}
@@ -1,9 +1,9 @@
 #pragma once

-#include <source_location>
+#include <os/logger_detail.h>

-#define LOG_IMPL(type, func, str)       os::logger::Log(str, os::logger::ELogType::type, func)
-#define LOGF_IMPL(type, func, str, ...) os::logger::Log(fmt::format(str, __VA_ARGS__), os::logger::ELogType::type, func)
+#define LOG_IMPL(type, func, str)       os::logger::Log(str, os::logger::detail::ELogType::type, func)
+#define LOGF_IMPL(type, func, str, ...) os::logger::Log(fmt::format(str, __VA_ARGS__), os::logger::detail::ELogType::type, func)

 // Function-specific logging.

@@ -51,14 +51,6 @@

 namespace os::logger
 {
-    enum class ELogType
-    {
-        None,
-        Utility,
-        Warning,
-        Error
-    };
-
    void Init();
-    void Log(const std::string_view str, ELogType type = ELogType::None, const char* func = nullptr);
+    void Log(const std::string_view str, detail::ELogType type = detail::ELogType::None, const char* func = nullptr);
 }
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <source_location>
+
+namespace os::logger::detail
+{
+    enum class ELogType
+    {
+        None,
+        Utility,
+        Warning,
+        Error
+    };
+
+    void Init();
+    void Log(const std::string_view str, ELogType type = ELogType::None, const char* func = nullptr);
+}
@@ -0,0 +1,7 @@
+#include <os/media.h>
+#include <os/media_detail.h>
+
+bool os::media::IsExternalMediaPlaying()
+{
+    return detail::IsExternalMediaPlaying();
+}
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace os::media::detail
+{
+    bool IsExternalMediaPlaying();
+}
@@ -0,0 +1,17 @@
+#include <os/process.h>
+#include <os/process_detail.h>
+
+std::filesystem::path os::process::GetExecutablePath()
+{
+    return detail::GetExecutablePath();
+}
+
+std::filesystem::path os::process::GetWorkingDirectory()
+{
+    return detail::GetWorkingDirectory();
+}
+
+bool os::process::StartProcess(const std::filesystem::path path, const std::vector<std::string> args, std::filesystem::path work)
+{
+    return detail::StartProcess(path, args, work);
+}
@@ -4,7 +4,5 @@ namespace os::process
 {
    std::filesystem::path GetExecutablePath();
    std::filesystem::path GetWorkingDirectory();
-    bool SetWorkingDirectory(const std::filesystem::path& path);
-    bool StartProcess(const std::filesystem::path& path, const std::vector<std::string>& args, std::filesystem::path work = {});
-    void ShowConsole();
+    bool StartProcess(const std::filesystem::path path, const std::vector<std::string> args, std::filesystem::path work = {});
 }
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace os::process::detail
+{
+    std::filesystem::path GetExecutablePath();
+    std::filesystem::path GetWorkingDirectory();
+    bool StartProcess(const std::filesystem::path path, const std::vector<std::string> args, std::filesystem::path work = {});
+}
@@ -1,18 +0,0 @@
-#pragma once
-
-namespace os::registry
-{
-    bool Init();
-
-    template<typename T>
-    bool ReadValue(const std::string_view& name, T& data);
-
-    template<typename T>
-    bool WriteValue(const std::string_view& name, const T& data);
-}
-
-#if _WIN32
-#include <os/win32/registry_win32.inl>
-#elif defined(__linux__)
-#include <os/linux/registry_linux.inl>
-#endif
@@ -0,0 +1,7 @@
+#include <os/user.h>
+#include <os/user_detail.h>
+
+bool os::user::IsDarkTheme()
+{
+    return detail::IsDarkTheme();
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
RadiantDerg	c357062de8	Partial ratio text implementation	2025-01-19 04:22:12 -06:00
RadiantDerg	fc51d0e7ae	Fix potential memory issue Text/Line vectors could've been added to even if Reddog was never enabled, thus only ever expanding in size as they couldn't update.	2025-01-17 19:22:04 -06:00
Hyper	f4406cd8d0	Merge branch 'main' into debug-menu	2025-01-18 00:20:05 +00:00
RadiantDerg	2af11c8d2f	Fix position text scaling with aspect ratio	2025-01-17 18:17:50 -06:00
Hyper	dd54867e58	Merge branch 'main' into debug-menu	2025-01-17 23:03:02 +00:00
Hyper	4b358d8e43	Rebase branch to main	2025-01-17 20:44:56 +00:00
Hyper	110f341af6	reddog_window: fix variable titlebar button positions	2025-01-17 20:17:59 +00:00
RadiantDerg	00e148b182	Draw position, Move patches to debug_patches.cpp	2025-01-17 20:17:56 +00:00
RadiantDerg	eb3225c2f7	SWA API mappings	2025-01-17 20:17:16 +00:00
Hyper	4ab26a1696	reddog: window improvements, added "welcome" message	2025-01-17 20:17:16 +00:00
Hyper	72a0a17e3a	view_window: reordering and clean-up	2025-01-17 20:17:15 +00:00
Hyper	35b9361a91	api: use MmGetHostAddress for globals	2025-01-17 20:17:15 +00:00
Hyper	7788e36704	api: added globals struct	2025-01-17 20:17:15 +00:00
RadiantDerg	023fc0edf7	Added Vector mappings, Added DebugDraw class for drawing text on screen and in a popup SWA API: - Added CVector - Added CVector4 - Combined CVectorX into one header Reddog: - Added toggle for visualizing the loaded GI Atlas Mipmap level - Added toggles for rendering Havok collision - Added toggles for Light Field	2025-01-17 20:17:12 +00:00
Hyper	d5ca843716	reddog: implemented FPS counter	2025-01-17 20:16:30 +00:00
Hyper	dbdf020218	reddog: improve button accuracy	2025-01-17 20:14:53 +00:00
Hyper	d5e947f520	reddog: improve window list accuracy	2025-01-17 20:14:52 +00:00
Hyper	a7e004fb60	reddog: improve window colour accuracy	2025-01-17 20:14:52 +00:00
Hyper	892e24f71e	reddog: implemented custom button	2025-01-17 20:14:51 +00:00
Hyper	72a0507c66	Fix old header paths	2025-01-17 20:14:51 +00:00
Hyper	2f68ee5df2	Implemented mock reddog window manager Requires micross.ttf font in game root and ENABLE_IM_FONT_ATLAS_SNAPSHOT undefined, not currently in the font atlas.	2025-01-17 20:14:50 +00:00