Recording Mode & Enable Autosave in Dusk preset (#685 )

* branch for recording without a HUD * no more black bars thanks maddie * Backslash hotkey * mute music * dont check for null twice * renamed option to recording mode, and added it to the rmlui menu * Move recording mode to Interface * re-added & renamed minimal hud option * Mute all BGM if recording mode is on * Update Interface section * Un-experimentalize Autosave & enable in Dusk preset --------- Co-authored-by: MelonSpeedruns <melonspeedruns@stratobox.net> Co-authored-by: Irastris <irastris15@gmail.com> Co-authored-by: Luke Street <luke@street.dev>
Add missing climits include
2026-07-04 11:19:58 -04:00 · 2026-05-07 23:26:22 -06:00 · 2026-05-07 22:24:31 -07:00 · 2026-05-07 23:10:23 -06:00 · 2026-05-07 23:09:25 -06:00 · 2026-05-07 23:05:08 -06:00
149 changed files with 11174 additions and 6200 deletions
@@ -102,6 +102,7 @@ set(AURORA_ENABLE_DVD ON CACHE BOOL "Enable DVD API support" FORCE)
 set(AURORA_ENABLE_CARD ON CACHE BOOL "Enable CARD API support" FORCE)
 set(AURORA_ENABLE_RMLUI ON CACHE BOOL "Enable RmlUi UI support" FORCE)
 add_subdirectory(extern/aurora EXCLUDE_FROM_ALL)
+target_compile_definitions(aurora_mtx PRIVATE MTX_USE_PS=1)

 add_subdirectory(libs/freeverb)

@@ -285,7 +286,7 @@ set(DUSK_COPYRIGHT "Copyright (C) Twilit Realm contributors")
 source_group("dolzel" FILES ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${REL_FILES})
 source_group("dusk" FILES ${DUSK_FILES})

-set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0)
+set(GAME_COMPILE_DEFS TARGET_PC WIDESCREEN_SUPPORT=1 AVOID_UB=1 VERSION=0 MTX_USE_PS=1)

 set(GAME_INCLUDE_DIRS
    include
@@ -297,8 +298,10 @@ set(GAME_INCLUDE_DIRS
    extern
    ${CMAKE_BINARY_DIR})

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

 list(APPEND GAME_LIBS libzstd_static)

@@ -320,46 +323,13 @@ if (DUSK_MOVIE_SUPPORT)
    list(APPEND GAME_COMPILE_DEFS MOVIE_SUPPORT=1)
 endif ()

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

 # Edit & Continue
@@ -1,37 +1,55 @@
-![DuskLogo](res/logo-mascot.png)
+<div align="center">
+  <img src="res/logo-mascot.png" alt="Logo" width="640">

- ### **[Official Website](https://twilitrealm.dev)**
- ### **[Discord](https://discord.gg/QACynxeyna)**
+  <p align="center">
+    <a href="https://twilitrealm.dev">Official Website</a>
+    •
+    <a href="https://discord.gg/QACynxeyna">Discord</a>
+  </p>
+</div>

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

 # Setup
-**⚠️ Dusk does NOT provide any copyrighted assets. You must provide your own copy of the game.**

-### 1. Verify your ROM dump
-First make sure your dump of the game is clean and supported by Dusk. You can do this by checking the sha1 hash of your dump against this list of supported versions.
+> [!IMPORTANT]
+> Dusk does *not* provide any copyrighted assets. You must provide your own copy of the original game.

-| Version      | sha1 hash                                |
-|--------------| ---------------------------------------- |
-| GameCube USA | 75edd3ddff41f125d1b4ce1a40378f1b565519e7 |
-| GameCube PAL | 2601822a488eeb86fb89db16ca8f29c2c953e1ca |
+### 1. Verify your dump
+
+First, make sure your dump of the game is clean and supported by Dusk. You can do this by checking the SHA-1 hash of your dump against this list of supported versions:
+
+| Version      | SHA-1 hash                                 |
+|--------------| ------------------------------------------ |
+| GameCube USA | `75edd3ddff41f125d1b4ce1a40378f1b565519e7` |
+| GameCube EUR | `2601822a488eeb86fb89db16ca8f29c2c953e1ca` |

 ### 2. Download [Dusk](https://github.com/TwilitRealm/dusk/releases)

 ### 3. Setup the game
- Extract the zip folder
- Launch Dusk
- Select Options, then set the ISO Path to your supported game dump
- Press Start Game to play!

-![Dusk options](assets/dusk_options.png)
+- Extract the .zip file
+- Launch Dusk
+- Press **Select Disc Image** and provide the path to your supported game dump.
+- Press **Play**!

 # Building
+
 If you'd like to build Dusk from source, please read the [build instructions](docs/building.md).

-Pull Requests are welcomed! Note that we do not accept contributions that are primarily AI generated and will close your PR if we suspect as much.
+Pull requests are welcomed! Note that we do not accept contributions that are primarily AI-generated and will close your PR if we suspect as much.

 # Credits
+
 Special thanks to the [TP decompilation](https://github.com/zeldaret/tp) team, the GC/Wii decompilation community, the [Aurora](https://github.com/encounter/aurora) developers, the [TP speedrunning community](https://zsrtp.link), and all [contributors](https://github.com/TwilitRealm/dusk/graphs/contributors).
+
+<br/>
+<div align="center">
+    <a href="https://github.com/encounter/aurora">
+        <img src="assets/aurora-powered.png" alt="Powered by Aurora" width="800">
+    </a>
+</div>
@@ -0,0 +1,66 @@
+<svg width="600" height="600" viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="150" cy="150" r="105" fill="none" stroke="white" stroke-width="4"/>
+  <circle cx="150" cy="150" r="95" fill="none" stroke="white" stroke-width="4"/>
+  <circle cx="150" cy="150" r="60" fill="none" stroke="white" stroke-width="4"/>
+  <circle cx="150" cy="150" r="75" fill="none" stroke="white" stroke-width="4"/>
+
+  <defs>
+    <line id="ray" x1="150" y1="55" x2="150" y2="45"/>
+    <clipPath id="zigzag-clip">
+      <circle cx="150" cy="150" r="75"/>
+    </clipPath>
+  </defs>
+
+  <g stroke="white" stroke-width="3">
+    <use href="#ray"/>
+    <use href="#ray" transform="rotate(18 150 150)"/>
+    <use href="#ray" transform="rotate(36 150 150)"/>
+    <use href="#ray" transform="rotate(54 150 150)"/>
+    <use href="#ray" transform="rotate(72 150 150)"/>
+    <use href="#ray" transform="rotate(90 150 150)"/>
+    <use href="#ray" transform="rotate(108 150 150)"/>
+    <use href="#ray" transform="rotate(126 150 150)"/>
+    <use href="#ray" transform="rotate(144 150 150)"/>
+    <use href="#ray" transform="rotate(162 150 150)"/>
+    <use href="#ray" transform="rotate(180 150 150)"/>
+    <use href="#ray" transform="rotate(198 150 150)"/>
+    <use href="#ray" transform="rotate(216 150 150)"/>
+    <use href="#ray" transform="rotate(234 150 150)"/>
+    <use href="#ray" transform="rotate(252 150 150)"/>
+    <use href="#ray" transform="rotate(270 150 150)"/>
+    <use href="#ray" transform="rotate(288 150 150)"/>
+    <use href="#ray" transform="rotate(306 150 150)"/>
+    <use href="#ray" transform="rotate(324 150 150)"/>
+    <use href="#ray" transform="rotate(342 150 150)"/>
+  </g>
+
+  <polygon fill="none" stroke="white" stroke-width="4" opacity="1" clip-path="url(#zigzag-clip)"
+    points="
+      126.82,78.67
+      150,90
+      173.18,78.67
+      185.27,101.46
+      210.68,105.92
+      207.06,131.46
+      225,150
+      207.06,168.54
+      210.68,194.08
+      185.27,198.54
+      173.18,221.33
+      150,210
+      126.82,221.33
+      114.73,198.54
+      89.32,194.08
+      92.94,168.54
+      75,150
+      92.94,131.46
+      89.32,105.92
+      114.73,101.46
+    "/>
+
+  <g fill="none" stroke="white" stroke-width="4">
+    <polygon points="150,105 130,140 170,140"/>
+    <polygon points="130,140 110,175 150,175"/>
+    <polygon points="170,140 150,175 190,175"/>
+  </g>
+</svg>
@@ -1447,36 +1447,37 @@ set(DUSK_FILES
        src/dusk/imgui/ImGuiBloomWindow.hpp
        src/dusk/imgui/ImGuiMenuTools.cpp
        src/dusk/imgui/ImGuiMenuTools.hpp
-        src/dusk/imgui/ImGuiPreLaunchWindow.cpp
-        src/dusk/imgui/ImGuiPreLaunchWindow.hpp
-        src/dusk/imgui/ImGuiFirstRunPreset.hpp
-        src/dusk/imgui/ImGuiFirstRunPreset.cpp
        src/dusk/imgui/ImGuiProcessOverlay.cpp
        src/dusk/imgui/ImGuiCameraOverlay.cpp
        src/dusk/imgui/ImGuiHeapOverlay.cpp
-        src/dusk/imgui/ImGuiDebugPad.cpp
        src/dusk/imgui/ImGuiControllerOverlay.cpp
        src/dusk/imgui/ImGuiStubLog.cpp
        src/dusk/imgui/ImGuiMapLoader.cpp
        src/dusk/imgui/ImGuiSaveEditor.cpp
        src/dusk/imgui/ImGuiStateShare.hpp
        src/dusk/imgui/ImGuiStateShare.cpp
-        src/dusk/imgui/ImGuiAchievements.hpp
-        src/dusk/imgui/ImGuiAchievements.cpp
+        src/dusk/ui/achievements.cpp
+        src/dusk/ui/achievements.hpp
        src/dusk/ui/bool_button.cpp
        src/dusk/ui/bool_button.hpp
        src/dusk/ui/button.cpp
        src/dusk/ui/button.hpp
        src/dusk/ui/component.cpp
        src/dusk/ui/component.hpp
+        src/dusk/ui/controller_config.cpp
+        src/dusk/ui/controller_config.hpp
        src/dusk/ui/document.cpp
        src/dusk/ui/document.hpp
        src/dusk/ui/editor.cpp
        src/dusk/ui/editor.hpp
        src/dusk/ui/event.cpp
        src/dusk/ui/event.hpp
+        src/dusk/ui/graphics_tuner.cpp
+        src/dusk/ui/graphics_tuner.hpp
        src/dusk/ui/input.cpp
        src/dusk/ui/input.hpp
+        src/dusk/ui/modal.cpp
+        src/dusk/ui/modal.hpp
        src/dusk/ui/nav_types.hpp
        src/dusk/ui/number_button.cpp
        src/dusk/ui/number_button.hpp
@@ -1484,12 +1485,12 @@ set(DUSK_FILES
        src/dusk/ui/overlay.hpp
        src/dusk/ui/pane.cpp
        src/dusk/ui/pane.hpp
-        src/dusk/ui/popup.cpp
-        src/dusk/ui/popup.hpp
+        src/dusk/ui/menu_bar.cpp
+        src/dusk/ui/menu_bar.hpp
        src/dusk/ui/prelaunch.cpp
        src/dusk/ui/prelaunch.hpp
-        src/dusk/ui/prelaunch_options.cpp
-        src/dusk/ui/prelaunch_options.hpp
+        src/dusk/ui/preset.cpp
+        src/dusk/ui/preset.hpp
        src/dusk/ui/select_button.cpp
        src/dusk/ui/select_button.hpp
        src/dusk/ui/settings.cpp
@@ -1510,6 +1511,8 @@ set(DUSK_FILES
        src/dusk/OSReport.cpp
        src/dusk/OSThread.cpp
        src/dusk/OSMutex.cpp
+        src/dusk/discord.cpp
+        src/dusk/discord.hpp
        src/dusk/discord_presence.cpp
        src/dusk/version.cpp
 )
@@ -25,6 +25,10 @@ public:
    int Draw();
    int Delete();

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

+#if TARGET_PC
+    cXyz mChainInterpPrev[64];
+    cXyz mChainInterpCurr[64];
+    bool mChainInterpPrevValid;
+    bool mChainInterpCurrValid;
+#endif
+
    // Number of chain models
    u32 getArg0() {
        return fopAcM_GetParamBit(this, 0, 6);
@@ -118,6 +118,18 @@ class camera_class;
 class dCamera_c;
 typedef bool (dCamera_c::*engine_fn)(s32);

+#if TARGET_PC
+struct DebugFlyCam {
+    bool initialized;
+    f32 pitch;
+    f32 yaw;
+    cXyz savedCenter;
+    cXyz savedEye;
+    f32 savedFovy;
+    cSAngle savedBank;
+};
+#endif
+
 class dCamera_c {
 public:
    class dCamInfo_c {
@@ -1028,6 +1040,8 @@ public:
    bool test2Camera(s32);
    #if TARGET_PC
    bool freeCamera();
+    bool executeDebugFlyCam();
+    void deactivateDebugFlyCam();
    #endif
    bool towerCamera(s32);
    bool hookshotCamera(s32);
@@ -1376,6 +1390,10 @@ public:
    /* 0x970 */ dCamSetup_c mCamSetup;
    /* 0xAEC */ dCamParam_c mCamParam;
    /* 0xB0C */ u8 field_0xb0c;
+
+#if TARGET_PC
+    DebugFlyCam mDebugFlyCam;
+#endif
 };  // Size: 0xB10

 dCamera_c* dCam_getBody();
@@ -169,6 +169,12 @@ public:

    void mapBlink() {}

+    #if PLATFORM_WII || TARGET_PC
+    f32 getMirrorPosX(f32 param_0, f32 param_1) {
+        return (field_0x11dc * 2.0f - (param_0 + param_1)) - param_1;
+    }
+    #endif
+
    // Unknown name
    struct RegionTexData {
        /* 0x00 */ float mMinX;
@@ -66,6 +66,16 @@ public:
        _c90 = param_2;
    }

+#if PLATFORM_WII || TARGET_PC
+    f32 getMirrorCenterPosX(f32 param_0, f32 param_1) {
+        if (_c90) {
+            return (mCenterPosX * 2.0f - (param_0 + param_1)) - param_1;
+        }
+
+        return param_0;
+    }
+#endif
+
    struct Stage_c {
        // Incomplete class

@@ -50,8 +50,6 @@ public:
    bool hasSignal(const char* key) const;

    std::vector<Achievement> getAchievements() const;
-    bool hasPendingUnlock() const { return !m_pendingUnlocks.empty(); }
-    std::string consumePendingUnlock();

 private:
    struct Entry {
@@ -68,7 +66,6 @@ private:
    std::unordered_set<std::string_view> m_signals;
    bool m_loaded = false;
    bool m_dirty = false;
-    std::queue<std::string> m_pendingUnlocks;
 };

 } // namespace dusk
@@ -1,18 +1,14 @@
 #pragma once

-#ifdef DUSK_DISCORD_RPC
+#ifdef DUSK_DISCORD

-namespace dusk {
-namespace discord {
+namespace dusk::discord {

-void Initialize();
+void initialize();
+void run_callbacks();
+void update_presence();
+void shutdown();

-void RunCallbacks();
+}  // namespace dusk::discord

-void UpdatePresence();
-
-void Shutdown();
-}
-}
-
-#endif // DUSK_DISCORD_RPC
+#endif  // DUSK_DISCORD
@@ -1,6 +1,10 @@
 #ifndef DUSK_MAIN_H
 #define DUSK_MAIN_H

+#if defined(__APPLE__)
+#include <TargetConditionals.h>
+#endif
+
 #include <filesystem>

 namespace dusk {
@@ -8,7 +12,17 @@ namespace dusk {
    extern bool IsShuttingDown;
    extern bool IsGameLaunched;
    extern bool IsFocusPaused;
+    extern bool RestartRequested;
    extern std::filesystem::path ConfigPath;
+
+#if defined(__ANDROID__) || (defined(TARGET_OS_IOS) && TARGET_OS_IOS) || \
+    (defined(TARGET_OS_TV) && TARGET_OS_TV)
+    inline constexpr bool SupportsProcessRestart = false;
+#else
+    inline constexpr bool SupportsProcessRestart = true;
+#endif
+
+    void RequestRestart() noexcept;
 }

 #endif  // DUSK_MAIN_H
@@ -1,5 +1,7 @@
 #pragma once

+#include <array>
+
 struct RoomEntry {
    u8 roomNo;
    std::vector<s16> roomPoints = {};
@@ -2,9 +2,6 @@
 #define _SRC_DUSK_MATH_H_

 #include <cmath>
-#include <array>
-#include <limits>
-#include <bit>

 #ifndef M_PI
 #define M_PI 3.14159265358979323846f
@@ -19,139 +16,6 @@ inline float i_cosf(float x) { return cos(x); }
 inline float i_tanf(float x) { return tan(x); }
 inline float i_acosf(float x) { return acos(x); }

-
-// frsqrte matching courtesy of Geotale, with reference to https://achurch.org/cpu-tests/ppc750cl.s
-
-struct BaseAndDec32 {
-    uint32_t base;
-    int32_t dec;
-};
-
-struct BaseAndDec64 {
-    uint64_t base;
-    int64_t dec;
-};
-
-union c32 {
-    constexpr c32(const float p) {
-        f = p;
-    }
-
-    constexpr c32(const uint32_t p) {
-        u = p;
-    }
-
-    uint32_t u;
-    float f;
-};
-
-union c64 {
-    constexpr c64(const double p) {
-        f = p;
-    }
-
-    constexpr c64(const uint64_t p) {
-        u = p;
-    }
-
-    uint64_t u;
-    double f;
-};
-
-static constexpr uint64_t EXPONENT_SHIFT_F64 = 52;
-static constexpr uint64_t MANTISSA_MASK_F64 = 0x000fffffffffffffULL;
-static constexpr uint64_t EXPONENT_MASK_F64 = 0x7ff0000000000000ULL;
-static constexpr uint64_t SIGN_MASK_F64 = 0x8000000000000000ULL;
-
-static constexpr std::array<BaseAndDec64, 32> RSQRTE_TABLE = {{
-        {0x69fa000000000ULL, -0x15a0000000LL},
-        {0x5f2e000000000ULL, -0x13cc000000LL},
-        {0x554a000000000ULL, -0x1234000000LL},
-        {0x4c30000000000ULL, -0x10d4000000LL},
-        {0x43c8000000000ULL, -0x0f9c000000LL},
-        {0x3bfc000000000ULL, -0x0e88000000LL},
-        {0x34b8000000000ULL, -0x0d94000000LL},
-        {0x2df0000000000ULL, -0x0cb8000000LL},
-        {0x2794000000000ULL, -0x0bf0000000LL},
-        {0x219c000000000ULL, -0x0b40000000LL},
-        {0x1bfc000000000ULL, -0x0aa0000000LL},
-        {0x16ae000000000ULL, -0x0a0c000000LL},
-        {0x11a8000000000ULL, -0x0984000000LL},
-        {0x0ce6000000000ULL, -0x090c000000LL},
-        {0x0862000000000ULL, -0x0898000000LL},
-        {0x0416000000000ULL, -0x082c000000LL},
-        {0xffe8000000000ULL, -0x1e90000000LL},
-        {0xf0a4000000000ULL, -0x1c00000000LL},
-        {0xe2a8000000000ULL, -0x19c0000000LL},
-        {0xd5c8000000000ULL, -0x17c8000000LL},
-        {0xc9e4000000000ULL, -0x1610000000LL},
-        {0xbedc000000000ULL, -0x1490000000LL},
-        {0xb498000000000ULL, -0x1330000000LL},
-        {0xab00000000000ULL, -0x11f8000000LL},
-        {0xa204000000000ULL, -0x10e8000000LL},
-        {0x9994000000000ULL, -0x0fe8000000LL},
-        {0x91a0000000000ULL, -0x0f08000000LL},
-        {0x8a1c000000000ULL, -0x0e38000000LL},
-        {0x8304000000000ULL, -0x0d78000000LL},
-        {0x7c48000000000ULL, -0x0cc8000000LL},
-        {0x75e4000000000ULL, -0x0c28000000LL},
-        {0x6fd0000000000ULL, -0x0b98000000LL},
-}};
-
-[[nodiscard]] static inline double frsqrte(const double val) {
-    c64 bits(val);
-
-    uint64_t mantissa = bits.u & MANTISSA_MASK_F64;
-    int64_t exponent = bits.u & EXPONENT_MASK_F64;
-    bool sign = (bits.u & SIGN_MASK_F64) != 0;
-
-    // Handle 0 case
-    if (mantissa == 0 && exponent == 0) {
-        return std::copysign(std::numeric_limits<double>::infinity(), bits.f);
-    }
-
-    // Handle NaN-like
-    if (exponent == EXPONENT_MASK_F64) {
-        if (mantissa == 0) {
-            return sign ? std::numeric_limits<double>::quiet_NaN() : 0.0;
-        }
-
-        return val;
-    }
-
-    // Handle negative inputs
-    if (sign) {
-        return std::numeric_limits<double>::quiet_NaN();
-    }
-
-    if (exponent == 0) {
-        // Shift so one bit goes to where the exponent would be,
-        // then clear that bit to mimic a not-subnormal number!
-        // Aka, if there are 12 leading zeroes, shift left once
-        uint32_t shift = std::countl_zero(mantissa) - static_cast<uint32_t>(63 - EXPONENT_SHIFT_F64);
-
-        mantissa <<= shift;
-        mantissa &= MANTISSA_MASK_F64;
-        // The shift is subtracted by 1 because denormals by default
-        // are offset by 1 (exponent 0 doesn't have implied 1 bit)
-        exponent -= static_cast<int64_t>(shift - 1) << EXPONENT_SHIFT_F64;
-    }
-
-    // In reality this doesn't get the full exponent -- Only the least significant bit
-    // Only that's needed because square roots of higher exponent bits simply multiply the
-    // result by 2!!
-    uint32_t key = static_cast<uint32_t>((static_cast<uint64_t>(exponent) | mantissa) >> 37);
-    uint64_t new_exp =
-            (static_cast<uint64_t>((0xbfcLL << EXPONENT_SHIFT_F64) - exponent) >> 1) & EXPONENT_MASK_F64;
-
-    // Remove the bits relating to anything higher than the LSB of the exponent
-    const auto &entry = RSQRTE_TABLE[0x1f & (key >> 11)];
-
-    // The result is given by an estimate then an adjustment based on the original
-    // key that was computed
-    uint64_t new_mantissa = static_cast<uint64_t>(entry.base + entry.dec * static_cast<int64_t>(key & 0x7ff));
-
-    return c64(new_exp | new_mantissa).f;
-}
+#include <dolphin/ppc_math.h>

 #endif // _SRC_DUSK_MATH_H_
@@ -21,6 +21,12 @@ enum class GameLanguage : u8 {
    Italian = OS_LANGUAGE_ITALIAN,
 };

+enum class DiscVerificationState : u8 {
+    Unknown = 0,
+    Success,
+    HashMismatch,
+};
+
 namespace config {
 template <>
 struct ConfigEnumRange<BloomMode> {
@@ -33,6 +39,12 @@ struct ConfigEnumRange<GameLanguage> {
    static constexpr auto min = GameLanguage::English;
    static constexpr auto max = GameLanguage::Italian;
 };
+
+template <>
+struct ConfigEnumRange<DiscVerificationState> {
+    static constexpr auto min = DiscVerificationState::Unknown;
+    static constexpr auto max = DiscVerificationState::HashMismatch;
+};
 }

 // Persistent user settings
@@ -45,6 +57,8 @@ struct UserSettings {
        ConfigVar<bool> enableFullscreen;
        ConfigVar<bool> enableVsync;
        ConfigVar<bool> lockAspectRatio;
+        ConfigVar<bool> enableFpsOverlay;
+        ConfigVar<int> fpsOverlayCorner;
    } video;

    struct {
@@ -56,6 +70,7 @@ struct UserSettings {
        ConfigVar<int> fanfareVolume;
        ConfigVar<bool> enableReverb;
        ConfigVar<bool> enableHrtf;
+        ConfigVar<bool> menuSounds;
    } audio;

    // Game settings
@@ -66,7 +81,6 @@ struct UserSettings {
        // QoL
        ConfigVar<bool> enableQuickTransform;
        ConfigVar<bool> hideTvSettingsScreen;
-        ConfigVar<bool> skipWarningScreen;
        ConfigVar<bool> biggerWallets;
        ConfigVar<bool> noReturnRupees;
        ConfigVar<bool> disableRupeeCutscenes;
@@ -85,7 +99,7 @@ struct UserSettings {

        // Preferences
        ConfigVar<bool> enableMirrorMode;
-        ConfigVar<bool> disableMainHUD;
+        ConfigVar<bool> minimalHUD;
        ConfigVar<bool> pauseOnFocusLost;
        ConfigVar<bool> enableLinkDollRotation;
        ConfigVar<bool> enableAchievementNotifications;
@@ -119,6 +133,8 @@ struct UserSettings {
        ConfigVar<bool> invertCameraXAxis;
        ConfigVar<bool> invertCameraYAxis;
        ConfigVar<float> freeCameraSensitivity;
+        ConfigVar<bool> debugFlyCam;
+        ConfigVar<bool> debugFlyCamLockEvents;

        // Cheats
        ConfigVar<bool> infiniteHearts;
@@ -145,17 +161,19 @@ struct UserSettings {
        // Tools
        ConfigVar<bool> speedrunMode;
        ConfigVar<bool> liveSplitEnabled;
+        ConfigVar<bool> recordingMode;
    } game;

    struct {
        ConfigVar<std::string> isoPath;
+        ConfigVar<DiscVerificationState> isoVerification;
        ConfigVar<std::string> graphicsBackend;
        ConfigVar<bool> skipPreLaunchUI;
        ConfigVar<bool> showPipelineCompilation;
        ConfigVar<bool> wasPresetChosen;
        ConfigVar<bool> enableCrashReporting;
-        ConfigVar<bool> duskMenuOpen;
        ConfigVar<int> cardFileType;
+        ConfigVar<bool> enableAdvancedSettings;
    } backend;
 };

@@ -5,6 +5,7 @@
 #include "Z2AudioLib/Z2EnvSeMgr.h"
 #include "Z2AudioLib/Z2LinkMgr.h"
 #include "dusk/audio.h"
+#include "dusk/settings.h"

 class mDoAud_zelAudio_c : public Z2AudioMgr {
 public:
@@ -132,6 +133,18 @@ inline void mDoAud_seStart(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_re
                                               -1.0f, -1.0f, 0);
 }

+#if TARGET_PC
+inline void mDoAud_seStartMenu(u32 i_sfxID) {
+    if (!mDoAud_zelAudio_c::isInitFlag()) {
+        return;
+    }
+    if (!dusk::getSettings().audio.menuSounds.getValue()) {
+        return;
+    }
+    mDoAud_seStart(i_sfxID, nullptr, 0, 0);
+}
+#endif
+
 inline void mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) {
    DUSK_AUDIO_SKIP()
    Z2AudioMgr::getInterface()->seStartLevel(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f,
@@ -1,9 +1,9 @@
 #ifndef J3DSTRUCT_H
 #define J3DSTRUCT_H

+#include <cstring>
 #include <gx.h>
 #include <mtx.h>
-#include <mtx.h>
 #include "global.h"
 #include "JSystem/JMath/JMath.h"

@@ -11,7 +11,7 @@

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DLightInfo {
    bool operator==(J3DLightInfo& other) const;
@@ -28,7 +28,7 @@ struct J3DLightInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DTextureSRTInfo {
    // NOTE: Big endian when loaded from file!
@@ -79,7 +79,7 @@ enum J3DTexMtxMode {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DTexMtxInfo {
    bool operator==(J3DTexMtxInfo& other) const;
@@ -97,7 +97,7 @@ struct J3DTexMtxInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DIndTexMtxInfo {
    J3DIndTexMtxInfo& operator=(J3DIndTexMtxInfo const&);
@@ -107,7 +107,7 @@ struct J3DIndTexMtxInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DFogInfo {
    bool operator==(J3DFogInfo&) const;
@@ -126,7 +126,7 @@ struct J3DFogInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DNBTScaleInfo {
    bool operator==(const J3DNBTScaleInfo& other) const;
@@ -153,7 +153,7 @@ struct J3DIndTexOrderInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DTevSwapModeInfo {
    /* 0x0 */ u8 mRasSel;
@@ -164,7 +164,7 @@ struct J3DTevSwapModeInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DTevSwapModeTableInfo {
    /* 0x0 */ u8 field_0x0;
@@ -175,7 +175,7 @@ struct J3DTevSwapModeTableInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DTevStageInfo {
    /* 0x0 */ u8 field_0x0;
@@ -202,7 +202,7 @@ struct J3DTevStageInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DIndTevStageInfo {
    /* 0x0 */ u8 mIndStage;
@@ -219,7 +219,7 @@ struct J3DIndTevStageInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DTexCoordInfo {
    /* 0x0 */ u8 mTexGenType;
@@ -265,7 +265,7 @@ struct J3DBlendInfo {

 /**
 * @ingroup jsystem-j3d
- * 
+ *
 */
 struct J3DTevOrderInfo {
    void operator=(const J3DTevOrderInfo& other) {
@@ -556,8 +556,8 @@ void J3DModelLoader::readVertexData(const J3DVertexBlock& block, J3DVertexData&

        if (attr == GX_VA_POS) {
            // can be a little off due to 0x20 alignment, account for that
-            u32 expect = ((data.mVtxNum * vertStride) + 0x1F) & ~0x1F;
-            JUT_ASSERT(1234, expect == addrDiff);
+            // u32 expect = ((data.mVtxNum * vertStride) + 0x1F) & ~0x1F;
+            // JUT_ASSERT(1234, expect == addrDiff);
        } else if (attr == GX_VA_NRM) {
            data.mNrmNum = num;
        } else if (attr == GX_VA_CLR0) {
@@ -8,140 +8,269 @@ body {
    height: 100%;
    margin: 0;
    padding: 0;
-    font-family: "Fira Sans Condensed";
-    font-size: 24dp;
-    color: #FFFFFF;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-    align-items: stretch;
-}
-
-.overlay-root {
-    width: 100%;
-    min-height: 45%;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-    align-items: stretch;
-    decorator: vertical-gradient(#00000000 #151610F2);
-    padding: 48dp 0 40dp 0;
-    filter: opacity(0);
-    transition: filter 0.2s linear-in-out;
-}
-
-.overlay-root[open] {
-    filter: opacity(1);
-}
-
-.overlay {
-    width: 100%;
-    max-width: 1216dp;
-    margin-left: auto;
-    margin-right: auto;
-    display: flex;
-    flex-direction: column;
-    gap: 24dp;
-    padding: 0 32dp;
-}
-
-@media (max-height: 800dp) {
-    .overlay-root {
-        min-height: 38%;
-        padding: 32dp 0 28dp 0;
-    }
-
-    .overlay {
-        gap: 16dp;
-        padding: 0 24dp;
-    }
-}
-
-.header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 24dp;
-}
-
-.carousel-container {
-    flex: 1 1 auto;
-    display: flex;
-    justify-content: flex-end;
-    min-width: 0;
-}
-
-.description {
-    font-size: 18dp;
-    line-height: 22dp;
-    color: rgba(255, 255, 255, 50%);
-}
-
-.divider {
-    margin: 1dp 0;
-    border-top: 1dp rgba(217, 217, 217, 50%);
-}
-
-.footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 24dp;
-}
-
-footer-button {
-    display: block;
-    width: 100%;
-    max-width: 220dp;
-    border: 0;
-    padding: 0;
-    background-color: transparent;
-    font-family: "Fira Sans Condensed";
-    font-weight: bold;
+    font-family: "Fira Sans";
+    font-weight: normal;
    font-size: 20dp;
-    line-height: 24dp;
-    text-transform: uppercase;
-    color: #FFFFFF;
-    opacity: 1;
+    color: #E0DBC8;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    align-items: stretch;
+    z-index: 1;
+    pointer-events: none;
+}
+
+fps,
+toast {
+    position: absolute;
+    border: 1dp #92875B;
+    background-color: rgba(21, 22, 16, 80%);
+}
+
+toast {
+    top: 40dp;
+    right: 40dp;
+    display: flex;
+    flex-flow: column;
+    border-radius: 14dp;
+    overflow: hidden;
+    backdrop-filter: blur(5dp);
+    box-shadow: 0 0 15dp 3dp;
+    filter: opacity(0);
+    transform: scale(0.9);
+    transform-origin: center;
+    transition: filter transform 0.2s cubic-in-out;
+    padding: 18dp 24dp;
+    gap: 8dp;
+}
+
+toast[open] {
+    filter: opacity(1);
+    transform: scale(1);
+}
+
+/*toast:hover {
    cursor: pointer;
+    background-color: rgba(61, 59, 36, 80%);
 }

-footer-button.return {
-    text-align: left;
+toast:active {
+    background-color: rgba(45, 43, 26, 80%);
+}*/
+
+toast heading {
+    display: flex;
+    gap: 18dp;
+    align-items: center;
+    font-family: "Fira Sans Condensed";
+    font-size: 18dp;
+    font-weight: bold;
+    text-transform: uppercase;
+    color: #92875B;
 }

-footer-button.reset {
-    text-align: right;
+toast heading > span {
+    flex: 1 0 auto;
 }

-.stepped-carousel {
+toast heading > row {
+    flex: 1 0 auto;
    display: flex;
    align-items: center;
-    justify-content: center;
-    gap: 16dp;
-    width: auto;
-    min-width: 246dp;
-    padding: 0;
-    background-color: transparent;
-    font-family: "Fira Sans Condensed";
-    font-weight: bold;
+    gap: 4dp;
 }

-.stepped-carousel-value {
-    line-height: 29dp;
-    min-width: 166dp;
+toast message {
+    display: flex;
+    flex-flow: column;
+    gap: 8dp;
+}
+
+toast message row {
+    display: flex;
+}
+
+toast message row.muted {
+    opacity: 0.5;
+}
+
+toast progress {
+    height: 4dp;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+}
+
+toast progress fill {
+    background-color: rgba(194, 164, 45, 80%);
+}
+
+toast.achievement {
+    border: 1dp #C2A42D;
+}
+
+toast.achievement heading {
+    color: #C2A42D;
+}
+
+toast.controller-warning {
+    top: auto;
+    right: auto;
+    bottom: 40dp;
+    left: 50%;
+    width: 440dp;
+    max-width: 90%;
+    transform: translateX(-50%) scale(0.9);
+}
+
+toast.controller-warning[open] {
+    transform: translateX(-50%) scale(1);
+}
+
+toast.controller-warning heading {
+    color: #C2A42D;
+}
+
+toast.menu-notification {
+    top: 40dp;
+    right: auto;
+    bottom: auto;
+    left: 50%;
+    max-width: 90%;
+    transform: translateX(-50%) scale(0.9);
+}
+
+toast.menu-notification[open] {
+    transform: translateX(-50%) scale(1);
+}
+
+toast.menu-notification message {
+    align-items: center;
    text-align: center;
-    white-space: nowrap;
-    opacity: 0.9;
 }

-.stepped-carousel-arrow {
+toast.menu-notification message row {
+    align-items: center;
+    gap: 6dp;
+}
+
+icon {
+    font-family: "Material Symbols Rounded";
+    font-weight: normal;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+icon.arrow-forward {
    width: 24dp;
    height: 24dp;
-    min-width: 24dp;
-    padding: 0;
-    border: 0;
-    background-color: transparent;
-    opacity: 1;
-    cursor: pointer;
+    font-size: 24dp;
+    decorator: text("&#xe5c8;" center center);
+}
+
+icon.trophy {
+    width: 24dp;
+    height: 24dp;
+    font-size: 24dp;
+    decorator: text("&#xe71a;" center center);
+}
+
+icon.controller {
+    width: 24dp;
+    height: 24dp;
+    font-size: 24dp;
+    decorator: text("&#xf135;" center center);
+}
+
+icon.warning {
+    width: 24dp;
+    height: 24dp;
+    font-size: 24dp;
+    decorator: text("&#xe002;" center center);
+}
+
+fps {
+    display: none;
+    z-index: 99;
+    font-size: 18dp;
+    font-weight: bold;
+    padding: 9dp 12dp;
+    border-radius: 7dp;
+    pointer-events: none;
+    white-space: nowrap;
+}
+
+fps[open] {
+    display: block;
+}
+
+fps[corner=tl] {
+    top: 12dp;
+    left: 12dp;
+}
+
+fps[corner=tr] {
+    top: 12dp;
+    right: 12dp;
+}
+
+fps[corner=bl] {
+    bottom: 12dp;
+    left: 12dp;
+}
+
+fps[corner=br] {
+    bottom: 12dp;
+    right: 12dp;
+}
+
+logo {
+    position: absolute;
+    width: 100dp;
+    height: 100dp;
+    bottom: 40dp;
+    left: 40dp;
+    opacity: 0;
+    transition: opacity 0.5s linear-in-out;
+}
+
+logo[open] {
+    opacity: 0.65;
+}
+
+logo img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    filter: drop-shadow(#0008 0 0 14dp);
+    transform-origin: center;
+}
+
+logo img.inner {
+    animation: 24s linear-in-out infinite logo-inner-spin;
+}
+
+logo img.outer {
+    animation: 8s linear-in-out infinite logo-outer-spin;
+}
+
+@keyframes logo-inner-spin {
+    from {
+        transform: rotate(360deg);
+    }
+    to {
+        transform: rotate(0deg);
+    }
+}
+
+@keyframes logo-outer-spin {
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(360deg);
+    }
 }
@@ -9,16 +9,44 @@ body {
    font-weight: normal;
    font-size: 20dp;
    color: #FFFFFF;
-    background-color: #000000;
-    decorator: image(../prelaunch-bg.png cover left center);
    filter: opacity(0);
-    transition: filter 1s 0.1s linear-in-out;
+    transition: filter 1s 0.2s linear-in-out;
+    z-index: -1;
+}
+
+.gradient {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    /* The color gradient from the Figma bands really badly. A fully black gradient does as well, but not as badly. */
+    decorator: horizontal-gradient(#000000FF #00000000);
+}
+
+body.mirrored .gradient {
+    decorator: horizontal-gradient(#00000000 #000000FF);
+}
+
+.background {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    decorator: image(../prelaunch-bg.png cover left center);
+    opacity: 0;
+    transition: opacity 1s linear-in-out;
 }

 body[open] {
    filter: opacity(1);
 }

+body[open] .background {
+    opacity: 1;
+}
+
+body.disc-ready .background {
+    opacity: 0;
+}
+
 content {
    display: block;
    width: 100%;
@@ -34,6 +62,7 @@ content[open] {
 menu {
    position: absolute;
    left: 96dp;
+    right: auto;
    top: 50%;
    transform: translateY(-50%);
    /* Scale based on a reference screen width, 428/1216 */
@@ -46,6 +75,11 @@ menu {
    gap: 48dp;
 }

+body.mirrored menu {
+    left: auto;
+    right: 96dp;
+}
+
 hero {
    display: flex;
    flex-direction: column;
@@ -54,6 +88,10 @@ hero {
    gap: 8dp;
 }

+body.mirrored hero {
+    align-items: flex-end;
+}
+
 hero img {
    width: 100%;
 }
@@ -78,6 +116,7 @@ hero img {
    display: flex;
    flex-direction: column;
    gap: 12dp;
+    align-items: flex-start;
 }

 #menu-list button {
@@ -85,6 +124,7 @@ hero img {
    height: 54dp;
    padding: 8dp 16dp;
    border-radius: 8dp;
+    text-align: left;
    text-transform: uppercase;
    font-family: "Fira Sans Condensed";
    font-size: 32dp;
@@ -94,8 +134,14 @@ hero img {
    decorator: horizontal-gradient(#00000000 #00000000);
 }

+#menu-list button:disabled {
+    opacity: 0.75;
+    cursor: default;
+    decorator: horizontal-gradient(#00000000 #00000000);
+}
+
 #menu-list button.anim-done {
-    transition: decorator color 0.1s linear-in-out;
+    transition: decorator color opacity 0.1s linear-in-out;
 }

 #menu-list button:hover,
@@ -104,45 +150,136 @@ hero img {
    decorator: horizontal-gradient(#FEE685FF #FEE68500);
 }

-disk-status {
+body.mirrored #menu-list {
+    align-items: flex-end;
+}
+
+body.mirrored #menu-list button {
+    text-align: right;
+}
+
+body.mirrored #menu-list button:hover,
+body.mirrored #menu-list button:focus-visible {
+    decorator: horizontal-gradient(#FEE68500 #FEE685FF);
+}
+
+disc-info {
    position: absolute;
    left: 96dp;
+    right: auto;
    bottom: 72dp;
    display: flex;
    flex-direction: column;
-    gap: 8dp;
+    gap: 12dp;
+    font-size: 24dp;
+    font-effect: glow(0dp 4dp 0dp 4dp black);
+    text-align: left;
+}
+
+body.mirrored disc-info {
+    left: auto;
+    right: 96dp;
+    text-align: right;
 }

 version-info {
    position: absolute;
    right: 96dp;
+    left: auto;
    bottom: 72dp;
    display: flex;
    flex-direction: column;
-    gap: 8dp;
+    gap: 12dp;
+    text-align: right;
+    font-size: 24dp;
+    font-effect: glow(0dp 4dp 0dp 4dp black);
    text-align: right;
 }

-.status,
-.version {
-    font-size: 24dp;
+body.mirrored version-info {
+    right: auto;
+    left: 96dp;
+    text-align: left;
 }

-.status,
-.update {
+#disc-status {
+    display: flex;
+    align-items: center;
+    gap: 8dp;
+}
+
+#disc-status[status=good] {
    color: #D8F999;
 }

-.status[bad] {
+#disc-status[status=bad] {
    color: #FFC9C9;
 }

+#disc-status[status=verifying] {
+    color: #FFFFFF;
+}
+
+#disc-status[status=mismatch] {
+    color: #FFD6A7;
+}
+
+#disc-status[status=unknown] {
+    color: rgba(224, 219, 200, 65%);
+}
+
+#disc-status[status=pending] {
+    color: #FEE685;
+}
+
+#disc-status icon {
+    display: none;
+    width: 24dp;
+    height: 24dp;
+    font-family: "Material Symbols Rounded";
+    font-weight: normal;
+    font-size: 24dp;
+}
+
+#disc-status[status] icon {
+    display: block;
+}
+
+#disc-status[status=good] icon {
+    decorator: text("&#xe5ca;" center center);
+}
+
+#disc-status[status=bad] icon {
+    decorator: text("&#xe5cd;" center center);
+}
+
+#disc-status[status=verifying] icon {
+    decorator: text("&#xe8b5;" center center);
+}
+
+#disc-status[status=mismatch] icon {
+    decorator: text("&#xe002;" center center);
+}
+
+#disc-status[status=unknown] icon {
+    decorator: text("&#xe887;" center center);
+}
+
+#disc-status[status=pending] icon {
+    decorator: text("&#xe863;" center center);
+}
+
+#disc-version {
+    font-size: 20dp;
+}
+
 /* TODO: Hidden until an actual update checker is introduced */
 .update {
    display: none;
    font-size: 16dp;
    font-weight: bold;
    cursor: pointer;
+    color: #D8F999;
 }

 .detail,
@@ -185,3 +322,84 @@ body.animate-in .intro-item {
 .delay-5 {
    transition: opacity transform 0.3s 0.6s cubic-in-out;
 }
+
+/* Mobile layout */
+@media (max-height: 640dp) {
+    .gradient {
+        decorator: horizontal-gradient(#00000000 #000000FF);
+    }
+
+    body.mirrored .gradient {
+        decorator: horizontal-gradient(#000000FF #00000000);
+    }
+
+    menu {
+        left: 20dp;
+        right: 20dp;
+        width: auto;
+        min-width: 0;
+        max-width: none;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        gap: 16dp;
+    }
+
+    body.mirrored menu {
+        left: 20dp;
+        right: 20dp;
+        flex-direction: row-reverse;
+    }
+
+    hero {
+        flex: 1 1 0;
+        min-width: 0;
+        max-width: 48%;
+
+    }
+
+    body.mirrored hero {
+        align-items: flex-end;
+    }
+
+    hero img {
+        width: 100%;
+    }
+
+    #menu-list {
+        flex: 1 1 0;
+        min-width: 0;
+        max-width: 52%;
+        align-items: flex-end;
+    }
+
+    #menu-list button {
+        width: 100%;
+        max-width: 100%;
+        text-align: right;
+    }
+
+    #menu-list button:hover,
+    #menu-list button:focus-visible {
+        decorator: horizontal-gradient(#FEE68500 #FEE685FF);
+    }
+
+    body.mirrored #menu-list {
+        align-items: flex-start;
+    }
+
+    body.mirrored #menu-list button {
+        text-align: left;
+    }
+
+    body.mirrored #menu-list button:hover,
+    body.mirrored #menu-list button:focus-visible {
+        decorator: horizontal-gradient(#FEE685FF #FEE68500);
+    }
+
+    .eyebrow,
+    disc-info,
+    version-info {
+        display: none;
+    }
+}
@@ -1,10 +1,21 @@
 tab-bar {
    display: flex;
+    position: relative;
    min-width: 0;
    overflow: auto hidden;
+    clip: always;
    text-transform: uppercase;
 }

+tab-bar scrollbarhorizontal,
+tab-bar scrollbarhorizontal sliderarrowdec,
+tab-bar scrollbarhorizontal sliderarrowinc,
+tab-bar scrollbarhorizontal slidertrack,
+tab-bar scrollbarhorizontal sliderbar {
+    width: 0;
+    height: 0;
+}
+
 tab-bar tab {
    flex: 0 0 auto;
    padding: 0 24dp;
@@ -31,3 +42,40 @@ tab-bar tab:hover {
 tab-bar tab:active {
    decorator: vertical-gradient(#c2a42d10 #c2a42d40);
 }
+
+tab-bar[closable] tab-end-spacer {
+    display: block;
+    flex: 0 0 64dp;
+    width: 64dp;
+    pointer-events: none;
+}
+
+tab-bar[closable] close {
+    display: block;
+    position: fixed;
+    top: 8dp;
+    right: 8dp;
+    z-index: 1;
+    width: 48dp;
+    height: 48dp;
+    font-family: "Material Symbols Rounded";
+    font-weight: normal;
+    font-size: 24dp;
+    color: rgba(224, 219, 200, 70%);
+    backdrop-filter: blur(2dp);
+    border-radius: 6dp;
+    decorator: text("&#xe5cd;" center center);
+    transition: color background-color 0.12s linear-in-out;
+    cursor: pointer;
+}
+
+tab-bar[closable] close:hover,
+tab-bar[closable] close:focus-visible {
+    color: #fff;
+    background-color: rgba(194, 164, 45, 24%);
+}
+
+tab-bar[closable] close:active {
+    color: #fff;
+    background-color: rgba(194, 164, 45, 40%);
+}
@@ -0,0 +1,147 @@
+*, *:before, *:after {
+    box-sizing: border-box;
+}
+
+body {
+    overflow: visible;
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    font-family: "Fira Sans Condensed";
+    font-size: 24dp;
+    color: #FFFFFF;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    align-items: stretch;
+}
+
+.tuner-root {
+    width: 100%;
+    min-height: 45%;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    align-items: stretch;
+    decorator: vertical-gradient(#00000000 #151610F2);
+    filter: opacity(0);
+    transition: filter 0.2s linear-in-out;
+}
+
+.tuner-root[open] {
+    filter: opacity(1);
+}
+
+.tuner {
+    width: 100%;
+    max-width: 1216dp;
+    margin-left: auto;
+    margin-right: auto;
+    display: flex;
+    flex-direction: column;
+    gap: 24dp;
+    padding: 48dp 64dp;
+}
+
+@media (max-height: 800dp) {
+    .tuner-root {
+        min-height: 38%;
+    }
+
+    .tuner {
+        gap: 16dp;
+        padding: 32dp 48dp;
+    }
+}
+
+.header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 24dp;
+}
+
+.carousel-container {
+    flex: 1 1 auto;
+    display: flex;
+    justify-content: flex-end;
+    min-width: 0;
+}
+
+.description {
+    font-size: 18dp;
+    line-height: 22dp;
+    color: rgba(255, 255, 255, 50%);
+}
+
+.divider {
+    margin: 1dp 0;
+    border-top: 1dp rgba(217, 217, 217, 50%);
+}
+
+.footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 24dp;
+}
+
+footer-button {
+    display: block;
+    width: 100%;
+    max-width: 220dp;
+    border: 0;
+    padding: 0;
+    background-color: transparent;
+    font-family: "Fira Sans Condensed";
+    font-weight: bold;
+    font-size: 20dp;
+    line-height: 24dp;
+    text-transform: uppercase;
+    color: #FFFFFF;
+    opacity: 1;
+    cursor: pointer;
+}
+
+footer-button.return {
+    text-align: left;
+}
+
+footer-button.reset {
+    text-align: right;
+}
+
+.stepped-carousel {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 16dp;
+    width: auto;
+    min-width: 246dp;
+    padding: 0;
+    background-color: transparent;
+    font-family: "Fira Sans Condensed";
+    font-weight: bold;
+}
+
+.stepped-carousel-value {
+    line-height: 29dp;
+    min-width: 166dp;
+    text-align: center;
+    white-space: nowrap;
+    opacity: 0.9;
+}
+
+.stepped-carousel-arrow {
+    width: 24dp;
+    height: 24dp;
+    min-width: 24dp;
+    padding: 0;
+    border: 0;
+    background-color: transparent;
+    opacity: 1;
+    cursor: pointer;
+    font-family: "Material Symbols Rounded";
+    font-weight: normal;
+}
@@ -3,6 +3,7 @@
 }

 body {
+    display: flex;
    width: 100%;
    height: 100%;
    padding: 64dp;
@@ -17,6 +18,7 @@ window {
    display: flex;
    flex-flow: column;
    height: 100%;
+    width: 100%;
    max-width: 1088dp;
    max-height: 768dp;
    margin: auto;
@@ -32,6 +34,15 @@ window {
    transition: filter transform 0.2s cubic-in-out;
 }

+window.small {
+    height: auto;
+    width: auto;
+}
+
+window.modal {
+    max-width: 640dp;
+}
+
 window[open] {
    filter: opacity(1);
    transform: scale(1);
@@ -62,7 +73,7 @@ window tab-bar tab {

 window content {
    display: flex;
-    flex: 1 1 0;
+    flex: 1 1 auto;
    min-width: 0;
    min-height: 0;
    overflow: hidden;
@@ -72,7 +83,6 @@ window content pane {
    display: flex;
    flex-flow: column;
    flex: 1 1 0;
-    height: 100%;
    min-width: 0;
    min-height: 0;
    padding: 24dp;
@@ -90,6 +100,10 @@ window content pane > * {
    flex: 0 0 auto;
 }

+window content pane:last-of-type > div {
+    line-height: 1.625;
+}
+
 window content pane > spacer {
    display: block;
    /* Completes the 24dp bottom inset after the pane's 8dp gap. */
@@ -184,6 +198,11 @@ button:not(:disabled):active {
    box-shadow: #C2A42D 0 0 0 2dp;
 }

+button.modal-btn {
+    flex: 1 1 0;
+    text-align: center;
+}
+
 select-button {
    display: flex;
    align-items: center;
@@ -225,15 +244,250 @@ select-button key {
    font-weight: bold;
    font-size: 18dp;
    text-transform: uppercase;
-    flex: 1 0 auto;
+    flex: 0 1 auto;
 }

 select-button value {
-    margin-left: auto;
+    flex: 1 1 auto;
+    text-align: right;
    font-size: 20dp;
 }

+select-button value.modified {
+    font-weight: bold;
+}
+
 select-button input {
    text-align: right;
    font-size: 20dp;
 }
+
+icon {
+    width: 1em;
+    height: 1em;
+    font-family: "Material Symbols Rounded";
+    font-weight: normal;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+icon.warning {
+    decorator: text("&#xe002;" center center);
+}
+
+icon.error {
+    decorator: text("&#xe000;" center center);
+}
+
+icon.verifying {
+    decorator: text("&#xe8b5;" center center);
+}
+
+icon.celebration {
+    decorator: text("&#xea65;" center center);
+}
+
+icon.question-mark {
+    decorator: text("&#xeb8b;" center center);
+}
+
+.achievement-row {
+    display: flex;
+    align-items: flex-start;
+    gap: 10dp;
+    padding: 12dp 0;
+    border-bottom: 1dp rgba(146, 135, 91, 30%);
+}
+
+.achievement-info {
+    display: block;
+    flex: 1 1 0;
+    min-width: 0;
+}
+
+.achievement-header {
+    display: flex;
+    align-items: center;
+}
+
+.achievement-name {
+    flex: 1;
+    font-weight: bold;
+}
+
+.achievement-name.unlocked {
+    color: #ffa826;
+}
+
+.achievement-badge {
+    font-size: 14dp;
+    opacity: 0.7;
+}
+
+.achievement-badge.unlocked {
+    color: #44cc55;
+    opacity: 1;
+}
+
+.achievement-badge.locked {
+    color: #cc4444;
+    opacity: 1;
+}
+
+.achievement-desc {
+    display: block;
+    color: rgba(224, 219, 200, 55%);
+    font-size: 16dp;
+    margin: 4dp 0 0 0;
+}
+
+.achievement-progress {
+    display: block;
+    font-size: 13dp;
+    color: rgba(224, 219, 200, 45%);
+}
+
+progress {
+    display: block;
+    width: 100%;
+    height: 6dp;
+    border-radius: 3dp;
+    background-color: rgba(255, 255, 255, 10%);
+    margin: 6dp 0 2dp 0;
+}
+
+progress.progress-done fill {
+    background-color: #44aa22;
+    border-radius: 3dp;
+}
+
+progress.progress-ongoing fill {
+    background-color: #2255bb;
+    border-radius: 3dp;
+}
+
+button.achievement-clear {
+    flex: 0 0 auto;
+    align-self: center;
+    font-size: 14dp;
+    padding: 2dp 8dp;
+    opacity: 0.45;
+}
+
+.preset-grid {
+    display: flex;
+    flex-direction: row;
+    gap: 20dp;
+    flex: 0 1 auto;
+    align-items: flex-start;
+    width: 100%;
+}
+
+.preset-col {
+    display: flex;
+    flex-flow: column;
+    gap: 12dp;
+    flex: 1 1 0;
+}
+
+.preset-desc {
+    display: block;
+    font-size: 16dp;
+    text-align: center;
+}
+
+.modal-dialog {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    padding: 24dp;
+    gap: 20dp;
+    flex: 0 1 auto;
+    width: 100%;
+    text-align: left;
+}
+
+window.modal.danger {
+    border: 2dp #852221;
+}
+
+.modal-header {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    flex: 0 0 auto;
+    gap: 16dp;
+}
+
+.modal-header icon {
+    font-size: 24dp;
+    color: #92875B;
+}
+
+.modal-title {
+    display: block;
+    font-family: "Fira Sans Condensed";
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 18dp;
+    color: #92875B;
+    flex: 1 1 auto;
+}
+
+window.modal.danger .modal-title,
+window.modal.danger .modal-header icon {
+    color: #B3261E;
+}
+
+.modal-body {
+    display: block;
+    width: 100%;
+    flex: 0 1 auto;
+    min-width: 0;
+    font-size: 20dp;
+    color: #FFFFFF;
+    font-weight: normal;
+}
+
+.modal-body span.tip {
+    font-size: 14dp;
+    color: #92875B;
+}
+
+.verification-progress {
+    display: flex;
+    flex-direction: column;
+    gap: 10dp;
+    width: 100%;
+}
+
+.verification-file {
+    display: block;
+    font-size: 17dp;
+    color: #FFFFFF;
+}
+
+progress.verification-progress-bar {
+    height: 8dp;
+    margin: 2dp 0 0 0;
+}
+
+.verification-detail {
+    display: block;
+    font-size: 14dp;
+    color: rgba(224, 219, 200, 65%);
+}
+
+.modal-actions {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: stretch;
+    align-items: stretch;
+    gap: 12dp;
+    width: 100%;
+    flex: 0 0 auto;
+    padding-top: 4dp;
+}
@@ -2,6 +2,7 @@
 #include "Z2AudioLib/Z2SoundInfo.h"
 #if TARGET_PC
 #include "dusk/audio/DuskDsp.hpp"
+#include "dusk/settings.h"
 #include <cmath>
 #endif
 #include "Z2AudioLib/Z2Calc.h"
@@ -705,6 +706,11 @@ f32 Z2Audience::calcRelPosVolume(const Vec& param_0, f32 param_1, int camID) {
 f32 Z2Audience::calcRelPosPan(const Vec& param_0, int camID) {
    Vec local_54 = param_0;
    local_54.y = 0.0f;
+#if TARGET_PC
+    if (dusk::getSettings().game.enableMirrorMode) {
+        local_54.x = -local_54.x;
+    }
+#endif

    f32 dVar6 = VECMag(&local_54);
    if (dVar6 < 0.1f) {
@@ -44,16 +44,14 @@ void daAlink_c::handleWolfHowl() {
        bool canHowl = false;

        if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn()) {
-            if (!checkForestOldCentury()) {
-                if (checkMidnaRide()) {
-                    if ((checkWolf() &&
-                         (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
-                        (!checkWolf() &&
-                         (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
-                         (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
-                    {
-                        canHowl = true;
-                    }
+            if (checkMidnaRide()) {
+                if ((checkWolf() &&
+                     (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
+                    (!checkWolf() &&
+                     (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
+                     (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
+                {
+                    canHowl = true;
                }
            }
        }
@@ -124,16 +122,14 @@ void daAlink_c::handleQuickTransform() {
    bool canTransform = false;

    if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn()) {
-        if (!checkForestOldCentury()) {
-            if (checkMidnaRide()) {
-                if ((checkWolf() &&
-                     (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
-                    (!checkWolf() &&
-                     (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
-                     (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
-                {
-                    canTransform = true;
-                }
+        if (checkMidnaRide()) {
+            if ((checkWolf() &&
+                 (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
+                (!checkWolf() &&
+                 (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
+                 (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
+            {
+                canTransform = true;
            }
        }
    }
@@ -2721,7 +2721,7 @@ int daAlink_c::procHorseRun() {
            }

            if (mProcVar2.field_0x300c == 0) {
-                set3DStatus(BUTTON_STATUS_HOLD_ON, 4);
+                set3DStatus(BUTTON_STATUS_HOLD_ON, IF_DUSK(dusk::getSettings().game.enableMirrorMode ? 1 :) 4);
            }
        } else {
            if (mProcVar3.field_0x300e != 0) {
@@ -2731,7 +2731,7 @@ int daAlink_c::procHorseRun() {
            }

            if (mProcVar2.field_0x300c == 0) {
-                set3DStatus(BUTTON_STATUS_HOLD_ON, 1);
+                set3DStatus(BUTTON_STATUS_HOLD_ON, IF_DUSK(dusk::getSettings().game.enableMirrorMode ? 4 :) 1);
            }
        }

@@ -41,7 +41,7 @@ void daAlink_c::setOriginalHeap(JKRExpHeap** i_ppheap, u32 i_size) {
        u32 var_r28 = 0x10;
        u32 size = ROUND(i_size, 16);
 #if TARGET_PC
-        size *= 2;
+        size *= 20; // Increase Link's heap size to prevent mods from crashing with higher-quality models.
 #endif
        JKRHeap* parent = mDoExt_getGameHeap();

@@ -254,7 +254,11 @@ BOOL daBdoor_c::checkArea() {
    if (fabsf(vec.z) > 100.0f) {
        return false;
    }
+#ifdef TARGET_PC
+    return (s16)((s32)fabs(current.angle.y - 0x7fff - player->current.angle.y) & 0xffff) <= 0x4000 ? 1 : 0;
+#else
    return (s16)fabs((f64)(current.angle.y - 0x7fff - player->current.angle.y)) <= 0x4000 ? 1 : 0;
+#endif
 }

 BOOL daBdoor_c::checkFront() {
@@ -825,7 +825,11 @@ int daBdoorL1_c::checkArea() {
    if (fabsf(local_48.z) > 100.0f) {
        return 0;
    }
+#ifdef TARGET_PC
+    if ((s16)((s32)fabs(current.angle.y - 0x7fff - player->current.angle.y) & 0xffff) <= 0x4000) {
+#else
    if ((s16)fabs((f64)(current.angle.y - 0x7fff - player->current.angle.y)) <= 0x4000) {
+#endif
        return 1;
    } else {
        return 0;
@@ -348,7 +348,11 @@ int daBdoorL5_c::checkArea() {
    if (fabsf(local_48.z) > 100.0f) {
        return 0;
    }
+#ifdef TARGET_PC
+    if ((s16)((s32)fabs(current.angle.y - 0x7fff - player->current.angle.y) & 0xffff) <= 0x4000) {
+#else
    if ((s16)fabs((f64)(current.angle.y - 0x7fff - player->current.angle.y)) <= 0x4000) {
+#endif
        return 1;
    } else {
        return 0;
@@ -1317,8 +1317,12 @@ int daMBdoorL1_c::checkArea() {
    if (fabsf(local_48.z) > 110.0f) {
        return 0;
    }
-    
+
+#ifdef TARGET_PC
+    if ((s16)((s32)fabs(angle - 0x7fff - player->current.angle.y) & 0xffff) > 0x4000) {
+#else
    if ((s16)fabs((f64)(angle - 0x7fff - player->current.angle.y)) > 0x4000) {
+#endif
        return 0;
    } else {
        return 1;
@@ -517,6 +517,12 @@ void daE_OctBg_c::core_fish_attack() {
                        field_0xbaf = cM_rndFX(80.0f) + 100.0f;
                    }
                }
+            #if AVOID_UB
+                else {
+                    in_f31 = cM_rndF(400.0f) + 80.0f;
+                    field_0xbaf = cM_rndFX(80.0f) + 100.0f;
+                }
+            #endif
            } else if (current.pos.abs(cStack_5c) < 400.0f) {
                in_f31 = cM_rndF(50.0f) + 20.0f;
                field_0xbaf = cM_rndFX(20.0f) + 40.0f;
@@ -3519,7 +3519,15 @@ void daKago_c::action() {
    checkSizeBg();
    setFlyEffect();

+#if TARGET_PC
+    if (dusk::getSettings().game.enableMirrorMode) {
+        mStickX = -mDoCPd_c::getStickX3D(PAD_1);
+    } else {
+        mStickX = mDoCPd_c::getStickX3D(PAD_1);
+    }
+#else
    mStickX = mDoCPd_c::getStickX3D(PAD_1);
+#endif
    mStickY = mDoCPd_c::getStickY(PAD_1);

    u8 prevIsWaterfall = mIsWaterfall;
@@ -14,6 +14,7 @@
 #include "d/actor/d_a_obj_automata.h"
 #include "d/d_msg_object.h"
 #include "d/actor/d_a_obj_scannon.h"
+#include "dusk/frame_interpolation.h"
 #include <cstring>

 const daNpc_Toby_HIOParam daNpc_Toby_Param_c::m = {
@@ -1398,6 +1399,7 @@ int daNpc_Toby_c::cutRepairSCannon(int arg0) {
                old.pos = current.pos;
                setAngle(cM_deg2s(5.0f * f32(mPath.getArg0())));
                mEventTimer = mPath.getArg2();
+                dusk::frame_interp::request_presentation_sync();
            }
        } else if (!mHide) {
            mHide = 1;
@@ -11,6 +11,8 @@
 #include "d/d_bg_w.h"
 #include "d/d_cc_uty.h"
 #include "d/d_com_inf_game.h"
+#include "dusk/frame_interpolation.h"
+#include "dusk/settings.h"

 struct daObjKLift00_HIO_c : public mDoHIO_entry_c {
    daObjKLift00_HIO_c();
@@ -295,6 +297,11 @@ int daObjKLift00_c::Create() {
    if(getLock())
        mStopSwingingFrames = 5;

+#if TARGET_PC
+    mChainInterpPrevValid = false;
+    mChainInterpCurrValid = false;
+#endif
+
    return 1;
 }

@@ -436,6 +443,34 @@ int daObjKLift00_c::Execute(Mtx** i_mtx) {
    return 1;
 }

+#if TARGET_PC
+static void klift00_interp_callback(bool isSimFrame, void* pUserWork) {
+    static_cast<daObjKLift00_c*>(pUserWork)->onInterpCallback();
+}
+
+void daObjKLift00_c::onInterpCallback() {
+    if (!mChainInterpPrevValid || !mChainInterpCurrValid) {
+        return;
+    }
+
+    const f32 alpha = dusk::frame_interp::get_interpolation_step();
+    cXyz savedPositions[64];
+
+    for (int i = 0; i < mNumChains; i++) {
+        savedPositions[i] = mChainPositions[i].mCurrentPos;
+        const cXyz& p0 = mChainInterpPrev[i];
+        const cXyz& p1 = mChainInterpCurr[i];
+        mChainPositions[i].mCurrentPos = p0 + (p1 - p0) * alpha;
+    }
+
+    setMtx();
+
+    for (int i = 0; i < mNumChains; i++) {
+        mChainPositions[i].mCurrentPos = savedPositions[i];
+    }
+}
+#endif
+
 int daObjKLift00_c::Draw() {
    g_env_light.settingTevStruct(16, &current.pos, &tevStr);
    g_env_light.setLightTevColorType_MAJI(mpLiftPlatform, &tevStr);
@@ -457,6 +492,22 @@ int daObjKLift00_c::Draw() {

    dComIfGd_setList();

+#if TARGET_PC
+    if (dusk::getSettings().game.enableFrameInterpolation) {
+        if (mChainInterpCurrValid) {
+            memcpy(mChainInterpPrev, mChainInterpCurr, mNumChains * sizeof(cXyz));
+            mChainInterpPrevValid = true;
+        }
+
+        for (int i = 0; i < mNumChains; i++) {
+            mChainInterpCurr[i] = mChainPositions[i].mCurrentPos;
+        }
+        
+        mChainInterpCurrValid = true;
+        dusk::frame_interp::add_interpolation_callback(&klift00_interp_callback, this);
+    }
+#endif
+
    return 1;
 }

@@ -12,6 +12,10 @@
 #include "SSystem/SComponent/c_counter.h"
 #include <cstring>

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 #define DRAW_TYPE_YELLOW 0
 #define DRAW_TYPE_RED    1

@@ -1422,6 +1426,11 @@ int dAttention_c::Run() {
 }

 void dAttention_c::Draw() {
+#if TARGET_PC
+if (dusk::getSettings().game.recordingMode) {
+    return;
+}
+#endif
    if (mAttParam.CheckFlag(dAttParam_c::EFlag_ARROW_OFF)) {
        draw[0].field_0x173 = 3;
        draw[1].field_0x173 = 3;
@@ -31,6 +31,7 @@
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
 #include "dusk/logging.h"
+#include "imgui.h"
 #endif

 namespace {
@@ -1040,6 +1041,11 @@ void dCamera_c::debugDrawInit() {
 bool dCamera_c::Run() {
 #if TARGET_PC
    ResetView();
+    if (executeDebugFlyCam()) {
+        mFrameCounter++;
+        mTicks++;
+        return true;
+    }
 #endif

    daAlink_c* link = daAlink_getAlinkActorClass();
@@ -7474,7 +7480,155 @@ bool dCamera_c::test2Camera(s32 param_0) {
    return false;
 }

+static constexpr f32 FLYCAM_SPEED = 0.5f;
+static constexpr f32 FLYCAM_FAST_SPEED = 4.0f;
+static constexpr f32 FLYCAM_ROTATION_SPEED = 0.002f;
+static constexpr f32 FLYCAM_TRIGGER_DEADZONE = 20.0f;
+static constexpr s16 FLYCAM_ROLL_SPEED = 256;
+static ImVec2 sFlyCamLastMousePos = {-1.f, -1.f};
+
 #if TARGET_PC
+bool dCamera_c::executeDebugFlyCam() {
+    if (!dusk::getSettings().game.debugFlyCam) {
+        if (mDebugFlyCam.initialized) {
+            deactivateDebugFlyCam();
+        }
+        sFlyCamLastMousePos = {-1.f, -1.f};
+        return false;
+    }
+
+    dEvt_control_c* event = dComIfGp_getEvent();
+    if (event == nullptr) {
+        return false;
+    }
+
+    if (!mDebugFlyCam.initialized && (event->mEventStatus != 0 || dComIfGp_isPauseFlag())) {
+        dusk::getSettings().game.debugFlyCam.setValue(false);
+        return false;
+    }
+
+    if (!mDebugFlyCam.initialized) {
+        mDebugFlyCam.savedCenter = mCenter;
+        mDebugFlyCam.savedEye = mEye;
+        mDebugFlyCam.savedFovy = mFovy;
+        mDebugFlyCam.savedBank = mBank;
+
+        f32 dx = mCenter.x - mEye.x;
+        f32 dy = mCenter.y - mEye.y;
+        f32 dz = mCenter.z - mEye.z;
+        mDebugFlyCam.yaw = atan2f(dz, dx);
+        f32 horizontal = sqrtf(dx * dx + dz * dz);
+        mDebugFlyCam.pitch = atan2f(dy, horizontal);
+
+        mDebugFlyCam.initialized = true;
+    }
+
+    if (dusk::getSettings().game.debugFlyCamLockEvents) {
+        event->mEventStatus = 1;
+        dComIfGp_getEventManager().setCameraPlay(1);
+    } else {
+        if (event->mEventStatus != 0) {
+            event->mEventStatus = 0;
+        }
+        dComIfGp_getEventManager().setCameraPlay(0);
+    }
+
+    f32 stickY = 0.f;
+    f32 stickX = 0.f;
+    f32 cStickY = 0.f;
+    f32 cStickX = 0.f;
+    f32 trigL = 0.f;
+    f32 trigR = 0.f;
+    f32 rollInput = 0.f;
+    bool fast = false;
+
+    if (dusk::getSettings().game.debugFlyCamLockEvents) {
+        interface_of_controller_pad& pad = mDoCPd_c::getCpadInfo(0);
+        stickY = pad.mMainStickPosY * 72.0f;
+        stickX = pad.mMainStickPosX * 72.0f;
+        cStickY = pad.mCStickPosY * 59.0f;
+        cStickX = pad.mCStickPosX * 59.0f;
+        trigL = pad.mTriggerLeft * 150.0f;
+        trigR = pad.mTriggerRight * 150.0f;
+        fast = mDoCPd_c::getHoldZ(PAD_1);
+        if (mDoCPd_c::getHoldY(PAD_1)) rollInput -= 1.f;
+        if (mDoCPd_c::getHoldX(PAD_1)) rollInput += 1.f;
+    }
+
+    {
+        ImGuiIO& io = ImGui::GetIO();
+        if (!io.WantCaptureKeyboard) {
+            f32 kbX = 0.0f, kbY = 0.0f;
+            if (ImGui::IsKeyDown(ImGuiKey_W) || ImGui::IsKeyDown(ImGuiKey_UpArrow)) kbY += 1.f;
+            if (ImGui::IsKeyDown(ImGuiKey_S) || ImGui::IsKeyDown(ImGuiKey_DownArrow)) kbY -= 1.f;
+            if (ImGui::IsKeyDown(ImGuiKey_D) || ImGui::IsKeyDown(ImGuiKey_RightArrow)) kbX += 1.f;
+            if (ImGui::IsKeyDown(ImGuiKey_A) || ImGui::IsKeyDown(ImGuiKey_LeftArrow)) kbX -= 1.f;
+            f32 len = sqrtf(kbX * kbX + kbY * kbY);
+            if (len > 1.f) { kbX /= len; kbY /= len; }
+            stickX += kbX * 72.0f;
+            stickY += kbY * 72.0f;
+            if (ImGui::IsKeyDown(ImGuiKey_Space)) trigR += 150.0f;
+            if (ImGui::IsKeyDown(ImGuiKey_LeftCtrl)) trigL += 150.0f;
+            if (ImGui::IsKeyDown(ImGuiKey_LeftShift)) fast = true;
+            if (ImGui::IsKeyDown(ImGuiKey_Q)) rollInput -= 1.0f;
+            if (ImGui::IsKeyDown(ImGuiKey_E)) rollInput += 1.0f;
+        }
+        bool mouseValid = !io.WantCaptureMouse && io.MousePos.x >= 0.0f && io.MousePos.y >= 0.0f;
+        if (mouseValid && sFlyCamLastMousePos.x >= 0.0f) {
+            cStickX -= (io.MousePos.x - sFlyCamLastMousePos.x) * 2.0f;
+            cStickY -= (io.MousePos.y - sFlyCamLastMousePos.y) * 2.0f;
+        }
+        sFlyCamLastMousePos = mouseValid ? io.MousePos : ImVec2{-1.0f, -1.0f};
+    }
+
+    f32 verticalDisp = 0.0f;
+    if (trigR >= FLYCAM_TRIGGER_DEADZONE) {
+        verticalDisp += trigR;
+    }
+    if (trigL >= FLYCAM_TRIGGER_DEADZONE) {
+        verticalDisp -= trigL;
+    }
+
+    f32 moveDy = stickY * sinf(mDebugFlyCam.pitch) + verticalDisp;
+    f32 moveDx = stickY * cosf(mDebugFlyCam.yaw) * cosf(mDebugFlyCam.pitch) - stickX * sinf(mDebugFlyCam.yaw);
+    f32 moveDz = stickY * sinf(mDebugFlyCam.yaw) * cosf(mDebugFlyCam.pitch) + stickX * cosf(mDebugFlyCam.yaw);
+
+    f32 speed = fast ? FLYCAM_FAST_SPEED : FLYCAM_SPEED;
+
+    mEye.x += speed * moveDx;
+    mEye.y += speed * moveDy;
+    mEye.z += speed * moveDz;
+
+    static constexpr f32 FLYCAM_TARGET_DIST = 100.0f;
+    mCenter.x = mEye.x + cosf(mDebugFlyCam.yaw) * cosf(mDebugFlyCam.pitch) * FLYCAM_TARGET_DIST;
+    mCenter.z = mEye.z + sinf(mDebugFlyCam.yaw) * cosf(mDebugFlyCam.pitch) * FLYCAM_TARGET_DIST;
+    mCenter.y = mEye.y + sinf(mDebugFlyCam.pitch) * FLYCAM_TARGET_DIST;
+
+    mBank = mBank + static_cast<s16>(rollInput * FLYCAM_ROLL_SPEED * (fast ? FLYCAM_FAST_SPEED / FLYCAM_SPEED : 1.f));
+    Reset(mCenter, mEye);
+
+    f32 yawInput = dusk::getSettings().game.invertCameraXAxis ? cStickX : -cStickX;
+    mDebugFlyCam.yaw += yawInput * FLYCAM_ROTATION_SPEED;
+    mDebugFlyCam.yaw = fmodf(mDebugFlyCam.yaw + 2.0f * (f32)M_PI, 2.0f * (f32)M_PI);
+
+    f32 maxPitch = (f32)M_PI / 2.0f - 0.1f;
+    f32 minPitch = -(f32)M_PI / 2.0f + 0.1f;
+    mDebugFlyCam.pitch = std::clamp(mDebugFlyCam.pitch + cStickY * FLYCAM_ROTATION_SPEED, minPitch, maxPitch);
+
+    return true;
+}
+
+void dCamera_c::deactivateDebugFlyCam() {
+    Reset(mDebugFlyCam.savedCenter, mDebugFlyCam.savedEye, mDebugFlyCam.savedFovy, mDebugFlyCam.savedBank.Val());
+
+    dEvt_control_c* event = dComIfGp_getEvent();
+    if (event != nullptr && event->mEventStatus != 0) {
+        event->mEventStatus = 0;
+    }
+    dComIfGp_getEventManager().setCameraPlay(0);
+    mDebugFlyCam.initialized = false;
+}
+
 bool dCamera_c::freeCamera() {
    if (dusk::getSettings().game.freeCamera && mGear == 1) {
        mGear = 0;
@@ -11,6 +11,62 @@
 #include "JSystem/JGadget/define.h"
 #include <cstring>

+#include "dusk/logging.h"
+
+#if TARGET_PC
+#include "dusk/ui/ui.hpp"
+
+namespace {
+static int sJaiSkip = -1;
+
+static JSUList<JAIStream>* get_stream_list() {
+    return Z2GetSoundMgr()->getStreamMgr()->getStreamList();
+}
+
+static int get_stream_count(JSUList<JAIStream>* list) {
+    int i = 0;
+    for (JSULink<JAIStream>* l = list != nullptr ? list->getFirst() : nullptr; l != nullptr;
+        l = l->getNext()) {
+        i++;
+    }
+    return i;
+}
+
+static void pause_stream(int skip_first, bool paused) {
+    int i = 0;
+    JSUList<JAIStream>* list = get_stream_list();
+    for (JSULink<JAIStream>* l = list->getFirst(); l != nullptr; l = l->getNext(), ++i) {
+        if (i >= skip_first) {
+            l->getObject()->pause(paused);
+        }
+    }
+}
+
+static void pause_streams(int skip_first) {
+    if (!dusk::ui::is_prelaunch_open()) {
+        return;
+    }
+    JSUList<JAIStream>* list = get_stream_list();
+    if (list == nullptr || get_stream_count(list) <= skip_first) {
+        return;
+    }
+    pause_stream(skip_first, true);
+    sJaiSkip = skip_first;
+}
+
+static void unpause_streams(bool require_prelaunch_hidden) {
+    if (sJaiSkip < 0) {
+        return;
+    }
+    if (require_prelaunch_hidden && dusk::ui::is_prelaunch_open()) {
+        return;
+    }
+    pause_stream(sJaiSkip, false);
+    sJaiSkip = -1;
+}
+}  // namespace
+#endif
+
 s16 dDemo_c::m_branchId = -1;

 namespace {
@@ -1006,7 +1062,16 @@ int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) {
        m_control->setSuspend(0);
    }

+#if TARGET_PC
+    const int existing_streams = get_stream_count(get_stream_list());
+#endif
+
    m_control->forward(0);
+
+#if TARGET_PC
+    pause_streams(existing_streams);
+#endif
+
    m_translation = p_translation;

    if (m_translation != NULL) {
@@ -1034,6 +1099,10 @@ static void dummyString2() {
 void dDemo_c::end() {
    JUT_ASSERT(1956, m_system != NULL);

+#if TARGET_PC
+    unpause_streams(false);
+#endif
+
    m_control->destroyObject_all();
    m_object->remove();
    m_data = NULL;
@@ -1054,6 +1123,10 @@ void dDemo_c::branch() {
 int dDemo_c::update() {
    JUT_ASSERT(2064, m_system != NULL);

+#if TARGET_PC
+    unpause_streams(true);
+#endif
+
    if (m_data == NULL) {
        if (m_branchData == NULL) {
            return 0;
@@ -1595,7 +1595,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
        calcMapCmPerTexel(field_0x80, &field_0x58);
        getPack(field_0x80, &mPackX, &mPackZ);

-        mCenterX += mPackX;
+        mCenterX += IF_DUSK(dusk::getSettings().game.enableMirrorMode ? -mPackX :) mPackX;
        mCenterZ -= mPackZ;
        mCenterX += field_0x64;
        mCenterZ += mPackPlusZ;
@@ -1657,7 +1657,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
            calcMapCmPerTexel(field_0x80, &field_0x58);
            getPack(field_0x80, &mPackX, &mPackZ);

-            mCenterX += mPackX;
+            mCenterX += IF_DUSK(dusk::getSettings().game.enableMirrorMode ? -mPackX :) mPackX;
            mCenterZ -= mPackZ;
        }
        break;
@@ -1737,7 +1737,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
                calcMapCmPerTexel(field_0x80, &field_0x58);
                getPack(field_0x80, &mPackX, &mPackZ);

-                mCenterX += mPackX;
+                mCenterX += IF_DUSK(dusk::getSettings().game.enableMirrorMode ? -mPackX :) mPackX;
                mCenterZ -= mPackZ;
                field_0x8f = 4;
 #if DEBUG
@@ -1829,7 +1829,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {

            sp14 += temp_f31_2 * (spC - sp14);
            sp10 += temp_f31_2 * (sp8 - sp10);
-            mCenterX += sp14;
+            mCenterX += IF_DUSK(dusk::getSettings().game.enableMirrorMode ? -sp14 :) sp14;
            mCenterZ -= sp10;
            break;
        }
@@ -15,13 +15,47 @@
 #include <cstring>

 #ifdef TARGET_PC
+#include <span>
+#include <numbers>
+#include <array>
+
 constexpr u16 kMapResolutionMultiplier = 4;
-constexpr u16 kMapCircleSize = 16 * kMapResolutionMultiplier;
+constexpr u16 kMapImageSide = 16 * kMapResolutionMultiplier;
+constexpr u32 kMapImageTotalPixels = kMapImageSide * kMapImageSide;
+
+typedef std::function<u8(size_t, size_t)> PaintI8Fn;
+
+void paint_i8(std::span<u8> dst, size_t width, PaintI8Fn paint) {
+    const auto blocksAcross = width >> 3;
+
+    for (size_t i = 0; i < dst.size(); i++) {
+        // 8x4 block swizzling for I8
+        const auto blockIdx = i >> 5;
+        const auto localIdx = i & 31;
+
+        const auto blockY = blockIdx / blocksAcross;
+        const auto blockX = blockIdx % blocksAcross;
+
+        const auto localY = localIdx >> 3;
+        const auto localX = localIdx & 7;
+
+        const auto x = (blockX << 3) + localX;
+        const auto y = (blockY << 2) + localY;
+
+        dst[i] = paint(x, y);
+    }
+}
 #endif

 void dMpath_n::dTexObjAggregate_c::create() {
    static int const data[7] = {
-        79, 80, 77, 78, 76, 81, 82,
+        79, // 0: im_map_icon_square_4i.bti
+        80, // 1: im_map_icon_tresurebox_4i.bti
+        77, // 2: im_map_icon_enter_4i.bti
+        78, // 3: im_map_icon_nijumaru_4i.bti
+        76, // 4: im_map_icon_circle_4i.bti
+        81, // 5: im_map_icon_try_force_4i.bti
+        82, // 6: map_icon_circle16x16_4i.bti
    };

    for (int lp1 = 0; lp1 < 7; lp1++) {
@@ -35,45 +69,101 @@ void dMpath_n::dTexObjAggregate_c::create() {
    }

 #if TARGET_PC
-    auto hqCircle = JKR_NEW TGXTexObj();
+    static bool hqTexsDrawn = false;

-    static bool hqCircleDrawn = false;
-    static u8 hqCircleData[kMapCircleSize * kMapCircleSize];
+    static u8 hqCircleData[kMapImageTotalPixels];
+    static u8 hqCircleAltData[kMapImageTotalPixels];
+    static u8 hqNijumaruData[kMapImageTotalPixels];
+    static u8 hqEnterData[kMapImageTotalPixels];
+    static u8 hqTryForceData[kMapImageTotalPixels];

-    if (!hqCircleDrawn) {
-        const auto center = kMapCircleSize / 2.0f;
-        const auto radiusSq = center * center;
-        const auto blocksAcross = kMapCircleSize >> 3;
-        const auto totalPixels = sizeof(hqCircleData);
+    if (!hqTexsDrawn) {
+        constexpr auto center = kMapImageSide / 2.0f;
+        constexpr auto radiusSq = center * center;

-        for (size_t i = 0; i < totalPixels; i++) {
-            // 8x4 block swizzling for I8
-            const auto blockIdx = i >> 5;
-            const auto localIdx = i & 31;
+        // 6: map_icon_circle16x16_4i.bti - simple circle
+        paint_i8(std::span{hqCircleData}, kMapImageSide, [=](auto x, auto y) {
+            const auto dx = (x + 0.5f) - center;
+            const auto dy = (y + 0.5f) - center;
+            return (dx * dx + dy * dy < radiusSq) ? 0x11 : 0;
+        });

-            const auto blockY = blockIdx / blocksAcross;
-            const auto blockX = blockIdx % blocksAcross;
-
-            const auto localY = localIdx >> 3;
-            const auto localX = localIdx & 7;
-
-            const auto x = (blockX << 3) + localX;
-            const auto y = (blockY << 2) + localY;
+        // 4: im_map_icon_circle_4i.bti - outlined circle
+        paint_i8(std::span{hqCircleAltData}, kMapImageSide, [=](auto x, auto y) {
+            constexpr auto innerRadius = kMapImageSide * 3.0f / 8.0f;
+            constexpr auto innerRadiusSq = innerRadius * innerRadius;

            const auto dx = (x + 0.5f) - center;
            const auto dy = (y + 0.5f) - center;
+            const auto dSq = dx * dx + dy * dy;

-            // the original texture is in I4 format and uses 1 to indicate if inside the circle
-            // so we scale to I8 range: 255 / 15 = 17
-            hqCircleData[i] = (dx * dx + dy * dy < radiusSq) ? 17 : 0;
-        }
-        hqCircleDrawn = true;
+            return dSq < radiusSq ? (dSq < innerRadiusSq ? 0x22 : 0x11) : 0;
+        });
+
+        // 3: im_map_icon_nijumaru_4i.bti - concentric rings
+        paint_i8(std::span{hqNijumaruData}, kMapImageSide, [=](auto x, auto y) {
+            constexpr u8 nijumaruRings[] = {0x11, 0x22, 0x11, 0x11, 0x22, 0x22};
+
+            const auto dx = (x + 0.5f) - center;
+            const auto dy = (y + 0.5f) - center;
+            const auto dSq = dx * dx + dy * dy;
+
+            if (dSq < radiusSq) {
+                const auto ringIndex =
+                    static_cast<size_t>(std::trunc(std::sqrt(dSq) / kMapImageSide * 12));
+                return nijumaruRings[ringIndex];
+            }
+            return u8{0};
+        });
+
+        // 2: im_map_icon_enter_4i.bti - outlined octagram
+        paint_i8(std::span{hqEnterData}, kMapImageSide, [=](auto x, auto y) {
+            constexpr auto outlineWidth = kMapImageSide / 6.0f;
+
+            const auto adx = std::abs((x + 0.5f) - center);
+            const auto ady = std::abs((y + 0.5f) - center);
+            const auto dist =
+                std::min(adx + ady, std::max(adx, ady) * std::numbers::sqrt2_v<float>) -
+                kMapImageSide / 2.0f;
+
+            return dist > 0.0f ? 0 : (dist > -outlineWidth ? 0x22 : 0x33);
+        });
+
+        // 5: im_map_icon_try_force_4i.bti - outlined circle with triangle
+        paint_i8(std::span{hqTryForceData}, kMapImageSide, [=](auto x, auto y) {
+            constexpr auto innerRadiusNorm = 5.0f / 12.0f;
+            constexpr auto innerRadius = kMapImageSide * innerRadiusNorm;
+            constexpr auto innerRadiusSq = innerRadius * innerRadius;
+            constexpr auto triRadius = kMapImageSide * innerRadiusNorm / 2.0f;
+
+            const auto dx = (x + 0.5f) - center;
+            const auto dy = (y + 0.5f) - center;
+            const auto dSq = dx * dx + dy * dy;
+            const auto triSideDist = (std::numbers::sqrt3_v<float> * std::abs(dx) - dy) * 0.5f;
+            const auto insideTri = std::max(dy, triSideDist) < triRadius;
+
+            return insideTri ? 0x22 : (dSq < radiusSq ? (dSq < innerRadiusSq ? 0x33 : 0x22) : 0);
+        });
+
+        hqTexsDrawn = true;
    }

-    GXInitTexObj(hqCircle, hqCircleData, kMapCircleSize, kMapCircleSize, GX_TF_I8, GX_CLAMP,
-                 GX_CLAMP, GX_FALSE);
-    GXInitTexObjLOD(hqCircle, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
-    mp_texObj[6] = hqCircle;
+    constexpr auto replacements = std::to_array<std::pair<size_t, const u8*> >({
+        {2, hqEnterData},
+        {3, hqNijumaruData},
+        {4, hqCircleAltData},
+        {5, hqTryForceData},
+        {6, hqCircleData},
+    });
+
+    for (const auto& [idx, data] : replacements) {
+        JKR_DELETE(mp_texObj[idx]);
+        const auto texobj = JKR_NEW TGXTexObj();
+        GXInitTexObj(
+            texobj, data, kMapImageSide, kMapImageSide, GX_TF_I8, GX_CLAMP, GX_CLAMP, GX_FALSE);
+        GXInitTexObjLOD(texobj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
+        mp_texObj[idx] = texobj;
+    }
 #endif
 }

@@ -942,7 +942,10 @@ void dMenu_DmapBg_c::draw() {
        f32 local_28c = mpBackTexture->getBounds().i.x;
        mpBackTexture->setBlackWhite(color_black, color_white);
        mpBackTexture->draw(local_28c, field_0xd94 + mpBackTexture->getBounds().i.y, mpBackTexture->getWidth(),
-                            mpBackTexture->getHeight(), false, false, false);
+                            mpBackTexture->getHeight(),
+                            IF_DUSK(dusk::getSettings().game.enableMirrorMode ? true :) false,
+                            false,
+                            false);

        grafContext->scissor(field_0xd94 + mDoGph_gInf_c::getMinXF(),
                             scissor_top, mDoGph_gInf_c::getWidthF(),
@@ -368,7 +368,7 @@ void dMenu_StageMapCtrl_c::initGetTreasureList(u8 param_0, s8 param_1) {
 }

 inline static s16 rightModeCnvRot(s16 param_0) {
-    return param_0;
+    return IF_DUSK(dusk::getSettings().game.enableMirrorMode ? -param_0 :) param_0;
 }

 bool dMenu_StageMapCtrl_c::getTreasureList(f32* o_posX, f32* o_posY, s8* param_2, u8* o_swbit,
@@ -405,7 +405,7 @@ bool dMenu_StageMapCtrl_c::getTreasureList(f32* o_posX, f32* o_posY, s8* param_2
 }

 inline static f32 rightModeCnvPos(f32 param_0) {
-    return param_0;
+    return IF_DUSK(dusk::getSettings().game.enableMirrorMode ? -param_0 :) param_0;
 }

 void dMenu_StageMapCtrl_c::cnvPosTo2Dpos(f32 param_0, f32 param_1, f32* param_2,
@@ -919,9 +919,20 @@ void dMenu_Fmap_c::region_map_proc() {
        }
        mpDraw2DBack->regionMapMove(mpStick);
        int stage_no, room_no;
+
+#if TARGET_PC
+        f32 arrow_pos_x = mpDraw2DBack->getArrowPos2DX();
+        if (dusk::getSettings().game.enableMirrorMode) {
+            arrow_pos_x = mpDraw2DBack->getMirrorPosX(arrow_pos_x, 0.0f);
+        }
+
+        f32 pos_x = arrow_pos_x - mDoGph_gInf_c::getMinXF() - mDoGph_gInf_c::getWidthF() * 0.5f;
+#else
        f32 pos_x = mpDraw2DBack->getArrowPos2DX() - mDoGph_gInf_c::getMinXF()
                                                    - mDoGph_gInf_c::getWidthF() * 0.5f;
+#endif
        f32 pos_y = mpDraw2DBack->getArrowPos2DY() - mDoGph_gInf_c::getHeightF() * 0.5f;
+
        mpMenuFmapMap->getPointStagePathInnerNo(getNowFmapRegionData(), pos_x, pos_y,
                                                mStayStageNo, &stage_no, &room_no);
        if (mStageCursor != stage_no || mRoomCursor != room_no || mResetAreaName) {
@@ -2464,6 +2475,13 @@ void dMenu_Fmap_c::portalWarpMapMove(STControl* i_stick) {
    f32 arrow_y = mpDraw2DBack->getArrowPos2DY();
    u8 uVar6 = 0xff;

+#if TARGET_PC
+    if (dusk::getSettings().game.enableMirrorMode) {
+        arrow_x = mpDraw2DBack->getMirrorPosX(arrow_x, 0.0f);
+    }
+#endif
+
+
    for (int i = 0; i < portal_dat->mCount; i++) {
        if (portals[i].mRegionNo == mpDraw2DBack->getRegionCursor() + 1
            && checkDrawPortalIcon(portals[i].mStageNo, portals[i].mSwitchNo))
@@ -1043,6 +1043,12 @@ void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) {
    calcAllMapPos2D((mArrowPos3DX + control_xpos) - mStageTransX,
                    (mArrowPos3DZ + control_ypos) - mStageTransZ, &sp14, &sp10);

+#if TARGET_PC
+    if (dusk::getSettings().game.enableMirrorMode) {
+        sp14 = getMirrorPosX(sp14, 0.0f);
+    }
+#endif
+
    mSelectRegion = 0xff;
    for (int i = 7; i >= 0; i--) {
        int val = field_0x1230[i];
@@ -1397,6 +1403,15 @@ void dMenu_Fmap2DBack_c::regionTextureDraw() {
            if (uVar10 != uVar9) {
                bool b = 0;
                f32 v = mTransX + (dVar14 + (mRegionMinMapX[uVar10] + field_0xf0c[uVar10]));
+
+                #if TARGET_PC
+                if (dusk::getSettings().game.enableMirrorMode) {
+                    b = true;
+                    v = getMirrorPosX(mTransX + (dVar14 + (mRegionMinMapX[uVar10] + field_0xf0c[uVar10])),
+                                      mRegionMapSizeX[uVar10] * mZoom * 0.5f);
+                }
+                #endif
+
                mpAreaTex[uVar10]->draw(
                    v, mTransZ + (dVar13 + (mRegionMinMapY[uVar10] + field_0xf2c[uVar10])),
                    mRegionMapSizeX[uVar10] * mZoom, mRegionMapSizeY[uVar10] * mZoom, b, false,
@@ -1404,6 +1419,15 @@ void dMenu_Fmap2DBack_c::regionTextureDraw() {
            } else {
                bool b = 0;
                f32 v = mTransX + (dVar14 + (mRegionMinMapX[uVar9] + field_0xf0c[uVar9]));
+
+                #if TARGET_PC
+                if (dusk::getSettings().game.enableMirrorMode) {
+                    b = true;
+                    v = getMirrorPosX(mTransX + (dVar14 + (mRegionMinMapX[uVar9] + field_0xf0c[uVar9])),
+                                      mRegionMapSizeX[uVar9] * mZoom * 0.5f);
+                }
+                #endif
+
                mpAreaTex[uVar9]->draw(
                    v, mTransZ + (dVar13 + (mRegionMinMapY[uVar9] + field_0xf2c[uVar9])),
                    mRegionMapSizeX[uVar9] * mZoom, mRegionMapSizeY[uVar9] * mZoom, b, false,
@@ -343,6 +343,11 @@ void dMenuMapCommon_c::drawIcon(f32 i_posX, f32 i_posY, f32 param_3, f32 param_4
                    }

                    f32 pos_x = icon_pos_x + i_posX;
+                    #if TARGET_PC
+                    if (dusk::getSettings().game.enableMirrorMode) {
+                        pos_x = getMirrorCenterPosX(pos_x, 0.0f);
+                    }
+                    #endif
                    mpDrawCursor->setPos(pos_x, icon_pos_y + i_posY);
                    mpDrawCursor->setScale(mIconInfo[info_idx].scale * g_fmapHIO.mMapIconHIO.mPortalCursorScale);
                    mpDrawCursor->draw();
@@ -364,6 +369,12 @@ void dMenuMapCommon_c::drawIcon(f32 i_posX, f32 i_posY, f32 param_3, f32 param_4
                    }

                    f32 pos_x = (icon_pos_x + i_posX);
+                    #if TARGET_PC
+                    if (dusk::getSettings().game.enableMirrorMode) {
+                        pos_x = getMirrorCenterPosX(pos_x, 0.0f);
+                    }
+                    #endif
+
                    mpPortalIcon->setPos(pos_x, icon_pos_y + i_posY);
                    mpPortalIcon->setScale(mIconInfo[info_idx].scale * g_fmapHIO.mMapIconHIO.mPortalIconScale);
                    mpPortalIcon->draw();
@@ -399,6 +410,12 @@ void dMenuMapCommon_c::drawIcon(f32 i_posX, f32 i_posY, f32 param_3, f32 param_4
                }

                f32 pos_x = i_posX + (icon_pos_x - (icon_size_x / 2));
+                #if TARGET_PC
+                if (dusk::getSettings().game.enableMirrorMode) {
+                    pos_x = getMirrorCenterPosX(i_posX + (icon_pos_x - (icon_size_x / 2)), icon_size_x / 2);
+                }
+                #endif
+
                mPictures[mIconInfo[info_idx].icon_no]->draw(pos_x, (i_posY + (icon_pos_y - icon_size_y / 2)),
                                                             icon_size_x, icon_size_y, false, false, false);

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

+#if TARGET_PC
 #include "dusk/memory.h"
-
-#include "dusk/memory.h"
+#include "dusk/settings.h"
+#endif

 int dMeter2_c::_create() {
    stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
@@ -317,7 +318,9 @@ int dMeter2_c::_execute() {

 int dMeter2_c::_draw() {
    #if TARGET_PC
-    if (dusk::getSettings().game.disableMainHUD) {
+    if (dusk::getSettings().game.recordingMode || dusk::getSettings().game.minimalHUD ||
+        dusk::getSettings().game.debugFlyCam)
+    {
        return 1;
    }
    #endif
@@ -1987,6 +1987,13 @@ bool jmessage_tSequenceProcessor::do_isReady() {
    }
    #endif

+#if TARGET_PC
+    if (dusk::getSettings().game.instantText && mDoCPd_c::getHoldB(0)) {
+        field_0xb2 = 1;
+        pReference->setSendTimer(0);
+    }
+#endif
+
    if (dComIfGp_checkMesgBgm()) {
        bool isItemMusicPlaying = true;
        if (mDoAud_checkPlayingSubBgmFlag() != Z2BGM_ITEM_GET &&
@@ -427,6 +427,16 @@ static void dummyStrings() {
 dMsgObject_HIO_c g_MsgObject_HIO_c;

 int dMsgObject_c::_execute() {
+#if TARGET_PC
+    if (dusk::getSettings().game.enableMirrorMode) {
+        // enable wii message index override
+        g_MsgObject_HIO_c.mMessageDisplay = 1;
+    } else if (!dusk::getSettings().game.enableMirrorMode && g_MsgObject_HIO_c.mMessageDisplay == 1) {
+        g_MsgObject_HIO_c.mMessageDisplay = 0;
+    }
+#endif
+
+
    field_0x4c7 = 0;
    if (mpTalkHeap != NULL) {
        field_0x148 = mDoExt_setCurrentHeap(mpTalkHeap);
@@ -1880,15 +1890,14 @@ bool dMsgObject_c::isShopItemMessage() {
        {7001, 7003, 7004, 7005, 7006, 7007, 7008, 7009, 7010, 7013, 7014, 7022, 7023, 7028, 7029,
            7044, 7045, 7053},
        // zel_02.bmg - Kakariko Shops
-        {5251, 5253, 5254, 5256, 5258, 5259, 5653, 5654, 5656, 5660, 5661, 5664, 5665, 5697, 5698,
-            5699, 5803, 5804, 5806, 5810, 5811, 5812, 5814, 5821, 5823, 5824, 5987, 5988, 5989, 5990,
-            5991, 5992, 5993, 5994, 5995, 5996, 5997, 5998, 5999},
+        {5181, 5182, 5251, 5253, 5254, 5256, 5258, 5259, 5653, 5654, 5656, 5660, 5661, 5664, 5665,
+            5697, 5698, 5699, 5803, 5804, 5806, 5810, 5811, 5812, 5814, 5821, 5823, 5824, 5987, 5988,
+            5989, 5990, 5991, 5992, 5993, 5994, 5995, 5996, 5997, 5998, 5999},
        // zel_03.bmg - Death Mountain Shop
        {5303, 5304, 5306, 5310, 5311, 5314, 5315, 5322, 5323, 5324, 5496, 5497, 5498, 5499},
        // zel_04.bmg - Castle Town Shops
        {5407, 5408, 5409, 5410, 5411, 5412, 5413, 5414, 5415, 5416, 5417, 5418, 5419, 5420, 5431,
-            5432, 5433, 5434, 5435, 5436, 5437, 5438, 5439, 5440, 5441, 5444, 5449, 5450, 5451, 5452,
-            5462},
+            5432, 5434, 5435, 5436, 5437, 5438, 5439, 5440, 5441, 5444, 5449, 5450, 5451, 5452, 5462},
        // zel_05.bmg - Oocca Shop
        {9428, 9429, 9430, 9431, 9432, 9437, 9443, 9448, 9449, 9451, 9459}
    });
@@ -6,6 +6,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_pane_class.h"

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 dMsgScrnArrow_c::dMsgScrnArrow_c() {
    mpScreen = JKR_NEW J2DScreen();
    JUT_ASSERT(0, mpScreen != NULL);
@@ -65,6 +69,11 @@ dMsgScrnArrow_c::~dMsgScrnArrow_c() {
 }

 void dMsgScrnArrow_c::draw() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
    mpScreen->draw(0.0f, 0.0f, graf_ctx);
 }
@@ -8,6 +8,10 @@
 #include "d/d_pane_class.h"
 #include <cstring>

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 dMsgScrnBase_c::dMsgScrnBase_c() {
    init();
 }
@@ -57,12 +61,22 @@ void dMsgScrnBase_c::init() {
 }

 void dMsgScrnBase_c::multiDraw() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    if (field_0x48 != NULL) {
        dComIfGd_set2DOpa(field_0x48);
    }
 }

 void dMsgScrnBase_c::draw() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();

    ctx->setup2D();
@@ -72,10 +86,20 @@ void dMsgScrnBase_c::draw() {
 }

 void dMsgScrnBase_c::drawSelf() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    drawOutFont(0.0f, 0.0f, 1.0f);
 }

 void dMsgScrnBase_c::drawOutFont(f32 param_0, f32 param_1, f32 param_2) {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    mpOutFont->draw(NULL, param_0, param_1, param_2);
 }

@@ -6,6 +6,10 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 dMsgScrnBoss_c::dMsgScrnBoss_c() {
    static u64 t_tag[7] = {
        MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfont00'),
@@ -91,6 +95,11 @@ void dMsgScrnBoss_c::exec() {
 }

 void dMsgScrnBoss_c::drawSelf() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();
    ctx->setup2D();
    drawOutFont(0.0f, 0.0f, 1.0f);
@@ -13,6 +13,10 @@
 #include "d/d_msg_out_font.h"
 #include "d/d_pane_class.h"

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) {
    if (param_0 != NULL) {
        field_0xd4 = param_0;
@@ -176,6 +180,11 @@ void dMsgScrnKanban_c::exec() {
 }

 void dMsgScrnKanban_c::draw() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
    grafContext->setup2D();
    mpScreen->draw(0.0f, 0.0f, grafContext);
@@ -12,6 +12,10 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 dMsgScrnPlace_c::dMsgScrnPlace_c() {
    static u64 t_tag[7] = {
        MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfont00'),
@@ -127,6 +131,11 @@ void dMsgScrnPlace_c::exec() {
 }

 void dMsgScrnPlace_c::drawSelf() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
    grafContext->setup2D();
    drawOutFont(0.0f, 0.0f, 1.0f);
@@ -20,6 +20,10 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include <cstring>

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
    if (param_3 != NULL) {
        field_0xe4 = param_3;
@@ -303,6 +307,11 @@ void dMsgScrnTalk_c::exec() {
 }

 void dMsgScrnTalk_c::drawSelf() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    J2DGrafContext* grafContext[1];
    grafContext[0] = dComIfGp_getCurrentGrafPort();
    grafContext[0]->setup2D();
@@ -9,6 +9,10 @@
 #include "d/d_msg_out_font.h"
 #include "d/d_pane_class.h"

+#if TARGET_PC
+#include "dusk/settings.h"
+#endif
+
 dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) {
    if (param_1 != NULL) {
        field_0xd8 = param_1;
@@ -187,6 +191,11 @@ void dMsgScrnTree_c::exec() {
 }

 void dMsgScrnTree_c::draw() {
+#if TARGET_PC
+    if (dusk::getSettings().game.recordingMode) {
+        return;
+    }
+#endif
    J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
    grafContext->setup2D();
    mpScreen->draw(0.0f, 0.0f, grafContext);
@@ -1120,26 +1120,12 @@ int dScnLogo_c::create() {
    checkProgSelect();
    if (field_0x20a != 0) {
        mExecCommand = EXEC_PROG_IN;
-        #if TARGET_PC
-        mTimer = dusk::getSettings().game.skipWarningScreen ? 1 : 30;
-        #else
        mTimer = 30;
-        #endif
        field_0x218 = getProgressiveMode();
    } else {
        #if TARGET_PC
-        if (dusk::getSettings().game.skipWarningScreen) {
-            mTimer = 0;  // Possibly unnecessary but just in case
-            mExecCommand = EXEC_DVD_WAIT;
-        } else {
-            if (mDoRst::getWarningDispFlag()) {
-                mTimer = 90;
-                mExecCommand = EXEC_NINTENDO_IN;
-            } else {
-                mTimer = 120;
-                mExecCommand = EXEC_WARNING_IN;
-            }
-        }
+        mTimer = 0;  // Possibly unnecessary but just in case
+        mExecCommand = EXEC_DVD_WAIT;
        #else
        if (mDoRst::getWarningDispFlag()) {
            mTimer = 90;
@@ -40,8 +40,9 @@
 #include "JSystem/JKernel/JKRAramArchive.h"

 #if TARGET_PC
+#include "dusk/autosave.h"
 #include "dusk/memory.h"
-#include <dusk/autosave.h>
+#include "dusk/ui/ui.hpp"
 #endif

 #if DEBUG
@@ -794,7 +795,17 @@ static int dScnPly_Execute(dScnPly_c* i_this) {
        dJprev_c::get()->update();
        #endif

+#if TARGET_PC
+        if (!dusk::ui::is_prelaunch_open()) {
+            dDemo_c::update();
+        } else if (dusk::getSettings().audio.menuSounds) {
+            s8 reverb = dComIfGp_getReverb(dComIfGp_roomControl_getStayNo());
+            f32 fxMix = reverb / 127.0f;
+            g_mEnvSeMgr.field_0x144.startEnvSeDirLevel(JA_SE_ATM_WIND_1, fxMix, 1.0f);
+        }
+#else
        dDemo_c::update();
+#endif

        #if DEBUG
        dJcame_c::get()->update();
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include "aurora/lib/logging.hpp"
 #include "os_report.h"

@@ -19,12 +21,60 @@ static bool checkEnabled() {
    return !__OSReport_disable || dusk::OSReportReallyForceEnable;
 }

+#ifndef va_copy
+#define va_copy(d, s) ((d) = (s))
+#endif
+
 static std::string FormatToString(const char* msg, va_list list) {
-    int ret = vsnprintf(nullptr, 0, msg, list);
-    std::string buf(ret, '\0');
-    vsnprintf(buf.data(), buf.size(), msg, list);
-    buf.pop_back();
-    return buf;
+    size_t size = (strlen(msg) * 2) + 50;
+    std::string str;
+    va_list ap;
+    int attempts = 0;
+    while (true) {
+        str.resize(size);
+        va_copy(ap, list);
+        int n = vsnprintf(str.data(), size, msg, ap);
+        va_end(ap);
+        if (n > -1 && n < size) { 
+            str.resize(n);
+            break;
+        }
+        
+        ++attempts;
+        if (attempts >= 3) {
+            if (n == -1) {
+                str.clear();
+            }
+            break;
+        }
+        if (n > -1) {
+            size = n + 1;
+        } else {
+            size *= 2;
+        }
+    }
+    return str;
+}
+
+void OSReport(const char* fmt, ...) {
+    if (!checkEnabled()) {
+        return;
+    }
+    va_list args;
+    va_start(args, fmt);
+    const auto str = FormatToString(fmt, args);
+    va_end(args);
+
+    Log.info("{}", str);
+}
+
+void OSPanic(const char* file, int line, const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    const auto str = FormatToString(fmt, args);
+    va_end(args);
+
+    Log.fatal("[{}:{}] {}", file, line, str);
 }

 void OSReport_Error(const char* fmt, ...) {
@@ -1,14 +1,15 @@
 #include "dusk/achievements.h"
-#include "dusk/io.hpp"
-#include "dusk/main.h"
-#include "d/d_com_inf_game.h"
-#include "d/d_meter2_info.h"
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_npc4.h"
 #include "d/actor/d_a_player.h"
+#include "d/d_com_inf_game.h"
 #include "d/d_demo.h"
-#include "f_pc/f_pc_name.h"
+#include "d/d_meter2_info.h"
+#include "dusk/io.hpp"
+#include "dusk/main.h"
+#include "dusk/ui/ui.hpp"
 #include "f_op/f_op_actor_mng.h"
+#include "f_pc/f_pc_name.h"

 #include <filesystem>
 #include <algorithm>
@@ -454,12 +455,6 @@ AchievementSystem& AchievementSystem::get() {
    return instance;
 }

-std::string AchievementSystem::consumePendingUnlock() {
-    std::string msg = std::move(m_pendingUnlocks.front());
-    m_pendingUnlocks.pop();
-    return msg;
-}
-
 std::vector<Achievement> AchievementSystem::getAchievements() const {
    std::vector<Achievement> result;
    result.reserve(m_entries.size());
@@ -559,7 +554,14 @@ void AchievementSystem::processEntry(Entry& e) {
    if (nowUnlocked) {
        e.achievement.progress = e.achievement.isCounter ? e.achievement.goal : 1;
        e.achievement.unlocked = true;
-        m_pendingUnlocks.push(e.achievement.name);
+        if (getSettings().game.enableAchievementNotifications) {
+            ui::push_toast({
+                .type = "achievement",
+                .title = "Achievement Unlocked!",
+                .content = e.achievement.name,
+                .duration = std::chrono::seconds(5),
+            });
+        }
        m_dirty = true;
    } else if (progressChanged) {
        m_dirty = true;
@@ -1,4 +1,5 @@
 #include "dusk/autosave.h"
+#include "dusk/ui/ui.hpp"
 #include "imgui/ImGuiConsole.hpp"

 u8 mSaveBuffer[QUEST_LOG_SIZE * 3];
@@ -83,6 +84,9 @@ void waitingForWrite() {
 }

 void endAutoSave() {
-    dusk::g_imguiConsole.AddToast("Saving...", 2.0f);
+    dusk::ui::push_toast({
+        .type = "autosave",
+        .duration = std::chrono::milliseconds(1500),
+    });
    mAutoSaveProc = 0;
 }
@@ -154,6 +154,7 @@ namespace dusk::config {
    template class ConfigImpl<f64>;
    template class ConfigImpl<std::string>;
    template class ConfigImpl<dusk::BloomMode>;
+    template class ConfigImpl<dusk::DiscVerificationState>;
    template class ConfigImpl<dusk::GameLanguage>;
 }

@@ -0,0 +1,867 @@
+#ifdef DUSK_DISCORD
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#include "discord.hpp"
+
+#include "dusk/logging.h"
+#include "nlohmann/json.hpp"
+
+#include <algorithm>
+#include <array>
+#include <atomic>
+#include <chrono>
+#include <condition_variable>
+#include <cstdint>
+#include <cstring>
+#include <deque>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <thread>
+#include <vector>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMCX
+#define NOSERVICE
+#define NOIME
+#include <windows.h>
+#else
+#include <cerrno>
+#include <cstdlib>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <unistd.h>
+#endif
+
+namespace dusk::discord::rpc {
+namespace {
+
+using json = nlohmann::json;
+
+constexpr uint32_t kRpcVersion = 1;
+constexpr size_t kFrameHeaderSize = sizeof(uint32_t) * 2;
+constexpr size_t kMaxFramePayloadSize = 64 * 1024;
+constexpr auto kIoWait = std::chrono::milliseconds(500);
+constexpr auto kShutdownClearTimeout = std::chrono::milliseconds(200);
+constexpr auto kInitialReconnectDelay = std::chrono::milliseconds(500);
+constexpr auto kMaxReconnectDelay = std::chrono::milliseconds(60 * 1000);
+
+enum class Opcode : uint32_t {
+    Handshake = 0,
+    Frame = 1,
+    Close = 2,
+    Ping = 3,
+    Pong = 4,
+};
+
+enum class ConnectionState {
+    Disconnected,
+    SentHandshake,
+    Connected,
+};
+
+enum class DisconnectCode : int {
+    PipeClosed = 1,
+    ReadCorrupt = 2,
+    BadFrame = 3,
+};
+
+struct Frame {
+    Opcode opcode = Opcode::Frame;
+    std::string payload;
+};
+
+struct QueuedEvent {
+    enum class Type {
+        Ready,
+        Disconnected,
+        Error,
+    };
+
+    Type type = Type::Ready;
+    User user;
+    int code = 0;
+    std::string message;
+};
+
+class Backoff {
+public:
+    std::chrono::milliseconds next_delay() {
+        const auto delay = currentDelay;
+        currentDelay = std::min(currentDelay * 2, kMaxReconnectDelay);
+        return delay;
+    }
+
+    void reset() { currentDelay = kInitialReconnectDelay; }
+
+private:
+    std::chrono::milliseconds currentDelay = kInitialReconnectDelay;
+};
+
+class IpcConnection {
+public:
+    IpcConnection() = default;
+    ~IpcConnection() { close(); }
+
+    IpcConnection(const IpcConnection&) = delete;
+    IpcConnection& operator=(const IpcConnection&) = delete;
+
+    bool open() {
+#ifdef _WIN32
+        wchar_t pipeName[] = L"\\\\?\\pipe\\discord-ipc-0";
+        constexpr size_t kPipeDigit = sizeof(pipeName) / sizeof(wchar_t) - 2;
+
+        for (wchar_t pipeNumber = L'0'; pipeNumber <= L'9'; ++pipeNumber) {
+            pipeName[kPipeDigit] = pipeNumber;
+            pipe = CreateFileW(
+                pipeName, GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr);
+            if (pipe != INVALID_HANDLE_VALUE) {
+                return true;
+            }
+
+            if (GetLastError() == ERROR_PIPE_BUSY && WaitNamedPipeW(pipeName, 10000)) {
+                --pipeNumber;
+            }
+        }
+        return false;
+#else
+        const auto tempPaths = get_temp_paths();
+        for (const std::string& tempPath : tempPaths) {
+            for (int pipeNumber = 0; pipeNumber < 10; ++pipeNumber) {
+                socketFd = socket(AF_UNIX, SOCK_STREAM, 0);
+                if (socketFd == -1) {
+                    return false;
+                }
+
+                sockaddr_un pipeAddress{};
+                pipeAddress.sun_family = AF_UNIX;
+                const std::string socketPath =
+                    tempPath + "/discord-ipc-" + std::to_string(pipeNumber);
+                if (socketPath.size() >= sizeof(pipeAddress.sun_path)) {
+                    close();
+                    continue;
+                }
+
+                std::strncpy(
+                    pipeAddress.sun_path, socketPath.c_str(), sizeof(pipeAddress.sun_path) - 1);
+                if (connect(socketFd, reinterpret_cast<const sockaddr*>(&pipeAddress),
+                        sizeof(pipeAddress)) == 0)
+                {
+                    fcntl(socketFd, F_SETFL, O_NONBLOCK);
+#ifdef SO_NOSIGPIPE
+                    int optval = 1;
+                    setsockopt(socketFd, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval));
+#endif
+                    return true;
+                }
+                close();
+            }
+        }
+        return false;
+#endif
+    }
+
+    void close() {
+#ifdef _WIN32
+        if (pipe != INVALID_HANDLE_VALUE) {
+            CloseHandle(pipe);
+            pipe = INVALID_HANDLE_VALUE;
+        }
+#else
+        if (socketFd != -1) {
+            ::close(socketFd);
+            socketFd = -1;
+        }
+#endif
+        pendingRead.clear();
+    }
+
+    bool is_open() const {
+#ifdef _WIN32
+        return pipe != INVALID_HANDLE_VALUE;
+#else
+        return socketFd != -1;
+#endif
+    }
+
+    bool write_frame(const Frame& frame) {
+        std::array<uint8_t, kFrameHeaderSize> header{};
+        write_u32(header.data(), static_cast<uint32_t>(frame.opcode));
+        write_u32(header.data() + sizeof(uint32_t), static_cast<uint32_t>(frame.payload.size()));
+
+        return write_all(header.data(), header.size()) &&
+               write_all(
+                   reinterpret_cast<const uint8_t*>(frame.payload.data()), frame.payload.size());
+    }
+
+    enum class ReadStatus {
+        None,
+        Frame,
+        Closed,
+        Corrupt,
+    };
+
+    ReadStatus read_frame(Frame& frame) {
+        if (!read_available()) {
+            return is_open() ? ReadStatus::None : ReadStatus::Closed;
+        }
+
+        if (pendingRead.size() < kFrameHeaderSize) {
+            return ReadStatus::None;
+        }
+
+        const uint32_t payloadLength = read_u32(pendingRead.data() + sizeof(uint32_t));
+        if (payloadLength > kMaxFramePayloadSize) {
+            return ReadStatus::Corrupt;
+        }
+
+        const size_t frameLength = kFrameHeaderSize + payloadLength;
+        if (pendingRead.size() < frameLength) {
+            return ReadStatus::None;
+        }
+
+        frame.opcode = static_cast<Opcode>(read_u32(pendingRead.data()));
+        frame.payload.assign(
+            reinterpret_cast<const char*>(pendingRead.data() + kFrameHeaderSize), payloadLength);
+        pendingRead.erase(
+            pendingRead.begin(), pendingRead.begin() + static_cast<std::ptrdiff_t>(frameLength));
+        return ReadStatus::Frame;
+    }
+
+private:
+#ifndef _WIN32
+    static std::vector<std::string> get_temp_paths() {
+        std::vector<std::string> paths;
+        for (const char* name : {"XDG_RUNTIME_DIR", "TMPDIR", "TMP", "TEMP"}) {
+            if (const char* value = std::getenv(name); value && value[0] != '\0') {
+                if (std::find(paths.begin(), paths.end(), value) == paths.end()) {
+                    paths.emplace_back(value);
+                }
+            }
+        }
+        if (std::find(paths.begin(), paths.end(), "/tmp") == paths.end()) {
+            paths.emplace_back("/tmp");
+        }
+        return paths;
+    }
+#endif
+
+    static void write_u32(uint8_t* out, uint32_t value) {
+        out[0] = static_cast<uint8_t>(value & 0xff);
+        out[1] = static_cast<uint8_t>((value >> 8) & 0xff);
+        out[2] = static_cast<uint8_t>((value >> 16) & 0xff);
+        out[3] = static_cast<uint8_t>((value >> 24) & 0xff);
+    }
+
+    static uint32_t read_u32(const uint8_t* in) {
+        return static_cast<uint32_t>(in[0]) | (static_cast<uint32_t>(in[1]) << 8) |
+               (static_cast<uint32_t>(in[2]) << 16) | (static_cast<uint32_t>(in[3]) << 24);
+    }
+
+    bool write_all(const uint8_t* data, size_t length) {
+        size_t written = 0;
+        while (written < length) {
+#ifdef _WIN32
+            DWORD bytesWritten = 0;
+            if (WriteFile(pipe, data + written, static_cast<DWORD>(length - written), &bytesWritten,
+                    nullptr) == FALSE ||
+                bytesWritten == 0)
+            {
+                close();
+                return false;
+            }
+            written += bytesWritten;
+#else
+#ifdef MSG_NOSIGNAL
+            constexpr int kMsgFlags = MSG_NOSIGNAL;
+#else
+            constexpr int kMsgFlags = 0;
+#endif
+            const ssize_t bytesWritten =
+                send(socketFd, data + written, length - written, kMsgFlags);
+            if (bytesWritten < 0) {
+                if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    continue;
+                }
+                close();
+                return false;
+            }
+            if (bytesWritten == 0) {
+                close();
+                return false;
+            }
+            written += static_cast<size_t>(bytesWritten);
+#endif
+        }
+        return true;
+    }
+
+    bool read_available() {
+        std::array<uint8_t, 4096> buffer{};
+        bool readAny = false;
+
+        for (;;) {
+#ifdef _WIN32
+            DWORD bytesAvailable = 0;
+            if (PeekNamedPipe(pipe, nullptr, 0, nullptr, &bytesAvailable, nullptr) == FALSE) {
+                close();
+                return readAny;
+            }
+            if (bytesAvailable == 0) {
+                return readAny;
+            }
+
+            const DWORD bytesToRead =
+                std::min<DWORD>(bytesAvailable, static_cast<DWORD>(buffer.size()));
+            DWORD bytesRead = 0;
+            if (ReadFile(pipe, buffer.data(), bytesToRead, &bytesRead, nullptr) == FALSE) {
+                close();
+                return readAny;
+            }
+            if (bytesRead == 0) {
+                close();
+                return readAny;
+            }
+            pendingRead.insert(pendingRead.end(), buffer.begin(), buffer.begin() + bytesRead);
+            readAny = true;
+#else
+#ifdef MSG_NOSIGNAL
+            constexpr int kMsgFlags = MSG_NOSIGNAL;
+#else
+            constexpr int kMsgFlags = 0;
+#endif
+            const ssize_t bytesRead = recv(socketFd, buffer.data(), buffer.size(), kMsgFlags);
+            if (bytesRead < 0) {
+                if (errno == EAGAIN || errno == EWOULDBLOCK) {
+                    return readAny;
+                }
+                close();
+                return readAny;
+            }
+            if (bytesRead == 0) {
+                close();
+                return readAny;
+            }
+            pendingRead.insert(pendingRead.end(), buffer.begin(), buffer.begin() + bytesRead);
+            readAny = true;
+#endif
+        }
+    }
+
+#ifdef _WIN32
+    HANDLE pipe = INVALID_HANDLE_VALUE;
+#else
+    int socketFd = -1;
+#endif
+    std::vector<uint8_t> pendingRead;
+};
+
+int current_process_id() {
+#ifdef _WIN32
+    return static_cast<int>(GetCurrentProcessId());
+#else
+    return static_cast<int>(getpid());
+#endif
+}
+
+std::string next_nonce() {
+    static std::atomic_uint64_t sNonce{1};
+    return std::to_string(sNonce.fetch_add(1));
+}
+
+const json* find_member(const json& object, const char* key) {
+    if (!object.is_object()) {
+        return nullptr;
+    }
+
+    const auto member = object.find(key);
+    if (member == object.end()) {
+        return nullptr;
+    }
+    return &*member;
+}
+
+std::string json_string_member(const json& object, const char* key) {
+    const json* member = find_member(object, key);
+    if (!member || !member->is_string()) {
+        return {};
+    }
+    return member->get<std::string>();
+}
+
+int json_int_member(const json& object, const char* key, int defaultValue) {
+    const json* member = find_member(object, key);
+    if (!member || !member->is_number_integer()) {
+        return defaultValue;
+    }
+
+    try {
+        return member->get<int>();
+    } catch (const json::exception&) {
+        return defaultValue;
+    }
+}
+
+json make_presence_activity(const Presence& presence) {
+    json activity = json::object();
+
+    if (!presence.state.empty()) {
+        activity["state"] = presence.state;
+    }
+    if (!presence.details.empty()) {
+        activity["details"] = presence.details;
+    }
+    if (presence.startTimestamp != 0) {
+        activity["timestamps"] = {{"start", presence.startTimestamp}};
+    }
+    if (!presence.largeImageKey.empty() || !presence.largeImageText.empty()) {
+        json assets = json::object();
+        if (!presence.largeImageKey.empty()) {
+            assets["large_image"] = presence.largeImageKey;
+        }
+        if (!presence.largeImageText.empty()) {
+            assets["large_text"] = presence.largeImageText;
+        }
+        activity["assets"] = std::move(assets);
+    }
+
+    return activity;
+}
+
+Frame make_handshake_frame(std::string_view applicationId) {
+    return {
+        Opcode::Handshake,
+        json{
+            {"v", kRpcVersion},
+            {"client_id", std::string(applicationId)},
+        }
+            .dump(),
+    };
+}
+
+Frame make_set_activity_frame(std::string nonce, int pid, std::optional<Presence> presence) {
+    json args = {{"pid", pid}};
+    if (presence) {
+        args["activity"] = make_presence_activity(*presence);
+    } else {
+        args["activity"] = nullptr;
+    }
+
+    return {
+        Opcode::Frame,
+        json{
+            {"cmd", "SET_ACTIVITY"},
+            {"nonce", std::move(nonce)},
+            {"args", std::move(args)},
+        }
+            .dump(),
+    };
+}
+
+class Client {
+public:
+    void initialize(std::string applicationId, EventHandlers handlers) {
+        shutdown();
+
+        {
+            std::lock_guard lock(mutex);
+            this->applicationId = std::move(applicationId);
+            this->handlers = std::move(handlers);
+            shouldRun = true;
+            queuedPresence.reset();
+            hasQueuedPresence = false;
+            clearRequested = false;
+            sentInitialConnectLog = false;
+        }
+
+        ioThread = std::thread([this] { io_loop(); });
+    }
+
+    void run_callbacks() {
+        std::deque<QueuedEvent> events;
+        EventHandlers localHandlers;
+        {
+            std::lock_guard lock(mutex);
+            events.swap(queuedEvents);
+            localHandlers = handlers;
+        }
+
+        for (const QueuedEvent& event : events) {
+            switch (event.type) {
+            case QueuedEvent::Type::Ready:
+                if (localHandlers.ready) {
+                    localHandlers.ready(event.user);
+                }
+                break;
+            case QueuedEvent::Type::Disconnected:
+                if (localHandlers.disconnected) {
+                    localHandlers.disconnected(event.code, event.message);
+                }
+                break;
+            case QueuedEvent::Type::Error:
+                if (localHandlers.error) {
+                    localHandlers.error(event.code, event.message);
+                }
+                break;
+            }
+        }
+    }
+
+    void update_presence(Presence presence) {
+        {
+            std::lock_guard lock(mutex);
+            if (!shouldRun) {
+                return;
+            }
+            queuedPresence = std::move(presence);
+            hasQueuedPresence = true;
+        }
+        cv.notify_all();
+    }
+
+    void clear_presence() {
+        {
+            std::lock_guard lock(mutex);
+            if (!shouldRun) {
+                return;
+            }
+            queuedPresence.reset();
+            hasQueuedPresence = false;
+            clearRequested = true;
+        }
+        cv.notify_all();
+    }
+
+    void shutdown() {
+        {
+            std::lock_guard lock(mutex);
+            if (!shouldRun && !ioThread.joinable()) {
+                return;
+            }
+            shouldRun = false;
+            clearRequested = true;
+        }
+        cv.notify_all();
+
+        if (ioThread.joinable()) {
+            ioThread.join();
+        }
+
+        std::lock_guard lock(mutex);
+        queuedPresence.reset();
+        hasQueuedPresence = false;
+        clearRequested = false;
+        queuedEvents.clear();
+        handlers = {};
+        applicationId.clear();
+    }
+
+private:
+    void io_loop() {
+        IpcConnection connection;
+        ConnectionState state = ConnectionState::Disconnected;
+        Backoff reconnectBackoff;
+        auto nextConnect = std::chrono::steady_clock::now();
+        const int pid = current_process_id();
+        std::string localApplicationId;
+
+        for (;;) {
+            {
+                std::unique_lock lock(mutex);
+                if (!shouldRun) {
+                    break;
+                }
+                localApplicationId = applicationId;
+            }
+
+            const auto now = std::chrono::steady_clock::now();
+            if (state == ConnectionState::Disconnected && now >= nextConnect) {
+                if (connection.open()) {
+                    if (connection.write_frame(make_handshake_frame(localApplicationId))) {
+                        state = ConnectionState::SentHandshake;
+                    } else {
+                        connection.close();
+                    }
+                }
+
+                if (state == ConnectionState::Disconnected) {
+                    log_waiting_for_discord_once();
+                    nextConnect = now + reconnectBackoff.next_delay();
+                }
+            }
+
+            if (state != ConnectionState::Disconnected) {
+                process_reads(connection, state, reconnectBackoff, nextConnect);
+            }
+
+            if (state == ConnectionState::Connected) {
+                flush_pending_presence(connection, pid);
+            }
+
+            std::unique_lock lock(mutex);
+            if (!shouldRun) {
+                break;
+            }
+            cv.wait_for(lock, kIoWait);
+        }
+
+        flush_shutdown_clear(connection, state, pid);
+        connection.close();
+    }
+
+    void process_reads(IpcConnection& connection, ConnectionState& state, Backoff& reconnectBackoff,
+        std::chrono::steady_clock::time_point& nextConnect) {
+        for (;;) {
+            Frame frame;
+            const auto status = connection.read_frame(frame);
+            if (status == IpcConnection::ReadStatus::None) {
+                return;
+            }
+            if (status == IpcConnection::ReadStatus::Closed) {
+                handle_disconnect(connection, state, reconnectBackoff, nextConnect,
+                    static_cast<int>(DisconnectCode::PipeClosed), "Pipe closed");
+                return;
+            }
+            if (status == IpcConnection::ReadStatus::Corrupt) {
+                handle_disconnect(connection, state, reconnectBackoff, nextConnect,
+                    static_cast<int>(DisconnectCode::ReadCorrupt), "Oversized Discord IPC frame");
+                return;
+            }
+
+            switch (frame.opcode) {
+            case Opcode::Frame:
+                process_json_frame(frame.payload, state, reconnectBackoff);
+                break;
+            case Opcode::Close:
+                process_close_frame(
+                    frame.payload, connection, state, reconnectBackoff, nextConnect);
+                return;
+            case Opcode::Ping:
+                connection.write_frame({Opcode::Pong, frame.payload});
+                break;
+            case Opcode::Pong:
+                break;
+            case Opcode::Handshake:
+            default:
+                handle_disconnect(connection, state, reconnectBackoff, nextConnect,
+                    static_cast<int>(DisconnectCode::BadFrame), "Bad Discord IPC frame");
+                return;
+            }
+        }
+    }
+
+    void process_json_frame(
+        const std::string& payload, ConnectionState& state, Backoff& reconnectBackoff) {
+        json message;
+        try {
+            message = json::parse(payload);
+        } catch (const json::parse_error&) {
+            enqueue_error(
+                static_cast<int>(DisconnectCode::ReadCorrupt), "Invalid Discord IPC JSON");
+            return;
+        }
+
+        const std::string cmd = json_string_member(message, "cmd");
+        const std::string evt = json_string_member(message, "evt");
+
+        if (state == ConnectionState::SentHandshake && cmd == "DISPATCH" && evt == "READY") {
+            state = ConnectionState::Connected;
+            reconnectBackoff.reset();
+            enqueue_ready(message);
+            return;
+        }
+
+        if (evt == "ERROR") {
+            const json* data = find_member(message, "data");
+            enqueue_error(data ? json_int_member(*data, "code", 0) : 0,
+                data ? json_string_member(*data, "message") : std::string{});
+        }
+    }
+
+    void process_close_frame(const std::string& payload, IpcConnection& connection,
+        ConnectionState& state, Backoff& reconnectBackoff,
+        std::chrono::steady_clock::time_point& nextConnect) {
+        int code = static_cast<int>(DisconnectCode::PipeClosed);
+        std::string message = "Discord closed IPC connection";
+
+        try {
+            const json closePayload = json::parse(payload);
+            code = json_int_member(closePayload, "code", code);
+            const std::string closeMessage = json_string_member(closePayload, "message");
+            if (!closeMessage.empty()) {
+                message = closeMessage;
+            }
+        } catch (const json::exception&) {
+        }
+
+        handle_disconnect(connection, state, reconnectBackoff, nextConnect, code, message);
+    }
+
+    void handle_disconnect(IpcConnection& connection, ConnectionState& state,
+        Backoff& reconnectBackoff, std::chrono::steady_clock::time_point& nextConnect, int code,
+        std::string_view message) {
+        const bool wasConnected =
+            state == ConnectionState::Connected || state == ConnectionState::SentHandshake;
+        connection.close();
+        state = ConnectionState::Disconnected;
+        nextConnect = std::chrono::steady_clock::now() + reconnectBackoff.next_delay();
+        if (wasConnected) {
+            enqueue_disconnected(code, message);
+        }
+    }
+
+    void flush_pending_presence(IpcConnection& connection, int pid) {
+        std::optional<Presence> presence;
+        bool shouldClear = false;
+        {
+            std::lock_guard lock(mutex);
+            if (hasQueuedPresence) {
+                presence = queuedPresence;
+                hasQueuedPresence = false;
+            } else if (clearRequested) {
+                shouldClear = true;
+                clearRequested = false;
+            }
+        }
+
+        if (presence) {
+            if (!connection.write_frame(
+                    make_set_activity_frame(next_nonce(), pid, std::move(presence))))
+            {
+                requeue_presence();
+            }
+        } else if (shouldClear) {
+            connection.write_frame(make_set_activity_frame(next_nonce(), pid, std::nullopt));
+        }
+    }
+
+    void flush_shutdown_clear(IpcConnection& connection, ConnectionState state, int pid) {
+        if (state != ConnectionState::Connected || !connection.is_open()) {
+            return;
+        }
+
+        connection.write_frame(make_set_activity_frame(next_nonce(), pid, std::nullopt));
+        const auto deadline = std::chrono::steady_clock::now() + kShutdownClearTimeout;
+        while (std::chrono::steady_clock::now() < deadline) {
+            Frame frame;
+            const auto status = connection.read_frame(frame);
+            if (status == IpcConnection::ReadStatus::None) {
+                std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                continue;
+            }
+            if (status != IpcConnection::ReadStatus::Frame) {
+                break;
+            }
+            if (frame.opcode == Opcode::Ping) {
+                connection.write_frame({Opcode::Pong, frame.payload});
+            }
+        }
+    }
+
+    void requeue_presence() {
+        std::lock_guard lock(mutex);
+        if (queuedPresence) {
+            hasQueuedPresence = true;
+        }
+    }
+
+    void enqueue_ready(const json& readyMessage) {
+        User user;
+        const auto data = readyMessage.find("data");
+        if (data != readyMessage.end() && data->is_object()) {
+            const auto userIt = data->find("user");
+            if (userIt != data->end() && userIt->is_object()) {
+                user.id = json_string_member(*userIt, "id");
+                user.username = json_string_member(*userIt, "username");
+                user.discriminator = json_string_member(*userIt, "discriminator");
+                user.avatar = json_string_member(*userIt, "avatar");
+            }
+        }
+
+        std::lock_guard lock(mutex);
+        queuedEvents.push_back({QueuedEvent::Type::Ready, std::move(user)});
+    }
+
+    void enqueue_disconnected(int code, std::string_view message) {
+        std::lock_guard lock(mutex);
+        QueuedEvent event;
+        event.type = QueuedEvent::Type::Disconnected;
+        event.code = code;
+        event.message = message;
+        queuedEvents.push_back(std::move(event));
+    }
+
+    void enqueue_error(int code, std::string_view message) {
+        std::lock_guard lock(mutex);
+        QueuedEvent event;
+        event.type = QueuedEvent::Type::Error;
+        event.code = code;
+        event.message = message;
+        queuedEvents.push_back(std::move(event));
+    }
+
+    void log_waiting_for_discord_once() {
+        bool shouldLog = false;
+        {
+            std::lock_guard lock(mutex);
+            if (!sentInitialConnectLog) {
+                sentInitialConnectLog = true;
+                shouldLog = true;
+            }
+        }
+        if (shouldLog) {
+            DuskLog.info("Discord: Waiting for local Discord IPC");
+        }
+    }
+
+    std::mutex mutex;
+    std::condition_variable cv;
+    std::thread ioThread;
+    std::string applicationId;
+    EventHandlers handlers;
+    std::deque<QueuedEvent> queuedEvents;
+    std::optional<Presence> queuedPresence;
+    bool hasQueuedPresence = false;
+    bool clearRequested = false;
+    bool shouldRun = false;
+    bool sentInitialConnectLog = false;
+};
+
+Client& client() {
+    static Client sClient;
+    return sClient;
+}
+
+}  // namespace
+
+void initialize(std::string applicationId, EventHandlers handlers) {
+    client().initialize(std::move(applicationId), std::move(handlers));
+}
+
+void run_callbacks() {
+    client().run_callbacks();
+}
+
+void update_presence(Presence presence) {
+    client().update_presence(std::move(presence));
+}
+
+void clear_presence() {
+    client().clear_presence();
+}
+
+void shutdown() {
+    client().shutdown();
+}
+
+}  // namespace dusk::discord::rpc
+
+#endif  // DUSK_DISCORD
@@ -0,0 +1,41 @@
+#pragma once
+
+#ifdef DUSK_DISCORD
+
+#include <cstdint>
+#include <functional>
+#include <string>
+#include <string_view>
+
+namespace dusk::discord::rpc {
+
+struct User {
+    std::string id;
+    std::string username;
+    std::string discriminator;
+    std::string avatar;
+};
+
+struct Presence {
+    std::string state;
+    std::string details;
+    int64_t startTimestamp = 0;
+    std::string largeImageKey;
+    std::string largeImageText;
+};
+
+struct EventHandlers {
+    std::function<void(const User&)> ready;
+    std::function<void(int, std::string_view)> disconnected;
+    std::function<void(int, std::string_view)> error;
+};
+
+void initialize(std::string applicationId, EventHandlers handlers);
+void run_callbacks();
+void update_presence(Presence presence);
+void clear_presence();
+void shutdown();
+
+}  // namespace dusk::discord::rpc
+
+#endif  // DUSK_DISCORD
@@ -1,38 +1,39 @@
-#ifdef DUSK_DISCORD_RPC
+#ifdef DUSK_DISCORD

 #include "dusk/discord_presence.hpp"
+#include "d/d_com_inf_game.h"
+#include "discord.hpp"
 #include "dusk/logging.h"
 #include "dusk/main.h"
 #include "dusk/map_loader_definitions.h"
-#include "d/d_com_inf_game.h"
-#include "discord_rpc.h"
 #include "fmt/format.h"

 #include <chrono>
-#include <cstring>
 #include <string>
+#include <string_view>
+#include <utility>

-namespace dusk {
-namespace discord {
+namespace dusk::discord {

 static int64_t g_startTime = 0;
 static bool g_initialized = false;
-static const char* APPLICATION_ID = "1495632471994405035";
+static constexpr const char* kApplicationId = "1495632471994405035";

-static void OnReady(const DiscordUser* user) {
-    DuskLog.info("Discord: Connected as {}", user->username);
+static void on_ready(const rpc::User& user) {
+    DuskLog.info("Discord: Connected as {}", user.username);
 }

-static void OnDisconnected(int errorCode, const char* message) {
+static void on_disconnected(int errorCode, std::string_view message) {
    DuskLog.warn("Discord: Disconnected ({}: {})", errorCode, message);
 }

-static void OnError(int errorCode, const char* message) {
+static void on_error(int errorCode, std::string_view message) {
    DuskLog.warn("Discord: Error ({}: {})", errorCode, message);
 }

-static const char* LookupMapName(const char* mapFile) {
-    if (!mapFile || mapFile[0] == '\0') return nullptr;
+static const char* lookup_map_name(const char* mapFile) {
+    if (!mapFile || mapFile[0] == '\0')
+        return nullptr;
    for (const auto& region : gameRegions) {
        for (const auto& map : region.maps) {
            if (map.mapFile && strcmp(mapFile, map.mapFile) == 0) {
@@ -43,80 +44,80 @@ static const char* LookupMapName(const char* mapFile) {
    return nullptr;
 }

-void Initialize() {
-    g_startTime = static_cast<int64_t>(
-        std::chrono::duration_cast<std::chrono::seconds>(
-            std::chrono::system_clock::now().time_since_epoch()
-        ).count()
-    );
+void initialize() {
+    g_startTime = std::chrono::duration_cast<std::chrono::seconds>(
+        std::chrono::system_clock::now().time_since_epoch())
+                      .count();

-    DiscordEventHandlers handlers{};
-    handlers.ready = OnReady;
-    handlers.disconnected = OnDisconnected;
-    handlers.errored = OnError;
-    Discord_Initialize(APPLICATION_ID, &handlers, 0, nullptr);
+    rpc::EventHandlers handlers{};
+    handlers.ready = on_ready;
+    handlers.disconnected = on_disconnected;
+    handlers.error = on_error;
+    rpc::initialize(kApplicationId, std::move(handlers));
    g_initialized = true;

    DuskLog.info("Discord Rich Presence initialized");
 }

-void RunCallbacks() {
-    if (!g_initialized) return;
-    Discord_RunCallbacks();
+void run_callbacks() {
+    if (!g_initialized)
+        return;
+    rpc::run_callbacks();
 }

-void UpdatePresence() {
-    if (!g_initialized) return;
+void update_presence() {
+    if (!g_initialized)
+        return;

-    static auto lastUpdate = std::chrono::steady_clock::time_point{};
+    static auto sLastUpdate = std::chrono::steady_clock::time_point{};
    const auto now = std::chrono::steady_clock::now();
-    if (now - lastUpdate < std::chrono::seconds(15)) return;
-    lastUpdate = now;
+    if (now - sLastUpdate < std::chrono::seconds(15))
+        return;
+    sLastUpdate = now;

-    static std::string detailsBuf;
-    static std::string stateBuf;
+    static std::string sDetailsBuf;
+    static std::string sStateBuf;

-    DiscordRichPresence presence{};
+    rpc::Presence presence{};
    presence.startTimestamp = g_startTime;
    presence.largeImageKey = "icon";
    presence.largeImageText = "Dusk";

-    if (dusk::IsGameLaunched) {
+    if (IsGameLaunched) {
        const char* stageName = dComIfGp_getLastPlayStageName();

        // stageName is empty until a room is actually entered
        if (stageName[0] != '\0') {
-            const char* locationName = LookupMapName(stageName);
+            const char* locationName = lookup_map_name(stageName);

            if (locationName) {
-                detailsBuf = locationName;
-            }
-            else {
-                detailsBuf = "Twilight Princess";
+                sDetailsBuf = locationName;
+            } else {
+                sDetailsBuf = "Twilight Princess";
            }

-            presence.details = detailsBuf.c_str();
+            presence.details = sDetailsBuf;

-            stateBuf = fmt::format(FMT_STRING("{}/{} \u2665  |  {} Rupees"),
+            sStateBuf = fmt::format(FMT_STRING("{}/{} \u2665  |  {} Rupees"),
                dComIfGs_getLife() / 4, dComIfGs_getMaxLife() / 5, dComIfGs_getRupee());

-            presence.state = stateBuf.c_str();
+            presence.state = sStateBuf;
        }
    }

-    Discord_UpdatePresence(&presence);
+    rpc::update_presence(std::move(presence));
    DuskLog.debug("Discord Rich Presence sent");
 }

-void Shutdown() {
-    if (!g_initialized) return;
-    Discord_ClearPresence();
-    Discord_Shutdown();
+void shutdown() {
+    if (!g_initialized)
+        return;
+    rpc::clear_presence();
+    rpc::shutdown();
    g_initialized = false;
    DuskLog.info("Discord Rich Presence shut down");
 }

-} // namespace discord
-} // namespace dusk
+}  // namespace dusk::discord

-#endif // DUSK_DISCORD_RPC
+#endif  // DUSK_DISCORD
@@ -1,245 +0,0 @@
-#include "ImGuiAchievements.hpp"
-#include "ImGuiConfig.hpp"
-#include "dusk/achievements.h"
-#include "dusk/settings.h"
-#include "fmt/format.h"
-#include "imgui.h"
-
-namespace dusk {
-
-void ImGuiAchievements::notify(std::string name) {
-    if (m_notifyTimer <= 0.f) {
-        m_notifyName = std::move(name);
-        m_notifyTimer = NOTIFY_DURATION;
-    } else {
-        m_notifyQueue.push(std::move(name));
-    }
-}
-
-void ImGuiAchievements::showNotification() {
-    if (!getSettings().game.enableAchievementNotifications.getValue()) {
-        return;
-    }
-    if (m_notifyTimer <= 0.f) {
-        if (m_notifyQueue.empty()) {
-            return;
-        }
-        m_notifyName = std::move(m_notifyQueue.front());
-        m_notifyQueue.pop();
-        m_notifyTimer = NOTIFY_DURATION;
-    }
-
-    m_notifyTimer -= ImGui::GetIO().DeltaTime;
-
-    const float alpha = std::min({
-        m_notifyTimer / NOTIFY_FADE_TIME,
-        (NOTIFY_DURATION - m_notifyTimer) / NOTIFY_FADE_TIME,
-        1.0f
-    });
-
-    const ImGuiViewport* viewport = ImGui::GetMainViewport();
-    const float padding = 12.0f;
-    ImGui::SetNextWindowPos(
-        ImVec2(viewport->WorkPos.x + viewport->WorkSize.x - padding, viewport->WorkPos.y + padding),
-        ImGuiCond_Always, ImVec2(1.0f, 0.0f)
-    );
-
-    ImGui::SetNextWindowBgAlpha(alpha * 0.92f);
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.08f, 0.06f, 0.01f, alpha * 0.92f));
-    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 0.8f, 0.1f, alpha));
-    ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 1.0f, 1.0f, alpha));
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 2.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(14.0f, 10.0f));
-
-    constexpr ImGuiWindowFlags flags =
-        ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_AlwaysAutoResize |
-        ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing |
-        ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoInputs;
-
-    if (ImGui::Begin("##achievement_notify", nullptr, flags)) {
-        ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.82f, 0.1f, alpha));
-        ImGui::TextUnformatted("Achievement Unlocked!");
-        ImGui::PopStyleColor();
-        ImGui::Spacing();
-        ImGui::TextUnformatted(m_notifyName.c_str());
-    }
-    ImGui::End();
-
-    ImGui::PopStyleVar(2);
-    ImGui::PopStyleColor(3);
-}
-
-void ImGuiAchievements::draw(bool& open) {
-    showNotification();
-
-    if (!open) {
-        return;
-    }
-
-    ImGui::SetNextWindowSizeConstraints(ImVec2(800, 200), ImVec2(1280, 900));
-    ImGui::SetNextWindowSize(ImVec2(800, 480), ImGuiCond_FirstUseEver);
-    
-    if (!ImGui::Begin(
-        "Achievements", &open,
-        ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav)
-    )
-    {
-        ImGui::End();
-        return;
-    }
-
-    const auto achievements = AchievementSystem::get().getAchievements();
-
-    int unlocked = 0;
-    for (const auto& a : achievements) {
-        if (a.unlocked) {
-            ++unlocked;
-        }
-    }
-
-    ImGui::Text("%d / %d achievements unlocked", unlocked, (int)achievements.size());
-    ImGui::SameLine();
-    config::ImGuiCheckbox("Notifications", getSettings().game.enableAchievementNotifications);
-    ImGui::Separator();
-
-    static const struct {
-        AchievementCategory cat;
-        const char* label;
-        ImVec4 color;
-    } ACHIEVEMENT_CATEGORIES[] = {
-        {AchievementCategory::Story, "Story", ImVec4(1.0f, 0.82f, 0.1f, 1.0f)},
-        {AchievementCategory::Collection, "Collection", ImVec4(0.3f, 0.85f, 0.4f, 1.0f)},
-        {AchievementCategory::Challenge, "Challenge", ImVec4(1.0f, 0.65f, 0.15f, 1.0f)},
-        {AchievementCategory::Minigame, "Minigame", ImVec4(0.5f, 0.85f, 1.0f, 1.0f)},
-        {AchievementCategory::Misc, "Misc", ImVec4(0.65f, 0.65f, 0.65f, 1.0f)},
-        {AchievementCategory::Glitched, "Glitched", ImVec4(0.75f, 0.4f, 1.0f, 1.0f)},
-    };
-
-    const float footerHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
-
-    if (ImGui::BeginTabBar("##achievement_tabs", ImGuiTabBarFlags_FittingPolicyScroll)) {
-        for (const auto& catInfo : ACHIEVEMENT_CATEGORIES) {
-            int catTotal = 0, catUnlocked = 0;
-            for (const auto& a : achievements) {
-                if (a.category == catInfo.cat) {
-                    ++catTotal;
-                    if (a.unlocked) {
-                        ++catUnlocked;
-                    }
-                }
-            }
-            if (catTotal == 0) {
-                continue;
-            }
-
-            const std::string tabLabel = fmt::format("{} ({}/{})###{}", catInfo.label, catUnlocked, catTotal, catInfo.label);
-            
-            ImGui::PushStyleColor(ImGuiCol_Text, catInfo.color);
-            const bool tabOpen = ImGui::BeginTabItem(tabLabel.c_str());
-            ImGui::PopStyleColor();
-
-            if (tabOpen) {
-                ImGui::BeginChild(
-                    "##cat_list",
-                    ImVec2(0, -footerHeight),
-                    ImGuiChildFlags_None,
-                    ImGuiWindowFlags_NoBackground
-                );
-
-                ImGui::Spacing();
-
-                for (const auto& a : achievements) {
-                    if (a.category != catInfo.cat) {
-                        continue;
-                    }
-                    ImGui::PushID(a.key);
-                    ImGui::BeginGroup();
-
-                    ImGui::PushStyleColor(
-                        ImGuiCol_Text,
-                        a.unlocked ?
-                            ImVec4(1.0f, 0.65f, 0.15f, 1.0f) :
-                            ImGui::GetStyleColorVec4(ImGuiCol_Text)
-                    );
-
-                    ImGui::TextUnformatted(a.name);
-                    ImGui::PopStyleColor();
-
-                    const char* statusLabel = a.unlocked ? "[Unlocked]" : "[Locked]";
-                    ImGui::SameLine(
-                        ImGui::GetContentRegionMax().x -
-                        ImGui::CalcTextSize(statusLabel).x
-                    );
-
-                    if (a.unlocked) {
-                        ImGui::TextColored(ImVec4(0.2f, 0.8f, 0.2f, 1.0f), "%s", statusLabel);
-                    } else {
-                        ImGui::TextColored(ImVec4(0.8f, 0.2f, 0.2f, 1.0f), "%s", statusLabel);
-                    }
-
-                    ImGui::TextDisabled("%s", a.description);
-
-                    if (a.isCounter) {
-                        const float fraction = a.goal > 0 ? (float)(a.progress) / (float)(a.goal) : 1.0f;
-                        const std::string overlay = fmt::format("{} / {}", a.progress, a.goal);
-                        ImGui::PushStyleColor(
-                            ImGuiCol_PlotHistogram,
-                            a.unlocked ?
-                                ImVec4(0.4f, 0.7f, 0.1f, 1.0f) :
-                                ImVec4(0.2f, 0.45f, 0.8f, 1.0f)
-                        );
-                        ImGui::ProgressBar(fraction, ImVec2(-1.0f, 0.0f), overlay.c_str());
-                        ImGui::PopStyleColor();
-                    }
-
-                    ImGui::EndGroup();
-
-                    if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(ImGuiMouseButton_Right)) {
-                        ImGui::OpenPopup("##ctx");
-                    }
-
-                    if (ImGui::BeginPopup("##ctx")) {
-                        ImGui::TextDisabled("%s", a.name);
-                        ImGui::Separator();
-                        if (ImGui::MenuItem("Clear Achievement")) {
-                            AchievementSystem::get().clearOne(a.key);
-                        }
-                        ImGui::EndPopup();
-                    }
-
-                    ImGui::Spacing();
-                    ImGui::PopID();
-                }
-
-                ImGui::EndChild();
-                ImGui::EndTabItem();
-            }
-        }
-        ImGui::EndTabBar();
-    }
-
-    ImGui::Separator();
-    ImGui::Spacing();
-
-    if (ImGui::Button("Clear All Achievements")) {
-        ImGui::OpenPopup("##confirm_clear");
-    }
-
-    if (ImGui::BeginPopup("##confirm_clear")) {
-        ImGui::Text("Reset all achievement progress?");
-        ImGui::Spacing();
-        if (ImGui::Button("Yes, reset all")) {
-            AchievementSystem::get().clearAll();
-            ImGui::CloseCurrentPopup();
-        }
-        ImGui::SameLine();
-        if (ImGui::Button("Cancel")) {
-            ImGui::CloseCurrentPopup();
-        }
-        ImGui::EndPopup();
-    }
-
-    ImGui::End();
-}
-
-}  // namespace dusk
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <queue>
-#include <string>
-
-namespace dusk {
-
-class ImGuiAchievements {
-public:
-    void draw(bool& open);
-    void notify(std::string name);
-
-private:
-    void showNotification();
-
-    std::string m_notifyName;
-    float m_notifyTimer = 0.f;
-    std::queue<std::string> m_notifyQueue;
-    static constexpr float NOTIFY_DURATION = 4.0f;
-    static constexpr float NOTIFY_FADE_TIME = 0.5f;
-};
-
-} // namespace dusk
@@ -282,7 +282,9 @@ static void ShowAllJAISeqs() {
 }

 void dusk::ImGuiMenuTools::ShowAudioDebug() {
-    if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F10, m_showAudioDebug)) {
+    if (!getSettings().backend.enableAdvancedSettings ||
+        !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F10, m_showAudioDebug))
+    {
        return;
    }

@@ -328,7 +330,9 @@ void dusk::ImGuiMenuTools::ShowAudioDebug() {
 }

 void dusk::ImGuiMenuTools::ShowSaveEditor() {
-    if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F6, m_showSaveEditor)) {
+    if (!getSettings().backend.enableAdvancedSettings ||
+        !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F6, m_showSaveEditor))
+    {
        return;
    }
    m_saveEditor.draw(m_showSaveEditor);
@@ -1,13 +1,18 @@
 #include "f_op/f_op_camera_mng.h"
 #include "SSystem/SComponent/c_xyz.h"
+#include "d/d_com_inf_game.h"

 #include "imgui.h"
+#include "ImGuiConfig.hpp"
 #include "ImGuiConsole.hpp"
 #include "ImGuiMenuTools.hpp"
+#include "dusk/settings.h"

 namespace dusk {
    void ImGuiMenuTools::ShowCameraOverlay() {
-        if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F9, m_showCameraOverlay)) {
+        if (!getSettings().backend.enableAdvancedSettings ||
+            !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F9, m_showCameraOverlay))
+        {
            return;
        }

@@ -46,73 +51,44 @@ namespace dusk {

        ImGui::InputFloat("Camera FOV", &dCam->mFovy);

-        ImGui::SeparatorText("Free-look Data");
+        ImGui::SeparatorText("Options");

-        static float eyeYawDeg = 0.0f;
-        static float moveSpeed = 5000.0f;
-        static float rotSpeed = 5.0f;
-        static cXyz freeLookPos = cXyz::Zero;
-        static bool freeLookActive = false;
-
-        bool changed = false;
-
-        if (ImGui::IsKeyDown(ImGuiKey_LeftArrow)) {
-            eyeYawDeg += rotSpeed;
-            if (eyeYawDeg >= 360.0f)
-                eyeYawDeg -= 360.0f;
-
-            changed = true;
+        bool eventRunning = (dComIfGp_event_runCheck() || dComIfGp_isPauseFlag()) && !getSettings().game.debugFlyCam;
+        if (eventRunning) {
+            ImGui::BeginDisabled();
        }
-        else if (ImGui::IsKeyDown(ImGuiKey_RightArrow)) {
-            eyeYawDeg -= rotSpeed;
-            if (eyeYawDeg < 0.0f)
-                eyeYawDeg += 360.0f;
-
-            changed = true;
+        config::ImGuiCheckbox("Fly Mode", getSettings().game.debugFlyCam);
+        if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
+            if (eventRunning) {
+                ImGui::SetTooltip("Cannot enable while paused or during an active event.");
+            } else {
+                ImGui::SetTooltip("Detach camera and fly freely.\n"
+                                  "WASD/Arrows/Left stick: move, Mouse/C-stick: look\n"
+                                  "Ctrl/L: down, Space/R: up, Shift/Z: fast\n"
+                                "Q Key/Y: roll left, R Key/X: roll right");
+            }
        }
-        cSAngle yawAngle = cSAngle(eyeYawDeg);
-        cXyz frontDir = cXyz(yawAngle.Sin(), 0.0f, yawAngle.Cos());
-
-        if (ImGui::IsKeyDown(ImGuiKey_UpArrow)) {
-            freeLookPos -= frontDir * moveSpeed * ImGui::GetIO().DeltaTime;
-            changed = true;
-        }
-        else if (ImGui::IsKeyDown(ImGuiKey_DownArrow)) {
-            freeLookPos += frontDir * moveSpeed * ImGui::GetIO().DeltaTime;
-            changed = true;
+        if (eventRunning) {
+            ImGui::EndDisabled();
        }

-        if (ImGui::IsKeyDown(ImGuiKey_LeftShift)) {
-            freeLookPos += cXyz::BaseY * moveSpeed * ImGui::GetIO().DeltaTime;
-            changed = true;
+        if (!getSettings().game.debugFlyCam) {
+            ImGui::BeginDisabled();
        }
-
-        if (ImGui::IsKeyDown(ImGuiKey_LeftCtrl)) {
-            freeLookPos -= cXyz::BaseY * moveSpeed * ImGui::GetIO().DeltaTime;
-            changed = true;
+        config::ImGuiCheckbox("Lock Events", getSettings().game.debugFlyCamLockEvents);
+        if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
+            if (!getSettings().game.debugFlyCam) {
+                ImGui::SetTooltip("Enable Fly Mode first.");
+            } else {
+                ImGui::SetTooltip("Freeze game events while flying.");
+            }
        }
-
-        if (!freeLookActive && changed) {
-            freeLookPos += dCam->Center();
-            freeLookActive = true;
+        if (!getSettings().game.debugFlyCam) {
+            ImGui::EndDisabled();
        }

-        if (ImGui::IsKeyDown(ImGuiKey_R)) {
-            freeLookPos = cXyz::Zero;
-            freeLookActive = false;
-        }
-
-        if (freeLookActive) {
-            dCam->Reset(freeLookPos, freeLookPos + (frontDir * 100.0f));
-        }
-
-        ImGui::InputFloat("Free-look Yaw", &eyeYawDeg);
-        ImGui::InputFloat3("Free-look Position", &freeLookPos.x);
-        ImGui::InputFloat("Free-look Move Speed", &moveSpeed);
-        ImGui::InputFloat("Free-look Rotation Speed", &rotSpeed);
-
        ShowCornerContextMenu(m_cameraOverlayCorner, 0);

        ImGui::End();
    }
-}
+}
@@ -10,11 +10,9 @@

 #include "fmt/format.h"
 #include "ImGuiConsole.hpp"
+#include "ImGuiEngine.hpp"
 #include "JSystem/JUtility/JUTGamePad.h"
-#include "SDL3/SDL_events.h"
 #include "SDL3/SDL_mouse.h"
-#include "aurora/lib/window.hpp"
-#include "dusk/achievements.h"
 #include "dusk/audio/DuskAudioSystem.h"
 #include "dusk/config.hpp"
 #include "dusk/dusk.h"
@@ -22,6 +20,9 @@
 #include "dusk/livesplit.h"
 #include "dusk/main.h"
 #include "dusk/settings.h"
+#include "dusk/ui/ui.hpp"
+#include "f_pc/f_pc_manager.h"
+#include "f_pc/f_pc_name.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_main.h"
 #include "tracy/Tracy.hpp"
@@ -35,14 +36,6 @@ using namespace std::string_literals;
 using namespace std::string_view_literals;

 namespace {
-ImVec2 TouchEventToScreenPos(const SDL_TouchFingerEvent& touch) {
-    const AuroraWindowSize size = aurora::window::get_window_size();
-    return ImVec2{
-        touch.x * static_cast<float>(size.width),
-        touch.y * static_cast<float>(size.height),
-    };
-}
-
 ImGuiWindow* FindDragScrollWindow(ImGuiWindow* window) {
    while (window != nullptr) {
        const bool canScrollX = window->ScrollMax.x > 0.0f;
@@ -241,48 +234,7 @@ namespace dusk {
    ImGuiConsole::ImGuiConsole() {}

    void ImGuiConsole::HandleSDLEvent(const SDL_Event& event) {
-        if (!IsGameLaunched) {
-            return;
-        }
-
-        switch (event.type) {
-        case SDL_EVENT_FINGER_DOWN:
-            if (!m_touchTapActive) {
-                m_touchTapActive = true;
-                m_touchTapMoved = false;
-                m_touchTapFingerId = event.tfinger.fingerID;
-                m_touchTapStartPos = TouchEventToScreenPos(event.tfinger);
-            }
-            break;
-        case SDL_EVENT_FINGER_MOTION:
-            if (m_touchTapActive && m_touchTapFingerId == event.tfinger.fingerID) {
-                const auto currentPos = TouchEventToScreenPos(event.tfinger);
-                const auto delta = currentPos - m_touchTapStartPos;
-                if (ImLengthSqr(delta) > 144.0f) {
-                    m_touchTapMoved = true;
-                }
-            }
-            break;
-        case SDL_EVENT_FINGER_UP:
-            if (m_touchTapActive && m_touchTapFingerId == event.tfinger.fingerID) {
-                const bool shouldToggle =
-                    !m_touchTapMoved && (m_isHidden || !ImGui::GetIO().WantCaptureMouse);
-                m_touchTapActive = false;
-                m_touchTapMoved = false;
-                if (shouldToggle) {
-                    m_isHidden = !m_isHidden;
-                    getSettings().backend.duskMenuOpen.setValue(!m_isHidden);
-                    Save();
-                }
-            }
-            break;
-        case SDL_EVENT_FINGER_CANCELED:
-            m_touchTapActive = false;
-            m_touchTapMoved = false;
-            break;
-        default:
-            break;
-        }
+        (void)event;
    }

    void ImGuiConsole::UpdateSettings() {
@@ -301,42 +253,28 @@ namespace dusk {

        UpdateSettings();

-        AchievementSystem::get().tick();
-        while (AchievementSystem::get().hasPendingUnlock()) {
-            if (getSettings().game.enableAchievementNotifications) {
-                m_menuTools.notifyAchievement(AchievementSystem::get().consumePendingUnlock());
-            } else {
-                AchievementSystem::get().consumePendingUnlock();
-            }
-        }
-
-        if ((ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)) &&
+        if (!fpcM_SearchByName(fpcNm_LOGO_SCENE_e) &&
+            (ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)) &&
            ImGui::IsKeyPressed(ImGuiKey_R))
        {
            JUTGamePad::C3ButtonReset::sResetSwitchPushing = true;
        }

        if (ImGui::IsKeyPressed(ImGuiKey_F11)) {
-            ImGuiMenuGame::ToggleFullscreen();
+            getSettings().video.enableFullscreen.setValue(!getSettings().video.enableFullscreen);
+            VISetWindowFullscreen(getSettings().video.enableFullscreen);
+            config::Save();
        }

-        if (ImGui::IsKeyPressed(ImGuiKey_Escape) && getSettings().video.enableFullscreen) {
-            ImGuiMenuGame::ToggleFullscreen();
-        }
-
-        // if (!dusk::IsGameLaunched) {
-        //     m_preLaunchWindow.draw();
-        // }
-
-        m_isHidden = !getSettings().backend.duskMenuOpen;
        if (ImGui::GetIO().KeyShift && ImGui::IsKeyPressed(ImGuiKey_F1)) {
-            m_isHidden = !m_isHidden;
+            if (getSettings().backend.enableAdvancedSettings) {
+                m_isHidden = !m_isHidden;
+            } else {
+                m_isHidden = true;
+            }
        }
+        
        bool showMenu = !m_isHidden;
-        if (getSettings().backend.duskMenuOpen != showMenu) {
-            getSettings().backend.duskMenuOpen.setValue(showMenu);
-            Save();
-        }

        // The menu bar renders with ImGuiCol_WindowBg behind it. We just want ImGuiCol_MenuBarBg,
        // so make the window bg fully transparent temporarily
@@ -345,30 +283,11 @@ namespace dusk {
            m_menuGame.draw();
            m_menuTools.draw();

-            const auto fpsLabel =
-                fmt::format(FMT_STRING("FPS: {:.2f}\n"), ImGui::GetIO().Framerate);
-            const auto fpsSize =
-                ImGui::CalcTextSize(fpsLabel.data(), fpsLabel.data() + fpsLabel.size());
-            ImGui::SetCursorPosX(
-                ImMax(ImGui::GetCursorPosX(), ImGui::GetWindowWidth() -
-                                                  ImGui::GetStyle().DisplaySafeAreaPadding.x -
-                                                  fpsSize.x - ImGui::GetStyle().ItemSpacing.x));
-            ImGuiStringViewText(fpsLabel);
-
            ImGui::EndMainMenuBar();
        }
        ImGui::PopStyleColor();

-        if (!getSettings().backend.wasPresetChosen) {
-            m_firstRunPreset.draw();
-            return;
-        }
-
        if (dusk::IsGameLaunched && !m_isLaunchInitialized) {
-            AddToast(ImGui::GetIO().MouseSource == ImGuiMouseSource_TouchScreen ?
-                                      "Tap to toggle menu"s :
-                                      "Press F1 to toggle menu"s,
-                                  4.f);
            m_isLaunchInitialized = true;
            if (getSettings().game.liveSplitEnabled) {
                dusk::speedrun::connectLiveSplit();
@@ -377,8 +296,68 @@ namespace dusk {

        UpdateDragScroll();

-        m_menuGame.windowControllerConfig();
-        m_menuGame.windowInputViewer();
+        // Show message when Aurora backend is Null
+        if (aurora_get_backend() == BACKEND_NULL) {
+            auto& io = ImGui::GetIO();
+            ImGui::SetNextWindowSize(ImVec2(io.DisplaySize.x, io.DisplaySize.y));
+            ImGui::SetNextWindowPos(ImVec2(0, 0));
+            ImGui::SetNextWindowBgAlpha(0.65f);
+            ImGui::Begin("Pre Launch Window", nullptr,
+                ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoResize |
+                    ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing |
+                    ImGuiWindowFlags_NoBringToFrontOnFocus);
+            ImGui::NewLine();
+            if (ImGuiEngine::duskLogo) {
+                const auto& windowSize = ImGui::GetWindowSize();
+                ImGui::NewLine();
+                float iconSize = 150.f;
+                float width = iconSize * 2.5f;
+                ImGui::SameLine(windowSize.x / 2 - width + (width / 2));
+                ImGui::Image(ImGuiEngine::duskLogo, ImVec2{width, iconSize});
+            } else {
+                ImGui::PushFont(ImGuiEngine::fontExtraLarge);
+                ImGuiTextCenter("Dusk");
+                ImGui::PopFont();
+            }
+            ImGui::PushFont(ImGuiEngine::fontLarge);
+            ImGuiTextCenter("Failed to initialize any graphics backend");
+            const auto& style = ImGui::GetStyle();
+            const auto retrySize = ImGui::CalcTextSize("Retry (Auto backend)");
+            const auto quitSize = ImGui::CalcTextSize("Quit");
+            float buttonsWidth = quitSize.x + style.FramePadding.x * 2.0f;
+            if constexpr (SupportsProcessRestart) {
+                buttonsWidth += retrySize.x + style.FramePadding.x * 2.0f + style.ItemSpacing.x;
+            }
+#if DUSK_CAN_OPEN_DATA_FOLDER
+            const auto openSize = ImGui::CalcTextSize("Open Data Folder");
+            buttonsWidth += openSize.x + style.FramePadding.x * 2.0f + style.ItemSpacing.x;
+#endif
+            ImGui::NewLine();
+            ImGui::SetCursorPosX(
+                ImMax(style.WindowPadding.x, (ImGui::GetWindowSize().x - buttonsWidth) * 0.5f));
+            if constexpr (SupportsProcessRestart) {
+                if (ImGui::Button("Retry (Auto backend)")) {
+                    getSettings().backend.graphicsBackend.setValue("auto");
+                    config::Save();
+                    RestartRequested = true;
+                    IsRunning = false;
+                }
+                ImGui::SameLine();
+            }
+#if DUSK_CAN_OPEN_DATA_FOLDER
+            if (ImGui::Button("Open Data Folder")) {
+                OpenDataFolder();
+            }
+            ImGui::SameLine();
+#endif
+            if (ImGui::Button("Quit")) {
+                IsRunning = false;
+            }
+            ImGui::PopFont();
+            ImGui::End();
+        }
+
+        m_menuTools.ShowInputViewer();
        m_menuGame.drawSpeedrunTimerOverlay();

        if (getSettings().game.liveSplitEnabled) {
@@ -402,8 +381,6 @@ namespace dusk {
            m_menuTools.ShowSaveEditor();
            m_menuTools.ShowStateShare();
        }
-        m_menuTools.ShowAchievements();
-        DuskDebugPad(); // temporary, remove later

        // Hide mouse cursor if the F1 menu is not open and the cursor is idle for 3 seconds.
        ImGuiIO& io = ImGui::GetIO();
@@ -2,16 +2,16 @@
 #define DUSK_IMGUI_HPP

 #include <deque>
+#include <filesystem>
 #include <string>
 #include <string_view>

+#include <SDL3/SDL_misc.h>
 #include <aurora/aurora.h>
-#include <SDL3/SDL_touch.h>

-#include "ImGuiFirstRunPreset.hpp"
 #include "ImGuiMenuGame.hpp"
 #include "ImGuiMenuTools.hpp"
-#include "ImGuiPreLaunchWindow.hpp"
+#include "dusk/main.h"
 #include "imgui.h"

 union SDL_Event;
@@ -26,7 +26,7 @@ public:
    void PreDraw();
    void PostDraw();

-	static bool CheckMenuViewToggle(ImGuiKey key, bool& active);
+    static bool CheckMenuViewToggle(ImGuiKey key, bool& active);
    void AddToast(std::string_view message, float duration = 3.f);

 private:
@@ -42,17 +42,11 @@ private:

    bool m_isHidden = true;
    bool m_isLaunchInitialized = false;
-    bool m_touchTapActive = false;
-    bool m_touchTapMoved = false;
-    SDL_FingerID m_touchTapFingerId = 0;
-    ImVec2 m_touchTapStartPos = {};
    ImGuiWindow* m_dragScrollWindow = nullptr;
    ImVec2 m_dragScrollLastMousePos = {};
    std::deque<Toast> m_toasts;

-    ImGuiFirstRunPreset m_firstRunPreset;
    ImGuiMenuGame m_menuGame;
-    ImGuiPreLaunchWindow m_preLaunchWindow;

    // Keep always last
    ImGuiMenuTools m_menuTools;
@@ -79,6 +73,24 @@ bool ImGuiButtonCenter(std::string_view text);
 float ImGuiScale();
 }  // namespace dusk

-void DuskDebugPad();
+#if defined(_WIN32) ||                                                                             \
+    (defined(__APPLE__) && !TARGET_OS_IOS && !TARGET_OS_TV && !TARGET_OS_MACCATALYST) ||           \
+    (defined(__linux__) && !defined(__ANDROID__))
+#define DUSK_CAN_OPEN_DATA_FOLDER 1
+
+namespace fs = std::filesystem;
+
+static void OpenDataFolder() {
+    const std::string path = fs::absolute(dusk::ConfigPath).generic_string();
+#if defined(_WIN32)
+    const std::string url = std::string("file:///") + path;
+#else
+    const std::string url = std::string("file://") + path;
+#endif
+    (void)SDL_OpenURL(url.c_str());
+}
+#else
+#define DUSK_CAN_OPEN_DATA_FOLDER 0
+#endif

 #endif  // DUSK_IMGUI_HPP
@@ -3,12 +3,11 @@
 #include "imgui.h"
 #include <imgui_internal.h>
 #include "ImGuiConsole.hpp"
-#include "ImGuiMenuGame.hpp"

 #include <dolphin/pad.h>

 namespace dusk {
-    void ImGuiMenuGame::windowInputViewer() {
+    void ImGuiMenuTools::ShowInputViewer() {
        if (!m_showInputViewer) {
            return;
        }
@@ -1,61 +0,0 @@
-#include "m_Do/m_Do_controller_pad.h"
-
-#include "imgui.h"
-#include "ImGuiConsole.hpp"
-
-void DuskDebugPad() {
-    auto& pad = mDoCPd_c::getCpadInfo(PAD_1);
-    auto KeyFlag = [&](ImGuiKey key, u32 padFlag) {
-        if (ImGui::IsKeyDown(key))
-            pad.mButtonFlags |= padFlag;
-        if (ImGui::IsKeyPressed(key))
-            pad.mPressedButtonFlags |= padFlag;
-
-    };
-
-    KeyFlag(ImGuiKey_K, PAD_BUTTON_A);
-    KeyFlag(ImGuiKey_J, PAD_BUTTON_B);
-    KeyFlag(ImGuiKey_L, PAD_BUTTON_X);
-    KeyFlag(ImGuiKey_I, PAD_BUTTON_Y);
-    KeyFlag(ImGuiKey_H, PAD_BUTTON_START);
-    KeyFlag(ImGuiKey_O, PAD_TRIGGER_Z);
-    KeyFlag(ImGuiKey_Keypad8, PAD_BUTTON_UP);
-    KeyFlag(ImGuiKey_Keypad2, PAD_BUTTON_DOWN);
-    KeyFlag(ImGuiKey_Keypad6, PAD_BUTTON_RIGHT);
-    KeyFlag(ImGuiKey_Keypad4, PAD_BUTTON_LEFT);
-
-    if (ImGui::IsKeyDown(ImGuiKey_W)) {
-        pad.mMainStickPosY = 1.0f;
-        pad.mMainStickValue = 1.0f;
-        pad.mMainStickAngle = 0x8000;
-    }
-
-    if (ImGui::IsKeyDown(ImGuiKey_S)) {
-        pad.mMainStickPosY = -1.0f;
-        pad.mMainStickValue = 1.0f;
-        pad.mMainStickAngle = 0;
-    }
-
-    if (ImGui::IsKeyDown(ImGuiKey_D)) {
-        pad.mMainStickPosX = 1.0f;
-        pad.mMainStickValue = 1.0f;
-        pad.mMainStickAngle = 0x4000;
-    }
-
-    if (ImGui::IsKeyDown(ImGuiKey_A)) {
-        pad.mMainStickPosX = -1.0f;
-        pad.mMainStickValue = 1.0f;
-        pad.mMainStickAngle = -0x4000;
-    }
-
-    if (ImGui::IsKeyDown(ImGuiKey_Q)) {
-        pad.mTriggerLeft = 1.0;
-        pad.mTrigLockL = 1;
-        pad.mHoldLockL = 1;
-    }
-    if (ImGui::IsKeyDown(ImGuiKey_E)) {
-        pad.mTriggerRight = 1.0;
-        pad.mTrigLockR = 1;
-        pad.mHoldLockR = 1;
-    }
-}
@@ -219,7 +219,7 @@ void ImGuiEngine_AddTextures() {
        ImGuiEngine::orgIcon = AddTexture("org-icon.png");
    }
    if (ImGuiEngine::duskLogo == 0) {
-        ImGuiEngine::duskLogo = AddTexture("logo.png");
+        ImGuiEngine::duskLogo = AddTexture("logo-mascot.png");
    }
 }
 }  // namespace dusk
@@ -1,141 +0,0 @@
-#include "ImGuiFirstRunPreset.hpp"
-
-#include "imgui.h"
-#include "ImGuiConsole.hpp"
-#include "ImGuiEngine.hpp"
-#include "dusk/settings.h"
-#include "dusk/config.hpp"
-#include <dusk/dusk.h>
-
-namespace dusk {
-
-static void ApplyPresetClassic() {
-    auto& s = getSettings();
-    s.video.lockAspectRatio.setValue(true);
-    s.game.bloomMode.setValue(BloomMode::Classic);
-    AuroraSetViewportPolicy(AURORA_VIEWPORT_FIT);
-}
-
-static void ApplyPresetHD() {
-    auto& s = getSettings();
-    s.game.bloomMode.setValue(BloomMode::Classic);
-    s.game.hideTvSettingsScreen.setValue(true);
-    s.game.skipWarningScreen.setValue(true);
-    s.game.noReturnRupees.setValue(true);
-    s.game.disableRupeeCutscenes.setValue(true);
-    s.game.noSwordRecoil.setValue(true);
-    s.game.fastClimbing.setValue(true);
-    s.game.noMissClimbing.setValue(true);
-    s.game.fastTears.setValue(true);
-    s.game.biggerWallets.setValue(true);
-    s.game.invertCameraXAxis.setValue(true);
-    s.game.freeCamera.setValue(true);
-    s.game.no2ndFishForCat.setValue(true);
-}
-
-static void ApplyPresetDusk() {
-    ApplyPresetHD();
-
-    auto& s = getSettings();
-    s.game.enableAchievementNotifications.setValue(true);
-    s.game.enableQuickTransform.setValue(true);
-    s.game.instantSaves.setValue(true);
-    s.game.midnasLamentNonStop.setValue(true);
-    s.game.enableFrameInterpolation.setValue(true);
-    s.game.sunsSong.setValue(true);
-    s.game.bloomMode.setValue(BloomMode::Dusk);
-    s.game.autoSave.setValue(true);
-}
-
-// =========================================================================
-
-void ImGuiFirstRunPreset::draw() {
-    const char* modalTitle = "Welcome to Dusk!";
-
-    if (m_done) return;
-
-    if (!m_opened) {
-        ImGui::OpenPopup(modalTitle);
-        m_opened = true;
-    }
-
-    const ImGuiViewport* viewport = ImGui::GetMainViewport();
-    ImGui::SetNextWindowPos(viewport->GetCenter(), ImGuiCond_Always, ImVec2(0.5f, 0.5f));
-    ImGui::SetNextWindowSize(ImVec2(800.0f * ImGuiScale(), 0.0f), ImGuiCond_Always);
-
-    if (!ImGui::BeginPopupModal(modalTitle, nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove)) {
-        // force the user to actually pick one, and not just hit escape to skip the dialog
-        m_opened = false;
-        return;
-    }
-
-    ImGui::TextWrapped("Choose a preset to get started. You can change any setting later from the Enhancements menu.");
-    ImGui::Spacing();
-    ImGui::Separator();
-    ImGui::Spacing();
-
-    int chosen = -1;
-
-    if (ImGui::BeginTable("##presets", 5, ImGuiTableFlags_None)) {
-        ImGui::TableSetupColumn(nullptr, ImGuiTableColumnFlags_WidthStretch);
-        ImGui::TableSetupColumn(nullptr, ImGuiTableColumnFlags_WidthFixed, 16.0f * ImGuiScale());
-        ImGui::TableSetupColumn(nullptr, ImGuiTableColumnFlags_WidthStretch);
-        ImGui::TableSetupColumn(nullptr, ImGuiTableColumnFlags_WidthFixed, 16.0f * ImGuiScale());
-        ImGui::TableSetupColumn(nullptr, ImGuiTableColumnFlags_WidthStretch);
-
-        ImGui::TableNextRow();
-
-        ImGui::PushFont(ImGuiEngine::fontLarge);
-
-        ImGui::TableSetColumnIndex(0);
-        if (ImGui::Button("Classic##btn", ImVec2(ImGui::GetContentRegionAvail().x, 80.0f * ImGuiScale()))) {
-            chosen = 0;
-        }
-
-        ImGui::TableSetColumnIndex(2);
-        if (ImGui::Button("HD##btn", ImVec2(ImGui::GetContentRegionAvail().x, 80.0f * ImGuiScale()))) {
-            chosen = 1;
-        }
-
-        ImGui::TableSetColumnIndex(4);
-        if (ImGui::Button("Dusk##btn", ImVec2(ImGui::GetContentRegionAvail().x, 80.0f * ImGuiScale())))
-        {
-            chosen = 2;
-        }
-
-        ImGui::PopFont();
-
-        ImGui::TableNextRow();
-
-        ImGui::TableSetColumnIndex(0);
-        ImGui::Spacing();
-        ImGui::TextWrapped("All enhancements disabled to match the GameCube version. Good for speedrunning or simple nostalgia!");
-
-        ImGui::TableSetColumnIndex(2);
-        ImGui::Spacing();
-        ImGui::TextWrapped("Some enhancements enabled to match the HD version. A good starting point for most players!");
-
-        ImGui::TableSetColumnIndex(4);
-        ImGui::Spacing();
-        ImGui::TextWrapped("More enhancements enabled than the HD preset. Veteran players will appreciate the additional tweaks!");
-
-        ImGui::EndTable();
-    }
-
-    if (chosen >= 0) {
-        if (chosen == 0) ApplyPresetClassic();
-        if (chosen == 1) ApplyPresetHD();
-        if (chosen == 2) ApplyPresetDusk();
-
-        getSettings().backend.wasPresetChosen.setValue(true);
-        config::Save();
-
-        m_done = true;
-
-        ImGui::CloseCurrentPopup();
-    }
-
-    ImGui::EndPopup();
-}
-
-}  // namespace dusk
@@ -1,14 +0,0 @@
-#pragma once
-
-namespace dusk {
-
-class ImGuiFirstRunPreset {
-public:
-    void draw();
-
-private:
-    bool m_opened = false;
-    bool m_done = false;
-};
-
-}  // namespace dusk
@@ -22,7 +22,9 @@ namespace dusk {
    void ShowHeapDetailed(JKRHeap* heap, OpenHeapData& data, bool& open);

    void ImGuiMenuTools::ShowHeapOverlay() {
-        if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F4, m_showHeapOverlay)) {
+        if (!getSettings().backend.enableAdvancedSettings ||
+            !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F4, m_showHeapOverlay))
+        {
            return;
        }

@@ -9,7 +9,9 @@

 namespace dusk {
    void ImGuiMenuTools::ShowMapLoader() {
-        if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F7, m_showMapLoader)) {
+    if (!getSettings().backend.enableAdvancedSettings ||
+        !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F7, m_showMapLoader))
+    {
            return;
        }

@@ -1,573 +1,16 @@
 #include "fmt/format.h"
 #include "imgui.h"

-#include "ImGuiEngine.hpp"
 #include "ImGuiConsole.hpp"
 #include "ImGuiConfig.hpp"

 #include "dusk/main.h"
-#include "dusk/hotkeys.h"
 #include "m_Do/m_Do_main.h"

-#include <SDL3/SDL_gamepad.h>
-
 namespace dusk {
-    void ImGuiMenuGame::ToggleFullscreen() {
-        getSettings().video.enableFullscreen.setValue(!getSettings().video.enableFullscreen);
-        VISetWindowFullscreen(getSettings().video.enableFullscreen);
-        config::Save();
-    }
-
    ImGuiMenuGame::ImGuiMenuGame() {}

-    void ImGuiMenuGame::draw() {
-        if (ImGui::BeginMenu("Settings")) {
-            // TODO: Remove this once Controller Config exists in RmlUi
-            if (ImGui::Button("Configure Controller")){
-                m_showControllerConfig = !m_showControllerConfig;
-            }
-
-            ImGui::Checkbox("Show Input Viewer", &m_showInputViewer);
-
-            ImGui::EndMenu();
-        }
-    }
-
-    static void drawVirtualStick(const char* id, const ImVec2& stick) {
-        float scale = ImGuiScale();
-        ImGui::SetCursorPos(ImVec2(ImGui::GetCursorPos().x + 45 * scale, ImGui::GetCursorPos().y + 10));
-
-        ImGui::BeginChild(id, ImVec2(80 * scale, 80 * scale), 0, ImGuiWindowFlags_NoBackground);
-        ImDrawList* dl = ImGui::GetWindowDrawList();
-        ImVec2 p = ImGui::GetCursorScreenPos();
-
-        float radius = 30.0f * scale;
-        ImVec2 pos = ImVec2(p.x + radius, p.y + radius);
-
-        constexpr ImU32 stickGray = IM_COL32(150, 150, 150, 255);
-        constexpr ImU32 white = IM_COL32(255, 255, 255, 255);
-        constexpr ImU32 red = IM_COL32(230, 0, 0, 255);
-
-        dl->AddCircleFilled(pos, radius, stickGray, 8);
-        dl->AddCircleFilled(ImVec2(pos.x + stick.x * (radius), pos.y + -stick.y * (radius)), 3 * scale, red);
-        ImGui::EndChild();
-    }
-
-    struct SpecificButtonName {
-        SDL_GamepadType Type;
-        const char* Name;
-    };
-
-    struct ButtonNames {
-        SDL_GamepadButton Button;
-        std::vector<SpecificButtonName> Names;
-    };
-
-// clang-format off
-    static const std::vector<ButtonNames> GamepadButtonNames = {
-        { SDL_GAMEPAD_BUTTON_LEFT_STICK, {
-           {SDL_GAMEPAD_TYPE_PS3, "L3"},
-           {SDL_GAMEPAD_TYPE_PS4, "L3"},
-           {SDL_GAMEPAD_TYPE_PS5, "L3"},
-           {SDL_GAMEPAD_TYPE_XBOX360, "Left Stick"},
-           {SDL_GAMEPAD_TYPE_XBOXONE, "Left Stick"},
-           {SDL_GAMEPAD_TYPE_GAMECUBE, "Control Stick"},
-        }},
-        { SDL_GAMEPAD_BUTTON_RIGHT_STICK, {
-           {SDL_GAMEPAD_TYPE_PS3, "R3"},
-           {SDL_GAMEPAD_TYPE_PS4, "R3"},
-           {SDL_GAMEPAD_TYPE_PS5, "R3"},
-           {SDL_GAMEPAD_TYPE_XBOX360, "Right Stick"},
-           {SDL_GAMEPAD_TYPE_XBOXONE, "Right Stick"},
-           {SDL_GAMEPAD_TYPE_GAMECUBE, "C Stick"},
-        }},
-        { SDL_GAMEPAD_BUTTON_LEFT_SHOULDER, {
-           {SDL_GAMEPAD_TYPE_PS3, "L1"},
-           {SDL_GAMEPAD_TYPE_PS4, "L1"},
-           {SDL_GAMEPAD_TYPE_PS5, "L1"},
-           {SDL_GAMEPAD_TYPE_XBOX360, "LB"},
-           {SDL_GAMEPAD_TYPE_XBOXONE, "LB"},
-        }},
-        { SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER, {
-           {SDL_GAMEPAD_TYPE_PS3, "R1"},
-           {SDL_GAMEPAD_TYPE_PS4, "R1"},
-           {SDL_GAMEPAD_TYPE_PS5, "R1"},
-           {SDL_GAMEPAD_TYPE_XBOX360, "RB"},
-           {SDL_GAMEPAD_TYPE_XBOXONE, "RB"},
-           {SDL_GAMEPAD_TYPE_GAMECUBE, "Z"},
-        }},
-        { SDL_GAMEPAD_BUTTON_BACK, {
-           {SDL_GAMEPAD_TYPE_PS3, "Select"},
-           {SDL_GAMEPAD_TYPE_PS4, "Share"},
-           {SDL_GAMEPAD_TYPE_PS5, "Create"},
-           {SDL_GAMEPAD_TYPE_XBOX360, "Back"},
-           {SDL_GAMEPAD_TYPE_XBOXONE, "View"},
-        }},
-        { SDL_GAMEPAD_BUTTON_START, {
-           {SDL_GAMEPAD_TYPE_PS3, "Start"},
-           {SDL_GAMEPAD_TYPE_PS4, "Options"},
-           {SDL_GAMEPAD_TYPE_PS5, "Options"},
-           {SDL_GAMEPAD_TYPE_XBOX360, "Start"},
-           {SDL_GAMEPAD_TYPE_XBOXONE, "Menu"},
-           {SDL_GAMEPAD_TYPE_GAMECUBE, "Start/Pause"},
-        }},
-    };
-// clang-format on
-
-    static const char* GetNameForGamepadButton(SDL_Gamepad* gamepad, u32 buttonUntyped) {
-        if (buttonUntyped == PAD_NATIVE_BUTTON_INVALID) {
-            return "Not bound";
-        }
-
-        auto button = static_cast<SDL_GamepadButton>(buttonUntyped);
-        auto label = SDL_GetGamepadButtonLabel(gamepad, button);
-
-        switch (label) {
-        case SDL_GAMEPAD_BUTTON_LABEL_A:
-            return "A";
-        case SDL_GAMEPAD_BUTTON_LABEL_B:
-            return "B";
-        case SDL_GAMEPAD_BUTTON_LABEL_X:
-            return "X";
-        case SDL_GAMEPAD_BUTTON_LABEL_Y:
-            return "Y";
-        case SDL_GAMEPAD_BUTTON_LABEL_CROSS:
-            return "Cross";
-        case SDL_GAMEPAD_BUTTON_LABEL_CIRCLE:
-            return "Circle";
-        case SDL_GAMEPAD_BUTTON_LABEL_TRIANGLE:
-            return "Triangle";
-        case SDL_GAMEPAD_BUTTON_LABEL_SQUARE:
-            return "Square";
-        default:; // Fall through
-        }
-
-        auto padType = SDL_GetGamepadType(gamepad);
-        for (const auto& buttonNames : GamepadButtonNames) {
-            if (buttonNames.Button != button) {
-                continue;
-            }
-
-            for (const auto& name : buttonNames.Names) {
-                if (name.Type == padType) {
-                    return name.Name;
-                }
-            }
-        }
-
-        switch (button) {
-        case SDL_GAMEPAD_BUTTON_DPAD_LEFT:
-            return "D-pad left";
-        case SDL_GAMEPAD_BUTTON_DPAD_RIGHT:
-            return "D-pad right";
-        case SDL_GAMEPAD_BUTTON_DPAD_UP:
-            return "D-pad up";
-        case SDL_GAMEPAD_BUTTON_DPAD_DOWN:
-            return "D-pad down";
-        default:
-            return PADGetNativeButtonName(buttonUntyped);
-        }
-    }
-
-    void ImGuiMenuGame::windowControllerConfig() {
-        if (!m_showControllerConfig) {
-            return;
-        }
-
-        // if pending for a button mapping, check to set new input
-        if (m_controllerConfig.m_pendingButtonMapping != nullptr) {
-            s32 nativeButton = PADGetNativeButtonPressed(m_controllerConfig.m_pendingPort);
-            if (nativeButton != -1) {
-                m_controllerConfig.m_pendingButtonMapping->nativeButton = nativeButton;
-                m_controllerConfig.m_pendingButtonMapping = nullptr;
-                m_controllerConfig.m_pendingPort = -1;
-                PADBlockInput(false);
-                PADSerializeMappings();
-            }
-        }
-
-        // if pending for an axis mapping, check to set new input
-        if (m_controllerConfig.m_pendingAxisMapping != nullptr) {
-            auto nativeAxis = PADGetNativeAxisPulled(m_controllerConfig.m_pendingPort);
-            if (nativeAxis.nativeAxis != -1) {
-                m_controllerConfig.m_pendingAxisMapping->nativeAxis = nativeAxis;
-                m_controllerConfig.m_pendingAxisMapping->nativeButton = -1;
-                m_controllerConfig.m_pendingAxisMapping = nullptr;
-                m_controllerConfig.m_pendingPort = -1;
-                PADBlockInput(false);
-                PADSerializeMappings();
-            } else {
-                auto nativeButton = PADGetNativeButtonPressed(m_controllerConfig.m_pendingPort);
-                if (nativeButton != -1) {
-                    m_controllerConfig.m_pendingAxisMapping->nativeAxis = {-1, AXIS_SIGN_POSITIVE};
-                    m_controllerConfig.m_pendingAxisMapping->nativeButton = nativeButton;
-                    m_controllerConfig.m_pendingAxisMapping = nullptr;
-                    m_controllerConfig.m_pendingPort = -1;
-                    PADBlockInput(false);
-                    PADSerializeMappings();
-                }
-            }
-        }
-
-        float scale = ImGuiScale();
-        ImGuiWindowFlags windowFlags =
-            ImGuiWindowFlags_NoResize |
-            ImGuiWindowFlags_AlwaysAutoResize;
-
-        // ImGui::SetNextWindowBgAlpha(0.65f);
-
-        if (!ImGui::Begin("Controller Config", &m_showControllerConfig, windowFlags)) {
-            ImGui::End();
-            return;
-        }
-
-        // port tabs
-        ImGui::BeginTabBar("##ControllerTabs");
-        for (int i = PAD_1; i <= PAD_4; i++) {
-            if (ImGui::BeginTabItem(fmt::format("Port {}", i + 1).c_str())) {
-                m_controllerConfig.m_selectedPort = i;
-                ImGui::EndTabItem();
-            }
-        }
-        ImGui::EndTabBar();
-
-        // if tab is changed while waiting for input, cancel pending
-        if ((m_controllerConfig.m_pendingButtonMapping != nullptr ||
-             m_controllerConfig.m_pendingAxisMapping != nullptr) &&
-            m_controllerConfig.m_pendingPort != m_controllerConfig.m_selectedPort)
-        {
-            m_controllerConfig.m_pendingButtonMapping = nullptr;
-            m_controllerConfig.m_pendingAxisMapping = nullptr;
-            m_controllerConfig.m_pendingPort = -1;
-            PADBlockInput(false);
-        }
-
-        // get a list of all available controller's names
-        std::vector<std::string> controllerList;
-        controllerList.push_back("None");
-        for (int i = 0; i < PADCount(); i++) {
-            // attach index to name for unique name
-            controllerList.push_back(fmt::format("{}-{}", PADGetNameForControllerIndex(i), i));
-        }
-
-        // get current controller name
-        const char* tmpName = PADGetName(m_controllerConfig.m_selectedPort);
-        std::string currentName = "None";
-        if (tmpName != nullptr) {
-            currentName = fmt::format("{}-{}", tmpName, PADGetIndexForPort(m_controllerConfig.m_selectedPort));
-        }
-
-        // controller selection combo box
-        bool changedController = false;
-        int changedControllerIndex = 0;
-        ImGui::SetNextItemWidth(400.0f * scale);
-        if (ImGui::BeginCombo("##ControllerDeviceList", currentName.c_str())) {
-            for (int i = 0; const auto& name : controllerList) {
-                if (ImGui::Selectable(name.c_str(), currentName == name)) {
-                    changedControllerIndex = i;
-                    changedController = true;
-                }
-                i++;
-            }
-            ImGui::EndCombo();
-        }
-
-        // handle controller change
-        if (changedController) {
-            if (changedControllerIndex > 0) {
-                PADSetPortForIndex(changedControllerIndex - 1, m_controllerConfig.m_selectedPort);
-            }
-            else if (changedControllerIndex == 0) {
-                // if "None" selected
-                PADClearPort(m_controllerConfig.m_selectedPort);
-            }
-            PADSerializeMappings();
-        }
-
-        // restore defaults button
-        ImGui::SameLine();
-        if (ImGui::Button("Default")) {
-            PADRestoreDefaultMapping(m_controllerConfig.m_selectedPort);
-            PADSerializeMappings();
-        }
-
-        // buttons panel
-        const float uiButtonSize = 40 * scale;
-        ImVec2 btnSize(110.0f * scale, 30.0f * scale);
-
-        ImGuiBeginGroupPanel("Buttons", ImVec2(150 * scale, 20 * scale));
-
-        SDL_Gamepad* gamepad = PADGetSDLGamepadForIndex(PADGetIndexForPort(m_controllerConfig.m_selectedPort));
-        u32 buttonCount;
-        PADButtonMapping* btnMappingList = PADGetButtonMappings(m_controllerConfig.m_selectedPort, &buttonCount);
-        if (btnMappingList != nullptr) {
-            for (int i = 0; i < buttonCount; i++) {
-                const char* btnName = PADGetButtonName(btnMappingList[i].padButton);
-                ImVec2 len = ImGui::CalcTextSize(btnName);
-                ImVec2 pos = ImGui::GetCursorPos();
-
-                ImGui::SetCursorPosY(pos.y + len.y / 4);
-                ImGui::SetCursorPosX(pos.x + abs(len.x - uiButtonSize));
-                ImGui::Text("%s", btnName);
-                ImGui::SameLine();
-
-                ImGui::SetCursorPosY(pos.y);
-
-                std::string dispName;
-                if (m_controllerConfig.m_isReading && m_controllerConfig.m_pendingButtonMapping == &btnMappingList[i]) {
-                    dispName = fmt::format("Press a Key...##{}", btnName);
-                } else {
-                    const char* nativeName = GetNameForGamepadButton(gamepad, btnMappingList[i].nativeButton);
-                    if (nativeName == nullptr) {
-                        nativeName = "[unbound]";
-                    }
-                    dispName = fmt::format("{0}##-{1}", nativeName, i);
-                }
-                bool pressed = ImGui::Button(dispName.c_str(),
-                    btnSize);
-
-                if (pressed) {
-                    m_controllerConfig.m_isReading = true;
-                    m_controllerConfig.m_pendingPort = m_controllerConfig.m_selectedPort;
-                    m_controllerConfig.m_pendingButtonMapping = &btnMappingList[i];
-                    PADBlockInput(true);
-                }
-            }
-        }
-
-        ImGuiEndGroupPanel();
-        ImGui::SameLine();
-
-        uint32_t axisCount;
-        PADAxisMapping* axisMappingList = PADGetAxisMappings(m_controllerConfig.m_selectedPort, &axisCount);
-
-        ImGuiBeginGroupPanel("Analog Triggers", ImVec2(150 * scale, 20 * scale));
-
-        PADAxis triggers[] = {PAD_AXIS_TRIGGER_L, PAD_AXIS_TRIGGER_R};
-        if (axisMappingList != nullptr) {
-            for (PADAxis trigger : triggers) {
-                const char* axisName = PADGetAxisName(axisMappingList[trigger].padAxis);
-                ImVec2 len = ImGui::CalcTextSize(axisName);
-                ImVec2 pos = ImGui::GetCursorPos();
-
-                ImGui::SetCursorPosY(pos.y + len.y / 4);
-                ImGui::SetCursorPosX(pos.x + abs(len.x - uiButtonSize));
-                ImGui::Text("%s", axisName);
-                ImGui::SameLine();
-
-                ImGui::SetCursorPosY(pos.y);
-
-                std::string dispName;
-                if (m_controllerConfig.m_isReading && m_controllerConfig.m_pendingAxisMapping == &axisMappingList[trigger]) {
-                    dispName = fmt::format("Press a Key...##{}", axisName);
-                } else {
-                    dispName = fmt::format("{0}##-{1}", PADGetNativeAxisName(axisMappingList[trigger].nativeAxis), trigger);
-                }
-                bool pressed = ImGui::Button(dispName.c_str(),
-                    btnSize);
-
-                if (pressed) {
-                    m_controllerConfig.m_isReading = true;
-                    m_controllerConfig.m_pendingPort = m_controllerConfig.m_selectedPort;
-                    m_controllerConfig.m_pendingAxisMapping = &axisMappingList[trigger];
-                    PADBlockInput(true);
-                }
-            }
-        }
-
-        int port = m_controllerConfig.m_selectedPort;
-        PADDeadZones* deadZones = PADGetDeadZones(port);
-
-        if (deadZones != nullptr) {
-            ImGui::Text("L Threshold");
-            ImGui::SameLine();
-            {
-                float tmp = static_cast<float>(deadZones->leftTriggerActivationZone * 100.f) / 32767.f;
-                if (ImGui::DragFloat("##LThreshold", &tmp, 0.5f, 0.f, 100.f, "%.3f%%")) {
-                    deadZones->leftTriggerActivationZone = static_cast<u16>((tmp / 100.f) * 32767);
-                    PADSerializeMappings();
-                }
-            }
-        }
-
-        if (deadZones != nullptr) {
-            ImGui::Text("R Threshold");
-            ImGui::SameLine();
-            {
-                float tmp = static_cast<float>(deadZones->rightTriggerActivationZone * 100.f) / 32767.f;
-                if (ImGui::DragFloat("##RThreshold", &tmp, 0.5f, 0.f, 100.f, "%.3f%%")) {
-                    deadZones->rightTriggerActivationZone = static_cast<u16>((tmp / 100.f) * 32767);
-                    PADSerializeMappings();
-                }
-            }
-        }
-
-        ImGuiEndGroupPanel();
-        ImGui::SameLine();
-
-        // main stick panel
-        ImGuiBeginGroupPanel("Control Stick", ImVec2(150 * scale, 20 * scale));
-
-        drawVirtualStick("##mainStick", ImVec2{ mDoCPd_c::getStickX(port), mDoCPd_c::getStickY(port) });
-
-        if (axisMappingList != nullptr) {
-            const PADAxis lStickAxes[] = {PAD_AXIS_LEFT_Y_POS, PAD_AXIS_LEFT_Y_NEG, PAD_AXIS_LEFT_X_NEG, PAD_AXIS_LEFT_X_POS};
-            for (auto axis : lStickAxes) {
-                const char* label = PADGetAxisDirectionLabel(axis);
-                ImVec2 len = ImGui::CalcTextSize(label);
-                ImVec2 pos = ImGui::GetCursorPos();
-
-                ImGui::SetCursorPosY(pos.y + len.y / 4);
-                ImGui::SetCursorPosX(pos.x + abs(len.x - uiButtonSize));
-                ImGui::Text("%s", label);
-                ImGui::SameLine();
-
-                ImGui::SetCursorPosY(pos.y);
-
-                std::string dispName;
-                if (m_controllerConfig.m_isReading && m_controllerConfig.m_pendingAxisMapping == &axisMappingList[axis]) {
-                    dispName = fmt::format("Press a Key...##{}", label);
-                } else {
-                    if (axisMappingList[axis].nativeAxis.nativeAxis != -1) {
-                        const char* signStr;
-                        if (axis == PAD_AXIS_TRIGGER_L || axis == PAD_AXIS_TRIGGER_R) {
-                            signStr = "";
-                        } else if (axisMappingList[axis].nativeAxis.sign == AXIS_SIGN_POSITIVE) {
-                            signStr = "+";
-                        } else {
-                            signStr = "-";
-                        }
-                        dispName = fmt::format("{0}{1}##-{2}", PADGetNativeAxisName(axisMappingList[axis].nativeAxis), signStr, axis);
-                    } else {
-                        assert(axisMappingList[axis].nativeButton != -1);
-                        dispName = fmt::format("{0}##-{1}", PADGetNativeButtonName(axisMappingList[axis].nativeButton), axis);
-                    }
-                }
-                bool pressed = ImGui::Button(dispName.c_str(), btnSize);
-
-                if (pressed) {
-                    m_controllerConfig.m_isReading = true;
-                    m_controllerConfig.m_pendingPort = m_controllerConfig.m_selectedPort;
-                    m_controllerConfig.m_pendingAxisMapping = &axisMappingList[axis];
-                    PADBlockInput(true);
-                }
-            }
-        }
-
-        if (deadZones != nullptr) {
-            ImGui::Text("Dead Zone");
-            {
-                float tmp = static_cast<float>(deadZones->stickDeadZone * 100.f) / 32767.f;
-                if (ImGui::DragFloat("##mainDeadZone", &tmp, 0.5f, 0.f, 100.f, "%.3f%%")) {
-                    deadZones->stickDeadZone = static_cast<u16>((tmp / 100.f) * 32767);
-                    PADSerializeMappings();
-                }
-            }
-        }
-
-        ImGuiEndGroupPanel();
-        ImGui::SameLine();
-
-        // sub stick panel
-        ImGuiBeginGroupPanel("C Stick", ImVec2(150 * scale, 20 * scale));
-
-        drawVirtualStick("##subStick", ImVec2{ mDoCPd_c::getSubStickX(port), mDoCPd_c::getSubStickY(port) });
-
-        if (axisMappingList != nullptr) {
-            const PADAxis rStickAxes[] = {PAD_AXIS_RIGHT_Y_POS, PAD_AXIS_RIGHT_Y_NEG, PAD_AXIS_RIGHT_X_NEG, PAD_AXIS_RIGHT_X_POS};
-            for (auto axis : rStickAxes) {
-                const char* label = PADGetAxisDirectionLabel(axisMappingList[axis].padAxis);
-                ImVec2 len = ImGui::CalcTextSize(label);
-                ImVec2 pos = ImGui::GetCursorPos();
-
-                ImGui::SetCursorPosY(pos.y + len.y / 4);
-                ImGui::SetCursorPosX(pos.x + abs(len.x - uiButtonSize));
-                ImGui::Text("%s", label);
-                ImGui::SameLine();
-
-                ImGui::SetCursorPosY(pos.y);
-
-                std::string dispName;
-                if (m_controllerConfig.m_isReading && m_controllerConfig.m_pendingAxisMapping == &axisMappingList[axis]) {
-                    dispName = fmt::format("Press a Key...##sub{}", label);
-                } else {
-                    if (axisMappingList[axis].nativeAxis.nativeAxis != -1) {
-                        const char* signStr;
-                        if (axis == PAD_AXIS_TRIGGER_L || axis == PAD_AXIS_TRIGGER_R) {
-                            signStr = "";
-                        } else if (axisMappingList[axis].nativeAxis.sign == AXIS_SIGN_POSITIVE) {
-                            signStr = "+";
-                        } else {
-                            signStr = "-";
-                        }
-                        dispName = fmt::format("{0}{1}##-{2}", PADGetNativeAxisName(axisMappingList[axis].nativeAxis), signStr, axis);
-                    } else {
-                        assert(axisMappingList[axis].nativeButton != -1);
-                        dispName = fmt::format("{0}##-{1}", PADGetNativeButtonName(axisMappingList[axis].nativeButton), axis);
-                    }
-                }
-                bool pressed = ImGui::Button(fmt::format("{0}##sub{1}", dispName, label).c_str(), btnSize);
-
-                if (pressed) {
-                    m_controllerConfig.m_isReading = true;
-                    m_controllerConfig.m_pendingPort = m_controllerConfig.m_selectedPort;
-                    m_controllerConfig.m_pendingAxisMapping = &axisMappingList[axis];
-                    PADBlockInput(true);
-                }
-            }
-        }
-
-        if (deadZones != nullptr) {
-            ImGui::Text("Dead Zone");
-            {
-                float tmp = static_cast<float>(deadZones->substickDeadZone * 100.f) / 32767.f;
-                if (ImGui::DragFloat("##subDeadZone", &tmp, 0.5f, 0.f, 100.f, "%.3f%%")) {
-                    deadZones->substickDeadZone = static_cast<u16>((tmp / 100.f) * 32767);
-                    PADSerializeMappings();
-                }
-            }
-        }
-
-        ImGuiEndGroupPanel();
-        ImGui::SameLine();
-
-        // Options panel
-        ImGuiBeginGroupPanel("Options", ImVec2(150 * scale, -1));
-
-        if (deadZones != nullptr) {
-            if (ImGui::Checkbox("Enable Dead Zones", &deadZones->useDeadzones)) {
-                PADSerializeMappings();
-            }
-            if (ImGui::Checkbox("Emulate Triggers", &deadZones->emulateTriggers)) {
-                PADSerializeMappings();
-            }
-        }
-        
-        if (PADSupportsRumbleIntensity(m_controllerConfig.m_selectedPort)) {
-            ImGuiBeginGroupPanel("Rumble Intensity", ImVec2(150 * scale, -1));
-            u16 low;
-            u16 high;
-            (void)PADGetRumbleIntensity(m_controllerConfig.m_selectedPort, &low, &high);
-            float fLow = (static_cast<float>(low) / 32767.f) * 100.f;
-            bool changed = ImGui::SliderFloat("Low", &fLow, 0.f, 100.f, "%.0f%%");
-            float fHigh = (static_cast<float>(high) / 32767.f) * 100.f;
-            changed |= ImGui::SliderFloat("High", &fHigh, 0.f, 100.f, "%.0f%%");
-            if (changed) {
-                PADSetRumbleIntensity(m_controllerConfig.m_selectedPort,
-                    static_cast<u16>((fLow / 100) * 32767),
-                    static_cast<u16>((fHigh / 100) * 32767));
-                PADSerializeMappings();
-            }
-            if (ImGui::Button(fmt::format("{0}...##rumbleTest", m_controllerConfig.m_isRumbling ? "Stop": "Test").c_str(), {-1, 0})) {
-                PADControlMotor(m_controllerConfig.m_selectedPort, !m_controllerConfig.m_isRumbling ? PAD_MOTOR_RUMBLE : PAD_MOTOR_STOP_HARD);
-                m_controllerConfig.m_isRumbling ^= 1;
-            } 
-            ImGuiEndGroupPanel();
-        }
-        ImGuiEndGroupPanel();
-
-        ImGui::End();
-    }
+    void ImGuiMenuGame::draw() {}

    static std::string GetFormattedTime(OSTime ticks) {
        OSCalendarTime time;
@@ -601,6 +44,7 @@ namespace dusk {
        getSettings().game.freeMagicArmor.setValue(false);

        getSettings().game.enableTurboKeybind.setValue(false);
+        getSettings().game.debugFlyCam.setValue(false);
    }

    SpeedrunInfo m_speedrunInfo;
@@ -46,31 +46,11 @@ namespace dusk {
        ImGuiMenuGame();
        void draw();

-        void windowInputViewer();
-        void windowControllerConfig();
        void drawSpeedrunTimerOverlay();

-        static void ToggleFullscreen();
-
        static void resetForSpeedrunMode();

    private:
-        struct {
-            int m_selectedPort = 0;
-            bool m_isReading = false;
-            PADButtonMapping* m_pendingButtonMapping = nullptr;
-            PADAxisMapping* m_pendingAxisMapping = nullptr;
-            int m_pendingPort = -1;
-            bool m_isRumbling = false;
-        } m_controllerConfig;
-
-        bool m_showControllerConfig = false;
-
-        bool m_showInputViewer = false;
-        bool m_showInputViewerGyro = false;
-        int m_inputOverlayCorner = 3;
-        std::string m_controllerName;
-
        bool m_showTimerWindow = false;
    };
 }
@@ -23,24 +23,6 @@
 #include <TargetConditionals.h>
 #endif

-#if defined(_WIN32) || (defined(__APPLE__) && !TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || (defined(__linux__) && !defined(__ANDROID__))
-#define DUSK_CAN_OPEN_DATA_FOLDER 1
-
-namespace fs = std::filesystem;
-
-static void OpenDataFolder() {
-    const std::string path = fs::absolute(dusk::ConfigPath).generic_string();
-#if defined(_WIN32)
-    const std::string url = std::string("file:///") + path;
-#else
-    const std::string url = std::string("file://") + path;
-#endif
-    (void)SDL_OpenURL(url.c_str());
-}
-#else
-#define DUSK_CAN_OPEN_DATA_FOLDER 0
-#endif
-
 namespace aurora::gx {
 extern bool enableLodBias;
 }
@@ -66,7 +48,8 @@ namespace dusk {
                ImGui::EndDisabled();
            }

-            ImGui::MenuItem("Achievements", nullptr, &m_showAchievements);
+            ImGui::Separator();
+            ImGui::Checkbox("Show Input Viewer", &m_showInputViewer);

 #if DUSK_CAN_OPEN_DATA_FOLDER
            ImGui::Separator();
@@ -138,7 +121,9 @@ namespace dusk {
    }

    void ImGuiMenuTools::ShowDebugOverlay() {
-        if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F3, m_showDebugOverlay)) {
+        if (!getSettings().backend.enableAdvancedSettings ||
+            !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F3, m_showDebugOverlay))
+        {
            return;
        }

@@ -202,7 +187,9 @@ namespace dusk {
    }

    void ImGuiMenuTools::ShowPlayerInfo() {
-        if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F5, m_showPlayerInfo)) {
+        if (!getSettings().backend.enableAdvancedSettings ||
+            !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F5, m_showPlayerInfo))
+        {
            return;
        }

@@ -268,12 +255,4 @@ namespace dusk {
        ImGui::End();
        ImGui::PopFont();
    }
-
-    void ImGuiMenuTools::ShowAchievements() {
-        m_achievementsWindow.draw(m_showAchievements);
-    }
-
-    void ImGuiMenuTools::notifyAchievement(std::string name) {
-        m_achievementsWindow.notify(std::move(name));
-    }
 }
@@ -2,10 +2,10 @@
 #define DUSK_IMGUI_MENUTOOLS_HPP

 #include <aurora/aurora.h>
+#include <queue>
 #include <string>

 #include "imgui.h"
-#include "ImGuiAchievements.hpp"
 #include "ImGuiSaveEditor.hpp"
 #include "ImGuiStateShare.hpp"

@@ -27,8 +27,7 @@ namespace dusk {
        void ShowAudioDebug();
        void ShowSaveEditor();
        void ShowStateShare();
-        void ShowAchievements();
-        void notifyAchievement(std::string name);
+        void ShowInputViewer();

    private:
 		bool m_showDebugOverlay = false;
@@ -69,8 +68,10 @@ namespace dusk {
        bool m_showStateShare = false;
        ImGuiStateShare m_stateShare;

-        bool m_showAchievements = false;
-        ImGuiAchievements m_achievementsWindow;
+        bool m_showInputViewer = false;
+        bool m_showInputViewerGyro = false;
+        int m_inputOverlayCorner = 3;
+        std::string m_controllerName;
    };
 }

@@ -1,282 +0,0 @@
-#include "imgui.h"
-
-#include "ImGuiConfig.hpp"
-#include "ImGuiEngine.hpp"
-#include "ImGuiPreLaunchWindow.hpp"
-
-#include "../file_select.hpp"
-#include "../iso_validate.hpp"
-#include "ImGuiConsole.hpp"
-#include "dusk/main.h"
-#include "dusk/settings.h"
-
-#include <SDL3/SDL_dialog.h>
-#include <SDL3/SDL_filesystem.h>
-
-#include "aurora/lib/internal.hpp"
-#include "aurora/lib/window.hpp"
-
-namespace dusk {
-
-typedef void (ImGuiPreLaunchWindow::*drawFunc)();
-
-drawFunc drawTable[2] = {&ImGuiPreLaunchWindow::drawMainMenu, &ImGuiPreLaunchWindow::drawOptions};
-
-static constexpr std::array<const char*, 5> skLanguageNames = {
-    "English", "German", "French", "Spanish", "Italian"
-};
-
-static constexpr std::array<SDL_DialogFileFilter, 2> skGameDiscFileFilters{{
-    {"Game Disc Images", "iso;gcm;ciso;gcz;nfs;rvz;wbfs;wia;tgc"},
-    {"All Files", "*"},
-}};
-
-static std::string ShowIsoInvalidError(const iso::ValidationError code) {
-    using namespace std::literals::string_literals;
-
-    switch (code) {
-    case iso::ValidationError::IOError:
-        return "Unknown IO error occurred"s;
-    case iso::ValidationError::InvalidImage:
-        return "Unable to interpret selected file as a disc image"s;
-    case iso::ValidationError::WrongGame:
-        return "Selected disc image is for a different game"s;
-    case iso::ValidationError::WrongVersion:
-        return "Selected disc image is for an unsupported version of the game. Only North American GameCube (NTSC/GZ2E01) is supported at this time."s;
-    case iso::ValidationError::ExecutableMismatch:
-        return "Selected disc image contains modified executable files."s;
-    default:
-        return "Unknown error"s;
-    }
-}
-
-static std::string_view card_type_name(CARDFileType type) {
-    switch (type) {
-    case CARD_GCIFOLDER:
-        return "GCI Folder"sv;
-    case CARD_RAWIMAGE:
-        return "Card Image"sv;
-    default:
-        return ""sv;
-    }
-}
-
-void fileDialogCallback(void* userdata, const char* path, const char* error) {
-    auto* self = static_cast<ImGuiPreLaunchWindow*>(userdata);
-    if (error != nullptr) {
-        self->m_selectedIsoPath.clear();
-        self->m_errorString = fmt::format("File dialog error: {}", error);
-        return;
-    }
-
-    if (path == nullptr) {
-        self->m_selectedIsoPath.clear();
-        return;
-    }
-
-    self->m_selectedIsoPath = path;
-    self->m_isPal = iso::isPal(path);
-    getSettings().backend.isoPath.setValue(self->m_selectedIsoPath);
-    config::Save();
-}
-
-ImGuiPreLaunchWindow::ImGuiPreLaunchWindow() = default;
-
-bool ImGuiPreLaunchWindow::isSelectedPathValid() const {
-#if TARGET_ANDROID
-    return !m_selectedIsoPath.empty(); // unsure why SDL_GetPathInfo doesnt work here
-#else
-    return !m_selectedIsoPath.empty() && SDL_GetPathInfo(m_selectedIsoPath.c_str(), nullptr);
-#endif
-}
-
-void ImGuiPreLaunchWindow::draw() {
-    if (m_IsFirstDraw) {
-        m_selectedIsoPath = getSettings().backend.isoPath;
-        m_isPal = !m_selectedIsoPath.empty() && iso::isPal(m_selectedIsoPath.c_str());
-        m_initialGraphicsBackend = getSettings().backend.graphicsBackend;
-        m_IsFirstDraw = false;
-    }
-
-    if (isSelectedPathValid() && getSettings().backend.skipPreLaunchUI) {
-        dusk::IsGameLaunched = true;
-        return;
-    }
-
-    auto& io = ImGui::GetIO();
-
-    ImGui::SetNextWindowSize(ImVec2(io.DisplaySize.x, io.DisplaySize.y));
-    ImGui::SetNextWindowPos(ImVec2(0, 0));
-    ImGui::SetNextWindowBgAlpha(0.65f);
-
-    ImGui::Begin("Pre Launch Window", nullptr,
-                 ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoResize |
-                     ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoFocusOnAppearing |
-                     ImGuiWindowFlags_NoBringToFrontOnFocus);
-
-    const auto& windowSize = ImGui::GetWindowSize();
-
-    for (int i = 0; i < 5; i++)
-        ImGui::NewLine();
-
-    float iconSize = 150.f;
-    ImGui::SameLine(windowSize.x / 2 - iconSize + (iconSize / 2));
-    if (ImGuiEngine::orgIcon != 0) {
-        ImGui::Image(ImGuiEngine::orgIcon, ImVec2{iconSize, iconSize});
-    }
-    ImGuiTextCenter("Twilit Realm presents");
-    if (ImGuiEngine::duskLogo) {
-        ImGui::NewLine();
-        float width = iconSize * 2.5f;
-        ImGui::SameLine(windowSize.x / 2 - width + (width / 2));
-        ImGui::Image(ImGuiEngine::duskLogo, ImVec2{width, iconSize});
-    } else {
-        ImGui::PushFont(ImGuiEngine::fontExtraLarge);
-        ImGuiTextCenter("Dusk");
-        ImGui::PopFont();
-    }
-
-    (this->*drawTable[m_CurMenu])();
-
-    ImGui::End();
-}
-
-void ImGuiPreLaunchWindow::drawMainMenu() {
-    const auto& windowSize = ImGui::GetWindowSize();
-    ImGui::SetCursorPosY(windowSize.y - 200);
-
-    ImGui::PushFont(ImGuiEngine::fontLarge);
-
-    if (!isSelectedPathValid()) {
-        if (!m_errorString.empty()) {
-            ImGuiTextCenter(m_errorString);
-        }
-
-        if (ImGuiButtonCenter("Select disc image...")) {
-            ShowFileSelect(&fileDialogCallback, this, aurora::window::get_sdl_window(),
-                           skGameDiscFileFilters.data(), int(skGameDiscFileFilters.size()), nullptr,
-                           false);
-        }
-    } else {
-        if (ImGuiButtonCenter("Start game")) {
-            dusk::IsGameLaunched = true;
-        }
-    }
-
-    if (ImGuiButtonCenter("Options")) {
-        m_CurMenu = 1;
-    }
-
-    ImGui::PopFont();
-}
-
-void ImGuiPreLaunchWindow::drawOptions() {
-    const auto& windowSize = ImGui::GetWindowSize();
-
-    ImGui::NewLine();
-
-    ImGui::PushFont(ImGuiEngine::fontLarge);
-    ImGuiTextCenter("Options");
-    ImGui::Separator();
-    ImGui::PopFont();
-
-    auto cursorY = ImGui::GetCursorPosY();
-    float endCursorY = windowSize.y - 100;
-
-    float childWidth = windowSize.x - 400;
-
-    ImGui::SetCursorPosX(windowSize.x / 2 - (childWidth / 2));
-    if (ImGui::BeginChild("OptionsChild", ImVec2(childWidth, endCursorY - cursorY),
-                          ImGuiChildFlags_None, ImGuiWindowFlags_NoBackground))
-    {
-        if (!m_errorString.empty()) {
-            ImGuiTextCenter(m_errorString);
-        }
-
-        ImGui::InputText("Game ISO Path", &m_selectedIsoPath, ImGuiInputTextFlags_ReadOnly);
-        ImGui::SameLine();
-        if (ImGui::Button(m_selectedIsoPath == "" ? "Set" : "Change")) {
-            ShowFileSelect(&fileDialogCallback, this, aurora::window::get_sdl_window(),
-                           skGameDiscFileFilters.data(), int(skGameDiscFileFilters.size()), nullptr,
-                           false);
-        }
-
-        if (m_isPal) {
-            auto selectedLanguage = getSettings().game.language.getValue();
-            if (ImGui::BeginCombo("Language", skLanguageNames[static_cast<u8>(selectedLanguage)])) {
-                for (u8 i = 0; i < skLanguageNames.size(); ++i) {
-                    if (ImGui::Selectable(skLanguageNames[i])) {
-                        getSettings().game.language.setValue(static_cast<GameLanguage>(i));
-                        config::Save();
-                    }
-                }
-
-                ImGui::EndCombo();
-            }
-        }
-
-        AuroraBackend configuredBackend = BACKEND_AUTO;
-        const std::string& configuredBackendId = getSettings().backend.graphicsBackend;
-        if (!try_parse_backend(configuredBackendId, configuredBackend)) {
-            configuredBackend = BACKEND_AUTO;
-        }
-
-        if (ImGui::BeginCombo("Graphics Backend", backend_name(configuredBackend).data())) {
-            if (ImGui::Selectable("Auto", configuredBackend == BACKEND_AUTO)) {
-                getSettings().backend.graphicsBackend.setValue("auto");
-                config::Save();
-            }
-
-            size_t backendCount = 0;
-            const AuroraBackend* availableBackends = aurora_get_available_backends(&backendCount);
-            for (size_t i = 0; i < backendCount; ++i) {
-                const AuroraBackend backend = availableBackends[i];
-                const bool isSelected = configuredBackend == backend;
-                if (ImGui::Selectable(backend_name(backend).data(), isSelected)) {
-                    getSettings().backend.graphicsBackend.setValue(
-                        std::string(backend_id(backend)));
-                    config::Save();
-                }
-                if (isSelected) {
-                    ImGui::SetItemDefaultFocus();
-                }
-            }
-
-            ImGui::EndCombo();
-        }
-        if (configuredBackendId != m_initialGraphicsBackend) {
-            ImGui::TextDisabled("Restart Required");
-        }
-        auto curFileType = (CARDFileType)getSettings().backend.cardFileType.getValue();
-
-        if (ImGui::BeginCombo("Save File Type", card_type_name(curFileType).data())) {
-
-            if (ImGui::Selectable("GCI Folder", curFileType == CARD_GCIFOLDER)) {
-                getSettings().backend.cardFileType.setValue(CARD_GCIFOLDER);
-                config::Save();
-            }
-
-            if (ImGui::Selectable("Card Image", curFileType == CARD_RAWIMAGE)) {
-                getSettings().backend.cardFileType.setValue(CARD_RAWIMAGE);
-                config::Save();
-            }
-
-            ImGui::EndCombo();
-        }
-
-        ImGui::EndChild();
-    }
-
-    ImGui::SetCursorPosY(endCursorY);
-    ImGui::NewLine();
-
-    ImGui::Separator();
-
-    ImGui::PushFont(ImGuiEngine::fontLarge);
-    if (ImGuiButtonCenter("Back")) {
-        m_CurMenu = 0;
-    }
-    ImGui::PopFont();
-}
-
-}  // namespace dusk
@@ -1,23 +0,0 @@
-#pragma once
-
-namespace dusk {
-class ImGuiPreLaunchWindow {
-private:
-    int m_CurMenu = 0;
-    bool m_IsFirstDraw = true;
-    std::string m_initialGraphicsBackend;
-
-    bool isSelectedPathValid() const;
-
-public:
-    ImGuiPreLaunchWindow();
-    void draw();
-
-    void drawMainMenu();
-    void drawOptions();
-
-    std::string m_selectedIsoPath;
-    std::string m_errorString;
-    bool m_isPal = false;
-};
-}  // namespace dusk
@@ -126,7 +126,9 @@ namespace dusk {
    }

    void ImGuiMenuTools::ShowProcessManager() {
-        if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F2, m_showProcessManagement)) {
+        if (!getSettings().backend.enableAdvancedSettings ||
+            !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F2, m_showProcessManagement))
+        {
            return;
        }

@@ -13,7 +13,6 @@
 #include "d/actor/d_a_player.h"

 #include <map>
-#include <bit>

 namespace dusk {
    enum ItemType {
@@ -1354,38 +1353,30 @@ namespace dusk {
        // genCommonAreaFlags(membit);
    }

-    template <typename T>
-    concept FlagIter = requires(T t) {
-        ++t;
-        --t;
-        t + 1;
-        t < t;
-        { t->flagID } -> std::convertible_to<u16>;
-    };
-
-    template <typename T>
-    concept FlagTester = requires(T t, u16 flagID) {
-        { t(flagID) } -> std::convertible_to<bool>;
-    };
-
-    static void sortByFlags(FlagIter auto begin, FlagIter auto end, FlagTester auto&& flagTester) {
+    template <typename FlagIter, typename FlagTester>
+    requires requires(FlagIter a, FlagTester tester) {
+        --a; ++a; a < a; *a;
+        a + 1;
+        { tester(*a) } -> std::convertible_to<bool>;
+    }
+    static void sortByFlags(FlagIter begin, FlagIter end, FlagTester&& flagTester) {
        if (begin == end) return;

-        FlagIter auto fullEnd = end;
+        auto fullEnd = end;

        // We want to find the location of where we can swap our `On` flags to.
        // We're gonna put the `Off` bits first, and the `On` bits last. 0 < 1
        // We can achieve this by skipping all the `On` bits at the end.

        // backtrack until we find a bit that is off
-        while (begin < --end && flagTester(end->flagID)) {
+        while (begin < --end && flagTester(*end)) {
            // move the end pointer back while we find on bits
        }

        // end should now be pointing to a bit that is off
        while (begin < end) {
            // if there's a flag that's on
-            if (flagTester(begin->flagID)) {
+            if (flagTester(*begin)) {
                // move it to the end
                std::rotate(begin, begin + 1, fullEnd);
                // move back the end of where we're checking
@@ -1401,122 +1392,82 @@ namespace dusk {

    
    static void genAreaFlagTable(uint8_t areaIndex, dSv_memBit_c& membit) {
-        constexpr auto makeMask             = [](uint8_t size) -> uint16_t              { return (1 << size) - 1; };
-        constexpr auto getByteIndexFromFlag = [](uint16_t f) -> uint8_t                 { return f >> 8; };
-        constexpr auto getBitMaskFromFlag   = [](uint16_t f) -> uint8_t                 { return f & 0xff; };
-        constexpr auto getValueSize = [getBitMaskFromFlag](uint16_t f) -> uint8_t {
-            return std::popcount(getBitMaskFromFlag(f));
-        };
-        
-        constexpr auto makeEventFlag = [](uint8_t byteIndex, uint8_t bitIndices) -> uint16_t {
-            return (byteIndex << 8) | bitIndices;
-        };
-
-        const auto eventFlagToAreaFlag = [&](uint16_t areaFlag) -> int {
-            auto byteInd = getByteIndexFromFlag(areaFlag);
-            constexpr size_t areaIndexSize = 5;
-            // if we're looking at 0x580, that would be byte 5, and check if 0x80 is set on that byte
-            // the event flags are structured differently than area flags
-            // B is byte index, b is the flag mask to check
-            // event flags are BBBBBBBB bbbbbbbb
-            // for area flags, they check bitIndex, not mask, i is index
-            // also area uses u32 index, not byte index
-            // area flags are BBBiiiii
-            // so we need to convert from bit mask to index
-            // also our byte index has to become a u32 index
-            
-            // dividing byte index by sizeof(u32) gets us the u32 index
-            // but in big endian, the first byte is the highest order byte of the u32
-            // so we skip 24 bytes for the first byte, 16 for the second, etc
-            // essentially (3 - (x % 4)), reversing the modulus, 0=3, 1=2
-            auto bitsToSkip = 8 * ((sizeof(u32) - 1) - (byteInd % sizeof(u32)));
-            return ((byteInd / sizeof(u32)) << areaIndexSize) | ((std::countr_zero(areaFlag) + bitsToSkip) & makeMask(areaIndexSize));
-        };
-
-        constexpr uint8_t validTbox = sizeof(membit.mTbox);
-        constexpr uint8_t validSwitch = validTbox + sizeof(membit.mSwitch);
-        constexpr uint8_t validItem = validSwitch + sizeof(membit.mItem);
-        constexpr uint16_t tboxConvert = 0;
-        constexpr uint16_t switchConvert = sizeof(membit.mTbox) << 8;
-        constexpr uint16_t itemConvert = switchConvert + (sizeof(membit.mItem) << 8);
-
-        const auto LoadFlag = [&](uint16_t flag) -> bool {            
-            const auto byteIndex = getByteIndexFromFlag(flag);
-
-            if (byteIndex < validTbox) {
-                return membit.isTbox(eventFlagToAreaFlag(flag - tboxConvert));
-            } else if (byteIndex < validSwitch) {
-                return membit.isSwitch(eventFlagToAreaFlag(flag - switchConvert));
-            } else if (byteIndex < validItem) {
-                return membit.isItem(eventFlagToAreaFlag(flag - itemConvert));
+        const auto LoadFlag = [&](const EventAreaFlags& flag) -> bool {
+            switch (flag.flag.type) {
+            case AreaFlagType::Item: {
+                return membit.isItem(flag.flag.flagID);
+            } break;
+            case AreaFlagType::Switch: {
+                return membit.isSwitch(flag.flag.flagID);
+            } break;
+            case AreaFlagType::Tbox: {
+                return membit.isTbox(flag.flag.flagID);
+            } break;
            }
            return false;
        };

-        const auto SetFlag = [&](uint16_t flag, bool set) -> void {
-            const auto byteIndex = getByteIndexFromFlag(flag);
+        const auto SetFlag = [&](const AreaFlagInd& flag, bool set) -> void {
            if (set) {
-                if (byteIndex < validTbox) {
-                    membit.onTbox(eventFlagToAreaFlag(flag - tboxConvert));
-                } else if (byteIndex < validSwitch) {
-                    membit.onSwitch(eventFlagToAreaFlag(flag - switchConvert));
-                } else if (byteIndex < validItem) {
-                    membit.onItem(eventFlagToAreaFlag(flag - itemConvert));
+                switch (flag.type) {
+                case AreaFlagType::Item: {
+                    membit.onItem(flag.flagID);
+                } break;
+                case AreaFlagType::Switch: {
+                    membit.onSwitch(flag.flagID);
+                } break;
+                case AreaFlagType::Tbox: {
+                    membit.onTbox(flag.flagID);
+                } break;
                }
            } else {
-                if (byteIndex < validTbox) {
-                    membit.offTbox(eventFlagToAreaFlag(flag - tboxConvert));
-                } else if (byteIndex < validSwitch) {
-                    membit.offSwitch(eventFlagToAreaFlag(flag - switchConvert));
-                } else if (byteIndex < validItem) {
-                    membit.offItem(eventFlagToAreaFlag(flag - itemConvert));
+                switch (flag.type) {
+                case AreaFlagType::Item: {
+                    membit.offItem(flag.flagID);
+                } break;
+                case AreaFlagType::Switch: {
+                    membit.offSwitch(flag.flagID);
+                } break;
+                case AreaFlagType::Tbox: {
+                    membit.offTbox(flag.flagID);
+                } break;
                }
            }
        };

-        const auto LoadMultiByteFlag = [&](uint16_t flag) -> uint8_t {
-            const auto bitInds = getBitMaskFromFlag(flag);
-            const auto byteIndex = getByteIndexFromFlag(flag);
-
-            const uint16_t startingMask = std::bit_floor(bitInds);
-            uint8_t val = 0;
-            for (uint16_t bitIndexMask = startingMask; (bitInds & bitIndexMask) != 0;
-                 bitIndexMask >>= 1)
-            {
-                val <<= 1;
-                if (LoadFlag(makeEventFlag(byteIndex, bitInds & bitIndexMask))) {
-                    val |= 1;
-                }
+        const auto LoadMultiByteFlag = [&](const AreaFlagMultibit& flag) -> uint8_t {
+            BE(u32)* areaFlags = nullptr;
+            switch (flag.type) {
+            case AreaFlagType::Item: {
+                areaFlags = membit.mItem;
+            } break;
+            case AreaFlagType::Switch: {
+                areaFlags = membit.mSwitch;
+            } break;
+            case AreaFlagType::Tbox: {
+                areaFlags = membit.mTbox;
+            } break;
            }
-            return val;
+            assert(areaFlags != nullptr);
+            return (areaFlags[flag.index] & flag.mask) >> flag.shift;
        };

-        const auto SetMultiByteFlag = [&](uint16_t flag, uint8_t val) -> void {
-            const auto bitInds = getBitMaskFromFlag(flag);
-            const auto byteIndex = getByteIndexFromFlag(flag);
-
-            const uint16_t startingMask = std::bit_floor(bitInds);
-            uint16_t valueMask = 1 << (getValueSize(flag) - 1);
-
-            for (uint16_t bitIndexMask = startingMask; (bitInds & bitIndexMask) != 0;
-                 bitIndexMask >>= 1, valueMask >>= 1)
-            {
-                SetFlag(makeEventFlag(byteIndex, bitInds & bitIndexMask), (val & valueMask) != 0);
+        const auto SetMultiByteFlag = [&](const AreaFlagMultibit& flag, uint8_t val) -> void {
+            BE(u32)* areaFlags = nullptr;
+            switch (flag.type) {
+            case AreaFlagType::Item: {
+                areaFlags = membit.mItem;
+            } break;
+            case AreaFlagType::Switch: {
+                areaFlags = membit.mSwitch;
+            } break;
+            case AreaFlagType::Tbox: {
+                areaFlags = membit.mTbox;
+            } break;
            }
-        };

-        const auto LoadSpreadMultiByte = [&](uint16_t high, uint16_t low) -> uint8_t {
-            if (low == AREA_FLAG_NONE)
-                return LoadMultiByteFlag(high);
-            return (LoadMultiByteFlag(high) << getValueSize(low)) | LoadMultiByteFlag(low);
-        };
-
-        const auto SetSpreadMultiByte = [&](uint16_t high, uint16_t low, uint8_t value) -> void {
-            if (low == AREA_FLAG_NONE)
-                return SetMultiByteFlag(high, value);
-            const auto lowerSize = getValueSize(low);
-            SetMultiByteFlag(high, value >> lowerSize);
-            SetMultiByteFlag(low, value & makeMask(lowerSize));
+            areaFlags[flag.index] &= ~flag.mask;
+            areaFlags[flag.index] |= (val << flag.shift) & flag.mask;
        };

        auto iter = imguiAreaFlagLookup.find(areaIndex);
@@ -1568,7 +1519,7 @@ namespace dusk {
                        case COLUMN_DESC:
                            return l.description < r.description;
                        case COLUMN_BIT:
-                            return l.flagID < r.flagID;
+                            return l.GetFlagID() < r.GetFlagID();
                        }
                        return false;
                    };
@@ -1597,9 +1548,9 @@ namespace dusk {

                ImGui::TableNextRow();
                ImGui::TableNextColumn();
-                bool flag = LoadFlag(e.flagID);
-                if (ImGui::Checkbox(fmt::format("##_unused_area_flag_{}", e.flagID).c_str(), &flag)) {
-                    SetFlag(e.flagID, flag);
+                bool flag = LoadFlag(e);
+                if (ImGui::Checkbox(fmt::format("##_unused_area_flag_{}", e.flag.flagID).c_str(), &flag)) {
+                    SetFlag(e.flag, flag);
                }

                ImGui::TableNextColumn();
@@ -1611,7 +1562,7 @@ namespace dusk {
        }

        for (const auto& multiByteFlag : areaFlags.multibyteFlags) {
-            auto flagValue = LoadSpreadMultiByte(multiByteFlag.highOrderflag, multiByteFlag.lowOrderflag); 
+            auto flagValue = LoadMultiByteFlag(multiByteFlag.flag);

            const char* currentVal = "UNKNOWN";

@@ -1623,7 +1574,7 @@ namespace dusk {
            if (ImGui::BeginCombo(multiByteFlag.name, currentVal)) {
                for (const auto& [val, name] : multiByteFlag.enumValues) {
                    if (ImGui::Selectable(name)) {
-                        SetSpreadMultiByte(multiByteFlag.highOrderflag, multiByteFlag.lowOrderflag, val);
+                        SetMultiByteFlag(multiByteFlag.flag, val);
                    }
                }
                ImGui::EndCombo();
@@ -1756,7 +1707,9 @@ namespace dusk {
                    // if we're sorting by flags, do special sort, regular sort is bad for sorting bools
                    // it can swap values that are the same, and that causes constant reordering
                    if (column == COLUMN_FLAG) {
-                        const auto testEventFunc = [&event](u16 flag) -> bool { return event.isEventBit(flag); };
+                        const auto testEventFunc = [&event](const duskImguiEventFlagEntry& flag) -> bool {
+                            return event.isEventBit(flag.flagID);
+                        };

                        if (direction == ImGuiSortDirection_Ascending) {
                            sortByFlags(std::begin(duskImguiEventFlags),
@@ -417,7 +417,9 @@ void ImGuiStateShare::draw(bool& open) {
 }

 void ImGuiMenuTools::ShowStateShare() {
-    if (!ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F8, m_showStateShare)) {
+    if (!getSettings().backend.enableAdvancedSettings ||
+        !ImGuiConsole::CheckMenuViewToggle(ImGuiKey_F8, m_showStateShare))
+    {
        return;
    }
    m_stateShare.draw(m_showStateShare);
@@ -1,49 +1,99 @@
 #include "iso_validate.hpp"

+#include <SDL3/SDL_iostream.h>
 #include <nod.h>
-#include <span>
+#include <xxhash.h>

-#include "SDL3/SDL_iostream.h"
+#include <array>
+#include <memory>
+#include <stdexcept>
+#include <string_view>
+
+namespace {
+
+constexpr uint8_t hex_nibble_to_u8(char c) {
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    if (c >= 'A' && c <= 'F')
+        return c - 'A' + 10;
+    throw std::invalid_argument("invalid hex character");
+}
+
+constexpr uint64_t parse_u64_hex(std::string_view s) {
+    if (s.size() != 16)
+        throw std::invalid_argument("expected 16 hex chars for uint64");
+
+    uint64_t value = 0;
+    for (char c : s) {
+        value = (value << 4) | hex_nibble_to_u8(c);
+    }
+    return value;
+}
+
+constexpr XXH128_hash_t parse_xxh128(std::string_view hex) {
+    if (hex.size() != 32)
+        throw std::invalid_argument("expected 32 hex chars for XXH128");
+
+    return XXH128_hash_t{
+        .low64 = parse_u64_hex(hex.substr(16, 16)),
+        .high64 = parse_u64_hex(hex.substr(0, 16)),
+    };
+}
+
+}  // namespace

 namespace dusk::iso {

-constexpr const char* TP_GAME_IDS[] = {
-    "GZ2E01", // GCN USA
-    "GZ2P01", // GCN PAL
-    "GZ2J01", // GCN JPN
-    "RZDE01", // Wii USA
-    "RZDP01", // Wii PAL
-    "RZDJ01", // Wii JPN
-    "RZDK01", // Wii KOR
+enum class Platform : u8 {
+    GameCube,
+    Wii,
 };

-constexpr const char* PAL_GAME_IDS[] = {
-    "GZ2P01", // GCN PAL
-    "RZDP01", // Wii PAL
+enum class Region : u8 {
+    NorthAmerica,
+    Europe,
+    Japan,
+    Korea,
 };

-constexpr const char* SUPPORTED_TP_GAME_IDS[] = {
-    "GZ2E01", // GCN USA
-    "GZ2P01", // GCN PAL
+struct KnownDisc {
+    std::string_view id;
+    Platform platform;
+    Region region;
+    bool supported = false;
+    XXH128_hash_t hash{};
+
+    constexpr KnownDisc(std::string_view id, Platform platform, Region region)
+        : id(id), platform(platform), region(region) {}
+    constexpr KnownDisc(
+        std::string_view id, Platform platform, Region region, const std::string_view hash)
+        : id(id), platform(platform), region(region), supported(true), hash(parse_xxh128(hash)) {}
 };

-template <size_t N>
-constexpr bool matches(const char (&id)[6], const char* const (&valid)[N]) {
-    for (auto elem : valid) {
-        if (strncmp(id, elem, 6) == 0) {
-            return true;
-        }
+constexpr auto KNOWN_DISCS = std::to_array<KnownDisc>({
+    {"GZ2E01", Platform::GameCube, Region::NorthAmerica, "14e886f08e548a000afde98a3195e788"},
+    {"GZ2J01", Platform::GameCube, Region::Japan},
+    {"GZ2P01", Platform::GameCube, Region::Europe, "9ef597588b0035ca9e91b333fa9a8a7e"},
+    {"RZDE01", Platform::Wii, Region::NorthAmerica},
+    {"RZDJ01", Platform::Wii, Region::Japan},
+    {"RZDK01", Platform::Wii, Region::Korea},
+    {"RZDP01", Platform::Wii, Region::Europe},
+});
+
+constexpr const KnownDisc* find_disc(std::string_view id) {
+    for (const auto& disc : KNOWN_DISCS) {
+        if (disc.id == id)
+            return &disc;
    }
-
-    return false;
+    return nullptr;
 }

 struct NodHandleWrapper {
    NodHandle* handle;

-    NodHandleWrapper() : handle(nullptr) {
-    }
-
+    NodHandleWrapper() : handle(nullptr) {}
    ~NodHandleWrapper() {
        if (handle != nullptr) {
            nod_free(handle);
@@ -52,7 +102,7 @@ struct NodHandleWrapper {
    }
 };

-static ValidationError convertNodError(NodResult result) {
+static ValidationError convert_nod_error(NodResult result) {
    switch (result) {
    case NOD_RESULT_ERR_IO:
        return ValidationError::IOError;
@@ -67,96 +117,135 @@ s64 StreamReadAt(void* user_data, u64 offset, void* out, size_t len) {
    if (len == 0) {
        return 0;
    }
-
-    auto io = static_cast<SDL_IOStream*>(user_data);
-
-    auto ret = SDL_SeekIO(io, static_cast<s64>(offset), SDL_IO_SEEK_SET);
+    auto* io = static_cast<SDL_IOStream*>(user_data);
+    const auto ret = SDL_SeekIO(io, static_cast<s64>(offset), SDL_IO_SEEK_SET);
    if (ret < 0) {
        return -1;
    }
-
-    auto read = SDL_ReadIO(io, out, len);
+    const auto read = SDL_ReadIO(io, out, len);
    if (read == 0) {
        if (SDL_GetIOStatus(io) == SDL_IO_STATUS_EOF) {
            return 0;
        }
-
        return -1;
    }
-
    return static_cast<s64>(read);
 }

 s64 StreamLength(void* user_data) {
-    auto io = static_cast<SDL_IOStream*>(user_data);
-    return SDL_GetIOSize(io);
+    return SDL_GetIOSize(static_cast<SDL_IOStream*>(user_data));
 }

 void StreamClose(void* user_data) {
-    auto io = static_cast<SDL_IOStream*>(user_data);
-    SDL_CloseIO(io);
+    SDL_CloseIO(static_cast<SDL_IOStream*>(user_data));
 }

-ValidationError validate(const char* path) {
-    NodHandleWrapper disc;
+ValidationError verify_disc(NodHandle* disc, VerificationStatus& status) {
+    std::unique_ptr<XXH3_state_t, decltype(&XXH3_freeState)> hashState(
+        XXH3_createState(), XXH3_freeState);
+    if (!hashState) {
+        return ValidationError::Unknown;
+    }
+    XXH3_128bits_reset(hashState.get());

+    while (true) {
+        if (status.shouldCancel.load(std::memory_order_relaxed)) {
+            return ValidationError::Canceled;
+        }
+
+        size_t bytesAvail;
+        const auto buf = nod_buf_read(disc, &bytesAvail);
+        if (!bytesAvail)
+            break;
+
+        XXH3_128bits_update(hashState.get(), buf, bytesAvail);
+
+        status.bytesRead.fetch_add(bytesAvail, std::memory_order_relaxed);
+        nod_buf_consume(disc, bytesAvail);
+    }
+
+    const auto hash = XXH3_128bits_digest(hashState.get());
+    if (!XXH128_isEqual(hash, status.knownDisc->hash)) {
+        return ValidationError::HashMismatch;
+    }
+    return ValidationError::Success;
+}
+
+ValidationError validate(const char* path, VerificationStatus& status, DiscInfo& info) {
    const auto sdlStream = SDL_IOFromFile(path, "rb");
    if (sdlStream == nullptr) {
        return ValidationError::IOError;
    }

-    const NodDiscStream nod_stream {
-        .user_data = sdlStream,
-        .read_at = StreamReadAt,
-        .stream_len = StreamLength,
-        .close = StreamClose,
-    };
-
-    auto result = nod_disc_open_stream(&nod_stream, nullptr, &disc.handle);
-    if (disc.handle == nullptr || result != NOD_RESULT_OK) {
-        return convertNodError(result);
-    }
-
-    NodDiscHeader header{};
-    result = nod_disc_header(disc.handle, &header);
-    if (result != NOD_RESULT_OK) {
-        return convertNodError(result);
-    }
-
-    if (!matches(header.game_id, TP_GAME_IDS)) {
-        return ValidationError::WrongGame;
-    }
-
-    if (!matches(header.game_id, SUPPORTED_TP_GAME_IDS)) {
-        return ValidationError::WrongVersion;
-    }
-
-    return ValidationError::Success;
-}
-bool isPal(const char* path) {
    NodHandleWrapper disc;
-
-    const auto sdlStream = SDL_IOFromFile(path, "rb");
-    if (sdlStream == nullptr) {
-        return false;
-    }
-
    const NodDiscStream nod_stream{
        .user_data = sdlStream,
        .read_at = StreamReadAt,
        .stream_len = StreamLength,
        .close = StreamClose,
    };
+    auto result = nod_disc_open_stream(&nod_stream, nullptr, &disc.handle);
+    if (disc.handle == nullptr || result != NOD_RESULT_OK) {
+        return convert_nod_error(result);
+    }

-    if (nod_disc_open_stream(&nod_stream, nullptr, &disc.handle) != NOD_RESULT_OK || disc.handle == nullptr) {
-        return false;
+    status.bytesTotal.store(nod_disc_size(disc.handle), std::memory_order_relaxed);
+
+    NodDiscHeader header{};
+    result = nod_disc_header(disc.handle, &header);
+    if (result != NOD_RESULT_OK) {
+        return convert_nod_error(result);
+    }
+
+    const auto knownDisc = find_disc(std::string_view(header.game_id, 6));
+    if (!knownDisc) {
+        return ValidationError::WrongGame;
+    }
+    status.knownDisc = knownDisc;
+    info.isPal = knownDisc->region == Region::Europe;
+    if (!knownDisc->supported) {
+        return ValidationError::WrongVersion;
+    }
+    return verify_disc(disc.handle, status);
+}
+
+ValidationError inspect(const char* path, DiscInfo& info) {
+    const auto sdlStream = SDL_IOFromFile(path, "rb");
+    if (sdlStream == nullptr) {
+        return ValidationError::IOError;
+    }
+
+    NodHandleWrapper disc;
+    const NodDiscStream nod_stream{
+        .user_data = sdlStream,
+        .read_at = StreamReadAt,
+        .stream_len = StreamLength,
+        .close = StreamClose,
+    };
+    auto result = nod_disc_open_stream(&nod_stream, nullptr, &disc.handle);
+    if (disc.handle == nullptr || result != NOD_RESULT_OK) {
+        return convert_nod_error(result);
    }

    NodDiscHeader header{};
-    if (nod_disc_header(disc.handle, &header) != NOD_RESULT_OK) {
-        return false;
+    result = nod_disc_header(disc.handle, &header);
+    if (result != NOD_RESULT_OK) {
+        return convert_nod_error(result);
    }

-    return matches(header.game_id, PAL_GAME_IDS);
+    const auto knownDisc = find_disc(std::string_view(header.game_id, 6));
+    if (!knownDisc) {
+        return ValidationError::WrongGame;
+    }
+    info.isPal = knownDisc->region == Region::Europe;
+    if (!knownDisc->supported) {
+        return ValidationError::WrongVersion;
+    }
+    return ValidationError::Success;
 }
-}  // namespace dusk::iso
+
+bool isPal(const char* path) {
+    DiscInfo info{};
+    return inspect(path, info) == ValidationError::Success && info.isPal;
+}
+}  // namespace dusk::iso
@@ -1,19 +1,37 @@
 #ifndef DUSK_ISO_VALIDATE_HPP
 #define DUSK_ISO_VALIDATE_HPP

-namespace dusk::iso {
-    enum class ValidationError : u8 {
-        Success = 0,
-        IOError,
-        InvalidImage,
-        WrongGame,
-        WrongVersion,
-        ExecutableMismatch,
-        Unknown
-    };
+#include <atomic>

-    ValidationError validate(const char* path);
-    bool isPal(const char* path);
-}
+namespace dusk::iso {
+struct KnownDisc;
+
+enum class ValidationError : u8 {
+    Unknown = 0,
+    IOError,
+    InvalidImage,
+    WrongGame,
+    WrongVersion,
+    Canceled,
+    HashMismatch,
+    Success
+};
+
+struct VerificationStatus {
+    std::atomic_size_t bytesRead = 0;
+    std::atomic_size_t bytesTotal = 0;
+    const KnownDisc* knownDisc = nullptr;
+    std::atomic_bool shouldCancel = false;
+};
+
+struct DiscInfo {
+    bool isPal = false;
+};
+
+ValidationError inspect(const char* path, DiscInfo& info);
+ValidationError validate(const char* path, VerificationStatus& status, DiscInfo& info);
+bool isPal(const char* path);
+
+}  // namespace dusk::iso

 #endif  // DUSK_ISO_VALIDATE_HPP
@@ -5,17 +5,110 @@
 #endif

 #include <aurora/main.h>
+#include "dusk/main.h"

+#include <algorithm>
+#include <array>
+#include <cerrno>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
+#include <filesystem>
 #include <string>
 #include <string_view>
 #include <vector>

+#if !defined(_WIN32)
+#include <unistd.h>
+#if defined(__APPLE__)
+#include <mach-o/dyld.h>
+#endif
+#endif
+
 int game_main(int argc, char* argv[]);

 namespace {

+bool RestartProcess(int argc, char* argv[]) {
+#if defined(__ANDROID__) || (defined(TARGET_OS_IOS) && TARGET_OS_IOS) ||                           \
+    (defined(TARGET_OS_TV) && TARGET_OS_TV)
+    (void)argc;
+    (void)argv;
+    return false;
+#elif _WIN32
+    std::wstring commandLine = GetCommandLineW();
+    STARTUPINFOW startupInfo{};
+    startupInfo.cb = sizeof(startupInfo);
+    PROCESS_INFORMATION processInfo{};
+    if (!CreateProcessW(nullptr, commandLine.data(), nullptr, nullptr, FALSE, 0, nullptr, nullptr,
+            &startupInfo, &processInfo))
+    {
+        fprintf(stderr, "Failed to restart Dusk: CreateProcessW error %lu\n", GetLastError());
+        return false;
+    }
+
+    CloseHandle(processInfo.hThread);
+    CloseHandle(processInfo.hProcess);
+    return true;
+#else
+    std::filesystem::path executablePath;
+
+#if defined(__APPLE__)
+    uint32_t pathSize = 0;
+    _NSGetExecutablePath(nullptr, &pathSize);
+    if (pathSize > 0) {
+        std::string path(pathSize, '\0');
+        if (_NSGetExecutablePath(path.data(), &pathSize) == 0) {
+            path.resize(std::strlen(path.c_str()));
+            std::error_code ec;
+            executablePath = std::filesystem::weakly_canonical(path, ec);
+            if (ec) {
+                executablePath = path;
+            }
+        }
+    }
+#elif defined(__linux__)
+    std::array<char, 4096> path{};
+    const ssize_t len = readlink("/proc/self/exe", path.data(), path.size() - 1);
+    if (len > 0) {
+        path[static_cast<size_t>(len)] = '\0';
+        executablePath = path.data();
+    }
+#endif
+
+    if (executablePath.empty() && argc > 0 && argv[0] != nullptr && argv[0][0] != '\0') {
+        std::error_code ec;
+        executablePath = std::filesystem::absolute(argv[0], ec);
+        if (ec) {
+            executablePath = argv[0];
+        }
+    }
+
+    if (executablePath.empty()) {
+        fprintf(stderr, "Failed to restart Dusk: unable to resolve executable path\n");
+        return false;
+    }
+
+    std::vector<std::string> args;
+    args.reserve(static_cast<size_t>(std::max(argc, 1)));
+    args.push_back(executablePath.string());
+    for (int i = 1; i < argc; ++i) {
+        args.emplace_back(argv[i] != nullptr ? argv[i] : "");
+    }
+
+    std::vector<char*> execArgv;
+    execArgv.reserve(args.size() + 1);
+    for (auto& arg : args) {
+        execArgv.push_back(arg.data());
+    }
+    execArgv.push_back(nullptr);
+
+    execv(executablePath.c_str(), execArgv.data());
+    fprintf(stderr, "Failed to restart Dusk: execv failed: %s\n", std::strerror(errno));
+    return false;
+#endif
+}
+
 #if _WIN32
 bool ShouldShowWindowsConsole(int argc, char* argv[]) {
    if (const auto* env = std::getenv("DUSK_CONSOLE")) {
@@ -53,19 +146,25 @@ void WindowsSetupConsole(bool showConsole) {
    SetConsoleOutputCP(CP_UTF8);

    if (const HANDLE stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE);
-        stdoutHandle != INVALID_HANDLE_VALUE && stdoutHandle != nullptr) {
+        stdoutHandle != INVALID_HANDLE_VALUE && stdoutHandle != nullptr)
+    {
        DWORD consoleMode = 0;
        if (GetConsoleMode(stdoutHandle, &consoleMode)) {
            SetConsoleMode(stdoutHandle,
-                           consoleMode | ENABLE_PROCESSED_OUTPUT
-                                             | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+                consoleMode | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
        }
    }
 }

 int DuskMain(int argc, char* argv[]) {
    WindowsSetupConsole(ShouldShowWindowsConsole(argc, argv));
-    return game_main(argc, argv);
+    const int result = game_main(argc, argv);
+    if constexpr (dusk::SupportsProcessRestart) {
+        if (dusk::RestartRequested) {
+            return RestartProcess(argc, argv) ? 0 : result;
+        }
+    }
+    return result;
 }

 std::vector<std::string> WideArgsToUtf8(int argc, wchar_t** argv) {
@@ -81,8 +180,8 @@ std::vector<std::string> WideArgsToUtf8(int argc, wchar_t** argv) {
        }

        std::vector<char> utf8Buffer(static_cast<size_t>(requiredSize));
-        WideCharToMultiByte(CP_UTF8, 0, argv[i], -1, utf8Buffer.data(), requiredSize, nullptr,
-                            nullptr);
+        WideCharToMultiByte(
+            CP_UTF8, 0, argv[i], -1, utf8Buffer.data(), requiredSize, nullptr, nullptr);
        utf8Args.emplace_back(utf8Buffer.data());
    }

@@ -109,7 +208,11 @@ int RunWindowsGuiEntryPoint() {
 }
 #else
 int DuskMain(int argc, char* argv[]) {
-    return game_main(argc, argv);
+    const int result = game_main(argc, argv);
+    if (dusk::RestartRequested && RestartProcess(argc, argv)) {
+        return 0;
+    }
+    return result;
 }
 #endif

@@ -8,6 +8,8 @@ UserSettings g_userSettings = {
        .enableFullscreen {"video.enableFullscreen", false},
        .enableVsync {"video.enableVsync", true},
        .lockAspectRatio {"video.lockAspectRatio", false},
+        .enableFpsOverlay {"game.enableFpsOverlay", false},
+        .fpsOverlayCorner {"game.fpsOverlayCorner", 0},
    },

    .audio = {
@@ -18,6 +20,7 @@ UserSettings g_userSettings = {
        .fanfareVolume {"audio.fanfareVolume", 100},
        .enableReverb {"audio.enableReverb", true},
        .enableHrtf {"audio.enableHrtf", false},
+        .menuSounds {"audio.menuSounds", true},
    },

    .game = {
@@ -25,8 +28,7 @@ UserSettings g_userSettings = {

        // Quality of Life
        .enableQuickTransform {"game.enableQuickTransform", false},
-        .hideTvSettingsScreen {"game.hideTvSettingsScreen", false},
-        .skipWarningScreen {"game.skipWarningScreen", false},
+        .hideTvSettingsScreen {"game.hideTvSettingsScreen", true},
        .biggerWallets {"game.biggerWallets", false},
        .noReturnRupees {"game.noReturnRupees", false},
        .disableRupeeCutscenes {"game.disableRupeeCutscenes", false},
@@ -45,13 +47,13 @@ UserSettings g_userSettings = {

        // Preferences
        .enableMirrorMode {"game.enableMirrorMode", false},
-        .disableMainHUD {"game.disableMainHUD", false},
+        .minimalHUD {"game.minimalHUD", false},
        .pauseOnFocusLost {"game.pauseOnFocusLost", false},
-        .enableLinkDollRotation = {"game.enableLinkDollRotation", false },
-        .enableAchievementNotifications {"game.enableAchievementNotifications", false},
+        .enableLinkDollRotation {"game.enableLinkDollRotation", false},
+        .enableAchievementNotifications {"game.enableAchievementNotifications", true},

        // Graphics
-        .bloomMode {"game.bloomMode", BloomMode::Classic},
+        .bloomMode {"game.bloomMode", BloomMode::Dusk},
        .bloomMultiplier {"game.bloomMultiplier", 1.0f},
        .disableWaterRefraction {"game.disableWaterRefraction", false},
        .enableFrameInterpolation {"game.enableFrameInterpolation", false},
@@ -78,18 +80,20 @@ UserSettings g_userSettings = {
        .invertCameraXAxis {"game.invertCameraXAxis", false},
        .invertCameraYAxis {"game.invertCameraYAxis", false},
        .freeCameraSensitivity {"game.freeCameraSensitivity", 1.0f},
+        .debugFlyCam {"game.debugFlyCam", false},
+        .debugFlyCamLockEvents {"game.debugFlyCamLockEvents", true},

        // Cheats
        .infiniteHearts {"game.infiniteHearts", false},
-        .infiniteArrows{"game.infiniteArrows", false},
-        .infiniteBombs{"game.infiniteBombs", false},
-        .infiniteOil{"game.infiniteOil", false},
-        .infiniteOxygen{"game.infiniteOxygen", false},
-        .infiniteRupees{"game.infiniteRupees", false},
+        .infiniteArrows {"game.infiniteArrows", false},
+        .infiniteBombs {"game.infiniteBombs", false},
+        .infiniteOil {"game.infiniteOil", false},
+        .infiniteOxygen {"game.infiniteOxygen", false},
+        .infiniteRupees {"game.infiniteRupees", false},
        .enableIndefiniteItemDrops {"game.enableIndefiniteItemDrops", false},
-        .moonJump{"game.moonJump", false},
-        .superClawshot{"game.superClawshot", false},
-        .alwaysGreatspin{"game.alwaysGreatspin", false},
+        .moonJump {"game.moonJump", false},
+        .superClawshot {"game.superClawshot", false},
+        .alwaysGreatspin {"game.alwaysGreatspin", false},
        .enableFastIronBoots {"game.enableFastIronBoots", false},
        .canTransformAnywhere {"game.canTransformAnywhere", false},
        .fastSpinner {"game.fastSpinner", false},
@@ -103,18 +107,20 @@ UserSettings g_userSettings = {

        // Tools
        .speedrunMode {"game.speedrunMode", false},
-        .liveSplitEnabled {"game.liveSplitEnabled", false}
+        .liveSplitEnabled {"game.liveSplitEnabled", false},
+        .recordingMode {"game.recordingMode", false}
    },

    .backend = {
        .isoPath {"backend.isoPath", ""},
+        .isoVerification {"backend.isoVerification", DiscVerificationState::Unknown},
        .graphicsBackend {"backend.graphicsBackend", "auto"},
        .skipPreLaunchUI {"backend.skipPreLaunchUI", false},
        .showPipelineCompilation {"backend.showPipelineCompilation", false},
        .wasPresetChosen {"backend.wasPresetChosen", false},
        .enableCrashReporting {"backend.enableCrashReporting", true},
-        .duskMenuOpen {"backend.duskMenuOpen", false},
-        .cardFileType {"backend.cardFileType", static_cast<int>(CARD_GCIFOLDER)}
+        .cardFileType {"backend.cardFileType", static_cast<int>(CARD_GCIFOLDER)},
+        .enableAdvancedSettings {"backend.enableAdvancedSettings", false},
    }
 };

@@ -127,6 +133,8 @@ void registerSettings() {
    Register(g_userSettings.video.enableFullscreen);
    Register(g_userSettings.video.enableVsync);
    Register(g_userSettings.video.lockAspectRatio);
+    Register(g_userSettings.video.enableFpsOverlay);
+    Register(g_userSettings.video.fpsOverlayCorner);

    // Audio
    Register(g_userSettings.audio.masterVolume);
@@ -136,12 +144,12 @@ void registerSettings() {
    Register(g_userSettings.audio.fanfareVolume);
    Register(g_userSettings.audio.enableReverb);
    Register(g_userSettings.audio.enableHrtf);
+    Register(g_userSettings.audio.menuSounds);

    // Game
    Register(g_userSettings.game.language);
    Register(g_userSettings.game.enableQuickTransform);
    Register(g_userSettings.game.hideTvSettingsScreen);
-    Register(g_userSettings.game.skipWarningScreen);
    Register(g_userSettings.game.biggerWallets);
    Register(g_userSettings.game.noReturnRupees);
    Register(g_userSettings.game.disableRupeeCutscenes);
@@ -160,7 +168,7 @@ void registerSettings() {
    Register(g_userSettings.game.invertCameraXAxis);
    Register(g_userSettings.game.invertCameraYAxis);
    Register(g_userSettings.game.freeCameraSensitivity);
-    Register(g_userSettings.game.disableMainHUD);
+    Register(g_userSettings.game.minimalHUD);
    Register(g_userSettings.game.pauseOnFocusLost);
    Register(g_userSettings.game.bloomMode);
    Register(g_userSettings.game.bloomMultiplier);
@@ -181,6 +189,7 @@ void registerSettings() {
    Register(g_userSettings.game.enableTurboKeybind);
    Register(g_userSettings.game.speedrunMode);
    Register(g_userSettings.game.liveSplitEnabled);
+    Register(g_userSettings.game.recordingMode);
    Register(g_userSettings.game.fastSpinner);
    Register(g_userSettings.game.infiniteHearts);
    Register(g_userSettings.game.infiniteArrows);
@@ -203,15 +212,18 @@ void registerSettings() {
    Register(g_userSettings.game.gyroInvertPitch);
    Register(g_userSettings.game.gyroInvertYaw);
    Register(g_userSettings.game.freeCamera);
+    Register(g_userSettings.game.debugFlyCam);
+    Register(g_userSettings.game.debugFlyCamLockEvents);

    Register(g_userSettings.backend.isoPath);
+    Register(g_userSettings.backend.isoVerification);
    Register(g_userSettings.backend.graphicsBackend);
    Register(g_userSettings.backend.skipPreLaunchUI);
    Register(g_userSettings.backend.showPipelineCompilation);
    Register(g_userSettings.backend.wasPresetChosen);
    Register(g_userSettings.backend.enableCrashReporting);
-    Register(g_userSettings.backend.duskMenuOpen);
    Register(g_userSettings.backend.cardFileType);
+    Register(g_userSettings.backend.enableAdvancedSettings);
 }

 // Transient settings
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
MelonSpeedruns	1c1a849095	Recording Mode & Enable Autosave in Dusk preset (#685 ) * branch for recording without a HUD * no more black bars thanks maddie * Backslash hotkey * mute music * dont check for null twice * renamed option to recording mode, and added it to the rmlui menu * Move recording mode to Interface * re-added & renamed minimal hud option * Mute all BGM if recording mode is on * Update Interface section * Un-experimentalize Autosave & enable in Dusk preset --------- Co-authored-by: MelonSpeedruns <melonspeedruns@stratobox.net> Co-authored-by: Irastris <irastris15@gmail.com> Co-authored-by: Luke Street <luke@street.dev>	2026-05-07 23:26:22 -06:00
Phillip Stephens	89d393e57a	Add missing climits include	2026-05-07 22:24:31 -07:00
Phillip Stephens	2f27687d80	Fix OSReport strings corruption with non-trivial format (#709 ) * Fix OSReport strings corruption with non-trivial format * Limit format attempts to 3	2026-05-07 23:10:23 -06:00
SuperDude88	167a50c01d	Deselect Sub-Menu On Focus Change (#710 ) - Unselect any previous items when focusing a new one This might be way over-inclusive so it should be scrutinized harshly (but fixes #672)	2026-05-07 23:09:25 -06:00
SuperDude88	313f03f5e5	Dim Carousel Arrows - Dim carousel arrows if there are no further options in that direction (closes #708) This sets the color property constantly, not sure if that is a concern for perf (would imagine not since it already sets the rml to mValueElem every frame also?)	2026-05-07 23:05:08 -06:00
Howard Luck	6cfdc3d8a3	add keyboard controls + roll support to fly cam (#705 )	2026-05-07 23:04:29 -06:00
Luke Street	9c24a0bc4b	Disable Development Mode & move Input Viewer Resolves #712	2026-05-07 23:03:26 -06:00
TakaRikka	b99ad920c4	Merge pull request #704 from TwilitRealm/ira/rmlui-confirmation Add confirmations modals to Reset and Quit	2026-05-07 13:57:03 -07:00
TakaRikka	912b18eca1	Merge pull request #703 from TwilitRealm/ui/advanced-settings Advanced Settings	2026-05-07 13:55:13 -07:00
TakaRikka	9e651a51db	Merge pull request #700 from TwilitRealm/ira/rmlui-fps Add FPS counter to RmlUi	2026-05-07 13:51:51 -07:00
TakaRikka	c8b6e997a7	Merge pull request #702 from TwilitRealm/ira/rmlui-inputconfig Add remaining controller config options to RmlUi	2026-05-07 13:45:35 -07:00
Irastris	928e187524	Add mobile layout for prelaunch	2026-05-07 15:57:52 -04:00
Irastris	cf12d19860	Resolve RmlUi deprecation warning, add L1/R1 tabbing to MenuBar	2026-05-07 13:48:12 -04:00
Irastris	e3a3ac56fb	Add confirmations modals to Reset and Quit	2026-05-07 13:32:59 -04:00
MelonSpeedruns	d15ed81cd5	Only show Editor if Advanced Settings is enabled	2026-05-07 12:39:37 -04:00
TakaRikka	ff054f6f47	update aurora and enable MTX_USE_PS	2026-05-07 09:36:32 -07:00
MelonSpeedruns	667cf70fa0	Add Advanced Settings option & Disable debug hotkeys if it's off	2026-05-07 12:01:32 -04:00
Irastris	73eb401c93	Add remaining controller config options, remove ImGui config	2026-05-07 12:00:35 -04:00
Irastris	b11f3add06	Don't immediately dismiss prelaunch if skip config is toggled Prevents a situation where memcard is not init until restarting after the deferral change	2026-05-07 09:26:41 -04:00
Irastris	92f888a152	Remove blur and shadow from counter, consolidate options	2026-05-07 03:28:30 -04:00
Irastris	78ed5cc716	Add FPS counter	2026-05-07 03:13:08 -04:00
Luke Street	3968b67c5d	Disc verification cleanup	2026-05-07 00:35:00 -06:00
Luke Street	119830c979	Merge pull request #695 from TwilitRealm/hash-verif Hash verification for disc images	2026-05-06 23:41:57 -06:00
Luke Street	647394c875	Don't hash on startup & cleanup	2026-05-06 23:33:55 -06:00
Luke Street	c50d777309	Progress modal & persist validation state	2026-05-06 23:21:43 -06:00
Luke Street	4954685cca	Merge branch 'main' into hash-verif	2026-05-06 22:09:20 -06:00
qwertyquerty	39d43a8d8f	Keyboard mouse binding controls (#682 ) * kbm controls * submodule * files.cmake * a * Fixes * include <cstring> in J3DStruct.h --------- Co-authored-by: Luke Street <luke@street.dev>	2026-05-06 22:07:28 -06:00
TakaRikka	b4761cc54e	fix build	2026-05-06 20:36:21 -07:00
qwertyquerty	9aee2e9cfe	PS math accuracy (#654 ) * math accuracy * submodule * Update aurora --------- Co-authored-by: Luke Street <luke@street.dev>	2026-05-06 21:22:59 -06:00
Luke Street	7c7c8b228e	Crafty's crafty Dungeon door hack	2026-05-06 19:53:18 -06:00
doop	ca7714dafd	Merge pull request #697 from TwilitRealm/include-numbers Try to fix Windows/macOS build errors	2026-05-06 21:09:53 -04:00
doop	1ad5ab8632	Try to fix Windows/macOS build errors	2026-05-07 01:02:43 +00:00
Irastris	c4e7838089	Swap shield labels in RmlUi editor	2026-05-06 21:02:15 -04:00
roeming	7313712263	update area flags to precalculate correct offsets/masks (#694 ) Co-authored-by: roeming <roeming@users.noreply.github.com>	2026-05-06 18:40:10 -06:00
doop	aa48d95f24	Procedurally-generate HQ minimap textures (#692 ) * Procedurally-generate HQ minimap textures * Don't leak old minimap textures	2026-05-06 18:40:04 -06:00
Thomas	c5baabbe9c	assets: Remove objdiff screenshot (#691 ) Leftover from the decomp.	2026-05-06 18:38:01 -06:00
Irastris	1d2716139f	Redesign PresetWindow	2026-05-06 19:49:57 -04:00
MelonSpeedruns	742ad2c150	Increase Link's heap size for mods	2026-05-06 19:48:43 -04:00
Luke Street	18eb0692f0	UI: "No controller" & menu notifications Resolves #629 Resolves #678	2026-05-06 17:34:08 -06:00
Irastris	b5f98f69db	Redesign Modal	2026-05-06 19:19:38 -04:00
Irastris	47593d0eb4	Allow hash-mismatched discs to be loaded with user confirmation	2026-05-06 19:19:38 -04:00
Irastris	4404fce369	Do hash-based verification of disc images	2026-05-06 19:19:38 -04:00
Irastris	72c20f4dd0	Add stylesheet rules	2026-05-06 19:19:38 -04:00
doop	3240885bfd	Preserved doop work * Disc verification * Add platform and region info to known discs map * Use array over map * Use std::to_array	2026-05-06 19:19:38 -04:00
Luke Street	7f0955f022	Add ImGui screen for Aurora Null backend Resolves #628	2026-05-06 16:39:28 -06:00
Luke Street	c21bce0093	UI: Adjust battery icon thresholds	2026-05-06 11:49:24 -06:00
Luke Street	4e23472ed5	UI: Controller connect/disconnect toasts	2026-05-06 11:14:12 -06:00
doop	cfe1f2304b	Increase line-height for right pane descriptions	2026-05-06 13:15:30 +00:00
TakaRikka	de6568d750	allow suns song / quick transform in ToT past	2026-05-06 04:25:42 -07:00
TakaRikka	3aafe7fa16	more mirror mode map fixes	2026-05-06 04:19:00 -07:00
Luke Street	c1e65d19e7	Autosave: Rotate inner ring too	2026-05-05 23:57:20 -06:00
Luke Street	5fdf954994	Reduce autosave spinner opacity	2026-05-05 23:25:06 -06:00
Luke Street	230868af3c	Add autosave spinner & make RmlUi respect 4:3 Resolves #627	2026-05-05 23:18:11 -06:00
doop	66154d9de8	Remove post-trim scissor (#684 ) * Remove post-trim scissor Fixes #679 * Add comment	2026-05-05 19:41:59 -06:00
Luke Street	93ec3c7dbd	New UI: Achievement toasts (#690 ) * Rename Overlay -> GraphicsTuner, Popup -> MenuBar * Update GraphicsTuner CSS * WIP Overlay document & toasts * Achievement toasts * Cleanup	2026-05-05 19:29:42 -06:00
MelonSpeedruns	945ce3e4bc	Alternate RMLUI Menu Sounds (#686 ) * Alternate RMLUI Menu Sounds Those fit more the game I feel like. * swapped tab sounds * pressing A on tab button plays the OK sound * Fix tab sound + Added menu sounds to prelaunch menu * Centralize UI sound definitions * Improvements * Add "Play" button sound * Use kSoundItemFocus in prelaunch * Oops * Update play/enable/disable sounds --------- Co-authored-by: MelonSpeedruns <melonspeedruns@stratobox.net> Co-authored-by: Luke Street <luke@street.dev>	2026-05-05 16:44:11 -06:00
TakaRikka	782a8573e9	Merge pull request #570 from TwilitRealm/mapmirror fix main map for mirror mode	2026-05-05 14:22:25 -07:00
Irastris	4e0ca51159	Remove restart notice from cardFileType's rightPane	2026-05-05 17:03:04 -04:00
Irastris	3cd160e1b2	Defer mDoMemCd_ThdInit if necessary, removing restart requirement Thanks, Melon	2026-05-05 16:56:41 -04:00
Luke Street	93a236a9d2	Prelaunch settings: actually save config	2026-05-05 14:47:53 -06:00
Irastris	eaf3bc2f40	Remove skipWarningScreen config option, always skip logos	2026-05-05 16:27:41 -04:00
Luke Street	5ca0a2ba06	UI: Fix focus reconciliation for context root	2026-05-05 14:17:57 -06:00
Luke Street	ccd2bdbaac	Add full Settings window to prelaunch	2026-05-05 14:12:53 -06:00
Irastris	08321699cd	Display the real title screen behind the prelaunch menu (#638 ) * Start game execution as soon as a disk image is available * Do not update dDemo_c if prelaunch document is visible * Prevent intro music until prelaunch has popped * Replace "Start Game" references with "Play" * Make prelaunch layout respect mirror mode * Add drop shadow to prelaunch disk-status and version-info * Remove ImGui prelaunch * Add "Change Disk Image" button to prelaunch options * Actually validate discs and make prelaunch very betterer :) * Check your build before pushing dumbass, and go to sleep * "Disc" consistency, adjust restart notice logic * Better LanguageSelect logic * Add restart notice to SaveTypeSelect * Added wind sounds to the pre-launch menu * Add Modal document, use it for disc verification * Consolidate Modal and PresetWindow * Squash various bugs, rearrange document flow * Allow Window inheritors to opt-out of being toggleable * Tweak focus behavior/syntax * Implement "Restart Now" option * Tweaks * Remove a bunch of dynamic_cast * Update README.md --------- Co-authored-by: Luke Street <luke@street.dev>	2026-05-05 12:18:25 -06:00
Luke Street	7300c0e0f5	Update aurora	2026-05-05 12:15:01 -06:00
Luke Street	7e562824fe	Add a <br>	2026-05-05 11:30:49 -06:00
Luke Street	ed8b5c96b9	Update aurora & add logo to README.md	2026-05-05 11:28:05 -06:00
TakaRikka	14bccdffa6	fix mirror map portal selection	2026-05-05 06:25:46 -07:00
TakaRikka	39e465bcab	fix mirror map region selection	2026-05-05 06:22:49 -07:00
TakaRikka	e53bb3a12d	Merge branch 'main' of github.com:TwilitRealm/dusk into mapmirror	2026-05-05 04:59:25 -07:00
TakaRikka	50fccd393f	fix mirror mode text / rodeo direction	2026-05-05 04:44:14 -07:00
TakaRikka	7993740ac8	fix kargorok mirror mode controls	2026-05-05 01:16:01 -07:00
TakaRikka	8e5bb8ae59	Merge pull request #676 from TwilitRealm/instant-text-tweaks Instant text tweaks	2026-05-04 23:43:43 -07:00
TakaRikka	8fefdd4114	Merge pull request #669 from TwilitRealm/remove-discord-rpc Remove discord-rpc/rapidjson; roll our own	2026-05-04 23:43:24 -07:00
gymnast86	64c8cee21b	revert to checking for Hold B at the start of do_isReady	2026-05-04 23:08:01 -07:00
gymnast86	25fe686573	add message ids for not being able to buy bombs from barnes	2026-05-04 23:07:23 -07:00
Luke Street	1c1ea98fdd	Update aurora	2026-05-04 23:35:21 -06:00
TakaRikka	e098104f8f	Merge pull request #642 from TwilitRealm/debug-fly-cam Add fly mode option to debug cam	2026-05-04 19:25:19 -07:00
Pheenoh	3c5ade5565	don't allow activation if paused or in event	2026-05-04 20:15:02 -06:00
Pheenoh	b2ad75027e	Merge branch 'main' into debug-fly-cam	2026-05-04 19:26:31 -06:00
TakaRikka	fdfbf83b88	Merge pull request #660 from TwilitRealm/fix/fix-ub Fix a UB in Morpheel	2026-05-04 18:24:16 -07:00
SuperDude88	1b9ca0949e	Clear Description on More Hovers (#673 ) - Properly clear the previous option description when you hover over "toggle fullscreen" or "restore default window size" Fixes #671	2026-05-04 19:17:39 -06:00
Luke Street	827037f0fa	Update aurora for RmlUi base path fix	2026-05-04 18:27:50 -06:00
Luke Street	d84c5790f5	NOMINMAX	2026-05-04 16:27:12 -06:00
Luke Street	49eb2282af	Forgor to add	2026-05-04 16:20:30 -06:00
Luke Street	741f9ecfab	Remove discord-rpc/rapidjson; roll our own	2026-05-04 16:14:57 -06:00
Luke Street	37b8122962	UI: Refactor pane control to allow hover for help text	2026-05-04 14:16:35 -06:00
doop	5f2cf68e80	Minor UI nits	2026-05-04 19:38:11 +00:00
Luke Street	74f2c58b29	UI: Preset tweaks	2026-05-04 13:08:20 -06:00
madeline	208433047a	Merge branch 'main' of https://github.com/TakaRikka/dusk	2026-05-04 12:06:28 -07:00
madeline	2c01430035	fix stereo audio with mirror mode fixes #666	2026-05-04 12:06:24 -07:00
Luke Street	5121437bcf	UI: Avoid looping at end of window content	2026-05-04 11:49:12 -06:00
Luke Street	f61bd3e5ad	UI: Reorder settings tabs	2026-05-04 11:31:09 -06:00
Luke Street	835e409b32	UI: Fix prelaunch options close anim	2026-05-04 11:27:31 -06:00
Luke Street	010bdb7e25	UI: Fix left/right nav from content to change tabs	2026-05-04 11:17:48 -06:00
Luke Street	7ba22b7714	UI: Refocus top document automatically	2026-05-04 11:14:40 -06:00
Luke Street	efcb19a3d0	Revert hide change to popup menu	2026-05-04 10:49:57 -06:00
Luke Street	55455bb1b5	Adjust presets & default settings	2026-05-04 10:43:42 -06:00
qwertyquerty	e49be12297	RmlUi improvements (#663 ) * rmlui audio * fix menu select sound * Fixes #662 * fix reset logic and fix popup getting stuck closed * fix X button on menu popup * rmlui achievements, and fix open/close bug * presets, achievements css, and menu sounds toggle * forgor * fix b button causing audio when menu not visible	2026-05-04 10:25:13 -06:00
MelonSpeedruns	75f4940f5e	set field_0xbaf variable like all the other conditions	2026-05-04 11:29:29 -04:00
MelonSpeedruns	8047330952	oops i suck	2026-05-04 09:55:01 -04:00
MelonSpeedruns	9105dcb078	remove empty line	2026-05-04 09:54:24 -04:00
MelonSpeedruns	b8e38e03e2	Apply PJB request	2026-05-04 09:54:00 -04:00
MelonSpeedruns	331352878e	Fix a UB in morpheel	2026-05-04 08:41:19 -04:00
Luke Street	62a88f1e9a	UI: Add warning icons to experimental settings	2026-05-03 23:44:38 -06:00
Luke Street	43b603e70b	UI: 3-finger tap to toggle menu on mobile	2026-05-03 22:39:31 -06:00
doop	95e6ac54cf	Random UI and README tweaks (#653 )	2026-05-03 22:02:09 -06:00
Luke Street	c4b2e2e501	Make prelaunch fade out smoother	2026-05-03 22:01:02 -06:00
Luke Street	dccba23980	Update aurora	2026-05-03 20:47:14 -06:00
Luke Street	bf27d10519	Revert "Convert UI fonts to WOFF2 (#647 )" (#648 ) This reverts commit `6c27011e32`.	2026-05-03 20:41:24 -06:00
doop	6c27011e32	Convert UI fonts to WOFF2 (#647 ) * Convert UI fonts to WOFF2 * ...except for the ones we use for ImGui	2026-05-03 20:36:55 -06:00
Luke Street	6220990dc5	UI: Use decorator: text for close button	2026-05-03 19:01:44 -06:00
Phillip Stephens	93e9767c9f	Fix OSReport crash on linux, harden FormatToString against malformed strings (#640 ) * Fix OSReport crash on linux, harden FormatToString against malformed strings * Move size increment to after error check * Update aurora and impl OSPanic --------- Co-authored-by: Luke Street <luke@street.dev>	2026-05-03 18:50:49 -06:00
Luke Street	c774f53dad	UI: Fix L/R to switch tabs Resolves #645	2026-05-03 18:36:06 -06:00
Luke Street	7fbfe5ad88	UI: Add close button to tab bar	2026-05-03 18:29:08 -06:00
Luke Street	ef02037990	Remove ESC to exit fullscreen	2026-05-03 17:26:17 -06:00
Luke Street	23cc18ba0e	UI: Press ESC to unbind a button Resolves #562	2026-05-03 17:26:17 -06:00
Luke Street	924dbc7715	UI: Implement controller config Resolves #622	2026-05-03 17:26:17 -06:00
TakaRikka	742f4938f2	Merge pull request #641 from TwilitRealm/fix/klift00 Frame Interp: Fix obj_klift00 chains	2026-05-03 15:32:35 -07:00
TakaRikka	02e0f586d3	Merge pull request #639 from TwilitRealm/fix/fyer_cs Frame Interp: Fix Fyer canon repair cutscene	2026-05-03 15:31:09 -07:00
Luke Street	5717aeef85	UI: Bold modified settings values	2026-05-03 16:01:33 -06:00
Luke Street	da9b99f650	Update aurora	2026-05-03 15:28:03 -06:00
Pheenoh	901ce2ee4c	add debug fly cam option	2026-05-03 15:23:59 -06:00
Pheenoh	dd2b993cd5	frame interp: fix obj_klift00 chains	2026-05-03 09:58:31 -06:00
Pheenoh	83577d3b82	frame interp: fix fyer canon repair cs	2026-05-03 09:20:41 -06:00
TakaRikka	eaae8b6137	Merge branch 'main' of github.com:TwilitRealm/dusk into mapmirror	2026-04-26 17:37:30 -07:00
TakaRikka	d9a0ef760f	fix icon positions	2026-04-16 19:46:02 -07:00
TakaRikka	95470b830f	wip map mirror	2026-04-16 05:55:46 -07:00