Bad Apple!!

2026-07-03 19:10:19 -04:00 · 2026-04-14 19:40:57 +02:00
410 changed files with 3387 additions and 29547 deletions
@@ -2,7 +2,7 @@
 Language: Cpp
 Standard: C++03
 AccessModifierOffset: -4
-AlignAfterOpenBracket: DontAlign
+AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignOperands:   true
@@ -8,9 +8,8 @@ on:
  pull_request:

 env:
-  # SCCACHE_GHA_ENABLED: "true"
+  SCCACHE_GHA_ENABLED: "true"
  RUSTC_WRAPPER: "sccache"
-  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}

 jobs:
  build-linux:
@@ -22,13 +21,13 @@ jobs:
      matrix:
        include:
          - name: GCC x86_64
-            runner: [self-hosted, Linux]
+            runner: ubuntu-latest
            preset: gcc
            artifact_arch: x86_64
-          # - name: GCC aarch64
-          #   runner: ubuntu-24.04-arm
-          #   preset: gcc
-          #   artifact_arch: aarch64
+          - name: GCC aarch64
+            runner: ubuntu-24.04-arm
+            preset: gcc
+            artifact_arch: aarch64
          # - name: Clang x86_64
          #   runner: ubuntu-latest
          #   preset: clang
@@ -41,22 +40,17 @@ jobs:
          submodules: recursive

      - name: Install dependencies
-        if: 'false' # disabled for self-hosted
        run: |
          sudo apt-get update
          sudo apt-get -y install ninja-build clang lld openssl libcurl4-openssl-dev \
            zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
            libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev libfreetype-dev \
            libxinerama-dev libxcursor-dev python3-markupsafe libgtk-3-dev libssl-dev \
-            libxss-dev libfuse2 libusb-1.0-0-dev libdecor-0-dev libpipewire-0.3-dev libunwind-dev
+            libxss-dev libfuse2

      - name: Setup sccache
-        if: 'false' # disabled for self-hosted
        uses: mozilla-actions/sccache-action@v0.0.9

-      - name: Print sccache stats
-        run: sccache --show-stats
-
      - name: Configure CMake
        run: cmake --preset x-linux-ci-${{matrix.preset}}

@@ -67,7 +61,6 @@ jobs:
        run: ci/build-appimage.sh

      - name: Upload artifacts
-        if: startsWith(github.event.ref, 'refs/tags/v')
        uses: actions/upload-artifact@v7
        with:
          name: dusk-${{env.DUSK_VERSION}}-linux-${{matrix.preset}}-${{matrix.artifact_arch}}
@@ -75,26 +68,23 @@ jobs:
            build/install/Dusk-*.AppImage
            build/install/debug.tar.*

+
  build-apple:
    name: Build Apple (${{matrix.name}})
-    runs-on: [self-hosted, macOS]
+    runs-on: macos-latest
    strategy:
      fail-fast: false
      matrix:
        include:
-          - name: AppleClang macOS arm64
+          - name: AppleClang macOS universal
            platform: macos
-            preset: x-macos-ci-arm64
-            artifact_name: macos-appleclang-arm64
-          # - name: AppleClang macOS x86_64
-          #   platform: macos
-          #   preset: x-macos-ci-x86_64
-          #   artifact_name: macos-appleclang-x86_64
-          # - name: AppleClang iOS arm64
+            preset: x-macos-ci
+            artifact_name: macos-appleclang-universal
+          # - name: AppleClang iOS arm64 # TODO enable when CI is free
          #   platform: ios
          #   preset: x-ios-ci
          #   artifact_name: ios-appleclang-arm64
-          # - name: AppleClang tvOS arm64
+          # - name: AppleClang tvOS arm64 # TODO enable when CI is free
          #   platform: tvos
          #   preset: x-tvos-ci
          #   artifact_name: tvos-appleclang-arm64
@@ -105,15 +95,22 @@ jobs:
          fetch-depth: 0
          submodules: recursive

+      - name: Update Homebrew
+        if: matrix.platform == 'tvos'
+        run: |
+          brew update
+          brew upgrade --formula
+
      - name: Install dependencies
-        if: 'false'
        run: brew install cmake ninja

+      - name: Install markupsafe
+        if: matrix.platform == 'tvos'
+        run: pip3 install --break-system-packages markupsafe
+
      - name: Install Rust iOS target
        if: matrix.platform == 'ios'
-        run: |
-          rustup toolchain install stable
-          rustup target add aarch64-apple-ios
+        run: rustup target add aarch64-apple-ios

      - name: Install Rust tvOS target
        if: matrix.platform == 'tvos'
@@ -121,12 +118,6 @@ jobs:
          rustup toolchain install nightly
          rustup target add --toolchain nightly aarch64-apple-tvos

-      - name: Install Rust x86_64 macOS target
-        if: endsWith(matrix.preset, 'x86_64')
-        run: |
-          rustup toolchain install stable
-          rustup target add x86_64-apple-darwin
-
      - name: Setup sccache
        uses: mozilla-actions/sccache-action@v0.0.9

@@ -137,7 +128,6 @@ jobs:
        run: cmake --build --preset ${{matrix.preset}}

      - name: Upload artifacts
-        if: startsWith(github.event.ref, 'refs/tags/v')
        uses: actions/upload-artifact@v7
        with:
          name: dusk-${{env.DUSK_VERSION}}-${{matrix.artifact_name}}
@@ -149,22 +139,26 @@ jobs:
    name: Build Windows (${{matrix.name}})
    runs-on: ${{matrix.runner}}

+    env:
+      BUILD_DIR: C:\build
+      SCCACHE_DIR: C:\sccache
+
    strategy:
      fail-fast: false
      matrix:
        include:
          - name: MSVC x86_64
-            runner: [self-hosted, Windows]
+            runner: windows-latest
            preset: msvc
            msvc_arch: amd64
            vcpkg_arch: x64
            artifact_arch: x86_64
-          # - name: MSVC arm64
-          #   runner: windows-11-arm
-          #   preset: arm64-msvc
-          #   msvc_arch: arm64
-          #   vcpkg_arch: arm64
-          #   artifact_arch: arm64
+          - name: MSVC arm64
+            runner: windows-11-arm
+            preset: arm64-msvc
+            msvc_arch: arm64
+            vcpkg_arch: arm64
+            artifact_arch: arm64
          # - name: Clang x86_64
          #   runner: windows-latest
          #   preset: clang
@@ -191,10 +185,11 @@ jobs:
        uses: mozilla-actions/sccache-action@v0.0.9

      - name: Install dependencies
-        if: 'false' # disabled for self-hosted
        run: |
          choco install ninja
-          vcpkg install freetype:${{matrix.vcpkg_arch}}-windows-static zstd:${{matrix.vcpkg_arch}}-windows-static
+          vcpkg install zlib:${{matrix.vcpkg_arch}}-windows-static bzip2:${{matrix.vcpkg_arch}}-windows-static `
+            zstd:${{matrix.vcpkg_arch}}-windows-static liblzma:${{matrix.vcpkg_arch}}-windows-static `
+            freetype:${{matrix.vcpkg_arch}}-windows-static

      - name: Configure CMake
        run: cmake --preset x-windows-ci-${{matrix.preset}}
@@ -203,12 +198,9 @@ jobs:
        run: cmake --build --preset x-windows-ci-${{matrix.preset}}

      - name: Upload artifacts
-        if: startsWith(github.event.ref, 'refs/tags/v')
        uses: actions/upload-artifact@v7
        with:
          name: dusk-${{env.DUSK_VERSION}}-win32-msvc-${{matrix.artifact_arch}}
          path: |
-            build/install/*.exe
-            build/install/*.dll
-            build/install/res/
-            build/install/debug.7z
+            ${{env.BUILD_DIR}}/install/*.exe
+            ${{env.BUILD_DIR}}/install/debug.7z
@@ -6,7 +6,7 @@
            "type": "cppvsdbg",
            "request": "launch",
            "program": "${command:cmake.launchTargetPath}",
-            "args": ["-l", "1", "--dvd", "${workspaceRoot}/orig/GZ2E01/GZ2E01.iso", "--console"],
+            "args": ["-l", "1", "--dvd", "${workspaceRoot}/orig/GZ2E01/GZ2E01.iso"],
            "MIMode": "gdb",
            "miDebuggerPath": "gdb",
            "symbolSearchPath": "${command:cmake.launchTargetPath}",
@@ -48,17 +48,12 @@ else ()
    message(STATUS "Unable to find git, commit information will not be available")
 endif ()

-if (DUSK_WC_DESCRIBE MATCHES "^v([0-9]+)\\.([0-9]+)\\.([0-9]+)(-([0-9]+).*)?$")
-    set(DUSK_SHORT_VERSION_STRING "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
-    if (CMAKE_MATCH_5)
-        set(DUSK_VERSION_STRING "${DUSK_SHORT_VERSION_STRING}.${CMAKE_MATCH_5}")
-    else ()
-        set(DUSK_VERSION_STRING "${DUSK_SHORT_VERSION_STRING}.0")
-    endif ()
+if (DUSK_WC_DESCRIBE)
+    string(REGEX REPLACE "v([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+).*" "\\1.\\2.\\3.\\4" DUSK_VERSION_STRING "${DUSK_WC_DESCRIBE}")
+    string(REGEX REPLACE "v([0-9]+)\.([0-9]+)\.([0-9]+).*" "\\1.\\2.\\3" DUSK_SHORT_VERSION_STRING "${DUSK_WC_DESCRIBE}")
 else ()
    set(DUSK_WC_DESCRIBE "UNKNOWN-VERSION")
-    set(DUSK_VERSION_STRING "0.0.0.0")
-    set(DUSK_SHORT_VERSION_STRING "0.0.0")
+    set(DUSK_VERSION_STRING "0.0.0")
 endif ()

 # Add version information to CI environment variables
@@ -68,9 +63,6 @@ endif()
 message(STATUS "Dusk version set to ${DUSK_WC_DESCRIBE}")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 project(dusk LANGUAGES C CXX VERSION ${DUSK_VERSION_STRING})
-if (APPLE)
-    enable_language(OBJC)
-endif ()
 if (APPLE AND NOT TVOS AND CMAKE_SYSTEM_NAME STREQUAL tvOS)
    # ios.toolchain.cmake hack for SDL
    set(TVOS ON)
@@ -90,17 +82,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

-# Folder-based instead of target-based organization
-# in Visual Studio and Xcode generators
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "_cmake")
-
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
  set(DAWN_USE_WAYLAND ON CACHE BOOL "Enable support for Wayland surface" FORCE)
 endif ()
 set(AURORA_ENABLE_DVD ON CACHE BOOL "Enable DVD API support" FORCE)
 set(AURORA_ENABLE_CARD ON CACHE BOOL "Enable CARD API support" FORCE)
-set(AURORA_ENABLE_RMLUI ON CACHE BOOL "Enable RmlUi UI support" FORCE)
 add_subdirectory(extern/aurora EXCLUDE_FROM_ALL)

 add_subdirectory(libs/freeverb)
@@ -109,20 +95,8 @@ option(DUSK_BUILD_WARNINGS "Enable compiler warnings (off by default)")
 option(DUSK_SELECTED_OPT "If on, selected parts of the project will be compiled with optimizations on Debug, intending to make the game run at 30 FPS. Note for MSVC: you will need to remove '/RTC1' from your debug flags in CMake.")
 option(DUSK_MOVIE_SUPPORT "If on, compile against libjpeg-turbo to enable THP file decoding" ON)

-if(ANDROID)
-    set(DUSK_MOVIE_SUPPORT OFF)
-    set(NOD_COMPRESS_BZIP2 OFF CACHE BOOL "" FORCE)
-    set(NOD_COMPRESS_LZMA OFF CACHE BOOL "" FORCE)
-    set(NOD_COMPRESS_ZLIB OFF CACHE BOOL "" FORCE)
-    set(NOD_COMPRESS_ZSTD OFF CACHE BOOL "" FORCE)
-endif ()
-
-option(DUSK_ENABLE_SENTRY_NATIVE "Enable sentry-native crash reporting support" OFF)
-set(DUSK_SENTRY_DSN "" CACHE STRING "Sentry DSN")
-set(DUSK_SENTRY_ENVIRONMENT "development" CACHE STRING "Sentry environment")
-
 if (DUSK_MOVIE_SUPPORT)
-    find_package(libjpeg-turbo 3.0 CONFIG QUIET)
+    find_package(libjpeg-turbo QUIET)
    if (libjpeg-turbo_FOUND)
        message(STATUS "dusk: Using system libjpeg-turbo")
    else ()
@@ -134,37 +108,19 @@ if (DUSK_MOVIE_SUPPORT)
        else ()
            set(_jpeg_lib ${_jpeg_install_dir}/lib/libturbojpeg.a)
        endif ()
-        set(_jpeg_cmake_args
-            -DCMAKE_INSTALL_PREFIX=${_jpeg_install_dir}
-            -DENABLE_SHARED=OFF
-            -DWITH_TURBOJPEG=ON
-            -DWITH_JAVA=OFF
-        )
-        if (CMAKE_TOOLCHAIN_FILE)
-            get_filename_component(_jpeg_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE BASE_DIR "${CMAKE_SOURCE_DIR}")
-            list(APPEND _jpeg_cmake_args -DCMAKE_TOOLCHAIN_FILE=${_jpeg_toolchain_file})
-        endif ()
-        set(_jpeg_passthrough_vars
-            CMAKE_BUILD_TYPE
-            CMAKE_C_COMPILER
-            CMAKE_C_COMPILER_LAUNCHER
-            CMAKE_MAKE_PROGRAM
-            CMAKE_MSVC_RUNTIME_LIBRARY
-            CMAKE_OSX_ARCHITECTURES
-            DEPLOYMENT_TARGET
-            ENABLE_ARC
-            ENABLE_BITCODE
-            PLATFORM
-        )
-        foreach(_var IN LISTS _jpeg_passthrough_vars)
-            if (DEFINED ${_var})
-                list(APPEND _jpeg_cmake_args -D${_var}=${${_var}})
-            endif ()
-        endforeach ()
        ExternalProject_Add(libjpeg-turbo-ext
            URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.tar.gz
            URL_HASH SHA256=35fec2e1ddfb05ecf6d93e50bc57c1e54bc81c16d611ddf6eff73fff266d8285
-            CMAKE_ARGS ${_jpeg_cmake_args}
+            CMAKE_ARGS
+                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+                -DCMAKE_INSTALL_PREFIX=${_jpeg_install_dir}
+                -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
+                -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}
+                -DENABLE_SHARED=OFF
+                -DWITH_TURBOJPEG=ON
+                -DWITH_JAVA=OFF
            BUILD_BYPRODUCTS ${_jpeg_lib}
        )
        file(MAKE_DIRECTORY ${_jpeg_install_dir}/include)
@@ -192,23 +148,21 @@ elseif (APPLE)
    set(CMAKE_INSTALL_RPATH "$ORIGIN")
    set(CMAKE_BUILD_RPATH "$ORIGIN")
 elseif (MSVC)
-    add_compile_options(
-        $<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>
-        $<$<COMPILE_LANGUAGE:C,CXX>:/Zc:strictStrings->
-        $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
-        $<$<COMPILE_LANGUAGE:C,CXX>:/FS>
-    )
+    add_compile_options(/bigobj)
+    add_compile_options(/Zc:strictStrings-)
+    add_compile_options(/MP)
+    add_compile_options(/FS)

    if (NOT DUSK_BUILD_WARNINGS)
-        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/W0>)
+        add_compile_options(/W0)
    else ()
        # Disable warnings
-        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4068>) # unknown pragma
-        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4291>) # no matching delete operator, leaks if exception thrown
+        add_compile_options(/wd4068) # unknown pragma
+        add_compile_options(/wd4291) # no matching delete operator, leaks if exception thrown
        # Only show warnings once
-        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wo4244>) # narrowing conversion, possible data loss
+        add_compile_options(/wo4244) # narrowing conversion, possible data loss
    endif ()
-    add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>)
+    add_compile_options(/utf-8)
 endif ()


@@ -229,46 +183,6 @@ FetchContent_Declare(json
 )
 FetchContent_MakeAvailable(cxxopts json)

-if (DUSK_ENABLE_SENTRY_NATIVE)
-    message(STATUS "dusk: Fetching sentry-native")
-    set(SENTRY_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-    set(SENTRY_BACKEND crashpad CACHE STRING "" FORCE)
-    if (WIN32)
-        set(SENTRY_TRANSPORT winhttp CACHE STRING "" FORCE)
-    endif ()
-    set(SENTRY_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(SENTRY_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    set(SENTRY_BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
-    FetchContent_Declare(sentry_native
-        GIT_REPOSITORY https://github.com/getsentry/sentry-native.git
-        GIT_TAG 0.13.6
-        GIT_SHALLOW TRUE
-        GIT_PROGRESS TRUE
-        GIT_SUBMODULES_RECURSE TRUE
-    )
-    if (NOT sentry_native_POPULATED)
-        FetchContent_Populate(sentry_native)
-        set(_dusk_skip_install_rules ${CMAKE_SKIP_INSTALL_RULES})
-        set(CMAKE_SKIP_INSTALL_RULES ON)
-        add_subdirectory(${sentry_native_SOURCE_DIR} ${sentry_native_BINARY_DIR} EXCLUDE_FROM_ALL)
-        set(CMAKE_SKIP_INSTALL_RULES ${_dusk_skip_install_rules})
-    endif ()
-endif ()
-
-if (CMAKE_SYSTEM_NAME STREQUAL Windows)
-    set(PLATFORM_NAME win32)
-elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
-    if (IOS)
-        set(PLATFORM_NAME ios)
-    elseif (TVOS)
-        set(PLATFORM_NAME tvos)
-    else ()
-        set(PLATFORM_NAME macos)
-    endif ()
-else ()
-    string(TOLOWER CMAKE_SYSTEM_NAME PLATFORM_NAME)
-endif ()
-
 configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_BINARY_DIR}/version.h)

 include(files.cmake)
@@ -276,21 +190,23 @@ include(files.cmake)
 # TODO: version handling for res includes

 set(DUSK_BUNDLE_NAME Dusk)
-set(DUSK_BUNDLE_IDENTIFIER dev.twilitrealm.dusk)
-set(DUSK_COMPANY_NAME "Twilit Realm")
-set(DUSK_FILE_DESCRIPTION "Dusk")
-set(DUSK_PRODUCT_NAME "Dusk")
-set(DUSK_COPYRIGHT "Copyright (C) Twilit Realm contributors")
+set(DUSK_BUNDLE_IDENTIFIER dev.decomp.dusk)
+set(DUSK_GAME_NAME "GZ2E")
+set(DUSK_GAME_VERSION "01")
+set(DUSK_TP_VERSION ${DUSK_GAME_NAME}${DUSK_GAME_VERSION})

-source_group("dolzel" FILES ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${REL_FILES})
+message(STATUS "dusk: Game Version: ${DUSK_TP_VERSION}")
+
+source_group("dolzel" FILES ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${JSYSTEM_FILES} ${JSYSTEM_DEBUG_FILES} ${REL_FILES})
 source_group("dusk" FILES ${DUSK_FILES})

-set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0)
+set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0
+    DUSK_TP_VERSION="${DUSK_TP_VERSION}" DUSK_GAME_NAME="${DUSK_GAME_NAME}" DUSK_GAME_VERSION="${DUSK_GAME_VERSION}")

 set(GAME_INCLUDE_DIRS
    include
    src
-    assets/GZ2E01 # TODO: make this dynamic if needed?
+    assets/${DUSK_TP_VERSION}
    libs/JSystem/include
    libs
    extern/aurora/include/dolphin
@@ -298,18 +214,7 @@ set(GAME_INCLUDE_DIRS
    ${CMAKE_BINARY_DIR})

 set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::pad aurora::mtx aurora::os aurora::dvd
-    aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt)
-
-list(APPEND GAME_LIBS libzstd_static)
-
-if (DUSK_ENABLE_SENTRY_NATIVE)
-    list(APPEND GAME_LIBS sentry)
-    list(APPEND GAME_COMPILE_DEFS DUSK_ENABLE_SENTRY_NATIVE=1 SENTRY_BUILD_STATIC=1)
-endif ()
-
-if (WIN32)
-    list(APPEND GAME_LIBS Ws2_32)
-endif ()
+    aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient)

 if (DUSK_MOVIE_SUPPORT)
    if (TARGET libjpeg-turbo::turbojpeg-static)
@@ -320,217 +225,98 @@ if (DUSK_MOVIE_SUPPORT)
    list(APPEND GAME_COMPILE_DEFS MOVIE_SUPPORT=1)
 endif ()

-option(DUSK_ENABLE_DISCORD_RPC "Enable Discord Rich Presence support" ON)
-if (DUSK_ENABLE_DISCORD_RPC AND NOT ANDROID AND NOT IOS AND NOT TVOS)
-
-    FetchContent_Populate(discord_rpc
-        URL https://github.com/discord/discord-rpc/archive/refs/tags/v3.4.0.tar.gz
-        URL_HASH SHA256=e13427019027acd187352dacba6c65953af66fdf3c35fcf38fc40b454a9d7855
-        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    )
-    # RapidJSON is a git submodule absent from the discord-rpc tarball; fetch separately.
-    FetchContent_Populate(rapidjson
-        URL https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
-        URL_HASH SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
-        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    )
-
-    if (NOT TARGET discord-rpc)
-        set(_drpc ${discord_rpc_SOURCE_DIR}/src)
-        set(_drpc_src
-            ${_drpc}/discord_rpc.cpp
-            ${_drpc}/rpc_connection.cpp
-            ${_drpc}/serialization.cpp
-        )
-        if (WIN32)
-            list(APPEND _drpc_src ${_drpc}/connection_win.cpp ${_drpc}/discord_register_win.cpp)
-        elseif (APPLE)
-            list(APPEND _drpc_src ${_drpc}/connection_unix.cpp ${_drpc}/discord_register_osx.m)
-        else ()
-            list(APPEND _drpc_src ${_drpc}/connection_unix.cpp ${_drpc}/discord_register_linux.cpp)
-        endif ()
-        add_library(discord-rpc STATIC ${_drpc_src})
-        target_include_directories(discord-rpc PUBLIC
-            ${discord_rpc_SOURCE_DIR}/include
-            ${rapidjson_SOURCE_DIR}/include
-        )
-        if (UNIX)
-            target_link_libraries(discord-rpc PUBLIC pthread)
-        endif ()
-    endif ()
-    list(APPEND GAME_LIBS discord-rpc)
-    list(APPEND GAME_COMPILE_DEFS DUSK_DISCORD_RPC=1)
-endif ()
-
 # Edit & Continue
 if (MSVC)
-    if ("${CMAKE_MSVC_DEBUG_INFORMATION_FORMAT}" STREQUAL "" AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-        set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "EditAndContinue")
-    endif ()
-    if (CMAKE_MSVC_DEBUG_INFORMATION_FORMAT STREQUAL "EditAndContinue")
-        add_link_options("/INCREMENTAL")
-    endif ()
-endif ()
-
-if(ANDROID)
-    list(APPEND GAME_COMPILE_DEFS TARGET_ANDROID=1)
+    add_compile_options("/ZI")
+    add_link_options("/INCREMENTAL")
 endif ()

 # game_debug is for game code files that we know work when compiled with DEBUG=1
 # Of course, if building a release build, this distinction is irrelevant
-set(GAME_DEBUG_FILES
-        ${SSYSTEM_FILES}
+add_library(game_debug OBJECT ${JSYSTEM_DEBUG_FILES} ${SSYSTEM_FILES}
        src/dusk/audio/DuskAudioSystem.cpp
        src/dusk/audio/JASCriticalSection.cpp
        src/dusk/audio/DuskDsp.cpp
        src/dusk/audio/Adpcm.cpp
        src/dusk/audio/DspStub.cpp
-        src/dusk/imgui/ImGuiAudio.cpp
-)
-set_source_files_properties(
-        ${GAME_DEBUG_FILES}
-        PROPERTIES
-        COMPILE_DEFINITIONS "$<$<CONFIG:Debug>:DEBUG=1>;$<$<CONFIG:Debug>:PARTIAL_DEBUG=1>"
-)
+        src/dusk/imgui/ImGuiAudio.cpp)

 # game_base is for all other game code files
-set(GAME_BASE_FILES
-        ${DOLZEL_FILES}
-        ${Z2AUDIOLIB_FILES}
-        ${REL_FILES}
-        ${DUSK_FILES}
-        ${DOLPHIN_FILES}
+add_library(game_base OBJECT ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${JSYSTEM_FILES} ${REL_FILES} ${DUSK_FILES} ${DOLPHIN_FILES})
+
+target_compile_definitions(game_debug PRIVATE ${GAME_COMPILE_DEFS} $<$<CONFIG:Debug>:DEBUG=1> $<$<CONFIG:Debug>:PARTIAL_DEBUG=1>)
+target_compile_definitions(game_base PRIVATE ${GAME_COMPILE_DEFS} NDEBUG=1 NDEBUG_DEFINED=1 DEBUG_DEFINED=0 $<$<CONFIG:Debug>:PARTIAL_DEBUG=1>)
+
+# only apply PCH to game_base since not all headers are necessarily validated with DEBUG=1
+target_precompile_headers(game_base PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
+
+target_include_directories(game_debug PRIVATE ${GAME_INCLUDE_DIRS})
+target_include_directories(game_base PRIVATE ${GAME_INCLUDE_DIRS})
+
+# This implicitly pulls in the library include directories even though no
+# linking actually takes place for object libraries
+target_link_libraries(game_debug PRIVATE ${GAME_LIBS})
+target_link_libraries(game_base PRIVATE ${GAME_LIBS})
+
+# Combined game library
+add_library(game STATIC
+    $<TARGET_OBJECTS:game_base>
+    $<TARGET_OBJECTS:game_debug>)
+target_link_libraries(game PUBLIC ${GAME_LIBS})
+
+add_executable(dusk src/dusk/main.cpp)
+target_compile_definitions(dusk PRIVATE TARGET_PC AVOID_UB=1 VERSION=0)
+target_include_directories(dusk PRIVATE include)
+target_link_libraries(dusk PRIVATE game aurora::main)
+
+add_custom_command(TARGET dusk POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+        "${CMAKE_SOURCE_DIR}/res"
+        "$<TARGET_FILE_DIR:dusk>/res"
+    COMMENT "Copying resources"
 )
-set_source_files_properties(
-        ${GAME_BASE_FILES}
-        PROPERTIES
-        COMPILE_DEFINITIONS "NDEBUG=1;NDEBUG_DEFINED=1;DEBUG_DEFINED=0;$<$<CONFIG:Debug>:PARTIAL_DEBUG=1>"
-)
-
-foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
-    target_compile_definitions(${jsystem_lib} PRIVATE
-            ${GAME_COMPILE_DEFS}
-            $<$<CONFIG:Debug>:DEBUG=1>
-            $<$<CONFIG:Debug>:PARTIAL_DEBUG=1>
-    )
-    target_include_directories(${jsystem_lib} PRIVATE ${GAME_INCLUDE_DIRS})
-    target_link_libraries(${jsystem_lib} PRIVATE ${GAME_LIBS})
-    set_target_properties(${jsystem_lib} PROPERTIES FOLDER "JSystem")
-endforeach()
-
-set(JSYSTEM_LINK_LIBRARIES ${JSYSTEM_LIBRARIES})
-if (CMAKE_CXX_LINK_GROUP_USING_RESCAN_SUPPORTED OR CMAKE_LINK_GROUP_USING_RESCAN_SUPPORTED)
-    # GNU ld resolves static archives in a single left-to-right pass. The split
-    # JSystem libraries reference each other, so they need a RESCAN group there.
-    set(JSYSTEM_LINK_LIBRARIES "$<LINK_GROUP:RESCAN,${JSYSTEM_LIBRARIES}>")
-endif ()
-
-set(DUSK_FILES src/dusk/main.cpp ${GAME_BASE_FILES} ${GAME_DEBUG_FILES})
-if(ANDROID)
-    add_library(dusk SHARED ${DUSK_FILES})
-    set_target_properties(dusk PROPERTIES OUTPUT_NAME main)
-else ()
-    add_executable(dusk ${DUSK_FILES})
-endif ()
-
-target_compile_definitions(dusk PRIVATE ${GAME_COMPILE_DEFS})
-target_include_directories(dusk PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries(dusk PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
-target_precompile_headers(dusk PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
-if (TARGET crashpad_handler)
-    add_dependencies(dusk crashpad_handler)
-endif ()
-
-if (ANDROID)
-    # SDLActivity loads SDL_main via dlsym on Android. Since aurora::main is a static
-    # archive, force an undefined reference so the linker keeps the SDL_main object.
-    target_link_options(dusk PRIVATE "-Wl,-u,SDL_main")
-endif ()
-
-if (NOT APPLE)
-    add_custom_command(TARGET dusk POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CMAKE_SOURCE_DIR}/res"
-            "$<TARGET_FILE_DIR:dusk>/res"
-        COMMENT "Copying resources"
-    )
-endif ()
-
-if (WIN32)
-    set(DUSK_WINDOWS_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/windows)
-    set(DUSK_WINDOWS_ICON_PNG ${CMAKE_CURRENT_SOURCE_DIR}/res/icon.png)
-    set(DUSK_WINDOWS_ICON_ICO ${CMAKE_CURRENT_BINARY_DIR}/dusk.ico)
-    set(DUSK_WINDOWS_RC ${CMAKE_CURRENT_BINARY_DIR}/dusk.rc)
-    set(DUSK_WINDOWS_MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/dusk.manifest)
-
-    add_custom_command(
-            OUTPUT ${DUSK_WINDOWS_ICON_ICO}
-            COMMAND powershell -ExecutionPolicy Bypass -File
-            ${DUSK_WINDOWS_RESOURCE_DIR}/Create-IcoFromPng.ps1
-            -InputPng ${DUSK_WINDOWS_ICON_PNG}
-            -OutputIco ${DUSK_WINDOWS_ICON_ICO}
-            DEPENDS ${DUSK_WINDOWS_ICON_PNG} ${DUSK_WINDOWS_RESOURCE_DIR}/Create-IcoFromPng.ps1
-            VERBATIM
-            COMMENT "Generating Windows icon"
-    )
-
-    configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusk.manifest.in ${DUSK_WINDOWS_MANIFEST} @ONLY)
-    configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusk.rc.in ${DUSK_WINDOWS_RC} @ONLY)
-
-    target_sources(dusk PRIVATE ${DUSK_WINDOWS_ICON_ICO} ${DUSK_WINDOWS_RC})
-    set_target_properties(dusk PROPERTIES WIN32_EXECUTABLE TRUE)
-
-    if (MSVC)
-        target_link_options(dusk PRIVATE /MANIFEST:NO)
-    endif ()
-endif ()

 if (APPLE)
    if (IOS)
        set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios)
-    elseif (TVOS)
-        set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/tvos)
-    else ()
-        set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/macos)
+        set(DUSK_INFO_PLIST ${DUSK_RESOURCE_DIR}/Info.plist.in)
+        file(GLOB_RECURSE DUSK_RESOURCE_FILES "${DUSK_RESOURCE_DIR}/Base.lproj/*")
+    endif ()
+    if (IOS OR TVOS)
+        target_sources(dusk PRIVATE ${DUSK_RESOURCE_FILES})
+        foreach (FILE ${DUSK_RESOURCE_FILES})
+            file(RELATIVE_PATH NEW_FILE "${DUSK_RESOURCE_DIR}" ${FILE})
+            get_filename_component(NEW_FILE_PATH ${NEW_FILE} DIRECTORY)
+            set_property(SOURCE ${FILE} PROPERTY MACOSX_PACKAGE_LOCATION "Resources/${NEW_FILE_PATH}")
+        endforeach ()
+        set_target_properties(
+            dusk PROPERTIES
+            MACOSX_BUNDLE TRUE
+            MACOSX_BUNDLE_BUNDLE_NAME ${DUSK_BUNDLE_NAME}
+            MACOSX_BUNDLE_GUI_IDENTIFIER ${DUSK_BUNDLE_IDENTIFIER}
+            MACOSX_BUNDLE_BUNDLE_VERSION ${DUSK_VERSION_STRING}
+            MACOSX_BUNDLE_SHORT_VERSION_STRING ${DUSK_SHORT_VERSION_STRING}
+            OUTPUT_NAME dusk
+            XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "YES"
+            XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
+        )
+        if (CMAKE_GENERATOR STREQUAL "Xcode")
+            set_target_properties(dusk PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${DUSK_INFO_PLIST})
+        elseif (DEFINED DUSK_INFO_PLIST)
+            set(MACOSX_BUNDLE_EXECUTABLE_NAME dusk)
+            set(MACOSX_BUNDLE_GUI_IDENTIFIER ${DUSK_BUNDLE_IDENTIFIER})
+            set(MACOSX_BUNDLE_BUNDLE_NAME ${DUSK_BUNDLE_NAME})
+            set(MACOSX_BUNDLE_BUNDLE_VERSION ${DUSK_VERSION_STRING})
+            set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${DUSK_SHORT_VERSION_STRING})
+            set(DUSK_GENERATED_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/dusk.Info.plist)
+            configure_file(${DUSK_INFO_PLIST} ${DUSK_GENERATED_INFO_PLIST})
+            add_custom_command(
+                TARGET dusk POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DUSK_GENERATED_INFO_PLIST} $<TARGET_FILE_DIR:dusk>/Info.plist
+                VERBATIM
+            )
+        endif ()
    endif ()
-    set(DUSK_INFO_PLIST ${DUSK_RESOURCE_DIR}/Info.plist.in)
-    file(GLOB_RECURSE DUSK_RESOURCE_FILES
-        "${DUSK_RESOURCE_DIR}/Assets.car"
-        "${DUSK_RESOURCE_DIR}/Base.lproj/*"
-        "${DUSK_RESOURCE_DIR}/Dusk.icns")
-    file(GLOB_RECURSE DUSK_APP_RESOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/res/*")
-    target_sources(dusk PRIVATE ${DUSK_RESOURCE_FILES})
-    target_sources(dusk PRIVATE ${DUSK_APP_RESOURCE_FILES})
-    foreach (FILE ${DUSK_RESOURCE_FILES})
-        file(RELATIVE_PATH NEW_FILE "${DUSK_RESOURCE_DIR}" ${FILE})
-        get_filename_component(NEW_FILE_PATH ${NEW_FILE} DIRECTORY)
-        set_property(SOURCE ${FILE} PROPERTY MACOSX_PACKAGE_LOCATION "Resources/${NEW_FILE_PATH}")
-    endforeach ()
-    foreach (FILE ${DUSK_APP_RESOURCE_FILES})
-        file(RELATIVE_PATH NEW_FILE "${CMAKE_CURRENT_SOURCE_DIR}" ${FILE})
-        get_filename_component(NEW_FILE_PATH ${NEW_FILE} DIRECTORY)
-        set_property(SOURCE ${FILE} PROPERTY MACOSX_PACKAGE_LOCATION "Resources/${NEW_FILE_PATH}")
-    endforeach ()
-    set_target_properties(
-        dusk PROPERTIES
-        MACOSX_BUNDLE TRUE
-        MACOSX_BUNDLE_BUNDLE_NAME ${DUSK_BUNDLE_NAME}
-        MACOSX_BUNDLE_GUI_IDENTIFIER ${DUSK_BUNDLE_IDENTIFIER}
-        MACOSX_BUNDLE_BUNDLE_VERSION ${DUSK_VERSION_STRING}
-        MACOSX_BUNDLE_SHORT_VERSION_STRING ${DUSK_SHORT_VERSION_STRING}
-        MACOSX_BUNDLE_INFO_PLIST ${DUSK_INFO_PLIST}
-        OUTPUT_NAME Dusk
-        XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "YES"
-        XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
-    )
-endif ()
-
-if (IOS)
-    find_library(UIKIT_FRAMEWORK UIKit REQUIRED)
-    find_library(UNIFORM_TYPE_IDENTIFIERS_FRAMEWORK UniformTypeIdentifiers REQUIRED)
-    target_sources(dusk PRIVATE src/dusk/ios/FileSelectDialog.m)
-    set_source_files_properties(src/dusk/ios/FileSelectDialog.m PROPERTIES COMPILE_FLAGS -fobjc-arc)
-    target_link_libraries(dusk PRIVATE ${UIKIT_FRAMEWORK} ${UNIFORM_TYPE_IDENTIFIERS_FRAMEWORK})
 endif ()

 include(extern/aurora/cmake/AuroraCopyRuntimeDLLs.cmake)
@@ -578,10 +364,6 @@ if (TARGET crashpad_handler)
    list(APPEND EXTRA_TARGETS crashpad_handler)
 endif ()
 install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_PREFIX})
-aurora_install_runtime_dlls(dusk ${CMAKE_INSTALL_PREFIX})
-if (NOT APPLE)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/res DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif ()
 if (CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
    set(DEBUG_FILES_LIST "")
    foreach (target IN LISTS BINARY_TARGETS EXTRA_TARGETS)
@@ -603,22 +385,18 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
        endif ()
        list(APPEND DEBUG_FILES_LIST "${output_name}")
    endforeach ()
-    # This is a terrible hack to only run this on CI
-    # until I turn this into a script or something
-    if(DEFINED ENV{GITHUB_ENV})
-        if (WIN32)
-            list(TRANSFORM DEBUG_FILES_LIST APPEND ".pdb")
-            list(JOIN DEBUG_FILES_LIST " " DEBUG_FILES)
-            install(CODE "execute_process(WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\" COMMAND 7z a -t7z \"${CMAKE_INSTALL_PREFIX}/debug.7z\" ${DEBUG_FILES})")
-        elseif (APPLE)
-            list(TRANSFORM DEBUG_FILES_LIST APPEND ".dSYM")
-            list(JOIN DEBUG_FILES_LIST " " DEBUG_FILES)
-            install(CODE "execute_process(WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\" COMMAND tar acfv \"${CMAKE_INSTALL_PREFIX}/debug.tar.xz\" ${DEBUG_FILES})")
-        elseif (UNIX)
-            list(TRANSFORM DEBUG_FILES_LIST APPEND ".dbg")
-            list(JOIN DEBUG_FILES_LIST " " DEBUG_FILES)
-            install(CODE "execute_process(WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\" COMMAND tar -I \"xz -9 -T0\" -cvf \"${CMAKE_INSTALL_PREFIX}/debug.tar.xz\" ${DEBUG_FILES})")
-        endif ()
+    if (WIN32)
+        list(TRANSFORM DEBUG_FILES_LIST APPEND ".pdb")
+        list(JOIN DEBUG_FILES_LIST " " DEBUG_FILES)
+        install(CODE "execute_process(WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\" COMMAND 7z a -t7z \"${CMAKE_INSTALL_PREFIX}/debug.7z\" ${DEBUG_FILES})")
+    elseif (APPLE)
+        list(TRANSFORM DEBUG_FILES_LIST APPEND ".dSYM")
+        list(JOIN DEBUG_FILES_LIST " " DEBUG_FILES)
+        install(CODE "execute_process(WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\" COMMAND tar acfv \"${CMAKE_INSTALL_PREFIX}/debug.tar.xz\" ${DEBUG_FILES})")
+    elseif (UNIX)
+        list(TRANSFORM DEBUG_FILES_LIST APPEND ".dbg")
+        list(JOIN DEBUG_FILES_LIST " " DEBUG_FILES)
+        install(CODE "execute_process(WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}\" COMMAND tar -I \"xz -9 -T0\" -cvf \"${CMAKE_INSTALL_PREFIX}/debug.tar.xz\" ${DEBUG_FILES})")
    endif ()
 endif ()
 foreach (target IN LISTS BINARY_TARGETS)
@@ -22,20 +22,6 @@
        "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded"
      }
    },
-    {
-      "name": "ci",
-      "hidden": true,
-      "cacheVariables": {
-        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache",
-        "DUSK_ENABLE_SENTRY_NATIVE": {
-          "type": "BOOL",
-          "value": true
-        },
-        "DUSK_SENTRY_DSN": "$env{SENTRY_DSN}",
-        "DUSK_SENTRY_ENVIRONMENT": "production"
-      }
-    },
    {
      "name": "linux-default",
      "displayName": "Linux (default)",
@@ -102,7 +88,7 @@
      "name": "windows-msvc",
      "displayName": "Windows (MSVC)",
      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/${presetName}",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
      "architecture": {
        "value": "x64",
        "strategy": "external"
@@ -110,7 +96,7 @@
      "cacheVariables": {
        "CMAKE_C_COMPILER": "cl",
        "CMAKE_CXX_COMPILER": "cl",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install"
      },
      "vendor": {
        "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -140,7 +126,7 @@
      "name": "windows-arm64-msvc",
      "displayName": "Windows ARM64 (MSVC)",
      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/${presetName}",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
      "architecture": {
        "value": "arm64",
        "strategy": "external"
@@ -148,7 +134,8 @@
      "cacheVariables": {
        "CMAKE_C_COMPILER": "cl",
        "CMAKE_CXX_COMPILER": "cl",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install",
+        "AURORA_DAWN_PROVIDER": "vendor"
      },
      "vendor": {
        "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -329,7 +316,7 @@
      "cacheVariables": {
        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
        "CMAKE_TOOLCHAIN_FILE": "$env{ANDROID_HOME}/ndk/$env{ANDROID_NDK_VERSION}/build/cmake/android.toolchain.cmake",
-        "ANDROID_PLATFORM": "android-28"
+        "ANDROID_PLATFORM": "android-24"
      }
    },
    {
@@ -356,11 +343,11 @@
      "name": "x-linux-ci",
      "hidden": true,
      "inherits": [
-        "relwithdebinfo",
-        "ci"
+        "relwithdebinfo"
      ],
      "cacheVariables": {
-        "AURORA_SDL3_PROVIDER": "vendor"
+        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
      }
    },
    {
@@ -380,40 +367,11 @@
    {
      "name": "x-macos-ci",
      "inherits": [
-        "macos-default-relwithdebinfo",
-        "ci"
+        "macos-default-relwithdebinfo"
      ],
      "cacheVariables": {
-        "AURORA_NOD_PROVIDER": "vendor",
-        "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
-          "type": "BOOL",
-          "value": true
-        },
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
-        "CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew",
-        "DUSK_MOVIE_SUPPORT": {
-          "type": "BOOL",
-          "value": false
-        }
-      }
-    },
-    {
-      "name": "x-macos-ci-arm64",
-      "inherits": [
-        "x-macos-ci"
-      ],
-      "cacheVariables": {
-        "CMAKE_OSX_ARCHITECTURES": "arm64"
-      }
-    },
-    {
-      "name": "x-macos-ci-x86_64",
-      "inherits": [
-        "x-macos-ci"
-      ],
-      "cacheVariables": {
-        "CMAKE_OSX_ARCHITECTURES": "x86_64",
-        "Rust_CARGO_TARGET": "x86_64-apple-darwin"
+        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
      }
    },
    {
@@ -423,11 +381,7 @@
      ],
      "cacheVariables": {
        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache",
-        "DUSK_MOVIE_SUPPORT": {
-          "type": "BOOL",
-          "value": false
-        }
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
      }
    },
    {
@@ -437,27 +391,21 @@
      ],
      "cacheVariables": {
        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache",
-        "DUSK_MOVIE_SUPPORT": {
-          "type": "BOOL",
-          "value": false
-        }
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
      }
    },
    {
      "name": "x-windows-ci",
      "hidden": true,
      "inherits": [
-        "relwithdebinfo",
-        "ci"
+        "relwithdebinfo"
      ],
+      "binaryDir": "$env{BUILD_DIR}",
      "cacheVariables": {
-        "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "Embedded",
-        "CMAKE_TOOLCHAIN_FILE": {
-          "type": "FILEPATH",
-          "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-        },
-        "VCPKG_TARGET_TRIPLET": "x64-windows"
+        "CMAKE_INSTALL_PREFIX": "$env{BUILD_DIR}/install",
+        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache",
+        "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "Embedded"
      }
    },
    {
@@ -598,19 +546,10 @@
      ]
    },
    {
-      "name": "x-macos-ci-arm64",
-      "configurePreset": "x-macos-ci-arm64",
-      "description": "(Internal) macOS CI arm64",
-      "displayName": "(Internal) macOS CI arm64",
-      "targets": [
-        "install"
-      ]
-    },
-    {
-      "name": "x-macos-ci-x86_64",
-      "configurePreset": "x-macos-ci-x86_64",
-      "description": "(Internal) macOS CI x86_64",
-      "displayName": "(Internal) macOS CI x86_64",
+      "name": "x-macos-ci",
+      "configurePreset": "x-macos-ci",
+      "description": "(Internal) macOS CI",
+      "displayName": "(Internal) macOS CI",
      "targets": [
        "install"
      ]
@@ -618,8 +557,8 @@
    {
      "name": "x-ios-ci",
      "configurePreset": "x-ios-ci",
-      "description": "(Internal) iOS CI arm64",
-      "displayName": "(Internal) iOS CI arm64",
+      "description": "(Internal) iOS CI",
+      "displayName": "(Internal) iOS CI",
      "targets": [
        "install"
      ]
@@ -627,8 +566,8 @@
    {
      "name": "x-tvos-ci",
      "configurePreset": "x-tvos-ci",
-      "description": "(Internal) tvOS CI arm64",
-      "displayName": "(Internal) tvOS CI arm64",
+      "description": "(Internal) tvOS CI",
+      "displayName": "(Internal) tvOS CI",
      "targets": [
        "install"
      ]
@@ -1,37 +1,103 @@
-![DuskLogo](res/logo-mascot.png)
+## Dusk

- ### **[Official Website](https://twilitrealm.dev)**
- ### **[Discord](https://discord.gg/QACynxeyna)**
+### Building
+#### Prerequisites
+* [CMake 3.25+](https://cmake.org)
+    * Windows: Install `CMake Tools` in Visual Studio
+    * macOS: `brew install cmake`
+* [Python 3+](https://python.org)
+    * Windows: [Microsoft Store](https://go.microsoft.com/fwlink?linkID=2082640)
+        * Verify it's added to `%PATH%` by typing `python` in `cmd`.
+    * macOS: `brew install python@3`
+* **[Windows]** [Visual Studio 2026 Community](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
+    * Select `C++ Development` and verify the following packages are included:
+        * `Windows 11 SDK`
+        * `CMake Tools`
+        * `C++ Clang Compiler`
+        * `C++ Clang-cl`
+* **[macOS]** [Xcode 16.4+](https://developer.apple.com/xcode/download/)
+* **[Linux]** Actively tested on Ubuntu 24.04, Arch Linux & derivatives.
+    * Ubuntu 24.04+ packages
+      ```
+      build-essential curl git ninja-build clang lld zlib1g-dev libcurl4-openssl-dev \
+      libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev libpulse-dev \
+      libudev-dev libpng-dev libncurses5-dev cmake libx11-xcb-dev python3 python-is-python3 \
+      libclang-dev libfreetype-dev libxinerama-dev libxcursor-dev python3-markupsafe libgtk-3-dev \
+      libxss-dev libxtst-dev
+      ```
+     * Arch Linux packages
+       ```
+       base-devel cmake ninja llvm vulkan-headers python python-markupsafe clang lld alsa-lib libpulse libxrandr freetype2
+       ```
+     * Fedora packages
+       ```
+       cmake vulkan-headers ninja-build clang-devel llvm-devel libpng-devel
+       ```
+         * It's also important that you install the developer tools and libraries
+           ```
+           sudo dnf groupinstall "Development Tools" "Development Libraries"
+           ```
+#### Setup
+Clone and initialize the Dusk repository
+```sh
+git clone --recursive https://github.com/TwilitRealm/dusk.git
+cd dusk
+git pull
+git submodule update --init --recursive
+```

-# Overview
-Dusk is a reverse-engineered reimplementation of Twilight Princess.
-It aims to be as accurate as possible to the original while also providing new options, enhancements, and tools to customize your experience.
+#### Building

-# Setup
-**⚠️ Dusk does NOT provide any copyrighted assets. You must provide your own copy of the game.**
+**CLion (Windows / macOS / Linux)**

-### 1. Verify your ROM dump
-First make sure your dump of the game is clean and supported by Dusk. You can do this by checking the sha1 hash of your dump against this list of supported versions.
+Open the project directory in CLion. Enable the appropriate presets for your platform:

-| Version      | sha1 hash                                |
-|--------------| ---------------------------------------- |
-| GameCube USA | 75edd3ddff41f125d1b4ce1a40378f1b565519e7 |
-| GameCube PAL | 2601822a488eeb86fb89db16ca8f29c2c953e1ca |
+![CLion](assets/clion.png)

-### 2. Download [Dusk](https://github.com/TwilitRealm/dusk/releases)
+**Visual Studio (Windows)**

-### 3. Setup the game
- Extract the zip folder
- Launch Dusk
- Select Options, then set the ISO Path to your supported game dump
- Press Start Game to play!
+Open the project directory in Visual Studio. The CMake configuration will be loaded automatically.

-![Dusk options](assets/dusk_options.png)
+**ninja (macOS)**

-# Building
-If you'd like to build Dusk from source, please read the [build instructions](docs/building.md).
+```sh
+cmake --preset macos-default-relwithdebinfo
+cmake --build --preset macos-default-relwithdebinfo
+```

-Pull Requests are welcomed! Note that we do not accept contributions that are primarily AI generated and will close your PR if we suspect as much.
+Alternate presets available:
+- `macos-default-debug`: Clang, Debug

-# Credits
-Special thanks to the [TP decompilation](https://github.com/zeldaret/tp) team, the GC/Wii decompilation community, the [Aurora](https://github.com/encounter/aurora) developers, the [TP speedrunning community](https://zsrtp.link), and all [contributors](https://github.com/TwilitRealm/dusk/graphs/contributors).
+**ninja (Linux)**
+
+```sh
+cmake --preset linux-default-relwithdebinfo
+cmake --build --preset linux-default-relwithdebinfo
+```
+
+Alternate presets available:
+- `linux-default-debug`: GCC, Debug
+- `linux-clang-relwithdebinfo`: Clang, RelWithDebInfo
+- `linux-clang-debug`: Clang, Debug
+
+**ninja (Windows)**
+
+```sh
+cmake --preset windows-msvc-relwithdebinfo
+cmake --build --preset windows-msvc-relwithdebinfo
+```
+
+Alternate presets available:
+- `windows-msvc-debug`: MSVC, Debug
+- `windows-clang-relwithdebinfo`: Clang-cl, RelWithDebInfo
+- `windows-clang-debug`: Clang-cl, Debug
+
+#### Running
+Pass the disc image as a positional argument. Supported formats: ISO (GCM), RVZ, WIA, WBFS, CISO, GCZ
+```sh
+build/{preset}/dusk /path/to/game.rvz
+```
+If no path is specified, Dusk defaults to `game.iso` in the current working directory.
+
+#### 30 FPS on Debug
+When compiled fully in a Debug the game runs too slowly to hit playable 30 FPS. To avoid this, you can set a CMake cache variable to optimize specific critical files without hampering debuggability in the rest of the program: `-DDUSK_SELECTED_OPT=ON`. When building for MSVC (Windows) you must also modify `CMAKE_CXX_FLAGS_DEBUG` and `CMAKE_C_FLAGS_DEBUG` to remove `/RTC1` from the flags, like so: `-DCMAKE_CXX_FLAGS_DEBUG="/MDd /Zi /Ob0 /Od" -DCMAKE_C_FLAGS_DEBUG="/MDd /Zi /Ob0 /Od"`
@@ -0,0 +1,19 @@
+from PIL import Image
+FRAME_COUNT = 6572
+WIDTH = 48
+HEIGHT = 36
+
+out = open("apple.dat", "wb")
+for frame in range(1, 6572+1):
+    print(frame)
+    img = Image.open(f"apples/{frame}.png")
+    pixels = img.load()
+    assert img.width == WIDTH
+    assert img.height == HEIGHT
+    for y in range(HEIGHT):
+        for x in range(WIDTH):
+            (r, g, b) = pixels[x, y]
+            if r > 128:
+                out.write(b"\x01")
+            else:
+                out.write(b"\x00")
@@ -9,10 +9,10 @@ chmod +x linuxdeploy-$(uname -m).AppImage
 # Build AppImage
 cd "$GITHUB_WORKSPACE"
 mkdir -p build/appdir/usr/{bin,share/{applications,icons/hicolor}}
-cp -r build/install/!(*.*) build/appdir/usr/bin
+cp build/install/!(*.*) build/appdir/usr/bin
 cp -r platforms/freedesktop/{16x16,32x32,48x48,64x64,128x128,256x256,512x512,1024x1024} build/appdir/usr/share/icons/hicolor
 cp platforms/freedesktop/dusk.desktop build/appdir/usr/share/applications

 cd build/install
 VERSION="$DUSK_VERSION" NO_STRIP=1 "$RUNNER_WORKSPACE"/linuxdeploy-$(uname -m).AppImage \
-  -l /usr/lib/x86_64-linux-gnu/libusb-1.0.so --appdir "$GITHUB_WORKSPACE"/build/appdir --output appimage
+  --appdir "$GITHUB_WORKSPACE"/build/appdir --output appimage
@@ -13,3 +13,13 @@ buildType:
      short: RelWithDebInfo
      long: Optimized, with debug symbols
      buildType: RelWithDebInfo
+
+tp_version:
+  default: GZ2E01
+  description: TP Version
+  choices:
+    GZ2E01:
+      short: GZ2E01
+      long: GZ2E01
+      settings:
+        DUSK_TP_VERSION: GZ2E01
@@ -1,98 +0,0 @@
-### Building
-#### Prerequisites
-* [CMake 3.25+](https://cmake.org)
-    * Windows: Install `CMake Tools` in Visual Studio
-    * macOS: `brew install cmake`
-* [Python 3+](https://python.org)
-    * Windows: [Microsoft Store](https://go.microsoft.com/fwlink?linkID=2082640)
-        * Verify it's added to `%PATH%` by typing `python` in `cmd`.
-    * macOS: `brew install python@3`
-* **[Windows]** [Visual Studio 2026 Community](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
-    * Select `C++ Development` and verify the following packages are included:
-        * `Windows 11 SDK`
-        * `CMake Tools`
-        * `C++ Clang Compiler`
-        * `C++ Clang-cl`
-* **[macOS]** [Xcode 16.4+](https://developer.apple.com/xcode/download/)
-* **[Linux]** Actively tested on Ubuntu 24.04, Arch Linux & derivatives.
-    * Ubuntu 24.04+ packages
-      ```
-      build-essential curl git ninja-build clang lld zlib1g-dev libcurl4-openssl-dev \
-      libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev libpulse-dev \
-      libudev-dev libpng-dev libncurses5-dev cmake libx11-xcb-dev python3 python-is-python3 \
-      libclang-dev libfreetype-dev libxinerama-dev libxcursor-dev python3-markupsafe libgtk-3-dev \
-      libxss-dev libxtst-dev
-      ```
-     * Arch Linux packages
-       ```
-       base-devel cmake ninja llvm vulkan-headers python python-markupsafe clang lld alsa-lib libpulse libxrandr freetype2
-       ```
-     * Fedora packages
-       ```
-       cmake vulkan-headers ninja-build clang-devel llvm-devel libpng-devel
-       ```
-         * It's also important that you install the developer tools and libraries
-           ```
-           sudo dnf groupinstall "Development Tools" "Development Libraries"
-           ```
-#### Setup
-Clone and initialize the Dusk repository
-```sh
-git clone --recursive https://github.com/TwilitRealm/dusk.git
-cd dusk
-git pull
-git submodule update --init --recursive
-```
-
-#### Building
-
-**CLion (Windows / macOS / Linux)**
-
-Open the project directory in CLion. Enable the appropriate presets for your platform:
-
-![CLion](../assets/clion.png)
-
-**Visual Studio (Windows)**
-
-Open the project directory in Visual Studio. The CMake configuration will be loaded automatically.
-
-**ninja (macOS)**
-
-```sh
-cmake --preset macos-default-relwithdebinfo
-cmake --build --preset macos-default-relwithdebinfo
-```
-
-Alternate presets available:
- `macos-default-debug`: Clang, Debug
-
-**ninja (Linux)**
-
-```sh
-cmake --preset linux-default-relwithdebinfo
-cmake --build --preset linux-default-relwithdebinfo
-```
-
-Alternate presets available:
- `linux-default-debug`: GCC, Debug
- `linux-clang-relwithdebinfo`: Clang, RelWithDebInfo
- `linux-clang-debug`: Clang, Debug
-
-**ninja (Windows)**
-
-```sh
-cmake --preset windows-msvc-relwithdebinfo
-cmake --build --preset windows-msvc-relwithdebinfo
-```
-
-Alternate presets available:
- `windows-msvc-debug`: MSVC, Debug
- `windows-clang-relwithdebinfo`: Clang-cl, RelWithDebInfo
- `windows-clang-debug`: Clang-cl, Debug
-
-#### Running
-Pass the disc image as a positional argument. Supported formats: ISO (GCM), RVZ, WIA, WBFS, CISO, GCZ
-```sh
-build/{preset}/dusk /path/to/game.rvz
-```
-If no path is specified, Dusk defaults to `game.iso` in the current working directory.
@@ -1,7 +1,7 @@

 set(DOLZEL_FILES
        src/m_Do/m_Do_main.cpp
-        #src/m_Do/m_Do_printf.cpp
+        src/m_Do/m_Do_printf.cpp
        src/m_Do/m_Do_audio.cpp
        src/m_Do/m_Do_controller_pad.cpp
        #src/m_Do/m_Re_controller_pad.cpp
@@ -15,6 +15,7 @@ set(DOLZEL_FILES
        src/m_Do/m_Do_DVDError.cpp
        src/m_Do/m_Do_MemCard.cpp
        src/m_Do/m_Do_MemCardRWmng.cpp
+        src/m_Do/m_Do_machine_exception.cpp
        src/m_Do/m_Do_hostIO.cpp
        src/c/c_damagereaction.cpp
        src/c/c_dylink.cpp
@@ -314,7 +315,7 @@ set(SSYSTEM_FILES
        src/SSystem/SStandard/s_basic.cpp
 )

-add_library(JSystem_JParticle STATIC
+set(JSYSTEM_DEBUG_FILES
        libs/JSystem/src/JParticle/JPAResourceManager.cpp
        libs/JSystem/src/JParticle/JPAResource.cpp
        libs/JSystem/src/JParticle/JPABaseShape.cpp
@@ -330,19 +331,10 @@ add_library(JSystem_JParticle STATIC
        libs/JSystem/src/JParticle/JPAEmitter.cpp
        libs/JSystem/src/JParticle/JPAParticle.cpp
        libs/JSystem/src/JParticle/JPAMath.cpp
-)
-
-add_library(JSystem_JFramework STATIC
        libs/JSystem/src/JFramework/JFWSystem.cpp
        libs/JSystem/src/JFramework/JFWDisplay.cpp
-)
-
-add_library(JSystem_J3DU STATIC
        libs/JSystem/src/J3DU/J3DUClipper.cpp
        libs/JSystem/src/J3DU/J3DUDL.cpp
-)
-
-add_library(JSystem_JKernel STATIC
        libs/JSystem/src/JKernel/JKRHeap.cpp
        libs/JSystem/src/JKernel/JKRExpHeap.cpp
        libs/JSystem/src/JKernel/JKRSolidHeap.cpp
@@ -368,23 +360,14 @@ add_library(JSystem_JKernel STATIC
        libs/JSystem/src/JKernel/JKRDvdRipper.cpp
        libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp
        libs/JSystem/src/JKernel/JKRDecomp.cpp
-)
-
-add_library(JSystem_JMath STATIC
        libs/JSystem/src/JMath/JMath.cpp
        libs/JSystem/src/JMath/random.cpp
        libs/JSystem/src/JMath/JMATrigonometric.cpp
-)
-
-add_library(JSystem_JSupport STATIC
        libs/JSystem/src/JSupport/JSUList.cpp
        libs/JSystem/src/JSupport/JSUInputStream.cpp
        libs/JSystem/src/JSupport/JSUOutputStream.cpp
        libs/JSystem/src/JSupport/JSUMemoryStream.cpp
        libs/JSystem/src/JSupport/JSUFileStream.cpp
-)
-
-add_library(JSystem_JUtility STATIC
        libs/JSystem/src/JUtility/JUTCacheFont.cpp
        libs/JSystem/src/JUtility/JUTResource.cpp
        libs/JSystem/src/JUtility/JUTTexture.cpp
@@ -405,9 +388,6 @@ add_library(JSystem_JUtility STATIC
        libs/JSystem/src/JUtility/JUTConsole.cpp
        libs/JSystem/src/JUtility/JUTDirectFile.cpp
        libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp
-)
-
-add_library(JSystem_JStage STATIC
        libs/JSystem/src/JStage/JSGActor.cpp
        libs/JSystem/src/JStage/JSGAmbientLight.cpp
        libs/JSystem/src/JStage/JSGCamera.cpp
@@ -415,9 +395,6 @@ add_library(JSystem_JStage STATIC
        libs/JSystem/src/JStage/JSGLight.cpp
        libs/JSystem/src/JStage/JSGObject.cpp
        libs/JSystem/src/JStage/JSGSystem.cpp
-)
-
-add_library(JSystem_J2DGraph STATIC
        libs/JSystem/src/J2DGraph/J2DGrafContext.cpp
        libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp
        libs/JSystem/src/J2DGraph/J2DTevs.cpp
@@ -436,9 +413,6 @@ add_library(JSystem_J2DGraph STATIC
        libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp
        libs/JSystem/src/J2DGraph/J2DAnimation.cpp
        libs/JSystem/src/J2DGraph/J2DManage.cpp
-)
-
-add_library(JSystem_J3DGraphBase STATIC
        libs/JSystem/src/J3DGraphBase/J3DGD.cpp
        libs/JSystem/src/J3DGraphBase/J3DSys.cpp
        libs/JSystem/src/J3DGraphBase/J3DVertex.cpp
@@ -453,9 +427,6 @@ add_library(JSystem_J3DGraphBase STATIC
        libs/JSystem/src/J3DGraphBase/J3DTevs.cpp
        libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp
        libs/JSystem/src/J3DGraphBase/J3DStruct.cpp
-)
-
-add_library(JSystem_J3DGraphAnimator STATIC
        libs/JSystem/src/J3DGraphAnimator/J3DShapeTable.cpp
        libs/JSystem/src/J3DGraphAnimator/J3DJointTree.cpp
        libs/JSystem/src/J3DGraphAnimator/J3DModelData.cpp
@@ -467,9 +438,6 @@ add_library(JSystem_J3DGraphAnimator STATIC
        libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp
        libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp
        libs/JSystem/src/J3DGraphAnimator/J3DMaterialAttach.cpp
-)
-
-add_library(JSystem_J3DGraphLoader STATIC
        libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory.cpp
        libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory_v21.cpp
        libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp
@@ -478,9 +446,6 @@ add_library(JSystem_J3DGraphLoader STATIC
        libs/JSystem/src/J3DGraphLoader/J3DJointFactory.cpp
        libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp
        libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp
-)
-
-add_library(JSystem_JStudio STATIC
        libs/JSystem/src/JStudio/JStudio/ctb.cpp
        libs/JSystem/src/JStudio/JStudio/ctb-data.cpp
        libs/JSystem/src/JStudio/JStudio/functionvalue.cpp
@@ -495,9 +460,6 @@ add_library(JSystem_JStudio STATIC
        libs/JSystem/src/JStudio/JStudio/stb.cpp
        libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp
        libs/JSystem/src/JStudio/JStudio/stb-data.cpp
-)
-
-add_library(JSystem_JStudio_JStage STATIC
        libs/JSystem/src/JStudio/JStudio_JStage/control.cpp
        libs/JSystem/src/JStudio/JStudio_JStage/object.cpp
        libs/JSystem/src/JStudio/JStudio_JStage/object-actor.cpp
@@ -505,19 +467,10 @@ add_library(JSystem_JStudio_JStage STATIC
        libs/JSystem/src/JStudio/JStudio_JStage/object-camera.cpp
        libs/JSystem/src/JStudio/JStudio_JStage/object-fog.cpp
        libs/JSystem/src/JStudio/JStudio_JStage/object-light.cpp
-)
-
-add_library(JSystem_JStudio_JAudio2 STATIC
        libs/JSystem/src/JStudio/JStudio_JAudio2/control.cpp
        libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp
-)
-
-add_library(JSystem_JStudio_JParticle STATIC
        libs/JSystem/src/JStudio/JStudio_JParticle/control.cpp
        libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp
-)
-
-add_library(JSystem_JAudio2 STATIC
        libs/JSystem/src/JAudio2/JASCalc.cpp
        libs/JSystem/src/JAudio2/JASTaskThread.cpp
        libs/JSystem/src/JAudio2/JASDvdThread.cpp
@@ -582,34 +535,22 @@ add_library(JSystem_JAudio2 STATIC
        libs/JSystem/src/JAudio2/JAUSoundAnimator.cpp
        libs/JSystem/src/JAudio2/JAUSoundTable.cpp
        libs/JSystem/src/JAudio2/JAUStreamFileTable.cpp
-)
-
-add_library(JSystem_JMessage STATIC
        libs/JSystem/src/JMessage/control.cpp
        libs/JSystem/src/JMessage/data.cpp
        libs/JSystem/src/JMessage/processor.cpp
        libs/JSystem/src/JMessage/resource.cpp
        libs/JSystem/src/JMessage/locale.cpp
-)
-
-add_library(JSystem_JGadget STATIC
        libs/JSystem/src/JGadget/binary.cpp
        libs/JSystem/src/JGadget/define.cpp
        libs/JSystem/src/JGadget/linklist.cpp
        libs/JSystem/src/JGadget/search.cpp
        libs/JSystem/src/JGadget/std-vector.cpp
-)
-
-add_library(JSystem_JAHostIO STATIC
        libs/JSystem/src/JAHostIO/JAHFrameNode.cpp
        libs/JSystem/src/JAHostIO/JAHioMessage.cpp
        libs/JSystem/src/JAHostIO/JAHioMgr.cpp
        libs/JSystem/src/JAHostIO/JAHioNode.cpp
        libs/JSystem/src/JAHostIO/JAHioUtil.cpp
        libs/JSystem/src/JAHostIO/JAHVirtualNode.cpp
-)
-
-add_library(JSystem_JHostIO STATIC
        libs/JSystem/src/JHostIO/JORFile.cpp
        libs/JSystem/src/JHostIO/JORHostInfo.cpp
        libs/JSystem/src/JHostIO/JORMessageBox.cpp
@@ -619,28 +560,7 @@ add_library(JSystem_JHostIO STATIC
        libs/JSystem/src/JHostIO/JHIMccBuf.cpp
 )

-set(JSYSTEM_LIBRARIES
-        JSystem_JParticle
-        JSystem_JFramework
-        JSystem_J3DU
-        JSystem_JKernel
-        JSystem_JMath
-        JSystem_JSupport
-        JSystem_JUtility
-        JSystem_JStage
-        JSystem_J2DGraph
-        JSystem_J3DGraphBase
-        JSystem_J3DGraphAnimator
-        JSystem_J3DGraphLoader
-        JSystem_JStudio
-        JSystem_JStudio_JStage
-        JSystem_JStudio_JAudio2
-        JSystem_JStudio_JParticle
-        JSystem_JAudio2
-        JSystem_JMessage
-        JSystem_JGadget
-        JSystem_JAHostIO
-        JSystem_JHostIO
+set(JSYSTEM_FILES
 )

 set(REL_FILES
@@ -1414,22 +1334,16 @@ set(DUSK_FILES
        include/dusk/endian_gx.hpp
        include/dusk/config.hpp
        include/dusk/dvd_asset.hpp
-        include/dusk/scope_guard.hpp
        src/dusk/dvd_asset.cpp
        src/d/actor/d_a_alink_dusk.cpp
        src/dusk/asserts.cpp
        src/dusk/config.cpp
-        src/dusk/crash_reporting.cpp
        src/dusk/endian.cpp
        src/dusk/extras.c
-        src/dusk/file_select.cpp
-        src/dusk/file_select.hpp
+        src/dusk/extras.cpp
        src/dusk/frame_interpolation.cpp
-        src/dusk/game_clock.cpp
        src/dusk/globals.cpp
-        src/dusk/gyro.cpp
-		src/dusk/gamepad_color.cpp
-		src/dusk/autosave.cpp
+        src/dusk/gyro_aim.cpp
        src/dusk/io.cpp
        src/dusk/layout.cpp
        src/dusk/logging.cpp
@@ -1443,10 +1357,10 @@ set(DUSK_FILES
        src/dusk/imgui/ImGuiEngine.hpp
        src/dusk/imgui/ImGuiMenuGame.cpp
        src/dusk/imgui/ImGuiMenuGame.hpp
-        src/dusk/imgui/ImGuiBloomWindow.cpp
-        src/dusk/imgui/ImGuiBloomWindow.hpp
        src/dusk/imgui/ImGuiMenuTools.cpp
        src/dusk/imgui/ImGuiMenuTools.hpp
+        src/dusk/imgui/ImGuiMenuEnhancements.cpp
+        src/dusk/imgui/ImGuiMenuEnhancements.hpp
        src/dusk/imgui/ImGuiPreLaunchWindow.cpp
        src/dusk/imgui/ImGuiPreLaunchWindow.hpp
        src/dusk/imgui/ImGuiFirstRunPreset.hpp
@@ -1459,59 +1373,8 @@ set(DUSK_FILES
        src/dusk/imgui/ImGuiStubLog.cpp
        src/dusk/imgui/ImGuiMapLoader.cpp
        src/dusk/imgui/ImGuiSaveEditor.cpp
-        src/dusk/imgui/ImGuiStateShare.hpp
-        src/dusk/imgui/ImGuiStateShare.cpp
-        src/dusk/imgui/ImGuiAchievements.hpp
-        src/dusk/imgui/ImGuiAchievements.cpp
-        src/dusk/ui/bool_button.cpp
-        src/dusk/ui/bool_button.hpp
-        src/dusk/ui/button.cpp
-        src/dusk/ui/button.hpp
-        src/dusk/ui/component.cpp
-        src/dusk/ui/component.hpp
-        src/dusk/ui/controller_config.cpp
-        src/dusk/ui/controller_config.hpp
-        src/dusk/ui/document.cpp
-        src/dusk/ui/document.hpp
-        src/dusk/ui/editor.cpp
-        src/dusk/ui/editor.hpp
-        src/dusk/ui/event.cpp
-        src/dusk/ui/event.hpp
-        src/dusk/ui/input.cpp
-        src/dusk/ui/input.hpp
-        src/dusk/ui/nav_types.hpp
-        src/dusk/ui/number_button.cpp
-        src/dusk/ui/number_button.hpp
-        src/dusk/ui/overlay.cpp
-        src/dusk/ui/overlay.hpp
-        src/dusk/ui/pane.cpp
-        src/dusk/ui/pane.hpp
-        src/dusk/ui/popup.cpp
-        src/dusk/ui/popup.hpp
-        src/dusk/ui/prelaunch.cpp
-        src/dusk/ui/prelaunch.hpp
-        src/dusk/ui/prelaunch_options.cpp
-        src/dusk/ui/prelaunch_options.hpp
-        src/dusk/ui/select_button.cpp
-        src/dusk/ui/select_button.hpp
-        src/dusk/ui/settings.cpp
-        src/dusk/ui/settings.hpp
-        src/dusk/ui/string_button.cpp
-        src/dusk/ui/string_button.hpp
-        src/dusk/ui/tab_bar.cpp
-        src/dusk/ui/tab_bar.hpp
-        src/dusk/ui/ui.cpp
-        src/dusk/ui/ui.hpp
-        src/dusk/ui/window.cpp
-        src/dusk/ui/window.hpp
-        src/dusk/achievements.cpp
-        src/dusk/iso_validate.cpp
-        src/dusk/livesplit.cpp
        src/dusk/offset_ptr.cpp
        src/dusk/OSContext.cpp
-        src/dusk/OSReport.cpp
        src/dusk/OSThread.cpp
        src/dusk/OSMutex.cpp
-        src/dusk/discord_presence.cpp
-        src/dusk/version.cpp
 )
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1775710090,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
@@ -1,33 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  };
-  outputs = { self, nixpkgs }:
-    let
-      pkgs = import nixpkgs { system = "x86_64-linux"; };
-      dusk = pkgs.stdenv.mkDerivation {
-        name = "dusk";
-        src = ./.;
-        nativeBuildInputs = [
-          pkgs.cmake
-          pkgs.pkg-config
-          pkgs.wayland
-        ];
-        buildInputs = [
-          pkgs.libGL
-          pkgs.libX11
-          pkgs.libXcursor
-          pkgs.libxi
-          pkgs.libxcb
-          pkgs.libxrandr
-          pkgs.libxscrnsaver
-          pkgs.libxtst
-          pkgs.libjpeg8
-          pkgs.libxkbcommon
-          pkgs.libglvnd
-        ];
-      };
-    in {
-      packages.x86_64-linux.default = dusk;
-    };
-}
@@ -39,10 +39,6 @@ enum Z2WolfHowlCurveID {
    Z2WOLFHOWL_NEWSONG2,
    Z2WOLFHOWL_NEWSONG3,

-    #if TARGET_PC
-    Z2WOLFHOWL_TIMESONG,
-    #endif
-
    Z2WOLFHOWL_MAX
 };

@@ -4549,9 +4549,8 @@ public:
    /* 0x03850 */ daAlink_procFunc mpProcFunc;

 #if TARGET_PC
-    void handleWolfHowl();
    void handleQuickTransform();
-    bool checkGyroAimContext();
+    bool checkGyroAimItemContext();
 #endif
 };  // Size: 0x385C

@@ -188,15 +188,6 @@ public:
    /* 0x273C */ f32 mKankyoBlend;
    /* 0x2740 */ u8 field_0x2740;
    /* 0x2744 */ dMsgFlow_c mMsgFlow;
-#if TARGET_PC
-    cXyz mReinsInterpPrev[2][16];
-    cXyz mReinsInterpCurr[2][16];
-    cXyz mReinsTexInterpPrev[2];
-    cXyz mReinsTexInterpCurr[2];
-    bool mReinsInterpPrevValid;
-    bool mReinsInterpCurrValid;
-    s8 mDemoCamSyncTicks;
-#endif
 };

 STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790);
@@ -44,9 +44,6 @@ public:
    int draw();
    int execute();
    void drawMeter();
-    #if TARGET_PC
-    void updateOnWide();
-    #endif
    void setComboCount(u8, u8);
    void setScoreCount(u32);
    void addScoreCount(cXyz*, u32, u8);
@@ -44,12 +44,6 @@ public:
    /* 0x88C */ u8 field_0x88C[0x8C8 - 0x88C];
    /* 0x8C8 */ s8 field_0x8c8;
    /* 0x8C9 */ u8 mInitHIO;
-#if TARGET_PC
-    cXyz mRopeInterpPrev[16];
-    cXyz mRopeInterpCurr[16];
-    bool mRopeInterpPrevValid;
-    bool mRopeInterpCurrValid;
-#endif
 };

 STATIC_ASSERT(sizeof(e_mb_class) == 0x8cc);
@@ -220,15 +220,6 @@ public:
    /* 0x17E2 */ s16 wait_roll_angle;  ///< @brief Roll angle during wait state.
    /* 0x17E4 */ u8 field_0x17e4[0x17e8 - 0x17e4];
    /* 0x17E8 */ f32 ride_speed_max;  ///< @brief Speed rate for riding calculations.
-#if TARGET_PC
-    cXyz himo_mat_interp_prev[2][16];
-    cXyz himo_mat_interp_curr[2][16];
-    cXyz himo_tex_interp_prev[2];
-    cXyz himo_tex_interp_curr[2];
-    bool himo_interp_prev_valid;
-    bool himo_interp_curr_valid;
-    s8 demo_cam_sync_ticks;
-#endif
 };

 STATIC_ASSERT(sizeof(e_wb_class) == 0x17EC);
@@ -25,10 +25,6 @@ public:
    /* 0x164 */ cXyz mMinVal;
    /* 0x170 */ cXyz mMaxVal;
    /* 0x17C */ cXyz mViewScale;
-#if TARGET_PC
-    bool mbReset = false;
-    bool mbHadEntry = false;
-#endif
 };

 /**
@@ -94,12 +94,6 @@ static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
 #define THP_TEXTURE_SET_COUNT  3
 #endif

-#if TARGET_PC
-namespace dusk {
-    void MoviePlayerShutdown();
-}
-#endif
-
 struct daMP_THPPlayer {
    /* 0x000 */ DVDFileInfo fileInfo;
 	/* 0x03C */ THPHeader header;
@@ -25,10 +25,6 @@ public:
    int Draw();
    int Delete();

-#if TARGET_PC
-    void onInterpCallback();
-#endif
-
    enum Param_e {
        LOCK_e = (1 << 6), NO_BASE_DISP = (1 << 7)
    };
@@ -54,13 +50,6 @@ private:
    /* 0x1020 */ dCcD_Cyl mCylinderCollider;
    /* 0x115C */ s32 mStopSwingingFrames;

-#if TARGET_PC
-    cXyz mChainInterpPrev[64];
-    cXyz mChainInterpCurr[64];
-    bool mChainInterpPrevValid;
-    bool mChainInterpCurrValid;
-#endif
-
    // Number of chain models
    u32 getArg0() {
        return fopAcM_GetParamBit(this, 0, 6);
@@ -58,9 +58,6 @@ public:
    void setNextPoint();
    int Draw();
    int Delete();
-#if TARGET_PC
-    friend void daL8Lift_interp_callback(bool isSimFrame, void* pUserWork);
-#endif

    u8 getPthID() { return fopAcM_GetParamBit(this, 0, 8); }
    u8 getMoveSpeed() { return fopAcM_GetParamBit(this, 8, 4); }
@@ -41,7 +41,7 @@ public:
 *
 */
 class daObj_SMTile_c : public fopAc_ac_c {
-private:
+public:
    /* 0x568 */ mDoExt_brkAnm mBrk;
    /* 0x580 */ OBJ_SMTILE_HIO_CLASS* mpHIO;
    /* 0x584 */ request_of_phase_process_class mPhase;
@@ -59,6 +59,10 @@ private:
    /* 0xB29 */ u8 field_0xb29;
    /* 0xB2A */ u8 field_0xb2a;
    /* 0xB2B */ u8 field_0xb2b;
+
+    bool bad_apple;
+    u32 bad_apple_frame;
+    JAISoundHandle apple_sound;
 public:
    virtual ~daObj_SMTile_c();
    int create();
@@ -68,8 +68,10 @@ public:
    /* 0x904 */ cXyz field_0x904[2];
    /* 0x91C */ int field_0x91c;
    /* 0x920 */ cXyz field_0x920[63];
-    /* 0xC14 */ f32 field_0xc14[63];
-    /* 0xD10 */ s8 field_0xd10[64];
+    /* 0xC14 */ f32 field_0xc14[4];
+    /* 0xC24 */ u8 field_0xc24[0xd10 - 0xc24];
+    /* 0xD10 */ s8 field_0xd10[4];
+    /* 0xD14 */ u8 field_0xd14[0xd50 - 0xd14];
    /* 0xD50 */ mDoExt_3DlineMat1_c field_0xd50;
    /* 0xD8C */ int field_0xd8c;
 };
@@ -143,12 +143,6 @@ public:
    /* 0x20 */ JORFile mFile;
 #endif

-#if TARGET_PC
-    /* 0x24 */ u8 mManualMode;
-    /* 0x25 */ f32 freeXAngle;
-    /* 0x29 */ f32 freeYAngle;
-#endif
-
    u32 Id(s32 i_style) { return mCamStyleData[i_style].field_0x0; }
    int Algorythmn(s32 i_style) { return mCamStyleData[i_style].field_0x4; }
    int Algorythmn() { return mCurrentStyle->field_0x4; }
@@ -273,8 +273,6 @@ public:
        /* 0xA4 */ f32 field_0xa4;
        /* 0xA8 */ int field_0xa8;
        /* 0xAC */ f32 field_0xac;
-        f32 xAngle;
-        f32 yAngle;
    };

    struct LockOnData {
@@ -1026,9 +1024,6 @@ public:
    bool colosseumCamera(s32);
    bool test1Camera(s32);
    bool test2Camera(s32);
-    #if TARGET_PC
-    bool freeCamera();
-    #endif
    bool towerCamera(s32);
    bool hookshotCamera(s32);
    bool railCamera(s32);
@@ -4834,7 +4834,8 @@ inline void dComIfGd_drawXluListDark() {
 inline void dComIfGd_drawXluListInvisible() {
    ZoneScoped;
 #ifdef TARGET_PC
-    if (!dusk::getSettings().game.disableWaterRefraction) {
+    if (dusk::getSettings().game.enableWaterRefraction &&
+        !dusk::getSettings().game.enableFrameInterpolation) {
 #endif
        g_dComIfG_gameInfo.drawlist.drawXluListInvisible();
 #ifdef TARGET_PC
@@ -4845,7 +4846,8 @@ inline void dComIfGd_drawXluListInvisible() {
 inline void dComIfGd_drawOpaListInvisible() {
    ZoneScoped;
 #ifdef TARGET_PC
-    if (!dusk::getSettings().game.disableWaterRefraction) {
+    if (dusk::getSettings().game.enableWaterRefraction &&
+        !dusk::getSettings().game.enableFrameInterpolation) {
 #endif
        g_dComIfG_gameInfo.drawlist.drawOpaListInvisible();
 #ifdef TARGET_PC
@@ -209,10 +209,6 @@ public:
    /* 0x04 */ TGXTexObj* mpTexObj;
    /* 0x08 */ Mtx mVolumeMtx;
    /* 0x38 */ Mtx mMtx;
-#if TARGET_PC
-    const void* mVolumeMtxKey;
-    const void* mMtxKey;
-#endif
 };  // Size: 0x68

 struct cBgD_Vtx_t;
@@ -312,11 +308,8 @@ private:
    /* 0x0000C */ dDlst_shadowSimple_c mSimple[128];
    /* 0x0340C */ int mNextID;
    /* 0x03410 */ dDlst_shadowReal_c mReal[8];
-    /* 0x15EB0 */ TGXTexObj mShadowTexObj[2];
-    /* 0x15EF0 */ void* mShadowTexData[2];
-    #if TARGET_PC
-    int mTexResScale;
-    #endif
+    /* 0x15EB0 */ TGXTexObj field_0x15eb0[2];
+    /* 0x15EF0 */ void* field_0x15ef0[2];
 };

 class dDlst_window_c {
@@ -10,7 +10,6 @@
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"

 class dFile_info_c;
-class J2DPicture;

 class dDlst_FileSel_c : public dDlst_base_c {
 public:
@@ -114,14 +113,6 @@ public:
    /* 0x04 */ J2DScreen* Scr3m;
 };

-class dDlst_FileSelFade_c : public dDlst_base_c {
-public:
-    void draw();
-    virtual ~dDlst_FileSelFade_c() {}
-
-    /* 0x04 */ J2DPicture* mpPict;
-};
-
 class dFs_HIO_c : public JORReflexible {
 public:
    dFs_HIO_c();
@@ -685,9 +676,6 @@ public:
    #if PLATFORM_GCN
    /* 0x2378 */ J2DPicture* mpFadePict;
    #endif
-#ifdef TARGET_PC
-    dDlst_FileSelFade_c mFadeDlst;
-#endif

    #if PLATFORM_WII || PLATFORM_SHIELD
    /* 0x2376 */ u8 field_0x2376[SAVEFILE_SIZE];
@@ -696,10 +684,6 @@ public:
    #endif
 };

-#ifdef TARGET_PC
-STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C + sizeof(dDlst_FileSelFade_c));
-#else
 STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C);
-#endif

 #endif /* D_FILE_D_FILE_SELECT_H */
@@ -91,10 +91,6 @@ public:
    void calcCursor();
    void drawCursor();

-    #if TARGET_PC
-    void dMapBgWide();
-    #endif
-
    void setDPDFloorSelCurPos(s8 i_pos) { field_0xdd6 = i_pos; }

    f32 getMapWidth() { return mMapWidth; }
@@ -107,10 +103,6 @@ public:
        field_0xd98 = param_1;
    }

-#if TARGET_PC
-    void resetScrollArrowMask() { field_0xdda = 0; }
-#endif
-
    /* 0xC98 */ JKRExpHeap* mpHeap;
    /* 0xC9C */ JKRExpHeap* mpTalkHeap;
    /* 0xCA0 */ STControl* mpStick;
@@ -75,9 +75,7 @@ public:
        /* 0x8 */ BE(u16) mAreaName;
        /* 0xA */ u8 mCount;
 #ifdef _MSVC_LANG
-        // Room numbers start at offset 0xB (right after mCount), NOT at sizeof(data)=12.
-        // (u8*)(this+1) would give offset 12 because MSVC sizeof=12; use &mCount+1 instead.
-        u8* __get_mRoomNos() const { return (u8*)&mCount + 1; }
+        u8* __get_mRoomNos() const { return (u8*)(this + 1); }
        __declspec(property(get = __get_mRoomNos)) u8* mRoomNos;
 #else
        /* 0xB */ u8 mRoomNos[0];
@@ -81,10 +81,6 @@ public:
    void calcDrawPriority();
    void setArrowPosAxis(f32, f32);

-    #if TARGET_PC
-    void fMapBackWide();
-    #endif
-
    virtual void draw();
    virtual ~dMenu_Fmap2DBack_c();

@@ -334,10 +330,6 @@ public:
    void setHIO(bool);
    bool isWarpAccept();

-    #if TARGET_PC
-    void fMapTopWide();
-    #endif
-
    virtual void draw();
    virtual ~dMenu_Fmap2DTop_c();

@@ -204,18 +204,6 @@ private:
    /* 0x6D1 */ u8 field_0x6d1;
    /* 0x6D2 */ u8 field_0x6d2;
    /* 0x6D3 */ u8 field_0x6d3;
-#if TARGET_PC
-    f32 mSelectItemSlideElapsed[4];
-    f32 mCursorInterpPrevX;
-    f32 mCursorInterpPrevY;
-    f32 mCursorInterpCurrX;
-    f32 mCursorInterpCurrY;
-    s16 mCursorInterpPrevAngle;
-    s16 mCursorInterpCurrAngle;
-    bool mCursorInterpPrevAngular;
-    bool mCursorInterpCurrAngular;
-    bool mCursorInterpInit;
-#endif
 };

 #endif /* D_MENU_D_MENU_RING_H */
@@ -343,11 +343,6 @@ public:
    /* 0x624 */ f32 mMidonaPosX;
    /* 0x628 */ f32 mMidonaPosY;
    /* 0x62C */ f32 mMidonaScale;
-
-#ifdef TARGET_PC
-    bool mWasListen[2];
-    bool mWasRepeat[2];
-#endif
 };

 #endif /* D_METER_D_METER_BUTTON_H */
@@ -67,9 +67,6 @@ public:
    bool isStaffMessage();
    bool isSaveMessage();
    bool isTalkMessage();
-#if TARGET_PC
-    bool isShopItemMessage();
-#endif
    const char* getSmellName();
    const char* getPortalName();
    const char* getBombName();
@@ -110,10 +110,6 @@ struct dMsgScrnHowl_c : public dMsgScrnBase_c {
    /* 0x27A0 */ f32 field_0x27a0;
    /* 0x27A4 */ f32 field_0x27a4;
    /* 0x27A8 */ f32 field_0x27a8;
-
-#if TARGET_PC
-    u8 showCursor;
-#endif
 };

 #endif /* MSG_SCRN_D_MSG_SCRN_HOWL_H */
@@ -89,7 +89,7 @@ public:
    void MojiSelectAnm3();
    int mojiChange(u8);
    void selectMojiSet();
-    #if TARGET_PC || REGION_JPN
+    #if REGION_JPN
    int checkDakuon(int, u8);
    int setDakuon(int, u8);
    #endif
@@ -79,7 +79,7 @@ public:
    bool isProgressiveMode();
    void setRenderMode();

-    #if TARGET_PC || VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD
+    #if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD
    u8 getPalLanguage();
    #endif

@@ -149,7 +149,7 @@ public:
    /* 0x200 */ dDlst_2D_c* mNvLogo;
    /* 0x204 */ dDlst_2D_c* mMocImg;
 #endif
-#if TARGET_PC || VERSION == VERSION_GCN_PAL
+#if VERSION == VERSION_GCN_PAL
    /* 0x1FC */ mDoDvdThd_mountArchive_c* mpPalLogoResCommand;
 #endif
    /* 0x1FC */ request_of_phase_process_class* m_preLoad_dylPhase;
@@ -487,31 +487,19 @@ public:
        }
    }
    char* getPlayerName() const { return const_cast<char*>(mPlayerName); }
-    void setPlayerName(const char* i_name) {
-#if AVOID_UB
-        strncpy(mPlayerName, i_name, sizeof(mPlayerName) - 1);
-        mPlayerName[sizeof(mPlayerName) - 1] = '\0';
-#else
-        strcpy(mPlayerName, i_name);
-#endif
-    }
+    void setPlayerName(const char* i_name) { strcpy(mPlayerName, i_name); }
    char* getHorseName() const { return const_cast<char*>(mHorseName); }
-    void setHorseName(const char* i_name) {
-#if AVOID_UB
-        strncpy(mHorseName, i_name, sizeof(mHorseName) - 1);
-        mHorseName[sizeof(mHorseName) - 1] = '\0';
-#else
-        strcpy(mHorseName, i_name);
-#endif
-    }
+    void setHorseName(const char* i_name) { strcpy(mHorseName, i_name); }
    u8 getClearCount() const { return mClearCount; }

    /* 0x00 */ BE(u64) unk0;
    /* 0x08 */ BE(s64) mTotalTime;
    /* 0x10 */ BE(u16) unk16;
    /* 0x12 */ BE(u16) mDeathCount;
-    /* 0x14 */ char mPlayerName[17];
-    /* 0x25 */ char mHorseName[17];
+    /* 0x14 */ char mPlayerName[16];
+    /* 0x24 */ u8 unk36;
+    /* 0x25 */ char mHorseName[16];
+    /* 0x35 */ u8 unk53;
    /* 0x36 */ u8 mClearCount;
    /* 0x37 */ u8 unk55[5];
 };  // Size: 0x40
@@ -47,13 +47,6 @@ public:
        mPositionY = y;
    }

-#ifdef TARGET_PC
-    f32 getPositionX() const { return mPositionX; }
-    f32 getPositionY() const { return mPositionY; }
-
-    void refreshAspectScale();
-#endif
-
    void onUpdateFlag() { mUpdateFlag = true; }

    void resetUpdateFlag() { mUpdateFlag = false; }
@@ -86,9 +79,6 @@ private:
    /* 0x58 */ f32 mPositionX;
    /* 0x5C */ f32 mPositionY;
    /* 0x60 */ f32 mParam1;
-#ifdef TARGET_PC
-    f32 mBaseParam1;
-#endif
    /* 0x64 */ f32 mParam2;
    /* 0x68 */ f32 mParam3;
    /* 0x6C */ f32 mParam4;
@@ -1,74 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <functional>
-#include <queue>
-#include <string>
-#include <string_view>
-#include <unordered_set>
-#include <vector>
-#include "nlohmann/json.hpp"
-
-namespace dusk {
-
-enum class AchievementCategory : uint8_t {
-    Story,
-    Collection,
-    Challenge,
-    Minigame,
-    Misc,
-    Glitched
-};
-
-struct Achievement {
-    const char* key;
-    const char* name;
-    const char* description;
-    AchievementCategory category;
-    bool isCounter;
-    int32_t goal;
-    int32_t progress;
-    bool unlocked;
-};
-
-// Responsible for updating a.progress.
-// Use extra for any per-achievement state that must survive across frames or sessions, extra is saved
-using AchievementCheckFn = std::function<void(Achievement& a, nlohmann::json& extra)>;
-
-class AchievementSystem {
-public:
-    static AchievementSystem& get();
-
-    void load();
-    void save();
-    void tick();
-    void clearAll();
-    void clearOne(const char* key);
-
-    // Signals are visible to all achievement checks within the same tick, then cleared.
-    void signal(const char* key);
-    bool hasSignal(const char* key) const;
-
-    std::vector<Achievement> getAchievements() const;
-    bool hasPendingUnlock() const { return !m_pendingUnlocks.empty(); }
-    std::string consumePendingUnlock();
-
-private:
-    struct Entry {
-        Achievement achievement;
-        AchievementCheckFn check;
-        nlohmann::json extra;
-    };
-
-    AchievementSystem();
-    static std::vector<Entry> makeEntries();
-    void processEntry(Entry& e);
-
-    std::vector<Entry> m_entries;
-    std::unordered_set<std::string_view> m_signals;
-    bool m_loaded = false;
-    bool m_dirty = false;
-    std::queue<std::string> m_pendingUnlocks;
-};
-
-} // namespace dusk
@@ -12,8 +12,6 @@ namespace dusk::audio {

    void SetMasterVolume(f32 value);

-    void SetPaused(bool paused);
-
    u32 GetResetCount(int channelIdx);

    f32 VolumeFromU16(u16 value);
@@ -1,17 +0,0 @@
-#pragma once
-
-#ifndef AUTOSAVE_H
-#define AUTOSAVE_H
-
-#include <m_Do/m_Do_MemCardRWmng.h>
-#include <m_Do/m_Do_MemCard.h>
-
-void noAutoSave();
-void triggerAutoSave();
-void updateAutoSave();
-void enterAutoSave();
-void autoSaving();
-void waitingForWrite();
-void endAutoSave();
-
-#endif
@@ -146,12 +146,6 @@ concept ConfigValue =
 template <ConfigValue T>
 const ConfigImplBase* GetConfigImpl();

-template <typename T>
-struct ConfigEnumRange {
-    static constexpr auto min = std::numeric_limits<std::underlying_type_t<T>>::min();
-    static constexpr auto max = std::numeric_limits<std::underlying_type_t<T>>::max();
-};
-
 /**
 * \brief A CVar storing values.
 *
@@ -195,11 +189,6 @@ public:
        }
    }

-    [[nodiscard]] constexpr const T& getDefaultValue() const noexcept {
-        checkRegistered();
-        return defaultValue;
-    }
-
    /**
     * \brief Change the value of a CVar.
     *
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace dusk {
-
-void InitializeCrashReporting();
-void ShutdownCrashReporting();
-
-}  // namespace dusk
@@ -1,18 +0,0 @@
-#pragma once
-
-#ifdef DUSK_DISCORD_RPC
-
-namespace dusk {
-namespace discord {
-
-void Initialize();
-
-void RunCallbacks();
-
-void UpdatePresence();
-
-void Shutdown();
-}
-}
-
-#endif // DUSK_DISCORD_RPC
@@ -6,6 +6,7 @@
 #include "aurora/gfx.h"

 extern AuroraInfo auroraInfo;
+extern const char* configPath;

 namespace dusk {
    extern AuroraStats lastFrameAuroraStats;
@@ -1,31 +1,22 @@
 #pragma once

 #include "dolphin/types.h"
-#include "version.hpp"

 namespace dusk {

-struct OffsetVersion {
-    version::GameVersion mGameVersion;
-    u32 mOffset;
-
-    constexpr OffsetVersion(const version::GameVersion gameVersion, const u32 offset)
-        : mGameVersion(gameVersion), mOffset(offset) {}
-};
-
 /**
 * Load bytes from the main DOL by GameCube virtual address
 */
-bool LoadDolAsset(void* dst, std::initializer_list<OffsetVersion> virtualAddress, s32 size);
+bool LoadDolAsset(void* dst, u32 virtualAddress, s32 size);

 /**
 * Load bytes from a REL file in the ISO filesystem, dst must be 32-byte aligned
 */
-bool LoadRelAsset(void* dst, const char* dvdPath, std::initializer_list<OffsetVersion> offset, s32 size);
+bool LoadRelAsset(void* dst, const char* dvdPath, s32 offset, s32 size);

 /**
 * Load bytes from a REL inside RELS.arc
 */
-bool LoadArchivedRelAsset(void* dst, u32 memType, const char* relFileName, std::initializer_list<OffsetVersion> offset, s32 size);
+bool LoadArchivedRelAsset(void* dst, u32 memType, const char* relFileName, s32 offset, s32 size);

 }  // namespace dusk
@@ -1,12 +1,13 @@
-#pragma once
+#ifndef DUSK_FRAME_INTERP_H
+#define DUSK_FRAME_INTERP_H

 #include <dolphin/mtx.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

+struct cXyz;
 class camera_process_class;
-class view_class;

 #ifdef __cplusplus
 namespace dusk {
@@ -14,39 +15,29 @@ namespace frame_interp {

 void ensure_initialized();

+void begin_record_camera();
 void begin_record();
 void end_record();
-void begin_sim_tick();
-void begin_frame(bool enabled, bool is_sim_frame, float step);
-void interpolate();
+void interpolate(float step);
 float get_interpolation_step();
+void notify_sim_tick_complete();
+uint32_t begin_presentation_ui_pass();
+uint32_t get_presentation_ui_advance_ticks();
+void end_presentation_ui_pass();

-void request_presentation_sync();
-bool presentation_sync_active();
-
-bool is_enabled();
-
-// TODO: These should be phased out as UI is progressively updated to use game_clock
-void set_ui_tick_pending(bool value);
-bool get_ui_tick_pending();
-
-bool is_sim_frame();
-
+void open_child(const void* key, int32_t id);
+void close_child();
 void record_camera(::camera_process_class* cam, int camera_id);
-void interp_view(::view_class* view);
-void record_final_mtx(Mtx m, const void *key);
-void record_final_mtx(Mtx m);
+void record_final_mtx_raw(const Mtx* dest, const Mtx src);

-bool lookup_replacement(const void* key, Mtx out);
+bool lookup_replacement(const void* source, Mtx out);
 bool lookup_concat_replacement(const void* lhs, const void* rhs, Mtx out);

-typedef void (*InterpolationCallBack)(bool isSimFrame, void* pUserWork);
-// call on a sim tick, will get called during presentation
-void add_interpolation_callback(InterpolationCallBack pCallBack, void* pUserWork);
-
-void begin_presentation_camera();
-void end_presentation_camera();
+void camera_eye_from_view_mtx(MtxP view_mtx, cXyz* o_eye);
+bool build_star_view(Mtx o_view, Mtx o_cam_billboard_base, cXyz* o_anchor_eye, float* o_fovy);

 }  // namespace frame_interp
 }  // namespace dusk
 #endif
+
+#endif
@@ -1,26 +0,0 @@
-#pragma once
-
-namespace dusk::game_clock {
-
-void ensure_initialized();
-void reset_frame_timer();
-
-constexpr float sim_pace() { return 1.0f / 30.0f; }
-constexpr float period_for_original_frames(float frame_count) { return frame_count * sim_pace(); }
-constexpr float ui_maximum_dt() { return 0.05f; }
-constexpr float ui_initial_dt() { return 1.0f / 60.0f; }
-
-struct MainLoopPacer {
-    float presentation_dt_seconds;
-    bool is_interpolating;
-    int sim_ticks_to_run;
-    float sim_pace;
-};
-
-MainLoopPacer advance_main_loop();
-void commit_sim_tick();
-float sample_interpolation_step();
-
-float consume_interval(const void* consumer);
-
-} // namespace dusk::game_clock
@@ -1,8 +0,0 @@
-#pragma once
-
-#ifndef GAMEPAD_COLOR_H
-#define GAMEPAD_COLOR_H
-
-void handleGamepadColor();
-
-#endif
@@ -1,17 +0,0 @@
-#ifndef DUSK_GYRO_H
-#define DUSK_GYRO_H
-
-namespace dusk::gyro {
-void read(float dt);
-void getAimDeltas(float& out_yaw, float& out_pitch);
-bool queryGyroAimContext();
-
-void rollgoalTick(bool play_active, s16 camera_yaw);
-void rollgoalTableOffset(s16& out_ax, s16& out_az);
-
-extern bool s_sensor_keep_alive;
-bool get_sensor_keep_alive();
-void set_sensor_keep_alive(bool value);
-}  // namespace dusk::gyro
-
-#endif
@@ -0,0 +1,10 @@
+#ifndef DUSK_GYRO_AIM_H
+#define DUSK_GYRO_AIM_H
+
+namespace dusk::gyro_aim {
+void read(float dt, bool context_active);
+void consumeAimDeltas(float& out_yaw_rad, float& out_pitch_rad);
+bool queryGyroAimItemContext();
+}  // namespace dusk::gyro_aim
+
+#endif
@@ -9,17 +9,14 @@ constexpr const char* DO_RESET = "Cmd+R";
 constexpr const char* DO_RESET = "Ctrl+R";
 #endif

+constexpr const char* TOGGLE_FULLSCREEN = "F11";
+
 constexpr const char* SHOW_PROCESS_MANAGEMENT = "F2";
 constexpr const char* SHOW_DEBUG_OVERLAY = "F3";
 constexpr const char* SHOW_HEAP_VIEWER = "F4";
-constexpr const char* SHOW_PLAYER_INFO = "F5";
-constexpr const char* SHOW_SAVE_EDITOR = "F6";
-constexpr const char* SHOW_MAP_LOADER = "F7";
-constexpr const char* SHOW_STATE_SHARE = "F8";
-constexpr const char* SHOW_DEBUG_CAMERA = "F9";
-constexpr const char* SHOW_AUDIO_DEBUG = "F10";
-
-constexpr const char* TOGGLE_FULLSCREEN = "F11";
+constexpr const char* SHOW_STUB_LOG = "F5";
+constexpr const char* SHOW_CAMERA_DEBUG = "F6";
+constexpr const char* SHOW_AUDIO_DEBUG = "F7";

 constexpr const char* TURBO = "Tab";

@@ -1,16 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace dusk::speedrun {
-void onGameFrame();
-uint64_t getFrameCount();
-void start();
-void reset();
-void connectLiveSplit(const char* host = "127.0.0.1", int port = 16834);
-void disconnectLiveSplit();
-bool consumeConnectedEvent();
-bool consumeDisconnectedEvent();
-void updateLiveSplit();
-void shutdown();
-}
@@ -4,14 +4,9 @@
 #include <aurora/aurora.h>
 #include <aurora/lib/logging.hpp>

-#include <filesystem>
-
 void aurora_log_callback(AuroraLogLevel level, const char* module, const char* message, unsigned int len);

 namespace dusk {
-    void InitializeFileLogging(const std::filesystem::path& configDir, AuroraLogLevel logLevel);
-    void ShutdownFileLogging();
-    const char* GetLogFilePath();
    void SendToStubLog(AuroraLogLevel level, const char* module, const char* message);
 }

@@ -1,14 +1,10 @@
 #ifndef DUSK_MAIN_H
 #define DUSK_MAIN_H

-#include <filesystem>
-
 namespace dusk {
    extern bool IsRunning;
    extern bool IsShuttingDown;
    extern bool IsGameLaunched;
-    extern bool IsFocusPaused;
-    extern std::filesystem::path ConfigPath;
 }

 #endif  // DUSK_MAIN_H
@@ -1,20 +0,0 @@
-#ifndef DUSK_SCOPE_GUARD_HPP
-#define DUSK_SCOPE_GUARD_HPP
-
-#include <functional>
-
-class SimpleScopeGuard {
-public:
-    // Store the function in the constructor
-    explicit SimpleScopeGuard(const std::function<void()>& func) : m_func(func) {}
-
-    // Run the function when the object goes out of scope
-    ~SimpleScopeGuard() {
-        if (m_func) m_func();
-    }
-
-private:
-    std::function<void()> m_func;
-};
-
-#endif //DUSK_SCOPE_GUARD_HPP
@@ -7,34 +7,6 @@ namespace dusk {

 using namespace config;

-enum class BloomMode : int {
-    Off = 0,
-    Classic = 1,
-    Dusk = 2,
-};
-
-enum class GameLanguage : u8 {
-    English = OS_LANGUAGE_ENGLISH,
-    German = OS_LANGUAGE_GERMAN,
-    French = OS_LANGUAGE_FRENCH,
-    Spanish = OS_LANGUAGE_SPANISH,
-    Italian = OS_LANGUAGE_ITALIAN,
-};
-
-namespace config {
-template <>
-struct ConfigEnumRange<BloomMode> {
-    static constexpr auto min = BloomMode::Off;
-    static constexpr auto max = BloomMode::Dusk;
-};
-
-template <>
-struct ConfigEnumRange<GameLanguage> {
-    static constexpr auto min = GameLanguage::English;
-    static constexpr auto max = GameLanguage::Italian;
-};
-}
-
 // Persistent user settings

 struct UserSettings {
@@ -55,14 +27,11 @@ struct UserSettings {
        ConfigVar<int> soundEffectsVolume;
        ConfigVar<int> fanfareVolume;
        ConfigVar<bool> enableReverb;
-        ConfigVar<bool> enableHrtf;
    } audio;

    // Game settings

    struct {
-        ConfigVar<GameLanguage> language;
-
        // QoL
        ConfigVar<bool> enableQuickTransform;
        ConfigVar<bool> hideTvSettingsScreen;
@@ -77,29 +46,17 @@ struct UserSettings {
        ConfigVar<bool> fastClimbing;
        ConfigVar<bool> noMissClimbing;
        ConfigVar<bool> fastTears;
-        ConfigVar<bool> no2ndFishForCat;
        ConfigVar<bool> instantSaves;
-        ConfigVar<bool> instantText;
-        ConfigVar<bool> sunsSong;
-        ConfigVar<bool> autoSave;

        // Preferences
        ConfigVar<bool> enableMirrorMode;
-        ConfigVar<bool> disableMainHUD;
-        ConfigVar<bool> pauseOnFocusLost;
-        ConfigVar<bool> enableLinkDollRotation;
-        ConfigVar<bool> enableAchievementNotifications;
-
+        ConfigVar<bool> invertCameraXAxis;

        // Graphics
-        ConfigVar<BloomMode> bloomMode;
-        ConfigVar<float> bloomMultiplier;
-        ConfigVar<bool> disableWaterRefraction;
+        ConfigVar<bool> enableBloom;
+        ConfigVar<bool> enableWaterRefraction;
        ConfigVar<bool> enableFrameInterpolation;
-        ConfigVar<int> internalResolutionScale;
        ConfigVar<int> shadowResolutionMultiplier;
-        ConfigVar<bool> enableDepthOfField;
-        ConfigVar<bool> enableMapBackground;

        // Audio
        ConfigVar<bool> noLowHpSound;
@@ -107,30 +64,12 @@ struct UserSettings {

        // Input
        ConfigVar<bool> enableGyroAim;
-        ConfigVar<bool> enableGyroRollgoal;
-        ConfigVar<float> gyroSensitivityX;
-        ConfigVar<float> gyroSensitivityY;
-        ConfigVar<float> gyroSensitivityRollgoal;
-        ConfigVar<float> gyroSmoothing;
-        ConfigVar<float> gyroDeadband;
-        ConfigVar<bool> gyroInvertPitch;
-        ConfigVar<bool> gyroInvertYaw;
-        ConfigVar<bool> freeCamera;
-        ConfigVar<bool> invertCameraXAxis;
-        ConfigVar<bool> invertCameraYAxis;
-        ConfigVar<float> freeCameraSensitivity;
+        ConfigVar<float> gyroAimSensitivityX;
+        ConfigVar<float> gyroAimSensitivityY;
+        ConfigVar<bool> gyroAimInvertPitch;
+        ConfigVar<bool> gyroAimInvertYaw;

        // Cheats
-        ConfigVar<bool> infiniteHearts;
-        ConfigVar<bool> infiniteArrows;
-        ConfigVar<bool> infiniteBombs;
-        ConfigVar<bool> infiniteOil;
-        ConfigVar<bool> infiniteOxygen;
-        ConfigVar<bool> infiniteRupees;
-        ConfigVar<bool> enableIndefiniteItemDrops;
-        ConfigVar<bool> moonJump;
-        ConfigVar<bool> superClawshot;
-        ConfigVar<bool> alwaysGreatspin;
        ConfigVar<bool> enableFastIronBoots;
        ConfigVar<bool> canTransformAnywhere;
        ConfigVar<bool> fastSpinner;
@@ -141,10 +80,6 @@ struct UserSettings {

        // Controls
        ConfigVar<bool> enableTurboKeybind;
-
-        // Tools
-        ConfigVar<bool> speedrunMode;
-        ConfigVar<bool> liveSplitEnabled;
    } game;

    struct {
@@ -153,9 +88,6 @@ struct UserSettings {
        ConfigVar<bool> skipPreLaunchUI;
        ConfigVar<bool> showPipelineCompilation;
        ConfigVar<bool> wasPresetChosen;
-        ConfigVar<bool> enableCrashReporting;
-        ConfigVar<bool> duskMenuOpen;
-        ConfigVar<int> cardFileType;
    } backend;
 };

@@ -180,7 +112,6 @@ struct TransientSettings {
    CollisionViewSettings collisionView;
    bool skipFrameRateLimit;
    bool moveLinkActive;
-    bool stateShareLoadActive;
 };

 TransientSettings& getTransientSettings();
@@ -1,10 +1,9 @@
 #ifndef DUSK_TIME_H
 #define DUSK_TIME_H

-#include <array>
+#include <chrono>
 #include <numeric>
-
-#include "SDL3/SDL_timer.h"
+#include <array>

 #ifdef _WIN32
 #ifndef WIN32_LEAN_AND_MEAN
@@ -16,26 +15,28 @@
 #include <Windows.h>
 #include <shellapi.h>
 #include <intrin.h>
+#else
+#include "SDL3/SDL_timer.h"
 #endif

 class Limiter {
-public:
-  using duration_t = Uint64;
+  using delta_clock = std::chrono::high_resolution_clock;
+  using duration_t = std::chrono::nanoseconds;

-  void Reset() { m_oldTime = SDL_GetTicksNS(); }
+public:
+  void Reset() { m_oldTime = delta_clock::now(); }

  void Sleep(duration_t targetFrameTime) {
-    if (targetFrameTime == 0) {
+    if (targetFrameTime.count() == 0) {
      return;
    }

-    const Uint64 start = SDL_GetTicksNS();
+    auto start = delta_clock::now();
    duration_t adjustedSleepTime = SleepTime(targetFrameTime);
-    if (adjustedSleepTime > 0) {
+    if (adjustedSleepTime.count() > 0) {
      NanoSleep(adjustedSleepTime);
-      const duration_t elapsed = TimeSince(start);
-      const duration_t overslept = elapsed > adjustedSleepTime ? elapsed - adjustedSleepTime : 0;
-      if (overslept < targetFrameTime) {
+      duration_t overslept = TimeSince(start) - adjustedSleepTime;
+      if (overslept < duration_t{targetFrameTime}) {
        m_overheadTimes[m_overheadTimeIdx] = overslept;
        m_overheadTimeIdx = (m_overheadTimeIdx + 1) % m_overheadTimes.size();
      }
@@ -44,23 +45,23 @@ public:
  }

  duration_t SleepTime(duration_t targetFrameTime) {
-    const duration_t elapsed = TimeSince(m_oldTime);
-    const duration_t sleepTime = elapsed < targetFrameTime ? targetFrameTime - elapsed : 0;
-    m_overhead = std::accumulate(m_overheadTimes.begin(), m_overheadTimes.end(), duration_t{0}) /
-                 m_overheadTimes.size();
+    const auto sleepTime = duration_t{targetFrameTime} - TimeSince(m_oldTime);
+    m_overhead = std::accumulate(m_overheadTimes.begin(), m_overheadTimes.end(), duration_t{}) / m_overheadTimes.size();
    if (sleepTime > m_overhead) {
      return sleepTime - m_overhead;
    }
-    return 0;
+    return duration_t{0};
  }

 private:
-  Uint64 m_oldTime = 0;
+  delta_clock::time_point m_oldTime;
  std::array<duration_t, 4> m_overheadTimes{};
  size_t m_overheadTimeIdx = 0;
-  duration_t m_overhead = 0;
+  duration_t m_overhead = duration_t{0};

-  duration_t TimeSince(Uint64 start) const { return SDL_GetTicksNS() - start; }
+  duration_t TimeSince(delta_clock::time_point start) {
+    return std::chrono::duration_cast<duration_t>(delta_clock::now() - start);
+  }

 #if _WIN32
  void NanoSleep(const duration_t duration) {
@@ -84,10 +85,9 @@ private:

    LARGE_INTEGER start, current;
    QueryPerformanceCounter(&start);
-    const LONGLONG ticksToWait = static_cast<LONGLONG>(duration * countPerNs);
-    const Uint64 ms = duration / 1'000'000ULL;
-    if (ms > 1) {
-      ::Sleep(static_cast<DWORD>(ms - 1));
+    LONGLONG ticksToWait = static_cast<LONGLONG>(duration.count() * countPerNs);
+    if (DWORD ms = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(); ms > 1) {
+      ::Sleep(ms - 1);
    }
    do {
      QueryPerformanceCounter(&current);
@@ -99,7 +99,7 @@ private:
    } while (current.QuadPart - start.QuadPart < ticksToWait);
  }
 #else
-  void NanoSleep(const duration_t duration) { SDL_DelayPrecise(duration); }
+  void NanoSleep(const duration_t duration) { SDL_DelayPrecise(duration.count()); }
 #endif
 };

@@ -1,67 +0,0 @@
-#ifndef DUSK_VERSION_HPP
-#define DUSK_VERSION_HPP
-
-/**
- * Functionality for switching game behavior based on the loaded game version (e.g. PAL/JPN, GC/Wii)
- */
-namespace dusk::version {
-    enum class GameVersion : u8 {
-        GcnUsa = VERSION_GCN_USA,
-        GcnPal = VERSION_GCN_PAL,
-        GcnJpn = VERSION_GCN_JPN,
-        WiiUsaRev0 = VERSION_WII_USA_R0,
-        WiiUsa = VERSION_WII_USA_R2,
-        WiiPal = VERSION_WII_PAL,
-        WiiJpn = VERSION_WII_JPN,
-        WiiKor = VERSION_WII_KOR,
-    };
-
-    bool isGcn();
-    bool isWii();
-    bool isPalOrAtLeastWiiR2();
-
-    bool isRegionPal();
-    bool isRegionJpn();
-    bool isRegionUsa();
-
-    GameVersion getGameVersion();
-
-    const DVDDiskID& getDiskID();
-
-    void init();
-
-    template<typename T>
-    struct VersionOption {
-        GameVersion mVersion;
-        T mValue;
-
-        constexpr VersionOption(GameVersion version, T value) : mVersion(version), mValue(value) {}
-    };
-
-    template<typename T>
-    const T& versionSelect(const std::initializer_list<VersionOption<T>> options) {
-        const auto version = getGameVersion();
-        for (const auto& opt : options) {
-            if (opt.mVersion == version) {
-                return opt.mValue;
-            }
-        }
-
-        // Unable to find value.
-        abort();
-    }
-
-    template<typename T>
-    const T& versionSelect(const std::initializer_list<VersionOption<T>> options, const T& defaultValue) {
-        const auto version = getGameVersion();
-        for (const auto& opt : options) {
-            if (opt.mVersion == version) {
-                return opt.mValue;
-            }
-        }
-
-        return defaultValue;
-    }
-}  // namespace dusk::version
-
-#endif  // DUSK_VERSION_HPP
@@ -25,7 +25,7 @@ typedef struct leafdraw_class : base_process_class {
 #endif
    /* 0xB8 */ leafdraw_method_class* leaf_methods;
    /* 0xBC */ s8 unk_0xBC;
-    /* 0xBD */ u8 draw_interp_frame;
+    /* 0xBD */ u8 unk_0xBD;
    /* 0xBE */ draw_priority_class draw_priority;
 } leafdraw_class;

@@ -18,7 +18,6 @@ typedef struct process_node_class {
    /* 0x0BC */ layer_class layer;
    /* 0x0E8 */ node_list_class layer_nodelist[16];
    /* 0x1A8 */ s8 unk_0x1A8;
-    /* 0x1A9 */ s8 draw_interp_frame;
 } process_node_class;

 typedef struct node_process_profile_definition {
@@ -73,9 +73,6 @@
 #endif

 #ifndef __MWERKS__
-#ifdef __cplusplus
-extern "C" {
-#endif
 // Silence clangd errors about MWCC PPC intrinsics by declaring them here.
 extern int __cntlzw(unsigned int);
 extern int __rlwimi(int, int, int, int, int);
@@ -83,14 +80,7 @@ extern void __dcbf(void*, int);
 extern void __dcbz(void*, int);
 extern void __sync();
 extern int __abs(int);
-#if defined(__has_builtin) && __has_builtin(__builtin_memcpy)
-#define __memcpy __builtin_memcpy
-#else
-#define __memcpy memcpy
-#endif
-#ifdef __cplusplus
-}
-#endif
+void* __memcpy(void*, const void*, int);
 #endif

 #ifndef M_PI
@@ -230,16 +220,10 @@ using std::isnan;
 // Some basic macros that are more convenient than putting down #if blocks for one-line changes.
 #if TARGET_PC
 #define IF_DUSK(statement) statement
-#define IF_DUSK_BLOCK(cond) if (cond) {
-#define IF_DUSK_BLOCK_END }
-#define IF_DUSK_ARG(expr) , expr
 #define IF_NOT_DUSK(statement)
 #define DUSK_IF_ELSE(dusk, orig) dusk
 #else
 #define IF_DUSK(statement)
-#define IF_DUSK_ARG(expr)
-#define IF_DUSK_BLOCK(cond)
-#define IF_DUSK_BLOCK_END
 #define IF_NOT_DUSK(statement) statement
 #define DUSK_IF_ELSE(dusk, orig) orig
 #endif
@@ -125,15 +125,8 @@ public:
 #if TARGET_PC
    static f32 hudAspectScaleDown;
    static f32 hudAspectScaleUp;
-    static void updateSafeAreaBounds();
-    static f32 getSafeMinXF() { return m_safeMinXF; }
-    static f32 getSafeMinYF() { return m_safeMinYF; }
-    static f32 getSafeWidthF() { return m_safeWidthF; }
-    static f32 getSafeHeightF() { return m_safeHeightF; }
-    static f32 getSafeMaxXF() { return m_safeMaxXF; }
-    static f32 getSafeMaxYF() { return m_safeMaxYF; }
-    static f32 ScaleHUDXLeft(f32 baseX) { return getSafeMinXF() + baseX; }
-    static f32 ScaleHUDXRight(f32 baseX) { return getSafeMaxXF() - FB_WIDTH_BASE + baseX; }
+    static f32 ScaleHUDXLeft(f32 baseX) { return getMinXF() + baseX; }
+    static f32 ScaleHUDXRight(f32 baseX) { return -getMinXF() + baseX; }
 #endif

    static void setBlureMtx(const Mtx m) {
@@ -286,7 +279,12 @@ public:
    #if WIDESCREEN_SUPPORT
    static void setTvSize();

+    #if TARGET_PC
+    static void onWide(f32 width, f32 height);
+    #else
    static void onWide();
+    #endif
+
    static void offWide();
    static u8 isWide();

@@ -299,7 +297,7 @@ public:
    #endif

    #if TARGET_PC
-    static void updateRenderSize();
+    static void setWindowSize(AuroraWindowSize const& size);
    #endif

    static TGXTexObj mFrameBufferTexObj;
@@ -371,15 +369,6 @@ public:
    static int m_height;
    static f32 m_heightF;
    static f32 m_widthF;
-
-    #if TARGET_PC
-    static f32 m_safeMinXF;
-    static f32 m_safeMinYF;
-    static f32 m_safeMaxXF;
-    static f32 m_safeMaxYF;
-    static f32 m_safeWidthF;
-    static f32 m_safeHeightF;
-    #endif
    #endif
 };

@@ -43,6 +43,10 @@ struct mDoLib_clipper {
 };

 void mDoLib_project(Vec* src, Vec* dst);
+#if TARGET_PC
+void mDoLib_project(Vec* src, Vec* dst, JGeometry::TBox2<f32> viewport);
+#endif
+
 u32 mDoLib_setResTimgObj(ResTIMG const* res, TGXTexObj* o_texObj, u32 tlut_name,
                          GXTlutObj* o_tlutObj);
 void mDoLib_pos2camera(Vec* src, Vec* dst);
@@ -79,10 +79,6 @@ public:
    virtual void viewCalc();
    virtual ~J3DModel() {}

-#if TARGET_PC
-    static void interp_callback(bool isSimFrame, void* pUserWork);
-#endif
-
    J3DModelData* getModelData() { return mModelData; }

    void onFlag(u32 flag) { mFlags |= flag; }
@@ -109,7 +105,9 @@ public:
    void setAnmMtx(int jointNo, Mtx m) {
        mMtxBuffer->setAnmMtx(jointNo, m);
 #ifdef TARGET_PC
-        dusk::frame_interp::record_final_mtx(mMtxBuffer->getAnmMtx(jointNo));
+        dusk::frame_interp::record_final_mtx_raw(
+            reinterpret_cast<const Mtx*>(mMtxBuffer->getAnmMtx(jointNo)),
+            mMtxBuffer->getAnmMtx(jointNo));
 #endif
    }
    MtxP getAnmMtx(int jointNo) { return mMtxBuffer->getAnmMtx(jointNo); }
@@ -23,10 +23,6 @@ public:
    void syncJ3DSysPointers() const;
    void syncJ3DSysFlags() const;

-#if TARGET_PC
-    bool needsInterpCallBack() const;
-#endif
-
    virtual ~J3DModelData() {}

    void simpleCalcMaterial(Mtx mtx) { simpleCalcMaterial(0, mtx); }
@@ -33,9 +33,6 @@ public:
    void copy(J3DMaterial*);
    s32 newSharedDisplayList(u32);
    s32 newSingleSharedDisplayList(u32);
-#if TARGET_PC
-    bool needsInterpCallBack() const;
-#endif

    virtual void calc(f32 const (*)[4]);
    virtual void calcDiffTexMtx(f32 const (*)[4]);
@@ -49,6 +46,7 @@ public:
    virtual void change();

    J3DMaterial() { initialize(); }
+    ~J3DMaterial() {}
    J3DMaterial* getNext() { return mNext; }
    J3DShape* getShape() { return mShape; }
    J3DTevBlock* getTevBlock() { return mTevBlock; }
@@ -59,9 +59,6 @@ public:
    bool isActive() const { return mSeqList.getNumLinks() != 0; }
    int getNumActiveSeqs() const { return mSeqList.getNumLinks(); }
    void pause(bool paused) { mActivity.field_0x0.flags.flag2 = paused; }
-    #if TARGET_PC
-    JSUList<JAISeq>* getSeqList() { return &mSeqList; }
-    #endif

 private:
    /* 0x08 */ JAIAudience* mAudience;
@@ -11,17 +11,9 @@
 struct JASCalc {
    static void imixcopy(const s16*, const s16*, s16*, u32);
    static void bcopyfast(const void* src, void* dest, u32 size);
-#if TARGET_ANDROID
-    static void _bcopy(const void* src, void* dest, u32 size);
-#else
    static void bcopy(const void* src, void* dest, u32 size);
-#endif
    static void bzerofast(void* dest, u32 size);
-#if TARGET_ANDROID
-    static void _bzero(void* dest, u32 size);
-#else
    static void bzero(void* dest, u32 size);
-#endif
    static f32 pow2(f32);

    template <typename A, typename B>
@@ -101,6 +101,10 @@ public:

    void setDrawDoneMethod(EDrawDone drawDone) { mDrawDoneMethod = drawDone; }
    void setFader(JUTFader* fader) { mFader = fader; }
+#ifdef TARGET_PC
+    // For frame interpolation
+    void setFaderSimSteps(u32 steps);
+#endif
    void resetFader() { setFader(NULL); }
    JUTFader* getFader() const { return mFader; }
    void setClearColor(JUtility::TColor color) { mClearColor = color; }
@@ -207,11 +207,4 @@ void JPARegistAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);
 void JPARegistPrmAlpha(JPAEmitterWorkData*, JPABaseParticle*);
 void JPARegistPrmAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);

-#if TARGET_PC
-void JPAInterpBillboard(JPAEmitterWorkData*, JPABaseParticle*);
-void JPAInterpRotBillboard(JPAEmitterWorkData*, JPABaseParticle*);
-void JPAInterpDirection(JPAEmitterWorkData*, JPABaseParticle*);
-void JPAInterpRotDirection(JPAEmitterWorkData*, JPABaseParticle*);
-#endif
-
 #endif /* JPABASESHAPE_H */
@@ -24,9 +24,6 @@ public:
    void init_c(JPAEmitterWorkData*, JPABaseParticle*);
    bool calc_p(JPAEmitterWorkData*);
    bool calc_c(JPAEmitterWorkData*);
-#if TARGET_PC
-    void interp(JPAEmitterWorkData*, void const* drawFunc);
-#endif
    bool canCreateChild(JPAEmitterWorkData*);
    f32 getWidth(JPABaseEmitter const*) const;
    f32 getHeight(JPABaseEmitter const*) const;
@@ -11,10 +11,8 @@
 class JUTFader {
 public:
    enum EStatus {
-        None,
-        Wait,
-        FadeIn,
-        FadeOut,
+        UNKSTATUS_M1 = -1,
+        UNKSTATUS_0 = 0,
    };

    JUTFader(int, int, int, int, JUtility::TColor);
@@ -31,12 +29,12 @@ public:
    void setColor(JUtility::TColor color) { mColor.set(color); }

    /* 0x04 */ s32 mStatus;
-    /* 0x08 */ u16 mDuration;
-    /* 0x0A */ u16 mTimer;
+    /* 0x08 */ u16 field_0x8;
+    /* 0x0A */ u16 field_0xa;
    /* 0x0C */ JUtility::TColor mColor;
    /* 0x10 */ JGeometry::TBox2<f32> mBox;
-    /* 0x20 */ int mStatusTimer;
-    /* 0x24 */ u32 mNextStatus;
+    /* 0x20 */ int mEStatus;
+    /* 0x24 */ u32 field_0x24;
 };

 #endif /* JUTFADER_H */
@@ -5,17 +5,6 @@
 #include <cstring>
 #include "dusk/endian.h"

-#if TARGET_PC
-struct FontDrawContext {
-    bool isTextureLoaded = false;
-};
-#define FONT_DRAW_CTX , FontDrawContext* context
-#define FONT_DRAW_CTX_ARG , context
-#else
-#define FONT_DRAW_CTX
-#define FONT_DRAW_CTX_ARG
-#endif
-
 /**
 * @ingroup jsystem-jutility
 * 
@@ -95,12 +84,7 @@ public:

    /* 0x0C */ virtual void setGX() = 0;
    /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2) { setGX(); }
-    /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6 FONT_DRAW_CTX) = 0;
-#if TARGET_PC
-    f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) {
-        return drawChar_scale(a1, a2, a3, a4, a5, a6, nullptr);
-    }
-#endif
+    /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0;
    /* 0x18 */ virtual int getLeading() const = 0;
    /* 0x1C */ virtual s32 getAscent() const = 0;
    /* 0x20 */ virtual s32 getDescent() const = 0;
@@ -113,11 +97,6 @@ public:
    /* 0x3C */ virtual ResFONT* getResFont() const = 0;
    /* 0x40 */ virtual bool isLeadByte(int a1) const = 0;

-#if TARGET_PC
-    virtual void pushDrawState() = 0;
-    virtual void popDrawState() = 0;
-#endif
-
    static bool isLeadByte_1Byte(int b) {
        return false;
    }
@@ -263,9 +263,6 @@ public:
    /* 0x9C */ u8 field_0x9c[4];
    /* 0xA0 */ OSTime mResetHoldStartTime;
    /* 0xA8 */ u8 field_0xa8;
-#if TARGET_PC
-    u32 mResetHoldFrameCount;
-#endif
 };

 /**
@@ -40,9 +40,6 @@ public:
    JUTTransparency getTransparency() const { return JUTTransparency(mTransparency); }
    u16 getNumColors() const { return mNumColors; }
    ResTLUT* getColorTable() const { return mColorTable; }
-#if TARGET_PC
-    void dataUploaded();
-#endif

 private:
    /* 0x00 */ GXTlutObj mTlutObj;
@@ -18,6 +18,10 @@ struct BlockHeader {
    BE(u32) size;
 };

+#if TARGET_PC
+struct GlyphTextures;
+#endif
+
 /**
 * @ingroup jsystem-jutility
 * 
@@ -27,7 +31,7 @@ public:
    virtual ~JUTResFont();
    virtual void setGX();
    virtual void setGX(JUtility::TColor, JUtility::TColor);
-    virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool FONT_DRAW_CTX);
+    virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool);
    virtual int getLeading() const;
    virtual s32 getAscent() const;
    virtual s32 getDescent() const;
@@ -39,7 +43,7 @@ public:
    virtual int getFontType() const;
    virtual ResFONT* getResFont() const;
    virtual bool isLeadByte(int) const;
-    virtual void loadImage(int, GXTexMapID FONT_DRAW_CTX);
+    virtual void loadImage(int, GXTexMapID);
    virtual void setBlock();

    JUTResFont(ResFONT const*, JKRHeap*);
@@ -49,15 +53,10 @@ public:
    bool initiate(ResFONT const*, JKRHeap*);
    bool protected_initiate(ResFONT const*, JKRHeap*);
    void countBlock();
-    void loadFont(int, GXTexMapID, JUTFont::TWidth* FONT_DRAW_CTX);
+    void loadFont(int, GXTexMapID, JUTFont::TWidth*);
    int getFontCode(int) const;
    int convertSjis(int, BE(u16)*) const;

-#if TARGET_PC
-    void pushDrawState() override;
-    void popDrawState() override;
-#endif
-
    inline void delete_and_initialize() {
        deleteMemBlocks_ResFont();
        initialize_state();
@@ -69,7 +68,11 @@ public:
    // some types uncertain, may need to be fixed
    /* 0x1C */ int mWidth;
    /* 0x20 */ int mHeight;
+#if TARGET_PC
+    GlyphTextures* mGlyphTextures;
+#else
    /* 0x24 */ TGXTexObj mTexObj;
+#endif
    /* 0x44 */ int mTexPageIdx;
    /* 0x48 */ const ResFONT* mResFont;
    /* 0x4C */ ResFONT::INF1* mInf1Ptr;
@@ -83,16 +86,6 @@ public:
    /* 0x66 */ u16 field_0x66;
    /* 0x68 */ u16 mMaxCode;
    /* 0x6C */ const IsLeadByte_func* mIsLeadByte;
-
-#if TARGET_PC
-    // Dusk change: we use a single large texture for all characters.
-    // This enables better draw call merging, ideally enabling entire blocks of
-    // text to be one draw call.
-    TGXTexObj mJoinedTextureObject;
-    u16 mJoinedTextureHeight;
-
-    void initJoinedTexture();
-#endif
 };

 extern u8 const JUTResFONT_Ascfont_fix12[];
@@ -75,7 +75,6 @@ public:
    s32 getTransparency() const { return mTexInfo->alphaEnabled; }
    s32 getWidth() const { return mTexInfo->width; }
    s32 getHeight() const { return mTexInfo->height; }
-    JUTPalette* getPalette() const { return mPalette; }
    void setCaptureFlag(bool flag) { mFlags &= 2 | flag; }
    bool getCaptureFlag() const { return mFlags & 1; }
    bool getEmbPaletteDelFlag() const { return mFlags & 2; }
@@ -83,7 +82,7 @@ public:
    int getTlutName() const { return mTlutName; }
    bool operator==(const JUTTexture& other) {
        return mTexInfo == other.mTexInfo
-            && mPalette == other.mPalette
+            && field_0x2c == other.field_0x2c
            && mWrapS == other.mWrapS
            && mWrapT == other.mWrapT
            && mMinFilter == other.mMinFilter
@@ -101,7 +100,7 @@ private:
    /* 0x20 */ const ResTIMG* mTexInfo;
    /* 0x24 */ void* mTexData;
    /* 0x28 */ JUTPalette* mEmbPalette;
-    /* 0x2C */ JUTPalette* mPalette;
+    /* 0x2C */ JUTPalette* field_0x2c;
    /* 0x30 */ u8 mWrapS;
    /* 0x31 */ u8 mWrapT;
    /* 0x32 */ u8 mMinFilter;
@@ -33,16 +33,24 @@ public:
    static void postRetraceProc(u32);
    static void drawDoneCallback();

-    u16 getFbWidth() const { return mRenderObj->fbWidth; }
-    u16 getEfbHeight() const { return mRenderObj->efbHeight; }
+    u16 getFbWidth() const {
+        #if TARGET_PC
+        return m_WindowSize.fb_width;
+        #else
+        return mRenderObj->fbWidth;
+        #endif
+    }
+    u16 getEfbHeight() const {
+        #if TARGET_PC
+        return m_WindowSize.fb_height;
+        #else
+        return mRenderObj->efbHeight;
+        #endif
+    }
    void getBounds(u16& width, u16& height) const {
        width = (u16)getFbWidth();
        height = (u16)getEfbHeight();
    }
-#ifdef TARGET_PC
-    u32 getRenderWidth() const { return mRenderWidth; }
-    u32 getRenderHeight() const { return mRenderHeight; }
-#endif
    u16 getXfbHeight() const { return u16(mRenderObj->xfbHeight); }
    u8 isAntiAliasing() const { return u8(mRenderObj->aa); }
    Pattern getSamplePattern() const { return mRenderObj->sample_pattern; }
@@ -55,7 +63,7 @@ public:

    GXRenderModeObj* getRenderMode() const { return mRenderObj; }
 #if TARGET_PC
-    void setRenderSize(u32 width, u32 height);
+    void setWindowSize(AuroraWindowSize const& size);
 #endif

 private:
@@ -81,8 +89,7 @@ private:

 #if TARGET_PC
 public:
-    u32 mRenderWidth;
-    u32 mRenderHeight;
+    AuroraWindowSize m_WindowSize;
 #endif
 };

@@ -64,6 +64,10 @@ void J2DGrafContext::setup2D() {
 }

 void J2DGrafContext::setScissor() {
+#if TARGET_PC
+    GXSetScissor(mScissorBounds.i.x, mScissorBounds.i.y, mScissorBounds.getWidth(),
+                 mScissorBounds.getHeight());
+#else
    JGeometry::TBox2<f32> bounds(0, 0, 1024, 1024);
    JGeometry::TBox2<f32> curBounds(mScissorBounds);
    mScissorBounds.intersect(bounds);
@@ -77,6 +81,7 @@ void J2DGrafContext::setScissor() {
    } else {
        GXSetScissor(0, 0, 0, 0);
    }
+#endif
 }

 void J2DGrafContext::scissor(JGeometry::TBox2<f32> const& bounds) {
@@ -211,11 +211,6 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
    local_bc.a = local_bc.a * alpha / 0xFF;
    mFont->setGradColor(local_b8, field_0x22 ? local_bc : local_b8);

-#if TARGET_PC
-    FontDrawContext context;
-    mFont->pushDrawState();
-#endif
-
    do {
        bool b2ByteCharacter = false;
        bool r25;
@@ -317,9 +312,9 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
                } else {
                    if (param_6) {
                        if (param_3 != NULL) {
-                            mFont->drawChar_scale(mCursorH + (s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true IF_DUSK_ARG(&context));
+                            mFont->drawChar_scale(mCursorH + (s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true);
                        } else {
-                            mFont->drawChar_scale(mCursorH, mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true IF_DUSK_ARG(&context));
+                            mFont->drawChar_scale(mCursorH, mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true);
                        }
                    }
                    mCursorH += field_0x34;
@@ -358,8 +353,6 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
        iCharacter = *(pString++);
    } while (true);

-    IF_DUSK(mFont->popDrawState());
-
    if (param_3 != NULL) {
        param_3[someIndex] = 0xFFFF;
    }
@@ -97,16 +97,6 @@ s32 J3DModel::entryModelData(J3DModelData* pModelData, u32 mdlFlags, u32 mtxNum)
    return kJ3DError_Success;
 }

-#if TARGET_PC
-void J3DModel::interp_callback(bool isSimFrame, void* pUserWork) {
-    J3DModel* i_this = static_cast<J3DModel*>(pUserWork);
-    if (!isSimFrame) {
-        i_this->calcMaterial();
-        i_this->diff();
-    }
-}
-#endif
-
 s32 J3DModel::createShapePacket(J3DModelData* pModelData) {
    J3D_ASSERTMSG(173, pModelData != NULL, "Error : null pointer.");

@@ -462,11 +452,11 @@ void J3DModel::calc() {

 #ifdef TARGET_PC
    for (u16 i = 0; i < mModelData->getJointNum(); ++i) {
-        dusk::frame_interp::record_final_mtx(getAnmMtx(i));
+        dusk::frame_interp::record_final_mtx_raw(reinterpret_cast<const Mtx*>(getAnmMtx(i)), getAnmMtx(i));
    }

    for (u16 i = 0; i < mModelData->getWEvlpMtxNum(); ++i) {
-        dusk::frame_interp::record_final_mtx(getWeightAnmMtx(i));
+        dusk::frame_interp::record_final_mtx_raw(reinterpret_cast<const Mtx*>(getWeightAnmMtx(i)), getWeightAnmMtx(i));
    }
 #endif
 }
@@ -495,11 +485,6 @@ void J3DModel::entry() {
            joint->entryIn();
        }
    }
-
-#if TARGET_PC
-    if (mModelData->needsInterpCallBack())
-        dusk::frame_interp::add_interpolation_callback(&J3DModel::interp_callback, this);
-#endif
 }

 void J3DModel::viewCalc() {
@@ -511,7 +496,7 @@ void J3DModel::viewCalc() {
            J3DCalcViewBaseMtx(j3dSys.getViewMtx(), mBaseScale, mBaseTransformMtx,
                               (MtxP)&mInternalView);
 #ifdef TARGET_PC
-            dusk::frame_interp::record_final_mtx(mInternalView);
+            dusk::frame_interp::record_final_mtx_raw(&mInternalView, mInternalView);
 #endif
        }
    } else if (isCpuSkinningOn()) {
@@ -519,7 +504,7 @@ void J3DModel::viewCalc() {
            J3DCalcViewBaseMtx(j3dSys.getViewMtx(), mBaseScale, mBaseTransformMtx,
                               (MtxP)&mInternalView);
 #ifdef TARGET_PC
-            dusk::frame_interp::record_final_mtx(mInternalView);
+            dusk::frame_interp::record_final_mtx_raw(&mInternalView, mInternalView);
 #endif
        }
    } else if (checkFlag(J3DMdlFlag_SkinPosCpu)) {
@@ -543,7 +528,7 @@ void J3DModel::viewCalc() {

 #ifdef TARGET_PC
    for (u16 i = 0; i < mModelData->getDrawMtxNum(); ++i) {
-        dusk::frame_interp::record_final_mtx(getDrawMtxPtr()[i]);
+        dusk::frame_interp::record_final_mtx_raw(&getDrawMtxPtr()[i], getDrawMtxPtr()[i]);
    }
 #endif

@@ -84,15 +84,6 @@ void J3DModelData::simpleCalcMaterial(u16 idx, Mtx param_1) {
    }
 }

-#if TARGET_PC
-bool J3DModelData::needsInterpCallBack() const {
-    for (u16 i = 0, n = getMaterialNum(); i < n; i++)
-        if (getMaterialNodePointer(i)->needsInterpCallBack())
-            return true;
-    return false;
-}
-#endif
-
 void J3DModelData::syncJ3DSysPointers() const {
    j3dSys.setTexture(getTexture());
    j3dSys.setVtxPos(getVtxPosArray(), getVtxNum());
@@ -265,7 +265,7 @@ void J3DMaterial::diff(u32 diffFlags) {
 }

 void J3DMaterial::calc(f32 const (*param_0)[4]) {
-    if (j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
+    if (j3dSys.checkFlag(0x40000000)) {
        mTexGenBlock->calcPostTexMtx(param_0);
    } else {
        mTexGenBlock->calc(param_0);
@@ -276,7 +276,7 @@ void J3DMaterial::calc(f32 const (*param_0)[4]) {
 }

 void J3DMaterial::calcDiffTexMtx(f32 const (*param_0)[4]) {
-    if (j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
+    if (j3dSys.checkFlag(0x40000000)) {
        mTexGenBlock->calcPostTexMtxWithoutViewMtx(param_0);
    } else {
        mTexGenBlock->calcWithoutViewMtx(param_0);
@@ -288,7 +288,7 @@ void J3DMaterial::setCurrentMtx() {
 }

 void J3DMaterial::calcCurrentMtx() {
-    if (!j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
+    if (!j3dSys.checkFlag(0x40000000)) {
        mCurrentMtx.setCurrentTexMtx(
            getTexCoord(0)->getTexGenMtx(),
            getTexCoord(1)->getTexGenMtx(),
@@ -371,30 +371,6 @@ s32 J3DMaterial::newSingleSharedDisplayList(u32 dlSize) {
    return kJ3DError_Success;
 }

-#if TARGET_PC
-bool J3DMaterial::needsInterpCallBack() const {
-    for (int i = 0, n = getTexGenNum(); i < n; i++) {
-        J3DTexMtx* pTexMtx = mTexGenBlock->getTexMtx(i);
-        if (pTexMtx != NULL) {
-            u32 texMtxMode = pTexMtx->getTexMtxInfo().mInfo & 0x3f;
-
-            // uses j3dSys.getViewMtx()
-            switch (texMtxMode) {
-            case J3DTexMtxMode_EnvmapBasic:
-            case J3DTexMtxMode_EnvmapOld:
-            case J3DTexMtxMode_Envmap:
-            case J3DTexMtxMode_ProjmapBasic:
-            case J3DTexMtxMode_Projmap:
-            case J3DTexMtxMode_ViewProjmap:
-            case J3DTexMtxMode_ViewProjmapBasic:
-                return true;
-            }
-        }
-    }
-    return false;
-}
-#endif
-
 void J3DPatchedMaterial::initialize() {
    J3DMaterial::initialize();
 }
@@ -37,9 +37,9 @@ void loadTexCoordGens(u32 texGenNum, J3DTexCoord* texCoords) {
    var_r28 = 61;
    J3DGDWriteXFCmdHdr(GX_XF_REG_DUALTEX0, texGenNum);

-    if (j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
+    if (j3dSys.checkFlag(0x40000000)) {
        for (int i = 0; i < texGenNum; i++) {
-            if (texCoords[i].getTexGenMtx() != GX_IDENTITY) {
+            if (texCoords[i].getTexGenMtx() != 60) {
                var_r28 = i * 3;
            } else {
                var_r28 = 61;
@@ -120,19 +120,11 @@ void JAISeqMgr::mixOut() {
 }

 JAISeq* JAISeqMgr::beginStartSeq_() {
-#ifdef TARGET_PC
-    if (JAISeq::getFreeMemCount() == 0) {
-        JUT_WARN(273, "%s", "JASPoolAllocObject::<JAISeq>::operator new failed .\n");
-        return NULL;
-    }
-    return JKR_NEW JAISeq(this, field_0x10);
-#else
-    JAISeq* seq = new JAISeq(this, field_0x10);
+    JAISeq* seq = JKR_NEW JAISeq(this, field_0x10);
    if (seq == NULL) {
        JUT_WARN(273, "%s", "JASPoolAllocObject::<JAISeq>::operator new failed .\n");
    }
    return seq;
-#endif
 }

 bool JAISeqMgr::endStartSeq_(JAISeq* seq, JAISoundHandle* handle) {
@@ -55,11 +55,7 @@ void JASDriver::initAI(void (*param_0)(void)) {
    for (int i = 0; i < 3; i++) {
        sDmaDacBuffer[i] = JKR_NEW_ARRAY_ARGS(s16, dacSize, JASDram, 0x20);
        JUT_ASSERT(102, sDmaDacBuffer[i])
-#if TARGET_ANDROID
-        JASCalc::_bzero(sDmaDacBuffer[i], size);
-#else
        JASCalc::bzero(sDmaDacBuffer[i], size);
-#endif
        DCStoreRange(sDmaDacBuffer[i], size);
    }
    sDspDacBuffer = JKR_NEW_ARRAY_ARGS(s16*, data_804507A8, JASDram, 0);
@@ -67,11 +63,7 @@ void JASDriver::initAI(void (*param_0)(void)) {
    for (int i = 0; i < data_804507A8; i++) {
        sDspDacBuffer[i] = JKR_NEW_ARRAY_ARGS(s16, getDacSize(), JASDram, 0x20);
        JUT_ASSERT(119, sDspDacBuffer[i]);
-#if TARGET_ANDROID
-        JASCalc::_bzero(sDspDacBuffer[i], size);
-#else
        JASCalc::bzero(sDspDacBuffer[i], size);
-#endif
        DCStoreRange(sDspDacBuffer[i], size);
    }
    sDspDacWriteBuffer = data_804507A8 - 1;
@@ -69,11 +69,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h
    JUT_ASSERT(145, list_chunk);

    u8* envt = JKR_NEW_ARRAY_ARGS(u8, envt_chunk->mSize, heap, 2);
-#if TARGET_ANDROID
-    JASCalc::_bcopy(envt_chunk->mData, envt, envt_chunk->mSize);
-#else
    JASCalc::bcopy(envt_chunk->mData, envt, envt_chunk->mSize);
-#endif

    BE(u32)* ptr = &osc_chunk->mCount;
    u32 count = *ptr++;
@@ -219,11 +215,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
                            int size = endPtr - points;
                            JASOscillator::Point* table = JKR_NEW_ARRAY_ARGS(JASOscillator::Point, size, heap, 0);
                            JUT_ASSERT(396, table != NULL);
-#if TARGET_ANDROID
-                            JASCalc::_bcopy(points, table, size * sizeof(JASOscillator::Point));
-#else
                            JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point));
-#endif
                            osc->mTable = table;
                        } else {
                            osc->mTable = NULL;
@@ -235,11 +227,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
                            int size = endPtr - points;
                            JASOscillator::Point* table = JKR_NEW_ARRAY_ARGS(JASOscillator::Point, size, heap, 0);
                            JUT_ASSERT(409, table != NULL);
-#if TARGET_ANDROID
-                            JASCalc::_bcopy(points, table, size * sizeof(JASOscillator::Point));
-#else
                            JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point));
-#endif
                            osc->rel_table = table;
                        } else {
                            osc->rel_table = NULL;
@@ -13,11 +13,7 @@ void JASBasicBank::newInstTable(u8 num, JKRHeap* heap) {
        JUT_ASSERT(31, num <= JASBank::PRG_OSC);
        mInstNumMax = num;
        mInstTable = JKR_NEW_ARRAY_ARGS(JASInst*, mInstNumMax, heap, 0);
-#if TARGET_ANDROID
-        JASCalc::_bzero(mInstTable, mInstNumMax * 4);
-#else
        JASCalc::bzero(mInstTable, mInstNumMax * 4);
-#endif
    }
 }

@@ -13,11 +13,7 @@ JASBasicInst::JASBasicInst() {
    mPitch = 1.0;
    mKeymapCount = 0;
    mKeymap = NULL;
-#if TARGET_ANDROID
-    JASCalc::_bzero(field_0xc, sizeof(field_0xc));
-#else
    JASCalc::bzero(field_0xc, sizeof(field_0xc));
-#endif
 }

 JASBasicInst::~JASBasicInst() {
@@ -33,11 +33,7 @@ void JASCalc::bcopyfast(const void* src, void* dest, u32 size) {
    }
 }

-#if TARGET_ANDROID
-void JASCalc::_bcopy(const void* src, void* dest, u32 size) {
-#else
 void JASCalc::bcopy(const void* src, void* dest, u32 size) {
-#endif
    u32* usrc;
    u32* udest;

@@ -94,11 +90,7 @@ void JASCalc::bzerofast(void* dest, u32 size) {
    }
 }

-#if TARGET_ANDROID
-void JASCalc::_bzero(void* dest, u32 size) {
-#else
 void JASCalc::bzero(void* dest, u32 size) {
-#endif
    u32* udest;
    u8* bdest = (u8*)dest;
    if ((size & 0x1f) == 0 && (reinterpret_cast<uintptr_t>(dest) & 0x1f) == 0) {
@@ -1,9 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep

 #include "JSystem/JAudio2/JASChannel.h"
-#if TARGET_PC
-#include "dusk/audio/DuskDsp.hpp"
-#endif
 #include "JSystem/JAudio2/JASAiCtrl.h"
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JAudio2/JASDriverIF.h"
@@ -173,12 +170,7 @@ void JASChannel::updateEffectorParam(JASDsp::TChannel* i_channel, u16* i_mixerVo

    f32 pan = 0.5f;
    f32 dolby = 0.0f;
-#if TARGET_PC
-    u32 effectiveOutputMode = dusk::audio::EnableHrtf ? JAS_OUTPUT_SURROUND : JASDriver::getOutputMode();
-#else
-    u32 effectiveOutputMode = JASDriver::getOutputMode();
-#endif
-    switch (effectiveOutputMode) {
+    switch (JASDriver::getOutputMode()) {
    case JAS_OUTPUT_MONO:
        break;
    case JAS_OUTPUT_STEREO:
@@ -434,14 +434,8 @@ void JASDsp::initBuffer() {
    JUT_ASSERT(354, CH_BUF);
    FX_BUF = JKR_NEW_ARRAY_ARGS(FxBuf, 4, JASDram, 0x20);
    JUT_ASSERT(356, FX_BUF);
-#if TARGET_ANDROID
-    JASCalc::_bzero(CH_BUF, sizeof(TChannel) * DSP_CHANNELS);
-    JASCalc::_bzero(FX_BUF, sizeof(FxBuf) * 4);
-#else
    JASCalc::bzero(CH_BUF, sizeof(TChannel) * DSP_CHANNELS);
    JASCalc::bzero(FX_BUF, sizeof(FxBuf) * 4);
-#endif
-
    for (u8 i = 0; i < 4; i++) {
        setFXLine(i, NULL, NULL);
    }
@@ -465,11 +459,7 @@ int JASDsp::setFXLine(u8 param_0, s16* buffer, JASDsp::FxlineConfig_* param_2) {
    if (buffer != NULL && param_2 != NULL) {
        u32 bufsize = param_2->field_0xc * 0xa0;
        puVar3->field_0x4 = buffer;
-#if TARGET_ANDROID
-        JASCalc::_bzero(buffer, bufsize);
-#else
        JASCalc::bzero(buffer, bufsize);
-#endif
        JUT_ASSERT(420, ((u32)((uintptr_t)buffer) & 0x1f) == 0);
        JUT_ASSERT(421, (bufsize & 0x1f) == 0);
        DCFlushRange(buffer, bufsize);
@@ -18,11 +18,7 @@ void JASDrumSet::newPercArray(u8 num, JKRHeap* heap) {
        JUT_ASSERT(39, num <= 128);
        mPercNumMax = num;
        mPercArray = JKR_NEW_ARRAY_ARGS(TPerc*, mPercNumMax, heap, 0);
-#if TARGET_ANDROID
-        JASCalc::_bzero(mPercArray, mPercNumMax * sizeof(TPerc*));
-#else
        JASCalc::bzero(mPercArray, mPercNumMax * sizeof(TPerc*));
-#endif
    }
 }

@@ -302,6 +302,7 @@ void JASKernel::setupRootHeap(JKRSolidHeap* heap, u32 size) {
    JKRHEAP_NAME(sSystemHeap, "JASKernel::sSystemHeap");
    JUT_ASSERT(787, sSystemHeap);
    sCommandHeap = JKR_NEW_ARGS (heap, 0) JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>;
+    JKRHEAP_NAME(sSystemHeap, "JASKernel::sCommandHeap");
    JUT_ASSERT(790, sCommandHeap);
    JASDram = heap;
 }
--- a/Show More
+++ b/Show More