(Temp) Disable map scale

2026-07-04 11:19:58 -04:00 · 2026-06-08 22:49:58 -06:00
176 changed files with 815 additions and 13234 deletions
@@ -1,3 +1,3 @@
 [submodule "extern/aurora"]
 	path = extern/aurora
-	url = https://github.com/Lurs/aurora.git
+	url = https://github.com/encounter/aurora.git
@@ -291,13 +291,13 @@ message(STATUS "dusklight: Fetching cxxopts")
 FetchContent_Declare(cxxopts
    URL https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.3.1.tar.gz
    URL_HASH SHA256=3bfc70542c521d4b55a46429d808178916a579b28d048bd8c727ee76c39e2072
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
 message(STATUS "dusklight: Fetching nlohmann/json")
 FetchContent_Declare(json
    URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
    URL_HASH SHA256=42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa
-    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
 )
 FetchContent_MakeAvailable(cxxopts json)

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

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

 set(GAME_INCLUDE_DIRS
    include
@@ -378,7 +378,7 @@ set(GAME_INCLUDE_DIRS
 find_package(Threads REQUIRED)
 set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::pad aurora::mtx aurora::os aurora::dvd
    aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt
-    Threads::Threads zstd::libzstd ZLIB::ZLIB)
+    Threads::Threads zstd::libzstd)

 if (DUSK_ENABLE_SENTRY_NATIVE)
    list(APPEND GAME_LIBS sentry)
@@ -158,11 +158,7 @@
      "cacheVariables": {
        "CMAKE_C_COMPILER": "cl",
        "CMAKE_CXX_COMPILER": "cl",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
-        "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": {
-          "type": "BOOL",
-          "value": true
-        }
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install"
      },
      "vendor": {
        "microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -1418,11 +1418,7 @@ set(DUSK_FILES
        include/dusk/scope_guard.hpp
        src/dusk/dvd_asset.cpp
        src/d/actor/d_a_alink_dusk.cpp
-        src/dusk/android_frame_rate.hpp
-        src/dusk/android_frame_rate.cpp
        src/dusk/asserts.cpp
-        src/dusk/batch.cpp
-        src/dusk/batch.hpp
        src/dusk/config.cpp
        src/dusk/crash_handler.cpp
        src/dusk/crash_reporting.cpp
@@ -1436,8 +1432,6 @@ set(DUSK_FILES
        src/dusk/game_clock.cpp
        src/dusk/globals.cpp
        src/dusk/gyro.cpp
-        include/dusk/menu_pointer.h
-        src/dusk/menu_pointer.cpp
        src/dusk/mouse.cpp
 		src/dusk/gamepad_color.cpp
 		src/dusk/autosave.cpp
@@ -1451,7 +1445,6 @@ set(DUSK_FILES
        src/dusk/stubs.cpp
        include/dusk/texture_replacements.hpp
        src/dusk/texture_replacements.cpp
-        src/dusk/touch_camera.cpp
        src/dusk/update_check.cpp
        src/dusk/update_check.hpp
        #src/dusk/m_Do_ext_dusk.cpp
@@ -1481,7 +1474,6 @@ set(DUSK_FILES
        src/dusk/ui/button.hpp
        src/dusk/ui/component.cpp
        src/dusk/ui/component.hpp
-        src/dusk/ui/controls.hpp
        src/dusk/ui/controller_config.cpp
        src/dusk/ui/controller_config.hpp
        src/dusk/ui/document.cpp
@@ -1494,8 +1486,6 @@ set(DUSK_FILES
        src/dusk/ui/graphics_tuner.hpp
        src/dusk/ui/input.cpp
        src/dusk/ui/input.hpp
-        src/dusk/ui/icon_provider.cpp
-        src/dusk/ui/icon_provider.hpp
        src/dusk/ui/modal.cpp
        src/dusk/ui/modal.hpp
        src/dusk/ui/nav_types.hpp
@@ -1521,12 +1511,6 @@ set(DUSK_FILES
        src/dusk/ui/string_button.hpp
        src/dusk/ui/tab_bar.cpp
        src/dusk/ui/tab_bar.hpp
-        src/dusk/ui/touch_controls_common.cpp
-        src/dusk/ui/touch_controls_common.hpp
-        src/dusk/ui/touch_controls.cpp
-        src/dusk/ui/touch_controls.hpp
-        src/dusk/ui/touch_controls_editor.cpp
-        src/dusk/ui/touch_controls_editor.hpp
        src/dusk/ui/ui.cpp
        src/dusk/ui/ui.hpp
        src/dusk/ui/warp.cpp
@@ -1546,16 +1530,6 @@ set(DUSK_FILES
        src/dusk/discord_presence.cpp
        src/dusk/version.cpp
        src/dusk/action_bindings.cpp
-        src/dusk/tphd/TphdPack.hpp
-        src/dusk/tphd/TphdPack.cpp
-        src/dusk/tphd/GtxParser.hpp
-        src/dusk/tphd/GtxParser.cpp
-        src/dusk/tphd/AddrLib.hpp
-        src/dusk/tphd/AddrLib.cpp
-        src/dusk/tphd/HdAssetLayer.hpp
-        src/dusk/tphd/HdAssetLayer.cpp
-        src/dusk/tphd/LosTable.hpp
-        src/dusk/tphd/LosTable.cpp
 )

 set(DUSK_HTTP_BACKEND_FILES
@@ -138,7 +138,7 @@
            NOD_PREBUILT = nod;
            CXXOPTS = pkgs.cxxopts.src;
            JSON = pkgs.nlohmann_json.src;
-            XXHASH = pkgs.xxhash.src;
+            XXHASH = pkgs.xxHash.src;
            ZSTD = pkgs.zstd.src;
            FMT = pkgs.fetchzip {
              url = "https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.tar.gz";
@@ -194,7 +194,7 @@
                  pkgs.zstd
                  pkgs.cxxopts
                  pkgs.nlohmann_json
-                  pkgs.xxhash
+                  pkgs.xxHash
                  pkgs.abseil-cpp
                  pkgs.zlib
                  pkgs.libpng
@@ -158,10 +158,6 @@ enum Z2Scene {
    /* 0x4E */ Z2SCENE_GROTTO_ROCK_2,
    /* 0x4F */ Z2SCENE_GROTTO_POND,
    /* 0x50 */ Z2SCENE_FARON_WOODS_CAVE,
-
-#if TARGET_PC
-    /* 0x51 */ Z2SCENE_CAVE_OF_SHADOWS,
-#endif
 };

 #endif /* Z2SCENEMGR_H */
@@ -4556,12 +4556,9 @@ public:
    void handleWolfHowl();
    void handleQuickTransform();
    bool checkAimContext();
-    bool checkAimInputContext();

    void onIronBallChainInterpCallback();

-    f32 mLosStickValue;
-
    static const int IRON_BALL_CHAIN_COUNT = 102;
    cXyz mIBChainInterpPrevPos[IRON_BALL_CHAIN_COUNT];
    cXyz mIBChainInterpCurrPos[IRON_BALL_CHAIN_COUNT];
@@ -18,24 +18,16 @@ public:
    TGXTexObj& getTexObj() { return mTexObj; }
    cXyz* getQuad() { return mQuad; }

-#if TARGET_PC
-    // TP HD reflects across N floor quads (F_SP117 room 2 uses 6); GC uses 1.
-    static const int MAX_QUADS = 6;
-#endif
-
    /* 0x010 */ TGXTexObj mTexObj;
    /* 0x030 */ u8 mModelCount;
    /* 0x034 */ J3DModel* mModels[0x40];
-    /* 0x134 */ cXyz mQuad[DUSK_IF_ELSE(MAX_QUADS*4, 4)];
+    /* 0x134 */ cXyz mQuad[4];
    /* 0x164 */ cXyz mMinVal;
    /* 0x170 */ cXyz mMaxVal;
    /* 0x17C */ cXyz mViewScale;
 #if TARGET_PC
    bool mbReset = false;
    bool mbHadEntry = false;
-    cXyz mQuadBoxMin[MAX_QUADS];  
-    cXyz mQuadBoxMax[MAX_QUADS];
-    int mQuadCount = 1;         
 #endif
 };

@@ -142,12 +142,12 @@ namespace daObjSwpush {
        int Mthd_Execute();
        int Mthd_Draw();

-        static s16 const M_bmd[DUSK_IF_ELSE(4, 3)];
-        static s16 const M_dzb[DUSK_IF_ELSE(4, 3)];
-        static u32 const M_heap_size[DUSK_IF_ELSE(4, 3)];
+        static s16 const M_bmd[3];
+        static s16 const M_dzb[3];
+        static u32 const M_heap_size[3];
        static Hio_c::Attr_c const M_attr[5];
        static u8 const M_op_vtx[4];
-        static DUSK_CONST char* M_arcname[DUSK_IF_ELSE(4, 3)];
+        static DUSK_CONST char* M_arcname[3];

        /* 0x568 */ request_of_phase_process_class mPhase;
        /* 0x570 */ dBgWSv* mpBgW;
@@ -4,10 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "SSystem/SComponent/c_xyz.h"

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

@@ -4,10 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "SSystem/SComponent/c_xyz.h"

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

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

-#if TARGET_PC
-        MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE,
-        MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE_ERR_WAIT,
-#endif
-
        #if PLATFORM_WII || PLATFORM_SHIELD
        MEMCARDCHECKPROC_NAND_STAT_CHECK,
        MEMCARDCHECKPROC_GAMEFILE_INIT_SEL,
@@ -416,10 +411,6 @@ public:
    bool yesnoWakuAlpahAnm(u8);
    #if TARGET_PC
    void fileSelectWide();
-    bool pointerDataSelect();
-    bool pointerMenuSelect();
-    bool pointerCopyDataToSelect();
-    bool pointerYesNoSelect(bool errorSelect);
    #endif
    void _draw();
    void errorMoveAnmInitSet(int, int);
@@ -454,10 +445,6 @@ public:
    void MemCardMakeGameFile();
    void MemCardMakeGameFileWait();
    void MemCardMakeGameFileCheck();
-#if TARGET_PC
-    void MemCardAutoMakeGameFile();
-    void MemCardAutoMakeGameFileErrWait();
-#endif
    void MemCardMsgWindowInitOpen();
    void MemCardMsgWindowOpen();
    void MemCardMsgWindowClose();
@@ -400,8 +400,4 @@ BOOL isBottleItem(u8 item_no);
 u8 check_itemno(int i_itemNo);
 BOOL isInsect(u8 i_itemNo);

-#if TARGET_PC
-void item_func_WALLET_LV4();
-#endif
-
 #endif /* D_D_ITEM_H */
@@ -350,11 +350,4 @@ enum {
    /* 0xFF */ dItemNo_NONE_e,
 };

-#if TARGET_PC
-// HD item mappings
-enum {
-    dItemNo_WALLET_LV4_e = 0xDA,
-};
-#endif
-
 #endif /* D_D_ITEM_DATA_H */
@@ -157,9 +157,6 @@ public:
    int getDispType() const;
    void _move(f32, f32, int, f32);
    void _draw();
-#if TARGET_PC
-    bool refreshTextureSize();
-#endif

    virtual ~dMap_c() {
 #if DEBUG
@@ -57,7 +57,7 @@ public:
        return &mpTypeGroupData[i_typeGroupNo];
    }

-    /* 0x0 */ fmpTresTypeGroupDataList_c mpTypeGroupData[DUSK_IF_ELSE(35, 17)];
+    /* 0x0 */ fmpTresTypeGroupDataList_c mpTypeGroupData[17];
 };

 class dMenu_Fmap_data_c {
@@ -74,8 +74,6 @@ public:

    #if TARGET_PC
    void menuCollectWide();
-    bool pointerWait();
-    void pointerActivateCurrent();
    #endif

    void _create();
@@ -51,10 +51,6 @@ public:
    void setBButtonString(u16);
    void setHIO(bool);

-#if TARGET_PC
-    bool pointerWait();
-#endif
-
    virtual void draw() { _draw(); }
    virtual ~dMenu_Insect_c();

@@ -55,10 +55,6 @@ public:
    u8 getLetterNum();
    void setHIO(bool);

-#if TARGET_PC
-    bool pointerWait();
-#endif
-
    virtual void draw() { _draw(); }
    virtual ~dMenu_Letter_c();

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

    virtual void draw() { _draw(); }
    virtual ~dMenu_Ring_c();
@@ -266,8 +266,6 @@ public:

    #if TARGET_PC
    void menuSaveWide();
-    bool pointerSaveSelect();
-    bool pointerYesNoSelect(bool errorSelect, u8 errParam = 0, u8 soundParam = 0);
    #endif

    void _draw2();
@@ -49,10 +49,6 @@ public:
    u8 getSkillNum();
    void setHIO(bool);

-#if TARGET_PC
-    bool pointerWait();
-#endif
-
    virtual void draw() { _draw(); }
    virtual ~dMenu_Skill_c();

@@ -172,15 +172,6 @@ public:
    int event041(mesg_flow_node_event*, fopAc_ac_c*);
    int event042(mesg_flow_node_event*, fopAc_ac_c*);

-#if TARGET_PC
-    // HD additions
-    u16 query054(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    u16 query055(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    int event043(mesg_flow_node_event*, fopAc_ac_c*);
-    int event044(mesg_flow_node_event*, fopAc_ac_c*);
-    int event045(mesg_flow_node_event*, fopAc_ac_c*);
-#endif
-
    void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**);

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

-    static queryFunc mQueryList[DUSK_IF_ELSE(55, 53)];
-    static eventFunc mEventList[DUSK_IF_ELSE(46, 43)];
+    static queryFunc mQueryList[53];
+    static eventFunc mEventList[43];

 private:
    /* 0x04 */ u8* mFlow_p;
@@ -49,10 +49,6 @@ public:
    void selectScale();
    void selectTrans();
    void selectAnimeTransform(int);
-#if TARGET_PC
-    bool pointerMove();
-    bool consumePointerClick();
-#endif

    void setOffsetX(f32 i_offsetX) { mOffsetX = i_offsetX; }
    bool isAnimeUpdate(int param_0) { return (field_0x114 & (u8)(1 << param_0)) ? TRUE : FALSE; }
@@ -1416,11 +1416,6 @@ dStage_KeepDoorInfo* dStage_GetKeepDoorInfo();
 dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo();
 void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage);

-#if TARGET_PC
-// TP HD Cave of Shadows (D_SB11): reveal the los next-floor when a descent gate opens.
-void dStage_showLOSNextFloor(int fromRoom);
-#endif
-
 #if DEBUG
 void dStage_DebugDisp();
 #endif
@@ -9,8 +9,6 @@ namespace dusk {
 enum class ActionBinds {
    FIRST_PERSON_CAMERA,
    CALL_MIDNA,
-    OPEN_MAP_SCREEN,
-    TOGGLE_MINIMAP,
    OPEN_DUSKLIGHT_MENU,
    TURBO_SPEED_BUTTON,
    COUNT,
@@ -34,12 +32,6 @@ bool isActionBound(ActionBinds action, u32 port);

 void updateActionBindings();

-void setVirtualActionBind(ActionBinds action, u32 port, bool pressed, bool available = true);
-
-void clearVirtualActionBind(ActionBinds action, u32 port);
-
-void clearAllVirtualActionBinds();
-
 bool getActionBindTrig(ActionBinds action, u32 port);

 bool getActionBindHold(ActionBinds action, u32 port);
@@ -4,7 +4,6 @@
 #include "dolphin/types.h"
 #include <type_traits>
 #include <cstdlib>
-#include <limits>
 #include <string>

 /**
@@ -140,16 +139,11 @@ concept ConfigValueInteger =
    || std::is_same_v<T, s64>
    || std::is_same_v<T, u64>;

-template <typename T>
-struct ConfigValueTraits {
-    static constexpr bool enabled = false;
-};
-
 /**
 * \brief Concept that defines the legal set of types that can be used for CVar values.
 *
 * Valid types cannot be cv-qualified and must be basic primitive types (int, float, bool),
- * strings, enums of the basic primitives, or explicitly-enabled structured settings.
+ * strings, or enums of the basic primitives.
 */
 template <typename T>
 concept ConfigValue =
@@ -160,8 +154,7 @@ concept ConfigValue =
        || std::is_same_v<T, f32>
        || std::is_same_v<T, f64>
        || std::is_same_v<T, std::string>
-        || (std::is_enum_v<T> && ConfigValueInteger<std::underlying_type_t<T>>)
-        || ConfigValueTraits<T>::enabled);
+        || (std::is_enum_v<T> && ConfigValueInteger<std::underlying_type_t<T>>));

 template <ConfigValue T>
 const ConfigImplBase* GetConfigImpl();
@@ -28,11 +28,4 @@ bool LoadRelAsset(void* dst, const char* dvdPath, std::initializer_list<OffsetVe
 */
 bool LoadArchivedRelAsset(void* dst, u32 memType, const char* relFileName, std::initializer_list<OffsetVersion> offset, s32 size);

-#ifdef DUSK_TPHD
-/**
- * Load bytes from the RPX by Wii U virtual address
- */
-bool LoadRPXAsset(void* dst, uint32_t virtualAddress, s32 size);
-#endif
-
 }  // namespace dusk
@@ -602,50 +602,6 @@ static const auto gameRegions = std::to_array({
        MapEntry("Grotto 5", "D_SB09", {
            {4, {0, 1}},
        }),
-        MapEntry("HD: Cave Of Shadows", "D_SB11", {
-                // ordered by floor rather than room number
-                {19, {0}},
-                {35, {0}},
-                {21, {0}},
-                {23, {0}},
-                {10, {0}},
-                {25, {0}},
-                {26, {0}},
-                {8, {0}},
-                {5, {0}},
-                {28, {0}},
-                {47, {0}},
-                {15, {0}},
-                {22, {0}},
-                {33, {0}},
-                {31, {0}},
-                {7, {0}},
-                {13, {0}},
-                {46, {0}},
-                {48, {0}},
-                {34, {0}},
-                {2, {0}},
-                {36, {0}},
-                {27, {0}},
-                {32, {0}},
-                {18, {0}},
-                {3, {0}},
-                {44, {0}},
-                {40, {0}},
-                {4, {0}},
-                {30, {0}},
-                {29, {0}},
-                {17, {0}},
-                {41, {0}},
-                {43, {0}},
-                {16, {0}},
-                {38, {0}},
-                {1, {0}},
-                {42, {0}},
-                {45, {0}},
-                {49, {0}},
-        }
-        ),
    }),
    RegionEntry("Misc", {
        MapEntry("Title Screen / King Bulblin 1", "F_SP102", {
@@ -1,60 +0,0 @@
-#pragma once
-
-#include "dolphin/types.h"
-
-class CPaneMgr;
-
-namespace dusk::menu_pointer {
-
-enum class Context {
-    None,
-    FileSelect,
-    Save,
-    ItemWheel,
-    Collection,
-    Options,
-    Dialog,
-};
-
-enum class Phase {
-    Move,
-    Press,
-    Release,
-    Cancel,
-};
-
-struct State {
-    f32 x = 0.0f;
-    f32 y = 0.0f;
-    bool valid = false;
-    bool down = false;
-    bool pressed = false;
-    bool released = false;
-    bool clicked = false;
-    bool touch = false;
-};
-
-void begin_game_frame() noexcept;
-void end_game_frame() noexcept;
-void begin_context(Context context) noexcept;
-bool handle_fallthrough_pointer(f32 x, f32 y, Phase phase, bool touch, s32 mouseButton = -1) noexcept;
-
-bool active() noexcept;
-bool enabled() noexcept;
-bool mouse_capture_active() noexcept;
-const State& state() noexcept;
-bool consume_click() noexcept;
-void set_dialog_choice(u8 choice, bool clicked) noexcept;
-bool get_dialog_choice(u8& choice) noexcept;
-bool consume_dialog_click(u8& choice) noexcept;
-void defer_activation(Context context, u8 target) noexcept;
-bool consume_deferred_activation(Context context, u8 target) noexcept;
-void clear_deferred_activation(Context context) noexcept;
-u32 suppressed_pad_buttons(u32 port) noexcept;
-void finish_pad_suppression_read(u32 port) noexcept;
-
-bool hit_rect(f32 left, f32 top, f32 right, f32 bottom, f32 padding = 0.0f) noexcept;
-bool hit_pane(CPaneMgr* pane, f32 padding = 0.0f) noexcept;
-bool hit_pane(J2DPane* pane, f32 padding = 0.0f) noexcept;
-
-}  // namespace dusk::menu_pointer
@@ -1,10 +1,9 @@
-#pragma once
+#ifndef DUSK_CONFIG_H
+#define DUSK_CONFIG_H

 #include <array>
-#include <filesystem>

 #include "dusk/config_var.hpp"
-#include "dusk/ui/controls.hpp"

 namespace dusk {

@@ -41,6 +40,11 @@ enum class DiscVerificationState : u8 {
    HashMismatch,
 };

+enum class GyroMode : u8 {
+    Sensor = 0,
+    Mouse = 1,
+};
+
 enum class FrameInterpMode : u8 {
    Off = 0,
    Capped = 1,
@@ -92,6 +96,12 @@ struct ConfigEnumRange<DiscVerificationState> {
    static constexpr auto max = DiscVerificationState::HashMismatch;
 };

+template <>
+struct ConfigEnumRange<GyroMode> {
+    static constexpr auto min = GyroMode::Sensor;
+    static constexpr auto max = GyroMode::Mouse;
+};
+
 template <>
 struct ConfigEnumRange<FrameInterpMode> {
    static constexpr auto min = FrameInterpMode::Off;
@@ -109,11 +119,6 @@ struct ConfigEnumRange<MagicArmorMode> {
    static constexpr auto min = MagicArmorMode::NORMAL;
    static constexpr auto max = MagicArmorMode::COSMETIC;
 };
-
-template <>
-struct ConfigValueTraits<ui::ControlLayout> {
-    static constexpr bool enabled = true;
-};
 }  // namespace config

 // Persistent user settings
@@ -129,9 +134,6 @@ struct UserSettings {
        ConfigVar<bool> enableFpsOverlay;
        ConfigVar<int> fpsOverlayCorner;
        ConfigVar<int> maxFrameRate;
-        ConfigVar<bool> rememberWindowSize;
-        ConfigVar<int> lastWindowWidth;
-        ConfigVar<int> lastWindowHeight;
    } video;

    struct {
@@ -216,9 +218,6 @@ struct UserSettings {
        ConfigVar<float> mouseCameraSensitivity;
        ConfigVar<bool> invertMouseY;
        ConfigVar<bool> freeCamera;
-        ConfigVar<bool> enableTouchControls;
-        ConfigVar<bool> enableMenuPointer;
-        ConfigVar<ui::ControlLayout> touchControlsLayout;
        ConfigVar<bool> invertCameraXAxis;
        ConfigVar<bool> invertCameraYAxis;
        ConfigVar<bool> invertFirstPersonXAxis;
@@ -227,8 +226,6 @@ struct UserSettings {
        ConfigVar<bool> invertAirSwimY;
        ConfigVar<float> freeCameraXSensitivity;
        ConfigVar<float> freeCameraYSensitivity;
-        ConfigVar<float> touchCameraXSensitivity;
-        ConfigVar<float> touchCameraYSensitivity;
        ConfigVar<bool> debugFlyCam;
        ConfigVar<bool> debugFlyCamLockEvents;
        ConfigVar<bool> allowBackgroundInput;
@@ -274,9 +271,6 @@ struct UserSettings {
    struct {
        ConfigVar<std::string> isoPath;
        ConfigVar<DiscVerificationState> isoVerification;
-#if DUSK_TPHD
-        ConfigVar<std::string> hdContentPath;
-#endif
        ConfigVar<std::string> graphicsBackend;
        ConfigVar<bool> skipPreLaunchUI;
        ConfigVar<bool> showPipelineCompilation;
@@ -290,8 +284,6 @@ struct UserSettings {
    struct {
        std::array<ActionBindConfigVar, 4> firstPersonCamera;
        std::array<ActionBindConfigVar, 4> callMidna;
-        std::array<ActionBindConfigVar, 4> openMapScreen;
-        std::array<ActionBindConfigVar, 4> toggleMinimap;
        std::array<ActionBindConfigVar, 4> openDusklightMenu;
        std::array<ActionBindConfigVar, 4> turboSpeedButton;
    } actionBindings;
@@ -299,9 +291,6 @@ struct UserSettings {

 UserSettings& getSettings();

-std::filesystem::path tphd_content_path();
-bool tphd_active();
-
 void registerSettings();

 // Transient settings
@@ -326,4 +315,6 @@ struct TransientSettings {

 TransientSettings& getTransientSettings();

-}  // namespace dusk
+}
+
+#endif // DUSK_CONFIG_H
@@ -1,12 +0,0 @@
-#pragma once
-
-namespace dusk::touch_camera {
-
-constexpr float YAW_DEGREES_PER_DP = 0.34f;
-constexpr float PITCH_DEGREES_PER_DP = 0.22f;
-
-void add_delta(float yaw_dp, float pitch_dp) noexcept;
-bool consume_delta(float& yaw_dp, float& pitch_dp) noexcept;
-void clear() noexcept;
-
-}  // namespace dusk::touch_camera
@@ -212,9 +212,6 @@ public:
    void setCornerColor(JUtility::TColor c0) {
        setCornerColor(c0, c0, c0, c0);
    }
-#if TARGET_PC
-    JUtility::TColor corner(size_t index) const { return mCornerColor[index]; }
-#endif

 protected:
    /* 0x100 */ JUTTexture* mTexture[2];
@@ -1761,16 +1761,6 @@ public:
    virtual ~J3DIndBlockNull() {}
 };

-#ifdef DUSK_TPHD
-struct PolygonOffset {
-    BE(f32) mFrontOffset;
-    BE(f32) mFrontScale;
-    BE(f32) mBackOffset;
-    BE(f32) mBackScale;
-    BE(f32) mClamp;
-};
-#endif
-
 /**
 * @ingroup jsystem-j3d
 *
@@ -1803,10 +1793,6 @@ public:
    virtual void setDither(u8 const*) {}
    virtual void setDither(u8) {}
    virtual u8 getDither() const { return 0; }
-#ifdef DUSK_TPHD
-    virtual void setPolygonOffset(const PolygonOffset&) {}
-    virtual PolygonOffset* getPolygonOffset() { return NULL; }
-#endif
    virtual u32 getFogOffset() const { return 0; }
    virtual void setFogOffset(u32) {}
    virtual ~J3DPEBlock() {}
@@ -1970,25 +1956,12 @@ public:
    virtual void setFogOffset(u32 fogOffset) { mFogOffset = fogOffset; }
    virtual ~J3DPEBlockFull() {}

-#ifdef DUSK_TPHD
-    virtual void setPolygonOffset(const PolygonOffset& offset) {
-        mPolygonOffset = offset;
-    }
-
-    virtual PolygonOffset* getPolygonOffset() {
-        return &mPolygonOffset;
-    }
-#endif
-
    /* 0x04 */ J3DFog mFog;
    /* 0x30 */ J3DAlphaComp mAlphaComp;
    /* 0x34 */ J3DBlend mBlend;
    /* 0x38 */ J3DZMode mZMode;
    /* 0x3A */ u8 mZCompLoc;
    /* 0x3B */ u8 mDither;
-#ifdef DUSK_TPHD
-    PolygonOffset mPolygonOffset;
-#endif
    /* 0x3C */ u32 mFogOffset;
 };  // Size: 0x40

@@ -46,13 +46,6 @@ struct J3DMaterialInitData {
    /* 0x14A */ BE(u16) mNBTScaleIdx;
 }; // size 0x14C

-
-#ifdef DUSK_TPHD
-struct J3DMaterialInitData_MAT4 : public J3DMaterialInitData {
-    /* 0x14C */ BE(u16) mPolygonOffsetIdx;
-}; // size 0x14E
-#endif
-
 /**
 * @ingroup jsystem-j3d
 * 
@@ -150,29 +143,10 @@ public:
    J3DNBTScale newNBTScale(int) const;

    u16 getMaterialID(int idx) const { return mpMaterialID[idx]; }
-#ifdef DUSK_TPHD
-    u8 getMaterialMode(int idx) const { return getMatInitData(idx)->mMaterialMode; }
-#else
    u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; }
-#endif
    
-#if DUSK_TPHD
-    const PolygonOffset newPolygonOffset(int) const;
-
-    J3DMaterialInitData* getMatInitData(int idx) const {
-        static const u32 sInitDataSizes[] = {0, 0, 0x138, 0x14C, 0x14E};
-
-        return (J3DMaterialInitData*)((u8*)mpMaterialInitData + sInitDataSizes[mBlockType] * getMaterialID(idx));
-    }
-
-    u16 mBlockType;
-#endif
    /* 0x00 */ u16 mMaterialNum;
-#if DUSK_TPHD
-    /* 0x04 */ void* mpMaterialInitData;
-#else
    /* 0x04 */ J3DMaterialInitData* mpMaterialInitData;
-#endif
    /* 0x08 */ BE(u16)* mpMaterialID;
    /* 0x0C */ J3DIndInitData* mpIndInitData;
    /* 0x10 */ GXColor* mpMatColor;
@@ -201,9 +175,6 @@ public:
    /* 0x6C */ u8* mpZCompLoc;
    /* 0x70 */ u8* mpDither;
    /* 0x74 */ J3DNBTScaleInfo* mpNBTScaleInfo;
-#ifdef DUSK_TPHD
-    PolygonOffset* mpPolygonOffsets;
-#endif
    /* 0x78 */ J3DDisplayListInit* mpDisplayListInit;
    /* 0x7C */ J3DPatchingInfo* mpPatchingInfo;
    /* 0x80 */ J3DCurrentMtxInfo* mpCurrentMtxInfo;
@@ -169,12 +169,6 @@ struct J3DMaterialBlock_v21 : public J3DModelBlock {
    /* 0x74 */ OFFSET_PTR_V0 mpNBTScaleInfo;
 };

-#ifdef DUSK_TPHD
-struct J3DMaterialBlock_MAT4 : public J3DMaterialBlock {
-    /* 0x84 */ OFFSET_PTR_V0 mpPolygonOffsets;
-};
-#endif
-
 /**
 * @ingroup jsystem-j3d
 * 
@@ -3,20 +3,6 @@

 #include <gx.h>

-#if TARGET_PC
-#include <mtx.h>
-
-struct ParticleDrawCtx {
-    bool batch;     // off = immediate mode
-    bool useTexMtx; // UVs transformed by texMtx
-    bool useClr0;   // prm color in GX_VA_CLR0
-    bool useClr1;   // env color in GX_VA_CLR1
-    Mtx texMtx;
-    GXColor clr0;
-    GXColor clr1;
-};
-#endif
-
 struct JPAEmitterWorkData;
 class JPABaseParticle;
 class JKRHeap;
@@ -89,9 +75,6 @@ public:

    const GXTevColorArg* getTevColorArg() const { return st_ca[(pBsd->mFlags >> 0x0F) & 0x07]; }
    const GXTevAlphaArg* getTevAlphaArg() const { return st_aa[(pBsd->mFlags >> 0x12) & 0x01]; }
-#if TARGET_PC
-    u32 getTevColorArgSel() const { return (pBsd->mFlags >> 0x0F) & 0x07; }
-#endif

    u32 getType() const { return (pBsd->mFlags >> 0) & 0x0F; }
    u32 getDirType() const { return (pBsd->mFlags >> 4) & 0x07; }
@@ -203,34 +186,26 @@ void JPARegistPrm(JPAEmitterWorkData*);
 void JPARegistEnv(JPAEmitterWorkData*);
 void JPARegistPrmEnv(JPAEmitterWorkData*);

-#if TARGET_PC
-#define JPA_DRAW_PARTICLE_ARGS JPAEmitterWorkData*, JPABaseParticle*, ParticleDrawCtx*
-#else
-#define JPA_DRAW_PARTICLE_ARGS JPAEmitterWorkData*, JPABaseParticle*
-#endif
-
-void JPADrawPoint(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawLine(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotDirection(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawDirection(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotation(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawDBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawRotYBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawYBillboard(JPA_DRAW_PARTICLE_ARGS);
-void JPADrawParticleCallBack(JPA_DRAW_PARTICLE_ARGS);
-void JPALoadTexAnm(JPA_DRAW_PARTICLE_ARGS);
-void JPASetPointSize(JPA_DRAW_PARTICLE_ARGS);
-void JPASetLineWidth(JPA_DRAW_PARTICLE_ARGS);
-void JPALoadCalcTexCrdMtxAnm(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistAlpha(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistEnv(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistAlphaEnv(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistPrmAlpha(JPA_DRAW_PARTICLE_ARGS);
-void JPARegistPrmAlphaEnv(JPA_DRAW_PARTICLE_ARGS);
-
-#undef JPA_DRAW_PARTICLE_ARGS
+void JPADrawPoint(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawLine(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotDirection(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawDirection(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotation(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawDBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawRotYBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawYBillboard(JPAEmitterWorkData*, JPABaseParticle*);
+void JPADrawParticleCallBack(JPAEmitterWorkData*, JPABaseParticle*);
+void JPALoadTexAnm(JPAEmitterWorkData*, JPABaseParticle*);
+void JPASetPointSize(JPAEmitterWorkData*, JPABaseParticle*);
+void JPASetLineWidth(JPAEmitterWorkData*, JPABaseParticle*);
+void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistAlpha(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistEnv(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistPrmAlpha(JPAEmitterWorkData*, JPABaseParticle*);
+void JPARegistPrmAlphaEnv(JPAEmitterWorkData*, JPABaseParticle*);

 #if TARGET_PC
 void JPAInterpBillboard(JPAEmitterWorkData*, JPABaseParticle*);
@@ -17,10 +17,6 @@ class JPADynamicsBlock;
 class JPAFieldBlock;
 class JPAKeyBlock;

-#if TARGET_PC
-struct ParticleDrawCtx;
-#endif
-
 /**
 * @ingroup jsystem-jparticle
 * 
@@ -54,19 +50,13 @@ public:
 public:
    typedef void (*EmitterFunc)(JPAEmitterWorkData*);
    typedef void (*ParticleFunc)(JPAEmitterWorkData*, JPABaseParticle*);
-#if TARGET_PC
-    typedef void (*DrawParticleFunc)(JPAEmitterWorkData*, JPABaseParticle*,
-                                     ParticleDrawCtx*);
-#else
-    typedef ParticleFunc DrawParticleFunc;
-#endif
    /* 0x00 */ EmitterFunc* mpCalcEmitterFuncList;
    /* 0x04 */ EmitterFunc* mpDrawEmitterFuncList;
    /* 0x08 */ EmitterFunc* mpDrawEmitterChildFuncList;
    /* 0x0C */ ParticleFunc* mpCalcParticleFuncList;
-    /* 0x10 */ DrawParticleFunc* mpDrawParticleFuncList;
+    /* 0x10 */ ParticleFunc* mpDrawParticleFuncList;
    /* 0x14 */ ParticleFunc* mpCalcParticleChildFuncList;
-    /* 0x18 */ DrawParticleFunc* mpDrawParticleChildFuncList;
+    /* 0x18 */ ParticleFunc* mpDrawParticleChildFuncList;

    /* 0x1C */ JPABaseShape* pBsp;
    /* 0x20 */ JPAExtraShape* pEsp;
@@ -87,20 +77,6 @@ public:
    /* 0x45 */ u8 mpDrawParticleFuncListNum;
    /* 0x46 */ u8 mpCalcParticleChildFuncListNum;
    /* 0x47 */ u8 mpDrawParticleChildFuncListNum;
-
-#if TARGET_PC
-    struct BatchInfo {
-        f32 vtxPos[8][3];
-        f32 vtxUv[8][2];
-        u8 vtxCount;        // 4 (quad) or 8 (cross)
-        bool supported;     // draw func list contains only batchable funcs
-        bool hasPtclColor;  // per-particle JPARegist* func is present
-        bool hasPtclTexMtx; // JPALoadCalcTexCrdMtxAnm is present
-    };
-    BatchInfo mBatchInfo;
-
-    void initBatchInfo();
-#endif
 };

 #endif /* JPARESOURCE_H */
@@ -7,9 +7,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/JMath/JMath.h"
 #include "m_Do/m_Do_mtx.h"
-#if TARGET_PC
-#include "dusk/settings.h" 
-#endif

 void J3DMtxCalcJ3DSysInitBasic::init(Vec const& scale, Mtx const& mtx) {
    J3DSys::mCurrentS = scale;
@@ -181,23 +178,7 @@ void J3DJoint::entryIn() {
            matPacket->setMaterialAnmID(mesh->getMaterialAnm());
            matPacket->setShapePacket(shapePacket);
            bool isDrawModeOpaTexEdge = mesh->isDrawModeOpaTexEdge() == FALSE;
-#if TARGET_PC
-            // TP HD J3DJoint::entryIn (FUN_02b57690): 
-            J3DDrawBuffer* drawBuffer = j3dSys.getDrawBuffer(isDrawModeOpaTexEdge);
-            u8 r24;
-            if (dusk::tphd_active() && (mesh->mMaterialID & 0x80000000) != 0 &&
-                (mesh->getMaterialMode() & 0x20) != 0 &&
-                drawBuffer->getSortMode() == J3DDrawBufSortMode_Mat)
-            {
-                matPacket->drawClear();
-                shapePacket->drawClear();
-                r24 = drawBuffer->entryImm(matPacket, 1);
-            } else {
-                r24 = matPacket->entry(drawBuffer);
-            }
-#else
            u8 r24 = matPacket->entry(j3dSys.getDrawBuffer(isDrawModeOpaTexEdge));
-#endif
            if (r24) {
                j3dSys.setMatPacket(matPacket);
                J3DDrawBuffer::entryNum++;
@@ -230,13 +230,6 @@ void J3DMatPacket::draw() {
 #endif
    packet->getShape()->loadPreDrawSetting();

-#if DUSK_TPHD
-    {
-        const auto* offs = mpMaterial->getPEBlock()->getPolygonOffset();
-        GX2SetPolygonOffset(offs->mFrontOffset, offs->mFrontScale, offs->mBackOffset, offs->mBackScale, offs->mClamp);
-    }
-#endif
-
    while (packet != NULL) {
        if (packet->getDisplayListObj() != NULL) {
            packet->getDisplayListObj()->callDL();
@@ -136,8 +136,8 @@ void J3DLoadCPCmd(u8 addr, u32 val) {
 #if TARGET_PC
 static void J3DLoadArrayBasePtr(GXAttr attr, void* data, u32 size, bool le) {
    u32 idx = (attr == GX_VA_NBT) ? 1 : (attr - GX_VA_POS);
-    GXCmd1u8(GX_AURORA);
-    GXCmd1u16(GX_AURORA_LOAD_ARRAYBASE | idx);
+    GXCmd1u8(GX_LOAD_AURORA);
+    GXCmd1u16(GX_LOAD_AURORA_ARRAYBASE | idx);
    GXCmd1u64((u64)data);
    GXCmd1u32(size);
    GXCmd1u8(le ? 1 : 0);
@@ -7,11 +7,265 @@
 #include "JSystem/JKernel/JKRHeap.h"

 #if TARGET_PC
-#include <aurora/dl.hpp>
+#include <algorithm>
 #include <tracy/Tracy.hpp>
+#include <vector>
+#include "dusk/logging.h"

 namespace {

+u16 read_be16(const u8* data) {
+    return (u16(data[0]) << 8) | data[1];
+}
+
+void append_be16(std::vector<u8>& out, u16 value) {
+    out.push_back(value >> 8);
+    out.push_back(value & 0xFF);
+}
+
+void append_bytes(std::vector<u8>& out, const u8* data, u32 size) {
+    out.insert(out.end(), data, data + size);
+}
+
+bool is_matrix_idx_attr(GXAttr attr) {
+    return attr >= GX_VA_PNMTXIDX && attr <= GX_VA_TEX7MTXIDX;
+}
+
+bool is_draw_opcode(u8 opcode) {
+    return opcode == GX_QUADS || opcode == GX_TRIANGLES || opcode == GX_TRIANGLESTRIP ||
+           opcode == GX_TRIANGLEFAN || opcode == GX_LINES || opcode == GX_LINESTRIP ||
+           opcode == GX_POINTS;
+}
+
+bool is_mergeable_draw_opcode(u8 opcode) {
+    return opcode == GX_QUADS || opcode == GX_TRIANGLES || opcode == GX_TRIANGLESTRIP ||
+           opcode == GX_TRIANGLEFAN;
+}
+
+bool calc_vtx_stride(const GXVtxDescList* vtxDesc, u32& stride) {
+    stride = 0;
+    for (; vtxDesc->attr != GX_VA_NULL; vtxDesc++) {
+        switch (vtxDesc->type) {
+        case GX_NONE:
+            break;
+        case GX_DIRECT:
+            if (!is_matrix_idx_attr(vtxDesc->attr)) {
+                return false;
+            }
+            stride += 1;
+            break;
+        case GX_INDEX8:
+            stride += 1;
+            break;
+        case GX_INDEX16:
+            stride += 2;
+            break;
+        default:
+            return false;
+        }
+    }
+    return stride != 0;
+}
+
+bool get_command_size(const u8* dlStart, u32 dlSize, u32 offset, u32 stride, u32& cmdSize) {
+    if (offset >= dlSize) {
+        return false;
+    }
+
+    const u8 cmd = dlStart[offset];
+    const u8 opcode = cmd & GX_OPCODE_MASK;
+    switch (opcode) {
+    case GX_NOP:
+    case GX_CMD_INVL_VC:
+        cmdSize = 1;
+        return true;
+    case (GX_LOAD_BP_REG & GX_OPCODE_MASK):
+        cmdSize = 5;
+        return offset + cmdSize <= dlSize;
+    case GX_LOAD_CP_REG:
+        cmdSize = 6;
+        return offset + cmdSize <= dlSize;
+    case GX_LOAD_XF_REG: {
+        if (offset + 5 > dlSize) {
+            return false;
+        }
+        const u16 count = read_be16(dlStart + offset + 1) + 1;
+        cmdSize = 5 + count * 4;
+        return offset + cmdSize <= dlSize;
+    }
+    case GX_LOAD_INDX_A:
+    case GX_LOAD_INDX_B:
+    case GX_LOAD_INDX_C:
+    case GX_LOAD_INDX_D:
+        cmdSize = 5;
+        return offset + cmdSize <= dlSize;
+    case GX_CMD_CALL_DL:
+        cmdSize = 9;
+        return offset + cmdSize <= dlSize;
+    default:
+        if (is_draw_opcode(opcode)) {
+            if (offset + 3 > dlSize) {
+                return false;
+            }
+            const u16 vtxCount = read_be16(dlStart + offset + 1);
+            cmdSize = 3 + vtxCount * stride;
+            return offset + cmdSize <= dlSize;
+        }
+        return false;
+    }
+}
+
+struct MergeRun {
+    u8 cmd = 0;
+    u16 vtxCount = 0;
+    std::vector<u8> vertices;
+};
+
+void flush_merge_run(std::vector<u8>& out, MergeRun& run) {
+    if (run.vtxCount == 0) {
+        return;
+    }
+
+    out.push_back(run.cmd);
+    append_be16(out, run.vtxCount);
+    append_bytes(out, run.vertices.data(), run.vertices.size());
+    run.vertices.clear();
+    run.vtxCount = 0;
+}
+
+void append_vertex(std::vector<u8>& out, const u8* vertices, u32 stride, u16 idx) {
+    append_bytes(out, vertices + idx * stride, stride);
+}
+
+bool triangulate_draw(
+    std::vector<u8>& out, u8 opcode, const u8* vertices, u32 stride, u16 vtxCount) {
+    switch (opcode) {
+    case GX_TRIANGLES:
+        append_bytes(out, vertices, vtxCount * stride);
+        return true;
+    case GX_TRIANGLEFAN:
+        if (vtxCount < 3) {
+            return false;
+        }
+        for (u16 v = 2; v < vtxCount; v++) {
+            append_vertex(out, vertices, stride, 0);
+            append_vertex(out, vertices, stride, v - 1);
+            append_vertex(out, vertices, stride, v);
+        }
+        return true;
+    case GX_TRIANGLESTRIP:
+        if (vtxCount < 3) {
+            return false;
+        }
+        for (u16 v = 2; v < vtxCount; v++) {
+            if ((v & 1) == 0) {
+                append_vertex(out, vertices, stride, v - 2);
+                append_vertex(out, vertices, stride, v - 1);
+            } else {
+                append_vertex(out, vertices, stride, v - 1);
+                append_vertex(out, vertices, stride, v - 2);
+            }
+            append_vertex(out, vertices, stride, v);
+        }
+        return true;
+    case GX_QUADS:
+        if ((vtxCount & 3) != 0) {
+            return false;
+        }
+        for (u16 v = 0; v < vtxCount; v += 4) {
+            append_vertex(out, vertices, stride, v);
+            append_vertex(out, vertices, stride, v + 1);
+            append_vertex(out, vertices, stride, v + 2);
+            append_vertex(out, vertices, stride, v + 2);
+            append_vertex(out, vertices, stride, v + 3);
+            append_vertex(out, vertices, stride, v);
+        }
+        return true;
+    default:
+        return false;
+    }
+}
+
+void append_triangles_to_run(
+    std::vector<u8>& out, MergeRun& run, u8 cmd, const std::vector<u8>& vertices, u32 stride) {
+    u32 offset = 0;
+    u32 remaining = vertices.size() / stride;
+    while (remaining != 0) {
+        if (run.vtxCount != 0 && run.cmd != cmd) {
+            flush_merge_run(out, run);
+        }
+
+        if (run.vtxCount == 0) {
+            run.cmd = cmd;
+        }
+
+        u32 available = 0xFFFF - run.vtxCount;
+        if (available == 0) {
+            flush_merge_run(out, run);
+            continue;
+        }
+
+        u32 toCopy = std::min(remaining, available);
+        append_bytes(run.vertices, vertices.data() + offset * stride, toCopy * stride);
+        run.vtxCount += toCopy;
+        offset += toCopy;
+        remaining -= toCopy;
+
+        if (run.vtxCount == 0xFFFF) {
+            flush_merge_run(out, run);
+        }
+    }
+}
+
+bool optimize_display_list(const u8* dlStart, u32 dlSize, u32 stride, std::vector<u8>& out) {
+    MergeRun run;
+    out.reserve(dlSize);
+
+    for (u32 offset = 0; offset < dlSize;) {
+        u32 cmdSize = 0;
+        if (!get_command_size(dlStart, dlSize, offset, stride, cmdSize)) {
+            return false;
+        }
+
+        const u8 cmd = dlStart[offset];
+        const u8 opcode = cmd & GX_OPCODE_MASK;
+        if (opcode == GX_NOP) {
+            offset += cmdSize;
+            continue;
+        }
+
+        if (!is_draw_opcode(opcode)) {
+            flush_merge_run(out, run);
+            append_bytes(out, dlStart + offset, cmdSize);
+            offset += cmdSize;
+            continue;
+        }
+
+        if (!is_mergeable_draw_opcode(opcode)) {
+            flush_merge_run(out, run);
+            append_bytes(out, dlStart + offset, cmdSize);
+            offset += cmdSize;
+            continue;
+        }
+
+        const u16 vtxCount = read_be16(dlStart + offset + 1);
+        const u8* vertices = dlStart + offset + 3;
+        std::vector<u8> triangles;
+        if (!triangulate_draw(triangles, opcode, vertices, stride, vtxCount)) {
+            flush_merge_run(out, run);
+            append_bytes(out, dlStart + offset, cmdSize);
+            offset += cmdSize;
+            continue;
+        }
+
+        append_triangles_to_run(out, run, (GX_TRIANGLES | (cmd & GX_VAT_MASK)), triangles, stride);
+        offset += cmdSize;
+    }
+
+    flush_merge_run(out, run);
+    return true;
+}
+
 void set_display_list_copy(void*& displayList, u32& displayListSize, const u8* data, u32 size) {
    const u32 alignedSize = ALIGN_NEXT(size, 0x20);
    u8* newDL = JKR_NEW_ARRAY_ARGS(u8, alignedSize, 0x20);
@@ -35,11 +289,20 @@ u32 J3DShapeDraw::countVertex(u32 stride) {
    u8* dlStart = (u8*)getDisplayList();

 #if TARGET_PC
-    aurora::gx::dl::Reader reader{dlStart, getDisplayListSize(), static_cast<u8>(stride)};
-    while (const auto cmd = reader.next()) {
-        if (cmd->kind != aurora::gx::dl::Command::Kind::Passthrough) {
-            count += cmd->draw.vtxCount;
+    for (u32 offset = 0; offset < getDisplayListSize();) {
+        u8 cmd = dlStart[offset];
+        u8 opcode = cmd & GX_OPCODE_MASK;
+        u32 cmdSize = 0;
+        if (!get_command_size(dlStart, getDisplayListSize(), offset, stride, cmdSize)) {
+            break;
        }
+        if (!is_draw_opcode(opcode)) {
+            offset += cmdSize;
+            continue;
+        }
+        int vtxNum = be16(*reinterpret_cast<u16*>(dlStart + offset + 1));
+        count += vtxNum;
+        offset += 3 + stride * vtxNum;
    }
 #else
    for (u8* dl = dlStart; (dl - dlStart) < getDisplayListSize();) {
@@ -57,53 +320,6 @@ u32 J3DShapeDraw::countVertex(u32 stride) {
    return count;
 }

-#if TARGET_PC
-void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
-    u32 byteNum = countVertex(stride);
-    u32 oldSize = mDisplayListSize;
-    u32 newSize = ALIGN_NEXT(oldSize + byteNum, 0x20);
-    u8* newDLStart = JKR_NEW_ARRAY_ARGS(u8, newSize, 0x20);
-    u8* oldDLStart = (u8*)mDisplayList;
-    u8* newDL = newDLStart;
-
-    aurora::gx::dl::Reader reader{oldDLStart, mDisplayListSize, static_cast<u8>(stride)};
-    while (const auto cmd = reader.next()) {
-        if (cmd->kind == aurora::gx::dl::Command::Kind::Passthrough) {
-            std::memcpy(newDL, cmd->data, cmd->size);
-            newDL += cmd->size;
-            continue;
-        }
-
-        const auto& draw = cmd->draw;
-        const u32 headerSize = draw.vertices - cmd->data;
-        std::memcpy(newDL, cmd->data, headerSize);
-        newDL += headerSize;
-
-        for (u32 i = 0; i < draw.vtxCount; i++) {
-            const u8* oldVtx = draw.vertices + stride * i;
-            u8 pnmtxidx = oldVtx[0];
-            std::memcpy(newDL, oldVtx, attrOffs);
-            newDL += attrOffs;
-            *newDL++ = valueBase + pnmtxidx;
-            std::memcpy(newDL, oldVtx + attrOffs, stride - attrOffs);
-            newDL += stride - attrOffs;
-        }
-    }
-    if (reader.failed()) {
-        // preserve the remainder untouched
-        std::memcpy(newDL, oldDLStart + reader.pos(), mDisplayListSize - reader.pos());
-        newDL += mDisplayListSize - reader.pos();
-    }
-
-    u32 realSize = ALIGN_NEXT((uintptr_t)newDL - (uintptr_t)newDLStart, 0x20);
-    for (; (newDL - newDLStart) < newSize; newDL++)
-        *newDL = 0;
-
-    mDisplayListSize = realSize;
-    mDisplayList = newDLStart;
-    DCStoreRange(newDLStart, mDisplayListSize);
-}
-#else
 void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
    u32 byteNum = countVertex(stride);
    u32 oldSize = mDisplayListSize;
@@ -114,13 +330,32 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
    u8* newDL = newDLStart;

    for (; (oldDL - oldDLStart) < mDisplayListSize;) {
+#if TARGET_PC
+        u32 oldOffset = oldDL - oldDLStart;
+        u32 cmdSize = 0;
+        if (!get_command_size(oldDLStart, mDisplayListSize, oldOffset, stride, cmdSize)) {
+            memcpy(newDL, oldDL, mDisplayListSize - oldOffset);
+            newDL += mDisplayListSize - oldOffset;
+            break;
+        }
+#endif
        // Copy command
        u8 cmd = *(u8*)oldDL;
        oldDL++;
        *newDL++ = cmd;

+#if TARGET_PC
+        u8 opcode = cmd & GX_OPCODE_MASK;
+        if (!is_draw_opcode(opcode)) {
+            memcpy(newDL, oldDL, cmdSize - 1);
+            oldDL += cmdSize - 1;
+            newDL += cmdSize - 1;
+            continue;
+        }
+#else
        if (cmd != GX_TRIANGLEFAN && cmd != GX_TRIANGLESTRIP)
            break;
+#endif

        // Copy count
        int vtxNum = *(u16*)oldDL;
@@ -149,7 +384,6 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
    mDisplayList = newDLStart;
    DCStoreRange(newDLStart, mDisplayListSize);
 }
-#endif

 J3DShapeDraw::J3DShapeDraw(const u8* displayList, u32 displayListSize) {
 #if TARGET_PC
@@ -163,8 +397,12 @@ J3DShapeDraw::J3DShapeDraw(const u8* displayList, u32 displayListSize) {
 #if TARGET_PC
 J3DShapeDraw::J3DShapeDraw(
    const u8* displayList, u32 displayListSize, const GXVtxDescList* vtxDesc) {
-    if (const auto optimized = aurora::gx::dl::optimize(displayList, displayListSize, vtxDesc)) {
-        set_display_list_copy(mDisplayList, mDisplayListSize, optimized->data(), optimized->size());
+    u32 stride = 0;
+    std::vector<u8> optimized;
+    if (calc_vtx_stride(vtxDesc, stride) &&
+        optimize_display_list(displayList, displayListSize, stride, optimized))
+    {
+        set_display_list_copy(mDisplayList, mDisplayListSize, optimized.data(), optimized.size());
    } else {
        set_display_list_copy(mDisplayList, mDisplayListSize, displayList, displayListSize);
    }
@@ -12,9 +12,6 @@
 #include "dusk/logging.h"

 J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
-#ifdef DUSK_TPHD
-    mBlockType = (i_block.mBlockType & 0xFF) - 0x30; // get number at last byte of block name
-#endif
    mMaterialNum = i_block.mMaterialNum;
    mpMaterialInitData = JSUConvertOffsetToPtr<J3DMaterialInitData>(&i_block, i_block.mpMaterialInitData);
    mpMaterialID = JSUConvertOffsetToPtr<BE(u16)>(&i_block, i_block.mpMaterialID);
@@ -49,11 +46,6 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
    mpZCompLoc = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpZCompLoc);
    mpDither = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpDither);
    mpNBTScaleInfo = JSUConvertOffsetToPtr<J3DNBTScaleInfo>(&i_block, i_block.mpNBTScaleInfo);
-#ifdef DUSK_TPHD
-    if(mBlockType >= 4) {
-        mpPolygonOffsets = JSUConvertOffsetToPtr<PolygonOffset>(&i_block, reinterpret_cast<const J3DMaterialBlock_MAT4&>(i_block).mpPolygonOffsets);
-    }
-#endif
    mpDisplayListInit = NULL;
    mpPatchingInfo = NULL;
    mpCurrentMtxInfo = NULL;
@@ -82,11 +74,7 @@ u16 J3DMaterialFactory::countUniqueMaterials() {
 }

 u32 J3DMaterialFactory::countTexGens(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTexGenNumIdx != 0xff) {
        return mpTexGenNum[mtl_init_data->mTexGenNumIdx];
    }
@@ -94,11 +82,7 @@ u32 J3DMaterialFactory::countTexGens(int i_idx) const {
 }

 u32 J3DMaterialFactory::countStages(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    u32 count1 = 0;
    u32 count2 = 0;
    if (mtl_init_data->mTevStageNumIdx != 0xff) {
@@ -173,9 +157,6 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i
    i_material->mPEBlock->setZMode(newZMode(i_idx));
    i_material->mPEBlock->setZCompLoc(newZCompLoc(i_idx));
    i_material->mPEBlock->setDither(newDither(i_idx));
-#ifdef DUSK_TPHD
-    i_material->mPEBlock->setPolygonOffset(newPolygonOffset(i_idx));
-#endif
    i_material->mTevBlock->setTevStageNum(newTevStageNum(i_idx));
    for (u8 i = 0; i < tex_num; i++) {
        i_material->mTevBlock->setTexNo(i, newTexNo(i_idx, i));
@@ -184,11 +165,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i
        i_material->mTevBlock->setTevOrder(i, newTevOrder(i_idx, i));
    }
    for (u8 i = 0; i < tev_stage_num_max; i++) {
-#ifdef DUSK_TPHD
-        J3DMaterialInitData* material_init_data = getMatInitData(i_idx);
-#else
        J3DMaterialInitData* material_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
        i_material->mTevBlock->setTevStage(i, newTevStage(i_idx, i));
        if (material_init_data->mTevSwapModeIdx[i] != 0xffff) {
            i_material->mTevBlock->getTevStage(i)->setTexSel(
@@ -223,11 +200,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i
    for (u8 i = 0; i < 8; i++) {
        i_material->mTexGenBlock->setTexMtx(i, newTexMtx(i_idx, i));
    }
-#ifdef DUSK_TPHD
-        J3DMaterialInitData* material_init_data = getMatInitData(i_idx);
-#else
-        J3DMaterialInitData* material_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
+    J3DMaterialInitData* material_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
    for (u8 i = 0; i < tev_stage_num_max; i++) {
        if (material_init_data->mTevKColorSel[i] != 0xff) {
            i_material->mTevBlock->setTevKColorSel(i, material_init_data->mTevKColorSel[i]);
@@ -300,11 +273,7 @@ J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material,
        i_material->mTevBlock->setTevColor(i, newTevColor(i_idx, i));
    }
    for (u8 i = 0; i < tev_stage_num; i++) {
-#ifdef DUSK_TPHD
-        J3DMaterialInitData* material_init_data = getMatInitData(i_idx);
-#else
        J3DMaterialInitData* material_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
        i_material->mTevBlock->setTevStage(i, newTevStage(i_idx, i));
        if (material_init_data->mTevSwapModeIdx[i] != 0xffff) {
            i_material->mTevBlock->getTevStage(i)->setTexSel(
@@ -313,11 +282,7 @@ J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material,
                mpTevSwapModeInfo[material_init_data->mTevSwapModeIdx[i]].mRasSel);
        }
    }
-#ifdef DUSK_TPHD
-        J3DMaterialInitData* init_data = getMatInitData(i_idx);
-#else
-        J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
+    J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
    for (u8 i = 0; i < tev_stage_num; i++) {
        if (init_data->mTevKColorSel[i] != 0xff) {
            i_material->mTevBlock->setTevKColorSel(i, init_data->mTevKColorSel[i]);
@@ -458,11 +423,7 @@ u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_id
    size += J3DMaterial::calcSizeTevBlock((u16)tev_stage_num_max);
    size += J3DMaterial::calcSizeIndBlock(ind_flag);
    size += J3DMaterial::calcSizePEBlock(pe_flag, getMaterialMode(i_idx));
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    for (u32 i = 0; i < 8; i++) {
        if (init_data->mTexMtxIdx[i] != 0xffff) {
            size += sizeof(J3DTexMtx);
@@ -483,11 +444,7 @@ u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_i
    size += sizeof(J3DTevBlockPatched);
    size += J3DMaterial::calcSizeIndBlock(ind_flag);
    size += J3DMaterial::calcSizePEBlock(0x10000000, getMaterialMode(i_idx));
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    for (u32 i = 0; i < 8; i++) {
        if (init_data->mTexMtxIdx[i] != 0xffff) {
            size += sizeof(J3DTexMtx);
@@ -517,11 +474,7 @@ J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const {
    #else
    J3DGXColor dflt = GXColor{0xff, 0xff, 0xff, 0xff};
    #endif
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mMatColorIdx[i_no] != 0xffff) {
        return (GXColor) mpMatColor[mtl_init_data->mMatColorIdx[i_no]];
    } else {
@@ -530,11 +483,7 @@ J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const {
 }

 const u8 J3DMaterialFactory::newColorChanNum(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mColorChanNumIdx != 0xff) {
        return mpColorChanNum[mtl_init_data->mColorChanNumIdx];
    } else {
@@ -544,11 +493,7 @@ const u8 J3DMaterialFactory::newColorChanNum(int i_idx) const {

 J3DColorChan J3DMaterialFactory::newColorChan(int i_idx, int i_no) const {
    u32 r29 = 0;
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (init_data->mColorChanIdx[i_no] != 0xffff) {
        return J3DColorChan(mpColorChanInfo[init_data->mColorChanIdx[i_no]]);
    } else {
@@ -562,11 +507,7 @@ J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const {
    #else
    J3DGXColor dflt = GXColor{0x32, 0x32, 0x32, 0x32};
    #endif
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mAmbColorIdx[i_no] != 0xffff) {
        return (GXColor) mpAmbColor[mtl_init_data->mAmbColorIdx[i_no]];
    } else {
@@ -576,11 +517,7 @@ J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const {

 u32 J3DMaterialFactory::newTexGenNum(int i_idx) const {
    u32 r30 = 0;
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTexGenNumIdx != 0xff) {
        return mpTexGenNum[mtl_init_data->mTexGenNumIdx];
    } else {
@@ -589,11 +526,7 @@ u32 J3DMaterialFactory::newTexGenNum(int i_idx) const {
 }

 J3DTexCoord J3DMaterialFactory::newTexCoord(int i_idx, int i_no) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTexCoordIdx[i_no] != 0xffff) {
        return J3DTexCoord(mpTexCoordInfo[mtl_init_data->mTexCoordIdx[i_no]]);
    } else {
@@ -603,11 +536,7 @@ J3DTexCoord J3DMaterialFactory::newTexCoord(int i_idx, int i_no) const {

 J3DTexMtx* J3DMaterialFactory::newTexMtx(int i_idx, int i_no) const {
    J3DTexMtx* tex_mtx = NULL;
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTexMtxIdx[i_no] != 0xffff) {
 #if TARGET_LITTLE_ENDIAN
        auto tex_mtx_info = mpTexMtxInfo[mtl_init_data->mTexMtxIdx[i_no]];
@@ -629,11 +558,7 @@ J3DTexMtx* J3DMaterialFactory::newTexMtx(int i_idx, int i_no) const {

 u8 J3DMaterialFactory::newCullMode(int i_idx) const {
    u32 r30 = 0;
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mCullModeIdx != 0xff) {
        return mpCullMode[mtl_init_data->mCullModeIdx];
    } else {
@@ -642,11 +567,7 @@ u8 J3DMaterialFactory::newCullMode(int i_idx) const {
 }

 u16 J3DMaterialFactory::newTexNo(int i_idx, int i_no) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTexNoIdx[i_no] != 0xffff) {
        return mpTexNo[mtl_init_data->mTexNoIdx[i_no]];
    } else {
@@ -655,11 +576,7 @@ u16 J3DMaterialFactory::newTexNo(int i_idx, int i_no) const {
 }

 J3DTevOrder J3DMaterialFactory::newTevOrder(int i_idx, int i_no) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTevOrderIdx[i_no] != 0xffff) {
        return J3DTevOrder(mpTevOrderInfo[mtl_init_data->mTevOrderIdx[i_no]]);
    } else {
@@ -670,11 +587,7 @@ J3DTevOrder J3DMaterialFactory::newTevOrder(int i_idx, int i_no) const {
 J3DGXColorS10 J3DMaterialFactory::newTevColor(int i_idx, int i_no) const {
    GXColorS10 _dflt = {0, 0, 0, 0};
    J3DGXColorS10 dflt = _dflt;
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTevColorIdx[i_no] != 0xffff) {
        return (GXColorS10) mpTevColor[mtl_init_data->mTevColorIdx[i_no]];
    } else {
@@ -688,11 +601,7 @@ J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const {
    #else
    J3DGXColor dflt = GXColor{0xff, 0xff, 0xff, 0xff};
    #endif
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTevKColorIdx[i_no] != 0xffff) {
        return (GXColor) mpTevKColor[mtl_init_data->mTevKColorIdx[i_no]];
    } else {
@@ -701,11 +610,7 @@ J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const {
 }

 const u8 J3DMaterialFactory::newTevStageNum(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTevStageNumIdx != 0xff) {
        return mpTevStageNum[mtl_init_data->mTevStageNumIdx];
    } else {
@@ -714,11 +619,7 @@ const u8 J3DMaterialFactory::newTevStageNum(int i_idx) const {
 }

 J3DTevStage J3DMaterialFactory::newTevStage(int i_idx, int i_no) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTevStageIdx[i_no] != 0xffff) {
        return J3DTevStage(mpTevStageInfo[mtl_init_data->mTevStageIdx[i_no]]);
    } else {
@@ -727,11 +628,7 @@ J3DTevStage J3DMaterialFactory::newTevStage(int i_idx, int i_no) const {
 }

 J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int i_idx, int i_no) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mTevSwapModeTableIdx[i_no] != 0xffff) {
        return J3DTevSwapModeTable(mpTevSwapModeTableInfo[mtl_init_data->mTevSwapModeTableIdx[i_no]]);
    } else {
@@ -792,11 +689,7 @@ J3DIndTexCoordScale J3DMaterialFactory::newIndTexCoordScale(int i_idx, int i_no)

 J3DFog J3DMaterialFactory::newFog(int i_idx) const {
    J3DFog fog;
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mFogIdx != 0xffff) {
 #if TARGET_LITTLE_ENDIAN
        J3DFogInfo fogInfo = mpFogInfo[mtl_init_data->mFogIdx];
@@ -816,11 +709,7 @@ J3DFog J3DMaterialFactory::newFog(int i_idx) const {
 }

 J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mAlphaCompIdx != 0xffff) {
        return J3DAlphaComp(mpAlphaCompInfo[mtl_init_data->mAlphaCompIdx]);
    } else {
@@ -829,11 +718,7 @@ J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const {
 }

 J3DBlend J3DMaterialFactory::newBlend(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mBlendIdx != 0xffff) {
        return J3DBlend(mpBlendInfo[mtl_init_data->mBlendIdx]);
    } else {
@@ -843,11 +728,7 @@ J3DBlend J3DMaterialFactory::newBlend(int i_idx) const {

 J3DZMode J3DMaterialFactory::newZMode(int i_idx) const {
    u32 r29 = 0;
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mZModeIdx != 0xff) {
        return J3DZMode(mpZModeInfo[mtl_init_data->mZModeIdx]);
    } else {
@@ -856,11 +737,7 @@ J3DZMode J3DMaterialFactory::newZMode(int i_idx) const {
 }

 const u8 J3DMaterialFactory::newZCompLoc(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mZCompLocIdx != 0xff){
        return mpZCompLoc[mtl_init_data->mZCompLocIdx];
    } else {
@@ -869,11 +746,7 @@ const u8 J3DMaterialFactory::newZCompLoc(int i_idx) const {
 }

 const u8 J3DMaterialFactory::newDither(int i_idx) const {
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mDitherIdx != 0xff){
        return mpDither[mtl_init_data->mDitherIdx];
    } else {
@@ -881,24 +754,9 @@ const u8 J3DMaterialFactory::newDither(int i_idx) const {
    }
 }

-#ifdef DUSK_TPHD
-const PolygonOffset J3DMaterialFactory::newPolygonOffset(int i_idx) const {
-    J3DMaterialInitData_MAT4* mtl_init_data = (J3DMaterialInitData_MAT4*)getMatInitData(i_idx);
-    if (mBlockType >= 4 && mtl_init_data->mPolygonOffsetIdx != 0xffff){
-        return mpPolygonOffsets[mtl_init_data->mPolygonOffsetIdx];
-    } else {
-        return PolygonOffset{0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
-    }
-}
-#endif
-
 J3DNBTScale J3DMaterialFactory::newNBTScale(int i_idx) const {
    J3DNBTScale dflt(j3dDefaultNBTScaleInfo);
-#ifdef DUSK_TPHD
-    J3DMaterialInitData* mtl_init_data = getMatInitData(i_idx);
-#else
    J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
-#endif
    if (mtl_init_data->mNBTScaleIdx != 0xffff) {
        return J3DNBTScale(mpNBTScaleInfo[mtl_init_data->mNBTScaleIdx]);
    } else {
@@ -103,9 +103,6 @@ J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) {
                readJoint((J3DJointBlock*)block);
                break;
            case 'MAT3':
-#if DUSK_TPHD
-            case 'MAT4':
-#endif
                readMaterial((J3DMaterialBlock*)block, (s32)i_flags);
                break;
            case 'MAT2':
@@ -150,9 +147,6 @@ J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) {
    for (u32 block_no = 0; block_no < data->mBlockNum; block_no++) {
        switch (block->mBlockType) {
            case 'MAT3':
-#if DUSK_TPHD
-            case 'MAT4':
-#endif
                readMaterialTable((J3DMaterialBlock*)block, flags);
                break;
            case 'MAT2':
@@ -218,9 +212,6 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_fl
                modifyMaterial(i_flags);
                break;
            case 'MAT3':
-#if DUSK_TPHD
-            case 'MAT4':
-#endif
                flags = 0x50100000;
                flags |= (i_flags & 0x3000000);
                mpMaterialBlock = (J3DMaterialBlock*)block;
@@ -317,22 +308,8 @@ static GXVtxAttrFmtList getFmt(GXVtxAttrFmtList* i_fmtList, GXAttr i_attr) {
            return *i_fmtList;
        }
    }
-#if DUSK_TPHD
-    // HD BMDs occasionally have vertex arrays without a format entry. Mirror
-    // the GC runtime: fall back to J3DSys::initGX defaults.
-    GXVtxAttrFmtList def{};
-    def.attr = i_attr;
-    def.frac = 0;
-    if (i_attr == GX_VA_POS)               { def.cnt = GX_POS_XYZ; def.type = GX_F32; }
-    else if (i_attr == GX_VA_NRM)          { def.cnt = GX_NRM_XYZ; def.type = GX_F32; }
-    else if (i_attr == GX_VA_NBT)          { def.cnt = GX_NRM_NBT; def.type = GX_F32; }
-    else if (i_attr >= GX_VA_CLR0 &&
-             i_attr <= GX_VA_CLR1)         { def.cnt = GX_CLR_RGBA; def.type = GX_RGBA8; }
-    else                                   { def.cnt = GX_TEX_ST;  def.type = GX_F32; }
-    return def;
-#else
+
    OSPanic(__FILE__, __LINE__, "Unable to find vertex attribute format!");
-#endif
 }
 #endif

@@ -16,7 +16,7 @@ u16 J3DModelLoader::countMaterialNum(const void* stream) {
    const J3DModelBlock* block = header->mBlocks;
    for (int i = 0; i < header->mBlockNum; i++)
    {
-        if (block->mBlockType == 'MAT3' || block->mBlockType == 'MAT4') {
+        if (block->mBlockType == 'MAT3') {
            const J3DMaterialBlock* materialBlock = (const J3DMaterialBlock*)block;
            return materialBlock->mMaterialNum;
        }
@@ -45,7 +45,6 @@ u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) {
            size += calcSizeJoint((const J3DJointBlock*)nextBlock);
            break;
        case 'MAT3':
-        case 'MAT4':
            size += calcSizeMaterial((const J3DMaterialBlock*)nextBlock, flags);
            break;
        case 'SHP1':
@@ -87,7 +86,6 @@ u32 J3DModelLoader::calcLoadMaterialTableSize(const void* stream) {
    for (u32 i = 0; i < header->mBlockNum; i++) {
        switch (nextBlock->mBlockType) {
        case 'MAT3':
-        case 'MAT4':
            size += calcSizeMaterialTable((const J3DMaterialBlock*)nextBlock, flags);
            break;
        case 'TEX1':
@@ -137,8 +135,7 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags)
 		case 'MDL3':
 			size += calcSizeMaterialDL((const J3DMaterialDLBlock*)nextBlock, flags);
 			break;
-        case 'MAT3':
-        case 'MAT4': {
+        case 'MAT3': {
 			u32 flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn);
            flags2 |= (u32)flags & (J3DMLF_Material_UseIndirect | J3DMLF_26);
 			mpMaterialBlock = (const J3DMaterialBlock*)nextBlock;
@@ -9,24 +9,6 @@
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JUtility/JUTAssert.h"

-#if DUSK_TPHD
-#include "dusk/tphd/HdAssetLayer.hpp"
-
-namespace {
-void register_copied_hd_resource(
-    JKRArchive* archive, JKRArchive::SDIFileEntry* fileEntry, void* buffer, u32 resourceSize) {
-    if (archive == NULL || fileEntry == NULL || buffer == NULL || resourceSize == 0 ||
-        archive->mStringTable == NULL)
-    {
-        return;
-    }
-
-    dusk::tphd::register_copied_hd_resource(archive->mEntryNum,
-        archive->mStringTable + fileEntry->getNameOffset(), buffer, resourceSize);
-}
-}  // namespace
-#endif
-
 JKRArchive* JKRArchive::check_mount_already(s32 entryNum, JKRHeap* heap) {
    if (heap == NULL) {
        heap = JKRGetCurrentHeap();
@@ -214,9 +196,6 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u32 type, const char*
    if (fileEntry) {
        u32 resourceSize;
        fetchResource(buffer, bufferSize, fileEntry, &resourceSize);
-#if DUSK_TPHD
-        register_copied_hd_resource(this, fileEntry, buffer, resourceSize);
-#endif
        return resourceSize;
    }

@@ -235,9 +214,6 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, const char* path) {
    if (fileEntry) {
        u32 resourceSize;
        fetchResource(buffer, bufferSize, fileEntry, &resourceSize);
-#if DUSK_TPHD
-        register_copied_hd_resource(this, fileEntry, buffer, resourceSize);
-#endif
        return resourceSize;
    }

@@ -250,9 +226,6 @@ u32 JKRArchive::readIdxResource(void* buffer, u32 bufferSize, u32 index) {
    if (fileEntry) {
        u32 resourceSize;
        fetchResource(buffer, bufferSize, fileEntry, &resourceSize);
-#if DUSK_TPHD
-        register_copied_hd_resource(this, fileEntry, buffer, resourceSize);
-#endif
        return resourceSize;
    }

@@ -265,9 +238,6 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u16 id) {
    if (fileEntry) {
        u32 resourceSize;
        fetchResource(buffer, bufferSize, fileEntry, &resourceSize);
-#if DUSK_TPHD
-        register_copied_hd_resource(this, fileEntry, buffer, resourceSize);
-#endif
        return resourceSize;
    }

@@ -10,10 +10,6 @@
 #include <stdint.h>
 #include "os_report.h"

-#if DUSK_TPHD
-#include "dusk/tphd/HdAssetLayer.hpp"
-#endif
-
 JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
    : JKRArchive(entryNum, MOUNT_MEM) {
    mIsMounted = false;
@@ -71,13 +67,8 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
    mIsOpen = false;
    mMountDirection = mountDirection;

-#ifdef TARGET_PC
-    u32 loadedSize = 0;
-#endif
    if (mMountDirection == JKRArchive::MOUNT_DIRECTION_HEAD) {
-#ifndef TARGET_PC
        u32 loadedSize;
-#endif
        mArcHeader = (SArcHeader *)JKRDvdToMainRam(
            entryNum, NULL, EXPAND_SWITCH_UNKNOWN1, 0, mHeap, JKRDvdRipper::ALLOC_DIRECTION_FORWARD,
            0, (int *)&mCompression, &loadedSize);
@@ -86,9 +77,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
        }
    }
    else {
-#ifndef TARGET_PC
        u32 loadedSize;
-#endif
        mArcHeader = (SArcHeader *)JKRDvdToMainRam(
            entryNum, NULL, EXPAND_SWITCH_UNKNOWN1, 0, mHeap,
            JKRDvdRipper::ALLOC_DIRECTION_BACKWARD, 0, (int *)&mCompression, &loadedSize);
@@ -101,9 +90,6 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
        mMountMode = UNKNOWN_MOUNT_MODE;
    }
    else {
-#if DUSK_TPHD
-        dusk::tphd::register_mounted_hd_archive(entryNum, mArcHeader, loadedSize);
-#endif
        JUT_ASSERT(438, mArcHeader->signature == 'RARC');
        mArcInfoBlock = (SArcDataInfo *)((u8 *)mArcHeader + mArcHeader->header_length);
        mNodes = (SDIDirEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset);
@@ -14,33 +14,6 @@
 #endif
 #include "tracy/Tracy.hpp"

-#if TARGET_PC
-#define JPA_DRAW_CTX_PARAM , ParticleDrawCtx* ctx
-
-namespace {
-GXColor emitter_prm_color(JPAEmitterWorkData* work) {
-    JPABaseEmitter* emtr = work->mpEmtr;
-    GXColor prm = emtr->mPrmClr;
-    prm.r = COLOR_MULTI(prm.r, emtr->mGlobalPrmClr.r);
-    prm.g = COLOR_MULTI(prm.g, emtr->mGlobalPrmClr.g);
-    prm.b = COLOR_MULTI(prm.b, emtr->mGlobalPrmClr.b);
-    prm.a = COLOR_MULTI(prm.a, emtr->mGlobalPrmClr.a);
-    return prm;
-}
-
-GXColor emitter_env_color(JPAEmitterWorkData* work) {
-    JPABaseEmitter* emtr = work->mpEmtr;
-    GXColor env = emtr->mEnvClr;
-    env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
-    env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
-    env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-    return env;
-}
-}  // namespace
-#else
-#define JPA_DRAW_CTX_PARAM
-#endif
-
 void JPASetPointSize(JPAEmitterWorkData* work) {
    GXSetPointSize((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);
 }
@@ -49,16 +22,15 @@ void JPASetLineWidth(JPAEmitterWorkData* work) {
    GXSetLineWidth((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);
 }

-void JPASetPointSize(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPASetPointSize(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    GXSetPointSize((u8)(ptcl->mParticleScaleX * (25.0f * work->mGlobalPtclScl.x)), GX_TO_ONE);
 }

-void JPASetLineWidth(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPASetLineWidth(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    GXSetLineWidth((u8)(ptcl->mParticleScaleX * (25.0f * work->mGlobalPtclScl.x)), GX_TO_ONE);
 }

 void JPARegistPrm(JPAEmitterWorkData* work) {
-    ZoneScoped;
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor prm = emtr->mPrmClr;
    prm.r = COLOR_MULTI(prm.r, emtr->mGlobalPrmClr.r);
@@ -69,7 +41,6 @@ void JPARegistPrm(JPAEmitterWorkData* work) {
 }

 void JPARegistEnv(JPAEmitterWorkData* work) {
-    ZoneScoped;
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor env = emtr->mEnvClr;
    env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
@@ -79,7 +50,6 @@ void JPARegistEnv(JPAEmitterWorkData* work) {
 }

 void JPARegistPrmEnv(JPAEmitterWorkData* work) {
-    ZoneScoped;
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor prm = emtr->mPrmClr;
    GXColor env = emtr->mEnvClr;
@@ -94,8 +64,7 @@ void JPARegistPrmEnv(JPAEmitterWorkData* work) {
    GXSetTevColor(GX_TEVREG1, env);
 }

-void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
-    ZoneScoped;
+void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor prm = emtr->mPrmClr;
    prm.r = COLOR_MULTI(prm.r, emtr->mGlobalPrmClr.r);
@@ -103,19 +72,10 @@ void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX
    prm.b = COLOR_MULTI(prm.b, emtr->mGlobalPrmClr.b);
    prm.a = COLOR_MULTI(prm.a, emtr->mGlobalPrmClr.a);
    prm.a = COLOR_MULTI(prm.a, ptcl->mPrmColorAlphaAnm);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        if (ctx->useClr1) {
-            ctx->clr1 = emitter_env_color(work);
-        }
-        return;
-    }
-#endif
    GXSetTevColor(GX_TEVREG0, prm);
 }

-void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    ZoneScoped;
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor prm = ptcl->mPrmClr;
@@ -124,19 +84,10 @@ void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_
    prm.b = COLOR_MULTI(prm.b, emtr->mGlobalPrmClr.b);
    prm.a = COLOR_MULTI(prm.a, emtr->mGlobalPrmClr.a);
    prm.a = COLOR_MULTI(prm.a, ptcl->mPrmColorAlphaAnm);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        if (ctx->useClr1) {
-            ctx->clr1 = emitter_env_color(work);
-        }
-        return;
-    }
-#endif
    GXSetTevColor(GX_TEVREG0, prm);
 }

-void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    ZoneScoped;
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor prm = ptcl->mPrmClr;
@@ -149,19 +100,11 @@ void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DR
    env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
    env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
    env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        ctx->clr1 = env;
-        return;
-    }
-#endif
    GXSetTevColor(GX_TEVREG0, prm);
    GXSetTevColor(GX_TEVREG1, env);
 }

-void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
-    ZoneScoped;
+void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor prm = emtr->mPrmClr;
    GXColor env = ptcl->mEnvClr;
@@ -173,31 +116,16 @@ void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_
    env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
    env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
    env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = prm;
-        ctx->clr1 = env;
-        return;
-    }
-#endif
    GXSetTevColor(GX_TEVREG0, prm);
    GXSetTevColor(GX_TEVREG1, env);
 }

-void JPARegistEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
-    ZoneScoped;
+void JPARegistEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    JPABaseEmitter* emtr = work->mpEmtr;
    GXColor env = ptcl->mEnvClr;
    env.r = COLOR_MULTI(env.r, emtr->mGlobalEnvClr.r);
    env.g = COLOR_MULTI(env.g, emtr->mGlobalEnvClr.g);
    env.b = COLOR_MULTI(env.b, emtr->mGlobalEnvClr.b);
-#if TARGET_PC
-    if (ctx->batch) {
-        ctx->clr0 = emitter_prm_color(work);
-        ctx->clr1 = env;
-        return;
-    }
-#endif
    GXSetTevColor(GX_TEVREG1, env);
 }

@@ -330,7 +258,7 @@ void JPAGenCalcTexCrdMtxAnm(JPAEmitterWorkData* work) {
    GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX0);
 }

-void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
    ZoneScoped;
    JPABaseShape* shape = work->mpRes->getBsp();
    f32 dVar16 = param_1->mAge;
@@ -358,12 +286,6 @@ void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1
    local_108[2][1] = 0.0f;
    local_108[2][2] = 1.0f;
    local_108[2][3] = 0.0f;
-#if TARGET_PC
-    if (ctx->batch) {
-        MTXCopy(local_108, ctx->texMtx);
-        return;
-    }
-#endif
    GXLoadTexMtxImm(local_108, 0x1e, GX_MTX2x4);
 }

@@ -377,7 +299,7 @@ void JPALoadTexAnm(JPAEmitterWorkData* work) {
    work->mpResMgr->load(work->mpRes->getTexIdx(work->mpEmtr->mTexAnmIdx), GX_TEXMAP0);
 }

-void JPALoadTexAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPALoadTexAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    ZoneScoped;
    work->mpResMgr->load(work->mpRes->getTexIdx(ptcl->mTexAnmIdx), GX_TEXMAP0);
 }
@@ -507,47 +429,6 @@ static projectionFunc p_prj[3] = {
 };

 #if TARGET_PC
-static void emit_batch_quad(JPAEmitterWorkData* work, const ParticleDrawCtx* ctx,
-                            const Mtx posMtx) {
-    const JPAResource::BatchInfo& info = work->mpRes->mBatchInfo;
-
-    for (int i = 0; i < info.vtxCount; i++) {
-        Vec localPos = {info.vtxPos[i][0], info.vtxPos[i][1], info.vtxPos[i][2]};
-        Vec drawPos;
-        MTXMultVec(posMtx, &localPos, &drawPos);
-
-        f32 texS = info.vtxUv[i][0];
-        f32 texT = info.vtxUv[i][1];
-        if (ctx->useTexMtx) {
-            f32 srcS = texS;
-            f32 srcT = texT;
-            texS = ctx->texMtx[0][0] * srcS + ctx->texMtx[0][1] * srcT + ctx->texMtx[0][3];
-            texT = ctx->texMtx[1][0] * srcS + ctx->texMtx[1][1] * srcT + ctx->texMtx[1][3];
-        }
-
-        GXPosition3f32(drawPos.x, drawPos.y, drawPos.z);
-        if (ctx->useClr0) {
-            GXColor4u8(ctx->clr0.r, ctx->clr0.g, ctx->clr0.b, ctx->clr0.a);
-        }
-        if (ctx->useClr1) {
-            GXColor4u8(ctx->clr1.r, ctx->clr1.g, ctx->clr1.b, ctx->clr1.a);
-        }
-        GXTexCoord2f32(texS, texT);
-    }
-}
-
-static void submit_particle_quad(
-    JPAEmitterWorkData* work, ParticleDrawCtx* ctx, const Mtx posMtx, const u8* dl, u32 dlSize) {
-    if (ctx->batch) {
-        emit_batch_quad(work, ctx, posMtx);
-        return;
-    }
-
-    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
-    p_prj[work->mPrjType](work, posMtx);
-    GXCallDisplayList(dl, dlSize);
-}
-
 void JPAInterpBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    Mtx ptclPosMtx;
    MTXTrans(ptclPosMtx, ptcl->mPosition.x, ptcl->mPosition.y, ptcl->mPosition.z);
@@ -567,7 +448,7 @@ void JPAInterpRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
 }
 #endif

-void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -592,16 +473,12 @@ void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_C
    posMtx[2][2] = 1.0f;
    posMtx[2][3] = pos.z;
    posMtx[0][1] = posMtx[0][2] = posMtx[1][0] = posMtx[1][2] = posMtx[2][0] = posMtx[2][1] = 0.0f;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, posMtx, jpa_dl, sizeof(jpa_dl));
-#else
    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
    p_prj[work->mPrjType](work, posMtx);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }

-void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -640,16 +517,12 @@ void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRA
    posMtx[2][2] = 1.0f;
    posMtx[2][3] = pos.z;
    posMtx[0][2] = posMtx[1][2] = posMtx[2][0] = posMtx[2][1] = 0.0f;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, posMtx, jpa_dl, sizeof(jpa_dl));
-#else
    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
    p_prj[work->mPrjType](work, posMtx);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }

-void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -669,16 +542,12 @@ void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DR
    local_38[2][2] = work->mYBBCamMtx[2][2];
    local_38[2][3] = local_48.z;
    local_38[0][1] = local_38[0][2] = local_38[1][0] = local_38[2][0] = 0.0f;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, local_38, jpa_dl, sizeof(jpa_dl));
-#else
    GXLoadPosMtxImm(local_38, GX_PNMTX0);
    p_prj[work->mPrjType](work, local_38);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }

-void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -707,13 +576,9 @@ void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1 JPA
    local_38[2][1] = local_94 * fVar1;
    local_38[2][2] = local_90;
    local_38[2][3] = local_48.z;
-#if TARGET_PC
-    submit_particle_quad(work, ctx, local_38, jpa_dl, sizeof(jpa_dl));
-#else
    GXLoadPosMtxImm(local_38, GX_PNMTX0);
    p_prj[work->mPrjType](work, local_38);
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
-#endif
 }

 void dirTypeVel(JPAEmitterWorkData const* work, JPABaseParticle const* param_1,
@@ -876,88 +741,6 @@ static u8* p_dl[2] = {
 };

 #if TARGET_PC
-static bool make_direction_mtx(JPAEmitterWorkData* work, JPABaseParticle* ptcl, Mtx posMtx) {
-    JGeometry::TVec3<f32> axisY;
-    JGeometry::TVec3<f32> axisZ;
-    JGeometry::TVec3<f32> baseAxis(ptcl->mBaseAxis);
-    p_direction[work->mDirType](work, ptcl, &axisY);
-    if (axisY.isZero()) {
-        return false;
-    }
-
-    axisY.normalize();
-    axisZ.cross(baseAxis, axisY);
-    if (axisZ.isZero()) {
-        return false;
-    }
-
-    axisZ.normalize();
-    baseAxis.cross(axisY, axisZ);
-    baseAxis.normalize();
-    ptcl->mBaseAxis.set(baseAxis);
-
-    f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
-    f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
-    posMtx[0][0] = baseAxis.x;
-    posMtx[0][1] = axisY.x;
-    posMtx[0][2] = axisZ.x;
-    posMtx[0][3] = ptcl->mPosition.x;
-    posMtx[1][0] = baseAxis.y;
-    posMtx[1][1] = axisY.y;
-    posMtx[1][2] = axisZ.y;
-    posMtx[1][3] = ptcl->mPosition.y;
-    posMtx[2][0] = baseAxis.z;
-    posMtx[2][1] = axisY.z;
-    posMtx[2][2] = axisZ.z;
-    posMtx[2][3] = ptcl->mPosition.z;
-    p_plane[work->mPlaneType](posMtx, scaleX, scaleY);
-    return true;
-}
-
-static bool make_rot_direction_mtx(JPAEmitterWorkData* work, JPABaseParticle* ptcl, Mtx posMtx) {
-    f32 sinRot = JMASSin(ptcl->mRotateAngle);
-    f32 cosRot = JMASCos(ptcl->mRotateAngle);
-    JGeometry::TVec3<f32> axisY;
-    JGeometry::TVec3<f32> axisZ;
-    JGeometry::TVec3<f32> baseAxis(ptcl->mBaseAxis);
-    p_direction[work->mDirType](work, ptcl, &axisY);
-    if (axisY.isZero()) {
-        return false;
-    }
-
-    axisY.normalize();
-    axisZ.cross(baseAxis, axisY);
-    if (axisZ.isZero()) {
-        return false;
-    }
-
-    axisZ.normalize();
-    baseAxis.cross(axisY, axisZ);
-    baseAxis.normalize();
-    ptcl->mBaseAxis.set(baseAxis);
-
-    f32 scaleX = work->mGlobalPtclScl.x * ptcl->mParticleScaleX;
-    f32 scaleY = work->mGlobalPtclScl.y * ptcl->mParticleScaleY;
-    Mtx rotMtx;
-    Mtx dirMtx;
-    p_rot[work->mRotType](sinRot, cosRot, rotMtx);
-    p_plane[work->mPlaneType](rotMtx, scaleX, scaleY);
-    dirMtx[0][0] = baseAxis.x;
-    dirMtx[0][1] = axisY.x;
-    dirMtx[0][2] = axisZ.x;
-    dirMtx[0][3] = ptcl->mPosition.x;
-    dirMtx[1][0] = baseAxis.y;
-    dirMtx[1][1] = axisY.y;
-    dirMtx[1][2] = axisZ.y;
-    dirMtx[1][3] = ptcl->mPosition.y;
-    dirMtx[2][0] = baseAxis.z;
-    dirMtx[2][1] = axisY.z;
-    dirMtx[2][2] = axisZ.z;
-    dirMtx[2][3] = ptcl->mPosition.z;
-    MTXConcat(dirMtx, rotMtx, posMtx);
-    return true;
-}
-
 void JPAInterpDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    JGeometry::TVec3<f32> axisY;
    JGeometry::TVec3<f32> axisZ;
@@ -1040,7 +823,7 @@ void JPAInterpRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
 }
 #endif

-void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -1049,12 +832,8 @@ void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_C

    Mtx posMtx;
 #if TARGET_PC
-    if (!dusk::frame_interp::lookup_replacement(ptcl, posMtx) &&
-        !make_direction_mtx(work, ptcl, posMtx))
-    {
-        return;
-    }
-#else
+    if (!dusk::frame_interp::lookup_replacement(ptcl, posMtx))
+#endif
    {
        JGeometry::TVec3<f32> axisY;
        JGeometry::TVec3<f32> axisZ;
@@ -1090,19 +869,14 @@ void JPADrawDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_C
        posMtx[2][3] = ptcl->mPosition.z;
        p_plane[work->mPlaneType](posMtx, scaleX, scaleY);
    }
-#endif

    MTXConcat(work->mPosCamMtx, posMtx, posMtx);
-#if TARGET_PC
-    submit_particle_quad(work, ctx, posMtx, p_dl[work->mDLType], sizeof(jpa_dl));
-#else
    GXLoadPosMtxImm(posMtx, GX_PNMTX0);
    p_prj[work->mPrjType](work, posMtx);
    GXCallDisplayList(p_dl[work->mDLType], sizeof(jpa_dl));
-#endif
 }

-void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -1112,12 +886,8 @@ void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRA
    Mtx mtx1;
    Mtx mtx2;
 #if TARGET_PC
-    if (!dusk::frame_interp::lookup_replacement(ptcl, mtx1) &&
-        !make_rot_direction_mtx(work, ptcl, mtx1))
-    {
-        return;
-    }
-#else
+    if (!dusk::frame_interp::lookup_replacement(ptcl, mtx1))
+#endif
    {
        f32 sinRot = JMASSin(ptcl->mRotateAngle);
        f32 cosRot = JMASCos(ptcl->mRotateAngle);
@@ -1157,18 +927,13 @@ void JPADrawRotDirection(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRA
        mtx2[2][3] = ptcl->mPosition.z;
        MTXConcat(mtx2, mtx1, mtx1);
    }
-#endif
    MTXConcat(work->mPosCamMtx, mtx1, mtx2);
-#if TARGET_PC
-    submit_particle_quad(work, ctx, mtx2, p_dl[work->mDLType], sizeof(jpa_dl));
-#else
    GXLoadPosMtxImm(mtx2, GX_PNMTX0);
    p_prj[work->mPrjType](work, mtx2);
    GXCallDisplayList(p_dl[work->mDLType], sizeof(jpa_dl));
-#endif
 }

-void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -1205,7 +970,7 @@ void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA
    GXCallDisplayList(jpa_dl, sizeof(jpa_dl));
 }

-void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -1223,16 +988,12 @@ void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_D
    auStack_88[1][3] = param_1->mPosition.y;
    auStack_88[2][3] = param_1->mPosition.z;
    MTXConcat(param_0->mPosCamMtx, auStack_88, auStack_88);
-#if TARGET_PC
-    submit_particle_quad(param_0, ctx, auStack_88, p_dl[param_0->mDLType], sizeof(jpa_dl));
-#else
    GXLoadPosMtxImm(auStack_88, 0);
    p_prj[param_0->mPrjType](param_0, auStack_88);
    GXCallDisplayList(p_dl[param_0->mDLType], sizeof(jpa_dl));
-#endif
 }

-void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    if (ptcl->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -1249,7 +1010,7 @@ void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_P
    GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
 }

-void JPADrawLine(JPAEmitterWorkData* param_0, JPABaseParticle* param_1 JPA_DRAW_CTX_PARAM) {
+void JPADrawLine(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
    if (param_1->checkStatus(JPAPtclStts_Invisible)) {
        return;
    }
@@ -1325,7 +1086,7 @@ void JPADrawStripe(JPAEmitterWorkData* param_0) {
    GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
    GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
    GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT1, ptcl_num << 1);
-    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd();
+    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd(); 
                                                     node = node_func(node), coord += step) {
        param_0->mpCurNode = node;
        JPABaseParticle* particle = node->getObject();
@@ -1350,7 +1111,7 @@ void JPADrawStripe(JPAEmitterWorkData* param_0) {
        }
        particle->mBaseAxis.cross(local_f8, local_104);
        particle->mBaseAxis.normalize();
-
+        
        local_c8[0][0] = local_104.x;
        local_c8[0][1] = local_f8.x;
        local_c8[0][2] = particle->mBaseAxis.x;
@@ -1416,7 +1177,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
    GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
    GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
    GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT1, ptcl_num << 1);
-    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd();
+    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd(); 
                                                     node = node_func(node), coord += step) {
        param_0->mpCurNode = node;
        JPABaseParticle* particle = node->getObject();
@@ -1441,7 +1202,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
        }
        particle->mBaseAxis.cross(local_c0, local_cc);
        particle->mBaseAxis.normalize();
-
+        
        local_90[0][0] = local_cc.x;
        local_90[0][1] = local_c0.x;
        local_90[0][2] = particle->mBaseAxis.x;
@@ -1466,7 +1227,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {

    coord = start_coord;
    GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT1, ptcl_num << 1);
-    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd();
+    for (JPANode<JPABaseParticle>* node = startNode; node != param_0->mpAlivePtcl->getEnd(); 
                                                     node = node_func(node), coord += step) {
        param_0->mpCurNode = node;
        JPABaseParticle* particle = node->getObject();
@@ -1491,7 +1252,7 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
        }
        particle->mBaseAxis.cross(local_c0, local_cc);
        particle->mBaseAxis.normalize();
-
+        
        local_90[0][0] = local_cc.x;
        local_90[0][1] = local_c0.x;
        local_90[0][2] = particle->mBaseAxis.x;
@@ -1528,7 +1289,7 @@ void JPADrawEmitterCallBackB(JPAEmitterWorkData* work) {
    emtr->mpEmtrCallBack->draw(emtr);
 }

-void JPADrawParticleCallBack(JPAEmitterWorkData* work, JPABaseParticle* ptcl JPA_DRAW_CTX_PARAM) {
+void JPADrawParticleCallBack(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
    JPABaseEmitter* emtr = work->mpEmtr;
    if (emtr->mpPtclCallBack == NULL) {
        return;
@@ -18,21 +18,9 @@
 #include "global.h"
 #include "tracy/Tracy.hpp"

-#if TARGET_PC
-#define JPA_DRAW_CTX_ARG , &ctx
-#else
-#define JPA_DRAW_CTX_ARG
-#endif
-
 JPAResource::JPAResource() {
    mpCalcEmitterFuncList = mpDrawEmitterFuncList = mpDrawEmitterChildFuncList = NULL;
-#if TARGET_PC
-    mpCalcParticleFuncList = mpCalcParticleChildFuncList = NULL;
-    mpDrawParticleFuncList = mpDrawParticleChildFuncList = NULL;
-    mBatchInfo = {};
-#else
    mpCalcParticleFuncList = mpDrawParticleFuncList = mpCalcParticleChildFuncList = mpDrawParticleChildFuncList = NULL;
-#endif
    pBsp = NULL;
    pEsp = NULL;
    pCsp = NULL;
@@ -73,60 +61,6 @@ static u8 jpa_crd[32] ATTRIBUTE_ALIGN(32) = {
    0x00, 0x00, 0x01, 0x00, 0x01, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02,
 };

-#if TARGET_PC
-void JPAResource::initBatchInfo() {
-    mBatchInfo = {};
-
-    bool hasDrawFunc = false;
-    for (int i = 0; i < mpDrawParticleFuncListNum; i++) {
-        DrawParticleFunc func = mpDrawParticleFuncList[i];
-        if (func == JPADrawBillboard || func == JPADrawRotBillboard ||
-            func == JPADrawYBillboard || func == JPADrawRotYBillboard ||
-            func == JPADrawDirection || func == JPADrawRotDirection || func == JPADrawRotation)
-        {
-            hasDrawFunc = true;
-        } else if (func == JPADrawParticleCallBack) {
-            // Batchable only for emitters without a particle callback; checked per draw
-        } else if (func == JPALoadCalcTexCrdMtxAnm) {
-            mBatchInfo.hasPtclTexMtx = true;
-        } else if (func == JPARegistAlpha || func == JPARegistPrmAlpha ||
-                   func == JPARegistPrmAlphaEnv || func == JPARegistAlphaEnv ||
-                   func == static_cast<DrawParticleFunc>(JPARegistEnv)) // overloaded
-        {
-            mBatchInfo.hasPtclColor = true;
-        } else {
-            // JPADrawPoint, JPADrawLine, JPADrawDBillboard, JPALoadTexAnm,
-            // JPASetPointSize, JPASetLineWidth
-            return;
-        }
-    }
-    if (!hasDrawFunc) {
-        return;
-    }
-
-    // Template array offsets, same math as setPTev
-    int base_plane_type = (pBsp->getType() == 3 || pBsp->getType() == 7) ?
-        pBsp->getBasePlaneType() : 0;
-    int center_offset = pEsp != nullptr ? (pEsp->getScaleCenterX() + 3 * pEsp->getScaleCenterY()) * 0xC : 0x30;
-    const s8* pos = reinterpret_cast<const s8*>(jpa_pos) + center_offset + base_plane_type * 0x6C;
-    const s8* crd = reinterpret_cast<const s8*>(jpa_crd) + (pBsp->getTilingS() + 2 * pBsp->getTilingT()) * 8;
-
-    bool cross = pBsp->getType() == 4 || pBsp->getType() == 8;
-    mBatchInfo.vtxCount = cross ? 8 : 4;
-    for (int i = 0; i < mBatchInfo.vtxCount; i++) {
-        int posIdx = i < 4 ? i : 72 + (i - 4);
-        int crdIdx = i & 3;
-        mBatchInfo.vtxPos[i][0] = pos[posIdx * 3 + 0];
-        mBatchInfo.vtxPos[i][1] = pos[posIdx * 3 + 1];
-        mBatchInfo.vtxPos[i][2] = pos[posIdx * 3 + 2];
-        mBatchInfo.vtxUv[i][0] = crd[crdIdx * 2 + 0];
-        mBatchInfo.vtxUv[i][1] = crd[crdIdx * 2 + 1];
-    }
-
-    mBatchInfo.supported = true;
-}
-#endif
-
 void JPAResource::init(JKRHeap* heap) {
    BOOL is_glbl_clr_anm = pBsp->isGlblClrAnm();
    BOOL is_glbl_tex_anm = pBsp->isGlblTexAnm();
@@ -591,10 +525,7 @@ void JPAResource::init(JKRHeap* heap) {

    if (mpDrawParticleFuncListNum != 0) {
        mpDrawParticleFuncList =
-            (DrawParticleFunc*)JKRAllocFromHeap(
-                heap,
-                mpDrawParticleFuncListNum * sizeof(DrawParticleFunc),
-                alignof(DrawParticleFunc));
+            (ParticleFunc*)JKRAllocFromHeap(heap, mpDrawParticleFuncListNum * sizeof(ParticleFunc), alignof(ParticleFunc));
    }

    func_no = 0;
@@ -704,10 +635,7 @@ void JPAResource::init(JKRHeap* heap) {

    if (mpDrawParticleChildFuncListNum != 0) {
        mpDrawParticleChildFuncList =
-            (DrawParticleFunc*)JKRAllocFromHeap(
-                heap,
-                mpDrawParticleChildFuncListNum * sizeof(DrawParticleFunc),
-                alignof(DrawParticleFunc));
+            (ParticleFunc*)JKRAllocFromHeap(heap, mpDrawParticleChildFuncListNum * sizeof(ParticleFunc), sizeof(EmitterFunc));
    }

    func_no = 0;
@@ -771,10 +699,6 @@ void JPAResource::init(JKRHeap* heap) {
        mpDrawParticleChildFuncList[func_no] = &JPARegistPrmAlphaEnv;
        func_no++;
    }
-
-#if TARGET_PC
-    initBatchInfo();
-#endif
 }

 bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
@@ -884,183 +808,6 @@ void JPAResource::draw(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
    }
 }

-#if TARGET_PC
-static GXTevAlphaArg to_vtx_alpha_arg(GXTevAlphaArg arg) {
-    return arg == GX_CA_A0 ? GX_CA_RASA : arg;
-}
-
-static void batch_set_tev_op(GXTevStageID stage) {
-    GXSetTevColorOp(stage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-    GXSetTevAlphaOp(stage, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
-}
-
-static void batch_setup_tev(JPAEmitterWorkData* work, bool useClr1) {
-    JPABaseShape* shape = work->mpRes->getBsp();
-    JPAExTexShape* ets = work->mpRes->getEts();
-    bool useIndirect = ets != nullptr && ets->isUseIndirect();
-
-    // JPAEmitterManager::draw configures both channels to pass vertex color through
-    GXSetNumChans(useClr1 ? 2 : 1);
-
-    const GXTevAlphaArg* alphaArg = shape->getTevAlphaArg();
-    GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
-    GXSetTevAlphaIn(GX_TEVSTAGE0, to_vtx_alpha_arg(alphaArg[0]), to_vtx_alpha_arg(alphaArg[1]),
-                    to_vtx_alpha_arg(alphaArg[2]), to_vtx_alpha_arg(alphaArg[3]));
-    batch_set_tev_op(GX_TEVSTAGE0);
-    if (!useIndirect) {
-        GXSetTevDirect(GX_TEVSTAGE0);
-    }
-    GXTevStageID nextStage = GX_TEVSTAGE1;
-
-    switch (shape->getTevColorArgSel()) {
-    case 0: // TEXC
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_ONE, GX_CC_ZERO);
-        break;
-    case 1: // C0 * TEXC
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO);
-        break;
-    case 2: // lerp(C0, 1, TEXC)
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_RASC, GX_CC_ONE, GX_CC_TEXC, GX_CC_ZERO);
-        break;
-    case 3: // lerp(C1, C0, TEXC) = C0 * TEXC (stage 0) + C1 * (1 - TEXC) (stage 1)
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO);
-        GXSetTevOrder(nextStage, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR1A1);
-        GXSetTevColorIn(nextStage, GX_CC_RASC, GX_CC_ZERO, GX_CC_TEXC, GX_CC_CPREV);
-        GXSetTevAlphaIn(nextStage, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV);
-        batch_set_tev_op(nextStage);
-        GXSetTevDirect(nextStage);
-        nextStage = static_cast<GXTevStageID>(nextStage + 1);
-        break;
-    case 4: // TEXC * C0 + C1: C0 * TEXC (stage 0), + C1 (stage 1)
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO);
-        GXSetTevOrder(nextStage, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR1A1);
-        GXSetTevColorIn(nextStage, GX_CC_CPREV, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC);
-        GXSetTevAlphaIn(nextStage, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV);
-        batch_set_tev_op(nextStage);
-        GXSetTevDirect(nextStage);
-        nextStage = static_cast<GXTevStageID>(nextStage + 1);
-        break;
-    case 5: // C0
-        GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC);
-        break;
-    }
-
-    if (ets != nullptr && ets->isUseSecTex()) {
-        // Mirrors setPTev's secondary texture stage, at the next free stage
-        GXTexCoordID texCoord = useIndirect ? GX_TEXCOORD2 : GX_TEXCOORD1;
-        GXSetTevOrder(nextStage, texCoord, GX_TEXMAP3, GX_COLOR_NULL);
-        GXSetTevColorIn(nextStage, GX_CC_ZERO, GX_CC_TEXC, GX_CC_CPREV, GX_CC_ZERO);
-        GXSetTevAlphaIn(nextStage, GX_CA_ZERO, GX_CA_TEXA, GX_CA_APREV, GX_CA_ZERO);
-        batch_set_tev_op(nextStage);
-        GXSetTevDirect(nextStage);
-        nextStage = static_cast<GXTevStageID>(nextStage + 1);
-    }
-
-    GXSetNumTevStages(nextStage);
-}
-
-static void batch_setup_vtx_desc(bool useClr0, bool useClr1) {
-    static Mtx identityMtx = {
-        {1.0f, 0.0f, 0.0f, 0.0f},
-        {0.0f, 1.0f, 0.0f, 0.0f},
-        {0.0f, 0.0f, 1.0f, 0.0f},
-    };
-
-    GXLoadPosMtxImm(identityMtx, GX_PNMTX0);
-    GXSetCurrentMtx(GX_PNMTX0);
-    GXClearVtxDesc();
-    GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
-    if (useClr0) {
-        GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT);
-    }
-    if (useClr1) {
-        GXSetVtxDesc(GX_VA_CLR1, GX_DIRECT);
-    }
-    GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    if (useClr0) {
-        GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    }
-    if (useClr1) {
-        GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_CLR1, GX_CLR_RGBA, GX_RGBA8, 0);
-    }
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-}
-
-static void batch_restore_gx(JPAEmitterWorkData* work, bool changedTev, bool changedTexMtx) {
-    GXClearVtxDesc();
-    GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
-    GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_S8, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetVtxAttrFmt(GX_VTXFMT1, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetCurrentMtx(GX_PNMTX0);
-
-    if (changedTexMtx) {
-        GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX0);
-    }
-
-    if (changedTev) {
-        GXSetNumChans(0);
-        work->mpRes->getBsp()->setGX(work);
-        work->mpRes->setPTev();
-    }
-}
-
-static bool draw_particle_batch(JPAEmitterWorkData* work) {
-    ZoneScoped;
-
-    JPAResource* res = work->mpRes;
-    const JPAResource::BatchInfo& info = res->mBatchInfo;
-    if (!info.supported || work->mPrjType != 0 || work->mpEmtr->mpPtclCallBack != nullptr) {
-        return false;
-    }
-
-    bool useClr0 = false;
-    bool useClr1 = false;
-    if (info.hasPtclColor) {
-        u32 colorSel = res->getBsp()->getTevColorArgSel();
-        if (colorSel >= 6) {
-            return false;
-        }
-        useClr0 = true;
-        useClr1 = colorSel == 3 || colorSel == 4;
-        batch_setup_tev(work, useClr1);
-    }
-
-    if (info.hasPtclTexMtx) {
-        // UVs are CPU-transformed; drop the texgen
-        GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
-    }
-
-    batch_setup_vtx_desc(useClr0, useClr1);
-
-    ParticleDrawCtx ctx{};
-    ctx.batch = true;
-    ctx.useTexMtx = info.hasPtclTexMtx;
-    ctx.useClr0 = useClr0;
-    ctx.useClr1 = useClr1;
-
-    bool fwdAhead = res->getBsp()->isDrawFwdAhead();
-    JPANode<JPABaseParticle>* node = fwdAhead ? work->mpEmtr->mAlivePtclBase.getLast() :
-                                                work->mpEmtr->mAlivePtclBase.getFirst();
-
-    GXBegin(GX_QUADS, GX_VTXFMT1, GX_AUTO);
-    while (node != work->mpEmtr->mAlivePtclBase.getEnd()) {
-        work->mpCurNode = node;
-        for (int i = res->mpDrawParticleFuncListNum - 1; i >= 0; i--) {
-            (*res->mpDrawParticleFuncList[i])(work, node->getObject(), &ctx);
-        }
-        node = fwdAhead ? node->getPrev() : node->getNext();
-    }
-    GXEnd();
-
-    batch_restore_gx(work, useClr0, info.hasPtclTexMtx);
-    return true;
-}
-#endif
-
 void JPAResource::drawP(JPAEmitterWorkData* work) {
    ZoneScoped;
    work->mpEmtr->clearStatus(0x80);
@@ -1095,25 +842,13 @@ void JPAResource::drawP(JPAEmitterWorkData* work) {
        (*mpDrawEmitterFuncList[i])(work);
    }

-#if TARGET_PC
-    if (draw_particle_batch(work)) {
-        GXSetMisc(GX_MT_XF_FLUSH, 0);
-        if (work->mpEmtr->mpEmtrCallBack != nullptr) {
-            work->mpEmtr->mpEmtrCallBack->drawAfter(work->mpEmtr);
-        }
-        return;
-    }
-
-    ParticleDrawCtx ctx{}; // immediate mode
-#endif
-
    if (pBsp->isDrawFwdAhead()) {
        JPANode<JPABaseParticle>* node = work->mpEmtr->mAlivePtclBase.getLast();
        for (; node != work->mpEmtr->mAlivePtclBase.getEnd(); node = node->getPrev()) {
            work->mpCurNode = node;
            if (mpDrawParticleFuncList != NULL) {
                for (int i = mpDrawParticleFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleFuncList[i])(work, node->getObject());
                }
            }
        }
@@ -1123,7 +858,7 @@ void JPAResource::drawP(JPAEmitterWorkData* work) {
            work->mpCurNode = node;
            if (mpDrawParticleFuncList != NULL) {
                for (int i = mpDrawParticleFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleFuncList[i])(work, node->getObject());
                }
            }
        }
@@ -1170,17 +905,13 @@ void JPAResource::drawC(JPAEmitterWorkData* work) {
        (*mpDrawEmitterChildFuncList[i])(work);
    }

-#if TARGET_PC
-    ParticleDrawCtx ctx{}; // immediate mode
-#endif
-
    if (pBsp->isDrawFwdAhead()) {
        JPANode<JPABaseParticle>* node = work->mpEmtr->mAlivePtclChld.getLast();
        for (; node != work->mpEmtr->mAlivePtclChld.getEnd(); node = node->getPrev()) {
            work->mpCurNode = node;
            if (mpDrawParticleChildFuncList != NULL) {
                for (int i = mpDrawParticleChildFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleChildFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleChildFuncList[i])(work, node->getObject());
                }
            }
        }
@@ -1190,7 +921,7 @@ void JPAResource::drawC(JPAEmitterWorkData* work) {
            work->mpCurNode = node;
            if (mpDrawParticleChildFuncList != NULL) {
                for (int i = mpDrawParticleChildFuncListNum - 1; i >= 0; i--) {
-                    (*mpDrawParticleChildFuncList[i])(work, node->getObject() JPA_DRAW_CTX_ARG);
+                    (*mpDrawParticleChildFuncList[i])(work, node->getObject());
                }
            }
        }
@@ -4,7 +4,6 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
-import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -15,16 +14,12 @@ import android.provider.DocumentsContract;
 import android.provider.OpenableColumns;
 import android.provider.Settings;
 import android.util.Log;
-import android.view.Display;
-import android.view.Surface;
-import android.view.SurfaceHolder;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowInsetsController;

 import org.libsdl.app.SDLActivity;
-import org.libsdl.app.SDLSurface;

 import java.io.File;
 import java.util.ArrayList;
@@ -32,7 +27,6 @@ import java.util.List;

 public class DuskActivity extends SDLActivity {
    private static final String TAG = "DuskActivity";
-    private static final float DEFAULT_SURFACE_FRAME_RATE = 60.0f;
    private static final int FOLDER_DIALOG_REQUEST_CODE = 0x4455;
    private static final int MANAGE_STORAGE_REQUEST_CODE = 0x4456;
    private static final String EXTERNAL_STORAGE_AUTHORITY =
@@ -94,11 +88,6 @@ public class DuskActivity extends SDLActivity {
        hideSystemBars();
    }

-    @Override
-    protected SDLSurface createSDLSurface(Context context) {
-        return new DuskSurface(context);
-    }
-
    @Override
    protected void onResume() {
        super.onResume();
@@ -150,77 +139,6 @@ public class DuskActivity extends SDLActivity {
        };
    }

-    public void setPreferredSurfaceFrameRate(float frameRate) {
-        runOnUiThread(() -> {
-            if (mSurface instanceof DuskSurface) {
-                ((DuskSurface)mSurface).setPreferredFrameRate(frameRate);
-            }
-        });
-    }
-
-    private static final class DuskSurface extends SDLSurface {
-        private float preferredFrameRate = DEFAULT_SURFACE_FRAME_RATE;
-
-        DuskSurface(Context context) {
-            super(context);
-        }
-
-        @Override
-        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-            super.surfaceChanged(holder, format, width, height);
-            setTargetFrameRate(holder);
-        }
-
-        void setPreferredFrameRate(float frameRate) {
-            preferredFrameRate = frameRate;
-            setTargetFrameRate(getHolder());
-        }
-
-        private void setTargetFrameRate(SurfaceHolder holder) {
-            if (!mIsSurfaceReady || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-                return;
-            }
-
-            Surface surface = holder != null ? holder.getSurface() : getHolder().getSurface();
-            if (surface == null || !surface.isValid()) {
-                return;
-            }
-
-            float targetFrameRate = getMaxSupportedFrameRate();
-            if (preferredFrameRate > 0.0f) {
-                targetFrameRate = preferredFrameRate;
-            }
-            if (targetFrameRate <= 0.0f) {
-                return;
-            }
-
-            try {
-                surface.setFrameRate(
-                    targetFrameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT);
-                Log.v(TAG, "Requested surface frame rate " + targetFrameRate + " fps");
-            } catch (RuntimeException e) {
-                Log.w(TAG, "Failed to request surface frame rate", e);
-            }
-        }
-
-        private float getMaxSupportedFrameRate() {
-            if (mDisplay == null) {
-                return 0.0f;
-            }
-
-            float maxFrameRate = mDisplay.getRefreshRate();
-            Display.Mode[] modes = mDisplay.getSupportedModes();
-            if (modes == null) {
-                return maxFrameRate;
-            }
-
-            for (Display.Mode mode : modes) {
-                maxFrameRate = Math.max(maxFrameRate, mode.getRefreshRate());
-            }
-            return maxFrameRate;
-        }
-    }
-
    @Override
    protected String[] getArguments() {
        Intent intent = getIntent();
@@ -19,13 +19,9 @@ import android.os.*;

 import java.lang.Runnable;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.UUID;

-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
 class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDevice {

    private static final String TAG = "hidapi";
@@ -37,19 +33,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
    private boolean mIsConnected = false;
    private boolean mIsChromebook = false;
    private boolean mIsReconnecting = false;
-    private boolean mHasEnabledNotifications = false;
-    private boolean mHasSeenInputUpdate = false;
    private boolean mFrozen = false;
    private LinkedList<GattOperation> mOperations;
    GattOperation mCurrentOperation = null;
    private Handler mHandler;
-    private int mProductId = -1;
-    private int mReportId = 0;
-    private UUID mInputCharacteristic;
-
-    private static final int D0G_BLE2_PID = 0x1106;
-    private static final int TRITON_BLE_PID = 0x1303;
-

    private static final int TRANSPORT_AUTO = 0;
    private static final int TRANSPORT_BREDR = 1;
@@ -58,14 +45,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
    private static final int CHROMEBOOK_CONNECTION_CHECK_INTERVAL = 10000;

    static final UUID steamControllerService = UUID.fromString("100F6C32-1735-4313-B402-38567131E5F3");
-    static final UUID inputCharacteristicD0G = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
-    static final UUID inputCharacteristicTriton_0x45 = UUID.fromString("100F6C7A-1735-4313-B402-38567131E5F3");
-    static final UUID inputCharacteristicTriton_0x47 = UUID.fromString("100F6C7C-1735-4313-B402-38567131E5F3");
+    static final UUID inputCharacteristic = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
    static final UUID reportCharacteristic = UUID.fromString("100F6C34-1735-4313-B402-38567131E5F3");
    static private final byte[] enterValveMode = new byte[] { (byte)0xC0, (byte)0x87, 0x03, 0x08, 0x07, 0x00 };

-    private HashMap<Integer, BluetoothGattCharacteristic> mOutputReportChars = new HashMap<Integer, BluetoothGattCharacteristic>();
-
    static class GattOperation {
        private enum Operation {
            CHR_READ,
@@ -78,7 +61,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        byte[] mValue;
        BluetoothGatt mGatt;
        boolean mResult = true;
-        int mDelayMs = 0;

        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid) {
            mGatt = gatt;
@@ -86,13 +68,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
            mUuid = uuid;
        }

-        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, int delayMs) {
-            mGatt = gatt;
-            mOp = operation;
-            mUuid = uuid;
-            mDelayMs = delayMs;
-        }        
-
        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, byte[] value) {
            mGatt = gatt;
            mOp = operation;
@@ -100,14 +75,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
            mValue = value;
        }

-        private GattOperation(BluetoothGatt gatt, GattOperation.Operation operation, UUID uuid, byte[] value, int delayMs) {
-            mGatt = gatt;
-            mOp = operation;
-            mUuid = uuid;
-            mValue = value;
-            mDelayMs = delayMs;
-        }
-
        public void run() {
            // This is executed in main thread
            BluetoothGattCharacteristic chr;
@@ -169,8 +136,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
            return mResult;
        }

-        public int getDelayMs() { return mDelayMs; }
-
        private BluetoothGattCharacteristic getCharacteristic(UUID uuid) {
            BluetoothGattService valveService = mGatt.getService(steamControllerService);
            if (valveService == null)
@@ -189,10 +154,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        static public GattOperation enableNotification(BluetoothGatt gatt, UUID uuid) {
            return new GattOperation(gatt, Operation.ENABLE_NOTIFICATION, uuid);
        }
-
-        static public GattOperation enableNotification(BluetoothGatt gatt, UUID uuid, int delayMs) {
-            return new GattOperation(gatt, Operation.ENABLE_NOTIFICATION, uuid, delayMs);
-        }
    }

    HIDDeviceBLESteamController(HIDDeviceManager manager, BluetoothDevice device) {
@@ -205,8 +166,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        mHandler = new Handler(Looper.getMainLooper());

        mGatt = connectGatt();
-        mHasEnabledNotifications = false;
-        mHasSeenInputUpdate = false;
        // final HIDDeviceBLESteamController finalThis = this;
        // mHandler.postDelayed(new Runnable() {
        //     @Override
@@ -355,45 +314,8 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                Log.v(TAG, "Found Valve steam controller service " + service.getUuid());

                for (BluetoothGattCharacteristic chr : service.getCharacteristics()) {
-                    if (chr.getUuid().equals(inputCharacteristicTriton_0x45)) {
-                        Log.v(TAG, "Found Triton input characteristic 0x45");
-                        mProductId = TRITON_BLE_PID;
-                        mReportId = 0x45;
-                        mInputCharacteristic = chr.getUuid();
-                    } else if (chr.getUuid().equals(inputCharacteristicTriton_0x47)) {
-                        Log.v(TAG, "Found Triton input characteristic 0x47");
-                        mProductId = TRITON_BLE_PID;
-                        mReportId = 0x47;
-                        mInputCharacteristic = chr.getUuid();
-                    } else if (chr.getUuid().equals(inputCharacteristicD0G)) {
-                        Log.v(TAG, "Found D0G input characteristic");
-                        mProductId = D0G_BLE2_PID;
-                        mReportId = 0x03;
-                        mInputCharacteristic = chr.getUuid();
-                    } else {
-                        Pattern reportPattern = Pattern.compile("100F6C([0-9A-Z]{2})", Pattern.CASE_INSENSITIVE);
-                        Matcher matcher = reportPattern.matcher(chr.getUuid().toString());
-
-                        if (matcher.find()) {
-                            try {
-                                int reportId = Integer.parseInt(matcher.group(1), 16);
-
-                                reportId -= 0x35;
-                                if (reportId >= 0x80) {
-                                    // This is a Triton output report characteristic that we need to care about.
-                                    Log.v(TAG, "Found Triton output report 0x" + Integer.toString(reportId, 16));
-                                    mOutputReportChars.put(reportId, chr);
-                                }
-                            }
-                            catch (NumberFormatException nfe) {
-                                Log.w(TAG, "Could not parse report characteristic " + chr.getUuid().toString() + ": " + nfe.toString());
-                            }
-                        }
-                    }
-                }
-
-                for (BluetoothGattCharacteristic chr : service.getCharacteristics()) {
-                    if (chr.getUuid().equals(mInputCharacteristic)) {
+                    if (chr.getUuid().equals(inputCharacteristic)) {
+                        Log.v(TAG, "Found input characteristic");
                        // Start notifications
                        BluetoothGattDescriptor cccd = chr.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
                        if (cccd != null) {
@@ -450,30 +372,21 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
            mCurrentOperation = mOperations.removeFirst();
        }

-        Runnable gattOperationRunnable = new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (mOperations) {
-                        if (mCurrentOperation == null) {
-                            Log.e(TAG, "Current operation null in executor?");
-                            return;
-                        }
-
-                        mCurrentOperation.run();
-                        // now wait for the GATT callback and when it comes, finish this operation
+        // Run in main thread
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (mOperations) {
+                    if (mCurrentOperation == null) {
+                        Log.e(TAG, "Current operation null in executor?");
+                        return;
                    }
+
+                    mCurrentOperation.run();
+                    // now wait for the GATT callback and when it comes, finish this operation
                }
-            };
-
-        if (mCurrentOperation.getDelayMs() == 0) {
-            // Run in main thread
-            mHandler.post(gattOperationRunnable);
-        }
-        else {
-            // If we have a delay on this operation, wait before we post it.
-            mHandler.postDelayed(gattOperationRunnable, mCurrentOperation.getDelayMs());
-        }
-
+            }
+        });
    }

    private void queueGattOperation(GattOperation op) {
@@ -484,39 +397,8 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
    }

    private void enableNotification(UUID chrUuid) {
-        // Add a 500ms delay to notification write for Amazon Fire TV devices, as otherwise if we do this too quickly after connecting
-        // it will return success and then silently drop the operation on the floor.
-        GattOperation op = HIDDeviceBLESteamController.GattOperation.enableNotification(mGatt, chrUuid, 500);
+        GattOperation op = HIDDeviceBLESteamController.GattOperation.enableNotification(mGatt, chrUuid);
        queueGattOperation(op);
-
-        // Amazon Fire devices can also silently timeout on writeDescriptor, so
-        // set up a little delayed check that will attempt to write a second time.
-        //
-        // While this only seems to be needed on Amazon Fire TV devices at present, it
-        // doesn't hurt to have a retry on other devices as well.
-        //
-        final HIDDeviceBLESteamController finalThis = this;
-        final UUID finalUuid = chrUuid;
-        mHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (!finalThis.mHasEnabledNotifications) {
-
-                    if (finalThis.mHasSeenInputUpdate) {
-                        // Amazon Five devices may have enabled notifications on the input characteristic and not given us a callback. If we've seen
-                        // input reports, though, somewhat by definition notifications are enabled.
-                        Log.w(TAG, "WriteDescriptor has never returned, but we've seen input reports. Moving on with controller initialization.");
-                        finalThis.mHasEnabledNotifications = true;
-                        finalThis.enableValveMode();
-                        return;
-                    }
-
-                    // Give one more try.
-                    GattOperation retry = HIDDeviceBLESteamController.GattOperation.enableNotification(finalThis.mGatt, finalUuid, 500);
-                    finalThis.queueGattOperation(retry);
-                }
-            }
-        }, 1000);            
    }

    void writeCharacteristic(UUID uuid, byte[] value) {
@@ -566,16 +448,8 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                mIsConnected = false;
                gatt.disconnect();
                mGatt = connectGatt(false);
-            } else {
-                if (getProductId() == TRITON_BLE_PID) {
-                    // Android will not properly play well with Data Length Extensions without manually requesting a large MTU,
-                    // and Triton controllers require DLE support.
-                    //
-                    // 517 is basically a "magic number" as far as Android's bluetooth code is concerned, so do not change
-                    // this value. It is functionally "please enable data length extensions" on some Android builds.
-                    mGatt.requestMtu(517);
-                }
-
+            }
+            else {
                probeService(this);
            }
        }
@@ -600,7 +474,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
            // Only register controller with the native side once it has been fully configured
            if (!isRegistered()) {
                Log.v(TAG, "Registering Steam Controller with ID: " + getId());
-                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true, mReportId);
+                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true);
                setRegistered();
            }
        }
@@ -613,8 +487,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
    // Enable this for verbose logging of controller input reports
        //Log.v(TAG, "onCharacteristicChanged uuid=" + characteristic.getUuid() + " data=" + HexDump.dumpHexString(characteristic.getValue()));

-        if (characteristic.getUuid().equals(mInputCharacteristic) && !mFrozen) {
-            mHasSeenInputUpdate = true;
+        if (characteristic.getUuid().equals(inputCharacteristic) && !mFrozen) {
            mManager.HIDDeviceInputReport(getId(), characteristic.getValue());
        }
    }
@@ -624,36 +497,19 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        //Log.v(TAG, "onDescriptorRead status=" + status);
    }

-    private void enableValveMode()
-    {
-        BluetoothGattService valveService = mGatt.getService(steamControllerService);
-        if (valveService == null)
-            return;
-
-        BluetoothGattCharacteristic reportChr = valveService.getCharacteristic(reportCharacteristic);
-        if (reportChr != null) {
-            if (getProductId() == TRITON_BLE_PID) {
-                // For Triton we just mark things registered.
-                Log.v(TAG, "Registering Triton Steam Controller with ID: " + getId());
-                mManager.HIDDeviceConnected(getId(), getIdentifier(), getVendorId(), getProductId(), getSerialNumber(), getVersion(), getManufacturerName(), getProductName(), 0, 0, 0, 0, true, mReportId);
-                setRegistered();
-            } else {
-                // For the original controller, we need to manually enter Valve mode.
-                Log.v(TAG, "Writing report characteristic to enter valve mode");
-                reportChr.setValue(enterValveMode);
-                mGatt.writeCharacteristic(reportChr);
-            }
-        }
-    }
-
    @Override
    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
        BluetoothGattCharacteristic chr = descriptor.getCharacteristic();
        //Log.v(TAG, "onDescriptorWrite status=" + status + " uuid=" + chr.getUuid() + " descriptor=" + descriptor.getUuid());

-        if (chr.getUuid().equals(mInputCharacteristic)) {
-            mHasEnabledNotifications = true;
-            enableValveMode();
+        if (chr.getUuid().equals(inputCharacteristic)) {
+            boolean hasWrittenInputDescriptor = true;
+            BluetoothGattCharacteristic reportChr = chr.getService().getCharacteristic(reportCharacteristic);
+            if (reportChr != null) {
+                Log.v(TAG, "Writing report characteristic to enter valve mode");
+                reportChr.setValue(enterValveMode);
+                gatt.writeCharacteristic(reportChr);
+            }
        }

        finishCurrentGattOperation();
@@ -692,20 +548,9 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe

    @Override
    public int getProductId() {
-        if (mProductId > 0) {
-            // We've already set a product ID.
-            return mProductId;
-        }
-
-        if (mDevice.getName().startsWith("Steam Ctrl")) {
-            // We're a newer Triton device
-            mProductId = TRITON_BLE_PID;
-        } else {
-            // We're an OG Steam Controller
-            mProductId = D0G_BLE2_PID;
-        }
-
-        return mProductId;
+        // We don't have an easy way to query from the Bluetooth device, but we know what it is
+        final int D0G_BLE2_PID = 0x1106;
+        return D0G_BLE2_PID;
    }

    @Override
@@ -756,29 +601,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
            writeCharacteristic(reportCharacteristic, actual_report);
            return report.length;
        } else {
-            // If we're an original-recipe Steam Controller we just write to the characteristic directly.
-            if (getProductId() == D0G_BLE2_PID) {
-                //Log.v(TAG, "writeOutputReport " + HexDump.dumpHexString(report));
-                writeCharacteristic(reportCharacteristic, report);
-                return report.length;
-            }
-
-            // If we're a Triton, we need to find the correct report characteristic.
-            if (report.length > 0) {
-                int reportId = report[0] & 0xFF;
-                BluetoothGattCharacteristic targetedReportCharacteristic = mOutputReportChars.get(reportId);
-                if (targetedReportCharacteristic != null) {
-                    byte[] actual_report = Arrays.copyOfRange(report, 1, report.length - 1);
-                    //Log.v(TAG, "writeOutputReport 0x" + Integer.toString(reportId, 16) + " " + HexDump.dumpHexString(report));
-                    writeCharacteristic(targetedReportCharacteristic.getUuid(), actual_report);
-                    return report.length;
-                } else {
-                    Log.w(TAG, "Got report write request for unknown report type 0x" + Integer.toString(reportId, 16));
-                }
-            }
+            //Log.v(TAG, "writeOutputReport " + HexDump.dumpHexString(report));
+            writeCharacteristic(reportCharacteristic, report);
+            return report.length;
        }
-
-        return -1;
    }

    @Override
@@ -256,7 +256,6 @@ public class HIDDeviceManager {
            0x24c6, // PowerA
            0x2c22, // Qanba
            0x2dc8, // 8BitDo
-            0x3537, // GameSir
            0x37d7, // Flydigi
            0x9886, // ASTRO Gaming
        };
@@ -361,7 +360,7 @@ public class HIDDeviceManager {
                    HIDDeviceUSB device = new HIDDeviceUSB(this, usbDevice, interface_index);
                    int id = device.getId();
                    mDevicesById.put(id, device);
-                    HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol(), false, 0);
+                    HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol(), false);
                }
            }
        }
@@ -530,13 +529,7 @@ public class HIDDeviceManager {
            return false;
        }

-        // Steam Controllers will always support Bluetooth Low Energy
-        if ((bluetoothDevice.getType() & BluetoothDevice.DEVICE_TYPE_LE) == 0) {
-            return false;
-        }
-
-        // Match on the name either the original Steam Controller or the new second-generation one advertise with.
-        return bluetoothDevice.getName().equals("SteamController") || bluetoothDevice.getName().startsWith("Steam Ctrl");
+        return bluetoothDevice.getName().equals("SteamController") && ((bluetoothDevice.getType() & BluetoothDevice.DEVICE_TYPE_LE) != 0);
    }

    private void close() {
@@ -688,7 +681,7 @@ public class HIDDeviceManager {
    private native void HIDDeviceRegisterCallback();
    private native void HIDDeviceReleaseCallback();

-    native void HIDDeviceConnected(int deviceID, String identifier, int vendorId, int productId, String serial_number, int release_number, String manufacturer_string, String product_string, int interface_number, int interface_class, int interface_subclass, int interface_protocol, boolean bBluetooth, int reportID);
+    native void HIDDeviceConnected(int deviceID, String identifier, int vendorId, int productId, String serial_number, int release_number, String manufacturer_string, String product_string, int interface_number, int interface_class, int interface_subclass, int interface_protocol, boolean bBluetooth);
    native void HIDDeviceOpenPending(int deviceID);
    native void HIDDeviceOpenResult(int deviceID, boolean opened);
    native void HIDDeviceDisconnected(int deviceID);
@@ -21,7 +21,6 @@ class HIDDeviceUSB implements HIDDevice {
    protected InputThread mInputThread;
    protected boolean mRunning;
    protected boolean mFrozen;
-    protected boolean mClaimed;

    public HIDDeviceUSB(HIDDeviceManager manager, UsbDevice usbDevice, int interface_index) {
        mManager = manager;
@@ -30,7 +29,6 @@ class HIDDeviceUSB implements HIDDevice {
        mInterface = mDevice.getInterface(mInterfaceIndex).getId();
        mDeviceId = manager.getDeviceIDForIdentifier(getIdentifier());
        mRunning = false;
-        mClaimed = false;
    }

    String getIdentifier() {
@@ -116,7 +114,6 @@ class HIDDeviceUSB implements HIDDevice {
            close();
            return false;
        }
-        mClaimed = true;

        // Find the endpoints
        for (int j = 0; j < iface.getEndpointCount(); j++) {
@@ -135,12 +132,9 @@ class HIDDeviceUSB implements HIDDevice {
            }
        }

-        // Make sure the required endpoints were present. The original Steam Controller and the wireless dongle for it do NOT
-        // actually have -- or require -- output endpoints, so we need to accept only an input one for them or else we'll fall
-        // back to the Android system gamepad functionality (and lose our paddles et al).
-        if (mInputEndpoint == null) {
+        // Make sure the required endpoints were present
+        if (mInputEndpoint == null || mOutputEndpoint == null) {
            Log.w(TAG, "Missing required endpoint on USB device " + getDeviceName());
-            mConnection.releaseInterface(iface);
            close();
            return false;
        }
@@ -160,11 +154,6 @@ class HIDDeviceUSB implements HIDDevice {
            return -1;
        }

-        if (!mClaimed) {
-            Log.w(TAG, "writeReport() called but some other process currently owns the USB device");
-            return -1;
-        }
-
        if (feature) {
            int res = -1;
            int offset = 0;
@@ -196,11 +185,6 @@ class HIDDeviceUSB implements HIDDevice {
            }
            return length;
        } else {
-            if (mOutputEndpoint == null)
-            {
-                Log.e(TAG, "Tried to write an output report to an interface with no output endpoint!");
-                return -1;
-            }
            int res = mConnection.bulkTransfer(mOutputEndpoint, report, report.length, 1000);
            if (res != report.length) {
                Log.w(TAG, "writeOutputReport() returned " + res + " on device " + getDeviceName());
@@ -221,12 +205,6 @@ class HIDDeviceUSB implements HIDDevice {
            Log.w(TAG, "readReport() called with no device connection");
            return false;
        }
-        if (!mClaimed) {
-            if (feature) {
-                return false;
-            }
-            return true;            
-        }

        if (report_number == 0x0) {
            /* Offset the return buffer by 1, so that the report ID
@@ -280,13 +258,10 @@ class HIDDeviceUSB implements HIDDevice {
            mInputThread = null;
        }
        if (mConnection != null) {
-            if (mClaimed) {
-                UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
-                mConnection.releaseInterface(iface);                
-            }
+            UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
+            mConnection.releaseInterface(iface);
            mConnection.close();
            mConnection = null;
-            mClaimed = false;
        }
    }

@@ -299,22 +274,6 @@ class HIDDeviceUSB implements HIDDevice {
    @Override
    public void setFrozen(boolean frozen) {
        mFrozen = frozen;
-
-        /* If we have a valid device connection and the claim state doesn't match what we want, try to correct that. */
-        if (mConnection != null && mClaimed == mFrozen) {
-            UsbInterface iface = mDevice.getInterface(mInterfaceIndex);
-            if (frozen) {
-                mClaimed = !mConnection.releaseInterface(iface);
-                if (mClaimed) {
-                    Log.e(TAG, "Tried to release claim on USB device, but failed!");
-                }
-            } else {
-                mClaimed = mConnection.claimInterface(iface, true);
-                if (!mClaimed) {
-                    Log.e(TAG, "Tried to regain claim on USB device, but failed!");
-                }
-            }
-        }
    }

    protected class InputThread extends Thread {
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 3;
    private static final int SDL_MINOR_VERSION = 4;
-    private static final int SDL_MICRO_VERSION = 10;
+    private static final int SDL_MICRO_VERSION = 8;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
@@ -530,8 +530,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh

        if (mHIDDeviceManager != null) {
            mHIDDeviceManager.setFrozen(true);
-        }        
-
+        }
        if (!mHasMultiWindow) {
            pauseNativeThread();
        }
@@ -544,8 +543,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh

        if (mHIDDeviceManager != null) {
            mHIDDeviceManager.setFrozen(false);
-        }        
-
+        }
        if (!mHasMultiWindow) {
            resumeNativeThread();
        }
@@ -618,14 +616,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        super.onWindowFocusChanged(hasFocus);
        Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);

-        // If we are gaining focus, we can always try to restore our USB devices. If we are losing focus,
-        // only try to relinquish them if we don't have background events allowed (for multi-window Android setups).
-        if (hasFocus || !SDLActivity.nativeGetHintBoolean("SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS", false)) {
-            if (mHIDDeviceManager != null) {
-                mHIDDeviceManager.setFrozen(!hasFocus);
-            }            
-        }
-
        if (SDLActivity.mBrokenLibraries) {
           return;
        }
@@ -1491,11 +1481,11 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        if (SDLControllerManager.isDeviceSDLJoystick(deviceId)) {
            // Note that we process events with specific key codes here
            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (SDLControllerManager.onNativePadDown(deviceId, keyCode, event.getScanCode())) {
+                if (SDLControllerManager.onNativePadDown(deviceId, keyCode)) {
                    return true;
                }
            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (SDLControllerManager.onNativePadUp(deviceId, keyCode, event.getScanCode())) {
+                if (SDLControllerManager.onNativePadUp(deviceId, keyCode)) {
                    return true;
                }
            }
@@ -1973,7 +1963,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            Intent i = new Intent(Intent.ACTION_VIEW);
            i.setData(Uri.parse(url));

-            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY
+            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY 
                      | Intent.FLAG_ACTIVITY_MULTIPLE_TASK
                      | Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
            i.addFlags(flags);
@@ -2237,4 +2227,3 @@ class SDLClipboardHandler implements
        SDLActivity.onNativeClipboardChanged();
    }
 }
-
@@ -10,10 +10,6 @@ import android.hardware.lights.Light;
 import android.hardware.lights.LightsRequest;
 import android.hardware.lights.LightsManager;
 import android.hardware.lights.LightState;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.VibrationEffect;
@@ -34,18 +30,16 @@ public class SDLControllerManager
    static native void nativeAddJoystick(int device_id, String name, String desc,
                                                int vendor_id, int product_id,
                                                int button_mask,
-                                                int naxes, int axis_mask, int nhats, boolean can_rumble, boolean has_rgb_led,
-                                                boolean has_accelerometer, boolean has_gyroscope);
+                                                int naxes, int axis_mask, int nhats, boolean can_rumble, boolean has_rgb_led);
    static native void nativeRemoveJoystick(int device_id);
    static native void nativeAddHaptic(int device_id, String name);
    static native void nativeRemoveHaptic(int device_id);
-    static public native boolean onNativePadDown(int device_id, int keycode, int scancode);
-    static public native boolean onNativePadUp(int device_id, int keycode, int scancode);
+    static public native boolean onNativePadDown(int device_id, int keycode);
+    static public native boolean onNativePadUp(int device_id, int keycode);
    static native void onNativeJoy(int device_id, int axis,
                                          float value);
    static native void onNativeHat(int device_id, int hat_id,
                                          int x, int y);
-    static native void onNativeJoySensor(int device_id, int sensor_type, long sensor_timestamp, float x, float y, float z);

    protected static SDLJoystickHandler mJoystickHandler;
    protected static SDLHapticHandler mHapticHandler;
@@ -87,13 +81,6 @@ public class SDLControllerManager
        mJoystickHandler.setLED(device_id, red, green, blue);
    }

-    /**
-     * This method is called by SDL using JNI.
-     */
-    static void joystickSetSensorsEnabled(int device_id, boolean enabled) {
-        mJoystickHandler.setSensorsEnabled(device_id, enabled);
-    }
-
    /**
     * This method is called by SDL using JNI.
     */
@@ -166,10 +153,6 @@ class SDLJoystickHandler {
        ArrayList<InputDevice.MotionRange> hats;
        ArrayList<Light> lights;
        LightsManager.LightsSession lightsSession;
-        SensorManager sensorManager;
-        SDLJoySensorListener sensorListener;
-        Sensor accelerometerSensor;
-        Sensor gyroscopeSensor;
    }
    static class RangeComparator implements Comparator<InputDevice.MotionRange> {
        @Override
@@ -242,13 +225,12 @@ class SDLJoystickHandler {
                    joystick.desc = getJoystickDescriptor(joystickDevice);
                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
-                    java.util.Set<Integer> axisStrsSet = new java.util.HashSet<Integer>();
                    joystick.lights = new ArrayList<Light>();

                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
                    Collections.sort(ranges, new RangeComparator());
                    for (InputDevice.MotionRange range : ranges) {
-                        if (((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) && axisStrsSet.add(range.getAxis())) {
+                        if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
                            if (range.getAxis() == MotionEvent.AXIS_HAT_X || range.getAxis() == MotionEvent.AXIS_HAT_Y) {
                                joystick.hats.add(range);
                            } else {
@@ -259,8 +241,6 @@ class SDLJoystickHandler {

                    boolean can_rumble = false;
                    boolean has_rgb_led = false;
-                    boolean has_accelerometer = false;
-                    boolean has_gyroscope = false;
                    if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
                        VibratorManager vibratorManager = joystickDevice.getVibratorManager();
                        int[] vibrators = vibratorManager.getVibratorIds();
@@ -278,26 +258,12 @@ class SDLJoystickHandler {
                            joystick.lightsSession = lightsManager.openSession();
                            has_rgb_led = true;
                        }
-                        SensorManager sensorManager = joystickDevice.getSensorManager();
-                        if (sensorManager != null) {
-                            joystick.sensorManager = sensorManager;
-                            joystick.sensorListener = new SDLJoySensorListener(joystick.device_id);
-                            joystick.accelerometerSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-                            if (joystick.accelerometerSensor != null) {
-                                has_accelerometer = true;
-                            }
-                            joystick.gyroscopeSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
-                            if (joystick.gyroscopeSensor != null) {
-                                has_gyroscope = true;
-                            }
-                        }
                    }

                    mJoysticks.add(joystick);
                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
                            getVendorId(joystickDevice), getProductId(joystickDevice),
-                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, can_rumble, has_rgb_led,
-                            has_accelerometer, has_gyroscope);
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, can_rumble, has_rgb_led);
                }
            }
        }
@@ -542,31 +508,6 @@ class SDLJoystickHandler {
        }
        joystick.lightsSession.requestLights(lightsRequest.build());
    }
-
-    void setSensorsEnabled(int device_id, boolean enabled) {
-        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
-            return;
-        }
-        SDLJoystick joystick = getJoystick(device_id);
-        if (joystick == null || joystick.sensorManager == null) {
-            return;
-        }
-        if (enabled) {
-            if (joystick.accelerometerSensor != null) {
-                SDLSensorManager.registerListener(joystick.sensorManager, joystick.sensorListener, joystick.accelerometerSensor, SensorManager.SENSOR_DELAY_GAME);
-            }
-            if (joystick.gyroscopeSensor != null) {
-                SDLSensorManager.registerListener(joystick.sensorManager, joystick.sensorListener, joystick.gyroscopeSensor, SensorManager.SENSOR_DELAY_GAME);
-            }
-        } else {
-            if (joystick.accelerometerSensor != null) {
-                SDLSensorManager.unregisterListener(joystick.sensorManager, joystick.sensorListener, joystick.accelerometerSensor);
-            }
-            if (joystick.gyroscopeSensor != null) {
-                SDLSensorManager.unregisterListener(joystick.sensorManager, joystick.sensorListener, joystick.gyroscopeSensor);
-            }
-        }
-    }
 }

 class SDLHapticHandler_API31 extends SDLHapticHandler {
@@ -992,19 +933,3 @@ class SDLGenericMotionListener_API29 extends SDLGenericMotionListener_API26 {
        return penDevice.isExternal() ? SDL_PEN_DEVICE_TYPE_INDIRECT : SDL_PEN_DEVICE_TYPE_DIRECT;
    }
 }
-
-class SDLJoySensorListener implements SensorEventListener {
-    int device_id;
-
-    public SDLJoySensorListener(int device_id) {
-        this.device_id = device_id;
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {}
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        SDLControllerManager.onNativeJoySensor(device_id, event.sensor.getType(), event.timestamp, event.values[0], event.values[1], event.values[2]);
-    }
-}
@@ -1,32 +0,0 @@
-package org.libsdl.app;
-
-import android.hardware.Sensor;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-
-// This class coordinates synchronized access to sensor manager registration
-//
-// This prevents a java.util.ConcurrentModificationException exception on
-// Android 16, specifically on the Samsung Tab S9 Ultra.
-
-class SDLSensorManager
-{
-    static private SDLSensorManager mManager = new SDLSensorManager();
-
-    public static void registerListener(SensorManager manager, SensorEventListener listener, Sensor sensor, int samplingPeriodUs) {
-        mManager.RegisterListener(manager, listener, sensor, samplingPeriodUs);
-    }
-
-    public static void unregisterListener(SensorManager manager, SensorEventListener listener, Sensor sensor) {
-        mManager.UnregisterListener(manager, listener, sensor);
-    }
-
-    private synchronized void RegisterListener(SensorManager manager, SensorEventListener listener, Sensor sensor, int samplingPeriodUs) {
-        manager.registerListener(listener, sensor, samplingPeriodUs, null);
-    }
-
-    private synchronized void UnregisterListener(SensorManager manager, SensorEventListener listener, Sensor sensor) {
-        manager.unregisterListener(listener, sensor);
-    }
-}
-
@@ -47,9 +47,6 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
    // Is SurfaceView ready for rendering
    protected boolean mIsSurfaceReady;

-    // Is on-screen keyboard visible
-    protected boolean mKeyboardVisible;
-
    // Pinch events
    private final ScaleGestureDetector scaleGestureDetector;

@@ -216,18 +213,6 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
                                               WindowInsets.Type.displayCutout());

            SDLActivity.onNativeInsetsChanged(combined.left, combined.right, combined.top, combined.bottom);
-
-            if (insets.isVisible(WindowInsets.Type.ime())) {
-                if (!mKeyboardVisible) {
-                    mKeyboardVisible = true;
-                    SDLActivity.onNativeScreenKeyboardShown();
-                }
-            } else {
-                if (mKeyboardVisible) {
-                    mKeyboardVisible = false;
-                    SDLActivity.onNativeScreenKeyboardHidden();
-                }
-            }
        }

        // Pass these to any child views in case they need them
@@ -333,11 +318,11 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
    protected void enableSensor(int sensortype, boolean enabled) {
        // TODO: This uses getDefaultSensor - what if we have >1 accels?
        if (enabled) {
-            SDLSensorManager.registerListener(mSensorManager, this,
+            mSensorManager.registerListener(this,
                            mSensorManager.getDefaultSensor(sensortype),
-                            SensorManager.SENSOR_DELAY_GAME);
+                            SensorManager.SENSOR_DELAY_GAME, null);
        } else {
-            SDLSensorManager.unregisterListener(mSensorManager, this,
+            mSensorManager.unregisterListener(this,
                            mSensorManager.getDefaultSensor(sensortype));
        }
    }
@@ -16,7 +16,7 @@ body {
    flex-direction: column;
    justify-content: flex-end;
    align-items: stretch;
-    z-index: 2;
+    z-index: 1;
    pointer-events: none;
 }

@@ -1,339 +0,0 @@
-*, *:before, *:after {
-    box-sizing: border-box;
-}
-
-body {
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    font-family: "Fira Sans Condensed";
-    font-weight: bold;
-    color: rgba(248, 244, 232, 90%);
-    z-index: 1;
-    filter: opacity(0);
-    transition: filter 0.2s linear-in-out;
-}
-
-body[open] {
-    filter: opacity(1);
-}
-
-body:not([open]) {
-    pointer-events: none;
-}
-
-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    decorator: none;
-    padding: 0;
-    border: 1dp rgba(255, 255, 255, 22%);
-    background-color: rgba(22, 24, 28, 48%);
-    color: rgba(248, 244, 232, 90%);
-    text-align: center;
-    /* backdrop-filter: blur(7dp); */
-    /* box-shadow: 0 6dp 18dp rgba(0, 0, 0, 28%); */
-    transform-origin: center;
-    transition: background-color border-color filter transform 0.08s linear-in-out,
-                opacity 0.2s linear-in-out;
-}
-
-button.pressed,
-button.active {
-    background-color: rgba(63, 78, 90, 68%);
-    border-color: rgba(255, 255, 255, 48%);
-    filter: brightness(1.18);
-}
-
-button:hidden {
-    opacity: 0;
-    pointer-events: none;
-}
-
-button span {
-    display: block;
-    line-height: 1;
-}
-
-button icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-}
-
-button icon glyph {
-    display: block;
-    font-family: "Material Symbols Rounded";
-    font-weight: normal;
-    font-size: 24dp;
-    line-height: 1;
-}
-
-.midna-icon,
-.item-icon,
-.item-count,
-.oil-meter {
-    display: none;
-}
-
-.midna-icon.visible,
-.item-icon.visible,
-.item-count.visible,
-.oil-meter.visible {
-    display: block;
-}
-
-.control {
-    position: absolute;
-}
-
-.trigger-l.active {
-    background-color: rgba(57, 116, 133, 74%);
-    border-color: rgba(128, 222, 234, 72%);
-}
-
-.trigger,
-.skip {
-    border-radius: 23dp;
-}
-
-.trigger {
-    font-size: 22dp;
-}
-
-.button-z {
-    background-color: rgba(118, 79, 158, 58%);
-    border-color: rgba(203, 170, 255, 36%);
-}
-
-.midna-icon {
-    position: absolute;
-    left: 9dp;
-    top: -1dp;
-    height: 48dp;
-}
-
-.button-z.has-icon span,
-.face.has-item span {
-    position: absolute;
-    font-size: 13dp;
-    line-height: 1;
-}
-
-.button-z.has-icon span {
-    right: 9dp;
-    bottom: 7dp;
-}
-
-.button-z.pressed {
-    background-color: rgba(139, 91, 187, 82%);
-    border-color: rgba(220, 194, 255, 70%);
-}
-
-action-bar {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    border: 1dp rgba(255, 255, 255, 22%);
-    border-radius: 23dp;
-    background-color: rgba(22, 24, 28, 48%);
-    /* backdrop-filter: blur(7dp); */
-    /* box-shadow: 0 -6dp 18dp rgba(0, 0, 0, 28%); */
-    overflow: hidden;
-    opacity: 1;
-    transform-origin: center;
-    transition: opacity 0.2s linear-in-out;
-}
-
-action-bar:hidden,
-action-bar:hidden button,
-action-bar:hidden separator {
-    opacity: 0;
-    pointer-events: none;
-}
-
-.utility {
-    position: relative;
-    flex: 1 1 auto;
-    width: 56dp;
-    height: 44dp;
-    margin: 0;
-    border-width: 0dp;
-    border-radius: 0;
-    background-color: transparent;
-    box-shadow: none;
-}
-
-.utility,
-.skip {
-    opacity: 0.55;
-}
-
-.utility.pressed {
-    background-color: rgba(63, 78, 90, 68%);
-}
-
-.utility.pressed,
-.skip.pressed {
-    opacity: 1;
-}
-
-.skip {
-    z-index: 1;
-    border-color: rgba(255, 255, 255, 36%);
-}
-
-separator {
-    display: block;
-    flex: 0 0 1dp;
-    width: 1dp;
-    height: 24dp;
-    background-color: rgba(255, 255, 255, 18%);
-    opacity: 1;
-    transition: opacity 0.2s linear-in-out;
-}
-
-.face {
-    position: absolute;
-    border-radius: 29dp;
-    font-size: 24dp;
-    overflow: visible;
-}
-
-.item-icon {
-    width: auto;
-    height: auto;
-    max-width: 76%;
-    max-height: 76%;
-}
-
-.item-count {
-    position: absolute;
-    left: 6dp;
-    bottom: 5dp;
-    min-width: 17dp;
-    height: 15dp;
-    padding: 1dp 3dp;
-    border-radius: 7dp;
-    background-color: rgba(0, 0, 0, 52%);
-    color: rgba(255, 255, 255, 92%);
-    font-size: 12dp;
-    line-height: 13dp;
-    text-align: center;
-}
-
-.oil-meter {
-    position: absolute;
-    left: 12dp;
-    bottom: -5dp;
-    width: 34dp;
-    height: 8dp;
-    padding: 2dp;
-    border: 1dp rgba(42, 32, 18, 82%);
-    border-radius: 4dp;
-    background-color: rgba(18, 14, 10, 70%);
-    /* box-shadow: 0 2dp 6dp rgba(0, 0, 0, 35%); */
-}
-
-oil-fill {
-    display: block;
-    width: 0%;
-    height: 100%;
-    border-radius: 2dp;
-    background-color: rgb(255, 232, 74);
-}
-
-.face.has-item span {
-    right: 6dp;
-    bottom: 6dp;
-    color: rgba(255, 255, 255, 88%);
-}
-
-.face.a {
-    border-radius: 37dp;
-    font-size: 31dp;
-    background-color: rgba(34, 112, 123, 62%);
-}
-
-.face.b {
-    background-color: rgba(161, 61, 66, 58%);
-}
-
-.face.x {
-    background-color: rgba(83, 115, 151, 56%);
-}
-
-.face.y {
-    background-color: rgba(113, 91, 150, 54%);
-}
-
-button.control.docked-top,
-action-bar.docked-top {
-    border-top-width: 0dp;
-    border-top-left-radius: 0dp;
-    border-top-right-radius: 0dp;
-}
-
-button.control.docked-bottom,
-action-bar.docked-bottom {
-    border-bottom-width: 0dp;
-    border-bottom-left-radius: 0dp;
-    border-bottom-right-radius: 0dp;
-}
-
-button.control.docked-left,
-action-bar.docked-left {
-    border-left-width: 0dp;
-    border-top-left-radius: 0dp;
-    border-bottom-left-radius: 0dp;
-}
-
-button.control.docked-right,
-action-bar.docked-right {
-    border-right-width: 0dp;
-    border-top-right-radius: 0dp;
-    border-bottom-right-radius: 0dp;
-}
-
-touch-stick {
-    display: block;
-    position: absolute;
-    width: 124dp;
-    height: 124dp;
-    border-radius: 62dp;
-    background-color: rgba(18, 20, 24, 35%);
-    border: 1dp rgba(255, 255, 255, 20%);
-    /* backdrop-filter: blur(7dp); */
-    /* box-shadow: 0 8dp 24dp rgba(0, 0, 0, 24%); */
-    opacity: 0;
-    pointer-events: none;
-    transition: opacity 0.18s linear-in-out;
-}
-
-touch-stick.active {
-    opacity: 1;
-}
-
-stick-ring {
-    position: absolute;
-    left: 18dp;
-    top: 18dp;
-    width: 88dp;
-    height: 88dp;
-    border-radius: 44dp;
-    border: 1dp rgba(255, 255, 255, 18%);
-}
-
-stick-knob {
-    position: absolute;
-    width: 48dp;
-    height: 48dp;
-    border-radius: 24dp;
-    background-color: rgba(238, 236, 226, 55%);
-    border: 1dp rgba(255, 255, 255, 45%);
-}
@@ -1,138 +0,0 @@
-body.touch-editor {
-    background-color: rgba(4, 6, 8, 34%);
-    z-index: 8;
-}
-
-body.touch-editor .control,
-body.touch-editor action-bar {
-    opacity: 0.88;
-    cursor: move;
-    pointer-events: auto;
-}
-
-body.touch-editor .control:hover,
-body.touch-editor action-bar:hover,
-body.touch-editor .control.editor-selected,
-body.touch-editor action-bar.editor-selected {
-    border-color: rgba(255, 232, 128, 80%);
-    filter: brightness(1.15);
-}
-
-body.touch-editor action-bar button,
-body.touch-editor action-bar separator {
-    pointer-events: none;
-}
-
-selection-frame {
-    display: none;
-    position: absolute;
-    z-index: 20;
-    border: 2dp rgba(255, 232, 128, 88%);
-    background-color: rgba(255, 232, 128, 7%);
-    pointer-events: none;
-}
-
-selection-frame.visible {
-    display: block;
-}
-
-resize-handle {
-    display: block;
-    position: absolute;
-    width: 22dp;
-    height: 22dp;
-    border: 2dp rgba(255, 244, 190, 96%);
-    border-radius: 11dp;
-    background-color: rgba(34, 37, 42, 86%);
-    pointer-events: auto;
-}
-
-resize-handle.left {
-    left: -12dp;
-}
-
-resize-handle.right {
-    right: -12dp;
-}
-
-resize-handle.top {
-    top: -12dp;
-}
-
-resize-handle.bottom {
-    bottom: -12dp;
-}
-
-resize-handle.horizontal {
-    top: 50%;
-    margin-top: -11dp;
-}
-
-resize-handle.vertical {
-    left: 50%;
-    margin-left: -11dp;
-}
-
-resize-handle.corner.left {
-    left: -12dp;
-}
-
-resize-handle.corner.right {
-    right: -12dp;
-}
-
-resize-handle.corner.top {
-    top: -12dp;
-}
-
-resize-handle.corner.bottom {
-    bottom: -12dp;
-}
-
-editor-toolbar {
-    display: flex;
-    position: absolute;
-    left: 24dp;
-    right: 24dp;
-    top: 50%;
-    z-index: 30;
-    height: 48dp;
-    margin-top: -24dp;
-    gap: 8dp;
-    justify-content: center;
-    pointer-events: auto;
-}
-
-editor-toolbar button.editor-command {
-    flex: 0 1 150dp;
-    min-width: 96dp;
-    height: 48dp;
-    padding: 0 14dp;
-    border-radius: 8dp;
-    border: 1dp rgba(255, 255, 255, 26%);
-    background-color: rgba(17, 19, 24, 88%);
-    color: rgba(255, 250, 232, 94%);
-    font-family: "Fira Sans";
-    font-size: 18dp;
-    line-height: 48dp;
-    opacity: 1;
-    cursor: pointer;
-}
-
-editor-toolbar button.editor-command span {
-    display: block;
-    width: 100%;
-    line-height: 48dp;
-    text-align: center;
-}
-
-editor-toolbar button.editor-command.primary {
-    border-color: rgba(255, 232, 128, 70%);
-    background-color: rgba(96, 82, 38, 90%);
-}
-
-editor-toolbar button.editor-command:hover,
-editor-toolbar button.editor-command:focus-visible {
-    border-color: rgba(255, 244, 190, 92%);
-    background-color: rgba(78, 85, 96, 92%);
-}
@@ -15,9 +15,6 @@ static const char* sSpotName[] = {
    "D_MN08A", "D_MN08D", "D_MN09",  "D_MN09A", "D_MN09B", "D_MN09C", "D_SB00",  "D_SB01",
    "D_SB02",  "D_SB03",  "D_SB04",  "D_SB05",  "D_SB06",  "D_SB07",  "D_SB08",  "D_SB09",
    "D_SB10",
-#if TARGET_PC
-    "D_SB11",
-#endif
 };

 #endif /* SPOTNAME_H */
@@ -1603,35 +1603,13 @@ void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
            bgm_wave1 = 0x45;
        }
        break;
-#if TARGET_PC
-    case Z2SCENE_CAVE_OF_SHADOWS:
-        if (room == 29) {
-            se_wave2 = 0x16;
-        } else if (room == 40) {
-            se_wave2 = 0x12;
-        } else {
-            se_wave2 = 0x36;
-        }
-
-        bgm_wave1 = 0x45;
-        se_wave1 = 0x51;
-        mDoAud_zelAudio_c::onBgmSet();
-        bgm_id = Z2BGM_SUB_DUNGEON;
-
-        if (BGM_ID == Z2BGM_SUB_DUNGEON) {
-            if (sceneNum == Z2SCENE_CAVE_OF_ORDEALS) {
-                BGM_ID = -1;
-            }
-        }
-        break;
-#endif
    }

        /*dSv_event_flag_c::M_071 - Cutscene - [cutscene: 20] Zant appears (during Midna's desperate hour) */
    if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[104])
            /* dSv_event_flag_c::F_0250 - Cutscene - [cutscene: 21] reunion with Zelda / Midna revived (Hyrule Castle barrier appears) */
        && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[250])
-        && demo_wave == 0 && spotNo != Z2SCENE_ELDIN_BRIDGE_BATTLE IF_DUSK(&& spotNo != Z2SCENE_CAVE_OF_SHADOWS))
+        && demo_wave == 0 && spotNo != Z2SCENE_ELDIN_BRIDGE_BATTLE)
    {
        bgm_wave1 = 0x36;
        if (spotNo == Z2SCENE_CASTLE_TOWN_SHOPS && room == 5) {
@@ -583,12 +583,6 @@ void Z2SeqMgr::bgmStreamPlay() {
        }
    }

-    #if TARGET_PC
-    if (dusk::tphd_active()) {
-        return;
-    }
-    #endif
-
    #if !PLATFORM_SHIELD
    else if (getStreamBgmID() == 0x2000000) {
        if (mStreamBgmHandle) {
@@ -5,53 +5,51 @@

 #include "d/dolzel.h" // IWYU pragma: keep

+#include "d/actor/d_a_alink.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
-#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
+#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "JSystem/JHostIO/JORServer.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "SSystem/SComponent/c_math.h"
-#include "d/actor/d_a_alink.h"
-#include "d/actor/d_a_b_mgn.h"
-#include "d/actor/d_a_canoe.h"
-#include "d/actor/d_a_cow.h"
+#include "d/d_item.h"
+#include "d/d_meter2_draw.h"
+#include "d/d_pane_class.h"
+#include "d/d_demo.h"
 #include "d/actor/d_a_crod.h"
-#include "d/actor/d_a_horse.h"
-#include "d/actor/d_a_kytag05.h"
 #include "d/actor/d_a_mg_rod.h"
 #include "d/actor/d_a_midna.h"
 #include "d/actor/d_a_mirror.h"
-#include "d/actor/d_a_ni.h"
-#include "d/actor/d_a_npc_bou.h"
-#include "d/actor/d_a_npc_kolin.h"
+#include "d/actor/d_a_spinner.h"
+#include "d/actor/d_a_tbox.h"
+#include "d/actor/d_a_tag_Lv6Gate.h"
+#include "d/actor/d_a_tag_kmsg.h"
+#include "d/actor/d_a_tag_magne.h"
+#include "d/actor/d_a_tag_wljump.h"
 #include "d/actor/d_a_npc_tk.h"
+#include "d/actor/d_a_cow.h"
 #include "d/actor/d_a_obj_crope.h"
 #include "d/actor/d_a_obj_wchain.h"
-#include "d/actor/d_a_scene_exit.h"
-#include "d/actor/d_a_spinner.h"
-#include "d/actor/d_a_tag_Lv6Gate.h"
 #include "d/actor/d_a_tag_hstop.h"
-#include "d/actor/d_a_tag_kmsg.h"
-#include "d/actor/d_a_tag_lantern.h"
-#include "d/actor/d_a_tag_magne.h"
+#include "d/actor/d_a_scene_exit.h"
 #include "d/actor/d_a_tag_mhint.h"
 #include "d/actor/d_a_tag_mmsg.h"
+#include "d/actor/d_a_tag_lantern.h"
+#include "d/actor/d_a_horse.h"
+#include "m_Do/m_Do_controller_pad.h"
+#include "d/d_bomb.h"
+#include "d/d_meter2_info.h"
+#include "d/actor/d_a_kytag05.h"
+#include "d/actor/d_a_b_mgn.h"
+#include "d/actor/d_a_npc_bou.h"
+#include "d/actor/d_a_npc_kolin.h"
+#include "f_op/f_op_kankyo_mng.h"
 #include "d/actor/d_a_tag_mstop.h"
 #include "d/actor/d_a_tag_mwait.h"
-#include "d/actor/d_a_tag_wljump.h"
-#include "d/actor/d_a_tbox.h"
-#include "d/d_bomb.h"
-#include "d/d_demo.h"
-#include "d/d_item.h"
-#include "d/d_meter2_draw.h"
-#include "d/d_meter2_info.h"
-#include "d/d_pane_class.h"
+#include "d/actor/d_a_canoe.h"
+#include "d/actor/d_a_ni.h"
 #include "d/d_s_play.h"
-#include "dusk/tphd/LosTable.hpp"
-#include "dusk/tphd/TphdPack.hpp"
-#include "f_op/f_op_kankyo_mng.h"
-#include "m_Do/m_Do_controller_pad.h"

 #if TARGET_PC
 #include "dusk/action_bindings.h"
@@ -17454,7 +17452,7 @@ int daAlink_c::procCoMetamorphoseInit() {
            mProcVar2.field_0x300c = shape_angle.x;

            daMidna_c* midna = (daMidna_c*)getMidnaActor();
-            if (checkMidnaRide() && (daMidna_c::checkMidnaRealBody() IF_DUSK(|| dusk::tphd::is_los_active())) && midna->checkDemoTypeNone())
+            if (checkMidnaRide() && daMidna_c::checkMidnaRealBody() && midna->checkDemoTypeNone())
            {
                midna->changeOriginalDemo();
                midna->changeDemoMode(daPy_demo_c::DEMO_UNK_15_e);
@@ -737,12 +737,6 @@ void daAlink_c::setDemoData() {
                        } else {
                            mDemo.setStick(1.0f);
                        }
-
-#if TARGET_PC
-                        if (dusk::tphd::is_los_active() && mLosStickValue > 0.0f) {
-                            mDemo.setStick(mLosStickValue);
-                        }
-#endif
                    }

                    if ((demo_mode == daPy_demo_c::DEMO_UNK_2_e || demo_mode == daPy_demo_c::DEMO_UNK_3_e) && prm1_p != NULL && *prm1_p == 1) {
@@ -3,7 +3,6 @@
 #include "d/d_meter2.h"
 #include "d/d_meter2_draw.h"
 #include "d/d_meter2_info.h"
-#include "dusk/tphd/LosTable.hpp"

 void daAlink_c::handleWolfHowl() {
    if (checkWolf()) {
@@ -72,11 +71,6 @@ void daAlink_c::handleQuickTransform() {
        return;
    }

-    if (dusk::tphd::is_los_active() && !dusk::getSettings().game.canTransformAnywhere) {
-        Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
-        return;
-    }
-
    // Check to see if Link has the ability to transform.
    if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077)) {
        return;
@@ -181,13 +175,3 @@ bool daAlink_c::checkAimContext() {
        return false;
    }
 }
-
-bool daAlink_c::checkAimInputContext() {
-    switch (mProcID) {
-    case PROC_HOOKSHOT_ROOF_WAIT:
-    case PROC_HOOKSHOT_WALL_WAIT:
-        return false;
-    default:
-        return checkAimContext();
-    }
-}
@@ -14,7 +14,6 @@
 #include "dusk/action_bindings.h"
 #include "dusk/gyro.h"
 #include "dusk/mouse.h"
-#include "dusk/touch_camera.h"
 #endif

 bool daAlink_c::checkNoSubjectModeCamera() {
@@ -123,7 +122,7 @@ BOOL daAlink_c::setBodyAngleToCamera() {
            }

 #if TARGET_PC
-            if (dusk::getSettings().game.enableMouseAim && checkAimInputContext()) {
+            if (dusk::getSettings().game.enableMouseAim && checkAimContext()) {
                sp8 = mBodyAngle.x;
            } else
 #endif
@@ -142,7 +141,7 @@ BOOL daAlink_c::setBodyAngleToCamera() {
 #if TARGET_PC
        if ((dusk::getSettings().game.enableGyroAim ||
             dusk::getSettings().game.enableMouseAim) &&
-             checkAimInputContext())
+             checkAimContext())
        {
            f32 gyro_scale = 1.0f;
            if (checkWolfEyeUp()) {
@@ -173,32 +172,6 @@ BOOL daAlink_c::setBodyAngleToCamera() {
                sp8 = mBodyAngle.x;
            }
        }
-
-        if (dusk::getSettings().game.enableTouchControls && checkAimInputContext()) {
-            f32 touchYawDp = 0.0f;
-            f32 touchPitchDp = 0.0f;
-            if (dusk::touch_camera::consume_delta(touchYawDp, touchPitchDp)) {
-                f32 scale = 1.0f;
-                if (checkWolfEyeUp()) {
-                    scale *= 0.6f;
-                }
-                if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
-                    scale /= dComIfGp_getCameraZoomScale(field_0x317c);
-                }
-
-                const f32 yawDeg = -touchYawDp * dusk::touch_camera::YAW_DEGREES_PER_DP * scale *
-                                   dusk::getSettings().game.touchCameraXSensitivity;
-                const f32 pitchDeg = touchPitchDp * dusk::touch_camera::PITCH_DEGREES_PER_DP *
-                                     scale * dusk::getSettings().game.touchCameraYSensitivity;
-
-                shape_angle.y = shape_angle.y + cM_deg2s(yawDeg);
-                sp8 = sp8 + cM_deg2s(pitchDeg);
-
-                if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) {
-                    sp8 = mBodyAngle.x;
-                }
-            }
-        }
 #endif

        if (checkNotItemSinkLimit() && sp8 > 0) {
@@ -452,8 +425,4 @@ daAlink_c::daAlink_c()
      mFaceBtkHeap(0x400),
      mFaceBckHeap(0xC00),
      mAnmHeap9(0x800)
-{
-#if TARGET_PC
-    mLosStickValue = -1.0f;
-#endif
-}
+      {}
@@ -85,17 +85,6 @@ int daAlink_c::loadModelDVD() {
                }
                cPhs_Reset(&mPhaseReq);
                mpArcHeap->freeAll();
-#if TARGET_PC
-                field_0x06d0 = NULL;
-                field_0x06d4 = NULL;
-                field_0x06d8 = NULL;
-                field_0x06dc = NULL;
-                field_0x06e0 = NULL;
-                field_0x06e4 = NULL;
-                field_0x06e8 = NULL;
-                field_0x06ec = NULL;
-                field_0x06f0 = NULL;
-#endif

                if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_METAMORPHOSE_ONLY) {
                    setArcName(!checkWolf());
@@ -13,7 +13,6 @@
 #include "d/d_bg_parts.h"
 #include "m_Do/m_Do_lib.h"
 #include "d/d_demo.h"
-#include "dusk/tphd/LosTable.hpp"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
@@ -298,25 +297,6 @@ int daBg_c::draw() {
    dComIfGd_setListBG();
    mDoLib_clipper::changeFar(1000000.0f);

-#if TARGET_PC
-    bool losClip = false;
-    Mtx losBgMtx;
-    if (dusk::tphd_active()) {
-        // TPHD Cave of Shadows rooms have a base matrix far from identity; it gets the room translation from 'los.bin'
-        // HD daBg::draw clips the shape bbox in world space, so recompute the room base matrix to transform it.
-        if (strcmp(dComIfGp_getStartStageName(), "D_SB11") == 0) {
-            f32 hx, hy, hz;
-            s16 ha;
-            if (dusk::tphd::los_get_room_trans(roomNo, &hx, &hy, &hz, &ha)) {
-                mDoMtx_stack_c::transS(hx, hy, hz);
-                mDoMtx_stack_c::YrotM(ha);
-                mDoMtx_copy(mDoMtx_stack_c::get(), losBgMtx);
-                losClip = true;
-            }
-        }
-    }
-#endif
-
    J3DModelData* modelData;
    for (int i = 0; i < 6; i++) {
        sp8 = 0;
@@ -345,22 +325,8 @@ int daBg_c::draw() {
            for (u16 j = 0; j < modelData->getShapeNum(); j++) {
                J3DShape* shape = modelData->getShapeNodePointer(j);

-                Vec* clipMin = (Vec*)shape->getMin();
-                Vec* clipMax = (Vec*)shape->getMax();
-#if TARGET_PC
-                if (dusk::tphd_active()) {
-                    Vec losClipMin, losClipMax;
-                    if (losClip) {
-                        // HD transforms the bbox min/max by the room base matrix; clip rebuilds
-                        // the 8 corners (exact for the room angles, which are multiples of 90).
-                        mDoMtx_multVec(losBgMtx, clipMin, &losClipMin);
-                        mDoMtx_multVec(losBgMtx, clipMax, &losClipMax);
-                        clipMin = &losClipMin;
-                        clipMax = &losClipMax;
-                    }
-                }
-#endif
-                if (mDoLib_clipper::clip(j3dSys.getViewMtx(), clipMin, clipMax)) {
+                if (mDoLib_clipper::clip(j3dSys.getViewMtx(), (Vec*)shape->getMin(),
+                                         (Vec*)shape->getMax())) {
                    shape->hide();
                } else {
                    shape->show();
@@ -599,43 +565,17 @@ int daBg_c::create() {
        }

        J3DModelData* modelData;
-#if TARGET_PC
-        f32 transX = 0.0f;
-        f32 transY = 0.0f;
-        f32 transVert = 0.0f;
-        s16 angle = 0;
-        bool foundMapTrans = false;
-
-        if (dusk::tphd_active()) {
-            // TPHD positions Cave of Shadows rooms via los.bin (per-room world X/Y/Z +
-            // Y-rotation, incl. the vertical Y that GC's MULT lacks). Retail gates
-            // this on g_dComIfG_gameInfo.field_0x1e448; los.bin only carries
-            // D_SB11's room data, so restrict it to that stage and fall back to MULT.
-            if (strcmp(dComIfGp_getStartStageName(), "D_SB11") == 0) {
-                foundMapTrans = dusk::tphd::los_get_room_trans(roomNo, &transX, &transVert, &transY, &angle);
-            }
-        }
-
-        if (!foundMapTrans)
-            foundMapTrans = dComIfGp_getMapTrans(roomNo, &transX, &transY, &angle);
-        if (foundMapTrans) {
-#else
        f32 transX;
        f32 transY;
        s16 angle;
        if (dComIfGp_getMapTrans(roomNo, &transX, &transY, &angle)) {
-#endif
            daBg_Part* bgPart = mBgParts;
            J3DModel* model;
            for (int i = 0; i < 6; i++) {
                model = bgPart->model;

                if (model != NULL) {
-                    #if TARGET_PC
-                    mDoMtx_stack_c::transS(transX, transVert, transY);
-                    #else
                    mDoMtx_stack_c::transS(transX, 0.0f, transY);
-                    #endif
                    mDoMtx_stack_c::YrotM(angle);
                    model->setBaseTRMtx(mDoMtx_stack_c::get());

@@ -144,11 +144,7 @@ bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
            default:
                // Invalid data block type
                OS_REPORT_ERROR("データブロックタイプが不正です<%d>\n", block_type);
-#if DUSK_TPHD
-                return 0; // HD-port: skip actor instead of asserting.
-#else
                JUT_ASSERT(527, FALSE);
-#endif
            }

            if (block_type == 0) {
@@ -189,11 +185,7 @@ bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
            default:
                // Invalid data block type
                OS_REPORT_ERROR("データブロックタイプが不正です<%d>\n", block_type);
-#if DUSK_TPHD
-                return 0;
-#else
                JUT_ASSERT(570, FALSE);
-#endif
            }

            if (block_type == 0) {
@@ -234,12 +226,8 @@ bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
            default:
                // "Data Block type invalid<%d>\n"
                OSReport_Error("データブロックタイプが不正です<%d>\n", block_type);
-#if DUSK_TPHD
-                return 0;
-#else
                JUT_ASSERT(619, FALSE);
                break;
-#endif
            }

            if (block_type == 0) {
@@ -403,10 +403,7 @@ void e_ai_class::e_ai_damage() {
            if (m_timers[1] == 0) {
                m_sound.startCreatureSound(Z2SE_EN_AI_FLASH, 0, -1);
                mpEmitter = dComIfGp_particle_set(0x81ED, &current.pos, &tevStr, &shape_angle, NULL);
-                if (mpEmitter != NULL) {
-                    mpEmitter->becomeImmortalEmitter();
-                }
-
+                mpEmitter->becomeImmortalEmitter();
                m_timers[1] = 1000;
                m_timers[2] = 56;
            }
@@ -13,9 +13,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>

-#include "dusk/tphd/LosTable.hpp"
-#include "dusk/tphd/TphdPack.hpp"
-
 enum E_ww_RES_File_ID {
    /* BCK */
    /* 0x04 */ BCK_WW_APPEAR = 0x4,
@@ -469,7 +466,7 @@ f32 daE_WW_c::checkCreateBg(cXyz i_vector) {
            return -G_CM3D_F_INF;
        }

-        if (dComIfG_Bgsp().GetSpecialCode(gnd_chk) == 5 || dComIfG_Bgsp().GetPolyAtt0(gnd_chk) == 0xD IF_DUSK(|| dusk::tphd::is_los_active())) {
+        if (dComIfG_Bgsp().GetSpecialCode(gnd_chk) == 5 || dComIfG_Bgsp().GetPolyAtt0(gnd_chk) == 0xD) {
            cXyz temp_r1 = daPy_getPlayerActorClass()->current.pos;
            temp_r1.y += 100.0f;
            sp14 = i_vector;
@@ -669,14 +666,8 @@ void daE_WW_c::executeMaster() {
                sp30.set(0.0f, 0.0f, 3000.0f);
            }

-#if TARGET_PC
-            if (dusk::tphd::is_los_active()) {
-                sp30.z = 600.0f;
-            }
-#endif
-
            cLib_offsetPos(&sp3C, &sp48, fopCamM_GetAngleY(camera), &sp30);
-            if ((current.pos.abs(sp3C) < field_0x6a8) IF_DUSK(|| (dusk::tphd::is_los_active() && current.pos.y - sp48.y < field_0x6a8))) {
+            if (current.pos.abs(sp3C) < field_0x6a8) {
                f32 temp_f31 = checkCreateBg(sp3C);
                if (-G_CM3D_F_INF != temp_f31) {
                    sp3C.y = temp_f31;
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include <cstring>
-#include <dusk/ui/settings.hpp>

 static int daKytag04_Draw(kytag04_class* i_this) {
    dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -261,25 +260,12 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {

    a_this->mNeedDropNum = i_this->current.angle.z & 0xFF;

-    #if TARGET_PC
-    if (dusk::tphd_active()) {
-        a_this->mNeedDropNum = 12;
-    }
-    #endif
-
    int phase_state = dComIfG_resLoad(&a_this->mPhase, "Kytag04");
    if (phase_state == cPhs_COMPLEATE_e) {
        a_this->field_0x5b4 = (fopAcM_GetParam(i_this) >> 8) & 7;
        a_this->mStageNo = (i_this->current.angle.z >> 8) & 0xFF;
        a_this->mExitID = fopAcM_GetParam(i_this) & 0xFF;
        a_this->mNeedDropNum = i_this->current.angle.z & 0xFF;
-
-        #if TARGET_PC
-        if (dusk::tphd_active()) {
-            a_this->mNeedDropNum = 12;
-        }
-        #endif
-
        a_this->field_0x5b5 = fopAcM_GetParam(i_this) >> 0x10;
        a_this->field_0x5b6 = fopAcM_GetParam(i_this) >> 0x18;

@@ -64,7 +64,6 @@ static dPath* get_Extent_pos_end_get(kytag10_class* i_this, dPath* i_path, cXyz*
 }

 static void sparks_move(kytag10_class* i_this) {
-
    camera_process_class* camera_p = dComIfGp_getCamera(0);

    cXyz ratio_pos_1;
@@ -5,17 +5,16 @@

 #include "d/dolzel_rel.h" // IWYU pragma: keep

+#include "d/actor/d_a_midna.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
+#include "d/d_meter2_info.h"
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_kago.h"
-#include "d/actor/d_a_midna.h"
-#include "d/d_debug_viewer.h"
 #include "d/d_demo.h"
-#include "d/d_meter2_info.h"
 #include "d/d_msg_object.h"
 #include "d/d_s_play.h"
+#include "d/d_debug_viewer.h"
 #include "dusk/frame_interpolation.h"
-#include "dusk/tphd/LosTable.hpp"

 static f32 dummy_lit_3777(int idx, u8 foo) {
    Vec dummy_vec = {0.0f, 0.0f, 0.0f};
@@ -3309,14 +3308,7 @@ int daMidna_c::execute() {
                    }
                }
                onStateFlg0(FLG0_UNK_8000);
-#if TARGET_PC
-                if (dusk::tphd::is_los_active() && !dusk::getSettings().game.canTransformAnywhere) {
-                    mMsgFlow.init(this, 0x457, 0, NULL);
-                } else
-#endif
-                {
-                    mMsgFlow.init(this, 0xbb9, 0, NULL);
-                }
+                mMsgFlow.init(this, 0xbb9, 0, NULL);
            } else if (mMsgFlow.doFlow(this, NULL, 0)) {
                int item_id;
                u16 event_id = mMsgFlow.getEventId(&item_id);
@@ -15,8 +15,6 @@
 #include "m_Do/m_Do_lib.h"
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
-#include "dusk/settings.h"
-#include <cstring>
 #endif

 #ifndef __MWERKS__
@@ -52,32 +50,6 @@ void dMirror_packet_c::calcMinMax() {
    mMinVal.set(FLT_MAX, FLT_MAX, FLT_MAX);
    mMaxVal.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);

-#if TARGET_PC
-    // HD: per-quad cull box + global bbox over all mQuadCount quads.
-    for (int q = 0; q < mQuadCount; q++) {
-        cXyz& bmin = mQuadBoxMin[q];
-        cXyz& bmax = mQuadBoxMax[q];
-        bmin.set(FLT_MAX, FLT_MAX, FLT_MAX);
-        bmax.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
-
-        cXyz* quad = &mQuad[q * 4];
-        for (int i = 0; i < 4; i++, quad++) {
-            if (quad->x < bmin.x) bmin.x = quad->x;
-            if (quad->x > bmax.x) bmax.x = quad->x;
-            if (quad->y < bmin.y) bmin.y = quad->y;
-            if (quad->y > bmax.y) bmax.y = quad->y;
-            if (quad->z < bmin.z) bmin.z = quad->z;
-            if (quad->z > bmax.z) bmax.z = quad->z;
-        }
-
-        if (bmin.x < mMinVal.x) mMinVal.x = bmin.x;
-        if (bmax.x > mMaxVal.x) mMaxVal.x = bmax.x;
-        if (bmin.y < mMinVal.y) mMinVal.y = bmin.y;
-        if (bmax.y > mMaxVal.y) mMaxVal.y = bmax.y;
-        if (bmin.z < mMinVal.z) mMinVal.z = bmin.z;
-        if (bmax.z > mMaxVal.z) mMaxVal.z = bmax.z;
-    }
-#else
    cXyz* quad = mQuad;
    for (int i = 0; i < 4; i++, quad++) {
        f32 val = quad->x;
@@ -110,7 +82,6 @@ void dMirror_packet_c::calcMinMax() {
            mMaxVal.z = val;
        }
    }
-#endif
 }

 int dMirror_packet_c::entryModel(J3DModel* i_model) {
@@ -132,10 +103,6 @@ int dMirror_packet_c::entryModel(J3DModel* i_model) {
    return 1;
 }

-#if TARGET_PC
-static f32 dMirror_quadDist(const cXyz& p, const cXyz& bmin, const cXyz& bmax);
-#endif
-
 void dMirror_packet_c::mirrorZdraw(f32* param_0, f32* param_1, f32 param_2, f32 param_3,
                                   f32 param_4, f32 param_5, f32 param_6, f32 param_7) {
    ZoneScoped;
@@ -164,82 +131,11 @@ void dMirror_packet_c::mirrorZdraw(f32* param_0, f32* param_1, f32 param_2, f32
    GXLoadPosMtxImm(j3dSys.getViewMtx(), 0);
    GXSetCurrentMtx(0);

-#if TARGET_PC
-    // HD FUN_0247d9fc: with count>=2, tint only the same-height quad group nearest the camera
-    u32 groupMask = 1;
-    int groupCount = 1;
-    if (mQuadCount >= 2) {
-        const cXyz& eye = dComIfGd_getView()->lookat.eye;
-        int nearest = 0;
-        f32 best = FLT_MAX;
-        for (int q = 0; q < mQuadCount; q++) {
-            f32 dist = dMirror_quadDist(eye, mQuadBoxMin[q], mQuadBoxMax[q]);
-            if (dist < best) {
-                best = dist;
-                nearest = q;
-            }
-        }
-        groupMask = 0;
-        groupCount = 0;
-        for (int q = 0; q < mQuadCount; q++) {
-            if (fabsf(mQuadBoxMin[q].y - mQuadBoxMin[nearest].y) < 0.0001f) {
-                groupMask |= 1u << q;
-                groupCount++;
-            }
-        }
-    }
-
-    GXBegin(GX_QUADS, GX_VTXFMT0, groupCount * 4);
-    for (int q = 0; q < mQuadCount; q++) {
-        if (groupMask & (1u << q)) {
-            for (int i = 0; i < 4; i++) {
-                GXPosition3f32(mQuad[q * 4 + i].x, mQuad[q * 4 + i].y, mQuad[q * 4 + i].z);
-            }
-        }
-    }
-    GXEnd();
-
-    if (mQuadCount >= 2 && GX2SupportsStencil()) {
-        GXSetColorUpdate(GX_DISABLE);
-        GXSetAlphaUpdate(GX_DISABLE);
-        GXSetBlendMode(GX_BM_NONE, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_CLEAR);
-        GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
-        GX2SetStencilMask(0xff, 0xff, 0, 0xff, 0xff, 0);       
-        GX2SetDepthStencilControl(0, 0, 7, 1, 0, 7, 3, 3, 0, 0, 0, 0, 0);
-        GXBegin(GX_QUADS, GX_VTXFMT0, groupCount * 4);
-        for (int q = 0; q < mQuadCount; q++) {
-            if (groupMask & (1u << q)) {
-                for (int i = 0; i < 4; i++) {
-                    GXPosition3f32(mQuad[q * 4 + i].x, mQuad[q * 4 + i].y, mQuad[q * 4 + i].z);
-                }
-            }
-        }
-        GXEnd();
-
-        GX2SetDepthStencilControl(1, 1, 7, 1, 0, 2, 1, 1, 1, 0, 0, 0, 0);
-        Mtx44 proj;
-        C_MTXOrtho(proj, param_1[1], param_1[1] + param_1[3], param_1[0],
-                   param_1[0] + param_1[2], 0, 100.0f);
-        GXSetProjection(proj, GX_ORTHOGRAPHIC);
-        GXLoadPosMtxImm(mDoMtx_getIdentity(), 0);
-        GXBegin(GX_QUADS, GX_VTXFMT0, 4);
-        GXPosition3f32(param_1[0], param_1[1], -100.0f);
-        GXPosition3f32(param_1[0] + param_1[2], param_1[1], -100.0f);
-        GXPosition3f32(param_1[0] + param_1[2], param_1[1] + param_1[3], -100.0f);
-        GXPosition3f32(param_1[0], param_1[1] + param_1[3], -100.0f);
-        GXEnd();
-        GXSetProjectionv(param_0);
-        GXSetColorUpdate(GX_ENABLE);
-        GXSetAlphaUpdate(GX_DISABLE); // no stencil-off: the next material's zmode write disables it
-        return;
-    }
-#else
    GXBegin(GX_QUADS, GX_VTXFMT0, 4);
    for (int i = 0; i < 4; i++) {
        GXPosition3f32(mQuad[i].x, mQuad[i].y, mQuad[i].z);
    }
    GXEnd();
-#endif

    if (mViewScale.y > 0.0f) {
        GXSetZMode(GX_ENABLE, GX_ALWAYS, GX_ENABLE);
@@ -369,223 +265,10 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) {
    }
 }

-#if TARGET_PC
-// FUN_0247c89c: HD multi-quad floor reflection helpers (F_SP117 room 2):
-static f32 dMirror_quadDist(const cXyz& p, const cXyz& bmin, const cXyz& bmax) {
-    f32 ox = bmin.x - p.x;
-    if (ox < 0.0f) ox = 0.0f;
-    f32 oz = bmin.z - p.z;
-    if (oz < 0.0f) oz = 0.0f;
-    f32 px = p.x - bmax.x;
-    if (px < 0.0f) px = 0.0f;
-    f32 pz = p.z - bmax.z;
-    if (pz < 0.0f) pz = 0.0f;
-    return fabsf(p.y - bmin.y) + ox + oz + px + pz;
-}
-
-static void dMirror_accumQuadBBox(view_class* view, view_port_class* view_port, const u32 scissor[4],
-                                  cXyz* quad, f32& minX, f32& maxX, f32& minY, f32& maxY, f32& maxZ) {
-    cXyz sp19C[5];
-    int prjPosNum = 4;
-    f32 nearZ = -view->near_;
-
-    int behind = 0;
-    int lastFront = 0;
-    for (int i = 0; i < 4; i++) {
-        cMtx_multVec(view->viewMtx, &quad[i], &sp19C[i]);
-        if (sp19C[i].z >= nearZ) {
-            behind++;
-        } else {
-            lastFront = i;
-        }
-    }
-    if (behind >= 4) {
-        return;  
-    }
-
-    int var_r28 = lastFront;
-    if (behind != 0) {
-        int var_r27 = -1;
-        for (int i = 0; i < 4; i++) {
-            int temp_r5 = (var_r28 + 1) % 4;
-            if (var_r27 < 0) {
-                if (sp19C[temp_r5].z >= nearZ) {
-                    var_r27 = temp_r5;
-                }
-            } else if (sp19C[temp_r5].z < nearZ) {
-                int temp_r29 = (var_r27 + 3) % 4;
-                cXyz d0 = sp19C[var_r27] - sp19C[temp_r29];
-                d0 *= (nearZ - sp19C[temp_r29].z) / d0.z;
-                sp19C[4] = sp19C[temp_r29] + d0;
-                prjPosNum++;
-
-                cXyz d1 = sp19C[var_r28] - sp19C[temp_r5];
-                d1 *= (nearZ - sp19C[temp_r5].z) / d1.z;
-                sp19C[var_r28] = sp19C[temp_r5] + d1;
-
-                for (int j = var_r27; j != var_r28; j = (j + 1) % 4) {
-                    sp19C[j] = sp19C[var_r28];
-                }
-                break;
-            }
-            var_r28 = temp_r5;
-        }
-    }
-
-    f32 aspect = view->aspect;
-    f32 tanHalf = tanf(MTXDegToRad(view->fovy * 0.5f));
-    f32 vx, vy, vw, vh;
-    if (view_port->x_orig != 0.0f) {
-        vx = (((view_port->x_orig * 2.0f) + view_port->width) * 0.5f) - (FB_WIDTH / 2);
-        vw = FB_WIDTH;
-    } else {
-        vx = view_port->x_orig;
-        vw = view_port->width;
-    }
-    if (view_port->y_orig != 0.0f) {
-        vy = (((view_port->y_orig * 2.0f) + view_port->height) * 0.5f) - (FB_HEIGHT / 2);
-        vh = FB_HEIGHT;
-    } else {
-        vy = view_port->y_orig;
-        vh = view_port->height;
-    }
-
-    f32 sxMin = scissor[0];
-    f32 sxMax = sxMin + scissor[2];
-    f32 syMin = scissor[1];
-    f32 syMax = syMin + scissor[3];
-
-    Vec* p = sp19C;
-    for (int i = 0; i < prjPosNum; i++, p++) {
-        p->y = p->y / (p->z * tanHalf);
-        p->x = p->x / (aspect * (-p->z * tanHalf));
-        p->x = vx + ((1.0f + p->x) * (vw * 0.5f));
-        p->y = vy + ((1.0f + p->y) * (vh * 0.5f));
-        p->x = cLib_minMaxLimit<f32>(p->x, sxMin, sxMax);
-        p->y = cLib_minMaxLimit<f32>(p->y, syMin, syMax);
-        if (p->x < minX) minX = p->x;
-        if (p->x > maxX) maxX = p->x;
-        if (p->y < minY) minY = p->y;
-        if (p->y > maxY) maxY = p->y;
-        if (p->z > maxZ) maxZ = p->z;
-    }
-}
-#endif
-
 void dMirror_packet_c::mainDraw() {
    ZoneScoped;
    j3dSys.reinitGX();

-#if TARGET_PC
-    f32 sp150[7];
-    GXGetProjectionv(sp150);
-
-    f32 sp138[6];
-    GXGetViewportv(sp138);
-
-    u32 scissor[4];
-    GXGetScissor(&scissor[0], &scissor[1], &scissor[2], &scissor[3]);
-
-    view_class* view = dComIfGd_getView();
-    view_port_class* view_port = dComIfGd_getViewport();
-
-    // HD mainDraw (FUN_0247e6e8):
-    f32 minX = FLT_MAX, minY = FLT_MAX;
-    f32 maxX = -FLT_MAX, maxY = -FLT_MAX, maxZ = -FLT_MAX;
-    for (int q = 0; q < mQuadCount; q++) {
-        dMirror_accumQuadBBox(view, view_port, scissor, &mQuad[q * 4], minX, maxX, minY, maxY, maxZ);
-    }
-
-    if (maxX <= minX || maxY <= minY) {
-        return;  
-    }
-    if (fabsf(maxX - minX) < 8.0f || fabsf(maxY - minY) < 8.0f) {
-        return;
-    }
-
-    GXSetScissor((u32)minX, (u32)minY, (u32)(maxX - minX), (u32)(maxY - minY));
-
-    Mtx reflMtx[MAX_QUADS];
-    for (int q = 0; q < mQuadCount; q++) {
-        cXyz* quad = &mQuad[q * 4];
-        cXyz e0 = quad[1] - quad[0];
-        cXyz e1 = quad[2] - quad[1];
-        cXyz n = e0.outprod(e1);
-        n.normalizeZP();
-
-        f32 planeD = (n.x * quad[0].x) + (n.y * quad[0].y) + (n.z * quad[0].z);
-        f32 dCenter = ((n.x * view->lookat.center.x) + (n.y * view->lookat.center.y) +
-                       (n.z * view->lookat.center.z)) -
-                      planeD;
-        cXyz reflEye =
-            view->lookat.eye -
-            (n * (2.0f * (((n.x * view->lookat.eye.x) + (n.y * view->lookat.eye.y) +
-                           (n.z * view->lookat.eye.z)) -
-                          planeD)));
-        cXyz reflCenter = view->lookat.center - (n * (2.0f * dCenter));
-
-        cXyz up(0.0f, 1.0f, 0.0f);
-        if (mViewScale.y > 0.0f) {
-            cXyz a = reflEye - view->lookat.eye;
-            cXyz b = a.outprod(view->lookat.up);
-            up = a.outprod(b);
-            up.normalizeZP();
-            up *= cXyz(-1.0f, -1.0f, -1.0f);
-        }
-
-        Mtx look;
-        mDoMtx_lookAt(look, &reflEye, &reflCenter, &up, view->bank);
-        mDoMtx_stack_c::scaleS(mViewScale);
-        mDoMtx_stack_c::concat(look);
-
-        f32 (*cur)[4] = mDoMtx_stack_c::get();
-        for (int r = 0; r < 3; r++) {
-            for (int c = 0; c < 4; c++) {
-                reflMtx[q][r][c] = cur[r][c];
-            }
-        }
-    }
-    J3DShape::resetVcdVatCache();
-
-    bool wallQuad = !dusk::tphd_active() ||
-                    (mQuadCount <= 1 && mQuadBoxMax[0].y - mQuadBoxMin[0].y > 0.1f);
-    for (int i = 0; i < mModelCount; i++) {
-        Mtx& bm = mModels[i]->getBaseTRMtx();
-        cXyz pos(bm[0][3], bm[1][3], bm[2][3]);
-        int best = 0;
-        if (!wallQuad) {
-            const cXyz& eye = view->lookat.eye;
-            best = -1;
-            f32 bestDist = FLT_MAX;
-            for (int q = 0; q < mQuadCount; q++) {
-                if ((mQuadBoxMin[q].x <= pos.x || mQuadBoxMin[q].x <= eye.x) &&
-                    (mQuadBoxMin[q].z <= pos.z || mQuadBoxMin[q].z <= eye.z) &&
-                    (pos.x <= mQuadBoxMax[q].x || eye.x <= mQuadBoxMax[q].x) &&
-                    (pos.z <= mQuadBoxMax[q].z || eye.z <= mQuadBoxMax[q].z))
-                {
-                    f32 dist = dMirror_quadDist(pos, mQuadBoxMin[q], mQuadBoxMax[q]);
-                    if (dist < bestDist) {
-                        bestDist = dist;
-                        best = q;
-                    }
-                }
-            }
-            if (best < 0) {
-                continue;
-            }
-        }
-        modelDraw(mModels[i], reflMtx[best]);
-    }
-
-    j3dSys.reinitGX();
-    if (dusk::tphd_active()) {
-        mirrorZdraw(sp150, sp138, view->far_, minX, minY, maxX, maxY, maxZ);
-        GXSetScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
-    } else {
-        GXSetScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
-        mirrorZdraw(sp150, sp138, view->far_, minX, minY, maxX, maxY, maxZ);
-    }
-#else
    cXyz sp19C[5];

    Mtx sp16C;
@@ -773,7 +456,6 @@ void dMirror_packet_c::mainDraw() {
        GXSetScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
        mirrorZdraw(sp150, sp138, view->far_, var_f31, var_f30, var_f29, var_f28, var_f27);
    }
-#endif
 }

 void dMirror_packet_c::draw() {
@@ -854,36 +536,6 @@ int daMirror_c::create() {
        mPacket.getViewScale().set(-1.0f, 1.0f, 1.0f);
    } else {
        if (type == 1) {
-#if TARGET_PC
-            if (dusk::tphd_active() && strcmp(dComIfGp_getStartStageName(), "F_SP117") == 0 &&
-                dComIfGp_getStartStageRoomNo() == 2)
-            {
-                // HD const DAT_1002f070 (world-space floor rects) 
-                static const struct {
-                    f32 xMin, xMax, y, zMin, zMax;
-                } l_tot_quads[dMirror_packet_c::MAX_QUADS] = {
-                    {-1800.0f, 1800.0f, 999.0f, 747.0f, 5600.0f},
-                    {-670.0f, 670.0f, 999.0f, 5600.0f, 6400.0f},
-                    {-3530.0f, 3530.0f, 1526.0f, -8151.0f, -2014.0f},
-                    {-3530.0f, -1040.0f, 1526.0f, -2014.0f, -1089.0f},
-                    {1040.0f, 3530.0f, 1526.0f, -2014.0f, -1089.0f},
-                    {-700.0f, 700.0f, 2887.0f, -10700.0f, -8300.0f},
-                };
-                cXyz* q = mPacket.getQuad();
-                for (int i = 0; i < dMirror_packet_c::MAX_QUADS; i++) {
-                    q[i * 4 + 0].set(l_tot_quads[i].xMin, l_tot_quads[i].y, l_tot_quads[i].zMin);
-                    q[i * 4 + 1].set(l_tot_quads[i].xMax, l_tot_quads[i].y, l_tot_quads[i].zMin);
-                    q[i * 4 + 2].set(l_tot_quads[i].xMax, l_tot_quads[i].y, l_tot_quads[i].zMax);
-                    q[i * 4 + 3].set(l_tot_quads[i].xMin, l_tot_quads[i].y, l_tot_quads[i].zMax);
-                }
-                mPacket.mQuadCount = dMirror_packet_c::MAX_QUADS;
-                mPacket.getViewScale().set(1.0f, -1.0f, 1.0f);
-                m_myObj = this;
-                mPacket.calcMinMax();
-                eyePos.set(current.pos.x, current.pos.y, current.pos.z);
-                return cPhs_COMPLEATE_e;
-            }
-#endif
            scale *= 10.0f;
            mPacket.getViewScale().set(1.0, -1.0, 1.0);
        } else {
@@ -10,11 +10,8 @@
 #include <cstring>


-static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[DUSK_IF_ELSE(2, 1)] = {
+static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[1] = {
    {"", 0},
-#if TARGET_PC
-    {"DEFAULT_GETITEM", 0},
-#endif
 };

 static DUSK_CONST char* l_resNameList[2] = {
@@ -148,7 +145,7 @@ int daNpc_FairySeirei_c::Draw() {

 int daNpc_FairySeirei_c::isDelete() {
    int ret = 0;
-    if (IF_DUSK(mType != 4 &&) daNpcT_chkEvtBit(0x1F9) == false) {
+    if (daNpcT_chkEvtBit(0x1F9) == false) {
        ret = 1;
    }
    return ret;
@@ -362,15 +359,6 @@ int daNpc_FairySeirei_c::talk(int param_0) {
                }
                if (fopAcM_IsExecuting(mItemPartnerId)) {
                    mTalking = TRUE;
-
-                    #if TARGET_PC
-                    if (dusk::tphd_active() && getType() == 4) {
-                        mEvtNo = 1;
-                        field_0xe33 = true;
-                        mSpeakEvent = true;
-                    }
-                    #endif
-
                    evtChange();
                }
            } else {
@@ -6882,16 +6882,6 @@ static int daNpc_Ks_Delete(npc_ks_class* i_this) {
        i_this->model->stopZelAnime();
    }

-#if TARGET_PC
-    if (leader == i_this) {
-        leader = NULL;
-    }
-
-    if (saru_p[i_this->set_id] == i_this) {
-        saru_p[i_this->set_id] = NULL;
-    }
-#endif
-
    return 1;
 }

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

-#include "d/actor/d_a_alink.h"
-#include "dusk/tphd/LosTable.hpp"
-
 static DUSK_CONST char* l_arcName = "ef_Portal";

 static char const* l_clearEvName[9] = {
@@ -104,7 +101,7 @@ int daObjBossWarp_c::Create() {
    }
    mBossClearMapToolId = 0xff;

-    if ((!isFirst() || level == 8) IF_DUSK(&& !dusk::tphd::is_los_active())) {
+    if (!isFirst() || level == 8) {
        mBossWarpInEventId = dComIfGp_getEventManager().getEventIdx(this, "BOSS_WARPIN", 0xff);
        mBossWarpInMapToolId = 0xff;
        mAction = 3;
@@ -220,31 +217,6 @@ BOOL daObjBossWarp_c::checkDistance() {
 }

 int daObjBossWarp_c::execute() {
-#if TARGET_PC
-    if (dusk::tphd::is_los_active()) {
-        u8 sw = getSwNo();
-        if (sw == 0xff || fopAcM_isSwitch(this, sw)) {
-            if (mAction == ACT_WAIT) {
-                mAction = ACT_WAIT_WARP;
-            }
-
-            set_appear();
-
-            if (!dComIfGp_evmng_checkStartDemo()) {
-                field_0x595 = true;
-                field_0x620 = current.pos;
-            }
-
-            event_proc_call();
-
-            daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor();
-            if (field_0x595 && midna != NULL) {
-                midna->onTagWaitPos(&field_0x620);
-            }
-        }
-    }
-#endif
-
    if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
        u8 sw = getSwNo();
        if (sw == 0xff || fopAcM_isSwitch(this, sw)) {
@@ -504,14 +476,6 @@ int daObjBossWarp_c::demoProc() {
            disappear(0);
            break;
        case 3:  // SCENE_CHG
-            #if TARGET_PC
-            if (dusk::tphd::is_los_active()) {
-                // tphd sets some event flags here for bookkeeping, ignoring for now
-                daAlink_getAlinkActorClass()->mLosStickValue = -1.0f;
-                break;
-            }
-            #endif
-
            int scene;
            if (isFirst()) {
                scene = getSceneListNo();
@@ -572,11 +536,6 @@ int daObjBossWarp_c::demoProc() {
            break;
        case 6:  // WALK_TARGET1
            dComIfGp_evmng_setGoal(&current.pos);
-#if TARGET_PC
-            if (dusk::tphd::is_los_active()) {
-                daAlink_getAlinkActorClass()->mLosStickValue = 1.0f;
-            }
-#endif
            break;
        case 7:  // APPEAR_END
            break;
@@ -614,14 +573,6 @@ int daObjBossWarp_c::demoProc() {
        dComIfGp_evmng_cutEnd(mStaffId);
        break;
    case 3:  // SCENE_CHG
-#if TARGET_PC
-        if (dusk::tphd::is_los_active()) {
-            if (mCounter++ == 0) {
-                fopAcM_offDraw(this);
-                dComIfGp_event_remove();
-            }
-        }
-#endif
        break;
    case 4:  // STONE_FALL
        if (ystone != NULL) {
@@ -26,8 +26,6 @@
 daObjDrop_HIO_c l_HIO;
 #endif

-#include <dusk/ui/settings.hpp>
-
 static void* searchParentSub(void* pproc, void* pdata) {
    daObjDrop_c* pdrop = (daObjDrop_c*)pdata;
    fopAc_ac_c* pym = (fopAc_ac_c*)pproc;
@@ -105,17 +103,9 @@ void daObjDrop_c::dropGet() {
        dComIfGs_setLightDropNum(dComIfGp_getStartStageDarkArea(), num + 1);

        if (dComIfGp_getStartStageDarkArea() == 2 &&
-            #if TARGET_PC
-            ((dusk::tphd_active() &&
-                 dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()) == 11) ||
-                !dusk::tphd_active() &&
-                    dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()) == 15
-            ))
-            #else
            dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()) == 15)
-            #endif
        {
-            /* dSv_event_flag_c::F_0005 - Misc. - Gathered 15 Tears of Light in area 4 */
+            /* dSv_event_flag_c::F_0005 - Misc. - Gathered 14 Tears of Light in area 4 */
            dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[9]);
        }

@@ -6,10 +6,9 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep

 #include "d/actor/d_a_obj_lv8Lift.h"
-#include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_path.h"
-#include "dusk/tphd/LosTable.hpp"
+#include "d/d_bg_w.h"

 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
@@ -45,14 +44,14 @@ f32 const daL8Lift_c::mSpeed[16] = {
 };

 int daL8Lift_c::CreateHeap() {
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd::is_los_active() ? "L8LiftSt" : "L8Lift", "L8Lift"), 5);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L8Lift", 5);
    JUT_ASSERT(190, modelData != NULL);
    mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
    if (!mpModel) {
        return 0;
    }

-    int res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd::is_los_active() ? "L8LiftSt" : "L8Lift", "L8Lift"), 8),
+    int res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("L8Lift", 8),
        1, 0, 1.0f, 0, -1);
    JUT_ASSERT(207, res == 1);

@@ -64,9 +63,9 @@ static daL8Lift_HIO_c l_HIO;
 int daL8Lift_c::create() {
    fopAcM_ct(this, daL8Lift_c);

-    int phase_state = dComIfG_resLoad(&mPhase, DUSK_IF_ELSE(dusk::tphd::is_los_active() ? "L8LiftSt" : "L8Lift", "L8Lift"));
+    int phase_state = dComIfG_resLoad(&mPhase, "L8Lift");
    if (phase_state == cPhs_COMPLEATE_e) {
-        if (MoveBGCreate(DUSK_IF_ELSE(dusk::tphd::is_los_active() ? "L8LiftSt" : "L8Lift", "L8Lift"), 11, dBgS_MoveBGProc_TypicalRotY, DUSK_IF_ELSE(dusk::tphd::is_los_active() ? 0x1D40 : 0xD40, 0xd40) , NULL) == cPhs_ERROR_e) {
+        if (MoveBGCreate("L8Lift", 11, dBgS_MoveBGProc_TypicalRotY, 0xd40, NULL) == cPhs_ERROR_e) {
            return cPhs_ERROR_e;
        }

@@ -93,17 +92,8 @@ int daL8Lift_c::create() {
        
        if (mSwbit == 0xff) {
            mBtk.setFrame(mBtk.getEndFrame() - 1.0f);
-
-#if TARGET_PC
-            if (dusk::tphd::is_los_active()) {
-                mLightSet = 0;
-            } else
-#endif
-            {
-                mLightSet = 1;
-                dKy_plight_set(&mLight);
-            }
-
+            mLightSet = 1;
+            dKy_plight_set(&mLight);
            init_modeWaitInit();
        } else {
            mNoRideOffSwTimer = 0;
@@ -300,15 +290,8 @@ void daL8Lift_c::init_modeOnAnm() {
 void daL8Lift_c::modeOnAnm() {
    if (mBtk.play() == 1) {
        field_0x808 = 1;
-
-#if TARGET_PC
-      if (!dusk::tphd::is_los_active())
-#endif
-        {
-            mLightSet = 1;
-            dKy_plight_set(&mLight);
-        }
-
+        mLightSet = 1;
+        dKy_plight_set(&mLight);
        init_modeMoveWait();
    }
 }
@@ -445,28 +428,20 @@ int daL8Lift_c::Draw() {
    J3DMaterial* mpMatNode = modelData->getMaterialNodePointer(0);
    dComIfGd_setListDarkBG();

-#if TARGET_PC
-    if (dusk::tphd::is_los_active()) {
-        mDoExt_modelUpdateDL(mpModel);
-    } else
-#endif
-    {
-        if (mpMatNode->getTexGenBlock()->getTexMtx(1)) {
-            J3DTexMtxInfo* texMtxInfo = &mpMatNode->getTexGenBlock()->getTexMtx(1)->getTexMtxInfo();
-            if (texMtxInfo) {
-                Mtx mMtx58;
-                C_MTXLightOrtho(mMtx58, 100.0f, -100.0f, -100.0f, 100.0f, 1.0f, 1.0f, 0.0f, 0.0f);
-                mDoMtx_stack_c::XrotS(0x4000);
-                mDoMtx_stack_c::transM(-current.pos.x, -current.pos.y, -current.pos.z);
-                cMtx_concat(mMtx58, mDoMtx_stack_c::get(), texMtxInfo->mEffectMtx);
-            }
+    if (mpMatNode->getTexGenBlock()->getTexMtx(1)) {
+        J3DTexMtxInfo* texMtxInfo = &mpMatNode->getTexGenBlock()->getTexMtx(1)->getTexMtxInfo();
+        if (texMtxInfo) {
+            Mtx mMtx58;
+            C_MTXLightOrtho(mMtx58, 100.0f, -100.0f, -100.0f, 100.0f, 1.0f, 1.0f, 0.0f, 0.0f);
+            mDoMtx_stack_c::XrotS(0x4000);
+            mDoMtx_stack_c::transM(-current.pos.x, -current.pos.y, -current.pos.z);
+            cMtx_concat(mMtx58, mDoMtx_stack_c::get(), texMtxInfo->mEffectMtx);
        }
-
-        mBtk.entry(modelData);
-        mDoExt_modelUpdateDL(mpModel);
-        mBtk.remove(modelData);
    }

+    mBtk.entry(modelData);
+    mDoExt_modelUpdateDL(mpModel);
+    mBtk.remove(modelData);
    dComIfGd_setList();

    J3DGXColor* mColor = mpMatNode->getTevKColor(1);
@@ -478,7 +453,7 @@ int daL8Lift_c::Draw() {
 }

 int daL8Lift_c::Delete() {
-    dComIfG_resDelete(&mPhase, DUSK_IF_ELSE(dusk::tphd::is_los_active() ? "L8LiftSt" : "L8Lift", "L8Lift"));
+    dComIfG_resDelete(&mPhase, "L8Lift");
    if (mLightSet) {
        dKy_plight_cut(&mLight);
    }
@@ -9,19 +9,9 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"

-static DUSK_CONST char* l_resNameIdx[DUSK_IF_ELSE(10, 2)] = {
+static DUSK_CONST char* l_resNameIdx[2] = {
    "P_Rgate",
    "SDGate",
-#if TARGET_PC
-    "losGate1",
-    "SDGate",
-    "los_Maze",
-    "losGate5",
-    "losGate1",
-    "losGate2",
-    "losGate3",
-    "losGate4",
-#endif
 };

 daSwShutter_HIO_c::daSwShutter_HIO_c() {
@@ -46,20 +36,7 @@ void daSwShutter_c::setBaseMtx() {
    mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }

-static const int l_bmdIdx[DUSK_IF_ELSE(10, 2)] = {
-    4,
-    4,
-#if TARGET_PC
-    4,
-    4,
-    1,
-    4,
-    4,
-    4,
-    4,
-    4,
-#endif
-};
+static const int l_bmdIdx[2] = {4, 4};

 int daSwShutter_c::CreateHeap() {
    J3DModelData* modelData =
@@ -73,20 +50,7 @@ int daSwShutter_c::CreateHeap() {
    return 1;
 }

-static const int l_dzbIdx[DUSK_IF_ELSE(10, 2)] = {
-    7,
-    7,
-#if TARGET_PC
-    7,
-    7,
-    2,
-    7,
-    7,
-    7,
-    7,
-    7,
-#endif
-};
+static const int l_dzbIdx[2] = {7, 7};

 int daSwShutter_c::create() {
    fopAcM_ct(this, daSwShutter_c);
@@ -110,39 +74,9 @@ int daSwShutter_c::create() {
        field_0x5b0 = 0.0f;

        if (fopAcM_isSwitch(this, getSwBit())) {
-            #if TARGET_PC
-            if (dusk::tphd_active()) {
-                switch (getModelType()) {
-                case 4:
-                    current.pos.y -= -370.0f;
-                    break;
-                case 5:
-                    current.pos.y -= -450.0f;
-                    break;
-                case 9:
-                    current.pos.y -= -740.0f;
-                    break;
-                default:
-                    current.pos.y += -450.0f;
-                    break;
-                }
-
-                init_modeMoveDownEnd();
-            } else {
-                current.pos.y += -450.0f;
-                init_modeMoveDownEnd();
-            }
-            #else
            current.pos.y += -450.0f;
            init_modeMoveDownEnd();
-            #endif
        } else {
-            #if TARGET_PC
-            if (dusk::tphd_active() && getModelType() == 2) {
-                current.pos.y += -450.0f;
-            }
-            #endif
-
            mShakeRot.x = 0;
            mShakeRot.y = 0;
            mShakeRot.z = 0;
@@ -208,23 +142,10 @@ void daSwShutter_c::init_modeMoveDownInit() {
    mMaxAtten = l_HIO.mMaxAtten;
    mMinAtten = l_HIO.mMinAtten;

-#if TARGET_PC
-    if (dusk::tphd_active()) {
-        // TPHD: opening a Cave-of-Shadows shutter gate reveals the floor below
-        dStage_showLOSNextFloor(fopAcM_GetRoomNo(this));
-    }
-#endif
-
    if (mModelType == TYPE_SUBDAN_e) {
        dComIfGp_particle_set(0x8C73, &current.pos, &shape_angle, NULL);
        dComIfGp_particle_set(0x8C74, &current.pos, &shape_angle, NULL);
-    }
-#if TARGET_PC
-    else if (dusk::tphd_active() && (mModelType == 0 || mModelType == 3 || mModelType == 4 || mModelType == 5 || mModelType == 9)) {
-        mShakeStrength = 0.0f;
-    }
-#endif
-    else {
+    } else {
        dComIfGp_particle_set(0x8709, &current.pos, &shape_angle, NULL);
        dComIfGp_particle_set(0x870A, &current.pos, &shape_angle, NULL);
    }
@@ -242,16 +163,9 @@ void daSwShutter_c::modeMoveDownInit() {
 }

 void daSwShutter_c::init_modeMoveDown() {
-    #if TARGET_PC
-    if (dusk::tphd_active() && mModelType == 2) {
-        fopAcM_SetSpeedF(this, 13.6f);
-    } else
-    #endif
-    {
-        fopAcM_SetSpeedF(this, l_HIO.mInitSpeed);
-    }
+    fopAcM_SetSpeedF(this, l_HIO.mInitSpeed);

-    if (mModelType == TYPE_SUBDAN_e IF_DUSK(|| (dusk::tphd_active() && (mModelType != 4 && mModelType != 5 && mModelType != 9)))) {
+    if (mModelType == TYPE_SUBDAN_e) {
        dComIfGp_particle_set(0x8C77, &current.pos, &shape_angle, NULL);
    } else {
        dComIfGp_particle_set(0x870D, &current.pos, &shape_angle, NULL);
@@ -261,41 +175,11 @@ void daSwShutter_c::init_modeMoveDown() {
 }

 void daSwShutter_c::modeMoveDown() {
-#if TARGET_PC
-    if (dusk::tphd_active() && mModelType == 2) {
-        cLib_chaseF(&speedF, l_HIO.mInitSpeed, l_HIO.mAcceleration);
-    } else
-#endif
-    {
-        cLib_chaseF(&speedF, l_HIO.mMaxSpeed, l_HIO.mAcceleration);
-    }
-
-#if TARGET_PC
-    f32 target_dist;
-    if (dusk::tphd_active()) {
-        switch (getModelType()) {
-        case 4:
-            target_dist = cLib_addCalc(&current.pos.y, home.pos.y - -370.0f, 1.0f, fopAcM_GetSpeedF(this), 1.0f);
-            break;
-        case 5:
-            target_dist = cLib_addCalc(&current.pos.y, home.pos.y - -450.0f, 1.0f, fopAcM_GetSpeedF(this), 1.0f);
-            break;
-        case 9:
-            target_dist = cLib_addCalc(&current.pos.y, home.pos.y - -740.0f, 1.0f, fopAcM_GetSpeedF(this), 1.0f);
-            break;
-        default:
-            target_dist = cLib_addCalc(&current.pos.y, home.pos.y + -450.0f, 1.0f, fopAcM_GetSpeedF(this), 1.0f);
-            break;
-        }
-    } else {
-        target_dist = cLib_addCalc(&current.pos.y, home.pos.y + -450.0f, 1.0f, fopAcM_GetSpeedF(this), 1.0f);
-    }
-#else
+    cLib_chaseF(&speedF, l_HIO.mMaxSpeed, l_HIO.mAcceleration);
    f32 target_dist =
        cLib_addCalc(&current.pos.y, home.pos.y + -450.0f, 1.0f, fopAcM_GetSpeedF(this), 1.0f);
-#endif

-    if (mModelType == TYPE_SUBDAN_e IF_DUSK(|| (dusk::tphd_active() && (mModelType != 4 && mModelType != 5 && mModelType != 9)))) {
+    if (mModelType == TYPE_SUBDAN_e) {
        mEmitterID0 = dComIfGp_particle_set(mEmitterID0, 0x8C75, &current.pos, &shape_angle, NULL);
        mEmitterID1 = dComIfGp_particle_set(mEmitterID1, 0x8C76, &current.pos, &shape_angle, NULL);
    } else {
@@ -54,27 +54,14 @@ BOOL daObjSwpush::Act_c::solidHeapCB(fopAc_ac_c* a_this) {
    return static_cast<daObjSwpush::Act_c*>(a_this)->create_heap();
 }

-s16 const daObjSwpush::Act_c::M_bmd[DUSK_IF_ELSE(4, 3)] = {
-    BMDR_KBOTA_00, BMDR_S_LV3BOTA, BMDR_S_LV6BOTA,
-#if TARGET_PC
-    4
-#endif
-};
+s16 const daObjSwpush::Act_c::M_bmd[3] = {BMDR_KBOTA_00, BMDR_S_LV3BOTA, BMDR_S_LV6BOTA};

-s16 const daObjSwpush::Act_c::M_dzb[DUSK_IF_ELSE(4, 3)] = {
-    DZB_KBOTA_00, DZB_KBOTA2_00, DZB_KBOTA3_00,
-#if TARGET_PC
-    7
-#endif
-};
+s16 const daObjSwpush::Act_c::M_dzb[3] = {DZB_KBOTA_00, DZB_KBOTA2_00, DZB_KBOTA3_00};

-DUSK_CONST char* daObjSwpush::Act_c::M_arcname[DUSK_IF_ELSE(4, 3)] = {
+DUSK_CONST char* daObjSwpush::Act_c::M_arcname[3] = {
    "Kbota_00",
    "S_lv3bota",
    "S_lv6bota",
-#if TARGET_PC
-    "S_losbota",
-#endif
 };

 bool daObjSwpush::Act_c::create_heap() {
@@ -130,12 +117,7 @@ cPhs_Step daObjSwpush::Act_c::create_res_load() {
    return cPhs_COMPLEATE_e;
 }

-u32 const daObjSwpush::Act_c::M_heap_size[DUSK_IF_ELSE(4, 3)] = {
-    0x1000, 0x1000, 0x1000,
-#if TARGET_PC
-    0x2000,
-#endif
-};
+u32 const daObjSwpush::Act_c::M_heap_size[3] = {0x1000, 0x1000, 0x1000};

 daObjSwpush::Hio_c::Attr_c const daObjSwpush::Act_c::M_attr[5] = {
    {
@@ -371,41 +371,11 @@ JKRHeap* daPy_anmHeap_c::setAnimeHeap() {
 #include "dusk/dvd_asset.hpp"
 using GameVersion = dusk::version::GameVersion;
 static const u8* l_sightDL_get() { 
-#if DUSK_TPHD
-    if(dusk::tphd_active()) {
-        static u8 buf[0x89];
-        static bool _ = (
-            dusk::LoadRPXAsset(
-                buf,
-                0x1011a260,
-                0x89
-            ),
-            true
-        );
-        return buf;
-    }
-    else {
-        static u8 buf[0x89];
-        static bool _ = (
-            dusk::LoadDolAsset(
-                buf,
-                {
-                {GameVersion::GcnUsa, 0x803BA0C0},
-                {GameVersion::GcnPal, 0x803BBDA0},
-                {GameVersion::GcnJpn, 0x803B4220}
-                },
-                0x89
-            ),
-            true
-        );
-        return buf;
-    }
-#else
    static u8 buf[0x89];
    static bool _ = (
        dusk::LoadDolAsset(
            buf,
-            {
+{
            {GameVersion::GcnUsa, 0x803BA0C0},
            {GameVersion::GcnPal, 0x803BBDA0},
            {GameVersion::GcnJpn, 0x803B4220}
@@ -415,7 +385,6 @@ static const u8* l_sightDL_get() {
        true
    );
    return buf;
-#endif
 }
 #define l_sightDL (l_sightDL_get())
 #else
@@ -126,10 +126,6 @@ int daSwc00_c::execute() {
    case 1:
    case 2:
    case 7:
-#if TARGET_PC
-    case 10:  // HD Cave of Shadows region switch
-    case 11:
-#endif
    case 15:
        if (sw2 != 0xff && !fopAcM_isSwitch(this, sw2)) {
            return 1;
@@ -183,17 +179,7 @@ int daSwc00_c::execute() {
            field_0x584 = 1;
        }
        break;
-#if TARGET_PC
-    // HD Cave of Shadows region switch (CoS-controller bookkeeping omitted; not in this port)
-    case 10:
-    case 11:
-        if (hitCheck(this)) {
-            dComIfGs_onSwitch(sw1, fopAcM_GetRoomNo(this));
-            field_0x583 = 1;
-            field_0x584 = 1;
-        }
-        break;
-#endif
+    
    case 7:
    case 8:
        if (hitCheck(this)) {
@@ -101,7 +101,7 @@ void daTit_HIO_c::genMessage(JORMContext* mctx) {
 #endif

 int daTitle_c::CreateHeap() {
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 10);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 10);
    JUT_ASSERT(258, modelData);
    mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000285);

@@ -109,16 +109,16 @@ int daTitle_c::CreateHeap() {
        return 0;
    }

-    int res = mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 7), 1, 0, 2.0f, 0, -1, false);
+    int res = mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7), 1, 0, 2.0f, 0, -1, false);
    JUT_ASSERT(276, res == 1);

-    res = mBpk.init(modelData, (J3DAnmColor*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 13), 1, 0, 2.0f, 0, -1);
+    res = mBpk.init(modelData, (J3DAnmColor*)dComIfG_getObjectRes(l_arcName, 13), 1, 0, 2.0f, 0, -1);
    JUT_ASSERT(283, res == 1);

-    res = mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 16), 1, 0, 2.0f, 0, -1);
+    res = mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 16), 1, 0, 2.0f, 0, -1);
    JUT_ASSERT(290, res == 1);

-    res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 19), 1, 0, 2.0f, 0, -1);
+    res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19), 1, 0, 2.0f, 0, -1);
    JUT_ASSERT(297, res == 1);

    return 1;
@@ -132,7 +132,7 @@ static procFunc daTitleProc[6] = {
 int daTitle_c::create() {
    fopAcM_ct(this, daTitle_c);

-    int phase_state = dComIfG_resLoad(&mPhaseReq, DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName));
+    int phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName);
    if (phase_state != cPhs_COMPLEATE_e) {
        return phase_state;
    }
@@ -408,7 +408,7 @@ int daTitle_c::Draw() {
 int daTitle_c::Delete() {
    mDoHIO_DELETE_CHILD(g_daTitHIO.id);

-    dComIfG_resDelete(&mPhaseReq, DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName));
+    dComIfG_resDelete(&mPhaseReq, l_arcName);
    JKR_DELETE(mTitle.Scr);
    JKR_DELETE(field_0x600);

@@ -15,12 +15,6 @@ const u16 l_J_Ohana00_64TEX__height = 63;
 using GameVersion = dusk::version::GameVersion;
 static u8* l_J_Ohana00_64TEX_get() { static u8 buf[0x800]; static bool _ = (dusk::LoadArchivedRelAsset(buf, 'AMEM', "d_a_grass.rel", {{GameVersion::GcnUsa, 0x9060}, {GameVersion::GcnPal, 0x9060}}, 0x800), true); return buf; }
 #define l_J_Ohana00_64TEX (l_J_Ohana00_64TEX_get())
-
-// from d_grass.inc
-static MtxP get_model_mtx(Mtx modelMtx, Mtx storage);
-static void transform_positions(
-    const dusk::batch::LeafTemplate& tpl, const Vec* posArray, const Mtx mtx, Vec* xfPos);
-static void split_batch(u32& emitted, u32 vtxCount);
 #else
 #include "assets/l_J_Ohana00_64TEX.h"
 #endif
@@ -594,12 +588,6 @@ dFlower_packet_c::dFlower_packet_c() {
    GXInitTexObj(&mTexObj_l_J_Ohana01_64128_0419TEX, l_J_Ohana01_64128_0419TEX,
        l_J_Ohana01_64128_0419TEX__width + 1, l_J_Ohana01_64128_0419TEX__height + 1, GX_TF_CMPR, GX_MIRROR, GX_MIRROR, GX_FALSE
    );
-
-    dusk::batch::decode_leaf_template(l_J_hana00DL, 0x140, mTplHana00);
-    dusk::batch::decode_leaf_template(l_J_hana00_cDL, 0xC0, mTplHana00Cut);
-    dusk::batch::decode_leaf_template(l_J_hana01DL, 0x120, mTplHana01);
-    dusk::batch::decode_leaf_template(l_J_hana01_c_00DL, 0xC0, mTplHana01Cut00);
-    dusk::batch::decode_leaf_template(l_J_hana01_c_01DL, 0x120, mTplHana01Cut);
 #endif

    m_deleteRoom = &dFlower_packet_c::deleteRoom;
@@ -609,371 +597,6 @@ dFlower_packet_c::dFlower_packet_c() {
 #endif
 }

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

    J3DShape::resetVcdVatCache();
 }
-#endif

 void dFlower_packet_c::calc() {
    dFlower_anm_c* anm_p = getAnm();
@@ -512,366 +512,11 @@ dGrass_packet_c::dGrass_packet_c() {
    m_Mkusa_9q_cDL_size = 0xC0;
    field_0x1d714 = 0;

-#if TARGET_PC
-    dusk::batch::decode_leaf_template(mp_Mkusa_9q_DL, m_Mkusa_9q_DL_size, mTplKusa9q);
-    dusk::batch::decode_leaf_template(mp_Mkusa_9q_cDL, m_Mkusa_9q_cDL_size, mTplKusa9qCut);
-    dusk::batch::decode_leaf_template(l_M_TenGusaDL, 0xC0, mTplTengusa);
-#endif
-
    OS_REPORT("草群メモリ=%fＫ\n", 117.7734375f);
    
    m_deleteRoom = &dGrass_packet_c::deleteRoom;
 }

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

    J3DShape::resetVcdVatCache();
 }
-#endif

 void dGrass_packet_c::calc() {
    cXyz* temp_r29 = dKyw_get_wind_vec();
@@ -34,7 +34,6 @@
 #include "dusk/action_bindings.h"
 #include "dusk/mouse.h"
 #include "dusk/settings.h"
-#include "dusk/touch_camera.h"
 #include "imgui.h"
 #endif

@@ -7500,15 +7499,6 @@ static constexpr s16 FLYCAM_ROLL_SPEED = 256;
 static ImVec2 sFlyCamLastMousePos = {-1.f, -1.f};

 #if TARGET_PC
-static constexpr f32 TOUCH_CAMERA_CSTICK_EXIT_THRESHOLD = 0.05f;
-static bool sTouchFreeCameraActive = false;
-
-bool dCamera_c::isAimActive() {
-    auto* link = daAlink_getAlinkActorClass();
-    return link != nullptr && link->checkAimInputContext() &&
-           dComIfGp_checkCameraAttentionStatus(link->field_0x317c, 0x10);
-}
-
 bool dCamera_c::executeDebugFlyCam() {
    if (!dusk::getSettings().game.debugFlyCam) {
        if (mDebugFlyCam.initialized) {
@@ -7650,30 +7640,16 @@ void dCamera_c::deactivateDebugFlyCam() {
    mDebugFlyCam.initialized = false;
 }

-bool dCamera_c::freeCamera() {
-    f32 touchYawDp = 0.0f;
-    f32 touchPitchDp = 0.0f;
-    bool touchCameraMoved = false;
-    const bool touchControlsEnabled = dusk::getSettings().game.enableTouchControls;
-    if (touchControlsEnabled && !isAimActive()) {
-        touchCameraMoved = dusk::touch_camera::consume_delta(touchYawDp, touchPitchDp);
-    }
-    if (!touchControlsEnabled ||
-        mPadInfo.mCStick.mLastValue > TOUCH_CAMERA_CSTICK_EXIT_THRESHOLD)
-    {
-        sTouchFreeCameraActive = false;
-    }
-    if (touchCameraMoved) {
-        sTouchFreeCameraActive = true;
-    }
+bool dCamera_c::canUseFreeCam() {
+    return dusk::getSettings().game.freeCamera || dusk::getSettings().game.enableMouseCamera;
+}

-    const bool useFreeCamera = dusk::getSettings().game.freeCamera ||
-                               dusk::getSettings().game.enableMouseCamera || sTouchFreeCameraActive;
-    if (useFreeCamera && mGear == 1) {
+bool dCamera_c::freeCamera() {
+    if (canUseFreeCam() && mGear == 1) {
        mGear = 0;
    }

-    if (!useFreeCamera || mCamStyle == 70)
+    if (!canUseFreeCam() || mCamStyle == 70)
    {
        mCamParam.mManualMode = 0;
        return false;
@@ -7684,17 +7660,6 @@ bool dCamera_c::freeCamera() {
        mCamParam.freeYAngle = mViewCache.mDirection.mInclination.Degree();
    }

-    if (touchCameraMoved) {
-        mCamParam.mManualMode = 1;
-        const f32 yawInput = dusk::getSettings().game.invertCameraXAxis ? -touchYawDp : touchYawDp;
-        const f32 pitchInput =
-            touchPitchDp * (dusk::getSettings().game.invertCameraYAxis ? -1.0f : 1.0f);
-        mCamParam.freeXAngle += yawInput * dusk::getSettings().game.touchCameraXSensitivity *
-                                dusk::touch_camera::YAW_DEGREES_PER_DP;
-        mCamParam.freeYAngle += pitchInput * dusk::getSettings().game.touchCameraYSensitivity *
-                                dusk::touch_camera::PITCH_DEGREES_PER_DP;
-    }
-
    cXyz camMovement = {mPadInfo.mCStick.mLastPosX, mPadInfo.mCStick.mLastPosY, 0.0f};
    f32 magnitude = sqrt(mPadInfo.mCStick.mLastPosX * mPadInfo.mCStick.mLastPosX + mPadInfo.mCStick.mLastPosY * mPadInfo.mCStick.mLastPosY);

@@ -11394,7 +11359,7 @@ static int camera_execute(camera_process_class* i_this) {
                const auto target = get_target_trim_height(i_this);
                const auto step = dusk::frame_interp::get_interpolation_step();
                const auto cur = camera->TrimHeight();
-                const auto prev = (4.0f * cur - target) / 3.0f;
+                const auto prev = (4.0f * cur - target) / 3.0f; 
                const auto trim_height = prev + (cur - prev) * step;

                widezoom_correction(i_this, trim_height);
@@ -25,10 +25,8 @@
 #include "m_Do/m_Do_graphic.h"
 #include <cstdio>
 #include <cstring>
-#include <dusk/ui/settings.hpp>

 #include "dusk/string.hpp"
-#include "dusk/tphd/LosTable.hpp"

 void dComIfG_play_c::ct() {
    mWindowNum = 0;
@@ -2575,14 +2573,7 @@ u8 dComIfG_getNowCalcRegion() {

 bool dComIfGp_isLightDropMapVisible() {
    for (int i = 0; i < 3; i++) {
-        #if TARGET_PC
-        if (dComIfGs_isLightDropGetFlag(i) != FALSE && 
-            ((dusk::tphd_active() && dComIfGs_getLightDropNum(i) < 12) ||
-            (!dusk::tphd_active() && dComIfGs_getLightDropNum(i) < 16)))
-        {
-        #else
        if (dComIfGs_isLightDropGetFlag(i) != FALSE && dComIfGs_getLightDropNum(i) < 16) {
-        #endif
            return true;
        }
    }
@@ -2864,12 +2855,6 @@ BOOL dComIfGs_Wolf_Change_Check() {
        is_wolf = true;
    }

-#if TARGET_PC
-    if (dusk::tphd::is_los_active()) {
-        is_wolf = true;
-    }
-#endif
-
    OS_REPORT("dComIfGs_isSaveSwitch 12[%x] 13[%x]\n", dComIfGs_isSaveSwitch(12), dComIfGs_isSaveSwitch(13));

    // Stage is Hyrule Field and Room is Eldin Gorge Entrance
@@ -1138,14 +1138,7 @@ void dDlst_shadowReal_c::draw() {
    {
        GXLoadTexMtxImm(mReceiverProjMtx, GX_TEXMTX0, GX_MTX3x4);
    }
-
-#ifdef DUSK_TPHD
-    GX2SetPolygonOffset(-10.0f, -10.0f, -10.0f, -10.0f, 0);
-#endif
    mShadowRealPoly.draw();
-#ifdef DUSK_TPHD
-    GX2SetPolygonOffset(0.0f, 0.0f, 0.0f, 0.0f, 0);
-#endif
 }

 static int psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int param_2,
@@ -23,22 +23,8 @@
 #include "m_Do/m_Do_graphic.h"
 #include <cstring>

-#if TARGET_PC
-#include "dusk/menu_pointer.h"
 #include "dusk/string.hpp"

-namespace {
-constexpr u8 pointer_target(u8 group, u8 index) noexcept {
-    return static_cast<u8>((group << 4) | (index & 0x0F));
-}
-
-constexpr u8 s_pointerDataSelectTarget = 0;
-constexpr u8 s_pointerMenuSelectTarget = 1;
-constexpr u8 s_pointerCopySelectTarget = 2;
-constexpr u8 s_pointerYesNoSelectTarget = 3;
-}  // namespace
-#endif
-
 static s32 SelStartFrameTbl[3] = {
    59,
    99,
@@ -770,143 +756,8 @@ void dFile_select_c::dataSelectInit() {
    }
 }

-#if TARGET_PC
-bool dFile_select_c::pointerDataSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 3; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mSelFilePanes[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked = dusk::menu_pointer::consume_click();
-        if (mSelectNum != i) {
-            mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, NULL, 0, 0);
-            mLastSelectNum = mSelectNum;
-            mSelectNum = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::FileSelect,
-                    pointer_target(s_pointerDataSelectTarget, i));
-            }
-            dataSelectAnmSet();
-            mDataSelProc = DATASELPROC_DATA_SELECT_MOVE_ANIME;
-            return true;
-        }
-        if (clicked) {
-            dataSelectStart();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool dFile_select_c::pointerMenuSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 3; ++i) {
-        if (!dusk::menu_pointer::hit_pane(m3mSelPane[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked = dusk::menu_pointer::consume_click();
-        if (!mIsDataNew[mSelectNum] && mSelectMenuNum != i) {
-            mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0);
-            mLastSelectMenuNum = mSelectMenuNum;
-            mSelectMenuNum = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::FileSelect,
-                    pointer_target(s_pointerMenuSelectTarget, i));
-            }
-            menuSelectAnmSet();
-            mDataSelProc = DATASELPROC_MENU_SELECT_MOVE_ANM;
-            return true;
-        }
-        if (clicked) {
-            menuSelectStart();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool dFile_select_c::pointerCopyDataToSelect() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 2; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mCpSelPane[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked = dusk::menu_pointer::consume_click();
-        if (field_0x026b != i) {
-            mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, NULL, 0, 0);
-            field_0x026c = field_0x026b;
-            field_0x026b = i;
-            if (clicked) {
-                dusk::menu_pointer::defer_activation(
-                    dusk::menu_pointer::Context::FileSelect,
-                    pointer_target(s_pointerCopySelectTarget, i));
-            }
-            copyDataToSelectMoveAnmSet();
-            mDataSelProc = DATASELPROC_COPY_DATA_TO_SELECT_MOVE_ANM;
-            return true;
-        }
-        if (clicked) {
-            copyDataToSelectStart();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool dFile_select_c::pointerYesNoSelect(bool errorSelect) {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    for (u8 i = 0; i < 2; ++i) {
-        if (!dusk::menu_pointer::hit_pane(mYnSelPane[i], 8.0f)) {
-            continue;
-        }
-        const bool clicked =
-            (!errorSelect || field_0x0268 == i) && dusk::menu_pointer::consume_click();
-        if (field_0x0268 != i) {
-            field_0x0269 = field_0x0268;
-            field_0x0268 = i;
-            if (errorSelect) {
-                errCurMove(0);
-                return false;
-            } else {
-                mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0);
-                if (clicked) {
-                    dusk::menu_pointer::defer_activation(
-                        dusk::menu_pointer::Context::FileSelect,
-                        pointer_target(s_pointerYesNoSelectTarget, i));
-                }
-                yesnoSelectAnmSet();
-                mDataSelProc = DATASELPROC_YES_NO_CURSOR_MOVE_ANM;
-                return true;
-            }
-        }
-        if (clicked) {
-            if (errorSelect) {
-                if (field_0x0268 != 0) {
-                    mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0);
-                } else {
-                    mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, 0, 0, 0);
-                }
-                mSelIcon->setAlphaRate(0.0f);
-            } else {
-                yesNoSelectStart();
-            }
-            return true;
-        }
-    }
-    return false;
-}
-#endif
-
 // handles switching between quest logs
 void dFile_select_c::dataSelect() {
-#if TARGET_PC
-    if (pointerDataSelect()) {
-        return;
-    }
-#endif
-
    stick->checkTrigger();

    // If A or Start was pressed
@@ -950,9 +801,6 @@ static u16 msgTbl[3] = {
 };

 void dFile_select_c::dataSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
    mSelIcon->setAlphaRate(0.0f);

    if (mIsNoData[mSelectNum]) {
@@ -1101,16 +949,6 @@ void dFile_select_c::dataSelectAnmSet() {
 }

 void dFile_select_c::dataSelectMoveAnime() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (mSelectNum != 0xFF && dusk::menu_pointer::hit_pane(mSelFilePanes[mSelectNum], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerDataSelectTarget, mSelectNum));
-    }
-#endif
    bool iVar7 = true;
    bool iVar6 = true;
    bool bVar1 = true;
@@ -1159,14 +997,6 @@ void dFile_select_c::dataSelectMoveAnime() {
            mSelFilePanes[mLastSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
        }

-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerDataSelectTarget, mSelectNum))) {
-            dataSelectStart();
-            return;
-        }
-#endif
        mDataSelProc = DATASELPROC_DATA_SELECT;
    }
 }
@@ -1331,12 +1161,6 @@ void dFile_select_c::selectDataOpenEraseMove() {

 // Handles selecting between copy / start / delete menus in quest log
 void dFile_select_c::menuSelect() {
-#if TARGET_PC
-    if (pointerMenuSelect()) {
-        return;
-    }
-#endif
-
    stick->checkTrigger();

    // if a was pressed, do the menu selection process
@@ -1367,9 +1191,6 @@ void dFile_select_c::menuSelect() {

 // Handles copy / start / delete actions depending on which menu is selected from menuSelect
 void dFile_select_c::menuSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
    #if TARGET_PC
    if (!dusk::getSettings().game.hideTvSettingsScreen || mSelectMenuNum != 1) {
        mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
@@ -1491,17 +1312,6 @@ void dFile_select_c::menuSelectAnmSet() {
 }

 void dFile_select_c::menuSelectMoveAnm() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (mSelectMenuNum != 0xFF &&
-        dusk::menu_pointer::hit_pane(m3mSelPane[mSelectMenuNum], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerMenuSelectTarget, mSelectMenuNum));
-    }
-#endif
    bool tmp1 = true;

    if (mSelectMenuNum != 0xFF &&
@@ -1559,14 +1369,6 @@ void dFile_select_c::menuSelectMoveAnm() {
            m3mSelPane[mLastSelectMenuNum]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
        }

-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerMenuSelectTarget, mSelectMenuNum))) {
-            menuSelectStart();
-            return;
-        }
-#endif
        mDataSelProc = DATASELPROC_MENU_SELECT;
    }
 }
@@ -1896,12 +1698,6 @@ void dFile_select_c::setSaveDataForCopySel() {
 }

 void dFile_select_c::copyDataToSelect() {
-#if TARGET_PC
-    if (pointerCopyDataToSelect()) {
-        return;
-    }
-#endif
-
    stick->checkTrigger();

    if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -1926,9 +1722,6 @@ void dFile_select_c::copyDataToSelect() {
 }

 void dFile_select_c::copyDataToSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
    mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);

    mCpDataToNum = getCptoNum(field_0x026b);
@@ -1994,17 +1787,6 @@ void dFile_select_c::copyDataToSelectMoveAnmSet() {
 }

 void dFile_select_c::copyDataToSelectMoveAnm() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (field_0x026b != 0xFF &&
-        dusk::menu_pointer::hit_pane(mCpSelPane[field_0x026b], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerCopySelectTarget, field_0x026b));
-    }
-#endif
    bool iVar7 = true;
    bool iVar6 = true;
    bool bVar1 = true;
@@ -2054,14 +1836,6 @@ void dFile_select_c::copyDataToSelectMoveAnm() {
            mSelIcon2->setAlphaRate(1.0f);
        }

-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerCopySelectTarget, field_0x026b))) {
-            copyDataToSelectStart();
-            return;
-        }
-#endif
        mDataSelProc = DATASELPROC_COPY_DATA_TO_SELECT;
    }
 }
@@ -2331,12 +2105,6 @@ void dFile_select_c::yesnoCursorShow() {
 }

 void dFile_select_c::YesNoSelect() {
-#if TARGET_PC
-    if (pointerYesNoSelect(false)) {
-        return;
-    }
-#endif
-
    stick->checkTrigger();

    if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -2361,9 +2129,6 @@ void dFile_select_c::YesNoSelect() {
 }

 void dFile_select_c::yesNoSelectStart() {
-#if TARGET_PC
-    dusk::menu_pointer::clear_deferred_activation(dusk::menu_pointer::Context::FileSelect);
-#endif
    if (field_0x0268 != 0) {
        mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
        field_0x03b1 = 1;
@@ -2519,29 +2284,10 @@ void dFile_select_c::YesNoCancelMove() {
 }

 void dFile_select_c::yesNoCursorMoveAnm() {
-#if TARGET_PC
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::FileSelect);
-    if (field_0x0268 != 0xFF &&
-        dusk::menu_pointer::hit_pane(mYnSelPane[field_0x0268], 8.0f) &&
-        dusk::menu_pointer::consume_click())
-    {
-        dusk::menu_pointer::defer_activation(
-            dusk::menu_pointer::Context::FileSelect,
-            pointer_target(s_pointerYesNoSelectTarget, field_0x0268));
-    }
-#endif
    bool isYnSelMove = yesnoSelectMoveAnm();
    bool isYnWakuAlpha = yesnoWakuAlpahAnm(field_0x0269);
    if (isYnSelMove == true && isYnWakuAlpha == true) {
        yesnoCursorShow();
-#if TARGET_PC
-        if (dusk::menu_pointer::consume_deferred_activation(
-                dusk::menu_pointer::Context::FileSelect,
-                pointer_target(s_pointerYesNoSelectTarget, field_0x0268))) {
-            yesNoSelectStart();
-            return;
-        }
-#endif
        mDataSelProc = DATASELPROC_YES_NO_SELECT;
    }
 }
@@ -4492,11 +4238,6 @@ static MemCardCheckFuncT MemCardCheckProc[] = {
    &dFile_select_c::MemCardErrYesNoCursorMoveAnm,
    &dFile_select_c::MemCardSaveDataClear,

-#if TARGET_PC
-    &dFile_select_c::MemCardAutoMakeGameFile,
-    &dFile_select_c::MemCardAutoMakeGameFileErrWait,
-#endif
-
    #if PLATFORM_WII || PLATFORM_SHIELD
    &dFile_select_c::nandStatCheck,
    &dFile_select_c::gameFileInitSel,
@@ -4580,33 +4321,11 @@ void dFile_select_c::MemCardStatCheck() {
        mDoMemCd_Load();
        mCardCheckProc = MEMCARDCHECKPROC_LOAD_WAIT;
        break;
-#if TARGET_PC
-    case 1: { // no save file
-        if (dusk::getSettings().game.instantSaves) {
-            field_0x03b1 = 1;
-            setInitSaveData();
-            dataSave();
-            mCardCheckProc = MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE;
-        } else {
-            errDispInitSet(22, 0);
-            field_0x0280 = true;
-            mNextCardCheckProc = MEMCARDCHECKPROC_MAKE_GAMEFILE_SEL;
-        }
-        break;
-    }
-    case 4: // card is writing
-        if (dusk::getSettings().game.instantSaves) {
-            field_0x03b1 = 1;
-            mCardCheckProc = MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE;
-        }
-        break;
-#else
    case 1:
        errDispInitSet(22, 0);
        field_0x0280 = true;
        mNextCardCheckProc = MEMCARDCHECKPROC_MAKE_GAMEFILE_SEL;
        break;
-#endif
    }
 #else
    switch (status) {
@@ -5312,33 +5031,6 @@ void dFile_select_c::MemCardMakeGameFileCheck() {
    }
 }

-#if TARGET_PC
-void dFile_select_c::MemCardAutoMakeGameFile() {
-    field_0x03b4 = mDoMemCd_SaveSync();
-    if (field_0x03b4 == 0) {
-        return;
-    }
-
-    field_0x03b1 = 0;
-    if (field_0x03b4 == 1) {
-        mDoMemCd_Load();
-        mCardCheckProc = MEMCARDCHECKPROC_LOAD_WAIT;
-    } else {
-        errDispInitSet(0x1A, 0);
-        field_0x0280 = false;
-        mWindowCloseMsgDispCb = NULL;
-        mKeyWaitMsgDispCb = NULL;
-        mNextCardCheckProc = MEMCARDCHECKPROC_AUTO_MAKE_GAMEFILE_ERR_WAIT;
-    }
-}
-
-void dFile_select_c::MemCardAutoMakeGameFileErrWait() {
-    mNextCardCheckProc = MEMCARDCHECKPROC_STAT_CHECK;
-    mKeyWaitCardCheckProc = MEMCARDCHECKPROC_MSG_WINDOW_CLOSE;
-    mCardCheckProc = MEMCARDCHECKPROC_ERRMSG_WAIT_KEY;
-}
-#endif
-
 #if PLATFORM_WII || PLATFORM_SHIELD
 void dFile_select_c::gameFileInitSel() {
    if (errYesNoSelect() != 0) {
@@ -5492,12 +5184,6 @@ void dFile_select_c::MemCardMsgWindowClose() {

 bool dFile_select_c::errYesNoSelect() {
    bool rv = false;
-#if TARGET_PC
-    if (pointerYesNoSelect(true)) {
-        return true;
-    }
-#endif
-
    stick->checkTrigger();

    if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -229,7 +229,7 @@ static void (*item_func_ptr[256])() = {
    item_func_F_MAYFLY,
    item_func_noentry,
    item_func_noentry,
-    DUSK_IF_ELSE(item_func_WALLET_LV4, item_func_noentry),
+    item_func_noentry,
    item_func_noentry,
    item_func_noentry,
    item_func_noentry,
@@ -2187,11 +2187,4 @@ int addBombCount(u8 i_bombType, u8 i_addNum) {
    return i_addNum;
 }

-#if TARGET_PC
-// HD item functions
-void item_func_WALLET_LV4() {
-    dComIfGs_setWalletSize(3);
-}
-#endif
-
 u8* dEnemyItem_c::mData;
@@ -221,11 +221,7 @@ dItem_itemResource dItem_data::item_resource[] = {
    {"O_gD_kagm", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0031, 0x50, 0x0000},
    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
-#if TARGET_PC
-    {"O_gD_puL4", 0x0001,-0x0001,-0x0001, -0x0001,-0x0001, -0x1, -0x1, 0x00AF, 0x26, 0x0251},
-#else
    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
-#endif
    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
@@ -1213,10 +1213,6 @@ void dMap_c::changeTextureSize(int param_1, int param_2, int param_3) {
    JUT_ASSERT(2672, mImage_p != NULL);
    JUT_ASSERT(2673, mResTIMG != NULL);

-#if TARGET_PC
-    GXDestroyCopyTex(mImage_p);
-#endif
-
    mTexSizeX = param_1 >> param_3;
    mTexSizeY = param_2 >> param_3;

@@ -1230,24 +1226,6 @@ void dMap_c::changeTextureSize(int param_1, int param_2, int param_3) {
 }
 #endif

-#if TARGET_PC
-bool dMap_c::refreshTextureSize() {
-    JUT_ASSERT(2688, mImage_p != NULL);
-    JUT_ASSERT(2689, mResTIMG != NULL);
-
-    const u16 oldWidth = mResTIMG->width;
-    const u16 oldHeight = mResTIMG->height;
-    makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33);
-
-    if (mResTIMG->width == oldWidth && mResTIMG->height == oldHeight) {
-        return false;
-    }
-
-    GXDestroyCopyTex(mImage_p);
-    return true;
-}
-#endif
-
 void dMap_c::_remove() {
    if (mImage_p != NULL) {
 #if TARGET_PC
@@ -15,49 +15,32 @@
 #include <cstring>

 #ifdef TARGET_PC
-#include "dusk/settings.h"
-#include "m_Do/m_Do_graphic.h"
-#include <dolphin/gx/GXAurora.h>
-#include <aurora/math.hpp>
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <functional>
-#include <limits>
-#include <numbers>
 #include <span>
+#include <numbers>
+#include <array>

-constexpr u16 kMapIconResolutionMultiplier = 4;
-constexpr u16 kMapImageSide = 16 * kMapIconResolutionMultiplier;
+constexpr u16 kPreferredMapResolutionMultiplier = 1;
+constexpr u32 kMaxMapRenderPixels = 2048 * 2048;
+constexpr u16 kMapImageSide = 16 * kPreferredMapResolutionMultiplier;
 constexpr u32 kMapImageTotalPixels = kMapImageSide * kMapImageSide;

 typedef std::function<u8(size_t, size_t)> PaintI8Fn;

-u16 scaled_map_axis(u16 value, f32 scale) {
-    const auto scaledValue =
-        static_cast<u32>(std::max(1.0f, std::round(static_cast<f32>(value) * scale)));
-    return static_cast<u16>(std::min<u32>(scaledValue, std::numeric_limits<u16>::max()));
-}
-
-aurora::Vec2<u16> map_render_size_for(u16 width, u16 height) {
-    if (width == 0 || height == 0) {
-        return {width, height};
+u16 map_resolution_multiplier(u16 width, u16 height) {
+    const u32 basePixels = static_cast<u32>(width) * height;
+    if (basePixels == 0) {
+        return 1;
    }

-    u32 renderWidth = 0;
-    u32 renderHeight = 0;
-    AuroraGetRenderSize(&renderWidth, &renderHeight);
-
-    const f32 logicalWidth = std::max(mDoGph_gInf_c::getWidthF(), 1.0f);
-    const f32 logicalHeight = std::max(mDoGph_gInf_c::getHeightF(), 1.0f);
-    const f32 irScaleX = renderWidth > 0 ? static_cast<f32>(renderWidth) / logicalWidth : 1.0f;
-    const f32 irScaleY = renderHeight > 0 ? static_cast<f32>(renderHeight) / logicalHeight : 1.0f;
-    const f32 hudScale = std::clamp(dusk::getSettings().game.hudScale.getValue(), 0.5f, 2.0f);
-    return {
-        scaled_map_axis(width, irScaleX * hudScale),
-        scaled_map_axis(height, irScaleY * hudScale),
-    };
+    u16 scale = kPreferredMapResolutionMultiplier;
+    while (scale > 1) {
+        const u32 scalePixels = static_cast<u32>(scale) * scale;
+        if (basePixels <= kMaxMapRenderPixels / scalePixels) {
+            break;
+        }
+        scale--;
+    }
+    return scale;
 }

 void paint_i8(std::span<u8> dst, size_t width, PaintI8Fn paint) {
@@ -513,9 +496,9 @@ void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p
    p_image->format = GX_TF_C8;
    p_image->alphaEnabled = 2;
 #ifdef TARGET_PC
-    const auto [rw, rh] = map_render_size_for(width, height);
-    p_image->width = rw;
-    p_image->height = rh;
+    const u16 scale = map_resolution_multiplier(width, height);
+    p_image->width = width * scale;
+    p_image->height = height * scale;
 #else
    p_image->width = width;
    p_image->height = height;
@@ -598,14 +581,16 @@ void dRenderingFDAmap_c::drawBack() const {

 void dRenderingFDAmap_c::preRenderingMap() {
 #ifdef TARGET_PC
-    const auto [rw, rh] = map_render_size_for(mTexWidth, mTexHeight);
-    GXCreateFrameBuffer(rw, rh);
+    const u16 scale = map_resolution_multiplier(mTexWidth, mTexHeight);
+    const u16 w = mTexWidth * scale;
+    const u16 h = mTexHeight * scale;
+    GXCreateFrameBuffer(w, h);
    // Set logical viewport dimensions
    GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
    GXSetScissor(0, 0, mTexWidth, mTexHeight);
    // Set render viewport dimensions
-    GXSetViewportRender(0.0f, 0.0f, rw, rh, 0.0f, 1.0f);
-    GXSetScissorRender(0, 0, rw, rh);
+    GXSetViewportRender(0.0f, 0.0f, w, h, 0.0f, 1.0f);
+    GXSetScissorRender(0, 0, w, h);
 #else
    GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
    GXSetScissor(0, 0, mTexWidth, mTexHeight);
@@ -643,9 +628,11 @@ void dRenderingFDAmap_c::preRenderingMap() {
 void dRenderingFDAmap_c::postRenderingMap() {
    GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL);
 #ifdef TARGET_PC
-    const auto [rw, rh] = map_render_size_for(mTexWidth, mTexHeight);
-    GXSetTexCopySrc(0, 0, rw, rh);
-    GXSetTexCopyDst(rw, rh, GX_CTF_R8, GX_FALSE);
+    const u16 scale = map_resolution_multiplier(mTexWidth, mTexHeight);
+    const u16 w = mTexWidth * scale;
+    const u16 h = mTexHeight * scale;
+    GXSetTexCopySrc(0, 0, w, h);
+    GXSetTexCopyDst(w, h, GX_CTF_R8, GX_FALSE);
    GXCopyTex(field_0x4, GX_TRUE);
    GXRestoreFrameBuffer();
 #else
@@ -36,10 +36,6 @@
 #include "d/d_menu_window.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"

-#if TARGET_PC
-#include "dusk/menu_pointer.h"
-#endif
-
 typedef void (dMenu_Collect2D_c::*initFunc)();
 static DUSK_CONSTEXPR initFunc init[] = {
    &dMenu_Collect2D_c::wait_init,          &dMenu_Collect2D_c::save_open_init,
@@ -689,8 +685,6 @@ void dMenu_Collect2D_c::screenSet() {
        field_0x184[0][3] = 0x199;
    } else if (dComIfGs_getWalletSize() == BIG_WALLET) {
        field_0x184[0][3] = 0x19a;
-    } if (dusk::tphd_active() && dComIfGs_getWalletSize() == 3) {
-        field_0x184[0][3] = 0x19c;
    } else {
        field_0x184[0][3] = 0x19b;
    }
@@ -1792,12 +1786,6 @@ void dMenu_Collect2D_c::wait_init() {
 }

 void dMenu_Collect2D_c::wait_proc() {
-#if TARGET_PC
-    if (pointerWait()) {
-        return;
-    }
-#endif
-
    if (dMw_A_TRIGGER()) {
        if (mCursorX == 0 && mCursorY == 5) {
            if (mDoGph_gInf_c::getFader()->mStatus == 1) {
@@ -1899,87 +1887,6 @@ void dMenu_Collect2D_c::wait_proc() {
    }
 }

-#if TARGET_PC
-void dMenu_Collect2D_c::pointerActivateCurrent() {
-    if (mCursorX == 0 && mCursorY == 5) {
-        if (mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 1;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            dMeter2Info_set2DVibrationM();
-        }
-    } else if (mCursorX == 1 && mCursorY == 5) {
-        if (mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 2;
-            Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
-                                     -1.0f, 0);
-            dMeter2Info_set2DVibrationM();
-        }
-    } else if (mCursorX == 3 && mCursorY == 4) {
-        if (field_0x22d[3][4] != 0 && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 3;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (mCursorX == 2 && mCursorY == 4) {
-        if (isFishIconVisible() && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 4;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (mCursorX == 3 && mCursorY == 3) {
-        if (isSkillIconVisible() && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 5;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (mCursorX == 2 && mCursorY == 3) {
-        if (isInsectIconVisible() && mDoGph_gInf_c::getFader()->mStatus == 1) {
-            mSubWindowOpenCheck = 6;
-            dMeter2Info_set2DVibration();
-        }
-    } else if (field_0x22d[mCursorX][mCursorY] != 0 && !mIsWolf) {
-        if ((mCursorX >= 3 && mCursorX <= 4) || (mCursorX == 5 && mCursorY == 2)) {
-            u8 cursorY = mCursorY;
-            if (cursorY == 0) {
-                if (daPy_getPlayerActorClass()->getSwordChangeWaitTimer() == 0) {
-                    changeSword();
-                }
-            } else if (cursorY == 1) {
-                if (daPy_getPlayerActorClass()->getShieldChangeWaitTimer() == 0) {
-                    changeShield();
-                }
-            } else if (cursorY == 2 &&
-                       daPy_getPlayerActorClass()->getClothesChangeWaitTimer() == 0)
-            {
-                changeClothe();
-            }
-        }
-    }
-}
-
-bool dMenu_Collect2D_c::pointerWait() {
-    dusk::menu_pointer::begin_context(dusk::menu_pointer::Context::Collection);
-    for (u8 y = 0; y < 6; ++y) {
-        for (u8 x = 0; x < 7; ++x) {
-            if (getItemTag(x, y, true) == 0 || !dusk::menu_pointer::hit_pane(mpSelPm[x][y], 8.0f)) {
-                continue;
-            }
-            if (mCursorX != x || mCursorY != y) {
-                mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0);
-                mCursorX = x;
-                mCursorY = y;
-                cursorPosSet();
-                setItemNameString(mCursorX, mCursorY);
-            }
-            if (dusk::menu_pointer::consume_click()) {
-                pointerActivateCurrent();
-                return true;
-            }
-            return false;
-        }
-    }
-    return false;
-}
-#endif
-

 void dMenu_Collect2D_c::save_open_init() {
    JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
--- a/Show More
+++ b/Show More