Crash Reporting Option Portability

- Makes the crash reporting preference get saved with the other config files

.github/workflows/build.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get -y install ninja-build clang lld mold openssl libcurl4-openssl-dev \
+          sudo apt-get -y install ninja-build clang lld openssl libcurl4-openssl-dev \
             zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
             libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev libfreetype-dev \
             libxinerama-dev libxcursor-dev python3-markupsafe libgtk-3-dev libssl-dev \

CMakeLists.txt

@@ -126,33 +126,6 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "_cmake")
 
-option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
-if (ENABLE_ASAN)
-    if (CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC" AND
-            CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/fsanitize=address>)
-        add_link_options(/fsanitize=address /INCREMENTAL:NO)
-        set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "ProgramDatabase")
-        foreach (_lang C CXX)
-            foreach (_rtc_flag /RTC1 /RTCc /RTCs /RTCu)
-                string(REPLACE "${_rtc_flag}" "" CMAKE_${_lang}_FLAGS_DEBUG "${CMAKE_${_lang}_FLAGS_DEBUG}")
-            endforeach ()
-        endforeach ()
-    elseif (CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU" AND
-            CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
-        add_compile_options(
-                $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-fsanitize=address>
-                $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-fno-omit-frame-pointer>
-        )
-        add_link_options(-fsanitize=address)
-    else ()
-        message(FATAL_ERROR "ENABLE_ASAN requires GNU-like or MSVC-like C/C++ compiler frontends")
-    endif ()
-
-    add_compile_definitions(NDEBUG_SANITIZER) # Avoids absl issue with SwissTable debug code
-    message(STATUS "dusklight: Enabled AddressSanitizer")
-endif ()
-
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
   set(DAWN_USE_WAYLAND ON CACHE BOOL "Enable support for Wayland surface" FORCE)
 endif ()
@@ -164,19 +137,11 @@ target_compile_definitions(aurora_mtx PRIVATE MTX_USE_PS=1)
 
 add_subdirectory(libs/freeverb)
 
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(DUSK_GFX_DEBUG_GROUPS_DEFAULT ON)
-else ()
-    set(DUSK_GFX_DEBUG_GROUPS_DEFAULT OFF)
-endif ()
-
 option(DUSK_BUILD_WARNINGS "Enable compiler warnings (off by default)")
 option(DUSK_SELECTED_OPT "If on, selected parts of the project will be compiled with optimizations on Debug, intending to make the game run at 30 FPS. Note for MSVC: you will need to remove '/RTC1' from your debug flags in CMake.")
 option(DUSK_MOVIE_SUPPORT "If on, compile against libjpeg-turbo to enable THP file decoding" ON)
 option(DUSK_ENABLE_UPDATE_CHECKER "Enable update checking support" ON)
 option(DUSK_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})
 set(DUSK_SENTRY_DSN "" CACHE STRING "Sentry DSN")
 set(DUSK_SENTRY_ENVIRONMENT "development" CACHE STRING "Sentry environment")
 
@@ -224,8 +189,6 @@ if (DUSK_MOVIE_SUPPORT)
             CMAKE_MSVC_RUNTIME_LIBRARY
             CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
             CMAKE_OSX_ARCHITECTURES
-            CMAKE_OSX_DEPLOYMENT_TARGET
-            CMAKE_OSX_SYSROOT
             DEPLOYMENT_TARGET
             ENABLE_ARC
             ENABLE_BITCODE
@@ -284,6 +247,7 @@ elseif (MSVC)
     add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>)
 endif ()
 
+
 include(FetchContent)
 
 # Declare all dependencies first so CMake can download them in parallel
@@ -291,13 +255,13 @@ message(STATUS "dusklight: Fetching cxxopts")
 FetchContent_Declare(cxxopts
     URL https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.3.1.tar.gz
     URL_HASH SHA256=3bfc70542c521d4b55a46429d808178916a579b28d048bd8c727ee76c39e2072
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
 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
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
 FetchContent_MakeAvailable(cxxopts json)
 
@@ -378,7 +342,9 @@ set(GAME_INCLUDE_DIRS
 find_package(Threads REQUIRED)
 set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::pad aurora::mtx aurora::os aurora::dvd
     aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt
-    Threads::Threads zstd::libzstd)
+    Threads::Threads)
+
+list(APPEND GAME_LIBS libzstd_static)
 
 if (DUSK_ENABLE_SENTRY_NATIVE)
     list(APPEND GAME_LIBS sentry)
@@ -450,16 +416,6 @@ if(ANDROID)
     list(APPEND GAME_COMPILE_DEFS TARGET_ANDROID=1)
 endif ()
 
-if (DUSK_PACKAGE_INSTALL)
-    include(GNUInstallDirs)
-    list(APPEND GAME_COMPILE_DEFS DUSK_ASSET_DIR="${CMAKE_INSTALL_FULL_DATADIR}/dusklight/")
-endif ()
-
-if (DUSK_GFX_DEBUG_GROUPS)
-    list(APPEND GAME_COMPILE_DEFS DUSK_GFX_DEBUG_GROUPS=1)
-    target_compile_definitions(aurora_gx PRIVATE AURORA_GFX_DEBUG_GROUPS)
-endif ()
-
 # game_debug is for game code files that we know work when compiled with DEBUG=1
 # Of course, if building a release build, this distinction is irrelevant
 set(GAME_DEBUG_FILES
@@ -516,9 +472,6 @@ if(ANDROID)
 else ()
     add_executable(dusklight ${DUSK_FILES})
 endif ()
-if (ENABLE_ASAN)
-    target_sources(dusklight PRIVATE src/dusk/asan_options.c)
-endif ()
 
 target_compile_definitions(dusklight PRIVATE ${GAME_COMPILE_DEFS})
 target_include_directories(dusklight PRIVATE ${GAME_INCLUDE_DIRS})
@@ -681,20 +634,12 @@ set(EXTRA_TARGETS "")
 if (TARGET crashpad_handler)
     list(APPEND EXTRA_TARGETS crashpad_handler)
 endif ()
-if (DUSK_PACKAGE_INSTALL)
-    install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_BINDIR})
-else()
-    install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif()
+install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_PREFIX})
 aurora_install_runtime_dlls(dusklight ${CMAKE_INSTALL_PREFIX})
 if (NOT APPLE)
-    if (DUSK_PACKAGE_INSTALL)
-        install(DIRECTORY ${CMAKE_SOURCE_DIR}/res DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dusklight)
-    else()
-        install(DIRECTORY ${CMAKE_SOURCE_DIR}/res DESTINATION ${CMAKE_INSTALL_PREFIX})
-    endif()
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/res DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif ()
-if (CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo AND NOT DUSK_PACKAGE_INSTALL)
+if (CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
     set(DEBUG_FILES_LIST "")
     foreach (target IN LISTS BINARY_TARGETS EXTRA_TARGETS)
         get_target_output_name(${target} output_name)

CMakePresets.json

@@ -19,19 +19,7 @@
       "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "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
-        }
+        "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded"
       }
     },
     {
@@ -52,26 +40,12 @@
         }
       }
     },
-    {
-      "name": "asan",
-      "hidden": true,
-      "cacheVariables": {
-        "ENABLE_ASAN": {
-          "type": "BOOL",
-          "value": true
-        }
-      }
-    },
     {
       "name": "linux-default",
       "displayName": "Linux (default)",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
-        "BUILD_SHARED_LIBS": {
-          "type": "BOOL",
-          "value": false
-        },
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
       },
       "vendor": {
@@ -93,15 +67,6 @@
         "linux-default"
       ]
     },
-    {
-      "name": "linux-default-debug-asan",
-      "displayName": "Linux (default) Debug ASan",
-      "inherits": [
-        "debug",
-        "linux-default",
-        "asan"
-      ]
-    },
     {
       "name": "linux-default-relwithdebinfo",
       "displayName": "Linux (default) RelWithDebInfo",
@@ -129,15 +94,6 @@
         "linux-clang"
       ]
     },
-    {
-      "name": "linux-clang-debug-asan",
-      "displayName": "Linux (Clang) Debug ASan",
-      "inherits": [
-        "debug",
-        "linux-clang",
-        "asan"
-      ]
-    },
     {
       "name": "linux-clang-relwithdebinfo",
       "displayName": "Linux (Clang) RelWithDebInfo",
@@ -158,11 +114,7 @@
       "cacheVariables": {
         "CMAKE_C_COMPILER": "cl",
         "CMAKE_CXX_COMPILER": "cl",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
-        "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
-          "type": "BOOL",
-          "value": true
-        }
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -180,15 +132,6 @@
         "windows-msvc"
       ]
     },
-    {
-      "name": "windows-msvc-debug-asan",
-      "displayName": "Windows (MSVC) Debug ASan",
-      "inherits": [
-        "debug",
-        "windows-msvc",
-        "asan"
-      ]
-    },
     {
       "name": "windows-msvc-relwithdebinfo",
       "displayName": "Windows (MSVC) RelWithDebInfo",
@@ -258,10 +201,6 @@
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
-        "BUILD_SHARED_LIBS": {
-          "type": "BOOL",
-          "value": false
-        },
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
       },
       "vendor": {
@@ -280,15 +219,6 @@
         "macos-default"
       ]
     },
-    {
-      "name": "macos-default-debug-asan",
-      "displayName": "macOS (default) Debug ASan",
-      "inherits": [
-        "debug",
-        "macos-default",
-        "asan"
-      ]
-    },
     {
       "name": "macos-default-relwithdebinfo",
       "displayName": "macOS (default) RelWithDebInfo",
@@ -354,21 +284,24 @@
           "type": "BOOL",
           "value": false
         },
-        "ENABLE_ARC": {
-          "type": "BOOL",
-          "value": false
-        },
         "Rust_CARGO_TARGET": "aarch64-apple-tvos",
         "Rust_TOOLCHAIN": "nightly",
         "BUILD_SHARED_LIBS": {
           "type": "BOOL",
           "value": false
         },
-        "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
+        "CMAKE_DISABLE_FIND_PACKAGE_BZip2": {
           "type": "BOOL",
           "value": true
         },
-        "CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew"
+        "CMAKE_DISABLE_FIND_PACKAGE_LibLZMA": {
+          "type": "BOOL",
+          "value": true
+        },
+        "CMAKE_DISABLE_FIND_PACKAGE_zstd": {
+          "type": "BOOL",
+          "value": true
+        }
       },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -394,14 +327,8 @@
           "type": "BOOL",
           "value": false
         },
-        "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
-          "type": "BOOL",
-          "value": true
-        },
-        "CMAKE_DISABLE_FIND_PACKAGE_zstd": {
-          "type": "BOOL",
-          "value": true
-        }
+        "AURORA_SDL3_VERSION": "3.4.8",
+        "AURORA_SDL3_REF": "refs/tags/release-3.4.8"
       }
     },
     {
@@ -429,8 +356,7 @@
       "hidden": true,
       "inherits": [
         "android-base",
-        "ci",
-        "release"
+        "ci"
       ],
       "cacheVariables": {
         "DUSK_ENABLE_SENTRY_NATIVE": {
@@ -458,8 +384,7 @@
         "ci"
       ],
       "cacheVariables": {
-        "AURORA_SDL3_PROVIDER": "vendor",
-        "CMAKE_LINKER_TYPE": "MOLD"
+        "AURORA_SDL3_PROVIDER": "vendor"
       }
     },
     {
@@ -488,8 +413,12 @@
           "type": "BOOL",
           "value": true
         },
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "12.0",
-        "CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew"
+        "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
+        "CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew",
+        "BUILD_SHARED_LIBS": {
+          "type": "BOOL",
+          "value": false
+        }
       }
     },
     {
@@ -579,12 +508,6 @@
       "description": "Linux (default) debug build",
       "displayName": "Linux (default) Debug"
     },
-    {
-      "name": "linux-default-debug-asan",
-      "configurePreset": "linux-default-debug-asan",
-      "description": "Linux (default) debug build with AddressSanitizer",
-      "displayName": "Linux (default) Debug ASan"
-    },
     {
       "name": "linux-default-relwithdebinfo",
       "configurePreset": "linux-default-relwithdebinfo",
@@ -597,12 +520,6 @@
       "description": "Linux (Clang) debug build",
       "displayName": "Linux (Clang) Debug"
     },
-    {
-      "name": "linux-clang-debug-asan",
-      "configurePreset": "linux-clang-debug-asan",
-      "description": "Linux (Clang) debug build with AddressSanitizer",
-      "displayName": "Linux (Clang) Debug ASan"
-    },
     {
       "name": "linux-clang-relwithdebinfo",
       "configurePreset": "linux-clang-relwithdebinfo",
@@ -615,12 +532,6 @@
       "description": "macOS debug build",
       "displayName": "macOS Debug"
     },
-    {
-      "name": "macos-default-debug-asan",
-      "configurePreset": "macos-default-debug-asan",
-      "description": "macOS debug build with AddressSanitizer",
-      "displayName": "macOS Debug ASan"
-    },
     {
       "name": "macos-default-relwithdebinfo",
       "configurePreset": "macos-default-relwithdebinfo",
@@ -678,12 +589,6 @@
       "description": "Windows (MSVC) debug build",
       "displayName": "Windows (MSVC) Debug"
     },
-    {
-      "name": "windows-msvc-debug-asan",
-      "configurePreset": "windows-msvc-debug-asan",
-      "description": "Windows (MSVC) debug build with AddressSanitizer",
-      "displayName": "Windows (MSVC) Debug ASan"
-    },
     {
       "name": "windows-msvc-relwithdebinfo",
       "configurePreset": "windows-msvc-relwithdebinfo",

docs/building.md

@@ -180,7 +180,6 @@ cmake --build --preset macos-default-relwithdebinfo
 Alternate presets available:
 
 * `macos-default-debug`: Clang, Debug
-* `macos-default-debug-asan`: Clang, Debug, AddressSanitizer
 
 **ninja (Linux)**
 
@@ -192,10 +191,8 @@ cmake --build --preset linux-default-relwithdebinfo
 Alternate presets available:
 
 * `linux-default-debug`: GCC, Debug
-* `linux-default-debug-asan`: GCC, Debug, AddressSanitizer
 * `linux-clang-relwithdebinfo`: Clang, RelWithDebInfo
 * `linux-clang-debug`: Clang, Debug
-* `linux-clang-debug-asan`: Clang, Debug, AddressSanitizer
 
 **ninja (Windows)**
 
@@ -207,7 +204,6 @@ cmake --build --preset windows-msvc-relwithdebinfo
 Alternate presets available:
 
 * `windows-msvc-debug`: MSVC, Debug
-* `windows-msvc-debug-asan`: MSVC, Debug, AddressSanitizer
 * `windows-clang-relwithdebinfo`: Clang-cl, RelWithDebInfo
 * `windows-clang-debug`: Clang-cl, Debug
 

files.cmake

@@ -1418,11 +1418,7 @@ set(DUSK_FILES
         include/dusk/scope_guard.hpp
         src/dusk/dvd_asset.cpp
         src/d/actor/d_a_alink_dusk.cpp
-        src/dusk/android_frame_rate.hpp
-        src/dusk/android_frame_rate.cpp
         src/dusk/asserts.cpp
-        src/dusk/batch.cpp
-        src/dusk/batch.hpp
         src/dusk/config.cpp
         src/dusk/crash_handler.cpp
         src/dusk/crash_reporting.cpp
@@ -1436,9 +1432,6 @@ set(DUSK_FILES
         src/dusk/game_clock.cpp
         src/dusk/globals.cpp
         src/dusk/gyro.cpp
-        include/dusk/menu_pointer.h
-        src/dusk/menu_pointer.cpp
-        src/dusk/mouse.cpp
 		src/dusk/gamepad_color.cpp
 		src/dusk/autosave.cpp
         src/dusk/http/http.hpp
@@ -1451,7 +1444,6 @@ set(DUSK_FILES
         src/dusk/stubs.cpp
         include/dusk/texture_replacements.hpp
         src/dusk/texture_replacements.cpp
-        src/dusk/touch_camera.cpp
         src/dusk/update_check.cpp
         src/dusk/update_check.hpp
         #src/dusk/m_Do_ext_dusk.cpp
@@ -1481,7 +1473,6 @@ 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/document.cpp
@@ -1494,8 +1485,6 @@ set(DUSK_FILES
         src/dusk/ui/graphics_tuner.hpp
         src/dusk/ui/input.cpp
         src/dusk/ui/input.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/nav_types.hpp
@@ -1521,12 +1510,6 @@ 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_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
         src/dusk/ui/ui.hpp
         src/dusk/ui/warp.cpp

fix-cmake-paths.patch

@@ -1,32 +0,0 @@
-From f69d29614644f9963f5cb3f828b58575d60a1c5a Mon Sep 17 00:00:00 2001
-From: Joshua Trees <gh@jtrees.io>
-Date: Thu, 4 Jun 2026 01:04:04 +0100
-Subject: [PATCH] fix cmake paths
-
----
- cmake/nodConfig.cmake.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/nodConfig.cmake.in b/cmake/nodConfig.cmake.in
-index 0969382..2a24a88 100644
---- a/cmake/nodConfig.cmake.in
-+++ b/cmake/nodConfig.cmake.in
-@@ -1,12 +1,12 @@
- @PACKAGE_INIT@
- 
--set(_nod_libdir "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_LIBDIR@")
--set(_nod_incdir "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
-+set(_nod_libdir "@CMAKE_INSTALL_FULL_LIBDIR@")
-+set(_nod_incdir "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
- 
- if (NOT TARGET nod::nod_shared AND NOT TARGET nod::nod_static)
-     # Shared library
-     if (WIN32)
--        set(_nod_dll "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_BINDIR@/${CMAKE_SHARED_LIBRARY_PREFIX}nod${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+        set(_nod_dll "@CMAKE_INSTALL_FULL_BINDIR@/${CMAKE_SHARED_LIBRARY_PREFIX}nod${CMAKE_SHARED_LIBRARY_SUFFIX}")
-         set(_nod_implib "${_nod_libdir}/${CMAKE_IMPORT_LIBRARY_PREFIX}nod${CMAKE_IMPORT_LIBRARY_SUFFIX}")
-         if (EXISTS "${_nod_dll}")
-             add_library(nod::nod_shared SHARED IMPORTED)
--- 
-2.53.0
-

flake.nix

@@ -57,22 +57,12 @@
           inherit (pkgs.stdenv.hostPlatform) isDarwin;
           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'
-          '';
+          aurora = pkgs.fetchFromGitHub {
+            owner = "encounter";
+            repo = "aurora";
+            rev = "10006618ee493f248b8597e4dfa1d2871d76a1d9";
+            hash = "sha256-lY2xuVyB7aPJ9+2wwLRB3F5U/BuPSxdSpegdG+qNd9o=";
+          };
 
           dawn = pkgs.fetchzip {
             url = "https://github.com/encounter/dawn-build/releases/download/${dawnVersion}/dawn-${dawnInfo.${system}.triple}.tar.gz";
@@ -96,7 +86,6 @@
               rev = nodVersion;
               hash = "sha256-+zrtVzjo0+X/6uMcNUn1+FaSR+jOhrcQSDNBFjw0NDs=";
             };
-            patches = [ ./fix-cmake-paths.patch ];
             cargoDeps = pkgs.rustPlatform.importCargoLock {
               lockFile = "${finalAttrs.src}/Cargo.lock";
             };
@@ -138,7 +127,7 @@
             NOD_PREBUILT = nod;
             CXXOPTS = pkgs.cxxopts.src;
             JSON = pkgs.nlohmann_json.src;
-            XXHASH = pkgs.xxhash.src;
+            XXHASH = pkgs.xxHash.src;
             ZSTD = pkgs.zstd.src;
             FMT = pkgs.fetchzip {
               url = "https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.tar.gz";
@@ -164,120 +153,119 @@
             };
           };
 
-          dusklight =
-            if !aurora then
-              throw needSubmodules
-            else
-              pkgs.stdenv.mkDerivation {
-                pname = "dusklight";
-                version = versionSuffix;
-                src = ./.;
+          dusklight = 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"
+              rm -rf "$sourceRoot/extern/aurora"
+              mkdir -p "$sourceRoot/extern"
+              cp -r ${aurora} "$sourceRoot/extern/aurora"
+              chmod -R u+w "$sourceRoot/extern/aurora"
+              substituteInPlace "$sourceRoot/extern/aurora/CMakeLists.txt" \
+                --replace-warn "add_subdirectory(tests)" ""
+            '';
+
+            nativeBuildInputs = [
+              pkgs.cmake
+              pkgs.ninja
+              pkgs.pkg-config
+              pkgs.python3
+              pkgs.python3Packages.markupsafe
+            ]
+            ++ lib.optionals (!isDarwin) [ pkgs.autoPatchelfHook ];
+
+            buildInputs = [
+              pkgs.sdl3
+              pkgs.freetype
+              pkgs.zstd
+              pkgs.cxxopts
+              pkgs.nlohmann_json
+              pkgs.xxHash
+              pkgs.abseil-cpp
+              pkgs.zlib
+              pkgs.libpng
+              pkgs.libjpeg_turbo
+              pkgs.curl
+              pkgs.openssl
+            ]
+            ++ lib.optionals isDarwin [
+              pkgs.apple-sdk_15
+              pkgs.libiconv
+            ]
+            ++ lib.optionals (!isDarwin) [
+              pkgs.libGL
+              pkgs.libGLU
+              pkgs.libglvnd
+              pkgs.vulkan-loader
+              pkgs.libX11
+              pkgs.libxcb
+              pkgs.libXcursor
+              pkgs.libxi
+              pkgs.libxrandr
+              pkgs.libxscrnsaver
+              pkgs.libxtst
+              pkgs.libxinerama
+              pkgs.libxkbcommon
+              pkgs.wayland
+              pkgs.libdecor
+              pkgs.alsa-lib
+              pkgs.libpulseaudio
+              pkgs.pipewire
+              pkgs.dbus
+              pkgs.udev
+              pkgs.libusb1
+              pkgs.libunwind
+              pkgs.gtk3
+            ];
+
+            cmakeBuildType = "RelWithDebInfo";
+            ninjaFlags = [ "dusklight" ];
+
+            cmakeFlags = [
+              "-DDUSK_VERSION_OVERRIDE=${versionSuffix}"
+              "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
+              "-DAURORA_DAWN_PROVIDER=package"
+              "-DAURORA_DAWN_LINKAGE=static"
+              "-DAURORA_NOD_PROVIDER=package"
+              "-DAURORA_NOD_LINKAGE=static"
+              "-DAURORA_SDL3_PROVIDER=system"
+            ]
+            ++ lib.mapAttrsToList (key: src: "-DFETCHCONTENT_SOURCE_DIR_${key}=${src}") fetchContentDirs;
+
+            installPhase =
+              if isDarwin then
+                ''
+                  runHook preInstall
+                  mkdir -p "$out/Applications"
+                  cp -r Dusklight.app "$out/Applications/Dusklight.app"
+                  runHook postInstall
+                ''
+              else
+                ''
+                  runHook preInstall
+                  install -Dm755 dusklight "$out/bin/dusklight"
+                  cp -r "$src/res" "$out/bin/res"
+                  install -Dm644 "$src/platforms/freedesktop/dev.twilitrealm.dusk.desktop" \
+                    "$out/share/applications/dev.twilitrealm.dusk.desktop"
+                  for size in 16 32 48 64 128 256 512 1024; do
+                    install -Dm644 "$src/platforms/freedesktop/''${size}x''${size}/apps/dev.twilitrealm.dusk.png" \
+                      "$out/share/icons/hicolor/''${size}x''${size}/apps/dev.twilitrealm.dusk.png"
+                  done
+                  runHook postInstall
                 '';
 
-                nativeBuildInputs = [
-                  pkgs.cmake
-                  pkgs.ninja
-                  pkgs.pkg-config
-                  pkgs.python3
-                  pkgs.python3Packages.markupsafe
-                ]
-                ++ lib.optionals (!isDarwin) [ pkgs.autoPatchelfHook ];
+            dontStrip = true;
 
-                buildInputs = [
-                  pkgs.sdl3
-                  pkgs.freetype
-                  pkgs.zstd
-                  pkgs.cxxopts
-                  pkgs.nlohmann_json
-                  pkgs.xxhash
-                  pkgs.abseil-cpp
-                  pkgs.zlib
-                  pkgs.libpng
-                  pkgs.libjpeg_turbo
-                  pkgs.curl
-                  pkgs.openssl
-                ]
-                ++ lib.optionals isDarwin [
-                  pkgs.apple-sdk_15
-                  pkgs.libiconv
-                ]
-                ++ lib.optionals (!isDarwin) [
-                  pkgs.libGL
-                  pkgs.libGLU
-                  pkgs.libglvnd
-                  pkgs.vulkan-loader
-                  pkgs.libX11
-                  pkgs.libxcb
-                  pkgs.libXcursor
-                  pkgs.libxi
-                  pkgs.libxrandr
-                  pkgs.libxscrnsaver
-                  pkgs.libxtst
-                  pkgs.libxinerama
-                  pkgs.libxkbcommon
-                  pkgs.wayland
-                  pkgs.libdecor
-                  pkgs.alsa-lib
-                  pkgs.libpulseaudio
-                  pkgs.pipewire
-                  pkgs.dbus
-                  pkgs.udev
-                  pkgs.libusb1
-                  pkgs.libunwind
-                  pkgs.gtk3
-                  nod
-                ];
-
-                cmakeBuildType = "RelWithDebInfo";
-                ninjaFlags = [ "dusklight" ];
-
-                cmakeFlags = [
-                  "-DDUSK_VERSION_OVERRIDE=${versionSuffix}"
-                  "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
-                  "-DAURORA_DAWN_PROVIDER=package"
-                  "-DAURORA_DAWN_LINKAGE=static"
-                  "-DAURORA_NOD_PROVIDER=system"
-                  "-DAURORA_SDL3_PROVIDER=system"
-                  "-DBUILD_SHARED_LIBS=OFF"
-                ]
-                ++ lib.mapAttrsToList (key: src: "-DFETCHCONTENT_SOURCE_DIR_${key}=${src}") fetchContentDirs;
-
-                installPhase =
-                  if isDarwin then
-                    ''
-                      runHook preInstall
-                      mkdir -p "$out/Applications"
-                      cp -r Dusklight.app "$out/Applications/Dusklight.app"
-                      runHook postInstall
-                    ''
-                  else
-                    ''
-                      runHook preInstall
-                      install -Dm755 dusklight "$out/bin/dusklight"
-                      cp -r "$src/res" "$out/bin/res"
-                      install -Dm644 "$src/platforms/freedesktop/dev.twilitrealm.dusk.desktop" \
-                        "$out/share/applications/dev.twilitrealm.dusk.desktop"
-                      for size in 16 32 48 64 128 256 512 1024; do
-                        install -Dm644 "$src/platforms/freedesktop/''${size}x''${size}/apps/dev.twilitrealm.dusk.png" \
-                          "$out/share/icons/hicolor/''${size}x''${size}/apps/dev.twilitrealm.dusk.png"
-                      done
-                      runHook postInstall
-                    '';
-
-                dontStrip = true;
-
-                meta = {
-                  description = "Dusklight — native PC port of the Twilight Princess decompilation";
-                  homepage = "https://github.com/zeldaret/tp";
-                  platforms = supportedSystems;
-                  mainProgram = "dusklight";
-                };
-              };
+            meta = {
+              description = "Dusklight — native PC port of the Twilight Princess decompilation";
+              homepage = "https://github.com/zeldaret/tp";
+              platforms = supportedSystems;
+              mainProgram = "dusklight";
+            };
+          };
 
           # Tooling common to every supported host (Linux and macOS).
           commonDevTools = [

include/d/actor/d_a_alink.h

@@ -88,10 +88,6 @@ public:
     /* 0x02C */ cXyz field_0x2c;
     /* 0x038 */ cXyz field_0x38[60];
     /* 0x308 */ cXyz field_0x308[60];
-#if TARGET_PC
-    TGXTexObj mBlurTexObj;
-    ResTIMG* mpCachedBlurTex = nullptr;
-#endif
 };  // Size = 0x5D8
 
 class dAlink_bottleWaterPcallBack_c : public JPAParticleCallBack {
@@ -4555,8 +4551,7 @@ public:
 #if TARGET_PC
     void handleWolfHowl();
     void handleQuickTransform();
-    bool checkAimContext();
-    bool checkTouchAimCaptureContext();
+    bool checkGyroAimContext();
 
     void onIronBallChainInterpCallback();
 
@@ -4569,18 +4564,6 @@ public:
     cXyz mIBChainInterpCurrHandRoot;
     bool mIBChainInterpPrevValid;
     bool mIBChainInterpCurrValid;
-
-    cXyz mHsChainInterpPrevTop;
-    cXyz mHsChainInterpCurrTop;
-    cXyz mHsChainInterpPrevRoot;
-    cXyz mHsChainInterpCurrRoot;
-    cXyz mHsChainInterpPrevSubRoot;
-    cXyz mHsChainInterpCurrSubRoot;
-    cXyz mHsChainInterpPrevSubTop;
-    cXyz mHsChainInterpCurrSubTop;
-    bool mHsChainInterpPrevValid;
-    bool mHsChainInterpCurrValid;
-
     bool mIsRollstab = false;
 #endif
 };  // Size: 0x385C

include/d/actor/d_a_mg_rod.h

@@ -299,13 +299,8 @@ public:
     /* 0x168C */ u8 field_0x168c;
     /* 0x168D */ u8 field_0x168d;
     /* 0x168E */ u8 HIOInit;
-
-#if TARGET_PC
-    cXyz mLineInterpPrev[MG_ROD_LURE_LINE_LEN];
-    cXyz mLineInterpCurr[MG_ROD_LURE_LINE_LEN];
-    bool mLineInterpPrevValid;
-    bool mLineInterpCurrValid;
-#endif
 };
 
+STATIC_ASSERT(sizeof(dmg_rod_class) == 0x1690);
+
 #endif /* D_A_MG_ROD_H */

include/d/actor/d_a_obj_keyhole.h

@@ -66,18 +66,9 @@ public:
     /* 0x2CA7 */ s8 hide_lock;
     /* 0x2CA8 */ cXyz field_0x2ca8;
     /* 0x2CB4 */ u8 field_0x2cb4;
-
-#if TARGET_PC
-    Mtx mChainInterpPrev[6][16];
-    Mtx mChainInterpCurr[6][16];
-    bool mChainInterpPrevValid;
-    bool mChainInterpCurrValid;
-#endif
 };
 
-#if !TARGET_PC
 STATIC_ASSERT(sizeof(obj_keyhole_class) == 0x2CB8);
-#endif
 
 class daObj_Keyhole_HIO_c : public JORReflexible {
 public:

include/d/actor/d_a_player.h

@@ -50,10 +50,6 @@ public:
     /* 0x14 */ Mtx mProjMtx;
     /* 0x44 */ ResTIMG* mpImg;
     /* 0x48 */ u8* mpData;
-#if TARGET_PC
-    TGXTexObj mTexObj;
-    ResTIMG* mpCachedImg = nullptr;
-#endif
 };
 
 class daPy_boomerangMove_c {

include/d/actor/d_flower.h

@@ -4,10 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "SSystem/SComponent/c_xyz.h"
 
-#if TARGET_PC
-#include "dusk/batch.hpp"
-#endif
-
 class cCcD_Obj;
 class dCcMassS_HitInf;
 class fopAc_ac_c;
@@ -111,12 +107,6 @@ public:
 #if TARGET_PC
     TGXTexObj mTexObj_l_J_Ohana00_64TEX;
     TGXTexObj mTexObj_l_J_Ohana01_64128_0419TEX;
-
-    dusk::batch::LeafTemplate mTplHana00;       // l_J_hana00DL
-    dusk::batch::LeafTemplate mTplHana00Cut;    // l_J_hana00_cDL
-    dusk::batch::LeafTemplate mTplHana01;       // l_J_hana01DL
-    dusk::batch::LeafTemplate mTplHana01Cut00;  // l_J_hana01_c_00DL
-    dusk::batch::LeafTemplate mTplHana01Cut;    // l_J_hana01_c_01DL
 #endif
 };  // Size: 0x12A54
 

include/d/actor/d_grass.h

@@ -4,10 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "SSystem/SComponent/c_xyz.h"
 
-#if TARGET_PC
-#include "../../../src/dusk/batch.hpp"
-#endif
-
 class cCcD_Obj;
 class csXyz;
 class dCcMassS_HitInf;
@@ -114,10 +110,6 @@ public:
 #if TARGET_PC
     TGXTexObj mTexObj_l_M_Hijiki00TEX;
     TGXTexObj mTexObj_l_M_kusa05_RGBATEX;
-
-    dusk::batch::LeafTemplate mTplKusa9q;     // l_M_Kusa_9qDL
-    dusk::batch::LeafTemplate mTplKusa9qCut;  // l_M_Kusa_9q_cDL
-    dusk::batch::LeafTemplate mTplTengusa;    // l_M_TenGusaDL
 #endif
 };  // Size: 0x1D718
 

include/d/d_camera.h

@@ -1037,7 +1037,6 @@ public:
     bool test1Camera(s32);
     bool test2Camera(s32);
     #if TARGET_PC
-    static bool isAimActive();
     bool freeCamera();
     bool executeDebugFlyCam();
     void deactivateDebugFlyCam();

include/d/d_file_select.h

@@ -287,11 +287,6 @@ public:
         MEMCARDCHECKPROC_ERR_YESNO_CURSOR_MOVE_ANM,
         MEMCARDCHECKPROC_SAVEDATA_CLEAR,
 
-#if TARGET_PC
-        MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE,
-        MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE_ERR_WAIT,
-#endif
-
         #if PLATFORM_WII || PLATFORM_SHIELD
         MEMCARDCHECKPROC_NAND_STAT_CHECK,
         MEMCARDCHECKPROC_GAMEFILE_INIT_SEL,
@@ -416,10 +411,6 @@ public:
     bool yesnoWakuAlpahAnm(u8);
     #if TARGET_PC
     void fileSelectWide();
-    bool pointerDataSelect();
-    bool pointerMenuSelect();
-    bool pointerCopyDataToSelect();
-    bool pointerYesNoSelect(bool errorSelect);
     #endif
     void _draw();
     void errorMoveAnmInitSet(int, int);
@@ -454,10 +445,6 @@ public:
     void MemCardMakeGameFile();
     void MemCardMakeGameFileWait();
     void MemCardMakeGameFileCheck();
-#if TARGET_PC
-    void MemCardAutoMakeGameFile();
-    void MemCardAutoMakeGameFileErrWait();
-#endif
     void MemCardMsgWindowInitOpen();
     void MemCardMsgWindowOpen();
     void MemCardMsgWindowClose();

include/d/d_kankyo_wether.h

@@ -198,7 +198,6 @@ struct HOUSI_EFF {
     /* 0x4C */ u16 field_0x4c;
 };  // Size: 0x50
 
-// Housi is the rising square particles in Twilight
 class dKankyo_housi_Packet : public J3DPacket {
 public:
     virtual void draw();
@@ -209,7 +208,7 @@ public:
     /* 0x0020 */ HOUSI_EFF mHousiEff[300];
     /* 0x5DE0 */ u8 field_0x5de0[8];
     /* 0x5DE8 */ f32 field_0x5de8;
-    /* 0x5DEC */ s16 mHousiCount;
+    /* 0x5DEC */ s16 field_0x5dec;
 };  // Size: 0x5DF0
 
 struct CLOUD_EFF {

include/d/d_map.h

@@ -157,9 +157,6 @@ public:
     int getDispType() const;
     void _move(f32, f32, int, f32);
     void _draw();
-#if TARGET_PC
-    bool refreshTextureSize();
-#endif
 
     virtual ~dMap_c() {
 #if DEBUG

include/d/d_menu_collect.h

@@ -74,8 +74,6 @@ public:
 
     #if TARGET_PC
     void menuCollectWide();
-    bool pointerWait();
-    void pointerActivateCurrent();
     #endif
 
     void _create();

include/d/d_menu_insect.h

@@ -51,10 +51,6 @@ public:
     void setBButtonString(u16);
     void setHIO(bool);
 
-#if TARGET_PC
-    bool pointerWait();
-#endif
-
     virtual void draw() { _draw(); }
     virtual ~dMenu_Insect_c();
 

include/d/d_menu_letter.h

@@ -55,10 +55,6 @@ public:
     u8 getLetterNum();
     void setHIO(bool);
 
-#if TARGET_PC
-    bool pointerWait();
-#endif
-
     virtual void draw() { _draw(); }
     virtual ~dMenu_Letter_c();
 

include/d/d_menu_option.h

@@ -80,9 +80,6 @@ public:
     void setBButtonString(u16);
     bool isRumbleSupported();
     bool dpdMenuMove();
-#if TARGET_PC
-    bool pointerConfirmSelect();
-#endif
     void paneResize(u64);
     void initialize();
     void yesnoMenuMoveAnmInitSet(int, int);

include/d/d_menu_ring.h

@@ -74,9 +74,6 @@ public:
     void clacEllipsePlotAverage(int, f32, f32);
     bool dpdMove();
     u8 openExplain(u8);
-#if TARGET_PC
-    bool pointerMove();
-#endif
 
     virtual void draw() { _draw(); }
     virtual ~dMenu_Ring_c();

include/d/d_menu_save.h

@@ -266,8 +266,6 @@ public:
 
     #if TARGET_PC
     void menuSaveWide();
-    bool pointerSaveSelect();
-    bool pointerYesNoSelect(bool errorSelect, u8 errParam = 0, u8 soundParam = 0);
     #endif
 
     void _draw2();

include/d/d_menu_skill.h

@@ -49,10 +49,6 @@ public:
     u8 getSkillNum();
     void setHIO(bool);
 
-#if TARGET_PC
-    bool pointerWait();
-#endif
-
     virtual void draw() { _draw(); }
     virtual ~dMenu_Skill_c();
 

include/d/d_msg_scrn_3select.h

@@ -49,10 +49,6 @@ public:
     void selectScale();
     void selectTrans();
     void selectAnimeTransform(int);
-#if TARGET_PC
-    bool pointerMove();
-    bool consumePointerClick();
-#endif
 
     void setOffsetX(f32 i_offsetX) { mOffsetX = i_offsetX; }
     bool isAnimeUpdate(int param_0) { return (field_0x114 & (u8)(1 << param_0)) ? TRUE : FALSE; }

include/dusk/action_bindings.h

@@ -9,8 +9,6 @@ namespace dusk {
 enum class ActionBinds {
     FIRST_PERSON_CAMERA,
     CALL_MIDNA,
-    OPEN_MAP_SCREEN,
-    TOGGLE_MINIMAP,
     OPEN_DUSKLIGHT_MENU,
     TURBO_SPEED_BUTTON,
     COUNT,
@@ -34,12 +32,6 @@ bool isActionBound(ActionBinds action, u32 port);
 
 void updateActionBindings();
 
-void setVirtualActionBind(ActionBinds action, u32 port, bool pressed, bool available = true);
-
-void clearVirtualActionBind(ActionBinds action, u32 port);
-
-void clearAllVirtualActionBinds();
-
 bool getActionBindTrig(ActionBinds action, u32 port);
 
 bool getActionBindHold(ActionBinds action, u32 port);

include/dusk/config_var.hpp

@@ -4,7 +4,6 @@
 #include "dolphin/types.h"
 #include <type_traits>
 #include <cstdlib>
-#include <limits>
 #include <string>
 
 /**
@@ -140,16 +139,11 @@ concept ConfigValueInteger =
     || std::is_same_v<T, s64>
     || std::is_same_v<T, u64>;
 
-template <typename T>
-struct ConfigValueTraits {
-    static constexpr bool enabled = false;
-};
-
 /**
  * \brief Concept that defines the legal set of types that can be used for CVar values.
  *
  * Valid types cannot be cv-qualified and must be basic primitive types (int, float, bool),
- * strings, enums of the basic primitives, or explicitly-enabled structured settings.
+ * strings, or enums of the basic primitives.
  */
 template <typename T>
 concept ConfigValue =
@@ -160,8 +154,7 @@ concept ConfigValue =
         || std::is_same_v<T, f32>
         || std::is_same_v<T, f64>
         || std::is_same_v<T, std::string>
-        || (std::is_enum_v<T> && ConfigValueInteger<std::underlying_type_t<T>>)
-        || ConfigValueTraits<T>::enabled);
+        || (std::is_enum_v<T> && ConfigValueInteger<std::underlying_type_t<T>>));
 
 template <ConfigValue T>
 const ConfigImplBase* GetConfigImpl();

include/dusk/gx_helper.h

@@ -7,16 +7,12 @@
 #include <dolphin/gx/GXExtra.h>
 #include "tracy/Tracy.hpp"
 
-#if DUSK_GFX_DEBUG_GROUPS
 #define GX_DEBUG_GROUP(name, ...) \
     do {                          \
         GXPushDebugGroup(#name);  \
         name(__VA_ARGS__);        \
         GXPopDebugGroup();        \
     } while (0)
-#else
-#define GX_DEBUG_GROUP(name, ...) name(__VA_ARGS__)
-#endif
 
 #ifdef TARGET_PC
 class GXTexObjRAII : public GXTexObj {
@@ -43,37 +39,16 @@ public:
 static_assert(sizeof(GXTexObjRAII) == sizeof(GXTexObj),
               "GXTexObjRAII should have the same size as GXTexObj");
 typedef GXTexObjRAII TGXTexObj;
-
-class GXTlutObjRAII : public GXTlutObj {
-public:
-    GXTlutObjRAII() : GXTlutObj() {}
-    ~GXTlutObjRAII() { GXDestroyTlutObj(this); }
-
-    void reset() { GXDestroyTlutObj(this); }
-
-    GXTlutObjRAII(const GXTlutObjRAII&) = delete;
-    GXTlutObjRAII& operator=(const GXTlutObjRAII&) = delete;
-    GXTlutObjRAII(GXTlutObjRAII&&) = delete;
-    GXTlutObjRAII& operator=(GXTlutObjRAII&&) = delete;
-};
-static_assert(sizeof(GXTlutObjRAII) == sizeof(GXTlutObj),
-              "GXTlutObjRAII should have the same size as GXTlutObj");
-typedef GXTlutObjRAII TGXTlutObj;
 #else
 typedef GXTexObj TGXTexObj;
-typedef GXTlutObj TGXTlutObj;
 #endif
 
 struct GXScopedDebugGroup {
     explicit GXScopedDebugGroup(const char* text) {
-#if DUSK_GFX_DEBUG_GROUPS
         GXPushDebugGroup(text);
-#endif
     }
     ~GXScopedDebugGroup() {
-#if DUSK_GFX_DEBUG_GROUPS
         GXPopDebugGroup();
-#endif
     }
 };
 

include/dusk/gyro.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef DUSK_GYRO_H
+#define DUSK_GYRO_H
 
 namespace dusk::gyro {
 void read(float dt);
@@ -13,3 +14,5 @@ bool get_sensor_keep_alive();
 void set_sensor_keep_alive(bool value);
 bool rollgoal_gyro_enabled();
 }  // namespace dusk::gyro
+
+#endif

include/dusk/menu_pointer.h

@@ -1,60 +0,0 @@
-#pragma once
-
-#include "dolphin/types.h"
-
-class CPaneMgr;
-
-namespace dusk::menu_pointer {
-
-enum class Context {
-    None,
-    FileSelect,
-    Save,
-    ItemWheel,
-    Collection,
-    Options,
-    Dialog,
-};
-
-enum class Phase {
-    Move,
-    Press,
-    Release,
-    Cancel,
-};
-
-struct State {
-    f32 x = 0.0f;
-    f32 y = 0.0f;
-    bool valid = false;
-    bool down = false;
-    bool pressed = false;
-    bool released = false;
-    bool clicked = false;
-    bool touch = false;
-};
-
-void begin_game_frame() noexcept;
-void end_game_frame() noexcept;
-void begin_context(Context context) noexcept;
-bool handle_fallthrough_pointer(f32 x, f32 y, Phase phase, bool touch, s32 mouseButton = -1) noexcept;
-
-bool active() noexcept;
-bool enabled() noexcept;
-bool mouse_capture_active() noexcept;
-const State& state() noexcept;
-bool consume_click() noexcept;
-void set_dialog_choice(u8 choice, bool clicked) noexcept;
-bool get_dialog_choice(u8& choice) noexcept;
-bool consume_dialog_click(u8& choice) noexcept;
-void defer_activation(Context context, u8 target) noexcept;
-bool consume_deferred_activation(Context context, u8 target) noexcept;
-void clear_deferred_activation(Context context) noexcept;
-u32 suppressed_pad_buttons(u32 port) noexcept;
-void finish_pad_suppression_read(u32 port) noexcept;
-
-bool hit_rect(f32 left, f32 top, f32 right, f32 bottom, f32 padding = 0.0f) noexcept;
-bool hit_pane(CPaneMgr* pane, f32 padding = 0.0f) noexcept;
-bool hit_pane(J2DPane* pane, f32 padding = 0.0f) noexcept;
-
-}  // namespace dusk::menu_pointer

include/dusk/mouse.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <SDL3/SDL_events.h>
-
-namespace dusk::mouse {
-void read();
-void getAimDeltas(float& out_yaw, float& out_pitch);
-void getCameraDeltas(float& out_yaw, float& out_pitch);
-void handle_event(const SDL_Event& event) noexcept;
-void onFocusLost();
-void onFocusGained();
-}  // namespace dusk::mouse

include/dusk/settings.h

@@ -1,9 +1,9 @@
-#pragma once
+#ifndef DUSK_CONFIG_H
+#define DUSK_CONFIG_H
 
 #include <array>
 
 #include "dusk/config_var.hpp"
-#include "dusk/ui/controls.hpp"
 
 namespace dusk {
 
@@ -40,6 +40,11 @@ enum class DiscVerificationState : u8 {
     HashMismatch,
 };
 
+enum class GyroMode : u8 {
+    Sensor = 0,
+    Mouse = 1,
+};
+
 enum class FrameInterpMode : u8 {
     Off = 0,
     Capped = 1,
@@ -52,14 +57,6 @@ enum class MenuScaling : u8 {
     Dusklight = 2,
 };
 
-enum class MagicArmorMode : u8 {
-    NORMAL = 0,
-    ON_DAMAGE = 1,
-    DOUBLE_DEFENSE = 2,
-    INVINCIBLE = 3,
-    COSMETIC = 4,
-};
-
 namespace config {
 template <>
 struct ConfigEnumRange<BloomMode> {
@@ -91,6 +88,12 @@ struct ConfigEnumRange<DiscVerificationState> {
     static constexpr auto max = DiscVerificationState::HashMismatch;
 };
 
+template <>
+struct ConfigEnumRange<GyroMode> {
+    static constexpr auto min = GyroMode::Sensor;
+    static constexpr auto max = GyroMode::Mouse;
+};
+
 template <>
 struct ConfigEnumRange<FrameInterpMode> {
     static constexpr auto min = FrameInterpMode::Off;
@@ -102,17 +105,6 @@ struct ConfigEnumRange<MenuScaling> {
     static constexpr auto min = MenuScaling::GameCube;
     static constexpr auto max = MenuScaling::Dusklight;
 };
-
-template <>
-struct ConfigEnumRange<MagicArmorMode> {
-    static constexpr auto min = MagicArmorMode::NORMAL;
-    static constexpr auto max = MagicArmorMode::COSMETIC;
-};
-
-template <>
-struct ConfigValueTraits<ui::ControlLayout> {
-    static constexpr bool enabled = true;
-};
 }  // namespace config
 
 // Persistent user settings
@@ -128,9 +120,6 @@ struct UserSettings {
         ConfigVar<bool> enableFpsOverlay;
         ConfigVar<int> fpsOverlayCorner;
         ConfigVar<int> maxFrameRate;
-        ConfigVar<bool> rememberWindowSize;
-        ConfigVar<int> lastWindowWidth;
-        ConfigVar<int> lastWindowHeight;
     } video;
 
     struct {
@@ -164,7 +153,6 @@ struct UserSettings {
         ConfigVar<bool> noMissClimbing;
         ConfigVar<bool> fastTears;
         ConfigVar<bool> no2ndFishForCat;
-        ConfigVar<bool> buttonFishing;
         ConfigVar<bool> instantSaves;
         ConfigVar<bool> instantText;
         ConfigVar<bool> sunsSong;
@@ -174,7 +162,6 @@ struct UserSettings {
         // Preferences
         ConfigVar<bool> enableMirrorMode;
         ConfigVar<bool> minimalHUD;
-        ConfigVar<float> hudScale;
         ConfigVar<bool> pauseOnFocusLost;
         ConfigVar<bool> enableLinkDollRotation;
         ConfigVar<bool> enableAchievementToasts;
@@ -200,6 +187,7 @@ struct UserSettings {
         ConfigVar<bool> midnasLamentNonStop;
 
         // Input
+        ConfigVar<GyroMode> gyroMode;
         ConfigVar<bool> enableGyroAim;
         ConfigVar<bool> enableGyroRollgoal;
         ConfigVar<float> gyroSensitivityX;
@@ -209,15 +197,7 @@ struct UserSettings {
         ConfigVar<float> gyroDeadband;
         ConfigVar<bool> gyroInvertPitch;
         ConfigVar<bool> gyroInvertYaw;
-        ConfigVar<bool> enableMouseCamera;
-        ConfigVar<bool> enableMouseAim;
-        ConfigVar<float> mouseAimSensitivity;
-        ConfigVar<float> mouseCameraSensitivity;
-        ConfigVar<bool> invertMouseY;
         ConfigVar<bool> freeCamera;
-        ConfigVar<bool> enableTouchControls;
-        ConfigVar<bool> enableMenuPointer;
-        ConfigVar<ui::ControlLayout> touchControlsLayout;
         ConfigVar<bool> invertCameraXAxis;
         ConfigVar<bool> invertCameraYAxis;
         ConfigVar<bool> invertFirstPersonXAxis;
@@ -226,8 +206,6 @@ struct UserSettings {
         ConfigVar<bool> invertAirSwimY;
         ConfigVar<float> freeCameraXSensitivity;
         ConfigVar<float> freeCameraYSensitivity;
-        ConfigVar<float> touchCameraXSensitivity;
-        ConfigVar<float> touchCameraYSensitivity;
         ConfigVar<bool> debugFlyCam;
         ConfigVar<bool> debugFlyCamLockEvents;
         ConfigVar<bool> allowBackgroundInput;
@@ -250,7 +228,7 @@ struct UserSettings {
         ConfigVar<bool> canTransformAnywhere;
         ConfigVar<bool> fastRoll;
         ConfigVar<bool> fastSpinner;
-        ConfigVar<MagicArmorMode> armorRupeeDrain;
+        ConfigVar<bool> freeMagicArmor;
         ConfigVar<bool> invincibleEnemies;
 
         // Technical
@@ -286,8 +264,6 @@ struct UserSettings {
     struct {
         std::array<ActionBindConfigVar, 4> firstPersonCamera;
         std::array<ActionBindConfigVar, 4> callMidna;
-        std::array<ActionBindConfigVar, 4> openMapScreen;
-        std::array<ActionBindConfigVar, 4> toggleMinimap;
         std::array<ActionBindConfigVar, 4> openDusklightMenu;
         std::array<ActionBindConfigVar, 4> turboSpeedButton;
     } actionBindings;
@@ -319,4 +295,6 @@ struct TransientSettings {
 
 TransientSettings& getTransientSettings();
 
-}  // namespace dusk
+}
+
+#endif // DUSK_CONFIG_H

include/dusk/touch_camera.h

@@ -1,12 +0,0 @@
-#pragma once
-
-namespace dusk::touch_camera {
-
-constexpr float YAW_DEGREES_PER_DP = 0.34f;
-constexpr float PITCH_DEGREES_PER_DP = 0.22f;
-
-void add_delta(float yaw_dp, float pitch_dp) noexcept;
-bool consume_delta(float& yaw_dp, float& pitch_dp) noexcept;
-void clear() noexcept;
-
-}  // namespace dusk::touch_camera

include/m_Do/m_Do_lib.h

@@ -44,7 +44,7 @@ struct mDoLib_clipper {
 
 void mDoLib_project(Vec* src, Vec* dst);
 u32 mDoLib_setResTimgObj(ResTIMG const* res, TGXTexObj* o_texObj, u32 tlut_name,
-                         TGXTlutObj* o_tlutObj);
+                          GXTlutObj* o_tlutObj);
 void mDoLib_pos2camera(Vec* src, Vec* dst);
 
 #if PLATFORM_WII

ios.toolchain.cmake

@@ -952,70 +952,45 @@ if(DEFINED APPLE_TARGET_TRIPLE)
   set(APPLE_TARGET_TRIPLE_FLAG "-target ${APPLE_TARGET_TRIPLE}")
 endif()
 
-function(ios_toolchain_set_cached_flags variable description)
-  set(clean_flags "${${variable}}")
-  foreach(toolchain_flag IN LISTS ARGN)
-    if(NOT "${toolchain_flag}" STREQUAL "")
-      string(REPLACE "${toolchain_flag}" "" clean_flags "${clean_flags}")
-    endif()
-  endforeach()
-  string(REGEX REPLACE "[ \t]+" " " clean_flags "${clean_flags}")
-  string(STRIP "${clean_flags}" clean_flags)
-
-  set(final_flags "")
-  foreach(toolchain_flag IN LISTS ARGN)
-    if(NOT "${toolchain_flag}" STREQUAL "")
-      string(APPEND final_flags " ${toolchain_flag}")
-    endif()
-  endforeach()
-  if(NOT "${clean_flags}" STREQUAL "")
-    string(APPEND final_flags " ${clean_flags}")
-  endif()
-  string(REGEX REPLACE "[ \t]+" " " final_flags "${final_flags}")
-  string(STRIP "${final_flags}" final_flags)
-
-  set(${variable} "${final_flags}" CACHE INTERNAL "${description}")
-endfunction()
-
 #Check if Xcode generator is used since that will handle these flags automagically
 if(CMAKE_GENERATOR MATCHES "Xcode")
   message(STATUS "Not setting any manual command-line buildflags, since Xcode is selected as the generator. Modifying the Xcode build-settings directly instead.")
 else()
-  ios_toolchain_set_cached_flags(CMAKE_C_FLAGS "Flags used by the compiler during all C build types."
-      "${C_TARGET_FLAGS}" "${APPLE_TARGET_TRIPLE_FLAG}" "${SDK_NAME_VERSION_FLAGS}" "${OBJC_LEGACY_VARS}" "${BITCODE}" "${VISIBILITY}")
+  set(CMAKE_C_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${BITCODE} ${VISIBILITY} ${CMAKE_C_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler during all C build types.")
   set(CMAKE_C_FLAGS_DEBUG "-O0 -g ${CMAKE_C_FLAGS_DEBUG}")
   set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_C_FLAGS_MINSIZEREL}")
   set(CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
   set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_C_FLAGS_RELEASE}")
-  ios_toolchain_set_cached_flags(CMAKE_CXX_FLAGS "Flags used by the compiler during all CXX build types."
-      "${C_TARGET_FLAGS}" "${APPLE_TARGET_TRIPLE_FLAG}" "${SDK_NAME_VERSION_FLAGS}" "${OBJC_LEGACY_VARS}" "${BITCODE}" "${VISIBILITY}")
+  set(CMAKE_CXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${BITCODE} ${VISIBILITY} ${CMAKE_CXX_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler during all CXX build types.")
   set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_CXX_FLAGS_MINSIZEREL}")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_CXX_FLAGS_RELEASE}")
   if(NAMED_LANGUAGE_SUPPORT_INT)
-    ios_toolchain_set_cached_flags(CMAKE_OBJC_FLAGS "Flags used by the compiler during all OBJC build types."
-        "${C_TARGET_FLAGS}" "${APPLE_TARGET_TRIPLE_FLAG}" "${SDK_NAME_VERSION_FLAGS}" "${BITCODE}" "${VISIBILITY}" "${FOBJC_ARC}" "${OBJC_VARS}")
+    set(CMAKE_OBJC_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${BITCODE} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJC_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler during all OBJC build types.")
     set(CMAKE_OBJC_FLAGS_DEBUG "-O0 -g ${CMAKE_OBJC_FLAGS_DEBUG}")
     set(CMAKE_OBJC_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_OBJC_FLAGS_MINSIZEREL}")
     set(CMAKE_OBJC_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_OBJC_FLAGS_RELWITHDEBINFO}")
     set(CMAKE_OBJC_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_OBJC_FLAGS_RELEASE}")
-    ios_toolchain_set_cached_flags(CMAKE_OBJCXX_FLAGS "Flags used by the compiler during all OBJCXX build types."
-        "${C_TARGET_FLAGS}" "${APPLE_TARGET_TRIPLE_FLAG}" "${SDK_NAME_VERSION_FLAGS}" "${BITCODE}" "${VISIBILITY}" "${FOBJC_ARC}" "${OBJC_VARS}")
+    set(CMAKE_OBJCXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${BITCODE} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJCXX_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler during all OBJCXX build types.")
     set(CMAKE_OBJCXX_FLAGS_DEBUG "-O0 -g ${CMAKE_OBJCXX_FLAGS_DEBUG}")
     set(CMAKE_OBJCXX_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_OBJCXX_FLAGS_MINSIZEREL}")
     set(CMAKE_OBJCXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_OBJCXX_FLAGS_RELWITHDEBINFO}")
     set(CMAKE_OBJCXX_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_OBJCXX_FLAGS_RELEASE}")
   endif()
-  ios_toolchain_set_cached_flags(CMAKE_C_LINK_FLAGS "Flags used by the compiler for all C link types."
-      "${C_TARGET_FLAGS}" "${SDK_NAME_VERSION_FLAGS}" "-Wl,-search_paths_first")
-  ios_toolchain_set_cached_flags(CMAKE_CXX_LINK_FLAGS "Flags used by the compiler for all CXX link types."
-      "${C_TARGET_FLAGS}" "${SDK_NAME_VERSION_FLAGS}" "-Wl,-search_paths_first")
+  set(CMAKE_C_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler for all C link types.")
+  set(CMAKE_CXX_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS}  -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler for all CXX link types.")
   if(NAMED_LANGUAGE_SUPPORT_INT)
-    ios_toolchain_set_cached_flags(CMAKE_OBJC_LINK_FLAGS "Flags used by the compiler for all OBJC link types."
-        "${C_TARGET_FLAGS}" "${SDK_NAME_VERSION_FLAGS}" "-Wl,-search_paths_first")
-    ios_toolchain_set_cached_flags(CMAKE_OBJCXX_LINK_FLAGS "Flags used by the compiler for all OBJCXX link types."
-        "${C_TARGET_FLAGS}" "${SDK_NAME_VERSION_FLAGS}" "-Wl,-search_paths_first")
+    set(CMAKE_OBJC_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_OBJC_LINK_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler for all OBJC link types.")
+    set(CMAKE_OBJCXX_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_OBJCXX_LINK_FLAGS}" CACHE INTERNAL
+     "Flags used by the compiler for all OBJCXX link types.")
   endif()
   set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp" CACHE INTERNAL
      "Flags used by the compiler for all ASM build types.")

libs/JSystem/include/JSystem/J2DGraph/J2DPicture.h

@@ -212,9 +212,6 @@ public:
     void setCornerColor(JUtility::TColor c0) {
         setCornerColor(c0, c0, c0, c0);
     }
-#if TARGET_PC
-    JUtility::TColor corner(size_t index) const { return mCornerColor[index]; }
-#endif
 
 protected:
     /* 0x100 */ JUTTexture* mTexture[2];

libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeDraw.h

@@ -1,7 +1,6 @@
 #ifndef J3DSHAPEDRAW_H
 #define J3DSHAPEDRAW_H
 
-#include <gx.h>
 #include <types.h>
 
 /**
@@ -13,9 +12,6 @@ public:
     u32 countVertex(u32);
     void addTexMtxIndexInDL(u32, u32, u32);
     J3DShapeDraw(u8 const*, u32);
-#if TARGET_PC
-    J3DShapeDraw(u8 const*, u32, const GXVtxDescList*);
-#endif
     void draw() const;
 
     virtual ~J3DShapeDraw();

libs/JSystem/include/JSystem/JParticle/JPABaseShape.h

@@ -3,20 +3,6 @@
 
 #include <gx.h>
 
-#if TARGET_PC
-#include <mtx.h>
-
-struct ParticleDrawCtx {
-    bool batch;     // off = immediate mode
-    bool useTexMtx; // UVs transformed by texMtx
-    bool useClr0;   // prm color in GX_VA_CLR0
-    bool useClr1;   // env color in GX_VA_CLR1
-    Mtx texMtx;
-    GXColor clr0;
-    GXColor clr1;
-};
-#endif
-
 struct JPAEmitterWorkData;
 class JPABaseParticle;
 class JKRHeap;
@@ -89,9 +75,6 @@ public:
 
     const GXTevColorArg* getTevColorArg() const { return st_ca[(pBsd->mFlags >> 0x0F) & 0x07]; }
     const GXTevAlphaArg* getTevAlphaArg() const { return st_aa[(pBsd->mFlags >> 0x12) & 0x01]; }
-#if TARGET_PC
-    u32 getTevColorArgSel() const { return (pBsd->mFlags >> 0x0F) & 0x07; }
-#endif
 
     u32 getType() const { return (pBsd->mFlags >> 0) & 0x0F; }
     u32 getDirType() const { return (pBsd->mFlags >> 4) & 0x07; }
@@ -203,34 +186,26 @@ void JPARegistPrm(JPAEmitterWorkData*);
 void JPARegistEnv(JPAEmitterWorkData*);
 void JPARegistPrmEnv(JPAEmitterWorkData*);
 
-#if TARGET_PC
-#define JPA_DRAW_PARTICLE_ARGS JPAEmitterWorkData*, JPABaseParticle*, ParticleDrawCtx*
-#else
-#define JPA_DRAW_PARTICLE_ARGS JPAEmitterWorkData*, JPABaseParticle*
-#endif
-
-void JPADrawPoint(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawLine(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotDirection(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawDirection(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotation(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawDBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotYBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawYBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawParticleCallBack(JPA_DRAW_PARTICLE_ARGS);
-void JPALoadTexAnm(JPA_DRAW_PARTICLE_ARGS);
-void JPASetPointSize(JPA_DRAW_PARTICLE_ARGS);
-void JPASetLineWidth(JPA_DRAW_PARTICLE_ARGS);
-void JPALoadCalcTexCrdMtxAnm(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistAlpha(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistEnv(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistAlphaEnv(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistPrmAlpha(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistPrmAlphaEnv(JPA_DRAW_PARTICLE_ARGS);
-
-#undef JPA_DRAW_PARTICLE_ARGS
+void JPADrawPoint(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawLine(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotDirection(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawDirection(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotation(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawDBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotYBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawYBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawParticleCallBack(JPAEmitterWorkData*, JPABaseParticle*);
+void JPALoadTexAnm(JPAEmitterWorkData*, JPABaseParticle*);
+void JPASetPointSize(JPAEmitterWorkData*, JPABaseParticle*);
+void JPASetLineWidth(JPAEmitterWorkData*, JPABaseParticle*);
+void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistAlpha(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistEnv(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistPrmAlpha(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistPrmAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);
 
 #if TARGET_PC
 void JPAInterpBillboard(JPAEmitterWorkData*, JPABaseParticle*);

libs/JSystem/include/JSystem/JParticle/JPAResource.h

@@ -17,10 +17,6 @@ class JPADynamicsBlock;
 class JPAFieldBlock;
 class JPAKeyBlock;
 
-#if TARGET_PC
-struct ParticleDrawCtx;
-#endif
-
 /**
  * @ingroup jsystem-jparticle
  * 
@@ -54,19 +50,13 @@ public:
 public:
     typedef void (*EmitterFunc)(JPAEmitterWorkData*);
     typedef void (*ParticleFunc)(JPAEmitterWorkData*, JPABaseParticle*);
-#if TARGET_PC
-    typedef void (*DrawParticleFunc)(JPAEmitterWorkData*, JPABaseParticle*,
-                                     ParticleDrawCtx*);
-#else
-    typedef ParticleFunc DrawParticleFunc;
-#endif
     /* 0x00 */ EmitterFunc* mpCalcEmitterFuncList;
     /* 0x04 */ EmitterFunc* mpDrawEmitterFuncList;
     /* 0x08 */ EmitterFunc* mpDrawEmitterChildFuncList;
     /* 0x0C */ ParticleFunc* mpCalcParticleFuncList;
-    /* 0x10 */ DrawParticleFunc* mpDrawParticleFuncList;
+    /* 0x10 */ ParticleFunc* mpDrawParticleFuncList;
     /* 0x14 */ ParticleFunc* mpCalcParticleChildFuncList;
-    /* 0x18 */ DrawParticleFunc* mpDrawParticleChildFuncList;
+    /* 0x18 */ ParticleFunc* mpDrawParticleChildFuncList;
 
     /* 0x1C */ JPABaseShape* pBsp;
     /* 0x20 */ JPAExtraShape* pEsp;
@@ -87,20 +77,6 @@ public:
     /* 0x45 */ u8 mpDrawParticleFuncListNum;
     /* 0x46 */ u8 mpCalcParticleChildFuncListNum;
     /* 0x47 */ u8 mpDrawParticleChildFuncListNum;
-
-#if TARGET_PC
-    struct BatchInfo {
-        f32 vtxPos[8][3];
-        f32 vtxUv[8][2];
-        u8 vtxCount;        // 4 (quad) or 8 (cross)
-        bool supported;     // draw func list contains only batchable funcs
-        bool hasPtclColor;  // per-particle JPARegist* func is present
-        bool hasPtclTexMtx; // JPALoadCalcTexCrdMtxAnm is present
-    };
-    BatchInfo mBatchInfo;
-
-    void initBatchInfo();
-#endif
 };
 
 #endif /* JPARESOURCE_H */

libs/JSystem/src/J2DGraph/J2DGrafContext.cpp

@@ -3,8 +3,6 @@
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include <gx.h>
 
-#include <tracy/Tracy.hpp>
-
 J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height)
     : mBounds(x, y, x + width, y + height), mScissorBounds(x, y, x + width, y + height) {
     if (x < 0.0f || y < 0.0f) {
@@ -139,7 +137,6 @@ void J2DGrafContext::setLineWidth(u8 lineWidth) {
 }
 
 void J2DGrafContext::fillBox(JGeometry::TBox2<f32> const& box) {
-    ZoneScoped;
     GXSetBlendMode((GXBlendMode)mBoxPart.mType, (GXBlendFactor)mBoxPart.mSrcFactor,
                    (GXBlendFactor)mBoxPart.mDstFactor, GX_LO_SET);
     GXLoadPosMtxImm(mPosMtx, 0);
@@ -158,7 +155,6 @@ void J2DGrafContext::fillBox(JGeometry::TBox2<f32> const& box) {
 }
 
 void J2DGrafContext::drawFrame(JGeometry::TBox2<f32> const& box) {
-    ZoneScoped;
     GXSetBlendMode((GXBlendMode)mBoxPart.mType, (GXBlendFactor)mBoxPart.mSrcFactor,
                    (GXBlendFactor)mBoxPart.mDstFactor, GX_LO_SET);
     GXLoadPosMtxImm(mPosMtx, 0);
@@ -179,7 +175,6 @@ void J2DGrafContext::drawFrame(JGeometry::TBox2<f32> const& box) {
 }
 
 void J2DGrafContext::line(JGeometry::TVec2<f32> start, JGeometry::TVec2<f32> end) {
-    ZoneScoped;
     GXSetBlendMode((GXBlendMode)mLinePart.mType, (GXBlendFactor)mLinePart.mSrcFactor,
                    (GXBlendFactor)mLinePart.mDstFactor, GX_LO_SET);
     GXLoadPosMtxImm(mPosMtx, 0);

libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp

@@ -542,11 +542,8 @@ void J3DModel::viewCalc() {
     }
 
 #ifdef TARGET_PC
-    Mtx* drawMtx = getDrawMtxPtr();
-    if (drawMtx != J3DMtxBuffer::sNoUseDrawMtxPtr) {
-        for (u16 i = 0; i < mModelData->getDrawMtxNum(); ++i) {
-            dusk::frame_interp::record_final_mtx(drawMtx[i]);
-        }
+    for (u16 i = 0; i < mModelData->getDrawMtxNum(); ++i) {
+        dusk::frame_interp::record_final_mtx(getDrawMtxPtr()[i]);
     }
 #endif
 

libs/JSystem/src/J3DGraphBase/J3DShape.cpp

@@ -136,8 +136,8 @@ void J3DLoadCPCmd(u8 addr, u32 val) {
 #if TARGET_PC
 static void J3DLoadArrayBasePtr(GXAttr attr, void* data, u32 size, bool le) {
     u32 idx = (attr == GX_VA_NBT) ? 1 : (attr - GX_VA_POS);
-    GXCmd1u8(GX_AURORA);
-    GXCmd1u16(GX_AURORA_LOAD_ARRAYBASE | idx);
+    GXCmd1u8(GX_LOAD_AURORA);
+    GXCmd1u16(GX_LOAD_AURORA_ARRAYBASE | idx);
     GXCmd1u64((u64)data);
     GXCmd1u32(size);
     GXCmd1u8(le ? 1 : 0);

libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp

@@ -1,47 +1,15 @@
-#include "JSystem/JSystem.h"  // IWYU pragma: keep
+#include "JSystem/JSystem.h" // IWYU pragma: keep
 
-#include <cstring>
-#include <gx.h>
-#include <stdint.h>
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/JKernel/JKRHeap.h"
-
-#if TARGET_PC
-#include <aurora/dl.hpp>
-#include <tracy/Tracy.hpp>
-
-namespace {
-
-void set_display_list_copy(void*& displayList, u32& displayListSize, const u8* data, u32 size) {
-    const u32 alignedSize = ALIGN_NEXT(size, 0x20);
-    u8* newDL = JKR_NEW_ARRAY_ARGS(u8, alignedSize, 0x20);
-    if (size != 0) {
-        std::memcpy(newDL, data, size);
-    }
-    for (u32 i = size; i < alignedSize; i++) {
-        newDL[i] = 0;
-    }
-
-    displayList = newDL;
-    displayListSize = alignedSize;
-    DCStoreRange(newDL, displayListSize);
-}
-
-}  // namespace
-#endif
+#include <cstring>
+#include <stdint.h>
+#include <gx.h>
 
 u32 J3DShapeDraw::countVertex(u32 stride) {
     u32 count = 0;
     u8* dlStart = (u8*)getDisplayList();
 
-#if TARGET_PC
-    aurora::gx::dl::Reader reader{dlStart, getDisplayListSize(), static_cast<u8>(stride)};
-    while (const auto cmd = reader.next()) {
-        if (cmd->kind != aurora::gx::dl::Command::Kind::Passthrough) {
-            count += cmd->draw.vtxCount;
-        }
-    }
-#else
     for (u8* dl = dlStart; (dl - dlStart) < getDisplayListSize();) {
         u8 cmd = *(u8*)dl;
         dl++;
@@ -52,58 +20,10 @@ u32 J3DShapeDraw::countVertex(u32 stride) {
         count += vtxNum;
         dl = (u8*)dl + stride * vtxNum;
     }
-#endif
 
     return count;
 }
 
-#if TARGET_PC
-void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
-    u32 byteNum = countVertex(stride);
-    u32 oldSize = mDisplayListSize;
-    u32 newSize = ALIGN_NEXT(oldSize + byteNum, 0x20);
-    u8* newDLStart = JKR_NEW_ARRAY_ARGS(u8, newSize, 0x20);
-    u8* oldDLStart = (u8*)mDisplayList;
-    u8* newDL = newDLStart;
-
-    aurora::gx::dl::Reader reader{oldDLStart, mDisplayListSize, static_cast<u8>(stride)};
-    while (const auto cmd = reader.next()) {
-        if (cmd->kind == aurora::gx::dl::Command::Kind::Passthrough) {
-            std::memcpy(newDL, cmd->data, cmd->size);
-            newDL += cmd->size;
-            continue;
-        }
-
-        const auto& draw = cmd->draw;
-        const u32 headerSize = draw.vertices - cmd->data;
-        std::memcpy(newDL, cmd->data, headerSize);
-        newDL += headerSize;
-
-        for (u32 i = 0; i < draw.vtxCount; i++) {
-            const u8* oldVtx = draw.vertices + stride * i;
-            u8 pnmtxidx = oldVtx[0];
-            std::memcpy(newDL, oldVtx, attrOffs);
-            newDL += attrOffs;
-            *newDL++ = valueBase + pnmtxidx;
-            std::memcpy(newDL, oldVtx + attrOffs, stride - attrOffs);
-            newDL += stride - attrOffs;
-        }
-    }
-    if (reader.failed()) {
-        // preserve the remainder untouched
-        std::memcpy(newDL, oldDLStart + reader.pos(), mDisplayListSize - reader.pos());
-        newDL += mDisplayListSize - reader.pos();
-    }
-
-    u32 realSize = ALIGN_NEXT((uintptr_t)newDL - (uintptr_t)newDLStart, 0x20);
-    for (; (newDL - newDLStart) < newSize; newDL++)
-        *newDL = 0;
-
-    mDisplayListSize = realSize;
-    mDisplayList = newDLStart;
-    DCStoreRange(newDLStart, mDisplayListSize);
-}
-#else
 void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
     u32 byteNum = countVertex(stride);
     u32 oldSize = mDisplayListSize;
@@ -149,30 +69,13 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
     mDisplayList = newDLStart;
     DCStoreRange(newDLStart, mDisplayListSize);
 }
-#endif
 
 J3DShapeDraw::J3DShapeDraw(const u8* displayList, u32 displayListSize) {
-#if TARGET_PC
-    set_display_list_copy(mDisplayList, mDisplayListSize, displayList, displayListSize);
-#else
     mDisplayList = (void*)displayList;
     mDisplayListSize = displayListSize;
-#endif
 }
 
-#if TARGET_PC
-J3DShapeDraw::J3DShapeDraw(
-    const u8* displayList, u32 displayListSize, const GXVtxDescList* vtxDesc) {
-    if (const auto optimized = aurora::gx::dl::optimize(displayList, displayListSize, vtxDesc)) {
-        set_display_list_copy(mDisplayList, mDisplayListSize, optimized->data(), optimized->size());
-    } else {
-        set_display_list_copy(mDisplayList, mDisplayListSize, displayList, displayListSize);
-    }
-}
-#endif
-
 void J3DShapeDraw::draw() const {
-    ZoneScoped;
     GXCallDisplayList(mDisplayList, mDisplayListSize);
 }
 

libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp

@@ -132,12 +132,7 @@ J3DShapeDraw* J3DShapeFactory::newShapeDraw(int shapeNo, int mtxGroupNo) const {
     const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]];
     const J3DShapeDrawInitData& drawInitData =
         (&mDrawInitData[shapeInitData.mDrawInitDataIndex])[mtxGroupNo];
-#if TARGET_PC
-    shapeDraw = JKR_NEW J3DShapeDraw(&mDisplayListData[drawInitData.mDisplayListIndex], drawInitData.mDisplayListSize,
-                                     getVtxDescList(shapeNo));
-#else
     shapeDraw = JKR_NEW J3DShapeDraw(&mDisplayListData[drawInitData.mDisplayListIndex], drawInitData.mDisplayListSize);
-#endif
     J3D_ASSERT_ALLOCMEM(193, shapeDraw);
     return shapeDraw;
 }
@@ -159,7 +154,7 @@ s32 J3DShapeFactory::calcSize(int shapeNo, u32 flag) {
 
     for (u32 i = 0; i < mtxGroupNo; i++) {
         size += calcSizeShapeMtx(flag, shapeNo, i);
-        size += sizeof(J3DShapeDraw);
+        size += 0x0C;
     }
 
     return size;

libs/JSystem/src/JParticle/JPABaseShape.cpp

@@ -14,33 +14,6 @@
 #endif
 #include "tracy/Tracy.hpp"
 
-#if TARGET_PC
-#define JPA_DRAW_CTX_PARAM , ParticleDrawCtx* ctx
-
-namespace {
-GXColor emitter_prm_color(JPAEmitterWorkData* work) {
-    JPABaseEmitter* emtr = work->mpEmtr;
-    GXColor prm = emtr->mPrmClr;
-    prm.r = COLOR_MULTI(prm.r, emtr->mGlobalPrmClr.r);
-    prm.g = COLOR_MULTI(prm.g, emtr->mGlobalPrmClr.g);
-    prm.b = COLOR_MULTI(prm.b, emtr->mGlobalPrmClr.b);
-    prm.a = COLOR_MULTI(prm.a, emtr->mGlobalPrmClr.a);
-    return prm;
-}
-
-GXColor emitter_env_color(JPAEmitterWorkData* work) {
-    JPABaseEmitter* emtr = work->mpEmtr;
-    GXColor env = emtr->mEnvClr;
-    env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
-    env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
-    env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-    return env;
-}
-}  // namespace
-#else
-#define JPA_DRAW_CTX_PARAM
-#endif
-
 void JPASetPointSize(JPAEmitterWorkData* work) {
     GXSetPointSize((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);
 }
@@ -49,16 +22,15 @@ void JPASetLineWidth(JPAEmitterWorkData* work) {
     GXSetLineWidth((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);
 }
 
-void JPASetPointSize(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPASetPointSize(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetPointSize((u8)(ptcl->mParticleScaleX * (25.0f * work->mGlobalPtclScl.x)), GX_TO_ONE);
 }
 
-void JPASetLineWidth(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPASetLineWidth(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetLineWidth((u8)(ptcl->mParticleScaleX * (25.0f * work->mGlobalPtclScl.x)), GX_TO_ONE);
 }
 
 void JPARegistPrm(JPAEmitterWorkData* work) {
-    ZoneScoped;
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
     prm.r = COLOR_MULTI(prm.r, emtr->mGlobalPrmClr.r);
@@ -69,7 +41,6 @@ void JPARegistPrm(JPAEmitterWorkData* work) {
 }
 
 void JPARegistEnv(JPAEmitterWorkData* work) {
-    ZoneScoped;
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor env = emtr->mEnvClr;
     env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
@@ -79,7 +50,6 @@ void JPARegistEnv(JPAEmitterWorkData* work) {
 }
 
 void JPARegistPrmEnv(JPAEmitterWorkData* work) {
-    ZoneScoped;
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
     GXColor env = emtr->mEnvClr;
@@ -94,8 +64,7 @@ void JPARegistPrmEnv(JPAEmitterWorkData* work) {
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
-    ZoneScoped;
+void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
     prm.r = COLOR_MULTI(prm.r, emtr->mGlobalPrmClr.r);
@@ -103,19 +72,10 @@ void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX
     prm.b = COLOR_MULTI(prm.b, emtr->mGlobalPrmClr.b);
     prm.a = COLOR_MULTI(prm.a, emtr->mGlobalPrmClr.a);
     prm.a = COLOR_MULTI(prm.a, ptcl->mPrmColorAlphaAnm);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        if (ctx->useClr1) {
-            ctx->clr1 = emitter_env_color(work);
-        }
-        return;
-    }
-#endif
     GXSetTevColor(GX_TEVREG0, prm);
 }
 
-void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     ZoneScoped;
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = ptcl->mPrmClr;
@@ -124,19 +84,10 @@ void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_
     prm.b = COLOR_MULTI(prm.b, emtr->mGlobalPrmClr.b);
     prm.a = COLOR_MULTI(prm.a, emtr->mGlobalPrmClr.a);
     prm.a = COLOR_MULTI(prm.a, ptcl->mPrmColorAlphaAnm);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        if (ctx->useClr1) {
-            ctx->clr1 = emitter_env_color(work);
-        }
-        return;
-    }
-#endif
     GXSetTevColor(GX_TEVREG0, prm);
 }
 
-void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     ZoneScoped;
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = ptcl->mPrmClr;
@@ -149,19 +100,11 @@ void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DR
     env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
     env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
     env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        ctx->clr1 = env;
-        return;
-    }
-#endif
     GXSetTevColor(GX_TEVREG0, prm);
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
-    ZoneScoped;
+void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
     GXColor env = ptcl->mEnvClr;
@@ -173,31 +116,16 @@ void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_
     env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
     env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
     env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        ctx->clr1 = env;
-        return;
-    }
-#endif
     GXSetTevColor(GX_TEVREG0, prm);
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-void JPARegistEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
-    ZoneScoped;
+void JPARegistEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor env = ptcl->mEnvClr;
     env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
     env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
     env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = emitter_prm_color(work);
-        ctx->clr1 = env;
-        return;
-    }
-#endif
     GXSetTevColor(GX_TEVREG1, env);
 }
 
@@ -330,7 +258,7 @@ void JPAGenCalcTexCrdMtxAnm(JPAEmitterWorkData* work) {
     GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX0);
 }
 
-void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     ZoneScoped;
     JPABaseShape* shape = work->mpRes->getBsp();
     f32 dVar16 = param_1->mAge;
@@ -358,12 +286,6 @@ void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1
     local_108[2][1] = 0.0f;
     local_108[2][2] = 1.0f;
     local_108[2][3] = 0.0f;
-#if TARGET_PC
-    if (ctx->batch) {
-        MTXCopy(local_108, ctx->texMtx);
-        return;
-    }
-#endif
     GXLoadTexMtxImm(local_108, 0x1e, GX_MTX2x4);
 }
 
@@ -377,7 +299,7 @@ void JPALoadTexAnm(JPAEmitterWorkData* work) {
     work->mpResMgr->load(work->mpRes->getTexIdx(work->mpEmtr->mTexAnmIdx), GX_TEXMAP0);
 }
 
-void JPALoadTexAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPALoadTexAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     ZoneScoped;
     work->mpResMgr->load(work->mpRes->getTexIdx(ptcl->mTexAnmIdx), GX_TEXMAP0);
 }
@@ -507,47 +429,6 @@ static projectionFunc p_prj[3] = {
 };
 
 #if TARGET_PC
-static void emit_batch_quad(JPAEmitterWorkData* work, const ParticleDrawCtx* ctx,
-                            const Mtx posMtx) {
-    const JPAResource::BatchInfo& info = work->mpRes->mBatchInfo;
-
-    for (int i = 0; i < info.vtxCount; i++) {
-        Vec localPos = {info.vtxPos[i][0], info.vtxPos[i][1], info.vtxPos[i][2]};
-        Vec drawPos;
-        MTXMultVec(posMtx, &localPos, &drawPos);
-
-        f32 texS = info.vtxUv[i][0];
-        f32 texT = info.vtxUv[i][1];
-        if (ctx->useTexMtx) {
-            f32 srcS = texS;
-            f32 srcT = texT;
-            texS = ctx->texMtx[0][0] * srcS + ctx->texMtx[0][1] * srcT + ctx->texMtx[0][3];
-            texT = ctx->texMtx[1][0] * srcS + ctx->texMtx[1][1] * srcT + ctx->texMtx[1][3];
-        }
-
-        GXPosition3f32(drawPos.x, drawPos.y, drawPos.z);
-        if (ctx->useClr0) {
-            GXColor4u8(ctx->clr0.r, ctx->clr0.g, ctx->clr0.b, ctx->clr0.a);
-        }
-        if (ctx->useClr1) {
-            GXColor4u8(ctx->clr1.r, ctx->clr1.g, ctx->clr1.b, ctx->clr1.a);
-        }
-        GXTexCoord2f32(texS, texT);
-    }
-}
-
-static void submit_particle_quad(
-    JPAEmitterWorkData* work, ParticleDrawCtx* ctx, const Mtx posMtx, const u8* dl, u32 dlSize) {
-    if (ctx->batch) {
-        emit_batch_quad(work, ctx, posMtx);
-        return;
-    }
-
-    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
-    p_prj[work->mPrjType](work, posMtx);
-    GXCallDisplayList(dl, dlSize);
-}
-
 void JPAInterpBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     Mtx ptclPosMtx;
     MTXTrans(ptclPosMtx, ptcl->mPosition.x, ptcl->mPosition.y, ptcl->mPosition.z);
@@ -567,7 +448,7 @@ void JPAInterpRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
 }
 #endif
 
-void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -592,16 +473,12 @@ void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_C
     posMtx[2][2] = 1.0f;
     posMtx[2][3] = pos.z;
     posMtx[0][1] = posMtx[0][2] = posMtx[1][0] = posMtx[1][2] = posMtx[2][0] = posMtx[2][1] = 0.0f;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, posMtx, jpa_dl, sizeof(jpa_dl));
-#else
     GXLoadPosMtxImm(posMtx, GX_PNMTX0);
     p_prj[work->mPrjType](work, posMtx);
     GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }
 
-void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -640,16 +517,12 @@ void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRA
     posMtx[2][2] = 1.0f;
     posMtx[2][3] = pos.z;
     posMtx[0][2] = posMtx[1][2] = posMtx[2][0] = posMtx[2][1] = 0.0f;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, posMtx, jpa_dl, sizeof(jpa_dl));
-#else
     GXLoadPosMtxImm(posMtx, GX_PNMTX0);
     p_prj[work->mPrjType](work, posMtx);
     GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }
 
-void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     if (param_1->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -669,16 +542,12 @@ void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DR
     local_38[2][2] = work->mYBBCamMtx[2][2];
     local_38[2][3] = local_48.z;
     local_38[0][1] = local_38[0][2] = local_38[1][0] = local_38[2][0] = 0.0f;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, local_38, jpa_dl, sizeof(jpa_dl));
-#else
     GXLoadPosMtxImm(local_38, GX_PNMTX0);
     p_prj[work->mPrjType](work, local_38);
     GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }
 
-void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     if (param_1->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -707,13 +576,9 @@ void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA
     local_38[2][1] = local_94 * fVar1;
     local_38[2][2] = local_90;
     local_38[2][3] = local_48.z;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, local_38, jpa_dl, sizeof(jpa_dl));
-#else
     GXLoadPosMtxImm(local_38, GX_PNMTX0);
     p_prj[work->mPrjType](work, local_38);
     GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }
 
 void dirTypeVel(JPAEmitterWorkData const* work, JPABaseParticle const* param_1,
@@ -876,88 +741,6 @@ static u8* p_dl[2] = {
 };
 
 #if TARGET_PC
-static bool make_direction_mtx(JPAEmitterWorkData* work, JPABaseParticle* ptcl, Mtx posMtx) {
-    JGeometry::TVec3<f32> axisY;
-    JGeometry::TVec3<f32> axisZ;
-    JGeometry::TVec3<f32> baseAxis(ptcl->mBaseAxis);
-    p_direction[work->mDirType](work, ptcl, &axisY);
-    if (axisY.isZero()) {
-        return false;
-    }
-
-    axisY.normalize();
-    axisZ.cross(baseAxis, axisY);
-    if (axisZ.isZero()) {
-        return false;
-    }
-
-    axisZ.normalize();
-    baseAxis.cross(axisY, axisZ);
-    baseAxis.normalize();
-    ptcl->mBaseAxis.set(baseAxis);
-
-    f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
-    f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
-    posMtx[0][0] = baseAxis.x;
-    posMtx[0][1] = axisY.x;
-    posMtx[0][2] = axisZ.x;
-    posMtx[0][3] = ptcl->mPosition.x;
-    posMtx[1][0] = baseAxis.y;
-    posMtx[1][1] = axisY.y;
-    posMtx[1][2] = axisZ.y;
-    posMtx[1][3] = ptcl->mPosition.y;
-    posMtx[2][0] = baseAxis.z;
-    posMtx[2][1] = axisY.z;
-    posMtx[2][2] = axisZ.z;
-    posMtx[2][3] = ptcl->mPosition.z;
-    p_plane[work->mPlaneType](posMtx, scaleX, scaleY);
-    return true;
-}
-
-static bool make_rot_direction_mtx(JPAEmitterWorkData* work, JPABaseParticle* ptcl, Mtx posMtx) {
-    f32 sinRot = JMASSin(ptcl->mRotateAngle);
-    f32 cosRot = JMASCos(ptcl->mRotateAngle);
-    JGeometry::TVec3<f32> axisY;
-    JGeometry::TVec3<f32> axisZ;
-    JGeometry::TVec3<f32> baseAxis(ptcl->mBaseAxis);
-    p_direction[work->mDirType](work, ptcl, &axisY);
-    if (axisY.isZero()) {
-        return false;
-    }
-
-    axisY.normalize();
-    axisZ.cross(baseAxis, axisY);
-    if (axisZ.isZero()) {
-        return false;
-    }
-
-    axisZ.normalize();
-    baseAxis.cross(axisY, axisZ);
-    baseAxis.normalize();
-    ptcl->mBaseAxis.set(baseAxis);
-
-    f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
-    f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
-    Mtx rotMtx;
-    Mtx dirMtx;
-    p_rot[work->mRotType](sinRot, cosRot, rotMtx);
-    p_plane[work->mPlaneType](rotMtx, scaleX, scaleY);
-    dirMtx[0][0] = baseAxis.x;
-    dirMtx[0][1] = axisY.x;
-    dirMtx[0][2] = axisZ.x;
-    dirMtx[0][3] = ptcl->mPosition.x;
-    dirMtx[1][0] = baseAxis.y;
-    dirMtx[1][1] = axisY.y;
-    dirMtx[1][2] = axisZ.y;
-    dirMtx[1][3] = ptcl->mPosition.y;
-    dirMtx[2][0] = baseAxis.z;
-    dirMtx[2][1] = axisY.z;
-    dirMtx[2][2] = axisZ.z;
-    dirMtx[2][3] = ptcl->mPosition.z;
-    MTXConcat(dirMtx, rotMtx, posMtx);
-    return true;
-}
-
 void JPAInterpDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JGeometry::TVec3<f32> axisY;
     JGeometry::TVec3<f32> axisZ;
@@ -1040,7 +823,7 @@ void JPAInterpRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
 }
 #endif
 
-void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -1049,12 +832,8 @@ void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_C
 
     Mtx posMtx;
 #if TARGET_PC
-    if (!dusk::frame_interp::lookup_replacement(ptcl, posMtx) &&
-        !make_direction_mtx(work, ptcl, posMtx))
-    {
-        return;
-    }
-#else
+    if (!dusk::frame_interp::lookup_replacement(ptcl, posMtx))
+#endif
     {
         JGeometry::TVec3<f32> axisY;
         JGeometry::TVec3<f32> axisZ;
@@ -1090,19 +869,14 @@ void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_C
         posMtx[2][3] = ptcl->mPosition.z;
         p_plane[work->mPlaneType](posMtx, scaleX, scaleY);
     }
-#endif
 
     MTXConcat(work->mPosCamMtx, posMtx, posMtx);
-#if TARGET_PC
-    submit_particle_quad(work, ctx, posMtx, p_dl[work->mDLType], sizeof(jpa_dl));
-#else
     GXLoadPosMtxImm(posMtx, GX_PNMTX0);
     p_prj[work->mPrjType](work, posMtx);
     GXCallDisplayList(p_dl[work->mDLType], sizeof(jpa_dl));
-#endif
 }
 
-void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -1112,12 +886,8 @@ void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRA
     Mtx mtx1;
     Mtx mtx2;
 #if TARGET_PC
-    if (!dusk::frame_interp::lookup_replacement(ptcl, mtx1) &&
-        !make_rot_direction_mtx(work, ptcl, mtx1))
-    {
-        return;
-    }
-#else
+    if (!dusk::frame_interp::lookup_replacement(ptcl, mtx1))
+#endif
     {
         f32 sinRot = JMASSin(ptcl->mRotateAngle);
         f32 cosRot = JMASCos(ptcl->mRotateAngle);
@@ -1157,18 +927,13 @@ void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRA
         mtx2[2][3] = ptcl->mPosition.z;
         MTXConcat(mtx2, mtx1, mtx1);
     }
-#endif
     MTXConcat(work->mPosCamMtx, mtx1, mtx2);
-#if TARGET_PC
-    submit_particle_quad(work, ctx, mtx2, p_dl[work->mDLType], sizeof(jpa_dl));
-#else
     GXLoadPosMtxImm(mtx2, GX_PNMTX0);
     p_prj[work->mPrjType](work, mtx2);
     GXCallDisplayList(p_dl[work->mDLType], sizeof(jpa_dl));
-#endif
 }
 
-void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -1205,7 +970,7 @@ void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA
     GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
 }
 
-void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -1223,16 +988,12 @@ void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_D
     auStack_88[1][3] = param_1->mPosition.y;
     auStack_88[2][3] = param_1->mPosition.z;
     MTXConcat(param_0->mPosCamMtx, auStack_88, auStack_88);
-#if TARGET_PC
-    submit_particle_quad(param_0, ctx, auStack_88, p_dl[param_0->mDLType], sizeof(jpa_dl));
-#else
     GXLoadPosMtxImm(auStack_88, 0);
     p_prj[param_0->mPrjType](param_0, auStack_88);
     GXCallDisplayList(p_dl[param_0->mDLType], sizeof(jpa_dl));
-#endif
 }
 
-void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -1249,7 +1010,7 @@ void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_P
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
 }
 
-void JPADrawLine(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawLine(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(JPAPtclStts_Invisible)) {
         return;
     }
@@ -1325,7 +1086,7 @@ void JPADrawStripe(JPAEmitterWorkData* param_0) {
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
     GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT1, ptcl_num << 1);
-    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd();
+    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd(); 
                                                      node = node_func(node), coord += step) {
         param_0->mpCurNode = node;
         JPABaseParticle* particle = node->getObject();
@@ -1350,7 +1111,7 @@ void JPADrawStripe(JPAEmitterWorkData* param_0) {
         }
         particle->mBaseAxis.cross(local_f8, local_104);
         particle->mBaseAxis.normalize();
-
+        
         local_c8[0][0] = local_104.x;
         local_c8[0][1] = local_f8.x;
         local_c8[0][2] = particle->mBaseAxis.x;
@@ -1416,7 +1177,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
     GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT1, ptcl_num << 1);
-    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd();
+    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd(); 
                                                      node = node_func(node), coord += step) {
         param_0->mpCurNode = node;
         JPABaseParticle* particle = node->getObject();
@@ -1441,7 +1202,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
         }
         particle->mBaseAxis.cross(local_c0, local_cc);
         particle->mBaseAxis.normalize();
-
+        
         local_90[0][0] = local_cc.x;
         local_90[0][1] = local_c0.x;
         local_90[0][2] = particle->mBaseAxis.x;
@@ -1466,7 +1227,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
 
     coord = start_coord;
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT1, ptcl_num << 1);
-    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd();
+    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd(); 
                                                      node = node_func(node), coord += step) {
         param_0->mpCurNode = node;
         JPABaseParticle* particle = node->getObject();
@@ -1491,7 +1252,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
         }
         particle->mBaseAxis.cross(local_c0, local_cc);
         particle->mBaseAxis.normalize();
-
+        
         local_90[0][0] = local_cc.x;
         local_90[0][1] = local_c0.x;
         local_90[0][2] = particle->mBaseAxis.x;
@@ -1528,7 +1289,7 @@ void JPADrawEmitterCallBackB(JPAEmitterWorkData* work) {
     emtr->mpEmtrCallBack->draw(emtr);
 }
 
-void JPADrawParticleCallBack(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawParticleCallBack(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     if (emtr->mpPtclCallBack == NULL) {
         return;

libs/JSystem/src/JParticle/JPAParticle.cpp

@@ -206,7 +206,8 @@ void JPABaseParticle::init_c(JPAEmitterWorkData* work, JPABaseParticle* parent)
 
 #if TARGET_PC
 void JPABaseParticle::interp(JPAEmitterWorkData* work, void const* drawFunc) {
-    if (!dusk::frame_interp::is_enabled())
+    static bool enable = false;
+    if (!enable)
         return;
 
     // don't interpolate the first frame

libs/JSystem/src/JParticle/JPAResource.cpp

@@ -18,21 +18,9 @@
 #include "global.h"
 #include "tracy/Tracy.hpp"
 
-#if TARGET_PC
-#define JPA_DRAW_CTX_ARG , &ctx
-#else
-#define JPA_DRAW_CTX_ARG
-#endif
-
 JPAResource::JPAResource() {
     mpCalcEmitterFuncList = mpDrawEmitterFuncList = mpDrawEmitterChildFuncList = NULL;
-#if TARGET_PC
-    mpCalcParticleFuncList = mpCalcParticleChildFuncList = NULL;
-    mpDrawParticleFuncList = mpDrawParticleChildFuncList = NULL;
-    mBatchInfo = {};
-#else
     mpCalcParticleFuncList = mpDrawParticleFuncList = mpCalcParticleChildFuncList = mpDrawParticleChildFuncList = NULL;
-#endif
     pBsp = NULL;
     pEsp = NULL;
     pCsp = NULL;
@@ -73,60 +61,6 @@ static u8 jpa_crd[32] ATTRIBUTE_ALIGN(32) = {
     0x00, 0x00, 0x01, 0x00, 0x01, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02,
 };
 
-#if TARGET_PC
-void JPAResource::initBatchInfo() {
-    mBatchInfo = {};
-
-    bool hasDrawFunc = false;
-    for (int i = 0; i < mpDrawParticleFuncListNum; i++) {
-        DrawParticleFunc func = mpDrawParticleFuncList[i];
-        if (func == JPADrawBillboard || func == JPADrawRotBillboard ||
-            func == JPADrawYBillboard || func == JPADrawRotYBillboard ||
-            func == JPADrawDirection || func == JPADrawRotDirection || func == JPADrawRotation)
-        {
-            hasDrawFunc = true;
-        } else if (func == JPADrawParticleCallBack) {
-            // Batchable only for emitters without a particle callback; checked per draw
-        } else if (func == JPALoadCalcTexCrdMtxAnm) {
-            mBatchInfo.hasPtclTexMtx = true;
-        } else if (func == JPARegistAlpha || func == JPARegistPrmAlpha ||
-                   func == JPARegistPrmAlphaEnv || func == JPARegistAlphaEnv ||
-                   func == static_cast<DrawParticleFunc>(JPARegistEnv)) // overloaded
-        {
-            mBatchInfo.hasPtclColor = true;
-        } else {
-            // JPADrawPoint, JPADrawLine, JPADrawDBillboard, JPALoadTexAnm,
-            // JPASetPointSize, JPASetLineWidth
-            return;
-        }
-    }
-    if (!hasDrawFunc) {
-        return;
-    }
-
-    // Template array offsets, same math as setPTev
-    int base_plane_type = (pBsp->getType() == 3 || pBsp->getType() == 7) ?
-        pBsp->getBasePlaneType() : 0;
-    int center_offset = pEsp != nullptr ? (pEsp->getScaleCenterX() + 3 * pEsp->getScaleCenterY()) * 0xC : 0x30;
-    const s8* pos = reinterpret_cast<const s8*>(jpa_pos) + center_offset + base_plane_type * 0x6C;
-    const s8* crd = reinterpret_cast<const s8*>(jpa_crd) + (pBsp->getTilingS() + 2 * pBsp->getTilingT()) * 8;
-
-    bool cross = pBsp->getType() == 4 || pBsp->getType() == 8;
-    mBatchInfo.vtxCount = cross ? 8 : 4;
-    for (int i = 0; i < mBatchInfo.vtxCount; i++) {
-        int posIdx = i < 4 ? i : 72 + (i - 4);
-        int crdIdx = i & 3;
-        mBatchInfo.vtxPos[i][0] = pos[posIdx * 3 + 0];
-        mBatchInfo.vtxPos[i][1] = pos[posIdx * 3 + 1];
-        mBatchInfo.vtxPos[i][2] = pos[posIdx * 3 + 2];
-        mBatchInfo.vtxUv[i][0] = crd[crdIdx * 2 + 0];
-        mBatchInfo.vtxUv[i][1] = crd[crdIdx * 2 + 1];
-    }
-
-    mBatchInfo.supported = true;
-}
-#endif
-
 void JPAResource::init(JKRHeap* heap) {
     BOOL is_glbl_clr_anm = pBsp->isGlblClrAnm();
     BOOL is_glbl_tex_anm = pBsp->isGlblTexAnm();
@@ -591,10 +525,7 @@ void JPAResource::init(JKRHeap* heap) {
 
     if (mpDrawParticleFuncListNum != 0) {
         mpDrawParticleFuncList =
-            (DrawParticleFunc*)JKRAllocFromHeap(
-                heap,
-                mpDrawParticleFuncListNum * sizeof(DrawParticleFunc),
-                alignof(DrawParticleFunc));
+            (ParticleFunc*)JKRAllocFromHeap(heap, mpDrawParticleFuncListNum * sizeof(ParticleFunc), alignof(ParticleFunc));
     }
 
     func_no = 0;
@@ -704,10 +635,7 @@ void JPAResource::init(JKRHeap* heap) {
 
     if (mpDrawParticleChildFuncListNum != 0) {
         mpDrawParticleChildFuncList =
-            (DrawParticleFunc*)JKRAllocFromHeap(
-                heap,
-                mpDrawParticleChildFuncListNum * sizeof(DrawParticleFunc),
-                alignof(DrawParticleFunc));
+            (ParticleFunc*)JKRAllocFromHeap(heap, mpDrawParticleChildFuncListNum * sizeof(ParticleFunc), sizeof(EmitterFunc));
     }
 
     func_no = 0;
@@ -771,10 +699,6 @@ void JPAResource::init(JKRHeap* heap) {
         mpDrawParticleChildFuncList[func_no] = &JPARegistPrmAlphaEnv;
         func_no++;
     }
-
-#if TARGET_PC
-    initBatchInfo();
-#endif
 }
 
 bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
@@ -837,15 +761,6 @@ bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
             }
         }
 
-#ifdef TARGET_PC
-        if (((pBsp && pBsp->getDirType() == 3) || (pCsp && pCsp->getDirType() == 3)) &&
-            dusk::frame_interp::is_enabled())
-        {
-            // ensure mGlobalEmtrDir is valid
-            calcWorkData_d(work);
-        }
-#endif
-
         JPANode<JPABaseParticle>* next = NULL;
         for (JPANode<JPABaseParticle>* node = emtr->mAlivePtclBase.getFirst(); node != emtr->mAlivePtclBase.getEnd(); node = next) {
             next = node->getNext();
@@ -884,183 +799,6 @@ void JPAResource::draw(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
     }
 }
 
-#if TARGET_PC
-static GXTevAlphaArg to_vtx_alpha_arg(GXTevAlphaArg arg) {
-    return arg == GX_CA_A0 ? GX_CA_RASA : arg;
-}
-
-static void batch_set_tev_op(GXTevStageID stage) {
-    GXSetTevColorOp(stage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-    GXSetTevAlphaOp(stage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-}
-
-static void batch_setup_tev(JPAEmitterWorkData* work, bool useClr1) {
-    JPABaseShape* shape = work->mpRes->getBsp();
-    JPAExTexShape* ets = work->mpRes->getEts();
-    bool useIndirect = ets != nullptr && ets->isUseIndirect();
-
-    // JPAEmitterManager::draw configures both channels to pass vertex color through
-    GXSetNumChans(useClr1 ? 2 : 1);
-
-    const GXTevAlphaArg* alphaArg = shape->getTevAlphaArg();
-    GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
-    GXSetTevAlphaIn(GX_TEVSTAGE0, to_vtx_alpha_arg(alphaArg[0]), to_vtx_alpha_arg(alphaArg[1]),
-                    to_vtx_alpha_arg(alphaArg[2]), to_vtx_alpha_arg(alphaArg[3]));
-    batch_set_tev_op(GX_TEVSTAGE0);
-    if (!useIndirect) {
-        GXSetTevDirect(GX_TEVSTAGE0);
-    }
-    GXTevStageID nextStage = GX_TEVSTAGE1;
-
-    switch (shape->getTevColorArgSel()) {
-    case 0: // TEXC
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_ONE, GX_CC_ZERO);
-        break;
-    case 1: // C0 * TEXC
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO);
-        break;
-    case 2: // lerp(C0, 1, TEXC)
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_RASC, GX_CC_ONE, GX_CC_TEXC, GX_CC_ZERO);
-        break;
-    case 3: // lerp(C1, C0, TEXC) = C0 * TEXC (stage 0) + C1 * (1 - TEXC) (stage 1)
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO);
-        GXSetTevOrder(nextStage, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR1A1);
-        GXSetTevColorIn(nextStage, GX_CC_RASC, GX_CC_ZERO, GX_CC_TEXC, GX_CC_CPREV);
-        GXSetTevAlphaIn(nextStage, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV);
-        batch_set_tev_op(nextStage);
-        GXSetTevDirect(nextStage);
-        nextStage = static_cast<GXTevStageID>(nextStage + 1);
-        break;
-    case 4: // TEXC * C0 + C1: C0 * TEXC (stage 0), + C1 (stage 1)
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO);
-        GXSetTevOrder(nextStage, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR1A1);
-        GXSetTevColorIn(nextStage, GX_CC_CPREV, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC);
-        GXSetTevAlphaIn(nextStage, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV);
-        batch_set_tev_op(nextStage);
-        GXSetTevDirect(nextStage);
-        nextStage = static_cast<GXTevStageID>(nextStage + 1);
-        break;
-    case 5: // C0
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC);
-        break;
-    }
-
-    if (ets != nullptr && ets->isUseSecTex()) {
-        // Mirrors setPTev's secondary texture stage, at the next free stage
-        GXTexCoordID texCoord = useIndirect ? GX_TEXCOORD2 : GX_TEXCOORD1;
-        GXSetTevOrder(nextStage, texCoord, GX_TEXMAP3, GX_COLOR_NULL);
-        GXSetTevColorIn(nextStage, GX_CC_ZERO, GX_CC_TEXC, GX_CC_CPREV, GX_CC_ZERO);
-        GXSetTevAlphaIn(nextStage, GX_CA_ZERO, GX_CA_TEXA, GX_CA_APREV, GX_CA_ZERO);
-        batch_set_tev_op(nextStage);
-        GXSetTevDirect(nextStage);
-        nextStage = static_cast<GXTevStageID>(nextStage + 1);
-    }
-
-    GXSetNumTevStages(nextStage);
-}
-
-static void batch_setup_vtx_desc(bool useClr0, bool useClr1) {
-    static Mtx identityMtx = {
-        {1.0f, 0.0f, 0.0f, 0.0f},
-        {0.0f, 1.0f, 0.0f, 0.0f},
-        {0.0f, 0.0f, 1.0f, 0.0f},
-    };
-
-    GXLoadPosMtxImm(identityMtx, GX_PNMTX0);
-    GXSetCurrentMtx(GX_PNMTX0);
-    GXClearVtxDesc();
-    GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
-    if (useClr0) {
-        GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT);
-    }
-    if (useClr1) {
-        GXSetVtxDesc(GX_VA_CLR1, GX_DIRECT);
-    }
-    GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    if (useClr0) {
-        GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    }
-    if (useClr1) {
-        GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR1, GX_CLR_RGBA, GX_RGBA8, 0);
-    }
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-}
-
-static void batch_restore_gx(JPAEmitterWorkData* work, bool changedTev, bool changedTexMtx) {
-    GXClearVtxDesc();
-    GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
-    GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_S8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetCurrentMtx(GX_PNMTX0);
-
-    if (changedTexMtx) {
-        GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX0);
-    }
-
-    if (changedTev) {
-        GXSetNumChans(0);
-        work->mpRes->getBsp()->setGX(work);
-        work->mpRes->setPTev();
-    }
-}
-
-static bool draw_particle_batch(JPAEmitterWorkData* work) {
-    ZoneScoped;
-
-    JPAResource* res = work->mpRes;
-    const JPAResource::BatchInfo& info = res->mBatchInfo;
-    if (!info.supported || work->mPrjType != 0 || work->mpEmtr->mpPtclCallBack != nullptr) {
-        return false;
-    }
-
-    bool useClr0 = false;
-    bool useClr1 = false;
-    if (info.hasPtclColor) {
-        u32 colorSel = res->getBsp()->getTevColorArgSel();
-        if (colorSel >= 6) {
-            return false;
-        }
-        useClr0 = true;
-        useClr1 = colorSel == 3 || colorSel == 4;
-        batch_setup_tev(work, useClr1);
-    }
-
-    if (info.hasPtclTexMtx) {
-        // UVs are CPU-transformed; drop the texgen
-        GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
-    }
-
-    batch_setup_vtx_desc(useClr0, useClr1);
-
-    ParticleDrawCtx ctx{};
-    ctx.batch = true;
-    ctx.useTexMtx = info.hasPtclTexMtx;
-    ctx.useClr0 = useClr0;
-    ctx.useClr1 = useClr1;
-
-    bool fwdAhead = res->getBsp()->isDrawFwdAhead();
-    JPANode<JPABaseParticle>* node = fwdAhead ? work->mpEmtr->mAlivePtclBase.getLast() :
-                                                work->mpEmtr->mAlivePtclBase.getFirst();
-
-    GXBegin(GX_QUADS, GX_VTXFMT1, GX_AUTO);
-    while (node != work->mpEmtr->mAlivePtclBase.getEnd()) {
-        work->mpCurNode = node;
-        for (int i = res->mpDrawParticleFuncListNum - 1; i >= 0; i--) {
-            (*res->mpDrawParticleFuncList[i])(work, node->getObject(), &ctx);
-        }
-        node = fwdAhead ? node->getPrev() : node->getNext();
-    }
-    GXEnd();
-
-    batch_restore_gx(work, useClr0, info.hasPtclTexMtx);
-    return true;
-}
-#endif
-
 void JPAResource::drawP(JPAEmitterWorkData* work) {
     ZoneScoped;
     work->mpEmtr->clearStatus(0x80);
@@ -1095,25 +833,13 @@ void JPAResource::drawP(JPAEmitterWorkData* work) {
         (*mpDrawEmitterFuncList[i])(work);
     }
 
-#if TARGET_PC
-    if (draw_particle_batch(work)) {
-        GXSetMisc(GX_MT_XF_FLUSH, 0);
-        if (work->mpEmtr->mpEmtrCallBack != nullptr) {
-            work->mpEmtr->mpEmtrCallBack->drawAfter(work->mpEmtr);
-        }
-        return;
-    }
-
-    ParticleDrawCtx ctx{}; // immediate mode
-#endif
-
     if (pBsp->isDrawFwdAhead()) {
         JPANode<JPABaseParticle>* node = work->mpEmtr->mAlivePtclBase.getLast();
         for (; node != work->mpEmtr->mAlivePtclBase.getEnd(); node = node->getPrev()) {
             work->mpCurNode = node;
             if (mpDrawParticleFuncList != NULL) {
                 for (int i = mpDrawParticleFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleFuncList[i])(work, node->getObject());
                 }
             }
         }
@@ -1123,7 +849,7 @@ void JPAResource::drawP(JPAEmitterWorkData* work) {
             work->mpCurNode = node;
             if (mpDrawParticleFuncList != NULL) {
                 for (int i = mpDrawParticleFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleFuncList[i])(work, node->getObject());
                 }
             }
         }
@@ -1170,17 +896,13 @@ void JPAResource::drawC(JPAEmitterWorkData* work) {
         (*mpDrawEmitterChildFuncList[i])(work);
     }
 
-#if TARGET_PC
-    ParticleDrawCtx ctx{}; // immediate mode
-#endif
-
     if (pBsp->isDrawFwdAhead()) {
         JPANode<JPABaseParticle>* node = work->mpEmtr->mAlivePtclChld.getLast();
         for (; node != work->mpEmtr->mAlivePtclChld.getEnd(); node = node->getPrev()) {
             work->mpCurNode = node;
             if (mpDrawParticleChildFuncList != NULL) {
                 for (int i = mpDrawParticleChildFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleChildFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleChildFuncList[i])(work, node->getObject());
                 }
             }
         }
@@ -1190,7 +912,7 @@ void JPAResource::drawC(JPAEmitterWorkData* work) {
             work->mpCurNode = node;
             if (mpDrawParticleChildFuncList != NULL) {
                 for (int i = mpDrawParticleChildFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleChildFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleChildFuncList[i])(work, node->getObject());
                 }
             }
         }

libs/JSystem/src/JUtility/JUTResFont.cpp

@@ -249,7 +249,6 @@ f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, i
     f32 x2;
     f32 y1;
 
-    ZoneScoped;
     JUT_ASSERT(378, mValid);
     JUTFont::TWidth width;
     loadFont(str_int, GX_TEXMAP0, &width FONT_DRAW_CTX_ARG);

platforms/android/app/src/main/java/com/twilitrealm/dusk/DuskActivity.java

@@ -4,7 +4,6 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
-import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -15,16 +14,12 @@ import android.provider.DocumentsContract;
 import android.provider.OpenableColumns;
 import android.provider.Settings;
 import android.util.Log;
-import android.view.Display;
-import android.view.Surface;
-import android.view.SurfaceHolder;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowInsetsController;
 
 import org.libsdl.app.SDLActivity;
-import org.libsdl.app.SDLSurface;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,7 +27,6 @@ import java.util.List;
 
 public class DuskActivity extends SDLActivity {
     private static final String TAG = "DuskActivity";
-    private static final float DEFAULT_SURFACE_FRAME_RATE = 60.0f;
     private static final int FOLDER_DIALOG_REQUEST_CODE = 0x4455;
     private static final int MANAGE_STORAGE_REQUEST_CODE = 0x4456;
     private static final String EXTERNAL_STORAGE_AUTHORITY =
@@ -94,11 +88,6 @@ public class DuskActivity extends SDLActivity {
         hideSystemBars();
     }
 
-    @Override
-    protected SDLSurface createSDLSurface(Context context) {
-        return new DuskSurface(context);
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -150,77 +139,6 @@ public class DuskActivity extends SDLActivity {
         };
     }
 
-    public void setPreferredSurfaceFrameRate(float frameRate) {
-        runOnUiThread(() -> {
-            if (mSurface instanceof DuskSurface) {
-                ((DuskSurface)mSurface).setPreferredFrameRate(frameRate);
-            }
-        });
-    }
-
-    private static final class DuskSurface extends SDLSurface {
-        private float preferredFrameRate = DEFAULT_SURFACE_FRAME_RATE;
-
-        DuskSurface(Context context) {
-            super(context);
-        }
-
-        @Override
-        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-            super.surfaceChanged(holder, format, width, height);
-            setTargetFrameRate(holder);
-        }
-
-        void setPreferredFrameRate(float frameRate) {
-            preferredFrameRate = frameRate;
-            setTargetFrameRate(getHolder());
-        }
-
-        private void setTargetFrameRate(SurfaceHolder holder) {
-            if (!mIsSurfaceReady || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-                return;
-            }
-
-            Surface surface = holder != null ? holder.getSurface() : getHolder().getSurface();
-            if (surface == null || !surface.isValid()) {
-                return;
-            }
-
-            float targetFrameRate = getMaxSupportedFrameRate();
-            if (preferredFrameRate > 0.0f) {
-                targetFrameRate = preferredFrameRate;
-            }
-            if (targetFrameRate <= 0.0f) {
-                return;
-            }
-
-            try {
-                surface.setFrameRate(
-                    targetFrameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT);
-                Log.v(TAG, "Requested surface frame rate " + targetFrameRate + " fps");
-            } catch (RuntimeException e) {
-                Log.w(TAG, "Failed to request surface frame rate", e);
-            }
-        }
-
-        private float getMaxSupportedFrameRate() {
-            if (mDisplay == null) {
-                return 0.0f;
-            }
-
-            float maxFrameRate = mDisplay.getRefreshRate();
-            Display.Mode[] modes = mDisplay.getSupportedModes();
-            if (modes == null) {
-                return maxFrameRate;
-            }
-
-            for (Display.Mode mode : modes) {
-                maxFrameRate = Math.max(maxFrameRate, mode.getRefreshRate());
-            }
-            return maxFrameRate;
-        }
-    }
-
     @Override
     protected String[] getArguments() {
         Intent intent = getIntent();

platforms/android/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java

@@ -19,13 +19,9 @@ import android.os.*;
 
 import java.lang.Runnable;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.UUID;
 
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
 class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDevice {
 
     private static final String TAG = "hidapi";
@@ -37,19 +33,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
     private boolean mIsConnected = false;
     private boolean mIsChromebook = false;
     private boolean mIsReconnecting = false;
-    private boolean mHasEnabledNotifications = false;
-    private boolean mHasSeenInputUpdate = false;
     private boolean mFrozen = false;
     private LinkedList<GattOperation> mOperations;
     GattOperation mCurrentOperation = null;
     private Handler mHandler;
-    private int mProductId = -1;
-    private int mReportId = 0;
-    private UUID mInputCharacteristic;
-
-    private static final int D0G_BLE2_PID = 0x1106;
-    private static final int TRITON_BLE_PID = 0x1303;
-
 
     private static final int TRANSPORT_AUTO = 0;
     private static final int TRANSPORT_BREDR = 1;
@@ -58,14 +45,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
     private static final int CHROMEBOOK_CONNECTION_CHECK_INTERVAL = 10000;
 
     static final UUID steamControllerService = UUID.fromString("100F6C32-1735-4313-B402-38567131E5F3");
-    static final UUID inputCharacteristicD0G = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
-    static final UUID inputCharacteristicTriton_0x45 = UUID.fromString("100F6C7A-1735-4313-B402-38567131E5F3");
-    static final UUID inputCharacteristicTriton_0x47 = UUID.fromString("100F6C7C-1735-4313-B402-38567131E5F3");
+    static final UUID inputCharacteristic = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
     static final UUID reportCharacteristic = UUID.fromString("100F6C34-1735-4313-B402-38567131E5F3");
     static private final byte[] enterValveMode = new byte[] { (byte)0xC0, (byte)0x87, 0x03, 0x08, 0x07, 0x00 };
 
-    private HashMap<Integer, BluetoothGattCharacteristic> mOutputReportChars = new HashMap<Integer, BluetoothGattCharacteristic>();
-
     static class GattOperation {
         private enum Operation {
             CHR_READ,
@@ -78,7 +61,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
         byte[] mValue;
         BluetoothGatt mGatt;
         boolean mResult = true;
-        int mDelayMs = 0;
 
         private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid) {
             mGatt = gatt;
@@ -86,13 +68,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
             mUuid = uuid;
         }
 
-        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, int delayMs) {
-            mGatt = gatt;
-            mOp = operation;
-            mUuid = uuid;
-            mDelayMs = delayMs;
-        }        
-
         private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, byte[] value) {
             mGatt = gatt;
             mOp = operation;
@@ -100,14 +75,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
             mValue = value;
         }
 
-        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, byte[] value, int delayMs) {
-            mGatt = gatt;
-            mOp = operation;
-            mUuid = uuid;
-            mValue = value;
-            mDelayMs = delayMs;
-        }
-
         public void run() {
             // This is executed in main thread
             BluetoothGattCharacteristic chr;
@@ -169,8 +136,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
             return mResult;
         }
 
-        public int getDelayMs() { return mDelayMs; }
-
         private BluetoothGattCharacteristic getCharacteristic(UUID uuid) {
             BluetoothGattService valveService = mGatt.getService(steamControllerService);
             if (valveService == null)
@@ -189,10 +154,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
         static public GattOperation enableNotification(BluetoothGatt gatt, UUID uuid) {
             return new GattOperation(gatt, Operation.ENABLE_NOTIFICATION, uuid);
         }
-
-        static public GattOperation enableNotification(BluetoothGatt gatt, UUID uuid, int delayMs) {
-            return new GattOperation(gatt, Operation.ENABLE_NOTIFICATION, uuid, delayMs);
-        }
     }
 
     HIDDeviceBLESteamController(HIDDeviceManager manager, BluetoothDevice device) {
@@ -205,8 +166,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
         mHandler = new Handler(Looper.getMainLooper());
 
         mGatt = connectGatt();
-        mHasEnabledNotifications = false;
-        mHasSeenInputUpdate = false;
         // final HIDDeviceBLESteamController finalThis = this;
         // mHandler.postDelayed(new Runnable() {
         //     @Override
@@ -355,45 +314,8 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                 Log.v(TAG, "Found Valve steam controller service " + service.getUuid());
 
                 for (BluetoothGattCharacteristic chr : service.getCharacteristics()) {
-                    if (chr.getUuid().equals(inputCharacteristicTriton_0x45)) {
-                        Log.v(TAG, "Found Triton input characteristic 0x45");
-                        mProductId = TRITON_BLE_PID;
-                        mReportId = 0x45;
-                        mInputCharacteristic = chr.getUuid();
-                    } else if (chr.getUuid().equals(inputCharacteristicTriton_0x47)) {
-                        Log.v(TAG, "Found Triton input characteristic 0x47");
-                        mProductId = TRITON_BLE_PID;
-                        mReportId = 0x47;
-                        mInputCharacteristic = chr.getUuid();
-                    } else if (chr.getUuid().equals(inputCharacteristicD0G)) {
-                        Log.v(TAG, "Found D0G input characteristic");
-                        mProductId = D0G_BLE2_PID;
-                        mReportId = 0x03;
-                        mInputCharacteristic = chr.getUuid();
-                    } else {
-                        Pattern reportPattern = Pattern.compile("100F6C([0-9A-Z]{2})", Pattern.CASE_INSENSITIVE);
-                        Matcher matcher = reportPattern.matcher(chr.getUuid().toString());
-
-                        if (matcher.find()) {
-                            try {
-                                int reportId = Integer.parseInt(matcher.group(1), 16);
-
-                                reportId -= 0x35;
-                                if (reportId >= 0x80) {
-                                    // This is a Triton output report characteristic that we need to care about.
-                                    Log.v(TAG, "Found Triton output report 0x" + Integer.toString(reportId, 16));
-                                    mOutputReportChars.put(reportId, chr);
-                                }
-                            }
-                            catch (NumberFormatException nfe) {
-                                Log.w(TAG, "Could not parse report characteristic " + chr.getUuid().toString() + ": " + nfe.toString());
-                            }
-                        }
-                    }
-                }
-
-                for (BluetoothGattCharacteristic chr : service.getCharacteristics()) {
-                    if (chr.getUuid().equals(mInputCharacteristic)) {
+                    if (chr.getUuid().equals(inputCharacteristic)) {
+                        Log.v(TAG, "Found input characteristic");
                         // Start notifications
                         BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
                         if (cccd != null) {
@@ -450,30 +372,21 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
             mCurrentOperation = mOperations.removeFirst();
         }
 
-        Runnable gattOperationRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (mOperations) {
-                        if (mCurrentOperation == null) {
-                            Log.e(TAG, "Current operation null in executor?");
-                            return;
-                        }
-
-                        mCurrentOperation.run();
-                        // now wait for the GATT callback and when it comes, finish this operation
+        // Run in main thread
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (mOperations) {
+                    if (mCurrentOperation == null) {
+                        Log.e(TAG, "Current operation null in executor?");
+                        return;
                     }
+
+                    mCurrentOperation.run();
+                    // now wait for the GATT callback and when it comes, finish this operation
                 }
-            };
-
-        if (mCurrentOperation.getDelayMs() == 0) {
-            // Run in main thread
-            mHandler.post(gattOperationRunnable);
-        }
-        else {
-            // If we have a delay on this operation, wait before we post it.
-            mHandler.postDelayed(gattOperationRunnable, mCurrentOperation.getDelayMs());
-        }
-
+            }
+        });
     }
 
     private void queueGattOperation(GattOperation op) {
@@ -484,39 +397,8 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
     }
 
     private void enableNotification(UUID chrUuid) {
-        // Add a 500ms delay to notification write for Amazon Fire TV devices, as otherwise if we do this too quickly after connecting
-        // it will return success and then silently drop the operation on the floor.
-        GattOperation op = HIDDeviceBLESteamController.GattOperation.enableNotification(mGatt, chrUuid, 500);
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.enableNotification(mGatt, chrUuid);
         queueGattOperation(op);
-
-        // Amazon Fire devices can also silently timeout on writeDescriptor, so
-        // set up a little delayed check that will attempt to write a second time.
-        //
-        // While this only seems to be needed on Amazon Fire TV devices at present, it
-        // doesn't hurt to have a retry on other devices as well.
-        //
-        final HIDDeviceBLESteamController finalThis = this;
-        final UUID finalUuid = chrUuid;
-        mHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (!finalThis.mHasEnabledNotifications) {
-
-                    if (finalThis.mHasSeenInputUpdate) {
-                        // Amazon Five devices may have enabled notifications on the input characteristic and not given us a callback. If we've seen
-                        // input reports, though, somewhat by definition notifications are enabled.
-                        Log.w(TAG, "WriteDescriptor has never returned, but we've seen input reports. Moving on with controller initialization.");
-                        finalThis.mHasEnabledNotifications = true;
-                        finalThis.enableValveMode();
-                        return;
-                    }
-
-                    // Give one more try.
-                    GattOperation retry = HIDDeviceBLESteamController.GattOperation.enableNotification(finalThis.mGatt, finalUuid, 500);
-                    finalThis.queueGattOperation(retry);
-                }
-            }
-        }, 1000);            
     }
 
     void writeCharacteristic(UUID uuid, byte[] value) {
@@ -566,16 +448,8 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                 mIsConnected = false;
                 gatt.disconnect();
                 mGatt = connectGatt(false);
-            } else {
-                if (getProductId() == TRITON_BLE_PID) {
-                    // Android will not properly play well with Data Length Extensions without manually requesting a large MTU,
-                    // and Triton controllers require DLE support.
-                    //
-                    // 517 is basically a "magic number" as far as Android's bluetooth code is concerned, so do not change
-                    // this value. It is functionally "please enable data length extensions" on some Android builds.
-                    mGatt.requestMtu(517);
-                }
-
+            }
+            else {
                 probeService(this);
             }
         }
@@ -600,7 +474,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
             // Only register controller with the native side once it has been fully configured
             if (!isRegistered()) {
                 Log.v(TAG, "Registering Steam Controller with ID: " + getId());
-                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true, mReportId);
+                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true);
                 setRegistered();
             }
         }
@@ -613,8 +487,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
     // Enable this for verbose logging of controller input reports
         //Log.v(TAG, "onCharacteristicChanged uuid=" + characteristic.getUuid() + " data=" + HexDump.dumpHexString(characteristic.getValue()));
 
-        if (characteristic.getUuid().equals(mInputCharacteristic) && !mFrozen) {
-            mHasSeenInputUpdate = true;
+        if (characteristic.getUuid().equals(inputCharacteristic) && !mFrozen) {
             mManager.HIDDeviceInputReport(getId(), characteristic.getValue());
         }
     }
@@ -624,36 +497,19 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
         //Log.v(TAG, "onDescriptorRead status=" + status);
     }
 
-    private void enableValveMode()
-    {
-        BluetoothGattService valveService = mGatt.getService(steamControllerService);
-        if (valveService == null)
-            return;
-
-        BluetoothGattCharacteristic reportChr = valveService.getCharacteristic(reportCharacteristic);
-        if (reportChr != null) {
-            if (getProductId() == TRITON_BLE_PID) {
-                // For Triton we just mark things registered.
-                Log.v(TAG, "Registering Triton Steam Controller with ID: " + getId());
-                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true, mReportId);
-                setRegistered();
-            } else {
-                // For the original controller, we need to manually enter Valve mode.
-                Log.v(TAG, "Writing report characteristic to enter valve mode");
-                reportChr.setValue(enterValveMode);
-                mGatt.writeCharacteristic(reportChr);
-            }
-        }
-    }
-
     @Override
     public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
         BluetoothGattCharacteristic chr = descriptor.getCharacteristic();
         //Log.v(TAG, "onDescriptorWrite status=" + status + " uuid=" + chr.getUuid() + " descriptor=" + descriptor.getUuid());
 
-        if (chr.getUuid().equals(mInputCharacteristic)) {
-            mHasEnabledNotifications = true;
-            enableValveMode();
+        if (chr.getUuid().equals(inputCharacteristic)) {
+            boolean hasWrittenInputDescriptor = true;
+            BluetoothGattCharacteristic reportChr = chr.getService().getCharacteristic(reportCharacteristic);
+            if (reportChr != null) {
+                Log.v(TAG, "Writing report characteristic to enter valve mode");
+                reportChr.setValue(enterValveMode);
+                gatt.writeCharacteristic(reportChr);
+            }
         }
 
         finishCurrentGattOperation();
@@ -692,20 +548,9 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
 
     @Override
     public int getProductId() {
-        if (mProductId > 0) {
-            // We've already set a product ID.
-            return mProductId;
-        }
-
-        if (mDevice.getName().startsWith("Steam Ctrl")) {
-            // We're a newer Triton device
-            mProductId = TRITON_BLE_PID;
-        } else {
-            // We're an OG Steam Controller
-            mProductId = D0G_BLE2_PID;
-        }
-
-        return mProductId;
+        // We don't have an easy way to query from the Bluetooth device, but we know what it is
+        final int D0G_BLE2_PID = 0x1106;
+        return D0G_BLE2_PID;
     }
 
     @Override
@@ -756,29 +601,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
             writeCharacteristic(reportCharacteristic, actual_report);
             return report.length;
         } else {
-            // If we're an original-recipe Steam Controller we just write to the characteristic directly.
-            if (getProductId() == D0G_BLE2_PID) {
-                //Log.v(TAG, "writeOutputReport " + HexDump.dumpHexString(report));
-                writeCharacteristic(reportCharacteristic, report);
-                return report.length;
-            }
-
-            // If we're a Triton, we need to find the correct report characteristic.
-            if (report.length > 0) {
-                int reportId = report[0] & 0xFF;
-                BluetoothGattCharacteristic targetedReportCharacteristic = mOutputReportChars.get(reportId);
-                if (targetedReportCharacteristic != null) {
-                    byte[] actual_report = Arrays.copyOfRange(report, 1, report.length - 1);
-                    //Log.v(TAG, "writeOutputReport 0x" + Integer.toString(reportId, 16) + " " + HexDump.dumpHexString(report));
-                    writeCharacteristic(targetedReportCharacteristic.getUuid(), actual_report);
-                    return report.length;
-                } else {
-                    Log.w(TAG, "Got report write request for unknown report type 0x" + Integer.toString(reportId, 16));
-                }
-            }
+            //Log.v(TAG, "writeOutputReport " + HexDump.dumpHexString(report));
+            writeCharacteristic(reportCharacteristic, report);
+            return report.length;
         }
-
-        return -1;
     }
 
     @Override

platforms/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java

@@ -256,7 +256,6 @@ public class HIDDeviceManager {
             0x24c6, // PowerA
             0x2c22, // Qanba
             0x2dc8, // 8BitDo
-            0x3537, // GameSir
             0x37d7, // Flydigi
             0x9886, // ASTRO Gaming
         };
@@ -361,7 +360,7 @@ public class HIDDeviceManager {
                     HIDDeviceUSB device = new HIDDeviceUSB(this, usbDevice, interface_index);
                     int id = device.getId();
                     mDevicesById.put(id, device);
-                    HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol(), false, 0);
+                    HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol(), false);
                 }
             }
         }
@@ -530,13 +529,7 @@ public class HIDDeviceManager {
             return false;
         }
 
-        // Steam Controllers will always support Bluetooth Low Energy
-        if ((bluetoothDevice.getType() & BluetoothDevice.DEVICE_TYPE_LE) == 0) {
-            return false;
-        }
-
-        // Match on the name either the original Steam Controller or the new second-generation one advertise with.
-        return bluetoothDevice.getName().equals("SteamController") || bluetoothDevice.getName().startsWith("Steam Ctrl");
+        return bluetoothDevice.getName().equals("SteamController") && ((bluetoothDevice.getType() & BluetoothDevice.DEVICE_TYPE_LE) != 0);
     }
 
     private void close() {
@@ -688,7 +681,7 @@ public class HIDDeviceManager {
     private native void HIDDeviceRegisterCallback();
     private native void HIDDeviceReleaseCallback();
 
-    native void HIDDeviceConnected(int deviceID, String identifier, int vendorId, int productId, String serial_number, int release_number, String manufacturer_string, String product_string, int interface_number, int interface_class, int interface_subclass, int interface_protocol, boolean bBluetooth, int reportID);
+    native void HIDDeviceConnected(int deviceID, String identifier, int vendorId, int productId, String serial_number, int release_number, String manufacturer_string, String product_string, int interface_number, int interface_class, int interface_subclass, int interface_protocol, boolean bBluetooth);
     native void HIDDeviceOpenPending(int deviceID);
     native void HIDDeviceOpenResult(int deviceID, boolean opened);
     native void HIDDeviceDisconnected(int deviceID);

platforms/android/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

@@ -21,7 +21,6 @@ class HIDDeviceUSB implements HIDDevice {
     protected InputThread mInputThread;
     protected boolean mRunning;
     protected boolean mFrozen;
-    protected boolean mClaimed;
 
     public HIDDeviceUSB(HIDDeviceManager manager, UsbDevice usbDevice, int interface_index) {
         mManager = manager;
@@ -30,7 +29,6 @@ class HIDDeviceUSB implements HIDDevice {
         mInterface = mDevice.getInterface(mInterfaceIndex).getId();
         mDeviceId = manager.getDeviceIDForIdentifier(getIdentifier());
         mRunning = false;
-        mClaimed = false;
     }
 
     String getIdentifier() {
@@ -116,7 +114,6 @@ class HIDDeviceUSB implements HIDDevice {
             close();
             return false;
         }
-        mClaimed = true;
 
         // Find the endpoints
         for (int j = 0; j < iface.getEndpointCount(); j++) {
@@ -135,12 +132,9 @@ class HIDDeviceUSB implements HIDDevice {
             }
         }
 
-        // Make sure the required endpoints were present. The original Steam Controller and the wireless dongle for it do NOT
-        // actually have -- or require -- output endpoints, so we need to accept only an input one for them or else we'll fall
-        // back to the Android system gamepad functionality (and lose our paddles et al).
-        if (mInputEndpoint == null) {
+        // Make sure the required endpoints were present
+        if (mInputEndpoint == null || mOutputEndpoint == null) {
             Log.w(TAG, "Missing required endpoint on USB device " + getDeviceName());
-            mConnection.releaseInterface(iface);
             close();
             return false;
         }
@@ -160,11 +154,6 @@ class HIDDeviceUSB implements HIDDevice {
             return -1;
         }
 
-        if (!mClaimed) {
-            Log.w(TAG, "writeReport() called but some other process currently owns the USB device");
-            return -1;
-        }
-
         if (feature) {
             int res = -1;
             int offset = 0;
@@ -196,11 +185,6 @@ class HIDDeviceUSB implements HIDDevice {
             }
             return length;
         } else {
-            if (mOutputEndpoint == null)
-            {
-                Log.e(TAG, "Tried to write an output report to an interface with no output endpoint!");
-                return -1;
-            }
             int res = mConnection.bulkTransfer(mOutputEndpoint, report, report.length, 1000);
             if (res != report.length) {
                 Log.w(TAG, "writeOutputReport() returned " + res + " on device " + getDeviceName());
@@ -221,12 +205,6 @@ class HIDDeviceUSB implements HIDDevice {
             Log.w(TAG, "readReport() called with no device connection");
             return false;
         }
-        if (!mClaimed) {
-            if (feature) {
-                return false;
-            }
-            return true;            
-        }
 
         if (report_number == 0x0) {
             /* Offset the return buffer by 1, so that the report ID
@@ -280,13 +258,10 @@ class HIDDeviceUSB implements HIDDevice {
             mInputThread = null;
         }
         if (mConnection != null) {
-            if (mClaimed) {
-                UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
-                mConnection.releaseInterface(iface);                
-            }
+            UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+            mConnection.releaseInterface(iface);
             mConnection.close();
             mConnection = null;
-            mClaimed = false;
         }
     }
 
@@ -299,22 +274,6 @@ class HIDDeviceUSB implements HIDDevice {
     @Override
     public void setFrozen(boolean frozen) {
         mFrozen = frozen;
-
-        /* If we have a valid device connection and the claim state doesn't match what we want, try to correct that. */
-        if (mConnection != null && mClaimed == mFrozen) {
-            UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
-            if (frozen) {
-                mClaimed = !mConnection.releaseInterface(iface);
-                if (mClaimed) {
-                    Log.e(TAG, "Tried to release claim on USB device, but failed!");
-                }
-            } else {
-                mClaimed = mConnection.claimInterface(iface, true);
-                if (!mClaimed) {
-                    Log.e(TAG, "Tried to regain claim on USB device, but failed!");
-                }
-            }
-        }
     }
 
     protected class InputThread extends Thread {

platforms/android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 3;
     private static final int SDL_MINOR_VERSION = 4;
-    private static final int SDL_MICRO_VERSION = 10;
+    private static final int SDL_MICRO_VERSION = 8;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -530,8 +530,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
 
         if (mHIDDeviceManager != null) {
             mHIDDeviceManager.setFrozen(true);
-        }        
-
+        }
         if (!mHasMultiWindow) {
             pauseNativeThread();
         }
@@ -544,8 +543,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
 
         if (mHIDDeviceManager != null) {
             mHIDDeviceManager.setFrozen(false);
-        }        
-
+        }
         if (!mHasMultiWindow) {
             resumeNativeThread();
         }
@@ -618,14 +616,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         super.onWindowFocusChanged(hasFocus);
         Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
 
-        // If we are gaining focus, we can always try to restore our USB devices. If we are losing focus,
-        // only try to relinquish them if we don't have background events allowed (for multi-window Android setups).
-        if (hasFocus || !SDLActivity.nativeGetHintBoolean("SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS", false)) {
-            if (mHIDDeviceManager != null) {
-                mHIDDeviceManager.setFrozen(!hasFocus);
-            }            
-        }
-
         if (SDLActivity.mBrokenLibraries) {
            return;
         }
@@ -1491,11 +1481,11 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
         if (SDLControllerManager.isDeviceSDLJoystick(deviceId)) {
             // Note that we process events with specific key codes here
             if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (SDLControllerManager.onNativePadDown(deviceId, keyCode, event.getScanCode())) {
+                if (SDLControllerManager.onNativePadDown(deviceId, keyCode)) {
                     return true;
                 }
             } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (SDLControllerManager.onNativePadUp(deviceId, keyCode, event.getScanCode())) {
+                if (SDLControllerManager.onNativePadUp(deviceId, keyCode)) {
                     return true;
                 }
             }
@@ -1973,7 +1963,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
             Intent i = new Intent(Intent.ACTION_VIEW);
             i.setData(Uri.parse(url));
 
-            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY
+            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY 
                       | Intent.FLAG_ACTIVITY_MULTIPLE_TASK
                       | Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
             i.addFlags(flags);
@@ -2237,4 +2227,3 @@ class SDLClipboardHandler implements
         SDLActivity.onNativeClipboardChanged();
     }
 }
-

platforms/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java

@@ -10,10 +10,6 @@ import android.hardware.lights.Light;
 import android.hardware.lights.LightsRequest;
 import android.hardware.lights.LightsManager;
 import android.hardware.lights.LightState;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.VibrationEffect;
@@ -34,18 +30,16 @@ public class SDLControllerManager
     static native void nativeAddJoystick(int device_id, String name, String desc,
                                                 int vendor_id, int product_id,
                                                 int button_mask,
-                                                int naxes, int axis_mask, int nhats, boolean can_rumble, boolean has_rgb_led,
-                                                boolean has_accelerometer, boolean has_gyroscope);
+                                                int naxes, int axis_mask, int nhats, boolean can_rumble, boolean has_rgb_led);
     static native void nativeRemoveJoystick(int device_id);
     static native void nativeAddHaptic(int device_id, String name);
     static native void nativeRemoveHaptic(int device_id);
-    static public native boolean onNativePadDown(int device_id, int keycode, int scancode);
-    static public native boolean onNativePadUp(int device_id, int keycode, int scancode);
+    static public native boolean onNativePadDown(int device_id, int keycode);
+    static public native boolean onNativePadUp(int device_id, int keycode);
     static native void onNativeJoy(int device_id, int axis,
                                           float value);
     static native void onNativeHat(int device_id, int hat_id,
                                           int x, int y);
-    static native void onNativeJoySensor(int device_id, int sensor_type, long sensor_timestamp, float x, float y, float z);
 
     protected static SDLJoystickHandler mJoystickHandler;
     protected static SDLHapticHandler mHapticHandler;
@@ -87,13 +81,6 @@ public class SDLControllerManager
         mJoystickHandler.setLED(device_id, red, green, blue);
     }
 
-    /**
-     * This method is called by SDL using JNI.
-     */
-    static void joystickSetSensorsEnabled(int device_id, boolean enabled) {
-        mJoystickHandler.setSensorsEnabled(device_id, enabled);
-    }
-
     /**
      * This method is called by SDL using JNI.
      */
@@ -166,10 +153,6 @@ class SDLJoystickHandler {
         ArrayList<InputDevice.MotionRange> hats;
         ArrayList<Light> lights;
         LightsManager.LightsSession lightsSession;
-        SensorManager sensorManager;
-        SDLJoySensorListener sensorListener;
-        Sensor accelerometerSensor;
-        Sensor gyroscopeSensor;
     }
     static class RangeComparator implements Comparator<InputDevice.MotionRange> {
         @Override
@@ -242,13 +225,12 @@ class SDLJoystickHandler {
                     joystick.desc = getJoystickDescriptor(joystickDevice);
                     joystick.axes = new ArrayList<InputDevice.MotionRange>();
                     joystick.hats = new ArrayList<InputDevice.MotionRange>();
-                    java.util.Set<Integer> axisStrsSet = new java.util.HashSet<Integer>();
                     joystick.lights = new ArrayList<Light>();
 
                     List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
                     Collections.sort(ranges, new RangeComparator());
                     for (InputDevice.MotionRange range : ranges) {
-                        if (((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) && axisStrsSet.add(range.getAxis())) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
                             if (range.getAxis() == MotionEvent.AXIS_HAT_X || range.getAxis() == MotionEvent.AXIS_HAT_Y) {
                                 joystick.hats.add(range);
                             } else {
@@ -259,8 +241,6 @@ class SDLJoystickHandler {
 
                     boolean can_rumble = false;
                     boolean has_rgb_led = false;
-                    boolean has_accelerometer = false;
-                    boolean has_gyroscope = false;
                     if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
                         VibratorManager vibratorManager = joystickDevice.getVibratorManager();
                         int[] vibrators = vibratorManager.getVibratorIds();
@@ -278,26 +258,12 @@ class SDLJoystickHandler {
                             joystick.lightsSession = lightsManager.openSession();
                             has_rgb_led = true;
                         }
-                        SensorManager sensorManager = joystickDevice.getSensorManager();
-                        if (sensorManager != null) {
-                            joystick.sensorManager = sensorManager;
-                            joystick.sensorListener = new SDLJoySensorListener(joystick.device_id);
-                            joystick.accelerometerSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-                            if (joystick.accelerometerSensor != null) {
-                                has_accelerometer = true;
-                            }
-                            joystick.gyroscopeSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
-                            if (joystick.gyroscopeSensor != null) {
-                                has_gyroscope = true;
-                            }
-                        }
                     }
 
                     mJoysticks.add(joystick);
                     SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
                             getVendorId(joystickDevice), getProductId(joystickDevice),
-                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, can_rumble, has_rgb_led,
-                            has_accelerometer, has_gyroscope);
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, can_rumble, has_rgb_led);
                 }
             }
         }
@@ -542,31 +508,6 @@ class SDLJoystickHandler {
         }
         joystick.lightsSession.requestLights(lightsRequest.build());
     }
-
-    void setSensorsEnabled(int device_id, boolean enabled) {
-        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
-            return;
-        }
-        SDLJoystick joystick = getJoystick(device_id);
-        if (joystick == null || joystick.sensorManager == null) {
-            return;
-        }
-        if (enabled) {
-            if (joystick.accelerometerSensor != null) {
-                SDLSensorManager.registerListener(joystick.sensorManager, joystick.sensorListener, joystick.accelerometerSensor, SensorManager.SENSOR_DELAY_GAME);
-            }
-            if (joystick.gyroscopeSensor != null) {
-                SDLSensorManager.registerListener(joystick.sensorManager, joystick.sensorListener, joystick.gyroscopeSensor, SensorManager.SENSOR_DELAY_GAME);
-            }
-        } else {
-            if (joystick.accelerometerSensor != null) {
-                SDLSensorManager.unregisterListener(joystick.sensorManager, joystick.sensorListener, joystick.accelerometerSensor);
-            }
-            if (joystick.gyroscopeSensor != null) {
-                SDLSensorManager.unregisterListener(joystick.sensorManager, joystick.sensorListener, joystick.gyroscopeSensor);
-            }
-        }
-    }
 }
 
 class SDLHapticHandler_API31 extends SDLHapticHandler {
@@ -992,19 +933,3 @@ class SDLGenericMotionListener_API29 extends SDLGenericMotionListener_API26 {
         return penDevice.isExternal() ? SDL_PEN_DEVICE_TYPE_INDIRECT : SDL_PEN_DEVICE_TYPE_DIRECT;
     }
 }
-
-class SDLJoySensorListener implements SensorEventListener {
-    int device_id;
-
-    public SDLJoySensorListener(int device_id) {
-        this.device_id = device_id;
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {}
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        SDLControllerManager.onNativeJoySensor(device_id, event.sensor.getType(), event.timestamp, event.values[0], event.values[1], event.values[2]);
-    }
-}

platforms/android/app/src/main/java/org/libsdl/app/SDLSensorManager.java

@@ -1,32 +0,0 @@
-package org.libsdl.app;
-
-import android.hardware.Sensor;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-
-// This class coordinates synchronized access to sensor manager registration
-//
-// This prevents a java.util.ConcurrentModificationException exception on
-// Android 16, specifically on the Samsung Tab S9 Ultra.
-
-class SDLSensorManager
-{
-    static private SDLSensorManager mManager = new SDLSensorManager();
-
-    public static void registerListener(SensorManager manager, SensorEventListener listener, Sensor sensor, int samplingPeriodUs) {
-        mManager.RegisterListener(manager, listener, sensor, samplingPeriodUs);
-    }
-
-    public static void unregisterListener(SensorManager manager, SensorEventListener listener, Sensor sensor) {
-        mManager.UnregisterListener(manager, listener, sensor);
-    }
-
-    private synchronized void RegisterListener(SensorManager manager, SensorEventListener listener, Sensor sensor, int samplingPeriodUs) {
-        manager.registerListener(listener, sensor, samplingPeriodUs, null);
-    }
-
-    private synchronized void UnregisterListener(SensorManager manager, SensorEventListener listener, Sensor sensor) {
-        manager.unregisterListener(listener, sensor);
-    }
-}
-

platforms/android/app/src/main/java/org/libsdl/app/SDLSurface.java

@@ -47,9 +47,6 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
     // Is SurfaceView ready for rendering
     protected boolean mIsSurfaceReady;
 
-    // Is on-screen keyboard visible
-    protected boolean mKeyboardVisible;
-
     // Pinch events
     private final ScaleGestureDetector scaleGestureDetector;
 
@@ -216,18 +213,6 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
                                                WindowInsets.Type.displayCutout());
 
             SDLActivity.onNativeInsetsChanged(combined.left, combined.right, combined.top, combined.bottom);
-
-            if (insets.isVisible(WindowInsets.Type.ime())) {
-                if (!mKeyboardVisible) {
-                    mKeyboardVisible = true;
-                    SDLActivity.onNativeScreenKeyboardShown();
-                }
-            } else {
-                if (mKeyboardVisible) {
-                    mKeyboardVisible = false;
-                    SDLActivity.onNativeScreenKeyboardHidden();
-                }
-            }
         }
 
         // Pass these to any child views in case they need them
@@ -333,11 +318,11 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
     protected void enableSensor(int sensortype, boolean enabled) {
         // TODO: This uses getDefaultSensor - what if we have >1 accels?
         if (enabled) {
-            SDLSensorManager.registerListener(mSensorManager, this,
+            mSensorManager.registerListener(this,
                             mSensorManager.getDefaultSensor(sensortype),
-                            SensorManager.SENSOR_DELAY_GAME);
+                            SensorManager.SENSOR_DELAY_GAME, null);
         } else {
-            SDLSensorManager.unregisterListener(mSensorManager, this,
+            mSensorManager.unregisterListener(this,
                             mSensorManager.getDefaultSensor(sensortype));
         }
     }

platforms/freedesktop/dev.twilitrealm.dusk.metainfo.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>dev.twilitrealm.dusk</id>
-  <launchable type="desktop-id">dev.twilitrealm.dusk.desktop</launchable>
-  <name>Dusklight</name>
-  <summary>Native port of a classic adventure game</summary>
-  <developer id="dev.twilitrealm">
-    <name>Twilit Realm</name>
-  </developer>
-  <url type="homepage">https://twilitrealm.dev</url>
-  <url type="bugtracker">https://github.com/TwilitRealm/dusklight/issues</url>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>CC0-1.0</project_license>
-  <content_rating type="oars-1.0"/>
-  <supports>
-      <control>console</control>
-      <control>gamepad</control>
-  </supports>
-  <description>
-    <p>
-      Dusklight is a reverse-engineered reimplementation of a classic adventure game.
-      It aims to be as accurate as possible to the original while also providing new options, enhancements, and tools to customize your experience.
-    </p>
-  </description>
-  
-  <provides>
-    <binary>dusklight</binary>
-    <id>dev.twilitrealm.dusk.desktop</id>
-  </provides>
-
-  <releases>
-    <release version="UNRELEASED" date="2026-12-31">
-      <description>
-        <p>Initial Flatpak release.</p>
-      </description>
-    </release>
-  </releases>
-</component>

res/rml/overlay.rcss

@@ -16,7 +16,7 @@ body {
     flex-direction: column;
     justify-content: flex-end;
     align-items: stretch;
-    z-index: 2;
+    z-index: 1;
     pointer-events: none;
 }
 

res/rml/touch_controls.rcss

@@ -1,339 +0,0 @@
-*, *:before, *:after {
-    box-sizing: border-box;
-}
-
-body {
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    font-family: "Fira Sans Condensed";
-    font-weight: bold;
-    color: rgba(248, 244, 232, 90%);
-    z-index: 1;
-    filter: opacity(0);
-    transition: filter 0.2s linear-in-out;
-}
-
-body[open] {
-    filter: opacity(1);
-}
-
-body:not([open]) {
-    pointer-events: none;
-}
-
-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    decorator: none;
-    padding: 0;
-    border: 1dp rgba(255, 255, 255, 22%);
-    background-color: rgba(22, 24, 28, 48%);
-    color: rgba(248, 244, 232, 90%);
-    text-align: center;
-    /* backdrop-filter: blur(7dp); */
-    /* box-shadow: 0 6dp 18dp rgba(0, 0, 0, 28%); */
-    transform-origin: center;
-    transition: background-color border-color filter transform 0.08s linear-in-out,
-                opacity 0.2s linear-in-out;
-}
-
-button.pressed,
-button.active {
-    background-color: rgba(63, 78, 90, 68%);
-    border-color: rgba(255, 255, 255, 48%);
-    filter: brightness(1.18);
-}
-
-button:hidden {
-    opacity: 0;
-    pointer-events: none;
-}
-
-button span {
-    display: block;
-    line-height: 1;
-}
-
-button icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-}
-
-button icon glyph {
-    display: block;
-    font-family: "Material Symbols Rounded";
-    font-weight: normal;
-    font-size: 24dp;
-    line-height: 1;
-}
-
-.midna-icon,
-.item-icon,
-.item-count,
-.oil-meter {
-    display: none;
-}
-
-.midna-icon.visible,
-.item-icon.visible,
-.item-count.visible,
-.oil-meter.visible {
-    display: block;
-}
-
-.control {
-    position: absolute;
-}
-
-.trigger-l.active {
-    background-color: rgba(57, 116, 133, 74%);
-    border-color: rgba(128, 222, 234, 72%);
-}
-
-.trigger,
-.skip {
-    border-radius: 23dp;
-}
-
-.trigger {
-    font-size: 22dp;
-}
-
-.button-z {
-    background-color: rgba(118, 79, 158, 58%);
-    border-color: rgba(203, 170, 255, 36%);
-}
-
-.midna-icon {
-    position: absolute;
-    left: 9dp;
-    top: -1dp;
-    height: 48dp;
-}
-
-.button-z.has-icon span,
-.face.has-item span {
-    position: absolute;
-    font-size: 13dp;
-    line-height: 1;
-}
-
-.button-z.has-icon span {
-    right: 9dp;
-    bottom: 7dp;
-}
-
-.button-z.pressed {
-    background-color: rgba(139, 91, 187, 82%);
-    border-color: rgba(220, 194, 255, 70%);
-}
-
-action-bar {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    border: 1dp rgba(255, 255, 255, 22%);
-    border-radius: 23dp;
-    background-color: rgba(22, 24, 28, 48%);
-    /* backdrop-filter: blur(7dp); */
-    /* box-shadow: 0 -6dp 18dp rgba(0, 0, 0, 28%); */
-    overflow: hidden;
-    opacity: 1;
-    transform-origin: center;
-    transition: opacity 0.2s linear-in-out;
-}
-
-action-bar:hidden,
-action-bar:hidden button,
-action-bar:hidden separator {
-    opacity: 0;
-    pointer-events: none;
-}
-
-.utility {
-    position: relative;
-    flex: 1 1 auto;
-    width: 56dp;
-    height: 44dp;
-    margin: 0;
-    border-width: 0dp;
-    border-radius: 0;
-    background-color: transparent;
-    box-shadow: none;
-}
-
-.utility,
-.skip {
-    opacity: 0.55;
-}
-
-.utility.pressed {
-    background-color: rgba(63, 78, 90, 68%);
-}
-
-.utility.pressed,
-.skip.pressed {
-    opacity: 1;
-}
-
-.skip {
-    z-index: 1;
-    border-color: rgba(255, 255, 255, 36%);
-}
-
-separator {
-    display: block;
-    flex: 0 0 1dp;
-    width: 1dp;
-    height: 24dp;
-    background-color: rgba(255, 255, 255, 18%);
-    opacity: 1;
-    transition: opacity 0.2s linear-in-out;
-}
-
-.face {
-    position: absolute;
-    border-radius: 29dp;
-    font-size: 24dp;
-    overflow: visible;
-}
-
-.item-icon {
-    width: auto;
-    height: auto;
-    max-width: 76%;
-    max-height: 76%;
-}
-
-.item-count {
-    position: absolute;
-    left: 6dp;
-    bottom: 5dp;
-    min-width: 17dp;
-    height: 15dp;
-    padding: 1dp 3dp;
-    border-radius: 7dp;
-    background-color: rgba(0, 0, 0, 52%);
-    color: rgba(255, 255, 255, 92%);
-    font-size: 12dp;
-    line-height: 13dp;
-    text-align: center;
-}
-
-.oil-meter {
-    position: absolute;
-    left: 12dp;
-    bottom: -5dp;
-    width: 34dp;
-    height: 8dp;
-    padding: 2dp;
-    border: 1dp rgba(42, 32, 18, 82%);
-    border-radius: 4dp;
-    background-color: rgba(18, 14, 10, 70%);
-    /* box-shadow: 0 2dp 6dp rgba(0, 0, 0, 35%); */
-}
-
-oil-fill {
-    display: block;
-    width: 0%;
-    height: 100%;
-    border-radius: 2dp;
-    background-color: rgb(255, 232, 74);
-}
-
-.face.has-item span {
-    right: 6dp;
-    bottom: 6dp;
-    color: rgba(255, 255, 255, 88%);
-}
-
-.face.a {
-    border-radius: 37dp;
-    font-size: 31dp;
-    background-color: rgba(34, 112, 123, 62%);
-}
-
-.face.b {
-    background-color: rgba(161, 61, 66, 58%);
-}
-
-.face.x {
-    background-color: rgba(83, 115, 151, 56%);
-}
-
-.face.y {
-    background-color: rgba(113, 91, 150, 54%);
-}
-
-button.control.docked-top,
-action-bar.docked-top {
-    border-top-width: 0dp;
-    border-top-left-radius: 0dp;
-    border-top-right-radius: 0dp;
-}
-
-button.control.docked-bottom,
-action-bar.docked-bottom {
-    border-bottom-width: 0dp;
-    border-bottom-left-radius: 0dp;
-    border-bottom-right-radius: 0dp;
-}
-
-button.control.docked-left,
-action-bar.docked-left {
-    border-left-width: 0dp;
-    border-top-left-radius: 0dp;
-    border-bottom-left-radius: 0dp;
-}
-
-button.control.docked-right,
-action-bar.docked-right {
-    border-right-width: 0dp;
-    border-top-right-radius: 0dp;
-    border-bottom-right-radius: 0dp;
-}
-
-touch-stick {
-    display: block;
-    position: absolute;
-    width: 124dp;
-    height: 124dp;
-    border-radius: 62dp;
-    background-color: rgba(18, 20, 24, 35%);
-    border: 1dp rgba(255, 255, 255, 20%);
-    /* backdrop-filter: blur(7dp); */
-    /* box-shadow: 0 8dp 24dp rgba(0, 0, 0, 24%); */
-    opacity: 0;
-    pointer-events: none;
-    transition: opacity 0.18s linear-in-out;
-}
-
-touch-stick.active {
-    opacity: 1;
-}
-
-stick-ring {
-    position: absolute;
-    left: 18dp;
-    top: 18dp;
-    width: 88dp;
-    height: 88dp;
-    border-radius: 44dp;
-    border: 1dp rgba(255, 255, 255, 18%);
-}
-
-stick-knob {
-    position: absolute;
-    width: 48dp;
-    height: 48dp;
-    border-radius: 24dp;
-    background-color: rgba(238, 236, 226, 55%);
-    border: 1dp rgba(255, 255, 255, 45%);
-}

res/rml/touch_controls_editor.rcss

@@ -1,138 +0,0 @@
-body.touch-editor {
-    background-color: rgba(4, 6, 8, 34%);
-    z-index: 8;
-}
-
-body.touch-editor .control,
-body.touch-editor action-bar {
-    opacity: 0.88;
-    cursor: move;
-    pointer-events: auto;
-}
-
-body.touch-editor .control:hover,
-body.touch-editor action-bar:hover,
-body.touch-editor .control.editor-selected,
-body.touch-editor action-bar.editor-selected {
-    border-color: rgba(255, 232, 128, 80%);
-    filter: brightness(1.15);
-}
-
-body.touch-editor action-bar button,
-body.touch-editor action-bar separator {
-    pointer-events: none;
-}
-
-selection-frame {
-    display: none;
-    position: absolute;
-    z-index: 20;
-    border: 2dp rgba(255, 232, 128, 88%);
-    background-color: rgba(255, 232, 128, 7%);
-    pointer-events: none;
-}
-
-selection-frame.visible {
-    display: block;
-}
-
-resize-handle {
-    display: block;
-    position: absolute;
-    width: 22dp;
-    height: 22dp;
-    border: 2dp rgba(255, 244, 190, 96%);
-    border-radius: 11dp;
-    background-color: rgba(34, 37, 42, 86%);
-    pointer-events: auto;
-}
-
-resize-handle.left {
-    left: -12dp;
-}
-
-resize-handle.right {
-    right: -12dp;
-}
-
-resize-handle.top {
-    top: -12dp;
-}
-
-resize-handle.bottom {
-    bottom: -12dp;
-}
-
-resize-handle.horizontal {
-    top: 50%;
-    margin-top: -11dp;
-}
-
-resize-handle.vertical {
-    left: 50%;
-    margin-left: -11dp;
-}
-
-resize-handle.corner.left {
-    left: -12dp;
-}
-
-resize-handle.corner.right {
-    right: -12dp;
-}
-
-resize-handle.corner.top {
-    top: -12dp;
-}
-
-resize-handle.corner.bottom {
-    bottom: -12dp;
-}
-
-editor-toolbar {
-    display: flex;
-    position: absolute;
-    left: 24dp;
-    right: 24dp;
-    top: 50%;
-    z-index: 30;
-    height: 48dp;
-    margin-top: -24dp;
-    gap: 8dp;
-    justify-content: center;
-    pointer-events: auto;
-}
-
-editor-toolbar button.editor-command {
-    flex: 0 1 150dp;
-    min-width: 96dp;
-    height: 48dp;
-    padding: 0 14dp;
-    border-radius: 8dp;
-    border: 1dp rgba(255, 255, 255, 26%);
-    background-color: rgba(17, 19, 24, 88%);
-    color: rgba(255, 250, 232, 94%);
-    font-family: "Fira Sans";
-    font-size: 18dp;
-    line-height: 48dp;
-    opacity: 1;
-    cursor: pointer;
-}
-
-editor-toolbar button.editor-command span {
-    display: block;
-    width: 100%;
-    line-height: 48dp;
-    text-align: center;
-}
-
-editor-toolbar button.editor-command.primary {
-    border-color: rgba(255, 232, 128, 70%);
-    background-color: rgba(96, 82, 38, 90%);
-}
-
-editor-toolbar button.editor-command:hover,
-editor-toolbar button.editor-command:focus-visible {
-    border-color: rgba(255, 244, 190, 92%);
-    background-color: rgba(78, 85, 96, 92%);
-}

src/d/actor/d_a_alink.cpp

@@ -12734,19 +12734,7 @@ void daAlink_c::setMagicArmorBrk(int i_status) {
 
 BOOL daAlink_c::checkMagicArmorHeavy() const {
 #if TARGET_PC
-    if(!checkMagicArmorWearAbility()) {
-        return false;
-    }
-
-    switch(dusk::getSettings().game.armorRupeeDrain) {
-        case dusk::MagicArmorMode::NORMAL:
-            return dComIfGs_getRupee() == 0;
-        case dusk::MagicArmorMode::ON_DAMAGE:
-        case dusk::MagicArmorMode::DOUBLE_DEFENSE:
-        case dusk::MagicArmorMode::INVINCIBLE:
-        case dusk::MagicArmorMode::COSMETIC:
-            return false;
-    }
+    return checkMagicArmorWearAbility() && (dComIfGs_getRupee() == 0 && !dusk::getSettings().game.freeMagicArmor);
 #else
     return checkMagicArmorWearAbility() && dComIfGs_getRupee() == 0;
 #endif
@@ -14808,8 +14796,6 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) {
 #if TARGET_PC
     mIBChainInterpPrevValid = false;
     mIBChainInterpCurrValid = false;
-    mHsChainInterpPrevValid = false;
-    mHsChainInterpCurrValid = false;
 #endif
     field_0x0774 = NULL;
     field_0x0778 = NULL;
@@ -18721,7 +18707,7 @@ int daAlink_c::execute() {
 #if TARGET_PC
             // This handles rupee drain and transitions between rupees/no rupees
             // We can skip all of that if the magic armor doesn't use rupees
-            if (dusk::getSettings().game.armorRupeeDrain.getValue() == dusk::MagicArmorMode::NORMAL && checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
+            if (!dusk::getSettings().game.freeMagicArmor && checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
 #else
             if (checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
 #endif
@@ -19782,37 +19768,23 @@ int daAlink_c::draw() {
                 dComIfGd_getOpaListDark()->entryImm(mpHookChain, 0);
 
 #if TARGET_PC
-                if (dusk::frame_interp::is_enabled()) {
-                    if (mEquipItem == dItemNo_IRONBALL_e &&
-                        mIronBallChainPos != NULL && mIronBallChainAngle != NULL)
-                    {
-                        if (mIBChainInterpCurrValid) {
-                            memcpy(mIBChainInterpPrevPos, mIBChainInterpCurrPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
-                            memcpy(mIBChainInterpPrevAngle, mIBChainInterpCurrAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
-                            mIBChainInterpPrevHandRoot = mIBChainInterpCurrHandRoot;
-                            mIBChainInterpPrevValid = true;
-                        }
-
-                        memcpy(mIBChainInterpCurrPos, mIronBallChainPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
-                        memcpy(mIBChainInterpCurrAngle, mIronBallChainAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
-                        mIBChainInterpCurrHandRoot = mHookshotTopPos;
-                        mIBChainInterpCurrValid = true;
-
-                        dusk::frame_interp::add_interpolation_callback(&ironBallChainInterpCallback, this);
-                    } else {
-                        if (mHsChainInterpCurrValid) {
-                            mHsChainInterpPrevTop = mHsChainInterpCurrTop;
-                            mHsChainInterpPrevRoot = mHsChainInterpCurrRoot;
-                            mHsChainInterpPrevSubRoot = mHsChainInterpCurrSubRoot;
-                            mHsChainInterpPrevSubTop = mHsChainInterpCurrSubTop;
-                            mHsChainInterpPrevValid = true;
-                        }
-                        mHsChainInterpCurrTop = mHookshotTopPos;
-                        mHsChainInterpCurrRoot = mHeldItemRootPos;
-                        mHsChainInterpCurrSubRoot = field_0x3810;
-                        mHsChainInterpCurrSubTop = mIronBallBgChkPos;
-                        mHsChainInterpCurrValid = true;
+                if (dusk::frame_interp::is_enabled() &&
+                    mEquipItem == dItemNo_IRONBALL_e &&
+                    mIronBallChainPos != NULL && mIronBallChainAngle != NULL)
+                {
+                    if (mIBChainInterpCurrValid) {
+                        memcpy(mIBChainInterpPrevPos, mIBChainInterpCurrPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
+                        memcpy(mIBChainInterpPrevAngle, mIBChainInterpCurrAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
+                        mIBChainInterpPrevHandRoot = mIBChainInterpCurrHandRoot;
+                        mIBChainInterpPrevValid = true;
                     }
+
+                    memcpy(mIBChainInterpCurrPos, mIronBallChainPos, IRON_BALL_CHAIN_COUNT * sizeof(cXyz));
+                    memcpy(mIBChainInterpCurrAngle, mIronBallChainAngle, IRON_BALL_CHAIN_COUNT * sizeof(csXyz));
+                    mIBChainInterpCurrHandRoot = mHookshotTopPos;
+                    mIBChainInterpCurrValid = true;
+
+                    dusk::frame_interp::add_interpolation_callback(&ironBallChainInterpCallback, this);
                 }
 #endif
             }

src/d/actor/d_a_alink_damage.inc

@@ -192,7 +192,7 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, BOOL i_checkZoraMag, BOOL i_setDm
 
     if (checkMagicArmorNoDamage()) {
 #if TARGET_PC
-        if(dusk::getSettings().game.armorRupeeDrain.getValue() == dusk::MagicArmorMode::INVINCIBLE) {
+        if(dusk::getSettings().game.freeMagicArmor) {
             i_dmgAmount = 0;
         }
 #endif
@@ -202,11 +202,6 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, BOOL i_checkZoraMag, BOOL i_setDm
     if (!mpHIO->mDamage.m.mInvincible && g_debugHpMode == 0)
     #endif
     {
-#if TARGET_PC
-        if(checkMagicArmorWearAbility() && dusk::getSettings().game.armorRupeeDrain.getValue() == dusk::MagicArmorMode::DOUBLE_DEFENSE) {
-            i_dmgAmount /= 2;
-        }
-#endif
         dComIfGp_setItemLifeCount(-i_dmgAmount, 0);
     }
 
@@ -286,26 +281,7 @@ BOOL daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* i_poly) {
 }
 
 BOOL daAlink_c::checkMagicArmorNoDamage() {
-#ifdef TARGET_PC
-    if (!checkMagicArmorWearAbility()) {
-        return false;
-    }
-
-    switch(dusk::getSettings().game.armorRupeeDrain) {
-        case dusk::MagicArmorMode::NORMAL:
-            return !checkMagicArmorHeavy();
-        case dusk::MagicArmorMode::ON_DAMAGE:
-            return dComIfGs_getRupee() != 0;
-        case dusk::MagicArmorMode::DOUBLE_DEFENSE:
-            return false;
-        case dusk::MagicArmorMode::INVINCIBLE:
-            return true;
-        case dusk::MagicArmorMode::COSMETIC:
-            return false;
-    }
-#else
     return checkMagicArmorWearAbility() && !checkMagicArmorHeavy();
-#endif
 }
 
 int daAlink_c::checkPolyDamage() {

src/d/actor/d_a_alink_dusk.cpp

@@ -144,7 +144,7 @@ void daAlink_c::handleQuickTransform() {
     procCoMetamorphoseInit();
 }
 
-bool daAlink_c::checkAimContext() {
+bool daAlink_c::checkGyroAimContext() {
     switch (mProcID) {
     case PROC_SUBJECTIVITY:
     case PROC_SWIM_SUBJECTIVITY:
@@ -175,13 +175,3 @@ bool daAlink_c::checkAimContext() {
         return false;
     }
 }
-
-bool daAlink_c::checkTouchAimCaptureContext() {
-    switch (mProcID) {
-    case PROC_HOOKSHOT_ROOF_WAIT:
-    case PROC_HOOKSHOT_WALL_WAIT:
-        return false;
-    default:
-        return checkAimContext();
-    }
-}

src/d/actor/d_a_alink_effect.inc

@@ -2028,10 +2028,11 @@ void daAlink_blur_c::traceBlur(cXyz const* param_0, cXyz const* param_1, s16 par
 }
 
 void daAlink_blur_c::draw() {
-    ZoneScoped;
     j3dSys.reinitGX();
 
-#if !TARGET_PC
+#ifdef TARGET_PC
+    TGXTexObj texObj;
+#else
     static TGXTexObj texObj;
 #endif
     static GXColor nColor0 = {0xFF, 0xFF, 0xFF, 0x14};
@@ -2039,25 +2040,11 @@ void daAlink_blur_c::draw() {
     GXSetNumIndStages(0);
     nColor0.a = field_0x20;
 
-#if TARGET_PC
-    if (mpCachedBlurTex != m_blurTex) {
-        mBlurTexObj.reset();
-        GXInitTexObj(&mBlurTexObj,
-            reinterpret_cast<void*>(
-                reinterpret_cast<uintptr_t>(m_blurTex) + m_blurTex->imageOffset),
-            16, 4, GX_TF_I4, GX_CLAMP, GX_CLAMP, GX_FALSE);
-        GXInitTexObjLOD(
-            &mBlurTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
-        mpCachedBlurTex = m_blurTex;
-    }
-    GXLoadTexObj(&mBlurTexObj, GX_TEXMAP0);
-#else
     GXInitTexObj(&texObj, (void*)((uintptr_t)m_blurTex + m_blurTex->imageOffset), 16, 4, GX_TF_I4,
                  GX_CLAMP, GX_CLAMP, GX_FALSE);
     GXInitTexObjLOD(&texObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE,
                     GX_ANISO_1);
     GXLoadTexObj(&texObj, GX_TEXMAP0);
-#endif
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA4, 8);
     GXClearVtxDesc();

src/d/actor/d_a_alink_hook.inc

@@ -136,26 +136,8 @@ void daAlink_c::hsChainShape_c::draw() {
             }
         }
     } else {
-#if TARGET_PC
-        cXyz hsInterpTop, hsInterpRoot, hsInterpSubRoot, hsInterpSubTop;
-        if (dusk::frame_interp::is_enabled() && alink->mHsChainInterpPrevValid && alink->mHsChainInterpCurrValid) {
-            const f32 alpha = dusk::frame_interp::get_interpolation_step();
-            hsInterpTop    = alink->mHsChainInterpPrevTop    + (alink->mHsChainInterpCurrTop    - alink->mHsChainInterpPrevTop)    * alpha;
-            hsInterpRoot   = alink->mHsChainInterpPrevRoot   + (alink->mHsChainInterpCurrRoot   - alink->mHsChainInterpPrevRoot)   * alpha;
-            hsInterpSubRoot = alink->mHsChainInterpPrevSubRoot + (alink->mHsChainInterpCurrSubRoot - alink->mHsChainInterpPrevSubRoot) * alpha;
-            hsInterpSubTop  = alink->mHsChainInterpPrevSubTop  + (alink->mHsChainInterpCurrSubTop  - alink->mHsChainInterpPrevSubTop)  * alpha;
-        } else {
-            hsInterpTop    = alink->getHsChainTopPos();
-            hsInterpRoot   = alink->getHsChainRootPos();
-            hsInterpSubRoot = alink->getHsSubChainRootPos();
-            hsInterpSubTop  = alink->getHsSubChainTopPos();
-        }
-        const cXyz& chainRootPos = hsInterpRoot;
-        const cXyz& chainTopPos = hsInterpTop;
-#else
         const cXyz& chainRootPos = alink->getHsChainRootPos();
         const cXyz& chainTopPos = alink->getHsChainTopPos();
-#endif
         cXyz maxDistance = chainRootPos - chainTopPos;
 
         f32 maxDistanceF = maxDistance.abs();
@@ -218,13 +200,8 @@ void daAlink_c::hsChainShape_c::draw() {
             }
         }
 
-#if TARGET_PC
-        const cXyz& subChainRootPos = hsInterpSubRoot;
-        const cXyz& subChainTopPos = hsInterpSubTop;
-#else
         const cXyz& subChainRootPos = alink->getHsSubChainRootPos();
         const cXyz& subChainTopPos = alink->getHsSubChainTopPos();
-#endif
         maxDistance = subChainRootPos - subChainTopPos;
 
         maxDistanceF = maxDistance.abs();

src/d/actor/d_a_alink_link.inc

@@ -11,10 +11,8 @@
 #include "d/actor/d_a_tag_mhint.h"
 
 #if TARGET_PC
-#include "dusk/action_bindings.h"
 #include "dusk/gyro.h"
-#include "dusk/mouse.h"
-#include "dusk/touch_camera.h"
+#include "dusk/action_bindings.h"
 #endif
 
 bool daAlink_c::checkNoSubjectModeCamera() {
@@ -122,28 +120,18 @@ BOOL daAlink_c::setBodyAngleToCamera() {
                 var_f31 /= dComIfGp_getCameraZoomScale(field_0x317c);
             }
 
-#if TARGET_PC
-            if (dusk::getSettings().game.enableMouseAim && checkAimContext()) {
-                sp8 = mBodyAngle.x;
-            } else
-#endif
-            {
-                shape_angle.y = shape_angle.y + (var_f31 * cM_ssin(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonXAxis ? -1.0f : 1.0f)));
-                sp8 = mBodyAngle.x + (var_f31 * cM_scos(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonYAxis ? -1.0f : 1.0f)));
+            shape_angle.y = shape_angle.y + (var_f31 * cM_ssin(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonXAxis ? -1.0f : 1.0f)));
+            sp8 = mBodyAngle.x + (var_f31 * cM_scos(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonYAxis ? -1.0f : 1.0f)));
 
-                if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) {
-                    sp8 = mBodyAngle.x;
-                }
+            if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) {
+                sp8 = mBodyAngle.x;
             }
         } else {
             sp8 = mBodyAngle.x;
         }
 
 #if TARGET_PC
-        if ((dusk::getSettings().game.enableGyroAim ||
-             dusk::getSettings().game.enableMouseAim) &&
-             checkAimContext())
-        {
+        if (dusk::getSettings().game.enableGyroAim && checkGyroAimContext()) {
             f32 gyro_scale = 1.0f;
             if (checkWolfEyeUp()) {
                 gyro_scale *= 0.6f;
@@ -153,52 +141,17 @@ BOOL daAlink_c::setBodyAngleToCamera() {
                 gyro_scale /= dComIfGp_getCameraZoomScale(field_0x317c);
             }
 
-            f32 final_yaw = 0.f;
-            f32 final_pitch = 0.f;
-            if (dusk::getSettings().game.enableMouseAim) {
-                dusk::mouse::getAimDeltas(final_yaw, final_pitch);
-            }
-            if (dusk::getSettings().game.enableGyroAim) {
-                f32 gyro_yaw = 0.f;
-                f32 gyro_pitch = 0.f;
-                dusk::gyro::getAimDeltas(gyro_yaw, gyro_pitch);
-                final_yaw += gyro_yaw;
-                final_pitch += gyro_pitch;
-            }
+            f32 gy_yaw = 0.f;
+            f32 gy_pitch = 0.f;
+            dusk::gyro::getAimDeltas(gy_yaw, gy_pitch);
 
-            shape_angle.y = shape_angle.y + cM_rad2s(final_yaw * gyro_scale);
-            sp8 = sp8 + cM_rad2s(final_pitch * gyro_scale);
+            shape_angle.y = shape_angle.y + cM_rad2s(gy_yaw * gyro_scale);
+            sp8 = sp8 + cM_rad2s(gy_pitch * gyro_scale);
 
             if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) {
                 sp8 = mBodyAngle.x;
             }
         }
-
-        if (dusk::getSettings().game.enableTouchControls && checkAimContext()) {
-            f32 touchYawDp = 0.0f;
-            f32 touchPitchDp = 0.0f;
-            if (dusk::touch_camera::consume_delta(touchYawDp, touchPitchDp)) {
-                f32 scale = 1.0f;
-                if (checkWolfEyeUp()) {
-                    scale *= 0.6f;
-                }
-                if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
-                    scale /= dComIfGp_getCameraZoomScale(field_0x317c);
-                }
-
-                const f32 yawDeg = -touchYawDp * dusk::touch_camera::YAW_DEGREES_PER_DP * scale *
-                                   dusk::getSettings().game.touchCameraXSensitivity;
-                const f32 pitchDeg = touchPitchDp * dusk::touch_camera::PITCH_DEGREES_PER_DP *
-                                     scale * dusk::getSettings().game.touchCameraYSensitivity;
-
-                shape_angle.y = shape_angle.y + cM_deg2s(yawDeg);
-                sp8 = sp8 + cM_deg2s(pitchDeg);
-
-                if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) {
-                    sp8 = mBodyAngle.x;
-                }
-            }
-        }
 #endif
 
         if (checkNotItemSinkLimit() && sp8 > 0) {

src/d/actor/d_a_alink_wolf.inc

@@ -348,7 +348,7 @@ void daAlink_c::changeLink(int param_0) {
             initModel(static_cast<J3DModelData*>(dComIfG_getObjectRes(l_mArcName, "al_hands.bmd")), 0);
 
 #if TARGET_PC
-        if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.armorRupeeDrain.getValue() != dusk::MagicArmorMode::NORMAL)
+        if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.freeMagicArmor)
 #else
         if (dComIfGs_getRupee() != 0)
 #endif
@@ -458,7 +458,7 @@ void daAlink_c::changeLink(int param_0) {
         field_0x06f0 = field_0x064C->getMaterialNodePointer(2)->getShape();
 
 #if TARGET_PC
-        if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.armorRupeeDrain.getValue() != dusk::MagicArmorMode::NORMAL) {
+        if (dComIfGs_getRupee() != 0 || dusk::getSettings().game.freeMagicArmor) {
 #else
         if (dComIfGs_getRupee() != 0) {
 #endif

src/d/actor/d_a_b_zant.cpp

@@ -5472,15 +5472,6 @@ int daB_ZANT_c::create() {
     fopAcM_ct(this, daB_ZANT_c);
     OS_REPORT("B_ZANT PARAM %x\n", fopAcM_GetParam(this));
 
-#if TARGET_PC
-        // Due to our loads being so much faster, Zant can initialize *before* the player
-        // This breaks respawning in the final phase of the fight when it tries
-        // to load the player's position
-        if (daPy_getPlayerActorClass() == NULL) {
-            return cPhs_INIT_e;
-        }
-#endif
-
     mSwbit = fopAcM_GetParam(this);
     if (mSwbit != 0xFF) {
         if (dComIfGs_isSwitch(mSwbit, fopAcM_GetRoomNo(this))) {

src/d/actor/d_a_e_sm2.cpp

@@ -923,14 +923,6 @@ static void damage_check(e_sm2_class* i_this) {
                         sm_hit_actor->mode = 10;
 
                         u8 new_color_type = new_col_d[(sm_hit_actor->type * 7) + i_this->type];
-                        #if TARGET_PC
-                        if (dusk::getSettings().game.restoreWiiGlitches &&
-                            ((sm_hit_actor->type == TYPE_BLUE && i_this->type == TYPE_YELLOW) ||
-                                (sm_hit_actor->type == TYPE_YELLOW && i_this->type == TYPE_BLUE)))
-                        {
-                            new_color_type = TYPE_GREEN;
-                        }
-                        #endif
                         i_this->type = new_color_type;
                         sm_hit_actor->type = new_color_type;
 

src/d/actor/d_a_mant.cpp

@@ -16,30 +16,12 @@
 
 using GameVersion = dusk::version::GameVersion;
 
-// keep the original version of the cape texture const so we don't need to reload the file
-static u8 const * l_Egnd_mantTEX_get()   { alignas(32) static u8 buf[0x4000]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x1C00}, {GameVersion::GcnPal, 0x1C00}}, 0x4000), true); return buf; }
+static u8* l_Egnd_mantTEX_get()   { alignas(32) static u8 buf[0x4000]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x1C00}, {GameVersion::GcnPal, 0x1C00}}, 0x4000), true); return buf; }
 static u8* l_Egnd_mantTEX_U_get() { alignas(32) static u8 buf[0x4000]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x5C00}, {GameVersion::GcnPal, 0x5C00}}, 0x4000), true); return buf; }
 static u8* l_Egnd_mantPAL_get()   { alignas(32) static u8 buf[0x60];   static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x9C00}, {GameVersion::GcnPal, 0x9C00}}, 0x60),   true); return buf; }
 #define l_Egnd_mantTEX   (l_Egnd_mantTEX_get())
 #define l_Egnd_mantTEX_U (l_Egnd_mantTEX_U_get())
 #define l_Egnd_mantPAL   (l_Egnd_mantPAL_get())
-
-// make a copy of the cape texture that can be overwritten with the tears
-static u8 l_Egnd_mantTEX_copy[0x4000];
-
-// keep our cached texture objects out here so that we can update them from multiple places
-static bool textureObjsInitialized = false;
-static TGXTlutObj tlutObj;
-static TGXTexObj mainTexObj;
-static TGXTexObj undersideTexObj;
-
-// l_pos is unused
-//static f32* l_pos_get()      { alignas(32) static f32 buf[507];   static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0xA44C}, {GameVersion::GcnPal, 0xA44C}}, sizeof(buf)),   true); return buf; }
-static f32* l_normal_get()   { alignas(32) static f32 buf[3];   static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x9C60}, {GameVersion::GcnPal, 0x9C60}}, sizeof(buf)),   true); return buf; }
-static f32* l_texCoord_get() { alignas(32) static f32 buf[338];   static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0xA458}, {GameVersion::GcnPal, 0xA458}}, sizeof(buf)),   true); return buf; }
-//#define l_pos      (l_pos_get())
-#define l_normal   (l_normal_get())
-#define l_texCoord (l_texCoord_get())
 #else
 #include "assets/l_Egnd_mantTEX.h"
 
@@ -49,6 +31,228 @@ static f32* l_texCoord_get() { alignas(32) static f32 buf[338];   static bool _
 #endif
 #include "d/d_s_play.h"
 
+static u32 l_pos[507] = {
+    0x42480000, 0x3F5CFC93, 0xC365BD9C, 0x4226AAAA,
+    0x3F5CFC93, 0xC365BD9C, 0x42055556, 0x3F5CFC93,
+    0xC365BD9C, 0x41C80000, 0x3F5CFC93, 0xC365BD9C,
+    0x41855556, 0x3F5CFC93, 0xC365BD9C, 0x41055556,
+    0x3F5CFC93, 0xC365BD9C, 0x358637BD, 0x3F5CFC93,
+    0xC365BD9C, 0xC1055554, 0x3F5CFC93, 0xC365BD9C,
+    0xC1855554, 0x3F5CFC93, 0xC365BD9C, 0xC1C7FFFF,
+    0x3F5CFC93, 0xC365BD9C, 0xC2055554, 0x3F5CFC93,
+    0xC365BD9C, 0xC226AAAA, 0x3F5CFC93, 0xC365BD9C,
+    0xC2480000, 0x3F5CFC93, 0xC365BD9C, 0x42480000,
+    0x3F5CFC93, 0xC35292F0, 0x4226AAAA, 0x3F5CFC93,
+    0xC35292F0, 0x42055556, 0x3F5CFC93, 0xC35292F0,
+    0x41C80000, 0x3F5CFC93, 0xC35292F0, 0x41855556,
+    0x3F5CFC93, 0xC35292F0, 0x41055556, 0x3F5CFC93,
+    0xC35292F0, 0x358637BD, 0x3F5CFC93, 0xC35292F0,
+    0xC1055554, 0x3F5CFC93, 0xC35292F0, 0xC1855554,
+    0x3F5CFC93, 0xC35292F0, 0xC1C7FFFF, 0x3F5CFC93,
+    0xC35292F0, 0xC2055554, 0x3F5CFC93, 0xC35292F0,
+    0xC226AAAA, 0x3F5CFC93, 0xC35292F0, 0xC2480000,
+    0x3F5CFC93, 0xC35292F0, 0x42480000, 0x3F5CFC93,
+    0xC33F6846, 0x4226AAAA, 0x3F5CFC93, 0xC33F6846,
+    0x42055556, 0x3F5CFC93, 0xC33F6846, 0x41C80000,
+    0x3F5CFC93, 0xC33F6846, 0x41855556, 0x3F5CFC93,
+    0xC33F6846, 0x41055556, 0x3F5CFC93, 0xC33F6846,
+    0x358637BD, 0x3F5CFC93, 0xC33F6846, 0xC1055554,
+    0x3F5CFC93, 0xC33F6846, 0xC1855554, 0x3F5CFC93,
+    0xC33F6846, 0xC1C7FFFF, 0x3F5CFC93, 0xC33F6846,
+    0xC2055554, 0x3F5CFC93, 0xC33F6846, 0xC226AAAA,
+    0x3F5CFC93, 0xC33F6846, 0xC2480000, 0x3F5CFC93,
+    0xC33F6846, 0x42480000, 0x3F5CFC93, 0xC32C3D9C,
+    0x4226AAAA, 0x3F5CFC93, 0xC32C3D9C, 0x42055556,
+    0x3F5CFC93, 0xC32C3D9C, 0x41C80000, 0x3F5CFC93,
+    0xC32C3D9C, 0x41855556, 0x3F5CFC93, 0xC32C3D9C,
+    0x41055556, 0x3F5CFC93, 0xC32C3D9C, 0x358637BD,
+    0x3F5CFC93, 0xC32C3D9C, 0xC1055554, 0x3F5CFC93,
+    0xC32C3D9C, 0xC1855554, 0x3F5CFC93, 0xC32C3D9C,
+    0xC1C7FFFF, 0x3F5CFC93, 0xC32C3D9C, 0xC2055554,
+    0x3F5CFC93, 0xC32C3D9C, 0xC226AAAA, 0x3F5CFC93,
+    0xC32C3D9C, 0xC2480000, 0x3F5CFC93, 0xC32C3D9C,
+    0x42480000, 0x3F5CFC93, 0xC31912F1, 0x4226AAAA,
+    0x3F5CFC93, 0xC31912F1, 0x42055556, 0x3F5CFC93,
+    0xC31912F1, 0x41C80000, 0x3F5CFC93, 0xC31912F1,
+    0x41855556, 0x3F5CFC93, 0xC31912F1, 0x41055556,
+    0x3F5CFC93, 0xC31912F1, 0x358637BD, 0x3F5CFC93,
+    0xC31912F1, 0xC1055554, 0x3F5CFC93, 0xC31912F1,
+    0xC1855554, 0x3F5CFC93, 0xC31912F1, 0xC1C7FFFF,
+    0x3F5CFC93, 0xC31912F1, 0xC2055554, 0x3F5CFC93,
+    0xC31912F1, 0xC226AAAA, 0x3F5CFC93, 0xC31912F1,
+    0xC2480000, 0x3F5CFC93, 0xC31912F1, 0x42480000,
+    0x3F5CFC93, 0xC305E846, 0x4226AAAA, 0x3F5CFC93,
+    0xC305E846, 0x42055556, 0x3F5CFC93, 0xC305E846,
+    0x41C80000, 0x3F5CFC93, 0xC305E846, 0x41855556,
+    0x3F5CFC93, 0xC305E846, 0x41055556, 0x3F5CFC93,
+    0xC305E846, 0x358637BD, 0x3F5CFC93, 0xC305E846,
+    0xC1055554, 0x3F5CFC93, 0xC305E846, 0xC1855554,
+    0x3F5CFC93, 0xC305E846, 0xC1C7FFFF, 0x3F5CFC93,
+    0xC305E846, 0xC2055554, 0x3F5CFC93, 0xC305E846,
+    0xC226AAAA, 0x3F5CFC93, 0xC305E846, 0xC2480000,
+    0x3F5CFC93, 0xC305E846, 0x42480000, 0x3F5CFC93,
+    0xC2E57B38, 0x4226AAAA, 0x3F5CFC93, 0xC2E57B38,
+    0x42055556, 0x3F5CFC93, 0xC2E57B38, 0x41C80000,
+    0x3F5CFC93, 0xC2E57B38, 0x41855556, 0x3F5CFC93,
+    0xC2E57B38, 0x41055556, 0x3F5CFC93, 0xC2E57B38,
+    0x358637BD, 0x3F5CFC93, 0xC2E57B38, 0xC1055554,
+    0x3F5CFC93, 0xC2E57B38, 0xC1855554, 0x3F5CFC93,
+    0xC2E57B38, 0xC1C7FFFF, 0x3F5CFC93, 0xC2E57B38,
+    0xC2055554, 0x3F5CFC93, 0xC2E57B38, 0xC226AAAA,
+    0x3F5CFC93, 0xC2E57B38, 0xC2480000, 0x3F5CFC93,
+    0xC2E57B38, 0x42480000, 0x3F5CFC93, 0xC2BF25E2,
+    0x4226AAAA, 0x3F5CFC93, 0xC2BF25E2, 0x42055556,
+    0x3F5CFC93, 0xC2BF25E2, 0x41C80000, 0x3F5CFC93,
+    0xC2BF25E2, 0x41855556, 0x3F5CFC93, 0xC2BF25E2,
+    0x41055556, 0x3F5CFC93, 0xC2BF25E2, 0x358637BD,
+    0x3F5CFC93, 0xC2BF25E2, 0xC1055554, 0x3F5CFC93,
+    0xC2BF25E2, 0xC1855554, 0x3F5CFC93, 0xC2BF25E2,
+    0xC1C7FFFF, 0x3F5CFC93, 0xC2BF25E2, 0xC2055554,
+    0x3F5CFC93, 0xC2BF25E2, 0xC226AAAA, 0x3F5CFC93,
+    0xC2BF25E2, 0xC2480000, 0x3F5CFC93, 0xC2BF25E2,
+    0x42480000, 0x3F5CFC93, 0xC298D08D, 0x4226AAAA,
+    0x3F5CFC93, 0xC298D08D, 0x42055556, 0x3F5CFC93,
+    0xC298D08D, 0x41C80000, 0x3F5CFC93, 0xC298D08D,
+    0x41855556, 0x3F5CFC93, 0xC298D08D, 0x41055556,
+    0x3F5CFC93, 0xC298D08D, 0x358637BD, 0x3F5CFC93,
+    0xC298D08D, 0xC1055554, 0x3F5CFC93, 0xC298D08D,
+    0xC1855554, 0x3F5CFC93, 0xC298D08D, 0xC1C7FFFF,
+    0x3F5CFC93, 0xC298D08D, 0xC2055554, 0x3F5CFC93,
+    0xC298D08D, 0xC226AAAA, 0x3F5CFC93, 0xC298D08D,
+    0xC2480000, 0x3F5CFC93, 0xC298D08D, 0x42480000,
+    0x3F5CFC93, 0xC264F66F, 0x4226AAAA, 0x3F5CFC93,
+    0xC264F66F, 0x42055556, 0x3F5CFC93, 0xC264F66F,
+    0x41C80000, 0x3F5CFC93, 0xC264F66F, 0x41855556,
+    0x3F5CFC93, 0xC264F66F, 0x41055556, 0x3F5CFC93,
+    0xC264F66F, 0x358637BD, 0x3F5CFC93, 0xC264F66F,
+    0xC1055554, 0x3F5CFC93, 0xC264F66F, 0xC1855554,
+    0x3F5CFC93, 0xC264F66F, 0xC1C7FFFF, 0x3F5CFC93,
+    0xC264F66F, 0xC2055554, 0x3F5CFC93, 0xC264F66F,
+    0xC226AAAA, 0x3F5CFC93, 0xC264F66F, 0xC2480000,
+    0x3F5CFC93, 0xC264F66F, 0x42480000, 0x3F5CFC93,
+    0xC2184BC4, 0x4226AAAA, 0x3F5CFC93, 0xC2184BC4,
+    0x42055556, 0x3F5CFC93, 0xC2184BC4, 0x41C80000,
+    0x3F5CFC93, 0xC2184BC4, 0x41855556, 0x3F5CFC93,
+    0xC2184BC4, 0x41055556, 0x3F5CFC93, 0xC2184BC4,
+    0x358637BD, 0x3F5CFC93, 0xC2184BC4, 0xC1055554,
+    0x3F5CFC93, 0xC2184BC4, 0xC1855554, 0x3F5CFC93,
+    0xC2184BC4, 0xC1C7FFFF, 0x3F5CFC93, 0xC2184BC4,
+    0xC2055554, 0x3F5CFC93, 0xC2184BC4, 0xC226AAAA,
+    0x3F5CFC93, 0xC2184BC4, 0xC2480000, 0x3F5CFC93,
+    0xC2184BC4, 0x42480000, 0x3F5CFC93, 0xC1974231,
+    0x4226AAAA, 0x3F5CFC93, 0xC1974231, 0x42055556,
+    0x3F5CFC93, 0xC1974231, 0x41C80000, 0x3F5CFC93,
+    0xC1974231, 0x41855556, 0x3F5CFC93, 0xC1974231,
+    0x41055556, 0x3F5CFC93, 0xC1974231, 0x358637BD,
+    0x3F5CFC93, 0xC1974231, 0xC1055554, 0x3F5CFC93,
+    0xC1974231, 0xC1855554, 0x3F5CFC93, 0xC1974231,
+    0xC1C7FFFF, 0x3F5CFC93, 0xC1974231, 0xC2055554,
+    0x3F5CFC93, 0xC1974231, 0xC226AAAA, 0x3F5CFC93,
+    0xC1974231, 0xC2480000, 0x3F5CFC93, 0xC1974231,
+    0x42480000, 0x3F5CFC93, 0x3E84C964, 0x4226AAAA,
+    0x3F5CFC93, 0x3E84C964, 0x42055556, 0x3F5CFC93,
+    0x3E84C964, 0x41C80000, 0x3F5CFC93, 0x3E84C964,
+    0x41855556, 0x3F5CFC93, 0x3E84C964, 0x41055556,
+    0x3F5CFC93, 0x3E84C964, 0x358637BD, 0x3F5CFC93,
+    0x3E84C964, 0xC1055554, 0x3F5CFC93, 0x3E84C964,
+    0xC1855554, 0x3F5CFC93, 0x3E84C964, 0xC1C7FFFF,
+    0x3F5CFC93, 0x3E84C964, 0xC2055554, 0x3F5CFC93,
+    0x3E84C964, 0xC226AAAA, 0x3F5CFC93, 0x3E84C964,
+    0xC2480000, 0x3F5CFC93, 0x3E84C964,
+};
+
+static u32 l_normal[3] = {
+    0x00000000, 0x3F800000, 0x00000000,
+};
+
+static u32 l_texCoord[338] = {
+    0x00000000, 0x3F6AAAB0, 0x3DAAAA7E, 0x3F6AAAB0,
+    0x3DAAAA7E, 0x3F800000, 0x00000000, 0x3F800000,
+    0x3E2AAAC1, 0x3F6AAAB0, 0x3E2AAAC1, 0x3F800000,
+    0x3E800000, 0x3F6AAAB0, 0x3E800000, 0x3F800000,
+    0x3EAAAA9F, 0x3F6AAAB0, 0x3EAAAA9F, 0x3F800000,
+    0x3ED55561, 0x3F6AAAB0, 0x3ED55561, 0x3F800000,
+    0x3F000000, 0x3F6AAAB0, 0x3F000000, 0x3F800000,
+    0x3F155550, 0x3F6AAAB0, 0x3F155550, 0x3F800000,
+    0x3F2AAAB0, 0x3F6AAAB0, 0x3F2AAAB0, 0x3F800000,
+    0x3F400000, 0x3F6AAAB0, 0x3F400000, 0x3F800000,
+    0x3F555550, 0x3F6AAAB0, 0x3F555550, 0x3F800000,
+    0x3F6AAAB0, 0x3F6AAAB0, 0x3F6AAAB0, 0x3F800000,
+    0x3F800000, 0x3F6AAAB0, 0x3F800000, 0x3F800000,
+    0x00000000, 0x3F555550, 0x3DAAAA7E, 0x3F555550,
+    0x3E2AAAC1, 0x3F555550, 0x3E800000, 0x3F555550,
+    0x3EAAAA9F, 0x3F555550, 0x3ED55561, 0x3F555550,
+    0x3F000000, 0x3F555550, 0x3F155550, 0x3F555550,
+    0x3F2AAAB0, 0x3F555550, 0x3F400000, 0x3F555550,
+    0x3F555550, 0x3F555550, 0x3F6AAAB0, 0x3F555550,
+    0x3F800000, 0x3F555550, 0x00000000, 0x3F400000,
+    0x3DAAAA7E, 0x3F400000, 0x3E2AAAC1, 0x3F400000,
+    0x3E800000, 0x3F400000, 0x3EAAAA9F, 0x3F400000,
+    0x3ED55561, 0x3F400000, 0x3F000000, 0x3F400000,
+    0x3F155550, 0x3F400000, 0x3F2AAAB0, 0x3F400000,
+    0x3F400000, 0x3F400000, 0x3F555550, 0x3F400000,
+    0x3F6AAAB0, 0x3F400000, 0x3F800000, 0x3F400000,
+    0x00000000, 0x3F2AAAB0, 0x3DAAAA7E, 0x3F2AAAB0,
+    0x3E2AAAC1, 0x3F2AAAB0, 0x3E800000, 0x3F2AAAB0,
+    0x3EAAAA9F, 0x3F2AAAB0, 0x3ED55561, 0x3F2AAAB0,
+    0x3F000000, 0x3F2AAAB0, 0x3F155550, 0x3F2AAAB0,
+    0x3F2AAAB0, 0x3F2AAAB0, 0x3F400000, 0x3F2AAAB0,
+    0x3F555550, 0x3F2AAAB0, 0x3F6AAAB0, 0x3F2AAAB0,
+    0x3F800000, 0x3F2AAAB0, 0x00000000, 0x3F155550,
+    0x3DAAAA7E, 0x3F155550, 0x3E2AAAC1, 0x3F155550,
+    0x3E800000, 0x3F155550, 0x3EAAAA9F, 0x3F155550,
+    0x3ED55561, 0x3F155550, 0x3F000000, 0x3F155550,
+    0x3F155550, 0x3F155550, 0x3F2AAAB0, 0x3F155550,
+    0x3F400000, 0x3F155550, 0x3F555550, 0x3F155550,
+    0x3F6AAAB0, 0x3F155550, 0x3F800000, 0x3F155550,
+    0x00000000, 0x3F000000, 0x3DAAAA7E, 0x3F000000,
+    0x3E2AAAC1, 0x3F000000, 0x3E800000, 0x3F000000,
+    0x3EAAAA9F, 0x3F000000, 0x3ED55561, 0x3F000000,
+    0x3F000000, 0x3F000000, 0x3F155550, 0x3F000000,
+    0x3F2AAAB0, 0x3F000000, 0x3F400000, 0x3F000000,
+    0x3F555550, 0x3F000000, 0x3F6AAAB0, 0x3F000000,
+    0x3F800000, 0x3F000000, 0x00000000, 0x3ED55561,
+    0x3DAAAA7E, 0x3ED55561, 0x3E2AAAC1, 0x3ED55561,
+    0x3E800000, 0x3ED55561, 0x3EAAAA9F, 0x3ED55561,
+    0x3ED55561, 0x3ED55561, 0x3F000000, 0x3ED55561,
+    0x3F155550, 0x3ED55561, 0x3F2AAAB0, 0x3ED55561,
+    0x3F400000, 0x3ED55561, 0x3F555550, 0x3ED55561,
+    0x3F6AAAB0, 0x3ED55561, 0x3F800000, 0x3ED55561,
+    0x00000000, 0x3EAAAA9F, 0x3DAAAA7E, 0x3EAAAA9F,
+    0x3E2AAAC1, 0x3EAAAA9F, 0x3E800000, 0x3EAAAA9F,
+    0x3EAAAA9F, 0x3EAAAA9F, 0x3ED55561, 0x3EAAAA9F,
+    0x3F000000, 0x3EAAAA9F, 0x3F155550, 0x3EAAAA9F,
+    0x3F2AAAB0, 0x3EAAAA9F, 0x3F400000, 0x3EAAAA9F,
+    0x3F555550, 0x3EAAAA9F, 0x3F6AAAB0, 0x3EAAAA9F,
+    0x3F800000, 0x3EAAAA9F, 0x00000000, 0x3E800000,
+    0x3DAAAA7E, 0x3E800000, 0x3E2AAAC1, 0x3E800000,
+    0x3E800000, 0x3E800000, 0x3EAAAA9F, 0x3E800000,
+    0x3ED55561, 0x3E800000, 0x3F000000, 0x3E800000,
+    0x3F155550, 0x3E800000, 0x3F2AAAB0, 0x3E800000,
+    0x3F400000, 0x3E800000, 0x3F555550, 0x3E800000,
+    0x3F6AAAB0, 0x3E800000, 0x3F800000, 0x3E800000,
+    0x00000000, 0x3E2AAAC1, 0x3DAAAA7E, 0x3E2AAAC1,
+    0x3E2AAAC1, 0x3E2AAAC1, 0x3E800000, 0x3E2AAAC1,
+    0x3EAAAA9F, 0x3E2AAAC1, 0x3ED55561, 0x3E2AAAC1,
+    0x3F000000, 0x3E2AAAC1, 0x3F155550, 0x3E2AAAC1,
+    0x3F2AAAB0, 0x3E2AAAC1, 0x3F400000, 0x3E2AAAC1,
+    0x3F555550, 0x3E2AAAC1, 0x3F6AAAB0, 0x3E2AAAC1,
+    0x3F800000, 0x3E2AAAC1, 0x00000000, 0x3DAAAA7E,
+    0x3DAAAA7E, 0x3DAAAA7E, 0x3E2AAAC1, 0x3DAAAA7E,
+    0x3E800000, 0x3DAAAA7E, 0x3EAAAA9F, 0x3DAAAA7E,
+    0x3ED55561, 0x3DAAAA7E, 0x3F000000, 0x3DAAAA7E,
+    0x3F155550, 0x3DAAAA7E, 0x3F2AAAB0, 0x3DAAAA7E,
+    0x3F400000, 0x3DAAAA7E, 0x3F555550, 0x3DAAAA7E,
+    0x3F6AAAB0, 0x3DAAAA7E, 0x3F800000, 0x3DAAAA7E,
+    0x00000000, 0x00000000, 0x3DAAAA7E, 0x00000000,
+    0x3E2AAAC1, 0x00000000, 0x3E800000, 0x00000000,
+    0x3EAAAA9F, 0x00000000, 0x3ED55561, 0x00000000,
+    0x3F000000, 0x00000000, 0x3F155550, 0x00000000,
+    0x3F2AAAB0, 0x00000000, 0x3F400000, 0x00000000,
+    0x3F555550, 0x00000000, 0x3F6AAAB0, 0x00000000,
+    0x3F800000, 0x00000000,
+};
+
 #if TARGET_PC
 using GameVersion = dusk::version::GameVersion;
 
@@ -101,9 +305,8 @@ static void mant_build_anchor_frame(const cXyz& anchor_a, const cXyz& anchor_b,
 #endif
 
 void daMant_packet_c::draw() {
-    ZoneScoped;
 #if TARGET_PC
-    void* image = l_Egnd_mantTEX_copy;
+    void* image = l_Egnd_mantTEX;
     void* lut = l_Egnd_mantPAL;
 #else
     void* image = tex_d[0];
@@ -185,12 +388,12 @@ void daMant_packet_c::draw() {
         }
     }
     GXSETARRAY(GX_VA_POS, draw_pos, sizeof(mNrm[0]), 12, true);
-    GXSETARRAY(GX_VA_NRM, l_normal, sizeof(f32) * 3, 12, false);
+    GXSETARRAY(GX_VA_NRM, &l_normal, sizeof(l_normal), 12, false);
 #else
     GXSETARRAY(GX_VA_POS, this->getPos(), sizeof(mPos[0]), 12, true);
     GXSETARRAY(GX_VA_NRM, this->getNrm(), sizeof(mNrm[0]), 12, true);
 #endif
-    GXSETARRAY(GX_VA_TEX0, l_texCoord, sizeof(f32) * 338, 8, false);
+    GXSETARRAY(GX_VA_TEX0, &l_texCoord, sizeof(l_texCoord), 8, false); // TODO: set to true when converted to float literals
 
     GXSetZCompLoc(0);
     GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE);
@@ -215,32 +418,15 @@ void daMant_packet_c::draw() {
     GXSetTevKAlphaSel(GX_TEVSTAGE0, GX_TEV_KASEL_K3_A);
     GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0);
 
-#if TARGET_PC
-    if (!textureObjsInitialized) {
-        GXInitTlutObj(&tlutObj, lut, GX_TL_RGB5A3, 0x100);
-        GXInitTexObjCI(&mainTexObj, image, 0x80, 0x80, GX_TF_C8, GX_CLAMP, GX_CLAMP, 0, 0);
-        GXInitTexObjLOD(&mainTexObj, GX_LINEAR, GX_LINEAR, 0.0, 0.0, 0.0, 0, 0, GX_ANISO_1);
-        GXInitTexObjCI(
-            &undersideTexObj, l_Egnd_mantTEX_U, 0x80, 0x80, GX_TF_C8, GX_CLAMP, GX_CLAMP, 0, 0);
-        GXInitTexObjLOD(&undersideTexObj, GX_LINEAR, GX_LINEAR, 0.0, 0.0, 0.0, 0, 0, GX_ANISO_1);
-        textureObjsInitialized = true;
-    }
-#else
     GXTlutObj GStack_80;
     GXInitTlutObj(&GStack_80, lut, GX_TL_RGB5A3, 0x100);
 
     TGXTexObj GStack_74;
     GXInitTexObjCI(&GStack_74, image, 0x80, 0x80, GX_TF_C8, GX_CLAMP, GX_CLAMP, 0, 0);
     GXInitTexObjLOD(&GStack_74, GX_LINEAR, GX_LINEAR, 0.0, 0.0, 0.0, 0, 0, GX_ANISO_1);
-#endif
 
-#if TARGET_PC
-    GXLoadTlut(&tlutObj, GX_TLUT0);
-    GXLoadTexObj(&mainTexObj, GX_TEXMAP0);
-#else
-    GXLoadTlut(&GStack_80, GX_TLUT0);
+    GXLoadTlut(&GStack_80, 0);
     GXLoadTexObj(&GStack_74, GX_TEXMAP0);
-#endif
 
     GXSetCullMode(GX_CULL_BACK);
 
@@ -256,13 +442,12 @@ void daMant_packet_c::draw() {
     GXLoadNrmMtxImm(MStack_54, GX_PNMTX0);
     GXCallDisplayList(l_Egnd_mantDL, 0x3e0);
 
-#if TARGET_PC
-    GXLoadTexObj(&undersideTexObj, GX_TEXMAP0);
-#else
+#ifdef TARGET_PC
+    GStack_74.reset();
+#endif
     GXInitTexObjCI(&GStack_74, l_Egnd_mantTEX_U, 0x80, 0x80, GX_TF_C8, GX_CLAMP, GX_CLAMP, 0, 0);
     GXInitTexObjLOD(&GStack_74, GX_LINEAR, GX_LINEAR, 0.0, 0.0, 0.0, 0, 0, GX_ANISO_1);
     GXLoadTexObj(&GStack_74, GX_TEXMAP0);
-#endif
 
     GXSetTevColor(GX_TEVREG0, COMPOUND_LITERAL(GXColor){0, 0, 0, 0});
     GXSetTevKColor(GX_KCOLOR0, COMPOUND_LITERAL(GXColor){0, 0, 0, 0});
@@ -709,14 +894,8 @@ static int daMant_Execute(mant_class* i_this) {
 
             if (0 <= uVar1 && uVar1 < 0x4000) {
                 int iVar5 = (uVar1 & 7) + (uVar1 & 0x78) * 4 + (uVar1 >> 4 & 0x18) + (uVar1 & 0x3e00);
-                DUSK_IF_ELSE(l_Egnd_mantTEX_copy[iVar5], l_Egnd_mantTEX[iVar5]) = l_Egnd_mantTEX_U[iVar5] = 0;
+                l_Egnd_mantTEX[iVar5] = l_Egnd_mantTEX_U[iVar5] = 0;
             }
-
-#if TARGET_PC
-            if(textureObjsInitialized) {
-                GXInitTlutObjData(&tlutObj, l_Egnd_mantPAL);  // make sure the cached textures are updated
-            }
-#endif
         }
     }
 
@@ -754,14 +933,6 @@ static int daMant_Create(fopAc_ac_c* i_this) {
         l_Egnd_mantTEX_U[i] = 6;
     }
 
-#if TARGET_PC
-    memcpy(l_Egnd_mantTEX_copy, l_Egnd_mantTEX, sizeof(l_Egnd_mantTEX_copy));
-
-    if(textureObjsInitialized) {
-        GXInitTlutObjData(&tlutObj, l_Egnd_mantPAL); // make sure the cached textures are updated
-    }
-#endif
-
     lbl_277_bss_0 = 0;
     daMant_Execute(m_this);
     return 4;

src/d/actor/d_a_mg_rod.cpp

@@ -26,7 +26,6 @@
 #include <cstring>
 
 #if TARGET_PC
-#include "dusk/frame_interpolation.h"
 #include "dusk/settings.h"
 #include "dusk/version.hpp"
 #endif
@@ -181,25 +180,6 @@ static int Worm_nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-#if TARGET_PC
-static void dmg_rod_interp_callback(bool isSimFrame, void* pUserWork) {
-    dmg_rod_class* i_this = (dmg_rod_class*)pUserWork;
-    if (!i_this->mLineInterpPrevValid || !i_this->mLineInterpCurrValid) {
-        return;
-    }
-    const f32 alpha = dusk::frame_interp::get_interpolation_step();
-    const int count = i_this->kind == MG_ROD_KIND_LURE ? MG_ROD_LURE_LINE_LEN : MG_ROD_UKI_LINE_LEN;
-    cXyz* dst = i_this->linemat.getPos(0);
-    for (int i = 0; i < count; i++) {
-        const cXyz& p0 = i_this->mLineInterpPrev[i];
-        const cXyz& p1 = i_this->mLineInterpCurr[i];
-        dst[i] = p0 + (p1 - p0) * alpha;
-    }
-    static GXColor l_color = {0xFF, 0xFF, 0x96, 0xFF};
-    i_this->linemat.update(count, l_color, &i_this->actor.tevStr);
-}
-#endif
-
 static int dmg_rod_Draw(dmg_rod_class* i_this) {
     int unused;
     fopAc_ac_c* actor = &i_this->actor;
@@ -240,18 +220,6 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) {
         i_this->linemat.update(MG_ROD_LURE_LINE_LEN, l_color, &i_this->actor.tevStr);
         dComIfGd_set3DlineMat(&i_this->linemat);
 
-#if TARGET_PC
-        if (dusk::frame_interp::is_enabled()) {
-            if (i_this->mLineInterpCurrValid) {
-                memcpy(i_this->mLineInterpPrev, i_this->mLineInterpCurr, MG_ROD_LURE_LINE_LEN * sizeof(cXyz));
-                i_this->mLineInterpPrevValid = true;
-            }
-            memcpy(i_this->mLineInterpCurr, i_this->linemat.getPos(0), MG_ROD_LURE_LINE_LEN * sizeof(cXyz));
-            i_this->mLineInterpCurrValid = true;
-            dusk::frame_interp::add_interpolation_callback(&dmg_rod_interp_callback, i_this);
-        }
-#endif
-
         model = i_this->rod_modelMorf->getModel();
         g_env_light.setLightTevColorType_MAJI(model, &i_this->actor.tevStr);
         i_this->rod_modelMorf->entryDL();
@@ -276,18 +244,6 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) {
         i_this->linemat.update(MG_ROD_UKI_LINE_LEN, l_color, &i_this->actor.tevStr);
         dComIfGd_set3DlineMat(&i_this->linemat);
 
-#if TARGET_PC
-        if (dusk::frame_interp::is_enabled()) {
-            if (i_this->mLineInterpCurrValid) {
-                memcpy(i_this->mLineInterpPrev, i_this->mLineInterpCurr, MG_ROD_UKI_LINE_LEN * sizeof(cXyz));
-                i_this->mLineInterpPrevValid = true;
-            }
-            memcpy(i_this->mLineInterpCurr, i_this->linemat.getPos(0), MG_ROD_UKI_LINE_LEN * sizeof(cXyz));
-            i_this->mLineInterpCurrValid = true;
-            dusk::frame_interp::add_interpolation_callback(&dmg_rod_interp_callback, i_this);
-        }
-#endif
-
         for (int i = 0; i < 15; i++) {
             g_env_light.setLightTevColorType_MAJI(i_this->rod_uki_model[i], &actor->tevStr);
             mDoExt_modelUpdateDL(i_this->rod_uki_model[i]);
@@ -5799,12 +5755,6 @@ static void play_camera_u(dmg_rod_class* i_this) {
     }
 }
 
-#if TARGET_PC
-BOOL item_any_fishing_rod(int itemId) {
-    return itemId == dItemNo_FISHING_ROD_1_e || (itemId >= dItemNo_BEE_ROD_e && itemId <= dItemNo_JEWEL_WORM_ROD_e);
-}
-#endif
-
 static int dmg_rod_Execute(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -5871,17 +5821,6 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) {
     i_this->prev_rod_substick_y = i_this->rod_substick_y;
     i_this->rod_substick_y = mDoCPd_c::getSubStickY(PAD_1);
 
-    #if TARGET_PC
-    if (dusk::getSettings().game.buttonFishing) {
-        if ((item_any_fishing_rod(dComIfGp_getSelectItem(0)) && mDoCPd_c::getHoldX(PAD_1)) ||
-            (item_any_fishing_rod(dComIfGp_getSelectItem(1)) && mDoCPd_c::getHoldY(PAD_1)))
-        {
-            i_this->rod_stick_y = -1.0f;
-            i_this->rod_substick_y = -1.0f;
-        }
-    }
-    #endif
-
     i_this->reel_speed = 5.0f;
     i_this->reel_btn_flags = mDoCPd_c::getHoldB(PAD_1) | mDoCPd_c::getHoldDown(PAD_1);
     if (mDoCPd_c::getHoldDown(PAD_1)) {
@@ -6449,11 +6388,6 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) {
             return cPhs_ERROR_e;
         }
 
-#if TARGET_PC
-        rod->mLineInterpPrevValid = false;
-        rod->mLineInterpCurrValid = false;
-#endif
-
         OS_REPORT("//////////////MG_ROD SET 2 !!\n");
         if (!hio_set) {
             rod->HIOInit = TRUE;

src/d/actor/d_a_mirror.cpp

@@ -105,7 +105,6 @@ int dMirror_packet_c::entryModel(J3DModel* i_model) {
 
 void dMirror_packet_c::mirrorZdraw(f32* param_0, f32* param_1, f32 param_2, f32 param_3,
                                    f32 param_4, f32 param_5, f32 param_6, f32 param_7) {
-    ZoneScoped;
     GXSetNumChans(1);
     GXSetChanCtrl(GX_COLOR0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE);
     GXSetNumTexGens(0);
@@ -266,7 +265,6 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) {
 }
 
 void dMirror_packet_c::mainDraw() {
-    ZoneScoped;
     j3dSys.reinitGX();
 
     cXyz sp19C[5];

src/d/actor/d_a_npc_impal.cpp

@@ -328,13 +328,13 @@ int daNpcImpal_c::step(s16 i_angle, int i_animate) {
 }
 
 void daNpcImpal_c::playExpression() {
-    daNpcF_anmPlayData dat0 = {ANM_1, mpHIO->m.common.morf_frame, DUSK_IF_ELSE(0, 1)};
+    daNpcF_anmPlayData dat0 = {ANM_1, mpHIO->m.common.morf_frame, 1};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
-    daNpcF_anmPlayData dat1 = {ANM_5, mpHIO->m.common.morf_frame, DUSK_IF_ELSE(0, 1)};
+    daNpcF_anmPlayData dat1 = {ANM_5, mpHIO->m.common.morf_frame, 1};
     daNpcF_anmPlayData* pDat1[1] = {&dat1};
-    daNpcF_anmPlayData dat2 = {ANM_4, mpHIO->m.common.morf_frame, DUSK_IF_ELSE(0, 1)};
+    daNpcF_anmPlayData dat2 = {ANM_4, mpHIO->m.common.morf_frame, 1};
     daNpcF_anmPlayData* pDat2[1] = {&dat2};
-    daNpcF_anmPlayData dat3 = {ANM_6, mpHIO->m.common.morf_frame, DUSK_IF_ELSE(0, 1)};
+    daNpcF_anmPlayData dat3 = {ANM_6, mpHIO->m.common.morf_frame, 1};
     daNpcF_anmPlayData* pDat3[1] = {&dat3};
     daNpcF_anmPlayData dat4 = {ANM_8, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat4[1] = {&dat4};

src/d/actor/d_a_npc_ks.cpp

@@ -178,7 +178,7 @@ static void anm_init(npc_ks_class* i_this, int param_2, f32 i_morf, u8 i_attr, f
             param_2 = 42;
         } else {
             // bug: developers meant to set equal to 44?
-            IF_NOT_DUSK(param_2 == 44);
+            param_2 == 44;
             dComIfGs_shake_kandelaar();
         }
     }
@@ -6882,16 +6882,6 @@ static int daNpc_Ks_Delete(npc_ks_class* i_this) {
         i_this->model->stopZelAnime();
     }
 
-#if TARGET_PC
-    if (leader == i_this) {
-        leader = NULL;
-    }
-
-    if (saru_p[i_this->set_id] == i_this) {
-        saru_p[i_this->set_id] = NULL;
-    }
-#endif
-
     return 1;
 }
 

src/d/actor/d_a_obj_flag2.cpp

@@ -261,7 +261,6 @@ void FlagCloth_c::execute() {
 }
 
 void FlagCloth_c::draw() {
-    ZoneScoped;
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
     dKy_setLight_again();

src/d/actor/d_a_obj_flag3.cpp

@@ -220,7 +220,6 @@ void FlagCloth2_c::initCcSphere(fopAc_ac_c*) {
 }
 
 inline void FlagCloth2_c::draw() {
-    ZoneScoped;
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
     dKy_setLight_again();

src/d/actor/d_a_obj_keyhole.cpp

@@ -10,9 +10,6 @@
 #include "d/d_s_play.h"
 #include "d/actor/d_a_player.h"
 #include "Z2AudioLib/Z2Instances.h"
-#if TARGET_PC
-#include "dusk/frame_interpolation.h"
-#endif
 
 daObj_Keyhole_HIO_c::daObj_Keyhole_HIO_c() {
     id = -1;
@@ -56,21 +53,6 @@ static int daObj_Keyhole_Draw(obj_keyhole_class* i_this) {
     for (int i = 0; i < 6; i++) {
         kh_chain_s* chain_s = &i_this->chain_s[i];
         for (int j = 0; j < i_this->chain_num; j++) {
-#if TARGET_PC
-            if (dusk::frame_interp::is_enabled() && i_this->mChainInterpPrevValid && i_this->mChainInterpCurrValid) {
-                const f32 alpha = dusk::frame_interp::get_interpolation_step();
-                Mtx mtx;
-                const f32* p0 = (const f32*)i_this->mChainInterpPrev[i][j];
-                const f32* p1 = (const f32*)i_this->mChainInterpCurr[i][j];
-                f32* dst = (f32*)mtx;
-                for (int k = 0; k < 12; k++) {
-                    dst[k] = p0[k] + (p1[k] - p0[k]) * alpha;
-                }
-                chain_s->model[j]->setBaseTRMtx(mtx);
-                g_env_light.setLightTevColorType_MAJI(chain_s->model[j], &actor->tevStr);
-                mDoExt_modelUpdateDL(chain_s->model[j]);
-            } else
-#endif
             dComIfGp_entrySimpleModel(chain_s->model[j], fopAcM_GetRoomNo(actor));
         }
     }
@@ -388,21 +370,6 @@ static void chain_move(obj_keyhole_class* i_this) {
             ANGLE_ADD(sp8, TREG_S(0) + 0x3D00);
         }
     }
-
-#if TARGET_PC
-    if (dusk::frame_interp::is_enabled()) {
-        if (i_this->mChainInterpCurrValid) {
-            memcpy(i_this->mChainInterpPrev, i_this->mChainInterpCurr, sizeof(i_this->mChainInterpCurr));
-            i_this->mChainInterpPrevValid = true;
-        }
-        for (int i = 0; i < 6; i++) {
-            for (int j = 0; j < i_this->chain_num; j++) {
-                MTXCopy(i_this->chain_s[i].model[j]->getBaseTRMtx(), i_this->mChainInterpCurr[i][j]);
-            }
-        }
-        i_this->mChainInterpCurrValid = true;
-    }
-#endif
 }
 
 static void open(obj_keyhole_class* i_this) {
@@ -783,11 +750,6 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) {
             return cPhs_ERROR_e;
         }
 
-#if TARGET_PC
-        i_this->mChainInterpPrevValid = false;
-        i_this->mChainInterpCurrValid = false;
-#endif
-
         OS_REPORT("//////////////OBJ_KEYHOLE SET 2 !!\n");
 
         if (i_this->arg0 == 3) {

src/d/actor/d_a_player.cpp

@@ -392,10 +392,7 @@ static const u8* l_sightDL_get() {
 #endif
 
 void daPy_sightPacket_c::draw() {
-    ZoneScoped;
-#if !TARGET_PC
     TGXTexObj texObj;
-#endif
 
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
@@ -410,24 +407,10 @@ void daPy_sightPacket_c::draw() {
 
     GXSetTevColor(GX_TEVREG0, reg0);
     GXSetTevColor(GX_TEVREG1, reg1);
-#if TARGET_PC
-    if (mpCachedImg != mpImg) {
-        mTexObj.reset();
-        GXInitTexObj(&mTexObj, mpData, mpImg->width, mpImg->height,
-            static_cast<GXTexFmt>(mpImg->format), static_cast<GXTexWrapMode>(mpImg->wrapS),
-            static_cast<GXTexWrapMode>(mpImg->wrapT),
-            mpImg->mipmapCount > 1 ? GX_ENABLE : GX_DISABLE);
-        GXInitTexObjLOD(
-            &mTexObj, GX_LINEAR, GX_LINEAR, 0.0, 0.0, 0.0, GX_FALSE, GX_FALSE, GX_ANISO_1);
-        mpCachedImg = mpImg;
-    }
-    GXLoadTexObj(&mTexObj, GX_TEXMAP0);
-#else
     GXInitTexObj(&texObj, mpData, mpImg->width, mpImg->height, (GXTexFmt)mpImg->format,
                  (GXTexWrapMode)mpImg->wrapS, (GXTexWrapMode)mpImg->wrapT, mpImg->mipmapCount > 1 ? GX_ENABLE : GX_DISABLE);
     GXInitTexObjLOD(&texObj, GX_LINEAR, GX_LINEAR, 0.0, 0.0, 0.0, GX_FALSE, GX_FALSE, GX_ANISO_1);
     GXLoadTexObj(&texObj, GX_TEXMAP0);
-#endif
     GXLoadPosMtxImm(mProjMtx, GX_PNMTX0);
     GXSetCurrentMtx(0);
     GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);

src/d/actor/d_flower.inc

@@ -15,12 +15,6 @@ const u16 l_J_Ohana00_64TEX__height = 63;
 using GameVersion = dusk::version::GameVersion;
 static u8* l_J_Ohana00_64TEX_get() { static u8 buf[0x800]; static bool _ = (dusk::LoadArchivedRelAsset(buf, 'AMEM', "d_a_grass.rel", {{GameVersion::GcnUsa, 0x9060}, {GameVersion::GcnPal, 0x9060}}, 0x800), true); return buf; }
 #define l_J_Ohana00_64TEX (l_J_Ohana00_64TEX_get())
-
-// from d_grass.inc
-static MtxP get_model_mtx(Mtx modelMtx, Mtx storage);
-static void transform_positions(
-    const dusk::batch::LeafTemplate& tpl, const Vec* posArray, const Mtx mtx, Vec* xfPos);
-static void split_batch(u32& emitted, u32 vtxCount);
 #else
 #include "assets/l_J_Ohana00_64TEX.h"
 #endif
@@ -594,12 +588,6 @@ dFlower_packet_c::dFlower_packet_c() {
     GXInitTexObj(&mTexObj_l_J_Ohana01_64128_0419TEX, l_J_Ohana01_64128_0419TEX,
         l_J_Ohana01_64128_0419TEX__width + 1, l_J_Ohana01_64128_0419TEX__height + 1, GX_TF_CMPR, GX_MIRROR, GX_MIRROR, GX_FALSE
     );
-
-    dusk::batch::decode_leaf_template(l_J_hana00DL, 0x140, mTplHana00);
-    dusk::batch::decode_leaf_template(l_J_hana00_cDL, 0xC0, mTplHana00Cut);
-    dusk::batch::decode_leaf_template(l_J_hana01DL, 0x120, mTplHana01);
-    dusk::batch::decode_leaf_template(l_J_hana01_c_00DL, 0xC0, mTplHana01Cut00);
-    dusk::batch::decode_leaf_template(l_J_hana01_c_01DL, 0x120, mTplHana01Cut);
 #endif
 
     m_deleteRoom = &dFlower_packet_c::deleteRoom;
@@ -609,373 +597,7 @@ dFlower_packet_c::dFlower_packet_c() {
 #endif
 }
 
-#if TARGET_PC
-static void batch_setup_tev(u32 lightMask) {
-    GXSetCullMode(GX_CULL_NONE);
-
-    GXSetNumChans(2);
-    GXSetChanCtrl(GX_COLOR0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_NONE, GX_AF_NONE);
-    GXSetChanCtrl(GX_COLOR1, GX_TRUE, GX_SRC_VTX, GX_SRC_REG, lightMask, GX_DF_CLAMP, GX_AF_SPOT);
-
-    GXSetNumTevStages(3);
-
-    GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR1A1);
-    GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC);
-    GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-    GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO);
-    GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-
-    GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
-    GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_ZERO, GX_CC_CPREV, GX_CC_RASC, GX_CC_ZERO);
-    GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-    GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO);
-    GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-
-    GXSetTevOrder(GX_TEVSTAGE2, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
-    GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_ZERO, GX_CC_TEXC, GX_CC_CPREV, GX_CC_C0);
-    GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_4, GX_TRUE, GX_TEVPREV);
-    GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_TEXA);
-    GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-}
-
-static GXColor hana00_amb_color(const dFlower_data_c* flower, const dKy_tevstr_c* tevstr) {
-    GXColor amb = {0, 0, 0, 0xFF};
-    if (DEBUG && g_kankyoHIO.navy.grass_adjust_ON != 0) {
-        amb.r = g_kankyoHIO.navy.grass_ambcol.r * 2;
-        amb.g = g_kankyoHIO.navy.grass_ambcol.g * 2;
-        amb.b = g_kankyoHIO.navy.grass_ambcol.b * 2;
-    } else {
-        amb.r = (flower->field_0x04 & 0x1F) * 2;
-        amb.g = ((flower->field_0x04 >> 5) & 0x1F) * 2;
-        amb.b = ((flower->field_0x04 >> 0xA) & 0x1F) * 2;
-    }
-
-    if (daPy_py_c::checkNowWolfPowerUp()) {
-        f32 ambRate = g_env_light.bg_amb_col[0].r / 255.0f;
-        f32 col = (((flower->field_0x04 & 0x1F) * 2 + 0x10));
-        amb.r = col * (ambRate * 4.0f);
-
-        ambRate = g_env_light.bg_amb_col[0].g / 255.0f;
-        f32 col2 = (((flower->field_0x04 >> 5) & 0x1F) * 2 + 0x10);
-        amb.g = col2 * (4.0f * ambRate);
-
-        ambRate = g_env_light.bg_amb_col[0].b / 255.0f;
-        f32 col3 = (((flower->field_0x04 >> 10) & 0x1F) * 2 + 0x10);
-        amb.b = col3 * (4.0f * ambRate);
-    }
-
-    if (amb.r == 0x3E) {
-        amb.r = tevstr->AmbCol.r;
-    }
-
-    if (amb.g == 0x3E) {
-        amb.g = tevstr->AmbCol.g;
-    }
-
-    if (amb.b == 0x3E) {
-        amb.b = tevstr->AmbCol.b;
-    }
-
-    return amb;
-}
-
-static GXColor hana01_amb_color(int idx, const dKy_tevstr_c* tevstr) {
-    f32 rRate = tevstr->AmbCol.r * 0.03125f;
-    if (rRate > 1.0f) {
-        rRate = 1.0f;
-    }
-
-    f32 gRate = tevstr->AmbCol.g * 0.03125f;
-    if (gRate > 1.0f) {
-        gRate = 1.0f;
-    }
-
-    f32 bRate = tevstr->AmbCol.b * 0.03125f;
-    if (bRate > 1.0f) {
-        bRate = 1.0f;
-    }
-
-    GXColor amb = {1, 1, 1, 1};
-
-    GXColor sub;
-    sub.r = -0.4f * tevstr->AmbCol.r * rRate;
-    sub.g = -0.4f * tevstr->AmbCol.g * gRate;
-    sub.b = -0.4f * tevstr->AmbCol.b * bRate;
-
-    switch (idx & 7) {
-    case 0:
-        amb.r = tevstr->AmbCol.r + sub.r;
-        amb.g = tevstr->AmbCol.g;
-        amb.b = tevstr->AmbCol.b;
-        break;
-    case 1:
-        amb.r = tevstr->AmbCol.r;
-        amb.g = tevstr->AmbCol.g + sub.g;
-        amb.b = tevstr->AmbCol.b;
-        break;
-    case 2:
-        amb.r = tevstr->AmbCol.r;
-        amb.g = tevstr->AmbCol.g;
-        amb.b = tevstr->AmbCol.b + sub.b;
-        break;
-    case 3:
-        amb.r = tevstr->AmbCol.r + sub.r;
-        amb.g = tevstr->AmbCol.g + sub.g;
-        amb.b = tevstr->AmbCol.b;
-        break;
-    case 4:
-        amb.r = tevstr->AmbCol.r;
-        amb.g = tevstr->AmbCol.g + sub.g;
-        amb.b = tevstr->AmbCol.b + sub.b;
-        break;
-    case 5:
-        amb.r = tevstr->AmbCol.r + sub.r;
-        amb.g = tevstr->AmbCol.g;
-        amb.b = tevstr->AmbCol.b + sub.b;
-        break;
-    case 6:
-        amb.r = tevstr->AmbCol.r + sub.r;
-        amb.g = tevstr->AmbCol.g + sub.g;
-        amb.b = tevstr->AmbCol.b + sub.b;
-        break;
-    case 7:
-        break;
-    }
-
-    if (daPy_py_c::checkNowWolfPowerUp()) {
-        f32 ambRate = g_env_light.bg_amb_col[0].r / 255.0f;
-        amb.r = (amb.r + 8) * (6.0f * ambRate);
-
-        ambRate = g_env_light.bg_amb_col[0].g / 255.0f;
-        amb.g = (amb.g + 8) * (6.0f * ambRate);
-
-        ambRate = g_env_light.bg_amb_col[0].b / 255.0f;
-        amb.b = (amb.b + 8) * (6.0f * ambRate);
-    }
-
-    amb.a = 0xFF;
-    return amb;
-}
-
-static void flower_emit(const dusk::batch::LeafTemplate& tpl, const Vec* xformedPos, GXColor amb) {
-    for (u32 i = 0; i < tpl.vtxCount; i++) {
-        const dusk::batch::LeafTemplate::Vtx& v = tpl.vtx[i];
-        const Vec& p = xformedPos[v.pos];
-        GXPosition3f32(p.x, p.y, p.z);
-        GXNormal1x8(v.nrm);
-        GXColor1x8(v.clr);
-        GXColor4u8(amb.r, amb.g, amb.b, amb.a);
-        GXTexCoord1x8(v.tex);
-    }
-}
-
 void dFlower_packet_c::draw() {
-    ZoneScoped;
-    dScnKy_env_light_c* kankyo = dKy_getEnvlight();
-    j3dSys.reinitGX();
-
-    GXSetNumIndStages(0);
-    dKy_setLight_again();
-    GXClearVtxDesc();
-    GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
-    GXSetVtxDesc(GX_VA_NRM, GX_INDEX8);
-    GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
-    GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR1, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSETARRAY(GX_VA_POS, &l_flowerPos, sizeof(l_flowerPos), sizeof(Vec), true);
-    GXSETARRAY(GX_VA_NRM, &l_flowerNormal, sizeof(l_flowerNormal), sizeof(Vec), true);
-    GXSETARRAY(GX_VA_CLR0, &l_flowerColor, sizeof(l_flowerColor), sizeof(GXColor), true);
-    GXSETARRAY(GX_VA_TEX0, &l_flowerTexCoord, sizeof(l_flowerTexCoord), 8, true);
-
-    static GXVtxDescList vtxDescList[] = {
-        {GX_VA_POS, GX_DIRECT},
-        {GX_VA_NRM, GX_INDEX8},
-        {GX_VA_CLR0, GX_INDEX8},
-        {GX_VA_CLR1, GX_DIRECT},
-        {GX_VA_TEX0, GX_INDEX8},
-        {GX_VA_NULL, GX_NONE},
-    };
-    static Vec xfPos[256];
-    Mtx identity;
-    MTXIdentity(identity);
-
-    // --- hana00 ---
-    for (int i = 0; i < 64; i++) {
-        dFlower_data_c* first = m_room[i].getData();
-        if (first == nullptr || !dComIfGp_roomControl_checkStatusFlag(i, 0x10)) {
-            continue;
-        }
-
-        dKy_tevstr_c* tevstr = dComIfGp_roomControl_getTevStr(i);
-        int lightCount = 6;
-
-        if (dComIfGp_roomControl_getStatusRoomDt(i) != nullptr) {
-            lightCount = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum();
-        }
-
-        if (dKy_SunMoon_Light_Check() && lightCount < 2) {
-            lightCount = 2;
-        }
-
-        for (int j = 0; j < 6; j++) {
-            if (kankyo->field_0x0c18[j].field_0x26 == 1) {
-                lightCount++;
-            }
-        }
-
-        if (lightCount <= 2) {
-            GXCallDisplayList(l_matLight4DL, 0x80);
-        } else {
-            GXCallDisplayList(l_matDL, 0x80);
-        }
-
-        GXSetTevColorS10(GX_TEVREG0, {0, 0, 0, 0});
-        dKy_Global_amb_set(tevstr);
-        dKy_GxFog_tevstr_set(tevstr);
-        dKy_setLight_nowroom_grass(tevstr->room_no, 1.0f);
-
-        GXLoadTexObj(&mTexObj_l_J_Ohana00_64TEX, GX_TEXMAP0);
-        batch_setup_tev(lightCount <= 2 ? (GX_LIGHT1 | GX_LIGHT2 | GX_LIGHT3 | GX_LIGHT4) :
-                                          (GX_LIGHT1 | GX_LIGHT2 | GX_LIGHT3 | GX_LIGHT4 |
-                                              GX_LIGHT5 | GX_LIGHT6 | GX_LIGHT7));
-        GXSetVtxDescv(vtxDescList);
-        GXLoadPosMtxImm(identity, GX_PNMTX0);
-        GXLoadNrmMtxImm(j3dSys.getViewMtx(), 0);
-
-        for (int bucket = 0; bucket < 2; bucket++) {
-            const bool cut = bucket != 0;
-            const dusk::batch::LeafTemplate& tpl = cut ? mTplHana00Cut : mTplHana00;
-
-            bool open = false;
-            u32 emitted = 0;
-            for (dFlower_data_c* flower = first; flower != nullptr; flower = flower->mp_next) {
-                if (cLib_checkBit<u8>(flower->m_state, 4) ||
-                    cLib_checkBit<u8>(flower->m_state, 0x40))
-                {
-                    continue;
-                }
-                if ((cLib_checkBit<u8>(flower->m_state, 8) != 0) != cut) {
-                    continue;
-                }
-
-                if (!open) {
-                    GXBegin(GX_TRIANGLES, GX_VTXFMT1, GX_AUTO);
-                    open = true;
-                }
-                split_batch(emitted, tpl.vtxCount);
-
-                Mtx interpMtx;
-                MtxP mtx = get_model_mtx(flower->m_modelMtx, interpMtx);
-                transform_positions(tpl, reinterpret_cast<Vec*>(l_flowerPos), mtx, xfPos);
-                flower_emit(tpl, xfPos, hana00_amb_color(flower, tevstr));
-            }
-            if (open) {
-                GXEnd();
-            }
-        }
-    }
-
-    // --- hana01 ---
-    GXSETARRAY(GX_VA_POS, mp_pos, sizeof(l_flowerPos2), sizeof(Vec), true);
-    GXSETARRAY(GX_VA_NRM, &l_flowerNormal2, sizeof(l_flowerNormal2), sizeof(Vec), true);
-    GXSETARRAY(GX_VA_CLR0, mp_colors, sizeof(l_flowerColor2), sizeof(GXColor), true);
-    GXSETARRAY(GX_VA_TEX0, mp_texCoords, sizeof(l_flowerTexCoord2), 8, true);
-
-    for (int i = 0; i < 64; i++) {
-        dFlower_data_c* first = m_room[i].getData();
-        if (first == NULL) {
-            continue;
-        }
-
-        dKy_tevstr_c* tevstr = dComIfGp_roomControl_getTevStr(i);
-        int lightCount = 6;
-
-        if (dComIfGp_roomControl_getStatusRoomDt(i) != NULL) {
-            lightCount = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum();
-        }
-
-#if DEBUG
-        if (g_kankyoHIO.light.m_HOSTIO_setting != 0) {
-            lightCount = g_kankyoHIO.dungeonLight.usedLights;
-        }
-#endif
-
-        if (dKy_SunMoon_Light_Check() == TRUE && lightCount < 2) {
-            lightCount = 2;
-        }
-
-        if (lightCount <= 2) {
-            GXCallDisplayList(mp_mat2Light4DL, m_mat2Light4DL_size);
-        } else {
-            GXCallDisplayList(mp_mat2DL, m_mat2DL_size);
-        }
-
-        GXSetTevColorS10(GX_TEVREG0, {0, 0, 0, 0});
-        dKy_Global_amb_set(tevstr);
-        dKy_GxFog_tevstr_set(tevstr);
-        dKy_setLight_nowroom_grass(tevstr->room_no, 1.0f);
-
-        GXLoadTexObj(&mTexObj_l_J_Ohana01_64128_0419TEX, GX_TEXMAP0);
-        batch_setup_tev(lightCount <= 2 ? (GX_LIGHT1 | GX_LIGHT2 | GX_LIGHT3 | GX_LIGHT4) :
-                                          (GX_LIGHT1 | GX_LIGHT2 | GX_LIGHT3 | GX_LIGHT4 |
-                                              GX_LIGHT5 | GX_LIGHT6 | GX_LIGHT7));
-        GXSetVtxDescv(vtxDescList);
-        GXLoadPosMtxImm(identity, GX_PNMTX0);
-        GXLoadNrmMtxImm(j3dSys.getViewMtx(), 0);
-
-        const dusk::batch::LeafTemplate* const buckets[3] = {
-            &mTplHana01, &mTplHana01Cut00, &mTplHana01Cut};
-        for (int bucket = 0; bucket < 3; bucket++) {
-            const dusk::batch::LeafTemplate& tpl = *buckets[bucket];
-
-            bool open = false;
-            u32 emitted = 0;
-            int idx = 0;
-            for (dFlower_data_c* flower = first; flower != NULL; flower = flower->mp_next, idx++) {
-                if (cLib_checkBit<u8>(flower->m_state, 4) ||
-                    !cLib_checkBit<u8>(flower->m_state, 0x40))
-                {
-                    continue;
-                }
-                const int flowerBucket = cLib_checkBit<u8>(flower->m_state, 8)    ? 2 :
-                                         cLib_checkBit<u8>(flower->m_state, 0x10) ? 1 :
-                                                                                    0;
-                if (flowerBucket != bucket) {
-                    continue;
-                }
-
-                if (!open) {
-                    GXBegin(GX_TRIANGLES, GX_VTXFMT1, GX_AUTO);
-                    open = true;
-                }
-                split_batch(emitted, tpl.vtxCount);
-
-                Mtx interpMtx;
-                MtxP mtx = get_model_mtx(flower->m_modelMtx, interpMtx);
-                transform_positions(tpl, mp_pos, mtx, xfPos);
-                flower_emit(tpl, xfPos, hana01_amb_color(idx, tevstr));
-            }
-            if (open) {
-                GXEnd();
-            }
-        }
-    }
-
-    GXSetNumTevStages(1);
-    GXSetNumChans(1);
-    J3DShape::resetVcdVatCache();
-}
-#else
-void dFlower_packet_c::draw() {
-    ZoneScoped;
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     j3dSys.reinitGX();
 
@@ -1263,7 +885,6 @@ void dFlower_packet_c::draw() {
 
     J3DShape::resetVcdVatCache();
 }
-#endif
 
 void dFlower_packet_c::calc() {
     dFlower_anm_c* anm_p = getAnm();

src/d/actor/d_grass.inc

@@ -512,368 +512,12 @@ dGrass_packet_c::dGrass_packet_c() {
     m_Mkusa_9q_cDL_size = 0xC0;
     field_0x1d714 = 0;
 
-#if TARGET_PC
-    dusk::batch::decode_leaf_template(mp_Mkusa_9q_DL, m_Mkusa_9q_DL_size, mTplKusa9q);
-    dusk::batch::decode_leaf_template(mp_Mkusa_9q_cDL, m_Mkusa_9q_cDL_size, mTplKusa9qCut);
-    dusk::batch::decode_leaf_template(l_M_TenGusaDL, 0xC0, mTplTengusa);
-#endif
-
     OS_REPORT("草群メモリ=%fＫ\n", 117.7734375f);
     
     m_deleteRoom = &dGrass_packet_c::deleteRoom;
 }
 
-#if TARGET_PC
-static MtxP get_model_mtx(Mtx modelMtx, Mtx storage) {
-    if (dusk::frame_interp::lookup_replacement(modelMtx, storage)) {
-        cMtx_concat(j3dSys.getViewMtx(), storage, storage);
-        return storage;
-    }
-    return modelMtx;
-}
-
-static void transform_positions(
-    const dusk::batch::LeafTemplate& tpl, const Vec* posArray, const Mtx mtx, Vec* xfPos) {
-    for (u32 i = 0; i < tpl.posRefCount; i++) {
-        const u8 idx = tpl.posRefs[i];
-        MTXMultVec(mtx, &posArray[idx], &xfPos[idx]);
-    }
-}
-
-static void split_batch(u32& emitted, u32 vtxCount) {
-    if (emitted + vtxCount > 0xFFFF) {
-        GXEnd();
-        GXBegin(GX_TRIANGLES, GX_VTXFMT1, GX_AUTO);
-        emitted = 0;
-    }
-    emitted += vtxCount;
-}
-
-static GXColor blade_amb_color(const dGrass_data_c* blade, const dKy_tevstr_c* tevstr) {
-    GXColor amb;
-    amb.a = 0;
-
-#if DEBUG
-    if (g_kankyoHIO.navy.grass_adjust_ON) {
-        amb.r = g_kankyoHIO.navy.grass_ambcol.r * 2;
-        amb.g = g_kankyoHIO.navy.grass_ambcol.g * 2;
-        amb.b = g_kankyoHIO.navy.grass_ambcol.b * 2;
-        return amb;
-    }
-#endif
-
-    amb.r = (blade->m_addCol & 0x1F) * 2;
-    amb.g = ((blade->m_addCol >> 5) & 0x1F) * 2;
-    amb.b = ((blade->m_addCol >> 0xA) & 0x1F) * 2;
-
-    if (daPy_py_c::checkNowWolfPowerUp()) {
-        f32 ambRate = g_env_light.bg_amb_col[0].r / 255.0f;
-        f32 col = (((blade->m_addCol & 0x1F) * 2 + 0x10));
-        amb.r = col * (ambRate * 4.0f);
-
-        ambRate = g_env_light.bg_amb_col[0].g / 255.0f;
-        f32 col2 = (((blade->m_addCol >> 5) & 0x1F) * 2 + 0x10);
-        amb.g = col2 * (4.0f * ambRate);
-
-        ambRate = g_env_light.bg_amb_col[0].b / 255.0f;
-        f32 col3 = (((blade->m_addCol >> 10) & 0x1F) * 2 + 0x10);
-        amb.b = col3 * (4.0f * ambRate);
-    }
-
-    f32 roomAmbScale = 1.0f - (static_cast<int>(blade->m_pos.x) & 0xFF) * 0.001953125f;
-    f32 colScale = 1.1f - (static_cast<u8>(static_cast<int>(blade->m_pos.x)) & 0xFF) / 2000.0f;
-    colScale -= (static_cast<int>(blade->m_pos.z) & 0xFF) / 2000.0f;
-
-    if (colScale > 1.0f) {
-        colScale = 1.0f;
-    }
-
-    if (amb.r == 0x3E) {
-        amb.r = tevstr->AmbCol.r * roomAmbScale;
-    } else {
-        amb.r = amb.r * colScale;
-    }
-
-    if (amb.g == 0x3E) {
-        amb.g = tevstr->AmbCol.g * roomAmbScale;
-    } else {
-        amb.g = amb.g * colScale;
-    }
-
-    if (amb.b == 0x3E) {
-        amb.b = tevstr->AmbCol.b * roomAmbScale;
-    } else {
-        amb.b = amb.b * colScale;
-    }
-
-    return amb;
-}
-
-static void blade_emit(const dusk::batch::LeafTemplate& tpl, const Vec* xformedPos,
-                             const GXColor* colors, GXColor amb) {
-    for (u32 i = 0; i < tpl.vtxCount; i++) {
-        const dusk::batch::LeafTemplate::Vtx& v = tpl.vtx[i];
-        const Vec& p = xformedPos[v.pos];
-        GXPosition3f32(p.x, p.y, p.z);
-        GXNormal1x8(v.nrm);
-        GXColor4u8(amb.r, amb.g, amb.b, colors[v.clr].a);
-        GXTexCoord1x8(v.tex);
-    }
-}
-
 void dGrass_packet_c::draw() {
-    ZoneScoped;
-    dScnKy_env_light_c* kankyo = dKy_getEnvlight();
-
-    j3dSys.reinitGX();
-    GXSetNumIndStages(0);
-    dKy_setLight_again();
-    GXClearVtxDesc();
-
-    static GXVtxDescList l_vtxDescList[] = {
-        {GX_VA_POS, GX_INDEX8},
-        {GX_VA_NRM, GX_INDEX8},
-        {GX_VA_CLR0, GX_INDEX8},
-        {GX_VA_TEX0, GX_INDEX8},
-        {GX_VA_NULL, GX_NONE},
-    };
-
-    static GXVtxDescList l_batchVtxDescList[] = {
-        {GX_VA_POS, GX_DIRECT},
-        {GX_VA_NRM, GX_INDEX8},
-        {GX_VA_CLR0, GX_DIRECT},
-        {GX_VA_TEX0, GX_INDEX8},
-        {GX_VA_NULL, GX_NONE},
-    };
-
-    GXSetVtxDescv(l_vtxDescList);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSETARRAY(GX_VA_POS, mp_pos, sizeof(l_pos), sizeof(Vec), true);
-    GXSETARRAY(GX_VA_NRM, mp_normal, sizeof(l_normal), sizeof(Vec), true);
-    GXSETARRAY(GX_VA_CLR0, mp_colors, sizeof(l_color), sizeof(GXColor), true);
-    GXSETARRAY(GX_VA_TEX0, mp_texCoords, sizeof(l_texCoord), 8, true);
-
-    GXColorS10 reg1 = {0, 0, 0, 0};
-
-    // daytime "shine" alpha curve (TEVREG1 alpha)
-    f32 daytime = g_env_light.getDaytime();
-    f32 ratio;
-    f32 shine;
-    if (daytime >= 90.0f && daytime < 135.0f) {
-        ratio = 1.0f - (0.022222223f * (135.0f - daytime));
-        shine = 100.0f - (18.0f * ratio);
-    } else if (daytime >= 135.0f && daytime < 225.0f) {
-        ratio = 1.0f - (0.011111111f * (225.0f - daytime));
-        shine = 82.0f - (25.0f * ratio);
-    } else if (daytime >= 225.0f && daytime < 270.0f) {
-        ratio = 1.0f - (0.022222223f * (270.0f - daytime));
-        shine = 57.0f - (-25.0f * ratio);
-    } else if (daytime >= 270.0f && daytime < 315.0f) {
-        ratio = (1.0f - (0.022222223f * (315.0f - daytime)));
-        shine = 82.0f - (-18.0f * ratio);
-    } else {
-        shine = 100.0f;
-    }
-
-#if DEBUG
-    if (g_kankyoHIO.navy.grass_shine_value != 0.0f) {
-        shine = g_kankyoHIO.navy.grass_shine_value;
-    }
-#endif
-
-    static Vec xfPos[256];
-    Mtx identity;
-    PSMTXIdentity(identity);
-
-    for (int i = 0; i < 64; i++) {
-        dGrass_data_c* first = m_room[i].getData();
-        if (first == NULL || !dComIfGp_roomControl_checkStatusFlag(i, 0x10)) {
-            continue;
-        }
-
-        int lightCount = 6;
-        dKy_tevstr_c* tevstr = dComIfGp_roomControl_getTevStr(i);
-
-        f32 lightInf = g_env_light.grass_light_inf_rate * g_env_light.bg_light_influence;
-        lightInf += 0.5f * (1.0f - lightInf);
-
-        J3DLightInfo* lightInfo = tevstr->mLights[0].getLightInfo();
-        reg1.r = lightInfo->mColor.r * lightInf;
-        reg1.g = lightInfo->mColor.g * lightInf;
-        reg1.b = lightInfo->mColor.b * lightInf;
-        reg1.a = shine;
-        if (memcmp(dComIfGp_getStartStageName(), "D_MN01", 6) == 0) {
-            reg1.r = 0;
-            reg1.g = 0x1E;
-            reg1.b = 5;
-            reg1.a = 0x50;
-        }
-        GFSetTevColorS10(GX_TEVREG1, reg1);
-
-        if (dComIfGp_roomControl_getStatusRoomDt(i) != nullptr) {
-            lightCount = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum();
-        }
-
-#if DEBUG
-        if (g_kankyoHIO.light.m_HOSTIO_setting != 0) {
-            lightCount = g_kankyoHIO.dungeonLight.usedLights;
-        }
-#endif
-
-        if (dKy_SunMoon_Light_Check() == TRUE && lightCount < 2) {
-            lightCount = 2;
-        }
-
-        for (int j = 0; j < 6; j++) {
-            if (kankyo->field_0x0c18[j].field_0x26 == 1) {
-                lightCount++;
-            }
-        }
-
-        // room-level setup
-        if (first->field_0x05 <= 3 || first->field_0x05 >= 10) {
-            GXLoadTexObj(&mTexObj_l_M_kusa05_RGBATEX, GX_TEXMAP0);
-            if (lightCount <= 3) {
-                GXCallDisplayList(mp_kusa9q_14_DL, m_kusa9q_DL_14_size);
-            } else {
-                GXCallDisplayList(mp_kusa9q_DL, m_kusa9q_DL_size);
-            }
-        } else {
-            GXLoadTexObj(&mTexObj_l_M_Hijiki00TEX, GX_TEXMAP0);
-            GXCallDisplayList(l_Tengusa_matDL, 0xA0);
-        }
-
-        GFSetTevColorS10(GX_TEVREG2, {0, 0, 0, 0});
-
-        dKy_Global_amb_set(tevstr);
-        dKy_GfFog_tevstr_set(tevstr);
-        dKy_setLight_nowroom_grass(tevstr->room_no, 0.0f);
-
-        GXSetVtxDescv(l_batchVtxDescList);
-        GXLoadPosMtxImm(identity, GX_PNMTX0);
-        GXLoadNrmMtxImm(j3dSys.getViewMtx(), 0);
-
-        // buckets: (kusa05 vs tengusa) x (standing vs cut)
-        bool hasRegrowing = false;
-        for (int bucket = 0; bucket < 4; bucket++) {
-            const bool kusaTex = bucket < 2;
-            const bool cut = (bucket & 1) != 0;
-            const dusk::batch::LeafTemplate& tpl =
-                cut ? mTplKusa9qCut : (kusaTex ? mTplKusa9q : mTplTengusa);
-
-            bool open = false;
-            u32 emitted = 0;
-            for (dGrass_data_c* blade = first; blade != NULL; blade = blade->mp_next) {
-                if (cLib_checkBit<u8>(blade->field_0x01, 2)) {
-                    continue;  // clipped
-                }
-                if (blade->field_0x02 < -1) {
-                    hasRegrowing = true;
-                    continue;
-                }
-                const bool bladeKusaTex = blade->field_0x05 <= 3 || blade->field_0x05 >= 10;
-                if (bladeKusaTex != kusaTex || (blade->field_0x02 < 0) != cut) {
-                    continue;
-                }
-
-                if (!open) {
-                    if (kusaTex) {
-                        GXLoadTexObj(&mTexObj_l_M_kusa05_RGBATEX, GX_TEXMAP0);
-                        if (lightCount <= 2) {
-                            GXCallDisplayList(mp_kusa9q_14_DL, m_kusa9q_DL_14_size);
-                        } else {
-                            GXCallDisplayList(mp_kusa9q_DL, m_kusa9q_DL_size);
-                        }
-                    } else {
-                        GXLoadTexObj(&mTexObj_l_M_Hijiki00TEX, GX_TEXMAP0);
-                        GXCallDisplayList(l_Tengusa_matDL, 0xA0);
-                    }
-                    // change amb_src to GX_SRC_VTX
-                    const u32 lightMask =
-                        (kusaTex && lightCount <= 2)
-                            ? (GX_LIGHT1 | GX_LIGHT2 | GX_LIGHT3 | GX_LIGHT4)
-                            : (GX_LIGHT1 | GX_LIGHT2 | GX_LIGHT3 | GX_LIGHT4 | GX_LIGHT5 |
-                               GX_LIGHT6 | GX_LIGHT7);
-                    GXSetChanCtrl(GX_COLOR0, GX_TRUE, GX_SRC_VTX, GX_SRC_REG, lightMask,
-                                  GX_DF_CLAMP, GX_AF_SPOT);
-                    reg1.a = cut ? 0 : shine;
-                    GFSetTevColorS10(GX_TEVREG1, reg1);
-                    GXBegin(GX_TRIANGLES, GX_VTXFMT1, GX_AUTO);
-                    open = true;
-                }
-
-                split_batch(emitted, tpl.vtxCount);
-
-                Mtx interpMtx;
-                MtxP mtx = get_model_mtx(blade->m_modelMtx, interpMtx);
-                transform_positions(tpl, mp_pos, mtx, xfPos);
-                blade_emit(tpl, xfPos, mp_colors, blade_amb_color(blade, tevstr));
-            }
-            if (open) {
-                GXEnd();
-            }
-        }
-
-        // regrowing blades have per-blade TEVREG2 alpha
-        // draw them with the original immediate path
-        if (hasRegrowing) {
-            GXSetVtxDescv(l_vtxDescList);
-            for (dGrass_data_c* blade = first; blade != NULL; blade = blade->mp_next) {
-                if (blade->field_0x02 >= -1 || cLib_checkBit<u8>(blade->field_0x01, 2)) {
-                    continue;
-                }
-
-                const bool kusaTex = blade->field_0x05 <= 3 || blade->field_0x05 >= 10;
-                if (kusaTex) {
-                    GXLoadTexObj(&mTexObj_l_M_kusa05_RGBATEX, GX_TEXMAP0);
-                    if (lightCount <= 2) {
-                        GXCallDisplayList(mp_kusa9q_14_DL, m_kusa9q_DL_14_size);
-                    } else {
-                        GXCallDisplayList(mp_kusa9q_DL, m_kusa9q_DL_size);
-                    }
-                } else {
-                    GXLoadTexObj(&mTexObj_l_M_Hijiki00TEX, GX_TEXMAP0);
-                    GXCallDisplayList(l_Tengusa_matDL, 0xA0);
-                }
-
-                reg1.a = 0;
-                GFSetTevColorS10(GX_TEVREG1, reg1);
-                GXSetChanAmbColor(GX_COLOR0A0, blade_amb_color(blade, tevstr));
-
-                Mtx modelMtx;
-                GXLoadPosMtxImm(get_model_mtx(blade->m_modelMtx, modelMtx), GX_PNMTX0);
-                GXLoadNrmMtxImm(j3dSys.getViewMtx(), 0);
-
-                GFSetTevColorS10(GX_TEVREG2,
-                    {0, 0, 0, static_cast<s16>(-0x100 - (blade->field_0x02 << 8) / 40)});
-
-                if (blade->field_0x02 != -2) {
-                    if (kusaTex) {
-                        GXCallDisplayList(mp_Mkusa_9q_DL, m_Mkusa_9q_DL_size);
-                    } else {
-                        GXCallDisplayList(l_M_TenGusaDL, 0xC0);
-                    }
-                } else {
-                    GXCallDisplayList(mp_Mkusa_9q_cDL, m_Mkusa_9q_cDL_size);
-                }
-
-                GFSetTevColorS10(GX_TEVREG2, {0, 0, 0, 0});
-            }
-        }
-    }
-
-    J3DShape::resetVcdVatCache();
-}
-#else
-void dGrass_packet_c::draw() {
-    ZoneScoped;
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     cXyz spB4;
     cXyz spA8;
@@ -1166,7 +810,6 @@ void dGrass_packet_c::draw() {
 
     J3DShape::resetVcdVatCache();
 }
-#endif
 
 void dGrass_packet_c::calc() {
     cXyz* temp_r29 = dKyw_get_wind_vec();

src/d/d_camera.cpp

@@ -32,9 +32,6 @@
 #include "dusk/frame_interpolation.h"
 #include "dusk/logging.h"
 #include "dusk/action_bindings.h"
-#include "dusk/mouse.h"
-#include "dusk/settings.h"
-#include "dusk/touch_camera.h"
 #include "imgui.h"
 #endif
 
@@ -7500,15 +7497,6 @@ static constexpr s16 FLYCAM_ROLL_SPEED = 256;
 static ImVec2 sFlyCamLastMousePos = {-1.f, -1.f};
 
 #if TARGET_PC
-static constexpr f32 TOUCH_CAMERA_CSTICK_EXIT_THRESHOLD = 0.05f;
-static bool sTouchFreeCameraActive = false;
-
-bool dCamera_c::isAimActive() {
-    auto* link = daAlink_getAlinkActorClass();
-    return link != nullptr && link->checkAimContext() &&
-           dComIfGp_checkCameraAttentionStatus(link->field_0x317c, 0x10);
-}
-
 bool dCamera_c::executeDebugFlyCam() {
     if (!dusk::getSettings().game.debugFlyCam) {
         if (mDebugFlyCam.initialized) {
@@ -7651,29 +7639,11 @@ void dCamera_c::deactivateDebugFlyCam() {
 }
 
 bool dCamera_c::freeCamera() {
-    f32 touchYawDp = 0.0f;
-    f32 touchPitchDp = 0.0f;
-    bool touchCameraMoved = false;
-    const bool touchControlsEnabled = dusk::getSettings().game.enableTouchControls;
-    if (touchControlsEnabled && !isAimActive()) {
-        touchCameraMoved = dusk::touch_camera::consume_delta(touchYawDp, touchPitchDp);
-    }
-    if (!touchControlsEnabled ||
-        mPadInfo.mCStick.mLastValue > TOUCH_CAMERA_CSTICK_EXIT_THRESHOLD)
-    {
-        sTouchFreeCameraActive = false;
-    }
-    if (touchCameraMoved) {
-        sTouchFreeCameraActive = true;
-    }
-
-    const bool useFreeCamera = dusk::getSettings().game.freeCamera ||
-                               dusk::getSettings().game.enableMouseCamera || sTouchFreeCameraActive;
-    if (useFreeCamera && mGear == 1) {
+    if (dusk::getSettings().game.freeCamera && mGear == 1) {
         mGear = 0;
     }
 
-    if (!useFreeCamera || mCamStyle == 70)
+    if (!dusk::getSettings().game.freeCamera || mCamStyle == 70)
     {
         mCamParam.mManualMode = 0;
         return false;
@@ -7684,17 +7654,6 @@ bool dCamera_c::freeCamera() {
         mCamParam.freeYAngle = mViewCache.mDirection.mInclination.Degree();
     }
 
-    if (touchCameraMoved) {
-        mCamParam.mManualMode = 1;
-        const f32 yawInput = dusk::getSettings().game.invertCameraXAxis ? -touchYawDp : touchYawDp;
-        const f32 pitchInput =
-            touchPitchDp * (dusk::getSettings().game.invertCameraYAxis ? -1.0f : 1.0f);
-        mCamParam.freeXAngle += yawInput * dusk::getSettings().game.touchCameraXSensitivity *
-                                dusk::touch_camera::YAW_DEGREES_PER_DP;
-        mCamParam.freeYAngle += pitchInput * dusk::getSettings().game.touchCameraYSensitivity *
-                                dusk::touch_camera::PITCH_DEGREES_PER_DP;
-    }
-
     cXyz camMovement = {mPadInfo.mCStick.mLastPosX, mPadInfo.mCStick.mLastPosY, 0.0f};
     f32 magnitude = sqrt(mPadInfo.mCStick.mLastPosX * mPadInfo.mCStick.mLastPosX + mPadInfo.mCStick.mLastPosY * mPadInfo.mCStick.mLastPosY);
 
@@ -7710,17 +7669,6 @@ bool dCamera_c::freeCamera() {
         mCamParam.freeYAngle += camMovement.y * magnitude * dusk::getSettings().game.freeCameraYSensitivity * 5.0f;
     }
 
-    f32 yaw_rad = 0.0f;
-    f32 pitch_rad = 0.0f;
-    dusk::mouse::getCameraDeltas(yaw_rad, pitch_rad);
-    if (dusk::getSettings().game.enableMouseCamera && (yaw_rad != 0.0f || pitch_rad != 0.0f) &&
-        !dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 0x8))
-    {
-        mCamParam.mManualMode = 1;
-        mCamParam.freeXAngle += MTXRadToDeg(yaw_rad);
-        mCamParam.freeYAngle += -MTXRadToDeg(pitch_rad);
-    }
-
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (!mCamParam.mManualMode || player == nullptr) {
         return false;
@@ -9402,10 +9350,6 @@ bool dCamera_c::rideCamera(s32 param_0) {
             mStyleSettle.mFinished = true;
         }
 
-#if TARGET_PC
-        freeCamera();
-#endif
-
         return true;
     }
 
@@ -9535,10 +9479,6 @@ bool dCamera_c::rideCamera(s32 param_0) {
         setFlag(0x400);
     }
 
-#if TARGET_PC
-    freeCamera();
-#endif
-
     return true;
 }
 
@@ -11394,7 +11334,7 @@ static int camera_execute(camera_process_class* i_this) {
                 const auto target = get_target_trim_height(i_this);
                 const auto step = dusk::frame_interp::get_interpolation_step();
                 const auto cur = camera->TrimHeight();
-                const auto prev = (4.0f * cur - target) / 3.0f;
+                const auto prev = (4.0f * cur - target) / 3.0f; 
                 const auto trim_height = prev + (cur - prev) * step;
 
                 widezoom_correction(i_this, trim_height);

src/d/d_drawlist.cpp

@@ -41,12 +41,12 @@ public:
     /* 0x14 */ GXColor field_0x14;
     /* 0x18 */ GXColor field_0x18;
     /* 0x1C */ TGXTexObj field_0x1c;
-    /* 0x3C */ TGXTlutObj field_0x3c;
+    /* 0x3C */ GXTlutObj field_0x3c;
     /* 0x48 */ s16 field_0x48;
     /* 0x4A */ s16 field_0x4a;
     /* 0x4C */ u8 field_0x4c;
     /* 0x50 */ TGXTexObj field_0x50;
-    /* 0x70 */ TGXTlutObj field_0x70;
+    /* 0x70 */ GXTlutObj field_0x70;
     /* 0x7C */ s16 field_0x7c;
     /* 0x7E */ s16 field_0x7e;
     /* 0x80 */ u8 field_0x80;
@@ -100,7 +100,7 @@ public:
     u8 check() { return field_0x0; }
     int getCI() { return mCI; }
     TGXTexObj* getTexObj() { return &mTexObj; }
-    TGXTlutObj* getTlutObj() { return &mTlutObj; }
+    GXTlutObj* getTlutObj() { return &mTlutObj; }
     GXColor* getColor() { return &mColor; }
     f32 getS() { return mS; }
     f32 getT() { return mT; }
@@ -110,7 +110,7 @@ public:
     /* 0x00 */ u8 field_0x0;
     /* 0x01 */ u8 mCI;
     /* 0x04 */ TGXTexObj mTexObj;
-    /* 0x24 */ TGXTlutObj mTlutObj;
+    /* 0x24 */ GXTlutObj mTlutObj;
     /* 0x30 */ GXColor mColor;
     /* 0x34 */ f32 mS;
     /* 0x38 */ f32 mT;
@@ -188,7 +188,6 @@ void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) {
 }
 
 void dDlst_2DTri_c::draw() {
-    ZoneScoped;
     f32 f4;
     f32 f5;
     f32 f2 = cM_scos(field_0xc);
@@ -225,7 +224,6 @@ void dDlst_2DTri_c::draw() {
 }
 
 void dDlst_2DQuad_c::draw() {
-    ZoneScoped;
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
@@ -249,7 +247,6 @@ void dDlst_2DQuad_c::draw() {
 }
 
 void dDlst_2DPoint_c::draw() {
-    ZoneScoped;
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
@@ -271,7 +268,6 @@ void dDlst_2DPoint_c::draw() {
 }
 
 void dDlst_2DT_c::draw() {
-    ZoneScoped;
     static GXColor l_color = {0xFF, 0xFF, 0xFF, 0xE0};
     f32 var5 = field_0xe;
     f32 var6 = field_0x10;
@@ -330,7 +326,6 @@ void dDlst_2DT_c::draw() {
 }
 
 void dDlst_2DT2_c::draw() {
-    ZoneScoped;
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA6, 0);
     GXClearVtxDesc();
@@ -670,7 +665,6 @@ void dDlst_2DT2_c::init(ResTIMG* i_timg, f32 param_1, f32 param_2, f32 param_3,
 }
 
 void dDlst_2DM_c::draw() {
-    ZoneScoped;
     s16 r31 = field_0x22;
     s16 r30 = field_0x24;
     int r29 = field_0x22 + 256.0f;
@@ -734,7 +728,6 @@ void dDlst_2DM_c::draw() {
 
 
 void dDlst_2Dm_c::draw() {
-    ZoneScoped;
     s16 r31 = field_0x48;
     s16 r30 = field_0x4a;
     int r29 = field_0x48 + 256.0f;
@@ -801,7 +794,6 @@ void dDlst_2Dm_c::draw() {
 
 
 void dDlst_2DMt_c::draw() {
-    ZoneScoped;
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -941,7 +933,6 @@ f32 cM_rnd_c::getValue(f32 param_0, f32 param_1) {
 }
 
 void dDlst_effectLine_c::draw() {
-    ZoneScoped;
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -1043,7 +1034,6 @@ void dDlst_shadowPoly_c::draw() {
         return;
 #endif
 
-    ZoneScoped;
     dDlst_shadowTri_c* tri = getTri();
 
     GXBegin(GX_TRIANGLES, GX_VTXFMT0, mCount * 3);
@@ -1620,7 +1610,6 @@ void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
 }
 
 void dDlst_shadowControl_c::draw(Mtx param_0) {
-    ZoneScoped;
     static GXTevColorChan l_tevColorChan[4] = {
         GX_CH_RED,
         GX_CH_GREEN,
@@ -1996,7 +1985,7 @@ int dDlst_list_c::set(dDlst_base_c**& p_start, dDlst_base_c**& p_end, dDlst_base
     return 1;
 }
 
-#if DUSK_GFX_DEBUG_GROUPS
+#if TARGET_PC && (TRACY_ENABLE || PARTIAL_DEBUG)
 static absl::flat_hash_map<std::type_index, const char*> typeDrawNames;
 
 static const char* getTypeDrawName(dDlst_base_c* dlst) {
@@ -2019,7 +2008,7 @@ void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) {
     for (; p_start < p_end; p_start++) {
         dDlst_base_c* dlst = *p_start;
 
-#if DUSK_GFX_DEBUG_GROUPS
+#if TARGET_PC && (TRACY_ENABLE || PARTIAL_DEBUG)
         const auto name = getTypeDrawName(dlst);
         GXScopedDebugGroup scope(name);
 #endif

src/d/d_file_select.cpp

@@ -23,22 +23,8 @@
 #include "m_Do/m_Do_graphic.h"
 #include <cstring>
 
-#if TARGET_PC
-#include "dusk/menu_pointer.h"
 #include "dusk/string.hpp"
 
-namespace {
-constexpr u8 pointer_target(u8 group, u8 index) noexcept {
-    return static_cast<u8>((group << 4) | (index & 0x0F));
-}
-
-constexpr u8 s_pointerDataSelectTarget = 0;
-constexpr u8 s_pointerMenuSelectTarget = 1;
-constexpr u8 s_pointerCopySelectTarget = 2;
-constexpr u8 s_pointerYesNoSelectTarget = 3;
-}  // namespace
-#endif
-
 static s32 SelStartFrameTbl[3] = {
     59,
     99,
@@ -770,143 +756,8 @@ void dFile_select_c::dataSelectInit() {
     }
 }
 
-#if TARGET_PC
-bool dFile_select_c::pointerDataSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 3; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mSelFilePanes[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked = dusk::menu_pointer::consume_click();
-        if (mSelectNum != i) {
-            mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, NULL, 0, 0);
-            mLastSelectNum = mSelectNum;
-            mSelectNum = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::FileSelect,
-                    pointer_target(s_pointerDataSelectTarget, i));
-            }
-            dataSelectAnmSet();
-            mDataSelProc = DATASELPROC_DATA_SELECT_MOVE_ANIME;
-            return true;
-        }
-        if (clicked) {
-            dataSelectStart();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool dFile_select_c::pointerMenuSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 3; ++i) {
-        if (!dusk::menu_pointer::hit_pane(m3mSelPane[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked = dusk::menu_pointer::consume_click();
-        if (!mIsDataNew[mSelectNum] && mSelectMenuNum != i) {
-            mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0);
-            mLastSelectMenuNum = mSelectMenuNum;
-            mSelectMenuNum = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::FileSelect,
-                    pointer_target(s_pointerMenuSelectTarget, i));
-            }
-            menuSelectAnmSet();
-            mDataSelProc = DATASELPROC_MENU_SELECT_MOVE_ANM;
-            return true;
-        }
-        if (clicked) {
-            menuSelectStart();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool dFile_select_c::pointerCopyDataToSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 2; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mCpSelPane[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked = dusk::menu_pointer::consume_click();
-        if (field_0x026b != i) {
-            mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, NULL, 0, 0);
-            field_0x026c = field_0x026b;
-            field_0x026b = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::FileSelect,
-                    pointer_target(s_pointerCopySelectTarget, i));
-            }
-            copyDataToSelectMoveAnmSet();
-            mDataSelProc = DATASELPROC_COPY_DATA_TO_SELECT_MOVE_ANM;
-            return true;
-        }
-        if (clicked) {
-            copyDataToSelectStart();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool dFile_select_c::pointerYesNoSelect(bool errorSelect) {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 2; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mYnSelPane[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked =
-            (!errorSelect || field_0x0268 == i) && dusk::menu_pointer::consume_click();
-        if (field_0x0268 != i) {
-            field_0x0269 = field_0x0268;
-            field_0x0268 = i;
-            if (errorSelect) {
-                errCurMove(0);
-                return false;
-            } else {
-                mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0);
-                if (clicked) {
-                    dusk::menu_pointer::defer_activation(
-                        dusk::menu_pointer::Context::FileSelect,
-                        pointer_target(s_pointerYesNoSelectTarget, i));
-                }
-                yesnoSelectAnmSet();
-                mDataSelProc = DATASELPROC_YES_NO_CURSOR_MOVE_ANM;
-                return true;
-            }
-        }
-        if (clicked) {
-            if (errorSelect) {
-                if (field_0x0268 != 0) {
-                    mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0);
-                } else {
-                    mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, 0, 0, 0);
-                }
-                mSelIcon->setAlphaRate(0.0f);
-            } else {
-                yesNoSelectStart();
-            }
-            return true;
-        }
-    }
-    return false;
-}
-#endif
-
 // handles switching between quest logs
 void dFile_select_c::dataSelect() {
-#if TARGET_PC
-    if (pointerDataSelect()) {
-        return;
-    }
-#endif
-
     stick->checkTrigger();
 
     // If A or Start was pressed
@@ -950,9 +801,6 @@ static u16 msgTbl[3] = {
 };
 
 void dFile_select_c::dataSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
     mSelIcon->setAlphaRate(0.0f);
 
     if (mIsNoData[mSelectNum]) {
@@ -1101,16 +949,6 @@ void dFile_select_c::dataSelectAnmSet() {
 }
 
 void dFile_select_c::dataSelectMoveAnime() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (mSelectNum != 0xFF && dusk::menu_pointer::hit_pane(mSelFilePanes[mSelectNum], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerDataSelectTarget, mSelectNum));
-    }
-#endif
     bool iVar7 = true;
     bool iVar6 = true;
     bool bVar1 = true;
@@ -1159,14 +997,6 @@ void dFile_select_c::dataSelectMoveAnime() {
             mSelFilePanes[mLastSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
         }
 
-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerDataSelectTarget, mSelectNum))) {
-            dataSelectStart();
-            return;
-        }
-#endif
         mDataSelProc = DATASELPROC_DATA_SELECT;
     }
 }
@@ -1331,12 +1161,6 @@ void dFile_select_c::selectDataOpenEraseMove() {
 
 // Handles selecting between copy / start / delete menus in quest log
 void dFile_select_c::menuSelect() {
-#if TARGET_PC
-    if (pointerMenuSelect()) {
-        return;
-    }
-#endif
-
     stick->checkTrigger();
 
     // if a was pressed, do the menu selection process
@@ -1367,9 +1191,6 @@ void dFile_select_c::menuSelect() {
 
 // Handles copy / start / delete actions depending on which menu is selected from menuSelect
 void dFile_select_c::menuSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
     #if TARGET_PC
     if (!dusk::getSettings().game.hideTvSettingsScreen || mSelectMenuNum != 1) {
         mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
@@ -1491,17 +1312,6 @@ void dFile_select_c::menuSelectAnmSet() {
 }
 
 void dFile_select_c::menuSelectMoveAnm() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (mSelectMenuNum != 0xFF &&
-        dusk::menu_pointer::hit_pane(m3mSelPane[mSelectMenuNum], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerMenuSelectTarget, mSelectMenuNum));
-    }
-#endif
     bool tmp1 = true;
 
     if (mSelectMenuNum != 0xFF &&
@@ -1559,14 +1369,6 @@ void dFile_select_c::menuSelectMoveAnm() {
             m3mSelPane[mLastSelectMenuNum]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
         }
 
-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerMenuSelectTarget, mSelectMenuNum))) {
-            menuSelectStart();
-            return;
-        }
-#endif
         mDataSelProc = DATASELPROC_MENU_SELECT;
     }
 }
@@ -1896,12 +1698,6 @@ void dFile_select_c::setSaveDataForCopySel() {
 }
 
 void dFile_select_c::copyDataToSelect() {
-#if TARGET_PC
-    if (pointerCopyDataToSelect()) {
-        return;
-    }
-#endif
-
     stick->checkTrigger();
 
     if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -1926,9 +1722,6 @@ void dFile_select_c::copyDataToSelect() {
 }
 
 void dFile_select_c::copyDataToSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
     mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
 
     mCpDataToNum = getCptoNum(field_0x026b);
@@ -1994,17 +1787,6 @@ void dFile_select_c::copyDataToSelectMoveAnmSet() {
 }
 
 void dFile_select_c::copyDataToSelectMoveAnm() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (field_0x026b != 0xFF &&
-        dusk::menu_pointer::hit_pane(mCpSelPane[field_0x026b], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerCopySelectTarget, field_0x026b));
-    }
-#endif
     bool iVar7 = true;
     bool iVar6 = true;
     bool bVar1 = true;
@@ -2054,14 +1836,6 @@ void dFile_select_c::copyDataToSelectMoveAnm() {
             mSelIcon2->setAlphaRate(1.0f);
         }
 
-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerCopySelectTarget, field_0x026b))) {
-            copyDataToSelectStart();
-            return;
-        }
-#endif
         mDataSelProc = DATASELPROC_COPY_DATA_TO_SELECT;
     }
 }
@@ -2331,12 +2105,6 @@ void dFile_select_c::yesnoCursorShow() {
 }
 
 void dFile_select_c::YesNoSelect() {
-#if TARGET_PC
-    if (pointerYesNoSelect(false)) {
-        return;
-    }
-#endif
-
     stick->checkTrigger();
 
     if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -2361,9 +2129,6 @@ void dFile_select_c::YesNoSelect() {
 }
 
 void dFile_select_c::yesNoSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
     if (field_0x0268 != 0) {
         mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
         field_0x03b1 = 1;
@@ -2519,29 +2284,10 @@ void dFile_select_c::YesNoCancelMove() {
 }
 
 void dFile_select_c::yesNoCursorMoveAnm() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (field_0x0268 != 0xFF &&
-        dusk::menu_pointer::hit_pane(mYnSelPane[field_0x0268], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerYesNoSelectTarget, field_0x0268));
-    }
-#endif
     bool isYnSelMove = yesnoSelectMoveAnm();
     bool isYnWakuAlpha = yesnoWakuAlpahAnm(field_0x0269);
     if (isYnSelMove == true && isYnWakuAlpha == true) {
         yesnoCursorShow();
-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerYesNoSelectTarget, field_0x0268))) {
-            yesNoSelectStart();
-            return;
-        }
-#endif
         mDataSelProc = DATASELPROC_YES_NO_SELECT;
     }
 }
@@ -4492,11 +4238,6 @@ static MemCardCheckFuncT MemCardCheckProc[] = {
     &dFile_select_c::MemCardErrYesNoCursorMoveAnm,
     &dFile_select_c::MemCardSaveDataClear,
 
-#if TARGET_PC
-    &dFile_select_c::MemCardAutoMakeGameFile,
-    &dFile_select_c::MemCardAutoMakeGameFileErrWait,
-#endif
-
     #if PLATFORM_WII || PLATFORM_SHIELD
     &dFile_select_c::nandStatCheck,
     &dFile_select_c::gameFileInitSel,
@@ -4580,33 +4321,11 @@ void dFile_select_c::MemCardStatCheck() {
         mDoMemCd_Load();
         mCardCheckProc = MEMCARDCHECKPROC_LOAD_WAIT;
         break;
-#if TARGET_PC
-    case 1: { // no save file
-        if (dusk::getSettings().game.instantSaves) {
-            field_0x03b1 = 1;
-            setInitSaveData();
-            dataSave();
-            mCardCheckProc = MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE;
-        } else {
-            errDispInitSet(22, 0);
-            field_0x0280 = true;
-            mNextCardCheckProc = MEMCARDCHECKPROC_MAKE_GAMEFILE_SEL;
-        }
-        break;
-    }
-    case 4: // card is writing
-        if (dusk::getSettings().game.instantSaves) {
-            field_0x03b1 = 1;
-            mCardCheckProc = MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE;
-        }
-        break;
-#else
     case 1:
         errDispInitSet(22, 0);
         field_0x0280 = true;
         mNextCardCheckProc = MEMCARDCHECKPROC_MAKE_GAMEFILE_SEL;
         break;
-#endif
     }
 #else
     switch (status) {
@@ -5312,33 +5031,6 @@ void dFile_select_c::MemCardMakeGameFileCheck() {
     }
 }
 
-#if TARGET_PC
-void dFile_select_c::MemCardAutoMakeGameFile() {
-    field_0x03b4 = mDoMemCd_SaveSync();
-    if (field_0x03b4 == 0) {
-        return;
-    }
-
-    field_0x03b1 = 0;
-    if (field_0x03b4 == 1) {
-        mDoMemCd_Load();
-        mCardCheckProc = MEMCARDCHECKPROC_LOAD_WAIT;
-    } else {
-        errDispInitSet(0x1A, 0);
-        field_0x0280 = false;
-        mWindowCloseMsgDispCb = NULL;
-        mKeyWaitMsgDispCb = NULL;
-        mNextCardCheckProc = MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE_ERR_WAIT;
-    }
-}
-
-void dFile_select_c::MemCardAutoMakeGameFileErrWait() {
-    mNextCardCheckProc = MEMCARDCHECKPROC_STAT_CHECK;
-    mKeyWaitCardCheckProc = MEMCARDCHECKPROC_MSG_WINDOW_CLOSE;
-    mCardCheckProc = MEMCARDCHECKPROC_ERRMSG_WAIT_KEY;
-}
-#endif
-
 #if PLATFORM_WII || PLATFORM_SHIELD
 void dFile_select_c::gameFileInitSel() {
     if (errYesNoSelect() != 0) {
@@ -5492,12 +5184,6 @@ void dFile_select_c::MemCardMsgWindowClose() {
 
 bool dFile_select_c::errYesNoSelect() {
     bool rv = false;
-#if TARGET_PC
-    if (pointerYesNoSelect(true)) {
-        return true;
-    }
-#endif
-
     stick->checkTrigger();
 
     if (mDoCPd_c::getTrigA(PAD_1)) {

src/d/d_kankyo_rain.cpp

@@ -94,39 +94,6 @@ static void dKyr_set_btitex(TGXTexObj* i_obj, ResTIMG* i_img) {
     dKyr_set_btitex_common(i_obj, i_img, GX_TEXMAP0);
 }
 
-#if TARGET_PC
-template <int N>
-struct CachedTexObjs {
-    TGXTexObj texObj[N];
-    ResTIMG* timg[N] = {};
-};
-
-template <int N>
-static GXTexObj* load_cached_tex(CachedTexObjs<N>& cache, ResTIMG* img, GXTexMapID mapID) {
-    for (int i = 0; i < N; i++) {
-        if (img != nullptr && cache.timg[i] == img) {
-            GXLoadTexObj(&cache.texObj[i], mapID);
-            return &cache.texObj[i];
-        }
-    }
-
-    int slot = 0;
-    for (int i = 0; i < N; i++) {
-        if (cache.timg[i] == nullptr) {
-            slot = i;
-            break;
-        }
-    }
-
-    if (cache.timg[slot] != nullptr) {
-        cache.texObj[slot].reset();
-    }
-    cache.timg[slot] = img;
-    dKyr_set_btitex_common(&cache.texObj[slot], img, mapID);
-    return &cache.texObj[slot];
-}
-#endif
-
 void dKyr_lenzflare_move() {
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
@@ -962,7 +929,7 @@ void dKyr_housi_move() {
     if (g_env_light.mHousiCount != 0 ||
         (g_env_light.mHousiCount == 0 && housi_packet->field_0x5de8 <= 0.0f))
     {
-        housi_packet->mHousiCount = g_env_light.mHousiCount;
+        housi_packet->field_0x5dec = g_env_light.mHousiCount;
     }
 
     if (g_env_light.mHousiCount != 0) {
@@ -971,7 +938,7 @@ void dKyr_housi_move() {
         cLib_addCalc(&housi_packet->field_0x5de8, 0.0f, 0.2f, 0.05f, 0.01f);
     }
 
-    if (housi_packet->mHousiCount == 0) {
+    if (housi_packet->field_0x5dec == 0) {
         return;
     }
 
@@ -1010,7 +977,7 @@ void dKyr_housi_move() {
         }
     }
 
-    for (int i = housi_packet->mHousiCount - 1; i >= 0; i--) {
+    for (int i = housi_packet->field_0x5dec - 1; i >= 0; i--) {
         f32 var_f26 = 0.4f * housi_packet->field_0x5de8;
         effect = &housi_packet->mHousiEff[i];
 
@@ -2058,27 +2025,16 @@ void vrkumo_move() {
     }
 }
 
-static void dKr_cullVtx_Set(IF_DUSK(bool const vtxColor = false)) {
+static void dKr_cullVtx_Set() {
     GXSetCullMode(GX_CULL_NONE);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA4, 8);
-#if TARGET_PC
-    if (vtxColor) {
-        GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    }
-#endif
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
     GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
-#if TARGET_PC
-    if (vtxColor) {
-        GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT);
-    }
-#endif
 }
 
 static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -2166,17 +2122,10 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) {
             return;
         }
 
-#if TARGET_PC
-        static CachedTexObjs<8> texobj;
-        load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-        load_cached_tex(texobj, (ResTIMG*)tex[1], GX_TEXMAP1);
-        load_cached_tex(texobj, (ResTIMG*)tex[texidx + 2], GX_TEXMAP2);
-#else
         TGXTexObj texobj;
         dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
         dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[1], GX_TEXMAP1);
         dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[texidx + 2], GX_TEXMAP2);
-#endif
 
         GXSetNumChans(0);
         GXSetTevColor(GX_TEVREG0, color_reg0);
@@ -2256,11 +2205,7 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) {
 
         for (int i = 0; i < 2; i++) {
             if (i == 1) {
-#if TARGET_PC
-                load_cached_tex(texobj, (ResTIMG*)lenz_packet->mpResBall, GX_TEXMAP0);
-#else
                 dKyr_set_btitex(&texobj, (ResTIMG*)lenz_packet->mpResBall);
-#endif
                 GXClearVtxDesc();
                 GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
                 GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
@@ -2525,17 +2470,10 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
                 return;
             }
 
-#if TARGET_PC
-            static CachedTexObjs<8> texobj;
-            load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-            load_cached_tex(texobj, (ResTIMG*)tex[1], GX_TEXMAP1);
-            load_cached_tex(texobj, (ResTIMG*)tex[texidx + 2], GX_TEXMAP2);
-#else
             TGXTexObj texobj;
             dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
             dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[1], GX_TEXMAP1);
             dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[texidx + 2], GX_TEXMAP2);
-#endif
 
             GXSetNumChans(0);
             GXSetTevColor(GX_TEVREG0, color_reg0);
@@ -2629,11 +2567,7 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
 
                 for (int i = 0; i < 2; i++) {
                     if (i == 1) {
-#if TARGET_PC
-                        load_cached_tex(texobj, (ResTIMG*)lenz_packet->mpResBall, GX_TEXMAP0);
-#else
                         dKyr_set_btitex(&texobj, (ResTIMG*)lenz_packet->mpResBall);
-#endif
                         GXClearVtxDesc();
                         GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
                         GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
@@ -2746,7 +2680,6 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
 }
 
 void dKyr_drawLenzflare(Mtx drawMtx, cXyz* ppos, GXColor& param_2, u8** tex) {
-    ZoneScoped;
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -2797,13 +2730,8 @@ void dKyr_drawLenzflare(Mtx drawMtx, cXyz* ppos, GXColor& param_2, u8** tex) {
 
         j3dSys.reinitGX();
 
-#if TARGET_PC
-        static CachedTexObjs<3> texobj;
-        load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-#else
         TGXTexObj texobj;
         dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
-#endif
         GXSetNumChans(0);
         GXSetTevColor(GX_TEVREG0, color_reg0);
         GXSetTevColor(GX_TEVREG1, color_reg1);
@@ -3108,23 +3036,11 @@ void dKyr_drawLenzflare(Mtx drawMtx, cXyz* ppos, GXColor& param_2, u8** tex) {
                 }
 
                 if (i == 1) {
-#if TARGET_PC
-                    load_cached_tex(texobj, (ResTIMG*)tex[2], GX_TEXMAP0);
-#else
                     dKyr_set_btitex(&texobj, (ResTIMG*)tex[2]);
-#endif
                 } else if (i == 2) {
-#if TARGET_PC
-                    load_cached_tex(texobj, (ResTIMG*)tex[3], GX_TEXMAP0);
-#else
                     dKyr_set_btitex(&texobj, (ResTIMG*)tex[3]);
-#endif
                 } else {
-#if TARGET_PC
-                    load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-#else
                     dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
-#endif
                 }
 
                 spE4.x = -var_f31;
@@ -3215,13 +3131,8 @@ void dKyr_drawRain(Mtx drawMtx, u8** tex) {
                 return;
             }
 
-#if TARGET_PC
-            static CachedTexObjs<1> texobj;
-            load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-#else
             TGXTexObj texobj;
             dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
-#endif
             GXSetNumChans(0);
             GXSetTevColor(GX_TEVREG0, color_reg0);
             GXSetNumTexGens(1);
@@ -3385,13 +3296,8 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) {
     color.b = 0xC8;
     color.a = rain_packet->mSibukiAlpha * alphaFade;
 
-#if TARGET_PC
-    static CachedTexObjs<1> texobj;
-    load_cached_tex(texobj, (ResTIMG*)tex[1], GX_TEXMAP0);
-#else
     TGXTexObj texobj;
     dKyr_set_btitex(&texobj, (ResTIMG*)tex[1]);
-#endif
     GXSetNumChans(0);
     GXSetTevColor(GX_TEVREG0, color);
     GXSetTevColor(GX_TEVREG1, color);
@@ -3472,26 +3378,21 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) {
 }
 
 void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     dKankyo_housi_Packet* housi_packet = g_env_light.mpHousiPacket;
     static f32 rot = 0.0f;
 
     Mtx camMtx;
     Mtx rotMtx;
     cXyz pos[4];
-#if TARGET_PC
-    static CachedTexObjs<1> texobj;
-#else
     TGXTexObj spDC;
-#endif
     cXyz spD0;
     Vec spC4;
     Vec spB8;
 
-    bool isPalaceOfTwilight = 0;
-    if (housi_packet->mHousiCount != 0) {
+    bool var_r28 = 0;
+    if (housi_packet->field_0x5dec != 0) {
         if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0) {
-            isPalaceOfTwilight = 1;
+            var_r28 = 1;
         }
 
         if (strcmp(dComIfGp_getStartStageName(), "D_MN08") != 0 ||
@@ -3518,7 +3419,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
             color_reg1.b = 0xCA;
             color_reg1.a = 0xFF;
 
-            if (dKy_darkworld_check() == 1 || isPalaceOfTwilight == 1) {
+            if (dKy_darkworld_check() == 1 || var_r28 == 1) {
                 color_reg0.r = 0;
                 color_reg0.g = 0;
                 color_reg0.b = 0;
@@ -3570,27 +3471,18 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
             f32 temp_f24 = 6.5f;
 
             for (int i = 0; i < 1; i++) {
-#if TARGET_PC
-                load_cached_tex(texobj, (ResTIMG*)*tex, GX_TEXMAP0);
-#else
-                dKyr_set_btitex(&texobj, (ResTIMG*)*tex);
-#endif
-#if TARGET_PC
-                GXSetNumChans(1);
-                GXSetChanCtrl(GX_COLOR0, GX_DISABLE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE);
-#else
+                dKyr_set_btitex(&spDC, (ResTIMG*)*tex);
                 GXSetNumChans(0);
                 GXSetTevColor(GX_TEVREG0, color_reg0);
-#endif
                 GXSetTevColor(GX_TEVREG1, color_reg1);
                 GXSetNumTexGens(1);
                 GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
                 GXSetNumTevStages(1);
-                GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, DUSK_IF_ELSE(GX_COLOR0A0, GX_COLOR_NULL));
-                GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C1, DUSK_IF_ELSE(GX_CC_RASC, GX_CC_C0), GX_CC_TEXC, GX_CC_ZERO);
+                GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
+                GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C1, GX_CC_C0, GX_CC_TEXC, GX_CC_ZERO);
                 GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE,
                                 GX_TEVPREV);
-                GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, DUSK_IF_ELSE(GX_CA_RASA, GX_CA_CA), GX_CA_TEXA, GX_CA_ZERO);
+                GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_A0, GX_CA_TEXA, GX_CA_ZERO);
                 GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE,
                                 GX_TEVPREV);
 
@@ -3613,7 +3505,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
 
                 GXSetClipMode(GX_CLIP_DISABLE);
                 GXSetNumIndStages(0);
-                dKr_cullVtx_Set(IF_DUSK(true));
+                dKr_cullVtx_Set();
 
                 rot += 1.2f;
                 MTXRotRad(rotMtx, 'Z', DEG_TO_RAD(rot));
@@ -3622,13 +3514,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
                 GXLoadPosMtxImm(drawMtx, GX_PNMTX0);
                 GXSetCurrentMtx(GX_PNMTX0);
 
-#if TARGET_PC
-                // Dusklight optimization: we submit a single large draw call, rather than hundreds.
-                u32 vertCount = 4 * housi_packet->mHousiCount;
-                GXBegin(GX_QUADS, GX_VTXFMT0, vertCount);
-#endif
-
-                for (int j = 0; j < housi_packet->mHousiCount; j++) {
+                for (int j = 0; j < housi_packet->field_0x5dec; j++) {
                     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
                     spD0.x =
@@ -3639,10 +3525,6 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
                         housi_packet->mHousiEff[j].mBasePos.z + housi_packet->mHousiEff[j].mPosition.z;
 
                     if (i == 1 && j == 0) {
-#if TARGET_PC
-                        // Never gets hit I think?
-                        abort();
-#endif
                         color_reg0.r = 0;
                         color_reg0.g = 0;
                         color_reg0.b = 0;
@@ -3671,10 +3553,8 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
                         color_reg0.a = housi_packet->mHousiEff[j].mAlpha * var_f25;
 
                     block_14:
-#if !TARGET_PC // GXLoadTextObj does nothing, TEV colors replaced with vertex colors
-                        GXLoadTexObj(&texobj, GX_TEXMAP0);
+                        GXLoadTexObj(&spDC, GX_TEXMAP0);
                         GXSetTevColor(GX_TEVREG0, color_reg0);
-#endif
 
                         f32 var_f27 = housi_packet->mHousiEff[j].field_0x48 * 9.0f;
                         if (g_env_light.field_0xea9 == 1) {
@@ -3686,7 +3566,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
                         f32 temp_f30 =
                             (var_f27 * 0.2f) * cM_fcos(housi_packet->mHousiEff[j].mScale.y * 6.0f);
 
-                        if (dKy_darkworld_check() == 1 || isPalaceOfTwilight == 1) {
+                        if (dKy_darkworld_check() == 1 || var_r28 == 1) {
                             cXyz sp7C[] = {
                                 cXyz(-1.0f, -0.5f, 0.0f),
                                 cXyz(-1.0f, 1.5f, 0.0f),
@@ -3831,34 +3711,24 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
                             pos[3].z = spD0.z + spB8.z;
                         }
 
-                        IF_NOT_DUSK(GXBegin(GX_QUADS, GX_VTXFMT0, 4));
+                        GXBegin(GX_QUADS, GX_VTXFMT0, 4);
 
                         s16 var_r17 = 0x1FF;
-                        if (dKy_darkworld_check() == true || isPalaceOfTwilight == 1) {
+                        if (dKy_darkworld_check() == true || var_r28 == 1) {
                             var_r17 = 0xFA;
                         }
 
                         GXPosition3f32(pos[0].x, pos[0].y, pos[0].z);
-                        IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                         GXTexCoord2s16(0, 0);
                         GXPosition3f32(pos[1].x, pos[1].y, pos[1].z);
-                        IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                         GXTexCoord2s16(var_r17, 0);
                         GXPosition3f32(pos[2].x, pos[2].y, pos[2].z);
-                        IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                         GXTexCoord2s16(var_r17, var_r17);
                         GXPosition3f32(pos[3].x, pos[3].y, pos[3].z);
-                        IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                         GXTexCoord2s16(0, var_r17);
-
-
-                        IF_NOT_DUSK(GXEnd());
+                        GXEnd();
                     }
                 }
-
-#if TARGET_PC
-                GXEnd();
-#endif
             }
 
             GXSetClipMode(GX_CLIP_ENABLE);
@@ -3868,7 +3738,6 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
 }
 
 void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
     dKankyo_snow_Packet* snow_packet = g_env_light.mpSnowPacket;
 
@@ -3932,37 +3801,25 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
                 }
 
                 if (tex[0] != NULL) {
-#if TARGET_PC
-                    static CachedTexObjs<1> texobj;
-                    load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-#else
-                    TGXTexObj texobj;
-                    dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
-#endif
-#if TARGET_PC
-                    // Dusklight optimization: enable draw call merging
-                    // by using vertex color instead of GX_TEVREG0
-                    GXSetNumChans(1);
-                    GXSetChanCtrl(GX_COLOR0, GX_DISABLE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE);
-#else
+                    TGXTexObj spA0;
+                    dKyr_set_btitex(&spA0, (ResTIMG*)tex[0]);
                     GXSetNumChans(0);
                     GXSetTevColor(GX_TEVREG0, color_reg0);
-#endif
                     GXSetTevColor(GX_TEVREG1, color_reg1);
                     GXSetNumTexGens(1);
                     GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
                     GXSetNumTevStages(1);
-                    GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, DUSK_IF_ELSE(GX_COLOR0A0, GX_COLOR_NULL));
-                    GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C1, DUSK_IF_ELSE(GX_CC_RASC, GX_CC_C0), GX_CC_TEXC, GX_CC_ZERO);
+                    GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL);
+                    GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_C1, GX_CC_C0, GX_CC_TEXC, GX_CC_ZERO);
                     GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-                    GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, DUSK_IF_ELSE(GX_CA_RASA, GX_CA_CA), GX_CA_TEXA, GX_CA_ZERO);
+                    GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_A0, GX_CA_TEXA, GX_CA_ZERO);
                     GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
                     GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ONE, GX_LO_COPY);
                     GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0);
                     GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_DISABLE);
                     GXSetClipMode(GX_CLIP_DISABLE);
                     GXSetNumIndStages(0);
-                    dKr_cullVtx_Set(IF_DUSK(true));
+                    dKr_cullVtx_Set();
 
                     Mtx rotMtx;
                     MTXRotRad(rotMtx, 'Z', DEG_TO_RAD(rot));
@@ -4039,7 +3896,7 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
                                     }
                                 }
 
-                                IF_NOT_DUSK(GXSetTevColor(GX_TEVREG0, color_reg0));
+                                GXSetTevColor(GX_TEVREG0, color_reg0);
                                 f32 sp38 = 2.0f * (i / 500.0f) * snow_packet->field_0x6d80;
                                 f32 sp68 = sp50 * (camera->view.lookat.eye.abs(sp7C) / 1000.0f);
                                 if (sp68 > 1.0f) {
@@ -4087,23 +3944,19 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
                                 for (int k = 0; k < spC; k++) {
                                     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
                                     GXPosition3f32(pos[0].x + (temp_f31 * add_table[k].x), pos[0].y + (temp_f31 * add_table[k].y), pos[0].z + (temp_f31 * add_table[k].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0, 0);
                                     GXPosition3f32(pos[1].x + (temp_f31 * add_table[k].x), pos[1].y + (temp_f31 * add_table[k].y), pos[1].z + (temp_f31 * add_table[k].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0xFF, 0);
                                     GXPosition3f32(pos[2].x + (temp_f31 * add_table[k].x), pos[2].y + (temp_f31 * add_table[k].y), pos[2].z + (temp_f31 * add_table[k].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0xFF, 0xFF);
                                     GXPosition3f32(pos[3].x + (temp_f31 * add_table[k].x), pos[3].y + (temp_f31 * add_table[k].y), pos[3].z + (temp_f31 * add_table[k].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0, 0xFF);
                                     GXEnd();
                                 }
 
                                 if ((g_env_light.field_0xe90 != 0 && dComIfGp_roomControl_getStayNo() == 0 && sp7C.z < 3000.0f) || dComIfGp_roomControl_getStayNo() == 3 || dComIfGp_roomControl_getStayNo() == 6 || dComIfGp_roomControl_getStayNo() == 9 || dComIfGp_roomControl_getStayNo() == 13) {
                                     color_reg0.a = 255.0f * ((0.4f * snow_packet->mSnowEff[i].field_0x30) + temp_f29);
-                                    IF_NOT_DUSK(GXSetTevColor(GX_TEVREG0, color_reg0));
+                                    GXSetTevColor(GX_TEVREG0, color_reg0);
 
                                     f32 sp34;
                                     f32 sp30;
@@ -4159,16 +4012,12 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
                                     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
                                     int var_r27 = 0;
                                     GXPosition3f32(pos[0].x + (temp_f31 * add_table[var_r27].x), pos[0].y + (temp_f31 * add_table[var_r27].y), pos[0].z + (temp_f31 * add_table[var_r27].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0, 0);
                                     GXPosition3f32(pos[1].x + (temp_f31 * add_table[var_r27].x), pos[1].y + (temp_f31 * add_table[var_r27].y), pos[1].z + (temp_f31 * add_table[var_r27].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0xFF, 0);
                                     GXPosition3f32(pos[2].x + (temp_f31 * add_table[var_r27].x), pos[2].y + (temp_f31 * add_table[var_r27].y), pos[2].z + (temp_f31 * add_table[var_r27].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0xFF, 0xFF);
                                     GXPosition3f32(pos[3].x + (temp_f31 * add_table[var_r27].x), pos[3].y + (temp_f31 * add_table[var_r27].y), pos[3].z + (temp_f31 * add_table[var_r27].z));
-                                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                                     GXTexCoord2s16(0, 0xFF);
                                     GXEnd();
                                 }
@@ -4504,7 +4353,6 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) {
 }
 
 void drawCloudShadow(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_cloud_Packet* cloud_packet = g_env_light.mpCloudPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -4540,12 +4388,7 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) {
 
         GXSetClipMode(GX_CLIP_DISABLE);
 
-#if TARGET_PC
-        static CachedTexObjs<1> texobj;
-        TGXTexObj fb_texobj;
-#else
         TGXTexObj texobj, fb_texobj;
-#endif
         if (g_env_light.mMoyaMode < 50) {
             dKy_ParticleColor_get_bg(&camera->view.lookat.eye, NULL, &sp48, &sp44, &sp40, &sp3C, 0.0f);
             f32 temp_f30 = 0.4f;
@@ -4558,11 +4401,7 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) {
             color_reg1.g = (0.45f * sp38.g) + (0.55f * sp44.g);
             color_reg1.b = (0.45f * sp38.b) + (0.55f * sp44.b);
 
-#if TARGET_PC
-            load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-#else
             dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
-#endif
             GXSetNumChans(0);
             GXSetTevColor(GX_TEVREG0, color_reg0);
             GXSetTevColor(GX_TEVREG1, color_reg1);
@@ -4607,11 +4446,7 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) {
             color_reg1.b = 0;
             color_reg1.a = 0xFF;
 
-#if TARGET_PC
-            load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP1);
-#else
             dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[0], GX_TEXMAP1);
-#endif
 
             ResTIMG* fb_timg = mDoGph_gInf_c::getFrameBufferTimg();
             dDlst_window_c* window = dComIfGp_getWindow(0);
@@ -4758,11 +4593,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
     Mtx camMtx;
     Mtx rotMtx;
 
-#if TARGET_PC
-    static CachedTexObjs<3> texobj;
-#else
     TGXTexObj texobj;
-#endif
     cXyz proj;
 
     f32 rot;
@@ -4872,11 +4703,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
             color_reg1.r = 0;
             color_reg1.g = 0;
             color_reg1.b = 0;
-#if TARGET_PC
-            auto* loaded_texobj = load_cached_tex(texobj, (ResTIMG*)tex[j], GX_TEXMAP0);
-#else
             dKyr_set_btitex(&texobj, (ResTIMG*)tex[j]);
-#endif
 
             GXSetNumChans(0);
             GXSetTevColor(GX_TEVREG0, color);
@@ -4981,11 +4808,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
                     }
 
                     if (!(vrkumo_packet->mVrkumoEff[k].mAlpha <= 0.000001f)) {
-#if TARGET_PC
-                        GXLoadTexObj(loaded_texobj, GX_TEXMAP0);
-#else
                         GXLoadTexObj(&texobj, GX_TEXMAP0);
-#endif
                         GXSetTevColor(GX_TEVREG0, color);
 
                         sp60 = sp68 * (0.2f + (0.2f * (k / 100.0f)));
@@ -5518,7 +5341,6 @@ void dKyr_odour_move() {
 }
 
 void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_odour_Packet* odour_packet = envlight->mOdourData.mpOdourPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -5607,14 +5429,8 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
         break;
     }
 
-#if TARGET_PC
-    static CachedTexObjs<1> texobj;
-    TGXTexObj fb_texobj;
-    load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP1);
-#else
     TGXTexObj texobj, fb_texobj;
     dKyr_set_btitex_common(&texobj, (ResTIMG*)tex[0], GX_TEXMAP1);
-#endif
 
     ResTIMG* fb_timg = mDoGph_gInf_c::getFrameBufferTimg();
     dDlst_window_c* window = dComIfGp_getWindow(0);
@@ -5629,23 +5445,18 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
     MTXRotRad(rotMtx, 'Z', DEG_TO_RAD(rot));
     MTXConcat(camMtx, rotMtx, camMtx);
 
-    // Dusklight opt: enable draw call merging
-    // by using vertex color instead of GX_TEVREG0
-
     GXLoadPosMtxImm(drawMtx, GX_PNMTX0);
     GXSetCurrentMtx(GX_PNMTX0);
     GXLoadTexMtxImm(spF0, GX_TEXMTX0, GX_MTX3x4);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA4, 8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX1, GX_CLR_RGBA, GX_RGBA4, 8);
-    IF_DUSK(GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0));
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
     GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
     GXSetVtxDesc(GX_VA_TEX1, GX_DIRECT);
-    IF_DUSK(GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT));
     GXSetNumChans(1);
-    GXSetChanCtrl(GX_COLOR0, GX_DISABLE, GX_SRC_REG, DUSK_IF_ELSE(GX_SRC_VTX, GX_SRC_REG), GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE);
+    GXSetChanCtrl(GX_COLOR0, GX_DISABLE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_CLAMP, GX_AF_NONE);
     GXSetTevColor(GX_TEVREG0, color_reg0);
     GXSetTevColor(GX_TEVREG1, color_reg1);
     GXSetNumTexGens(2);
@@ -5653,14 +5464,14 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
     GXSetTexCoordGen(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEX1, GX_IDENTITY);
     GXSetNumTevStages(2);
     GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
-    GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, DUSK_IF_ELSE(GX_CC_RASC, GX_CC_C0), GX_CC_C1);
+    GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_C0, GX_CC_C1);
     GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
     GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_TEXA, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO);
     GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
     GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD1, GX_TEXMAP1, GX_COLOR0A0);
     GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_CPREV, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO);
     GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV);
-    GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, DUSK_IF_ELSE(GX_CA_RASA, GX_CA_A0), GX_CA_TEXA, GX_CA_ZERO);
+    GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, GX_CA_A0, GX_CA_TEXA, GX_CA_ZERO);
     GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV);
     GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_COPY);
     GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
@@ -5702,7 +5513,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
             if (effect->mStatus != 0) {
                 if (!(temp_f29 <= 0.000001f)) {
                     color_reg0.a = 255.0f * temp_f29;
-                    IF_NOT_DUSK(GXSetTevColor(GX_TEVREG0, color_reg0));
+                    GXSetTevColor(GX_TEVREG0, color_reg0);
 
                     sp70 = sp4C;
 
@@ -5740,19 +5551,15 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
 
                     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
                     GXPosition3f32(pos[0].x, pos[0].y, pos[0].z);
-                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                     GXTexCoord2s16(0, 0);
                     GXTexCoord2s16(0, 0);
                     GXPosition3f32(pos[1].x, pos[1].y, pos[1].z);
-                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                     GXTexCoord2s16(0xFF, 0);
                     GXTexCoord2s16(0xFF, 0);
                     GXPosition3f32(pos[2].x, pos[2].y, pos[2].z);
-                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                     GXTexCoord2s16(0xFF, 0xFF);
                     GXTexCoord2s16(0xFF, 0xFF);
                     GXPosition3f32(pos[3].x, pos[3].y, pos[3].z);
-                    IF_DUSK(GXColor4u8(color_reg0.r, color_reg0.g, color_reg0.b, color_reg0.a));
                     GXTexCoord2s16(0, 0xFF);
                     GXTexCoord2s16(0, 0xFF);
                     GXEnd();
@@ -5923,7 +5730,6 @@ void dKyr_mud_move() {
 }
 
 void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     dKankyo_mud_Packet* mud_packet = g_env_light.mpMudPacket;
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
 
@@ -6017,13 +5823,8 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
     
         if (g_env_light.camera_water_in_status == 0) {
             for (int i = 0; i < 1; i++) {
-#if TARGET_PC
-                static CachedTexObjs<1> texobj_cache;
-                auto* texobj = load_cached_tex(texobj_cache, (ResTIMG*)tex[0], GX_TEXMAP0);
-#else
                 TGXTexObj texobj;
                 dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
-#endif
 
                 GXSetNumChans(0);
                 GXSetTevColor(GX_TEVREG0, color_reg0);
@@ -6063,11 +5864,7 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
 
                     color_reg0.a = mud_packet->mEffect[j].field_0x38 * var_f31;
 
-#if TARGET_PC
-                    GXLoadTexObj(texobj, GX_TEXMAP0);
-#else
                     GXLoadTexObj(&texobj, GX_TEXMAP0);
-#endif
                     GXSetTevColor(GX_TEVREG0, color_reg0);
 
                     f32 sp30 = 1.0f;
@@ -6152,7 +5949,6 @@ void dKyr_evil_move() {
 }
 
 static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_evil_Packet* evil_packet = envlight->mpEvilPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -6189,13 +5985,8 @@ static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) {
         color_reg0.b = 0x87;
         color_reg0.a = 0xFF;
 
-#if TARGET_PC
-        static CachedTexObjs<1> texobj;
-        load_cached_tex(texobj, (ResTIMG*)tex[1], GX_TEXMAP0);
-#else
         TGXTexObj texobj;
         dKyr_set_btitex(&texobj, (ResTIMG*)tex[1]);
-#endif
 
 #if TARGET_PC
         if (dusk::frame_interp::get_ui_tick_pending())
@@ -6396,7 +6187,6 @@ static f32 dKyr_near_bosslight_check(cXyz pos) {
 }
 
 void dKyr_evil_draw(Mtx drawMtx, u8** tex) {
-    ZoneScoped;
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_evil_Packet* evil_packet = envlight->mpEvilPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -6433,13 +6223,8 @@ void dKyr_evil_draw(Mtx drawMtx, u8** tex) {
         color_reg1.b = 10;
         color_reg1.a = 255;
 
-#if TARGET_PC
-        static CachedTexObjs<1> texobj;
-        load_cached_tex(texobj, (ResTIMG*)tex[0], GX_TEXMAP0);
-#else
         TGXTexObj texobj;
         dKyr_set_btitex(&texobj, (ResTIMG*)tex[0]);
-#endif
 
 #if TARGET_PC
         if (dusk::frame_interp::get_ui_tick_pending())

src/d/d_kankyo_wether.cpp

@@ -79,7 +79,7 @@ SNOW_EFF::~SNOW_EFF() {}
 SNOW_EFF::SNOW_EFF() {}
 
 void dKankyo_snow_Packet::draw() {
-    GX_DEBUG_GROUP(dKyr_drawSnow, j3dSys.getViewMtx(), &mpTex);
+    dKyr_drawSnow(j3dSys.getViewMtx(), &mpTex);
 }
 
 STAR_EFF::~STAR_EFF() {}
@@ -103,7 +103,7 @@ HOUSI_EFF::~HOUSI_EFF() {}
 HOUSI_EFF::HOUSI_EFF() {}
 
 void dKankyo_housi_Packet::draw() {
-    GX_DEBUG_GROUP(dKyr_drawHousi, j3dSys.getViewMtx(), &mpResTex);
+    dKyr_drawHousi(j3dSys.getViewMtx(), &mpResTex);
 }
 
 VRKUMO_EFF::~VRKUMO_EFF() {}
@@ -119,7 +119,7 @@ EF_ODOUR_EFF::~EF_ODOUR_EFF() {}
 EF_ODOUR_EFF::EF_ODOUR_EFF() {}
 
 void dKankyo_odour_Packet::draw() {
-    GX_DEBUG_GROUP(dKyr_odour_draw, j3dSys.getViewMtx(), &mpResTex);
+    dKyr_odour_draw(j3dSys.getViewMtx(), &mpResTex);
 }
 
 EF_MUD_EFF::~EF_MUD_EFF() {}

src/d/d_map.cpp

@@ -1213,10 +1213,6 @@ void dMap_c::changeTextureSize(int param_1, int param_2, int param_3) {
     JUT_ASSERT(2672, mImage_p != NULL);
     JUT_ASSERT(2673, mResTIMG != NULL);
 
-#if TARGET_PC
-    GXDestroyCopyTex(mImage_p);
-#endif
-
     mTexSizeX = param_1 >> param_3;
     mTexSizeY = param_2 >> param_3;
 
@@ -1230,24 +1226,6 @@ void dMap_c::changeTextureSize(int param_1, int param_2, int param_3) {
 }
 #endif
 
-#if TARGET_PC
-bool dMap_c::refreshTextureSize() {
-    JUT_ASSERT(2688, mImage_p != NULL);
-    JUT_ASSERT(2689, mResTIMG != NULL);
-
-    const u16 oldWidth = mResTIMG->width;
-    const u16 oldHeight = mResTIMG->height;
-    makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33);
-
-    if (mResTIMG->width == oldWidth && mResTIMG->height == oldHeight) {
-        return false;
-    }
-
-    GXDestroyCopyTex(mImage_p);
-    return true;
-}
-#endif
-
 void dMap_c::_remove() {
     if (mImage_p != NULL) {
 #if TARGET_PC

src/d/d_map_path.cpp

@@ -15,51 +15,16 @@
 #include <cstring>
 
 #ifdef TARGET_PC
-#include "dusk/settings.h"
-#include "m_Do/m_Do_graphic.h"
-#include <dolphin/gx/GXAurora.h>
-#include <aurora/math.hpp>
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <functional>
-#include <limits>
-#include <numbers>
 #include <span>
+#include <numbers>
+#include <array>
 
-constexpr u16 kMapIconResolutionMultiplier = 4;
-constexpr u16 kMapImageSide = 16 * kMapIconResolutionMultiplier;
+constexpr u16 kMapResolutionMultiplier = 4;
+constexpr u16 kMapImageSide = 16 * kMapResolutionMultiplier;
 constexpr u32 kMapImageTotalPixels = kMapImageSide * kMapImageSide;
 
 typedef std::function<u8(size_t, size_t)> PaintI8Fn;
 
-u16 scaled_map_axis(u16 value, f32 scale) {
-    const auto scaledValue =
-        static_cast<u32>(std::max(1.0f, std::round(static_cast<f32>(value) * scale)));
-    return static_cast<u16>(std::min<u32>(scaledValue, std::numeric_limits<u16>::max()));
-}
-
-aurora::Vec2<u16> map_render_size_for(u16 width, u16 height) {
-    if (width == 0 || height == 0) {
-        return {width, height};
-    }
-
-    u32 renderWidth = 0;
-    u32 renderHeight = 0;
-    AuroraGetRenderSize(&renderWidth, &renderHeight);
-
-    const f32 logicalWidth = std::max(mDoGph_gInf_c::getWidthF(), 1.0f);
-    const f32 logicalHeight = std::max(mDoGph_gInf_c::getHeightF(), 1.0f);
-    const f32 irScaleX = renderWidth > 0 ? static_cast<f32>(renderWidth) / logicalWidth : 1.0f;
-    const f32 irScaleY = renderHeight > 0 ? static_cast<f32>(renderHeight) / logicalHeight : 1.0f;
-    const f32 hudScale = std::clamp(dusk::getSettings().game.hudScale.getValue(), 0.5f, 2.0f);
-    return {
-        scaled_map_axis(width, irScaleX * hudScale),
-        scaled_map_axis(height, irScaleY * hudScale),
-    };
-}
-
 void paint_i8(std::span<u8> dst, size_t width, PaintI8Fn paint) {
     const auto blocksAcross = width >> 3;
 
@@ -513,9 +478,9 @@ void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p
     p_image->format = GX_TF_C8;
     p_image->alphaEnabled = 2;
 #ifdef TARGET_PC
-    const auto [rw, rh] = map_render_size_for(width, height);
-    p_image->width = rw;
-    p_image->height = rh;
+    // Increase map render resolution
+    p_image->width = width * kMapResolutionMultiplier;
+    p_image->height = height * kMapResolutionMultiplier;
 #else
     p_image->width = width;
     p_image->height = height;
@@ -598,14 +563,16 @@ void dRenderingFDAmap_c::drawBack() const {
 
 void dRenderingFDAmap_c::preRenderingMap() {
 #ifdef TARGET_PC
-    const auto [rw, rh] = map_render_size_for(mTexWidth, mTexHeight);
-    GXCreateFrameBuffer(rw, rh);
+    // Increase map render resolution
+    const u16 w = mTexWidth * kMapResolutionMultiplier;
+    const u16 h = mTexHeight * kMapResolutionMultiplier;
+    GXCreateFrameBuffer(w, h);
     // Set logical viewport dimensions
     GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
     GXSetScissor(0, 0, mTexWidth, mTexHeight);
     // Set render viewport dimensions
-    GXSetViewportRender(0.0f, 0.0f, rw, rh, 0.0f, 1.0f);
-    GXSetScissorRender(0, 0, rw, rh);
+    GXSetViewportRender(0.0f, 0.0f, w, h, 0.0f, 1.0f);
+    GXSetScissorRender(0, 0, w, h);
 #else
     GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
     GXSetScissor(0, 0, mTexWidth, mTexHeight);
@@ -643,9 +610,11 @@ void dRenderingFDAmap_c::preRenderingMap() {
 void dRenderingFDAmap_c::postRenderingMap() {
     GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL);
 #ifdef TARGET_PC
-    const auto [rw, rh] = map_render_size_for(mTexWidth, mTexHeight);
-    GXSetTexCopySrc(0, 0, rw, rh);
-    GXSetTexCopyDst(rw, rh, GX_CTF_R8, GX_FALSE);
+    // Increase map render resolution
+    const u16 w = mTexWidth * kMapResolutionMultiplier;
+    const u16 h = mTexHeight * kMapResolutionMultiplier;
+    GXSetTexCopySrc(0, 0, w, h);
+    GXSetTexCopyDst(w, h, GX_CTF_R8, GX_FALSE);
     GXCopyTex(field_0x4, GX_TRUE);
     GXRestoreFrameBuffer();
 #else

src/d/d_menu_collect.cpp

@@ -36,10 +36,6 @@
 #include "d/d_menu_window.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 
-#if TARGET_PC
-#include "dusk/menu_pointer.h"
-#endif
-
 typedef void (dMenu_Collect2D_c::*initFunc)();
 static DUSK_CONSTEXPR initFunc init[] = {
     &dMenu_Collect2D_c::wait_init,          &dMenu_Collect2D_c::save_open_init,
@@ -1790,12 +1786,6 @@ void dMenu_Collect2D_c::wait_init() {
 }
 
 void dMenu_Collect2D_c::wait_proc() {
-#if TARGET_PC
-    if (pointerWait()) {
-        return;
-    }
-#endif
-
     if (dMw_A_TRIGGER()) {
         if (mCursorX == 0 && mCursorY == 5) {
             if (mDoGph_gInf_c::getFader()->mStatus == 1) {
@@ -1897,87 +1887,6 @@ void dMenu_Collect2D_c::wait_proc() {
     }
 }
 
-#if TARGET_PC
-void dMenu_Collect2D_c::pointerActivateCurrent() {
-    if (mCursorX == 0 && mCursorY == 5) {
-        if (mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 1;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            dMeter2Info_set2DVibrationM();
-        }
-    } else if (mCursorX == 1 && mCursorY == 5) {
-        if (mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 2;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            dMeter2Info_set2DVibrationM();
-        }
-    } else if (mCursorX == 3 && mCursorY == 4) {
-        if (field_0x22d[3][4] != 0 && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 3;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (mCursorX == 2 && mCursorY == 4) {
-        if (isFishIconVisible() && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 4;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (mCursorX == 3 && mCursorY == 3) {
-        if (isSkillIconVisible() && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 5;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (mCursorX == 2 && mCursorY == 3) {
-        if (isInsectIconVisible() && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 6;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (field_0x22d[mCursorX][mCursorY] != 0 && !mIsWolf) {
-        if ((mCursorX >= 3 && mCursorX <= 4) || (mCursorX == 5 && mCursorY == 2)) {
-            u8 cursorY = mCursorY;
-            if (cursorY == 0) {
-                if (daPy_getPlayerActorClass()->getSwordChangeWaitTimer() == 0) {
-                    changeSword();
-                }
-            } else if (cursorY == 1) {
-                if (daPy_getPlayerActorClass()->getShieldChangeWaitTimer() == 0) {
-                    changeShield();
-                }
-            } else if (cursorY == 2 &&
-                       daPy_getPlayerActorClass()->getClothesChangeWaitTimer() == 0)
-            {
-                changeClothe();
-            }
-        }
-    }
-}
-
-bool dMenu_Collect2D_c::pointerWait() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Collection);
-    for (u8 y = 0; y < 6; ++y) {
-        for (u8 x = 0; x < 7; ++x) {
-            if (getItemTag(x, y, true) == 0 || !dusk::menu_pointer::hit_pane(mpSelPm[x][y], 8.0f)) {
-                continue;
-            }
-            if (mCursorX != x || mCursorY != y) {
-                mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0);
-                mCursorX = x;
-                mCursorY = y;
-                cursorPosSet();
-                setItemNameString(mCursorX, mCursorY);
-            }
-            if (dusk::menu_pointer::consume_click()) {
-                pointerActivateCurrent();
-                return true;
-            }
-            return false;
-        }
-    }
-    return false;
-}
-#endif
-
 
 void dMenu_Collect2D_c::save_open_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);

src/d/d_menu_fmap2D.cpp

@@ -17,10 +17,7 @@
 #include "d/d_msg_scrn_explain.h"
 #include "m_Do/m_Do_graphic.h"
 #include "d/actor/d_a_midna.h"
-#if TARGET_PC
 #include "dusk/frame_interpolation.h"
-#include "dusk/ui/touch_controls.hpp"
-#endif
 #include <cstring>
 
 #if TARGET_PC
@@ -1946,12 +1943,6 @@ void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) {
     calcAllMapPos2D(mArrowPos3DX + control_xpos - mStageTransX,
                     mArrowPos3DZ + control_ypos - mStageTransZ, &pos_x, &pos_y);
 
-#if TARGET_PC
-    if (dusk::getSettings().game.enableMirrorMode) {
-        pos_x = getMirrorPosX(pos_x, 0.0f);
-    }
-#endif
-
     mSelectRegion = 0xff;
     int region = mRegionCursor;
     if (region != 0xff && region != 7) {
@@ -2512,10 +2503,6 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
 }
 
 dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() {
-#if TARGET_PC
-    dusk::ui::set_control_override(dusk::ui::Control::Z, dusk::ui::ControlOverride::Default);
-#endif
-
     deleteExplain();
     JKR_DELETE(mpTitleScreen);
     mpTitleScreen = NULL;
@@ -2789,12 +2776,6 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
         param_0 = 0x533;
     }
 
-#if TARGET_PC
-    dusk::ui::set_control_override(dusk::ui::Control::Z,
-        param_0 != 0 && isWarpAccept() ? dusk::ui::ControlOverride::Action :
-                                         dusk::ui::ControlOverride::Default);
-#endif
-
 #if VERSION == VERSION_GCN_JPN
     static const u64 cont_zt[5] = {MULTI_CHAR('cont_zt'), MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4')};
     #define setZButtonString_font_zt cont_zt

src/d/d_menu_insect.cpp

@@ -22,10 +22,6 @@
 #include <cstdio>
 #include <cstring>
 
-#if TARGET_PC
-#include "dusk/menu_pointer.h"
-#endif
-
 typedef void (dMenu_Insect_c::*initFunc)();
 static initFunc map_init_process[] = {
     &dMenu_Insect_c::wait_init,          &dMenu_Insect_c::explain_open_init,
@@ -284,12 +280,6 @@ void dMenu_Insect_c::wait_init() {
 
 void dMenu_Insect_c::wait_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
-#if TARGET_PC
-        if (pointerWait()) {
-            return;
-        }
-#endif
-
         if (mDoCPd_c::getTrigB(PAD_1) || field_0xf7 == 0) {
             if (mDoCPd_c::getTrigB(PAD_1) && field_0xf6 == 1) {
                 dMeter2Info_setInsectSelectType(0);
@@ -311,39 +301,6 @@ void dMenu_Insect_c::wait_move() {
     }
 }
 
-#if TARGET_PC
-bool dMenu_Insect_c::pointerWait() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Collection);
-    for (u8 y = 0; y < 4; ++y) {
-        for (u8 x = 0; x < 6; ++x) {
-            const int index = x + y * 6;
-            if (!isGetInsect(x, y) || !dusk::menu_pointer::hit_pane(mpINSParent[index], 8.0f)) {
-                continue;
-            }
-
-            if (field_0xf4 != x || field_0xf5 != y) {
-                field_0xf4 = x;
-                field_0xf5 = y;
-                setCursorPos();
-                setAButtonString(0x368);
-                Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                         -1.0f, 0);
-            }
-            if (dusk::menu_pointer::consume_click()) {
-                field_0xf3 = 1;
-                Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                         -1.0f, 0);
-                dMeter2Info_set2DVibration();
-                return true;
-            }
-            return false;
-        }
-    }
-
-    return false;
-}
-#endif
-
 void dMenu_Insect_c::explain_open_init() {
     char local_78[32];
     char local_98[32];

src/d/d_menu_letter.cpp

@@ -19,15 +19,6 @@
 
 #ifdef TARGET_PC
 #include "dusk/achievements.h"
-#include "dusk/menu_pointer.h"
-#include "dusk/ui/touch_controls.hpp"
-
-static void enable_turn_page_controls(bool enabled) {
-    const auto controlOverride =
-        enabled ? dusk::ui::ControlOverride::Action : dusk::ui::ControlOverride::Default;
-    dusk::ui::set_control_override(dusk::ui::Control::L, controlOverride);
-    dusk::ui::set_control_override(dusk::ui::Control::R, controlOverride);
-}
 #endif
 
 #if VERSION == VERSION_GCN_JPN
@@ -91,10 +82,6 @@ dMenu_Letter_c::dMenu_Letter_c(JKRExpHeap* i_heap, STControl* i_stick, CSTContro
 
 
 dMenu_Letter_c::~dMenu_Letter_c() {
-#if TARGET_PC
-    enable_turn_page_controls(false);
-#endif
-
     JKR_DELETE(mpDrawCursor);
     mpDrawCursor = NULL;
 
@@ -370,10 +357,6 @@ int dMenu_Letter_c::_open() {
 }
 
 int dMenu_Letter_c::_close() {
-#if TARGET_PC
-    enable_turn_page_controls(false);
-#endif
-
     s16 closeWindowFrame =
         g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::WINDOW_FRAME];
     field_0x368 = 0;
@@ -403,10 +386,6 @@ int dMenu_Letter_c::_close() {
 }
 
 void dMenu_Letter_c::wait_init() {
-#if TARGET_PC
-    enable_turn_page_controls(field_0x374 > 1);
-#endif
-
     setAButtonString(0x40c);
     setBButtonString(0x3f9);
 }
@@ -414,12 +393,6 @@ void dMenu_Letter_c::wait_init() {
 void dMenu_Letter_c::wait_move() {
     u8 oldIndex = mIndex;
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
-#if TARGET_PC
-        if (pointerWait()) {
-            return;
-        }
-#endif
-
         if (mDoCPd_c::getTrigB(PAD_1) != 0) {
             mpDrawCursor->offPlayAnime(0);
             mStatus = 3;
@@ -475,40 +448,8 @@ void dMenu_Letter_c::wait_move() {
     }
 }
 
-#if TARGET_PC
-bool dMenu_Letter_c::pointerWait() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Collection);
-    for (u8 i = 0; i < field_0x373; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mpLetterParent[i], 8.0f)) {
-            continue;
-        }
-
-        if (mIndex != i) {
-            mIndex = i;
-            changeActiveColor();
-            Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-        }
-        if (dusk::menu_pointer::consume_click()) {
-            mProcess = 3;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_LETTER_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            dMeter2Info_set2DVibration();
-            return true;
-        }
-        return false;
-    }
-
-    return false;
-}
-#endif
-
 
 void dMenu_Letter_c::slide_right_init() {
-#if TARGET_PC
-    enable_turn_page_controls(false);
-#endif
-
     field_0x358 = -field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
     field_0x35c = field_0x1ec->getWidth() IF_NOT_DUSK(* mDoGph_gInf_c::getInvScale());
     changePageLight();
@@ -526,10 +467,6 @@ void dMenu_Letter_c::slide_right_move() {
 }
 
 void dMenu_Letter_c::slide_left_init() {
-#if TARGET_PC
-    enable_turn_page_controls(false);
-#endif
-
     field_0x358 = field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
     field_0x35c = -field_0x1ec->getWidth() IF_NOT_DUSK(* mDoGph_gInf_c::getInvScale());
     changePageLight();
@@ -547,10 +484,6 @@ void dMenu_Letter_c::slide_left_move() {
 }
 
 void dMenu_Letter_c::read_open_init() {
-#if TARGET_PC
-    enable_turn_page_controls(false);
-#endif
-
     field_0x36a = 0;
     u8 idx = field_0x3ac[field_0x36f * 6 + mIndex] - 1;
     field_0x3e3 = 1;

src/d/d_menu_option.cpp

@@ -26,11 +26,6 @@
 
 #include "JSystem/JAudio2/JASDriverIF.h"
 
-#if TARGET_PC
-#include "dusk/menu_pointer.h"
-#include "dusk/ui/touch_controls.hpp"
-#endif
-
 typedef void (dMenu_Option_c::*initFunc)();
 static initFunc init[] = {
     &dMenu_Option_c::atten_init,
@@ -298,10 +293,6 @@ void dMenu_Option_c::_create() {
 }
 
 void dMenu_Option_c::_delete() {
-#if TARGET_PC
-    dusk::ui::set_control_override(dusk::ui::Control::Z, dusk::ui::ControlOverride::Default);
-#endif
-
     JKR_DELETE(mpString);
     mpString = NULL;
 
@@ -527,15 +518,6 @@ void dMenu_Option_c::_move() {
                 (this->*init[field_0x3ef])();
             }
         }
-
-#if TARGET_PC
-        if (field_0x3f4 == 5 && field_0x3ef != SelectType3 && field_0x3f3 == 5 &&
-            field_0x3ef != SelectType4 && field_0x3ef != SelectType5 && field_0x3ef != SelectType6 &&
-            field_0x3ef != SelectType7 && pointerConfirmSelect())
-        {
-            goto skip;
-        }
-#endif
     }
 skip:
     u8 oldValue = field_0x3ef;
@@ -1092,34 +1074,6 @@ void dMenu_Option_c::confirm_move_move() {
     bool leftTrigger = checkLeftTrigger();
     bool rightTrigger = checkRightTrigger();
 
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Options);
-    for (u8 i = 0; i < 2; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mpYesNoSelBase_c[i], 8.0f)) {
-            continue;
-        }
-        if (field_0x3f9 != i) {
-            Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            field_0x3fa = field_0x3f9;
-            field_0x3f9 = i;
-            yesnoSelectAnmSet();
-            field_0x3ef = SelectType6;
-            mpWarning->_move();
-            setAnimation();
-            return;
-        }
-        if (dusk::menu_pointer::consume_click()) {
-            yesNoSelectStart();
-            field_0x3ef = SelectType7;
-            dMeter2Info_set2DVibrationM();
-            mpWarning->_move();
-            setAnimation();
-            return;
-        }
-    }
-#endif
-
     if (mDoCPd_c::getTrigA(PAD_1) != 0) {
         yesNoSelectStart();
         field_0x3ef = SelectType7;
@@ -2109,11 +2063,6 @@ void dMenu_Option_c::cursorAnime(f32 i_cursorValue) {
 }
 
 void dMenu_Option_c::setZButtonString(u16 i_stringID) {
-#if TARGET_PC
-    dusk::ui::set_control_override(dusk::ui::Control::Z,
-        i_stringID != 0 ? dusk::ui::ControlOverride::Action : dusk::ui::ControlOverride::Default);
-#endif
-
     if (i_stringID == 0) {
         for (int i = 0; i < 3; i++) {
             if (mpZButtonText[i] != NULL) {
@@ -2193,88 +2142,7 @@ bool dMenu_Option_c::isRumbleSupported() {
     return JUTGamePad::sRumbleSupported >> 0x1f;
 }
 
-#if TARGET_PC
-bool dMenu_Option_c::pointerConfirmSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Options);
-    if (!dusk::menu_pointer::state().clicked) {
-        return false;
-    }
-
-    for (u8 i = 0; i < SelectType3; ++i) {
-        if (dusk::menu_pointer::hit_pane(mpMenuPane[i], 8.0f)) {
-            return false;
-        }
-    }
-
-    if (!dusk::menu_pointer::consume_click()) {
-        return false;
-    }
-
-    field_0x3f7 = 1;
-    field_0x3f5 = field_0x3ef;
-    field_0x3ef = SelectType4;
-    dMeter2Info_set2DVibration();
-    (this->*init[field_0x3ef])();
-    return true;
-}
-#endif
-
 bool dMenu_Option_c::dpdMenuMove() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Options);
-    for (u8 i = 0; i < SelectType3; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mpMenuPane[i], 8.0f)) {
-            continue;
-        }
-        if (getSelectType() != i) {
-            field_0x3ef = i;
-            setCursorPos(i);
-            Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-        }
-        if (!dusk::menu_pointer::consume_click()) {
-            return true;
-        }
-
-        switch (i) {
-        case SelectType0:
-            field_0x3e4 ^= 1;
-            field_0x3da = 5;
-            field_0x3ef = SelectType3;
-            field_0x3f5 = SelectType0;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            return true;
-        case SelectType1:
-            if (isRumbleSupported()) {
-                field_0x3ea ^= 1;
-                if (field_0x3ea != 0) {
-                    mDoCPd_c::startMotorWave(0, &field_0x3e0, JUTGamePad::CRumble::VAL_0, 0x3c);
-                }
-                field_0x3da = 5;
-                field_0x3ef = SelectType3;
-                field_0x3f5 = SelectType1;
-                Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                         -1.0f, 0);
-            }
-            return true;
-        case SelectType2:
-            if (field_0x3e9 == 0) {
-                field_0x3e9 = 2;
-            } else {
-                field_0x3e9--;
-            }
-            field_0x3da = 5;
-            mDoAud_setOutputMode(dMo_soundMode[field_0x3e9]);
-            setSoundMode(dMo_soundMode[field_0x3e9]);
-            field_0x3ef = SelectType3;
-            field_0x3f5 = SelectType2;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_OPTION_SWITCH, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            return true;
-        }
-    }
-#endif
     return false;
 }
 

src/d/d_menu_ring.cpp

@@ -31,9 +31,7 @@
 
 #if TARGET_PC
 #include "dusk/game_clock.h"
-#include "dusk/menu_pointer.h"
 #include "dusk/settings.h"
-#include "dusk/ui/touch_controls.hpp"
 #endif
 
 typedef void (dMenu_Ring_c::*initFunc)();
@@ -616,9 +614,6 @@ void dMenu_Ring_c::_delete() {
  * initializes a new process if mStatus changes
 */
 void dMenu_Ring_c::_move() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::ItemWheel);
-#endif
     mRingRadiusH = g_ringHIO.mRingRadiusH;
     mRingRadiusV = g_ringHIO.mRingRadiusV;
     mOldStatus = mStatus; // Save current status for check
@@ -1522,11 +1517,6 @@ void dMenu_Ring_c::stick_wait_proc() {
         setDoStatus(0);
         return;
     }
-#if TARGET_PC
-    if (pointerMove()) {
-        return;
-    }
-#endif
     if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xe)) {
         Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     }
@@ -1538,49 +1528,6 @@ void dMenu_Ring_c::stick_wait_proc() {
     }
 }
 
-#if TARGET_PC
-bool dMenu_Ring_c::pointerMove() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::ItemWheel);
-    const auto& pointer = dusk::menu_pointer::state();
-    if (!pointer.valid || mItemsTotal == 0) {
-        return false;
-    }
-
-    int hoveredSlot = -1;
-    f32 bestDistance = 42.0f;
-    for (u8 i = 0; i < mItemsTotal; ++i) {
-        const f32 x = mItemSlotPosX[i] + mCenterPosX;
-        const f32 y = mItemSlotPosY[i] + mCenterPosY;
-        const f32 distance = calcDistance(pointer.x, pointer.y, x, y);
-        if (distance < bestDistance) {
-            bestDistance = distance;
-            hoveredSlot = i;
-        }
-    }
-
-    if (hoveredSlot < 0) {
-        return false;
-    }
-
-    if (mCurrentSlot != hoveredSlot) {
-        mDirectSelectCursorPos.x = mItemSlotPosX[mCurrentSlot];
-        mDirectSelectCursorPos.z = mItemSlotPosY[mCurrentSlot];
-        mCurrentSlot = hoveredSlot;
-        mDirectSelectActive = true;
-        field_0x670 = field_0x63e[mCurrentSlot];
-        setStatus(STATUS_MOVE);
-        field_0x6b2 = 0;
-        return true;
-    }
-
-    if (dusk::menu_pointer::consume_click()) {
-        return true;
-    }
-
-    return false;
-}
-#endif
-
 void dMenu_Ring_c::stick_move_init() {
     if (mCursorSpeed == 0) {
         mCursorSpeed = g_ringHIO.mCursorInitSpeed;
@@ -1725,40 +1672,12 @@ void dMenu_Ring_c::drawSelectItem() {
 #else
             if (field_0x674[i] < 10) {
 #endif
-#if TARGET_PC
-                f32 initSizeX;
-                f32 initSizeY;
-                f32 initScaleX;
-                f32 initScaleY;
-                Vec pos;
-                dusk::ui::EquipTarget touchTarget;
-                if (dusk::ui::get_equip_target(i, touchTarget)) {
-                    initSizeX = touchTarget.width;
-                    initSizeY = touchTarget.height;
-                    initScaleX = 1.0f;
-                    initScaleY = 1.0f;
-                    pos.x = touchTarget.left;
-                    pos.y = touchTarget.top;
-                    pos.z = 0.0f;
-                } else {
-                    CPaneMgr* meterItemPane = dMeter2Info_getMeterItemPanePtr(i);
-                    if (meterItemPane == NULL) {
-                        continue;
-                    }
-                    initSizeX = meterItemPane->getInitSizeX() * 1.7f;
-                    initSizeY = meterItemPane->getInitSizeY() * 1.7f;
-                    initScaleX = meterItemPane->getInitScaleX();
-                    initScaleY = meterItemPane->getInitScaleY();
-                    pos = meterItemPane->getGlobalVtxCenter(meterItemPane->mPane, true, 0);
-                }
-#else
                 f32 initSizeX = dMeter2Info_getMeterItemPanePtr(i)->getInitSizeX() * 1.7f;
                 f32 initSizeY = dMeter2Info_getMeterItemPanePtr(i)->getInitSizeY() * 1.7f;
                 f32 initScaleX = dMeter2Info_getMeterItemPanePtr(i)->getInitScaleX();
                 f32 initScaleY = dMeter2Info_getMeterItemPanePtr(i)->getInitScaleY();
                 Vec pos = dMeter2Info_getMeterItemPanePtr(i)->getGlobalVtxCenter(
                     dMeter2Info_getMeterItemPanePtr(i)->mPane, true, 0);
-#endif
 
 #if TARGET_PC
                 f32 fVar14 = 0.1f + 0.8f * u;

src/d/d_menu_save.cpp

@@ -18,15 +18,11 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
 #include "d/d_msg_scrn_explain.h"
+#include "dusk/frame_interpolation.h"
+#include "dusk/settings.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "f_op/f_op_msg_mng.h"
 
-#if TARGET_PC
-#include "dusk/frame_interpolation.h"
-#include "dusk/menu_pointer.h"
-#include "dusk/settings.h"
-#endif
-
 static int SelStartFrameTbl[3] = {
     59,
     99,
@@ -58,17 +54,6 @@ static int YnSelStartFrameTbl[2][2] = {
 
 static int YnSelEndFrameTbl[2][2] = {{2138, 3171}, {2150, 3181}};
 
-#if TARGET_PC
-namespace {
-constexpr u8 pointer_target(u8 group, u8 index) noexcept {
-    return static_cast<u8>((group << 4) | (index & 0x0F));
-}
-
-constexpr u8 s_pointerSaveSelectTarget = 0;
-constexpr u8 s_pointerYesNoSelectTarget = 1;
-}  // namespace
-#endif
-
 static dMs_HIO_c g_msHIO;
 
 dMs_HIO_c::dMs_HIO_c() {
@@ -1781,12 +1766,6 @@ void dMenu_save_c::openSaveSelect3() {
 
 void dMenu_save_c::saveSelect() {
     if (!mDoRst::isReset()) {
-#if TARGET_PC
-        if (pointerSaveSelect()) {
-            return;
-        }
-#endif
-
         stick->checkTrigger();
 
         if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -1813,84 +1792,7 @@ void dMenu_save_c::saveSelect() {
     }
 }
 
-#if TARGET_PC
-bool dMenu_save_c::pointerSaveSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Save);
-    for (u8 i = 0; i < 3; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mpSelData[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked = dusk::menu_pointer::consume_click();
-        if (mSelectedFile != i) {
-            mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, NULL, 0, 0);
-            mLastSelFile = mSelectedFile;
-            mSelectedFile = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::Save,
-                    pointer_target(s_pointerSaveSelectTarget, i));
-            }
-            dataSelectAnmSet();
-            mMenuProc = PROC_SAVE_SELECT_MOVE_ANM;
-            return true;
-        }
-        if (clicked) {
-            saveSelectStart();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool dMenu_save_c::pointerYesNoSelect(bool errorSelect, u8 errParam, u8 soundParam) {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Save);
-    for (u8 i = 0; i < 2; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mpNoYes[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked =
-            (!errorSelect || mYesNoCursor == i) && dusk::menu_pointer::consume_click();
-        if (mYesNoCursor != i) {
-            if (errorSelect) {
-                errCurMove(errParam, soundParam);
-                return false;
-            }
-            mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0);
-            mYesNoPrevCursor = mYesNoCursor;
-            mYesNoCursor = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::Save,
-                    pointer_target(s_pointerYesNoSelectTarget, i));
-            }
-            yesnoSelectAnmSet(0);
-            mMenuProc = PROC_YES_NO_CURSOR_MOVE_ANM;
-            return true;
-        }
-        if (clicked) {
-            if (errorSelect) {
-                if (mYesNoCursor != CURSOR_NO) {
-                    if (soundParam == 0) {
-                        mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
-                    }
-                } else if (soundParam == 0) {
-                    mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0);
-                }
-                mSelIcon->setAlphaRate(0.0f);
-            } else {
-                yesnoSelectStart();
-            }
-            return true;
-        }
-    }
-    return false;
-}
-#endif
-
 void dMenu_save_c::saveSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::Save);
-#endif
     mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
     selectDataMoveAnmInitSet(SelOpenStartFrameTbl[mSelectedFile],
                              SelOpenEndFrameTbl[mSelectedFile]);
@@ -1949,17 +1851,6 @@ void dMenu_save_c::dataSelectAnmSet() {
 }
 
 void dMenu_save_c::saveSelectMoveAnime() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Save);
-    if (mSelectedFile != 0xFF &&
-        dusk::menu_pointer::hit_pane(mpSelData[mSelectedFile], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::Save,
-            pointer_target(s_pointerSaveSelectTarget, mSelectedFile));
-    }
-#endif
     bool bookWakuAnmComplete = true;
     bool selWakuAnmComplete = true;
     bool var_r29 = true;
@@ -2009,26 +1900,12 @@ void dMenu_save_c::saveSelectMoveAnime() {
         if (mLastSelFile != 0xFF) {
             mpSelData[mLastSelFile]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL);
         }
-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::Save,
-                pointer_target(s_pointerSaveSelectTarget, mSelectedFile))) {
-            saveSelectStart();
-            return;
-        }
-#endif
         mMenuProc = PROC_SAVE_SELECT;
     }
 }
 
 void dMenu_save_c::saveYesNoSelect() {
     if (!mDoRst::isReset()) {
-#if TARGET_PC
-        if (pointerYesNoSelect(false)) {
-            return;
-        }
-#endif
-
         stick->checkTrigger();
 
         if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -2056,9 +1933,6 @@ void dMenu_save_c::saveYesNoSelect() {
 }
 
 void dMenu_save_c::yesnoSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::Save);
-#endif
     if (mYesNoCursor != CURSOR_NO) {
         mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
         mSelIcon->setAlphaRate(0.0f);
@@ -2127,30 +2001,11 @@ void dMenu_save_c::yesnoSelectAnmSet(u8 param_0) {
 }
 
 void dMenu_save_c::yesNoCursorMoveAnm() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Save);
-    if (mYesNoCursor != 0xFF &&
-        dusk::menu_pointer::hit_pane(mpNoYes[mYesNoCursor], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::Save,
-            pointer_target(s_pointerYesNoSelectTarget, mYesNoCursor));
-    }
-#endif
     bool selAnmComplete = yesnoSelectMoveAnm(0);
     bool wakuAnmComplete = yesnoWakuAlpahAnm(mYesNoPrevCursor);
 
     if (selAnmComplete == true && wakuAnmComplete == true) {
         yesnoCursorShow();
-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::Save,
-                pointer_target(s_pointerYesNoSelectTarget, mYesNoCursor))) {
-            yesnoSelectStart();
-            return;
-        }
-#endif
         mMenuProc = PROC_SAVE_YES_NO_SELECT;
     }
 }
@@ -2326,12 +2181,6 @@ bool dMenu_save_c::errYesNoSelect(u8 param_0, u8 param_1) {
         return false;
     }
 
-#if TARGET_PC
-    if (pointerYesNoSelect(true, param_0, param_1)) {
-        return true;
-    }
-#endif
-
     stick->checkTrigger();
 
     if (mDoCPd_c::getTrigA(PAD_1)) {

src/d/d_menu_skill.cpp

@@ -18,10 +18,6 @@
 #include "m_Do/m_Do_graphic.h"
 #include <cstring>
 
-#if TARGET_PC
-#include "dusk/menu_pointer.h"
-#endif
-
 typedef void (dMenu_Skill_c::*initFunc)();
 static initFunc map_init_process[] = {
     &dMenu_Skill_c::wait_init,
@@ -279,12 +275,6 @@ void dMenu_Skill_c::wait_init() {
 void dMenu_Skill_c::wait_move() {
     u8 oldIndex = mIndex;
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
-#if TARGET_PC
-        if (pointerWait()) {
-            return;
-        }
-#endif
-
         if (mDoCPd_c::getTrigB(PAD_1) != 0) {
             mpDrawCursor->offPlayAnime(0);
             mStatus = 3;
@@ -309,34 +299,6 @@ void dMenu_Skill_c::wait_move() {
     }
 }
 
-#if TARGET_PC
-bool dMenu_Skill_c::pointerWait() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Collection);
-    for (u8 i = 0; i < mSkillNum; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mpLetterParent[i], 8.0f)) {
-            continue;
-        }
-
-        if (mIndex != i) {
-            mIndex = i;
-            changeActiveColor();
-            Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_ITEM, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-        }
-        if (dusk::menu_pointer::consume_click()) {
-            mProcess = PROC_WAIT_MOVE;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            dMeter2Info_set2DVibration();
-            return true;
-        }
-        return false;
-    }
-
-    return false;
-}
-#endif
-
 void dMenu_Skill_c::read_open_init() {
     static const u32 i_id[7] = {
         1716, 1715, 1717, 1718, 1719, 1720, 1721,

src/d/d_meter2.cpp

@@ -663,15 +663,8 @@ void dMeter2_c::moveLife() {
         draw_life = true;
     }
 
-#if TARGET_PC
-    const f32 lifeGaugeScale =
-        g_drawHIO.mLifeParentScale *
-        std::clamp(dusk::getSettings().game.hudScale.getValue(), 0.5f, 2.0f);
-#else
-    const f32 lifeGaugeScale = g_drawHIO.mLifeParentScale;
-#endif
-    if (mLifeGaugeScale != lifeGaugeScale) {
-        mLifeGaugeScale = lifeGaugeScale;
+    if (mLifeGaugeScale != g_drawHIO.mLifeParentScale) {
+        mLifeGaugeScale = g_drawHIO.mLifeParentScale;
         draw_life = true;
     }
 
@@ -2973,15 +2966,7 @@ void dMeter2_c::alphaAnimeButtonCross() {
             field_0x190++;
         }
     } else {
-#if TARGET_PC
-        if (dusk::getSettings().game.enableTouchControls) {
-            mpMeterDraw->setAlphaButtonCrossAnimeMin();
-        } else {
-            mpMeterDraw->setAlphaButtonCrossAnimeMax();
-        }
-#else
         mpMeterDraw->setAlphaButtonCrossAnimeMax();
-#endif
 
         if (field_0x190 < 5) {
             field_0x190++;

src/d/d_meter2_draw.cpp

@@ -23,40 +23,6 @@
 #include "dusk/frame_interpolation.h"
 #include <cstring>
 
-#if TARGET_PC
-#include "dusk/settings.h"
-#include "dusk/ui/icon_provider.hpp"
-#include <algorithm>
-
-namespace {
-
-// Reads the user HUD scale setting, clamped to a safe range.
-f32 dGetUserHudScale() {
-    return std::clamp(dusk::getSettings().game.hudScale.getValue(), 0.5f, 2.0f);
-}
-
-// The screen corner each HUD group is anchored to. A pane scales around its own origin,
-// so without correction it drifts away from the screen edge; this names the corner that
-// must stay put.
-enum class HudCorner { TopLeft, TopRight, BottomLeft, BottomRight };
-
-// Adds the paneTrans offset that keeps i_corner pinned in place while the user HUD scale
-// grows or shrinks the pane. The shift is half the change in size pushed toward the
-// anchor corner, so it depends only on the pane's size (not its on-screen position) and
-// works whether the HUD is scaled down or up. i_pull < 1 applies a partial horizontal
-// push for a pane whose content sits inset from its box edge (the heart row).
-void dAnchorHudScale(CPaneMgr* i_pane, HudCorner i_corner, f32* io_x, f32* io_y, f32 i_pull = 1.0f) {
-    const f32 half = (1.0f - dGetUserHudScale()) * 0.5f;
-    const f32 dirX =
-        (i_corner == HudCorner::TopRight || i_corner == HudCorner::BottomRight) ? 1.0f : -1.0f;
-    const f32 dirY =
-        (i_corner == HudCorner::BottomLeft || i_corner == HudCorner::BottomRight) ? 1.0f : -1.0f;
-    *io_x += dirX * i_pane->getInitSizeX() * half * i_pull;
-    *io_y += dirY * i_pane->getInitSizeY() * half;
-}
-
-}  // namespace
-#endif
 dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
     OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n");
 
@@ -570,12 +536,6 @@ void dMeter2Draw_c::init() {
 }
 
 void dMeter2Draw_c::exec(u32 i_status) {
-#if TARGET_PC
-    // n_all keeps the vanilla scale. Scaling the root pane shrinks every child toward
-    // its centred origin; per-child scaling in each drawXxx() path keeps each HUD group
-    // anchored to its own pane origin and also pulls it toward the screen corner.
-    const f32 userHudScale = dGetUserHudScale();
-#endif
     if (mParentScale != g_drawHIO.mParentScale) {
         mParentScale = g_drawHIO.mParentScale;
         mpParent->scale(g_drawHIO.mParentScale, g_drawHIO.mParentScale);
@@ -586,39 +546,6 @@ void dMeter2Draw_c::exec(u32 i_status) {
         mpParent->setAlphaRate(g_drawHIO.mParentAlpha);
     }
 
-#if TARGET_PC
-    if (i_status & 0x1000000) {
-        f32 ringPosX = g_drawHIO.mRingHUDButtonsPosX;
-        f32 ringPosY = g_drawHIO.mRingHUDButtonsPosY;
-        dAnchorHudScale(mpButtonParent, HudCorner::TopRight, &ringPosX, &ringPosY);
-        if (mButtonsPosX != ringPosX || mButtonsPosY != ringPosY) {
-            mButtonsPosX = ringPosX;
-            mButtonsPosY = ringPosY;
-            mpButtonParent->paneTrans(ringPosX, ringPosY);
-        }
-
-        const f32 ringButtonsScale = g_drawHIO.mRingHUDButtonsScale * userHudScale;
-        if (mButtonsScale != ringButtonsScale) {
-            mButtonsScale = ringButtonsScale;
-            mpButtonParent->scale(ringButtonsScale, ringButtonsScale);
-        }
-    } else {
-        f32 mainPosX = g_drawHIO.mMainHUDButtonsPosX;
-        f32 mainPosY = g_drawHIO.mMainHUDButtonsPosY;
-        dAnchorHudScale(mpButtonParent, HudCorner::TopRight, &mainPosX, &mainPosY);
-        if (mButtonsPosX != mainPosX || mButtonsPosY != mainPosY) {
-            mButtonsPosX = mainPosX;
-            mButtonsPosY = mainPosY;
-            mpButtonParent->paneTrans(mainPosX, mainPosY);
-        }
-
-        const f32 mainButtonsScale = g_drawHIO.mMainHUDButtonsScale * userHudScale;
-        if (mButtonsScale != mainButtonsScale) {
-            mButtonsScale = mainButtonsScale;
-            mpButtonParent->scale(mainButtonsScale, mainButtonsScale);
-        }
-    }
-#else
     if (i_status & 0x1000000) {
         if (mButtonsPosX != g_drawHIO.mRingHUDButtonsPosX ||
             mButtonsPosY != g_drawHIO.mRingHUDButtonsPosY)
@@ -647,36 +574,20 @@ void dMeter2Draw_c::exec(u32 i_status) {
             mpButtonParent->scale(g_drawHIO.mMainHUDButtonsScale, g_drawHIO.mMainHUDButtonsScale);
         }
     }
-#endif
 }
 
 void dMeter2Draw_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     graf_ctx->setup2D();
 
-#if TARGET_PC
-    const bool touchControlsEnabled = dusk::getSettings().game.enableTouchControls;
-    if (touchControlsEnabled) {
-        mpButtonParent->hide();
-    } else {
-        mpButtonParent->show();
-    }
-#endif
-
     mpScreen->draw(0.0f, 0.0f, graf_ctx);
     drawKanteraScreen(1);
     drawKanteraScreen(2);
 
-#if TARGET_PC
-    if (!touchControlsEnabled) {
-#endif
     for (int i = 0; i < 2; i++) {
         if (mpItemXY[i] != NULL) {
             for (int j = 0; j < 3; j++) {
                 f32 temp_f30 = mItemParams[i].num_scale * 16.0f;
-#if TARGET_PC
-                temp_f30 *= dGetUserHudScale();
-#endif
 
                 Vec vtx0 = mpItemXY[i]->getPanePtr()->getGlbVtx(0);
                 Vec vtx3 = mpItemXY[i]->getPanePtr()->getGlbVtx(3);
@@ -718,9 +629,6 @@ void dMeter2Draw_c::draw() {
             }
         }
     }
-#if TARGET_PC
-    }
-#endif
 
     if (mpLightDropParent->getAlphaRate() != 0.0f) {
         f32 var_f28 = g_drawHIO.mLightDrop.mPikariScaleNormal;
@@ -803,11 +711,7 @@ void dMeter2Draw_c::draw() {
         }
     }
 
-#if TARGET_PC
-    if (!touchControlsEnabled && field_0x738 > 0.0f) {
-#else
     if (field_0x738 > 0.0f) {
-#endif
         drawPikari(mpButtonMidona, &field_0x738, g_drawHIO.mMidnaIconPikariScale,
                    g_drawHIO.mMidnaIconPikariFrontOuter, g_drawHIO.mMidnaIconPikariFrontInner,
                    g_drawHIO.mMidnaIconPikariBackOuter, g_drawHIO.mMidnaIconPikariBackInner,
@@ -1574,12 +1478,7 @@ void dMeter2Draw_c::drawLife(s16 i_maxLife, s16 i_life, f32 i_posX, f32 i_posY)
         }
     }
 
-#if TARGET_PC
-    const f32 lifeParentScale = g_drawHIO.mLifeParentScale * dGetUserHudScale();
-    mpLifeParent->scale(lifeParentScale, lifeParentScale);
-#else
     mpLifeParent->scale(g_drawHIO.mLifeParentScale, g_drawHIO.mLifeParentScale);
-#endif
 
     for (int i = 0; i < 20; i++) {
         mpHeartMark[i]->scale(g_drawHIO.mHeartMarkScale, g_drawHIO.mHeartMarkScale);
@@ -1589,16 +1488,7 @@ void dMeter2Draw_c::drawLife(s16 i_maxLife, s16 i_life, f32 i_posX, f32 i_posY)
         mpBigHeart->scale(g_drawHIO.mBigHeartScale, g_drawHIO.mBigHeartScale);
     }
 
-#if TARGET_PC
-    f32 lifePosX = i_posX;
-    f32 lifePosY = i_posY;
-    // The heart row sits inset from its box's left edge, so use a partial horizontal pull
-    // to keep it from jamming against the screen edge.
-    dAnchorHudScale(mpLifeParent, HudCorner::TopLeft, &lifePosX, &lifePosY, 0.6f);
-    mpLifeParent->paneTrans(lifePosX, lifePosY);
-#else
     mpLifeParent->paneTrans(i_posX, i_posY);
-#endif
 }
 
 void dMeter2Draw_c::setAlphaLifeChange(bool param_0) {
@@ -1711,22 +1601,9 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) {
     mpMagicMeter->resize(field_0x584[i_meterType], field_0x590[i_meterType]);
     mpMagicFrameR->move(field_0x59c[i_meterType], field_0x5a8[i_meterType]);
     mpMagicBase->resize(field_0x5b4[i_meterType], field_0x5c0[i_meterType]);
-#if TARGET_PC
-    const f32 magicUserScale = dGetUserHudScale();
-    mpMagicParent->scale(field_0x5cc[i_meterType] * magicUserScale,
-                         field_0x5d8[i_meterType] * magicUserScale);
-
-    f32 magicPosX = field_0x5e4[i_meterType];
-    f32 magicPosY = field_0x5f0[i_meterType];
-    // The oil/magic bar sits inset within its pane box, so use a reduced horizontal pull
-    // (like the heart row) to keep it from overshooting off the left edge when shrunk.
-    dAnchorHudScale(mpMagicParent, HudCorner::TopLeft, &magicPosX, &magicPosY, 0.3f);
-    mpMagicParent->paneTrans(magicPosX, magicPosY);
-#else
     mpMagicParent->scale(field_0x5cc[i_meterType], field_0x5d8[i_meterType]);
 
     mpMagicParent->paneTrans(field_0x5e4[i_meterType], field_0x5f0[i_meterType]);
-#endif
 
     mpKanteraScreen->draw(0.0f, 0.0f, graf_ctx);
 }
@@ -1990,21 +1867,10 @@ void dMeter2Draw_c::drawLightDrop(u8 i_num, u8 i_needNum, f32 i_posX, f32 i_posY
 
     field_0x6fc = param_5;
     mLightDropVesselScale = i_vesselScale;
-#if TARGET_PC
-    const f32 lightDropUserScale = dGetUserHudScale();
-    const f32 lightDropScale = mLightDropVesselScale * field_0x6f8 * lightDropUserScale;
-    mpLightDropParent->scale(lightDropScale, lightDropScale);
-
-    f32 lightDropPosX = i_posX;
-    f32 lightDropPosY = i_posY;
-    dAnchorHudScale(mpLightDropParent, HudCorner::TopRight, &lightDropPosX, &lightDropPosY);
-    mpLightDropParent->paneTrans(lightDropPosX, lightDropPosY);
-#else
     mpLightDropParent->scale(mLightDropVesselScale * field_0x6f8,
                              mLightDropVesselScale * field_0x6f8);
 
     mpLightDropParent->paneTrans(i_posX, i_posY);
-#endif
 }
 
 void dMeter2Draw_c::setAlphaLightDropChange(bool unused) {}
@@ -2077,13 +1943,8 @@ void dMeter2Draw_c::setAlphaLightDropAnimeMax() {
             field_0x6f8 = 1.0f;
         }
 
-#if TARGET_PC
-        const f32 dropAnimScale = mLightDropVesselScale * field_0x6f8 * dGetUserHudScale();
-        mpLightDropParent->scale(dropAnimScale, dropAnimScale);
-#else
         mpLightDropParent->scale(mLightDropVesselScale * field_0x6f8,
                                  mLightDropVesselScale * field_0x6f8);
-#endif
 
         if (g_drawHIO.mLightDrop.mDropGetScaleAnimFrameNum == mpLightDropParent->getAlphaTimer()) {
             dMeter2Info_setLightDropGetFlag(dComIfGp_getStartStageDarkArea(), 0xFF);
@@ -2154,22 +2015,10 @@ void dMeter2Draw_c::drawRupee(s16 i_rupeeNum) {
     static_cast<J2DPicture*>(mpRupeeTexture[0][0]->getPanePtr())->changeTexture(timg, 0);
     static_cast<J2DPicture*>(mpRupeeTexture[0][1]->getPanePtr())->changeTexture(timg, 0);
 
-#if TARGET_PC
-    const f32 rupeeKeyUserScale = dGetUserHudScale();
-    const f32 rupeeKeyScale = g_drawHIO.mRupeeKeyScale * field_0x718 * rupeeKeyUserScale;
-    mpRupeeKeyParent->scale(rupeeKeyScale, rupeeKeyScale);
-
-    f32 rupeeKeyPosX = g_drawHIO.mRupeeKeyPosX;
-    f32 rupeeKeyPosY = g_drawHIO.mRupeeKeyPosY;
-    // Rupees/keys read better anchored to the bottom-right corner than the top-right.
-    dAnchorHudScale(mpRupeeKeyParent, HudCorner::BottomRight, &rupeeKeyPosX, &rupeeKeyPosY);
-    mpRupeeKeyParent->paneTrans(rupeeKeyPosX, rupeeKeyPosY);
-#else
     mpRupeeKeyParent->scale(g_drawHIO.mRupeeKeyScale * field_0x718,
                             g_drawHIO.mRupeeKeyScale * field_0x718);
 
     mpRupeeKeyParent->paneTrans(g_drawHIO.mRupeeKeyPosX, g_drawHIO.mRupeeKeyPosY);
-#endif
 
     mpRupeeParent[0]->scale(g_drawHIO.mRupeeScale, g_drawHIO.mRupeeScale);
     mpRupeeParent[0]->paneTrans(g_drawHIO.mRupeePosX, g_drawHIO.mRupeePosY);
@@ -2288,18 +2137,8 @@ void dMeter2Draw_c::drawKey(s16 i_keyNum) {
         }
     }
 
-#if TARGET_PC
-    const f32 keyScale = g_drawHIO.mKeyScale * dGetUserHudScale();
-    mpKeyParent->scale(keyScale, keyScale);
-
-    f32 keyPosX = g_drawHIO.mKeyPosX;
-    f32 keyPosY = g_drawHIO.mKeyPosY;
-    dAnchorHudScale(mpKeyParent, HudCorner::BottomRight, &keyPosX, &keyPosY);
-    mpKeyParent->paneTrans(keyPosX, keyPosY);
-#else
     mpKeyParent->scale(g_drawHIO.mKeyScale, g_drawHIO.mKeyScale);
     mpKeyParent->paneTrans(g_drawHIO.mKeyPosX, g_drawHIO.mKeyPosY);
-#endif
 }
 
 void dMeter2Draw_c::setAlphaKeyChange(bool param_0) {
@@ -2472,11 +2311,6 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
         SAFE_STRCPY(static_cast<J2DTextBox*>(mpBText[i]->getPanePtr())->getStringPtr(), mp_string);
     }
 
-#if TARGET_PC
-    if (dusk::getSettings().game.enableTouchControls) {
-        mpScreen->search(MULTI_CHAR('item_b_n'))->hide();
-    } else
-#endif
     if (i_action == 0x26 || i_action == 0x2E) {
         mpScreen->search(MULTI_CHAR('item_b_n'))->show();
         var_r31 = 1;
@@ -2754,12 +2588,6 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_
             mpTextXY[i_no]->scale(g_drawHIO.mButtonXYTextScale, g_drawHIO.mButtonXYTextScale);
             mpTextXY[i_no]->paneTrans(g_drawHIO.mButtonXYTextPosX, g_drawHIO.mButtonXYTextPosY);
         }
-
-#if TARGET_PC
-        if (dusk::getSettings().game.enableTouchControls) {
-            mpScreen->search(tag[i_no])->hide();
-        }
-#endif
     }
 }
 
@@ -2768,24 +2596,11 @@ f32 dMeter2Draw_c::getButtonCrossParentInitTransY() {
 }
 
 void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) {
-#if TARGET_PC
-    const f32 buttonCrossUserScale = dGetUserHudScale();
-    const f32 buttonCrossScale = g_drawHIO.mButtonCrossScale * buttonCrossUserScale;
-    mpButtonCrossParent->scale(buttonCrossScale, buttonCrossScale);
-#else
     mpButtonCrossParent->scale(g_drawHIO.mButtonCrossScale, g_drawHIO.mButtonCrossScale);
-#endif
     mpTextI->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale);
     mpTextM->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale);
 
-#if TARGET_PC
-    f32 buttonCrossPosX = i_posX;
-    f32 buttonCrossPosY = i_posY;
-    dAnchorHudScale(mpButtonCrossParent, HudCorner::TopLeft, &buttonCrossPosX, &buttonCrossPosY);
-    mpButtonCrossParent->paneTrans(buttonCrossPosX, buttonCrossPosY);
-#else
     mpButtonCrossParent->paneTrans(i_posX, i_posY);
-#endif
 }
 
 void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() {
@@ -3325,10 +3140,6 @@ void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) {
     }
 
     mpButtonXY[2]->setAlpha(255.0f * field_0x724 * temp_f30_2);
-
-#if TARGET_PC
-    dusk::ui::update_midna_icon_texture(mpButtonMidona != NULL ? mpButtonMidona->getPanePtr() : NULL);
-#endif
 }
 
 void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool unused2) {
@@ -3694,16 +3505,9 @@ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
     Vec vtx0 = pane->getPanePtr()->getGlbVtx(0);
     Vec vtx3 = pane->getPanePtr()->getGlbVtx(3);
 
-#if TARGET_PC
-    const f32 oilUserScale = dGetUserHudScale();
-    mpKanteraMeter[i_button]->setPos(((vtx0.x + vtx3.x) * 0.5f) + 9.0f * oilUserScale + sp10[i_button],
-                                     vtx3.y + sp8[i_button]);
-    mpKanteraMeter[i_button]->setScale(0.6f * oilUserScale, 0.6f * oilUserScale);
-#else
     mpKanteraMeter[i_button]->setPos(((vtx0.x + vtx3.x) * 0.5f) + 9.0f + sp10[i_button],
                                      vtx3.y + sp8[i_button]);
     mpKanteraMeter[i_button]->setScale(0.6f, 0.6f);
-#endif
     mpKanteraMeter[i_button]->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil());
     mpKanteraMeter[i_button]->setAlphaRate(i_alphaRate);
 }

src/d/d_meter_map.cpp

@@ -16,16 +16,8 @@
 #include "f_op/f_op_overlap_mng.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "d/d_camera.h"
-#if TARGET_PC
-#include "dusk/settings.h"
-#include <algorithm>
-#endif
 #include <cstring>
 
-#if TARGET_PC
-#include "dusk/action_bindings.h"
-#endif
-
 #if (PLATFORM_WII || PLATFORM_SHIELD)
 dMeter_map_HIO_c g_meter_mapHIO;
 #endif
@@ -543,12 +535,6 @@ void dMeterMap_c::_move(u32 param_0) {
     }
     #endif
 
-#if TARGET_PC
-    if (mMap->refreshTextureSize()) {
-        mMapJ2DPicture->changeTexture(mMap->getResTIMGPointer(), 0);
-    }
-#endif
-
     int stayNo = dComIfGp_roomControl_getStayNo();
 
     field_0x14 = param_0;
@@ -635,16 +621,8 @@ void dMeterMap_c::draw() {
         mMapJ2DPicture->setAlpha(alpha);
 
         #if TARGET_PC
-        // Scale the minimap with the user HUD scale and shift down so its bottom-left
-        // corner stays anchored to the same screen position as at scale 1.0.
-        const f32 userHudScale =
-            std::clamp(dusk::getSettings().game.hudScale.getValue(), 0.5f, 2.0f);
-        const f32 scaledSizeX = sizeX * userHudScale;
-        const f32 scaledSizeY = sizeY * userHudScale;
-        const f32 mapBottomShift = sizeY - scaledSizeY;
-        mMapJ2DPicture->draw(mDoGph_gInf_c::ScaleHUDXLeft(drawPosX),
-                             drawPosY + mapBottomShift, scaledSizeX, scaledSizeY,
-                             false, false, false);
+        mMapJ2DPicture->draw(mDoGph_gInf_c::ScaleHUDXLeft(drawPosX), drawPosY, sizeX, sizeY, false,
+                             false, false);
         #else
         mMapJ2DPicture->draw(drawPosX, drawPosY, sizeX, sizeY, false, false, false);
         #endif
@@ -742,38 +720,7 @@ void dMeterMap_c::ctrlShowMap() {
                 }
             }
 
-        }
-#if TARGET_PC
-        else if (!isEventRunCheck() &&
-                 (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1) &&
-                 !dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen()) &&
-                 dusk::getActionBindTrig(dusk::ActionBinds::OPEN_MAP_SCREEN, PAD_1))
-        {
-            dMeter2Info_setMapStatus(2);
-            dMeter2Info_setMapKeyDirection(0x400);
-            Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                        -1.0f, 0);
-            dMeter2Info_set2DVibration();
-        } else if (!isEventRunCheck() &&
-                   (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1) &&
-                   isEnableDispMapAndMapDispSizeTypeNo() &&
-                   dusk::getActionBindTrig(dusk::ActionBinds::TOGGLE_MINIMAP, PAD_1))
-        {
-            if (isDispPosInsideFlg()) {
-                setDispPosOutsideFlg_SE_On();
-                Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_CLOSE_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                         -1.0f, 0);
-                dMeter2Info_setMapStatus(0);
-            } else {
-                setDispPosInsideFlg_SE_On();
-                Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                         -1.0f, 0);
-                dMeter2Info_set2DVibration();
-                dMeter2Info_setMapStatus(1);
-            }
-        }
-#endif
-        else if (!mDoCPd_c::getTrigUp(PAD_1) && !mDoCPd_c::getTrigDown(PAD_1)) {
+        } else if (!mDoCPd_c::getTrigUp(PAD_1) && !mDoCPd_c::getTrigDown(PAD_1)) {
             keyCheck();
         }
 
@@ -868,21 +815,7 @@ void dMeterMap_c::meter_map_move(u32 param_0) {
                 dMeter2Info_set2DVibration();
             }
             dMeter2Info_resetPauseStatus();
-        }
-#if TARGET_PC
-        else if (!dComIfGp_event_runCheck() && !dMsgObject_isTalkNowCheck() &&
-                 (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1) &&
-                 !dMeter2Info_isSub2DStatus(1) && (isFmapScreen() || isDmapScreen()) &&
-                 dusk::getActionBindTrig(dusk::ActionBinds::OPEN_MAP_SCREEN, PAD_1))
-        {
-            dMeter2Info_setMapStatus(2);
-            dMeter2Info_setMapKeyDirection(0x400);
-            Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_OPEN_S, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                        -1.0f, 0);
-            dMeter2Info_set2DVibration();
-        }
-#endif
-        else if (
+        } else if (
             #if DEBUG
             dMw_RIGHT_TRIGGER() &&
             #else