From ea5b71a3c8b973971fe74a8265e2b11ca360cb50 Mon Sep 17 00:00:00 2001
From: Demur Rumed <junkmute@hotmail.com>
Date: Mon, 19 May 2025 22:01:54 +0000
Subject: [PATCH] post merge fix

---
 .../Enhancements/game-interactor/GameInteractor_HookTable.h   | 1 -
 soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp | 4 +---
 soh/src/code/z_actor.c                                        | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
index 312dc1cbf..cadbcd40a 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
@@ -28,7 +28,6 @@ DEFINE_HOOK(OnCuccoOrChickenHatch, ());
 DEFINE_HOOK(OnShopSlotChange, (uint8_t cursorIndex, int16_t price));
 DEFINE_HOOK(OnActorInit, (void* actor));
 DEFINE_HOOK(OnActorUpdate, (void* actor));
-DEFINE_HOOK(OnActorDestroy, (void* actor));
 DEFINE_HOOK(OnActorKill, (void* actor));
 DEFINE_HOOK(OnActorDestroy, (void* actor));
 DEFINE_HOOK(OnEnemyDefeat, (void* actor));
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
index 614341e06..ef6ae68db 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
@@ -114,9 +114,7 @@ void GameInteractor_ExecuteOnActorUpdate(void* actor) {
     GameInteractor::Instance->ExecuteHooksForPtr<GameInteractor::OnActorUpdate>((uintptr_t)actor, actor);
     GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnActorUpdate>(actor);
 }
-void GameInteractor_ExecuteOnActorDestroy(void* actor) {
-    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorDestroy>(actor);
-}
+
 void GameInteractor_ExecuteOnActorKill(void* actor) {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnActorKill>(actor);
     GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnActorKill>(((Actor*)actor)->id, actor);
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index ab6755f8b..dbfbad6ec 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -2575,7 +2575,7 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
     unkFlag = 0;
 
     if (freezeActors) {
-        GameInteractor_ExecuteOnPlayerUpdate(player);
+        GameInteractor_ExecuteOnPlayerUpdate();
         return; // for AudioGlossary
     }