Merge remote-tracking branch 'origin/main' into mods

# Conflicts:
#	CMakeLists.txt
#	src/dusk/config.cpp

.clang-format

@@ -1,6 +1,6 @@
 ---
 Language: Cpp
-Standard: c++20
+Standard: C++03
 AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: false

.github/workflows/build.yml

@@ -80,7 +80,6 @@ jobs:
           path: |
             build/install/Dusklight-*.AppImage
             build/install/debug.tar.*
-            build/install/sdk/
 
   build-apple:
     name: Build Apple (${{matrix.name}})
@@ -149,7 +148,6 @@ jobs:
           path: |
             build/install/Dusklight.app
             build/install/debug.tar.*
-            build/install/sdk/
 
   build-android:
     name: Build Android (${{matrix.name}})
@@ -205,24 +203,18 @@ jobs:
       - name: Build native library
         run: cmake --build --preset ${{matrix.preset}} --target dusklight
 
-      - name: Build bundled mods
-        run: cmake --build --preset ${{matrix.preset}} --target dusklight_mods
+      - 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: Stage artifacts
-        run: |
-          mkdir -p upload/sdk
-          cp build/*/stub-android-*.so upload/sdk/
-          cp platforms/android/app/build/outputs/apk/release/app-${{matrix.abi}}-release-unsigned.apk upload/
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v7
         with:
           name: dusklight-${{env.DUSK_VERSION}}-android-${{matrix.artifact_arch}}
-          path: upload/
+          path: platforms/android/app/build/outputs/apk/release/app-${{matrix.abi}}-release-unsigned.apk
 
   build-windows:
     name: Build Windows (${{matrix.name}})
@@ -288,6 +280,4 @@ jobs:
             build/install/*.exe
             build/install/*.dll
             build/install/res/
-            build/install/mods/
             build/install/debug.7z
-            build/install/sdk/

.gitignore

@@ -53,3 +53,5 @@ compile_commands.json
 pipeline_cache.bin
 
 extract
+
+*.dusk

.vscode/launch.json

@@ -6,12 +6,12 @@
             "type": "cppvsdbg",
             "request": "launch",
             "program": "${command:cmake.launchTargetPath}",
-            "args": ["-l", "1", "--dvd", "${workspaceRoot}/orig/GZ2E01/GZ2E01.iso", "--console"],
+            "args": ["-l", "1", "--dvd", "${workspaceRoot}/orig/GZ2E01/GZ2E01.iso", "--console", "--mods", "${workspaceRoot}/mods"],
             "MIMode": "gdb",
             "miDebuggerPath": "gdb",
             "symbolSearchPath": "${command:cmake.launchTargetPath}",
             "console": "integratedTerminal",
-            "cwd":"${workspaceRoot}"
+            "cwd":"${workspaceRoot}",
         }
     ]
 }

CMakeLists.txt

@@ -5,8 +5,96 @@ if (NOT CMAKE_BUILD_TYPE)
             "Build type options: Debug Release RelWithDebInfo MinSizeRel" FORCE)
 endif ()
 
-include(cmake/DetectVersion.cmake)
-detect_version()
+set(DUSK_VERSION_OVERRIDE "" CACHE STRING "Override version string (skips git detection and format validation)")
+
+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_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --git-path HEAD
+            OUTPUT_VARIABLE dusk_git_head_filename
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${dusk_git_head_filename}")
+
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name HEAD
+            OUTPUT_VARIABLE dusk_git_head_symbolic
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            COMMAND ${GIT_EXECUTABLE} rev-parse --git-path ${dusk_git_head_symbolic}
+            OUTPUT_VARIABLE dusk_git_head_symbolic_filename
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${dusk_git_head_symbolic_filename}")
+
+    # defines DUSK_WC_REVISION
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+            OUTPUT_VARIABLE DUSK_WC_REVISION
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    # defines DUSK_WC_DESCRIBE
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --tags --long --dirty --match "v*"
+            OUTPUT_VARIABLE DUSK_WC_DESCRIBE
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    # remove the git hash, then collapse a clean "-0" suffix only
+    string(REGEX REPLACE "-[^-]+(-dirty|)$" "\\1" DUSK_WC_DESCRIBE "${DUSK_WC_DESCRIBE}")
+    string(REGEX REPLACE "-0$" "" DUSK_WC_DESCRIBE "${DUSK_WC_DESCRIBE}")
+
+    # defines DUSK_WC_BRANCH
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+            OUTPUT_VARIABLE DUSK_WC_BRANCH
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    # defines DUSK_WC_DATE
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} log -1 --format=%ad
+            OUTPUT_VARIABLE DUSK_WC_DATE
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+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]+)([-+].*)?$")
+    set(DUSK_SHORT_VERSION_STRING "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+    set(_ver_major ${CMAKE_MATCH_1})
+    set(_ver_minor ${CMAKE_MATCH_2})
+    set(_ver_patch ${CMAKE_MATCH_3})
+    set(DUSK_VERSION_TWEAK "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 "Build type: ${CMAKE_BUILD_TYPE}")
 project(dusklight LANGUAGES C CXX VERSION ${DUSK_VERSION_STRING})
 if (APPLE)
@@ -89,42 +177,12 @@ option(DUSK_ENABLE_UPDATE_CHECKER "Enable update checking support" ON)
 option(DUSK_ENABLE_SENTRY_NATIVE "Enable sentry-native crash reporting support" OFF)
 option(DUSK_PACKAGE_INSTALL "Install Dusklight with a Linux-native file structure" OFF)
 option(DUSK_GFX_DEBUG_GROUPS "Report debug groups to the native graphics API" ${DUSK_GFX_DEBUG_GROUPS_DEFAULT})
-option(DUSK_ENABLE_CODE_MODS "Enable code mods" OFF)
-option(DUSK_ENABLE_OPUS "Enable loading Opus audio files for mods" ON)
-
-set(DUSK_HAS_FUNCHOOK OFF)
-if (DUSK_ENABLE_CODE_MODS AND (NOT APPLE OR CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
-    set(DUSK_HAS_FUNCHOOK ON)
-endif ()
-set(DUSK_HAS_FUNCHOOK ${DUSK_HAS_FUNCHOOK} CACHE INTERNAL "Enable funchook" FORCE)
-
-set(_target_architectures ${CMAKE_OSX_ARCHITECTURES})
-if (NOT _target_architectures)
-    set(_target_architectures ${CMAKE_SYSTEM_PROCESSOR})
-endif ()
-list(LENGTH _target_architectures _target_arch_count)
-set(DUSK_HAS_PREPATCH OFF)
-if (DUSK_ENABLE_CODE_MODS AND APPLE AND _target_arch_count EQUAL 1)
-    list(GET _target_architectures 0 _target_arch)
-    if (_target_arch STREQUAL "arm64")
-        set(DUSK_HAS_PREPATCH ON)
-    endif ()
-endif ()
-set(DUSK_HAS_PREPATCH ${DUSK_HAS_PREPATCH} CACHE INTERNAL "Enable symgen prepatch support" FORCE)
-
-if (DUSK_ENABLE_CODE_MODS AND CMAKE_SYSTEM_NAME MATCHES "^(iOS|tvOS)$")
-    list(LENGTH CMAKE_OSX_ARCHITECTURES _mobile_arch_count)
-    if (NOT _mobile_arch_count EQUAL 1 OR NOT CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
-        message(FATAL_ERROR
-                "iOS/tvOS code mods require a single arm64 architecture; got "
-                "CMAKE_OSX_ARCHITECTURES='${CMAKE_OSX_ARCHITECTURES}'")
-    endif ()
-endif ()
+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"
-            AND CMAKE_CXX_COMPILER_ID STREQUAL "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")
@@ -153,7 +211,7 @@ if (DUSK_MOVIE_SUPPORT)
             -DWITH_JAVA=OFF
         )
         if (CMAKE_TOOLCHAIN_FILE)
-            get_filename_component(_jpeg_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE BASE_DIR "${CMAKE_SOURCE_DIR}")
+            get_filename_component(_jpeg_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
             list(APPEND _jpeg_cmake_args -DCMAKE_TOOLCHAIN_FILE=${_jpeg_toolchain_file})
         endif ()
         set(_jpeg_passthrough_vars
@@ -194,21 +252,24 @@ if (DUSK_MOVIE_SUPPORT)
     endif ()
 endif ()
 
-if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
+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.
     # -Wdeprecated-declarations: JSystem uses std::iterator, deprecated in C++17
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-trigraphs -Wno-deprecated-declarations")
+    set(CMAKE_INSTALL_RPATH "$ORIGIN")
+    set(CMAKE_BUILD_RPATH "$ORIGIN")
+elseif (APPLE)
+    add_compile_options(-Wno-declaration-after-statement -Wno-non-pod-varargs)
+    set(CMAKE_INSTALL_RPATH "$ORIGIN")
+    set(CMAKE_BUILD_RPATH "$ORIGIN")
+elseif (MSVC)
     add_compile_options(
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-multichar>
-        $<$<COMPILE_LANGUAGE:CXX>:-Wno-trigraphs>
-        $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-declarations>
-    )
-elseif (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-    add_compile_options(
-            $<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>
-            $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
-            $<$<COMPILE_LANGUAGE:C,CXX>:/FS>
+        $<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>
+        $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
+        $<$<COMPILE_LANGUAGE:C,CXX>:/FS>
     )
 
     if (NOT DUSK_BUILD_WARNINGS)
@@ -223,15 +284,6 @@ elseif (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
     add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>)
 endif ()
 
-if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-    set(CMAKE_INSTALL_RPATH "$ORIGIN")
-    set(CMAKE_BUILD_RPATH "$ORIGIN")
-elseif (APPLE)
-    add_compile_options(-Wno-declaration-after-statement -Wno-non-pod-varargs)
-    set(CMAKE_INSTALL_RPATH "@loader_path")
-    set(CMAKE_BUILD_RPATH "@loader_path")
-endif ()
-
 include(FetchContent)
 
 # Declare all dependencies first so CMake can download them in parallel
@@ -240,73 +292,42 @@ FetchContent_Declare(cxxopts
     URL https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.3.1.tar.gz
     URL_HASH SHA256=3bfc70542c521d4b55a46429d808178916a579b28d048bd8c727ee76c39e2072
     DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    EXCLUDE_FROM_ALL
 )
 message(STATUS "dusklight: Fetching nlohmann/json")
 FetchContent_Declare(json
     URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
     URL_HASH SHA256=42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa
     DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    EXCLUDE_FROM_ALL
 )
-message(STATUS "dusklight: Fetching miniz")
+
+message(STATUS "dusk: Fetching miniz")
 FetchContent_Declare(miniz
     URL https://github.com/richgel999/miniz/releases/download/3.0.2/miniz-3.0.2.zip
     DOWNLOAD_EXTRACT_TIMESTAMP TRUE
     EXCLUDE_FROM_ALL
 )
 
-set(_fetch_content_deps cxxopts json miniz)
-
-if (DUSK_ENABLE_OPUS)
-    message(STATUS "dusklight: Fetching opusfile")
-
-    # Opusfile options
-    SET(OP_DISABLE_HTTP ON CACHE BOOL "" FORCE)
-    SET(OP_DISABLE_DOCS ON CACHE BOOL "" FORCE)
-    SET(OP_DISABLE_EXAMPLES ON CACHE BOOL "" FORCE)
-
-    message(STATUS "dusklight: Fetching opusfile")
-    FetchContent_Declare(
-        opusfile
-        GIT_REPOSITORY https://github.com/xiph/opusfile.git
-        GIT_TAG        6dfd29e7adb87f2e193575fc3fa88cbf1a0b27df
-    )
-
-    list(APPEND _fetch_content_deps opusfile)
-endif ()
-
-if (DUSK_HAS_FUNCHOOK)
-    message(STATUS "dusklight: Fetching funchook")
-    # cmake/PatchFunchook.cmake patches funchook's cmake/capstone.cmake.in to inject a
-    # PATCH_COMMAND into capstone's inner ExternalProject. That PATCH_COMMAND runs
-    # cmake/PatchCapstone.cmake after capstone is cloned, which removes the
-    # cmake_policy(SET CMP0048 OLD) line that CMake >= 3.27 rejects.
-    # This is incredibly scuffed and we should probably think of a better way to do this
-    set(CAPSTONE_FIX_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/PatchCapstone.cmake")
-    FetchContent_Declare(funchook
-        GIT_REPOSITORY https://github.com/kubo/funchook.git
-        GIT_TAG v1.1.3
-        GIT_SHALLOW TRUE
-        GIT_PROGRESS TRUE
-        PATCH_COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=<SOURCE_DIR> -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PatchFunchook.cmake
-        EXCLUDE_FROM_ALL
-    )
-    set(FUNCHOOK_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(FUNCHOOK_BUILD_SHARED OFF CACHE BOOL "" FORCE)
-    set(FUNCHOOK_INSTALL OFF CACHE BOOL "" FORCE)
-    if (APPLE AND CMAKE_OSX_ARCHITECTURES)
-        list(LENGTH CMAKE_OSX_ARCHITECTURES _osx_arch_count)
-        if (_osx_arch_count EQUAL 1)
-            list(GET CMAKE_OSX_ARCHITECTURES 0 _osx_arch)
-            if (_osx_arch MATCHES "^(arm64|aarch64|ARM64)$")
-                set(FUNCHOOK_CPU arm64 CACHE STRING "" FORCE)
-            elseif (_osx_arch MATCHES "^(x86_64|AMD64|amd64|i[3-6]86|x86)$")
-                set(FUNCHOOK_CPU x86 CACHE STRING "" FORCE)
-            endif ()
-        endif ()
-    endif ()
-    list(APPEND _fetch_content_deps funchook)
-endif ()
-FetchContent_MakeAvailable(${_fetch_content_deps})
+message(STATUS "dusk: Fetching funchook")
+# cmake/patch_funchook.cmake patches funchook's cmake/capstone.cmake.in to inject a
+# PATCH_COMMAND into capstone's inner ExternalProject. That PATCH_COMMAND runs
+# cmake/fix_capstone_policy.cmake after capstone is cloned, which removes the
+# cmake_policy(SET CMP0048 OLD) line that CMake >= 3.27 rejects.
+# This is incredibly scuffed and we should probably think of a better way to do this
+set(CAPSTONE_FIX_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/fix_capstone_policy.cmake")
+FetchContent_Declare(funchook
+    GIT_REPOSITORY https://github.com/kubo/funchook.git
+    GIT_TAG v1.1.3
+    GIT_SHALLOW TRUE
+    GIT_PROGRESS TRUE
+    PATCH_COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=<SOURCE_DIR> -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/patch_funchook.cmake
+    EXCLUDE_FROM_ALL
+)
+set(FUNCHOOK_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(FUNCHOOK_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+set(FUNCHOOK_INSTALL OFF CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(cxxopts json miniz funchook)
 
 if (DUSK_ENABLE_SENTRY_NATIVE)
     message(STATUS "dusklight: Fetching sentry-native")
@@ -327,10 +348,10 @@ if (DUSK_ENABLE_SENTRY_NATIVE)
     )
     if (NOT sentry_native_POPULATED)
         FetchContent_Populate(sentry_native)
-        set(_skip_install_rules ${CMAKE_SKIP_INSTALL_RULES})
+        set(_dusk_skip_install_rules ${CMAKE_SKIP_INSTALL_RULES})
         set(CMAKE_SKIP_INSTALL_RULES ON)
         add_subdirectory(${sentry_native_SOURCE_DIR} ${sentry_native_BINARY_DIR} EXCLUDE_FROM_ALL)
-        set(CMAKE_SKIP_INSTALL_RULES ${_skip_install_rules})
+        set(CMAKE_SKIP_INSTALL_RULES ${_dusk_skip_install_rules})
     endif ()
 endif ()
 
@@ -340,7 +361,21 @@ if(_arch MATCHES "^(arm|aarch64)" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQU
     add_compile_options(-fsigned-char)
 endif()
 
-configure_version_header()
+if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+    set(PLATFORM_NAME win32)
+elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
+    if (IOS)
+        set(PLATFORM_NAME ios)
+    elseif (TVOS)
+        set(PLATFORM_NAME tvos)
+    else ()
+        set(PLATFORM_NAME macos)
+    endif ()
+else ()
+    string(TOLOWER CMAKE_SYSTEM_NAME PLATFORM_NAME)
+endif ()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
 include(files.cmake)
 
@@ -356,20 +391,30 @@ 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})
 
-include(cmake/GameABIConfig.cmake)
+set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0 MTX_USE_PS=1)
+
+set(GAME_INCLUDE_DIRS
+    include
+    src
+    assets/GZ2E01 # TODO: make this dynamic if needed?
+    libs/JSystem/include
+    libs
+    extern/aurora/include/dolphin
+    extern/aurora/include
+    extern
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${miniz_SOURCE_DIR})
+
+# Interface target for mods and sub-projects to inherit game headers/defines
+add_library(dusklight_game_headers INTERFACE)
+target_include_directories(dusklight_game_headers INTERFACE ${GAME_INCLUDE_DIRS})
+target_compile_definitions(dusklight_game_headers INTERFACE TARGET_PC=1)
+target_link_libraries(dusklight_game_headers INTERFACE TracyClient)
 
 find_package(Threads REQUIRED)
-set(GAME_COMPILE_DEFS DUSK_BUILDING_GAME=1)
 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
-    Threads::Threads zstd::libzstd dusklight_game_headers)
-if (DUSK_HAS_FUNCHOOK)
-    list(APPEND GAME_LIBS funchook-static)
-endif ()
-if (DUSK_ENABLE_OPUS)
-    list(APPEND GAME_LIBS OpusFile::opusfile)
-    list(APPEND GAME_COMPILE_DEFS DUSK_OPUS=1)
-endif ()
+    aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt funchook-static
+    Threads::Threads zstd::libzstd)
 
 if (DUSK_ENABLE_SENTRY_NATIVE)
     list(APPEND GAME_LIBS sentry)
@@ -437,12 +482,19 @@ if (DUSK_ENABLE_DISCORD AND NOT ANDROID AND NOT IOS AND NOT TVOS)
     list(APPEND GAME_COMPILE_DEFS DUSK_DISCORD=1)
 endif ()
 
-if (DUSK_ENABLE_CODE_MODS)
-    list(APPEND GAME_COMPILE_DEFS DUSK_CODE_MODS=1)
+if(ANDROID)
+    list(APPEND GAME_COMPILE_DEFS TARGET_ANDROID=1)
+endif ()
+
+set(DUSK_ENABLE_CODE_MODS_DEFAULT OFF)
+option(DUSK_ENABLE_CODE_MODS "Enable code mods" ${DUSK_ENABLE_CODE_MODS_DEFAULT})
+if (DUSK_ENABLE_CODE_MODS)
+    if (NOT ANDROID AND NOT IOS AND NOT TVOS)
+        list(APPEND GAME_COMPILE_DEFS DUSK_CODE_MODS=1)
+    else ()
+        message(FATAL_ERROR "Code mods not supported on the target platform!")
+    endif ()
 endif ()
-list(APPEND GAME_COMPILE_DEFS
-        DUSK_HAS_FUNCHOOK=$<BOOL:${DUSK_HAS_FUNCHOOK}>
-        DUSK_HAS_PREPATCH=$<BOOL:${DUSK_HAS_PREPATCH}>)
 
 if (DUSK_PACKAGE_INSTALL)
     include(GNUInstallDirs)
@@ -468,10 +520,9 @@ set(GAME_DEBUG_FILES
 set_source_files_properties(
         ${GAME_DEBUG_FILES}
         PROPERTIES
-        COMPILE_DEFINITIONS "$<$<CONFIG:Debug>:DEBUG=1>"
+        COMPILE_DEFINITIONS "$<$<CONFIG:Debug>:DEBUG=1>;$<$<CONFIG:Debug>:PARTIAL_DEBUG=1>"
 )
 
-# game_base is for all other game code files
 set(GAME_BASE_FILES
         ${DOLZEL_FILES}
         ${Z2AUDIOLIB_FILES}
@@ -482,11 +533,17 @@ set(GAME_BASE_FILES
 set_source_files_properties(
         ${GAME_BASE_FILES}
         PROPERTIES
-        COMPILE_DEFINITIONS "NDEBUG=1;NDEBUG_DEFINED=1;DEBUG_DEFINED=0"
+        COMPILE_DEFINITIONS "NDEBUG=1;NDEBUG_DEFINED=1;DEBUG_DEFINED=0;$<$<CONFIG:Debug>:PARTIAL_DEBUG=1>"
 )
 
 foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
-    target_compile_definitions(${jsystem_lib} PRIVATE ${GAME_COMPILE_DEFS} $<$<CONFIG:Debug>:DEBUG=1>)
+    target_compile_definitions(${jsystem_lib} PRIVATE
+            ${GAME_COMPILE_DEFS}
+            DUSK_BUILDING_GAME=1
+            $<$<CONFIG:Debug>:DEBUG=1>
+            $<$<CONFIG:Debug>:PARTIAL_DEBUG=1>
+    )
+    target_include_directories(${jsystem_lib} PRIVATE ${GAME_INCLUDE_DIRS})
     target_link_libraries(${jsystem_lib} PRIVATE ${GAME_LIBS})
     set_target_properties(${jsystem_lib} PROPERTIES FOLDER "JSystem")
 endforeach()
@@ -502,79 +559,57 @@ set(DUSK_FILES src/dusk/main.cpp ${GAME_BASE_FILES} ${GAME_DEBUG_FILES} ${miniz_
 if(ANDROID)
     add_library(dusklight SHARED ${DUSK_FILES})
     set_target_properties(dusklight PROPERTIES OUTPUT_NAME main)
+    set(DUSK_MAIN_TARGET dusklight)
+elseif(WIN32)
+    add_library(dusklight_game SHARED ${DUSK_FILES})
+    set_target_properties(dusklight_game PROPERTIES
+            WINDOWS_EXPORT_ALL_SYMBOLS ${DUSK_ENABLE_CODE_MODS}
+            OUTPUT_NAME dusklight
+            PDB_NAME dusklight_game)
+
+    # rmlui_core uses its own PCH which creates a duplicate PCH marker symbol when linked
+    # Disabling rmlui's PCH removes the conflicting marker and lets the link succeed
+    if (MSVC AND TARGET rmlui_core AND DUSK_ENABLE_CODE_MODS)
+        set_target_properties(rmlui_core PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
+    endif ()
+
+    add_executable(dusklight WIN32 src/dusk/launcher_win32.cpp)
+    target_link_libraries(dusklight PRIVATE dusklight_game)
+    target_include_directories(dusklight PRIVATE include)
+    set(DUSK_MAIN_TARGET dusklight_game)
 else ()
     add_executable(dusklight ${DUSK_FILES})
+    set(DUSK_MAIN_TARGET dusklight)
 endif ()
 if (ENABLE_ASAN)
-    target_sources(dusklight PRIVATE src/dusk/asan_options.c)
+    target_sources(${DUSK_MAIN_TARGET} PRIVATE src/dusk/asan_options.c)
 endif ()
 
-target_compile_definitions(dusklight PRIVATE ${GAME_COMPILE_DEFS})
-target_include_directories(dusklight PRIVATE ${miniz_SOURCE_DIR})
-target_link_libraries(dusklight PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
-target_precompile_headers(dusklight PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
-
-if (DUSK_ENABLE_CODE_MODS)
-    include(cmake/SymbolManifest.cmake)
-    if (WIN32)
-        # Game ABI exports & import library for mod linking
-        include(cmake/WindowsExports.cmake)
-        setup_windows_exports(dusklight)
-    endif ()
-    # Post-link symbol manifest: hookable-surface name->address map keyed to the build.
-    setup_symbol_manifest(dusklight)
+if (WIN32 AND TARGET imgui)
+    target_compile_definitions(imgui PRIVATE "IMGUI_API=__declspec(dllexport)")
+    target_sources(${DUSK_MAIN_TARGET} PRIVATE $<TARGET_OBJECTS:imgui>)
 endif ()
 
-# Hook reliability: guaranteed patchable entries on the game ABI surface, and no identical-code folding.
-if (MSVC)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:/hotpatch>)
-    endif ()
-    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
-        target_link_options(dusklight PRIVATE /FUNCTIONPADMIN:16 /OPT:NOICF)
-    else ()
-        target_link_options(dusklight PRIVATE /FUNCTIONPADMIN /OPT:NOICF)
-    endif ()
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "^(AppleClang|Clang)$")
-    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
-        set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=2,1>)
-    else ()
-        set(DUSK_PATCHABLE_ENTRY_FLAG $<$<COMPILE_LANGUAGE:C,CXX>:-fpatchable-function-entry=10,5>)
-    endif ()
-endif ()
+target_compile_definitions(${DUSK_MAIN_TARGET} PRIVATE ${GAME_COMPILE_DEFS} DUSK_BUILDING_GAME=1)
+target_include_directories(${DUSK_MAIN_TARGET} PRIVATE ${GAME_INCLUDE_DIRS})
+target_link_libraries(${DUSK_MAIN_TARGET} PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
+target_precompile_headers(${DUSK_MAIN_TARGET} PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_LIST_DIR}/include/dusk_pch.hpp>")
 
-if (DEFINED DUSK_PATCHABLE_ENTRY_FLAG)
-    target_compile_options(dusklight PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
-    foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
-        target_compile_options(${jsystem_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
-    endforeach()
-    foreach(_sdk_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
-            aurora_os aurora_pad aurora_si aurora_vi)
-        if (TARGET ${_sdk_lib})
-            get_target_property(_sdk_lib_imported ${_sdk_lib} IMPORTED)
-            if (NOT _sdk_lib_imported)
-                target_compile_options(${_sdk_lib} PRIVATE ${DUSK_PATCHABLE_ENTRY_FLAG})
-            endif ()
-        endif ()
-    endforeach ()
-endif ()
-
-if (WIN32)
-    target_link_libraries(dusklight PRIVATE Psapi)
-endif ()
-if (APPLE)
-    include(cmake/AppleExports.cmake)
-    setup_apple_exports(dusklight)
-elseif (ANDROID)
-    include(cmake/AndroidExports.cmake)
-    setup_android_exports(dusklight)
-elseif (UNIX)
-    target_link_options(dusklight PRIVATE -rdynamic)
-endif ()
+if(WIN32)
+    target_link_libraries(${DUSK_MAIN_TARGET} PRIVATE Psapi)
+endif()
+if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    target_link_libraries(${DUSK_MAIN_TARGET} PRIVATE dl)
+endif()
+if(APPLE)
+    target_link_options(${DUSK_MAIN_TARGET} PRIVATE -Wl,-export_dynamic)
+elseif(UNIX AND NOT ANDROID)
+    target_link_options(${DUSK_MAIN_TARGET} PRIVATE -rdynamic)
+endif()
 
 if (TARGET crashpad_handler)
-    add_dependencies(dusklight crashpad_handler)
-    add_custom_command(TARGET dusklight POST_BUILD
+    add_dependencies(${DUSK_MAIN_TARGET} crashpad_handler)
+    add_custom_command(TARGET ${DUSK_MAIN_TARGET} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
             "$<TARGET_FILE:crashpad_handler>"
             "$<TARGET_FILE_DIR:dusklight>"
@@ -585,20 +620,17 @@ 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_MAIN_TARGET} PRIVATE "-Wl,-u,SDL_main")
 endif ()
 
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
     target_link_options(dusklight PRIVATE "-Wl,--build-id=sha1")
-    target_link_libraries(dusklight PRIVATE dl)
-elseif (ANDROID)
-    target_link_options(dusklight PRIVATE "-Wl,--build-id=sha1")
 endif ()
 
 if (NOT APPLE)
     add_custom_command(TARGET dusklight POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CMAKE_SOURCE_DIR}/res"
+            "${CMAKE_CURRENT_SOURCE_DIR}/res"
             "$<TARGET_FILE_DIR:dusklight>/res"
         COMMENT "Copying resources"
     )
@@ -626,23 +658,12 @@ if (WIN32)
     configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusklight.rc.in ${DUSK_WINDOWS_RC} @ONLY)
 
     target_sources(dusklight PRIVATE ${DUSK_WINDOWS_ICON_ICO} ${DUSK_WINDOWS_RC})
-    set_target_properties(dusklight PROPERTIES WIN32_EXECUTABLE TRUE)
-
     if (MSVC)
         target_link_options(dusklight PRIVATE /MANIFEST:NO)
     endif ()
 endif ()
 
-include(cmake/ModSDK.cmake)
-
-if (DUSK_ENABLE_CODE_MODS AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-    add_custom_target(dusklight_mods) # Aggregate target for all in-tree mods
-    add_subdirectory(mods/template_mod)
-    add_subdirectory(mods/ao_mod)
-    add_subdirectory(mods/shadow_mod)
-    add_subdirectory(mods/window_demo)
-    add_subdirectory(mods/audio_mod)
-endif ()
+include(cmake/DuskModSDK.cmake)
 
 if (APPLE)
     if (IOS)
@@ -651,7 +672,7 @@ if (APPLE)
         set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/tvos)
     else ()
         set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/macos)
-        set(DUSK_ENTITLEMENTS ${DUSK_RESOURCE_DIR}/Dusklight.entitlements)
+        set(DUSK_ENTITLEMENTS ${DUSK_RESOURCE_DIR}/Dusk.entitlements)
     endif ()
     set(DUSK_INFO_PLIST ${DUSK_RESOURCE_DIR}/Info.plist.in)
     file(GLOB_RECURSE DUSK_RESOURCE_FILES
@@ -671,7 +692,8 @@ if (APPLE)
         get_filename_component(NEW_FILE_PATH ${NEW_FILE} DIRECTORY)
         set_property(SOURCE ${FILE} PROPERTY MACOSX_PACKAGE_LOCATION "Resources/${NEW_FILE_PATH}")
     endforeach ()
-    set(_apple_bundle_properties
+    set_target_properties(
+        dusklight PROPERTIES
         MACOSX_BUNDLE TRUE
         MACOSX_BUNDLE_BUNDLE_NAME ${DUSK_BUNDLE_NAME}
         MACOSX_BUNDLE_GUI_IDENTIFIER ${DUSK_BUNDLE_IDENTIFIER}
@@ -681,35 +703,12 @@ if (APPLE)
         OUTPUT_NAME Dusklight
         XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "YES"
         XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
+        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${DUSK_ENTITLEMENTS}
+        XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME "YES"
     )
-    if (DUSK_ENTITLEMENTS)
-        list(APPEND _apple_bundle_properties
-            XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${DUSK_ENTITLEMENTS})
-    endif ()
-    if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-        list(APPEND _apple_bundle_properties
-            XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME "YES")
-    endif ()
-    set_target_properties(dusklight PROPERTIES ${_apple_bundle_properties})
-
-    if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
-        set(_sign_nested_commands)
-        if (TARGET crashpad_handler)
-            list(APPEND _sign_nested_commands
-                COMMAND /usr/bin/codesign --force --sign -
-                    "$<TARGET_FILE_DIR:dusklight>/crashpad_handler")
-        endif ()
-        add_custom_command(TARGET dusklight POST_BUILD
-            ${_sign_nested_commands}
-            COMMAND /usr/bin/codesign --force --sign - --entitlements
-                "${DUSK_ENTITLEMENTS}" "$<TARGET_BUNDLE_DIR:dusklight>"
-            COMMENT "Signing Dusklight.app with entitlements"
-            VERBATIM
-        )
-    endif ()
 endif ()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+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)
@@ -725,7 +724,11 @@ if (IOS)
 endif ()
 
 include(extern/aurora/cmake/AuroraCopyRuntimeDLLs.cmake)
-aurora_copy_runtime_dlls(dusklight)
+if(WIN32)
+    aurora_copy_runtime_dlls(dusklight dusklight_game)
+else()
+    aurora_copy_runtime_dlls(dusklight)
+endif()
 
 if (DUSK_SELECTED_OPT)
     if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
@@ -764,15 +767,33 @@ function(get_target_prefix target result_var)
     endif ()
 endfunction()
 list(APPEND BINARY_TARGETS dusklight)
+if(WIN32)
+    list(APPEND BINARY_TARGETS dusklight_game)
+endif()
 set(EXTRA_TARGETS "")
 if (TARGET crashpad_handler)
     list(APPEND EXTRA_TARGETS crashpad_handler)
 endif ()
-if (DUSK_PACKAGE_INSTALL)
+if (WIN32)
+    # Install the launcher and game DLL, but skip the DLL import library.
+    if (DUSK_PACKAGE_INSTALL)
+        install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}
+            BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+        )
+    else ()
+        install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}
+            BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}
+        )
+    endif ()
+elseif (DUSK_PACKAGE_INSTALL)
     install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_BINDIR})
-else()
+else ()
     install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif()
+endif ()
 aurora_install_runtime_dlls(dusklight ${CMAKE_INSTALL_PREFIX})
 if (NOT APPLE)
     if (DUSK_PACKAGE_INSTALL)
@@ -831,4 +852,6 @@ foreach (target IN LISTS BINARY_TARGETS)
     endforeach ()
 endforeach ()
 
-install_bundled_mods()
+if (DUSK_ENABLE_CODE_MODS)
+    add_subdirectory(tools/mod_test)
+endif ()

CMakePresets.json

@@ -22,6 +22,18 @@
         "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL"
       }
     },
+    {
+      "name": "release",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL",
+        "CMAKE_INTERPROCEDURAL_OPTIMIZATION": {
+          "type": "BOOL",
+          "value": true
+        }
+      }
+    },
     {
       "name": "ci",
       "hidden": true,
@@ -60,11 +72,7 @@
           "type": "BOOL",
           "value": false
         },
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
-        "DUSK_ENABLE_CODE_MODS": {
-          "type": "BOOL",
-          "value": true
-        }
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -151,10 +159,6 @@
         "CMAKE_C_COMPILER": "cl",
         "CMAKE_CXX_COMPILER": "cl",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
-        "DUSK_ENABLE_CODE_MODS": {
-          "type": "BOOL",
-          "value": true
-        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true
@@ -196,13 +200,17 @@
     {
       "name": "windows-arm64-msvc",
       "displayName": "Windows ARM64 (MSVC)",
-      "inherits": [
-        "windows-msvc"
-      ],
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/${presetName}",
       "architecture": {
         "value": "arm64",
         "strategy": "external"
       },
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "cl",
+        "CMAKE_CXX_COMPILER": "cl",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
+      },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
           "hostOS": [
@@ -254,11 +262,7 @@
           "type": "BOOL",
           "value": false
         },
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
-        "DUSK_ENABLE_CODE_MODS": {
-          "type": "BOOL",
-          "value": true
-        }
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -314,19 +318,11 @@
           "type": "BOOL",
           "value": false
         },
-        "ENABLE_VISIBILITY": {
-          "type": "BOOL",
-          "value": true
-        },
         "Rust_CARGO_TARGET": "aarch64-apple-ios",
         "BUILD_SHARED_LIBS": {
           "type": "BOOL",
           "value": false
         },
-        "DUSK_ENABLE_CODE_MODS": {
-          "type": "BOOL",
-          "value": true
-        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true
@@ -362,20 +358,12 @@
           "type": "BOOL",
           "value": false
         },
-        "ENABLE_VISIBILITY": {
-          "type": "BOOL",
-          "value": true
-        },
         "Rust_CARGO_TARGET": "aarch64-apple-tvos",
         "Rust_TOOLCHAIN": "nightly",
         "BUILD_SHARED_LIBS": {
           "type": "BOOL",
           "value": false
         },
-        "DUSK_ENABLE_CODE_MODS": {
-          "type": "BOOL",
-          "value": true
-        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true
@@ -406,10 +394,6 @@
           "type": "BOOL",
           "value": false
         },
-        "DUSK_ENABLE_CODE_MODS": {
-          "type": "BOOL",
-          "value": true
-        },
         "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
           "type": "BOOL",
           "value": true
@@ -445,7 +429,8 @@
       "hidden": true,
       "inherits": [
         "android-base",
-        "ci"
+        "ci",
+        "release"
       ],
       "cacheVariables": {
         "DUSK_ENABLE_SENTRY_NATIVE": {

README.md

@@ -20,17 +20,31 @@ It aims to be as accurate as possible to the original while also providing new o
 > Dusklight does *not* provide any copyrighted assets. You must provide your own copy of the original game.
 
 > [!IMPORTANT]
-> At a minimum, Dusklight requires a GPU with support for D3D12, Vulkan 1.1+, or Metal. For older devices, best-effort support is provided for D3D11 and OpenGL ES (Android), but will not achieve full accuracy or performance. Your experience with specific hardware, operating systems, and drivers may vary.
+> 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.
 
 ### 1. Dump your game
 
-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 `.rvz` to save space.
+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 releases are supported. Support for other versions of the game is planned in the future.
+Currently, only the GameCube USA and EUR releases are supported. Support for other versions of the game is planned in the future.
 
-### 2. Install Dusklight
+### 2. Download [Dusklight](https://github.com/TwilitRealm/dusklight/releases)
 
-Visit the [official installation guide](https://twilitrealm.dev/install/) for full instructions.
+### 3. Setup the game
+**Windows / macOS / Linux**
+- Extract the .zip file
+- Launch Dusklight
+- Press **Select Disc Image** and provide the path to your supported game dump
+- Press **Play**!
+
+**iOS**
+- 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
 

cmake/AndroidExports.cmake

@@ -1,63 +0,0 @@
-include_guard(GLOBAL)
-
-get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
-
-# Android mod linking: symgen scans and filters the game's exports, generating a version script used for the executable
-# link step, and generates a shared object stub that mods can link against without having to build the whole game.
-function(setup_android_exports target)
-    include("${_dir}/SymbolManifest.cmake")
-    ensure_symgen(TRUE)
-    add_dependencies(${target} symgen)
-
-    set(_rsp_lines "$<TARGET_OBJECTS:${target}>")
-    foreach (_lib IN LISTS JSYSTEM_LIBRARIES)
-        list(APPEND _rsp_lines "$<TARGET_FILE:${_lib}>")
-    endforeach ()
-    list(JOIN _rsp_lines "\n" _rsp_content)
-    set(_rsp "${CMAKE_BINARY_DIR}/dusklight_exports_input.rsp")
-    file(GENERATE OUTPUT "${_rsp}" CONTENT "${_rsp_content}")
-
-    set(_sdk_args)
-    foreach (_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
-            aurora_os aurora_pad aurora_si aurora_vi)
-        if (TARGET ${_lib})
-            list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:${_lib}>")
-        endif ()
-    endforeach ()
-    if (TARGET dawn::webgpu_dawn)
-        get_target_property(_dawn_type dawn::webgpu_dawn TYPE)
-        if (_dawn_type STREQUAL "STATIC_LIBRARY")
-            list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:dawn::webgpu_dawn>")
-        endif ()
-    endif ()
-
-    set(_vscript "${CMAKE_BINARY_DIR}/dusklight_exports.ver")
-    add_custom_command(TARGET ${target} PRE_LINK
-            COMMAND "${SYMGEN_EXE}" exports
-            "@${_rsp}"
-            --out "${_vscript}"
-            --format version-script
-            --exclude cmake_pch
-            --exclude miniz
-            --exclude asan_options
-            --exclude src/dusk
-            # Resolved from the Java side; the SDL ones live in the statically-linked
-            # SDL archive, outside the provenance scan.
-            --extra-sym JNI_OnLoad
-            --extra-sym SDL_main
-            --extra-sym "Java_*"
-            ${_sdk_args}
-            COMMENT "Generating dusklight exports"
-            VERBATIM)
-    target_link_options(${target} PRIVATE "-Wl,--version-script=${_vscript}")
-
-    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _arch)
-    set(_stub "${CMAKE_BINARY_DIR}/stub-android-${_arch}.so")
-    add_custom_command(TARGET ${target} POST_BUILD
-            COMMAND "${SYMGEN_EXE}" stub -f elf "$<TARGET_FILE:${target}>" -o "${_stub}"
-            --soname "$<TARGET_FILE_NAME:${target}>" --arch "${_arch}"
-            BYPRODUCTS "${_stub}"
-            COMMENT "Generating dusklight link stub"
-            VERBATIM)
-    install(FILES "${_stub}" DESTINATION sdk)
-endfunction()

cmake/AppleExports.cmake

@@ -1,90 +0,0 @@
-include_guard(GLOBAL)
-
-get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
-
-# Apple mod linking: symgen scans and filters the game's exports, generating an exports list used for the executable
-# link step, and generates a MH_EXECUTE Mach-O stub that mods can link against without having to build the whole game.
-function(setup_apple_exports target)
-    include("${_dir}/SymbolManifest.cmake")
-    ensure_symgen(TRUE)
-    set(_symgen "${SYMGEN_EXE}")
-    add_dependencies(${target} symgen)
-
-    set(_config_subdir "")
-    if (CMAKE_CONFIGURATION_TYPES)
-        set(_config_subdir "$<CONFIG>/")
-    endif ()
-
-    set(_rsp_lines "$<TARGET_OBJECTS:${target}>")
-    foreach (_lib IN LISTS JSYSTEM_LIBRARIES)
-        list(APPEND _rsp_lines "$<TARGET_FILE:${_lib}>")
-    endforeach ()
-    list(JOIN _rsp_lines "\n" _rsp_content)
-    set(_rsp "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_exports_input.rsp")
-    file(GENERATE OUTPUT "${_rsp}" CONTENT "${_rsp_content}")
-
-    set(_sdk_args)
-    foreach (_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
-            aurora_os aurora_pad aurora_si aurora_vi)
-        if (TARGET ${_lib})
-            list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:${_lib}>")
-        endif ()
-    endforeach ()
-
-    # Dawn is linked statically on Apple; mods reach wgpu* through the executable.
-    if (TARGET dawn::webgpu_dawn)
-        get_target_property(_dawn_type dawn::webgpu_dawn TYPE)
-        if (_dawn_type STREQUAL "STATIC_LIBRARY")
-            list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:dawn::webgpu_dawn>")
-        endif ()
-    endif ()
-
-    set(_exp "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_exports.exp")
-    add_custom_command(TARGET ${target} PRE_LINK
-            COMMAND "${_symgen}" exports
-            "@${_rsp}"
-            --out "${_exp}"
-            --exclude cmake_pch
-            --exclude miniz
-            --exclude asan_options
-            --exclude src/dusk
-            ${_sdk_args}
-            COMMENT "Generating dusklight exports"
-            VERBATIM)
-    target_link_options(${target} PRIVATE -Xlinker -exported_symbols_list -Xlinker "${_exp}")
-
-    # Generate the stub executable mods link against via -bundle_loader.
-    set(_stub_args)
-    if (IOS)
-        set(_stub_platform "ios")
-        list(APPEND _stub_args --platform ios)
-    elseif (TVOS)
-        set(_stub_platform "tvos")
-        list(APPEND _stub_args --platform tvos)
-    else ()
-        set(_stub_platform "macos")
-    endif ()
-    if (CMAKE_OSX_DEPLOYMENT_TARGET)
-        list(APPEND _stub_args --min-os "${CMAKE_OSX_DEPLOYMENT_TARGET}")
-    endif ()
-    if (CMAKE_OSX_ARCHITECTURES)
-        set(_archs "${CMAKE_OSX_ARCHITECTURES}")
-    else ()
-        set(_archs "${CMAKE_SYSTEM_PROCESSOR}")
-    endif ()
-    set(_arch_names "")
-    foreach (_arch IN LISTS _archs)
-        string(TOLOWER "${_arch}" _arch)
-        list(APPEND _stub_args --arch "${_arch}")
-        list(APPEND _arch_names "${_arch}")
-    endforeach ()
-    list(JOIN _arch_names "_" _arch_name)
-
-    set(_stub "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight-stub")
-    add_custom_command(TARGET ${target} POST_BUILD
-            COMMAND "${_symgen}" stub -f macho "${_exp}" -o "${_stub}" ${_stub_args}
-            BYPRODUCTS "${_stub}"
-            COMMENT "Generating dusklight link stub"
-            VERBATIM)
-    install(FILES "${_stub}" DESTINATION sdk RENAME "stub-${_stub_platform}-${_arch_name}")
-endfunction()

cmake/CopyModAssets.cmake

@@ -1,10 +0,0 @@
-# Copies a mod asset directory for packaging, skipping dotfiles and dot-directories
-# (.gitkeep, .DS_Store, ...). Usage: cmake -DSRC=<dir> -DDST=<dir> -P CopyModAssets.cmake
-file(MAKE_DIRECTORY "${DST}")
-file(GLOB_RECURSE _files RELATIVE "${SRC}" "${SRC}/*")
-foreach (_file IN LISTS _files)
-    if (NOT _file MATCHES "(^|/)\\.")
-        get_filename_component(_dir "${_file}" DIRECTORY)
-        file(COPY "${SRC}/${_file}" DESTINATION "${DST}/${_dir}")
-    endif ()
-endforeach ()

cmake/DetectVersion.cmake

@@ -1,121 +0,0 @@
-# Version detection shared by the main build and the mod SDK (sdk/CMakeLists.txt)
-include_guard(GLOBAL)
-
-get_filename_component(_DUSK_VERSION_ROOT "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-
-set(DUSK_SENTRY_DSN "" CACHE STRING "Sentry DSN")
-set(DUSK_SENTRY_ENVIRONMENT "development" CACHE STRING "Sentry environment")
-
-set(DUSK_VERSION_OVERRIDE "" CACHE STRING "Override version string (skips git detection and format validation)")
-
-macro(detect_version)
-    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 ${_DUSK_VERSION_ROOT} COMMAND ${GIT_EXECUTABLE} rev-parse --git-path HEAD
-                    OUTPUT_VARIABLE dusk_git_head_filename
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-            get_filename_component(dusk_git_head_filename "${dusk_git_head_filename}" ABSOLUTE BASE_DIR "${_DUSK_VERSION_ROOT}")
-            set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${dusk_git_head_filename}")
-
-            execute_process(WORKING_DIRECTORY ${_DUSK_VERSION_ROOT} COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name HEAD
-                    OUTPUT_VARIABLE dusk_git_head_symbolic
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-            execute_process(WORKING_DIRECTORY ${_DUSK_VERSION_ROOT}
-                    COMMAND ${GIT_EXECUTABLE} rev-parse --git-path ${dusk_git_head_symbolic}
-                    OUTPUT_VARIABLE dusk_git_head_symbolic_filename
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-            get_filename_component(dusk_git_head_symbolic_filename "${dusk_git_head_symbolic_filename}" ABSOLUTE BASE_DIR "${_DUSK_VERSION_ROOT}")
-            set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${dusk_git_head_symbolic_filename}")
-
-            # defines DUSK_WC_REVISION
-            execute_process(WORKING_DIRECTORY ${_DUSK_VERSION_ROOT} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-                    OUTPUT_VARIABLE DUSK_WC_REVISION
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-            # defines DUSK_WC_DESCRIBE
-            execute_process(WORKING_DIRECTORY ${_DUSK_VERSION_ROOT} COMMAND ${GIT_EXECUTABLE} describe --tags --long --dirty --match "v*"
-                    OUTPUT_VARIABLE DUSK_WC_DESCRIBE
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-            # remove the git hash, then collapse a clean "-0" suffix only
-            string(REGEX REPLACE "-[^-]+(-dirty|)$" "\\1" DUSK_WC_DESCRIBE "${DUSK_WC_DESCRIBE}")
-            string(REGEX REPLACE "-0$" "" DUSK_WC_DESCRIBE "${DUSK_WC_DESCRIBE}")
-
-            # defines DUSK_WC_BRANCH
-            execute_process(WORKING_DIRECTORY ${_DUSK_VERSION_ROOT} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-                    OUTPUT_VARIABLE DUSK_WC_BRANCH
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-            # defines DUSK_WC_DATE
-            execute_process(WORKING_DIRECTORY ${_DUSK_VERSION_ROOT} COMMAND ${GIT_EXECUTABLE} log -1 --format=%ad
-                    OUTPUT_VARIABLE DUSK_WC_DATE
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-        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]+)([-+].*)?$")
-            set(DUSK_SHORT_VERSION_STRING "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
-            set(_ver_major ${CMAKE_MATCH_1})
-            set(_ver_minor ${CMAKE_MATCH_2})
-            set(_ver_patch ${CMAKE_MATCH_3})
-            set(DUSK_VERSION_TWEAK "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}")
-endmacro()
-
-# Sets PLATFORM_NAME and configures version.h into the caller's binary dir.
-macro(configure_version_header)
-    if (CMAKE_SYSTEM_NAME STREQUAL Windows)
-        set(PLATFORM_NAME win32)
-    elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
-        if (IOS)
-            set(PLATFORM_NAME ios)
-        elseif (TVOS)
-            set(PLATFORM_NAME tvos)
-        else ()
-            set(PLATFORM_NAME macos)
-        endif ()
-    else ()
-        string(TOLOWER CMAKE_SYSTEM_NAME PLATFORM_NAME)
-    endif ()
-
-    configure_file(${_DUSK_VERSION_ROOT}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-endmacro()

cmake/DuskModSDK.cmake

@@ -0,0 +1,49 @@
+# add_dusk_mod(<target> SOURCES <file>... MOD_JSON <mod.json> [RES_DIR <res>])
+set(DUSK_MODS_OUTPUT_DIR "${CMAKE_SOURCE_DIR}/mods" CACHE PATH "Directory to write .dusk packages into")
+
+function(add_dusk_mod target_name)
+    cmake_parse_arguments(ARG "" "MOD_JSON;RES_DIR" "SOURCES" ${ARGN})
+    if(NOT ARG_MOD_JSON)
+        message(FATAL_ERROR "add_dusk_mod: MOD_JSON is required")
+    endif()
+
+    add_library(${target_name} SHARED ${ARG_SOURCES})
+    set_target_properties(${target_name} PROPERTIES PREFIX "" WINDOWS_EXPORT_ALL_SYMBOLS ON)
+    target_compile_features(${target_name} PRIVATE cxx_std_20)
+    target_link_libraries(${target_name} PRIVATE dusklight_game_headers)
+
+    if(APPLE)
+        target_link_options(${target_name} PRIVATE -undefined dynamic_lookup)
+    elseif(UNIX)
+        target_link_options(${target_name} PRIVATE -Wl,--allow-shlib-undefined)
+    elseif(WIN32)
+        target_link_libraries(${target_name} PRIVATE dusklight_game)
+        if(MSVC)
+            target_link_options(${target_name} PRIVATE /INCREMENTAL:NO)
+            set_target_properties(${target_name} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        endif()
+    endif()
+
+
+    set(_stage "${CMAKE_CURRENT_BINARY_DIR}/${target_name}_stage")
+    set(_out   "${DUSK_MODS_OUTPUT_DIR}/${target_name}.dusk")
+    file(MAKE_DIRECTORY "${_stage}")  # must exist before POST_BUILD on Windows
+
+    set(_zip_args "$<TARGET_FILE_NAME:${target_name}>" mod.json)
+    set(_extra_cmds "")
+    if(ARG_RES_DIR)
+        list(APPEND _zip_args res)
+        set(_extra_cmds COMMAND ${CMAKE_COMMAND} -E copy_directory
+                "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_RES_DIR}" "${_stage}/res")
+    endif()
+
+    add_custom_command(TARGET ${target_name} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${_stage}" "${DUSK_MODS_OUTPUT_DIR}"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${target_name}>" "${_stage}/$<TARGET_FILE_NAME:${target_name}>"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_MOD_JSON}" "${_stage}/mod.json"
+        ${_extra_cmds}
+        COMMAND ${CMAKE_COMMAND} -E tar cvf "${_out}" --format=zip ${_zip_args}
+        WORKING_DIRECTORY "${_stage}"
+        COMMENT "Packaging ${target_name} -> ${_out}"
+    )
+endfunction()

cmake/GameABIConfig.cmake

@@ -1,68 +0,0 @@
-# The game ABI surface shared by the main build and the mod SDK (sdk/CMakeLists.txt)
-include_guard(GLOBAL)
-
-get_filename_component(_game_root "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-
-# PARTIAL_DEBUG makes debug and release share one struct/vtable ABI so a mod binary loads into either
-set(_game_compile_defs TARGET_PC=1 WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0 MTX_USE_PS=1 PARTIAL_DEBUG=1)
-if (ANDROID)
-    list(APPEND _game_compile_defs TARGET_ANDROID=1)
-endif ()
-
-# Public game headers
-set(_game_abi_include_dirs
-        ${_game_root}/include
-        ${_game_root}/assets/GZ2E01
-        ${_game_root}/libs/JSystem/include
-        ${_game_root}/extern/aurora/include/dolphin
-        ${_game_root}/extern/aurora/include
-        ${_game_root}/sdk/include
-)
-
-# Internal game headers
-set(_game_include_dirs
-        ${_game_abi_include_dirs}
-        ${_game_root}/src
-        ${_game_root}/extern
-        ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-# Mod API, including services
-add_library(dusklight_mod_api INTERFACE)
-target_include_directories(dusklight_mod_api INTERFACE ${_game_root}/sdk/include)
-
-# Full internal headers used to build the game
-add_library(dusklight_game_headers INTERFACE)
-target_include_directories(dusklight_game_headers INTERFACE ${_game_include_dirs})
-target_compile_definitions(dusklight_game_headers INTERFACE ${_game_compile_defs})
-
-# Public game ABI for mods
-add_library(dusklight_game_abi_headers INTERFACE)
-target_include_directories(dusklight_game_abi_headers INTERFACE ${_game_abi_include_dirs})
-target_compile_definitions(dusklight_game_abi_headers INTERFACE ${_game_compile_defs})
-
-# Mod feature targets
-add_library(dusklight_mod_feature_game INTERFACE)
-target_link_libraries(dusklight_mod_feature_game INTERFACE
-        dusklight_mod_api
-        dusklight_game_abi_headers)
-target_compile_definitions(dusklight_mod_feature_game INTERFACE DUSK_MOD_FEATURE_GAME=1)
-# Game headers assume global.h comes first in the translation unit (it defines DUSK_GAME_DATA
-# and friends); force-include it so mods don't depend on include order.
-if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-    target_compile_options(dusklight_mod_feature_game INTERFACE
-            "$<$<COMPILE_LANGUAGE:CXX>:/FIglobal.h>")
-else ()
-    target_compile_options(dusklight_mod_feature_game INTERFACE
-            "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-include global.h>")
-endif ()
-target_sources(dusklight_mod_feature_game INTERFACE
-        ${_game_root}/sdk/src/game_feature.cpp)
-
-add_library(dusklight_mod_feature_webgpu INTERFACE)
-target_link_libraries(dusklight_mod_feature_webgpu INTERFACE dusklight_mod_api)
-target_compile_definitions(dusklight_mod_feature_webgpu INTERFACE DUSK_MOD_FEATURE_WEBGPU=1)
-
-add_library(dusklight_mod_feature_fmt INTERFACE)
-target_link_libraries(dusklight_mod_feature_fmt INTERFACE dusklight_mod_api)
-target_compile_definitions(dusklight_mod_feature_fmt INTERFACE DUSK_MOD_FEATURE_FMT=1)

cmake/ModSDK.cmake

@@ -1,518 +0,0 @@
-# add_mod(<target> [FEATURES <feature>...] SOURCES <file>... MOD_JSON <mod.json>
-#         [RUNTIME_LIBRARIES <file>...] [RES_DIR <res>] [OVERLAY_DIR <overlay>]
-#         [TEXTURES_DIR <textures>] [OUTPUT_DIR <dir>] [BUNDLE])
-set(DUSK_MODS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/mods" CACHE PATH "Directory to write mod packages into")
-set(DUSKLIGHT_SDK_STUB_URL "https://github.com/encounter/dusklight/releases/download/sdk"
-        CACHE STRING "Base URL for game link stubs downloaded by out-of-tree mod builds")
-
-function(_mod_lib_info out_platform_var out_name_var)
-    set(_arch "${CMAKE_SYSTEM_PROCESSOR}")
-    if (APPLE AND CMAKE_OSX_ARCHITECTURES)
-        list(LENGTH CMAKE_OSX_ARCHITECTURES _count)
-        if (_count GREATER 1)
-            message(FATAL_ERROR "add_mod: universal binaries are not supported")
-        endif ()
-        set(_arch "${CMAKE_OSX_ARCHITECTURES}")
-    elseif (WIN32)
-        set(_arch_id "${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
-        if (NOT _arch_id)
-            set(_arch_id "${CMAKE_C_COMPILER_ARCHITECTURE_ID}")
-        endif ()
-        if (_arch_id MATCHES "^ARM64(EC)?$")
-            set(_arch "arm64")
-        elseif (_arch_id STREQUAL "x64")
-            set(_arch "amd64")
-        elseif (_arch_id STREQUAL "X86")
-            set(_arch "x86")
-        endif ()
-    endif ()
-    string(TOLOWER "${CMAKE_SYSTEM_NAME}" _platform)
-    if (_platform STREQUAL "darwin")
-        set(_platform "macos")
-    endif ()
-    string(TOLOWER "${_arch}" _arch)
-    if (_arch MATCHES "^(i[3-6]86|x86)$")
-        set(_arch "x86")
-    endif ()
-    if (WIN32)
-        set(_ext ".dll")
-    else ()
-        set(_ext ".so")
-    endif ()
-    set(${out_platform_var} "${_platform}-${_arch}" PARENT_SCOPE)
-    set(${out_name_var} "mod${_ext}" PARENT_SCOPE)
-endfunction()
-
-# For out-of-tree builds without a game binary: download the version-independent link stub
-# (generated by symgen) for the target platform.
-function(_mod_download_link_stub out_var)
-    _mod_lib_info(_platform _lib_name)
-    if (WIN32)
-        set(_asset "${_platform}.lib")
-    elseif (ANDROID)
-        set(_asset "stub-${_platform}.so")
-    else ()
-        set(_asset "stub-${_platform}")
-    endif ()
-    set(_stub "${CMAKE_BINARY_DIR}/dusklight-sdk-stubs/${_asset}")
-    if (NOT EXISTS "${_stub}")
-        message(STATUS "Mod SDK: downloading link stub ${_asset}")
-        file(DOWNLOAD "${DUSKLIGHT_SDK_STUB_URL}/${_asset}" "${_stub}.tmp" STATUS _status)
-        list(GET _status 0 _code)
-        if (NOT _code EQUAL 0)
-            list(GET _status 1 _error)
-            file(REMOVE "${_stub}.tmp")
-            message(FATAL_ERROR
-                    "Mod SDK: failed to download ${DUSKLIGHT_SDK_STUB_URL}/${_asset}: ${_error}\n"
-                    "Set DUSK_GAME_EXE to a game binary or link stub to skip the download.")
-        endif ()
-        file(RENAME "${_stub}.tmp" "${_stub}")
-    endif ()
-    set(${out_var} "${_stub}" PARENT_SCOPE)
-endfunction()
-
-function(_mod_resolve_source_path out_var path)
-    if (IS_ABSOLUTE "${path}")
-        set(_path "${path}")
-    else ()
-        set(_path "${CMAKE_CURRENT_SOURCE_DIR}/${path}")
-    endif ()
-    set(${out_var} "${_path}" PARENT_SCOPE)
-endfunction()
-
-function(_mod_collect_assets out_var dir)
-    if (NOT IS_DIRECTORY "${dir}")
-        message(FATAL_ERROR "add_mod: asset directory does not exist: ${dir}")
-    endif ()
-
-    file(GLOB_RECURSE _files CONFIGURE_DEPENDS LIST_DIRECTORIES false "${dir}/*")
-    # Dotfiles (.gitkeep, .DS_Store, ...) are not packaged; see CopyModAssets.cmake.
-    set(_assets "")
-    foreach (_file IN LISTS _files)
-        file(RELATIVE_PATH _rel "${dir}" "${_file}")
-        if (NOT _rel MATCHES "(^|/)\\.")
-            list(APPEND _assets "${_file}")
-        endif ()
-    endforeach ()
-    set(${out_var} ${_assets} PARENT_SCOPE)
-endfunction()
-
-function(_mod_add_webgpu_headers target_name)
-    if (NOT TARGET dawn::dawncpp_headers AND NOT TARGET dawn::webgpu_dawn)
-        include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../extern/aurora/cmake/AuroraDependencyVersions.cmake")
-        set(AURORA_DAWN_PROVIDER "package" CACHE STRING "How to provide Dawn for the mod SDK")
-        include("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../extern/aurora/cmake/AuroraDawnProvider.cmake")
-    endif ()
-
-    if (TARGET dawn::dawncpp_headers)
-        target_link_libraries(${target_name} PRIVATE dawn::dawncpp_headers)
-    elseif (TARGET dawn::webgpu_dawn)
-        target_link_libraries(${target_name} PRIVATE dawn::webgpu_dawn)
-    else ()
-        message(FATAL_ERROR "add_mod: FEATURES webgpu could not provide WebGPU headers")
-    endif ()
-endfunction()
-
-function(_mod_add_fmt target_name)
-    if (NOT TARGET fmt::fmt-header-only)
-        find_package(fmt 11 CONFIG QUIET GLOBAL)
-    endif ()
-
-    if (NOT TARGET fmt::fmt-header-only)
-        include(FetchContent)
-        message(STATUS "Mod SDK: fetching fmt")
-        # Keep the fallback version in sync with extern/aurora/extern/CMakeLists.txt.
-        FetchContent_Declare(fmt
-                URL https://github.com/fmtlib/fmt/archive/refs/tags/12.1.0.tar.gz
-                URL_HASH SHA256=ea7de4299689e12b6dddd392f9896f08fb0777ac7168897a244a6d6085043fea
-                DOWNLOAD_EXTRACT_TIMESTAMP FALSE
-                EXCLUDE_FROM_ALL)
-        FetchContent_MakeAvailable(fmt)
-    endif ()
-
-    if (NOT TARGET fmt::fmt-header-only)
-        message(FATAL_ERROR "add_mod: FEATURES fmt could not provide fmt::fmt-header-only")
-    endif ()
-    target_link_libraries(${target_name} PRIVATE fmt::fmt-header-only)
-endfunction()
-
-function(add_mod target_name)
-    cmake_parse_arguments(ARG "BUNDLE" "MOD_JSON;RES_DIR;OVERLAY_DIR;TEXTURES_DIR;OUTPUT_DIR"
-            "SOURCES;RUNTIME_LIBRARIES;FEATURES" ${ARGN})
-    if (ARG_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "add_mod: unknown arguments: ${ARG_UNPARSED_ARGUMENTS}")
-    endif ()
-    if (NOT ARG_MOD_JSON)
-        message(FATAL_ERROR "add_mod: MOD_JSON is required")
-    endif ()
-    _mod_resolve_source_path(_mod_json "${ARG_MOD_JSON}")
-    if (NOT EXISTS "${_mod_json}")
-        message(FATAL_ERROR "add_mod: MOD_JSON does not exist: ${_mod_json}")
-    endif ()
-
-    set(_supported_features fmt game webgpu)
-    set(_features "")
-    foreach (_feature IN LISTS ARG_FEATURES)
-        list(FIND _supported_features "${_feature}" _feature_index)
-        if (_feature_index EQUAL -1)
-            list(JOIN _supported_features ", " _supported_features_text)
-            message(FATAL_ERROR
-                    "add_mod: unknown feature '${_feature}' (supported: ${_supported_features_text})")
-        endif ()
-        list(FIND _features "${_feature}" _duplicate_index)
-        if (NOT _duplicate_index EQUAL -1)
-            message(FATAL_ERROR "add_mod: duplicate feature '${_feature}'")
-        endif ()
-        list(APPEND _features "${_feature}")
-    endforeach ()
-    if (_features AND NOT ARG_SOURCES)
-        message(FATAL_ERROR "add_mod: FEATURES requires SOURCES")
-    endif ()
-
-    set(_has_lib FALSE)
-    set(_needs_host_link FALSE)
-    set(_lib_platform "")
-    set(_lib_name "")
-    if (ARG_SOURCES)
-        set(_has_lib TRUE)
-        add_library(${target_name} MODULE ${ARG_SOURCES})
-        _mod_lib_info(_lib_platform _lib_name)
-        set_target_properties(${target_name} PROPERTIES
-                PREFIX ""
-                C_VISIBILITY_PRESET hidden
-                CXX_VISIBILITY_PRESET hidden
-                VISIBILITY_INLINES_HIDDEN ON
-                WINDOWS_EXPORT_ALL_SYMBOLS OFF)
-        target_compile_features(${target_name} PRIVATE cxx_std_20)
-        target_link_libraries(${target_name} PRIVATE dusklight_mod_api)
-        foreach (_feature IN LISTS _features)
-            target_link_libraries(${target_name} PRIVATE dusklight_mod_feature_${_feature})
-            if (_feature STREQUAL "webgpu")
-                _mod_add_webgpu_headers(${target_name})
-            endif ()
-            if (_feature STREQUAL "fmt")
-                _mod_add_fmt(${target_name})
-            endif ()
-            if (_feature STREQUAL "game" OR _feature STREQUAL "webgpu")
-                set(_needs_host_link TRUE)
-            endif ()
-        endforeach ()
-
-        if (NOT TARGET dusklight)
-            # Apply global compile options for out-of-tree mod builds
-            if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-                target_compile_options(${target_name} PRIVATE
-                        -Wno-multichar -Wno-trigraphs -Wno-deprecated-declarations)
-            elseif (APPLE)
-                target_compile_options(${target_name} PRIVATE
-                        -Wno-declaration-after-statement -Wno-non-pod-varargs)
-            elseif (MSVC)
-                target_compile_options(${target_name} PRIVATE
-                        "$<$<COMPILE_LANGUAGE:C,CXX>:/bigobj>"
-                        "$<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>")
-            endif ()
-            # Use signed char on ARM to match the original game (and x86)
-            string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _mod_arch)
-            if (_mod_arch MATCHES "^(arm|aarch64)" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
-                target_compile_options(${target_name} PRIVATE -fsigned-char)
-            endif ()
-        endif ()
-
-        if (APPLE)
-            if (_needs_host_link)
-                if (TARGET dusklight)
-                    set(_game_exe "$<TARGET_FILE:dusklight>")
-                    add_dependencies(${target_name} dusklight)
-                elseif (DUSK_GAME_EXE)
-                    _mod_resolve_source_path(_game_exe "${DUSK_GAME_EXE}")
-                else ()
-                    _mod_download_link_stub(_game_exe)
-                endif ()
-                target_link_options(${target_name} PRIVATE
-                        -Xlinker -bundle_loader -Xlinker "${_game_exe}")
-                set_property(TARGET ${target_name} APPEND PROPERTY LINK_DEPENDS "${_game_exe}")
-            endif ()
-            set_target_properties(${target_name} PROPERTIES
-                    BUILD_RPATH "@loader_path"
-                    INSTALL_RPATH "@loader_path")
-        elseif (ANDROID)
-            if (_needs_host_link)
-                if (TARGET dusklight)
-                    target_link_libraries(${target_name} PRIVATE dusklight)
-                else ()
-                    if (DUSK_GAME_EXE)
-                        _mod_resolve_source_path(_game_lib "${DUSK_GAME_EXE}")
-                    else ()
-                        _mod_download_link_stub(_game_lib)
-                    endif ()
-                    target_link_libraries(${target_name} PRIVATE "${_game_lib}")
-                endif ()
-            endif ()
-            set_target_properties(${target_name} PROPERTIES
-                    BUILD_RPATH "$ORIGIN"
-                    INSTALL_RPATH "$ORIGIN")
-        elseif (UNIX)
-            if (_needs_host_link)
-                target_link_options(${target_name} PRIVATE -Wl,--allow-shlib-undefined)
-            endif ()
-            set_target_properties(${target_name} PROPERTIES
-                    BUILD_RPATH "$ORIGIN"
-                    INSTALL_RPATH "$ORIGIN")
-        elseif (WIN32)
-            # Mods link against the game's import library (sdk/windows-<arch>.lib, generated by
-            # setup_windows_exports); cl and clang-cl both consume it in MSVC mode. Function
-            # calls resolve through import thunks; game data is reachable only through
-            # __declspec(dllimport), i.e. DUSK_GAME_DATA-annotated declarations.
-            if (_needs_host_link)
-                if (TARGET dusklight)
-                    if (NOT DUSK_GAME_IMPLIB)
-                        message(FATAL_ERROR
-                                "add_mod: DUSK_GAME_IMPLIB is not set (see setup_windows_exports)")
-                    endif ()
-                    set(_game_lib "${DUSK_GAME_IMPLIB}")
-                elseif (DUSK_GAME_EXE)
-                    _mod_resolve_source_path(_game_lib "${DUSK_GAME_EXE}")
-                    if (NOT _game_lib MATCHES "\\.lib$")
-                        message(FATAL_ERROR
-                                "add_mod: DUSK_GAME_EXE must be an import library on Windows "
-                                "(sdk/windows-<arch>.lib)")
-                    endif ()
-                else ()
-                    _mod_download_link_stub(_game_lib)
-                endif ()
-                target_link_libraries(${target_name} PRIVATE "${_game_lib}")
-            endif ()
-            set_target_properties(${target_name} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
-            target_compile_definitions(${target_name} PRIVATE _ITERATOR_DEBUG_LEVEL=0)
-        endif ()
-    endif ()
-    if (ARG_RUNTIME_LIBRARIES AND NOT _has_lib)
-        message(FATAL_ERROR "add_mod: RUNTIME_LIBRARIES requires SOURCES")
-    endif ()
-
-    set(_output_dir "${DUSK_MODS_OUTPUT_DIR}")
-    if (ARG_OUTPUT_DIR)
-        set(_output_dir "${ARG_OUTPUT_DIR}")
-    endif ()
-    set(_stage "${CMAKE_CURRENT_BINARY_DIR}/${target_name}_stage")
-    set(_out "${_output_dir}/${target_name}.dusk")
-
-    set(_zip_args mod.json)
-    set(_package_deps "${_mod_json}")
-    set(_package_inputs "${_mod_json}")
-    set(_extra_cmds "")
-    set(_lib_copy_cmd "")
-    set(_target_depend "")
-    if (_has_lib)
-        list(APPEND _zip_args lib)
-        set(_lib_copy_cmd
-                COMMAND ${CMAKE_COMMAND} -E make_directory "${_stage}/lib/${_lib_platform}"
-                COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "$<TARGET_FILE:${target_name}>" "${_stage}/lib/${_lib_platform}/${_lib_name}")
-        set(_target_depend ${target_name})
-    endif ()
-    string(TOLOWER "${_lib_name}" _lib_name_key)
-    set(_runtime_lib_name_keys "${_lib_name_key}")
-    foreach (_runtime_lib IN LISTS ARG_RUNTIME_LIBRARIES)
-        _mod_resolve_source_path(_runtime_lib_path "${_runtime_lib}")
-        if (NOT EXISTS "${_runtime_lib_path}" OR IS_DIRECTORY "${_runtime_lib_path}")
-            message(FATAL_ERROR "add_mod: runtime library does not exist or is not a file: ${_runtime_lib_path}")
-        endif ()
-        get_filename_component(_runtime_lib_name "${_runtime_lib_path}" NAME)
-        string(TOLOWER "${_runtime_lib_name}" _runtime_lib_name_key)
-        list(FIND _runtime_lib_name_keys "${_runtime_lib_name_key}" _runtime_lib_name_index)
-        if (NOT _runtime_lib_name_index EQUAL -1)
-            message(FATAL_ERROR "add_mod: duplicate runtime library filename: ${_runtime_lib_name}")
-        endif ()
-        list(APPEND _runtime_lib_name_keys "${_runtime_lib_name_key}")
-        list(APPEND _package_deps "${_runtime_lib_path}")
-        list(APPEND _package_inputs "${_runtime_lib_path}")
-        list(APPEND _lib_copy_cmd COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "${_runtime_lib_path}" "${_stage}/lib/${_lib_platform}/${_runtime_lib_name}")
-    endforeach ()
-    if (ARG_RES_DIR)
-        _mod_resolve_source_path(_res_dir "${ARG_RES_DIR}")
-        _mod_collect_assets(_res_deps "${_res_dir}")
-        list(APPEND _package_deps ${_res_deps})
-        list(APPEND _package_inputs "${_res_dir}" ${_res_deps})
-        list(APPEND _zip_args res)
-        list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} "-DSRC=${_res_dir}"
-                "-DDST=${_stage}/res" -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CopyModAssets.cmake")
-    endif ()
-    if (ARG_OVERLAY_DIR)
-        _mod_resolve_source_path(_overlay_dir "${ARG_OVERLAY_DIR}")
-        _mod_collect_assets(_overlay_deps "${_overlay_dir}")
-        list(APPEND _package_deps ${_overlay_deps})
-        list(APPEND _package_inputs "${_overlay_dir}" ${_overlay_deps})
-        list(APPEND _zip_args overlay)
-        list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} "-DSRC=${_overlay_dir}"
-                "-DDST=${_stage}/overlay" -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CopyModAssets.cmake")
-    endif ()
-    if (ARG_TEXTURES_DIR)
-        _mod_resolve_source_path(_textures_dir "${ARG_TEXTURES_DIR}")
-        _mod_collect_assets(_textures_deps "${_textures_dir}")
-        list(APPEND _package_deps ${_textures_deps})
-        list(APPEND _package_inputs "${_textures_dir}" ${_textures_deps})
-        list(APPEND _zip_args textures)
-        list(APPEND _extra_cmds COMMAND ${CMAKE_COMMAND} "-DSRC=${_textures_dir}"
-                "-DDST=${_stage}/textures" -P "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CopyModAssets.cmake")
-    endif ()
-
-    set(_bundle_cmds "")
-    if (ARG_BUNDLE AND TARGET dusklight)
-        file(READ "${_mod_json}" _mod_json_text)
-        string(JSON _mod_id GET "${_mod_json_text}" id)
-        set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_TARGETS "${target_name}")
-        set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_IDS "${_mod_id}")
-        set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_STAGES "${_stage}")
-        set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_PACKAGES "${_out}")
-        set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_LIB_PLATFORMS "${_lib_platform}")
-        set_property(GLOBAL APPEND PROPERTY DUSK_BUNDLED_MOD_LIB_NAMES "${_lib_name}")
-        set(_bundle_cmds
-                COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundled_mods"
-                COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_out}" "${CMAKE_BINARY_DIR}/bundled_mods/${target_name}.dusk")
-    endif ()
-
-    set(_package_target "${target_name}_package")
-    set(_package_inputs_file "${CMAKE_CURRENT_BINARY_DIR}/${target_name}_package_inputs.txt")
-    list(SORT _package_inputs)
-    set(_package_inputs_text "")
-    foreach (_package_input IN LISTS _package_inputs)
-        string(APPEND _package_inputs_text "${_package_input}\n")
-    endforeach ()
-    file(GENERATE OUTPUT "${_package_inputs_file}" CONTENT "${_package_inputs_text}")
-    add_custom_command(OUTPUT "${_out}"
-            COMMAND ${CMAKE_COMMAND} -E rm -rf "${_stage}"
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${_stage}" "${_output_dir}"
-            ${_lib_copy_cmd}
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_mod_json}" "${_stage}/mod.json"
-            ${_extra_cmds}
-            COMMAND ${CMAKE_COMMAND} -E chdir "${_stage}" ${CMAKE_COMMAND} -E tar cvf "${_out}" --format=zip ${_zip_args}
-            ${_bundle_cmds}
-            DEPENDS ${_target_depend} ${_package_deps} "${_package_inputs_file}"
-            COMMENT "Packaging ${target_name} -> ${_out}"
-            COMMAND_EXPAND_LISTS
-            VERBATIM
-    )
-    add_custom_target(${_package_target} ALL DEPENDS "${_out}")
-    if (TARGET dusklight_mods)
-        add_dependencies(dusklight_mods ${_package_target})
-    endif ()
-endfunction()
-
-# Install rules for BUNDLE mods.
-# - Windows: the .dusk archives into <install>/mods (the loader extracts native libs to the
-#   user cache).
-# - Linux: pre-extracted stage dirs into <install>/mods so native libs dlopen in place from
-#   read-only installs.
-# - macOS: pre-extracted stage dirs into the installed app's Contents/Resources/mods, native
-#   libs ad-hoc signed in place, then the whole bundle re-signed.
-# - iOS/tvOS: assets into <app>/mods/<id>, the mod library into Frameworks/<id>.so,
-#   and runtime libraries alongside it.
-# - Android: nothing here; gradle packs ${CMAKE_BINARY_DIR}/bundled_mods into APK assets.
-function(install_bundled_mods)
-    get_property(_targets GLOBAL PROPERTY DUSK_BUNDLED_MOD_TARGETS)
-    if (NOT _targets OR ANDROID)
-        return ()
-    endif ()
-    get_property(_ids GLOBAL PROPERTY DUSK_BUNDLED_MOD_IDS)
-    get_property(_stages GLOBAL PROPERTY DUSK_BUNDLED_MOD_STAGES)
-    get_property(_lib_platforms GLOBAL PROPERTY DUSK_BUNDLED_MOD_LIB_PLATFORMS)
-    get_property(_lib_names GLOBAL PROPERTY DUSK_BUNDLED_MOD_LIB_NAMES)
-    list(LENGTH _targets _count)
-    math(EXPR _last "${_count} - 1")
-
-    if (APPLE)
-        get_target_property(_app_name dusklight OUTPUT_NAME)
-        if (NOT _app_name)
-            set(_app_name dusklight)
-        endif ()
-        set(_bundle_dir "${CMAKE_INSTALL_PREFIX}/${_app_name}.app")
-        if (IOS OR TVOS)
-            foreach (_i RANGE ${_last})
-                list(GET _targets ${_i} _target)
-                list(GET _ids ${_i} _id)
-                list(GET _stages ${_i} _stage)
-                list(GET _lib_platforms ${_i} _lib_platform)
-                list(GET _lib_names ${_i} _lib_name)
-                install(DIRECTORY "${_stage}/" DESTINATION "${_bundle_dir}/mods/${_id}"
-                        PATTERN "lib" EXCLUDE)
-                install(PROGRAMS "$<TARGET_FILE:${_target}>"
-                        DESTINATION "${_bundle_dir}/Frameworks" RENAME "${_id}.so")
-                install(DIRECTORY "${_stage}/lib/${_lib_platform}/"
-                        DESTINATION "${_bundle_dir}/Frameworks"
-                        PATTERN "${_lib_name}" EXCLUDE)
-            endforeach ()
-            if (DUSK_HAS_PREPATCH)
-                set(_prepatch_executable "${_bundle_dir}/Dusklight")
-                set(_prepatch_mod_args "")
-                foreach (_id IN LISTS _ids)
-                    string(APPEND _prepatch_mod_args
-                            " \"${_bundle_dir}/Frameworks/${_id}.so\"")
-                endforeach ()
-                install(CODE "
-                    execute_process(
-                        COMMAND \"${SYMGEN_EXE}\" prepatch
-                            --binary \"${_prepatch_executable}\"
-                            --report \"${CMAKE_BINARY_DIR}/prepatch-report-$<CONFIG>.json\"
-                            ${_prepatch_mod_args}
-                        COMMAND_ERROR_IS_FATAL ANY)")
-            endif ()
-        else ()
-            foreach (_i RANGE ${_last})
-                list(GET _ids ${_i} _id)
-                list(GET _stages ${_i} _stage)
-                list(GET _lib_platforms ${_i} _lib_platform)
-                list(GET _lib_names ${_i} _lib_name)
-                install(DIRECTORY "${_stage}/" DESTINATION "${_bundle_dir}/Contents/Resources/mods/${_id}")
-                install(CODE "
-                    file(GLOB _mod_libs \"${_bundle_dir}/Contents/Resources/mods/${_id}/lib/${_lib_platform}/*\")
-                    foreach (_mod_lib IN LISTS _mod_libs)
-                        if (NOT IS_DIRECTORY \"\${_mod_lib}\")
-                            execute_process(COMMAND /usr/bin/codesign --force --sign - \"\${_mod_lib}\" COMMAND_ERROR_IS_FATAL ANY)
-                        endif ()
-                    endforeach ()")
-            endforeach ()
-            if (DUSK_HAS_PREPATCH)
-                set(_prepatch_executable "${_bundle_dir}/Contents/MacOS/Dusklight")
-                set(_prepatch_mod_args "")
-                foreach (_i RANGE ${_last})
-                    list(GET _ids ${_i} _id)
-                    list(GET _lib_platforms ${_i} _lib_platform)
-                    list(GET _lib_names ${_i} _lib_name)
-                    string(APPEND _prepatch_mod_args
-                            " \"${_bundle_dir}/Contents/Resources/mods/${_id}/lib/${_lib_platform}/${_lib_name}\"")
-                endforeach ()
-                install(CODE "
-                    execute_process(
-                        COMMAND \"${SYMGEN_EXE}\" prepatch
-                            --binary \"${_prepatch_executable}\"
-                            --report \"${CMAKE_BINARY_DIR}/prepatch-report-$<CONFIG>.json\"
-                            ${_prepatch_mod_args}
-                        COMMAND_ERROR_IS_FATAL ANY)")
-            endif ()
-            if (TARGET crashpad_handler)
-                install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - \"${_bundle_dir}/Contents/MacOS/$<TARGET_FILE_NAME:crashpad_handler>\" COMMAND_ERROR_IS_FATAL ANY)")
-            endif ()
-            install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - --entitlements \"${DUSK_ENTITLEMENTS}\" \"${_bundle_dir}\" COMMAND_ERROR_IS_FATAL ANY)")
-        endif ()
-        return ()
-    endif ()
-
-    if (DUSK_PACKAGE_INSTALL)
-        set(_mods_dest "${CMAKE_INSTALL_DATAROOTDIR}/dusklight/mods")
-    else ()
-        set(_mods_dest "${CMAKE_INSTALL_PREFIX}/mods")
-    endif ()
-    if (WIN32)
-        foreach (_target IN LISTS _targets)
-            install(FILES "${CMAKE_BINARY_DIR}/bundled_mods/${_target}.dusk" DESTINATION "${_mods_dest}")
-        endforeach ()
-    else ()
-        foreach (_i RANGE ${_last})
-            list(GET _ids ${_i} _id)
-            list(GET _stages ${_i} _stage)
-            install(DIRECTORY "${_stage}/" DESTINATION "${_mods_dest}/${_id}")
-        endforeach ()
-    endif ()
-endfunction()

cmake/PatchFunchook.cmake

@@ -1,60 +0,0 @@
-file(READ "${SOURCE_DIR}/cmake/capstone.cmake.in" _content)
-
-# Insert PATCH_COMMAND before CONFIGURE_COMMAND in the ExternalProject_Add.
-# Bracket args prevent cmake from substituting ${...} while writing this file.
-string(REPLACE
-    "    CONFIGURE_COMMAND \"\""
-    [=[    PATCH_COMMAND "${CMAKE_COMMAND}" -DDIR=${CMAKE_CURRENT_BINARY_DIR}/capstone-src -P "${CAPSTONE_FIX_SCRIPT}"
-    CONFIGURE_COMMAND ""]=]
-    _content "${_content}")
-
-file(WRITE "${SOURCE_DIR}/cmake/capstone.cmake.in" "${_content}")
-
-file(READ "${SOURCE_DIR}/src/funchook_unix.c" _unix_content)
-
-# macOS rejects the POSIX mprotect RWX/RW transition for executable image pages on arm64.
-# Use Mach VM_PROT_COPY for the short patch window, then restore RX permissions.
-if (NOT _unix_content MATCHES "VM_PROT_READ \\| VM_PROT_WRITE \\| VM_PROT_COPY")
-    string(REPLACE
-        [=[    rv = mprotect(mstate->addr, mstate->size, prot);]=]
-        [=[#ifdef __APPLE__
-    kern_return_t kr = vm_protect(mach_task_self(), (vm_address_t)mstate->addr,
-                                  (vm_size_t)mstate->size, FALSE,
-                                  VM_PROT_READ | VM_PROT_WRITE | VM_PROT_COPY);
-    if (kr == KERN_SUCCESS) {
-        funchook_log(funchook, "  unprotect memory %p (size=%"PRIuPTR", prot=read,write,copy) <- %p (size=%"PRIuPTR")\n",
-                     mstate->addr, mstate->size, start, len);
-        return 0;
-    }
-    funchook_set_error_message(funchook, "Failed to unprotect memory %p (size=%"PRIuPTR", prot=read,write,copy) <- %p (size=%"PRIuPTR", error=%s)",
-                               mstate->addr, mstate->size, start, len,
-                               mach_error_string(kr));
-    return FUNCHOOK_ERROR_MEMORY_FUNCTION;
-#endif
-    rv = mprotect(mstate->addr, mstate->size, prot);]=]
-        _unix_content "${_unix_content}")
-
-    string(REPLACE
-        [=[    char errbuf[128];
-    int rv = mprotect(mstate->addr, mstate->size, PROT_READ | PROT_EXEC);]=]
-        [=[    char errbuf[128];
-#ifdef __APPLE__
-    kern_return_t kr = vm_protect(mach_task_self(), (vm_address_t)mstate->addr,
-                                  (vm_size_t)mstate->size, FALSE,
-                                  VM_PROT_READ | VM_PROT_EXECUTE);
-
-    if (kr == KERN_SUCCESS) {
-        funchook_log(funchook, "  protect memory %p (size=%"PRIuPTR", prot=read,exec)\n",
-                     mstate->addr, mstate->size);
-        return 0;
-    }
-    funchook_set_error_message(funchook, "Failed to protect memory %p (size=%"PRIuPTR", prot=read,exec, error=%s)",
-                               mstate->addr, mstate->size,
-                               mach_error_string(kr));
-    return FUNCHOOK_ERROR_MEMORY_FUNCTION;
-#endif
-    int rv = mprotect(mstate->addr, mstate->size, PROT_READ | PROT_EXEC);]=]
-        _unix_content "${_unix_content}")
-endif ()
-
-file(WRITE "${SOURCE_DIR}/src/funchook_unix.c" "${_unix_content}")

cmake/SymbolManifest.cmake

@@ -1,153 +0,0 @@
-include_guard(GLOBAL)
-
-get_filename_component(_SYMBOL_MANIFEST_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
-
-set(_SYMGEN_VERSION "1.3.2")
-set(_SYMGEN_RELEASE_BASE_URL "https://github.com/encounter/symgen/releases/download/v${_SYMGEN_VERSION}")
-set(SYMGEN_PATH "" CACHE FILEPATH "Path to a symgen executable; empty downloads the pinned release")
-mark_as_advanced(SYMGEN_PATH)
-
-function(symgen_host_asset out_name out_hash)
-    string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" _host_processor)
-    set(_asset "")
-    set(_asset_hash "")
-
-    if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-        if (_host_processor MATCHES "^(arm64|aarch64)$")
-            set(_asset "symgen-macos-arm64")
-            set(_asset_hash "SHA256=0344838d1674df09c17c3eeddcf26eb89c333fdb85dfd78f68adc436070eccbe")
-        elseif (_host_processor MATCHES "^(x86_64|amd64)$")
-            set(_asset "symgen-macos-x86_64")
-            set(_asset_hash "SHA256=ae0674f4a1e9d0dedfa02d35939ac28cdd229276b331c1f507df5df809cbec7e")
-        endif ()
-    elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-        if (_host_processor MATCHES "^(aarch64|arm64)$")
-            set(_asset "symgen-linux-aarch64")
-            set(_asset_hash "SHA256=af766de2bfaeb0a06f6d7bc17bb2510b4a9c40f44a56e49bc4a4b798a6223042")
-        elseif (_host_processor MATCHES "^(x86_64|amd64)$")
-            set(_asset "symgen-linux-x86_64")
-            set(_asset_hash "SHA256=ebd62fb9623acc942b6295609e2306f85a73043b0a8a117f2072b761dd08e68f")
-        elseif (_host_processor MATCHES "^(i[3-6]86|x86)$")
-            set(_asset "symgen-linux-i686")
-            set(_asset_hash "SHA256=07780a4513fd29726578efc4ff2d88736b22f407ed821b32a68e35ff1e9af5f4")
-        endif ()
-    elseif (CMAKE_HOST_WIN32)
-        if (_host_processor MATCHES "^(arm64|aarch64)$")
-            set(_asset "symgen-windows-arm64.exe")
-            set(_asset_hash "SHA256=5bb22b4a4a9b5ad45646af411bfb09b8321a732ff3a077eb4c9de1feaef27d2b")
-        elseif (_host_processor MATCHES "^(x86_64|amd64)$")
-            set(_asset "symgen-windows-x86_64.exe")
-            set(_asset_hash "SHA256=1d1ac087f991a96932d108969e15998becfec643e88f3e7d182ca97ebfc6a46f")
-        elseif (_host_processor MATCHES "^(i[3-6]86|x86)$")
-            set(_asset "symgen-windows-x86.exe")
-            set(_asset_hash "SHA256=c113f4cd05f813efe2b1878dbfcf44d6302aee3974271736e0036430b0cced78")
-        endif ()
-    endif ()
-
-    set(${out_name} "${_asset}" PARENT_SCOPE)
-    set(${out_hash} "${_asset_hash}" PARENT_SCOPE)
-endfunction()
-
-function(ensure_symgen required)
-    if (TARGET symgen)
-        return()
-    endif ()
-
-    if (SYMGEN_PATH)
-        get_filename_component(_symgen "${SYMGEN_PATH}" ABSOLUTE)
-        if (NOT EXISTS "${_symgen}")
-            if (required)
-                message(FATAL_ERROR "symgen: SYMGEN_PATH does not exist: ${_symgen}")
-            endif ()
-            message(STATUS "symgen: SYMGEN_PATH does not exist, symbol manifest generation "
-                    "skipped (by-name hook resolution will be unavailable)")
-            return()
-        endif ()
-    else ()
-        symgen_host_asset(_asset _asset_hash)
-        if (_asset STREQUAL "")
-            if (required)
-                message(FATAL_ERROR "symgen: no prebuilt binary for host "
-                        "${CMAKE_HOST_SYSTEM_NAME}/${CMAKE_HOST_SYSTEM_PROCESSOR} "
-                        "(configure with -DDUSK_ENABLE_CODE_MODS=OFF)")
-            endif ()
-            message(STATUS "symgen: no prebuilt binary for host "
-                    "${CMAKE_HOST_SYSTEM_NAME}/${CMAKE_HOST_SYSTEM_PROCESSOR}; "
-                    "symbol manifest generation skipped (by-name hook resolution will be unavailable)")
-            return()
-        endif ()
-
-        set(_symgen_dir "${CMAKE_BINARY_DIR}/_deps/symgen")
-        set(_symgen "${_symgen_dir}/${_asset}")
-        set(_url "${_SYMGEN_RELEASE_BASE_URL}/${_asset}")
-        message(STATUS "dusklight: Fetching symgen ${_SYMGEN_VERSION} (${_asset})")
-        file(MAKE_DIRECTORY "${_symgen_dir}")
-        file(DOWNLOAD "${_url}" "${_symgen}"
-                TLS_VERIFY ON
-                STATUS _download_status
-                SHOW_PROGRESS
-                EXPECTED_HASH "${_asset_hash}")
-        list(GET _download_status 0 _download_code)
-        if (NOT _download_code EQUAL 0)
-            list(GET _download_status 1 _download_message)
-            file(REMOVE "${_symgen}")
-            if (required)
-                message(FATAL_ERROR "symgen: failed to download ${_url}: ${_download_message}")
-            endif ()
-            message(STATUS "symgen: failed to download ${_url}: ${_download_message}; "
-                    "symbol manifest generation skipped (by-name hook resolution will be unavailable)")
-            return()
-        endif ()
-        if (NOT CMAKE_HOST_WIN32)
-            file(CHMOD "${_symgen}" PERMISSIONS
-                    OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                    GROUP_READ GROUP_EXECUTE
-                    WORLD_READ WORLD_EXECUTE)
-        endif ()
-    endif ()
-
-    add_custom_target(symgen DEPENDS "${_symgen}")
-    set(SYMGEN_EXE "${_symgen}" CACHE INTERNAL "symgen executable" FORCE)
-endfunction()
-
-function(setup_symbol_manifest target)
-    ensure_symgen(TRUE)
-    if (NOT TARGET symgen)
-        return()
-    endif ()
-    add_dependencies(${target} symgen)
-
-    # Reserve an ELF program-header entry when the linker supports it (mold).
-    # symgen can replace the PT_NULL entry without relocating the table, keeping later post-link tools safe.
-    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        include(CheckLinkerFlag)
-        check_linker_flag(CXX "LINKER:--spare-program-headers=1" _linker_supports_spare_program_headers)
-        if (_linker_supports_spare_program_headers)
-            target_link_options(${target} PRIVATE "LINKER:--spare-program-headers=1")
-        endif ()
-    endif ()
-
-    if (WIN32)
-        set(_input --pdb "$<TARGET_PDB_FILE:${target}>")
-    else ()
-        set(_input --binary "$<TARGET_FILE:${target}>")
-    endif ()
-
-    if (APPLE)
-        # Room for the symbol manifest and several prepatch arenas.
-        target_link_options(${target} PRIVATE "LINKER:-headerpad,0x1000")
-        # ld64 may update an existing output, which breaks our symdb insertion. Remove it first.
-        add_custom_command(TARGET ${target} PRE_LINK
-                COMMAND "${CMAKE_COMMAND}" -E rm -f "$<TARGET_FILE:${target}>"
-                VERBATIM)
-    endif ()
-
-    # The manifest is embedded into the image as a new section, located at runtime through
-    # the descriptor manifest.cpp reserves. On Apple platforms this command must stay
-    # attached before the ad-hoc codesign POST_BUILD command: the patch removes any existing
-    # signature.
-    add_custom_command(TARGET ${target} POST_BUILD
-            COMMAND "${SYMGEN_EXE}" manifest ${_input} --embed "$<TARGET_FILE:${target}>"
-            COMMENT "Embedding symbol manifest"
-            VERBATIM)
-endfunction()

cmake/WindowsExports.cmake

@@ -1,93 +0,0 @@
-include_guard(GLOBAL)
-
-get_filename_component(_DUSK_WINDOWS_EXPORTS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
-
-# Windows mod linking: generate the curated export surface for the game executable and the
-# import library mods link against. symgen scans the built objects, filters by source, and
-# writes a .def used by the main link and import library generation.
-function(setup_windows_exports target)
-    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _implib_arch)
-    if (_implib_arch STREQUAL "arm64")
-        set(_dlltool_machine "arm64")
-        set(_lib_machine "arm64")
-    elseif (_implib_arch MATCHES "^(amd64|x86_64)$")
-        set(_dlltool_machine "i386:x86-64")
-        set(_lib_machine "x64")
-    else ()
-        message(FATAL_ERROR
-                "dusklight: no Windows mod linking support for ${CMAKE_SYSTEM_PROCESSOR}")
-    endif ()
-
-    include("${_DUSK_WINDOWS_EXPORTS_CMAKE_DIR}/SymbolManifest.cmake")
-    ensure_symgen(TRUE)
-    set(_symgen "${SYMGEN_EXE}")
-    add_dependencies(${target} symgen)
-
-    set(_config_subdir "")
-    if (CMAKE_CONFIGURATION_TYPES)
-        set(_config_subdir "$<CONFIG>/")
-    endif ()
-
-    set(_rsp_lines "$<TARGET_OBJECTS:${target}>")
-    foreach (_lib IN LISTS JSYSTEM_LIBRARIES)
-        list(APPEND _rsp_lines "$<TARGET_FILE:${_lib}>")
-    endforeach ()
-    list(JOIN _rsp_lines "\n" _rsp_content)
-    set(_rsp "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_exports_input.rsp")
-    file(GENERATE OUTPUT "${_rsp}" CONTENT "${_rsp_content}")
-
-    set(_sdk_args)
-    foreach (_lib aurora_card aurora_core aurora_dvd aurora_gd aurora_gx aurora_mtx
-            aurora_os aurora_pad aurora_si aurora_vi)
-        if (TARGET ${_lib})
-            list(APPEND _sdk_args --sdk-lib "$<TARGET_FILE:${_lib}>")
-        endif ()
-    endforeach ()
-
-    set(_forward_args)
-    if (TARGET dawn::webgpu_dawn)
-        get_target_property(_dawn_type dawn::webgpu_dawn TYPE)
-        if (_dawn_type STREQUAL "SHARED_LIBRARY")
-            list(APPEND _forward_args
-                    --forward-dll "$<TARGET_FILE:dawn::webgpu_dawn>"
-                    --forward-sym-prefix wgpu)
-        endif ()
-    endif ()
-
-    # Generate curated exports list from the main binary
-    set(_def "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_exports.def")
-    add_custom_command(TARGET ${target} PRE_LINK
-            COMMAND "${_symgen}" def
-            "@${_rsp}"
-            --out "${_def}"
-            --exclude cmake_pch
-            --exclude miniz
-            --exclude asan_options
-            --exclude src/dusk
-            --max-exports 58000
-            ${_sdk_args}
-            ${_forward_args}
-            COMMENT "Generating dusklight exports"
-            VERBATIM)
-    target_link_options(${target} PRIVATE "/DEF:${_def}")
-
-    # Generate import library for mods to link against.
-    set(_implib "${CMAKE_BINARY_DIR}/${_config_subdir}dusklight_imports.lib")
-    get_filename_component(_compiler_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
-    find_program(DUSK_LLVM_DLLTOOL llvm-dlltool HINTS "${_compiler_dir}")
-    if (DUSK_LLVM_DLLTOOL)
-        set(_implib_cmd "${DUSK_LLVM_DLLTOOL}" -d "${_def}" -D dusklight.exe
-                -m "${_dlltool_machine}" -l "${_implib}")
-    else ()
-        set(_implib_cmd "${CMAKE_AR}" /nologo "/def:${_def}" "/machine:${_lib_machine}"
-                /name:dusklight.exe "/out:${_implib}")
-    endif ()
-    add_custom_command(TARGET ${target} POST_BUILD
-            COMMAND ${_implib_cmd}
-            BYPRODUCTS "${_implib}"
-            COMMENT "Generating dusklight import library"
-            VERBATIM)
-    set(DUSK_GAME_IMPLIB "${_implib}" CACHE INTERNAL "Import library for Windows mod linking")
-
-    install(FILES "${_implib}" DESTINATION sdk RENAME "windows-${_implib_arch}.lib")
-endfunction()

cmake/patch_funchook.cmake

@@ -0,0 +1,11 @@
+file(READ "${SOURCE_DIR}/cmake/capstone.cmake.in" _content)
+
+# Insert PATCH_COMMAND before CONFIGURE_COMMAND in the ExternalProject_Add.
+# Bracket args prevent cmake from substituting ${...} while writing this file.
+string(REPLACE
+    "    CONFIGURE_COMMAND \"\""
+    [=[    PATCH_COMMAND "${CMAKE_COMMAND}" -DDIR=${CMAKE_CURRENT_BINARY_DIR}/capstone-src -P "${CAPSTONE_FIX_SCRIPT}"
+    CONFIGURE_COMMAND ""]=]
+    _content "${_content}")
+
+file(WRITE "${SOURCE_DIR}/cmake/capstone.cmake.in" "${_content}")

docs/imhex/jaudio/bst.hexpat

@@ -1,71 +0,0 @@
-#pragma endian big
-
-#include "std/sys.pat"
-#include "type/magic.pat"
-#include "std/array.pat"
-
-/**
- * Wrapper for a file-global pointer that allows it to be stored in an array.
- */ 
-struct Offset<T> {
-    T* offset : u32 [[inline]];
-};
-
-struct ItemSoundEffect {
-    u8 mPriority;
-    u8 mVolume;
-    padding[2];
-    u32 mSwBit;
-    float mPitch;
-};
-
-struct ItemSequence {
-    u8 mPriority;
-    u8 mVolume;
-    u16 mResourceId;
-};
-
-struct ItemStream {
-    u8 mPriority;
-    u8 mVolume;
-    u16 mStreamPanParameters;
-    char* mStreamFilePath[] : u32;
-};
-
-struct SoundTableGroupEntry {
-    u8 mTypeId;
-    if (mTypeId == 0x51) {
-        ItemSoundEffect* mOffset : u24 [[inline]];
-    } else if (mTypeId == 0x60) {
-        ItemSequence* mOffset : u24 [[inline]];
-    } else if (mTypeId == 0x70 || mTypeId == 0x71) {
-        ItemStream* mOffset : u24 [[inline]];
-    } else {
-        u24 mOffset;
-    }
-};
-
-struct TGroup {
-    u32 mNumItems;
-    padding[4];
-    SoundTableGroupEntry mEntries[mNumItems];
-};
-
-struct TSection {
-    u32 mNumGroups;
-    Offset<TGroup> mGroupOffsets[mNumGroups];
-};
-
-struct Root {
-    u32 mSectionNumber;
-    Offset<TSection> mSectionOffsets[mSectionNumber];
-};
-
-struct THeader {
-    type::Magic<"BST "> mMagic;
-
-    padding[8];
-    Root* mRoot : u32;
-};
-
-THeader header @ 0x0;

docs/imhex/jaudio/wsys.hexpat

@@ -1,228 +0,0 @@
-#pragma endian big
-
-#include "std/sys.pat"
-#include "type/magic.pat"
-#include "std/array.pat"
-
-/*
-WSYS file
-The WSYS file contains roughly two sections: WBCT and WINF.
-WBCT contains the mapping of Wave ID -> wave archives.
-WINF are the wave archives themselves and their metadata.
-*/
-
-/**
- * Wrapper for a file-global pointer that allows it to be stored in an array.
- */ 
-struct Offset<T> {
-    T* offset : u32 [[inline]];
-};
-
-/**
- * Format that audio data is in..
- */
-enum WaveFormat : u8 {
-    /**
-     * 16-samples-per-9-bytes custom Nintendo ADPCM.
-     */
-    ADPCM4 = 0,
-    
-    /**
-     * 16-samples-per-5-bytes custom Nintendo ADPCM.
-     */
-    ADPCM2 = 1,
-    
-    /**
-     * 8-bit-per-sample PCM.
-     */
-    PCM8 = 2,
-    
-    /**
-     * 16-bit-per-sample PCM.
-     */
-    PCM16 = 3,
-};
-
-/**
- * Defines playback info for a single audio "wave".
- * This data is stored per archive, making it duplicated (except for mAWOffsetStart)
- */
-struct TWave {
-    padding[1]; // unknown
-    WaveFormat mWaveFormat;
-    
-    /**
-     * Key (as in like, the musical term) this sample is in.
-     */
-    u8 mBaseKey;
-    padding[1];
-    
-    /**
-     * Sample rate of the audio in Hz.
-     */
-    float mSampleRate;
-    
-    /**
-     * Position where the sample data starts.
-     * This is in the .aw file for the archive containing this TWave.
-     */
-    u32 mAWOffsetStart;
-    
-    /**
-     * Byte length of the sample data.
-     */
-    u32 mAWLength;
-    
-    /**
-     * Indicates whether the sample should loop or not. All bits appear set if so.
-     */
-    u32 mLoopFlags;
-    
-    /**
-     * Audio sample at which the loop starts.
-     */
-    u32 mLoopStartSample;
-    
-    /**
-     * Audio sample at which the loop ends (and goes back to mLoopStartSample).
-     */
-    u32 mLoopEndSample;
-    
-    /**
-     * Total sample count in this wave.
-     */
-    u32 mSampleCount;
-    
-    /**
-     * Last sample for continuing ADPCM decode after loop.
-     */
-    s16 mpLast;
-    
-    /**
-     * Penult sample for continuing ADPCM decode after loop.
-     */
-    s16 mpPenult;
-};
-
-/**
- * A single wave archive on disk.
- * These are paired 1:1 with TCtrlScene objects.
- */
-struct TWaveArchive {
-    /**
-     * Filename of the raw sample data on disc. Relative to /Audiores/Waves/
-     */
-    char mFileName[0x70];
-    
-    /**
-     * Amount of waves in this archive.
-     * Matches the count in the paired TCtrl object.
-     */
-    u32 mWaveCount;
-    
-    /**
-     * Offsets to the wave metadata (not sample data) in the WSYS.
-     * These are paired 1:1 to the TCtrlWaves, and the TCtrlWave contains the actual
-     * "Wave ID" used by the game for lookups.
-     */
-    Offset<TWave> waveOffsets[mWaveCount];
-};
-
-/**
- * Header containing data for wave archives and their metadata.
- */
-struct TWaveArchiveBank {
-    type::Magic<"WINF"> mMagic;
-
-    /**
-     * Amount of archives in this wave bank.
-     * Matches the value in TCtrlGroup.
-     */
-    u32 mArchiveCounts;
-    Offset<TWaveArchive> mArchiveOffsets[mArchiveCounts];
-};
-
-/**
- * Definition for a single wave in a control group.
- */
-struct TCtrlWave {
-    /**
-     * Group ID matches the index of the control group this item is referenced by.
-     */
-    u16 mGroupId;
-    
-    /**
-     * Wave ID used by the game to look this wave up.
-     */
-    u16 mWaveId;
-};
-
-/**
- * Contains the actual data for a TCtrlScene.
- * Why is this separate? Who knows.
- */
-struct TCtrl {
-    // Other versions of this struct with different magic (C-EX and C-ST) also exist in the file.
-    // They aren't pointed to so we don't need to worry about them.
-    type::Magic<"C-DF"> mMagic;
-    
-    /**
-     * Amount of waves in this group.
-     * Matches the value in TWaveArchive.
-     */
-    u32 waveCount;
-    Offset<TCtrlWave> mWaveOffsets[waveCount];
-};
-
-/**
- * A single scene or "group" of waves that are loaded at once.
- */
-struct TCtrlScene {
-    type::Magic<"SCNE"> mMagic;
-    
-    padding[8]; // unknown
-    TCtrl* mCtrlOffset : u32 [[inline]];
-};
-
-/**
- * Contains the "control" section of the WSYS.
- */
-struct TCtrlGroup {
-    type::Magic<"WBCT"> mMagic;
-    
-    padding[4]; // unknown
-    u32 mGroupCount;
-    
-    Offset<TCtrlScene> mCtrlSceneOffsets[mGroupCount];
-};
-
-struct THeader {
-    type::Magic<"WSYS"> mMagic;
-    
-    /**
-     * Size of WSYS in bytes.
-     */
-    u32 mSize;
-    
-    /**
-     * ID of wave bank.
-     * This matches the value passed to the BAA load command.
-     * The game originally does not use this value itself, but Dusklight does rely on it.
-     */
-    u32 mId;
-    
-    /**
-     * Total amount of waves in this wave bank.
-     * (not groups! Waves!)
-     */
-    u32 mWaveTableSize;
-    
-    TWaveArchiveBank* archiveBankOffset : u32;
-    TCtrlGroup* ctrlGroupOffset : u32;
-};
-
-THeader header @ 0x0;
-
-std::assert(
-    header.archiveBankOffset.mArchiveCounts == header.ctrlGroupOffset.mGroupCount,
-    "Control group and archive count does not match!");

docs/jaudio.md

@@ -1,90 +0,0 @@
-# JAudio
-
-**JAudio** is the name for the audio engine used by Twilight Princess (along with many other Nintendo games from the era). TP uses exclusively JAudio v2, while other games use v1 or a mix of v1 and v2 infrastructure. This document will primarily focus on TP's use case, but best efforts will be made to document where behavior is TP-specific.
-
-## Common concepts
-
-Audio is almost exclusively 
-
-### `JAISoundID`
-
-A "sound", be that a _sound effect_ or music, is referenced in-code through the `JAISoundID` type. This is a `u32` that the game uses to look up the relevant sound. The actual value is bitpacked (BE) from the following fields:
-
-| Type  | Field      | Description                                                                                                                                                                                               |
-|-------|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `u8`  | Section ID | Section of the Sound Table this sound effect is located in. 0 for sound effects, 1 for sequenced music, 2 for streamed music.[^sectionids]                                                                |
-| `u8`  | Group ID   | ID of group further used to organize inside the Sound Table's Section. Sound effects are grouped into things like "SYSTEM" and "ENEMY", other sections leave this at 0.                                   |
-| `u16` | "Wave ID"  | Index inside the group to look up the sound at.<br/>**Note** that the term "wave" in code is extremely confusing[^waveterm]; it does **not** refer to audio samples ("waves") in the wave banks directly. |
-
-[^sectionids]: JAudio itself can seemingly work outside this convention, however it is enforced by some TP-specific game code.
-
-[^waveterm]: Possibly vestigial from JAudio v1, where I believe there were less layers of indirection.
-
-## Disc files
-
-All audio data is stored in `/Audiores` on the disc. Files are as follows:
-
-### `/Audiores/Seqs/Z2SoundSeqs.arc`
-
-Contains the BMS instructions for all BMS-based music and sound effects. Not all data is kept in memory at once.
-
-### `/Audiores/Stream/*.ast`
-
-Contains individual streamed music. Each file is a separate music track.  See [this page](https://www.lumasworkshop.com/wiki/AST_(File_Format)) for file format description.
-
-### `/Audiores/Waves/*.aw`
-
-Contains audio sample data for sequenced music and sound effects. These files are pure meat, no bone: they are loaded directly into ARAM and all metadata is stored in the BAA WSYS sections.
-
-Each file contains audio samples for one "scene", with factors like the current level determining what "scenes" are made resident in memory. There is tons of duplicate data between scenes, presumably to increase simplicity and loading performance.
-
-### `/Audiores/Z2Sound.baa`
-
-Contains all remaining metadata for the audio system. This is effectively a container for a bunch of different sub-sections. The file starts with a bunch of "commands" that indicate where other data in the file is. Each command has a 4-character identifier and depending on the command will be followed by some extra arguments before the next command.
-
-The commands used by TP's BAA file are as follows (note that the decompiled code has support for more load commands, which are unused):
-
-| Command/Argument | Value           | Description                                                                                                                               |
-|------------------|-----------------|-------------------------------------------------------------------------------------------------------------------------------------------|
-| Command          | `AA_<`          | Start of BAA commands. Must be at the start of the file and only appear once.                                                             |
-| Command          | `>_AA`          | End of BAA commands.                                                                                                                      |
-| Command          | `ws  `[^spaces] | Wave bank/WSYS data. Defines where audio samples are located on disc.                                                                     |
-| Argument         | u32             | Wave bank ID, max 255. In TP, 0 is sound effects, 1 is music samples.                                                                     |
-| Argument         | u32             | File offset for start of `WSYS` data                                                                                                      |
-| Argument         | u32             | Bit field selecting which groups (= `.aw` files) to load immediately. TP leaves this at zero.[^32ws]                                      |
-| Command          | `bnk `[^spaces] | Instrument bank/IBNK                                                                                                                      |
-| Argument         | u32             | Target wave bank ID                                                                                                                       |
-| Argument         | u32             | File offset for start of `IBNK` data                                                                                                      |
-| Command          | `bsc `[^spaces] | Sound effect sequence collection.                                                                                                         |
-| Argument         | u32             | File offset for start of `SC` data.                                                                                                       |
-| Argument         | u32             | File offset for end of `SC` data.                                                                                                         |
-| Command          | `bst `[^spaces] | Sound table. Defines parameters for music and sound effects.                                                                              |
-| Argument         | u32             | File offset for start of `BST `[^spaces] data.                                                                                            |
-| Argument         | u32             | File offset for end of `BST `[^spaces] data.                                                                                              |
-| Command          | `bstn`          | Sound name table. Defines names of all music and sound effects. Present on disc, but loading is disabled on release versions of the game. |
-| Argument         | u32             | File offset for start of `BSTN` data.                                                                                                     |
-| Argument         | u32             | File offset for end of `BSTN` data.                                                                                                       |
-| Command          | `bfca`          | Unknown, something related to initialization of DSP FX data.                                                                              |
-| Argument         | u32             | File offset for start of `RARC` data.                                                                                                     |
-
-[^spaces]: Padded with spaces.
-
-[^32ws]: Both of TP's wave banks have far more than 32 groups, and seemingly this mechanism would not be able to deal with that.
-
-Following is data descriptions for the remaining data in the `.BAA`, as pointed to by the above commands.
-
-### `WSYS` / Wave banks
-
-`WSYS` / Wave bank data defines where a set of audio samples can be found on disc. Each wave bank is made of multiple "groups", where each group corresponds to one `.aw` file on disc. Each group has a set of "wave IDs" it contains, along with the metadata (e.g. sample rate) and data offset in the `.aw` file.
-
-Multiple groups can contain the same wave ID, thus meaning the raw audio samples can be duplicated on disk.
-
-For the actual binary layout of this data, check [the ImHex pattern](imhex/jaudio/wsys.hexpat)
-
-*Relevant classes: `JASWSParser`, `JASBasicWaveBank`, `JASSimpleWaveBank`.*
-
-## Further reading & credits
-
-* https://www.lumasworkshop.com/wiki/SMR.szs (note that details like the exact layout of the BAA are not the same as TP)
-* XAYRGA for doing much RE work and making [JAMTools](https://xayr.gay/tools/SoundModdingToolkit/)
-* The decompiled source code, duh.

files.cmake

@@ -1411,109 +1411,68 @@ set(DOLPHIN_FILES
 )
 
 set(DUSK_FILES
-        include/helpers/batch.hpp
-        include/helpers/endian_gx.hpp
+        include/dusk/action_bindings.h
+        include/dusk/endian_gx.hpp
+        include/dusk/config.hpp
+        include/dusk/dvd_asset.hpp
+        include/dusk/scope_guard.hpp
+        src/dusk/dvd_asset.cpp
         src/d/actor/d_a_alink_dusk.cpp
-        src/dusk/OSContext.cpp
-        src/dusk/OSMutex.cpp
-        src/dusk/OSReport.cpp
-        src/dusk/OSThread.cpp
-        src/dusk/achievements.cpp
-        src/dusk/action_bindings.cpp
-        src/dusk/action_bindings.h
-        src/dusk/android_frame_rate.cpp
         src/dusk/android_frame_rate.hpp
+        src/dusk/android_frame_rate.cpp
         src/dusk/asserts.cpp
-        src/dusk/autosave.cpp
+        src/dusk/batch.cpp
+        src/dusk/batch.hpp
         src/dusk/config.cpp
-        src/dusk/config.hpp
         src/dusk/crash_handler.cpp
         src/dusk/crash_reporting.cpp
         src/dusk/data.cpp
         src/dusk/data.hpp
-        src/dusk/discord.cpp
-        src/dusk/discord.hpp
-        src/dusk/discord_presence.cpp
-        src/dusk/dvd_asset.cpp
-        src/dusk/dvd_asset.hpp
+        src/dusk/endian.cpp
         src/dusk/extras.c
         src/dusk/file_select.cpp
         src/dusk/file_select.hpp
         src/dusk/frame_interpolation.cpp
         src/dusk/game_clock.cpp
-        src/dusk/gamepad_color.cpp
         src/dusk/globals.cpp
         src/dusk/gyro.cpp
-        src/dusk/http/http.hpp
-        src/dusk/imgui/ImGuiActorSpawner.cpp
-        src/dusk/imgui/ImGuiBloomWindow.cpp
-        src/dusk/imgui/ImGuiBloomWindow.hpp
-        src/dusk/imgui/ImGuiCameraOverlay.cpp
-        src/dusk/imgui/ImGuiConfig.hpp
-        src/dusk/imgui/ImGuiConsole.cpp
-        src/dusk/imgui/ImGuiConsole.hpp
-        src/dusk/imgui/ImGuiControllerOverlay.cpp
-        src/dusk/imgui/ImGuiEngine.cpp
-        src/dusk/imgui/ImGuiEngine.hpp
-        src/dusk/imgui/ImGuiHeapOverlay.cpp
-        src/dusk/imgui/ImGuiMenuTools.cpp
-        src/dusk/imgui/ImGuiMenuTools.hpp
-        src/dusk/imgui/ImGuiProcessOverlay.cpp
-        src/dusk/imgui/ImGuiSaveEditor.cpp
-        src/dusk/imgui/ImGuiStateShare.cpp
-        src/dusk/imgui/ImGuiStateShare.hpp
-        src/dusk/imgui/ImGuiStubLog.cpp
-        src/dusk/io.cpp
-        src/dusk/iso_validate.cpp
-        src/dusk/layout.cpp
-        src/dusk/livesplit.cpp
-        src/dusk/logging.cpp
+        include/dusk/menu_pointer.h
         src/dusk/menu_pointer.cpp
-        src/dusk/menu_pointer.h
-        src/dusk/mods/loader/bundle_disk.cpp
-        src/dusk/mods/loader/bundle_zip.cpp
-        src/dusk/mods/loader/context.cpp
-        src/dusk/mods/loader/depgraph.cpp
-        src/dusk/mods/loader/depgraph.hpp
-        src/dusk/mods/loader/loader.cpp
-        src/dusk/mods/loader/loader.hpp
-        src/dusk/mods/loader/native_module.cpp
-        src/dusk/mods/loader/native_module.hpp
-        src/dusk/mods/loader/prepatch.cpp
-        src/dusk/mods/loader/prepatch.hpp
-        src/dusk/mods/log_buffer.cpp
-        src/dusk/mods/log_buffer.hpp
-        src/dusk/mods/manifest.cpp
-        src/dusk/mods/manifest.hpp
-        src/dusk/mods/svc/audio_res/audio_res.hpp
-        src/dusk/mods/svc/audio_res/audio_res.cpp
-        src/dusk/mods/svc/audio_res/wave.cpp
-        src/dusk/mods/svc/audio_res/opus.cpp
-        src/dusk/mods/svc/camera.cpp
-        src/dusk/mods/svc/config.cpp
-        src/dusk/mods/svc/config.hpp
-        src/dusk/mods/svc/game.cpp
-        src/dusk/mods/svc/gfx.cpp
-        src/dusk/mods/svc/hook.cpp
-        src/dusk/mods/svc/host.cpp
-        src/dusk/mods/svc/log.cpp
-        src/dusk/mods/svc/overlay.cpp
-        src/dusk/mods/svc/registry.cpp
-        src/dusk/mods/svc/registry.hpp
-        src/dusk/mods/svc/resource.cpp
-        src/dusk/mods/svc/texture.cpp
-        src/dusk/mods/svc/ui.cpp
-        src/dusk/mods/svc/ui.hpp
-        src/dusk/mods/svc/window.cpp
-        src/dusk/mods/svc/window.hpp
         src/dusk/mouse.cpp
-        src/dusk/scope_guard.hpp
+		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
+        include/dusk/texture_replacements.hpp
         src/dusk/texture_replacements.cpp
-        src/dusk/texture_replacements.hpp
         src/dusk/touch_camera.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/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/ImGuiProcessOverlay.cpp
+        src/dusk/imgui/ImGuiCameraOverlay.cpp
+        src/dusk/imgui/ImGuiHeapOverlay.cpp
+        src/dusk/imgui/ImGuiControllerOverlay.cpp
+        src/dusk/imgui/ImGuiStubLog.cpp
+        src/dusk/imgui/ImGuiSaveEditor.cpp
+        src/dusk/imgui/ImGuiStateShare.hpp
+        src/dusk/imgui/ImGuiStateShare.cpp
         src/dusk/ui/achievements.cpp
         src/dusk/ui/achievements.hpp
         src/dusk/ui/bool_button.cpp
@@ -1522,9 +1481,9 @@ set(DUSK_FILES
         src/dusk/ui/button.hpp
         src/dusk/ui/component.cpp
         src/dusk/ui/component.hpp
+        src/dusk/ui/controls.hpp
         src/dusk/ui/controller_config.cpp
         src/dusk/ui/controller_config.hpp
-        src/dusk/ui/controls.hpp
         src/dusk/ui/document.cpp
         src/dusk/ui/document.hpp
         src/dusk/ui/editor.cpp
@@ -1533,22 +1492,12 @@ set(DUSK_FILES
         src/dusk/ui/event.hpp
         src/dusk/ui/graphics_tuner.cpp
         src/dusk/ui/graphics_tuner.hpp
-        src/dusk/ui/icon_provider.cpp
-        src/dusk/ui/icon_provider.hpp
         src/dusk/ui/input.cpp
         src/dusk/ui/input.hpp
-        src/dusk/ui/logs_window.cpp
-        src/dusk/ui/logs_window.hpp
-        src/dusk/ui/menu_bar.cpp
-        src/dusk/ui/menu_bar.hpp
-        src/dusk/ui/mod_texture_provider.cpp
-        src/dusk/ui/mod_texture_provider.hpp
-        src/dusk/ui/mod_window.cpp
-        src/dusk/ui/mod_window.hpp
+        src/dusk/ui/icon_provider.cpp
+        src/dusk/ui/icon_provider.hpp
         src/dusk/ui/modal.cpp
         src/dusk/ui/modal.hpp
-        src/dusk/ui/mods_window.cpp
-        src/dusk/ui/mods_window.hpp
         src/dusk/ui/nav_types.hpp
         src/dusk/ui/number_button.cpp
         src/dusk/ui/number_button.hpp
@@ -1556,6 +1505,10 @@ 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/menu_bar.hpp
+        src/dusk/ui/mods_window.cpp
+        src/dusk/ui/mods_window.hpp
         src/dusk/ui/prelaunch.cpp
         src/dusk/ui/prelaunch.hpp
         src/dusk/ui/preset.cpp
@@ -1570,10 +1523,10 @@ set(DUSK_FILES
         src/dusk/ui/string_button.hpp
         src/dusk/ui/tab_bar.cpp
         src/dusk/ui/tab_bar.hpp
-        src/dusk/ui/touch_controls.cpp
-        src/dusk/ui/touch_controls.hpp
         src/dusk/ui/touch_controls_common.cpp
         src/dusk/ui/touch_controls_common.hpp
+        src/dusk/ui/touch_controls.cpp
+        src/dusk/ui/touch_controls.hpp
         src/dusk/ui/touch_controls_editor.cpp
         src/dusk/ui/touch_controls_editor.hpp
         src/dusk/ui/ui.cpp
@@ -1582,14 +1535,28 @@ set(DUSK_FILES
         src/dusk/ui/warp.hpp
         src/dusk/ui/window.cpp
         src/dusk/ui/window.hpp
-        src/dusk/update_check.cpp
-        src/dusk/update_check.hpp
+        src/dusk/achievements.cpp
+        src/dusk/iso_validate.cpp
+        src/dusk/livesplit.cpp
+        src/dusk/offset_ptr.cpp
+        src/dusk/OSContext.cpp
+        src/dusk/OSReport.cpp
+        src/dusk/OSThread.cpp
+        src/dusk/OSMutex.cpp
+        src/dusk/hook_system.cpp
+        src/dusk/modding/mod_loader.cpp
+        src/dusk/modding/mod_loader_api.cpp
+        src/dusk/modding/mod_loader_overlay.cpp
+        src/dusk/modding/native_module.cpp
+        src/dusk/modding/native_module.hpp
+        src/dusk/modding/bundle_disk.cpp
+        src/dusk/modding/bundle_zip.cpp
+        src/dusk/gx_helper.cpp
+        src/dusk/discord.cpp
+        src/dusk/discord.hpp
+        src/dusk/discord_presence.cpp
         src/dusk/version.cpp
-        src/helpers/batch.cpp
-        src/helpers/endian.cpp
-        src/helpers/offset_ptr.cpp
-        src/helpers/string.cpp
-        src/helpers/cast.cpp
+        src/dusk/action_bindings.cpp
 )
 
 set(DUSK_HTTP_BACKEND_FILES

flake.nix

@@ -2,7 +2,6 @@
   description = "Dusklight — native PC port of the Twilight Princess decompilation";
 
   inputs.nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  inputs.self.submodules = true;
 
   outputs =
     { self, nixpkgs }:
@@ -59,6 +58,21 @@
           hasNodPrebuilt = nodPrebuiltInfo ? ${system};
 
           aurora = builtins.pathExists "${self}/extern/aurora/CMakeLists.txt";
+          needSubmodules = ''
+            dusklight: The aurora submodule is not vendored. Add submodules=1 to build.
+
+            As a flake input:
+
+            dusklight.url = "git+https://github.com/TwilitRealm/dusklight?ref=main&submodules=1";
+
+            nix command:
+
+            nix run 'git+https://github.com/TwilitRealm/dusklight?submodules=1'
+
+            Local checkout:
+
+            nix run '.?submodules=1#dusklight'
+          '';
 
           dawn = pkgs.fetchzip {
             url = "https://github.com/encounter/dawn/releases/download/${dawnVersion}/dawn-${dawnInfo.${system}.triple}.tar.gz";
@@ -126,14 +140,6 @@
             JSON = pkgs.nlohmann_json.src;
             XXHASH = pkgs.xxhash.src;
             ZSTD = pkgs.zstd.src;
-
-
-            MINIZ = pkgs.fetchzip {
-              url = "https://github.com/richgel999/miniz/releases/download/3.0.2/miniz-3.0.2.zip";
-              hash = "sha256-DXysXkQEmoDAMMg1F8KexkwpXNyiHNzLJqXR9SMEkxk=";
-              stripRoot = false;
-            };
-
             FMT = pkgs.fetchzip {
               url = "https://github.com/fmtlib/fmt/archive/refs/tags/12.1.0.tar.gz";
               hash = "sha256-ZmI1Dv0ZabPlxa02OpERI47jp7zFfjpeWCy1WyuPYZ0=";
@@ -159,16 +165,19 @@
           };
 
           dusklight =
-            pkgs.stdenv.mkDerivation {
-              pname = "dusklight";
-              version = versionSuffix;
-              src = ./.;
+            if !aurora then
+              throw needSubmodules
+            else
+              pkgs.stdenv.mkDerivation {
+                pname = "dusklight";
+                version = versionSuffix;
+                src = ./.;
 
-              postUnpack = ''
-                chmod -R u+w "$sourceRoot"
-                substituteInPlace "$sourceRoot/extern/aurora/CMakeLists.txt" \
-                  --replace-warn "add_subdirectory(tests)" ""
-              '';
+                postUnpack = ''
+                  chmod -R u+w "$sourceRoot"
+                  substituteInPlace "$sourceRoot/extern/aurora/CMakeLists.txt" \
+                    --replace-warn "add_subdirectory(tests)" ""
+                '';
 
                 nativeBuildInputs = [
                   pkgs.cmake
@@ -260,12 +269,6 @@
                       runHook postInstall
                     '';
 
-                postFixup = lib.optionalString (!isDarwin) ''
-                  patchelf \
-                    --add-needed "${pkgs.vulkan-loader}/lib/libvulkan.so" \
-                    $out/bin/dusklight
-                '';
-
                 dontStrip = true;
 
                 meta = {

include/DynamicLink.h

@@ -88,9 +88,9 @@ struct DynamicModuleControl : DynamicModuleControlBase {
     /* 0x24 */ s32 mSize;
     /* 0x28 */ mDoDvdThd_callback_c* mAsyncLoadCallback;
 
-    static DUSK_GAME_DATA u32 sAllocBytes;
-    static DUSK_GAME_DATA JKRArchive* sArchive;
-    static DUSK_GAME_DATA JKRFileCache* sFileCache;
+    static u32 sAllocBytes;
+    static JKRArchive* sArchive;
+    static JKRFileCache* sFileCache;
 };
 
 #endif /* DYNAMICLINK_H */

include/SSystem/SComponent/c_API.h

@@ -12,6 +12,6 @@ struct cAPI_Interface {
     /* 0x14 */ cAPIGph_Mthd blankingOffMtd;
 };
 
-DUSK_GAME_EXTERN cAPI_Interface g_cAPI_Interface;
+extern cAPI_Interface g_cAPI_Interface;
 
 #endif /* C_API_H */

include/SSystem/SComponent/c_angle.h

@@ -24,11 +24,11 @@ private:
     s16 mAngle;
 
 public:
-    const static DUSK_GAME_DATA cSAngle _0;
-    const static DUSK_GAME_DATA cSAngle _1;
-    const static DUSK_GAME_DATA cSAngle _90;
-    const static DUSK_GAME_DATA cSAngle _180;
-    const static DUSK_GAME_DATA cSAngle _270;
+    const static cSAngle _0;
+    const static cSAngle _1;
+    const static cSAngle _90;
+    const static cSAngle _180;
+    const static cSAngle _270;
 #ifdef __MWERKS__
     cSAngle() {}
     ~cSAngle() {}

include/SSystem/SComponent/c_bg_s_chk.h

@@ -5,7 +5,7 @@
 #include "f_pc/f_pc_base.h"
 #include "SSystem/SComponent/c_bg_s_grp_pass_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_pass_chk.h"
-#include "helpers/endian.h"
+#include "dusk/endian.h"
 
 struct cBgD_Vtx_t : public Vec {};
 

include/SSystem/SComponent/c_bg_s_shdw_draw.h

@@ -20,7 +20,7 @@ public:
 
     /* 0x14 */ cM3dGAab mM3dGAab;
     /* 0x30 */ cBgS_ShdwDraw_Callback mCallbackFun;
-    #if PARTIAL_DEBUG || DEBUG
+    #if DEBUG
     /* 0x34 */ int field_0x34;
     #endif
 };

include/SSystem/SComponent/c_cc_d.h

@@ -435,7 +435,7 @@ public:
 
     cM3dGAab& GetWorkAab() { return mAab; }
 
-    static DUSK_GAME_DATA cXyz m_virtual_center;
+    static cXyz m_virtual_center;
 };
 
 STATIC_ASSERT(0x20 == sizeof(cCcD_ShapeAttr));

include/SSystem/SComponent/c_counter.h

@@ -9,7 +9,7 @@ struct counter_class {
     u32 mTimer;
 };
 
-DUSK_GAME_EXTERN counter_class g_Counter;
+extern counter_class g_Counter;
 
 void cCt_Counter(int resetCounter1);
 

include/SSystem/SComponent/c_lib.h

@@ -102,6 +102,6 @@ void MtxPosition(cXyz DUSK_CONST*, cXyz*);
 void MtxPush(void);
 void MtxPull(void);
 
-DUSK_GAME_EXTERN Mtx* calc_mtx;
+extern Mtx* calc_mtx;
 
 #endif

include/SSystem/SComponent/c_m3d.h

@@ -20,7 +20,7 @@ struct cM3d_Range {
 };
 
 #define G_CM3D_F_INF (1000000000.0f)
-DUSK_GAME_EXTERN const f32 G_CM3D_F_ABS_MIN;
+extern const f32 G_CM3D_F_ABS_MIN;
 
 static void cM3d_InDivPos1(const Vec*, const Vec*, f32, Vec*);
 void cM3d_InDivPos2(const Vec*, const Vec*, f32, Vec*);

include/SSystem/SComponent/c_m3d_g_tri.h

@@ -2,7 +2,7 @@
 #define C_M3D_G_TRI_H_
 
 #include "SSystem/SComponent/c_m3d_g_pla.h"
-#include "helpers/endian.h"
+#include "dusk/endian.h"
 
 class cM3dGCyl;
 

include/SSystem/SComponent/c_malloc.h

@@ -6,7 +6,7 @@
 class JKRHeap;
 
 struct cMl {
-    static DUSK_GAME_DATA JKRHeap* Heap;
+    static JKRHeap* Heap;
     static void init(JKRHeap*);
     static void* memalignB(int, u32);
     static void free(void*);

include/SSystem/SComponent/c_sxyz.h

@@ -9,7 +9,7 @@ struct SVec {
 
 class csXyz : public SVec {
 public:
-    static DUSK_GAME_DATA const csXyz Zero;
+    static const csXyz Zero;
     ~csXyz() {}
     csXyz() {}
     csXyz(s16, s16, s16);

include/SSystem/SComponent/c_xyz.h

@@ -14,14 +14,14 @@ struct cXy {
 };
 
 struct cXyz : Vec {
-    static DUSK_GAME_DATA const cXyz Zero;
-    static DUSK_GAME_DATA const cXyz BaseX;
-    static DUSK_GAME_DATA const cXyz BaseY;
-    static DUSK_GAME_DATA const cXyz BaseZ;
-    static DUSK_GAME_DATA const cXyz BaseXY;
-    static DUSK_GAME_DATA const cXyz BaseXZ;
-    static DUSK_GAME_DATA const cXyz BaseYZ;
-    static DUSK_GAME_DATA const cXyz BaseXYZ;
+    static const cXyz Zero;
+    static const cXyz BaseX;
+    static const cXyz BaseY;
+    static const cXyz BaseZ;
+    static const cXyz BaseXY;
+    static const cXyz BaseXZ;
+    static const cXyz BaseYZ;
+    static const cXyz BaseXYZ;
 #ifdef __MWERKS__
     cXyz() {}
     ~cXyz() {}

include/Z2AudioLib/Z2Audience.h

@@ -9,8 +9,6 @@
 #include "JSystem/JAudio2/JAUAudibleParam.h"
 #include "JSystem/TPosition3.h"
 
-#define Z2_AUDIO_PLAYERS 1
-
 struct Z2Audible;
 
 struct Z2AudibleAbsPos {
@@ -51,14 +49,10 @@ struct Z2AudioCamera {
     f32 getCamDist() const { return mCamDist; }
 
 
-    /* 0x00 */ JGeometry::TPosition3f32 mViewMatrix;
+    /* 0x00 */ JGeometry::TPosition3f32 field_0x0;
     /* 0x30 */ JGeometry::TVec3<f32> mVel;
     /* 0x3C */ JGeometry::TVec3<f32> mPos;
-
-    /**
-     *
-     */
-    /* 0x48 */ JGeometry::TVec3<f32> mLastPos;
+    /* 0x48 */ JGeometry::TVec3<f32> field_0x48;
     /* 0x54 */ f32 mFovySin;
     /* 0x58 */ f32 mVolCenterZ;
     /* 0x5C */ f32 mTargetVolume;
@@ -89,14 +83,14 @@ struct Z2SpotMic {
     /* 0x04 */ f32 field_0x4;
     /* 0x08 */ f32 field_0x8;
     /* 0x0C */ f32 field_0xc;
-    /* 0x10 */ Z2AudioCamera* field_0x10[Z2_AUDIO_PLAYERS];
+    /* 0x10 */ Z2AudioCamera* field_0x10[1];
     /* 0x14 */ Vec* mPosPtr;
-    /* 0x18 */ f32 field_0x18[Z2_AUDIO_PLAYERS];
+    /* 0x18 */ f32 field_0x18[1];
     /* 0x1C */ f32 field_0x1c;
-    /* 0x20 */ f32 field_0x20[Z2_AUDIO_PLAYERS];
+    /* 0x20 */ f32 field_0x20[1];
     /* 0x24 */ bool mIgnoreIfOut;
     /* 0x25 */ bool mMicOn;
-    /* 0x26 */ bool field_0x26[Z2_AUDIO_PLAYERS];
+    /* 0x26 */ bool field_0x26[1];
 };  // Size: 0x28
 
 struct Z2Audience3DSetting {
@@ -108,99 +102,62 @@ struct Z2Audience3DSetting {
     void updateDolbyDist(f32, f32);
 
     void calcVolumeFactorAll() {
-        mDistanceMaxes[1] = 1.25f * mDistanceMaxes[0];
-        mDistanceMaxes[2] = 1.5f * mDistanceMaxes[0];
-        mDistanceMaxes[3] = 2.0f * mDistanceMaxes[0];
-        mDistanceMaxes[4] = 3.0f * mDistanceMaxes[0];
-        mDistanceMaxes[5] = 4.0f * mDistanceMaxes[0];
-        mDistanceMaxes[6] = 6.0f * mDistanceMaxes[0];
-        mDistanceMaxes[7] = 8.0f * mDistanceMaxes[0];
-        mDistanceMaxes[8] = 0.9f * mDistanceMaxes[0];
-        mDistanceMaxes[9] = 0.8f * mDistanceMaxes[0];
-        mDistanceMaxes[10] = 0.7f * mDistanceMaxes[0];
-        mDistanceMaxes[11] = 0.6f * mDistanceMaxes[0];
-        mDistanceMaxes[12] = 0.5f * mDistanceMaxes[0];
-        mDistanceMaxes[13] = 0.4f * mDistanceMaxes[0];
-        mDistanceMaxes[14] = 0.3f * mDistanceMaxes[0];
+        field_0x0[1] = 1.25f * field_0x0[0];
+        field_0x0[2] = 1.5f * field_0x0[0];
+        field_0x0[3] = 2.0f * field_0x0[0];
+        field_0x0[4] = 3.0f * field_0x0[0];
+        field_0x0[5] = 4.0f * field_0x0[0];
+        field_0x0[6] = 6.0f * field_0x0[0];
+        field_0x0[7] = 8.0f * field_0x0[0];
+        field_0x0[8] = 0.9f * field_0x0[0];
+        field_0x0[9] = 0.8f * field_0x0[0];
+        field_0x0[10] = 0.7f * field_0x0[0];
+        field_0x0[11] = 0.6f * field_0x0[0];
+        field_0x0[12] = 0.5f * field_0x0[0];
+        field_0x0[13] = 0.4f * field_0x0[0];
+        field_0x0[14] = 0.3f * field_0x0[0];
         for (int i = 0; i < 15; i++) {
-            mVolumeFactor[i] = (mMinDistanceVolume - 1.0f) / (mDistanceMaxes[i] - mMaxVolumeDistance);
+            field_0x70[i] = (field_0x40 - 1.0f) / (field_0x0[i] - field_0x3c);
         }
     }
 
     void calcPriorityFactorAll() {
         for (int i = 0; i < 15; i++) {
-            mPriorityFactor[i] = mMaxDistancePriority / (mDistanceMaxes[i] - mMaxVolumeDistance);
+            field_0xac[i] = field_0x64 / (field_0x0[i] - field_0x3c);
         }
     }
 
     void calcFxMixFactorAll() {
         for (int i = 0; i < 15; i++) {
-            mFxMixFactor[i] = (mMaxDistanceFxMix - mMinDistanceFxMix) / (mDistanceMaxes[i] - mMaxVolumeDistance);
+            field_0xe8[i] = (field_0x54 - field_0x50) / (field_0x0[i] - field_0x3c);
         }
     }
 
-    /**
-     * Maximum distance a sound can reach before being "far away"
-     * Being far away affects stuff like culling, lowering its priority, forcibly stopping it, etc.
-     * Sounds select which entry they use based on their VolBits.
-     */
-    /* 0x000 */ f32 mDistanceMaxes[15];
-
-    /**
-     * Distance at which the max volume of a sound is reached.
-     * i.e. sounds do *not* get louder if they get closer than this.
-     */
-    /* 0x03C */ f32 mMaxVolumeDistance;
-
-    /**
-     * FX Mix value at maximum distance (@ref mDistanceMaxes)
-     */
-    /* 0x040 */ f32 mMinDistanceVolume;
-    /* 0x044 */ f32 mDolbyFrontDistanceMax;
-    /* 0x048 */ f32 mDolbyBehindDistanceMax;
-    /* 0x04C */ f32 mDolbyCenterValue;
-
-    /**
-     * FX Mix value at minimum distance (@ref mMaxVolumeDistance)
-     */
-    /* 0x050 */ f32 mMinDistanceFxMix;
-
-    /**
-     * FX Mix value at maximum distance (@ref mDistanceMaxes)
-     */
-    /* 0x054 */ f32 mMaxDistanceFxMix;
-    /* 0x058 */ f32 mPanFactor;
-    /* 0x05C */ f32 mSonicSpeed; // Used for doppler effect calculations.
+    /* 0x000 */ f32 field_0x0[15];
+    /* 0x03C */ f32 field_0x3c;
+    /* 0x040 */ f32 field_0x40;
+    /* 0x044 */ f32 field_0x44;
+    /* 0x048 */ f32 field_0x48;
+    /* 0x04C */ f32 field_0x4c;
+    /* 0x050 */ f32 field_0x50;
+    /* 0x054 */ f32 field_0x54;
+    /* 0x058 */ f32 field_0x58;
+    /* 0x05C */ f32 field_0x5c;
     /* 0x060 */ f32 field_0x60;
-
-    /**
-     * Priority that sounds receive when "far away".
-     * @see mDistanceMaxes
-     */
-    /* 0x064 */ u32 mMaxDistancePriority;
+    /* 0x064 */ u32 field_0x64;
     /* 0x068 */ f32 field_0x68;
     /* 0x06C */ f32 field_0x6c;
-    /* 0x070 */ f32 mVolumeFactor[15];
-    /* 0x0AC */ f32 mPriorityFactor[15];
-    /* 0x0E8 */ f32 mFxMixFactor[15];
+    /* 0x070 */ f32 field_0x70[15];
+    /* 0x0AC */ f32 field_0xac[15];
+    /* 0x0E8 */ f32 field_0xe8[15];
     /* 0x124 */ bool mVolumeDistInit;
     /* 0x125 */ bool mDolbyDistInit;
 };  // Size: 0x128
 
 struct Z2AudibleRelPos {
-    /* 0x00 */ JGeometry::TVec3<f32> mCameraRelative;
-
-    /**
-     * Distance from mCameraRelative. This is from the object root and not the
-     * exact distance used for volume/priority calculations.
-     */
-    /* 0x0C */ f32 mTrueDistance;
-
-    /**
-     * Distance from mCameraRelative but offset by mVolCenterZ.
-     * This presumably means the distance is more centered on the object than mTrueDistance.
-     */
-    /* 0x10 */ f32 mCenterDistance;
+    /* 0x00 */ JGeometry::TVec3<f32> field_0x00;
+    /* 0x0C */ f32 field_0xC;
+    /* 0x10 */ f32 field_0x10;
 };
 
 struct Z2AudibleChannel {
@@ -214,7 +171,7 @@ struct Z2AudibleChannel {
     }
 
     /* 0x00 */ JASSoundParams mParams;
-    /* 0x14 */ Z2AudibleRelPos mRelPos;
+    /* 0x14 */ Z2AudibleRelPos field_0x14;
     /* 0x28 */ f32 field_0x28;
     /* 0x2c */ f32 mPan;
     /* 0x30 */ f32 mDolby;
@@ -243,8 +200,8 @@ struct Z2Audible : public JAIAudible, public JASPoolAllocObject<Z2Audible> {
 
     /* 0x10 */ JAUAudibleParam mParam;
     /* 0x14 */ Z2AudibleAbsPos mAbsPos;
-    /* 0x2C */ Z2AudibleChannel mChannel[Z2_AUDIO_PLAYERS];
-    /* 0x64 */ f32 mMicDistances[Z2_AUDIO_PLAYERS];
+    /* 0x2C */ Z2AudibleChannel mChannel[1];
+    /* 0x64 */ f32 field_0x64[1];
 };
 
 struct Z2Audience : public JAIAudience, public JASGlobalInstance<Z2Audience> {
@@ -299,7 +256,7 @@ inline Z2Audience* Z2GetAudience() {
     return JASGlobalInstance<Z2Audience>::getInstance();
 }
 
-DUSK_GAME_EXTERN s8 data_80451358;
-DUSK_GAME_EXTERN s8 data_80451359;
+extern s8 data_80451358;
+extern s8 data_80451359;
 
 #endif /* Z2AUDIENCE_H */

include/Z2AudioLib/Z2AudioMgr.h

@@ -48,8 +48,6 @@ public:
     /* 0x1370 */ Z2FxLineMgr mFxLineMgr;
     #if DEBUG
     /* 0x13BC */ Z2DebugSys mDebugSys;
-    #elif PARTIAL_DEBUG
-    alignas(Z2DebugSys) u8 mDebugSys[sizeof(Z2DebugSys)];
     #endif
 };  // Size: 0x138C
 

include/Z2AudioLib/Z2Calc.h

@@ -42,8 +42,8 @@ f32 getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 outMin, f32
 f32 getRandom(f32 magnitude, f32 exponent, f32 bias);
 f32 getRandom_0_1();
 
-DUSK_GAME_EXTERN const f32 cEqualCSlope;
-DUSK_GAME_EXTERN const f32 cEqualPSlope;
+extern const f32 cEqualCSlope;
+extern const f32 cEqualPSlope;
 }  // namespace Z2Calc
 
 #endif /* Z2CALC_H */

include/Z2AudioLib/Z2EnvSeMgr.h

@@ -175,7 +175,7 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
 
 STATIC_ASSERT(sizeof(Z2EnvSeMgr) == 0x30C);
 
-DUSK_GAME_EXTERN Z2EnvSeMgr g_mEnvSeMgr;
+extern Z2EnvSeMgr g_mEnvSeMgr;
 
 inline Z2EnvSeMgr* Z2GetEnvSeMgr() {
     return JASGlobalInstance<Z2EnvSeMgr>::getInstance();

include/Z2AudioLib/Z2LinkMgr.h

@@ -57,7 +57,7 @@ public:
     void setUsingIronBall(bool isUsingIronBall) { mUsingIronBall = isUsingIronBall; }
     void setMarkState(u8 state) { mMarkState = state; }
 
-    static DUSK_GAME_DATA Z2CreatureLink* mLinkPtr;
+    static Z2CreatureLink* mLinkPtr;
     static Z2CreatureLink* getLink() { return mLinkPtr; }
 
     friend class Z2LinkSoundStarter;

include/Z2AudioLib/Z2Param.h

@@ -4,72 +4,72 @@
 #include <types.h>
 
 struct Z2Param {
-    static DUSK_GAME_DATA f32 DISTANCE_MAX;
-    static DUSK_GAME_DATA f32 MAX_VOLUME_DISTANCE;
-    static DUSK_GAME_DATA f32 DOLBY_CENTER_VALUE;
-    static DUSK_GAME_DATA f32 DOLBY_FLONT_DISTANCE_MAX;
-    static DUSK_GAME_DATA f32 DOLBY_BEHIND_DISTANCE_MAX;
-    static DUSK_GAME_DATA f32 DISTANCE_FX_PARAM;
-    static DUSK_GAME_DATA f32 SONIC_SPEED;
-    static DUSK_GAME_DATA f32 VOL_BGM_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_OBJECT_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_DEFAULT;
-    static DUSK_GAME_DATA f32 VOL_BGM_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_OBJECT_TALKING;
-    static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_TALKING;
-    static DUSK_GAME_DATA f32 VOL_BGM_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_SYSTEM_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_VOICE_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_MOTION_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_LINK_FOOTNOTE_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_CHAR_VOICE_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_CHAR_MOVE_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_OBJECT_PAUSING;
-    static DUSK_GAME_DATA f32 VOL_SE_ATMOSPHERE_PAUSING;
-    static DUSK_GAME_DATA f32 MIN_DISTANCE_VOLUME;
-    static DUSK_GAME_DATA f32 ENEMY_LASTHIT_MUTE_VOLUME;
+    static f32 DISTANCE_MAX;
+    static f32 MAX_VOLUME_DISTANCE;
+    static f32 DOLBY_CENTER_VALUE;
+    static f32 DOLBY_FLONT_DISTANCE_MAX;
+    static f32 DOLBY_BEHIND_DISTANCE_MAX;
+    static f32 DISTANCE_FX_PARAM;
+    static f32 SONIC_SPEED;
+    static f32 VOL_BGM_DEFAULT;
+    static f32 VOL_SE_SYSTEM_DEFAULT;
+    static f32 VOL_SE_LINK_VOICE_DEFAULT;
+    static f32 VOL_SE_LINK_MOTION_DEFAULT;
+    static f32 VOL_SE_LINK_FOOTNOTE_DEFAULT;
+    static f32 VOL_SE_CHAR_VOICE_DEFAULT;
+    static f32 VOL_SE_CHAR_MOVE_DEFAULT;
+    static f32 VOL_SE_OBJECT_DEFAULT;
+    static f32 VOL_SE_ATMOSPHERE_DEFAULT;
+    static f32 VOL_BGM_TALKING;
+    static f32 VOL_SE_SYSTEM_TALKING;
+    static f32 VOL_SE_LINK_VOICE_TALKING;
+    static f32 VOL_SE_LINK_MOTION_TALKING;
+    static f32 VOL_SE_LINK_FOOTNOTE_TALKING;
+    static f32 VOL_SE_CHAR_VOICE_TALKING;
+    static f32 VOL_SE_CHAR_MOVE_TALKING;
+    static f32 VOL_SE_OBJECT_TALKING;
+    static f32 VOL_SE_ATMOSPHERE_TALKING;
+    static f32 VOL_BGM_PAUSING;
+    static f32 VOL_SE_SYSTEM_PAUSING;
+    static f32 VOL_SE_LINK_VOICE_PAUSING;
+    static f32 VOL_SE_LINK_MOTION_PAUSING;
+    static f32 VOL_SE_LINK_FOOTNOTE_PAUSING;
+    static f32 VOL_SE_CHAR_VOICE_PAUSING;
+    static f32 VOL_SE_CHAR_MOVE_PAUSING;
+    static f32 VOL_SE_OBJECT_PAUSING;
+    static f32 VOL_SE_ATMOSPHERE_PAUSING;
+    static f32 MIN_DISTANCE_VOLUME;
+    static f32 ENEMY_LASTHIT_MUTE_VOLUME;
 
     // made up names based on HIO labels
-    static DUSK_GAME_DATA u8 SCENE_CHANGE_BGM_FADEOUT_TIME;
-    static DUSK_GAME_DATA u8 BGM_CROSS_FADEIN_TIME;
-    static DUSK_GAME_DATA u8 BGM_CROSS_FADEOUT_TIME;
-    static DUSK_GAME_DATA u8 BATTLE_BGM_WAIT_TIME;
+    static u8 SCENE_CHANGE_BGM_FADEOUT_TIME;
+    static u8 BGM_CROSS_FADEIN_TIME;
+    static u8 BGM_CROSS_FADEOUT_TIME;
+    static u8 BATTLE_BGM_WAIT_TIME;
 
     static f32 ENEMY_NEARBY_DIST;
     static f32 BATTLE_FADEIN_DIST;
     static f32 BATTLE_FADEOUT_DIST;
 
-    static DUSK_GAME_DATA u8 FOUND_TRACK_FI_TIME;
-    static DUSK_GAME_DATA u8 FOUND_TRACK_FO_TIME;
-    static DUSK_GAME_DATA u8 CLOSE_BATTLE_TRACK_FI_TIME;
-    static DUSK_GAME_DATA u8 CLOSE_BATTLE_TRACK_FO_TIME;
+    static u8 FOUND_TRACK_FI_TIME;
+    static u8 FOUND_TRACK_FO_TIME;
+    static u8 CLOSE_BATTLE_TRACK_FI_TIME;
+    static u8 CLOSE_BATTLE_TRACK_FO_TIME;
 
-    static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_DOWN_TIME;
-    static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_LOWER_TIME;
-    static DUSK_GAME_DATA u8 ENDING_BLOW_VOL_LOWER_RECOVER_TIME;
-    static DUSK_GAME_DATA u8 ENDING_BLOW_MIN_FINISH_TIME;
+    static u8 ENDING_BLOW_VOL_DOWN_TIME;
+    static u8 ENDING_BLOW_VOL_LOWER_TIME;
+    static u8 ENDING_BLOW_VOL_LOWER_RECOVER_TIME;
+    static u8 ENDING_BLOW_MIN_FINISH_TIME;
 
-    static DUSK_GAME_DATA u8 DARK_SE_FILTER_ON;
-    static DUSK_GAME_DATA u8 DARK_SE_LOW_PASS_FILTER_SETTING;
-    static DUSK_GAME_DATA u8 SYSTEM_SE_USE_DARK_SE_SETTING;
+    static u8 DARK_SE_FILTER_ON;
+    static u8 DARK_SE_LOW_PASS_FILTER_SETTING;
+    static u8 SYSTEM_SE_USE_DARK_SE_SETTING;
 
     static f32 AUDIBLE_DELTA_RANGE_VOLUME;
     static f32 AUDIBLE_DELTA_RANGE_PAN;
     static f32 AUDIBLE_DELTA_RANGE_DOLBY;
 };
 
-DUSK_GAME_EXTERN u8 data_8045086C;
+extern u8 data_8045086C;
 
 #endif /* Z2PARAM_H */

include/Z2AudioLib/Z2SeqMgr.h

@@ -194,7 +194,7 @@ public:
     JAISoundHandle* getMainBgmHandle() { return &mMainBgmHandle; }
     JAISoundHandle* getSubBgmHandle() { return &mSubBgmHandle; }
 
-    #if PARTIAL_DEBUG || DEBUG
+    #if DEBUG
     f32 field_0x00_debug;
     u8 field_0x04_debug;
     #endif

include/Z2AudioLib/Z2SoundObjMgr.h

@@ -100,13 +100,13 @@ public:
     bool isForceBattle() { return forceBattle_; }
     JSUList<Z2CreatureEnemy>* getEnemyList() { return &field_0x0; }
 
-    #if PARTIAL_DEBUG || DEBUG
+    #if DEBUG
     JSUList<Z2SoundObjBase>* getAllList() { return &allList_; }
     #endif
 
 private:
     /* 0x00 */ JSUList<Z2CreatureEnemy> field_0x0;
-    #if PARTIAL_DEBUG || DEBUG
+    #if DEBUG
     /* 0x0C */ JSUList<Z2SoundObjBase> allList_;
     #endif
     /* 0x0C */ Z2EnemyArea enemyArea_;

include/Z2AudioLib/Z2SoundObject.h

@@ -7,7 +7,7 @@
 struct Z2SoundStarter;
 
 class Z2SoundObjBase : public Z2SoundHandles
-#if PARTIAL_DEBUG || DEBUG
+#if DEBUG
 , public JSULink<Z2SoundObjBase>
 #endif
 {

include/c/c_damagereaction.h

@@ -12,18 +12,18 @@ public:
 
 BOOL cDmrNowMidnaTalk();
 
-DUSK_GAME_EXTERN u8 cDmr_SkipInfo;
-DUSK_GAME_EXTERN u8 data_80450C99;
-DUSK_GAME_EXTERN u8 data_80450C9A;
-DUSK_GAME_EXTERN u8 data_80450C9B;
-DUSK_GAME_EXTERN u8 data_80450C9C;
-DUSK_GAME_EXTERN u8 data_80450C9D;
-DUSK_GAME_EXTERN u8 data_80450C9E;
-DUSK_GAME_EXTERN u8 cDmr_FishingWether;
-DUSK_GAME_EXTERN u8 data_80450CA0;
+extern u8 cDmr_SkipInfo;
+extern u8 data_80450C99;
+extern u8 data_80450C9A;
+extern u8 data_80450C9B;
+extern u8 data_80450C9C;
+extern u8 data_80450C9D;
+extern u8 data_80450C9E;
+extern u8 cDmr_FishingWether;
+extern u8 data_80450CA0;
 
 extern "C" {
-    DUSK_GAME_EXTERN JPTraceParticleCallBack4 JPTracePCB4;
+    extern JPTraceParticleCallBack4 JPTracePCB4;
 }
 
 void debug_actor_create();

include/d/actor/d_a_alink.h

@@ -57,8 +57,8 @@ public:
     void setNowOffsetX(f32 i_offset) { mNowOffsetX = i_offset; }
     void setNowOffsetY(f32 i_offset) { mNowOffsetY = i_offset; }
 
-    static DUSK_GAME_DATA bool m_eye_move_flg;
-    static DUSK_GAME_DATA u8 m_morf_frame;
+    static bool m_eye_move_flg;
+    static u8 m_morf_frame;
 
     /* 0x0F4 */ mutable f32 field_0xf4;
     /* 0x0F8 */ mutable f32 field_0xf8;
@@ -3913,20 +3913,20 @@ public:
 
     static u32 getOtherHeapSize() { return 0xF0A60; }
 
-    static DUSK_GAME_DATA daAlink_BckData const m_mainBckShield[20];
-    static DUSK_GAME_DATA daAlink_BckData const m_mainBckSword[5];
-    static DUSK_GAME_DATA daAlink_BckData const m_mainBckFishing[28];
-    static DUSK_GAME_DATA daAlink_AnmData const m_anmDataTable[ANM_MAX];
-    static DUSK_GAME_DATA daAlink_WlAnmData const m_wlAnmDataTable[WANM_MAX];
-    static DUSK_GAME_DATA daAlink_FaceTexData const m_faceTexDataTable[];
-    static DUSK_GAME_DATA Vec const m_handLeftOutSidePos;
-    static DUSK_GAME_DATA Vec const m_handRightOutSidePos;
-    static DUSK_GAME_DATA Vec const m_handLeftInSidePos;
-    static DUSK_GAME_DATA Vec const m_handRightInSidePos;
+    static daAlink_BckData const m_mainBckShield[20];
+    static daAlink_BckData const m_mainBckSword[5];
+    static daAlink_BckData const m_mainBckFishing[28];
+    static daAlink_AnmData const m_anmDataTable[ANM_MAX];
+    static daAlink_WlAnmData const m_wlAnmDataTable[WANM_MAX];
+    static daAlink_FaceTexData const m_faceTexDataTable[];
+    static Vec const m_handLeftOutSidePos;
+    static Vec const m_handRightOutSidePos;
+    static Vec const m_handLeftInSidePos;
+    static Vec const m_handRightInSidePos;
 
-    static DUSK_GAME_DATA const daAlink_procInitTable m_procInitTable[];
-    static DUSK_GAME_DATA daAlink_procFunc m_demoInitTable[];
-    static DUSK_GAME_DATA const EffParamProc m_fEffParamProc[];
+    static const daAlink_procInitTable m_procInitTable[];
+    static daAlink_procFunc m_demoInitTable[];
+    static const EffParamProc m_fEffParamProc[];
 
     /* 0x0062C */ request_of_phase_process_class mPhaseReq;
     /* 0x00634 */ const char* mArcName;
@@ -4649,7 +4649,7 @@ struct daAlinkHIO_basic_c1 {
 
 class daAlinkHIO_basic_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_basic_c1 const m;
+    static daAlinkHIO_basic_c1 const m;
 };
 
 class daAlinkHIO_basic_c : public daAlinkHIO_data_c {
@@ -4700,7 +4700,7 @@ public:
 
 class daAlinkHIO_move_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_move_c1 const m;
+    static daAlinkHIO_move_c1 const m;
 };
 
 class daAlinkHIO_move_c : public daAlinkHIO_data_c {
@@ -4746,7 +4746,7 @@ public:
 
 class daAlinkHIO_atnMove_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_atnMove_c1 const m;
+    static daAlinkHIO_atnMove_c1 const m;
 };
 
 class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c {
@@ -4792,7 +4792,7 @@ public:
 
 class daAlinkHIO_noActAtnMove_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_noActAtnMove_c1 const m;
+    static daAlinkHIO_noActAtnMove_c1 const m;
 };
 
 class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c {
@@ -4834,7 +4834,7 @@ public:
 
 class daAlinkHIO_frontRoll_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_frontRoll_c1 const m;
+    static daAlinkHIO_frontRoll_c1 const m;
 };
 
 class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c {
@@ -4864,7 +4864,7 @@ public:
 
 class daAlinkHIO_backJump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_backJump_c1 const m;
+    static daAlinkHIO_backJump_c1 const m;
 };
 
 class daAlinkHIO_backJump_c : public daAlinkHIO_data_c {
@@ -4898,7 +4898,7 @@ public:
 
 class daAlinkHIO_sideStep_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_sideStep_c1 const m;
+    static daAlinkHIO_sideStep_c1 const m;
 };
 
 class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c {
@@ -4936,7 +4936,7 @@ public:
 
 class daAlinkHIO_slide_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_slide_c1 const m;
+    static daAlinkHIO_slide_c1 const m;
 };
 
 class daAlinkHIO_slide_c : public daAlinkHIO_data_c {
@@ -4964,27 +4964,27 @@ public:
 
 class daAlinkHIO_cutNmV_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
+    static daAlinkHIO_cutNormal_c1 const m;
 };
 
 class daAlinkHIO_cutNmL_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
+    static daAlinkHIO_cutNormal_c1 const m;
 };
 
 class daAlinkHIO_cutNmR_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
+    static daAlinkHIO_cutNormal_c1 const m;
 };
 
 class daAlinkHIO_cutNmSL_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
+    static daAlinkHIO_cutNormal_c1 const m;
 };
 
 class daAlinkHIO_cutNmSR_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutNormal_c1 const m;
+    static daAlinkHIO_cutNormal_c1 const m;
 };
 
 class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c {
@@ -5015,32 +5015,32 @@ public:
 
 class daAlinkHIO_cutFnL_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
+    static daAlinkHIO_cutFinish_c1 const m;
 };
 
 class daAlinkHIO_cutFnV_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
+    static daAlinkHIO_cutFinish_c1 const m;
 };
 
 class daAlinkHIO_cutFnS_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
+    static daAlinkHIO_cutFinish_c1 const m;
 };
 
 class daAlinkHIO_cutFnSl_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
+    static daAlinkHIO_cutFinish_c1 const m;
 };
 
 class daAlinkHIO_cutFnSm_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
+    static daAlinkHIO_cutFinish_c1 const m;
 };
 
 class daAlinkHIO_cutFnR_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutFinish_c1 const m;
+    static daAlinkHIO_cutFinish_c1 const m;
 };
 
 class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c {
@@ -5077,7 +5077,7 @@ public:
 
 class daAlinkHIO_cutFnJU_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutFnJU_c1 const m;
+    static daAlinkHIO_cutFnJU_c1 const m;
 };
 
 class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c {
@@ -5104,17 +5104,17 @@ public:
 
 class daAlinkHIO_cutDaL_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
+    static daAlinkHIO_cutDash_c1 const m;
 };
 
 class daAlinkHIO_cutDaR_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
+    static daAlinkHIO_cutDash_c1 const m;
 };
 
 class daAlinkHIO_cutDaCharge_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutDash_c1 const m;
+    static daAlinkHIO_cutDash_c1 const m;
 };
 
 class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c {
@@ -5146,7 +5146,7 @@ public:
 
 class daAlinkHIO_cutJump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutJump_c1 const m;
+    static daAlinkHIO_cutJump_c1 const m;
 };
 
 class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c {
@@ -5197,7 +5197,7 @@ public:
 
 class daAlinkHIO_cutTurn_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutTurn_c1 const m;
+    static daAlinkHIO_cutTurn_c1 const m;
 };
 
 class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c {
@@ -5225,22 +5225,22 @@ public:
 
 class daAlinkHIO_hoCutLA_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
+    static daAlinkHIO_hoCut_c1 const m;
 };
 
 class daAlinkHIO_hoCutLB_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
+    static daAlinkHIO_hoCut_c1 const m;
 };
 
 class daAlinkHIO_hoCutRA_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
+    static daAlinkHIO_hoCut_c1 const m;
 };
 
 class daAlinkHIO_hoCutRB_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_hoCut_c1 const m;
+    static daAlinkHIO_hoCut_c1 const m;
 };
 
 class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c {
@@ -5273,7 +5273,7 @@ public:
 
 class daAlinkHIO_hoCutCharge_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_hoCutCharge_c1 const m;
+    static daAlinkHIO_hoCutCharge_c1 const m;
 };
 
 class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c {
@@ -5307,7 +5307,7 @@ public:
 
 class daAlinkHIO_cutDown_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutDown_c1 const m;
+    static daAlinkHIO_cutDown_c1 const m;
 };
 
 class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c {
@@ -5343,7 +5343,7 @@ public:
 
 class daAlinkHIO_cutHead_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutHead_c1 const m;
+    static daAlinkHIO_cutHead_c1 const m;
 };
 
 class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c {
@@ -5380,7 +5380,7 @@ public:
 
 class daAlinkHIO_cutLargeJump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_cutLargeJump_c1 const m;
+    static daAlinkHIO_cutLargeJump_c1 const m;
 };
 
 class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c {
@@ -5457,7 +5457,7 @@ public:
     static daAlinkHIO_cutDown_c0 const mCutDown;
     static daAlinkHIO_cutHead_c0 const mCutHead;
     static daAlinkHIO_cutLargeJump_c0 const mCutLargeJump;
-    static DUSK_GAME_DATA daAlinkHIO_cut_c1 const m;
+    static daAlinkHIO_cut_c1 const m;
 };
 
 class daAlinkHIO_cut_c : public daAlinkHIO_data_c {
@@ -5513,12 +5513,12 @@ public:
 
 class daAlinkHIO_gAtPush_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_guardAttack_c1 const m;
+    static daAlinkHIO_guardAttack_c1 const m;
 };
 
 class daAlinkHIO_gAtKick_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_guardAttack_c1 const m;
+    static daAlinkHIO_guardAttack_c1 const m;
 };
 
 class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c {
@@ -5550,7 +5550,7 @@ public:
 
 class daAlinkHIO_turnMove_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_turnMove_c1 const m;
+    static daAlinkHIO_turnMove_c1 const m;
 };
 
 class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c {
@@ -5595,7 +5595,7 @@ public:
     static daAlinkHIO_gAtPush_c0 const mAtPush;
     static daAlinkHIO_gAtKick_c0 const mAtKick;
     static daAlinkHIO_turnMove_c0 const mTurnMove;
-    static DUSK_GAME_DATA daAlinkHIO_guard_c1 const m;
+    static daAlinkHIO_guard_c1 const m;
 };
 
 class daAlinkHIO_guard_c : public daAlinkHIO_data_c {
@@ -5634,7 +5634,7 @@ public:
 
 class daAlinkHIO_crouch_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_crouch_c1 const m;
+    static daAlinkHIO_crouch_c1 const m;
 };
 
 class daAlinkHIO_crouch_c : public daAlinkHIO_data_c {
@@ -5689,7 +5689,7 @@ public:
 
 class daAlinkHIO_autoJump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_autoJump_c1 const m;
+    static daAlinkHIO_autoJump_c1 const m;
 };
 
 class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c {
@@ -5719,7 +5719,7 @@ public:
 
 class daAlinkHIO_smallJump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_smallJump_c1 const m;
+    static daAlinkHIO_smallJump_c1 const m;
 };
 
 class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c {
@@ -5748,7 +5748,7 @@ public:
 
 class daAlinkHIO_wallCatch_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wallCatch_c1 const m;
+    static daAlinkHIO_wallCatch_c1 const m;
 };
 
 class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c {
@@ -5774,7 +5774,7 @@ public:
 
 class daAlinkHIO_wallFall_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wallFall_c1 const m;
+    static daAlinkHIO_wallFall_c1 const m;
 };
 
 class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c {
@@ -5803,7 +5803,7 @@ public:
 
 class daAlinkHIO_wallMove_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wallMove_c1 const m;
+    static daAlinkHIO_wallMove_c1 const m;
 };
 
 class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c {
@@ -5839,7 +5839,7 @@ public:
     static daAlinkHIO_wallCatch_c0 const mWallCatch;
     static daAlinkHIO_wallFall_c0 const mWallFall;
     static daAlinkHIO_wallMove_c0 const mWallMove;
-    static DUSK_GAME_DATA daAlinkHIO_wallHang_c1 const m;
+    static daAlinkHIO_wallHang_c1 const m;
 };
 
 class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c {
@@ -5886,7 +5886,7 @@ public:
 
 class daAlinkHIO_pushpull_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_pushpull_c1 const m;
+    static daAlinkHIO_pushpull_c1 const m;
 };
 
 class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c {
@@ -5920,7 +5920,7 @@ public:
 
 class daAlinkHIO_damNormal_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damNormal_c1 const m;
+    static daAlinkHIO_damNormal_c1 const m;
 };
 
 class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c {
@@ -5959,12 +5959,12 @@ public:
 
 class daAlinkHIO_damLarge_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damLaHu_c1 const m;
+    static daAlinkHIO_damLaHu_c1 const m;
 };
 
 class daAlinkHIO_damHuge_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damLaHu_c1 const m;
+    static daAlinkHIO_damLaHu_c1 const m;
 };
 
 class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c {
@@ -5992,7 +5992,7 @@ public:
 
 class daAlinkHIO_damHorse_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damHorse_c1 const m;
+    static daAlinkHIO_damHorse_c1 const m;
 };
 
 class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c {
@@ -6027,7 +6027,7 @@ public:
 
 class daAlinkHIO_damFall_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damFall_c1 const m;
+    static daAlinkHIO_damFall_c1 const m;
 };
 
 class daAlinkHIO_damFall_c : public daAlinkHIO_data_c {
@@ -6057,7 +6057,7 @@ public:
 
 class daAlinkHIO_damCaught_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damCaught_c1 const m;
+    static daAlinkHIO_damCaught_c1 const m;
 };
 
 class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c {
@@ -6093,7 +6093,7 @@ public:
 
 class daAlinkHIO_damSwim_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damSwim_c1 const m;
+    static daAlinkHIO_damSwim_c1 const m;
 };
 
 class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c {
@@ -6140,7 +6140,7 @@ public:
 
 class daAlinkHIO_damage_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_damage_c1 const m;
+    static daAlinkHIO_damage_c1 const m;
     static daAlinkHIO_damNormal_c0 const mDamNormal;
     static daAlinkHIO_damLarge_c0 const mDamLarge;
     static daAlinkHIO_damHuge_c0 const mDamHuge;
@@ -6192,7 +6192,7 @@ public:
 
 class daAlinkHIO_horse_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_horse_c1 const m;
+    static daAlinkHIO_horse_c1 const m;
 };
 
 class daAlinkHIO_horse_c : public daAlinkHIO_data_c {
@@ -6231,7 +6231,7 @@ public:
 
 class daAlinkHIO_canoe_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_canoe_c1 const m;
+    static daAlinkHIO_canoe_c1 const m;
 };
 
 class daAlinkHIO_canoe_c : public daAlinkHIO_data_c {
@@ -6276,7 +6276,7 @@ public:
 
 class daAlinkHIO_bow_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_bow_c1 const m;
+    static daAlinkHIO_bow_c1 const m;
 };
 
 class daAlinkHIO_bow_c : public daAlinkHIO_data_c {
@@ -6312,7 +6312,7 @@ public:
 
 class daAlinkHIO_boom_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_boom_c1 const m;
+    static daAlinkHIO_boom_c1 const m;
 };
 
 class daAlinkHIO_boom_c : public daAlinkHIO_data_c {
@@ -6356,7 +6356,7 @@ public:
 
 class daAlinkHIO_bomb_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_bomb_c1 const m;
+    static daAlinkHIO_bomb_c1 const m;
 };
 
 class daAlinkHIO_bomb_c : public daAlinkHIO_data_c {
@@ -6391,7 +6391,7 @@ public:
 
 class daAlinkHIO_huLight_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_huLight_c1 const m;
+    static daAlinkHIO_huLight_c1 const m;
 };
 
 class daAlinkHIO_wlLight_c1 {
@@ -6410,7 +6410,7 @@ public:
 
 class daAlinkHIO_wlLight_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlLight_c1 const m;
+    static daAlinkHIO_wlLight_c1 const m;
 };
 
 class daAlinkHIO_zwLight_c1 {  // may be wrong
@@ -6429,7 +6429,7 @@ public:
 
 class daAlinkHIO_zwLight_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_zwLight_c1 const m;
+    static daAlinkHIO_zwLight_c1 const m;
 };
 
 class daAlinkHIO_light_c : public daAlinkHIO_data_c {
@@ -6465,7 +6465,7 @@ public:
 
 class daAlinkHIO_kandelaar_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_kandelaar_c1 const m;
+    static daAlinkHIO_kandelaar_c1 const m;
 };
 
 class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c {
@@ -6504,7 +6504,7 @@ public:
 
 class daAlinkHIO_magneBoots_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_magneBoots_c1 const m;
+    static daAlinkHIO_magneBoots_c1 const m;
 };
 
 class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c {
@@ -6530,7 +6530,7 @@ public:
 
 class daAlinkHIO_fmChain_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_fmChain_c1 const m;
+    static daAlinkHIO_fmChain_c1 const m;
 };
 
 class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c {
@@ -6570,7 +6570,7 @@ public:
 
 class daAlinkHIO_hookshot_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_hookshot_c1 const m;
+    static daAlinkHIO_hookshot_c1 const m;
 };
 
 class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c {
@@ -6608,7 +6608,7 @@ public:
 
 class daAlinkHIO_spinner_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_spinner_c1 const m;
+    static daAlinkHIO_spinner_c1 const m;
 };
 
 class daAlinkHIO_spinner_c : public daAlinkHIO_data_c {
@@ -6664,7 +6664,7 @@ public:
 
 class daAlinkHIO_ironBall_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_ironBall_c1 const m;
+    static daAlinkHIO_ironBall_c1 const m;
 };
 
 class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c {
@@ -6694,7 +6694,7 @@ public:
 
 class daAlinkHIO_copyRod_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_copyRod_c1 const m;
+    static daAlinkHIO_copyRod_c1 const m;
 };
 
 class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c {
@@ -6722,7 +6722,7 @@ public:
 
 class daAlinkHIO_pickUp_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_pickUp_c1 const m;
+    static daAlinkHIO_pickUp_c1 const m;
 };
 
 class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c {
@@ -6769,7 +6769,7 @@ public:
 
 class daAlinkHIO_board_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_board_c1 const m;
+    static daAlinkHIO_board_c1 const m;
 };
 
 class daAlinkHIO_board_c : public daAlinkHIO_data_c {
@@ -6802,7 +6802,7 @@ public:
 
 class daAlinkHIO_bottle_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_bottle_c1 const m;
+    static daAlinkHIO_bottle_c1 const m;
 };
 
 class daAlinkHIO_bottle_c : public daAlinkHIO_data_c {
@@ -6850,7 +6850,7 @@ public:
     static daAlinkHIO_ironBall_c0 const mIronBall;
     static daAlinkHIO_copyRod_c0 const mCopyRod;
     static daAlinkHIO_zwLight_c0 const mZoraArmorPL;
-    static DUSK_GAME_DATA daAlinkHIO_item_c1 const m;
+    static daAlinkHIO_item_c1 const m;
 };
 
 class daAlinkHIO_item_c : public daAlinkHIO_data_c {
@@ -6909,7 +6909,7 @@ public:
 
 class daAlinkHIO_ladder_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_ladder_c1 const m;
+    static daAlinkHIO_ladder_c1 const m;
 };
 
 class daAlinkHIO_ladder_c : public daAlinkHIO_data_c {
@@ -6949,7 +6949,7 @@ public:
 
 class daAlinkHIO_roofHang_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_roofHang_c1 const m;
+    static daAlinkHIO_roofHang_c1 const m;
 };
 
 class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c {
@@ -6987,7 +6987,7 @@ public:
 
 class daAlinkHIO_grab_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_grab_c1 const m;
+    static daAlinkHIO_grab_c1 const m;
 };
 
 class daAlinkHIO_grab_c : public daAlinkHIO_data_c {
@@ -7062,7 +7062,7 @@ public:
 
 class daAlinkHIO_swim_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_swim_c1 const m;
+    static daAlinkHIO_swim_c1 const m;
 };
 
 class daAlinkHIO_swim_c : public daAlinkHIO_data_c {
@@ -7138,7 +7138,7 @@ public:
 
 class daAlinkHIO_wlMove_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlMove_c1 const m;
+    static daAlinkHIO_wlMove_c1 const m;
 };
 
 class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c {
@@ -7181,7 +7181,7 @@ public:
 
 class daAlinkHIO_wlMoveNoP_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlMoveNoP_c1 const m;
+    static daAlinkHIO_wlMoveNoP_c1 const m;
 };
 
 class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c {
@@ -7220,7 +7220,7 @@ public:
 
 class daAlinkHIO_wlAtnMove_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtnMove_c1 const m;
+    static daAlinkHIO_wlAtnMove_c1 const m;
 };
 
 class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c {
@@ -7252,7 +7252,7 @@ public:
 
 class daAlinkHIO_wlHowl_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlHowl_c1 const m;
+    static daAlinkHIO_wlHowl_c1 const m;
 };
 
 class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c {
@@ -7286,7 +7286,7 @@ public:
 
 class daAlinkHIO_wlSideStep_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlSideStep_c1 const m;
+    static daAlinkHIO_wlSideStep_c1 const m;
 };
 
 class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c {
@@ -7316,7 +7316,7 @@ public:
 
 class daAlinkHIO_wlBackJump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlBackJump_c1 const m;
+    static daAlinkHIO_wlBackJump_c1 const m;
 };
 
 class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c {
@@ -7361,7 +7361,7 @@ public:
 
 class daAlinkHIO_wlAutoJump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAutoJump_c1 const m;
+    static daAlinkHIO_wlAutoJump_c1 const m;
 };
 
 class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c {
@@ -7390,7 +7390,7 @@ public:
 
 class daAlinkHIO_wlPush_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlPush_c1 const m;
+    static daAlinkHIO_wlPush_c1 const m;
 };
 
 class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c {
@@ -7426,7 +7426,7 @@ public:
 
 class daAlinkHIO_wlLie_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlLie_c1 const m;
+    static daAlinkHIO_wlLie_c1 const m;
 };
 
 class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c {
@@ -7465,7 +7465,7 @@ public:
 
 class daAlinkHIO_wlWallHang_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlWallHang_c1 const m;
+    static daAlinkHIO_wlWallHang_c1 const m;
 };
 
 class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c {
@@ -7497,7 +7497,7 @@ public:
 
 class daAlinkHIO_wlDamNormal_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlDamNormal_c1 const m;
+    static daAlinkHIO_wlDamNormal_c1 const m;
 };
 
 class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c {
@@ -7532,12 +7532,12 @@ public:
 
 class daAlinkHIO_wlDamLarge_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlDamLaHu_c1 const m;
+    static daAlinkHIO_wlDamLaHu_c1 const m;
 };
 
 class daAlinkHIO_wlDamHuge_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlDamLaHu_c1 const m;
+    static daAlinkHIO_wlDamLaHu_c1 const m;
 };
 
 class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c {
@@ -7566,7 +7566,7 @@ public:
 
 class daAlinkHIO_wlDamCaught_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlDamCaught_c1 const m;
+    static daAlinkHIO_wlDamCaught_c1 const m;
 };
 
 class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c {
@@ -7599,7 +7599,7 @@ public:
 
 class daAlinkHIO_wlDamFall_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlDamFall_c1 const m;
+    static daAlinkHIO_wlDamFall_c1 const m;
 };
 
 class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c {
@@ -7626,7 +7626,7 @@ public:
 
 class daAlinkHIO_wlDamage_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlDamage_c1 const m;
+    static daAlinkHIO_wlDamage_c1 const m;
     static daAlinkHIO_wlDamNormal_c0 const mNormal;
     static daAlinkHIO_wlDamLarge_c0 const mLarge;
     static daAlinkHIO_wlDamHuge_c0 const mHuge;
@@ -7676,7 +7676,7 @@ public:
 
 class daAlinkHIO_wlSlide_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlSlide_c1 const m;
+    static daAlinkHIO_wlSlide_c1 const m;
 };
 
 class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c {
@@ -7711,7 +7711,7 @@ public:
 
 class daAlinkHIO_wlRope_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlRope_c1 const m;
+    static daAlinkHIO_wlRope_c1 const m;
 };
 
 class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c {
@@ -7747,17 +7747,17 @@ public:
 
 class daAlinkHIO_wlAtWaTl_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
+    static daAlinkHIO_wlAtWait_c1 const m;
 };
 
 class daAlinkHIO_wlAtWaSc_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
+    static daAlinkHIO_wlAtWait_c1 const m;
 };
 
 class daAlinkHIO_wlAtWaLr_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtWait_c1 const m;
+    static daAlinkHIO_wlAtWait_c1 const m;
 };
 
 class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c {
@@ -7784,7 +7784,7 @@ public:
 
 class daAlinkHIO_wlAtRoll_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtRoll_c1 const m;
+    static daAlinkHIO_wlAtRoll_c1 const m;
 };
 
 class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c {
@@ -7819,7 +7819,7 @@ public:
 
 class daAlinkHIO_wlAtNjump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtNjump_c1 const m;
+    static daAlinkHIO_wlAtNjump_c1 const m;
 };
 
 class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c {
@@ -7860,7 +7860,7 @@ public:
 
 class daAlinkHIO_wlAtCjump_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtCjump_c1 const m;
+    static daAlinkHIO_wlAtCjump_c1 const m;
 };
 
 class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c {
@@ -7888,7 +7888,7 @@ public:
 
 class daAlinkHIO_wlAtLand_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtLand_c1 const m;
+    static daAlinkHIO_wlAtLand_c1 const m;
 };
 
 class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c {
@@ -7924,7 +7924,7 @@ public:
 
 class daAlinkHIO_wlAtDown_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtDown_c1 const m;
+    static daAlinkHIO_wlAtDown_c1 const m;
 };
 
 class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c {
@@ -7961,7 +7961,7 @@ public:
 
 class daAlinkHIO_wlAtLock_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtLock_c1 const m;
+    static daAlinkHIO_wlAtLock_c1 const m;
 };
 
 class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c {
@@ -8001,7 +8001,7 @@ public:
 
 class daAlinkHIO_wlAtBite_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlAtBite_c1 const m;
+    static daAlinkHIO_wlAtBite_c1 const m;
 };
 
 class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c {
@@ -8046,7 +8046,7 @@ public:
     static  daAlinkHIO_wlAtDown_c0 const mWlAtDown;
     static  daAlinkHIO_wlAtLock_c0 const mWlAtLock;
     static  daAlinkHIO_wlAtBite_c0 const mWlAtBite;
-    static DUSK_GAME_DATA  daAlinkHIO_wlAttack_c1 const m;
+    static  daAlinkHIO_wlAttack_c1 const m;
 };
 
 class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c {
@@ -8093,7 +8093,7 @@ public:
 
 class daAlinkHIO_wlPoint_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlPoint_c1 const m;
+    static daAlinkHIO_wlPoint_c1 const m;
 };
 
 class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c {
@@ -8129,7 +8129,7 @@ public:
 
 class daAlinkHIO_wlChain_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlChain_c1 const m;
+    static daAlinkHIO_wlChain_c1 const m;
 };
 
 class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c {
@@ -8186,7 +8186,7 @@ public:
 
 class daAlinkHIO_wlSwim_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlSwim_c1 const m;
+    static daAlinkHIO_wlSwim_c1 const m;
 };
 
 class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c {
@@ -8215,7 +8215,7 @@ public:
 
 class daAlinkHIO_wlGrab_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlGrab_c1 const m;
+    static daAlinkHIO_wlGrab_c1 const m;
 };
 
 class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c {
@@ -8245,7 +8245,7 @@ public:
 
 class daAlinkHIO_wlBall_c0 {
 public:
-    static DUSK_GAME_DATA daAlinkHIO_wlBall_c1 const m;
+    static daAlinkHIO_wlBall_c1 const m;
 };
 
 class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c {
@@ -8300,7 +8300,7 @@ public:
     static daAlinkHIO_wlSwim_c0 const mWlSwim;
     static daAlinkHIO_wlGrab_c0 const mWlGrab;
     static daAlinkHIO_wlBall_c0 const mWlBall;
-    static DUSK_GAME_DATA daAlinkHIO_wolf_c1 const m;
+    static daAlinkHIO_wolf_c1 const m;
 };
 
 class daAlinkHIO_wolf_c : public daAlinkHIO_data_c {

include/d/actor/d_a_arrow.h

@@ -161,7 +161,7 @@ private:
     /* 0xA10 */ dPa_hermiteEcallBack_c field_0xa10;
     /* 0xA28 */ int (daArrow_c::*mProcFunc)();
 
-    static DUSK_GAME_DATA s16 m_count;
+    static s16 m_count;
 };
 
 STATIC_ASSERT(sizeof(daArrow_c) == 0xA34);

include/d/actor/d_a_balloon_2D.h

@@ -67,7 +67,7 @@ public:
     void hide() { mIsVisible = 0; }
     u8 isVisible() { return mIsVisible; }
 
-    static DUSK_GAME_DATA daBalloon2D_c* myclass;
+    static daBalloon2D_c* myclass;
 
     struct ScoreCount {
         cXyz field_0x0;

include/d/actor/d_a_bg_obj.h

@@ -89,10 +89,10 @@ public:
 
     void setAction(u8 i_action) { mAction = i_action; }
 
-    static DUSK_GAME_DATA createHeapFunc mCreateHeapFunc[];
-    static DUSK_GAME_DATA createInitFunc mCreateInitFunc[];
-    static DUSK_GAME_DATA executeFunc mExecuteFunc[];
-    static DUSK_GAME_DATA tgSetFunc mTgSetFunc[];
+    static createHeapFunc mCreateHeapFunc[];
+    static createInitFunc mCreateInitFunc[];
+    static executeFunc mExecuteFunc[];
+    static tgSetFunc mTgSetFunc[];
 
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ J3DModel* field_0x5a8[2][2];

include/d/actor/d_a_boomerang.h

@@ -190,12 +190,12 @@ STATIC_ASSERT(sizeof(daBoomerang_c) == 0xDE4);
 
 class daBoomerang_HIO_c0 {
 public:
-    static DUSK_GAME_DATA u16 const m_lockWaitTime;
-    static DUSK_GAME_DATA f32 const m_minCircleR;
-    static DUSK_GAME_DATA f32 const m_middleCircleR;
-    static DUSK_GAME_DATA f32 const m_maxCircleR;
-    static DUSK_GAME_DATA f32 const m_scale;
-    static DUSK_GAME_DATA f32 const m_lockWindScale;
+    static u16 const m_lockWaitTime;
+    static f32 const m_minCircleR;
+    static f32 const m_middleCircleR;
+    static f32 const m_maxCircleR;
+    static f32 const m_scale;
+    static f32 const m_lockWindScale;
 };
 
 #endif /* D_A_BOOMERANG_H */

include/d/actor/d_a_bullet.h

@@ -18,7 +18,7 @@ class daBullet_Param_c {
 public:
     virtual ~daBullet_Param_c() {}
 
-    static DUSK_GAME_DATA daBullet_HIOParam const m;
+    static daBullet_HIOParam const m;
 };
 
 #if DEBUG
@@ -80,8 +80,8 @@ public:
     int wait(void*);
     int move(void*);
 
-    static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo;
-    static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
+    static dCcD_SrcGObjInf const mCcDObjInfo;
+    static dCcD_SrcSph mCcDSph;
 };
 
 STATIC_ASSERT(sizeof(daBullet_c) == 0x95c);

include/d/actor/d_a_coach_fire.h

@@ -33,7 +33,7 @@ public:
 
     const CoachFireAttr& attr() { return M_attr; }
 
-    static DUSK_GAME_DATA CoachFireAttr const M_attr;
+    static CoachFireAttr const M_attr;
 
     inline ~daCoachFire_c();
 

include/d/actor/d_a_cstaF.h

@@ -38,7 +38,7 @@ public:
     struct BckTbl {
         u16 idx[4];
     };
-    static DUSK_GAME_DATA const BckTbl m_bckIdxTable[];
+    static const BckTbl m_bckIdxTable[];
 
 private:
     /* 0x5A0 */ const char* m_arcName;

include/d/actor/d_a_cstatue.h

@@ -99,7 +99,7 @@ public:
         mWarpMode = daCstatueWarpMode_Active;
     }
 
-    static DUSK_GAME_DATA u16 const m_bckIdxTable[daCstatueType_N][7];
+    static u16 const m_bckIdxTable[daCstatueType_N][7];
 
 private:
     /* 0x568 */ const char* mResName;

include/d/actor/d_a_dshutter.h

@@ -65,15 +65,15 @@ public:
     f32 getCloseBoundSpeed() { return CLOSE_BOUND_SPEED; }
     f32 getCloseBoundRatio() { return CLOSE_BOUND_RATIO; }
 
-    static DUSK_GAME_DATA f32 const OPEN_SIZE;
-    static DUSK_GAME_DATA f32 const OPEN_ACCEL;
-    static DUSK_GAME_DATA f32 const OPEN_SPEED;
-    static DUSK_GAME_DATA f32 const OPEN_BOUND_SPEED;
-    static DUSK_GAME_DATA f32 const OPEN_BOUND_RATIO;
-    static DUSK_GAME_DATA f32 const CLOSE_ACCEL;
-    static DUSK_GAME_DATA f32 const CLOSE_SPEED;
-    static DUSK_GAME_DATA f32 const CLOSE_BOUND_SPEED;
-    static DUSK_GAME_DATA f32 const CLOSE_BOUND_RATIO;
+    static f32 const OPEN_SIZE;
+    static f32 const OPEN_ACCEL;
+    static f32 const OPEN_SPEED;
+    static f32 const OPEN_BOUND_SPEED;
+    static f32 const OPEN_BOUND_RATIO;
+    static f32 const CLOSE_ACCEL;
+    static f32 const CLOSE_SPEED;
+    static f32 const CLOSE_BOUND_SPEED;
+    static f32 const CLOSE_BOUND_RATIO;
 
     /* 0x5A0 */ dComIfG_resLoader_c mResLoader;
     /* 0x5B0 */ J3DModel* mpModel;

include/d/actor/d_a_e_dt.h

@@ -175,14 +175,14 @@ private:
 STATIC_ASSERT(sizeof(daE_DT_c) == 0x1174);
 
 struct E_DT_n {
-    static DUSK_GAME_DATA f32 eDt_ShakeFrame[10];
-    static DUSK_GAME_DATA f32 eDt_ShakeFrameDemo[10];
-    static DUSK_GAME_DATA dCcD_SrcSph cc_dt_body_src;
-    static DUSK_GAME_DATA dCcD_SrcSph cc_dt_tongue_src;
-    static DUSK_GAME_DATA int mDt_OtamaNum;
-    static DUSK_GAME_DATA int mDt_OtamaNo[20];
-    static DUSK_GAME_DATA int m_fall_no;
-    static DUSK_GAME_DATA cXyz m_tongue_pos;
+    static f32 eDt_ShakeFrame[10];
+    static f32 eDt_ShakeFrameDemo[10];
+    static dCcD_SrcSph cc_dt_body_src;
+    static dCcD_SrcSph cc_dt_tongue_src;
+    static int mDt_OtamaNum;
+    static int mDt_OtamaNo[20];
+    static int m_fall_no;
+    static cXyz m_tongue_pos;
 };
 
 

include/d/actor/d_a_e_ge.h

@@ -101,7 +101,7 @@ private:
     /* 0xB9E */ u8 field_0xb9e;
     /* 0xB9F */ u8 mHIOInit;
 
-    static DUSK_GAME_DATA actionFunc l_actionmenu[9];
+    static actionFunc l_actionmenu[9];
 };
 
 STATIC_ASSERT(sizeof(daE_GE_c) == 0xBA0);

include/d/actor/d_a_e_oc.h

@@ -159,14 +159,14 @@ private:
 STATIC_ASSERT(sizeof(daE_OC_c) == 0xe88);
 
 struct E_OC_n {
-    static DUSK_GAME_DATA f32 const oc_attackb_trans[10];
-    static DUSK_GAME_DATA f32 const oc_attackc_trans[10];
-    static DUSK_GAME_DATA dCcD_SrcSph cc_sph_src;
-    static DUSK_GAME_DATA dCcD_SrcSph at_sph_src;
-    static DUSK_GAME_DATA daE_OC_c* m_battle_oc;
-    static DUSK_GAME_DATA daE_OC_c* m_damage_oc;
-    static DUSK_GAME_DATA daE_OC_c* m_death_oc;
-    static DUSK_GAME_DATA daE_OC_c* m_talk_oc;
+    static f32 const oc_attackb_trans[10];
+    static f32 const oc_attackc_trans[10];
+    static dCcD_SrcSph cc_sph_src;
+    static dCcD_SrcSph at_sph_src;
+    static daE_OC_c* m_battle_oc;
+    static daE_OC_c* m_damage_oc;
+    static daE_OC_c* m_death_oc;
+    static daE_OC_c* m_talk_oc;
 };
 
 #endif /* D_A_E_OC_H */

include/d/actor/d_a_e_ym.h

@@ -215,7 +215,7 @@ private:
 STATIC_ASSERT(sizeof(daE_YM_c) == 0xAF8);
 
 struct E_YM_n {
-    static DUSK_GAME_DATA dCcD_SrcSph cc_sph_src;
+    static dCcD_SrcSph cc_sph_src;
 };
 
 

include/d/actor/d_a_formation_mng.h

@@ -311,10 +311,10 @@ struct daFmtMng_c : public fopAc_ac_c {
     }
 
     static FmtMngAttributes const& attr() { return M_attr; }
-    static DUSK_GAME_DATA FmtMngAttributes const M_attr;
+    static FmtMngAttributes const M_attr;
 
     typedef void (daFmtMng_c::*ActionFunc)();
-    static DUSK_GAME_DATA daFmtMng_c::ActionFunc ActionTable[10];
+    static daFmtMng_c::ActionFunc ActionTable[10];
 
     /* 0x568 */ FmtPos_c* mPos;
     /* 0x56C */ FmtMember_c* mMember;

include/d/actor/d_a_grass.h

@@ -41,9 +41,9 @@ public:
     static void deleteRoomGrass(int);
     static void deleteRoomFlower(int);
 
-    static DUSK_GAME_DATA daGrass_c* m_myObj;
-    static DUSK_GAME_DATA dGrass_packet_c* m_grass;
-    static DUSK_GAME_DATA dFlower_packet_c* m_flower;
+    static daGrass_c* m_myObj;
+    static dGrass_packet_c* m_grass;
+    static dFlower_packet_c* m_flower;
 
     /* 0x568 */ u8 unk_0x568[0x570 - 0x568];
 };

include/d/actor/d_a_horse.h

@@ -351,8 +351,8 @@ public:
         m_modelData->getMaterialNodePointer(5)->getShape()->hide();
     }
 
-    static DUSK_GAME_DATA u16 const m_footJointTable[];
-    static DUSK_GAME_DATA f32 const m_callLimitDistance2;
+    static u16 const m_footJointTable[];
+    static f32 const m_callLimitDistance2;
 
     /* 0x0568 */ request_of_phase_process_class m_phase;
     /* 0x0570 */ J3DModel* m_model;
@@ -567,7 +567,7 @@ public:
 
 class daHorse_hio_c0 {
 public:
-    static DUSK_GAME_DATA const daHorse_hio_c1 m;
+    static const daHorse_hio_c1 m;
 };
 
 class daHorse_hio_c : public JORReflexible {

include/d/actor/d_a_hozelda.h

@@ -29,8 +29,8 @@ public:
     static void setMorfFrame(u8 i_frame) { mMorfFrame = i_frame; }
     static void decMorfFrame() { cLib_calcTimer<u8>(&mMorfFrame); }
 
-    static DUSK_GAME_DATA u8 mEyeMoveFlg;
-    static DUSK_GAME_DATA u8 mMorfFrame;
+    static u8 mEyeMoveFlg;
+    static u8 mMorfFrame;
 
     /* 0x0F4 */ f32 field_0xf4;
     /* 0x0F8 */ f32 field_0xf8;
@@ -50,7 +50,7 @@ struct daHoZelda_hio_c1 {
 struct daHoZelda_hio_c0 {
     daHoZelda_hio_c0() {}
 
-    static DUSK_GAME_DATA daHoZelda_hio_c1 const m;
+    static daHoZelda_hio_c1 const m;
 };
 
 class daHoZelda_hio_c : public JORReflexible {

include/d/actor/d_a_itembase.h

@@ -60,7 +60,7 @@ public:
     virtual u8 getCollisionH();
     virtual u8 getCollisionR();
 
-    static DUSK_GAME_DATA daItemBase_data const m_data;
+    static daItemBase_data const m_data;
 
     /* 0x56C */ request_of_phase_process_class mPhase;
     /* 0x574 */ J3DModel* mpModel;

include/d/actor/d_a_mant.h

@@ -88,14 +88,9 @@ public:
     /* 0x396A */ u8 field_0x396A[0x399E - 0x396A];
     /* 0x399E */ s16 field_0x399e;
     /* 0x39A0 */ u8 field_0x39A0[0x39A4 - 0x39A0];
-#if TARGET_PC
-    /* 0x39A4 */ cM_rnd_c mMantRng;
-#endif
+    
 };
-#if TARGET_PC
-STATIC_ASSERT(sizeof(mant_class) == 0x39ac);
-#else
+
 STATIC_ASSERT(sizeof(mant_class) == 0x39a4);
-#endif
 
 #endif /* D_A_MANT_H */

include/d/actor/d_a_midna.h

@@ -32,7 +32,7 @@ public:
 
 class daMidna_hio_c0 {
 public:
-    static DUSK_GAME_DATA daMidna_hio_c1 const m;
+    static daMidna_hio_c1 const m;
 };
 
 STATIC_ASSERT(sizeof(daMidna_hio_c0::m) == 0x20);
@@ -87,8 +87,8 @@ public:
     /* 0x0FC */ f32 mNowOffsetX;
     /* 0x100 */ f32 mNowOffsetY;
 
-    static DUSK_GAME_DATA bool sEyeMoveFlg;
-    static DUSK_GAME_DATA u8 sMorfFrame;
+    static bool sEyeMoveFlg;
+    static u8 sMorfFrame;
 };
 
 STATIC_ASSERT(sizeof(daMidna_matAnm_c) == 0x104);
@@ -420,8 +420,8 @@ public:
 
     static u32 getOtherHeapSize() { return 0x1D0; }
 
-    static DUSK_GAME_DATA daMidna_texData_s const m_texDataTable[21];
-    static DUSK_GAME_DATA daMidna_anmData_s const m_anmDataTable[53];
+    static daMidna_texData_s const m_texDataTable[21];
+    static daMidna_anmData_s const m_anmDataTable[53];
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhase;

include/d/actor/d_a_mirror.h

@@ -58,8 +58,8 @@ public:
     static u32 getMirrorRoomPrm() { return 0xFF03; }
 
     typedef int (daMirror_c::*entryModelFunc)(J3DModel*);
-    static DUSK_GAME_DATA entryModelFunc m_entryModel;
-    static DUSK_GAME_DATA daMirror_c* m_myObj;
+    static entryModelFunc m_entryModel;
+    static daMirror_c* m_myObj;
 
     /* 0x570 */ dMirror_packet_c mPacket;
     /* 0x6f8 */ J3DModel* mpModel;

include/d/actor/d_a_movie_player.h

@@ -95,6 +95,12 @@ static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
 #define THP_TEXTURE_SET_COUNT  3
 #endif
 
+#if TARGET_PC
+namespace dusk {
+    void MoviePlayerShutdown();
+}
+#endif
+
 struct daMP_THPPlayer {
     /* 0x000 */ DVDFileInfo fileInfo;
 	/* 0x03C */ THPHeader header;
@@ -164,7 +170,7 @@ public:
     static int daMP_c_Callback_Main(daMP_c*);
     static int daMP_c_Callback_Draw(daMP_c*);
 
-    static DUSK_GAME_DATA daMP_c* m_myObj;
+    static daMP_c* m_myObj;
 
 private:
     /* 0x568 */ u32 (*mpGetMovieRestFrame)(void);

include/d/actor/d_a_myna.h

@@ -131,8 +131,8 @@ public:
     typedef void (daMyna_c::*ProcFunc)();
     typedef int (daMyna_c::*BaseMotionFunc)(int);
 
-    static DUSK_GAME_DATA dCcD_SrcSph const mCcDSph;
-    static DUSK_GAME_DATA daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
+    static dCcD_SrcSph const mCcDSph;
+    static daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
 
     /* 0x56C */ request_of_phase_process_class mPhase;
     /* 0x574 */ mDoExt_McaMorfSO* mpMorf;

include/d/actor/d_a_nbomb.h

@@ -91,7 +91,7 @@ public:
 
     s16 getExTime() { return mExTime; }
 
-    static DUSK_GAME_DATA const char* m_arcNameList[6];
+    static const char* m_arcNameList[6];
 
     /* 0x56C */ request_of_phase_process_class mPhase;
     /* 0x574 */ J3DModel* mpModel;

include/d/actor/d_a_npc.h

@@ -776,12 +776,12 @@ public:
         return chkFindActor(daPy_getPlayerActorClass(), param_0, param_1);
     }
 
-    static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjData;
-    static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
-    static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
-    static DUSK_GAME_DATA fopAc_ac_c* mFindActorPtrs[50];
-    static DUSK_GAME_DATA s16 mSrchName;
-    static DUSK_GAME_DATA int mFindCount;
+    static dCcD_SrcGObjInf const mCcDObjData;
+    static dCcD_SrcCyl mCcDCyl;
+    static dCcD_SrcSph mCcDSph;
+    static fopAc_ac_c* mFindActorPtrs[50];
+    static s16 mSrchName;
+    static int mFindCount;
 
     enum Mode {
         /*  0 */ MODE_ENTER,

include/d/actor/d_a_npc2.h

@@ -113,9 +113,9 @@ public:
     virtual void drawOtherMdls();
     virtual bool dbgDraw();
 
-    static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObj;
-    static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
-    static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
+    static dCcD_SrcGObjInf const mCcDObj;
+    static dCcD_SrcCyl mCcDCyl;
+    static dCcD_SrcSph mCcDSph;
 
 public:
     /* 0x56C */ dBgS_ObjAcch mAcch;
@@ -173,9 +173,9 @@ public:
     virtual int ToFore() { return 1; }
     virtual int ToBack() { return 1; }
 
-    static DUSK_GAME_DATA const char* m_name;
-    static DUSK_GAME_DATA int m_dzb_id;
-    static DUSK_GAME_DATA MoveBGActor_SetFunc m_set_func;
+    static const char* m_name;
+    static int m_dzb_id;
+    static MoveBGActor_SetFunc m_set_func;
 
 public:
     /* 0xA14 */ dBgW* mpBgw;

include/d/actor/d_a_npc4.h

@@ -394,13 +394,13 @@ public:
     void onHide() { mHide = true; }
     void offHide() { mHide = false; }
 
-    static DUSK_GAME_DATA dCcD_SrcGObjInf const mCcDObjInfo;
-    static DUSK_GAME_DATA dCcD_SrcCyl mCcDCyl;
-    static DUSK_GAME_DATA dCcD_SrcSph mCcDSph;
-    static DUSK_GAME_DATA fopAc_ac_c* mFindActorPList[100];
-    static DUSK_GAME_DATA s32 mFindCount;
-    static DUSK_GAME_DATA s16 mSrchActorName;
-    static DUSK_GAME_DATA char mFileNameBuf[0x15];
+    static dCcD_SrcGObjInf const mCcDObjInfo;
+    static dCcD_SrcCyl mCcDCyl;
+    static dCcD_SrcSph mCcDSph;
+    static fopAc_ac_c* mFindActorPList[100];
+    static s32 mFindCount;
+    static s16 mSrchActorName;
+    static char mFileNameBuf[0x15];
 };
 
 STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48);

include/d/actor/d_a_npc_aru.h

@@ -17,7 +17,7 @@ class daNpc_Aru_Param_c {
 public:
     virtual ~daNpc_Aru_Param_c() {}
 
-    static DUSK_GAME_DATA daNpc_Aru_HIOParam const m;
+    static daNpc_Aru_HIOParam const m;
 };
 
 #if DEBUG
@@ -171,8 +171,8 @@ public:
     u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
     void setLastIn() { mLastGoatIn = true; }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[7];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[7];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[7];
+    static cutFunc DUSK_CONST mCutList[7];
 
 private:
     /* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_ash.h

@@ -12,7 +12,7 @@ public:
     daNpcAsh_Param_c() {}
     virtual ~daNpcAsh_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpcAsh_HIOParam m;
+    static const daNpcAsh_HIOParam m;
 };
 
 #if DEBUG
@@ -143,7 +143,7 @@ public:
     inline bool step(s16, bool);
     inline void playExpression();
 
-    static DUSK_GAME_DATA EventFn mEvtSeqList[6];
+    static EventFn mEvtSeqList[6];
 
 private:
     /* 0xB48 */ Z2Creature mCreatureSound;

include/d/actor/d_a_npc_ashB.h

@@ -12,7 +12,7 @@ class daNpcAshB_Param_c {
 public:
     virtual ~daNpcAshB_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpcAshB_HIOParam m;
+    static const daNpcAshB_HIOParam m;
 };
 
 #if DEBUG
@@ -135,7 +135,7 @@ public:
     inline bool step(s16, int, f32);
     inline void playExpression();
 
-    static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[2];
+    static EventFn DUSK_CONST mEvtSeqList[2];
 
 private:
     /* 0xB48 */ Z2Creature mCreatureSound;

include/d/actor/d_a_npc_bans.h

@@ -22,7 +22,7 @@ class daNpc_Bans_Param_c {
 public:
     virtual ~daNpc_Bans_Param_c() {}
 
-    static DUSK_GAME_DATA daNpc_Bans_HIOParam const m;
+    static daNpc_Bans_HIOParam const m;
 };
 
 #if DEBUG
@@ -117,8 +117,8 @@ public:
         return rv;
     }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[4];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[4];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[4];
+    static cutFunc DUSK_CONST mCutList[4];
 
     /* 0x0F7C */ mDoExt_McaMorfSO* mpScoopMorf;
     /* 0x0F80 */ NPC_BANS_HIO_CLASS* mHIO;

include/d/actor/d_a_npc_besu.h

@@ -15,7 +15,7 @@ class daNpc_Besu_Param_c {
 public:
     virtual ~daNpc_Besu_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpc_Besu_HIOParam m;
+    static const daNpc_Besu_HIOParam m;
 };
 
 #if DEBUG
@@ -140,8 +140,8 @@ public:
     u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
     u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[15];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[15];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[15];
+    static cutFunc DUSK_CONST mCutList[15];
 
 private:
     /* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf;

include/d/actor/d_a_npc_blue_ns.h

@@ -14,7 +14,7 @@ class daNpcBlueNS_Param_c {
 public:
     virtual ~daNpcBlueNS_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpcBlueNS_HIOParam m;
+    static const daNpcBlueNS_HIOParam m;
 };
 
 #if DEBUG
@@ -124,7 +124,7 @@ public:
         return var_r30;
     }
 
-    static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[];
+    static EventFn DUSK_CONST mEvtSeqList[];
 
     /* 0xB48 */ Z2Creature mSound;
     /* 0xBD8 */ u8 field_0xBD8[0xBDC - 0xBD8];

include/d/actor/d_a_npc_bou.h

@@ -16,7 +16,7 @@ struct daNpc_Bou_HIOParam {
 public:
     virtual ~daNpc_Bou_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpc_Bou_HIOParam m;
+    static const daNpc_Bou_HIOParam m;
  };
 
 #if DEBUG
@@ -114,8 +114,8 @@ public:
     virtual int drawDbgInfo();
     virtual void changeAnm(int*, int*);
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[9];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[9];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[9];
+    static cutFunc DUSK_CONST mCutList[9];
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;

include/d/actor/d_a_npc_bouS.h

@@ -29,7 +29,7 @@ class daNpcBouS_Param_c {
 public:
     virtual ~daNpcBouS_Param_c() {}
 
-    static DUSK_GAME_DATA daNpcBouS_HIOParam const m;
+    static daNpcBouS_HIOParam const m;
 };
 
 #if DEBUG
@@ -128,7 +128,7 @@ public:
         mForcibleTalk = 1;
     }
 
-    static DUSK_GAME_DATA eventFunc mEvtSeqList[4];
+    static eventFunc mEvtSeqList[4];
 
 private:
     /* 0xB48 */ Z2Creature mSound;

include/d/actor/d_a_npc_cd.h

@@ -25,7 +25,7 @@ public:
     J3DModelData* getObjMdlDataP(int);
     virtual ~daNpcCd_c() {}
 
-    static DUSK_GAME_DATA dCcD_SrcCyl const m_cylDat;
+    static dCcD_SrcCyl const m_cylDat;
 
     /* 0x56C */ request_of_phase_process_class mPhase1;
     /* 0x574 */ request_of_phase_process_class mPhase2;
@@ -101,7 +101,7 @@ public:
 
 STATIC_ASSERT(sizeof(daNpcCd_HIO_c) == 0x29BC);
 
-DUSK_GAME_EXTERN daNpcCd_HIO_c l_Cd_HIO;
+extern daNpcCd_HIO_c l_Cd_HIO;
 inline f32 HIO_atnOfs(int param_1) {
     s16 rv;
     if (param_1 < 16) {

include/d/actor/d_a_npc_cd2.h

@@ -87,7 +87,7 @@ struct daNpcCd2_HIO_c : public fOpAcm_HIO_entry_c {
     /* 0x20C4 */ daNpcCd2_HIO_WChild_c field_0x20c4[14];
 };
 
-DUSK_GAME_EXTERN daNpcCd2_HIO_c l_Cd2_HIO;
+extern daNpcCd2_HIO_c l_Cd2_HIO;
 
 inline s16 Cd2_HIO_atnOfs(int param_1) {
     s16 rv;
@@ -269,7 +269,7 @@ public:
     J3DAnmTexPattern* getTexAnmP(int);
     virtual ~daNpcCd2_c() {}
 
-    static DUSK_GAME_DATA dCcD_SrcCyl const m_cylDat;
+    static dCcD_SrcCyl const m_cylDat;
 
     /* 0x56C */ request_of_phase_process_class mPhase1;
     /* 0x574 */ request_of_phase_process_class mPhase2;

include/d/actor/d_a_npc_cdn3.h

@@ -334,52 +334,52 @@ public:
         actionFunc mExecFn;
     };
 
-    static DUSK_GAME_DATA const ActionPair ActionTable[8];
-    static DUSK_GAME_DATA seqFunc* m_funcTbl[44];
-    static DUSK_GAME_DATA seqFunc m_seq00_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq01_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq02_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq03_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq04_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq05_funcTbl[4];
-    static DUSK_GAME_DATA seqFunc m_seq06_funcTbl[4];
-    static DUSK_GAME_DATA seqFunc m_seq07_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq08_funcTbl[7];
-    static DUSK_GAME_DATA seqFunc m_seq09_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq10_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq11_funcTbl[6];
-    static DUSK_GAME_DATA seqFunc m_seq12_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq13_funcTbl[6];
-    static DUSK_GAME_DATA seqFunc m_seq14_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq15_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq16_funcTbl[7];
-    static DUSK_GAME_DATA seqFunc m_seq17_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq18_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq19_funcTbl[7];
-    static DUSK_GAME_DATA seqFunc m_seq20_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq21_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq22_funcTbl[4];
-    static DUSK_GAME_DATA seqFunc m_seq23_funcTbl[7];
-    static DUSK_GAME_DATA seqFunc m_seq24_funcTbl[5];
-    static DUSK_GAME_DATA seqFunc m_seq25_funcTbl[7];
-    static DUSK_GAME_DATA seqFunc m_seq26_funcTbl[3];
-    static DUSK_GAME_DATA seqFunc m_seq27_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq28_funcTbl[3];
-    static DUSK_GAME_DATA seqFunc m_seq29_funcTbl[3];
-    static DUSK_GAME_DATA seqFunc m_seq30_funcTbl[6];
-    static DUSK_GAME_DATA seqFunc m_seq31_funcTbl[6];
-    static DUSK_GAME_DATA seqFunc m_seq32_funcTbl[7];
-    static DUSK_GAME_DATA seqFunc m_seq33_funcTbl[7];
-    static DUSK_GAME_DATA seqFunc m_seq34_funcTbl[9];
-    static DUSK_GAME_DATA seqFunc m_seq35_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq36_funcTbl[4];
-    static DUSK_GAME_DATA seqFunc m_seq37_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq38_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq39_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq40_funcTbl[3];
-    static DUSK_GAME_DATA seqFunc m_seq41_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq42_funcTbl[2];
-    static DUSK_GAME_DATA seqFunc m_seq43_funcTbl[3];
+    static const ActionPair ActionTable[8];
+    static seqFunc* m_funcTbl[44];
+    static seqFunc m_seq00_funcTbl[2];
+    static seqFunc m_seq01_funcTbl[2];
+    static seqFunc m_seq02_funcTbl[2];
+    static seqFunc m_seq03_funcTbl[2];
+    static seqFunc m_seq04_funcTbl[2];
+    static seqFunc m_seq05_funcTbl[4];
+    static seqFunc m_seq06_funcTbl[4];
+    static seqFunc m_seq07_funcTbl[2];
+    static seqFunc m_seq08_funcTbl[7];
+    static seqFunc m_seq09_funcTbl[2];
+    static seqFunc m_seq10_funcTbl[2];
+    static seqFunc m_seq11_funcTbl[6];
+    static seqFunc m_seq12_funcTbl[2];
+    static seqFunc m_seq13_funcTbl[6];
+    static seqFunc m_seq14_funcTbl[2];
+    static seqFunc m_seq15_funcTbl[2];
+    static seqFunc m_seq16_funcTbl[7];
+    static seqFunc m_seq17_funcTbl[2];
+    static seqFunc m_seq18_funcTbl[2];
+    static seqFunc m_seq19_funcTbl[7];
+    static seqFunc m_seq20_funcTbl[2];
+    static seqFunc m_seq21_funcTbl[2];
+    static seqFunc m_seq22_funcTbl[4];
+    static seqFunc m_seq23_funcTbl[7];
+    static seqFunc m_seq24_funcTbl[5];
+    static seqFunc m_seq25_funcTbl[7];
+    static seqFunc m_seq26_funcTbl[3];
+    static seqFunc m_seq27_funcTbl[2];
+    static seqFunc m_seq28_funcTbl[3];
+    static seqFunc m_seq29_funcTbl[3];
+    static seqFunc m_seq30_funcTbl[6];
+    static seqFunc m_seq31_funcTbl[6];
+    static seqFunc m_seq32_funcTbl[7];
+    static seqFunc m_seq33_funcTbl[7];
+    static seqFunc m_seq34_funcTbl[9];
+    static seqFunc m_seq35_funcTbl[2];
+    static seqFunc m_seq36_funcTbl[4];
+    static seqFunc m_seq37_funcTbl[2];
+    static seqFunc m_seq38_funcTbl[2];
+    static seqFunc m_seq39_funcTbl[2];
+    static seqFunc m_seq40_funcTbl[3];
+    static seqFunc m_seq41_funcTbl[2];
+    static seqFunc m_seq42_funcTbl[2];
+    static seqFunc m_seq43_funcTbl[3];
 
     /* 0xAC8 */ J3DModel* field_0xac8;
     /* 0xACC */ J3DModel* field_0xacc;

include/d/actor/d_a_npc_chat.h

@@ -11,7 +11,7 @@ class daNpcChat_Param_c {
 public:
     virtual ~daNpcChat_Param_c() {}
 
-    static DUSK_GAME_DATA daNpcChat_HIOParam const m;
+    static daNpcChat_HIOParam const m;
 };
 
 #if DEBUG
@@ -102,7 +102,7 @@ public:
     void setFear() { mFear = true; }
     void setTalkFlag() { mTalkFlag = true; }
 
-    static DUSK_GAME_DATA eventFunc DUSK_CONST mEvtSeqList[1];
+    static eventFunc DUSK_CONST mEvtSeqList[1];
 
 private:
     /* 0xB48 */ Z2CreatureCitizen mSound;

include/d/actor/d_a_npc_chin.h

@@ -12,7 +12,7 @@ class daNpcChin_Param_c {
 public:
     virtual ~daNpcChin_Param_c() {}
 
-    static DUSK_GAME_DATA daNpcChin_HIOParam const m;
+    static daNpcChin_HIOParam const m;
 };
 
 #if DEBUG
@@ -183,7 +183,7 @@ public:
     inline void ForcibleTalk_Off() { field_0xe06 = 0; }
     inline u8 getForcibleTalk2() { return field_0xe06; }
 
-    static DUSK_GAME_DATA eventFunc mEvtSeqList[8];
+    static eventFunc mEvtSeqList[8];
 
     /* 0xB48 */ Z2Creature mSound;
     /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;

include/d/actor/d_a_npc_clerka.h

@@ -14,7 +14,7 @@ class daNpc_clerkA_Param_c {
 public:
     virtual ~daNpc_clerkA_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpc_clerkA_HIOParam m;
+    static const daNpc_clerkA_HIOParam m;
 };
 
 #if DEBUG
@@ -124,8 +124,8 @@ public:
 
     u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static cutFunc DUSK_CONST mCutList[1];
 
 private:
     /* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_clerkb.h

@@ -15,7 +15,7 @@ class daNpc_clerkB_Param_c {
 public:
     virtual ~daNpc_clerkB_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpc_clerkB_HIOParam m;
+    static const daNpc_clerkB_HIOParam m;
 };
 
 #if DEBUG
@@ -137,8 +137,8 @@ public:
 
     u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static cutFunc DUSK_CONST mCutList[1];
 
 private:
     /* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2;

include/d/actor/d_a_npc_clerkt.h

@@ -12,7 +12,7 @@ class daNpcClerkt_Param_c {
 public:
     virtual ~daNpcClerkt_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpcClerkt_HIOParam m;
+    static const daNpcClerkt_HIOParam m;
 };
 
 #if DEBUG
@@ -125,8 +125,8 @@ public:
         }
     }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static cutFunc DUSK_CONST mCutList[1];
 
 private:
     /* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_coach.h

@@ -295,7 +295,7 @@ public:
 
     const daNpcCoach_Attr_c& attr() const { return M_attr; }
 
-    static DUSK_GAME_DATA daNpcCoach_Attr_c const M_attr;
+    static daNpcCoach_Attr_c const M_attr;
     static u16 const ParticleName[10];
 private:
     /* 0x0568 */ daNpcChHorse_c mChHorse;

include/d/actor/d_a_npc_doc.h

@@ -12,7 +12,7 @@ class daNpc_Doc_Param_c {
 public:
     virtual ~daNpc_Doc_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpc_Doc_HIOParam m;
+    static const daNpc_Doc_HIOParam m;
 };
 
 #if DEBUG
@@ -133,8 +133,8 @@ public:
         return (fopAcM_GetParam(this) & 0xFF00) >> 8;
     }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static cutFunc DUSK_CONST mCutList[1];
 
 private:
     /* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_doorboy.h

@@ -12,7 +12,7 @@ class daNpcDoorBoy_Param_c {
 public:
     virtual ~daNpcDoorBoy_Param_c() {}
 
-    static DUSK_GAME_DATA daNpcDoorBoy_HIOParam const m;
+    static daNpcDoorBoy_HIOParam const m;
 };
 
 #if DEBUG
@@ -78,7 +78,7 @@ public:
     inline int getTimeHour();
     inline bool isDummyTalk();
 
-    static DUSK_GAME_DATA EventFn DUSK_CONST mEvtSeqList[1];
+    static EventFn DUSK_CONST mEvtSeqList[1];
 
 private:
     /* 0xB48 */ Z2CreatureCitizen mSound;

include/d/actor/d_a_npc_drainSol.h

@@ -11,7 +11,7 @@ class daNpcDrSol_Param_c {
 public:
     virtual ~daNpcDrSol_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpcDrSol_HIOParam m;
+    static const daNpcDrSol_HIOParam m;
 };
 
 #if DEBUG

include/d/actor/d_a_npc_fairy.h

@@ -94,7 +94,7 @@ class daNpc_Fairy_Param_c {
 public:
     virtual ~daNpc_Fairy_Param_c() {}
 
-    static DUSK_GAME_DATA daNpc_Fairy_HIOParam const m;
+    static daNpc_Fairy_HIOParam const m;
 };
 
 #if DEBUG
@@ -294,8 +294,8 @@ public:
     u8 getSceneNo1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
     u8 getSceneNo2() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[18];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[18];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[18];
+    static cutFunc DUSK_CONST mCutList[18];
 private:
     /* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO;
     /* 0x0E44 */ dCcD_Cyl mCyl;

include/d/actor/d_a_npc_fairy_seirei.h

@@ -13,7 +13,7 @@ class daNpc_FairySeirei_Param_c {
 public:
     virtual ~daNpc_FairySeirei_Param_c() {}
 
-    static DUSK_GAME_DATA daNpc_FairySeirei_HIOParam const m;
+    static daNpc_FairySeirei_HIOParam const m;
 };
 
 #if DEBUG
@@ -90,8 +90,8 @@ public:
 
     int getSeneNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
 
-    static DUSK_GAME_DATA DUSK_CONST char* mCutNameList[1];
-    static DUSK_GAME_DATA DUSK_CONST cutFunc mCutList[1];
+    static DUSK_CONST char* mCutNameList[1];
+    static DUSK_CONST cutFunc mCutList[1];
 
 private:
     /* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO;

include/d/actor/d_a_npc_gnd.h

@@ -11,7 +11,7 @@ class daNpc_Gnd_Param_c {
 public:
     virtual ~daNpc_Gnd_Param_c() {}
 
-    static DUSK_GAME_DATA const daNpc_Gnd_HIOParam m;
+    static const daNpc_Gnd_HIOParam m;
 };
 
 #if DEBUG
@@ -96,8 +96,8 @@ public:
     s32 getNeckJointNo() { return 3; }
     s32 getBackboneJointNo() { return 1; }
 
-    static DUSK_GAME_DATA char DUSK_CONST* DUSK_CONST mCutNameList[1];
-    static DUSK_GAME_DATA cutFunc DUSK_CONST mCutList[1];
+    static char DUSK_CONST* DUSK_CONST mCutNameList[1];
+    static cutFunc DUSK_CONST mCutList[1];
 
 private:
     /* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO;