From 1102fa945a70bfd1185244bdc8a37f05d2e976fb Mon Sep 17 00:00:00 2001
From: Demur Rumed <junkmute@hotmail.com>
Date: Sun, 1 Jun 2025 01:22:34 +0000
Subject: [PATCH] merge cleanup

---
 soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h | 1 -
 soh/soh/OTRGlobals.h                                        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
index dff0be4c3..2540a3bf2 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@@ -31,7 +31,6 @@ void GameInteractor_ExecuteOnCuccoOrChickenHatch();
 void GameInteractor_ExecuteOnActorInit(void* actor);
 void GameInteractor_ExecuteOnActorSpawn(void* actor);
 void GameInteractor_ExecuteOnActorUpdate(void* actor);
-void GameInteractor_ExecuteOnActorDestroy(void* actor);
 void GameInteractor_ExecuteOnActorKill(void* actor);
 void GameInteractor_ExecuteOnActorDestroy(void* actor);
 void GameInteractor_ExecuteOnEnemyDefeat(void* actor);
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 3cf08b347..afbf7cfc5 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -169,7 +169,6 @@ void Gfx_TextureCacheDelete(const uint8_t* addr);
 void SaveManager_ThreadPoolWait();
 void CheckTracker_OnMessageClose();
 
-int32_t GetGIID(uint32_t itemID);
 GetItemID RetrieveGetItemIDFromItemID(ItemID itemID);
 RandomizerGet RetrieveRandomizerGetFromItemID(ItemID itemID);
 #endif