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

# Conflicts: # CMakeLists.txt # src/dusk/config.cpp
2026-07-12 21:45:19 -04:00 · 2026-06-25 22:29:50 -07:00 · 2026-06-06 09:44:35 -06:00 · 2026-05-31 16:36:13 +02:00 · 2026-05-31 16:35:28 +02:00 · 2026-05-31 16:23:01 +02:00
389 changed files with 3671 additions and 65053 deletions
@@ -53,3 +53,5 @@ compile_commands.json
 pipeline_cache.bin

 extract
+
+*.dusk
@@ -6,12 +6,12 @@
            "type": "cppvsdbg",
            "request": "launch",
            "program": "${command:cmake.launchTargetPath}",
-            "args": ["-l", "1", "--dvd", "${workspaceRoot}/orig/GZ2E01/GZ2E01.iso", "--console"],
+            "args": ["-l", "1", "--dvd", "${workspaceRoot}/orig/GZ2E01/GZ2E01.iso", "--console", "--mods", "${workspaceRoot}/mods"],
            "MIMode": "gdb",
            "miDebuggerPath": "gdb",
            "symbolSearchPath": "${command:cmake.launchTargetPath}",
            "console": "integratedTerminal",
-            "cwd":"${workspaceRoot}"
+            "cwd":"${workspaceRoot}",
        }
    ]
 }
@@ -21,26 +21,26 @@ else ()
    find_package(Git)
 if (GIT_FOUND)
    # make sure version information gets re-run when the current Git HEAD changes
-    execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --git-path HEAD
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --git-path HEAD
            OUTPUT_VARIABLE dusk_git_head_filename
            OUTPUT_STRIP_TRAILING_WHITESPACE)
    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${dusk_git_head_filename}")

-    execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name HEAD
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name HEAD
            OUTPUT_VARIABLE dusk_git_head_symbolic
            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
            COMMAND ${GIT_EXECUTABLE} rev-parse --git-path ${dusk_git_head_symbolic}
            OUTPUT_VARIABLE dusk_git_head_symbolic_filename
            OUTPUT_STRIP_TRAILING_WHITESPACE)
    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${dusk_git_head_symbolic_filename}")

    # defines DUSK_WC_REVISION
-    execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
            OUTPUT_VARIABLE DUSK_WC_REVISION
            OUTPUT_STRIP_TRAILING_WHITESPACE)
    # defines DUSK_WC_DESCRIBE
-    execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --tags --long --dirty --match "v*"
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --tags --long --dirty --match "v*"
            OUTPUT_VARIABLE DUSK_WC_DESCRIBE
            OUTPUT_STRIP_TRAILING_WHITESPACE)

@@ -49,11 +49,11 @@ if (GIT_FOUND)
    string(REGEX REPLACE "-0$" "" DUSK_WC_DESCRIBE "${DUSK_WC_DESCRIBE}")

    # defines DUSK_WC_BRANCH
-    execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
            OUTPUT_VARIABLE DUSK_WC_BRANCH
            OUTPUT_STRIP_TRAILING_WHITESPACE)
    # defines DUSK_WC_DATE
-    execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} log -1 --format=%ad
+    execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} log -1 --format=%ad
            OUTPUT_VARIABLE DUSK_WC_DATE
            OUTPUT_STRIP_TRAILING_WHITESPACE)
 else ()
@@ -211,7 +211,7 @@ if (DUSK_MOVIE_SUPPORT)
            -DWITH_JAVA=OFF
        )
        if (CMAKE_TOOLCHAIN_FILE)
-            get_filename_component(_jpeg_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE BASE_DIR "${CMAKE_SOURCE_DIR}")
+            get_filename_component(_jpeg_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
            list(APPEND _jpeg_cmake_args -DCMAKE_TOOLCHAIN_FILE=${_jpeg_toolchain_file})
        endif ()
        set(_jpeg_passthrough_vars
@@ -292,14 +292,42 @@ FetchContent_Declare(cxxopts
    URL https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.3.1.tar.gz
    URL_HASH SHA256=3bfc70542c521d4b55a46429d808178916a579b28d048bd8c727ee76c39e2072
    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    EXCLUDE_FROM_ALL
 )
 message(STATUS "dusklight: Fetching nlohmann/json")
 FetchContent_Declare(json
    URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
    URL_HASH SHA256=42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa
    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    EXCLUDE_FROM_ALL
 )
-FetchContent_MakeAvailable(cxxopts json)
+
+message(STATUS "dusk: Fetching miniz")
+FetchContent_Declare(miniz
+    URL https://github.com/richgel999/miniz/releases/download/3.0.2/miniz-3.0.2.zip
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+    EXCLUDE_FROM_ALL
+)
+
+message(STATUS "dusk: Fetching funchook")
+# cmake/patch_funchook.cmake patches funchook's cmake/capstone.cmake.in to inject a
+# PATCH_COMMAND into capstone's inner ExternalProject. That PATCH_COMMAND runs
+# cmake/fix_capstone_policy.cmake after capstone is cloned, which removes the
+# cmake_policy(SET CMP0048 OLD) line that CMake >= 3.27 rejects.
+# This is incredibly scuffed and we should probably think of a better way to do this
+set(CAPSTONE_FIX_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/fix_capstone_policy.cmake")
+FetchContent_Declare(funchook
+    GIT_REPOSITORY https://github.com/kubo/funchook.git
+    GIT_TAG v1.1.3
+    GIT_SHALLOW TRUE
+    GIT_PROGRESS TRUE
+    PATCH_COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=<SOURCE_DIR> -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/patch_funchook.cmake
+    EXCLUDE_FROM_ALL
+)
+set(FUNCHOOK_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(FUNCHOOK_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+set(FUNCHOOK_INSTALL OFF CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(cxxopts json miniz funchook)

 if (DUSK_ENABLE_SENTRY_NATIVE)
    message(STATUS "dusklight: Fetching sentry-native")
@@ -347,7 +375,7 @@ else ()
    string(TOLOWER CMAKE_SYSTEM_NAME PLATFORM_NAME)
 endif ()

-configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_BINARY_DIR}/version.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)

 include(files.cmake)

@@ -372,12 +400,20 @@ set(GAME_INCLUDE_DIRS
    libs/JSystem/include
    libs
    extern/aurora/include/dolphin
+    extern/aurora/include
    extern
-    ${CMAKE_BINARY_DIR})
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${miniz_SOURCE_DIR})
+
+# Interface target for mods and sub-projects to inherit game headers/defines
+add_library(dusklight_game_headers INTERFACE)
+target_include_directories(dusklight_game_headers INTERFACE ${GAME_INCLUDE_DIRS})
+target_compile_definitions(dusklight_game_headers INTERFACE TARGET_PC=1)
+target_link_libraries(dusklight_game_headers INTERFACE TracyClient)

 find_package(Threads REQUIRED)
 set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::pad aurora::mtx aurora::os aurora::dvd
-    aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt
+    aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt funchook-static
    Threads::Threads zstd::libzstd)

 if (DUSK_ENABLE_SENTRY_NATIVE)
@@ -437,8 +473,6 @@ if (DUSK_MOVIE_SUPPORT)
    list(APPEND GAME_COMPILE_DEFS MOVIE_SUPPORT=1)
 endif ()

-include(src/dusk/randomizer/randomizer.cmake)
-
 set(DUSK_ENABLE_DISCORD_DEFAULT ON)
 if (DEFINED DUSK_ENABLE_DISCORD_RPC AND NOT DEFINED DUSK_ENABLE_DISCORD)
    set(DUSK_ENABLE_DISCORD_DEFAULT ${DUSK_ENABLE_DISCORD_RPC})
@@ -452,6 +486,16 @@ if(ANDROID)
    list(APPEND GAME_COMPILE_DEFS TARGET_ANDROID=1)
 endif ()

+set(DUSK_ENABLE_CODE_MODS_DEFAULT OFF)
+option(DUSK_ENABLE_CODE_MODS "Enable code mods" ${DUSK_ENABLE_CODE_MODS_DEFAULT})
+if (DUSK_ENABLE_CODE_MODS)
+    if (NOT ANDROID AND NOT IOS AND NOT TVOS)
+        list(APPEND GAME_COMPILE_DEFS DUSK_CODE_MODS=1)
+    else ()
+        message(FATAL_ERROR "Code mods not supported on the target platform!")
+    endif ()
+endif ()
+
 if (DUSK_PACKAGE_INSTALL)
    include(GNUInstallDirs)
    list(APPEND GAME_COMPILE_DEFS DUSK_ASSET_DIR="${CMAKE_INSTALL_FULL_DATADIR}/dusklight/")
@@ -479,7 +523,6 @@ set_source_files_properties(
        COMPILE_DEFINITIONS "$<$<CONFIG:Debug>:DEBUG=1>;$<$<CONFIG:Debug>:PARTIAL_DEBUG=1>"
 )

-# game_base is for all other game code files
 set(GAME_BASE_FILES
        ${DOLZEL_FILES}
        ${Z2AUDIOLIB_FILES}
@@ -496,6 +539,7 @@ set_source_files_properties(
 foreach(jsystem_lib IN LISTS JSYSTEM_LIBRARIES)
    target_compile_definitions(${jsystem_lib} PRIVATE
            ${GAME_COMPILE_DEFS}
+            DUSK_BUILDING_GAME=1
            $<$<CONFIG:Debug>:DEBUG=1>
            $<$<CONFIG:Debug>:PARTIAL_DEBUG=1>
    )
@@ -511,42 +555,61 @@ if (CMAKE_CXX_LINK_GROUP_USING_RESCAN_SUPPORTED OR CMAKE_LINK_GROUP_USING_RESCAN
    set(JSYSTEM_LINK_LIBRARIES "$<LINK_GROUP:RESCAN,${JSYSTEM_LIBRARIES}>")
 endif ()

-set(DUSK_FILES src/dusk/main.cpp ${GAME_BASE_FILES} ${GAME_DEBUG_FILES})
+set(DUSK_FILES src/dusk/main.cpp ${GAME_BASE_FILES} ${GAME_DEBUG_FILES} ${miniz_SOURCE_DIR}/miniz.c)
 if(ANDROID)
    add_library(dusklight SHARED ${DUSK_FILES})
    set_target_properties(dusklight PROPERTIES OUTPUT_NAME main)
-else ()
-    add_executable(dusklight ${DUSK_FILES})
-endif ()
-if (ENABLE_ASAN)
-    target_sources(dusklight PRIVATE src/dusk/asan_options.c)
-endif ()
+    set(DUSK_MAIN_TARGET dusklight)
+elseif(WIN32)
+    add_library(dusklight_game SHARED ${DUSK_FILES})
+    set_target_properties(dusklight_game PROPERTIES
+            WINDOWS_EXPORT_ALL_SYMBOLS ${DUSK_ENABLE_CODE_MODS}
+            OUTPUT_NAME dusklight
+            PDB_NAME dusklight_game)

-# Add embedded data to target
-
-file(GLOB_RECURSE RANDOMIZER_DATA "src/dusk/randomizer/generator/data/*")
-file(GLOB_RECURSE RANDOMIZER_ASSETS "src/dusk/randomizer/assets/*")
-list(APPEND RANDOMIZER_DATA ${RANDOMIZER_ASSETS})
-set(RANDO_ROOT_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
-foreach (RANDOMIZER_FILE IN LISTS RANDOMIZER_DATA)
-    file(RELATIVE_PATH REL_PATH ${RANDO_ROOT_DATA_DIR} ${RANDOMIZER_FILE})
-    if(REL_PATH MATCHES "^src/dusk/randomizer/generator/data/tests")
-        message(STATUS "Skipping Embed: ${REL_PATH}")
-        continue()
+    # rmlui_core uses its own PCH which creates a duplicate PCH marker symbol when linked
+    # Disabling rmlui's PCH removes the conflicting marker and lets the link succeed
+    if (MSVC AND TARGET rmlui_core AND DUSK_ENABLE_CODE_MODS)
+        set_target_properties(rmlui_core PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
    endif ()

-    message(STATUS "Embedding File: ${REL_PATH}")
-    b_embed(dusklight ${REL_PATH})
-endforeach ()
+    add_executable(dusklight WIN32 src/dusk/launcher_win32.cpp)
+    target_link_libraries(dusklight PRIVATE dusklight_game)
+    target_include_directories(dusklight PRIVATE include)
+    set(DUSK_MAIN_TARGET dusklight_game)
+else ()
+    add_executable(dusklight ${DUSK_FILES})
+    set(DUSK_MAIN_TARGET dusklight)
+endif ()
+if (ENABLE_ASAN)
+    target_sources(${DUSK_MAIN_TARGET} PRIVATE src/dusk/asan_options.c)
+endif ()
+
+if (WIN32 AND TARGET imgui)
+    target_compile_definitions(imgui PRIVATE "IMGUI_API=__declspec(dllexport)")
+    target_sources(${DUSK_MAIN_TARGET} PRIVATE $<TARGET_OBJECTS:imgui>)
+endif ()
+
+target_compile_definitions(${DUSK_MAIN_TARGET} PRIVATE ${GAME_COMPILE_DEFS} DUSK_BUILDING_GAME=1)
+target_include_directories(${DUSK_MAIN_TARGET} PRIVATE ${GAME_INCLUDE_DIRS})
+target_link_libraries(${DUSK_MAIN_TARGET} PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
+target_precompile_headers(${DUSK_MAIN_TARGET} PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_LIST_DIR}/include/dusk_pch.hpp>")
+
+if(WIN32)
+    target_link_libraries(${DUSK_MAIN_TARGET} PRIVATE Psapi)
+endif()
+if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    target_link_libraries(${DUSK_MAIN_TARGET} PRIVATE dl)
+endif()
+if(APPLE)
+    target_link_options(${DUSK_MAIN_TARGET} PRIVATE -Wl,-export_dynamic)
+elseif(UNIX AND NOT ANDROID)
+    target_link_options(${DUSK_MAIN_TARGET} PRIVATE -rdynamic)
+endif()

-target_compile_definitions(dusklight PRIVATE ${GAME_COMPILE_DEFS})
-target_include_directories(dusklight PRIVATE ${GAME_INCLUDE_DIRS})
-target_link_libraries(dusklight PRIVATE aurora::main ${GAME_LIBS} ${JSYSTEM_LINK_LIBRARIES})
-target_precompile_headers(dusklight PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")
 if (TARGET crashpad_handler)
-    add_dependencies(dusklight crashpad_handler)
-    add_custom_command(TARGET dusklight POST_BUILD
+    add_dependencies(${DUSK_MAIN_TARGET} crashpad_handler)
+    add_custom_command(TARGET ${DUSK_MAIN_TARGET} POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E copy_if_different
            "$<TARGET_FILE:crashpad_handler>"
            "$<TARGET_FILE_DIR:dusklight>"
@@ -557,7 +620,7 @@ endif ()
 if (ANDROID)
    # SDLActivity loads SDL_main via dlsym on Android. Since aurora::main is a static
    # archive, force an undefined reference so the linker keeps the SDL_main object.
-    target_link_options(dusklight PRIVATE "-Wl,-u,SDL_main")
+    target_link_options(${DUSK_MAIN_TARGET} PRIVATE "-Wl,-u,SDL_main")
 endif ()

 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
@@ -567,7 +630,7 @@ endif ()
 if (NOT APPLE)
    add_custom_command(TARGET dusklight POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CMAKE_SOURCE_DIR}/res"
+            "${CMAKE_CURRENT_SOURCE_DIR}/res"
            "$<TARGET_FILE_DIR:dusklight>/res"
        COMMENT "Copying resources"
    )
@@ -595,13 +658,13 @@ if (WIN32)
    configure_file(${DUSK_WINDOWS_RESOURCE_DIR}/dusklight.rc.in ${DUSK_WINDOWS_RC} @ONLY)

    target_sources(dusklight PRIVATE ${DUSK_WINDOWS_ICON_ICO} ${DUSK_WINDOWS_RC})
-    set_target_properties(dusklight PROPERTIES WIN32_EXECUTABLE TRUE)
-
    if (MSVC)
        target_link_options(dusklight PRIVATE /MANIFEST:NO)
    endif ()
 endif ()

+include(cmake/DuskModSDK.cmake)
+
 if (APPLE)
    if (IOS)
        set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ios)
@@ -609,6 +672,7 @@ if (APPLE)
        set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/tvos)
    else ()
        set(DUSK_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/platforms/macos)
+        set(DUSK_ENTITLEMENTS ${DUSK_RESOURCE_DIR}/Dusk.entitlements)
    endif ()
    set(DUSK_INFO_PLIST ${DUSK_RESOURCE_DIR}/Info.plist.in)
    file(GLOB_RECURSE DUSK_RESOURCE_FILES
@@ -639,6 +703,8 @@ if (APPLE)
        OUTPUT_NAME Dusklight
        XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "YES"
        XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
+        XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${DUSK_ENTITLEMENTS}
+        XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME "YES"
    )
 endif ()

@@ -658,7 +724,11 @@ if (IOS)
 endif ()

 include(extern/aurora/cmake/AuroraCopyRuntimeDLLs.cmake)
-aurora_copy_runtime_dlls(dusklight)
+if(WIN32)
+    aurora_copy_runtime_dlls(dusklight dusklight_game)
+else()
+    aurora_copy_runtime_dlls(dusklight)
+endif()

 if (DUSK_SELECTED_OPT)
    if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
@@ -697,15 +767,33 @@ function(get_target_prefix target result_var)
    endif ()
 endfunction()
 list(APPEND BINARY_TARGETS dusklight)
+if(WIN32)
+    list(APPEND BINARY_TARGETS dusklight_game)
+endif()
 set(EXTRA_TARGETS "")
 if (TARGET crashpad_handler)
    list(APPEND EXTRA_TARGETS crashpad_handler)
 endif ()
-if (DUSK_PACKAGE_INSTALL)
+if (WIN32)
+    # Install the launcher and game DLL, but skip the DLL import library.
+    if (DUSK_PACKAGE_INSTALL)
+        install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}
+            BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
+        )
+    else ()
+        install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}
+            BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}
+        )
+    endif ()
+elseif (DUSK_PACKAGE_INSTALL)
    install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_BINDIR})
-else()
+else ()
    install(TARGETS ${BINARY_TARGETS} ${EXTRA_TARGETS} DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif()
+endif ()
 aurora_install_runtime_dlls(dusklight ${CMAKE_INSTALL_PREFIX})
 if (NOT APPLE)
    if (DUSK_PACKAGE_INSTALL)
@@ -763,3 +851,7 @@ foreach (target IN LISTS BINARY_TARGETS)
        endif ()
    endforeach ()
 endforeach ()
+
+if (DUSK_ENABLE_CODE_MODS)
+    add_subdirectory(tools/mod_test)
+endif ()
@@ -20,17 +20,31 @@ It aims to be as accurate as possible to the original while also providing new o
 > Dusklight does *not* provide any copyrighted assets. You must provide your own copy of the original game.

 > [!IMPORTANT]
-> At a minimum, Dusklight requires a GPU with support for D3D12, Vulkan 1.1+, or Metal. For older devices, best-effort support is provided for D3D11 and OpenGL ES (Android), but will not achieve full accuracy or performance. Your experience with specific hardware, operating systems, and drivers may vary.
+> At a minimum, Dusklight requires a GPU with support for either D3D12, Vulkan, or Metal. Your experience with specific hardware, operating systems, and drivers may vary. In particular, older Intel iGPUs have a high likelihood of incompatibility. We are also aware of a number of issues on devices with Adreno GPUs and are working to resolve them.

 ### 1. Dump your game

-You must dump your own copy of the game. Please see [this article](https://wiki.dolphin-emu.org/index.php?title=Ripping_Games) for instructions. After dumping, you can use a program like [Dolphin](https://dolphin-emu.org/) or [nodtool](https://github.com/encounter/nod/releases) to convert the `.iso` to `.rvz` to save space.
+You must dump your own copy of the game, please see [this article](https://wiki.dolphin-emu.org/index.php?title=Ripping_Games) for instructions. After dumping, you can use a program like [Dolphin](https://dolphin-emu.org/) or [nodtool](https://github.com/encounter/nod/releases) to convert the `.iso` to a `.rvz` to save space.

 Currently, only the GameCube USA and EUR releases are supported. Support for other versions of the game is planned in the future.

-### 2. Install Dusklight
+### 2. Download [Dusklight](https://github.com/TwilitRealm/dusklight/releases)

-Visit the [official installation guide](https://twilitrealm.dev/install/) for full instructions.
+### 3. Setup the game
+**Windows / macOS / Linux**
+- Extract the .zip file
+- Launch Dusklight
+- Press **Select Disc Image** and provide the path to your supported game dump
+- Press **Play**!
+
+**iOS**
+- Follow the [iOS setup guide](docs/ios-install-altstore.md)
+
+**Android**
+- Install the Dusklight APK
+- Launch Dusklight
+- Press **Select Disc Image** and provide the path to your supported game dump
+- Press **Play**!

 # Building

@@ -0,0 +1,49 @@
+# add_dusk_mod(<target> SOURCES <file>... MOD_JSON <mod.json> [RES_DIR <res>])
+set(DUSK_MODS_OUTPUT_DIR "${CMAKE_SOURCE_DIR}/mods" CACHE PATH "Directory to write .dusk packages into")
+
+function(add_dusk_mod target_name)
+    cmake_parse_arguments(ARG "" "MOD_JSON;RES_DIR" "SOURCES" ${ARGN})
+    if(NOT ARG_MOD_JSON)
+        message(FATAL_ERROR "add_dusk_mod: MOD_JSON is required")
+    endif()
+
+    add_library(${target_name} SHARED ${ARG_SOURCES})
+    set_target_properties(${target_name} PROPERTIES PREFIX "" WINDOWS_EXPORT_ALL_SYMBOLS ON)
+    target_compile_features(${target_name} PRIVATE cxx_std_20)
+    target_link_libraries(${target_name} PRIVATE dusklight_game_headers)
+
+    if(APPLE)
+        target_link_options(${target_name} PRIVATE -undefined dynamic_lookup)
+    elseif(UNIX)
+        target_link_options(${target_name} PRIVATE -Wl,--allow-shlib-undefined)
+    elseif(WIN32)
+        target_link_libraries(${target_name} PRIVATE dusklight_game)
+        if(MSVC)
+            target_link_options(${target_name} PRIVATE /INCREMENTAL:NO)
+            set_target_properties(${target_name} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        endif()
+    endif()
+
+
+    set(_stage "${CMAKE_CURRENT_BINARY_DIR}/${target_name}_stage")
+    set(_out   "${DUSK_MODS_OUTPUT_DIR}/${target_name}.dusk")
+    file(MAKE_DIRECTORY "${_stage}")  # must exist before POST_BUILD on Windows
+
+    set(_zip_args "$<TARGET_FILE_NAME:${target_name}>" mod.json)
+    set(_extra_cmds "")
+    if(ARG_RES_DIR)
+        list(APPEND _zip_args res)
+        set(_extra_cmds COMMAND ${CMAKE_COMMAND} -E copy_directory
+                "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_RES_DIR}" "${_stage}/res")
+    endif()
+
+    add_custom_command(TARGET ${target_name} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${_stage}" "${DUSK_MODS_OUTPUT_DIR}"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${target_name}>" "${_stage}/$<TARGET_FILE_NAME:${target_name}>"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_MOD_JSON}" "${_stage}/mod.json"
+        ${_extra_cmds}
+        COMMAND ${CMAKE_COMMAND} -E tar cvf "${_out}" --format=zip ${_zip_args}
+        WORKING_DIRECTORY "${_stage}"
+        COMMENT "Packaging ${target_name} -> ${_out}"
+    )
+endfunction()
@@ -0,0 +1,13 @@
+# Patches capstone's CMakeLists.txt for compatibility with CMake >= 4.0:
+#   - Bumps cmake_minimum_required to 3.10 (CMake >= 4.0 dropped < 3.5 support; < 3.10 warns)
+#   - Removes cmake_policy(SET CMP0048 OLD) (rejected by CMake >= 3.27)
+file(READ "${DIR}/CMakeLists.txt" _content)
+string(REGEX REPLACE
+    "cmake_minimum_required[ \t]*\\([ \t]*VERSION[ \t]+[0-9]+\\.[0-9]+(\\.[0-9]+)?[ \t]*\\)"
+    "cmake_minimum_required(VERSION 3.10)"
+    _content "${_content}")
+string(REGEX REPLACE
+    "cmake_policy[ \t]*\\([ \t]*SET[ \t]+CMP0048[ \t]+OLD[ \t]*\\)"
+    "# cmake_policy(SET CMP0048 OLD)"
+    _content "${_content}")
+file(WRITE "${DIR}/CMakeLists.txt" "${_content}")
@@ -0,0 +1,11 @@
+file(READ "${SOURCE_DIR}/cmake/capstone.cmake.in" _content)
+
+# Insert PATCH_COMMAND before CONFIGURE_COMMAND in the ExternalProject_Add.
+# Bracket args prevent cmake from substituting ${...} while writing this file.
+string(REPLACE
+    "    CONFIGURE_COMMAND \"\""
+    [=[    PATCH_COMMAND "${CMAKE_COMMAND}" -DDIR=${CMAKE_CURRENT_BINARY_DIR}/capstone-src -P "${CAPSTONE_FIX_SCRIPT}"
+    CONFIGURE_COMMAND ""]=]
+    _content "${_content}")
+
+file(WRITE "${SOURCE_DIR}/cmake/capstone.cmake.in" "${_content}")
@@ -0,0 +1,351 @@
+# Dusk Mod API
+
+Mods are shared libraries packaged into a `.dusk` zip archive. The loader scans the `mods/` directory at startup, extracts each library, and calls your exports each frame.
+
+## Table of Contents
+
+1. [Getting Started](#getting-started)
+2. [mod.json](#modjson)
+3. [Required Exports](#required-exports)
+4. [DuskModAPI Reference](#duskmodapi-reference)
+5. [Logging](#logging)
+6. [Loading Resources](#loading-resources)
+7. [ImGui Integration](#imgui-integration)
+8. [Hooking Game Functions](#hooking-game-functions)
+   - [Pre-hooks](#pre-hooks)
+   - [Post-hooks](#post-hooks)
+   - [Replace hooks](#replace-hooks)
+   - [Reading and writing arguments](#reading-and-writing-arguments)
+9. [Inter-Mod Communication](#inter-mod-communication)
+10. [Full Example](#full-example)
+
+---
+
+## Getting Started
+
+Fork the [mod template](../tools/mod_template/), it is a self-contained CMake project that references dusk as a subdirectory.
+
+```
+my_mod/
+├── CMakeLists.txt
+├── mod.json
+├── src/mod.cpp
+└── res/ (optional bundled resources)
+```
+
+**CMakeLists.txt:**
+
+```cmake
+cmake_minimum_required(VERSION 3.25)
+project(my_mod CXX)
+
+set(DUSK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dusk" CACHE PATH "Path to dusk source root")
+add_subdirectory("${DUSK_DIR}" dusk EXCLUDE_FROM_ALL)
+
+add_dusk_mod(my_mod
+    SOURCES  src/mod.cpp
+    MOD_JSON mod.json
+    RES_DIR  res    # optional
+)
+```
+
+After building, `my_mod.dusk` is placed in `mods/` next to the project root (`DUSK_MODS_OUTPUT_DIR` cache variable). Copy it to the game's `mods/` folder and launch.
+
+- Windows: `%APPDATA%\TwilitRealm\Dusk\mods`
+- Linux: `~/.local/share/TwilitRealm/Dusk/mods`
+- macOS: `~/Library/Application Support/TwilitRealm/Dusk/mods`
+
+The `.dusk` archive is a standard zip containing `mod.json`, the compiled library, and an optional `res/` tree. `add_dusk_mod()` creates it automatically.
+
+---
+
+## mod.json
+
+```json
+{
+    "name":        "My Mod",
+    "version":     "1.0.0",
+    "author":      "Your Name",
+    "description": "A short description shown in the mod manager."
+}
+```
+
+All fields are optional but recommended. `name` falls back to the filename, `version` to `"?"`.
+
+---
+
+## Required Exports
+
+```cpp
+#include "dusk/mod_api.h"
+
+DUSK_REQUIRE_API_VERSION  // declares mod_api_version; loader rejects the mod if the engine is older
+
+extern "C" {
+
+void mod_init   (DuskModAPI* api);  // required, called once at startup
+void mod_tick   (DuskModAPI* api);  // required, called every frame
+void mod_cleanup(DuskModAPI* api);  // optional, called on shutdown
+
+}
+```
+
+`DUSK_REQUIRE_API_VERSION` is optional but recommended. When present, the loader will refuse to initialize the mod if its API version doesn't exactly match the engine's.
+
+---
+
+## DuskModAPI Reference
+
+The `api` pointer is valid for the lifetime of the mod. When using `hook.hpp`, call `dusk::init(api)` once and `dusk::g_api` is set for you.
+
+| Field | Description |
+|-------|-------------|
+| `api_version` | ABI version, check against `DUSK_MOD_API_VERSION` if needed |
+| `mod_dir` | Absolute path to the extracted mod cache directory |
+| `log_info` / `log_warn` / `log_error` | `printf`-style logging, prefixed with the mod name |
+| `load_resource` / `free_resource` | Load files from the `res/` tree in the `.dusk` archive |
+| `register_tab_content` | Add a panel to the mod manager's per-mod tab |
+| `register_menu_item` | Add an item to the quick-access menu |
+| `hook_dispatch_pre` / `hook_dispatch_post` | Called by the trampoline, do not call directly |
+| `service_publish` | Register a named pointer in the global service registry |
+| `service_get` | Look up a named pointer registered by another mod |
+
+---
+
+## Logging
+
+```cpp
+api->log_info("Player health: %d", hp);
+api->log_warn("Something looks wrong");
+api->log_error("Fatal: %s", msg);
+```
+
+Output appears in the dusk console as `[My Mod] ...`
+
+The format string is `printf`-compatible.
+
+---
+
+## Loading Resources
+
+```cpp
+size_t size = 0;
+void* data = api->load_resource("config.txt", &size);
+if (data) {
+    std::string text(static_cast<char*>(data), size);
+    api->free_resource(data);
+}
+```
+
+- Path is relative to `res/`, pass `"config.txt"` not `"res/config.txt"`
+- Always call `free_resource`, the buffer is owned by miniz
+- For writable storage, write files under `api->mod_dir`
+
+---
+
+## ImGui Integration
+
+**Tab content:** shown in the mod's panel in the Mods window, called every frame while visible:
+
+```cpp
+static void DrawPanel(void* userdata) {
+    ImGui::Text("Hello!");
+}
+api->register_tab_content(DrawPanel, nullptr);
+```
+
+Pass a pointer through `userdata` if your callback needs state:
+
+```cpp
+api->register_tab_content(DrawPanel, &g_state);
+```
+
+**Menu items:** added to the quick-access menu. Use `ImGui::MenuItem`, `ImGui::Separator`, etc.:
+
+```cpp
+static void DrawMenuEntry(void*) {
+    if (ImGui::MenuItem("Reset rotation")) { ... }
+}
+api->register_menu_item(DrawMenuEntry, nullptr);
+```
+
+---
+
+## Hooking Game Functions
+
+Call `dusk::init(api)` first.
+
+```cpp
+#include "dusk/hook.hpp"
+
+extern "C" void mod_init(DuskModAPI* api) {
+    dusk::init(api);
+    dusk::hookAddPre<&ClassName::Method>(callback);
+}
+```
+
+The trampoline is installed once per address. Multiple mods can register pre/post callbacks for the same function independently.
+
+### Pre-hooks
+
+Run before the original. Return `0` to let it proceed, non-zero to cancel it. Post-hooks still run either way.
+
+```cpp
+static int32_t on_posMove_pre(void* args) {
+    daAlink_c* link = dusk::arg<daAlink_c*>(args, 0);  // this
+    if (link->shape_angle.y > 10000)
+        return 1;  // cancel
+    return 0;
+}
+dusk::hookAddPre<&daAlink_c::posMove>(on_posMove_pre);
+```
+
+### Post-hooks
+
+Run after the original (or replace-hook).
+
+```cpp
+static void on_posMove_post(void* args) {
+    daAlink_c* link = dusk::arg<daAlink_c*>(args, 0);
+    dusk::g_api->log_info("New Y angle: %d", (int)link->shape_angle.y);
+}
+dusk::hookAddPost<&daAlink_c::posMove>(on_posMove_post);
+```
+
+### Replace hooks
+
+Completely substitutes the original. Only one replace-hook per function, a second install overwrites with a warning.
+
+```cpp
+static void on_posMove_replace(void* args) {
+    daAlink_c* link = dusk::arg<daAlink_c*>(args, 0);
+    link->shape_angle.y += 100;
+}
+dusk::hookSetReplace<&daAlink_c::posMove>(on_posMove_replace);
+```
+
+To call the original from inside a replace-hook:
+
+```cpp
+using Entry = dusk::HookEntry<&daAlink_c::posMove>;
+
+static void on_posMove_replace(void* args) {
+    daAlink_c* link = dusk::arg<daAlink_c*>(args, 0);
+    link->shape_angle.y = 0;
+    Entry::g_orig(link);
+}
+```
+
+### Reading and writing arguments
+
+`args` is a `void*[N]` array. Index `0` is `this`, subsequent indices are parameters in declaration order.
+
+```cpp
+T   value = dusk::arg   <T>(args, n);  // copy
+T&  ref   = dusk::argRef<T>(args, n);  // reference (read/write)
+```
+
+**Example:** halve incoming damage
+
+```cpp
+// void daEnemy_c::takeDamage(int amount, daActor_c* source)
+static int32_t on_takeDamage_pre(void* args) {
+    dusk::argRef<int>(args, 1) /= 2;
+    return 0;
+}
+dusk::hookAddPre<&daEnemy_c::takeDamage>(on_takeDamage_pre);
+```
+
+For reference parameters (e.g. `const cXyz& pos`), use `argRef<cXyz>` to get a direct reference.
+
+
+---
+
+## Inter-Mod Communication
+
+Mods can expose a public API to each other through a global service registry. The convention for names is `"mod_name/service_name"`.
+
+**Mod A — publishing:**
+
+```cpp
+struct MyModAPI {
+    void (*do_thing)(int value);
+};
+
+static void my_do_thing(int value) { ... }
+static MyModAPI g_api = { my_do_thing };
+
+extern "C" void mod_init(DuskModAPI* api) {
+    api->service_publish("my_mod/api", &g_api);
+}
+```
+
+**Mod B — consuming:**
+
+```cpp
+#include "my_mod_api.h"
+
+static MyModAPI* g_my_mod = nullptr;
+
+extern "C" void mod_init(DuskModAPI* api) {
+    g_my_mod = static_cast<MyModAPI*>(api->service_get("my_mod/api"));
+}
+```
+
+---
+
+## Full Example
+
+```cpp
+#include "d/actor/d_a_alink.h"
+#include "dusk/hook.hpp"
+#include "dusk/mod_api.h"
+#include "imgui.h"
+#include "m_Do/m_Do_controller_pad.h"
+
+static int g_ticks = 0;
+
+static int32_t on_posMove_pre(void* args) {
+    daAlink_c* link = dusk::arg<daAlink_c*>(args, 0);
+    if (mDoCPd_c::getHoldR(PAD_1)) {
+        link->shape_angle.y -= 2048;
+    }
+    return 0;
+}
+
+static void DrawPanel(void*) {
+    daAlink_c* link = daAlink_getAlinkActorClass();
+    ImGui::Text("Ticks: %d", g_ticks);
+    if (link) {
+        ImGui::Text("Y angle: %d", (int)link->shape_angle.y);
+        if (ImGui::Button("Reset rotation")) {
+            link->shape_angle.y = 0;
+        }
+    }
+}
+
+static void DrawMenuEntry(void*) {
+    daAlink_c* link = daAlink_getAlinkActorClass();
+    if (ImGui::MenuItem("Reset rotation", nullptr, false, link != nullptr)) {
+        link->shape_angle.y = 0;
+    }
+}
+
+extern "C" {
+
+void mod_init(DuskModAPI* api) {
+    dusk::init(api);
+    dusk::hookAddPre<&daAlink_c::posMove>(on_posMove_pre);
+    api->register_tab_content(DrawPanel, nullptr);
+    api->register_menu_item(DrawMenuEntry, nullptr);
+}
+
+void mod_tick(DuskModAPI* api) {
+    ++g_ticks;
+}
+
+void mod_cleanup(DuskModAPI* api) {
+    api->log_info("Unloaded after %d ticks.", g_ticks);
+}
+}
+```
@@ -1464,9 +1464,6 @@ set(DUSK_FILES
        src/dusk/imgui/ImGuiBloomWindow.hpp
        src/dusk/imgui/ImGuiMenuTools.cpp
        src/dusk/imgui/ImGuiMenuTools.hpp
-        src/dusk/imgui/ImGuiMenuRandomizer.cpp
-        src/dusk/imgui/ImGuiMenuRandomizer.hpp
-        src/dusk/imgui/ImGuiArchipelagoDebug.cpp
        src/dusk/imgui/ImGuiActorSpawner.cpp
        src/dusk/imgui/ImGuiProcessOverlay.cpp
        src/dusk/imgui/ImGuiCameraOverlay.cpp
@@ -1487,8 +1484,6 @@ set(DUSK_FILES
        src/dusk/ui/controls.hpp
        src/dusk/ui/controller_config.cpp
        src/dusk/ui/controller_config.hpp
-        src/dusk/ui/cosmetics.hpp
-        src/dusk/ui/cosmetics.cpp
        src/dusk/ui/document.cpp
        src/dusk/ui/document.hpp
        src/dusk/ui/editor.cpp
@@ -1512,6 +1507,8 @@ set(DUSK_FILES
        src/dusk/ui/pane.hpp
        src/dusk/ui/menu_bar.cpp
        src/dusk/ui/menu_bar.hpp
+        src/dusk/ui/mods_window.cpp
+        src/dusk/ui/mods_window.hpp
        src/dusk/ui/prelaunch.cpp
        src/dusk/ui/prelaunch.hpp
        src/dusk/ui/preset.cpp
@@ -1538,12 +1535,6 @@ set(DUSK_FILES
        src/dusk/ui/warp.hpp
        src/dusk/ui/window.cpp
        src/dusk/ui/window.hpp
-        src/dusk/ui/rando_config.cpp
-        src/dusk/ui/rando_config.hpp
-        src/dusk/ui/rando_seed_generation.cpp
-        src/dusk/ui/rando_seed_generation.hpp
-        src/dusk/ui/archi_connect_modal.cpp
-        src/dusk/ui/archi_connect_modal.hpp
        src/dusk/achievements.cpp
        src/dusk/iso_validate.cpp
        src/dusk/livesplit.cpp
@@ -1552,105 +1543,20 @@ set(DUSK_FILES
        src/dusk/OSReport.cpp
        src/dusk/OSThread.cpp
        src/dusk/OSMutex.cpp
+        src/dusk/hook_system.cpp
+        src/dusk/modding/mod_loader.cpp
+        src/dusk/modding/mod_loader_api.cpp
+        src/dusk/modding/mod_loader_overlay.cpp
+        src/dusk/modding/native_module.cpp
+        src/dusk/modding/native_module.hpp
+        src/dusk/modding/bundle_disk.cpp
+        src/dusk/modding/bundle_zip.cpp
+        src/dusk/gx_helper.cpp
        src/dusk/discord.cpp
        src/dusk/discord.hpp
        src/dusk/discord_presence.cpp
        src/dusk/version.cpp
        src/dusk/action_bindings.cpp
-        src/dusk/cosmetics/color_utils.hpp
-        src/dusk/cosmetics/color_utils.cpp
-        src/dusk/cosmetics/texture_utils.hpp
-        src/dusk/cosmetics/texture_utils.cpp
-        # Randomizer files
-        src/dusk/randomizer/game/flags.cpp
-        src/dusk/randomizer/game/flags.h
-        src/dusk/randomizer/game/messages.cpp
-        src/dusk/randomizer/game/messages.hpp
-        src/dusk/randomizer/game/stages.cpp
-        src/dusk/randomizer/game/stages.h
-        src/dusk/randomizer/game/tools.cpp
-        src/dusk/randomizer/game/tools.h
-        src/dusk/randomizer/game/verify_item_functions.cpp
-        src/dusk/randomizer/game/verify_item_functions.h
-        src/dusk/randomizer/game/randomizer_context.cpp
-        src/dusk/randomizer/game/randomizer_context.hpp
-        src/dusk/randomizer/generator/logic/area.cpp
-        src/dusk/randomizer/generator/logic/area.hpp
-        src/dusk/randomizer/generator/logic/dungeon.cpp
-        src/dusk/randomizer/generator/logic/dungeon.hpp
-        src/dusk/randomizer/generator/logic/entrance.cpp
-        src/dusk/randomizer/generator/logic/entrance.hpp
-        src/dusk/randomizer/generator/logic/entrance_shuffle.cpp
-        src/dusk/randomizer/generator/logic/entrance_shuffle.hpp
-        src/dusk/randomizer/generator/logic/fill.cpp
-        src/dusk/randomizer/generator/logic/fill.hpp
-        src/dusk/randomizer/generator/logic/flatten/bits.cpp
-        src/dusk/randomizer/generator/logic/flatten/bits.hpp
-        src/dusk/randomizer/generator/logic/flatten/flatten.cpp
-        src/dusk/randomizer/generator/logic/flatten/flatten.hpp
-        src/dusk/randomizer/generator/logic/flatten/simplify_algebraic.cpp
-        src/dusk/randomizer/generator/logic/flatten/simplify_algebraic.hpp
-        src/dusk/randomizer/generator/logic/hints.cpp
-        src/dusk/randomizer/generator/logic/hints.hpp
-        src/dusk/randomizer/generator/logic/item.cpp
-        src/dusk/randomizer/generator/logic/item.hpp
-        src/dusk/randomizer/generator/logic/item_pool.cpp
-        src/dusk/randomizer/generator/logic/item_pool.hpp
-        src/dusk/randomizer/generator/logic/location.cpp
-        src/dusk/randomizer/generator/logic/location.hpp
-        src/dusk/randomizer/generator/logic/plandomizer.cpp
-        src/dusk/randomizer/generator/logic/plandomizer.hpp
-        src/dusk/randomizer/generator/logic/requirement.cpp
-        src/dusk/randomizer/generator/logic/requirement.hpp
-        src/dusk/randomizer/generator/logic/search.cpp
-        src/dusk/randomizer/generator/logic/search.hpp
-        src/dusk/randomizer/generator/logic/spoiler_log.cpp
-        src/dusk/randomizer/generator/logic/spoiler_log.hpp
-        src/dusk/randomizer/generator/logic/world.cpp
-        src/dusk/randomizer/generator/logic/world.hpp
-        src/dusk/randomizer/generator/randomizer.cpp
-        src/dusk/randomizer/generator/randomizer.hpp
-        src/dusk/randomizer/generator/seedgen/config.cpp
-        src/dusk/randomizer/generator/seedgen/config.hpp
-        src/dusk/randomizer/generator/seedgen/packed_bits.hpp
-        src/dusk/randomizer/generator/seedgen/seed.cpp
-        src/dusk/randomizer/generator/seedgen/seed.hpp
-        src/dusk/randomizer/generator/seedgen/settings.cpp
-        src/dusk/randomizer/generator/seedgen/settings.hpp
-        src/dusk/randomizer/generator/test/test.cpp
-        src/dusk/randomizer/generator/test/test.hpp
-        src/dusk/randomizer/generator/utility/base64pp.hpp
-        src/dusk/randomizer/generator/utility/color.cpp
-        src/dusk/randomizer/generator/utility/color.hpp
-        src/dusk/randomizer/generator/utility/crc32.hpp
-        src/dusk/randomizer/generator/utility/common.cpp
-        src/dusk/randomizer/generator/utility/common.hpp
-        src/dusk/randomizer/generator/utility/container.hpp
-        src/dusk/randomizer/generator/utility/endian.cpp
-        src/dusk/randomizer/generator/utility/endian.hpp
-        src/dusk/randomizer/generator/utility/exception.hpp
-        src/dusk/randomizer/generator/utility/file.cpp
-        src/dusk/randomizer/generator/utility/file.hpp
-        src/dusk/randomizer/generator/utility/general.hpp
-        src/dusk/randomizer/generator/utility/log.cpp
-        src/dusk/randomizer/generator/utility/log.hpp
-        src/dusk/randomizer/generator/utility/math.hpp
-        src/dusk/randomizer/generator/utility/path.cpp
-        src/dusk/randomizer/generator/utility/path.hpp
-        src/dusk/randomizer/generator/utility/platform.cpp
-        src/dusk/randomizer/generator/utility/platform.hpp
-        src/dusk/randomizer/generator/utility/random.cpp
-        src/dusk/randomizer/generator/utility/random.hpp
-        src/dusk/randomizer/generator/utility/string.cpp
-        src/dusk/randomizer/generator/utility/string.hpp
-        src/dusk/randomizer/generator/utility/text.cpp
-        src/dusk/randomizer/generator/utility/text.hpp
-        src/dusk/randomizer/generator/utility/thread_local.hpp
-        src/dusk/randomizer/generator/utility/time.cpp
-        src/dusk/randomizer/generator/utility/time.hpp
-        src/dusk/randomizer/generator/utility/yaml.hpp
-        # Archipelago Files
-        src/dusk/archipelago/archipelago_context.cpp
 )

 set(DUSK_HTTP_BACKEND_FILES
@@ -269,12 +269,6 @@
                      runHook postInstall
                    '';

-                postFixup = lib.optionalString (!isDarwin) ''
-                  patchelf \
-                    --add-needed "${pkgs.vulkan-loader}/lib/libvulkan.so" \
-                    $out/bin/dusklight
-                '';
-
                dontStrip = true;

                meta = {
@@ -34,7 +34,7 @@ public:
    bool isResetting() { return mResettingFlag; }

    static Z2AudioMgr* getInterface() { return mAudioMgrPtr; }
-    static Z2AudioMgr* mAudioMgrPtr;
+    static DUSK_GAME_DATA Z2AudioMgr* mAudioMgrPtr;

    /* 0x0514 */ virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
    /* 0x0518 */ bool mResettingFlag;
@@ -46,11 +46,6 @@ public:
    s32 getSeLoadStatus(u32 wave) { return getWaveLoadStatus(wave, 0); }
    s32 getBgmLoadStatus(u32 wave) { return getWaveLoadStatus(wave, 1); }
    u8 getDemoSeWaveNum() { return loadedDemoWave; }
-#if TARGET_PC
-    u8 getLoadedSeWave_1() { return loadedSeWave_1;}
-    u8 getLoadedSeWave_2() { return loadedSeWave_2;}
-#endif
-

 private:
    /* 0x00 */ JAISoundID BGM_ID;
@@ -3912,12 +3912,6 @@ public:
    u16 getReadyItem() { return dComIfGp_getSelectItem(mSelectItemId); }

    static u32 getOtherHeapSize() { return 0xF0A60; }
-    
-#if TARGET_PC
-    u16 getEventId() { return mMsgFlow.getEventId(); }
-
-    bool checkSwimming() {return checkModeFlg(MODE_SWIMMING);}
-#endif

    static daAlink_BckData const m_mainBckShield[20];
    static daAlink_BckData const m_mainBckSword[5];
@@ -6397,8 +6391,7 @@ public:

 class daAlinkHIO_huLight_c0 {
 public:
-    static daAlinkHIO_huLight_c1 IF_NOT_DUSK(const) m;
-    IF_DUSK(static daAlinkHIO_huLight_c1 const original;)
+    static daAlinkHIO_huLight_c1 const m;
 };

 class daAlinkHIO_wlLight_c1 {
@@ -6472,8 +6465,7 @@ public:

 class daAlinkHIO_kandelaar_c0 {
 public:
-    static daAlinkHIO_kandelaar_c1 IF_NOT_DUSK(const) m;
-    IF_DUSK(static daAlinkHIO_kandelaar_c1 const original;)
+    static daAlinkHIO_kandelaar_c1 const m;
 };

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

 #endif /* D_A_MANT_H */
@@ -120,10 +120,7 @@ public:
    BOOL chkAction(actionFunc action) { return action == mAction; }

    static eventFunc mEvtSeqList[1];
-#if TARGET_PC
-    // Keep track of last given bug for rando
-    static u8 mGivenInsectId;
-#endif
+
 private:
    /* 0xB48 */ Z2Creature mSound;
    /* 0xBD8 */ J3DModel* mpUmbrellaModel;
@@ -64,9 +64,6 @@ public:
    virtual int Delete();
    virtual BOOL checkSmallTbox() { return true; }

-#if TARGET_PC
-    u8 getTboxNo() { return fopAcM_GetParamBit(this, 16, 8);}
-#endif
    u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); }
    u8 getItemNo() { return fopAcM_GetParamBit(this, 0, 8); }

@@ -114,10 +114,6 @@ public:

    bool checkBoomWindTgTimer() { return mBoomWindTgTimer == 0; }

-#if TARGET_PC
-    void setRandomizerItem(bool setFoolishItemModel = false);
-#endif
-
    static procFunc mFuncPtr[];
    static const dCcD_SrcCyl m_cyl_src;
    static s32 m_timer_max;
@@ -7,9 +7,4 @@ class fopAc_ac_c;
 int CheckFieldItemCreateHeap(fopAc_ac_c* actor);
 int CheckItemCreateHeap(fopAc_ac_c* i_this);

-#if TARGET_PC
-// Used for foolish items in rando. Foolish item model id is saved to home.angle.z
-#define M_ITEMNO_MODEL_ITEM_ID (IF_DUSK(randomizer_IsActive() && m_itemNo == dItemNo_Randomizer_FOOLISH_ITEM_e && home.angle.z != 0 ? home.angle.z :) m_itemNo)
-#endif
-
 #endif /* D_A_D_A_ITEMBASE_STATIC_H */
@@ -74,17 +74,7 @@ public:
    s16 getAngleY() const { return mAngleY; }
    void setAngleY(s16 angle) { mAngleY = angle;}

-#if TARGET_PC
-    BOOL isRandomized() const;
-#endif
-
    static ResourceData const mData[23];
-#if TARGET_PC
-    static ResourceData mRandoData[23];
-    #define M_SHOP_DATA (isRandomized() ? mRandoData : mData)
-#else
-    #define M_SHOP_DATA mData
-#endif
    static f32 const m_cullfar_max;

    enum {
@@ -1,10 +1,6 @@
 #ifndef D_COM_D_COM_INF_GAME_H
 #define D_COM_D_COM_INF_GAME_H

-#if TARGET_PC
-#include "dusk/randomizer/game/randomizer_context.hpp"
-#endif
-
 #include "d/d_attention.h"
 #include "d/d_cc_s.h"
 #include "d/d_event.h"
@@ -470,9 +466,6 @@ public:
    s8 getNextStageRoomNo() { return mNextStage.getRoomNo(); }
    s8 getNextStageLayer() { return mNextStage.getLayer(); }
    BOOL isEnableNextStage() { return mNextStage.isEnable(); }
-#if TARGET_PC
-    void setEnableNextStage() { return mNextStage.setEnable(); }
-#endif
    void offEnableNextStage() { mNextStage.offEnable(); }
    s8 getNextStageWipe() { return mNextStage.getWipe(); }
    u8 getNextStageWipeSpeed() { return mNextStage.getWipeSpeed(); }
@@ -1056,11 +1049,11 @@ public:

 STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c));

-extern dComIfG_inf_c g_dComIfG_gameInfo;
-extern GXColor g_blackColor;
-extern GXColor g_clearColor;
-extern GXColor g_whiteColor;
-extern GXColor g_saftyWhiteColor;
+DUSK_GAME_EXTERN dComIfG_inf_c g_dComIfG_gameInfo;
+DUSK_GAME_EXTERN GXColor g_blackColor;
+DUSK_GAME_EXTERN GXColor g_clearColor;
+DUSK_GAME_EXTERN GXColor g_whiteColor;
+DUSK_GAME_EXTERN GXColor g_saftyWhiteColor;

 int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*,
                         void*);
@@ -1128,15 +1121,6 @@ void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo,
                              u8 param_5);
 BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no);
 BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no);
-#if TARGET_PC
-void dComIfGs_onStageTbox(int i_stageNo, int i_no);
-void dComIfGs_offStageTbox(int i_stageNo, int i_no);
-
-void dComIfGs_onStageItem(int i_stageNo, int i_no);
-void dComIfGs_offStageItem(int i_stageNo, int i_no);
-
-#endif
-
 void dComIfGs_onStageSwitch(int i_stageNo, int i_no);
 void dComIfGs_offStageSwitch(int i_stageNo, int i_no);
 BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no);
@@ -1284,10 +1268,6 @@ int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3
                       f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
                       dKy_tevstr_c* param_9, s16 param_10, f32 param_11, TGXTexObj* param_12);

-#if TARGET_PC
-void dComIfGs_setupRandomizerSave();
-#endif
-
 inline dSv_info_c* dComIfGs_getSaveInfo() {
    return &g_dComIfG_gameInfo.info;
 }
@@ -1348,13 +1328,9 @@ inline u8 dComIfGs_getSelectEquipShield() {
    return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(COLLECT_SHIELD);
 }

-#if TARGET_PC
-u8 dComIfGs_getCollectSmell();
-#else
 inline u8 dComIfGs_getCollectSmell() {
    return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(COLLECT_SMELL);
 }
-#endif

 inline void dComIfGs_setCollectSmell(u8 smell) {
    g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_SMELL, smell);
@@ -1444,12 +1420,6 @@ inline BOOL dComIfGs_isDarkClearLV(int i_no) {
    return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isDarkClearLV(i_no);
 }

-#if TARGET_PC
-inline u8 dComIfGs_getDarkClearLV() {
-    return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().getDarkClearLV();
-}
-#endif
-
 inline void dComIfGs_onTransformLV(int i_no) {
    g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().onTransformLV(i_no);
 }
@@ -1527,12 +1497,6 @@ inline void dComIfGs_onRegionBit(int i_region) {
    g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().onRegionBit(i_region);
 }

-#if TARGET_PC
-inline void dComIfGs_setRegionBit(u8 i_region) {
-    g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().setRegionBit(i_region);
-}
-#endif
-
 inline void dComIfGs_setPlayerFieldLastStayInfo(const char* i_stage, cXyz& i_pos, s16 i_angle,
                                                s8 i_point, u8 i_region) {
    g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().set(i_stage, i_pos, i_angle,
@@ -1684,16 +1648,6 @@ inline void dComIfGs_setPachinkoNum(u8 i_num) {
    g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(i_num);
 }

-#if TARGET_PC
-inline u8 dComIfGs_getAncientDocumentNum() {
-    return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getAncientDocumentNum();
-}
-
-inline void dComIfGs_setAncientDocumentNum(u8 i_num) {
-    g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setAncientDocumentNum(i_num);
-}
-#endif
-
 inline u8 dComIfGs_getPachinkoMax() {
    return 50;
 }
@@ -1866,16 +1820,7 @@ inline u8 dComIfGs_getGetNumber(int i_no) {
 inline void dComIfGs_setGetNumber(int i_no, u8 i_value) {
    g_dComIfG_gameInfo.info.getPlayer().getLetterInfo().setGetNumber(i_no, i_value);
 }
-#if TARGET_PC
-// For rando
-inline void dComIfGs_setAllLetterGet() {
-    g_dComIfG_gameInfo.info.getPlayer().getLetterInfo().setAllLetterGet();
-}

-inline void dComIfGs_setAllLetterRead() {
-    g_dComIfG_gameInfo.info.getPlayer().getLetterInfo().setAllLetterRead();
-}
-#endif
 inline void dComIfGs_addFishNum(u8 param_0) {
    g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().addFishCount(param_0);
 }
@@ -1991,33 +1936,6 @@ inline u8 dComIfGs_getPalLanguage() {
    return g_dComIfG_gameInfo.info.getPlayer().getConfig().getPalLanguage();
 }

-#if TARGET_PC
-// Kinda hacky, but will do for now
-inline void dComIfGs_onRegionFlag(int i_stageNo, int i_no) {
-    auto regionFlags = reinterpret_cast<u8*>(&g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit());
-    const int offset = i_no / 8;
-    const int shift = i_no % 8;
-    regionFlags[offset] |= (0x80 >> shift);
-}
-
-inline void dComIfGs_onSaveTbox(int i_stageNo, int i_no) {
-    g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().onTbox(i_no);
-}
-
-inline void dComIfGs_offSaveTbox(int i_stageNo, int i_no) {
-    g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().offTbox(i_no);
-}
-
-inline void dComIfGs_onSaveItem(int i_no) {
-    g_dComIfG_gameInfo.info.getMemory().getBit().onItem(i_no);
-}
-
-inline void dComIfGs_offSaveItem(int i_no) {
-    g_dComIfG_gameInfo.info.getMemory().getBit().offItem(i_no);
-}
-
-#endif
-
 inline BOOL dComIfGs_isSaveTbox(int i_stageNo, int i_no) {
    return g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().isTbox(i_no);
 }
@@ -2102,10 +2020,6 @@ inline void dComIfGs_setKeyNum(u8 i_keyNum) {
    g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(i_keyNum);
 }

-#if TARGET_PC
-u8 dComIfGs_getKeyNum(int i_stageNo);
-#endif
-
 inline void dComIfGs_onDungeonItemMap() {
    g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap();
 }
@@ -2482,12 +2396,6 @@ inline void dComIfGs_onItem(int i_bitNo, int i_roomNo) {
    g_dComIfG_gameInfo.info.onItem(i_bitNo, i_roomNo);
 }

-#if TARGET_PC
-inline void dComIfGs_offItem(int i_bitNo, int i_roomNo) {
-    g_dComIfG_gameInfo.info.offItem(i_bitNo, i_roomNo);
-}
-#endif
-
 inline bool dComIfGs_isItem(int i_bitNo, int i_roomNo) {
    return g_dComIfG_gameInfo.info.isItem(i_bitNo, i_roomNo);
 }
@@ -2544,12 +2452,6 @@ inline s8 dComIfGp_getStartStageRoomNo() {
    return g_dComIfG_gameInfo.play.getStartStageRoomNo();
 }

-#if TARGET_PC
-inline s8 dComIfGp_getLayerNo() {
-    return g_dComIfG_gameInfo.play.getLayerNo(0);
-}
-#endif
-
 inline s8 dComIfGp_getStartStageLayer() {
    return g_dComIfG_gameInfo.play.getStartStageLayer();
 }
@@ -2594,12 +2496,6 @@ inline void dComIfGp_offEnableNextStage() {
    g_dComIfG_gameInfo.play.offEnableNextStage();
 }

-#if TARGET_PC
-inline void dComIfGp_setEnableNextStage() {
-    g_dComIfG_gameInfo.play.setEnableNextStage();
-}
-#endif
-
 inline s8 dComIfGp_getNextStageWipe() {
    return g_dComIfG_gameInfo.play.getNextStageWipe();
 }
@@ -203,10 +203,6 @@ public:
        DATASELPROC_DATA_SELECT_MOVE_ANIME,
        DATASELPROC_SELECT_DATA_OPEN_MOVE,
        DATASELPROC_SELECT_DATA_NAME_MOVE,
-#if TARGET_PC
-        DATASELPROC_SELECT_DATA_PLAY_MOVE, // Select between vanilla or randomizer play
-        DATASELPROC_MENU_ARCHIPELAGO_CONNECT, // Wait for archipelago to connect
-#endif
        DATASELPROC_SELECT_DATA_OPENERASE_MOVE,
        DATASELPROC_MENU_SELECT,
        DATASELPROC_MENU_SELECT_MOVE_ANM,
@@ -335,10 +331,6 @@ public:
    void makeRecInfo(u8);
    void selectDataOpenMove();
    void selectDataNameMove();
-#if TARGET_PC
-    void selectDataPlayTypeMove();
-    void menuArchipelagoConnect();
-#endif
    void selectDataOpenEraseMove();
    void menuSelect();
    void menuSelectStart();
@@ -740,14 +732,7 @@ public:
    /* 0x2378 */ J2DPicture* mpFadePict;
    #endif
 #ifdef TARGET_PC
-    struct mDusk {
-        dDlst_FileSelFade_c mFadeDlst;
-        bool mStartNameAnm;
-        bool mBackToFileSelect;
-        bool mArchipelagoBeginConnect;
-        bool mArchiStartCloseFile;
-        int mPendingRmlCloseFrames{0};
-    } mDusk;
+    dDlst_FileSelFade_c mFadeDlst;
 #endif

    #if PLATFORM_WII || PLATFORM_SHIELD
@@ -758,7 +743,7 @@ public:
 };

 #ifdef TARGET_PC
-STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C + sizeof(dFile_select_c::mDusk));
+STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C + sizeof(dDlst_FileSelFade_c));
 #else
 STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C);
 #endif
@@ -32,11 +32,6 @@ void item_func_ARROW_20();
 void item_func_ARROW_30();
 void item_func_ARROW_1();
 void item_func_PACHINKO_SHOT();
-#if TARGET_PC
-void item_func_FOOLISH_ITEM();
-void item_func_ORDON_PORTAL();
-void item_func_SOUTH_FARON_PORTAL();
-#endif
 void item_func_WATER_BOMB_5();
 void item_func_WATER_BOMB_10();
 void item_func_WATER_BOMB_20();
@@ -70,12 +65,6 @@ void item_func_DUNGEON_EXIT_2();
 void item_func_WALLET_LV1();
 void item_func_WALLET_LV2();
 void item_func_WALLET_LV3();
-#if TARGET_PC
-void item_func_UPPER_ZORAS_RIVER_PORTAL();
-void item_func_CASTLE_TOWN_PORTAL();
-void item_func_GERUDO_DESERT_PORTAL();
-void item_func_NORTH_FARON_PORTAL();
-#endif
 void item_func_ZORAS_JEWEL();
 void item_func_HAWK_EYE();
 void item_func_WOOD_STICK();
@@ -92,23 +81,13 @@ void item_func_LIGHT_SWORD();
 void item_func_FISHING_ROD_1();
 void item_func_PACHINKO();
 void item_func_COPY_ROD_2();
-#if TARGET_PC
-void item_func_KAKARIKO_GORGE_PORTAL();
-void item_func_KAKARIKO_VILLAGE_PORTAL();
-#endif
 void item_func_BOMB_BAG_LV2();
 void item_func_BOMB_BAG_LV1();
 void item_func_BOMB_IN_BAG();
-#if TARGET_PC
-void item_func_DEATH_MOUNTAIN_PORTAL();
-#endif
 void item_func_LIGHT_ARROW();
 void item_func_ARROW_LV1();
 void item_func_ARROW_LV2();
 void item_func_ARROW_LV3();
-#if TARGET_PC
-void item_func_ZORAS_DOMAIN_PORTAL();
-#endif
 void item_func_LURE_ROD();
 void item_func_BOMB_ARROW();
 void item_func_HAWK_ARROW();
@@ -154,33 +133,8 @@ void item_func_BILL();
 void item_func_WOOD_STATUE();
 void item_func_IRIAS_PENDANT();
 void item_func_HORSE_FLUTE();
-#if TARGET_PC
-void item_func_FOREST_SMALL_KEY();
-void item_func_MINES_SMALL_KEY();
-void item_func_LAKEBED_SMALL_KEY();
-void item_func_ARBITERS_SMALL_KEY();
-void item_func_SNOWPEAK_SMALL_KEY();
-void item_func_TEMPLE_OF_TIME_SMALL_KEY();
-void item_func_CITY_SMALL_KEY();
-void item_func_PALACE_SMALL_KEY();
-void item_func_HYRULE_SMALL_KEY();
-void item_func_CAMP_SMALL_KEY();
-void item_func_LAKE_HYLIA_PORTAL();
-#endif
 void item_func_RAFRELS_MEMO();
 void item_func_ASHS_SCRIBBLING();
-#if TARGET_PC
-void item_func_FOREST_BOSS_KEY();
-void item_func_LAKEBED_BOSS_KEY();
-void item_func_ARBITERS_BOSS_KEY();
-void item_func_TEMPLE_OF_TIME_BOSS_KEY();
-void item_func_CITY_BOSS_KEY();
-void item_func_PALACE_BOSS_KEY();
-void item_func_HYRULE_BOSS_KEY();
-void item_func_FOREST_COMPASS();
-void item_func_MINES_COMPASS();
-void item_func_LAKEBED_COMPASS();
-#endif
 void item_func_CHUCHU_YELLOW2();
 void item_func_OIL_BOTTLE3();
 void item_func_SHOP_BEE_CHILD();
@@ -193,34 +147,12 @@ void item_func_FILLED_CONTAINER();
 void item_func_MIRROR_PIECE_2();
 void item_func_MIRROR_PIECE_3();
 void item_func_MIRROR_PIECE_4();
-#if TARGET_PC
-void item_func_ARBITERS_COMPASS();
-void item_func_SNOWPEAK_COMPASS();
-void item_func_TEMPLE_OF_TIME_COMPASS();
-void item_func_CITY_COMPASS();
-void item_func_PALACE_COMPASS();
-void item_func_HYRULE_COMPASS();
-void item_func_MIRROR_CHAMBER_PORTAL();
-void item_func_SNOWPEAK_PORTAL();
-#endif
 void item_func_SMELL_YELIA_POUCH();
 void item_func_SMELL_PUMPKIN();
 void item_func_SMELL_POH();
 void item_func_SMELL_FISH();
 void item_func_SMELL_CHILDREN();
 void item_func_SMELL_MEDICINE();
-#if TARGET_PC
-void item_func_FOREST_MAP();
-void item_func_MINES_MAP();
-void item_func_LAKEBED_MAP();
-void item_func_ARBITERS_MAP();
-void item_func_SNOWPEAK_MAP();
-void item_func_TEMPLE_OF_TIME_MAP();
-void item_func_CITY_MAP();
-void item_func_PALACE_MAP();
-void item_func_HYRULE_MAP();
-void item_func_SACRED_GROVE_PORTAL();
-#endif
 void item_func_M_BEETLE();
 void item_func_F_BEETLE();
 void item_func_M_BUTTERFLY();
@@ -245,24 +177,7 @@ void item_func_M_ANT();
 void item_func_F_ANT();
 void item_func_M_MAYFLY();
 void item_func_F_MAYFLY();
-#if TARGET_PC
-void item_func_FUSED_SHADOW_1();
-void item_func_FUSED_SHADOW_2();
-void item_func_FUSED_SHADOW_3();
-void item_func_MIRROR_PIECE_1();
-void item_func_ARCHIPELAGO_ITEM();
-#endif
 void item_func_POU_SPIRIT();
-#if TARGET_PC
-void item_func_ENDING_BLOW();
-void item_func_SHIELD_ATTACK();
-void item_func_BACK_SLICE();
-void item_func_HELM_SPLITTER();
-void item_func_MORTAL_DRAW();
-void item_func_JUMP_STRIKE();
-void item_func_GREAT_SPIN();
-void item_func_ELDIN_BRIDGE_PORTAL();
-#endif
 void item_func_ANCIENT_DOCUMENT();
 void item_func_AIR_LETTER();
 void item_func_ANCIENT_DOCUMENT2();
@@ -306,10 +221,6 @@ int item_getcheck_func_ARROW_20();
 int item_getcheck_func_ARROW_30();
 int item_getcheck_func_ARROW_1();
 int item_getcheck_func_PACHINKO_SHOT();
-#if TARGET_PC
-int item_getcheck_func_ORDON_PORTAL();
-int item_getcheck_func_SOUTH_FARON_PORTAL();
-#endif
 int item_getcheck_func_WATER_BOMB_5();
 int item_getcheck_func_WATER_BOMB_10();
 int item_getcheck_func_WATER_BOMB_20();
@@ -343,12 +254,6 @@ int item_getcheck_func_DUNGEON_EXIT_2();
 int item_getcheck_func_WALLET_LV1();
 int item_getcheck_func_WALLET_LV2();
 int item_getcheck_func_WALLET_LV3();
-#if TARGET_PC
-int item_getcheck_func_UPPER_ZORAS_RIVER_PORTAL();
-int item_getcheck_func_CASTLE_TOWN_PORTAL();
-int item_getcheck_func_GERUDO_DESERT_PORTAL();
-int item_getcheck_func_NORTH_FARON_PORTAL();
-#endif
 int item_getcheck_func_ZORAS_JEWEL();
 int item_getcheck_func_HAWK_EYE();
 int item_getcheck_func_WOOD_STICK();
@@ -365,23 +270,13 @@ int item_getcheck_func_LIGHT_SWORD();
 int item_getcheck_func_FISHING_ROD_1();
 int item_getcheck_func_PACHINKO();
 int item_getcheck_func_COPY_ROD_2();
-#if TARGET_PC
-int item_getcheck_func_KAKARIKO_GORGE_PORTAL();
-int item_getcheck_func_KAKARIKO_VILLAGE_PORTAL();
-#endif
 int item_getcheck_func_BOMB_BAG_LV2();
 int item_getcheck_func_BOMB_BAG_LV1();
 int item_getcheck_func_BOMB_IN_BAG();
-#if TARGET_PC
-int item_getcheck_func_DEATH_MOUNTAIN_PORTAL();
-#endif
 int item_getcheck_func_LIGHT_ARROW();
 int item_getcheck_func_ARROW_LV1();
 int item_getcheck_func_ARROW_LV2();
 int item_getcheck_func_ARROW_LV3();
-#if TARGET_PC
-int item_getcheck_func_ZORAS_DOMAIN_PORTAL();
-#endif
 int item_getcheck_func_LURE_ROD();
 int item_getcheck_func_BOMB_ARROW();
 int item_getcheck_func_HAWK_ARROW();
@@ -427,10 +322,6 @@ int item_getcheck_func_BILL();
 int item_getcheck_func_WOOD_STATUE();
 int item_getcheck_func_IRIAS_PENDANT();
 int item_getcheck_func_HORSE_FLUTE();
-#if TARGET_PC
-int item_getcheck_func_CAMP_SMALL_KEY();
-int item_getcheck_func_LAKE_HYLIA_PORTAL();
-#endif
 int item_getcheck_func_RAFRELS_MEMO();
 int item_getcheck_func_ASHS_SCRIBBLING();
 int item_getcheck_func_CHUCHU_YELLOW2();
@@ -445,19 +336,12 @@ int item_getcheck_func_FILLED_CONTAINER();
 int item_getcheck_func_MIRROR_PIECE_2();
 int item_getcheck_func_MIRROR_PIECE_3();
 int item_getcheck_func_MIRROR_PIECE_4();
-#if TARGET_PC
-int item_getcheck_func_MIRROR_CHAMBER_PORTAL();
-int item_getcheck_func_SNOWPEAK_PORTAL();
-#endif
 int item_getcheck_func_SMELL_YELIA_POUCH();
 int item_getcheck_func_SMELL_PUMPKIN();
 int item_getcheck_func_SMELL_POH();
 int item_getcheck_func_SMELL_FISH();
 int item_getcheck_func_SMELL_CHILDREN();
 int item_getcheck_func_SMELL_MEDICINE();
-#if TARGET_PC
-int item_getcheck_func_SACRED_GROVE_PORTAL();
-#endif
 int item_getcheck_func_M_BEETLE();
 int item_getcheck_func_F_BEETLE();
 int item_getcheck_func_M_BUTTERFLY();
@@ -482,23 +366,7 @@ int item_getcheck_func_M_ANT();
 int item_getcheck_func_F_ANT();
 int item_getcheck_func_M_MAYFLY();
 int item_getcheck_func_F_MAYFLY();
-#if TARGET_PC
-int item_getcheck_func_FUSED_SHADOW_1();
-int item_getcheck_func_FUSED_SHADOW_2();
-int item_getcheck_func_FUSED_SHADOW_3();
-int item_getcheck_func_MIRROR_PIECE_1();
-#endif
 int item_getcheck_func_POU_SPIRIT();
-#if TARGET_PC
-int item_getcheck_func_ENDING_BLOW();
-int item_getcheck_func_SHIELD_ATTACK();
-int item_getcheck_func_BACK_SLICE();
-int item_getcheck_func_HELM_SPLITTER();
-int item_getcheck_func_MORTAL_DRAW();
-int item_getcheck_func_JUMP_STRIKE();
-int item_getcheck_func_GREAT_SPIN();
-int item_getcheck_func_ELDIN_BRIDGE_PORTAL();
-#endif
 int item_getcheck_func_ANCIENT_DOCUMENT();
 int item_getcheck_func_AIR_LETTER();
 int item_getcheck_func_ANCIENT_DOCUMENT2();
@@ -527,9 +395,6 @@ int checkItemGet(u8, int);
 BOOL isHeart(u8 item_no);
 int isBomb(u8);
 int isArrow(u8);
-#if TARGET_PC
-int isRupee(u8);
-#endif
 int addBombCount(u8, u8);
 BOOL isBottleItem(u8 item_no);
 u8 check_itemno(int i_itemNo);
@@ -35,65 +35,7 @@ struct dItem_fieldItemResource {
    /* 0xC */ u16 mHeapSize;
 };  // Size: 0x10

-#if TARGET_PC
-// Delcared helper functions since we can't include dComIfg_isRandomizer here
-dItem_itemResource* dItem_data_getItemResource();
-dItem_fieldItemResource* dItem_data_getFieldItemResource();
-dItem_itemInfo* dItem_data_getItemInfo();
-#endif
-
 struct dItem_data {
-#if TARGET_PC
-    static const char* getArcName(u8 index) { return dItem_data_getItemResource()[index].mArcName; }
-
-    static s16 getBtpName(u8 index) { return dItem_data_getItemResource()[index].mBtpName; }
-
-    static s16 getBrkName(u8 index) { return dItem_data_getItemResource()[index].mBrkName; }
-
-    static s16 getBxaName(u8 index) { return -1; }
-
-    static s16 getBckName(u8 index) { return dItem_data_getItemResource()[index].mBckName; }
-
-    static s16 getBpkName(u8 index) { return -1; }
-
-    static s16 getBtkName(u8 index) { return dItem_data_getItemResource()[index].mBtkName; }
-
-    static s16 getBmdName(u8 index) { return dItem_data_getItemResource()[index].mBmdName; }
-
-    static s8 getTevFrm(u8 index) { return dItem_data_getItemResource()[index].mTevFrm; }
-
-    static s8 getBtpFrm(u8 index) { return dItem_data_getItemResource()[index].mBtpFrm; }
-
-    static s16 getTexture(u8 index) { return dItem_data_getItemResource()[index].mTexture; }
-
-    static u8 getTexScale (u8 index) { return dItem_data_getItemResource()[index].mTexScale; }
-
-    static const char* getFieldArc(u8 index) { return dItem_data_getFieldItemResource()[index].mFieldArc; }
-
-    static s16 getItemBmdName(u8 index) { return dItem_data_getFieldItemResource()[index].mItemBmdName; }
-
-    static s16 getItemBtkName(u8 index) { return -1; }
-
-    static s16 getItemBpkName(u8 index) { return -1; }
-
-    static s16 getItemBckName(u8 index) { return dItem_data_getFieldItemResource()[index].mItemBckName; }
-
-    static s16 getItemBxaName(u8 index) { return -1; }
-
-    static s16 getItemBrkName(u8 index) { return dItem_data_getFieldItemResource()[index].mItemBrkName; }
-
-    static s16 getItemBtpName(u8 index) { return -1; }
-
-    static BOOL chkFlag(u8 index, int flag) { return dItem_data_getItemInfo()[index].mFlag & flag; }
-
-    static u8 getShadowSize(u8 index) { return dItem_data_getItemInfo()[index].mShadowSize; }
-
-    static const u8 getH(u8 index) { return dItem_data_getItemInfo()[index].mH; }
-
-    static const u8 getR(u8 index) { return dItem_data_getItemInfo()[index].mR; }
-
-    static u16 getFieldHeapSize(u8 index) { return dItem_data_getFieldItemResource()[index].mHeapSize; }
-#else
    static const char* getArcName(u8 index) { return item_resource[index].mArcName; }

    static s16 getBtpName(u8 index) { return item_resource[index].mBtpName; }
@@ -143,16 +85,10 @@ struct dItem_data {
    static const u8 getR(u8 index) { return item_info[index].mR; }

    static u16 getFieldHeapSize(u8 index) { return field_item_res[index].mHeapSize; } 
-#endif

    static dItem_itemResource item_resource[255];
    static dItem_fieldItemResource field_item_res[255];
    static dItem_itemInfo item_info[255];
-#if TARGET_PC
-    static dItem_itemResource item_resource_randomizer[255];
-    static dItem_fieldItemResource field_item_res_randomizer[255];
-    static dItem_itemInfo item_info_randomizer[255];
-#endif
 };

 enum {
@@ -414,267 +350,4 @@ enum {
    /* 0xFF */ dItemNo_NONE_e,
 };

-#if TARGET_PC
-// Randomizer item ids. Mostly the same, but we use most unused
-// entries for custom portals and keys
-enum {
-    /* 0x00 */ dItemNo_Randomizer_HEART_e,
-    /* 0x01 */ dItemNo_Randomizer_GREEN_RUPEE_e,
-    /* 0x02 */ dItemNo_Randomizer_BLUE_RUPEE_e,
-    /* 0x03 */ dItemNo_Randomizer_YELLOW_RUPEE_e,
-    /* 0x04 */ dItemNo_Randomizer_RED_RUPEE_e,
-    /* 0x05 */ dItemNo_Randomizer_PURPLE_RUPEE_e,
-    /* 0x06 */ dItemNo_Randomizer_ORANGE_RUPEE_e,
-    /* 0x07 */ dItemNo_Randomizer_SILVER_RUPEE_e,
-    /* 0x08 */ dItemNo_Randomizer_S_MAGIC_e,
-    /* 0x09 */ dItemNo_Randomizer_L_MAGIC_e,
-    /* 0x0A */ dItemNo_Randomizer_BOMB_5_e,
-    /* 0x0B */ dItemNo_Randomizer_BOMB_10_e,
-    /* 0x0C */ dItemNo_Randomizer_BOMB_20_e,
-    /* 0x0D */ dItemNo_Randomizer_BOMB_30_e,
-    /* 0x0E */ dItemNo_Randomizer_ARROW_10_e,
-    /* 0x0F */ dItemNo_Randomizer_ARROW_20_e,
-    /* 0x10 */ dItemNo_Randomizer_ARROW_30_e,
-    /* 0x11 */ dItemNo_Randomizer_ARROW_1_e,
-    /* 0x12 */ dItemNo_Randomizer_PACHINKO_SHOT_e,
-    /* 0x13 */ dItemNo_Randomizer_FOOLISH_ITEM_e,
-    /* 0x14 */ dItemNo_Randomizer_ORDON_PORTAL_e,
-    /* 0x15 */ dItemNo_Randomizer_SOUTH_FARON_PORTAL_e,
-    /* 0x16 */ dItemNo_Randomizer_WATER_BOMB_5_e,
-    /* 0x17 */ dItemNo_Randomizer_WATER_BOMB_10_e,
-    /* 0x18 */ dItemNo_Randomizer_WATER_BOMB_20_e,
-    /* 0x19 */ dItemNo_Randomizer_WATER_BOMB_30_e,
-    /* 0x1A */ dItemNo_Randomizer_BOMB_INSECT_5_e,
-    /* 0x1B */ dItemNo_Randomizer_BOMB_INSECT_10_e,
-    /* 0x1C */ dItemNo_Randomizer_BOMB_INSECT_20_e,
-    /* 0x1D */ dItemNo_Randomizer_BOMB_INSECT_30_e,
-    /* 0x1E */ dItemNo_Randomizer_RECOVERY_FAILY_e,
-    /* 0x1F */ dItemNo_Randomizer_TRIPLE_HEART_e,
-    /* 0x20 */ dItemNo_Randomizer_SMALL_KEY_e,
-    /* 0x21 */ dItemNo_Randomizer_KAKERA_HEART_e,
-    /* 0x22 */ dItemNo_Randomizer_UTAWA_HEART_e,
-    /* 0x23 */ dItemNo_Randomizer_MAP_e,
-    /* 0x24 */ dItemNo_Randomizer_COMPUS_e,
-    /* 0x25 */ dItemNo_Randomizer_DUNGEON_EXIT_e,
-    /* 0x26 */ dItemNo_Randomizer_BOSS_KEY_e,
-    /* 0x27 */ dItemNo_Randomizer_DUNGEON_BACK_e,
-    /* 0x28 */ dItemNo_Randomizer_SWORD_e,
-    /* 0x29 */ dItemNo_Randomizer_MASTER_SWORD_e,
-    /* 0x2A */ dItemNo_Randomizer_WOOD_SHIELD_e,
-    /* 0x2B */ dItemNo_Randomizer_SHIELD_e,
-    /* 0x2C */ dItemNo_Randomizer_HYLIA_SHIELD_e,
-    /* 0x2D */ dItemNo_Randomizer_TKS_LETTER_e,
-    /* 0x2E */ dItemNo_Randomizer_WEAR_CASUAL_e,
-    /* 0x2F */ dItemNo_Randomizer_WEAR_KOKIRI_e,
-    /* 0x30 */ dItemNo_Randomizer_ARMOR_e,
-    /* 0x31 */ dItemNo_Randomizer_WEAR_ZORA_e,
-    /* 0x32 */ dItemNo_Randomizer_MAGIC_LV1_e,
-    /* 0x33 */ dItemNo_Randomizer_DUNGEON_EXIT_2_e,
-    /* 0x34 */ dItemNo_Randomizer_WALLET_LV1_e,
-    /* 0x35 */ dItemNo_Randomizer_WALLET_LV2_e,
-    /* 0x36 */ dItemNo_Randomizer_WALLET_LV3_e,
-    /* 0x37 */ dItemNo_Randomizer_NOENTRY_55_e,
-    /* 0x38 */ dItemNo_Randomizer_NOENTRY_56_e,
-    /* 0x39 */ dItemNo_Randomizer_UPPER_ZORAS_RIVER_PORTAL_e,
-    /* 0x3A */ dItemNo_Randomizer_CASTLE_TOWN_PORTAL_e,
-    /* 0x3B */ dItemNo_Randomizer_GERUDO_DESERT_PORTAL_e,
-    /* 0x3C */ dItemNo_Randomizer_NORTH_FARON_PORTAL_e,
-    /* 0x3D */ dItemNo_Randomizer_ZORAS_JEWEL_e,
-    /* 0x3E */ dItemNo_Randomizer_HAWK_EYE_e,
-    /* 0x3F */ dItemNo_Randomizer_WOOD_STICK_e,
-    /* 0x40 */ dItemNo_Randomizer_BOOMERANG_e,
-    /* 0x41 */ dItemNo_Randomizer_SPINNER_e,
-    /* 0x42 */ dItemNo_Randomizer_IRONBALL_e,
-    /* 0x43 */ dItemNo_Randomizer_BOW_e,
-    /* 0x44 */ dItemNo_Randomizer_HOOKSHOT_e,
-    /* 0x45 */ dItemNo_Randomizer_HVY_BOOTS_e,
-    /* 0x46 */ dItemNo_Randomizer_COPY_ROD_e,
-    /* 0x47 */ dItemNo_Randomizer_W_HOOKSHOT_e,
-    /* 0x48 */ dItemNo_Randomizer_KANTERA_e,
-    /* 0x49 */ dItemNo_Randomizer_LIGHT_SWORD_e,
-    /* 0x4A */ dItemNo_Randomizer_FISHING_ROD_1_e,
-    /* 0x4B */ dItemNo_Randomizer_PACHINKO_e,
-    /* 0x4C */ dItemNo_Randomizer_COPY_ROD_2_e,
-    /* 0x4D */ dItemNo_Randomizer_KAKARIKO_GORGE_PORTAL_e,
-    /* 0x4E */ dItemNo_Randomizer_KAKARIKO_VILLAGE_PORTAL_e,
-    /* 0x4F */ dItemNo_Randomizer_BOMB_BAG_LV2_e,
-    /* 0x50 */ dItemNo_Randomizer_BOMB_BAG_LV1_e,
-    /* 0x51 */ dItemNo_Randomizer_BOMB_IN_BAG_e,
-    /* 0x52 */ dItemNo_Randomizer_DEATH_MOUNTAIN_PORTAL_e,
-    /* 0x53 */ dItemNo_Randomizer_LIGHT_ARROW_e,
-    /* 0x54 */ dItemNo_Randomizer_ARROW_LV1_e,
-    /* 0x55 */ dItemNo_Randomizer_ARROW_LV2_e,
-    /* 0x56 */ dItemNo_Randomizer_ARROW_LV3_e,
-    /* 0x57 */ dItemNo_Randomizer_ZORAS_DOMAIN_PORTAL_e,
-    /* 0x58 */ dItemNo_Randomizer_LURE_ROD_e,
-    /* 0x59 */ dItemNo_Randomizer_BOMB_ARROW_e,
-    /* 0x5A */ dItemNo_Randomizer_HAWK_ARROW_e,
-    /* 0x5B */ dItemNo_Randomizer_BEE_ROD_e,
-    /* 0x5C */ dItemNo_Randomizer_JEWEL_ROD_e,
-    /* 0x5D */ dItemNo_Randomizer_WORM_ROD_e,
-    /* 0x5E */ dItemNo_Randomizer_JEWEL_BEE_ROD_e,
-    /* 0x5F */ dItemNo_Randomizer_JEWEL_WORM_ROD_e,
-    /* 0x60 */ dItemNo_Randomizer_EMPTY_BOTTLE_e,
-    /* 0x61 */ dItemNo_Randomizer_RED_BOTTLE_e,
-    /* 0x62 */ dItemNo_Randomizer_GREEN_BOTTLE_e,
-    /* 0x63 */ dItemNo_Randomizer_BLUE_BOTTLE_e,
-    /* 0x64 */ dItemNo_Randomizer_MILK_BOTTLE_e,
-    /* 0x65 */ dItemNo_Randomizer_HALF_MILK_BOTTLE_e,
-    /* 0x66 */ dItemNo_Randomizer_OIL_BOTTLE_e,
-    /* 0x67 */ dItemNo_Randomizer_WATER_BOTTLE_e,
-    /* 0x68 */ dItemNo_Randomizer_OIL_BOTTLE_2_e,
-    /* 0x69 */ dItemNo_Randomizer_RED_BOTTLE_2_e,
-    /* 0x6A */ dItemNo_Randomizer_UGLY_SOUP_e,
-    /* 0x6B */ dItemNo_Randomizer_HOT_SPRING_e,
-    /* 0x6C */ dItemNo_Randomizer_FAIRY_e,
-    /* 0x6D */ dItemNo_Randomizer_HOT_SPRING_2_e,
-    /* 0x6E */ dItemNo_Randomizer_OIL2_e,
-    /* 0x6F */ dItemNo_Randomizer_OIL_e,
-    /* 0x70 */ dItemNo_Randomizer_NORMAL_BOMB_e,
-    /* 0x71 */ dItemNo_Randomizer_WATER_BOMB_e,
-    /* 0x72 */ dItemNo_Randomizer_POKE_BOMB_e,
-    /* 0x73 */ dItemNo_Randomizer_FAIRY_DROP_e,
-    /* 0x74 */ dItemNo_Randomizer_WORM_e,
-    /* 0x75 */ dItemNo_Randomizer_DROP_BOTTLE_e,
-    /* 0x76 */ dItemNo_Randomizer_BEE_CHILD_e,
-    /* 0x77 */ dItemNo_Randomizer_CHUCHU_RARE_e,
-    /* 0x78 */ dItemNo_Randomizer_CHUCHU_RED_e,
-    /* 0x79 */ dItemNo_Randomizer_CHUCHU_BLUE_e,
-    /* 0x7A */ dItemNo_Randomizer_CHUCHU_GREEN_e,
-    /* 0x7B */ dItemNo_Randomizer_CHUCHU_YELLOW_e,
-    /* 0x7C */ dItemNo_Randomizer_CHUCHU_PURPLE_e,
-    /* 0x7D */ dItemNo_Randomizer_LV1_SOUP_e,
-    /* 0x7E */ dItemNo_Randomizer_LV2_SOUP_e,
-    /* 0x7F */ dItemNo_Randomizer_LV3_SOUP_e,
-    /* 0x80 */ dItemNo_Randomizer_LETTER_e,
-    /* 0x81 */ dItemNo_Randomizer_BILL_e,
-    /* 0x82 */ dItemNo_Randomizer_WOOD_STATUE_e,
-    /* 0x83 */ dItemNo_Randomizer_IRIAS_PENDANT_e,
-    /* 0x84 */ dItemNo_Randomizer_HORSE_FLUTE_e,
-    /* 0x85 */ dItemNo_Randomizer_FOREST_SMALL_KEY_e,
-    /* 0x86 */ dItemNo_Randomizer_MINES_SMALL_KEY_e,
-    /* 0x87 */ dItemNo_Randomizer_LAKEBED_SMALL_KEY_e,
-    /* 0x88 */ dItemNo_Randomizer_ARBITERS_SMALL_KEY_e,
-    /* 0x89 */ dItemNo_Randomizer_SNOWPEAK_SMALL_KEY_e,
-    /* 0x8A */ dItemNo_Randomizer_TEMPLE_OF_TIME_SMALL_KEY_e,
-    /* 0x8B */ dItemNo_Randomizer_CITY_SMALL_KEY_e,
-    /* 0x8C */ dItemNo_Randomizer_PALACE_SMALL_KEY_e,
-    /* 0x8D */ dItemNo_Randomizer_HYRULE_SMALL_KEY_e,
-    /* 0x8E */ dItemNo_Randomizer_CAMP_SMALL_KEY_e,
-    /* 0x8F */ dItemNo_Randomizer_LAKE_HYLIA_PORTAL_e,
-    /* 0x90 */ dItemNo_Randomizer_RAFRELS_MEMO_e,
-    /* 0x91 */ dItemNo_Randomizer_ASHS_SCRIBBLING_e,
-    /* 0x92 */ dItemNo_Randomizer_FOREST_BOSS_KEY_e,
-    /* 0x93 */ dItemNo_Randomizer_LAKEBED_BOSS_KEY_e,
-    /* 0x94 */ dItemNo_Randomizer_ARBITERS_BOSS_KEY_e,
-    /* 0x95 */ dItemNo_Randomizer_TEMPLE_OF_TIME_BOSS_KEY_e,
-    /* 0x96 */ dItemNo_Randomizer_CITY_BOSS_KEY_e,
-    /* 0x97 */ dItemNo_Randomizer_PALACE_BOSS_KEY_e,
-    /* 0x98 */ dItemNo_Randomizer_HYRULE_BOSS_KEY_e,
-    /* 0x99 */ dItemNo_Randomizer_FOREST_COMPASS_e,
-    /* 0x9A */ dItemNo_Randomizer_MINES_COMPASS_e,
-    /* 0x9B */ dItemNo_Randomizer_LAKEBED_COMPASS_e,
-    /* 0x9C */ dItemNo_Randomizer_CHUCHU_YELLOW2_e,
-    /* 0x9D */ dItemNo_Randomizer_OIL_BOTTLE3_e,
-    /* 0x9E */ dItemNo_Randomizer_SHOP_BEE_CHILD_e,
-    /* 0x9F */ dItemNo_Randomizer_CHUCHU_BLACK_e,
-    /* 0xA0 */ dItemNo_Randomizer_LIGHT_DROP_e,
-    /* 0xA1 */ dItemNo_Randomizer_DROP_CONTAINER_e,
-    /* 0xA2 */ dItemNo_Randomizer_DROP_CONTAINER02_e,
-    /* 0xA3 */ dItemNo_Randomizer_DROP_CONTAINER03_e,
-    /* 0xA4 */ dItemNo_Randomizer_FILLED_CONTAINER_e,
-    /* 0xA5 */ dItemNo_Randomizer_MIRROR_PIECE_2_e,
-    /* 0xA6 */ dItemNo_Randomizer_MIRROR_PIECE_3_e,
-    /* 0xA7 */ dItemNo_Randomizer_MIRROR_PIECE_4_e,
-    /* 0xA8 */ dItemNo_Randomizer_ARBITERS_COMPASS_e,
-    /* 0xA9 */ dItemNo_Randomizer_SNOWPEAK_COMPASS_e,
-    /* 0xAA */ dItemNo_Randomizer_TEMPLE_OF_TIME_COMPASS_e,
-    /* 0xAB */ dItemNo_Randomizer_CITY_COMPASS_e,
-    /* 0xAC */ dItemNo_Randomizer_PALACE_COMPASS_e,
-    /* 0xAD */ dItemNo_Randomizer_HYRULE_COMPASS_e,
-    /* 0xAE */ dItemNo_Randomizer_MIRROR_CHAMBER_PORTAL_e,
-    /* 0xAF */ dItemNo_Randomizer_SNOWPEAK_PORTAL_e,
-    /* 0xB0 */ dItemNo_Randomizer_SMELL_YELIA_POUCH_e,
-    /* 0xB1 */ dItemNo_Randomizer_SMELL_PUMPKIN_e,
-    /* 0xB2 */ dItemNo_Randomizer_SMELL_POH_e,
-    /* 0xB3 */ dItemNo_Randomizer_SMELL_FISH_e,
-    /* 0xB4 */ dItemNo_Randomizer_SMELL_CHILDREN_e,
-    /* 0xB5 */ dItemNo_Randomizer_SMELL_MEDICINE_e,
-    /* 0xB6 */ dItemNo_Randomizer_FOREST_MAP_e,
-    /* 0xB7 */ dItemNo_Randomizer_MINES_MAP_e,
-    /* 0xB8 */ dItemNo_Randomizer_LAKEBED_MAP_e,
-    /* 0xB9 */ dItemNo_Randomizer_ARBITERS_MAP_e,
-    /* 0xBA */ dItemNo_Randomizer_SNOWPEAK_MAP_e,
-    /* 0xBB */ dItemNo_Randomizer_TEMPLE_OF_TIME_MAP_e,
-    /* 0xBC */ dItemNo_Randomizer_CITY_MAP_e,
-    /* 0xBD */ dItemNo_Randomizer_PALACE_MAP_e,
-    /* 0xBE */ dItemNo_Randomizer_HYRULE_MAP_e,
-    /* 0xBF */ dItemNo_Randomizer_SACRED_GROVE_PORTAL_e,
-    /* 0xC0 */ dItemNo_Randomizer_M_BEETLE_e,
-    /* 0xC1 */ dItemNo_Randomizer_F_BEETLE_e,
-    /* 0xC2 */ dItemNo_Randomizer_M_BUTTERFLY_e,
-    /* 0xC3 */ dItemNo_Randomizer_F_BUTTERFLY_e,
-    /* 0xC4 */ dItemNo_Randomizer_M_STAG_BEETLE_e,
-    /* 0xC5 */ dItemNo_Randomizer_F_STAG_BEETLE_e,
-    /* 0xC6 */ dItemNo_Randomizer_M_GRASSHOPPER_e,
-    /* 0xC7 */ dItemNo_Randomizer_F_GRASSHOPPER_e,
-    /* 0xC8 */ dItemNo_Randomizer_M_NANAFUSHI_e,
-    /* 0xC9 */ dItemNo_Randomizer_F_NANAFUSHI_e,
-    /* 0xCA */ dItemNo_Randomizer_M_DANGOMUSHI_e,
-    /* 0xCB */ dItemNo_Randomizer_F_DANGOMUSHI_e,
-    /* 0xCC */ dItemNo_Randomizer_M_MANTIS_e,
-    /* 0xCD */ dItemNo_Randomizer_F_MANTIS_e,
-    /* 0xCE */ dItemNo_Randomizer_M_LADYBUG_e,
-    /* 0xCF */ dItemNo_Randomizer_F_LADYBUG_e,
-    /* 0xD0 */ dItemNo_Randomizer_M_SNAIL_e,
-    /* 0xD1 */ dItemNo_Randomizer_F_SNAIL_e,
-    /* 0xD2 */ dItemNo_Randomizer_M_DRAGONFLY_e,
-    /* 0xD3 */ dItemNo_Randomizer_F_DRAGONFLY_e,
-    /* 0xD4 */ dItemNo_Randomizer_M_ANT_e,
-    /* 0xD5 */ dItemNo_Randomizer_F_ANT_e,
-    /* 0xD6 */ dItemNo_Randomizer_M_MAYFLY_e,
-    /* 0xD7 */ dItemNo_Randomizer_F_MAYFLY_e,
-    /* 0xD8 */ dItemNo_Randomizer_FUSED_SHADOW_1_e,
-    /* 0xD9 */ dItemNo_Randomizer_FUSED_SHADOW_2_e,
-    /* 0xDA */ dItemNo_Randomizer_FUSED_SHADOW_3_e,
-    /* 0xDB */ dItemNo_Randomizer_MIRROR_PIECE_1_e,
-    /* 0xDC */ dItemNo_Randomizer_ARCHIPELAGO_ITEM_e,
-    /* 0xDD */ dItemNo_Randomizer_NOENTRY_221_e,
-    /* 0xDE */ dItemNo_Randomizer_NOENTRY_222_e,
-    /* 0xDF */ dItemNo_Randomizer_NOENTRY_223_e,
-    /* 0xE0 */ dItemNo_Randomizer_POU_SPIRIT_e,
-    /* 0xE1 */ dItemNo_Randomizer_ENDING_BLOW_e,
-    /* 0xE2 */ dItemNo_Randomizer_SHIELD_ATTACK_e,
-    /* 0xE3 */ dItemNo_Randomizer_BACK_SLICE_e,
-    /* 0xE4 */ dItemNo_Randomizer_HELM_SPLITTER_e,
-    /* 0xE5 */ dItemNo_Randomizer_MORTAL_DRAW_e,
-    /* 0xE6 */ dItemNo_Randomizer_JUMP_STRIKE_e,
-    /* 0xE7 */ dItemNo_Randomizer_GREAT_SPIN_e,
-    /* 0xE8 */ dItemNo_Randomizer_ELDIN_BRIDGE_PORTAL_e,
-    /* 0xE9 */ dItemNo_Randomizer_ANCIENT_DOCUMENT_e,
-    /* 0xEA */ dItemNo_Randomizer_AIR_LETTER_e,
-    /* 0xEB */ dItemNo_Randomizer_ANCIENT_DOCUMENT2_e,
-    /* 0xEC */ dItemNo_Randomizer_LV7_DUNGEON_EXIT_e,
-    /* 0xED */ dItemNo_Randomizer_LINKS_SAVINGS_e,
-    /* 0xEE */ dItemNo_Randomizer_SMALL_KEY2_e,
-    /* 0xEF */ dItemNo_Randomizer_POU_FIRE1_e,
-    /* 0xF0 */ dItemNo_Randomizer_POU_FIRE2_e,
-    /* 0xF1 */ dItemNo_Randomizer_POU_FIRE3_e,
-    /* 0xF2 */ dItemNo_Randomizer_POU_FIRE4_e,
-    /* 0xF3 */ dItemNo_Randomizer_BOSSRIDER_KEY_e,
-    /* 0xF4 */ dItemNo_Randomizer_TOMATO_PUREE_e,
-    /* 0xF5 */ dItemNo_Randomizer_TASTE_e,
-    /* 0xF6 */ dItemNo_Randomizer_LV5_BOSS_KEY_e,
-    /* 0xF7 */ dItemNo_Randomizer_SURFBOARD_e,
-    /* 0xF8 */ dItemNo_Randomizer_KANTERA2_e,
-    /* 0xF9 */ dItemNo_Randomizer_L2_KEY_PIECES1_e,
-    /* 0xFA */ dItemNo_Randomizer_L2_KEY_PIECES2_e,
-    /* 0xFB */ dItemNo_Randomizer_L2_KEY_PIECES3_e,
-    /* 0xFC */ dItemNo_Randomizer_KEY_OF_CARAVAN_e,
-    /* 0xFD */ dItemNo_Randomizer_LV2_BOSS_KEY_e,
-    /* 0xFE */ dItemNo_Randomizer_KEY_OF_FILONE_e,
-    /* 0xFF */ dItemNo_Randomizer_NONE_e,
-};
-#endif
-
 #endif /* D_D_ITEM_DATA_H */
@@ -75,7 +75,6 @@ public:
    bool dpdMove();
    u8 openExplain(u8);
 #if TARGET_PC
-    void updateSlotImage(u8 slot);
    bool pointerMove();
 #endif

@@ -220,7 +219,6 @@ private:
    bool mCursorInterpCurrAngular;
    bool mCursorInterpInit;
    bool mPointerTouchPressHoveredCurrent;
-    J2DPicture* mDpadIcon;
 #endif
 };

@@ -129,9 +129,7 @@ public:
    bool getPlayerSubject();
    bool isBButtonShow(bool);
    s16 getButtonTimer();
-#if TARGET_PC
-    f32 getZButtonAlpha() { return mButtonZAlpha;}
-#endif
+
    virtual ~dMeter2Draw_c();

    J2DScreen* getMainScreenPtr() { return mpScreen; }
@@ -2,6 +2,7 @@
 #define D_METER_D_METER2_INFO_H

 #include "SSystem/SComponent/c_xyz.h"
+#include "global.h"

 class CPaneMgr;
 class J2DTextBox;
@@ -301,7 +302,7 @@ public:
    /* 0xF3 */ u8 unk_0xf3[5];
 };

-extern dMeter2Info_c g_meter2_info;
+DUSK_GAME_EXTERN dMeter2Info_c g_meter2_info;

 void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit);
 void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit);
@@ -849,6 +850,8 @@ inline void dMeter2Info_setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_w
    g_meter2_info.setFloatingMessage(i_msgID, i_msgTimer, i_wakuVisible);
 }

+// Show a custom text notification using the floating-message HUD display.
+
 inline void dMeter2Info_setMiniGameCount(s8 i_count) {
    g_meter2_info.setMiniGameCount(i_count);
 }
@@ -58,9 +58,6 @@ public:
    int checkEventRender(int*, int*, int*, int*);
    void remove();
    u16 getEventId(int*);
-#if TARGET_PC
-    u16 getEventId();
-#endif
    u32 getMsgNo();
    u32 getNowMsgNo();
    msg_class* getMsg();
@@ -131,9 +128,6 @@ public:
    u16 query051(mesg_flow_node_branch*, fopAc_ac_c*, int);
    u16 query052(mesg_flow_node_branch*, fopAc_ac_c*, int);
    u16 query053(mesg_flow_node_branch*, fopAc_ac_c*, int);
-#if TARGET_PC
-    u16 query054(mesg_flow_node_branch*, fopAc_ac_c*, int);
-#endif
    int event000(mesg_flow_node_event*, fopAc_ac_c*);
    int event001(mesg_flow_node_event*, fopAc_ac_c*);
    int event002(mesg_flow_node_event*, fopAc_ac_c*);
@@ -177,11 +171,6 @@ public:
    int event040(mesg_flow_node_event*, fopAc_ac_c*);
    int event041(mesg_flow_node_event*, fopAc_ac_c*);
    int event042(mesg_flow_node_event*, fopAc_ac_c*);
-#if TARGET_PC
-    // events for rando
-    int event043(mesg_flow_node_event*, fopAc_ac_c*);
-    int event044(mesg_flow_node_event*, fopAc_ac_c*);
-#endif

    void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**);

@@ -196,15 +185,8 @@ public:
    void setMsg(u32 msg) { mMsg = msg; }
    bool checkEndFlow() { return (u32)field_0x26 == 1; }

-    static queryFunc mQueryList[DUSK_IF_ELSE(54, 53)];
-    static eventFunc mEventList[DUSK_IF_ELSE(45, 43)];
-
-#if TARGET_PC
-    // patch funcs for rando
-    void randoPatchNodeType(u8& type, u16 nodeIdx);
-    void randoPatchBranchNode(mesg_flow_node_branch*& branch_node, u16 nodeIdx);
-    void randoPatchEventNode(mesg_flow_node_event*& event_node, u16 nodeIdx);
-#endif
+    static queryFunc mQueryList[53];
+    static eventFunc mEventList[43];

 private:
    /* 0x04 */ u8* mFlow_p;
@@ -360,12 +360,7 @@ inline void dMsgObject_demoMessageGroup() {
 }

 inline bool dMsgObject_isTalkNowCheck() {
-#if TARGET_PC
-    dMsgObject_c* msgObject = dMsgObject_getMsgObjectClass();
-    return msgObject != NULL && msgObject->getStatus() != 1;
-#else
    return dMsgObject_getMsgObjectClass()->getStatus() == 1 ? false : true;
-#endif
 }

 inline bool dMsgObject_isKillMessageFlag() {
@@ -502,12 +497,7 @@ inline void dMsgObject_onMsgSend() {
 }

 inline bool dMsgObject_isFukidashiCheck() {
-#if TARGET_PC
-    dMsgObject_c* msgObject = dMsgObject_getMsgObjectClass();
-    return msgObject != NULL && msgObject->getScrnDrawPtr() != NULL;
-#else
    return dMsgObject_getMsgObjectClass()->getScrnDrawPtr() == NULL ? false : true;
-#endif
 }

 inline void* dMsgObject_getTalkHeap() {
@@ -10,10 +10,6 @@
 #include "JSystem/JHostIO/JORReflexible.h"
 #include "dusk/endian.h"

-#if TARGET_PC
-#include <unordered_map>
-#endif
-
 static const int DEFAULT_SELECT_ITEM_INDEX = 0;
 static const int MAX_SELECT_ITEM = 4;
 static const int SELECT_ITEM_NUM = 2;
@@ -203,9 +199,6 @@ public:
    void setTime(f32 i_time) { mTime = i_time; }
    u16 getDate() const { return mDate; }
    void setDate(u16 i_date) { mDate = i_date; }
-#if TARGET_PC
-    u8 getDarkClearLV() const { return mDarkClearLevelFlag; }
-#endif

    /* 0x00 */ BE(OSTime) mDateIpl;
    /* 0x08 */ u8 mTransformLevelFlag;
@@ -279,9 +272,6 @@ public:
    bool isFieldDataExistFlag() const { return mFieldDataExistFlag ? true : false; }
    void offFieldDataExistFlag() { mFieldDataExistFlag = false; }
    void onFieldDataExistFlag() { mFieldDataExistFlag = true; }
-#if TARGET_PC
-    void setRegionBit(u8 region) { mRegion |= region;}
-#endif

 #if TARGET_PC
    /* 0x00 */ BE(Vec) mPos;
@@ -386,21 +376,12 @@ public:
    void setArrowNum(u8 i_num) { mArrowNum = i_num; }
    u8 getPachinkoNum() const { return mPachinkoNum; }
    void setPachinkoNum(u8 i_num) { mPachinkoNum = i_num; }
-#if TARGET_PC
-    u8 getAncientDocumentNum() const { return mAncientDocumentNum; }
-    void setAncientDocumentNum(u8 i_num) { mAncientDocumentNum = i_num; }
-#endif

    /* 0x0 */ u8 mArrowNum;
    /* 0x1 */ u8 mBombNum[3];
    /* 0x4 */ u8 mBottleNum[4];
    /* 0x8 */ u8 mPachinkoNum;
-#if TARGET_PC
-    /* 0x9 */ u8 mAncientDocumentNum; // Custom Field for Randomizer
-    /* 0x9 */ u8 unk5[2];
-#else
    /* 0x9 */ u8 unk5[3];
-#endif
 };  // Size: 0xC

 class dSv_player_item_max_c {
@@ -432,11 +413,7 @@ public:
    u8 getPohNum() const { return mPohNum; }

    void addPohNum() {
-#if TARGET_PC
-        if (mPohNum < 0x3D) {
-#else
        if (mPohNum < 0xFF) {
-#endif
            mPohNum++;
        }
    }
@@ -481,11 +458,6 @@ public:
    int isLetterReadFlag(int i_no) const;
    u8 getGetNumber(int i_no) { return mGetNumber[i_no]; }
    void setGetNumber(int i_no, u8 i_value) { mGetNumber[i_no] = i_value; }
-#if TARGET_PC
-    // For rando
-    void setAllLetterGet() { mLetterGetFlags[0] |= 0xFFFF;}
-    void setAllLetterRead() { mLetterReadFlags[0] |= 0xFFFF;}
-#endif

    /* 0x00 */ BE(u32) mLetterGetFlags[2];
    /* 0x08 */ BE(u32) mLetterReadFlags[2];
@@ -692,14 +664,10 @@ public:
    void onDungeonItemBossKey() { onDungeonItem(BOSS_KEY); }
    void offDungeonItemBossKey() { offDungeonItem(BOSS_KEY); }
    s32 isDungeonItemBossKey() const { return isDungeonItem(BOSS_KEY); }
-#if TARGET_PC
-    void onStageBossEnemy();
-#else
        void onStageBossEnemy() {
        onDungeonItem(STAGE_BOSS_ENEMY);
        onDungeonItem(OOCCOO_NOTE);
    }
-#endif
    void offStageBossEnemy() { offDungeonItem(STAGE_BOSS_ENEMY); }
    s32 isStageBossEnemy() const { return isDungeonItem(STAGE_BOSS_ENEMY); }
    void onStageLife() { onDungeonItem(STAGE_LIFE); }
@@ -980,7 +948,6 @@ public:
    /* 0x8 */ s8 m_no;
 };

-
 class dSv_info_c {
 public:
    void init();
@@ -993,9 +960,6 @@ public:
    BOOL isSwitch(int i_no, int i_roomNo) const;
    BOOL revSwitch(int i_no, int i_roomNo);
    void onItem(int i_no, int i_roomNo);
-#if TARGET_PC
-    void offItem(int i_no, int i_roomNo);
-#endif
    BOOL isItem(int i_no, int i_roomNo) const;
    void onActor(int i_no, int i_roomNo);
    void offActor(int i_no, int i_roomNo);
@@ -1292,9 +1292,6 @@ public:
    void set(const char*, s8, s16, s8, s8, u8);
    void offEnable() { enabled = 0; }
    BOOL isEnable() const { return enabled; }
-#if TARGET_PC
-    void setEnable() { enabled |= 0x1; }
-#endif
    s8 getWipe() const { return wipe; }
    u8 getWipeSpeed() const { return wipe_speed; }
    dStage_startStage_c* getStartStage() { return this; }
@@ -89,17 +89,16 @@ public:
 */
 void Register(ConfigVarBase& configVar);

-/**
- * \brief Indicate that all registrations have happened and everything should lock in.
- */
-void FinishRegistration();
-
 /**
 * \brief Load config from the standard user preferences location.
 */
 void LoadFromUserPreferences();
 void LoadFromFileName(const char* path);

+void LoadArgOverride(std::string_view name, std::string_view value);
+
+void Shutdown();
+
 /**
 * \brief Save the config to file.
 */
@@ -69,7 +69,7 @@ protected:
    /**
     * The name of this CVar, used in the configuration file.
     */
-    const char* name;
+    std::string name;

    /**
     * Whether this CVar has been registered with the global managing logic.
@@ -87,8 +87,10 @@ protected:
     */
    const ConfigImplBase* impl;

-    ConfigVarBase(const char* name, const ConfigImplBase* impl);
-    virtual ~ConfigVarBase() = default;
+    // The configuration system stores a direct pointer to the ConfigVar instance.
+    // It is not legal to move or copy it.
+    ConfigVarBase(const ConfigVarBase&) = delete;
+    ConfigVarBase(std::string name, const ConfigImplBase* impl);

    /**
     * Check that the CVar is registered, aborting if this is not the case.
@@ -99,6 +101,8 @@ protected:
    }

 public:
+    virtual ~ConfigVarBase();
+
    /**
     * Get the name of this CVar, used in the configuration file.
     */
@@ -121,6 +125,7 @@ public:
     * This is necessary to make it legal to access.
     */
    void markRegistered();
+    void unmarkRegistered();

    /**
     * Clear a speedrun-mode override if one is active on this CVar.
@@ -192,10 +197,12 @@ public:
     * @param arg Arguments to forward to construct the default value.
     */
    template <typename... Args>
-    ConfigVar(const char* name, Args&&... arg)
-        : ConfigVarBase(name, GetConfigImpl<T>()), defaultValue(std::forward<Args>(arg)...),
+    ConfigVar(std::string name, Args&&... arg)
+        : ConfigVarBase(std::move(name), GetConfigImpl<T>()), defaultValue(std::forward<Args>(arg)...),
        value(), overrideValue() {}

+    ConfigVar(ConfigVar const&) = delete;
+
    /**
     * \brief Get the current value of the CVar.
     *
@@ -22,9 +22,8 @@
 class GXTexObjRAII : public GXTexObj {
 public:
    GXTexObjRAII() : GXTexObj() {}
-    ~GXTexObjRAII() { GXDestroyTexObj(this); }
-
-    void reset() { GXDestroyTexObj(this); }
+    ~GXTexObjRAII();
+    void reset();

    GXTexObjRAII(const GXTexObjRAII&) = delete;
    GXTexObjRAII& operator=(const GXTexObjRAII&) = delete;
@@ -65,16 +64,8 @@ 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
-    }
+    explicit GXScopedDebugGroup(const char* text);
+    ~GXScopedDebugGroup();
 };

 #define GX_AND_TRACY_SCOPED(name) GXScopedDebugGroup scope(name); ZoneScopedN(name);
@@ -0,0 +1,122 @@
+#pragma once
+#include <cstring>
+#include <memory>
+#include <type_traits>
+#include "dusk/mod_api.h"
+
+namespace dusk {
+
+inline DuskModAPI* g_api = nullptr;
+inline void init(DuskModAPI* api) { g_api = api; }
+
+template <class T>
+T arg(void* args_raw, int n) noexcept {
+    void** a = static_cast<void**>(args_raw);
+    return *static_cast<std::add_pointer_t<std::remove_reference_t<T>>>(a[n]);
+}
+
+template <class T>
+std::remove_reference_t<T>& argRef(void* args_raw, int n) noexcept {
+    void** a = static_cast<void**>(args_raw);
+    return *static_cast<std::add_pointer_t<std::remove_reference_t<T>>>(a[n]);
+}
+
+template <class F>
+void* mfpAddr(F fn) noexcept {
+    void* p = nullptr;
+    static_assert(sizeof(fn) >= sizeof(void*), "unexpected MFP size");
+    std::memcpy(&p, &fn, sizeof(void*));
+    return p;
+}
+
+template <auto MFP, class R, class Self, class Orig, class... A>
+struct HookEntryBase {
+    static inline Orig g_orig = nullptr;
+
+    static R trampoline(Self self, A... args) {
+        void* ptrs[] = {static_cast<void*>(std::addressof(self)), static_cast<void*>(std::addressof(args))...};
+        if constexpr (std::is_void_v<R>) {
+            const bool cancel = g_api->hook_dispatch_pre(mfpAddr(MFP), static_cast<void*>(ptrs), nullptr);
+            if (!cancel) g_orig(self, args...);
+            g_api->hook_dispatch_post(mfpAddr(MFP), static_cast<void*>(ptrs), nullptr);
+        } else {
+            R result{};
+            const bool cancel = g_api->hook_dispatch_pre(mfpAddr(MFP), static_cast<void*>(ptrs), static_cast<void*>(std::addressof(result)));
+            if (!cancel) result = g_orig(self, args...);
+            g_api->hook_dispatch_post(mfpAddr(MFP), static_cast<void*>(ptrs), static_cast<void*>(std::addressof(result)));
+            return result;
+        }
+    }
+};
+
+template <auto FP, class R, class Orig, class... A>
+struct HookEntryFreeBase {
+    static inline Orig g_orig = nullptr;
+
+    static R trampoline(A... args) {
+        if constexpr (sizeof...(A) == 0) {
+            if constexpr (std::is_void_v<R>) {
+                const bool cancel = g_api->hook_dispatch_pre(mfpAddr(FP), nullptr, nullptr);
+                if (!cancel) g_orig(args...);
+                g_api->hook_dispatch_post(mfpAddr(FP), nullptr, nullptr);
+            } else {
+                R result{};
+                const bool cancel = g_api->hook_dispatch_pre(mfpAddr(FP), nullptr, static_cast<void*>(std::addressof(result)));
+                if (!cancel) result = g_orig(args...);
+                g_api->hook_dispatch_post(mfpAddr(FP), nullptr, static_cast<void*>(std::addressof(result)));
+                return result;
+            }
+        } else {
+            void* ptrs[] = {static_cast<void*>(std::addressof(args))...};
+            if constexpr (std::is_void_v<R>) {
+                const bool cancel = g_api->hook_dispatch_pre(mfpAddr(FP), static_cast<void*>(ptrs), nullptr);
+                if (!cancel) g_orig(args...);
+                g_api->hook_dispatch_post(mfpAddr(FP), static_cast<void*>(ptrs), nullptr);
+            } else {
+                R result{};
+                const bool cancel = g_api->hook_dispatch_pre(mfpAddr(FP), static_cast<void*>(ptrs), static_cast<void*>(std::addressof(result)));
+                if (!cancel) result = g_orig(args...);
+                g_api->hook_dispatch_post(mfpAddr(FP), static_cast<void*>(ptrs), static_cast<void*>(std::addressof(result)));
+                return result;
+            }
+        }
+    }
+};
+
+template <auto MFP>
+struct HookEntry;
+
+template <class C, class R, class... A, R (C::*MFP)(A...)>
+struct HookEntry<MFP> : HookEntryBase<MFP, R, C*, R(*)(C*, A...), A...> {};
+
+template <class C, class R, class... A, R (C::*MFP)(A...) const>
+struct HookEntry<MFP> : HookEntryBase<MFP, R, const C*, R(*)(const C*, A...), A...> {};
+
+template <class R, class... A, R (*FP)(A...)>
+struct HookEntry<FP> : HookEntryFreeBase<FP, R, R(*)(A...), A...> {};
+
+template <auto MFP>
+void hookAddPre(int32_t (*fn)(void* args)) {
+    using E = HookEntry<MFP>;
+    g_api->hook_install(mfpAddr(MFP), reinterpret_cast<void*>(E::trampoline),
+                        reinterpret_cast<void**>(&E::g_orig));
+    g_api->hook_pre(mfpAddr(MFP), fn);
+}
+
+template <auto MFP>
+void hookAddPost(void (*fn)(void* args, void* retval)) {
+    using E = HookEntry<MFP>;
+    g_api->hook_install(mfpAddr(MFP), reinterpret_cast<void*>(E::trampoline),
+                        reinterpret_cast<void**>(&E::g_orig));
+    g_api->hook_post(mfpAddr(MFP), fn);
+}
+
+template <auto MFP>
+void hookSetReplace(void (*fn)(void* args, void* retval)) {
+    using E = HookEntry<MFP>;
+    g_api->hook_install(mfpAddr(MFP), reinterpret_cast<void*>(E::trampoline),
+                        reinterpret_cast<void**>(&E::g_orig));
+    g_api->hook_replace(mfpAddr(MFP), fn);
+}
+
+}  // namespace dusk
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <cstdint>
+
+namespace dusk {
+
+void hookInstallByAddr(void* fn_addr, void* tramp_fn, void** orig_store);
+
+void hookRegisterPre (void* fn_addr, void* mod, int32_t (*fn)(void* args));
+void hookRegisterPost(void* fn_addr, void* mod, const char* mod_name, void (*fn)(void* args, void* retval));
+bool hookSetReplace  (void* fn_addr, void* mod, const char* mod_name, void (*fn)(void* args, void* retval));
+
+bool hookDispatchPre (void* fn_addr, void* args, void* retval);
+void hookDispatchPost(void* fn_addr, void* args, void* retval);
+
+void hookClearMod(void* mod);
+
+} // namespace dusk
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#if defined(_WIN32)
+#define DUSK_MOD_EXPORT __declspec(dllexport)
+#else
+#define DUSK_MOD_EXPORT __attribute__((visibility("default")))
+#endif
+
+#define DUSK_MOD_API_VERSION 1
+
+typedef void* DuskPanelHandle;
+typedef void* DuskElemHandle;
+
+// Place this once at file scope in your mod to declare the minimum API version required.
+// The loader will refuse to initialize the mod if the engine's API version is older.
+#define DUSK_REQUIRE_API_VERSION                                                                   \
+    extern "C" DUSK_MOD_EXPORT uint32_t mod_api_version = DUSK_MOD_API_VERSION;
+
+struct DuskModAPIv1 {
+    uint32_t api_version;
+    const char* mod_dir;
+
+    void (*log_info)(const char* fmt, ...);
+    void (*log_warn)(const char* fmt, ...);
+    void (*log_error)(const char* fmt, ...);
+
+    void* (*load_resource)(const char* relative_path, size_t* out_size);
+    void (*free_resource)(void* data);
+
+    void (*register_tab_content)(
+        void (*build_fn)(DuskPanelHandle panel, void* userdata), void* userdata);
+    void (*register_tab_update)(void (*update_fn)(void* userdata), void* userdata);
+
+    void (*panel_add_section)(DuskPanelHandle panel, const char* text);
+    void (*panel_add_button)(
+        DuskPanelHandle panel, const char* label, void (*cb)(void* userdata), void* userdata);
+    DuskElemHandle (*panel_add_badge_row)(DuskPanelHandle panel, const char* label, int ok);
+    DuskElemHandle (*panel_add_dyn_text)(DuskPanelHandle panel, const char* text);
+    DuskElemHandle (*panel_add_progress)(DuskPanelHandle panel, float value);
+
+    void (*elem_set_badge)(DuskElemHandle elem, int ok);
+    void (*elem_set_text)(DuskElemHandle elem, const char* text);
+    void (*elem_set_progress)(DuskElemHandle elem, float value);
+
+    void (*hook_install)(void* fn_addr, void* tramp_fn, void** orig_store);
+    void (*hook_pre)(void* fn_addr, int32_t (*fn)(void* args));
+    void (*hook_post)(void* fn_addr, void (*fn)(void* args, void* retval));
+    void (*hook_replace)(void* fn_addr, void (*fn)(void* args, void* retval));
+
+    bool (*hook_dispatch_pre)(void* fn_addr, void* args, void* retval);
+    void (*hook_dispatch_post)(void* fn_addr, void* args, void* retval);
+
+    void (*service_publish)(const char* name, void* ptr);
+    void* (*service_get)(const char* name);
+};
+
+using DuskModAPI = DuskModAPIv1;
+
+extern "C" {
+void mod_init(DuskModAPI* api);
+void mod_tick(DuskModAPI* api);
+}
@@ -0,0 +1,134 @@
+#pragma once
+
+#include <filesystem>
+#include <string>
+#include <vector>
+#include <ranges>
+
+#include "dusk/mod_api.h"
+#include "dusk/config_var.hpp"
+
+namespace dusk::modding {
+class ModBundle;
+class NativeModule;
+}
+
+namespace dusk {
+
+struct RmlTabContentCallback {
+    void (*build_fn)(void* panel, void* userdata);
+    void* userdata;
+};
+
+struct RmlTabUpdateCallback {
+    void (*update_fn)(void* userdata);
+    void* userdata;
+};
+
+struct ModMetadata {
+    std::string id;
+    std::string name;
+    std::string version;
+    std::string author;
+    std::string description;
+    bool hasCode;
+};
+
+struct NativeMod {
+    std::unique_ptr<modding::NativeModule> handle;
+    DuskModAPI api{};
+
+    using FnInit = void (*)(DuskModAPI*);
+    using FnTick = void (*)(DuskModAPI*);
+    using FnCleanup = void (*)(DuskModAPI*);
+
+    FnInit fn_init = nullptr;
+    FnTick fn_tick = nullptr;
+    FnCleanup fn_cleanup = nullptr;
+};
+
+enum class NativeModStatus : u8 {
+    /**
+     * Mod does not have native code included.
+     */
+    None,
+
+    /**
+     * Native code mod loaded successfully.
+     *
+     * Note that this only indicates load status of the native library. If the native lib throws in
+     * its init function, it will still be disabled!
+     */
+    Loaded,
+
+    /**
+     * This build was compiled without native mod support!
+     */
+    BuildDisabled,
+
+    /**
+     * Mod does not have a native library suitable for this build's platform.
+     */
+    ModMissingPlatform,
+
+    /**
+     * Mod is built for a different API version than this build of the game.
+     */
+    ApiVersionMismatch,
+
+    /**
+     * Unknown error loading the native mod.
+     */
+    Unknown,
+};
+
+struct LoadedMod {
+    ModMetadata metadata;
+    std::string mod_path;
+    std::string dir;
+
+    std::unique_ptr<ConfigVar<bool>> cvarIsEnabled;
+
+    bool active = false;
+    bool load_failed = false;
+
+    NativeModStatus native_status = NativeModStatus::None;
+    std::unique_ptr<NativeMod> native;
+
+    std::unique_ptr<modding::ModBundle> bundle;
+
+    std::vector<RmlTabContentCallback> tab_content;
+    std::vector<RmlTabUpdateCallback> tab_updates;
+};
+
+class ModLoader {
+public:
+    static ModLoader& instance();
+
+    void setModsDir(std::filesystem::path dir) { m_modsDir = std::move(dir); }
+    void init();
+    void tick();
+    void shutdown();
+
+    [[nodiscard]] auto mods() const {
+        return m_mods | std::views::transform([](const auto& m) -> LoadedMod& { return *m; });
+    }
+
+    [[nodiscard]] auto active_mods() const {
+        return mods() | std::views::filter([](const auto& m) { return m.active; });
+    }
+
+private:
+    std::vector<std::unique_ptr<LoadedMod>> m_mods;
+    std::filesystem::path m_modsDir;
+    bool m_initialized = false;
+
+    void tryLoadDusk(const std::filesystem::path& modPath, bool fromDir);
+    void tryLoadNativeMod(LoadedMod& mod);
+    void buildAPI(LoadedMod& mod);
+    void initOverlayFiles();
+};
+
+using ModIndex = std::ranges::range_difference_t<decltype(std::declval<ModLoader>().mods())>;
+
+}  // namespace dusk
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "f_op/f_op_actor_mng.h"
+#include "f_pc/f_pc_layer.h"
+#include "f_pc/f_pc_manager.h"
+#include "f_pc/f_pc_node.h"
+#include "m_Do/m_Do_controller_pad.h"
+
+// Remove a button from this frame's trigger state so the game won't see it
+// Call after detecting a combo in mod_tick to prevent double-processing
+inline void consumeInput(u32 pad, u32 buttonMask) {
+    mDoCPd_c::getCpadInfo(pad).mPressedButtonFlags &= ~buttonMask;
+}
+
+// Spawn an actor in the play scene layer
+// calling fopAcM_create directly outside game simulation context creates the actor in the wrong
+// layer, corrupting its first-frame rendering setup
+inline fpc_ProcID fopAcM_createInPlayScene(s16 proc_name, u32 params, const cXyz* pos, int room_no,
+    const csXyz* angle, const cXyz* scale, s8 argument) {
+    layer_class* savedLayer = fpcLy_CurrentLayer();
+    base_process_class* playScene = fpcM_SearchByName(fpcNm_PLAY_SCENE_e);
+    if (playScene != nullptr) {
+        fpcLy_SetCurrentLayer(&((process_node_class*)playScene)->layer);
+    }
+    fpc_ProcID result = fopAcM_create(proc_name, params, pos, room_no, angle, scale, argument);
+    fpcLy_SetCurrentLayer(savedLayer);
+    return result;
+}
@@ -46,12 +46,6 @@ enum class FrameInterpMode : u8 {
    Unlimited = 2,
 };

-enum class TouchTargeting : u8 {
-    Hybrid = 0,
-    Hold = 1,
-    Switch = 2,
-};
-
 enum class MenuScaling : u8 {
    GameCube = 0,
    Wii = 1,
@@ -103,12 +97,6 @@ struct ConfigEnumRange<FrameInterpMode> {
    static constexpr auto max = FrameInterpMode::Unlimited;
 };

-template <>
-struct ConfigEnumRange<TouchTargeting> {
-    static constexpr auto min = TouchTargeting::Hybrid;
-    static constexpr auto max = TouchTargeting::Switch;
-};
-
 template <>
 struct ConfigEnumRange<MenuScaling> {
    static constexpr auto min = MenuScaling::GameCube;
@@ -228,7 +216,6 @@ struct UserSettings {
        ConfigVar<bool> invertMouseY;
        ConfigVar<bool> freeCamera;
        ConfigVar<bool> enableTouchControls;
-        ConfigVar<TouchTargeting> touchTargeting;
        ConfigVar<bool> enableMenuPointer;
        ConfigVar<ui::ControlLayout> touchControlsLayout;
        ConfigVar<bool> invertCameraXAxis;
@@ -278,8 +265,6 @@ struct UserSettings {
        ConfigVar<bool> liveSplitEnabled;
        ConfigVar<bool> showSpeedrunRTATimer;
        ConfigVar<bool> recordingMode;
-
-        // Misc
        ConfigVar<bool> removeQuestMapMarkers;
        ConfigVar<bool> showInputViewer;
        ConfigVar<bool> showInputViewerGyro;
@@ -305,41 +290,6 @@ struct UserSettings {
        std::array<ActionBindConfigVar, 4> openDusklightMenu;
        std::array<ActionBindConfigVar, 4> turboSpeedButton;
    } actionBindings;
-
-    // Randomizer seed hashes, 1 per file
-    struct {
-        std::array<ConfigVar<std::string>, 3> seedHashes;
-    } randomizer;
-    
-    // Archipelago Settings
-    struct {
-        std::array<ConfigVar<std::string>, 3> savesServerIP;
-        std::array<ConfigVar<std::string>, 3> savesServerPass;
-        std::array<ConfigVar<std::string>, 3> savesSlotName;
-    } archipelago;
-
-    // Cosmetics
-    struct {
-        ConfigVar<std::string> herosTunicCapColor;
-        ConfigVar<std::string> herosTunicTorsoColor;
-        ConfigVar<std::string> herosTunicSkirtColor;
-        ConfigVar<std::string> zoraArmorCapColor;
-        ConfigVar<std::string> zoraArmorHelmetColor;
-        ConfigVar<std::string> zoraArmorTorsoColor;
-        ConfigVar<std::string> zoraArmorScalesColor;
-        ConfigVar<std::string> zoraArmorFlippersColor;
-        ConfigVar<std::string> lanternGlowColor;
-        ConfigVar<std::string> woodenSwordColor;
-        ConfigVar<std::string> msBladeColor;
-        ConfigVar<std::string> msHandleColor;
-        ConfigVar<std::string> lightSwordGlowColor;
-        ConfigVar<std::string> boomerangColor;
-        ConfigVar<std::string> ironBootsColor;
-        ConfigVar<std::string> spinnerColor;
-        ConfigVar<std::string> linkHairColor;
-        ConfigVar<std::string> wolfLinkColor;
-        ConfigVar<std::string> eponaColor;
-    } cosmetics;
 };

 UserSettings& getSettings();
@@ -114,6 +114,19 @@ inline int __builtin_clz(unsigned int v) {

 #endif

+// Data symbols in dusk.dll need dllimport on the mod side
+// DUSK_BUILDING_GAME is defined for the game build so the same headers work in both.
+#if defined(TARGET_PC) && defined(_WIN32) && !defined(DUSK_BUILDING_GAME)
+#  define DUSK_GAME_EXTERN extern __declspec(dllimport)
+#  define DUSK_GAME_DATA __declspec(dllimport)
+#elif defined(TARGET_PC) && defined(_WIN32) && defined(DUSK_BUILDING_GAME)
+#  define DUSK_GAME_EXTERN extern __declspec(dllexport)
+#  define DUSK_GAME_DATA __declspec(dllexport)
+#else
+#  define DUSK_GAME_EXTERN extern
+#  define DUSK_GAME_DATA
+#endif
+
 #define FAST_DIV(x, n) (x >> (n / 2))

 #define SQUARE(x) ((x) * (x))
@@ -33,7 +33,7 @@ public:
    static void onBgmSet() { mBgmSet = true; }
    static void offBgmSet() { mBgmSet = false; }

-    static u8 mInitFlag;
+    static DUSK_GAME_DATA u8 mInitFlag;
    static u8 mResetFlag;
    static u8 mBgmSet;
 };
@@ -398,7 +398,4 @@ inline int mDoAud_monsSeStart(u32 i_soundId, const Vec* i_pos, u32 i_actorId, u3
                                    0);
 }

-#if TARGET_PC
-mDoAud_zelAudio_c& mDoAud_getZelAudio();
-#endif
 #endif /* M_DO_M_DO_AUDIO_H */
@@ -4,6 +4,7 @@
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
 #include "dusk/settings.h"
+#include "global.h"

 // Controller Ports 1 - 4
 enum { PAD_1, PAD_2, PAD_3, PAD_4 };
@@ -94,7 +95,7 @@ public:
    static void stopMotorWaveHard(u32 pad) { return m_gamePad[pad]->stopMotorWaveHard(); }

    static JUTGamePad* m_gamePad[4];
-    static interface_of_controller_pad m_cpadInfo[4];
+    static DUSK_GAME_DATA interface_of_controller_pad m_cpadInfo[4];
    static interface_of_controller_pad m_debugCpadInfo[4];
 };

@@ -67,10 +67,6 @@ public:

    JKRMemArchive* getArchive() const { return mArchive; }
    JKRHeap* getHeap() const { return mHeap; }
-#if TARGET_PC
-    s32 getEntryNumber() const { return mEntryNumber; }
-#endif
-

 private:
    /* 0x14 */ u8 mMountDirection;
@@ -371,6 +371,7 @@ public:
    static int m_height;
    static f32 m_heightF;
    static f32 m_widthF;
+    #endif

    #if TARGET_PC
    static f32 m_safeMinXF;
@@ -380,7 +381,6 @@ public:
    static f32 m_safeWidthF;
    static f32 m_safeHeightF;
    #endif
-    #endif
 };

 #endif /* M_DO_M_DO_GRAPHIC_H */
@@ -154,18 +154,6 @@ public:
        return (J2DTextBoxHBinding)((mFlags >> 2) & 3);
    }

-#if TARGET_PC
-    void setVBinding(J2DTextBoxVBinding vBinding) {
-        mFlags &= 0b1100;
-        mFlags |= (vBinding & 3);
-    }
-
-    void setHBinding(J2DTextBoxHBinding hBinding) {
-        mFlags &= 0b0011;
-        mFlags |= ((hBinding & 3) << 2);
-    }
-#endif
-
    JUtility::TColor getCharColor() { return mCharColor; }
    JUtility::TColor getGradColor() { return mGradientColor; }
    u16 getStringAllocByte() const { return mStringLength; }
@@ -4,6 +4,7 @@
 #include <types.h>
 #include <cmath>
 #include <utility>
+#include "global.h"

 #ifdef __cplusplus
 extern "C" {
@@ -141,9 +142,9 @@ struct TAsinAcosTable {
    }
 };

-extern TSinCosTable<13, f32> sincosTable_;
-extern TAtanTable<1024, f32> atanTable_;
-extern TAsinAcosTable<1024, f32> asinAcosTable_;
+DUSK_GAME_EXTERN TSinCosTable<13, f32> sincosTable_;
+DUSK_GAME_EXTERN TAtanTable<1024, f32> atanTable_;
+DUSK_GAME_EXTERN TAsinAcosTable<1024, f32> asinAcosTable_;

 inline f32 acosDegree(f32 x) {
    return asinAcosTable_.acosDegree(x);
@@ -16,10 +16,10 @@ inline f64 getConst2() {
    return 9.765625E-4;
 }

-TSinCosTable<13, f32> sincosTable_ ATTRIBUTE_ALIGN(32);
+DUSK_GAME_DATA TSinCosTable<13, f32> sincosTable_ ATTRIBUTE_ALIGN(32);

-TAtanTable<1024, f32> atanTable_ ATTRIBUTE_ALIGN(32);
+DUSK_GAME_DATA TAtanTable<1024, f32> atanTable_ ATTRIBUTE_ALIGN(32);

-TAsinAcosTable<1024, f32> asinAcosTable_ ATTRIBUTE_ALIGN(32);
+DUSK_GAME_DATA TAsinAcosTable<1024, f32> asinAcosTable_ ATTRIBUTE_ALIGN(32);

 }  // namespace JMath
@@ -7,10 +7,6 @@

 #include "JSystem/JMessage/control.h"

-#if TARGET_PC
-#include "dusk/randomizer/game/messages.hpp"
-#endif
-
 JMessage::TControl::TControl()
    : pSequenceProcessor_(NULL),
      pRenderingProcessor_(NULL),
@@ -94,10 +90,6 @@ bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const*
    JUT_ASSERT(155, pResourceCache_!=NULL);

    pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_);
-#if TARGET_PC
-    // Feels kinda hacky to have to hijack this deep into JSystem, but works for now
-    HandleTextOverrides(this, pProcessor, uMessageGroupID_, uMessageID_);
-#endif
    pMessageText_current_ = pMessageText_begin_;
    oStack_renderingProcessor_.clear();
    return true;
@@ -22,7 +22,7 @@
      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>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+</dict>
+</plist>
@@ -362,6 +362,10 @@ body.animate-in .intro-item {
    transition: opacity transform 0.3s 0.6s cubic-in-out;
 }

+.delay-6 {
+    transition: opacity transform 0.3s 0.7s cubic-in-out;
+}
+
 /* Mobile layout */
@media (max-height: 640dp) {
    .gradient {
@@ -105,18 +105,6 @@ window content pane > * {
    flex: 0 0 auto;
 }

-pane.excluded-locations-pane {
-    display: flex;
-    flex-flow: column;
-    flex: 1 1 0;
-    min-width: 0;
-    min-height: 0;
-    gap: 8dp;
-    overflow-y: scroll;
-    font-size: 20dp;
-    border-top: 1dp #92875B;
-}
-
 window content pane:last-of-type > div {
    line-height: 1.625;
 }
@@ -407,6 +395,11 @@ progress.progress-ongoing fill {
    border-radius: 3dp;
 }

+progress.progress-health fill {
+    background-color: #cc3322;
+    border-radius: 3dp;
+}
+
 button.achievement-clear {
    flex: 0 0 auto;
    align-self: center;
@@ -490,7 +483,6 @@ window.modal.danger .modal-header icon {
    font-size: 20dp;
    color: #FFFFFF;
    font-weight: normal;
-    word-break: break-word;
 }

 .modal-body span.tip {
@@ -522,6 +514,30 @@ progress.verification-progress-bar {
    color: rgba(224, 219, 200, 65%);
 }

+.mod-info-row {
+    display: flex;
+    align-items: center;
+    gap: 12dp;
+    padding: 4dp 0;
+}
+
+.mod-info-label {
+    font-family: "Fira Sans Condensed";
+    font-weight: bold;
+    opacity: 0.55;
+    flex: 0 0 80dp;
+}
+
+.mod-info-value {
+    flex: 1 1 0;
+}
+
+.mod-path {
+    font-size: 14dp;
+    word-break: break-all;
+    opacity: 0.7;
+}
+
 .modal-actions {
    display: flex;
    flex-direction: row;
@@ -532,15 +548,3 @@ progress.verification-progress-bar {
    flex: 0 0 auto;
    padding-top: 4dp;
 }
-
-.current-option-text {
-    padding-left: 5dp;
-    border: 2dp #C2A42D;
-    border-radius: 14dp;
-}
-
-.not-current-option-text {
-    padding-left: 5dp;
-    margin: 2dp; /*Used to mimic border*/
-    opacity: 0.5;
-}
@@ -142,6 +142,12 @@ DynamicModuleControl::DynamicModuleControl(char const* name) {
 }
 #endif

+#if TARGET_PC
+// dump() is declared but its definition is inside #if !TARGET_PC above; stub it out.
+void DynamicModuleControlBase::dump() {}
+void DynamicModuleControlBase::dump(char*) {}
+#endif
+
 u32 DynamicModuleControl::sAllocBytes;

 JKRArchive* DynamicModuleControl::sArchive;
@@ -19,7 +19,7 @@
 #include "Z2AudioCS/Z2AudioCS.h"
 #endif

-Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr;
+DUSK_GAME_DATA Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr;
 u8 gMuffleOutOfRangeMic = false;

 Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) {
@@ -1230,8 +1230,7 @@ void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
            bgm_id = Z2BGM_DUNGEON_FOREST;
            bgm_wave1 = 0xa;
                   /* dSv_event_flag_c::M_022 - Forest Temple - Forest Temple clear (Midna creates warp hole) */
-                   // In rando, check for boss defeated instead
-        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[55]) IF_DUSK(&& (!randomizer_IsActive() || dComIfGs_isStageBossEnemy()))) {
+        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[55])) {
            bgm_id = 0x200005b;
        } else {
            bgm_wave1 = 0xc;
@@ -1291,13 +1290,11 @@ void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
        break;
    case Z2SCENE_LAKEBED_TEMPLE_BOSS:
        se_wave1 = 9;
-        // In rando, check for boss defeated instead
-        if (dComIfGs_isStageSwitch(4, 0xe) IF_DUSK(&& (!randomizer_IsActive() || dComIfGs_isStageBossEnemy()))) {
+        if (dComIfGs_isStageSwitch(4, 0xe)) {
            bgm_id = Z2BGM_DUNGEON_LV3;
            bgm_wave1 = 0x15;
                   /* dSv_event_flag_c::M_045 - Lakebed Temple - Lakebed Temple clear */
-                   // In rando, check for boss defeated instead
-        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[78]) IF_DUSK(&& (!randomizer_IsActive() || dComIfGs_isStageBossEnemy()))) {
+        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[78])) {
            bgm_id = 0x200005b;
        } else {
            bgm_wave1 = 0x1e;
@@ -1327,11 +1324,11 @@ void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
        break;
    case Z2SCENE_ARBITERS_GROUNDS_BOSS:
        se_wave1 = 0xd;
-        if (dComIfGs_isStageSwitch(0xa, 0xa) IF_DUSK(&& (!randomizer_IsActive() || dComIfGs_isStageBossEnemy()))) {
+        if (dComIfGs_isStageSwitch(0xa, 0xa)) {
            bgm_id = Z2BGM_DUNGEON_LV4;
            bgm_wave1 = 0x1a;
                   /* dSv_event_flag_c::F_0265 - Arbiter's Grounds - Arbiter's Grounds clear */
-        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[265]) IF_DUSK(&& (!randomizer_IsActive() || dComIfGs_isStageBossEnemy()))) {
+        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[265])) {
            bgm_id = 0x200005b;
        } else {
            bgm_wave1 = 0x4c;
@@ -1392,11 +1389,11 @@ void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
        break;
    case Z2SCENE_TEMPLE_OF_TIME_BOSS:
        se_wave1 = 0x15;
-        if (dComIfGs_isStageSwitch(7, 0x18) IF_DUSK(&& (!randomizer_IsActive() || dComIfGs_isStageBossEnemy()))) {
+        if (dComIfGs_isStageSwitch(7, 0x18)) {
            bgm_id = Z2BGM_DUNGEON_LV6;
            bgm_wave1 = 0x26;
                   /* dSv_event_flag_c::F_0267 - Temple of Time - Temple of Time clear */
-        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267]) IF_DUSK(&& (!randomizer_IsActive() || dComIfGs_isStageBossEnemy()))) {
+        } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267])) {
            bgm_id = 0x200005b;
        } else {
            bgm_wave1 = 0x4e;
@@ -58,10 +58,6 @@
 #include "res/Object/Alink.h"
 #include <cstring>
 #include <dusk/string.hpp>
-#include "dusk/cosmetics/color_utils.hpp"
-#include "dusk/randomizer/game/flags.h"
-#include "dusk/randomizer/game/stages.h"
-#include "dusk/randomizer/game/tools.h"
 #endif

 static int daAlink_Create(fopAc_ac_c* i_this);
@@ -4235,25 +4231,6 @@ int daAlink_c::createHeap() {
    if (mpHIO == NULL) {
        return 0;
    }
-#if TARGET_PC
-    const auto& lanternColor = dusk::getSettings().cosmetics.lanternGlowColor.getValue();
-    if (dusk::cosmetics::is_valid_hex_color_str(lanternColor)) {
-        u8 r = std::stoi(lanternColor.substr(0, 2), nullptr, 16);
-        u8 g = std::stoi(lanternColor.substr(2, 2), nullptr, 16);
-        u8 b = std::stoi(lanternColor.substr(4, 2), nullptr, 16);
-        auto& lanternAmbience = mpHIO->mItem.mLanternPL.m;
-        auto& lanternSphere = mpHIO->mItem.mLantern.m;
-        lanternAmbience.mColorR = r;
-        lanternAmbience.mColorG = g;
-        lanternAmbience.mColorB = b;
-        lanternSphere.mColorReg1R = r;
-        lanternSphere.mColorReg1G = g;
-        lanternSphere.mColorReg1B = b;
-        lanternSphere.mColorReg2R = r;
-        lanternSphere.mColorReg2G = g;
-        lanternSphere.mColorReg2B = b;
-    }
-#endif

    if (!(mpWlChangeModel = initModel(dRes_ID_ALINK_BMD_WL_CHANGE_e, 0))) {
        return 0;
@@ -10596,16 +10573,9 @@ void daAlink_c::decideDoStatus() {
                               (actor_name == fpcNm_TAG_KMSG_e &&
                                static_cast<daTag_KMsg_c*>(field_0x27f4)->getType() == 3))
                    {
-                        // Don't check vanilla condition in randomizer
-                        if (!checkEquipAnime() && checkMasterSwordEquip() IF_DUSK(&& !randomizer_IsActive())) {
+                        if (!checkEquipAnime() && checkMasterSwordEquip()) {
                            setDoStatus(BUTTON_STATUS_STRIKE);
                        }
-#if TARGET_PC
-                        // Separate check for striking sword into the pedestal for randomizer
-                        if (!checkEquipAnime() && randomizer_IsActive() && randomizer_checkTempleOfTimeRequirement()) {
-                            setDoStatus(BUTTON_STATUS_STRIKE);
-                        }
-#endif
                    }
                } else if (mTargetedActor != NULL && checkGoatCatchActor(mTargetedActor) &&
                           mAttention->getActionBtnB() != NULL &&
@@ -11513,14 +11483,6 @@ int daAlink_c::orderTalk(int i_checkZTalk) {
 static void* daAlink_searchBouDoor(fopAc_ac_c* i_actor, void* i_data) {
    UNUSED(i_data);

-#if TARGET_PC
-    // In randomizer, we don't want Bo preventing us from entering his house on Day 2
-    if (randomizer_IsActive() && daAlink_c::checkStageName("F_SP103"))
-    {
-        return NULL;
-    }
-#endif
-
    if (fopAcM_GetName(i_actor) == fpcNm_NPC_BOU_e && ((daNpc_Bou_c*)i_actor)->speakTo()) {
        return i_actor;
    }
@@ -12301,14 +12263,6 @@ BOOL daAlink_c::checkGroundSpecialMode() {
    if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() &&
        checkEndResetFlg0(ERFLG0_FORCE_WOLF_CHANGE))
    {
-#if TARGET_PC
-        u8 stage = getStageID();
-        // In rando, don't transform in twilight fog unless we have shadow crystal
-        if (randomizer_IsActive() && !dComIfGs_isEventBit(TRANSFORMING_UNLOCKED) &&
-            (stage == Palace_of_Twilight || stage == Phantom_Zant_1 || stage == Phantom_Zant_2)) {
-            return 0;
-        }
-#endif
        return procCoMetamorphoseInit();
    }

@@ -1624,7 +1624,7 @@ const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {

 #pragma push
 #pragma force_active on
-IF_NOT_DUSK(const) daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
+const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
    0,
    3,
 	0,
@@ -1638,25 +1638,8 @@ IF_NOT_DUSK(const) daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
 	0.0f,
 };
 #pragma pop
-#if TARGET_PC
-// Save original lantern colors incase player reverts to default
-const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::original = {
-    0,
-    3,
-    0,
-    181,
-    112,
-    40,
-    -70,
-    1.0f,
-    50.0f,
-    350.0f,
-    0.0f,
-};
-#endif

-
-IF_NOT_DUSK(const) daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
+const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
 	{
 		30,
        1.1f,
@@ -1689,42 +1672,6 @@ IF_NOT_DUSK(const) daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
    0.5f,
 };

-#if TARGET_PC
-// Save original lantern colors incase player reverts to default
-const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::original = {
-    {
-        30,
-        1.1f,
-        2.0f,
-        3.0f,
-        17.0f,
-    },
-    {
-        11,
-        1.0f,
-        0.0f,
-        3.0f,
-        12.0f,
-    },
-    {
-        17,
-        1.0f,
-        0.0f,
-        3.0f,
-        18.0f,
-    },
-    80,
-    40,
-    20,
-    40,
-    30,
-    10,
-    3,
-    200,
-    0.5f,
-};
-#endif
-
 const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
 	{
 		20,
@@ -23,14 +23,9 @@
 #include "d/actor/d_a_npc_tkc.h"
 #include <cstring>

-#include "dusk/archipelago/archipelago_context.hpp"
-
-#if TARGET_PC
 #include "dusk/imgui/ImGuiConsole.hpp"
 #include "dusk/settings.h"
 #include "dusk/speedrun.h"
-#include "dusk/randomizer/game/randomizer_context.hpp"
-#endif

 BOOL daAlink_c::checkEventRun() const {
    return dComIfGp_event_runCheck() || checkPlayerDemoMode();
@@ -1028,26 +1023,13 @@ void daAlink_c::setGetItemFace(u16 i_itemNo) {
        || i_itemNo == dItemNo_ANCIENT_DOCUMENT2_e
        || i_itemNo == dItemNo_DROP_CONTAINER_e
        || i_itemNo == dItemNo_DROP_CONTAINER02_e
-#if TARGET_PC
-        // Rando items for facial expressions
-        || (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_WOOD_STICK_e)
-        || (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_SWORD_e)
-        || (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_SHIELD_e)
-        || (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_MASTER_SWORD_e)
-        || (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_LIGHT_SWORD_e)
-        || (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_MAGIC_LV1_e)
-#endif
        || i_itemNo == dItemNo_DROP_CONTAINER03_e)
    {
        setFaceBasicBck(dRes_ID_ALANM_BCK_FI_e);
    } else if (i_itemNo == dItemNo_DUNGEON_EXIT_e || i_itemNo == dItemNo_LV7_DUNGEON_EXIT_e) {
        setFaceBasicTexture(FTANM_K_A);
        setFaceBasicBck(dRes_ID_ALANM_BCK_FK_e);
-#if TARGET_PC
-    } else if (i_itemNo == dItemNo_TOMATO_PUREE_e || i_itemNo == dItemNo_TASTE_e || (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_FOOLISH_ITEM_e)) {
-#else
    } else if (i_itemNo == dItemNo_TOMATO_PUREE_e || i_itemNo == dItemNo_TASTE_e) {
-#endif
        setFaceBasicBck(dRes_ID_ALANM_BCK_FJ_e);
    }
 }
@@ -2234,283 +2216,18 @@ void daAlink_c::setGetSubBgm(int i_itemNo) {
        /* dItemNo_KEY_OF_FILONE_e     */ SETYPE_ITEM_GET_MINI,
    };

-#if TARGET_PC
-    // Randomizer SeType changes
-    static const u8 getSeTypeRandomizer[255] = {
-        /* dItemNo_Randomizer_HEART_e             */ SETYPE_NONE,
-        /* dItemNo_Randomizer_GREEN_RUPEE_e       */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BLUE_RUPEE_e        */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_YELLOW_RUPEE_e      */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_RED_RUPEE_e         */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_PURPLE_RUPEE_e      */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_ORANGE_RUPEE_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_SILVER_RUPEE_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_S_MAGIC_e           */ SETYPE_NONE,
-        /* dItemNo_Randomizer_L_MAGIC_e           */ SETYPE_NONE,
-        /* dItemNo_Randomizer_BOMB_5_e            */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BOMB_10_e           */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BOMB_20_e           */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BOMB_30_e           */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_ARROW_10_e          */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_ARROW_20_e          */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_ARROW_30_e          */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_ARROW_1_e           */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_PACHINKO_SHOT_e     */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_FOOLISH_ITEM_e_e    */ SETYPE_NONE,
-        /* dItemNo_Randomizer_NOENTRY_20_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_21_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WATER_BOMB_5_e      */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_WATER_BOMB_10_e     */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_WATER_BOMB_20_e     */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_WATER_BOMB_30_e     */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BOMB_INSECT_5_e     */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BOMB_INSECT_10_e    */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BOMB_INSECT_20_e    */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_BOMB_INSECT_30_e    */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_RECOVERY_FAILY_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_TRIPLE_HEART_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_SMALL_KEY_e         */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_KAKERA_HEART_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_UTAWA_HEART_e       */ SETYPE_HEART,
-        /* dItemNo_Randomizer_MAP_e               */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_COMPUS_e            */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_DUNGEON_EXIT_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_BOSS_KEY_e          */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_DUNGEON_BACK_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_SWORD_e             */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_MASTER_SWORD_e      */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_WOOD_SHIELD_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_SHIELD_e            */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_HYLIA_SHIELD_e      */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_TKS_LETTER_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WEAR_CASUAL_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WEAR_KOKIRI_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_ARMOR_e             */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_WEAR_ZORA_e         */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_MAGIC_LV1_e         */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_DUNGEON_EXIT_2_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WALLET_LV1_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WALLET_LV2_e        */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_WALLET_LV3_e        */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_55_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_56_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_57_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_58_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_59_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_60_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_ZORAS_JEWEL_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_HAWK_EYE_e          */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_WOOD_STICK_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_BOOMERANG_e         */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_SPINNER_e           */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_IRONBALL_e          */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_BOW_e               */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_HOOKSHOT_e          */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_HVY_BOOTS_e         */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_COPY_ROD_e          */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_W_HOOKSHOT_e        */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_KANTERA_e           */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_LIGHT_SWORD_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_FISHING_ROD_1_e     */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_PACHINKO_e          */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_COPY_ROD_2_e        */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_77_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_78_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_BOMB_BAG_LV2_e      */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_BOMB_BAG_LV1_e      */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_BOMB_IN_BAG_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_82_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LIGHT_ARROW_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_ARROW_LV1_e         */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_ARROW_LV2_e         */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_ARROW_LV3_e         */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_87_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LURE_ROD_e          */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_BOMB_ARROW_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_HAWK_ARROW_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_BEE_ROD_e           */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_JEWEL_ROD_e         */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WORM_ROD_e          */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_JEWEL_BEE_ROD_e     */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_JEWEL_WORM_ROD_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_EMPTY_BOTTLE_e      */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_RED_BOTTLE_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_GREEN_BOTTLE_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_BLUE_BOTTLE_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_MILK_BOTTLE_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_HALF_MILK_BOTTLE_e  */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_OIL_BOTTLE_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WATER_BOTTLE_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_OIL_BOTTLE_2_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_RED_BOTTLE_2_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_UGLY_SOUP_e         */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_HOT_SPRING_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_FAIRY_e             */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_HOT_SPRING_2_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_OIL2_e              */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_OIL_e               */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NORMAL_BOMB_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WATER_BOMB_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_POKE_BOMB_e         */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_FAIRY_DROP_e        */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_WORM_e              */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_DROP_BOTTLE_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_BEE_CHILD_e         */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_CHUCHU_RARE_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_CHUCHU_RED_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_CHUCHU_BLUE_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_CHUCHU_GREEN_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_CHUCHU_YELLOW_e     */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_CHUCHU_PURPLE_e     */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LV1_SOUP_e          */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LV2_SOUP_e          */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LV3_SOUP_e          */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LETTER_e            */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_BILL_e              */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_WOOD_STATUE_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_IRIAS_PENDANT_e     */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_HORSE_FLUTE_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_133_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_134_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_135_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_136_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_137_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_138_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_139_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_140_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_141_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_142_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_143_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_RAFRELS_MEMO_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_ASHS_SCRIBBLING_e   */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_146_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_147_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_148_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_149_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_150_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_151_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_152_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_153_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_154_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_155_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_CHUCHU_YELLOW2_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_OIL_BOTTLE3_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_SHOP_BEE_CHILD_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_CHUCHU_BLACK_e      */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LIGHT_DROP_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_DROP_CONTAINER_e    */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_DROP_CONTAINER02_e  */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_DROP_CONTAINER03_e  */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_FILLED_CONTAINER_e  */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_MIRROR_PIECE_2_e    */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_MIRROR_PIECE_3_e    */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_MIRROR_PIECE_4_e    */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_168_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_169_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_170_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_171_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_172_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_173_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_174_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_175_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_SMELL_YELIA_POUCH_e */ SETYPE_ITEM_GET_SMELL,
-        /* dItemNo_Randomizer_SMELL_PUMPKIN_e     */ SETYPE_ITEM_GET_SMELL,
-        /* dItemNo_Randomizer_SMELL_POH_e         */ SETYPE_ITEM_GET_SMELL,
-        /* dItemNo_Randomizer_SMELL_FISH_e        */ SETYPE_ITEM_GET_SMELL,
-        /* dItemNo_Randomizer_SMELL_CHILDREN_e    */ SETYPE_ITEM_GET_SMELL,
-        /* dItemNo_Randomizer_SMELL_MEDICINE_e    */ SETYPE_ITEM_GET_SMELL,
-        /* dItemNo_Randomizer_NOENTRY_182_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_183_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_184_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_185_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_186_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_187_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_188_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_189_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_190_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_NOENTRY_191_e       */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_M_BEETLE_e          */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_BEETLE_e          */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_BUTTERFLY_e       */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_BUTTERFLY_e       */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_STAG_BEETLE_e     */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_STAG_BEETLE_e     */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_GRASSHOPPER_e     */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_GRASSHOPPER_e     */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_NANAFUSHI_e       */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_NANAFUSHI_e       */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_DANGOMUSHI_e      */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_DANGOMUSHI_e      */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_MANTIS_e          */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_MANTIS_e          */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_LADYBUG_e         */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_LADYBUG_e         */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_SNAIL_e           */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_SNAIL_e           */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_DRAGONFLY_e       */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_DRAGONFLY_e       */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_ANT_e             */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_ANT_e             */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_M_MAYFLY_e          */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_F_MAYFLY_e          */ SETYPE_ITEM_GET_INSECT,
-        /* dItemNo_Randomizer_NOENTRY_216_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_217_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_218_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_219_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_220_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_221_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_222_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_223_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_POU_SPIRIT_e        */ SETYPE_ITEM_GET_POU,
-        /* dItemNo_Randomizer_NOENTRY_225_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_226_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_227_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_228_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_229_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_230_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_231_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_NOENTRY_232_e       */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_ANCIENT_DOCUMENT_e  */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_AIR_LETTER_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_ANCIENT_DOCUMENT2_e */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_LV7_DUNGEON_EXIT_e  */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LINKS_SAVINGS_e     */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_SMALL_KEY2_e        */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_POU_FIRE1_e         */ SETYPE_NONE,
-        /* dItemNo_Randomizer_POU_FIRE2_e         */ SETYPE_NONE,
-        /* dItemNo_Randomizer_POU_FIRE3_e         */ SETYPE_NONE,
-        /* dItemNo_Randomizer_POU_FIRE4_e         */ SETYPE_NONE,
-        /* dItemNo_Randomizer_BOSSRIDER_KEY_e     */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_TOMATO_PUREE_e      */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_TASTE_e             */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_LV5_BOSS_KEY_e      */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_SURFBOARD_e         */ SETYPE_NONE,
-        /* dItemNo_Randomizer_KANTERA2_e          */ SETYPE_ITEM_GET_ME,
-        /* dItemNo_Randomizer_L2_KEY_PIECES1_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_L2_KEY_PIECES2_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_L2_KEY_PIECES3_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_KEY_OF_CARAVAN_e    */ SETYPE_ITEM_GET_MINI,
-        /* dItemNo_Randomizer_LV2_BOSS_KEY_e      */ SETYPE_ITEM_GET,
-        /* dItemNo_Randomizer_KEY_OF_FILONE_e     */ SETYPE_ITEM_GET_MINI,
-    };
-#endif
-
    static u32 const bgmLabel[8] = {
        Z2BGM_HEART_GET,       Z2BGM_ITEM_GET,       Z2BGM_ITEM_GET_MINI, Z2BGM_ITEM_GET_ME,
        Z2BGM_ITEM_GET_INSECT, Z2BGM_ITEM_GET_SMELL, Z2BGM_ITEM_GET_POU,  Z2BGM_ITEM_GET_ME_S,
    };

-#if TARGET_PC
-    u32 se_type = randomizer_IsActive() ? getSeTypeRandomizer[i_itemNo] : getSeType[i_itemNo];
-#else
    u32 se_type = getSeType[i_itemNo];
-#endif

    if (se_type == SETYPE_ITEM_GET_ME && mProcVar4.field_0x3010 == 0) {
        se_type = SETYPE_ITEM_GET_ME_S;
    }

-    if (se_type != SETYPE_NONE IF_DUSK(|| i_itemNo == dItemNo_Randomizer_FOOLISH_ITEM_e)) {
+    if (se_type != SETYPE_NONE) {
        mDoAud_subBgmStart(bgmLabel[se_type]);
        dComIfGp_setMesgBgmOn();
    }
@@ -2542,15 +2259,6 @@ int daAlink_c::procCoGetItemInit() {
    s16 var_r22 = 0;
    BOOL var_r31 = FALSE;
    BOOL var_r30 = FALSE;
-#if TARGET_PC
-    if (randomizer_IsActive()) {
-        // If we are giving a custom item, we want to set mParam0 to 0x100 so that instead of trying to search for an item
-        // actor that doesnt exist we want the game to create one using the item id in mGtItm.
-        if (g_randomizerState.getGiveItemToPlayerStatus() == RandomizerState::ITEM_IN_QUEUE) {
-            mDemo.setParam0(0x100);
-        }
-    }
-#endif
    if (mProcID == PROC_GET_ITEM || mProcID == PROC_INSECT_CATCH ||
        (mProcID == PROC_PREACTION_UNEQUIP && !checkNoUpperAnime()))
    {
@@ -2588,11 +2296,6 @@ int daAlink_c::procCoGetItemInit() {
        } else {
            item_no = dComIfGp_event_getGtItm();
        }
-#if TARGET_PC
-        if (randomizer_IsActive() && g_randomizerState.getGiveItemToPlayerStatus() == RandomizerState::ITEM_IN_QUEUE) {
-            g_randomizerState.setGiveItemToPlayerStatus(RandomizerState::CLEAR_QUEUE);
-        }
-#endif

        fpc_ProcID item_partner_id = fopAcM_createItemForPresentDemo(&current.pos, item_no, 0, -1,
                                                              fopAcM_GetRoomNo(this), NULL, NULL);
@@ -2820,10 +2523,8 @@ int daAlink_c::procCoGetItem() {
                    } else if (mProcVar2.field_0x300c == 0x23 && checkStageName("D_MN11")) {
                        field_0x32cc = 0x5C0;
                    } else if (mProcVar2.field_0x300c == 0xE0) {
-                        // Don't show special text in rando
-                        if (dComIfGs_getPohSpiritNum() == 20 IF_DUSK(&& !randomizer_IsActive())) {
+                        if (dComIfGs_getPohSpiritNum() == 20) {
                            field_0x32cc = 0x4CF;
-                            // Rando gives poe soul after the text, so it'll never hit this
                        } else if (dComIfGs_getPohSpiritNum() == 60) {
                            field_0x32cc = 0x4D0;
                        } else {
@@ -3304,15 +3005,6 @@ int daAlink_c::procCoDeadInit(int param_0) {
    field_0x3080 = 0;
    mProcVar5.field_0x3012 = 0x3F;
    field_0x3198 = -1;
-
-#if TARGET_PC
-    // trigger archipelago death link if applicable
-    if (dusk::archi::ArchipelagoContext::IsConnected()) {
-        dusk::archi::ArchipelagoContext::TryHandleDeathLink();
-    }
-
-#endif
-
    return 1;
 }

@@ -4322,10 +4014,6 @@ int daAlink_c::procGanonFinishInit() {
            dusk::m_speedrunInfo.stopRun();
        }
    }
-
-    if (dusk::archi::ArchipelagoContext::IsConnected()) {
-        dusk::archi::ArchipelagoContext::TryHandleGameComplete();
-    }
 #endif

    return 1;
@@ -4860,13 +4548,6 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
                        (checkItemGet(dItemNo_DUNGEON_BACK_e, 1) &&
                         strcmp(stageName, dComIfGs_getWarpStageName()) == 0))
                    {
-#if TARGET_PC
-                        // In rando, only clear the Ooccoo slot if Ooccoo is in it
-                        u8 ooccooSlot = dComIfGs_getItem(SLOT_18, false);
-                        if (!randomizer_IsActive() || ooccooSlot == dItemNo_Randomizer_DUNGEON_EXIT_e ||
-                                                      ooccooSlot == dItemNo_Randomizer_DUNGEON_EXIT_2_e ||
-                                                      ooccooSlot == dItemNo_Randomizer_LV7_DUNGEON_EXIT_e)
-#endif
                        dComIfGs_setItem(SLOT_18, dItemNo_NONE_e);
                        dComIfGs_resetLastWarpAcceptStage();
                    }
@@ -1191,19 +1191,6 @@ void daAlink_c::setLightningSwordEffect() {
            emitter = setEmitter(&field_0x327c[i], effName[i], &current.pos, &shape_angle);
            if (emitter != NULL) {
                emitter->setGlobalRTMatrix(mSwordModel->getBaseTRMtx());
-#if TARGET_PC
-                // Apply custom light sword glow if applicable
-                const auto& lightSwordGlowColor = dusk::getSettings().cosmetics.lightSwordGlowColor.getValue();
-                if (dusk::cosmetics::is_valid_hex_color_str(lightSwordGlowColor)) {
-                    GXColor color = dusk::cosmetics::hex_color_str_to_gx_color(lightSwordGlowColor);
-                    emitter->setGlobalEnvColor(color.r, color.g, color.b);
-                    emitter->setGlobalPrmColor(color.r, color.g, color.b);
-                } else if (lightSwordGlowColor == "Rainbow") {
-                    GXColor color = dusk::cosmetics::get_rainbow_rgb(127.5f);
-                    emitter->setGlobalEnvColor(color.r, color.g, color.b);
-                    emitter->setGlobalPrmColor(color.r, color.g, color.b);
-                }
-#endif
            }
        }
    } else {
@@ -18,10 +18,6 @@
 #include "c/c_damagereaction.h"
 #include <cmath>

-#if TARGET_PC
-#include "dusk/randomizer/game/tools.h"
-#endif
-
 enum B_bq_RES_File_ID {
    /* BCK */
    /* 0x07 */ BCK_BQ_APPEAR = 0x7,
@@ -900,11 +896,6 @@ static void b_bq_end(b_bq_class* i_this) {
        i_this->mMode = 1;

        int sw = fopAcM_GetParam(a_this) >> 0x18;
-#if TARGET_PC
-        if (randomizer_IsActive()) {
-            checkTransformFromWolf(); // If the player is wolf, they will softlock after the defeat cutscene is completed.
-        }
-#endif
        dComIfGs_onSwitch(sw, fopAcM_GetRoomNo(a_this));
        // fallthrough
    }
@@ -4084,15 +4084,6 @@ void daB_DS_c::executeBattle2Dead() {
            camera->mCamera.SetTrimSize(0);
            dComIfGp_event_reset();
            dComIfGs_onStageBossEnemy(0x13);
-#if TARGET_PC
-            if (randomizer_IsActive()) {
-                // Give the boss item
-                u8 agDungeonReward = randomizer_getItemAtLocation("Arbiters Grounds Dungeon Reward");
-                g_randomizerState.addItemToEventQueue(agDungeonReward);
-                // Set custom item flag
-                dComIfGs_onItem(0x9E, -1);
-            }
-#endif
            /* dSv_event_flag_c::F_0265 - Arbiter's Grounds - Arbiter's Grounds clear */
            dComIfGs_onEventBit(0x2010);
            fopAcM_delete(this);
@@ -530,33 +530,6 @@ int daDitem_c::execute() {
    }

    mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
-
-#if TARGET_PC
-    // Certain items use field models that are too big to fit in link's hands so we want to scale them down to fit.
-    if (randomizer_IsActive()) {
-        switch (m_itemNo)
-        {
-            case dItemNo_Randomizer_MIRROR_PIECE_1_e:
-            case dItemNo_Randomizer_MIRROR_PIECE_2_e:
-            case dItemNo_Randomizer_MIRROR_PIECE_3_e:
-            case dItemNo_Randomizer_MIRROR_PIECE_4_e:
-            {
-                scale.x = 0.05f;
-                break;
-            }
-            case dItemNo_Randomizer_MASTER_SWORD_e:
-            case dItemNo_Randomizer_LIGHT_SWORD_e:
-            {
-                scale.x = 0.001f;
-                break;
-            }
-            default:
-            {
-                break;
-            }
-        }
-    }
-#endif
    return 1;
 }

@@ -10,9 +10,6 @@
 #include "d/actor/d_a_midna.h"
 #include "d/d_door_param2.h"
 #include "d/actor/d_a_player.h"
-#if TARGET_PC
-#include "d/actor/d_a_alink.h"
-#endif
 #include "d/d_com_inf_game.h"
 #include "d/d_msg_object.h"
 #include "d/d_map_path_dmap.h"
@@ -316,17 +313,7 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) {
        return 1;
    }
    field_0x624.init(NULL, msgNo, 0, NULL);
-#if TARGET_PC
-    int rv = 1;
-
-    // If we are in SPR, we don't want Yeta's msg flow to prevent us from opening the door if we haven't talked to her.
-    if (randomizer_IsActive() && !daAlink_c::checkStageName("D_MN11"))
-    {
-        rv = field_0x624.checkOpenDoor(this, param_1);
-    }
-#else
    int rv = field_0x624.checkOpenDoor(this, param_1);
-#endif
    dMsgObject_endFlowGroup();
    return rv;
 }
@@ -11,11 +11,6 @@
 #include "f_op/f_op_actor_enemy.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/randomizer_context.hpp"
-#endif
-
-
 class daE_HP_HIO_c : public JORReflexible {
 public:
    daE_HP_HIO_c();
@@ -731,16 +726,11 @@ void daE_HP_c::executeDead() {
            fopAcM_onSwitch(this, bitSw);
        }

-#if TARGET_PC
-        if (randomizer_IsActive()) {
-            g_randomizerState.handlePoeItem(bitSw);
-        } else
-#endif
-            dComIfGs_addPohSpiritNum();
+        dComIfGs_addPohSpiritNum();

        field_0x784 = -1;

-        if (dComIfGs_getPohSpiritNum() == 20 IF_DUSK(&& !randomizer_IsActive())) {
+        if (dComIfGs_getPohSpiritNum() == 20) {
            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x1c9]);
        }

@@ -762,7 +752,7 @@ void daE_HP_c::executeDead() {
                    field_0x788 = 1;
                }
            }
-        } else if (field_0x788 != 0 IF_DUSK(|| randomizer_IsActive())) {
+        } else if (field_0x788 != 0) {
            fopAcM_createDisappear(this, &current.pos, 8, 3, 0xff);
            fopAcM_delete(this);
        } else {
@@ -396,10 +396,7 @@ inline int daE_MD_c::create() {
    int phase_state = dComIfG_resLoad(&mPhase, "E_MD");
    if (phase_state == cPhs_COMPLEATE_e) {
        OS_REPORT("E_MD PARAM %x\n", fopAcM_GetParam(this));
-
-        // Always create the armor in rando (otherwise ball and chain won't spawn
-        // if the player leaves and re-enters without getting it)
-        if (cDmr_SkipInfo != 0 && current.pos.z > -1500.0f IF_DUSK(&& !randomizer_IsActive())) {
+        if (cDmr_SkipInfo != 0 && current.pos.z > -1500.0f) {
            return cPhs_ERROR_e;
        }

@@ -21,10 +21,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/tools.h"
-#endif
-
 class daE_MK_HIO_c : public JORReflexible {
 public:
    virtual ~daE_MK_HIO_c() {}
@@ -1730,11 +1726,6 @@ static void demo_camera_end(e_mk_class* i_this) {
                    work.z = AREG_F(2) + -20.0f;
                    MtxPosition(&work, &pos);
                    pos += i_this->crownPos;
-                    #if TARGET_PC
-                    if (randomizer_IsActive()) {
-                        checkTransformFromWolf(); // If the player is wolf, they will void and lose the boomerang check.
-                    }
-                    #endif
                    fopAcM_createDisappear(actor, &pos, 5, 0, 0xff);
                }

@@ -14,10 +14,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/randomizer_context.hpp"
-#include "dusk/randomizer/game/tools.h"
-#endif

 static s16 mAttackNo = 3;

@@ -1136,17 +1132,11 @@ static void e_po_dead(e_po_class* i_this) {
            camera_player->mCamera.Start();
            camera_player->mCamera.SetTrimSize(0);
            dComIfGp_event_reset();
-#if TARGET_PC
-            if (!randomizer_IsActive()) {
-#endif
-                dComIfGs_addPohSpiritNum();
+            dComIfGs_addPohSpiritNum();
 #if !PLATFORM_SHIELD
-                if (dComIfGs_getPohSpiritNum() == 0x14) {
-                    /* dSv_event_flag_c::F_0457 - Castle Town - Revived cat */
-                    dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[457]);
-                }
-#endif
-#if TARGET_PC
+            if (dComIfGs_getPohSpiritNum() == 0x14) {
+                /* dSv_event_flag_c::F_0457 - Castle Town - Revived cat */
+                dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[457]);
            }
 #endif
            daPy_getPlayerActorClass()->cancelOriginalDemo();
@@ -1275,14 +1265,6 @@ static void e_po_dead(e_po_class* i_this) {
            }
        } else {
            if (i_this->field_0x75C == -1) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    u16 key = getStageID() << 8 | i_this->BitSW;
-                    u8 itemId = randomizer_GetContext().mPoeOverrides[key];
-                    i_this->field_0x75C = fopAcM_createItemForPresentDemo(&a_this->current.pos, itemId, 0,
-                                                                      -1, -1, NULL, NULL);
-                } else
-#endif
                i_this->field_0x75C = fopAcM_createItemForPresentDemo(&a_this->current.pos, 0xE0, 0,
                                                                      -1, -1, NULL, NULL);
            }
@@ -204,11 +204,7 @@ static void e_rb_move(e_rb_class* i_this) {
    spC.x = i_this->field_0xa10.x - enemy->current.pos.x;
    spC.z = i_this->field_0xa10.z - enemy->current.pos.z;

-#if AVOID_UB
-    f32 speed_target{};
-#else
    f32 speed_target;
-#endif
    switch (i_this->mode) {
    case 0:
        i_this->mode = 1;
@@ -16,10 +16,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 class daE_RDB_HIO_c : public JORReflexible {
 public:
    daE_RDB_HIO_c();
@@ -1254,12 +1250,6 @@ static void demo_camera(e_rdb_class* i_this) {
            }

            if (iVar1 != 0) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    u8 itemId = verifyProgressiveItem(randomizer_getItemAtLocation("Hyrule Castle King Bulblin Key"));
-                    daPy_getPlayerActorClass()->changeDemoMode(11, itemId, 0, 0);
-                } else // do the next line
-#endif
                daPy_getPlayerActorClass()->changeDemoMode(11, 32, 0, 0);
                i_this->mDemoMode = 12;
                i_this->field_0x10aa = 0;
@@ -9,9 +9,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/actor/d_a_player.h"
-#if TARGET_PC
-#include "d/actor/d_a_alink.h"
-#endif
 #include "d/d_com_inf_game.h"
 #include "d/d_path.h"
 #include "d/d_s_play.h"
@@ -1690,18 +1687,6 @@ static void demo_camera(e_s1_class* i_this) {
        if (i_this->mDemoTimer == 137) {
            if (!dComIfGs_isSwitch(i_this->mSwBit, fopAcM_GetRoomNo(a_this))) {
                dComIfGs_onSwitch(i_this->mSwBit, fopAcM_GetRoomNo(a_this));
-#if TARGET_PC
-                if (randomizer_IsActive() && daAlink_c::checkStageName("F_SP126")) {
-                    // We check to see if the flag being set is for the UZR portal as a safety precaution.
-                    if (i_this->mSwBit == 0x15 && g_dComIfG_gameInfo.info.getSavedata().getPlayer().getPlayerStatusA().getTransformStatus())
-                    {
-                        // Set the flag to make Iza 1 available and set the memory bit for having talked to her after opening the portal as human.
-                        dComIfGs_onEventBit(0xB02);
-                        dComIfGs_onSwitch(0x37, fopAcM_GetRoomNo(a_this));
-                    }
-                    // Note for the above stuff. This works for now. Eventually would like to adjust this to a FLW patch since I think we could accomplish similar results by having the conversation continue as normal regardless of form, but I haven't looked into it that much.
-                }
-#endif
                OS_REPORT("S! BITSW %d\n", i_this->mSwBit);
                OS_REPORT("S! BITSW %d\n", dComIfGs_isSwitch(i_this->mSwBit, fopAcM_GetRoomNo(a_this)));
            }
@@ -10,9 +10,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
+
 enum daE_TH_ACTION {
    ACTION_STOP,
    ACTION_SPIN,
@@ -933,12 +931,6 @@ static void get_demo(e_th_ball_class* i_this) {
    case 0:
        break;
    case 1:
-#if TARGET_PC
-        if (randomizer_IsActive()) {
-            u8 itemId = verifyProgressiveItem(randomizer_getItemAtLocation("Snowpeak Ruins Ball and Chain"));
-            demo_id = fopAcM_createItemForTrBoxDemo(&i_this->current.pos, itemId, -1, fopAcM_GetRoomNo(i_this), NULL, NULL);
-        } else
-#endif
        demo_id = fopAcM_createItemForTrBoxDemo(&i_this->current.pos, dItemNo_IRONBALL_e, -1, fopAcM_GetRoomNo(i_this), NULL, NULL);
        JUT_ASSERT(1670, demo_id != fpcM_ERROR_PROCESS_ID_e);
        i_this->mDemoMode = 2;
@@ -88,17 +88,8 @@ static int daKytag08_Execute(kytag08_class* i_this) {
        }
    }

-#if TARGET_PC
-    bool doFogWipe = false;
-    if (randomizer_IsActive()) {
-        doFogWipe = ((i_this->mSizeTimer < 100) || dComIfGs_BossLife_public_Get() == 1);
-    }else {
-        doFogWipe = (daPy_getPlayerActorClass()->checkKandelaarSwing(TRUE) && i_this->mSizeTimer < 100) || dComIfGs_BossLife_public_Get() == 1;
-    }
-    if (doFogWipe)
-#else
-    if ((daPy_getPlayerActorClass()->checkKandelaarSwing(TRUE) && i_this->mSizeTimer < 100) || dComIfGs_BossLife_public_Get() == 1)
-#endif
+    if ((daPy_getPlayerActorClass()->checkKandelaarSwing(TRUE) && i_this->mSizeTimer < 100) ||
+        dComIfGs_BossLife_public_Get() == 1)
    {
        dComIfGs_BossLife_public_Set(0);
        i_this->mTargetAvoidPos = i_this->current.pos;
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"

 #if TARGET_PC
-#include <aurora/texture.hpp>
 #include "dusk/dvd_asset.hpp"
 #include "dusk/frame_interpolation.h"

@@ -41,8 +40,6 @@ static f32* l_texCoord_get() { alignas(32) static f32 buf[338];   static bool _
 //#define l_pos      (l_pos_get())
 #define l_normal   (l_normal_get())
 #define l_texCoord (l_texCoord_get())
-
-static bool l_Egnd_mantTEX_hasReplacement = false;
 #else
 #include "assets/l_Egnd_mantTEX.h"

@@ -226,7 +223,6 @@ void daMant_packet_c::draw() {
        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);
-        l_Egnd_mantTEX_hasReplacement = aurora::texture::has_replacement(&mainTexObj, &tlutObj);
        textureObjsInitialized = true;
    }
 #else
@@ -640,11 +636,7 @@ static int daMant_Execute(mant_class* i_this) {
    iVar8 = 0;

    if (i_this->field_0x3967 != 0) {
-#if TARGET_PC
-        mant_cut_type = l_Egnd_mantTEX_hasReplacement ? 1 : i_this->field_0x3967;
-#else
        mant_cut_type = i_this->field_0x3967;
-#endif

        if (i_this->field_0x3968 < 15) {
            i_this->field_0x3968++;
@@ -656,18 +648,9 @@ static int daMant_Execute(mant_class* i_this) {
                iVar8 = 20;
            }

-#if TARGET_PC
-            if (l_Egnd_mantTEX_hasReplacement) {
-                unaff_r29 = i_this->mMantRng.getF(65536.0f);
-                var_f31 = i_this->mMantRng.getFX(32.0f);
-                var_f30 = i_this->mMantRng.getFX(32.0f);
-            } else
-#endif
-            {
-                unaff_r29 = cM_rndF(65536.0f);
-                var_f31 = cM_rndFX(32.0f);
-                var_f30 = cM_rndFX(32.0f);
-            }
+            unaff_r29 = cM_rndF(65536.0f);
+            var_f31 = cM_rndFX(32.0f);
+            var_f30 = cM_rndFX(32.0f);
        }

        i_this->field_0x3967 = 0;
@@ -777,8 +760,6 @@ static int daMant_Create(fopAc_ac_c* i_this) {
    if(textureObjsInitialized) {
        GXInitTlutObjData(&tlutObj, l_Egnd_mantPAL); // make sure the cached textures are updated
    }
-
-    m_this->mMantRng.init(66, 16983, 855);
 #endif

    lbl_277_bss_0 = 0;
@@ -29,7 +29,6 @@
 #include "dusk/frame_interpolation.h"
 #include "dusk/settings.h"
 #include "dusk/version.hpp"
-#include "dusk/randomizer/game/randomizer_context.hpp"
 #endif

 class dmg_rod_HIO_c : public JORReflexible {
@@ -2956,10 +2955,6 @@ static void lure_heart(dmg_rod_class* i_this) {
            if (obj_life != NULL) {
                fopAcM_delete(obj_life);
                fopAcM_onItem(obj_life, 0x80);
-#if TARGET_PC
-                // Don't give the item here in rando. We give it later when the FLW message happens
-                if (!randomizer_IsActive())
-#endif
                execItemGet(dItemNo_KAKERA_HEART_e);
                u8 eventReg = dComIfGs_getEventReg(0xECFF);
                eventReg |= (u8)0x40;
@@ -4095,10 +4090,6 @@ static void uki_catch(dmg_rod_class* i_this) {
            } else if (mgfish->mCaughtType == MG_CATCH_BIN) {
                i_this->msgflow.init(actor, 0x139A, 0, NULL);
                dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[468]);
-#if TARGET_PC
-                // Don't give the item here in rando. We give it later in the FLW Message
-                if (!randomizer_IsActive())
-#endif
                dComIfGs_setEmptyBottle();
            } else if (mgfish->mCaughtType == MG_CATCH_KN) {
                i_this->msgflow.init(actor, 0x139C, 0, NULL);
@@ -4365,8 +4356,7 @@ static void uki_main(dmg_rod_class* i_this) {
                }

                if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[468])) {
-                    // Always succeed the rng check in rando for fishing bottle
-                    if (cM_rndF(1.0f) <= 0.5f IF_DUSK(|| randomizer_IsActive())) {
+                    if (cM_rndF(1.0f) <= 0.5f) {
                        cXyz bin_pos(6800.0f, 30.0f, -270.0f);
                        bin_pos -= player->current.pos;

@@ -14,11 +14,6 @@
 #include "m_Do/m_Do_lib.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/stages.h"
-#include "dusk/randomizer/game/tools.h"
-#endif
-
 #if DEBUG
 void daNpcT_cmnListenPropertyEvent(char* param_0, int* param_1, daNpcT_HIOParam* param_2) {
    sprintf(&param_0[*param_1], "%.3ff,\t//  注目オフセット\n", param_2->attention_offset);
@@ -2891,29 +2886,6 @@ void daNpcT_offEvtBit(u32 i_no) {
 }

 BOOL daNpcT_chkEvtBit(u32 i_no) {
-#if TARGET_PC
-    if (randomizer_IsActive()) {
-        switch (i_no) {
-        case 0x153: // Checking if the player has Ending Blow
-        {
-            if (getStageID() == Hidden_Skill) {
-                return true;
-            }
-            break;
-        }
-
-        case 0x40: // Checking if the player has completed Goron Mines
-        {
-            if (getStageID() == Kakariko_Village_Interiors) {
-                return true; // Return true so Barnes will sell bombs no matter what
-            }
-            break;
-        }
-        default:
-            break;
-        }
-    }
-#endif
    return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_no]);
 }

@@ -1744,12 +1744,6 @@ int daNpc_Aru_c::cutSpeakTo(int i_staffID) {
                switch (eventId) {
                    case 1:
                        if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) {
-#if TARGET_PC
-                            if (randomizer_IsActive()) {
-                                itemNo = randomizer_getItemAtLocation("Herding Goats Reward");
-                                randomizer_setTempFlagForLocation("Herding Goats Reward");
-                            }
-#endif
                            mItemPartnerId = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
                        }

@@ -10,10 +10,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 const daNpcAshB_HIOParam daNpcAshB_Param_c::m = {
    205.0f,   // attention_offset
    -3.0f,    // gravity
@@ -1005,12 +1001,6 @@ BOOL daNpcAshB_c::EvCut_Appear(int i_staffID) {
        case '0008':
            local_30[0] = 0;
            if (mFlow.getEventId(local_30) == 1) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    local_30[0] = verifyProgressiveItem(randomizer_getItemAtLocation("Ashei Sketch"));
-                    randomizer_setTempFlagForLocation("Ashei Sketch");
-                }
-#endif
                mItemPartnerId =
                    fopAcM_createItemForPresentDemo(&current.pos, local_30[0], 0, -1, -1, 0, 0);
                dComIfGp_event_setItemPartnerId(mItemPartnerId);
@@ -618,7 +618,6 @@ BOOL daNpc_Bans_c::isDelete() {
                Delete if TYPE_MAKING_BOMBS and:
                Horseback Battle Not Cleared or Goron Mines Cleared
            */
-            IF_DUSK(if (randomizer_IsActive()) { return TRUE;}) // Always delete this type in randomizer
            return !daNpcT_chkEvtBit(85) || // dSv_event_flag_c::M_052 - Main Event - Horseback battle clear
                    daNpcT_chkEvtBit(64); // dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear

@@ -627,7 +626,6 @@ BOOL daNpc_Bans_c::isDelete() {
                Delete if TYPE_SHOP and:
                Goron Mines Cleared
            */
-            IF_DUSK(if (randomizer_IsActive()) { return FALSE;}) // Never delete this type in randomizer
            return !daNpcT_chkEvtBit(64); // dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear

        default:
@@ -1034,9 +1034,8 @@ bool daNpcBouS_c::wait(void* param_1) {
                    mTurnMode = 0;
                }
            }
-            
-            // In randomizer, we don't want bo to try and talk to us once the chest has been opened.
-            if (IF_DUSK(!randomizer_IsActive() &&) !checkItemGet(dItemNo_HVY_BOOTS_e, 1) && dComIfGs_isTbox(2)) {
+
+            if (!checkItemGet(dItemNo_HVY_BOOTS_e, 1) && dComIfGs_isTbox(2)) {
                mForcibleTalk = 1;
            }

@@ -1804,17 +1804,6 @@ int daNpcChin_c::_Evt_GameSucceed_CutMain(const int& param_0) {
                itemId1 = 0;
            }

-#if TARGET_PC
-            if (randomizer_IsActive()) {
-                if (itemId1 == dItemNo_ARROW_LV2_e) {
-                    itemId1 = randomizer_getItemAtLocation("STAR Prize 1");
-                    randomizer_setTempFlagForLocation("STAR Prize 1");
-                } else if (itemId1 == dItemNo_ARROW_LV3_e) {
-                    itemId1 = randomizer_getItemAtLocation("STAR Prize 2");
-                    randomizer_setTempFlagForLocation("STAR Prize 2");
-                }
-            }
-#endif
            fpc_ProcID itemId2 = fopAcM_createItemForPresentDemo(&current.pos, itemId1, 0, -1, -1,
                                                                 0, 0);
            if (itemId2 != -1) {
@@ -11,10 +11,6 @@
 #include "JSystem/JHostIO/JORFile.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 enum fairy_RES_File_ID {
    /* BCK */
    /* 0x09 */ BCK_FAIRY_F_SAD = 0x9,
@@ -1273,7 +1269,7 @@ void daNpc_Fairy_c::AppearDemoCall() {
            } else {
                mEvtNo = EVT_APPEAR_50F_02;
            }
-        } else if (dComIfGs_checkEmptyBottle() IF_DUSK(|| randomizer_IsActive())) {
+        } else if (dComIfGs_checkEmptyBottle()) {
            mEvtNo = EVT_APPEAR_50F_01;
        } else {
            mEvtNo = EVT_APPEAR_50F_04;
@@ -1337,14 +1333,6 @@ void daNpc_Fairy_c::PresentDemoCall() {
        item_no = 0;
    }

-#if TARGET_PC
-    // If we haven't visted this great fairy before, give the random item
-    if (randomizer_IsActive() && !daNpcT_chkEvtBit(505)) {
-        item_no = verifyProgressiveItem(randomizer_getItemAtLocation("Cave of Ordeals Great Fairy Reward"));
-        randomizer_setTempFlagForLocation("Cave of Ordeals Great Fairy Reward");
-    }
-#endif
-
    fpc_ProcID id = fopAcM_createItemForPresentDemo(&current.pos, item_no, 0, -1, -1, NULL, NULL);
    if (id != fpcM_ERROR_PROCESS_ID_e) {
        dComIfGp_event_setItemPartnerId(id);
@@ -14,10 +14,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 const daNpc_grA_HIOParam daNpc_grA_Param_c::m = {
    {90.0f,  -4.0f,  1.0f,   850.0f,  255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f,
     -20.0f, 40.0f,  -30.0f, 40.0f,   -40.0f, 0.4f,   12.0f, 4,      6,    6,    6,
@@ -4022,14 +4018,6 @@ BOOL daNpc_grA_c::talk(void*) {
        }
        if (r26 && talkProc(NULL, TRUE, NULL)) {
            if (mFlow.getEventId(&sp8) == 1) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    // Give the randomized underwater goron item
-                    if (sp8 == dItemNo_Randomizer_BOMB_IN_BAG_e) {
-                        sp8 = verifyProgressiveItem(randomizer_getItemAtLocation("Zoras Domain Underwater Goron"));
-                    }
-                }
-#endif
                field_0x1480 =
                    fopAcM_createItemForPresentDemo(&current.pos, sp8, 0, -1, -1, NULL, NULL);
                if (field_0x1480 != fpcM_ERROR_PROCESS_ID_e) {
@@ -13,10 +13,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 enum grO_RES_File_ID {
    /* BCK */
    /* 0x07 */ BCK_GRO_F_TALK_A = 0x7,
@@ -1685,12 +1681,6 @@ int daNpc_grO_c::talk(void* param_1) {
            if (facePlayerFlag && talkProc(NULL, TRUE, NULL)) {
                if (mType == TYPE_MINES) {
                    if (mFlow.getEventId(&itemId) == 1) {
-#if TARGET_PC
-                        if (randomizer_IsActive()) {
-                            itemId = verifyProgressiveItem(randomizer_getItemAtLocation("Goron Mines Gor Ebizo Key Shard"));
-                            randomizer_setTempFlagForLocation("Goron Mines Gor Ebizo Key Shard");
-                        }
-#endif
                        mItemID = fopAcM_createItemForPresentDemo(&current.pos, itemId, 0, -1, -1, NULL, NULL);
                        if (mItemID != fpcM_ERROR_PROCESS_ID_e) {
                            s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
@@ -10,10 +10,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 enum grR_RES_File_ID {
    /* BCK */
    /* 0x06 */ BCK_GRR_AGURA_GETUP = 0x6,
@@ -1342,12 +1338,6 @@ int daNpc_grR_c::talk(void* param_1) {
            if (bVar1 && talkProc(NULL, TRUE, NULL)) {
                if (mType == TYPE_0) {
                    if (mFlow.getEventId(&i_itemNo) == 1) {
-#if TARGET_PC
-                        if (randomizer_IsActive()) {
-                            i_itemNo = verifyProgressiveItem(randomizer_getItemAtLocation("Goron Mines Gor Liggs Key Shard"));
-                            randomizer_setTempFlagForLocation("Goron Mines Gor Liggs Key Shard");
-                        }
-#endif
                        mItemID = fopAcM_createItemForPresentDemo(&current.pos, i_itemNo, 0, -1, -1, NULL, NULL);

                        if (mItemID != fpcM_ERROR_PROCESS_ID_e) {
@@ -11,9 +11,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
 enum Event_Cut_Nums {
    NUM_EVT_CUTS_e = 2,
 };
@@ -1193,12 +1190,6 @@ int daNpc_grS_c::talk(void* param_0) {
        if (unkFlag1 && talkProc(NULL, 1, NULL)) {
            if (mType == 0) {
                if (mFlow.getEventId(&unkInt2) == 1) {
-#if TARGET_PC
-                    if (randomizer_IsActive()) {
-                        unkInt2 = verifyProgressiveItem(randomizer_getItemAtLocation("Goron Mines Gor Amato Key Shard"));
-                        randomizer_setTempFlagForLocation("Goron Mines Gor Amato Key Shard");
-                    }
-#endif
                    mPresentItemId =
                        fopAcM_createItemForPresentDemo(&current.pos, unkInt2, 0, -1, -1, 0, 0);

@@ -9,10 +9,6 @@
 #include "d/actor/d_a_npc.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 daNpcImpal_HIOParam const daNpcImpal_Param_c::m = {
    135.0f,        // attention_offset
    -3.0f,         // gravity
@@ -975,12 +971,6 @@ BOOL daNpcImpal_c::EvCut_ImpalAppear1(int i_cut_index) {
        if (talkProc(NULL, 1, NULL)) {
            int evt_id = 0;
            if (mFlow.getEventId(&evt_id) == 1) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    evt_id = verifyProgressiveItem(randomizer_getItemAtLocation("Ilia Charm"));
-                    randomizer_setTempFlagForLocation("Ilia Charm");
-                }
-#endif
                mItemPartnerId =
                    fopAcM_createItemForPresentDemo(&current.pos, evt_id, 0, -1, -1, 0, 0);
                if (mItemPartnerId != 0xffffffff) {
@@ -1070,12 +1060,6 @@ BOOL daNpcImpal_c::EvCut_CopyRod(int i_cut_index) {
        case '0003':
            int evt_id = 0;
            if (mFlow.getEventId(&evt_id) == 1) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    evt_id = verifyProgressiveItem(randomizer_getItemAtLocation("Skybook From Impaz"));
-                    randomizer_setTempFlagForLocation("Skybook From Impaz");
-                }
-#endif
                mItemPartnerId =
                    fopAcM_createItemForPresentDemo(&current.pos, evt_id, 0, -1, -1, 0, 0);
                dComIfGp_event_setItemPartnerId(mItemPartnerId);
@@ -11,13 +11,6 @@
 #include "d/d_msg_object.h"
 #include <cstring>

-
-
-#if TARGET_PC
-#include "dusk/randomizer/game/randomizer_context.hpp"
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 enum Ins_RES_File_ID {
    /* BCK */
    /* 0x06 */ BCK_INS_F_HAPPY = 0x6,
@@ -299,10 +292,6 @@ daNpcIns_c::eventFunc daNpcIns_c::mEvtSeqList[1] = {
    NULL,
 };

-#if TARGET_PC
-u8 daNpcIns_c::mGivenInsectId = 0xFF;
-#endif
-
 static insect_param_data const l_insectParams[24] = {
    {0x0191, 0x709, 0, 0},
    {0x0192, 0x709, 0, 0},
@@ -1270,9 +1259,6 @@ int daNpcIns_c::waitPresent(void* param_1) {
                    daPy_py_c* player = daPy_getPlayerActorClass();
                    player->changeOriginalDemo();
                    player->changeDemoMode(0x25, 2, type, 0);
-#if TARGET_PC
-                    mGivenInsectId = type;
-#endif
                } else {
                    mInsectMsgNo = 0x719;
                }
@@ -1501,14 +1487,6 @@ int daNpcIns_c::talk(void* param_1) {
                        OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventID, itemNo);

                        if (eventID == 1) {
-#if TARGET_PC
-                            // In rando, get the randomzied bug reward
-                            if (randomizer_IsActive()) {
-                                itemNo = randomizer_GetContext().mBugRewardOverrides[mGivenInsectId];
-                                itemNo = static_cast<int>(verifyProgressiveItem(itemNo));
-                                mGivenInsectId = 0xFF;
-                            }
-#endif
                            mItemID = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);

                            if (mItemID != fpcM_ERROR_PROCESS_ID_e) {
@@ -9,10 +9,6 @@
 #include "d/actor/d_a_e_ym.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 static DUSK_CONSTEXPR int l_bmdData[2][2] = {
    {35, 1},
    {18, 2},
@@ -1185,16 +1181,6 @@ int daNpc_Kkri_c::talk(void*) {
                    switch (eventId) {
                    case 1:
                        if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) {
-#if TARGET_PC
-                            if (randomizer_IsActive()) {
-                                if (item_no == dItemNo_OIL_BOTTLE3_e) {
-                                    item_no = verifyProgressiveItem(randomizer_getItemAtLocation("Coro Bottle"));
-                                    randomizer_setTempFlagForLocation("Coro Bottle");
-                                } /*else if (item_no == dItemNo_SMALL_KEY_e) { // Might be Small Key 2
-                                    item_no = verifyProgressiveItem(randomizer_getItemAtLocation("Coro Gate Key"));
-                                }*/
-                            }
-#endif
                            mItemPartnerId = fopAcM_createItemForPresentDemo(&current.pos, item_no, 0, -1, -1, NULL, NULL);
                        }

@@ -9,10 +9,6 @@
 #include "d/actor/d_a_tag_push.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 enum Type {
    /* 0x0 */ TYPE_0,
    /* 0x1 */ TYPE_1,
@@ -1240,12 +1236,6 @@ int daNpc_Len_c::talk(void* param_0) {
                    switch (evt_id) {
                    case 1:
                        if (mItemPartnerId == -1) {
-#if TARGET_PC
-                            if (randomizer_IsActive()) {
-                                local_18 = verifyProgressiveItem(randomizer_getItemAtLocation("Renados Letter"));
-                                randomizer_setTempFlagForLocation("Renados Letter");
-                            }
-#endif
                            mItemPartnerId = fopAcM_createItemForPresentDemo(&current.pos, local_18,
                                                                             0, -1, -1, 0, 0);
                        }
@@ -17,9 +17,6 @@
 #include "d/d_com_static.h"
 #include "d/d_item.h"
 #include "d/d_timer.h"
-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
 #if DEBUG
 #include "d/d_debug_viewer.h"
 #include <cstring>
@@ -2396,11 +2393,6 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
                    switch (evt_ret) {
                        case 1: {
                            if (mItemPartnerId == -1) {
-#if TARGET_PC
-                                if (randomizer_IsActive()) {
-                                    evt_id = verifyProgressiveItem(randomizer_getItemAtLocation("Talo Sharpshooting"));
-                                }
-#endif
                                mItemPartnerId = fopAcM_createItemForPresentDemo(&current.pos, evt_id, 0, -1, -1, NULL, NULL);
                            }

@@ -11,10 +11,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 enum {
    NUM_EVT_CUTS_e = 5,
 };
@@ -1195,12 +1191,6 @@ int daNpc_myna2_c::ECut_gameGoalSuccess(int i_staffId) {
        case 20: {
            int itemNo = 0;
            if (mFlow.getEventId(&itemNo) == 1) {
-#if TARGET_PC
-                // If plumm tries giving us the heart piece, give the randomized item instead
-                if (randomizer_IsActive() && itemNo == dItemNo_KAKERA_HEART_e) {
-                    itemNo = verifyProgressiveItem(randomizer_getItemAtLocation("Plumm Fruit Balloon Minigame"));
-                }
-#endif
                mItemPid = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
            }
            break;
@@ -8,12 +8,6 @@
 #include "d/actor/d_a_npc_pouya.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/flags.h"
-#include "dusk/randomizer/game/randomizer_context.hpp"
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 const daNpc_Pouya_HIOParam daNpc_Pouya_Param_c::m = {
    120.0f,  // attention_offset
    -3.0f,   // gravity
@@ -560,8 +554,7 @@ BOOL daNpc_Pouya_c::checkChangeEvt() {
                    evtChange();
                    return TRUE;
                }
-                // In randomizer, only get the 60 reward if we've already gotten the 20 reward
-                if (dComIfGs_getPohSpiritNum() >= 60 IF_DUSK(&& randomizer_IsActive() && dComIfGs_isEventBit(GOT_BOTTLE_FROM_JOVANI))) {
+                if (dComIfGs_getPohSpiritNum() >= 60) {
                    /* dSv_event_flag_c::F_0458 - Coversation with Jovani after collecting 60 ghosts
                     */
                    if (!daNpcT_chkEvtBit(0x1CA)) {
@@ -965,17 +958,6 @@ int daNpc_Pouya_c::cutHaveFavorToAsk(int param_0) {
                switch (evt_id) {
                case 1:
                    if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) {
-#if TARGET_PC
-                        if (randomizer_IsActive()) {
-                            if (local_64 == dItemNo_Randomizer_DROP_BOTTLE_e) {
-                                local_64 = verifyProgressiveItem(randomizer_getItemAtLocation("Jovani 20 Poe Soul Reward"));
-                                randomizer_setTempFlagForLocation("Jovani 20 Poe Soul Reward");
-                            } else if (local_64 == dItemNo_Randomizer_SILVER_RUPEE_e) {
-                                local_64 = verifyProgressiveItem(randomizer_getItemAtLocation("Jovani 60 Poe Soul Reward"));
-                                randomizer_setTempFlagForLocation("Jovani 60 Poe Soul Reward");
-                            }
-                        }
-#endif
                        mItemPartnerId = fopAcM_createItemForPresentDemo(&current.pos, local_64, 0,
                                                                         -1, -1, 0, 0);
                    }
@@ -7,9 +7,6 @@

 #include "d/actor/d_a_npc_prayer.h"
 #include "d/d_com_inf_game.h"
-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif

 static NPC_PRAY_HIO_CLASS l_HIO;

@@ -723,12 +720,6 @@ fpc_ProcID daNpcPray_c::createHeart() {
    mDoMtx_stack_c::ZXYrotS(rot);
    mDoMtx_stack_c::multVec(&offset, &offset);
    pos += offset;
-#if TARGET_PC
-    if (randomizer_IsActive()) {
-        u8 itemId = verifyProgressiveItem(randomizer_getItemAtLocation("Charlo Donation Blessing"));
-        return fopAcM_createItemForBoss(&pos, itemId, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0);
-    }
-#endif
    return fopAcM_createItemForBoss(&pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0);
 }

@@ -10,11 +10,6 @@
 #include "d/d_debug_viewer.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#include "dusk/randomizer/game/flags.h"
-#endif
-
 static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[29] = {
    {-1, 2, 0},
    {9, 0, 0},
@@ -199,12 +194,7 @@ int daNpcRafrel_c::Create() {

        mType = 0;
    } else if (strcmp(dComIfGp_getStartStageName(), "F_SP115") == 0 && dComIfGp_getStartStageRoomNo() == 0) {
-#if TARGET_PC
-        // Only despawn Auru in randomizer if we already collected his item
-        if ((randomizer_IsActive() ? dComIfGs_isEventBit(GOT_AURUS_MEMO) : daNpcF_chkEvtBit(0x169)) || !daNpcF_chkEvtBit(0x108)) {
-#else
-        if ( daNpcF_chkEvtBit(0x169) || !daNpcF_chkEvtBit(0x108)) {
-#endif
+        if (daNpcF_chkEvtBit(0x169) || !daNpcF_chkEvtBit(0x108)) {
            return cPhs_ERROR_e;
        }

@@ -1320,12 +1310,6 @@ bool daNpcRafrel_c::talk(void* param_0) {
                OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventId, itemNo);

                if (eventId == 1) {
-#if TARGET_PC
-                    if (randomizer_IsActive()) {
-                        itemNo = verifyProgressiveItem(randomizer_getItemAtLocation("Auru Gift To Fyer"));
-                        randomizer_setTempFlagForLocation("Auru Gift To Fyer");
-                    }
-#endif
                    field_0xe00 = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
                    if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e) {
                        s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
@@ -1578,12 +1562,6 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) {
            int itemNo = 0;
            u16 eventId = mFlow.getEventId(&itemNo);
            if (eventId == 1) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    itemNo = verifyProgressiveItem(randomizer_getItemAtLocation("Auru Gift To Fyer"));
-                    randomizer_setTempFlagForLocation("Auru Gift To Fyer");
-                }
-#endif
                field_0xe00 = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
                dComIfGp_event_setItemPartnerId(field_0xe00);
                field_0xe00 = fpcM_ERROR_PROCESS_ID_e;
@@ -356,25 +356,15 @@ cPhs_Step daNpcShad_c::Create() {
        mMode = 0;
    } else {
        if (strcmp(dComIfGp_getStartStageName(), "R_SP209") == 0) {
-#if TARGET_PC
-            if ((daNpcF_chkEvtBit(0x311) && !randomizer_IsActive()) ||
-                (daNpcF_chkEvtBit(0x333) && randomizer_IsActive())) { // Check custom flag before spawning
-#else
            if (daNpcF_chkEvtBit(0x311)) {
-#endif
                return cPhs_ERROR_e;
            }

-#if TARGET_PC
-            if (!randomizer_IsActive() &&
-                (!daNpcF_chkEvtBit(0x10B) || (daNpcF_chkEvtBit(0x12E) && !daNpcF_chkEvtBit(0x31C)))) {
-#else
            if (!daNpcF_chkEvtBit(0x10B) || (daNpcF_chkEvtBit(0x12E) && !daNpcF_chkEvtBit(0x31C))) {
-#endif
                return cPhs_ERROR_e;
            }

-            if (daNpcF_chkEvtBit(0x12F) IF_DUSK(&& !randomizer_IsActive())) {
+            if (daNpcF_chkEvtBit(0x12F)) {
                if (!daNpcF_chkEvtBit(0x312)) {
                    if (getPathPoint(getPathID(), 1, &home.pos)) {
                        current.pos = home.pos;
@@ -1346,8 +1336,7 @@ bool daNpcShad_c::wait_type1(void* param_1) {
                        }

                        u8 sVar1 = dComIfGp_event_getPreItemNo();
-                        // In randomizer we want Shad to give us the dominion rod check no matter which skybook we have.
-                        if (sVar1 == 0xE9 IF_DUSK(|| (randomizer_IsActive() && sVar1 >= 0xE9))) {
+                        if (sVar1 == 0xE9) {
                            field_0xe14 = 64;
                            daNpcF_offTmpBit(0xB);
                            daNpcF_offTmpBit(0xC);
@@ -1355,7 +1344,7 @@ bool daNpcShad_c::wait_type1(void* param_1) {
                            daNpcF_offTmpBit(0xE);
                            mOrderEvtNo = 3;
                            changeEvent(l_evtArcs[mOrderEvtNo], l_evtNames[mOrderEvtNo], 1, 0xFFFF);
-                        } else if (sVar1 == 0xEB IF_DUSK(&& !randomizer_IsActive())) {
+                        } else if (sVar1 == 0xEB) {
                            field_0xe14 = 65;
                            daNpcF_offTmpBit(0xB);
                            daNpcF_offTmpBit(0xC);
@@ -12,10 +12,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/randomizer/game/verify_item_functions.h"
-#endif
-
 const daNpcThe_HIOParam daNpcThe_Param_c::m = {
    220.0f,   // attention_offset
    -3.0f,    // gravity
@@ -827,11 +823,6 @@ BOOL daNpcThe_c::talk(void* param_0) {
                    }
                    int item_no = 0;
                    if (mFlow.getEventId(&item_no) == 1) {
-#if TARGET_PC
-                        if (randomizer_IsActive()) {
-                            item_no = verifyProgressiveItem(randomizer_getItemAtLocation("Telma Invoice"));
-                        }
-#endif
                        mItemID = fopAcM_createItemForPresentDemo(&current.pos, item_no, 0, -1, -1,
                                                                  NULL, NULL);
                        if (mItemID != -1) {
@@ -1165,12 +1165,6 @@ int daNpc_Uri_c::cutEndCarryTutorial(int param_1) {
            (s32)mFlow.getEventId(&local_48) == 1)
        {
            if (mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) {
-#if TARGET_PC
-                if (randomizer_IsActive()) {
-                    local_48 = randomizer_getItemAtLocation("Uli Cradle Delivery");
-                    randomizer_setTempFlagForLocation("Uli Cradle Delivery");
-                }
-#endif
                mItemPartnerId =
                    fopAcM_createItemForPresentDemo(&current.pos, local_48, 0, -1, -1, NULL, NULL);
            }
@@ -9,10 +9,7 @@
 #include "d/actor/d_a_demo_item.h"
 #include <cstring>

-#if TARGET_PC
 #include "dusk/string.hpp"
-#include "dusk/randomizer/game/tools.h"
-#endif

 static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdData[3] = {
    {3, 1},
@@ -1129,11 +1126,6 @@ BOOL daNpc_Yelia_c::cutTakeWoodStatue(int i_staffId) {
            if (prm == 99) {
                daNpcT_onEvtBit(0x11f);
                daNpcT_onEvtBit(0x17a);
-                #if TARGET_PC
-                if (randomizer_IsActive()) {
-                    offWarashibeItem(dItemNo_Randomizer_WOOD_STATUE_e); // Unset the statue item so it doesn't appear in the item wheel.
-                } else
-                #endif
                dComIfGs_setWarashibeItem(0xff);
                daNpcT_offTmpBit(0xb);
                daNpcT_offTmpBit(0xc);
@@ -947,9 +947,6 @@ BOOL daNpc_ykM_c::isDelete() {
            return FALSE;

        case TYPE_COOK:
-#if TARGET_PC
-            if (randomizer_IsActive()) return false; // We don't want cooking Yeto to leave the dungeon, even if the BK is obtained.
-#endif
            return dComIfGs_isDungeonItemBossKey();

        case TYPE_2:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Luke Street	a5de0c276a	Merge remote-tracking branch 'origin/main' into mods # Conflicts: # CMakeLists.txt # src/dusk/config.cpp	2026-06-25 22:29:50 -07:00
Luke Street	b6f0e104bd	Merge remote-tracking branch 'origin/main' into mods # Conflicts: # CMakeLists.txt # include/dusk/gx_helper.h	2026-06-06 09:44:35 -06:00
PJB3005	66aca3b69d	Fix string copy in LocateDllInBundle	2026-05-31 16:36:13 +02:00
PJB3005	bd09eea0f3	Disallow consecutive periods in mod IDs Avoid config shenanigans	2026-05-31 16:35:28 +02:00
PJB3005	531313120f	Merge branch 'main' into mods	2026-05-31 16:23:01 +02:00
PJB3005	fd26670b0e	Remove unused include from mod_loader.hpp This was for the code mods toggle before I moved the checking logic to CMake.	2026-05-29 09:56:47 +02:00
PJB3005	c83cc3b971	Horrible C++ template nightmares (fix clang-tidy warning about int conversions with ranges)	2026-05-29 05:47:12 +02:00
PJB3005	8c713d4535	Fix prelaunch animation timings oops	2026-05-29 05:22:12 +02:00
PJB3005	183e7669c2	Add mods button to prelaunch UI Fixes https://github.com/TwilitRealm/dusklight/issues/1904	2026-05-29 05:09:10 +02:00
PJB3005	f38514db79	Mods can be disabled by config We now register a CVar for mod enablement for each mod. Also made LoadedMod stored in unique_ptr because we keep pointers to them already, and I'm entirely uncomfortable with keeping pointers to the vector directly.	2026-05-29 04:59:42 +02:00
PJB3005	3792912ad1	Allow CVars to be registered late, improve usability for dynamically registered CVars. Now we store the raw JSON value in memory for unregistered CVars. Intended to be used for mod CVars, as we obviously can't statically define all of those. CVar names are now stored as an std::string, so the lifetime is easy to manage when dynamically registered. CVars cannot be moved/copied anymore. We had some code that was accidentally relying on this, and I fixed that.	2026-05-29 04:38:24 +02:00
PJB3005	d9795f4098	Validate that mod IDs have a restricted character set. Avoid funny business.	2026-05-29 02:43:00 +02:00
PJB3005	87d56be232	Improve native mod load failure diagnostics	2026-05-29 02:29:50 +02:00
PJB3005	be2924b509	Replace DuskLog uses with local log for modloader	2026-05-29 01:59:12 +02:00
PJB3005	be3e6b80eb	Move code mod API to separate C++ file	2026-05-29 01:55:26 +02:00
PJB3005	10c310f7b1	Merge branch 'main' into mods	2026-05-29 01:38:13 +02:00
PJB3005	5f0c44eb84	Don't force symbol export if code mods disabled Allows us to re-enable PCH on RmlUI. We'll likely need to rethink how this works anyways IMO.	2026-05-29 01:25:03 +02:00
PJB3005	b88a5e4ac3	Allow code mods to be disabled on build, disable them by default for now.	2026-05-29 00:37:13 +02:00
PJB3005	af6ca3c80c	Merge remote-tracking branch 'upstream/main' into mods	2026-05-28 00:41:11 +02:00
PJB3005	9973a28154	EntryNum assignment for new aurora API changes	2026-05-28 00:40:05 +02:00
PJB3005	358d218e8f	Fix Windows Unicode paths in disk mods oops	2026-05-28 00:17:25 +02:00
Ash	0692fa5423	wip: load other shared library formats (#1790 )	2026-05-24 15:23:38 -06:00
PJB3005	40f49a8615	Merge branch 'main' into mods	2026-05-16 18:13:39 +02:00
PJB3005	fb9ffb444a	Allow non-code mods to exist	2026-05-15 23:46:41 +02:00
PJB3005	9823ca7c4a	Split native mod stuff out of LoadedMod	2026-05-15 23:37:23 +02:00
PJB3005	32069d936c	Make native module handles a special type We love RAII	2026-05-15 23:11:29 +02:00
PJB3005	3f018204b6	Add mod IDs to mod json Each mod must have a unique ID	2026-05-15 22:40:46 +02:00
PJB3005	012b54b325	Use fs_path_to_string instead of .string() Unicode fixes	2026-05-15 22:04:22 +02:00
PJB3005	42d412a06e	Mod file overlay system Mods can now replace DVD files with contents of their "overlay" folder (I'll update the docs later when I do a full pass and make non-code mods more of a first-class citizen) Fixes https://github.com/TwilitRealm/dusklight/issues/1306	2026-05-15 21:04:48 +02:00
PJB3005	37e5b7409d	Move mod init earlier Probably necessary if we're gonna be replacing game files etc	2026-05-15 21:01:13 +02:00
PJB3005	cfc0fbc342	Allow mods to be loaded from extracted disk files Also just some code cleanup	2026-05-14 20:42:20 +02:00
PJB3005	3e84c65657	Fix mod SDK being broken due to rebrand	2026-05-14 20:41:49 +02:00
PJB3005	08cbaff57b	Merge branch 'main' into mods	2026-05-14 17:08:10 +02:00
PJB3005	d85718f802	Merge remote-tracking branch 'upstream/main' into mods	2026-05-13 17:26:22 +02:00
PJB3005	925bb069d9	Merge remote-tracking branch 'upstream/main' into mods	2026-05-13 17:25:29 +02:00
madeline	b2871054a6	address review, rmlui, better api, catmod	2026-05-11 02:55:11 -07:00
madeline	5bead49902	fix pch conflict	2026-05-10 18:07:05 -07:00
madeline	4175d9c7f4	Merge branch 'main' of https://github.com/TakaRikka/dusk into mods	2026-05-10 16:50:36 -07:00
Luke Street	0d6b47ac73	Move mods menu after tools	2026-04-24 11:56:31 -06:00
Luke Street	1fb5d1ee2a	Set FUNCHOOK_INSTALL=OFF	2026-04-24 10:29:05 -06:00
Luke Street	c042de8a55	Restore DUSK_BUILDING_GAME=1	2026-04-24 10:12:52 -06:00
Luke Street	e25a1f3ef6	Move mods to config dir & updates for macOS	2026-04-24 09:52:04 -06:00
Luke Street	b7f9bc91b4	Merge remote-tracking branch 'origin/main' into mods # Conflicts: # CMakeLists.txt	2026-04-24 01:37:37 -06:00
madeline	3281c64a55	more precise link debug info	2026-04-23 06:01:28 -07:00
madeline	fb08cfcc6b	handle hook conflicts	2026-04-23 05:17:15 -07:00
madeline	99fb2b89ce	DUSK_REQUIRE_API_VERSION	2026-04-23 04:52:16 -07:00
madeline	53573eb795	inter mod communication	2026-04-23 04:49:21 -07:00
madeline	975ab1dc54	i fugged up the merge	2026-04-23 03:07:44 -07:00
madeline	9d10a48329	i fugged up the merge	2026-04-23 03:07:00 -07:00
madeline	52a067e412	Merge branch 'main' into mods	2026-04-23 02:20:13 -07:00
madeline	5dcbca392d	fix turbo key getting stuck on	2026-04-20 09:51:33 -07:00
madeline	ba906150d4	another attempt	2026-04-20 08:20:08 -07:00
madeline	e5c7dfdedd	maybe fix apple ci idk this shit is giga fucked	2026-04-20 08:04:05 -07:00
madeline	02a4e213e3	again	2026-04-20 07:57:21 -07:00
madeline	394627cd47	remove low level hook info	2026-04-20 07:56:09 -07:00
madeline	e7081f770a	modding.md, test mod, template mod, better imgui context	2026-04-20 07:52:35 -07:00
madeline	8356eff4ce	fix apple ci	2026-04-20 05:24:46 -07:00
madeline	3597cb1bd6	incredibly scuffed funchook patching	2026-04-20 05:22:03 -07:00
madeline	507616015e	fix CI cmake	2026-04-20 04:25:17 -07:00
madeline	db20632130	Merge remote-tracking branch 'origin/main' into mods	2026-04-20 04:18:41 -07:00
madeline	22d906a248	mod loader	2026-04-20 04:17:42 -07:00