added trace hooks from pmdm

Taskfile.yml

@@ -1,5 +1,11 @@
 version: '3'
 
+env:
+  # can be overriden in .env
+  DEBUG_ADDR: 192.168.0.161:5001
+  CONSOLE_ADDR: 192.168.0.161:5000
+dotenv: [".env"]
+
 includes:
   app:
     taskfile: ./app

research/trace-view/.gitignore

@@ -1 +1 @@
-#*.json
+*.json

research/trace/Taskfile.yml

@@ -1,11 +1,5 @@
 version: '3'
 
-env:
-  # can be overriden in .env
-  CONSOLE_ADDR: 192.168.0.161:5000
-  DEBUG_ADDR: 192.168.0.161:5001
-dotenv: [".env"]
-
 tasks:
   libs:
     desc: Pull the libs (local modifications will be lost)
@@ -37,6 +31,7 @@ tasks:
       - git clone --branch dev https://github.com/Pistonight/nnheaders libs/nnheaders
 
   build:
+    aliases: [b]
     cmds:
       - megaton build
 

research/trace/src/hooks.cpp

@@ -0,0 +1,275 @@
+#include <megaton/hook.h>
+
+#include "hooks.hpp"
+#include "reporter.hpp"
+#define private public
+#include <Game/UI/uiPauseMenuDataMgr.h>
+#include <Game/Actor/actWeapon.h>
+#undef private
+
+using namespace uking::ui;
+using namespace uking::act;
+namespace sead {
+class CriticalSection;
+}
+
+namespace botw::ist::trace {
+
+//////// Pmdm Init
+namespace pmdm {
+
+static sead::CriticalSection* pmdm_mutex = nullptr;
+
+struct hook_trampoline_(createInstance) {
+    target_offset_(0x0096B1CC)
+    static PauseMenuDataMgr* call(void* heap) {
+        auto p = call_original(heap);
+        pmdm_mutex = &p->mCritSection;
+        current_reporter().send("pmdm::createInstance");
+        return p;
+    }
+};
+
+}
+
+//////// sead::CriticalSection
+namespace seadcs {
+struct hook_trampoline_(lock) {
+    target_offset_(0x00B1898C)
+    static void call(sead::CriticalSection* _this) {
+        if (_this == pmdm::pmdm_mutex) {
+            auto& reporter = current_reporter();
+            if (!reporter.is_top()) {
+                reporter.send("pmdm::(mutex lock)");
+            }
+        }
+        call_original(_this);
+    }
+};
+struct hook_trampoline_(unlock) {
+    target_offset_(0x00B1899C)
+    static void call(sead::CriticalSection* _this) {
+        if (_this == pmdm::pmdm_mutex) {
+            auto& reporter = current_reporter();
+            if (!reporter.is_top()) {
+                reporter.send("pmdm::(mutex unlock)");
+            }
+        }
+        call_original(_this);
+    }
+};
+}
+
+struct hook_trampoline_(doGetItem) {
+    target_offset_(0x0073A464)
+    static void call(const sead::SafeString& name, const WeaponModifierInfo* modifier) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("doGetItem");
+        if (modifier != nullptr) {
+            reporter.sendf("args:\nname=%s\nmodifier_flags=0x%x\nmodifier_value=%d", 
+                           name.cstr(), modifier->flags.getDirect(), modifier->value);
+        } else {
+            reporter.sendf("args:\nname=%s\nmodifier=null", name.cstr());
+        }
+        call_original(name, modifier);
+    }
+};
+
+struct hook_trampoline_(setItemDataToPouch) {
+    target_offset_(0x0073AA68)
+    static void call(const sead::SafeString& name, const WeaponModifierInfo* modifier) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("setItemDataToPouch");
+        if (modifier != nullptr) {
+            reporter.sendf("args:\nname=%s\nmodifier_flags=0x%x\nmodifier_value=%d", 
+                           name.cstr(), modifier->flags.getDirect(), modifier->value);
+        } else {
+            reporter.sendf("args:\nname=%s\nmodifier=null", name.cstr());
+        }
+        call_original(name, modifier);
+    }
+};
+
+//////// Inventory stuff
+namespace pmdm {
+
+struct hook_trampoline_(loadFromGameData) {
+    target_offset_(0x0096BE24)
+    static void call(PauseMenuDataMgr* _this) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("pmdm::loadFromGameData");
+        call_original(_this);
+    }
+};
+
+struct hook_trampoline_(doLoadFromGameData) {
+    target_offset_(0x0096C010)
+    static void call(PauseMenuDataMgr* _this) {
+        current_reporter().send("pmdm::doLoadFromGameData");
+        call_original(_this);
+    }
+};
+
+struct hook_trampoline_(saveToGameData) {
+    target_offset_(0x0096F9BC)
+    static void call(PauseMenuDataMgr* _this, const sead::OffsetList<PouchItem>& list) {
+        current_reporter().send("pmdm::saveToGameData");
+        call_original(_this, list);
+    }
+
+};
+
+struct hook_trampoline_(updateInventoryInfo) {
+    target_offset_(0x0096C954)
+    static void call(PauseMenuDataMgr* _this, void* list) {
+        current_reporter().send("pmdm::updateInventoryInfo");
+        call_original(_this, list);
+    }
+};
+
+struct hook_trampoline_(itemGet) {
+    target_offset_(0x0096EFB8)
+    static void call(PauseMenuDataMgr* _this, const sead::SafeString& name, int value, const WeaponModifierInfo* modifier) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("pmdm::itemGet");
+        if (modifier != nullptr) {
+            reporter.sendf("args:\nname=%s\nvalue=%d\nmodifier_flags=0x%x\nmodifier_value=%d", 
+                           name.cstr(), value, modifier->flags.getDirect(), modifier->value);
+        } else {
+            reporter.sendf("args:\nname=%s\nvalue=%d\nmodifier=null", name.cstr(), value);
+        }
+        call_original(_this, name, value, modifier);
+    }
+};
+
+struct hook_trampoline_(autoEquipLastAddedItem) {
+    target_offset_(0x00970264)
+    static void call(PauseMenuDataMgr* _this) {
+        current_reporter().send("pmdm::autoEquipLastAddedItem");
+        call_original(_this);
+    }
+};
+
+}
+
+/////// Pouch
+namespace pmdm {
+
+struct hook_trampoline_(addToPouch) {
+    target_offset_(0x0096F268)
+    static void call(
+        void* _this, const sead::SafeString& name, 
+        PouchItemType type, void* lists, int value,
+                    bool equipped, void* modifier,
+                    bool is_inventory_load) {
+
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("pmdm::addToPouch");
+        const char* type_str;
+        switch (type) {
+            case PouchItemType::Sword: type_str = "Sword"; break;
+            case PouchItemType::Bow: type_str = "Bow"; break;
+            case PouchItemType::Arrow: type_str = "Arrow"; break;
+            case PouchItemType::Shield: type_str = "Shield"; break;
+            case PouchItemType::ArmorHead: type_str = "ArmorHead"; break;
+            case PouchItemType::ArmorUpper: type_str = "ArmorUpper"; break;
+            case PouchItemType::ArmorLower: type_str = "ArmorLower"; break;
+            case PouchItemType::Material: type_str = "Material"; break;
+            case PouchItemType::Food: type_str = "Food"; break;
+            case PouchItemType::KeyItem: type_str = "KeyItem"; break;
+            default: type_str = "Invalid"; break;
+        }
+        reporter.sendf("args:\nname=%s\ntype=%s\nvalue=%d\nequipped=%d\nis_load=%d", 
+                       name.cstr(), 
+                       type_str, 
+                       value, 
+                       equipped, 
+                       is_inventory_load);
+        call_original(_this, name, type, lists, value, equipped, modifier, is_inventory_load);
+    }
+};
+
+struct hook_trampoline_(getItemCount) {
+    target_offset_(0x00970F84)
+    static int call(PauseMenuDataMgr* _this, const sead::SafeString& name, bool count_equipped) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("pmdm::getItemCount");
+        reporter.sendf("args:\nname=%s\ncount_equipped=%d", name.cstr(), count_equipped);
+        int ret_value = call_original(_this, name, count_equipped);
+        reporter.sendf("return: %d", ret_value);
+        return ret_value;
+    }
+};
+
+
+
+
+}
+
+/////// what
+namespace unk {
+
+struct hook_trampoline_(sub_007DC3FC) {
+    target_offset_(0x007DC3FC)
+    static void call(i64 a1) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("unk::sub_007DC3FC");
+        reporter.sendf("args:\na1=0x%llx", a1);
+        call_original(a1);
+    }
+};
+
+struct hook_trampoline_(sub_00984CA0) {
+    target_offset_(0x00984CA0)
+    static void call(i64 a1) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("unk::sub_00984CA0");
+        reporter.sendf("args:\na1=0x%llx", a1);
+        call_original(a1);
+    }
+};
+
+struct hook_trampoline_(sub_00A915D4) {
+    target_offset_(0x00A915D4)
+    static i64 call(void* a1, int a2, int a3, int a4) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("unk::sub_00A915D4");
+        return call_original(a1, a2, a3, a4);
+    }
+};
+
+struct hook_trampoline_(sub_0073A6D0) {
+    target_offset_(0x0073A6D0)
+    static void call(void* a1, const sead::SafeString& name) {
+        auto& reporter = current_reporter();
+        auto scope = reporter.scope("unk::sub_0073A6D0 (pick up from ground)");
+        reporter.sendf("args:\na1=0x%llx\nname=%s", a1, name.cstr());
+        call_original(a1, name);
+    }
+};
+
+}
+
+void install_hooks() {
+    pmdm::createInstance::install();
+    /* seadcs::lock::install(); */
+    /* seadcs::unlock::install(); */
+    doGetItem::install();
+    setItemDataToPouch::install();
+
+    pmdm::loadFromGameData::install();
+    pmdm::doLoadFromGameData::install();
+    pmdm::saveToGameData::install();
+    pmdm::updateInventoryInfo::install();
+    pmdm::itemGet::install();
+
+    pmdm::addToPouch::install();
+    /* pmdm::getItemCount::install(); */
+
+    unk::sub_007DC3FC::install();
+    unk::sub_00984CA0::install();
+    unk::sub_00A915D4::install();
+    unk::sub_0073A6D0::install();
+}
+
+}

research/trace/src/hooks.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace botw::ist::trace {
+
+void install_hooks();
+
+}

research/trace/src/main.cpp

@@ -1,40 +1,12 @@
-#include <megaton/prelude.h>
-#include <exl_hook/prelude.h>
-
-#include <Game/UI/uiPauseMenuDataMgr.h>
-#include <gfx/seadTextWriter.h>
-
 #include <toolkit/tcp.hpp>
-#include <toolkit/msg/screen.hpp>
 
 #include "reporter.hpp"
-
-// clang-format off
-hook_trampoline_(test_tcp) {
-    static void Callback(
-        void* _this, const sead::SafeString& name, uking::ui::PouchItemType type, void* lists, int value,
-                    bool equipped, void* modifier,
-                    bool is_inventory_load) {
-
-        auto& reporter = botw::ist::trace::current_reporter();
-        auto scope = reporter.scope("addToPouch");
-        reporter.sendf("args: %s\n%d\n%d\n%d\n%d\n%d", 
-                       name.cstr(), 
-                       type, 
-                       lists, 
-                       value, 
-                       equipped, 
-                       is_inventory_load);
-        Orig(_this, name, type, lists, value, equipped, modifier, is_inventory_load);
-    }
-};
-// clang-format on
+#include "hooks.hpp"
 
 extern "C" void megaton_main() {
     botw::tcp::init();
     botw::tcp::start_server(5001);
     botw::ist::trace::init();
-    test_tcp::InstallAtOffset(0x0096f268);
-    // your code here
+    botw::ist::trace::install_hooks();
 }
 

research/trace/src/reporter.cpp

@@ -80,4 +80,8 @@ void Reporter::sendf(const char* format, ...) const {
     send_event(thread_id, level, buffer);
 }
 
+void Reporter::send(const char* msg) const {
+    send_event(thread_id, level, msg);
+}
+
 }

research/trace/src/reporter.hpp

@@ -37,6 +37,8 @@ class LevelScope {
 
     Reporter() = default;
     Reporter(u64 thread_id) : thread_id(thread_id) {}
+    /** Send a message */
+    void send(const char* msg) const;
     /** Send a formatted message */
     void sendf(const char* format, ...) const;
 
@@ -45,6 +47,10 @@ class LevelScope {
         return LevelScope(*this, name);
     }
 
+    bool is_top() const {
+        return level == 0;
+    }
+
 private:
     /** Thread id for this reporter */
     u64 thread_id = INVALID_THREAD;