Disc verification cleanup

Merge pull request #695 from TwilitRealm/hash-verif
Hash verification for disc images
2026-07-04 03:12:48 -04:00 · 2026-05-07 00:35:00 -06:00 · 2026-05-06 23:41:57 -06:00 · 2026-05-06 23:33:55 -06:00 · 2026-05-06 23:21:43 -06:00 · 2026-05-06 22:09:20 -06:00
232 changed files with 19896 additions and 2127 deletions
@@ -2,7 +2,7 @@
 Language: Cpp
 Standard: C++03
 AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignOperands:   true
@@ -100,6 +100,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
 endif ()
 set(AURORA_ENABLE_DVD ON CACHE BOOL "Enable DVD API support" FORCE)
 set(AURORA_ENABLE_CARD ON CACHE BOOL "Enable CARD API support" FORCE)
 set(AURORA_ENABLE_RMLUI ON CACHE BOOL "Enable RmlUi UI support" FORCE)
 add_subdirectory(extern/aurora EXCLUDE_FROM_ALL)
 add_subdirectory(libs/freeverb)
@@ -280,30 +281,26 @@ set(DUSK_COMPANY_NAME "Twilit Realm")
 set(DUSK_FILE_DESCRIPTION "Dusk")
 set(DUSK_PRODUCT_NAME "Dusk")
 set(DUSK_COPYRIGHT "Copyright (C) Twilit Realm contributors")
 set(DUSK_GAME_NAME "GZ2E")
 set(DUSK_GAME_VERSION "01")
 set(DUSK_TP_VERSION ${DUSK_GAME_NAME}${DUSK_GAME_VERSION})
 message(STATUS "dusk: Game Version: ${DUSK_TP_VERSION}")
 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)
    DUSK_TP_VERSION="${DUSK_TP_VERSION}" DUSK_GAME_NAME="${DUSK_GAME_NAME}" DUSK_GAME_VERSION="${DUSK_GAME_VERSION}")
 set(GAME_INCLUDE_DIRS
    include
    src
-    assets/${DUSK_TP_VERSION}
+    assets/GZ2E01 # TODO: make this dynamic if needed?
    libs/JSystem/include
    libs
    extern/aurora/include/dolphin
    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)
@@ -312,6 +309,10 @@ if (DUSK_ENABLE_SENTRY_NATIVE)
    list(APPEND GAME_COMPILE_DEFS DUSK_ENABLE_SENTRY_NATIVE=1 SENTRY_BUILD_STATIC=1)
 endif ()
 if (WIN32)
    list(APPEND GAME_LIBS Ws2_32)
 endif ()
 if (DUSK_MOVIE_SUPPORT)
    if (TARGET libjpeg-turbo::turbojpeg-static)
        list(APPEND GAME_LIBS libjpeg-turbo::turbojpeg-static)
@@ -321,46 +322,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)
+set(DUSK_ENABLE_DISCORD_DEFAULT ON)
-if (DUSK_ENABLE_DISCORD_RPC AND NOT ANDROID AND NOT IOS AND NOT TVOS)
+if (DEFINED DUSK_ENABLE_DISCORD_RPC AND NOT DEFINED DUSK_ENABLE_DISCORD)
-
+    set(DUSK_ENABLE_DISCORD_DEFAULT ${DUSK_ENABLE_DISCORD_RPC})
-    FetchContent_Populate(discord_rpc
+endif ()
-        URL https://github.com/discord/discord-rpc/archive/refs/tags/v3.4.0.tar.gz
+option(DUSK_ENABLE_DISCORD "Enable Discord Rich Presence support" ${DUSK_ENABLE_DISCORD_DEFAULT})
-        URL_HASH SHA256=e13427019027acd187352dacba6c65953af66fdf3c35fcf38fc40b454a9d7855
+if (DUSK_ENABLE_DISCORD AND NOT ANDROID AND NOT IOS AND NOT TVOS)
-        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+    list(APPEND GAME_COMPILE_DEFS DUSK_DISCORD=1)
    )
    # RapidJSON is a git submodule absent from the discord-rpc tarball; fetch separately.
    FetchContent_Populate(rapidjson
        URL https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
        URL_HASH SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
    )
    if (NOT TARGET discord-rpc)
        set(_drpc ${discord_rpc_SOURCE_DIR}/src)
        set(_drpc_src
            ${_drpc}/discord_rpc.cpp
            ${_drpc}/rpc_connection.cpp
            ${_drpc}/serialization.cpp
        )
        if (WIN32)
            list(APPEND _drpc_src ${_drpc}/connection_win.cpp ${_drpc}/discord_register_win.cpp)
        elseif (APPLE)
            list(APPEND _drpc_src ${_drpc}/connection_unix.cpp ${_drpc}/discord_register_osx.m)
        else ()
            list(APPEND _drpc_src ${_drpc}/connection_unix.cpp ${_drpc}/discord_register_linux.cpp)
        endif ()
        add_library(discord-rpc STATIC ${_drpc_src})
        target_include_directories(discord-rpc PUBLIC
            ${discord_rpc_SOURCE_DIR}/include
            ${rapidjson_SOURCE_DIR}/include
        )
        if (UNIX)
            target_link_libraries(discord-rpc PUBLIC pthread)
        endif ()
    endif ()
    list(APPEND GAME_LIBS discord-rpc)
    list(APPEND GAME_COMPILE_DEFS DUSK_DISCORD_RPC=1)
 endif ()
 # Edit & Continue
@@ -1,50 +1,55 @@
-![DuskLogo](res/logo-mascot.webp)
+<div align="center">
  <img src="res/logo-mascot.png" alt="Logo" width="640">
- ### **[Official Website](https://twilitrealm.dev)**
+  <p align="center">
- ### **[Discord](https://discord.gg/QACynxeyna)**
+    <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
+> [!IMPORTANT]
-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.
+> Dusk does *not* provide any copyrighted assets. You must provide your own copy of the original game.
-| Version      | sha1 hash                                |
+### 1. Verify your dump
-|--------------| ---------------------------------------- |
+
-| GameCube USA | 75edd3ddff41f125d1b4ce1a40378f1b565519e7 |
+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:
-| GameCube PAL | 2601822a488eeb86fb89db16ca8f29c2c953e1ca |
+
 | 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!
-![DuskOptions](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).
-# Credits
+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.
 - Taka
 - encounter
 - Antidote
 - caseif
 - CraftyBoss
 - crowell
 - dooplecks
 - gymnast86
 - Irastris
 - kipcode66
 - Lars
 - LunarSoap
 - Maddie
 - MelonSpeedruns
 - Pheenoh
 - PJB
 - Roeming
 - YunataSavior
-Special thanks to the TP Decomp team, the GC/Wii Decomp community, the Aurora developers, and the TP speedrunning community.
+# 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>
@@ -13,13 +13,3 @@ buildType:
      short: RelWithDebInfo
      long: Optimized, with debug symbols
      buildType: RelWithDebInfo
 tp_version:
  default: GZ2E01
  description: TP Version
  choices:
    GZ2E01:
      short: GZ2E01
      long: GZ2E01
      settings:
        DUSK_TP_VERSION: GZ2E01
@@ -1,7 +1,7 @@
 set(DOLZEL_FILES
        src/m_Do/m_Do_main.cpp
-        src/m_Do/m_Do_printf.cpp
+        #src/m_Do/m_Do_printf.cpp
        src/m_Do/m_Do_audio.cpp
        src/m_Do/m_Do_controller_pad.cpp
        #src/m_Do/m_Re_controller_pad.cpp
@@ -1429,6 +1429,7 @@ set(DUSK_FILES
        src/dusk/globals.cpp
        src/dusk/gyro.cpp
 		src/dusk/gamepad_color.cpp
 		src/dusk/autosave.cpp
        src/dusk/io.cpp
        src/dusk/layout.cpp
        src/dusk/logging.cpp
@@ -1446,24 +1447,72 @@ 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/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
        src/dusk/ui/overlay.cpp
        src/dusk/ui/overlay.hpp
        src/dusk/ui/pane.cpp
        src/dusk/ui/pane.hpp
        src/dusk/ui/menu_bar.cpp
        src/dusk/ui/menu_bar.hpp
        src/dusk/ui/prelaunch.cpp
        src/dusk/ui/prelaunch.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
        src/dusk/ui/settings.hpp
        src/dusk/ui/string_button.cpp
        src/dusk/ui/string_button.hpp
        src/dusk/ui/tab_bar.cpp
        src/dusk/ui/tab_bar.hpp
        src/dusk/ui/ui.cpp
        src/dusk/ui/ui.hpp
        src/dusk/ui/window.cpp
        src/dusk/ui/window.hpp
        src/dusk/achievements.cpp
        src/dusk/iso_validate.cpp
        src/dusk/livesplit.cpp
        src/dusk/offset_ptr.cpp
        src/dusk/OSContext.cpp
        src/dusk/OSReport.cpp
        src/dusk/OSThread.cpp
        src/dusk/OSMutex.cpp
        src/dusk/discord.cpp
        src/dusk/discord.hpp
        src/dusk/discord_presence.cpp
        src/dusk/version.cpp
 )
@@ -188,6 +188,15 @@ public:
    /* 0x273C */ f32 mKankyoBlend;
    /* 0x2740 */ u8 field_0x2740;
    /* 0x2744 */ dMsgFlow_c mMsgFlow;
 #if TARGET_PC
    cXyz mReinsInterpPrev[2][16];
    cXyz mReinsInterpCurr[2][16];
    cXyz mReinsTexInterpPrev[2];
    cXyz mReinsTexInterpCurr[2];
    bool mReinsInterpPrevValid;
    bool mReinsInterpCurrValid;
    s8 mDemoCamSyncTicks;
 #endif
 };
 STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790);
@@ -44,6 +44,12 @@ public:
    /* 0x88C */ u8 field_0x88C[0x8C8 - 0x88C];
    /* 0x8C8 */ s8 field_0x8c8;
    /* 0x8C9 */ u8 mInitHIO;
 #if TARGET_PC
    cXyz mRopeInterpPrev[16];
    cXyz mRopeInterpCurr[16];
    bool mRopeInterpPrevValid;
    bool mRopeInterpCurrValid;
 #endif
 };
 STATIC_ASSERT(sizeof(e_mb_class) == 0x8cc);
@@ -27,6 +27,7 @@ public:
    /* 0x17C */ cXyz mViewScale;
 #if TARGET_PC
    bool mbReset = false;
    bool mbHadEntry = false;
 #endif
 };
@@ -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);
@@ -58,6 +58,9 @@ public:
    void setNextPoint();
    int Draw();
    int Delete();
 #if TARGET_PC
    friend void daL8Lift_interp_callback(bool isSimFrame, void* pUserWork);
 #endif
    u8 getPthID() { return fopAcM_GetParamBit(this, 0, 8); }
    u8 getMoveSpeed() { return fopAcM_GetParamBit(this, 8, 4); }
@@ -143,6 +143,12 @@ public:
    /* 0x20 */ JORFile mFile;
 #endif
 #if TARGET_PC
    /* 0x24 */ u8 mManualMode;
    /* 0x25 */ f32 freeXAngle;
    /* 0x29 */ f32 freeYAngle;
 #endif
    u32 Id(s32 i_style) { return mCamStyleData[i_style].field_0x0; }
    int Algorythmn(s32 i_style) { return mCamStyleData[i_style].field_0x4; }
    int Algorythmn() { return mCurrentStyle->field_0x4; }
@@ -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 {
@@ -273,6 +285,8 @@ public:
        /* 0xA4 */ f32 field_0xa4;
        /* 0xA8 */ int field_0xa8;
        /* 0xAC */ f32 field_0xac;
        f32 xAngle;
        f32 yAngle;
    };
    struct LockOnData {
@@ -1024,6 +1038,11 @@ public:
    bool colosseumCamera(s32);
    bool test1Camera(s32);
    bool test2Camera(s32);
    #if TARGET_PC
    bool freeCamera();
    bool executeDebugFlyCam();
    void deactivateDebugFlyCam();
    #endif
    bool towerCamera(s32);
    bool hookshotCamera(s32);
    bool railCamera(s32);
@@ -1371,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();
@@ -91,6 +91,10 @@ public:
    void calcCursor();
    void drawCursor();
    #if TARGET_PC
    void dMapBgWide();
    #endif
    void setDPDFloorSelCurPos(s8 i_pos) { field_0xdd6 = i_pos; }
    f32 getMapWidth() { return mMapWidth; }
@@ -81,6 +81,10 @@ public:
    void calcDrawPriority();
    void setArrowPosAxis(f32, f32);
    #if TARGET_PC
    void fMapBackWide();
    #endif
    virtual void draw();
    virtual ~dMenu_Fmap2DBack_c();
@@ -165,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;
@@ -330,6 +340,10 @@ public:
    void setHIO(bool);
    bool isWarpAccept();
    #if TARGET_PC
    void fMapTopWide();
    #endif
    virtual void draw();
    virtual ~dMenu_Fmap2DTop_c();
@@ -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
@@ -343,6 +343,11 @@ public:
    /* 0x624 */ f32 mMidonaPosX;
    /* 0x628 */ f32 mMidonaPosY;
    /* 0x62C */ f32 mMidonaScale;
 #ifdef TARGET_PC
    bool mWasListen[2];
    bool mWasRepeat[2];
 #endif
 };
 #endif /* D_METER_D_METER_BUTTON_H */
@@ -67,6 +67,9 @@ public:
    bool isStaffMessage();
    bool isSaveMessage();
    bool isTalkMessage();
 #if TARGET_PC
    bool isShopItemMessage();
 #endif
    const char* getSmellName();
    const char* getPortalName();
    const char* getBombName();
@@ -89,7 +89,7 @@ public:
    void MojiSelectAnm3();
    int mojiChange(u8);
    void selectMojiSet();
-    #if REGION_JPN
+    #if TARGET_PC || REGION_JPN
    int checkDakuon(int, u8);
    int setDakuon(int, u8);
    #endif
@@ -79,7 +79,7 @@ public:
    bool isProgressiveMode();
    void setRenderMode();
-    #if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD
+    #if TARGET_PC || VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD
    u8 getPalLanguage();
    #endif
@@ -149,7 +149,7 @@ public:
    /* 0x200 */ dDlst_2D_c* mNvLogo;
    /* 0x204 */ dDlst_2D_c* mMocImg;
 #endif
-#if VERSION == VERSION_GCN_PAL
+#if TARGET_PC || VERSION == VERSION_GCN_PAL
    /* 0x1FC */ mDoDvdThd_mountArchive_c* mpPalLogoResCommand;
 #endif
    /* 0x1FC */ request_of_phase_process_class* m_preLoad_dylPhase;
@@ -0,0 +1,71 @@
 #pragma once
 #include <cstdint>
 #include <functional>
 #include <queue>
 #include <string>
 #include <string_view>
 #include <unordered_set>
 #include <vector>
 #include "nlohmann/json.hpp"
 namespace dusk {
 enum class AchievementCategory : uint8_t {
    Story,
    Collection,
    Challenge,
    Minigame,
    Misc,
    Glitched
 };
 struct Achievement {
    const char* key;
    const char* name;
    const char* description;
    AchievementCategory category;
    bool isCounter;
    int32_t goal;
    int32_t progress;
    bool unlocked;
 };
 // Responsible for updating a.progress.
 // Use extra for any per-achievement state that must survive across frames or sessions, extra is saved
 using AchievementCheckFn = std::function<void(Achievement& a, nlohmann::json& extra)>;
 class AchievementSystem {
 public:
    static AchievementSystem& get();
    void load();
    void save();
    void tick();
    void clearAll();
    void clearOne(const char* key);
    // Signals are visible to all achievement checks within the same tick, then cleared.
    void signal(const char* key);
    bool hasSignal(const char* key) const;
    std::vector<Achievement> getAchievements() const;
 private:
    struct Entry {
        Achievement achievement;
        AchievementCheckFn check;
        nlohmann::json extra;
    };
    AchievementSystem();
    static std::vector<Entry> makeEntries();
    void processEntry(Entry& e);
    std::vector<Entry> m_entries;
    std::unordered_set<std::string_view> m_signals;
    bool m_loaded = false;
    bool m_dirty = false;
 };
 } // namespace dusk
@@ -0,0 +1,17 @@
 #pragma once
 #ifndef AUTOSAVE_H
 #define AUTOSAVE_H
 #include <m_Do/m_Do_MemCardRWmng.h>
 #include <m_Do/m_Do_MemCard.h>
 void noAutoSave();
 void triggerAutoSave();
 void updateAutoSave();
 void enterAutoSave();
 void autoSaving();
 void waitingForWrite();
 void endAutoSave();
 #endif
@@ -1,18 +1,14 @@
 #pragma once
-#ifdef DUSK_DISCORD_RPC
+#ifdef DUSK_DISCORD
-namespace dusk {
+namespace dusk::discord {
 namespace discord {
-void Initialize();
+void initialize();
 void run_callbacks();
 void update_presence();
 void shutdown();
-void RunCallbacks();
+}  // namespace dusk::discord
-void UpdatePresence();
+#endif  // DUSK_DISCORD
 void Shutdown();
 }
 }
 #endif // DUSK_DISCORD_RPC
@@ -1,22 +1,31 @@
 #pragma once
 #include "dolphin/types.h"
 #include "version.hpp"
 namespace dusk {
 struct OffsetVersion {
    version::GameVersion mGameVersion;
    u32 mOffset;
    constexpr OffsetVersion(const version::GameVersion gameVersion, const u32 offset)
        : mGameVersion(gameVersion), mOffset(offset) {}
 };
 /**
 * Load bytes from the main DOL by GameCube virtual address
 */
-bool LoadDolAsset(void* dst, u32 virtualAddress, s32 size);
+bool LoadDolAsset(void* dst, std::initializer_list<OffsetVersion> virtualAddress, s32 size);
 /**
 * Load bytes from a REL file in the ISO filesystem, dst must be 32-byte aligned
 */
-bool LoadRelAsset(void* dst, const char* dvdPath, s32 offset, s32 size);
+bool LoadRelAsset(void* dst, const char* dvdPath, std::initializer_list<OffsetVersion> offset, s32 size);
 /**
 * Load bytes from a REL inside RELS.arc
 */
-bool LoadArchivedRelAsset(void* dst, u32 memType, const char* relFileName, s32 offset, s32 size);
+bool LoadArchivedRelAsset(void* dst, u32 memType, const char* relFileName, std::initializer_list<OffsetVersion> offset, s32 size);
 }  // namespace dusk
@@ -0,0 +1,16 @@
 #pragma once
 #include <cstdint>
 namespace dusk::speedrun {
 void onGameFrame();
 uint64_t getFrameCount();
 void start();
 void reset();
 void connectLiveSplit(const char* host = "127.0.0.1", int port = 16834);
 void disconnectLiveSplit();
 bool consumeConnectedEvent();
 bool consumeDisconnectedEvent();
 void updateLiveSplit();
 void shutdown();
 }
@@ -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); }
-
+#include <dolphin/ppc_math.h>
 // 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;
 }
 #endif // _SRC_DUSK_MATH_H_
@@ -13,12 +13,38 @@ enum class BloomMode : int {
    Dusk = 2,
 };
 enum class GameLanguage : u8 {
    English = OS_LANGUAGE_ENGLISH,
    German = OS_LANGUAGE_GERMAN,
    French = OS_LANGUAGE_FRENCH,
    Spanish = OS_LANGUAGE_SPANISH,
    Italian = OS_LANGUAGE_ITALIAN,
 };
 enum class DiscVerificationState : u8 {
    Unknown = 0,
    Success,
    HashMismatch,
 };
 namespace config {
 template <>
 struct ConfigEnumRange<BloomMode> {
    static constexpr auto min = BloomMode::Off;
    static constexpr auto max = BloomMode::Dusk;
 };
 template <>
 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
@@ -41,15 +67,18 @@ struct UserSettings {
        ConfigVar<int> soundEffectsVolume;
        ConfigVar<int> fanfareVolume;
        ConfigVar<bool> enableReverb;
        ConfigVar<bool> enableHrtf;
        ConfigVar<bool> menuSounds;
    } audio;
    // Game settings
    struct {
        ConfigVar<GameLanguage> language;
        // QoL
        ConfigVar<bool> enableQuickTransform;
        ConfigVar<bool> hideTvSettingsScreen;
        ConfigVar<bool> skipWarningScreen;
        ConfigVar<bool> biggerWallets;
        ConfigVar<bool> noReturnRupees;
        ConfigVar<bool> disableRupeeCutscenes;
@@ -60,16 +89,18 @@ struct UserSettings {
        ConfigVar<bool> fastClimbing;
        ConfigVar<bool> noMissClimbing;
        ConfigVar<bool> fastTears;
        ConfigVar<bool> no2ndFishForCat;
        ConfigVar<bool> instantSaves;
        ConfigVar<bool> instantText;
        ConfigVar<bool> sunsSong;
        ConfigVar<bool> autoSave;
        // Preferences
        ConfigVar<bool> enableMirrorMode;
        ConfigVar<bool> invertCameraXAxis;
        ConfigVar<bool> disableMainHUD;
        ConfigVar<bool> pauseOnFocusLost;
        ConfigVar<bool> enableLinkDollRotation;
        ConfigVar<bool> enableAchievementNotifications;
        // Graphics
@@ -80,6 +111,7 @@ struct UserSettings {
        ConfigVar<int> internalResolutionScale;
        ConfigVar<int> shadowResolutionMultiplier;
        ConfigVar<bool> enableDepthOfField;
        ConfigVar<bool> enableMapBackground;
        // Audio
        ConfigVar<bool> noLowHpSound;
@@ -95,6 +127,11 @@ struct UserSettings {
        ConfigVar<float> gyroDeadband;
        ConfigVar<bool> gyroInvertPitch;
        ConfigVar<bool> gyroInvertYaw;
        ConfigVar<bool> freeCamera;
        ConfigVar<bool> invertCameraXAxis;
        ConfigVar<bool> invertCameraYAxis;
        ConfigVar<float> freeCameraSensitivity;
        ConfigVar<bool> debugFlyCam;
        // Cheats
        ConfigVar<bool> infiniteHearts;
@@ -117,16 +154,20 @@ struct UserSettings {
        // Controls
        ConfigVar<bool> enableTurboKeybind;
        // Tools
        ConfigVar<bool> speedrunMode;
        ConfigVar<bool> liveSplitEnabled;
    } 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;
    } backend;
 };
@@ -0,0 +1,67 @@
 #ifndef DUSK_VERSION_HPP
 #define DUSK_VERSION_HPP
 /**
 * Functionality for switching game behavior based on the loaded game version (e.g. PAL/JPN, GC/Wii)
 */
 namespace dusk::version {
    enum class GameVersion : u8 {
        GcnUsa = VERSION_GCN_USA,
        GcnPal = VERSION_GCN_PAL,
        GcnJpn = VERSION_GCN_JPN,
        WiiUsaRev0 = VERSION_WII_USA_R0,
        WiiUsa = VERSION_WII_USA_R2,
        WiiPal = VERSION_WII_PAL,
        WiiJpn = VERSION_WII_JPN,
        WiiKor = VERSION_WII_KOR,
    };
    bool isGcn();
    bool isWii();
    bool isPalOrAtLeastWiiR2();
    bool isRegionPal();
    bool isRegionJpn();
    bool isRegionUsa();
    GameVersion getGameVersion();
    const DVDDiskID& getDiskID();
    void init();
    template<typename T>
    struct VersionOption {
        GameVersion mVersion;
        T mValue;
        constexpr VersionOption(GameVersion version, T value) : mVersion(version), mValue(value) {}
    };
    template<typename T>
    const T& versionSelect(const std::initializer_list<VersionOption<T>> options) {
        const auto version = getGameVersion();
        for (const auto& opt : options) {
            if (opt.mVersion == version) {
                return opt.mValue;
            }
        }
        // Unable to find value.
        abort();
    }
    template<typename T>
    const T& versionSelect(const std::initializer_list<VersionOption<T>> options, const T& defaultValue) {
        const auto version = getGameVersion();
        for (const auto& opt : options) {
            if (opt.mVersion == version) {
                return opt.mValue;
            }
        }
        return defaultValue;
    }
 }  // namespace dusk::version
 #endif  // DUSK_VERSION_HPP
@@ -230,12 +230,16 @@ using std::isnan;
 // Some basic macros that are more convenient than putting down #if blocks for one-line changes.
 #if TARGET_PC
 #define IF_DUSK(statement) statement
 #define IF_DUSK_BLOCK(cond) if (cond) {
 #define IF_DUSK_BLOCK_END }
 #define IF_DUSK_ARG(expr) , expr
 #define IF_NOT_DUSK(statement)
 #define DUSK_IF_ELSE(dusk, orig) dusk
 #else
 #define IF_DUSK(statement)
 #define IF_DUSK_ARG(expr)
 #define IF_DUSK_BLOCK(cond)
 #define IF_DUSK_BLOCK_END
 #define IF_NOT_DUSK(statement) statement
 #define DUSK_IF_ELSE(dusk, orig) orig
 #endif
@@ -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) {
@@ -59,6 +59,9 @@ public:
    bool isActive() const { return mSeqList.getNumLinks() != 0; }
    int getNumActiveSeqs() const { return mSeqList.getNumLinks(); }
    void pause(bool paused) { mActivity.field_0x0.flags.flag2 = paused; }
    #if TARGET_PC
    JSUList<JAISeq>* getSeqList() { return &mSeqList; }
    #endif
 private:
    /* 0x08 */ JAIAudience* mAudience;
@@ -207,4 +207,11 @@ void JPARegistAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);
 void JPARegistPrmAlpha(JPAEmitterWorkData*, JPABaseParticle*);
 void JPARegistPrmAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);
 #if TARGET_PC
 void JPAInterpBillboard(JPAEmitterWorkData*, JPABaseParticle*);
 void JPAInterpRotBillboard(JPAEmitterWorkData*, JPABaseParticle*);
 void JPAInterpDirection(JPAEmitterWorkData*, JPABaseParticle*);
 void JPAInterpRotDirection(JPAEmitterWorkData*, JPABaseParticle*);
 #endif
 #endif /* JPABASESHAPE_H */
@@ -24,6 +24,9 @@ public:
    void init_c(JPAEmitterWorkData*, JPABaseParticle*);
    bool calc_p(JPAEmitterWorkData*);
    bool calc_c(JPAEmitterWorkData*);
 #if TARGET_PC
    void interp(JPAEmitterWorkData*, void const* drawFunc);
 #endif
    bool canCreateChild(JPAEmitterWorkData*);
    f32 getWidth(JPABaseEmitter const*) const;
    f32 getHeight(JPABaseEmitter const*) const;
@@ -40,6 +40,9 @@ public:
    JUTTransparency getTransparency() const { return JUTTransparency(mTransparency); }
    u16 getNumColors() const { return mNumColors; }
    ResTLUT* getColorTable() const { return mColorTable; }
 #if TARGET_PC
    void dataUploaded();
 #endif
 private:
    /* 0x00 */ GXTlutObj mTlutObj;
@@ -75,6 +75,7 @@ public:
    s32 getTransparency() const { return mTexInfo->alphaEnabled; }
    s32 getWidth() const { return mTexInfo->width; }
    s32 getHeight() const { return mTexInfo->height; }
    JUTPalette* getPalette() const { return mPalette; }
    void setCaptureFlag(bool flag) { mFlags &= 2 | flag; }
    bool getCaptureFlag() const { return mFlags & 1; }
    bool getEmbPaletteDelFlag() const { return mFlags & 2; }
@@ -82,7 +83,7 @@ public:
    int getTlutName() const { return mTlutName; }
    bool operator==(const JUTTexture& other) {
        return mTexInfo == other.mTexInfo
-            && field_0x2c == other.field_0x2c
+            && mPalette == other.mPalette
            && mWrapS == other.mWrapS
            && mWrapT == other.mWrapT
            && mMinFilter == other.mMinFilter
@@ -100,7 +101,7 @@ private:
    /* 0x20 */ const ResTIMG* mTexInfo;
    /* 0x24 */ void* mTexData;
    /* 0x28 */ JUTPalette* mEmbPalette;
-    /* 0x2C */ JUTPalette* field_0x2c;
+    /* 0x2C */ JUTPalette* mPalette;
    /* 0x30 */ u8 mWrapS;
    /* 0x31 */ u8 mWrapT;
    /* 0x32 */ u8 mMinFilter;
@@ -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;
+            // u32 expect = ((data.mVtxNum * vertStride) + 0x1F) & ~0x1F;
-            JUT_ASSERT(1234, expect == addrDiff);
+            // JUT_ASSERT(1234, expect == addrDiff);
        } else if (attr == GX_VA_NRM) {
            data.mNrmNum = num;
        } else if (attr == GX_VA_CLR0) {
@@ -1,6 +1,9 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 #include "JSystem/JAudio2/JASChannel.h"
 #if TARGET_PC
 #include "dusk/audio/DuskDsp.hpp"
 #endif
 #include "JSystem/JAudio2/JASAiCtrl.h"
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JAudio2/JASDriverIF.h"
@@ -170,7 +173,12 @@ void JASChannel::updateEffectorParam(JASDsp::TChannel* i_channel, u16* i_mixerVo
    f32 pan = 0.5f;
    f32 dolby = 0.0f;
-    switch (JASDriver::getOutputMode()) {
+#if TARGET_PC
    u32 effectiveOutputMode = dusk::audio::EnableHrtf ? JAS_OUTPUT_SURROUND : JASDriver::getOutputMode();
 #else
    u32 effectiveOutputMode = JASDriver::getOutputMode();
 #endif
    switch (effectiveOutputMode) {
    case JAS_OUTPUT_MONO:
        break;
    case JAS_OUTPUT_STEREO:
@@ -302,7 +302,6 @@ void JASKernel::setupRootHeap(JKRSolidHeap* heap, u32 size) {
    JKRHEAP_NAME(sSystemHeap, "JASKernel::sSystemHeap");
    JUT_ASSERT(787, sSystemHeap);
    sCommandHeap = JKR_NEW_ARGS (heap, 0) JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>;
    JKRHEAP_NAME(sSystemHeap, "JASKernel::sCommandHeap");
    JUT_ASSERT(790, sCommandHeap);
    JASDram = heap;
 }
@@ -442,6 +442,7 @@ static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) {
 JAUSectionHeap* JAUNewSectionHeap(bool param_0) {
    s32 freeSize = JASDram->getFreeSize();
    JKRSolidHeap* sectionHeap = JKRCreateSolidHeap(freeSize, JASDram, true);
    JKRHEAP_NAME(sectionHeap, "sectionHeap");
    JUT_ASSERT(821, sectionHeap);
    return JAUNewSectionHeap(sectionHeap, param_0);
 }
@@ -222,16 +222,11 @@ void* JKRExpHeap::do_alloc(u32 size, int alignment) {
        OSReport_Error("Free block list as follows:\n");
        OSReport_Error("Start    | End      | Size    \n");
        int i = 0;
        for (const CMemBlock* block = mHeadFreeList; block; block = block->mNext) {
            if (block->mMagic) {
                // Allocated, ignore.
                continue;
            }
            if (i++ > 10) {
                OSReport_Error("<more>\n");
                break;
            }
            auto blockStart = (uintptr_t)block - (uintptr_t)mStart;
            auto blockEnd = (uintptr_t)block + block->size - (uintptr_t)mStart;
@@ -239,6 +234,14 @@ void* JKRExpHeap::do_alloc(u32 size, int alignment) {
            OSReport_Error("%08X | %08X | %08X\n", (u32) blockStart, (u32) blockEnd, (u32) blockSize);
        }
        OSReport_Error("Child heaps as follows:\n");
        OSReport_Error("Start    | End      | Name    \n");
        const JSUTree<JKRHeap>& tree = getHeapTree();
        for (JSUTreeIterator iter(tree.getFirstChild()); iter != tree.getEndChild(); ++iter) {
            OSReport_Error("%08X | %08X | %s\n", iter->getStartAddr(), iter->getEndAddr(), iter->getName());
        }
        CRASH("Aborting due to allocation failure!");
    }
 #else
@@ -9,6 +9,9 @@
 #include <mtx.h>
 #include <gx.h>
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
 #endif
 #include "tracy/Tracy.hpp"
 void JPASetPointSize(JPAEmitterWorkData* work) {
@@ -418,50 +421,95 @@ static projectionFunc p_prj[3] = {
    loadPrjAnm,
 };
-void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
+#if TARGET_PC
-    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
+void JPAInterpBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    Mtx ptclPosMtx;
    MTXTrans(ptclPosMtx, ptcl->mPosition.x, ptcl->mPosition.y, ptcl->mPosition.z);
    dusk::frame_interp::record_final_mtx(ptclPosMtx, ptcl);
 }
 void JPAInterpRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    Mtx ptclPosMtx;
    f32 sinRot = JMASSin(ptcl->mRotateAngle);
    f32 cosRot = JMASCos(ptcl->mRotateAngle);
    MTXTrans(ptclPosMtx, ptcl->mPosition.x, ptcl->mPosition.y, ptcl->mPosition.z);
    ptclPosMtx[0][0] = cosRot;
    ptclPosMtx[0][1] = -sinRot;
    ptclPosMtx[1][0] = sinRot;
    ptclPosMtx[1][1] = cosRot;
    dusk::frame_interp::record_final_mtx(ptclPosMtx, ptcl);
 }
 #endif
 void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
-    JGeometry::TVec3<f32> local_48;
+    JGeometry::TVec3<f32> pos;
-    MTXMultVec(work->mPosCamMtx, &param_1->mPosition, &local_48);
+#if TARGET_PC
-    Mtx local_38;
+    Mtx ptclPosMtx;
-    local_38[0][0] = work->mGlobalPtclScl.x * param_1->mParticleScaleX;
+    if (dusk::frame_interp::lookup_replacement(ptcl, ptclPosMtx)) {
-    local_38[0][3] = local_48.x;
+        pos.set(ptclPosMtx[0][3], ptclPosMtx[1][3], ptclPosMtx[2][3]);
-    local_38[1][1] = work->mGlobalPtclScl.y * param_1->mParticleScaleY;
+        MTXMultVec(work->mPosCamMtx, &pos, &pos);
-    local_38[1][3] = local_48.y;
+    } else
-    local_38[2][2] = 1.0f;
+#endif
-    local_38[2][3] = local_48.z;
+    {
-    local_38[0][1] = local_38[0][2] = local_38[1][0] = local_38[1][2] = local_38[2][0] = local_38[2][1] = 0.0f;
+        MTXMultVec(work->mPosCamMtx, &ptcl->mPosition, &pos);
-    GXLoadPosMtxImm(local_38, 0);
+    }
-    p_prj[work->mPrjType](work, local_38);
+    Mtx posMtx;
    posMtx[0][0] = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
    posMtx[0][3] = pos.x;
    posMtx[1][1] = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
    posMtx[1][3] = pos.y;
    posMtx[2][2] = 1.0f;
    posMtx[2][3] = pos.z;
    posMtx[0][1] = posMtx[0][2] = posMtx[1][0] = posMtx[1][2] = posMtx[2][0] = posMtx[2][1] = 0.0f;
    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
    p_prj[work->mPrjType](work, posMtx);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
 }
-void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
+void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
-    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
+    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
-    JGeometry::TVec3<f32> local_48;
+    if (work->mpRes->getUsrIdx() == 0x89d7) {
-    MTXMultVec(work->mPosCamMtx, &param_1->mPosition, &local_48);
+        int a = 0;
-    f32 sinRot = JMASSin(param_1->mRotateAngle);
+    }
    f32 cosRot = JMASCos(param_1->mRotateAngle);
    f32 particleX = work->mGlobalPtclScl.x * param_1->mParticleScaleX;
    f32 particleY = work->mGlobalPtclScl.y * param_1->mParticleScaleY;
-    Mtx local_38;
+    JGeometry::TVec3<f32> pos;
-    local_38[0][0] = cosRot * particleX;
+    f32 sinRot, cosRot;
-    local_38[0][1] = -sinRot * particleY;
+#if TARGET_PC
-    local_38[0][3] = local_48.x;
+    Mtx ptclPosMtx;
-    local_38[1][0] = sinRot * particleX;
+    MTXTrans(ptclPosMtx, ptcl->mPosition.x, ptcl->mPosition.y, ptcl->mPosition.z);
-    local_38[1][1] = cosRot * particleY;
+    if (dusk::frame_interp::lookup_replacement(ptcl, ptclPosMtx)) {
-    local_38[1][3] = local_48.y;
+        pos.set(ptclPosMtx[0][3], ptclPosMtx[1][3], ptclPosMtx[2][3]);
-    local_38[2][2] = 1.0f;
+        sinRot = ptclPosMtx[1][0];
-    local_38[2][3] = local_48.z;
+        cosRot = ptclPosMtx[0][0];
-    local_38[0][2] = local_38[1][2] = local_38[2][0] = local_38[2][1] = 0.0f;
+        MTXMultVec(work->mPosCamMtx, &pos, &pos);
-    GXLoadPosMtxImm(local_38, 0);
+    } else
-    p_prj[work->mPrjType](work, local_38);
+#endif
    {
        MTXMultVec(work->mPosCamMtx, &ptcl->mPosition, &pos);
        sinRot = JMASSin(ptcl->mRotateAngle);
        cosRot = JMASCos(ptcl->mRotateAngle);
    }
    f32 particleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
    f32 particleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
    Mtx posMtx;
    posMtx[0][0] = cosRot * particleX;
    posMtx[0][1] = -sinRot * particleY;
    posMtx[0][3] = pos.x;
    posMtx[1][0] = sinRot * particleX;
    posMtx[1][1] = cosRot * particleY;
    posMtx[1][3] = pos.y;
    posMtx[2][2] = 1.0f;
    posMtx[2][3] = pos.z;
    posMtx[0][2] = posMtx[1][2] = posMtx[2][0] = posMtx[2][1] = 0.0f;
    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
    p_prj[work->mPrjType](work, posMtx);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
 }
@@ -484,7 +532,7 @@ void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
    local_38[2][2] = work->mYBBCamMtx[2][2];
    local_38[2][3] = local_48.z;
    local_38[0][1] = local_38[0][2] = local_38[1][0] = local_38[2][0] = 0.0f;
-    GXLoadPosMtxImm(local_38, 0);
+    GXLoadPosMtxImm(local_38, GX_PNMTX0);
    p_prj[work->mPrjType](work, local_38);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
 }
@@ -517,7 +565,7 @@ void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
    local_38[2][1] = local_94 * fVar1;
    local_38[2][2] = local_90;
    local_38[2][3] = local_48.z;
-    GXLoadPosMtxImm(local_38, 0);
+    GXLoadPosMtxImm(local_38, GX_PNMTX0);
    p_prj[work->mPrjType](work, local_38);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
 }
@@ -681,103 +729,197 @@ static u8* p_dl[2] = {
    jpa_dl_x,
 };
-void JPADrawDirection(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
+#if TARGET_PC
-    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
+void JPAInterpDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    JGeometry::TVec3<f32> axisY;
    JGeometry::TVec3<f32> axisZ;
    p_direction[work->mDirType](work, ptcl, &axisY);
    if (axisY.isZero()) {
        return;
    }
-    ZoneScoped;
+    axisY.normalize();
    axisZ.cross(ptcl->mBaseAxis, axisY);
-    JGeometry::TVec3<f32> local_6c;
+    if (axisZ.isZero()) {
    JGeometry::TVec3<f32> local_78;
    p_direction[param_0->mDirType](param_0, param_1, &local_6c);
    if (local_6c.isZero()) {
        return;
    }
-    local_6c.normalize();
+    axisZ.normalize();
-    local_78.cross(param_1->mBaseAxis, local_6c);
+    ptcl->mBaseAxis.cross(axisY, axisZ);
-
+    ptcl->mBaseAxis.normalize();
-    if (local_78.isZero()) {
+    Mtx posMtx;
-        return;
+    f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
-    }
+    f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
-
+    posMtx[0][0] = ptcl->mBaseAxis.x;
-    local_78.normalize();
+    posMtx[0][1] = axisY.x;
-    param_1->mBaseAxis.cross(local_6c, local_78);
+    posMtx[0][2] = axisZ.x;
-    param_1->mBaseAxis.normalize();
+    posMtx[0][3] = ptcl->mPosition.x;
-    Mtx local_60;
+    posMtx[1][0] = ptcl->mBaseAxis.y;
-    f32 fVar1 = param_0->mGlobalPtclScl.x * param_1->mParticleScaleX;
+    posMtx[1][1] = axisY.y;
-    f32 fVar2 = param_0->mGlobalPtclScl.y * param_1->mParticleScaleY;
+    posMtx[1][2] = axisZ.y;
-    local_60[0][0] = param_1->mBaseAxis.x;
+    posMtx[1][3] = ptcl->mPosition.y;
-    local_60[0][1] = local_6c.x;
+    posMtx[2][0] = ptcl->mBaseAxis.z;
-    local_60[0][2] = local_78.x;
+    posMtx[2][1] = axisY.z;
-    local_60[0][3] = param_1->mPosition.x;
+    posMtx[2][2] = axisZ.z;
-    local_60[1][0] = param_1->mBaseAxis.y;
+    posMtx[2][3] = ptcl->mPosition.z;
-    local_60[1][1] = local_6c.y;
+    p_plane[work->mPlaneType](posMtx, scaleX, scaleY);
-    local_60[1][2] = local_78.y;
+    dusk::frame_interp::record_final_mtx(posMtx, ptcl);
    local_60[1][3] = param_1->mPosition.y;
    local_60[2][0] = param_1->mBaseAxis.z;
    local_60[2][1] = local_6c.z;
    local_60[2][2] = local_78.z;
    local_60[2][3] = param_1->mPosition.z;
    p_plane[param_0->mPlaneType](local_60, fVar1, fVar2);
    MTXConcat(param_0->mPosCamMtx, local_60, local_60);
    GXLoadPosMtxImm(local_60, 0);
    p_prj[param_0->mPrjType](param_0, local_60);
    GXCallDisplayList(p_dl[param_0->mDLType], sizeof(jpa_dl));
 }
-void JPADrawRotDirection(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
+void JPAInterpRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
-    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
+    f32 sinRot = JMASSin(ptcl->mRotateAngle);
    f32 cosRot = JMASCos(ptcl->mRotateAngle);
    JGeometry::TVec3<f32> axisY;
    JGeometry::TVec3<f32> axisZ;
    p_direction[work->mDirType](work, ptcl, &axisY);
    if (axisY.isZero()) {
        return;
    }
    axisY.normalize();
    axisZ.cross(ptcl->mBaseAxis, axisY);
    if (axisZ.isZero()) {
        return;
    }
    axisZ.normalize();
    ptcl->mBaseAxis.cross(axisY, axisZ);
    ptcl->mBaseAxis.normalize();
    f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
    f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
    Mtx mtx1;
    Mtx mtx2;
    p_rot[work->mRotType](sinRot, cosRot, mtx1);
    p_plane[work->mPlaneType](mtx1, scaleX, scaleY);
    mtx2[0][0] = ptcl->mBaseAxis.x;
    mtx2[0][1] = axisY.x;
    mtx2[0][2] = axisZ.x;
    mtx2[0][3] = ptcl->mPosition.x;
    mtx2[1][0] = ptcl->mBaseAxis.y;
    mtx2[1][1] = axisY.y;
    mtx2[1][2] = axisZ.y;
    mtx2[1][3] = ptcl->mPosition.y;
    mtx2[2][0] = ptcl->mBaseAxis.z;
    mtx2[2][1] = axisY.z;
    mtx2[2][2] = axisZ.z;
    mtx2[2][3] = ptcl->mPosition.z;
    MTXConcat(mtx2, mtx1, mtx1);
    dusk::frame_interp::record_final_mtx(mtx1, ptcl);
 }
 #endif
 void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
    ZoneScoped;
-    f32 sinRot = JMASSin(param_1->mRotateAngle);
+    Mtx posMtx;
-    f32 cosRot = JMASCos(param_1->mRotateAngle);
+#if TARGET_PC
-    JGeometry::TVec3<f32> local_6c;
+    if (!dusk::frame_interp::lookup_replacement(ptcl, posMtx))
-    JGeometry::TVec3<f32> local_78;
+#endif
-    p_direction[param_0->mDirType](param_0, param_1, &local_6c);
+    {
        JGeometry::TVec3<f32> axisY;
        JGeometry::TVec3<f32> axisZ;
        p_direction[work->mDirType](work, ptcl, &axisY);
-    if (local_6c.isZero()) {
+        if (axisY.isZero()) {
            return;
        }
        axisY.normalize();
        axisZ.cross(ptcl->mBaseAxis, axisY);
        if (axisZ.isZero()) {
            return;
        }
        axisZ.normalize();
        ptcl->mBaseAxis.cross(axisY, axisZ);
        ptcl->mBaseAxis.normalize();
        f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
        f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
        posMtx[0][0] = ptcl->mBaseAxis.x;
        posMtx[0][1] = axisY.x;
        posMtx[0][2] = axisZ.x;
        posMtx[0][3] = ptcl->mPosition.x;
        posMtx[1][0] = ptcl->mBaseAxis.y;
        posMtx[1][1] = axisY.y;
        posMtx[1][2] = axisZ.y;
        posMtx[1][3] = ptcl->mPosition.y;
        posMtx[2][0] = ptcl->mBaseAxis.z;
        posMtx[2][1] = axisY.z;
        posMtx[2][2] = axisZ.z;
        posMtx[2][3] = ptcl->mPosition.z;
        p_plane[work->mPlaneType](posMtx, scaleX, scaleY);
    }
    MTXConcat(work->mPosCamMtx, posMtx, posMtx);
    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
    p_prj[work->mPrjType](work, posMtx);
    GXCallDisplayList(p_dl[work->mDLType], sizeof(jpa_dl));
 }
 void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
-    local_6c.normalize();
+    ZoneScoped;
    local_78.cross(param_1->mBaseAxis, local_6c);
-    if (local_78.isZero()) {
+    Mtx mtx1;
-        return;
+    Mtx mtx2;
 #if TARGET_PC
    if (!dusk::frame_interp::lookup_replacement(ptcl, mtx1))
 #endif
    {
        f32 sinRot = JMASSin(ptcl->mRotateAngle);
        f32 cosRot = JMASCos(ptcl->mRotateAngle);
        JGeometry::TVec3<f32> axisY;
        JGeometry::TVec3<f32> axisZ;
        p_direction[work->mDirType](work, ptcl, &axisY);
        if (axisY.isZero()) {
            return;
        }
        axisY.normalize();
        axisZ.cross(ptcl->mBaseAxis, axisY);
        if (axisZ.isZero()) {
            return;
        }
        axisZ.normalize();
        ptcl->mBaseAxis.cross(axisY, axisZ);
        ptcl->mBaseAxis.normalize();
        f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
        f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
        p_rot[work->mRotType](sinRot, cosRot, mtx1);
        p_plane[work->mPlaneType](mtx1, scaleX, scaleY);
        mtx2[0][0] = ptcl->mBaseAxis.x;
        mtx2[0][1] = axisY.x;
        mtx2[0][2] = axisZ.x;
        mtx2[0][3] = ptcl->mPosition.x;
        mtx2[1][0] = ptcl->mBaseAxis.y;
        mtx2[1][1] = axisY.y;
        mtx2[1][2] = axisZ.y;
        mtx2[1][3] = ptcl->mPosition.y;
        mtx2[2][0] = ptcl->mBaseAxis.z;
        mtx2[2][1] = axisY.z;
        mtx2[2][2] = axisZ.z;
        mtx2[2][3] = ptcl->mPosition.z;
        MTXConcat(mtx2, mtx1, mtx1);
    }
-
+    MTXConcat(work->mPosCamMtx, mtx1, mtx2);
-    local_78.normalize();
+    GXLoadPosMtxImm(mtx2, GX_PNMTX0);
-    param_1->mBaseAxis.cross(local_6c, local_78);
+    p_prj[work->mPrjType](work, mtx2);
-    param_1->mBaseAxis.normalize();
+    GXCallDisplayList(p_dl[work->mDLType], sizeof(jpa_dl));
    f32 particleX = param_0->mGlobalPtclScl.x * param_1->mParticleScaleX;
    f32 particleY = param_0->mGlobalPtclScl.y * param_1->mParticleScaleY;
    Mtx auStack_80;
    Mtx local_60;
    p_rot[param_0->mRotType](sinRot, cosRot, auStack_80);
    p_plane[param_0->mPlaneType](auStack_80, particleX, particleY);
    local_60[0][0] = param_1->mBaseAxis.x;
    local_60[0][1] = local_6c.x;
    local_60[0][2] = local_78.x;
    local_60[0][3] = param_1->mPosition.x;
    local_60[1][0] = param_1->mBaseAxis.y;
    local_60[1][1] = local_6c.y;
    local_60[1][2] = local_78.y;
    local_60[1][3] = param_1->mPosition.y;
    local_60[2][0] = param_1->mBaseAxis.z;
    local_60[2][1] = local_6c.z;
    local_60[2][2] = local_78.z;
    local_60[2][3] = param_1->mPosition.z;
    MTXConcat(local_60, auStack_80, auStack_80);
    MTXConcat(param_0->mPosCamMtx, auStack_80, local_60);
    GXLoadPosMtxImm(local_60, 0);
    p_prj[param_0->mPrjType](param_0, local_60);
    GXCallDisplayList(p_dl[param_0->mDLType], sizeof(jpa_dl));
 }
 void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
@@ -204,6 +204,28 @@ void JPABaseParticle::init_c(JPAEmitterWorkData* work, JPABaseParticle* parent)
    mTexAnmIdx = 0;
 }
 #if TARGET_PC
 void JPABaseParticle::interp(JPAEmitterWorkData* work, void const* drawFunc) {
    static bool enable = false;
    if (!enable)
        return;
    // don't interpolate the first frame
    if (mAge == 0)
        return;
    if (drawFunc == JPADrawBillboard) {
        JPAInterpBillboard(work, this);
    } else if (drawFunc == JPADrawRotBillboard) {
        JPAInterpRotBillboard(work, this);
    } else if (drawFunc == JPADrawDirection) {
        JPAInterpDirection(work, this);
    } else if (drawFunc == JPADrawRotDirection) {
        JPAInterpRotDirection(work, this);
    }
 }
 #endif
 bool JPABaseParticle::calc_p(JPAEmitterWorkData* work) {
    if (++mAge >= mLifeTime) {
        return true;
@@ -247,6 +269,17 @@ bool JPABaseParticle::calc_p(JPAEmitterWorkData* work) {
                  mOffsetPosition.y + mLocalPosition.y * work->mPublicScale.y,
                  mOffsetPosition.z + mLocalPosition.z * work->mPublicScale.z);
 #if TARGET_PC
    JPABaseShape* pBsp = work->mpRes->getBsp();
    work->mGlobalPtclScl.x = work->mpEmtr->mGlobalPScl.x * pBsp->getBaseSizeX();
    work->mGlobalPtclScl.y = work->mpEmtr->mGlobalPScl.y * pBsp->getBaseSizeY();
    work->mDirType = pBsp->getDirType();
    work->mRotType = pBsp->getRotType();
    work->mDLType = pBsp->getType() == 4 || pBsp->getType() == 8;
    work->mPlaneType = work->mDLType ? 2 : pBsp->getBasePlaneType();
    interp(work, (void const*)work->mpRes->mpDrawParticleFuncList[0]);
 #endif
    return false;
 }
@@ -289,6 +322,23 @@ bool JPABaseParticle::calc_c(JPAEmitterWorkData* work) {
                  mOffsetPosition.y + mLocalPosition.y * work->mPublicScale.y,
                  mOffsetPosition.z + mLocalPosition.z * work->mPublicScale.z);
 #if TARGET_PC
    JPABaseShape* pBsp = work->mpRes->getBsp();
    JPAChildShape* pCsp = work->mpRes->getCsp();
    if (pCsp->isScaleInherited()) {
        work->mGlobalPtclScl.x = work->mpEmtr->mGlobalPScl.x * pBsp->getBaseSizeX();
        work->mGlobalPtclScl.y = work->mpEmtr->mGlobalPScl.y * pBsp->getBaseSizeY();
    } else {
        work->mGlobalPtclScl.x = work->mpEmtr->mGlobalPScl.x * pCsp->getScaleX();
        work->mGlobalPtclScl.y = work->mpEmtr->mGlobalPScl.y * pCsp->getScaleY();
    }
    work->mDirType = pCsp->getDirType();
    work->mRotType = pCsp->getRotType();
    work->mDLType = pCsp->getType() == 4 || pCsp->getType() == 8;
    work->mPlaneType = work->mDLType ? 2 : pCsp->getBasePlaneType();
    interp(work, (void const*)work->mpRes->mpDrawParticleChildFuncList[0]);
 #endif
    return false;
 }
@@ -38,3 +38,9 @@ bool JUTPalette::load() {
    return check;
 }
 #if TARGET_PC
 void JUTPalette::dataUploaded() {
    GXInitTlutObjData(&mTlutObj, (void*)mColorTable);
 }
 #endif
@@ -27,7 +27,7 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) {
            mTexData = (void*)((intptr_t)mTexInfo + 0x20);
        }
-        field_0x2c = NULL;
+        mPalette = NULL;
        mTlutName = 0;
        mWrapS = mTexInfo->wrapS;
        mWrapT = mTexInfo->wrapT;
@@ -95,7 +95,7 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, GXTlut p
    }
    mEmbPalette = param_1;
    setEmbPaletteDelFlag(false);
-    field_0x2c = NULL;
+    mPalette = NULL;
    if (param_1 != NULL) {
        mTlutName = param_2;
        if (param_2 != param_1->getTlutName()) {
@@ -120,11 +120,11 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, GXTlut p
 void JUTTexture::attachPalette(JUTPalette* param_0) {
    if (mTexInfo->indexTexture) {
        if (param_0 == NULL && mEmbPalette != NULL) {
-            field_0x2c = mEmbPalette;
+            mPalette = mEmbPalette;
        } else {
-            field_0x2c = param_0;
+            mPalette = param_0;
        }
-        initTexObj(field_0x2c->getTlutName());
+        initTexObj(mPalette->getTlutName());
    }
 }
@@ -133,9 +133,9 @@ void JUTTexture::init() {
        initTexObj();
    } else {
        if (mEmbPalette != NULL) {
-            field_0x2c = mEmbPalette;
+            mPalette = mEmbPalette;
-            initTexObj(field_0x2c->getTlutName());
+            initTexObj(mPalette->getTlutName());
        } else {
            OS_REPORT("This texture is CI-Format, but EmbPalette is NULL.\n");
        }
@@ -179,8 +179,8 @@ void JUTTexture::initTexObj(GXTlut param_0) {
 }
 void JUTTexture::load(GXTexMapID param_0) {
-    if (field_0x2c) {
+    if (mPalette) {
-        field_0x2c->load();
+        mPalette->load();
    }
    GXLoadTexObj(&mTexObj, param_0);
 }
@@ -0,0 +1,237 @@
 *, *:before, *:after {
    box-sizing: border-box;
 }
 body {
    overflow: visible;
    width: 100%;
    height: 100%;
    margin: 0;
    padding: 0;
    font-family: "Fira Sans";
    font-weight: normal;
    font-size: 20dp;
    color: #E0DBC8;
    display: flex;
    flex-direction: column;
    justify-content: flex-end;
    align-items: stretch;
    z-index: 1;
    pointer-events: none;
 }
 toast {
    position: absolute;
    top: 40dp;
    right: 40dp;
    display: flex;
    flex-flow: column;
    border-radius: 14dp;
    overflow: hidden;
    border: 1dp #92875B;
    backdrop-filter: blur(5dp);
    box-shadow: 0 0 15dp 3dp;
    background-color: rgba(21, 22, 16, 80%);
    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%);
 }
 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;
 }
 toast heading > span {
    flex: 1 0 auto;
 }
 toast heading > row {
    flex: 1 0 auto;
    display: flex;
    align-items: center;
    gap: 4dp;
 }
 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;
 }
 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;
    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);
 }
 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);
    }
 }
@@ -0,0 +1,45 @@
 *, *:before, *:after {
    box-sizing: border-box;
 }
 body {
    overflow: visible;
    width: 100%;
    height: 100%;
    margin: 0;
    padding: 0;
    font-family: "Fira Sans Condensed";
    font-weight: bold;
    font-size: 18dp;
    color: #E0DBC8;
 }
 button {
    cursor: pointer;
    focus: auto;
 }
 popup {
    width: 100%;
    display: flex;
    align-items: stretch;
    height: 64dp;
    background-color: rgba(21, 22, 16, 80%);
    border-bottom: 2dp #92875B;
    backdrop-filter: blur(5dp);
    transform: translateY(-64dp);
    transition: transform 0.2s cubic-in-out;
 }
 popup[open] {
    transform: translateY(0);
 }
 popup tab-bar {
    flex: 1 1 0;
 }
 popup tab-bar tab {
    opacity: 0.35;
    color: #E0DBC8;
 }
@@ -0,0 +1,324 @@
 *, *:before, *:after {
    box-sizing: border-box;
 }
 body {
    width: 100%;
    height: 100%;
    font-family: "Fira Sans";
    font-weight: normal;
    font-size: 20dp;
    color: #FFFFFF;
    filter: opacity(0);
    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%;
    height: 100%;
    filter: opacity(0);
    transition: filter 0.2s linear-in-out;
 }
 content[open] {
    filter: opacity(1);
 }
 menu {
    position: absolute;
    left: 96dp;
    right: auto;
    top: 50%;
    transform: translateY(-50%);
    /* Scale based on a reference screen width, 428/1216 */
    width: 35.230264vw;
    min-width: 428dp;
    max-width: 856dp;
    height: auto;
    display: flex;
    flex-direction: column;
    gap: 48dp;
 }
 body.mirrored menu {
    left: auto;
    right: 96dp;
 }
 hero {
    display: flex;
    flex-direction: column;
    justify-content: center;
    align-items: flex-start;
    gap: 8dp;
 }
 body.mirrored hero {
    align-items: flex-end;
 }
 hero img {
    width: 100%;
 }
 .eyebrow {
    font-family: "Alegreya SC";
    font-size: 32dp;
 }
@media (min-width: 1216dp) {
    .eyebrow {
        /* Same logic as .menu, 32/1216 */
        font-size: 2.631579vw;
    }
 }
 .eyebrow span {
    font-weight: bold;
 }
 #menu-list {
    display: flex;
    flex-direction: column;
    gap: 12dp;
    align-items: flex-start;
 }
 #menu-list button {
    width: 428dp;
    height: 54dp;
    padding: 8dp 16dp;
    border-radius: 8dp;
    text-align: left;
    text-transform: uppercase;
    font-family: "Fira Sans Condensed";
    font-size: 32dp;
    font-weight: normal;
    cursor: pointer;
    /* Define a fully transparent gradient as the default state, otherwise a white flash occurs */
    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 opacity 0.1s linear-in-out;
 }
 #menu-list button:hover,
 #menu-list button:focus-visible {
    color: black;
    decorator: horizontal-gradient(#FEE685FF #FEE68500);
 }
 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: 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: 12dp;
    text-align: right;
    font-size: 24dp;
    font-effect: glow(0dp 4dp 0dp 4dp black);
    text-align: right;
 }
 body.mirrored version-info {
    right: auto;
    left: 96dp;
    text-align: left;
 }
 #disc-status {
    display: flex;
    align-items: center;
    gap: 8dp;
 }
 #disc-status[status=good] {
    color: #D8F999;
 }
 #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,
 .update span {
    color: #A6A09B;
 }
 /* Startup animation */
 .intro-item {
    opacity: 0;
    transform: translateY(10dp);
    transition: opacity transform 0.3s 0.1s cubic-in-out;
 }
 body.animate-in .intro-item {
    opacity: 1;
    transform: translateY(0dp);
 }
 .delay-0 {
    transition: opacity transform 0.3s 0.1s cubic-in-out;
 }
 .delay-1 {
    transition: opacity transform 0.3s 0.2s cubic-in-out;
 }
 .delay-2 {
    transition: opacity transform 0.3s 0.3s cubic-in-out;
 }
 .delay-3 {
    transition: opacity transform 0.3s 0.4s cubic-in-out;
 }
 .delay-4 {
    transition: opacity transform 0.3s 0.5s cubic-in-out;
 }
 .delay-5 {
    transition: opacity transform 0.3s 0.6s cubic-in-out;
 }
@@ -0,0 +1,81 @@
 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;
    line-height: 64dp;
    white-space: nowrap;
    decorator: vertical-gradient(#c2a42d00 #c2a42d00);
    transition: decorator 0.1s linear-in-out, opacity 0.1s linear-in-out;
    cursor: pointer;
 }
 tab-bar tab:selected {
    opacity: 1;
    border-bottom: 4dp #C2A42D;
    font-effect: glow(0dp 4dp 0dp 4dp black);
 }
 tab-bar tab:focus-visible,
 tab-bar tab:hover {
    opacity: 1;
    font-effect: glow(0dp 4dp 0dp 4dp black);
    decorator: vertical-gradient(#c2a42d00 #c2a42d26);
 }
 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;
 }
@@ -0,0 +1,484 @@
 *, *:before, *:after {
    box-sizing: border-box;
 }
 body {
    display: flex;
    width: 100%;
    height: 100%;
    padding: 64dp;
    font-family: "Fira Sans";
    font-weight: normal;
    font-style: normal;
    font-size: 15dp;
    color: #E0DBC8;
 }
 window {
    display: flex;
    flex-flow: column;
    height: 100%;
    width: 100%;
    max-width: 1088dp;
    max-height: 768dp;
    margin: auto;
    border-radius: 14dp;
    overflow: hidden;
    border: 2dp #92875B;
    backdrop-filter: blur(5dp);
    box-shadow: 0 0 25dp 5dp;
    background-color: rgba(21, 22, 16, 90%);
    filter: opacity(0);
    transform: scale(0.9);
    transform-origin: center;
    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);
 }
@media (max-height: 640dp) {
    body {
        padding: 16dp;
    }
    window {
        box-shadow: none;
    }
 }
 window tab-bar {
    flex: 0 0 64dp;
    height: 64dp;
    background-color: rgba(217, 217, 217, 10%);
    font-family: "Fira Sans Condensed";
    font-weight: bold;
    font-size: 18dp;
    border-bottom: 2dp #92875B;
 }
 window tab-bar tab {
    opacity: 0.25;
 }
 window content {
    display: flex;
    flex: 1 1 auto;
    min-width: 0;
    min-height: 0;
    overflow: hidden;
 }
 window content pane {
    display: flex;
    flex-flow: column;
    flex: 1 1 0;
    min-width: 0;
    min-height: 0;
    padding: 24dp;
    padding-bottom: 0dp;
    gap: 8dp;
    overflow: hidden auto;
    font-size: 20dp;
 }
 window content pane:not(:last-of-type) {
    border-right: 1dp #92875B;
 }
 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. */
    flex: 0 0 16dp;
    height: 16dp;
    pointer-events: none;
 }
 scrollbarvertical {
    width: 8dp;
    margin: 4dp 4dp 4dp 0;
 }
 scrollbarvertical sliderarrowdec,
 scrollbarvertical sliderarrowinc {
    width: 0;
    height: 0;
 }
 scrollbarvertical slidertrack {
    width: 8dp;
 }
 scrollbarvertical sliderbar {
    width: 8dp;
    min-height: 24dp;
    background-color: rgba(224, 219, 200, 45%);
    border-radius: 2dp;
    transition: background-color 0.2s cubic-in-out;
 }
 scrollbarvertical sliderbar:hover,
 scrollbarvertical sliderbar:active {
    background-color: rgba(194, 164, 45, 80%);
 }
 scrollbarhorizontal {
    height: 0;
 }
 scrollbarhorizontal sliderarrowdec,
 scrollbarhorizontal sliderarrowinc {
    width: 0;
    height: 0;
 }
 scrollbarhorizontal slidertrack,
 scrollbarhorizontal sliderbar {
    width: 0;
    height: 0;
 }
 .section-heading {
    font-family: "Fira Sans Condensed";
    font-weight: bold;
    text-transform: uppercase;
    font-size: 22dp;
    opacity: 0.25;
 }
 .section-heading:not(:first-of-type) {
    padding-top: 12dp;
 }
 button {
    text-align: center;
    background-color: rgba(17, 16, 10, 20%);
    opacity: 0.9;
    padding: 8dp 16dp;
    border-radius: 14dp;
    box-shadow: rgba(146, 135, 91, 25%) 0 0 0 1dp;
    font-size: 20dp;
    transition: background-color 0.1s linear-in-out, opacity 0.1s linear-in-out;
    cursor: pointer;
    focus: auto;
 }
 button:not(:disabled):hover,
 button:not(:disabled):focus-visible {
    background-color: rgba(204, 184, 119, 20%);
    box-shadow: #C2A42D 0 0 0 2dp;
 }
 button:not(:disabled):selected {
    opacity: 1;
    background-color: rgba(204, 184, 119, 40%);
 }
 button:not(:disabled):active {
    opacity: 1;
    background-color: rgba(204, 184, 119, 40%);
    box-shadow: #C2A42D 0 0 0 2dp;
 }
 button.modal-btn {
    flex: 1 1 0;
    text-align: center;
 }
 select-button {
    display: flex;
    align-items: center;
    gap: 8dp;
    background-color: rgba(17, 16, 10, 20%);
    opacity: 0.9;
    padding: 8dp 16dp;
    border-radius: 14dp;
    box-shadow: rgba(146, 135, 91, 25%) 0 0 0 1dp;
    transition: background-color 0.1s linear-in-out, opacity 0.1s linear-in-out;
    cursor: pointer;
    focus: auto;
 }
 select-button:not(:disabled):hover,
 select-button:not(:disabled):focus-visible {
    background-color: rgba(204, 184, 119, 20%);
    box-shadow: #C2A42D 0 0 0 2dp;
 }
 select-button:not(:disabled):selected {
    opacity: 1;
    background-color: rgba(204, 184, 119, 40%);
 }
 select-button:not(:disabled):active {
    opacity: 1;
    background-color: rgba(204, 184, 119, 40%);
    box-shadow: #C2A42D 0 0 0 2dp;
 }
 select-button:disabled {
    opacity: 0.35;
    cursor: default;
 }
 select-button key {
    font-family: "Fira Sans Condensed";
    font-weight: bold;
    font-size: 18dp;
    text-transform: uppercase;
    flex: 0 1 auto;
 }
 select-button value {
    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);
 }
 .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%);
 }
 progressbar {
    display: block;
    width: 100%;
    height: 6dp;
    border-radius: 3dp;
    background-color: rgba(255, 255, 255, 10%);
    margin: 6dp 0 2dp 0;
 }
 progressbar.progress-done fill {
    background-color: #44aa22;
    border-radius: 3dp;
 }
 progressbar.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;
 }
 .verification-progress {
    display: flex;
    flex-direction: column;
    gap: 10dp;
    width: 100%;
 }
 .verification-file {
    display: block;
    font-size: 17dp;
    color: #FFFFFF;
 }
 progressbar.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;
 }
@@ -468,9 +468,20 @@ s16 cLib_targetAngleX(cXyz const* lhs, cXyz const* rhs) {
 void cLib_offsetPos(cXyz* pdest, cXyz const* psrc, s16 angle, cXyz const* vec) {
    f32 cos = cM_scos(angle);
    f32 sin = cM_ssin(angle);
    // MWCC loads vec members into registers before writing to pdest; other compilers may not,
    // which corrupts results when pdest and vec alias the same memory.
 #if !__MWERKS__
    f32 vx = vec->x;
    f32 vy = vec->y;
    f32 vz = vec->z;
    pdest->x = psrc->x + (vx * cos + vz * sin);
    pdest->y = psrc->y + vy;
    pdest->z = psrc->z + (vz * cos - vx * sin);
 #else
    pdest->x = psrc->x + (vec->x * cos + vec->z * sin);
    pdest->y = psrc->y + vec->y;
    pdest->z = psrc->z + (vec->z * cos - vec->x * sin);
 #endif
 }
 /**
@@ -1,5 +1,10 @@
 #include "Z2AudioLib/Z2Audience.h"
 #include "Z2AudioLib/Z2SoundInfo.h"
 #if TARGET_PC
 #include "dusk/audio/DuskDsp.hpp"
 #include "dusk/settings.h"
 #include <cmath>
 #endif
 #include "Z2AudioLib/Z2Calc.h"
 #include "Z2AudioLib/Z2Param.h"
 #include "JSystem/JAudio2/JAISound.h"
@@ -701,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) {
@@ -734,9 +744,22 @@ f32 Z2Audience::calcRelPosPan(const Vec& param_0, int camID) {
 f32 Z2Audience::calcRelPosDolby(const Vec& param_0, int camID) {
    f32 fVar1 = param_0.z + mAudioCamera[camID].getDolbyCenterZ();
 #if TARGET_PC
    if (dusk::audio::EnableHrtf) {
        // Normalize the direction so result is purely front/back orientation,
        // independent of how far away the sound is
        f32 lenSq = param_0.x * param_0.x + param_0.y * param_0.y + param_0.z * param_0.z;
        if (lenSq < 0.0001f) {
            return 0.5f;
        }
        f32 zNorm = param_0.z / sqrtf(lenSq);
        f32 t = (zNorm + 1.0f) * 0.5f;
        return 0.5f - 0.5f * cosf(t * static_cast<f32>(M_PI));
    }
 #endif
    if (fVar1 > mSetting.field_0x48) {
        return 1.0f;
-    } 
+    }
    if (fVar1 < mSetting.field_0x44) {
        return 0.0f;
@@ -4962,13 +4962,16 @@ int daAlink_c::create() {
        setArcName(checkWolf());
        setOriginalHeap(&mpArcHeap, 0xA2800);
        JKRHEAP_NAME(mpArcHeap, "Alink ArcHeap");
        if (dComIfG_resLoad(&mPhaseReq, mArcName, mpArcHeap) != cPhs_COMPLEATE_e) {
            return cPhs_INIT_e;
        }
        setShieldArcName();
        setOriginalHeap(&mpShieldArcHeap, 0x7000);
-        if (dComIfG_resLoad(&mShieldPhaseReq, mShieldArcName, mpShieldArcHeap) != cPhs_COMPLEATE_e) {
+        JKRHEAP_NAME(mpShieldArcHeap, "Alink ShieldArcHeap");
        if (dComIfG_resLoad(&mShieldPhaseReq, mShieldArcName, mpShieldArcHeap) != cPhs_COMPLEATE_e)
        {
            return cPhs_INIT_e;
        }
@@ -5877,6 +5880,11 @@ void daAlink_c::setItemMatrix(int param_0) {
    modelCalc(mSheathModel);
    int var_r26;
    #if AVOID_UB
    var_r26 = 0;
    #endif
    if (!checkNoResetFlg3(FLG3_UNK_4000000)) {
        if (mEquipItem == 0x103 || param_0 != 0) {
            mSwordModel->setBaseTRMtx(mpLinkModel->getAnmMtx(mLeftItemJntNo));
@@ -18936,11 +18944,20 @@ void daAlink_c::setDrawHand() {
    mpLinkHandModel->setBaseTRMtx(mpLinkModel->getBaseTRMtx());
    mpLinkHandModel->calc();
 #if TARGET_PC
    // FRAME INTERP NOTE: Always set these, otherwise the hands occasionally zip to origin.
    // Doing it regardless of interpolation being active seems harmless.
    mpLinkHandModel->setAnmMtx(1, mpLinkModel->getAnmMtx(9));
    mpLinkHandModel->setAnmMtx(2, mpLinkModel->getAnmMtx(0xE));
 #endif
    if (var_r30 == 0xFE || var_r30 == 0xFB) {
        field_0x06d0 = field_0x06d8;
    } else {
        field_0x06d0 = mpLinkHandModel->getModelData()->getMaterialNodePointer(var_r30)->getShape();
 #if !TARGET_PC
        mpLinkHandModel->setAnmMtx(1, mpLinkModel->getAnmMtx(9));
 #endif
    }
    if (var_r30 == 0xFB) {
@@ -18959,7 +18976,9 @@ void daAlink_c::setDrawHand() {
        field_0x06d4 = field_0x06dc;
    } else {
        field_0x06d4 = mpLinkHandModel->getModelData()->getMaterialNodePointer(var_r29)->getShape();
 #if !TARGET_PC
        mpLinkHandModel->setAnmMtx(2, mpLinkModel->getAnmMtx(0xE));
 #endif
    }
    if (var_r29 == 0xFB) {
@@ -8,6 +8,10 @@
 #include "d/actor/d_a_horse.h"
 #include "d/actor/d_a_crod.h"
 #include "d/d_msg_object.h"
 #ifdef TARGET_PC
 #include "d/actor/d_a_obj_carry.h"
 #include "dusk/achievements.h"
 #endif
 #if DEBUG
 #include "d/d_s_menu.h"
@@ -677,6 +681,15 @@ BOOL daAlink_c::checkDamageAction() {
            }
            setDamagePoint(dmg, at_mtrl == dCcD_MTRL_FIRE || at_mtrl == dCcD_MTRL_ICE, TRUE, 0);
 #ifdef TARGET_PC
            if (tghit_ac_name == fpcNm_Obj_Carry_e) {
                auto* carry = static_cast<daObjCarry_c*>(tghit_ac);
                if (carry->prm_chk_type_ironball() && carry->checkCannon()) {
                    dusk::AchievementSystem::get().signal("iron_ball_hit_player");
                }
            }
 #endif
            if (armor_no_dmg && at_mtrl != dCcD_MTRL_ELECTRIC && at_mtrl != dCcD_MTRL_ICE) {
                setGuardSe(var_r29);
@@ -23,6 +23,7 @@
 #include "d/actor/d_a_npc_tkc.h"
 #include <cstring>
 #include "dusk/imgui/ImGuiConsole.hpp"
 #include "dusk/settings.h"
 BOOL daAlink_c::checkEventRun() const {
@@ -4005,6 +4006,15 @@ int daAlink_c::procGanonFinishInit() {
    field_0x37c8 = current.pos;
    onEndResetFlg1(ERFLG1_SHIELD_BACKBONE);
 #if TARGET_PC
    if (dusk::getSettings().game.speedrunMode) {
        if (dusk::m_speedrunInfo.m_isRunStarted) {
            dusk::m_speedrunInfo.stopRun();
        }
    }
 #endif
    return 1;
 }
@@ -44,16 +44,14 @@ void daAlink_c::handleWolfHowl() {
        bool canHowl = false;
        if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn()) {
-            if (!checkForestOldCentury()) {
+            if (checkMidnaRide()) {
-                if (checkMidnaRide()) {
+                if ((checkWolf() &&
-                    if ((checkWolf() &&
+                     (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
-                         (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
+                    (!checkWolf() &&
-                        (!checkWolf() &&
+                     (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
-                         (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
+                     (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
-                         (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
+                {
-                    {
+                    canHowl = true;
                        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 (checkMidnaRide()) {
+            if ((checkWolf() &&
-                if ((checkWolf() &&
+                 (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
-                     (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) ||
+                (!checkWolf() &&
-                    (!checkWolf() &&
+                 (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
-                     (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) &&
+                 (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
-                     (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10))))
+            {
-                {
+                canTransform = true;
                    canTransform = true;
                }
            }
        }
    }
@@ -18,6 +18,10 @@ enum {
 };
 void daAlink_c::hsChainShape_c::draw() {
    if (dusk::getSettings().game.superClawshot) {
        return;
    }
    static const int dummy = 0;
    daAlink_c* alink = (daAlink_c*)getUserArea();
@@ -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,12 +41,11 @@ 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();
        JKRExpHeap* heap = JKRExpHeap::create(size + (var_r29 + var_r28), parent, true);
        JKRHEAP_NAME(heap, "Alink original");
        *i_ppheap = heap;
    }
 }
@@ -17,6 +17,9 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "dusk/frame_interpolation.h"
 #include "dusk/settings.h"
 class daB_GND_HIO_c : public JORReflexible {
 public:
    daB_GND_HIO_c();
@@ -279,6 +282,30 @@ static int h_nodeCallBack(J3DJoint* i_joint, int param_2) {
    return 1;
 }
 #if TARGET_PC
 static void b_gnd_rein_interp_callback(bool isSimFrame, void* pUserWork) {
    b_gnd_class* i_this = (b_gnd_class*)pUserWork;
    if (!i_this->mReinsInterpPrevValid || !i_this->mReinsInterpCurrValid) {
        return;
    }
    const f32 alpha = dusk::frame_interp::get_interpolation_step();
    for (int r = 0; r < 2; r++) {
        cXyz* dst = i_this->mHorseReins[r].getPos(0);
        for (int i = 0; i < 16; i++) {
            const cXyz& p0 = i_this->mReinsInterpPrev[r][i];
            const cXyz& p1 = i_this->mReinsInterpCurr[r][i];
            dst[i] = p0 + (p1 - p0) * alpha;
        }
    }
    cXyz* dst = i_this->field_0x21e8.getPos(0);
    for (int i = 0; i < 2; i++) {
        const cXyz& p0 = i_this->mReinsTexInterpPrev[i];
        const cXyz& p1 = i_this->mReinsTexInterpCurr[i];
        dst[i] = p0 + (p1 - p0) * alpha;
    }
 }
 #endif
 static int daB_GND_Draw(b_gnd_class* i_this) {
    fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
@@ -366,6 +393,21 @@ static int daB_GND_Draw(b_gnd_class* i_this) {
        i_this->field_0x21e8.update(2, l_color, &a_this->tevStr);
        dComIfGd_set3DlineMat(&i_this->field_0x21e8);
 #if TARGET_PC
        if (dusk::getSettings().game.enableFrameInterpolation) {
            if (i_this->mReinsInterpCurrValid) {
                memcpy(i_this->mReinsInterpPrev, i_this->mReinsInterpCurr, sizeof(i_this->mReinsInterpCurr));
                memcpy(i_this->mReinsTexInterpPrev, i_this->mReinsTexInterpCurr, sizeof(i_this->mReinsTexInterpCurr));
                i_this->mReinsInterpPrevValid = true;
            }
            for (int r = 0; r < 2; r++) {
                memcpy(i_this->mReinsInterpCurr[r], i_this->mHorseReins[r].getPos(0), 16 * sizeof(cXyz));
            }
            memcpy(i_this->mReinsTexInterpCurr, i_this->field_0x21e8.getPos(0), 2 * sizeof(cXyz));
            i_this->mReinsInterpCurrValid = true;
            dusk::frame_interp::add_interpolation_callback(&b_gnd_rein_interp_callback, i_this);
        }
 #endif
    }
    return 1;
@@ -1189,10 +1231,16 @@ static void b_gnd_h_end(b_gnd_class* i_this) {
            if (i_this->mDemoCamMode < 32) {
                i_this->mDemoCamMode = 32;
 #if TARGET_PC
                i_this->mDemoCamSyncTicks = 2;
 #endif
            } else {
                i_this->mDemoCamMode = 34;
                i_this->mDemoCamTimer = 0;
                i_this->mMoveMode = 2;
 #if TARGET_PC
                i_this->mDemoCamSyncTicks = 2;
 #endif
            }
        }
        break;
@@ -2887,6 +2935,9 @@ static void demo_camera(b_gnd_class* i_this) {
    cXyz spF0;
    s8 sp8 = false;
 #if TARGET_PC
    const s16 entry_demo_cam_mode = i_this->mDemoCamMode;
 #endif
    switch (i_this->mDemoCamMode) {
    case 0:
        break;
@@ -3725,6 +3776,15 @@ static void demo_camera(b_gnd_class* i_this) {
            i_this->mDemoCamTimer = 10000;
        }
    }
 #if TARGET_PC
    if (entry_demo_cam_mode != i_this->mDemoCamMode) {
        i_this->mDemoCamSyncTicks = 2;
    }
    if (i_this->mDemoCamSyncTicks > 0) {
        dusk::frame_interp::request_presentation_sync();
        i_this->mDemoCamSyncTicks--;
    }
 #endif
 }
 static void anm_se_set(b_gnd_class* i_this) {
@@ -6,6 +6,7 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_balloon_2D.h"
 #include "dusk/frame_interpolation.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
@@ -438,7 +439,12 @@ void daBalloon2D_c::setComboAlpha() {
 void daBalloon2D_c::drawAddScore() {
    for (s32 i = 19; i >= 0; i--) {
        if (field_0x5f8[i].field_0xe != 0) {
-            field_0x5f8[i].field_0xe--;
+#ifdef TARGET_PC
            if (dusk::frame_interp::get_ui_tick_pending())
 #endif
            {
                field_0x5f8[i].field_0xe--;
            }
            s32 score3;
            s32 score2;
            s32 score = field_0x5f8[i].field_0xc;
@@ -446,8 +452,13 @@ void daBalloon2D_c::drawAddScore() {
            u8 local_88 = 0xff;
            f32 dVar11 = 30.0f;
            f32 dVar9 = 30.0f;
-            field_0x5f8[i].field_0x0.x += cM_ssin(temp0) * 0.3f;
+#ifdef TARGET_PC
-            field_0x5f8[i].field_0x0.y -= 1.0f;
+            if (dusk::frame_interp::get_ui_tick_pending())
 #endif
            {
                field_0x5f8[i].field_0x0.x += cM_ssin(temp0) * 0.3f;
                field_0x5f8[i].field_0x0.y -= 1.0f;
            }
            if (field_0x5f8[i].field_0xe < 10) {
                f32 fVar5 = field_0x5f8[i].field_0xe / 10.0f;
                local_88 = fVar5 * 255.0f;
@@ -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;
@@ -17,6 +17,11 @@
 #include <cstdio>
 #include <cstring>
 #if TARGET_PC
 #include <f_ap/f_ap_game.h>
 #include <dusk/autosave.h>
 #endif
 char* daDoor20_c::getStopBmdName() {
    switch (door_param2_c::getKind(this)) {
        case 3:
@@ -196,6 +201,7 @@ void daDoor20_c::setEventPrm() {
    } else {
        roomNo = FRoomNo;
    }
    if (dComIfGp_roomControl_checkStatusFlag(roomNo, 1)) {
        if (door_param2_c::getKind(this) == 9) {
            if (daPy_py_c::checkNowWolf()) {
@@ -564,6 +570,11 @@ int daDoor20_c::openEnd(int param_1) {
        openEnd_1();
        break;
    }
    #if TARGET_PC
    triggerAutoSave();
    #endif
    return 1;
 }
@@ -12,6 +12,8 @@
 #include "d/d_bomb.h"
 #include "c/c_damagereaction.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "dusk/frame_interpolation.h"
 #include "dusk/settings.h"
 #define ACTION_STANDBY    0
 #define ACTION_WALK1      1
@@ -63,6 +65,22 @@ static void anm_init(e_mb_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32
    i_this->mAnm = i_anmID;
 }
 #if TARGET_PC
 static void e_mb_rope_interp_callback(bool isSimFrame, void* pUserWork) {
    e_mb_class* i_this = (e_mb_class*)pUserWork;
    if (!i_this->mRopeInterpPrevValid || !i_this->mRopeInterpCurrValid) {
        return;
    }
    const f32 alpha = dusk::frame_interp::get_interpolation_step();
    cXyz* dst = i_this->mRopeMat.getPos(0);
    for (int i = 0; i < 16; i++) {
        const cXyz& p0 = i_this->mRopeInterpPrev[i];
        const cXyz& p1 = i_this->mRopeInterpCurr[i];
        dst[i] = p0 + (p1 - p0) * alpha;
    }
 }
 #endif
 static int daE_MB_Draw(e_mb_class* i_this) {
    fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
@@ -86,6 +104,17 @@ static int daE_MB_Draw(e_mb_class* i_this) {
    static GXColor l_color = {0x14, 0x0F, 0x00, 0xFF};
    i_this->mRopeMat.update(16, l_color, &a_this->tevStr);
    dComIfGd_set3DlineMat(&i_this->mRopeMat);
 #if TARGET_PC
    if (dusk::getSettings().game.enableFrameInterpolation) {
        if (i_this->mRopeInterpCurrValid) {
            memcpy(i_this->mRopeInterpPrev, i_this->mRopeInterpCurr, sizeof(i_this->mRopeInterpCurr));
            i_this->mRopeInterpPrevValid = true;
        }
        memcpy(i_this->mRopeInterpCurr, i_this->mRopeMat.getPos(0), 16 * sizeof(cXyz));
        i_this->mRopeInterpCurrValid = true;
        dusk::frame_interp::add_interpolation_callback(&e_mb_rope_interp_callback, i_this);
    }
 #endif
    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;
@@ -14,6 +14,10 @@
 #include "f_op/f_op_camera_mng.h"
 #include <cstring>
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
 #endif
 class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c {
 public:
    daE_SM2_HIO_c();
@@ -76,8 +80,62 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
    return 1;
 }
 #if TARGET_PC
 static void daE_SM2_interp_callback(bool isSimFrame, void* pUserWork) {
    e_sm2_class* i_this = static_cast<e_sm2_class*>(pUserWork);
    if (i_this == NULL) {
        return;
    }
    fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
    g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr);
    if (!i_this->isPiece) {
        if (i_this->modelMorf == NULL) {
            return;
        }
        J3DModel* model = i_this->modelMorf->getModel();
        if (model == NULL) {
            return;
        }
        g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr);
        J3DMaterial* material = model->getModelData()->getMaterialNodePointer(0);
        material->getTevKColor(1)->r = i_this->color_R;
        material->getTevKColor(1)->g = i_this->color_G;
        material->getTevKColor(1)->b = i_this->color_B;
        material->getTevKColor(1)->a = 217.0f * i_this->color_alpha;
        if (i_this->pbtk != NULL) {
            i_this->pbtk->entry(model->getModelData());
        }
    } else {
        if (i_this->pieceModelMorf == NULL) {
            return;
        }
        J3DModel* model = i_this->pieceModelMorf->getModel();
        if (model == NULL) {
            return;
        }
        J3DMaterial* material = model->getModelData()->getMaterialNodePointer(0);
        material->getTevKColor(1)->r = i_this->color_R;
        material->getTevKColor(1)->g = i_this->color_G;
        material->getTevKColor(1)->b = i_this->color_B;
        material->getTevKColor(1)->a = 217.0f * i_this->color_alpha;
        g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr);
    }
 }
 #endif
 static int daE_SM2_Draw(e_sm2_class* i_this) {
    fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
 #if TARGET_PC
    dusk::frame_interp::add_interpolation_callback(&daE_SM2_interp_callback, i_this);
 #endif
    g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr);
    J3DModel* model;
@@ -282,6 +282,11 @@ static void e_th_spin_B(e_th_class* i_this) {
    i_this->current.pos += spC;
    f32 speed_target;
    #if AVOID_UB
    speed_target = 0;
    #endif
    f32 anm_frame = i_this->mpModelMorf->getFrame();
    switch (i_this->mMode) {
@@ -1069,7 +1069,7 @@ void daE_YM_c::executeDown() {
            if (mAcch.ChkGroundHit()) {
                if (mFlyType != 1) {
                    #if TARGET_PC
-                    bckSet(6, 0, 0.0f, dusk::getSettings().game.fastTears && dComIfGp_event_getMode() == 0 ? 2.0f : 1.0f);
+                    bckSet(6, 0, 0.0f, dusk::getSettings().game.fastTears ? 2.0f : 1.0f);
                    #else
                    bckSet(6, 0, 0.0f, 1.0f);
                    #endif
@@ -1093,7 +1093,7 @@ void daE_YM_c::executeDown() {
                mSound.startCreatureSound(Z2SE_CM_BODYFALL_WATER_M, 0, -1);
                mSound.startCreatureSound(Z2SE_EN_YM_MOGAKU, 0, -1);
                #if TARGET_PC
-                bckSet(6, 0, 0.0f, dusk::getSettings().game.fastTears && dComIfGp_event_getMode() == 0 ? 2.0f : 1.0f);
+                bckSet(6, 0, 0.0f, dusk::getSettings().game.fastTears ? 2.0f : 1.0f);
                #else
                bckSet(6, 0, 0.0f, 1.0f);
                #endif
@@ -1115,7 +1115,7 @@ void daE_YM_c::executeDown() {
                    || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5)
            {
                    #if TARGET_PC
-                    bckSet(6, 0, 0.0f, dusk::getSettings().game.fastTears && dComIfGp_event_getMode() == 0 ? 2.0f : 1.0f);
+                    bckSet(6, 0, 0.0f, dusk::getSettings().game.fastTears ? 2.0f : 1.0f);
                    #else
                    bckSet(6, 0, 0.0f, 1.0f);
                    #endif
@@ -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;
@@ -13,9 +13,12 @@
 #if TARGET_PC
 #include "dusk/dvd_asset.hpp"
 #include "dusk/frame_interpolation.h"
-static u8* l_Egnd_mantTEX_get()   { alignas(32) static u8 buf[0x4000]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", 0x1C00, 0x4000), true); return buf; }
+
-static u8* l_Egnd_mantTEX_U_get() { alignas(32) static u8 buf[0x4000]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", 0x5C00, 0x4000), true); return buf; }
+using GameVersion = dusk::version::GameVersion;
-static u8* l_Egnd_mantPAL_get()   { alignas(32) static u8 buf[0x60];   static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", 0x9C00, 0x60),   true); return buf; }
+
 static u8* l_Egnd_mantTEX_get()   { alignas(32) static u8 buf[0x4000]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x1C00}, {GameVersion::GcnPal, 0x1C00}}, 0x4000), true); return buf; }
 static u8* l_Egnd_mantTEX_U_get() { alignas(32) static u8 buf[0x4000]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x5C00}, {GameVersion::GcnPal, 0x5C00}}, 0x4000), true); return buf; }
 static u8* l_Egnd_mantPAL_get()   { alignas(32) static u8 buf[0x60];   static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0x9C00}, {GameVersion::GcnPal, 0x9C00}}, 0x60),   true); return buf; }
 #define l_Egnd_mantTEX   (l_Egnd_mantTEX_get())
 #define l_Egnd_mantTEX_U (l_Egnd_mantTEX_U_get())
 #define l_Egnd_mantPAL   (l_Egnd_mantPAL_get())
@@ -251,7 +254,9 @@ static u32 l_texCoord[338] = {
 };
 #if TARGET_PC
-static u8* l_Egnd_mantDL_get() { alignas(32) static u8 buf[0x3EC]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", 0xA9A0, 0x3EC), true); return buf; }
+using GameVersion = dusk::version::GameVersion;
 static u8* l_Egnd_mantDL_get() { alignas(32) static u8 buf[0x3EC]; static bool _ = (dusk::LoadRelAsset(buf, "/rel/Final/Release/d_a_mant.rel", {{GameVersion::GcnUsa, 0xA9A0}, {GameVersion::GcnPal, 0xA9A0}}, 0x3EC), true); return buf; }
 #define l_Egnd_mantDL (l_Egnd_mantDL_get())
 #else
 #include "assets/l_Egnd_mantDL.h"
@@ -22,6 +22,7 @@
 #include "d/d_s_play.h"
 #include "d/d_vibration.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "dusk/version.hpp"
 #include <cstring>
 #define ANM_MG_FISH_MOUTH_CLOSE     4
@@ -3230,7 +3231,17 @@ static int daMg_Fish_Execute(mg_fish_class* i_this) {
    daPy_py_c* player = daPy_getPlayerActorClass();
-#if VERSION == VERSION_GCN_JPN
+#if TARGET_PC
    if (dusk::version::isRegionJpn()) {
        lit_1008 = 0;
    } else if (dusk::version::isRegionPal()) {
        if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGUAGE_ENGLISH) {
            lit_1008 = 2;
        } else {
            lit_1008 = 0;
        }
    }
 #elif VERSION == VERSION_GCN_JPN
    lit_1008 = 0;
 #elif VERSION == VERSION_GCN_PAL
    if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGUAGE_ENGLISH) {
@@ -3843,7 +3854,19 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) {
        a_this->mResName = "O_gD_bott";
    }
-#if VERSION == VERSION_GCN_JPN
+#if TARGET_PC
    if (dusk::version::isRegionJpn()) {
        lit_1008 = 0;
    } else if (dusk::version::isRegionPal()) {
        if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGUAGE_ENGLISH) {
            lit_1008 = 2;
        } else {
            lit_1008 = 0;
        }
    } else {
        lit_1008 = 1;
    }
 #elif VERSION == VERSION_GCN_JPN
    lit_1008 = 0;
 #elif VERSION == VERSION_GCN_PAL
    if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGUAGE_ENGLISH) {
@@ -5,14 +5,15 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/actor/d_a_mg_fish.h"
 #include "d/actor/d_a_mg_fshop.h"
 #include "d/actor/d_a_npc_henna.h"
 #include "d/actor/d_a_mg_fish.h"
 #include "d/actor/d_a_player.h"
 #include "f_op/f_op_camera_mng.h"
 #include "d/d_timer.h"
 #include "d/d_s_play.h"
-#include "Z2AudioLib/Z2Instances.h"
+#include "d/d_timer.h"
 #include "dusk/version.hpp"
 #include "f_op/f_op_camera_mng.h"
 #if TARGET_PC
 #include "dusk/gyro.h"
@@ -1742,7 +1743,18 @@ static int daFshop_Create(fopAc_ac_c* actor) {
        fopAcM_createChild(fpcNm_FSHOP_e, fopAcM_GetID(actor), 0xFFFFFF23, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL);
        u8 sp10;
-#if VERSION == VERSION_GCN_PAL || VERSION == VERSION_WII_PAL
+#if TARGET_PC
        if (dusk::version::isRegionPal()) {
            if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGUAGE_ENGLISH) {
                sp10 = 2;
            } else {
                sp10 = 0;
            }
        } else {
            sp10 = 1;
        }
 #elif VERSION == VERSION_GCN_PAL || VERSION == VERSION_WII_PAL
        if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGUAGE_ENGLISH) {
            sp10 = 2;
        } else {
@@ -25,6 +25,8 @@
 #include <cmath>
 #include <cstring>
 #include "dusk/version.hpp"
 class dmg_rod_HIO_c : public JORReflexible {
 public:
    dmg_rod_HIO_c();
@@ -5734,10 +5736,22 @@ static void play_camera_u(dmg_rod_class* i_this) {
 static int dmg_rod_Execute(dmg_rod_class* i_this) {
    fopAc_ac_c* actor = &i_this->actor;
    #if TARGET_PC
    if (dusk::version::isPalOrAtLeastWiiR2()) {
        if (dComIfGs_getPalLanguage() == 0) {
            data_804BBBD4 = 2;
        } else {
            data_804BBBD4 = 0;
        }
    } else if (dusk::version::isRegionJpn()) {
        data_804BBBD4 = 0;
    } else {
        data_804BBBD4 = 1;
    }
    //TODO: It seems possible that dComIfGs_getPalLanguage returns a constant value for non-PAL
    //      versions (causing the first block to be elided), and it's also possible that the value
    //      being compared against is an enum value with per-version definitions.
-    #if VERSION == VERSION_SHIELD_DEBUG
+    #elif VERSION == VERSION_SHIELD_DEBUG
    if (dComIfGs_getPalLanguage() == 1) {
        data_804BBBD4 = 2;
    } else {
@@ -6303,7 +6317,19 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) {
        heap_size = 0xC9A0;
    }
-    #if VERSION == VERSION_SHIELD_DEBUG
+    #if TARGET_PC
    if (dusk::version::isPalOrAtLeastWiiR2()) {
        if (dComIfGs_getPalLanguage() == 0) {
            data_804BBBD4 = 2;
        } else {
            data_804BBBD4 = 0;
        }
    } else if (dusk::version::isRegionJpn()) {
        data_804BBBD4 = 0;
    } else {
        data_804BBBD4 = 1;
    }
    #elif VERSION == VERSION_SHIELD_DEBUG
    if (dComIfGs_getPalLanguage() == 1) {
        data_804BBBD4 = 2;
    } else {
@@ -463,6 +463,23 @@ int daMidna_c::createHeap() {
    JKRReadIdxResource(mBckHeap[0].getBuffer(), mBckHeap[0].getBufferSize(), 0x1DC, dComIfGp_getAnmArchive());
    J3DAnmTransform* md_anm = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(mBckHeap[0].getBuffer());
    modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 14);
 #if TARGET_PC
    J3DTexture* tex = modelData->getTexture();
    JUTNameTab* nametable = modelData->getTextureName();
    if (tex != NULL && nametable != NULL) {
        for (u16 i = 0; i < tex->getNum(); i++) {
            const char* name = nametable->getName(i);
            if (name != NULL && strcmp(name, "midona_eye") == 0) {
                ResTIMG* timg = tex->getResTIMG(i);
                timg->mipmapEnabled = false;
                tex->loadGXTexObj(i);
                break;
            }
        }
    }
 #endif
    JUT_ASSERT(852, modelData != NULL);
    mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, &mMorfCB, NULL, md_anm, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, NULL, 0, 0x11000284);
    if (mpMorf == NULL || mpMorf->getModel() == NULL) {
@@ -40,6 +40,7 @@ dMirror_packet_c::dMirror_packet_c() {
 void dMirror_packet_c::reset() {
 #if TARGET_PC
    mbReset = true;
    mbHadEntry = false;
 #else
    mModelCount = 0;
 #endif
@@ -96,6 +97,9 @@ int dMirror_packet_c::entryModel(J3DModel* i_model) {
    }
    mModels[mModelCount++] = i_model;
 #if TARGET_PC
    mbHadEntry = true;
 #endif
    return 1;
 }
@@ -599,13 +603,6 @@ int daMirror_c::execute() {
        return 1;
    }
 #if TARGET_PC
    if (mPacket.mbReset) {
        mPacket.mModelCount = 0;
        mPacket.mbReset = false;
    }
 #endif
    daPy_py_c* player = daPy_getLinkPlayerActorClass();
    JUT_ASSERT(0, player != NULL);
@@ -631,6 +628,12 @@ int daMirror_c::draw() {
        mDoExt_modelUpdateDL(mpModel);
    }
 #if TARGET_PC
    if (mPacket.mbReset && !mPacket.mbHadEntry) {
        mPacket.mModelCount = 0;
    }
    mPacket.mbHadEntry = true;
 #endif
    dComIfGd_getOpaListBG()->entryImm(&mPacket, 0);
    return 1;
 }
@@ -956,7 +956,7 @@ static void npc_ne_tame(npc_ne_class* i_this) {
        i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed);
            /* dSv_event_flag_c::F_0470 - Fishing Pond - Reserved for fishing */
-        if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470])) {
+        if (IF_DUSK(dusk::getSettings().game.no2ndFishForCat) || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470])) {
            if (fpcEx_Search(s_fish_sub, _this) != NULL) {
                i_this->mAction = npc_ne_class::ACT_HOME;
                i_this->mMode = 10;
@@ -2948,8 +2948,7 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) {
    if (i_this->mWantsFish && (i_this->mCounter & 0xf) == 0) {
            /* dSv_event_flag_c::F_0470 - Fishing Pond - Reserved for fishing */
-        if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470])
+        if ((IF_DUSK(dusk::getSettings().game.no2ndFishForCat) || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470])) && i_this->mDistToTarget < 1500.0f) {
                                    && i_this->mDistToTarget < 1500.0f) {
            if (fopAcM_SearchByName(fpcNm_MG_ROD_e) != NULL) {
                i_this->mNoFollow = false;
            } else {
--- a/Show More
+++ b/Show More