hook test

soh/build.c

@@ -0,0 +1,9 @@
+#include <libultraship/libultra.h>
+
+const char gBuildVersion[] = "MacReady Charlie (8.0.4)";
+const u16 gBuildVersionMajor = 8;
+const u16 gBuildVersionMinor = 0;
+const u16 gBuildVersionPatch = 4;
+const char gBuildTeam[] = "github.com/harbourmasters";
+const char gBuildDate[] = __DATE__ " " __TIME__;
+const char gBuildMakeOption[] = "";

soh/soh/ActorDB.cpp

@@ -5,6 +5,8 @@
 
 #include "Scripting.h"
 
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
 ActorDB* ActorDB::Instance;
 
 
@@ -761,11 +763,36 @@ static std::string EnPythonScript2 =
 "    actor.draw(play)\n"
 "\n";
 
+static std::string OwlScript =
+"import ctypes\n"
+"def Func(id, should, opt):\n"
+"    if id == 8:\n"
+"        ctypes.cast(should, ctypes.POINTER(ctypes.c_bool))[0] = 1\n"
+"\n";
+
+static std::shared_ptr<ICompiledScript> owlScript;
+
+static void TestFunction(GIVanillaBehavior id, bool* should, void* opt) {
+    Scripting::CallIfExists<GameInteractor::OnVanillaBehavior::fn_raw>(owlScript, "Func", id, should, opt);
+}
+
 void ActorDB::AddBuiltInCustomActors() {
     gEnPartnerId = ActorDB::Instance->AddEntry(EnPartnerInit).entry.id;
 
     EnPythonInit.script = PyZelda::Instance->Compile(EnPythonScript2);
     gEnPythonId = ActorDB::Instance->AddEntry(EnPythonInit).entry.id;
+
+    owlScript = PyZelda::Instance->Compile(OwlScript);
+
+    static uint32_t onVanillaBehaviorHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::OnVanillaBehavior>([](GIVanillaBehavior id, bool* should, void* opt) {
+        TestFunction(id, should, opt);
+    });
+
+    bool hey = false;
+    TestFunction(VB_OPEN_KOKIRI_FOREST, &hey, 0);
+    assert(hey == false);
+    TestFunction(VB_OWL_INTERACTION, &hey, 0);
+    assert(hey == true);
 }
 
 extern "C" ActorDBEntry* ActorDB_Retrieve(const int id) {

soh/soh/Enhancements/game-interactor/GameInteractor.h

@@ -439,6 +439,7 @@ typedef uint32_t HOOK_ID;
     struct name {                                \
         typedef std::function<void args> fn;     \
         typedef std::function<bool args> filter; \
+        using fn_raw = void args; \
     }
 
 #define REGISTER_VB_SHOULD(flag, body) \

soh/soh/PyZelda.h

@@ -55,6 +55,8 @@ template <> struct GetTypeChar<char*> { static constexpr std::string_view value
 
 template <typename T> struct GetTypeChar<T*> { static constexpr std::string_view value = "K"; };
 
+template <typename T> requires std::is_enum_v<T> struct GetTypeChar<T> { static constexpr std::string_view value = "I"; }; // TODO 64b value?
+
 template <typename ReturnType> static ReturnType GetCallResult(PyObject* ret);
 
 template <> static void GetCallResult<void>(PyObject* ret) {

soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c

@@ -285,7 +285,7 @@ s32 EnOwl_CheckInitTalk(EnOwl* this, PlayState* play, u16 textId, f32 targetDist
         distCheck = (flags & 2) ? 200.0f : 1000.0f;
         if (GameInteractor_Should(VB_OWL_INTERACTION, this->actor.xzDistToPlayer < targetDist, this)) {
             this->actor.flags |= ACTOR_FLAG_WILL_TALK;
-            func_8002F1C4(&this->actor, play, targetDist, distCheck, 0);
+            func_8002F1C4(&this->actor, play, this->actor.xzDistToPlayer, distCheck, 0);
         }
         return false;
     }