Merge remote-tracking branch 'origin/main' into feature/hyper-enemies

# Conflicts:
#	src/dusk/imgui/ImGuiMenuGame.cpp
#	src/dusk/settings.cpp

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,116 +0,0 @@
-name: Bug Report
-description: Report an issue with Dusklight
-type: Bug
-body:
-- type: checkboxes
-  id: official-build-certification
-  attributes:
-    label: Mods and Forks
-    description: Certify that this issue exists on the official builds of Dusklight
-    options:
-    - label: The bug occurs on an **official release** of Dusklight, without any forks or third-party patches installed
-      required: true
-  validations:
-    required: true
-
-- type: input
-  id: dusklight-version
-  attributes:
-    label: Dusklight Version
-    placeholder: ex. 1.3.1
-  validations:
-    required: true
-
-- type: textarea
-  id: bug-description
-  attributes:
-    label: Bug Description
-    placeholder: Describe the bug you are encountering
-  validations:
-    required: true
-
-- type: textarea
-  id: repro-steps
-  attributes:
-    label: Steps to Reproduce
-    placeholder: |
-      1. Load save
-      2. Go to Hyrule Field
-      3. See bug
-
-- type: textarea
-  id: expected-behavior
-  attributes:
-    label: Expected Behavior
-    placeholder: Describe what should be happening
-
-- type: textarea
-  id: current-behavior
-  attributes:
-    label: Current Behavior
-    placeholder: Describe what is happening instead
-
-- type: dropdown
-  id: system-os-architecture
-  attributes:
-    label: OS / Architecture
-    description: The operating system and architecture you are running Dusklight on
-    options:
-    - Windows x86-64
-    - Windows ARM64
-    - MacOS ARM64
-    - MacOS x86-64
-    - Linux ARM64
-    - Linux x84-64
-    - Android ARM64
-    - iOS ARM64
-  validations:
-    required: true
-
-- type: dropdown
-  id: game-region
-  attributes:
-    label: Game Region
-    description: The game region you are playing on
-    options:
-    - NTSC-U (North America)
-    - PAL (Europe)
-  validations:
-    required: true
-
-- type: input
-  id: game-language
-  attributes:
-    label: Game Language
-    description: The language you are playing the game in
-    placeholder: ex. English, Spanish, etc.
-
-- type: dropdown
-  attributes:
-    label: Graphics Backend
-    options:
-    - Vulkan
-    - D3D12
-    - Metal
-    - D3D11
-    - OpenGL ES
-    - Unsure / Default
-    default: 5
-
-- type: textarea
-  id: texture-packs-mods
-  attributes:
-    label: Texture Packs and Mods
-    placeholder: List any texture packs or mods you had installed
-
-- type: upload
-  id: logs-upload
-  attributes:
-    label: Logs and Other Files
-    description: Include any relevant logs, config files, or saves to reproduce the bug
-
-- type: textarea
-  id: additional-context
-  attributes:
-    label: Additional Context
-    placeholder: Any other information that might be helpful

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,24 +0,0 @@
-name: Feature Request
-description: Request a new Dusklight feature. Not all requests can/will be included, but we will take these ideas into consideration.
-type: Feature
-body:
-- type: textarea
-  id: feature-description
-  attributes:
-    label: Feature Description
-    placeholder: Describe the feature you are requesting
-  validations:
-    required: true
-
-- type: input
-  id: feature-platform
-  attributes:
-    label: Platform
-    description: If applicable, list the platforms this feature applies to. If it is for all platforms, feel free to leave this field blank.
-    placeholder: ex. Mac, Android, Steam Deck, etc.
-
-- type: textarea
-  id: feature-related-info
-  attributes:
-    label: Additional Information
-    placeholder: Any other information that might be helpful (related features, existing implementations, open pull requests or issues, etc.)

.github/workflows/build.yml

@@ -5,19 +5,10 @@ on:
     paths-ignore:
       - '*.md'
       - '*LICENSE'
-      - 'docs/**'
   pull_request:
-    paths-ignore:
-      - '*.md'
-      - '*LICENSE'
-      - 'docs/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('run-{0}', github.run_id) }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
-  SCCACHE_GHA_ENABLED: "true"
+  # SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
   SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
 
@@ -31,13 +22,13 @@ jobs:
       matrix:
         include:
           - name: GCC x86_64
-            runner: ubuntu-24.04
+            runner: [self-hosted, Linux]
             preset: gcc
             artifact_arch: x86_64
-          - name: GCC aarch64
+          # - name: GCC aarch64
-            runner: ubuntu-24.04-arm
+          #   runner: ubuntu-24.04-arm
-            preset: gcc
+          #   preset: gcc
-            artifact_arch: aarch64
+          #   artifact_arch: aarch64
           # - name: Clang x86_64
           #   runner: ubuntu-latest
           #   preset: clang
@@ -50,6 +41,7 @@ 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 \
@@ -59,7 +51,8 @@ jobs:
             libxss-dev libfuse2 libusb-1.0-0-dev libdecor-0-dev libpipewire-0.3-dev libunwind-dev
 
       - name: Setup sccache
-        uses: mozilla-actions/sccache-action@v0.0.10
+        if: 'false' # disabled for self-hosted
+        uses: mozilla-actions/sccache-action@v0.0.9
 
       - name: Print sccache stats
         run: sccache --show-stats
@@ -74,16 +67,17 @@ jobs:
         run: ci/build-appimage.sh
 
       - name: Upload artifacts
+        if: startsWith(github.event.ref, 'refs/tags/v')
         uses: actions/upload-artifact@v7
         with:
-          name: dusklight-${{env.DUSK_VERSION}}-linux-${{matrix.preset}}-${{matrix.artifact_arch}}
+          name: dusk-${{env.DUSK_VERSION}}-linux-${{matrix.preset}}-${{matrix.artifact_arch}}
           path: |
-            build/install/Dusklight-*.AppImage
+            build/install/Dusk-*.AppImage
             build/install/debug.tar.*
 
   build-apple:
     name: Build Apple (${{matrix.name}})
-    runs-on: macos-latest
+    runs-on: [self-hosted, macOS]
     strategy:
       fail-fast: false
       matrix:
@@ -92,14 +86,14 @@ jobs:
             platform: macos
             preset: x-macos-ci-arm64
             artifact_name: macos-appleclang-arm64
-          - name: AppleClang macOS x86_64
+          # - name: AppleClang macOS x86_64
-            platform: macos
+          #   platform: macos
-            preset: x-macos-ci-x86_64
+          #   preset: x-macos-ci-x86_64
-            artifact_name: macos-appleclang-x86_64
+          #   artifact_name: macos-appleclang-x86_64
-          - name: AppleClang iOS arm64
+          # - name: AppleClang iOS arm64
-            platform: ios
+          #   platform: ios
-            preset: x-ios-ci
+          #   preset: x-ios-ci
-            artifact_name: ios-appleclang-arm64
+          #   artifact_name: ios-appleclang-arm64
           # - name: AppleClang tvOS arm64
           #   platform: tvos
           #   preset: x-tvos-ci
@@ -112,6 +106,7 @@ jobs:
           submodules: recursive
 
       - name: Install dependencies
+        if: 'false'
         run: brew install cmake ninja
 
       - name: Install Rust iOS target
@@ -133,7 +128,7 @@ jobs:
           rustup target add x86_64-apple-darwin
 
       - name: Setup sccache
-        uses: mozilla-actions/sccache-action@v0.0.10
+        uses: mozilla-actions/sccache-action@v0.0.9
 
       - name: Configure CMake
         run: cmake --preset ${{matrix.preset}}
@@ -142,80 +137,14 @@ 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: dusklight-${{env.DUSK_VERSION}}-${{matrix.artifact_name}}
+          name: dusk-${{env.DUSK_VERSION}}-${{matrix.artifact_name}}
           path: |
-            build/install/Dusklight.app
+            build/install/Dusk.app
             build/install/debug.tar.*
 
-  build-android:
-    name: Build Android (${{matrix.name}})
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Clang arm64-v8a
-            preset: x-android-ci-arm64
-            abi: arm64-v8a
-            artifact_arch: arm64
-            rust_target: aarch64-linux-android
-
-    env:
-      ANDROID_NDK_VERSION: "29.0.14206865"
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install ninja-build
-
-      - name: Setup Java
-        uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v4
-
-      - name: Install Android SDK packages
-        run: sdkmanager "platforms;android-36" "build-tools;36.1.0" "ndk;${ANDROID_NDK_VERSION}"
-
-      - name: Install Rust Android target
-        run: |
-          rustup toolchain install stable
-          rustup target add ${{matrix.rust_target}}
-
-      - name: Setup sccache
-        uses: mozilla-actions/sccache-action@v0.0.10
-
-      - name: Configure CMake
-        run: cmake --preset ${{matrix.preset}}
-
-      - name: Build native library
-        run: cmake --build --preset ${{matrix.preset}} --target dusklight
-
-      - name: Stage stripped JNI library
-        run: ANDROID_STAGE_ABIS="${{matrix.abi}}" platforms/android/scripts/stage-jni-libs.sh
-
-      - name: Build APK
-        working-directory: platforms/android
-        run: ./gradlew :app:assembleRelease --rerun-tasks
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: dusklight-${{env.DUSK_VERSION}}-android-${{matrix.artifact_arch}}
-          path: platforms/android/app/build/outputs/apk/release/app-${{matrix.abi}}-release-unsigned.apk
-
   build-windows:
     name: Build Windows (${{matrix.name}})
     runs-on: ${{matrix.runner}}
@@ -225,17 +154,17 @@ jobs:
       matrix:
         include:
           - name: MSVC x86_64
-            runner: windows-latest
+            runner: [self-hosted, Windows]
             preset: msvc
             msvc_arch: amd64
             vcpkg_arch: x64
             artifact_arch: x86_64
-          - name: MSVC arm64
+          # - name: MSVC arm64
-            runner: windows-latest
+          #   runner: windows-11-arm
-            preset: arm64-msvc
+          #   preset: arm64-msvc
-            msvc_arch: amd64_arm64
+          #   msvc_arch: arm64
-            vcpkg_arch: arm64
+          #   vcpkg_arch: arm64
-            artifact_arch: arm64
+          #   artifact_arch: arm64
           # - name: Clang x86_64
           #   runner: windows-latest
           #   preset: clang
@@ -262,9 +191,10 @@ 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 zstd:${{matrix.vcpkg_arch}}-windows
+          vcpkg install freetype:${{matrix.vcpkg_arch}}-windows-static zstd:${{matrix.vcpkg_arch}}-windows-static
 
       - name: Configure CMake
         run: cmake --preset x-windows-ci-${{matrix.preset}}
@@ -273,9 +203,10 @@ 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: dusklight-${{env.DUSK_VERSION}}-win32-msvc-${{matrix.artifact_arch}}
+          name: dusk-${{env.DUSK_VERSION}}-win32-msvc-${{matrix.artifact_arch}}
           path: |
             build/install/*.exe
             build/install/*.dll

.gitignore

@@ -41,10 +41,6 @@ compile_commands.json
 # MacOS
 .DS_Store
 
-# direnv / nix
-.direnv/
-.envrc
-
 # ISOs
 *.iso
 

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "extern/aurora"]
 	path = extern/aurora
-	url = https://github.com/Lurs/aurora.git
+	url = https://github.com/encounter/aurora.git

.vscode/launch.json

@@ -2,7 +2,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "(gdb) Launch Dusklight MSVC",
+            "name": "(gdb) Launch Dusk MSVC",
             "type": "cppvsdbg",
             "request": "launch",
             "program": "${command:cmake.launchTargetPath}",

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "cmake.buildDirectory": "${workspaceFolder}/build/dusklight/${buildType}/${variant:tp_version}",
+  "cmake.buildDirectory": "${workspaceFolder}/build/dusk/${buildType}/${variant:tp_version}",
   "cmake.generator": "Ninja",
   "cmake.configureSettings": {
     "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"

CMakeLists.txt

@@ -5,20 +5,8 @@ if (NOT CMAKE_BUILD_TYPE)
             "Build type options: Debug Release RelWithDebInfo MinSizeRel" FORCE)
 endif ()
 
-set(DUSK_VERSION_OVERRIDE "" CACHE STRING "Override version string (skips git detection and format validation)")
+# obtain revision info from git
-
+find_package(Git)
-if (DUSK_VERSION_OVERRIDE)
-    set(DUSK_WC_DESCRIBE "${DUSK_VERSION_OVERRIDE}")
-    set(DUSK_VERSION_STRING "0.0.0.0")
-    set(DUSK_SHORT_VERSION_STRING "0.0.0")
-    set(DUSK_VERSION_CODE "1")
-    set(DUSK_WC_REVISION "")
-    set(DUSK_WC_BRANCH "")
-    set(DUSK_WC_DATE "")
-    message(STATUS "Dusklight version overridden to ${DUSK_WC_DESCRIBE}")
-else ()
-    # obtain revision info from git
-    find_package(Git)
 if (GIT_FOUND)
     # make sure version information gets re-run when the current Git HEAD changes
     execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --git-path HEAD
@@ -60,48 +48,29 @@ 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]+)([-+].*)?$")
+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}")
-    set(_ver_major ${CMAKE_MATCH_1})
+    if (CMAKE_MATCH_5)
-    set(_ver_minor ${CMAKE_MATCH_2})
+        set(DUSK_VERSION_STRING "${DUSK_SHORT_VERSION_STRING}.${CMAKE_MATCH_5}")
-    set(_ver_patch ${CMAKE_MATCH_3})
+    else ()
-    set(DUSK_VERSION_TWEAK "0")
+        set(DUSK_VERSION_STRING "${DUSK_SHORT_VERSION_STRING}.0")
-    if (DUSK_WC_DESCRIBE MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+-([0-9]+)(-dirty)?$")
-        set(DUSK_VERSION_TWEAK "${CMAKE_MATCH_1}")
-    elseif (DUSK_WC_DESCRIBE MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+-[0-9A-Za-z.-]+-([0-9]+)(-dirty)?$")
-        set(DUSK_VERSION_TWEAK "${CMAKE_MATCH_1}")
     endif ()
-    set(DUSK_VERSION_STRING "${DUSK_SHORT_VERSION_STRING}.${DUSK_VERSION_TWEAK}")
-    if(DUSK_VERSION_TWEAK GREATER 999)
-        set(_tweak 999)
-    else()
-        set(_tweak ${DUSK_VERSION_TWEAK})
-    endif()
-    # encoding: major*1e7 + minor*1e5 + patch*1e3 + tweak; collision-free for major<210, minor<100, patch<100, tweak<=999
-    math(EXPR DUSK_VERSION_CODE
-        "${_ver_major} * 10000000 + ${_ver_minor} * 100000 + ${_ver_patch} * 1000 + ${_tweak}")
 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_CODE "1")
-endif ()
-
 endif ()
 
 # Add version information to CI environment variables
 if(DEFINED ENV{GITHUB_ENV})
     file(APPEND "$ENV{GITHUB_ENV}" "DUSK_VERSION=${DUSK_WC_DESCRIBE}\n")
-    file(APPEND "$ENV{GITHUB_ENV}" "DUSK_VERSION_CODE=${DUSK_VERSION_CODE}\n")
 endif()
-message(STATUS "Dusklight version set to ${DUSK_WC_DESCRIBE}")
+message(STATUS "Dusk version set to ${DUSK_WC_DESCRIBE}")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
-project(dusklight LANGUAGES C CXX VERSION ${DUSK_VERSION_STRING})
+project(dusk LANGUAGES C CXX VERSION ${DUSK_VERSION_STRING})
 if (APPLE)
-    enable_language(OBJC OBJCXX)
+    enable_language(OBJC)
 endif ()
-# Adjust CMAKE_SYSTEM_PROCESSOR on Windows to match compiler target
-include(cmake/WindowsTargetProcessor.cmake)
 if (APPLE AND NOT TVOS AND CMAKE_SYSTEM_NAME STREQUAL tvOS)
     # ios.toolchain.cmake hack for SDL
     set(TVOS ON)
@@ -132,41 +101,32 @@ 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)
-# Force Freetype (pulled by aurora/RmlUi) to use its bundled mini-zlib.
-# Otherwise its find_package(ZLIB) latches onto our FetchContent'd shared zlib,
-# duplicating inflate*/inflateInit2_ symbols against zlibstatic.
-set(FT_DISABLE_ZLIB TRUE CACHE BOOL "" FORCE)
 add_subdirectory(extern/aurora EXCLUDE_FROM_ALL)
-target_compile_definitions(aurora_mtx PRIVATE MTX_USE_PS=1)
 
 add_subdirectory(libs/freeverb)
 
 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)
-option(DUSK_ENABLE_UPDATE_CHECKER "Enable update checking support" ON)
+
-option(DUSK_TPHD "Enable TPHD asset support" 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")
 
-# 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 (DUSK_MOVIE_SUPPORT)
     find_package(libjpeg-turbo 3.0 CONFIG QUIET)
     if (libjpeg-turbo_FOUND)
-        message(STATUS "dusklight: Using system libjpeg-turbo")
+        message(STATUS "dusk: Using system libjpeg-turbo")
     else ()
-        message(STATUS "dusklight: Fetching libjpeg-turbo")
+        message(STATUS "dusk: Fetching libjpeg-turbo")
         include(ExternalProject)
         set(_jpeg_install_dir ${CMAKE_BINARY_DIR}/libjpeg-turbo-install)
         if (WIN32)
@@ -176,7 +136,6 @@ if (DUSK_MOVIE_SUPPORT)
         endif ()
         set(_jpeg_cmake_args
             -DCMAKE_INSTALL_PREFIX=${_jpeg_install_dir}
-            -DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/WindowsTargetProcessor.cmake
             -DENABLE_SHARED=OFF
             -DWITH_TURBOJPEG=ON
             -DWITH_JAVA=OFF
@@ -186,14 +145,11 @@ if (DUSK_MOVIE_SUPPORT)
             list(APPEND _jpeg_cmake_args -DCMAKE_TOOLCHAIN_FILE=${_jpeg_toolchain_file})
         endif ()
         set(_jpeg_passthrough_vars
-            ANDROID_ABI
-            ANDROID_PLATFORM
             CMAKE_BUILD_TYPE
             CMAKE_C_COMPILER
             CMAKE_C_COMPILER_LAUNCHER
             CMAKE_MAKE_PROGRAM
             CMAKE_MSVC_RUNTIME_LIBRARY
-            CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
             CMAKE_OSX_ARCHITECTURES
             DEPLOYMENT_TARGET
             ENABLE_ARC
@@ -225,9 +181,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
     # -Wno-multichar: Multi-character constants ('ABCD') are implementation-defined but all compilers
     #   (CW, GCC, Clang, MSVC) encode them identically in big-endian order.
     #   For >4-char literals (which GCC/Clang truncate to int), use the MULTI_CHAR() macro.
+    # -Wwrite-strings: Game code relies on implicit const char* -> char* conversions
     # -Wdeprecated-declarations: JSystem uses std::iterator, deprecated in C++17
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar -Wno-write-strings")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-trigraphs -Wno-deprecated-declarations")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-write-strings -Wno-trigraphs -Wno-deprecated-declarations")
     set(CMAKE_INSTALL_RPATH "$ORIGIN")
     set(CMAKE_BUILD_RPATH "$ORIGIN")
 elseif (APPLE)
@@ -237,6 +194,7 @@ elseif (APPLE)
 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>
     )
@@ -253,16 +211,17 @@ elseif (MSVC)
     add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>)
 endif ()
 
+
 include(FetchContent)
 
 # Declare all dependencies first so CMake can download them in parallel
-message(STATUS "dusklight: Fetching cxxopts")
+message(STATUS "dusk: Fetching cxxopts")
 FetchContent_Declare(cxxopts
     URL https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.3.1.tar.gz
     URL_HASH SHA256=3bfc70542c521d4b55a46429d808178916a579b28d048bd8c727ee76c39e2072
     DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
-message(STATUS "dusklight: Fetching nlohmann/json")
+message(STATUS "dusk: Fetching nlohmann/json")
 FetchContent_Declare(json
     URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
     URL_HASH SHA256=42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa
@@ -271,7 +230,7 @@ FetchContent_Declare(json
 FetchContent_MakeAvailable(cxxopts json)
 
 if (DUSK_ENABLE_SENTRY_NATIVE)
-    message(STATUS "dusklight: Fetching 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)
@@ -296,12 +255,6 @@ if (DUSK_ENABLE_SENTRY_NATIVE)
     endif ()
 endif ()
 
-# Use signed char on ARM to match the original game (and x86)
-string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _arch)
-if(_arch MATCHES "^(arm|aarch64)" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
-    add_compile_options(-fsigned-char)
-endif()
-
 if (CMAKE_SYSTEM_NAME STREQUAL Windows)
     set(PLATFORM_NAME win32)
 elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
@@ -322,20 +275,17 @@ include(files.cmake)
 
 # TODO: version handling for res includes
 
-set(DUSK_BUNDLE_NAME Dusklight)
+set(DUSK_BUNDLE_NAME Dusk)
 set(DUSK_BUNDLE_IDENTIFIER dev.twilitrealm.dusk)
 set(DUSK_COMPANY_NAME "Twilit Realm")
-set(DUSK_FILE_DESCRIPTION "Dusklight")
+set(DUSK_FILE_DESCRIPTION "Dusk")
-set(DUSK_PRODUCT_NAME "Dusklight")
+set(DUSK_PRODUCT_NAME "Dusk")
 set(DUSK_COPYRIGHT "Copyright (C) Twilit Realm contributors")
 
 source_group("dolzel" FILES ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${REL_FILES})
-source_group("dusklight" FILES ${DUSK_FILES} ${DUSK_HTTP_BACKEND_FILES})
+source_group("dusk" FILES ${DUSK_FILES})
 
-set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0 MTX_USE_PS=1)
+set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0)
-if (DUSK_TPHD)
-    list(APPEND GAME_COMPILE_DEFS DUSK_TPHD=1)
-endif ()
 
 set(GAME_INCLUDE_DIRS
     include
@@ -347,10 +297,10 @@ set(GAME_INCLUDE_DIRS
     extern
     ${CMAKE_BINARY_DIR})
 
-find_package(Threads REQUIRED)
 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
+    aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt)
-    Threads::Threads libzstd_static ZLIB::ZLIB)
+
+list(APPEND GAME_LIBS libzstd_static)
 
 if (DUSK_ENABLE_SENTRY_NATIVE)
     list(APPEND GAME_LIBS sentry)
@@ -359,47 +309,8 @@ endif ()
 
 if (WIN32)
     list(APPEND GAME_LIBS Ws2_32)
-    if (CMAKE_BUILD_TYPE STREQUAL Debug)
-        list(APPEND GAME_LIBS dbghelp)
-        list(APPEND GAME_COMPILE_DEFS DUSK_CRASH_DBGHELP=1)
-    endif ()
 endif ()
 
-set(DUSK_HTTP_BACKEND_SOURCE src/dusk/http/no_backend.cpp)
-if (DUSK_ENABLE_UPDATE_CHECKER)
-    list(APPEND GAME_COMPILE_DEFS DUSK_ENABLE_UPDATE_CHECKER=1)
-    if (WIN32)
-        set(DUSK_HTTP_BACKEND_SOURCE src/dusk/http/winhttp.cpp)
-        list(APPEND GAME_LIBS winhttp)
-        list(APPEND GAME_COMPILE_DEFS DUSK_HTTP_BACKEND_WINHTTP=1)
-        message(STATUS "dusklight: Enabled update checker (WinHTTP)")
-    elseif (ANDROID)
-        set(DUSK_HTTP_BACKEND_SOURCE src/dusk/http/android.cpp)
-        list(APPEND GAME_COMPILE_DEFS DUSK_HTTP_BACKEND_ANDROID=1)
-        message(STATUS "dusklight: Enabled update checker (Android)")
-    elseif (APPLE)
-        find_library(FOUNDATION_FRAMEWORK Foundation REQUIRED)
-        set(DUSK_HTTP_BACKEND_SOURCE src/dusk/http/url_session.mm)
-        set_source_files_properties(src/dusk/http/url_session.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
-        list(APPEND GAME_LIBS ${FOUNDATION_FRAMEWORK})
-        list(APPEND GAME_COMPILE_DEFS DUSK_HTTP_BACKEND_URLSESSION=1)
-        message(STATUS "dusklight: Enabled update checker (NSURLSession)")
-    elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
-        find_package(CURL QUIET OPTIONAL_COMPONENTS HTTPS SSL)
-        if (CURL_FOUND AND CURL_HTTPS_FOUND AND CURL_SSL_FOUND)
-            set(DUSK_HTTP_BACKEND_SOURCE src/dusk/http/curl.cpp)
-            list(APPEND GAME_LIBS CURL::libcurl)
-            list(APPEND GAME_COMPILE_DEFS DUSK_HTTP_BACKEND_LIBCURL=1)
-            message(STATUS "dusklight: Enabled update checker (libcurl)")
-        else ()
-            message(STATUS "dusklight: Disabled update checker (libcurl + HTTPS/SSL not found)")
-        endif ()
-    else ()
-        message(STATUS "dusklight: Disabled update checker (unsupported platform)")
-    endif ()
-endif ()
-list(APPEND DUSK_FILES ${DUSK_HTTP_BACKEND_SOURCE})
-
 if (DUSK_MOVIE_SUPPORT)
     if (TARGET libjpeg-turbo::turbojpeg-static)
         list(APPEND GAME_LIBS libjpeg-turbo::turbojpeg-static)
@@ -409,13 +320,56 @@ if (DUSK_MOVIE_SUPPORT)
     list(APPEND GAME_COMPILE_DEFS MOVIE_SUPPORT=1)
 endif ()
 
-set(DUSK_ENABLE_DISCORD_DEFAULT ON)
+option(DUSK_ENABLE_DISCORD_RPC "Enable Discord Rich Presence support" ON)
-if (DEFINED DUSK_ENABLE_DISCORD_RPC AND NOT DEFINED DUSK_ENABLE_DISCORD)
+if (DUSK_ENABLE_DISCORD_RPC AND NOT ANDROID AND NOT IOS AND NOT TVOS)
-    set(DUSK_ENABLE_DISCORD_DEFAULT ${DUSK_ENABLE_DISCORD_RPC})
+
+    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 ()
-option(DUSK_ENABLE_DISCORD "Enable Discord Rich Presence support" ${DUSK_ENABLE_DISCORD_DEFAULT})
+
-if (DUSK_ENABLE_DISCORD AND NOT ANDROID AND NOT IOS AND NOT TVOS)
+# Edit & Continue
-    list(APPEND GAME_COMPILE_DEFS DUSK_DISCORD=1)
+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)
@@ -473,41 +427,31 @@ endif ()
 
 set(DUSK_FILES src/dusk/main.cpp ${GAME_BASE_FILES} ${GAME_DEBUG_FILES})
 if(ANDROID)
-    add_library(dusklight SHARED ${DUSK_FILES})
+    add_library(dusk SHARED ${DUSK_FILES})
-    set_target_properties(dusklight PROPERTIES OUTPUT_NAME main)
+    set_target_properties(dusk PROPERTIES OUTPUT_NAME main)
 else ()
-    add_executable(dusklight ${DUSK_FILES})
+    add_executable(dusk ${DUSK_FILES})
 endif ()
 
-target_compile_definitions(dusklight PRIVATE ${GAME_COMPILE_DEFS})
+target_compile_definitions(dusk PRIVATE ${GAME_COMPILE_DEFS})
-target_include_directories(dusklight PRIVATE ${GAME_INCLUDE_DIRS})
+target_include_directories(dusk PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries(dusklight PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
+target_link_libraries(dusk PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
-target_precompile_headers(dusklight PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
+target_precompile_headers(dusk PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
 if (TARGET crashpad_handler)
-    add_dependencies(dusklight crashpad_handler)
+    add_dependencies(dusk crashpad_handler)
-    add_custom_command(TARGET dusklight POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "$<TARGET_FILE:crashpad_handler>"
-            "$<TARGET_FILE_DIR:dusklight>"
-        COMMENT "Copying 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(dusklight PRIVATE "-Wl,-u,SDL_main")
+    target_link_options(dusk PRIVATE "-Wl,-u,SDL_main")
-endif ()
-
-if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-    target_link_options(dusklight PRIVATE "-Wl,--build-id=sha1")
 endif ()
 
 if (NOT APPLE)
-    add_custom_command(TARGET dusklight POST_BUILD
+    add_custom_command(TARGET dusk POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
             "${CMAKE_SOURCE_DIR}/res"
-            "$<TARGET_FILE_DIR:dusklight>/res"
+            "$<TARGET_FILE_DIR:dusk>/res"
         COMMENT "Copying resources"
     )
 endif ()
@@ -515,9 +459,9 @@ 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}/dusklight.ico)
+    set(DUSK_WINDOWS_ICON_ICO ${CMAKE_CURRENT_BINARY_DIR}/dusk.ico)
-    set(DUSK_WINDOWS_RC ${CMAKE_CURRENT_BINARY_DIR}/dusklight.rc)
+    set(DUSK_WINDOWS_RC ${CMAKE_CURRENT_BINARY_DIR}/dusk.rc)
-    set(DUSK_WINDOWS_MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/dusklight.manifest)
+    set(DUSK_WINDOWS_MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/dusk.manifest)
 
     add_custom_command(
             OUTPUT ${DUSK_WINDOWS_ICON_ICO}
@@ -530,14 +474,14 @@ if (WIN32)
             COMMENT "Generating Windows icon"
     )
 
-    configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusklight.manifest.in ${DUSK_WINDOWS_MANIFEST} @ONLY)
+    configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusk.manifest.in ${DUSK_WINDOWS_MANIFEST} @ONLY)
-    configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusklight.rc.in ${DUSK_WINDOWS_RC} @ONLY)
+    configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusk.rc.in ${DUSK_WINDOWS_RC} @ONLY)
 
-    target_sources(dusklight PRIVATE ${DUSK_WINDOWS_ICON_ICO} ${DUSK_WINDOWS_RC})
+    target_sources(dusk PRIVATE ${DUSK_WINDOWS_ICON_ICO} ${DUSK_WINDOWS_RC})
-    set_target_properties(dusklight PROPERTIES WIN32_EXECUTABLE TRUE)
+    set_target_properties(dusk PROPERTIES WIN32_EXECUTABLE TRUE)
 
     if (MSVC)
-        target_link_options(dusklight PRIVATE /MANIFEST:NO)
+        target_link_options(dusk PRIVATE /MANIFEST:NO)
     endif ()
 endif ()
 
@@ -553,10 +497,10 @@ if (APPLE)
     file(GLOB_RECURSE DUSK_RESOURCE_FILES
         "${DUSK_RESOURCE_DIR}/Assets.car"
         "${DUSK_RESOURCE_DIR}/Base.lproj/*"
-        "${DUSK_RESOURCE_DIR}/Dusklight.icns")
+        "${DUSK_RESOURCE_DIR}/Dusk.icns")
     file(GLOB_RECURSE DUSK_APP_RESOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/res/*")
-    target_sources(dusklight PRIVATE ${DUSK_RESOURCE_FILES})
+    target_sources(dusk PRIVATE ${DUSK_RESOURCE_FILES})
-    target_sources(dusklight PRIVATE ${DUSK_APP_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)
@@ -568,36 +512,29 @@ if (APPLE)
         set_property(SOURCE ${FILE} PROPERTY MACOSX_PACKAGE_LOCATION "Resources/${NEW_FILE_PATH}")
     endforeach ()
     set_target_properties(
-        dusklight 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 Dusklight
+        OUTPUT_NAME Dusk
         XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "YES"
         XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
     )
 endif ()
 
-if (APPLE AND NOT IOS AND NOT TVOS)
-    find_library(APPKIT_FRAMEWORK AppKit REQUIRED)
-    target_sources(dusklight PRIVATE src/dusk/file_select_macos.mm)
-    set_source_files_properties(src/dusk/file_select_macos.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
-    target_link_libraries(dusklight PRIVATE ${APPKIT_FRAMEWORK})
-endif ()
-
 if (IOS)
     find_library(UIKIT_FRAMEWORK UIKit REQUIRED)
     find_library(UNIFORM_TYPE_IDENTIFIERS_FRAMEWORK UniformTypeIdentifiers REQUIRED)
-    target_sources(dusklight PRIVATE src/dusk/ios/FileSelectDialog.m)
+    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(dusklight PRIVATE ${UIKIT_FRAMEWORK} ${UNIFORM_TYPE_IDENTIFIERS_FRAMEWORK})
+    target_link_libraries(dusk PRIVATE ${UIKIT_FRAMEWORK} ${UNIFORM_TYPE_IDENTIFIERS_FRAMEWORK})
 endif ()
 
 include(extern/aurora/cmake/AuroraCopyRuntimeDLLs.cmake)
-aurora_copy_runtime_dlls(dusklight)
+aurora_copy_runtime_dlls(dusk)
 
 if (DUSK_SELECTED_OPT)
     if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
@@ -635,13 +572,13 @@ function(get_target_prefix target result_var)
         endif ()
     endif ()
 endfunction()
-list(APPEND BINARY_TARGETS dusklight)
+list(APPEND BINARY_TARGETS dusk)
 set(EXTRA_TARGETS "")
 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(dusklight ${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 ()

CMakePresets.json

@@ -33,11 +33,7 @@
           "value": true
         },
         "DUSK_SENTRY_DSN": "$env{SENTRY_DSN}",
-        "DUSK_SENTRY_ENVIRONMENT": "production",
+        "DUSK_SENTRY_ENVIRONMENT": "production"
-        "Rust_RUSTUP_INSTALL_MISSING_TARGET": {
-          "type": "BOOL",
-          "value": true
-        }
       }
     },
     {
@@ -253,11 +249,22 @@
           "type": "BOOL",
           "value": false
         },
-        "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
+        "CMAKE_DISABLE_FIND_PACKAGE_BZip2": {
           "type": "BOOL",
           "value": true
         },
-        "CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew"
+        "CMAKE_DISABLE_FIND_PACKAGE_LibLZMA": {
+          "type": "BOOL",
+          "value": true
+        },
+        "CMAKE_DISABLE_FIND_PACKAGE_zstd": {
+          "type": "BOOL",
+          "value": true
+        },
+        "CMAKE_DISABLE_FIND_PACKAGE_Freetype": {
+          "type": "BOOL",
+          "value": true
+        }
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -322,13 +329,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-28"
-        "BUILD_SHARED_LIBS": {
-          "type": "BOOL",
-          "value": false
-        },
-        "AURORA_SDL3_VERSION": "3.4.8",
-        "AURORA_SDL3_REF": "refs/tags/release-3.4.8"
       }
     },
     {
@@ -351,31 +352,6 @@
         "ANDROID_ABI": "x86_64"
       }
     },
-    {
-      "name": "x-android-ci",
-      "hidden": true,
-      "inherits": [
-        "android-base",
-        "ci"
-      ],
-      "cacheVariables": {
-        "DUSK_ENABLE_SENTRY_NATIVE": {
-          "type": "BOOL",
-          "value": false
-        }
-      }
-    },
-    {
-      "name": "x-android-ci-arm64",
-      "binaryDir": "${sourceDir}/build/android-arm64",
-      "inherits": [
-        "x-android-ci"
-      ],
-      "cacheVariables": {
-        "ANDROID_ABI": "arm64-v8a",
-        "Rust_CARGO_TARGET": "aarch64-linux-android"
-      }
-    },
     {
       "name": "x-linux-ci",
       "hidden": true,
@@ -415,7 +391,7 @@
         },
         "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
         "CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew",
-        "BUILD_SHARED_LIBS": {
+        "DUSK_MOVIE_SUPPORT": {
           "type": "BOOL",
           "value": false
         }
@@ -447,7 +423,11 @@
       ],
       "cacheVariables": {
         "CMAKE_C_COMPILER_LAUNCHER": "sccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache",
+        "DUSK_MOVIE_SUPPORT": {
+          "type": "BOOL",
+          "value": false
+        }
       }
     },
     {
@@ -457,7 +437,11 @@
       ],
       "cacheVariables": {
         "CMAKE_C_COMPILER_LAUNCHER": "sccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache",
+        "DUSK_MOVIE_SUPPORT": {
+          "type": "BOOL",
+          "value": false
+        }
       }
     },
     {
@@ -495,10 +479,7 @@
       "inherits": [
         "x-windows-ci",
         "windows-arm64-msvc"
-      ],
+      ]
-      "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "arm64-windows"
-      }
     }
   ],
   "buildPresets": [
@@ -544,7 +525,7 @@
       "description": "iOS release build with debug info",
       "displayName": "iOS RelWithDebInfo",
       "targets": [
-        "dusklight"
+        "dusk"
       ]
     },
     {
@@ -553,7 +534,7 @@
       "description": "tvOS release build with debug info",
       "displayName": "tvOS RelWithDebInfo",
       "targets": [
-        "dusklight"
+        "dusk"
       ]
     },
     {
@@ -562,7 +543,7 @@
       "description": "Android arm64-v8a release build with debug info",
       "displayName": "Android arm64-v8a RelWithDebInfo",
       "targets": [
-        "dusklight"
+        "dusk"
       ]
     },
     {
@@ -571,16 +552,7 @@
       "description": "Android x86_64 release build with debug info",
       "displayName": "Android x86_64 RelWithDebInfo",
       "targets": [
-        "dusklight"
+        "dusk"
-      ]
-    },
-    {
-      "name": "x-android-ci-arm64",
-      "configurePreset": "x-android-ci-arm64",
-      "description": "(Internal) Android CI arm64-v8a",
-      "displayName": "(Internal) Android CI arm64-v8a",
-      "targets": [
-        "dusklight"
       ]
     },
     {

README.md

@@ -1,64 +1,37 @@
-<div align="center">
+![DuskLogo](res/logo-mascot.png)
-  <img src="res/logo.png" alt="Logo" width="640">
 
-  <p align="center">
+- ### **[Official Website](https://twilitrealm.dev)**
-    <a href="https://twilitrealm.dev">Official Website</a>
+- ### **[Discord](https://discord.gg/QACynxeyna)**
-    •
-    <a href="https://discord.gg/6NpMhefCK9">Discord</a>
-  </p>
-</div>
 
 # Overview
-
+Dusk is a reverse-engineered reimplementation of Twilight Princess.
-Dusklight 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.
 
 # Setup
+**⚠️ Dusk does NOT provide any copyrighted assets. You must provide your own copy of the game.**
 
-> [!IMPORTANT]
+### 1. Verify your ROM dump
-> Dusklight does *not* provide any copyrighted assets. You must provide your own copy of the original game.
+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.
 
-> [!IMPORTANT]
+| Version      | sha1 hash                                |
-> At a minimum, Dusklight requires a GPU with support for either D3D12, Vulkan, or Metal. Your experience with specific hardware, operating systems, and drivers may vary. In particular, older Intel iGPUs have a high likelihood of incompatibility. We are also aware of a number of issues on devices with Adreno GPUs and are working to resolve them.
+|--------------| ---------------------------------------- |
+| GameCube USA | 75edd3ddff41f125d1b4ce1a40378f1b565519e7 |
+| GameCube PAL | 2601822a488eeb86fb89db16ca8f29c2c953e1ca |
 
-### 1. Dump your game
+### 2. Download [Dusk](https://github.com/TwilitRealm/dusk/releases)
-
-You must dump your own copy of the game, please see [this article](https://wiki.dolphin-emu.org/index.php?title=Ripping_Games) for instructions. After dumping, you can use a program like [Dolphin](https://dolphin-emu.org/) or [nodtool](https://github.com/encounter/nod/releases) to convert the `.iso` to a `.rvz` to save space.
-
-Currently, only the GameCube USA and EUR releases are supported. Support for other versions of the game is planned in the future.
-
-### 2. Download [Dusklight](https://github.com/TwilitRealm/dusklight/releases)
 
 ### 3. Setup the game
-**Windows / macOS / Linux**
+- Extract the zip folder
-- Extract the .zip file
+- Launch Dusk
-- Launch Dusklight
+- Select Options, then set the ISO Path to your supported game dump
-- Press **Select Disc Image** and provide the path to your supported game dump
+- Press Start Game to play!
-- Press **Play**!
 
-**iOS**
+![Dusk options](assets/dusk_options.png)
-- Follow the [iOS setup guide](docs/ios-install-altstore.md)
-
-**Android**
-- Install the Dusklight APK
-- Launch Dusklight
-- Press **Select Disc Image** and provide the path to your supported game dump
-- Press **Play**!
 
 # Building
+If you'd like to build Dusk from source, please read the [build instructions](docs/building.md).
 
-If you'd like to build Dusklight from source, please read the [build instructions](docs/building.md).
+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.
-
-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. Please also see the [code conventions](docs/code-conventions.md).
 
 # 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).
-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/dusklight/graphs/contributors).
-
-<br/>
-<div align="center">
-    <a href="https://github.com/encounter/aurora">
-        <img src="assets/aurora-powered.png" alt="Powered by Aurora" width="800">
-    </a>
-</div>

assets/org-icon.svg

@@ -1,66 +0,0 @@
-<svg width="600" height="600" viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="150" cy="150" r="105" fill="none" stroke="white" stroke-width="4"/>
-  <circle cx="150" cy="150" r="95" fill="none" stroke="white" stroke-width="4"/>
-  <circle cx="150" cy="150" r="60" fill="none" stroke="white" stroke-width="4"/>
-  <circle cx="150" cy="150" r="75" fill="none" stroke="white" stroke-width="4"/>
-
-  <defs>
-    <line id="ray" x1="150" y1="55" x2="150" y2="45"/>
-    <clipPath id="zigzag-clip">
-      <circle cx="150" cy="150" r="75"/>
-    </clipPath>
-  </defs>
-
-  <g stroke="white" stroke-width="3">
-    <use href="#ray"/>
-    <use href="#ray" transform="rotate(18 150 150)"/>
-    <use href="#ray" transform="rotate(36 150 150)"/>
-    <use href="#ray" transform="rotate(54 150 150)"/>
-    <use href="#ray" transform="rotate(72 150 150)"/>
-    <use href="#ray" transform="rotate(90 150 150)"/>
-    <use href="#ray" transform="rotate(108 150 150)"/>
-    <use href="#ray" transform="rotate(126 150 150)"/>
-    <use href="#ray" transform="rotate(144 150 150)"/>
-    <use href="#ray" transform="rotate(162 150 150)"/>
-    <use href="#ray" transform="rotate(180 150 150)"/>
-    <use href="#ray" transform="rotate(198 150 150)"/>
-    <use href="#ray" transform="rotate(216 150 150)"/>
-    <use href="#ray" transform="rotate(234 150 150)"/>
-    <use href="#ray" transform="rotate(252 150 150)"/>
-    <use href="#ray" transform="rotate(270 150 150)"/>
-    <use href="#ray" transform="rotate(288 150 150)"/>
-    <use href="#ray" transform="rotate(306 150 150)"/>
-    <use href="#ray" transform="rotate(324 150 150)"/>
-    <use href="#ray" transform="rotate(342 150 150)"/>
-  </g>
-
-  <polygon fill="none" stroke="white" stroke-width="4" opacity="1" clip-path="url(#zigzag-clip)"
-    points="
-      126.82,78.67
-      150,90
-      173.18,78.67
-      185.27,101.46
-      210.68,105.92
-      207.06,131.46
-      225,150
-      207.06,168.54
-      210.68,194.08
-      185.27,198.54
-      173.18,221.33
-      150,210
-      126.82,221.33
-      114.73,198.54
-      89.32,194.08
-      92.94,168.54
-      75,150
-      92.94,131.46
-      89.32,105.92
-      114.73,101.46
-    "/>
-
-  <g fill="none" stroke="white" stroke-width="4">
-    <polygon points="150,105 130,140 170,140"/>
-    <polygon points="130,140 110,175 150,175"/>
-    <polygon points="170,140 150,175 190,175"/>
-  </g>
-</svg>

ci/build-appimage.sh

@@ -1,27 +1,18 @@
 #!/bin/bash -ex
-
+shopt -s extglob
-if [[ -n "${GITHUB_WORKSPACE:-}" ]]; then
-  cd "$GITHUB_WORKSPACE"
-fi
-
-build_dir="$PWD/build"
-linuxdeploy="$build_dir/linuxdeploy-$(uname -m).AppImage"
-lib_dir="/usr/lib/$(uname -m)-linux-gnu"
 
 # Get linuxdeploy
-mkdir -p "$build_dir"
+cd "$RUNNER_WORKSPACE"
-curl -fL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$(uname -m).AppImage" -o "$linuxdeploy"
+curl -fOL https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$(uname -m).AppImage
-chmod +x "$linuxdeploy"
+chmod +x linuxdeploy-$(uname -m).AppImage
 
 # Build AppImage
+cd "$GITHUB_WORKSPACE"
 mkdir -p build/appdir/usr/{bin,share/{applications,icons/hicolor}}
-for install_path in build/install/*; do
+cp -r build/install/!(*.*) build/appdir/usr/bin
-  [[ "$(basename "$install_path")" == *.* ]] && continue
-  cp -r "$install_path" build/appdir/usr/bin
-done
 cp -r platforms/freedesktop/{16x16,32x32,48x48,64x64,128x128,256x256,512x512,1024x1024} build/appdir/usr/share/icons/hicolor
-cp platforms/freedesktop/dev.twilitrealm.dusk.desktop build/appdir/usr/share/applications
+cp platforms/freedesktop/dusk.desktop build/appdir/usr/share/applications
 
 cd build/install
-VERSION="$DUSK_VERSION" NO_STRIP=1 "$linuxdeploy" \
+VERSION="$DUSK_VERSION" NO_STRIP=1 "$RUNNER_WORKSPACE"/linuxdeploy-$(uname -m).AppImage \
-  -l "$lib_dir/libusb-1.0.so" --appdir "$build_dir/appdir" --output appimage
+  -l /usr/lib/x86_64-linux-gnu/libusb-1.0.so --appdir "$GITHUB_WORKSPACE"/build/appdir --output appimage

cmake/WindowsTargetProcessor.cmake

@@ -1,9 +0,0 @@
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if (CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64" OR CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64EC")
-        set(CMAKE_SYSTEM_PROCESSOR "ARM64")
-    elseif (CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "x64")
-        set(CMAKE_SYSTEM_PROCESSOR "AMD64")
-    elseif (CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "X86")
-        set(CMAKE_SYSTEM_PROCESSOR "X86")
-    endif ()
-endif ()

docs/building.md

@@ -1,165 +1,51 @@
-# Building Dusklight
+### Building
-
+#### Prerequisites
-## Dependencies
-
-The following dependencies are required:
-
 * [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)
-### Windows
+        * Verify it's added to `%PATH%` by typing `python` in `cmd`.
-
+    * macOS: `brew install python@3`
-* Install [CMake 3.25+](https://cmake.org) by searching `CMake Tools` in Visual Studio
+* **[Windows]** [Visual Studio 2026 Community](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
-* Install Python 3 from the [Microsoft Store](https://go.microsoft.com/fwlink?linkID=2082640) and verify it's added to `%PATH%` by typing `python` in `cmd`.
+    * Select `C++ Development` and verify the following packages are included:
-
+        * `Windows 11 SDK`
-Recommended IDEs:
+        * `CMake Tools`
-
+        * `C++ Clang Compiler`
-* [Visual Studio 2026 Community](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx). During installation:
+        * `C++ Clang-cl`
-  * Select `C++ Development` and verify the following packages are included:
+* **[macOS]** [Xcode 16.4+](https://developer.apple.com/xcode/download/)
-    * `Windows 11 SDK`
+* **[Linux]** Actively tested on Ubuntu 24.04, Arch Linux & derivatives.
-    * `CMake Tools`
+    * Ubuntu 24.04+ packages
-    * `C++ Clang Compiler`
+      ```
-    * `C++ Clang-cl`
+      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 \
-### macOS
+      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 \
-* Make sure [Homebrew](https://brew.sh) is installed
+      libxss-dev libxtst-dev
-* Install [CMake 3.25+](https://cmake.org)
+      ```
-
+     * 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
-brew install cmake
+git clone --recursive https://github.com/TwilitRealm/dusk.git
-```
+cd dusk
-
-* Install Python 3
-
-```sh
-brew install python@3
-```
-
-Recommended IDEs:
-
-* [Xcode 16.4 or later](https://developer.apple.com/xcode/)
-* [Visual Studio Code](https://code.visualstudio.com/download/)
-* [CLion](https://www.jetbrains.com/clion/)
-
-### Linux
-
-Actively tested on Ubuntu 24.04, Arch Linux & derivatives.
-
-**Ubuntu 24.04+ packages**
-
-<details>
-<summary>Click to expand</summary>
-
-* Run the following command to install the required dependencies:
-
-```sh
-sudo apt update && sudo apt install -y \
-    build-essential \
-    clang \
-    cmake \
-    curl \
-    git \
-    libasound2-dev \
-    libclang-dev \
-    libcurl4-openssl-dev \
-    libdbus-1-dev \
-    libfreetype-dev \
-    libglu1-mesa-dev \
-    libgtk-3-dev \
-    libncurses5-dev \
-    libpng-dev \
-    libpulse-dev \
-    libudev-dev \
-    libvulkan-dev \
-    libx11-xcb-dev \
-    libxcursor-dev \
-    libxi-dev \
-    libxinerama-dev \
-    libxrandr-dev \
-    libxss-dev \
-    libxtst-dev \
-    lld \
-    ninja-build \
-    python-is-python3 \
-    python3 \
-    python3-markupsafe \
-    zlib1g-dev
-```
-
-</details>
-<br>
-
-**Arch Linux packages**
-
-<details>
-<summary>Click to expand</summary>
-
-* Run the following command to install the required dependencies:
-
-```sh
-sudo pacman -S --needed \
-    alsa-lib \
-    base-devel \
-    clang \
-    cmake \
-    freetype2 \
-    libpulse \
-    libxrandr \
-    lld \
-    llvm \
-    ninja \
-    python \
-    python-markupsafe \
-    vulkan-headers
-```
-
-</details>
-<br>
-
-**Fedora packages**
-
-<details>
-<summary>Click to expand</summary>
-
-* Run the following command to install the required dependencies:
-
-```sh
-sudo dnf install -y \
-    clang-devel \
-    cmake \
-    libpng-devel \
-    llvm-devel \
-    ninja-build \
-    vulkan-headers
-```
-
-* It's also important that you install the developer tools and libraries
-
-```sh
-sudo dnf groupinstall \
-    "Development Libraries" "Development Tools"
-```
-
-</details>
-<br>
-
-Recommended IDEs:
-
-* [CLion](https://www.jetbrains.com/clion/)
-* [Visual Studio Code](https://code.visualstudio.com/download/)
-
-## Building
-
-* Clone and initialize the Dusklight repository:
-
-```sh
-git clone --recursive https://github.com/TwilitRealm/dusklight.git
 git pull
-cd dusklight
 git submodule update --init --recursive
 ```
 
+#### Building
+
 **CLion (Windows / macOS / Linux)**
 
 Open the project directory in CLion. Enable the appropriate presets for your platform:
@@ -178,8 +64,7 @@ cmake --build --preset macos-default-relwithdebinfo
 ```
 
 Alternate presets available:
-
+- `macos-default-debug`: Clang, Debug
-* `macos-default-debug`: Clang, Debug
 
 **ninja (Linux)**
 
@@ -189,10 +74,9 @@ cmake --build --preset linux-default-relwithdebinfo
 ```
 
 Alternate presets available:
-
+- `linux-default-debug`: GCC, Debug
-* `linux-default-debug`: GCC, Debug
+- `linux-clang-relwithdebinfo`: Clang, RelWithDebInfo
-* `linux-clang-relwithdebinfo`: Clang, RelWithDebInfo
+- `linux-clang-debug`: Clang, Debug
-* `linux-clang-debug`: Clang, Debug
 
 **ninja (Windows)**
 
@@ -202,27 +86,13 @@ 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
 
-* `windows-msvc-debug`: MSVC, Debug
+#### Running
-* `windows-clang-relwithdebinfo`: Clang-cl, RelWithDebInfo
+Pass the disc image as a positional argument. Supported formats: ISO (GCM), RVZ, WIA, WBFS, CISO, GCZ
-* `windows-clang-debug`: Clang-cl, Debug
-
-## Running
-
-**Windows / Linux**
-
-* Pass the disc image as a positional argument using the `--dvd` flag. Supported formats are: ISO (GCM), RVZ, WIA, WBFS, CISO, GCZ
-
 ```sh
-build/{preset}/dusklight --dvd /path/to/game.iso
+build/{preset}/dusk /path/to/game.rvz
-```
-
-**macOS**
-
-macOS builds an `.app` bundle which contains the executable and all necessary resources.
-
-* Pass the disc image as a positional argument using the `--dvd` flag. Supported formats are: ISO (GCM), RVZ, WIA, WBFS, CISO, GCZ
-
-```sh
-build/{preset}/Dusklight.app/Contents/MacOS/Dusklight --dvd /path/to/game.iso
 ```
+If no path is specified, Dusk defaults to `game.iso` in the current working directory.

docs/code-conventions.md

@@ -1,13 +0,0 @@
-# Code conventions for Dusk
-
-## Upstream when appropriate
-
-Bug fixes, documentation improvements, code cleanup, etc that also apply to the [original decompilation project](https://github.com/zeldaret/tp) should preferably be PR'd there.
-
-## Properly indicate Dusk-modified code
-
-When modifying original game code (i.e. in decomp) for Dusk's purposes, please clearly delineate such code as being Dusk-specific. Generally, this can be done by using `#if TARGET_PC` and keeping the original code in place. Use `#if AVOID_UB` for Undefined Behavior fixes to the original codebase.
-
-## Miscellaneous things
-
-* The original codebase makes heavy use of global `operator new` and similar overloads to allocate into a strict tree of heaps. This would cause many linkage headaches for us, so effectively all uses of `new` or `delete` in the original game code have been replaced with `JKR_NEW`, `JKR_DELETE`, or similar macros. See `JKRHeap.h` for the full list.  

docs/ios-install-altstore.md

@@ -1,48 +0,0 @@
-# Installing Dusklight on iOS via iloader
-
-## Prerequisites
-
-- A Windows, Linux, or macOS device 
-- iOS device connected to computer via USB 
-- Dusklight IPA file (download the latest `Dusklight-vX.X.X-ios-arm64.ipa` from the [releases page](https://github.com/TwilitRealm/dusklight/releases))
-- Legally acquired game disc - `GZ2E01` (Gamecube USA) or `GZ2PE01` (Gamecube PAL)
-
-## 1. Install iloader
-
-- Executable bundles can be installed from [iloader's main page](https://iloader.app/) or [their GitHub](https://github.com/nab138/iloader) for Windows, Linux, and macOS.
-- Windows WILL require iTunes to be installed
-- Linux WILL require usbmuxd to be installed, this is installed by default in most distros though
-
-## 2. Enable Developer Mode (iOS 16+)
-
-- On your iPhone, go to **Settings > Privacy & Security > Developer Mode**
-- Toggle it on, put in your device passcode, and restart when prompted
-
-## 3. Install Dusklight on Your iPhone
-
-1. Sign into your Apple ID (this is required for registering app IDs, it is sent securely directly to Apple and not stored by iloader)
-    * You may be prompted to put in a code from your iOS device if you have 2FA enabled, do so
-2. Plug in your iOS device via USB into your PC. If you're missing a dependency, an error pop-up will tell you to install it
-    * You will need to hit `Refresh` after plugging it in at this stage so that it can be detected, it does not automatically refresh
-3. Leave settings unchanged (the Anisette server should stay Sidestore (.io))
-    3.(a) Installing SideStore directly is not required, but provides you a way to install Dusklight on your phone without being plugged into a computer later
-4. Press `Import IPA` and choose your downloaded `Dusklight-v.X.X.X-ios-arm64.ipa`, it will begin installing on your device
-
-**NOTE:** *At various stages, you may be prompted to trust your device, do so*
-
-## 3. Getting Dusklight trusted
-When installing sideloaded iOS applications, at first you will need to manually trust the app due to Apple's security policies
-* Go to **Settings > General > VPN & Device Management**
-* Tap the Apple ID you signed into iloader with under "Developer App" and tap **Trust**
-* Tap **Allow** on the pop-up
-
-## 4. Copy Files to Your iPhone
-
-Transfer the game disc (and optionally, the Dusklight IPA) to your iPhone so they are accessible in the Files app. A few ways to do this:
-
-- **AirDrop** - Right-click the files on your Mac and choose Share > AirDrop
-- **iCloud Drive** - Place files in iCloud Drive on your Mac and they'll sync to Files on your iPhone
-- **USB transfer** - Connect your iPhone and drag files via Finder's sidebar
-- **Cloud storage** - Upload to Google Drive, Dropbox, etc. and download on your iPhone
-
-You may now use Dusklight on iOS and iPadOS!

files.cmake

@@ -246,18 +246,6 @@ set(DOLZEL_FILES
 if(DEBUG)
     list(APPEND DOLZEL_FILES src/d/d_event_debug.cpp)
 endif(DEBUG)
-if (DUSK_TPHD)
-    list(APPEND DOLZEL_FILES
-        src/dusk/tphd/TphdPack.hpp
-        src/dusk/tphd/TphdPack.cpp
-        src/dusk/tphd/GtxParser.hpp
-        src/dusk/tphd/GtxParser.cpp
-        src/dusk/tphd/AddrLib.hpp
-        src/dusk/tphd/AddrLib.cpp
-        src/dusk/tphd/HdAssetLayer.hpp
-        src/dusk/tphd/HdAssetLayer.cpp
-    )
-endif(DUSK_TPHD)
 
 set(Z2AUDIOLIB_FILES
         src/Z2AudioLib/Z2Calc.cpp
@@ -1423,7 +1411,6 @@ set(DOLPHIN_FILES
 )
 
 set(DUSK_FILES
-        include/dusk/action_bindings.h
         include/dusk/endian_gx.hpp
         include/dusk/config.hpp
         include/dusk/dvd_asset.hpp
@@ -1432,10 +1419,7 @@ set(DUSK_FILES
         src/d/actor/d_a_alink_dusk.cpp
         src/dusk/asserts.cpp
         src/dusk/config.cpp
-        src/dusk/crash_handler.cpp
         src/dusk/crash_reporting.cpp
-        src/dusk/data.cpp
-        src/dusk/data.hpp
         src/dusk/endian.cpp
         src/dusk/extras.c
         src/dusk/file_select.cpp
@@ -1446,57 +1430,53 @@ set(DUSK_FILES
         src/dusk/gyro.cpp
 		src/dusk/gamepad_color.cpp
 		src/dusk/autosave.cpp
-        src/dusk/http/http.hpp
         src/dusk/io.cpp
         src/dusk/layout.cpp
         src/dusk/logging.cpp
         src/dusk/settings.cpp
-        src/dusk/speedrun.cpp
-        src/dusk/string.cpp
         src/dusk/stubs.cpp
-        src/dusk/update_check.cpp
-        src/dusk/update_check.hpp
         #src/dusk/m_Do_ext_dusk.cpp
         src/dusk/imgui/ImGuiConfig.hpp
         src/dusk/imgui/ImGuiConsole.hpp
         src/dusk/imgui/ImGuiConsole.cpp
         src/dusk/imgui/ImGuiEngine.cpp
         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/ImGuiActorSpawner.cpp
+        src/dusk/imgui/ImGuiPreLaunchWindow.cpp
+        src/dusk/imgui/ImGuiPreLaunchWindow.hpp
+        src/dusk/imgui/ImGuiFirstRunPreset.hpp
+        src/dusk/imgui/ImGuiFirstRunPreset.cpp
         src/dusk/imgui/ImGuiProcessOverlay.cpp
         src/dusk/imgui/ImGuiCameraOverlay.cpp
         src/dusk/imgui/ImGuiHeapOverlay.cpp
+        src/dusk/imgui/ImGuiDebugPad.cpp
         src/dusk/imgui/ImGuiControllerOverlay.cpp
         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/ui/achievements.cpp
+        src/dusk/imgui/ImGuiAchievements.hpp
-        src/dusk/ui/achievements.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/graphics_tuner.cpp
-        src/dusk/ui/graphics_tuner.hpp
         src/dusk/ui/input.cpp
         src/dusk/ui/input.hpp
-        src/dusk/ui/modal.cpp
-        src/dusk/ui/modal.hpp
         src/dusk/ui/nav_types.hpp
         src/dusk/ui/number_button.cpp
         src/dusk/ui/number_button.hpp
@@ -1504,14 +1484,12 @@ set(DUSK_FILES
         src/dusk/ui/overlay.hpp
         src/dusk/ui/pane.cpp
         src/dusk/ui/pane.hpp
-        src/dusk/ui/menu_bar.cpp
+        src/dusk/ui/popup.cpp
-        src/dusk/ui/menu_bar.hpp
+        src/dusk/ui/popup.hpp
         src/dusk/ui/prelaunch.cpp
         src/dusk/ui/prelaunch.hpp
-        src/dusk/ui/preset.cpp
+        src/dusk/ui/prelaunch_options.cpp
-        src/dusk/ui/preset.hpp
+        src/dusk/ui/prelaunch_options.hpp
-        src/dusk/ui/reporting.cpp
-        src/dusk/ui/reporting.hpp
         src/dusk/ui/select_button.cpp
         src/dusk/ui/select_button.hpp
         src/dusk/ui/settings.cpp
@@ -1522,8 +1500,6 @@ set(DUSK_FILES
         src/dusk/ui/tab_bar.hpp
         src/dusk/ui/ui.cpp
         src/dusk/ui/ui.hpp
-        src/dusk/ui/warp.cpp
-        src/dusk/ui/warp.hpp
         src/dusk/ui/window.cpp
         src/dusk/ui/window.hpp
         src/dusk/achievements.cpp
@@ -1534,16 +1510,6 @@ set(DUSK_FILES
         src/dusk/OSReport.cpp
         src/dusk/OSThread.cpp
         src/dusk/OSMutex.cpp
-        src/dusk/discord.cpp
-        src/dusk/discord.hpp
         src/dusk/discord_presence.cpp
         src/dusk/version.cpp
-        src/dusk/action_bindings.cpp
-)
-
-set(DUSK_HTTP_BACKEND_FILES
-        src/dusk/http/no_backend.cpp
-        src/dusk/http/curl.cpp
-        src/dusk/http/winhttp.cpp
-        src/dusk/http/url_session.mm
 )

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778869304,
+        "lastModified": 1775710090,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,374 +1,33 @@
 {
-  description = "Dusklight — native PC port of the Twilight Princess decompilation";
+  inputs = {
-
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  inputs.nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+  };
-
+  outputs = { self, nixpkgs }:
-  outputs =
-    { self, nixpkgs }:
     let
-      inherit (nixpkgs) lib;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
-
+      dusk = pkgs.stdenv.mkDerivation {
-      supportedSystems = [
+        name = "dusk";
-        "x86_64-linux"
+        src = ./.;
-        "aarch64-linux"
+        nativeBuildInputs = [
-        "x86_64-darwin"
+          pkgs.cmake
-        "aarch64-darwin"
+          pkgs.pkg-config
-      ];
+          pkgs.wayland
-      forAllSystems = lib.genAttrs supportedSystems;
+        ];
-
+        buildInputs = [
-      dawnVersion = "v20260423.175430";
+          pkgs.libGL
-      nodVersion = "v2.0.0-alpha.8";
+          pkgs.libX11
-      versionSuffix = "nix-" + (self.shortRev or self.dirtyShortRev or "dirty");
+          pkgs.libXcursor
-
+          pkgs.libxi
-      dawnInfo = {
+          pkgs.libxcb
-        "x86_64-linux" = {
+          pkgs.libxrandr
-          triple = "linux-x86_64";
+          pkgs.libxscrnsaver
-          hash = "sha256-HXfKTLHtMPwupnFnaflCARtXVPuS/0PoCePXidjE5xs=";
+          pkgs.libxtst
-        };
+          pkgs.libjpeg8
-        "aarch64-linux" = {
+          pkgs.libxkbcommon
-          triple = "linux-aarch64";
+          pkgs.libglvnd
-          hash = "sha256-34yyFpfqBZUwoFXQ41F0AwAU78FaNihOSY0oriwn6B0=";
+        ];
-        };
-        "aarch64-darwin" = {
-          triple = "darwin-arm64";
-          hash = "sha256-eQnzrBp6gjiBek1VYQ9A5W13ClYWrDDKjIqv/7eNTR4=";
-        };
-        "x86_64-darwin" = {
-          triple = "darwin-x86_64";
-          hash = "sha256-QGWiGdxiI9kci3NPXH6QFFirxn16851zB/w3jqhIBJ4=";
-        };
       };
-
+    in {
-      nodPrebuiltInfo = {
+      packages.x86_64-linux.default = dusk;
-        "x86_64-linux" = {
-          triple = "linux-x86_64";
-          hash = "sha256-mUqvLsbsqaZ+HAjMmHYPYO+MgtanGRTw7Gzn5uXR5rE=";
-        };
-        "aarch64-darwin" = {
-          triple = "macos-arm64";
-          hash = "sha256-UPy1ywCcv0K6VJOU3uUelJuUdBh3UNaPRlyP5LOBeDw=";
-        };
-      };
-
-      perSystem =
-        system:
-        let
-          pkgs = import nixpkgs { inherit system; };
-          inherit (pkgs.stdenv.hostPlatform) isDarwin;
-          hasNodPrebuilt = nodPrebuiltInfo ? ${system};
-
-          aurora = pkgs.fetchFromGitHub {
-            owner = "encounter";
-            repo = "aurora";
-            rev = "10006618ee493f248b8597e4dfa1d2871d76a1d9";
-            hash = "sha256-lY2xuVyB7aPJ9+2wwLRB3F5U/BuPSxdSpegdG+qNd9o=";
-          };
-
-          dawn = pkgs.fetchzip {
-            url = "https://github.com/encounter/dawn-build/releases/download/${dawnVersion}/dawn-${dawnInfo.${system}.triple}.tar.gz";
-            hash = dawnInfo.${system}.hash;
-            stripRoot = false;
-          };
-
-          corrosion = pkgs.fetchFromGitHub {
-            owner = "corrosion-rs";
-            repo = "corrosion";
-            rev = "v0.6.1";
-            hash = "sha256-ppuDNObfKhneD9AlnPAvyCRHKW3BidXKglD1j/LE9CM=";
-          };
-
-          nodFromSource = pkgs.stdenv.mkDerivation (finalAttrs: {
-            pname = "nod";
-            version = nodVersion;
-            src = pkgs.fetchFromGitHub {
-              owner = "encounter";
-              repo = "nod";
-              rev = nodVersion;
-              hash = "sha256-+zrtVzjo0+X/6uMcNUn1+FaSR+jOhrcQSDNBFjw0NDs=";
-            };
-            cargoDeps = pkgs.rustPlatform.importCargoLock {
-              lockFile = "${finalAttrs.src}/Cargo.lock";
-            };
-            postPatch = ''
-              substituteInPlace CMakeLists.txt \
-                --replace-warn "add_subdirectory(nod-ffi/examples)" ""
-            '';
-            nativeBuildInputs = [
-              pkgs.cmake
-              pkgs.ninja
-              pkgs.rustPlatform.cargoSetupHook
-              pkgs.cargo
-              pkgs.rustc
-            ];
-            CARGO_NET_OFFLINE = "true";
-            cmakeFlags = [
-              "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
-              "-DFETCHCONTENT_SOURCE_DIR_CORROSION=${corrosion}"
-              "-DNOD_ENABLE_INSTALL=ON"
-              "-DBUILD_SHARED_LIBS=OFF"
-            ];
-            doCheck = false;
-          });
-
-          nod =
-            if hasNodPrebuilt then
-              pkgs.fetchzip {
-                url = "https://github.com/encounter/nod/releases/download/${nodVersion}/libnod-${
-                  nodPrebuiltInfo.${system}.triple
-                }.tar.gz";
-                hash = nodPrebuiltInfo.${system}.hash;
-                stripRoot = false;
-              }
-            else
-              nodFromSource;
-
-          fetchContentDirs = {
-            DAWN_PREBUILT = dawn;
-            NOD_PREBUILT = nod;
-            CXXOPTS = pkgs.cxxopts.src;
-            JSON = pkgs.nlohmann_json.src;
-            XXHASH = pkgs.xxHash.src;
-            ZSTD = pkgs.zstd.src;
-            FMT = pkgs.fetchzip {
-              url = "https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.tar.gz";
-              hash = "sha256-sUbxlYi/Aupaox3JjWFqXIjcaQa0LFjclQAOleT+FRA=";
-            };
-            TRACY = pkgs.fetchzip {
-              url = "https://github.com/wolfpld/tracy/archive/a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz";
-              hash = "sha256-hbNGOsGeyGSvCJ2No8RkwOib1lX2on3vNZSzyVkZdXw=";
-            };
-            IMGUI = pkgs.fetchFromGitHub {
-              owner = "ocornut";
-              repo = "imgui";
-              rev = "v1.91.9b-docking";
-              hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ=";
-            };
-            SQLITE3 = pkgs.fetchzip {
-              url = "https://sqlite.org/2026/sqlite-amalgamation-3510300.zip";
-              hash = "sha256-pNMR8zxaaqfAzQ0AQBOXMct4usdjey1Q0Gnitg06UhM=";
-            };
-            RMLUI = pkgs.fetchzip {
-              url = "https://github.com/mikke89/RmlUi/archive/f9b8c9e2935d5df2c7dff2c190d3968e99b0c3dc.tar.gz";
-              hash = "sha256-g4O/JZUrrcseOz8o2QJRt+2CeuiLnVeuDJc906xvuIg=";
-            };
-          };
-
-          dusklight = pkgs.stdenv.mkDerivation {
-            pname = "dusklight";
-            version = versionSuffix;
-            src = ./.;
-
-            postUnpack = ''
-              chmod -R u+w "$sourceRoot"
-              rm -rf "$sourceRoot/extern/aurora"
-              mkdir -p "$sourceRoot/extern"
-              cp -r ${aurora} "$sourceRoot/extern/aurora"
-              chmod -R u+w "$sourceRoot/extern/aurora"
-              substituteInPlace "$sourceRoot/extern/aurora/CMakeLists.txt" \
-                --replace-warn "add_subdirectory(tests)" ""
-            '';
-
-            nativeBuildInputs = [
-              pkgs.cmake
-              pkgs.ninja
-              pkgs.pkg-config
-              pkgs.python3
-              pkgs.python3Packages.markupsafe
-            ]
-            ++ lib.optionals (!isDarwin) [ pkgs.autoPatchelfHook ];
-
-            buildInputs = [
-              pkgs.sdl3
-              pkgs.freetype
-              pkgs.zstd
-              pkgs.cxxopts
-              pkgs.nlohmann_json
-              pkgs.xxHash
-              pkgs.abseil-cpp
-              pkgs.zlib
-              pkgs.libpng
-              pkgs.libjpeg_turbo
-              pkgs.curl
-              pkgs.openssl
-            ]
-            ++ lib.optionals isDarwin [
-              pkgs.apple-sdk_15
-              pkgs.libiconv
-            ]
-            ++ lib.optionals (!isDarwin) [
-              pkgs.libGL
-              pkgs.libGLU
-              pkgs.libglvnd
-              pkgs.vulkan-loader
-              pkgs.libX11
-              pkgs.libxcb
-              pkgs.libXcursor
-              pkgs.libxi
-              pkgs.libxrandr
-              pkgs.libxscrnsaver
-              pkgs.libxtst
-              pkgs.libxinerama
-              pkgs.libxkbcommon
-              pkgs.wayland
-              pkgs.libdecor
-              pkgs.alsa-lib
-              pkgs.libpulseaudio
-              pkgs.pipewire
-              pkgs.dbus
-              pkgs.udev
-              pkgs.libusb1
-              pkgs.libunwind
-              pkgs.gtk3
-            ];
-
-            cmakeBuildType = "RelWithDebInfo";
-            ninjaFlags = [ "dusklight" ];
-
-            cmakeFlags = [
-              "-DDUSK_VERSION_OVERRIDE=${versionSuffix}"
-              "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
-              "-DAURORA_DAWN_PROVIDER=package"
-              "-DAURORA_DAWN_LINKAGE=static"
-              "-DAURORA_NOD_PROVIDER=package"
-              "-DAURORA_NOD_LINKAGE=static"
-              "-DAURORA_SDL3_PROVIDER=system"
-            ]
-            ++ lib.mapAttrsToList (key: src: "-DFETCHCONTENT_SOURCE_DIR_${key}=${src}") fetchContentDirs;
-
-            installPhase =
-              if isDarwin then
-                ''
-                  runHook preInstall
-                  mkdir -p "$out/Applications"
-                  cp -r Dusklight.app "$out/Applications/Dusklight.app"
-                  runHook postInstall
-                ''
-              else
-                ''
-                  runHook preInstall
-                  install -Dm755 dusklight "$out/bin/dusklight"
-                  cp -r "$src/res" "$out/bin/res"
-                  install -Dm644 "$src/platforms/freedesktop/dev.twilitrealm.dusk.desktop" \
-                    "$out/share/applications/dev.twilitrealm.dusk.desktop"
-                  for size in 16 32 48 64 128 256 512 1024; do
-                    install -Dm644 "$src/platforms/freedesktop/''${size}x''${size}/apps/dev.twilitrealm.dusk.png" \
-                      "$out/share/icons/hicolor/''${size}x''${size}/apps/dev.twilitrealm.dusk.png"
-                  done
-                  runHook postInstall
-                '';
-
-            dontStrip = true;
-
-            meta = {
-              description = "Dusklight — native PC port of the Twilight Princess decompilation";
-              homepage = "https://github.com/zeldaret/tp";
-              platforms = supportedSystems;
-              mainProgram = "dusklight";
-            };
-          };
-
-          # Tooling common to every supported host (Linux and macOS).
-          commonDevTools = [
-            pkgs.cmake
-            pkgs.ninja
-            pkgs.pkg-config
-            pkgs.git
-            pkgs.python3
-            pkgs.python3Packages.markupsafe
-            pkgs.rustc
-            pkgs.cargo
-            pkgs.sccache
-          ];
-
-          # Linux-only system libraries — mirrors the apt deps from .github/workflows/build.yml
-          # so the cmake presets resolve the same set of headers as CI.
-          linuxDevDeps = [
-            # Compilers / linkers
-            pkgs.clang
-            pkgs.lld
-            # C/C++ utilities
-            pkgs.curl
-            pkgs.openssl
-            pkgs.zlib
-            pkgs.libpng
-            pkgs.libjpeg_turbo
-            pkgs.freetype
-            pkgs.zstd
-            pkgs.fmt
-            pkgs.tracy
-            pkgs.cxxopts
-            pkgs.abseil-cpp
-            pkgs.sdl3
-            pkgs.ncurses
-            pkgs.libunwind
-            pkgs.libusb1
-            pkgs.fuse
-            # Wayland / display server
-            pkgs.wayland
-            pkgs.wayland-protocols
-            pkgs.libxkbcommon
-            pkgs.libdecor
-            # OpenGL / Vulkan
-            pkgs.libGL
-            pkgs.libGLU
-            pkgs.libglvnd
-            pkgs.vulkan-headers
-            pkgs.vulkan-loader
-            # X11
-            pkgs.libX11
-            pkgs.libxcb
-            pkgs.libXcursor
-            pkgs.libxi
-            pkgs.libxrandr
-            pkgs.libxscrnsaver
-            pkgs.libxtst
-            pkgs.libxinerama
-            # Audio
-            pkgs.alsa-lib
-            pkgs.libpulseaudio
-            pkgs.pipewire
-            # System integration
-            pkgs.dbus
-            pkgs.udev
-            pkgs.gtk3
-          ];
-
-          # On macOS we deliberately avoid pulling Nix's cc-wrapper so CMake picks up
-          # Apple Clang and the Xcode SDK directly, matching the macOS CI workflow.
-          darwinShell = pkgs.mkShellNoCC {
-            packages = commonDevTools;
-            shellHook = ''
-              echo "Dusklight dev shell (macOS)"
-              echo "Requires Xcode Command Line Tools for Apple Clang and the macOS SDK."
-              echo "Configure: cmake --preset macos-default-relwithdebinfo"
-              echo "Build:     cmake --build --preset macos-default-relwithdebinfo"
-            '';
-          };
-
-          linuxShell = pkgs.mkShell {
-            packages = commonDevTools ++ linuxDevDeps;
-            shellHook = ''
-              echo "Dusklight dev shell (Linux)"
-              echo "Configure: cmake --preset linux-default-relwithdebinfo"
-              echo "           cmake --preset linux-clang-relwithdebinfo"
-              echo "Build:     cmake --build --preset <preset>"
-            '';
-          };
-        in
-        {
-          packages = {
-            default = dusklight;
-            dusklight = dusklight;
-          }
-          // lib.optionalAttrs (!hasNodPrebuilt) { nod = nodFromSource; };
-
-          devShells.default = if isDarwin then darwinShell else linuxShell;
-        };
-
-      systems = forAllSystems perSystem;
-    in
-    {
-      packages = lib.mapAttrs (_: s: s.packages) systems;
-      devShells = lib.mapAttrs (_: s: s.devShells) systems;
     };
 }

include/SSystem/SComponent/c_lib.h

@@ -98,7 +98,7 @@ T cLib_calcTimer(T* value) {
 void MtxInit(void);
 void MtxTrans(f32, f32, f32, u8);
 void MtxScale(f32, f32, f32, u8);
-void MtxPosition(cXyz DUSK_CONST*, cXyz*);
+void MtxPosition(cXyz*, cXyz*);
 void MtxPush(void);
 void MtxPull(void);
 

include/SSystem/SComponent/c_xyz.h

@@ -45,17 +45,17 @@ struct cXyz : Vec {
     ~cXyz() = default;
     cXyz(const cXyz& vec) = default;
 #endif
-    DUSK_CONSTEXPR cXyz(f32 x, f32 y, f32 z) {
+    cXyz(f32 x, f32 y, f32 z) {
         this->x = x;
         this->y = y;
         this->z = z;
     }
-    DUSK_CONSTEXPR cXyz(const Vec& vec) {
+    cXyz(const Vec& vec) {
         this->x = vec.x;
         this->y = vec.y;
         this->z = vec.z;
     }
-    DUSK_CONSTEXPR cXyz& operator=(const Vec& vec) {
+    cXyz& operator=(const Vec& vec) {
         this->x = vec.x;
         this->y = vec.y;
         this->z = vec.z;

include/Z2AudioLib/Z2StatusMgr.h

@@ -14,7 +14,7 @@ struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
     void menuIn();
     void menuOut();
     bool isMovieDemo();
-    void setDemoName(DUSK_CONST char* demoName);
+    void setDemoName(char* demoName);
     void processTime();
     bool checkDayTime();
     void setEventBit(void* eventBit);

include/d/actor/d_a_alink.h

@@ -4545,26 +4545,13 @@ public:
     /* 0x03840 */ cXyz* mIronBallChainPos;
     /* 0x03844 */ csXyz* mIronBallChainAngle;
     /* 0x03848 */ cXyz* field_0x3848;
-    /* 0x0384C */ cXyz DUSK_CONST* field_0x384c;
+    /* 0x0384C */ cXyz* field_0x384c;
     /* 0x03850 */ daAlink_procFunc mpProcFunc;
 
 #if TARGET_PC
     void handleWolfHowl();
     void handleQuickTransform();
     bool checkGyroAimContext();
-
-    void onIronBallChainInterpCallback();
-
-    static const int IRON_BALL_CHAIN_COUNT = 102;
-    cXyz mIBChainInterpPrevPos[IRON_BALL_CHAIN_COUNT];
-    cXyz mIBChainInterpCurrPos[IRON_BALL_CHAIN_COUNT];
-    csXyz mIBChainInterpPrevAngle[IRON_BALL_CHAIN_COUNT];
-    csXyz mIBChainInterpCurrAngle[IRON_BALL_CHAIN_COUNT];
-    cXyz mIBChainInterpPrevHandRoot;
-    cXyz mIBChainInterpCurrHandRoot;
-    bool mIBChainInterpPrevValid;
-    bool mIBChainInterpCurrValid;
-    bool mIsRollstab = false;
 #endif
 };  // Size: 0x385C
 

include/d/actor/d_a_b_tn.h

@@ -203,7 +203,7 @@ private:
     /* 0x0AAD */ bool mStayNo2Flag;
     /* 0x0AAE */ u8 mBlendStatus;
     /* 0x0AB0 */ f32 mBlend;
-    /* 0x0AB4 */ char DUSK_CONST* mArcName;
+    /* 0x0AB4 */ char* mArcName;
     /* 0x0AB8 */ dBgS_AcchCir mAcchCir;
     /* 0x0AF8 */ dBgS_ObjAcch mAcch;
     /* 0x0CD0 */ dBgS_AcchCir mAcchCirArr[16];

include/d/actor/d_a_door_boss.h

@@ -23,10 +23,10 @@ public:
         /* 3 */ ACT_END,
     };
 
-    DUSK_CONST char* getArcName();
+    char* getArcName();
-    DUSK_CONST char* getBmd();
+    char* getBmd();
-    DUSK_CONST char* getDzb();
+    char* getDzb();
-    DUSK_CONST char* getBmd2();
+    char* getBmd2();
     J3DModelData* getDoorModelData();
     int CreateHeap();
     void calcMtx();

include/d/actor/d_a_door_bossL1.h

@@ -33,8 +33,8 @@ public:
 
     typedef int (daBdoorL1_c::*actionFunc)();
 
-    DUSK_CONST char* getDoorEventName();
+    char* getDoorEventName();
-    DUSK_CONST char* getDoorEventName2();
+    char* getDoorEventName2();
     const char* getArcName();
     const char* getAnmArcName();
     int getDoorType();

include/d/actor/d_a_door_dbdoor00.h

@@ -14,11 +14,11 @@
  */
 class daDbDoor00_c : public fopAc_ac_c {
 public:
-    DUSK_CONST char* getAlwaysArcName();
+    char* getAlwaysArcName();
-    DUSK_CONST char* getDzb();
+    char* getDzb();
-    DUSK_CONST char* getDummyBmdName();
+    char* getDummyBmdName();
-    DUSK_CONST char* getBmdArcName();
+    char* getBmdArcName();
-    DUSK_CONST char* getBmdName();
+    char* getBmdName();
     J3DModelData* getDoorModelData();
     int CreateHeap();
     void calcMtx();

include/d/actor/d_a_door_knob00.h

@@ -29,11 +29,11 @@ public:
 
     typedef int (daKnob20_c::*actionFunc)();
 
-    DUSK_CONST char* getAlwaysArcName();
+    char* getAlwaysArcName();
-    DUSK_CONST char* getEvArcName();
+    char* getEvArcName();
-    DUSK_CONST char* getDzb();
+    char* getDzb();
-    DUSK_CONST char* getDummyBmd();
+    char* getDummyBmd();
-    DUSK_CONST char* getBmd();
+    char* getBmd();
     J3DModelData* getDoorModelData();
     int CreateHeap();
     void calcMtx();

include/d/actor/d_a_door_mbossL1.h

@@ -54,15 +54,15 @@ public:
 
     typedef int (daMBdoorL1_c::*actionFunc)();
 
-    DUSK_CONST char* getAnmArcName();
+    char* getAnmArcName();
-    DUSK_CONST char* getArcName();
+    char* getArcName();
-    DUSK_CONST char* getAlwaysArcName();
+    char* getAlwaysArcName();
     int getDoorType();
-    DUSK_CONST char* getOpenAnm();
+    char* getOpenAnm();
-    DUSK_CONST char* getCloseAnm();
+    char* getCloseAnm();
-    DUSK_CONST char* getBmd();
+    char* getBmd();
-    DUSK_CONST char* getBtk();
+    char* getBtk();
-    DUSK_CONST char* getDzb();
+    char* getDzb();
     J3DModelData* getDoorModelData();
     int CreateHeap();
     void calcMtx();

include/d/actor/d_a_door_shutter.h

@@ -45,12 +45,12 @@ public:
         ACTION_DEMO,
     };
 
-    char DUSK_CONST* getStopBmdName();
+    char* getStopBmdName();
     J3DModelData* getStopModelData();
-    char DUSK_CONST* getAlwaysArcName();
+    char* getAlwaysArcName();
-    char DUSK_CONST* getArcName();
+    char* getArcName();
-    char DUSK_CONST* getBmdName();
+    char* getBmdName();
-    char DUSK_CONST* getBtk();
+    char* getBtk();
     J3DModelData* getModelData();
     f32 getSize2X();
     int CreateHeap();
@@ -115,7 +115,7 @@ public:
     int chkStopOpen();
     int chkMakeKey();
 
-    virtual char DUSK_CONST* getDzbName();
+    virtual char* getDzbName();
     virtual int getDemoAction();
 
     void onFlag(u16 flag) { field_0x68e |= flag; }

include/d/actor/d_a_e_arrow.h

@@ -32,7 +32,7 @@ public:
     /* 0x5B4 */ J3DModel* mpModel;
     /* 0x5B8 */ u8 mArrowType;
     /* 0x5B9 */ u8 mFlags;
-    /* 0x5BC */ char DUSK_CONST* mResName;
+    /* 0x5BC */ char* mResName;
     /* 0x5C0 */ s16 field_0x5c0;
     /* 0x5C2 */ s16 mAction;
     /* 0x5C4 */ s16 mMode;

include/d/actor/d_a_e_ba.h

@@ -60,7 +60,7 @@ public:
     /* 0x5B5 */ u8 mDistanceParam;
     /* 0x5B6 */ u8 mType;
     /* 0x5B7 */ u8 mPathIndex;
-    /* 0x5B8 */ DUSK_CONST char* mArcName;
+    /* 0x5B8 */ char* mArcName;
     /* 0x5BC */ u8 field_0x5bc;
     /* 0x5BD */ s8 mPathPoint;
     /* 0x5BE */ s8 mPathStep;

include/d/actor/d_a_e_db.h

@@ -80,12 +80,6 @@ public:
     /* 0x125C */ u32 field_0x125c;
     /* 0x1260 */ u8 field_0x1260[0x126C - 0x1260];
     /* 0x126C */ u8 HIOInit;
-#if TARGET_PC
-    cXyz mStalkLineInterpPrev[12];
-    cXyz mStalkLineInterpCurr[12];
-    bool mStalkLineInterpPrevValid;
-    bool mStalkLineInterpCurrValid;
-#endif
 };
 
 STATIC_ASSERT(sizeof(e_db_class) == 0x1270);

include/d/actor/d_a_e_hb.h

@@ -73,12 +73,6 @@ public:
     /* 0x124C */ f32 field_0x124c;
     /* 0x1250 */ u8 field_0x1250[0x1264 - 0x1250];
     /* 0x1264 */ u8 HIOInit;
-#if TARGET_PC
-    cXyz mStalkLineInterpPrev[12];
-    cXyz mStalkLineInterpCurr[12];
-    bool mStalkLineInterpPrevValid;
-    bool mStalkLineInterpCurrValid;
-#endif
 };
 
 STATIC_ASSERT(sizeof(e_hb_class) == 0x1268);

include/d/actor/d_a_e_rd.h

@@ -38,7 +38,7 @@ public:
     /* 0x05CC */ s16 target_ya;
     /* 0x05D0 */ mDoExt_McaMorfSO* anm_p;
     /* 0x05D4 */ Z2CreatureEnemy sound;
-    /* 0x0678 */ DUSK_CONST char* resName;
+    /* 0x0678 */ char* resName;
     /* 0x067C */ int anm;
     /* 0x0680 */ int field_0x680;
     /* 0x0684 */ dJntCol_c mJntCol;

include/d/actor/d_a_e_rdy.h

@@ -36,7 +36,7 @@ public:
     /* 0x05C8 */ s16 mTargetAngleY;
     /* 0x05CC */ mDoExt_McaMorfSO* mpMorf;
     /* 0x05D0 */ Z2CreatureEnemy mSound;
-    /* 0x0674 */ char DUSK_CONST* mpArcName;
+    /* 0x0674 */ char* mpArcName;
     /* 0x0678 */ int mAnm;
     /* 0x067C */ u8 field_0x67c[0x680 - 0x67c];
     /* 0x0680 */ dJntCol_c mJntCol;

include/d/actor/d_a_e_s1.h

@@ -81,15 +81,6 @@ public:
     /* 0x306D */ u8 field_0x306D[0x307C - 0x306D];
     /* 0x307C */ u32 mBodyEffEmtrID;
     /* 0x3080 */ u8 mInitHIO;
-
-#if TARGET_PC
-    static const int HAIR_STRAND_COUNT = 22;
-    static const int HAIR_SEGMENT_COUNT = 16;
-    cXyz mHairInterpPrev[HAIR_STRAND_COUNT * HAIR_SEGMENT_COUNT];
-    cXyz mHairInterpCurr[HAIR_STRAND_COUNT * HAIR_SEGMENT_COUNT];
-    bool mHairInterpPrevValid;
-    bool mHairInterpCurrValid;
-#endif
 };
 
 STATIC_ASSERT(sizeof(e_s1_class) == 0x3084);

include/d/actor/d_a_e_tt.h

@@ -63,7 +63,7 @@ private:
     /* 0x6D4 */ f32 field_0x6d4;
     /* 0x6D8 */ s16 mFootJoints[4];
     /* 0x6E0 */ s16 field_0x6e0;
-    /* 0x6E4 */ char DUSK_CONST* mpResName;
+    /* 0x6E4 */ char* mpResName;
     /* 0x6E8 */ u16 mDamageCooldownTimer;
     /* 0x6EA */ u8 mGenericTimer;
     /* 0x6EC */ int mAttackTimer;

include/d/actor/d_a_e_wb.h

@@ -99,7 +99,7 @@ public:
     /* 0x0000 */ fopEn_enemy_c enemy;                   ///< @brief Base enemy class instance.
     /* 0x05AC */ request_of_phase_process_class phase;  ///< @brief Phase process request handler.
     /* 0x05B4 */ s16 ride_mode;  ///< @brief Current sub-action mode within the run action.
-    /* 0x05B8 */ char DUSK_CONST* resName;   ///< @brief Resource name for loading models/animations.
+    /* 0x05B8 */ char* resName;   ///< @brief Resource name for loading models/animations.
     /* 0x05BC */ u8 arg0;        ///< @brief Creation parameter 1.
     /* 0x05BD */ u8 arg1;       ///< @brief Creation parameter 2.
     /* 0x05BE */ u8 field_0x5be;

include/d/actor/d_a_e_yd.h

@@ -74,12 +74,6 @@ public:
     /* 0x1250 */ f32 field_0x1250;
     /* 0x1254 */ u8 field_0x1254[0x1268 - 0x1254];
     /* 0x1268 */ u8 field_0x1268;
-#if TARGET_PC
-    cXyz mLineMatInterpPrev[12];
-    cXyz mLineMatInterpCurr[12];
-    bool mLineMatInterpPrevValid;
-    bool mLineMatInterpCurrValid;
-#endif
 };
 
 STATIC_ASSERT(sizeof(e_yd_class) == 0x126c);

include/d/actor/d_a_e_yg.h

@@ -63,15 +63,6 @@ public:
     /* 0x0BB4 */ yg_ke_s mYgKes[13];
     /* 0x1880 */ mDoExt_3DlineMat0_c mLineMat;
     /* 0x189C */ u8 mIsFirstSpawn;
-
-#if TARGET_PC
-    static const int TENTACLE_STRAND_COUNT = 13;
-    static const int TENTACLE_SEGMENT_COUNT = 10;
-    cXyz mTentacleInterpPrev[TENTACLE_STRAND_COUNT * TENTACLE_SEGMENT_COUNT];
-    cXyz mTentacleInterpCurr[TENTACLE_STRAND_COUNT * TENTACLE_SEGMENT_COUNT];
-    bool mTentacleInterpPrevValid;
-    bool mTentacleInterpCurrValid;
-#endif
 };
 
 STATIC_ASSERT(sizeof(e_yg_class) == 0x18a0);

include/d/actor/d_a_e_yh.h

@@ -77,12 +77,6 @@ public:
     /* 0x1260 */ u32 field_0x1260;
     /* 0x1260 */ u8 field_0x1264[0x1270 - 0x1264];
     /* 0x1270 */ bool mIsHIOOwner;
-#if TARGET_PC
-    cXyz mLineInterpPrev[12];
-    cXyz mLineInterpCurr[12];
-    bool mLineInterpPrevValid;
-    bool mLineInterpCurrValid;
-#endif
 };
 
 STATIC_ASSERT(sizeof(e_yh_class) == 0x1274);

include/d/actor/d_a_kago.h

@@ -213,8 +213,8 @@ private:
     /* 0x750 */ int field_0x750;
     /* 0x754 */ int field_0x754;
     /* 0x758 */ int field_0x758;
-    /* 0x75C */ DUSK_CONST char* mArcName;
+    /* 0x75C */ char* mArcName;
-    /* 0x760 */ DUSK_CONST char* mDemoName;
+    /* 0x760 */ char* mDemoName;
     /* 0x764 */ u32 mShadowId;
     /* 0x768 */ dPath* mpPath1;
     /* 0x76C */ dPath* mpPath2;

include/d/actor/d_a_mg_fish.h

@@ -49,7 +49,7 @@ public:
     /* 0x5F4 */ s16 mYawToPlayer;
     /* 0x5F6 */ s16 field_0x5f6;
     /* 0x5F8 */ s16 field_0x5f8;
-    /* 0x5FC */ DUSK_CONST char* mResName;
+    /* 0x5FC */ char* mResName;
     /* 0x600 */ mDoExt_McaMorf* mpMorf;
     /* 0x604 */ J3DAnmTransform* mAnmTransform;
     /* 0x608 */ u32 mShadowId;

include/d/actor/d_a_mg_rod.h

@@ -90,7 +90,7 @@ public:
 
     /* 0x0000 */ fopAc_ac_c actor;
     /* 0x0568 */ request_of_phase_process_class phase;
-    /* 0x0570 */ DUSK_CONST char* arcname;
+    /* 0x0570 */ char* arcname;
     /* 0x0574 */ u8 arg0;
     /* 0x0575 */ u8 arg1;
     /* 0x0576 */ u8 arg2;

include/d/actor/d_a_movie_player.h

@@ -5,7 +5,6 @@
 #include <thp.h>
 #else
 #include <atomic>
-#include <chrono>
 #endif
 #include "f_op/f_op_actor.h"
 #include "d/d_drawlist.h"
@@ -126,7 +125,6 @@ struct daMP_THPPlayer {
 	/* 0x0D4 */ s32 curCount;
 #if TARGET_PC
 	/* 0x0D8 */ std::atomic<s32> videoDecodeCount;
-	std::chrono::steady_clock::time_point thpPlaybackClock;
 #else
 	/* 0x0D8 */ s32 videoDecodeCount;
 #endif

include/d/actor/d_a_myna.h

@@ -103,8 +103,8 @@ public:
     void animePlay();
     int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
     void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
-    J3DAnmTransformKey* getTrnsfrmKeyAnm(DUSK_CONST char*);
+    J3DAnmTransformKey* getTrnsfrmKeyAnm(char*);
-    J3DAnmTexPattern* getTexPtrnAnm(DUSK_CONST char*);
+    J3DAnmTexPattern* getTexPtrnAnm(char*);
     int checkEndAnm(J3DFrameCtrl*);
     int checkEndAnm(f32);
     u8 getItemNumMax();

include/d/actor/d_a_npc.h

@@ -519,7 +519,7 @@ public:
     /* 0x568 */ daNpcT_faceMotionAnmData_c const* mpFaceMotionAnmData;
     /* 0x56C */ daNpcT_motionAnmData_c const* mpMotionAnmData;
     /* 0x570 */ daNpcT_evtData_c const* mpEvtData;
-    /* 0x574 */ DUSK_CONST char* DUSK_CONST* mpArcNames;
+    /* 0x574 */ char** mpArcNames;
     /* 0x578 */ mDoExt_McaMorfSO* mpMorf[2];
     /* 0x580 */ Z2Creature mSound;
     /* 0x610 */ mDoExt_bckAnm mBckAnm;
@@ -627,7 +627,7 @@ public:
              daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
              int i_faceMotionStepNum,
              daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
-             int i_motionStepNum, daNpcT_evtData_c const* i_evtData, DUSK_CONST char* DUSK_CONST* i_arcNames)
+             int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         :
         mpFaceMotionAnmData(i_faceMotionAnmData),
         mpMotionAnmData(i_motionAnmData),
@@ -654,8 +654,8 @@ public:
     int setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
     int setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int);
     int setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int);
-    int loadRes(s8 const*, char const* DUSK_CONST*);
+    int loadRes(s8 const*, char const**);
-    void deleteRes(s8 const*, char const* DUSK_CONST*);
+    void deleteRes(s8 const*, char const**);
     int execute();
     int draw(BOOL, BOOL, f32, GXColorS10*, f32, BOOL, BOOL, BOOL);
     void setEnvTevColor();

include/d/actor/d_a_npc2.h

@@ -86,12 +86,12 @@ public:
 class daBaseNpc_c : public fopAc_ac_c {
 public:
     daBaseNpc_c();
-    J3DAnmTransform* getTrnsfrmKeyAnmP(char DUSK_CONST*, int);
+    J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
     int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
     int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
-    J3DAnmTransform* getTexPtrnAnmP(char DUSK_CONST*, int);
+    J3DAnmTransform* getTexPtrnAnmP(char*, int);
     int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
-    void orderEvent(int, char DUSK_CONST*);
+    void orderEvent(int, char*);
     void setEnvTevColor();
     void setRoomNo();
     int checkEndAnm(f32);
@@ -128,7 +128,7 @@ public:
     /* 0x808 */ mDoExt_btpAnm mBtp;
     /* 0x820 */ mDoExt_btkAnm mBtk;
     /* 0x838 */ s16 field_0x838;
-    /* 0x83C */ u16 DUSK_CONST* field_0x83c;
+    /* 0x83C */ u16* field_0x83c;
     /* 0x840 */ u16 field_0x840;
     /* 0x842 */ u16 field_0x842;
     /* 0x844 */ u8 field_0x844;

include/d/actor/d_a_npc4.h

@@ -311,10 +311,10 @@ public:
     static void* srchActor(void*, void*);
 
     void initialize();
-    J3DAnmTransformKey* getTrnsfrmKeyAnmP(DUSK_CONST char*, int);
+    J3DAnmTransformKey* getTrnsfrmKeyAnmP(char*, int);
-    J3DAnmTexPattern* getTexPtrnAnmP(DUSK_CONST char*, int);
+    J3DAnmTexPattern* getTexPtrnAnmP(char*, int);
-    J3DAnmTextureSRTKey* getTexSRTKeyAnmP(DUSK_CONST char*, int);
+    J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char*, int);
-    J3DAnmTevRegKey* getTevRegKeyAnmP(DUSK_CONST char*, int);
+    J3DAnmTevRegKey* getTevRegKeyAnmP(char*, int);
     BOOL setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr,
                                       int i_start, int i_end);
     BOOL setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start,
@@ -336,8 +336,8 @@ public:
     BOOL hitChk2(dCcD_Cyl*, BOOL, BOOL);
     void setDamage(int, int, int);
     int ctrlMsgAnm(int&, int&, fopAc_ac_c*, BOOL);
-    void orderEvent(int, DUSK_CONST char*, u16, u16, u8, u16);
+    void orderEvent(int, char*, u16, u16, u8, u16);
-    void changeEvent(DUSK_CONST char*, DUSK_CONST char*, u16, u16);
+    void changeEvent(char*, char*, u16, u16);
     BOOL chkActorInSight(fopAc_ac_c*, f32);
     BOOL chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16);
     BOOL chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int);

include/d/actor/d_a_npc_aru.h

@@ -149,7 +149,7 @@ public:
             int i_faceMotionStepNum,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
             int i_motionStepNum,
-            daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+            daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {
@@ -171,8 +171,8 @@ public:
     u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
     void setLastIn() { mLastGoatIn = true; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[7];
+    static char* mCutNameList[7];
-    static cutFunc DUSK_CONST mCutList[7];
+    static cutFunc mCutList[7];
 
 private:
     /* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_ashB.h

@@ -135,7 +135,7 @@ public:
     inline bool step(s16, int, f32);
     inline void playExpression();
 
-    static EventFn DUSK_CONST mEvtSeqList[2];
+    static EventFn mEvtSeqList[2];
 
 private:
     /* 0xB48 */ Z2Creature mCreatureSound;

include/d/actor/d_a_npc_bans.h

@@ -90,7 +90,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                 i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                 i_arcNames) {
@@ -117,8 +117,8 @@ public:
         return rv;
     }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[4];
+    static char* mCutNameList[4];
-    static cutFunc DUSK_CONST mCutList[4];
+    static cutFunc mCutList[4];
 
     /* 0x0F7C */ mDoExt_McaMorfSO* mpScoopMorf;
     /* 0x0F80 */ NPC_BANS_HIO_CLASS* mHIO;

include/d/actor/d_a_npc_besu.h

@@ -112,7 +112,7 @@ public:
             int i_faceMotionStepNum,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
             int i_motionStepNum,
-            daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+            daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {
@@ -140,8 +140,8 @@ public:
     u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
     u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[15];
+    static char* mCutNameList[15];
-    static cutFunc DUSK_CONST mCutList[15];
+    static cutFunc mCutList[15];
 
 private:
     /* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf;

include/d/actor/d_a_npc_blue_ns.h

@@ -124,7 +124,7 @@ public:
         return var_r30;
     }
 
-    static EventFn DUSK_CONST mEvtSeqList[];
+    static EventFn mEvtSeqList[];
 
     /* 0xB48 */ Z2Creature mSound;
     /* 0xBD8 */ u8 field_0xBD8[0xBDC - 0xBD8];

include/d/actor/d_a_npc_bou.h

@@ -89,7 +89,7 @@ public:
     daNpc_Bou_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
-                daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8)
+                daNpcT_evtData_c const* param_7, char** param_8)
         :
                                daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                 {}
@@ -114,8 +114,8 @@ public:
     virtual int drawDbgInfo();
     virtual void changeAnm(int*, int*);
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[9];
+    static char* mCutNameList[9];
-    static cutFunc DUSK_CONST mCutList[9];
+    static cutFunc mCutList[9];
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;

include/d/actor/d_a_npc_chat.h

@@ -102,7 +102,7 @@ public:
     void setFear() { mFear = true; }
     void setTalkFlag() { mTalkFlag = true; }
 
-    static eventFunc DUSK_CONST mEvtSeqList[1];
+    static eventFunc mEvtSeqList[1];
 
 private:
     /* 0xB48 */ Z2CreatureCitizen mSound;

include/d/actor/d_a_npc_clerka.h

@@ -100,7 +100,7 @@ public:
                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                    int i_faceMotionStepNum,
                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
-                   int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+                   int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
@@ -124,8 +124,8 @@ public:
 
     u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static char* mCutNameList[1];
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_clerkb.h

@@ -113,7 +113,7 @@ public:
                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                    int i_faceMotionStepNum,
                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
-                   int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+                   int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
@@ -137,8 +137,8 @@ public:
 
     u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static char* mCutNameList[1];
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2;

include/d/actor/d_a_npc_clerkt.h

@@ -91,7 +91,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
@@ -125,8 +125,8 @@ public:
         }
     }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static char* mCutNameList[1];
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_doc.h

@@ -66,7 +66,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames)
@@ -133,8 +133,8 @@ public:
         return (fopAcM_GetParam(this) & 0xFF00) >> 8;
     }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static char* mCutNameList[1];
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_doorboy.h

@@ -78,7 +78,7 @@ public:
     inline int getTimeHour();
     inline bool isDummyTalk();
 
-    static EventFn DUSK_CONST mEvtSeqList[1];
+    static EventFn mEvtSeqList[1];
 
 private:
     /* 0xB48 */ Z2CreatureCitizen mSound;

include/d/actor/d_a_npc_fairy.h

@@ -256,7 +256,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {
@@ -294,8 +294,8 @@ public:
     u8 getSceneNo1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
     u8 getSceneNo2() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[18];
+    static char* mCutNameList[18];
-    static cutFunc DUSK_CONST mCutList[18];
+    static cutFunc mCutList[18];
 private:
     /* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO;
     /* 0x0E44 */ dCcD_Cyl mCyl;

include/d/actor/d_a_npc_fairy_seirei.h

@@ -71,7 +71,7 @@ public:
                                        daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
                                        int param_4,
                                        daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
-                                       int param_6, daNpcT_evtData_c const* param_7, DUSK_CONST char* DUSK_CONST* param_8)
+                                       int param_6, daNpcT_evtData_c const* param_7, char** param_8)
         : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
 
     u8 getType() { return fopAcM_GetParam(this) & 0xFF; }
@@ -90,8 +90,8 @@ public:
 
     int getSeneNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
 
-    static DUSK_CONST char* mCutNameList[1];
+    static char* mCutNameList[1];
-    static DUSK_CONST cutFunc mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_gnd.h

@@ -83,7 +83,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {
@@ -96,8 +96,8 @@ public:
     s32 getNeckJointNo() { return 3; }
     s32 getBackboneJointNo() { return 1; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static char* mCutNameList[1];
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_gra.h

@@ -138,9 +138,9 @@ public:
     void addCarryNum() { field_0x1692++; }
     u8 getPathNoFromParam() { return home.angle.z; }
     void setGateWalk() { field_0x14D0 = 1; }
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList[12];
+    static char* mEvtCutNameList[12];
     typedef BOOL (daNpc_grA_c::*cut_type)(int);
-    static cut_type DUSK_CONST mEvtCutList[];
+    static cut_type mEvtCutList[];
 
 private:
     typedef BOOL (daNpc_grA_c::*daNpc_grA_c_Action)(void*);

include/d/actor/d_a_npc_grc.h

@@ -89,8 +89,8 @@ public:
     void setPrtcl();
     void adjustShapeAngle() {}
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
+    static char* mEvtCutNameList;
-    static EventFn DUSK_CONST mEvtCutList[1];
+    static EventFn mEvtCutList[1];
 
 private:
     /* 0xB48 */ Z2Creature mSound;

include/d/actor/d_a_npc_grd.h

@@ -81,8 +81,8 @@ public:
     BOOL ECut_nodToGrz(int);
     void adjustShapeAngle() {}
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
+    static char* mEvtCutNameList[2];
-    static cutFunc DUSK_CONST mEvtCutList[2];
+    static cutFunc mEvtCutList[2];
 
 private:
     /* 0xB48 */ Z2Creature mSound;

include/d/actor/d_a_npc_grm.h

@@ -120,7 +120,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
@@ -131,8 +131,8 @@ public:
     BOOL checkChangeJoint(int param_0) { return param_0 == JNT_HEAD; }
     BOOL checkRemoveJoint(int param_0) { return param_0 == JNT_MOUTH; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[2];
+    static char* mCutNameList[2];
-    static cutFunc DUSK_CONST mCutList[2];
+    static cutFunc mCutList[2];
 
 private:
     /* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_grmc.h

@@ -113,7 +113,7 @@ public:
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
             int i_motionStepNum,
             daNpcT_evtData_c const* i_evtData,
-            char DUSK_CONST* DUSK_CONST* i_arcNames)
+            char** i_arcNames)
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
@@ -124,8 +124,8 @@ public:
     BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
     u16 getEyeballMaterialNo() { return 1; };
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList;
+    static char* mCutNameList;
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_gro.h

@@ -85,8 +85,8 @@ public:
     int test(void*);
     void adjustShapeAngle() {}
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList[3];
+    static char* mEvtCutNameList[3];
-    static cutFunc DUSK_CONST mEvtCutList[3];
+    static cutFunc mEvtCutList[3];
 
 private:
     /* 0xB48 */ Z2Creature mSound;

include/d/actor/d_a_npc_grr.h

@@ -83,8 +83,8 @@ public:
     int test(void*);
     void adjustShapeAngle() {}
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList;
+    static char* mEvtCutNameList;
-    static cutFunc DUSK_CONST mEvtCutList[1];
+    static cutFunc mEvtCutList[1];
 
 private:
     /* 0xB48 */ Z2Creature mSound;

include/d/actor/d_a_npc_grs.h

@@ -84,8 +84,8 @@ public:
     void setPrtcl();
     void adjustShapeAngle() {}
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2];
+    static char* mEvtCutNameList[2];
-    static cutFunc DUSK_CONST mEvtCutList[2];
+    static cutFunc mEvtCutList[2];
 
 private:
     /* 0xB48 */ Z2Creature mSound;

include/d/actor/d_a_npc_grz.h

@@ -116,8 +116,8 @@ public:
 
     u8 getPathNoFromParam() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList[7];
+    static char* mEvtCutNameList[7];
-    static cutFunc DUSK_CONST mEvtCutList[7];
+    static cutFunc mEvtCutList[7];
 
 private:
     /* 0x0B48 */ Z2Creature mSound;

include/d/actor/d_a_npc_gwolf.h

@@ -104,8 +104,8 @@ public:
     void setHowlingEndFlag() { field_0xe1c = 2; }
     void setHowlingFlag() { field_0xe1c = 1; }
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
+    static char* mEvtCutNameList[5];
-    static cutFunc DUSK_CONST mEvtCutList[5];
+    static cutFunc mEvtCutList[5];
 
 private:
     /* 0xB48 */ Z2Creature mSound;

include/d/actor/d_a_npc_hanjo.h

@@ -194,7 +194,7 @@ public:
     daNpc_Hanjo_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
-                                 daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
+                                 daNpcT_evtData_c const* param_7, char** param_8) :
                                  daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                   {}
     u16 getEyeballMaterialNo() { return 2; }
@@ -218,9 +218,9 @@ public:
     u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
 
     static dCcD_SrcGObjInf const mStoneCcDObjInfo;
-    static char DUSK_CONST* DUSK_CONST mCutNameList[6];
+    static char* mCutNameList[6];
-    static cutFunc DUSK_CONST mCutList[6];
+    static cutFunc mCutList[6];
-    static dCcD_SrcSph DUSK_CONST mStoneCcDSph;
+    static dCcD_SrcSph mStoneCcDSph;
 private:
     /* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO;
     /* 0x0E44 */ J3DModel* mModel1;

include/d/actor/d_a_npc_hoz.h

@@ -91,7 +91,7 @@ public:
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                                    int i_faceMotionStepNum,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-                                   daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+                                   daNpcT_evtData_c const* i_evtData, char** i_arcNames)
                     : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                                i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                                i_arcNames)
@@ -125,8 +125,8 @@ public:
     bool getGameStartFlag() { return mGameStartFlag; }
     void setPotBreakFlag() { mPotBreakFlag = true; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[8];
+    static char* mCutNameList[8];
-    static cutFunc DUSK_CONST mCutList[];
+    static cutFunc mCutList[];
 
 private:
     /* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_jagar.h

@@ -138,7 +138,7 @@ public:
     daNpc_Jagar_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
-                                daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
+                                daNpcT_evtData_c const* param_7, char** param_8) :
                                 daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                  {}
     u16 getEyeballMaterialNo() { return MAT_JAGA_EYEBALL; }
@@ -223,8 +223,8 @@ public:
         return 0;
     }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[7];
+    static char* mCutNameList[7];
-    static cutFunc DUSK_CONST mCutList[7];
+    static cutFunc mCutList[7];
 private:
     /* 0x0E40 */ NPC_JAGAR_HIO_CLASS* mpHIO;
     /* 0x0E44 */ dCcD_Cyl mCyl1;

include/d/actor/d_a_npc_kakashi.h

@@ -76,7 +76,7 @@ public:
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                                    int i_faceMotionStepNum,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-                                   daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+                                   daNpcT_evtData_c const* i_evtData, char** i_arcNames)
                     : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                                i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                                i_arcNames)
@@ -113,8 +113,8 @@ public:
     u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
     u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[4];
+    static char* mCutNameList[4];
-    static int (daNpc_Kakashi_c::* DUSK_CONST mCutList[])(int);
+    static int (daNpc_Kakashi_c::*mCutList[])(int);
 
 private:
     /* 0x0E40 */ NPC_KAKASHI_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_kasi_kyu.h

@@ -120,7 +120,7 @@ public:
     void chgWeightLight() { mCcStts.SetWeight(0xD8); }
     BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); }
 
-    static EventFn DUSK_CONST mEvtSeqList[1];
+    static EventFn mEvtSeqList[1];
     static daTagEscape_c* mTargetTag;
     static f32 mTargetTagDist;
     static s16 mWolfAngle;

include/d/actor/d_a_npc_kasi_mich.h

@@ -121,7 +121,7 @@ public:
     void chgWeightLight() { mCcStts.SetWeight(0xD8); }
     BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); }
 
-    static EventFn DUSK_CONST mEvtSeqList[1];
+    static EventFn mEvtSeqList[1];
     static daTagEscape_c* mTargetTag;
     static f32 mTargetTagDist;
     static s16 mWolfAngle;

include/d/actor/d_a_npc_kkri.h

@@ -71,7 +71,7 @@ public:
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                                    int i_faceMotionStepNum,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-                                   daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+                                   daNpcT_evtData_c const* i_evtData, char** i_arcNames)
                     : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                                i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                                i_arcNames)
@@ -118,8 +118,8 @@ public:
         return mpMorf[0]->getModel()->getAnmMtx(5);
     }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[3];
+    static char* mCutNameList[3];
-    static int (daNpc_Kkri_c::* DUSK_CONST mCutList[])(int);
+    static int (daNpc_Kkri_c::*mCutList[])(int);
 
 private:
     /* 0xE40 */ NPC_KKRI_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_kn.h

@@ -88,7 +88,7 @@ public:
     /* 0x05AC */ const daNpcT_faceMotionAnmData_c* mpFaceMotionAnmData;
     /* 0x05B0 */ const daNpcT_motionAnmData_c* mpMotionAnmData;
     /* 0x05B4 */ const daNpcT_evtData_c* mpEventData;
-    /* 0x05B8 */ char DUSK_CONST* DUSK_CONST* mpArcNames;
+    /* 0x05B8 */ char** mpArcNames;
     /* 0x05BC */ mDoExt_McaMorfSO* mpModelMorf[2];
     /* 0x05C4 */ Z2Creature mSound;
     /* 0x0654 */ mDoExt_bckAnm mBckAnm;
@@ -322,8 +322,8 @@ public:
     int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
     BOOL setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
     BOOL setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
-    int loadRes(s8 const*, char const* DUSK_CONST*);
+    int loadRes(s8 const*, char const**);
-    void deleteRes(s8 const*, char const* DUSK_CONST*);
+    void deleteRes(s8 const*, char const**);
     int execute();
     int draw(int, int, f32, GXColorS10*, f32, int, int, int);
     void setEnvTevColor();
@@ -355,7 +355,7 @@ public:
                               daNpcT_motionAnmData_c const* param_1,
                               daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2, int param_3,
                               daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_4, int param_5,
-                              daNpcT_evtData_c const* param_6, char DUSK_CONST* DUSK_CONST* param_7)
+                              daNpcT_evtData_c const* param_6, char** param_7)
                         : mpFaceMotionAnmData(param_0), mpMotionAnmData(param_1), mFaceMotionSeqMngr(param_2, param_3),
                           mMotionSeqMngr(param_4, param_5), mpEventData(param_6), mpArcNames(param_7)
                     {
@@ -413,8 +413,8 @@ public:
     virtual bool afterSetMotionAnm(int, int, f32, int);
     
     static const dCcD_SrcGObjInf mCcDObjData;
-    static char DUSK_CONST* DUSK_CONST mCutNameList[21];
+    static char* mCutNameList[21];
-    static cutFunc DUSK_CONST mCutList[21];
+    static cutFunc mCutList[21];
     static dCcD_SrcCyl mCcDCyl;
     static dCcD_SrcSph mCcDSph;
     static s16 mSrchName;

include/d/actor/d_a_npc_knj.h

@@ -75,13 +75,13 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static char* mCutNameList[1];
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0xE40 */ NPC_KNJ_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_kolin.h

@@ -93,7 +93,7 @@ public:
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
             int i_motionStepNum,
             daNpcT_evtData_c const* i_evtData,
-            char DUSK_CONST* DUSK_CONST* i_arcNames)
+            char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
@@ -120,8 +120,8 @@ public:
     virtual void changeAnm(int*, int*);
     virtual void changeBck(int*, int*);
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[11];
+    static char* mCutNameList[11];
-    static cutFunc DUSK_CONST mCutList[11];
+    static cutFunc mCutList[11];
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;

include/d/actor/d_a_npc_kolinb.h

@@ -140,7 +140,7 @@ public:
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
             int i_motionStepNum,
             daNpcT_evtData_c const* i_evtData,
-            char DUSK_CONST* DUSK_CONST* i_arcNames)
+            char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
@@ -150,8 +150,8 @@ public:
     s32 getBackboneJointNo() { return mType == 2 ? ZRCB_JNT_BACKBONE1 : KOLINB_JNT_BACKBONE1; }
     s32 getNeckJointNo() { return mType == 2 ? ZRCB_JNT_NECK : KOLINB_JNT_NECK; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[7];
+    static char* mCutNameList[7];
-    static cutFunc DUSK_CONST mCutList[7];
+    static cutFunc mCutList[7];
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;

include/d/actor/d_a_npc_kyury.h

@@ -106,7 +106,7 @@ public:
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
                                  int param_4,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
-                                 int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8)
+                                 int param_6, daNpcT_evtData_c const* param_7, char** param_8)
         : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
     u16 getEyeballMaterialNo() { return 2; }
     s32 getHeadJointNo() { return 4; }
@@ -123,8 +123,8 @@ public:
         return nodeNo;
     }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[2];
+    static char* mCutNameList[2];
-    static cutFunc DUSK_CONST mCutList[2];
+    static cutFunc mCutList[2];
 
 private:
     /* 0xE40 */ NPC_KYURY_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_len.h

@@ -86,7 +86,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
@@ -100,8 +100,8 @@ public:
     s32 getFootRJointNo() { return 32; }
     BOOL chkXYItems() { return TRUE; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[4];
+    static char* mCutNameList[4];
-    static cutFunc DUSK_CONST mCutList[4];
+    static cutFunc mCutList[4];
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;

include/d/actor/d_a_npc_lud.h

@@ -91,7 +91,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
@@ -111,8 +111,8 @@ public:
     }
     u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[8];
+    static char* mCutNameList[8];
-    static cutFunc DUSK_CONST mCutList[8];
+    static cutFunc mCutList[8];
 
 private:
     /* 0xE40 */ mDoExt_McaMorfSO* mpBowlMorf;

include/d/actor/d_a_npc_maro.h

@@ -132,7 +132,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {
@@ -167,8 +167,8 @@ public:
     void startChoccai() { field_0x1134 = 1; }
     void endChoccai() { field_0x1134 = 0; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[17];
+    static char* mCutNameList[17];
-    static cutFunc DUSK_CONST mCutList[17];
+    static cutFunc mCutList[17];
 
     u8 getGroupId() {
         return (fopAcM_GetParam(this) & 0xF0000000) >> 28;

include/d/actor/d_a_npc_midp.h

@@ -130,7 +130,7 @@ public:
     daNpc_midP_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
-                                daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) :
+                                daNpcT_evtData_c const* param_7, char** param_8) :
                                 daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
     u16 getEyeballRMaterialNo() { return 3; }
     u16 getEyeballLMaterialNo() { return 2; }
@@ -148,8 +148,8 @@ public:
         return nodeNo;
     }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList;
+    static char* mCutNameList;
-    static cutFunc DUSK_CONST mCutList[1];
+    static cutFunc mCutList[1];
 
 private:
     /* 0xE40 */ NPC_MIDP_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_moi.h

@@ -128,7 +128,7 @@ public:
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
-        daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames)
+        daNpcT_evtData_c const* i_evtData, char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
@@ -158,8 +158,8 @@ public:
     bool chkSFight() { return field_0x166b == 1; }
     u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[5];
+    static char* mCutNameList[5];
-    static cutFunc DUSK_CONST mCutList[5];
+    static cutFunc mCutList[5];
 
 private:
     /* 0x0E40 */ NPC_MOI_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_myna2.h

@@ -87,8 +87,8 @@ public:
 
     int getType() { return mType; }
 
-    static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5];
+    static char* mEvtCutNameList[5];
-    static EventFn DUSK_CONST mEvtCutList[];
+    static EventFn mEvtCutList[];
 
     /* 0xB48 */ u8 field_0xB48[0xB4C - 0xB48];
     /* 0xB4C */ daNpcF_Lookat_c mLookat;

include/d/actor/d_a_npc_pachi_besu.h

@@ -115,7 +115,7 @@ public:
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
             int i_motionStepNum,
             daNpcT_evtData_c const* i_evtData,
-            char DUSK_CONST* DUSK_CONST* i_arcNames)
+            char** i_arcNames)
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
@@ -144,8 +144,8 @@ public:
     void setTagPos(cXyz const& i_pos) { mTagPos = i_pos; }
     void setLookPos(cXyz const& i_pos) { mLookPos = i_pos; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[11];
+    static char* mCutNameList[11];
-    static cutFunc DUSK_CONST mCutList[11];
+    static cutFunc mCutList[11];
 
 private:
     /* 0xE40 */ NPC_PACHI_BESU_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_pachi_maro.h

@@ -149,7 +149,7 @@ public:
                         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
                         int i_motionStepNum,
                         daNpcT_evtData_c const* i_evtData,
-                        char DUSK_CONST* DUSK_CONST* i_arcNames)
+                        char** i_arcNames)
                     : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                     i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                     i_arcNames) {
@@ -184,8 +184,8 @@ public:
     void setFMotion_Niramu_to_Besu() { mFMotion = 1; }
     void setFMotion_LookNone() { mFMotion = 2; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[11];
+    static char* mCutNameList[11];
-    static cutFunc DUSK_CONST mCutList[11];
+    static cutFunc mCutList[11];
 
 private:
     /* 0xE40 */ NPC_PACHI_MARO_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_pachi_taro.h

@@ -166,7 +166,7 @@ public:
                         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
                         int i_motionStepNum,
                         daNpcT_evtData_c const* i_evtData,
-                        char DUSK_CONST* DUSK_CONST* i_arcNames)
+                        char** i_arcNames)
                     : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                     i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                     i_arcNames) {
@@ -196,8 +196,8 @@ public:
     void setTagPos(cXyz const& i_pos) { mTagPos = i_pos; }
     void setLookPos(cXyz const& i_pos) { mLookPos = i_pos; }
 
-    static char DUSK_CONST* DUSK_CONST mCutNameList[11];
+    static char* mCutNameList[11];
-    static cutFunc DUSK_CONST mCutList[11];
+    static cutFunc mCutList[11];
 
 private:
     /* 0x0E40 */ NPC_PACHI_TARO_HIO_CLASS* mpHIO;