HarbourMasters · KiritoDv · Apr 6, 2026 · Apr 6, 2026 · Apr 6, 2026 · Apr 6, 2026
diff --git a/OTRExporter b/OTRExporter
diff --git a/ZAPDTR b/ZAPDTR
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -699,7 +699,7 @@ else()
     find_package(Opus REQUIRED)
     find_package(OpusFile REQUIRED)
      set(ADDITIONAL_LIBRARY_DEPENDENCIES
-    "libultraship;"
+        "libultraship;"
         "ZAPDLib;"
         SDL2::SDL2
         "Ogg::ogg"

diff --git a/soh/soh/Enhancements/ArrowCycle.cpp b/soh/soh/Enhancements/ArrowCycle.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/AssignableTunicsAndBoots.cpp b/soh/soh/Enhancements/AssignableTunicsAndBoots.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -61,7 +61,7 @@ static void UseTunicBoots(Player* player, PlayState* play, Input* input) {
     }
 }
 
-static void ClearAssignedTunicsBoots(int32_t unused = 0) {
+static void ClearAssignedTunicsBoots(IEvent* event = nullptr) {
     for (int32_t buttonIndex = 0; buttonIndex < 8; buttonIndex++) {
         int32_t item = gSaveContext.equips.buttonItems[buttonIndex];
 
@@ -71,7 +71,11 @@ static void ClearAssignedTunicsBoots(int32_t unused = 0) {
     }
 }
 
-static void ClearDeletedAssignedEquipment(int16_t equipmentType, uint16_t equipValue) {
+static void ClearDeletedAssignedEquipment(IEvent* ev) {
+    auto event = reinterpret_cast<OnEquipmentDelete*>(ev);
+
+    int16_t equipmentType = event->equipmentType;
+    uint16_t equipValue = event->equipValue;
     ItemID itemToRemove = ITEM_NONE;
 
     if (equipmentType == EQUIP_TYPE_TUNIC) {

diff --git a/soh/soh/Enhancements/BlueFireArrows.cpp b/soh/soh/Enhancements/BlueFireArrows.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 
@@ -9,13 +9,15 @@ extern "C" {
 extern PlayState* gPlayState;
 }
 
-static void UpdateBlueFireCollidersBgBreakwall(void* actorPtr) {
-    BgBreakwall* thisx = (BgBreakwall*)actorPtr;
+static void UpdateBlueFireCollidersBgBreakwall(IEvent* event) {
+    OnActorInit* ev = reinterpret_cast<OnActorInit*>(event);
+    BgBreakwall* thisx = (BgBreakwall*)ev->actor;
     thisx->collider.info.bumper.dmgFlags |= DMG_ARROW_ICE;
 }
 
-static void UpdateBlueFireCollidersBgIceShelter(void* actorPtr) {
-    BgIceShelter* thisx = (BgIceShelter*)actorPtr;
+static void UpdateBlueFireCollidersBgIceShelter(IEvent* event) {
+    OnActorInit* ev = reinterpret_cast<OnActorInit*>(event);
+    BgIceShelter* thisx = (BgIceShelter*)ev->actor;
     thisx->cylinder1.base.acFlags |= AC_TYPE_PLAYER;
     thisx->cylinder1.info.bumper.dmgFlags |= DMG_ARROW_ICE;
     thisx->cylinder2.base.acFlags |= AC_TYPE_PLAYER;

diff --git a/soh/soh/Enhancements/Cheats/DekuStick.cpp b/soh/soh/Enhancements/Cheats/DekuStick.cpp
@@ -1,6 +1,6 @@
 #include <libultraship/bridge.h>
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp b/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/libultraship.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -16,7 +16,7 @@ static int frameAdvanceTimer = 0;
 #define PAUSE_STATE_UNPAUSE_CLOSE 19
 
 void RegisterEasyFrameAdvance() {
-    COND_HOOK(OnGameStateMainStart, CVAR_FRAME_ADVANCE_VALUE, []() {
+    COND_HOOK(OnGameStateMainStart, CVAR_FRAME_ADVANCE_VALUE, [](IEvent* event) {
         if (gPlayState == NULL) {
             return;
         }

diff --git a/soh/soh/Enhancements/Cheats/EasyISG.cpp b/soh/soh/Enhancements/Cheats/EasyISG.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -11,7 +11,7 @@ extern PlayState* gPlayState;
 #define CVAR_EASY_ISG_DEFAULT 0
 #define CVAR_EASY_ISG_VALUE CVarGetInteger(CVAR_EASY_ISG_NAME, CVAR_EASY_ISG_DEFAULT)
 
-void OnGameFrameUpdateEasyISG() {
+void OnGameFrameUpdateEasyISG(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }

diff --git a/soh/soh/Enhancements/Cheats/EasyQPA.cpp b/soh/soh/Enhancements/Cheats/EasyQPA.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -11,7 +11,7 @@ extern PlayState* gPlayState;
 #define CVAR_EASY_QPA_DEFAULT 0
 #define CVAR_EASY_QPA_VALUE CVarGetInteger(CVAR_EASY_QPA_NAME, CVAR_EASY_QPA_DEFAULT)
 
-void OnGameFrameUpdateEasyQPA() {
+void OnGameFrameUpdateEasyQPA(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }

diff --git a/soh/soh/Enhancements/Cheats/FreezeTime.cpp b/soh/soh/Enhancements/Cheats/FreezeTime.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
 
@@ -13,7 +13,7 @@ extern "C" SaveContext gSaveContext;
 #define CVAR_PREV_TIME_DEFAULT -1
 #define CVAR_PREV_TIME_VALUE CVarGetInteger(CVAR_PREV_TIME_NAME, CVAR_PREV_TIME_DEFAULT)
 
-void OnGameFrameUpdateFreezeTime() {
+void OnGameFrameUpdateFreezeTime(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }
@@ -26,12 +26,12 @@ void OnGameFrameUpdateFreezeTime() {
 }
 
 void RegisterFreezeTime() {
-    static HOOK_ID hookId = 0;
-    GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnGameFrameUpdate>(hookId);
-    hookId = 0;
+    static ListenerID listenerId = -1;
+    if (listenerId == -1) {
+        UNREGISTER_LISTENER(OnGameFrameUpdate, listenerId);
+    }
     if (CVAR_FREEZE_TIME_VALUE) {
-        hookId =
-            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>(OnGameFrameUpdateFreezeTime);
+        listenerId = REGISTER_LISTENER(OnGameFrameUpdate, EVENT_PRIORITY_LOW, OnGameFrameUpdateFreezeTime);
     } else {
         CVarClear(CVAR_PREV_TIME_NAME);
     }

diff --git a/soh/soh/Enhancements/Cheats/GSTargetable.cpp b/soh/soh/Enhancements/Cheats/GSTargetable.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include <spdlog/spdlog.h>
 #include <vector>
@@ -15,8 +15,9 @@ static constexpr int32_t CVAR_GSTARGETABLE_DEFAULT = 0;
 #define CVAR_GSTARGETABLE_NAME CVAR_CHEAT("GSTargetable")
 #define CVAR_GSTARGETABLE_VALUE CVarGetInteger(CVAR_GSTARGETABLE_NAME, CVAR_GSTARGETABLE_DEFAULT)
 
-static void OnActorInitGSTargetable(void* refActor) {
-    EnSw* enSw = reinterpret_cast<EnSw*>(refActor);
+static void OnActorInitGSTargetable(IEvent* event) {
+    OnActorInit* ev = reinterpret_cast<OnActorInit*>(event);
+    EnSw* enSw = reinterpret_cast<EnSw*>(ev->actor);
 
     if (enSw->actor.naviEnemyId == 0x20) {
         // Enable Targeting this Gold Skulltula, if visible by default
@@ -31,17 +32,19 @@ static void OnActorInitGSTargetable(void* refActor) {
     }
 }
 
-static void OnEnemyDefeatGSTargetable(void* refActor) {
-    EnSw* enSw = reinterpret_cast<EnSw*>(refActor);
+static void OnEnemyDefeatGSTargetable(IEvent* event) {
+    OnEnemyDefeat* ev = reinterpret_cast<OnEnemyDefeat*>(event);
+    EnSw* enSw = reinterpret_cast<EnSw*>(ev->actor);
 
     if (enSw->actor.naviEnemyId == 0x20) {
         // Disable Targeting immediately when the Gold Skulltula is defeated (like regular Skullwalltulas)
         enSw->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
     }
 }
 
-static void OnActorUpdateGSTargetable(void* refActor) {
-    EnSw* enSw = reinterpret_cast<EnSw*>(refActor);
+static void OnActorUpdateGSTargetable(IEvent* event) {
+    OnActorUpdate* ev = reinterpret_cast<OnActorUpdate*>(event);
+    EnSw* enSw = reinterpret_cast<EnSw*>(ev->actor);
 
     // Handle Night GS Spawning/Despawning
     if ((enSw->actor.naviEnemyId == 0x20) && (((enSw->actor.params & 0xE000) >> 0xD) == 2) &&

diff --git a/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp b/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ShipInit.hpp"
@@ -15,7 +15,7 @@ extern SaveContext gSaveContext;
 #define CVAR_INFINITE_AMMO_DEFAULT 0
 #define CVAR_INFINITE_AMMO_VALUE CVarGetInteger(CVAR_INFINITE_AMMO_NAME, CVAR_INFINITE_AMMO_DEFAULT)
 
-void OnGameFrameUpdateInfiniteAmmo() {
+void OnGameFrameUpdateInfiniteAmmo(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }

diff --git a/soh/soh/Enhancements/Cheats/Infinite/Health.cpp b/soh/soh/Enhancements/Cheats/Infinite/Health.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
 
@@ -9,7 +9,7 @@ extern "C" SaveContext gSaveContext;
 #define CVAR_INFINITE_HEALTH_DEFAULT 0
 #define CVAR_INFINITE_HEALTH_VALUE CVarGetInteger(CVAR_INFINITE_HEALTH_NAME, CVAR_INFINITE_HEALTH_DEFAULT)
 
-void OnGameFrameUpdateInfiniteHealth() {
+void OnGameFrameUpdateInfiniteHealth(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }

diff --git a/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp b/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -10,7 +10,7 @@ extern SaveContext gSaveContext;
 #define CVAR_INFINITE_MAGIC_DEFAULT 0
 #define CVAR_INFINITE_MAGIC_VALUE CVarGetInteger(CVAR_INFINITE_MAGIC_NAME, CVAR_INFINITE_MAGIC_DEFAULT)
 
-void OnGameFrameUpdateInfiniteMagic() {
+void OnGameFrameUpdateInfiniteMagic(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }

diff --git a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
 #include "variables.h"
@@ -14,7 +14,7 @@ extern s32 Flags_GetRandomizerInf(RandomizerInf flag);
 #define CVAR_INFINITE_MONEY_DEFAULT 0
 #define CVAR_INFINITE_MONEY_VALUE CVarGetInteger(CVAR_INFINITE_MONEY_NAME, CVAR_INFINITE_MONEY_DEFAULT)
 
-void OnGameFrameUpdateInfiniteMoney() {
+void OnGameFrameUpdateInfiniteMoney(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true) || (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_HAS_WALLET))) {
         return;
     }

diff --git a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
 
@@ -10,7 +10,7 @@ extern "C" SaveContext gSaveContext;
 #define CVAR_INFINITE_NAYRUS_LOVE_VALUE \
     CVarGetInteger(CVAR_INFINITE_NAYRUS_LOVE_NAME, CVAR_INFINITE_NAYRUS_LOVE_DEFAULT)
 
-void OnGameFrameUpdateInfiniteNayrusLove() {
+void OnGameFrameUpdateInfiniteNayrusLove(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }

diff --git a/soh/soh/Enhancements/Cheats/MoonJump.cpp b/soh/soh/Enhancements/Cheats/MoonJump.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -11,7 +11,7 @@ extern PlayState* gPlayState;
 #define CVAR_MOON_JUMP_DEFAULT 0
 #define CVAR_MOON_JUMP_VALUE CVarGetInteger(CVAR_MOON_JUMP_NAME, CVAR_MOON_JUMP_DEFAULT)
 
-void OnPlayerUpdateMoonJump() {
+void OnPlayerUpdateMoonJump(IEvent* event) {
     Player* player = GET_PLAYER(gPlayState);
 
     if (player != nullptr && CHECK_BTN_ANY(gPlayState->state.input[0].cur.button, BTN_L)) {

diff --git a/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp b/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -8,8 +8,9 @@ extern "C" {
 extern s16 D_80A7DEB8;
 }
 
-static void OnActorInitNoBugsDespawn(void* refActor) {
-    EnInsect* insect = reinterpret_cast<EnInsect*>(refActor);
+static void OnActorInitNoBugsDespawn(IEvent* event) {
+    OnActorInit* ev = reinterpret_cast<OnActorInit*>(event);
+    EnInsect* insect = reinterpret_cast<EnInsect*>(ev->actor);
 
     if ((insect->actor.params & 2) && insect->soilActor == NULL) {
         insect->insectFlags &= ~4;

diff --git a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp b/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" PlayState* gPlayState;
@@ -8,7 +8,7 @@ extern "C" PlayState* gPlayState;
 #define CVAR_UNRESTRICTED_ITEMS_DEFAULT 0
 #define CVAR_UNRESTRICTED_ITEMS_VALUE CVarGetInteger(CVAR_UNRESTRICTED_ITEMS_NAME, CVAR_UNRESTRICTED_ITEMS_DEFAULT)
 
-void OnGameFrameUpdateUnrestrictedItems() {
+void OnGameFrameUpdateUnrestrictedItems(IEvent* event) {
     if (!GameInteractor::IsSaveLoaded(true)) {
         return;
     }

diff --git a/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp b/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 #define CVAR_WIN_GORON_POT_NAME CVAR_ENHANCEMENT("GoronPot")

diff --git a/soh/soh/Enhancements/Difficulty/BonkDamage.cpp b/soh/soh/Enhancements/Difficulty/BonkDamage.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/enhancementTypes.h"
 
@@ -15,7 +15,7 @@ static constexpr BonkDamage CVAR_BONK_DAMAGE_DEFAULT = BONK_DAMAGE_NONE;
 #define CVAR_BONK_DAMAGE_SET (CVAR_BONK_DAMAGE_VALUE != CVAR_BONK_DAMAGE_DEFAULT)
 
 static void RegisterBonkDamage() {
-    COND_HOOK(OnPlayerBonk, CVAR_BONK_DAMAGE_SET, [] {
+    COND_HOOK(OnPlayerBonk, CVAR_BONK_DAMAGE_SET, [](IEvent* event) {
         uint16_t bonkDamage = 0;
         switch (CVAR_BONK_DAMAGE_VALUE) {
             case BONK_DAMAGE_NONE:

diff --git a/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp b/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/Difficulty/DampeFire.cpp b/soh/soh/Enhancements/Difficulty/DampeFire.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/enhancementTypes.h"
 

diff --git a/soh/soh/Enhancements/Difficulty/DivingGameTimer.cpp b/soh/soh/Enhancements/Difficulty/DivingGameTimer.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/Difficulty/HorsebackArchery.cpp b/soh/soh/Enhancements/Difficulty/HorsebackArchery.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
+1 −1		OTRExporter/ExporterArchive.cpp
+1 −1		OTRExporter/ExporterArchiveO2R.cpp
+1 −1		OTRExporter/ExporterArchiveOTR.cpp
+6 −0		rom_info.py
+1 −1		ZAPD/CrashHandler.cpp
+1 −1		ZAPD/Declaration.cpp
+1 −1		ZAPD/ImageBackend.cpp
+1 −1		ZAPD/OtherStructs/CutsceneMM_Commands.cpp
+1 −1		ZAPD/OtherStructs/CutsceneOoT_Commands.cpp
+1 −1		ZAPD/OtherStructs/Cutscene_Common.cpp
+1 −1		ZAPD/OtherStructs/SkinLimbStructs.cpp
+1 −1		ZAPD/Overlays/ZOverlay.cpp
+1 −1		ZAPD/Utils/Directory.h
+1 −1		ZAPD/Utils/DiskFile.h
+1 −1		ZAPD/Utils/Path.h
+0 −191		ZAPD/Utils/StringHelper.cpp
+0 −33		ZAPD/Utils/StringHelper.h
+1 −1		ZAPD/WarningHandler.cpp
+1 −1		ZAPD/ZAnimation.cpp
+1 −1		ZAPD/ZArray.cpp
+1 −1		ZAPD/ZAudio.cpp
+1 −1		ZAPD/ZBackground.cpp
+1 −1		ZAPD/ZBlob.cpp
+1 −1		ZAPD/ZCKeyFrame.cpp
+1 −1		ZAPD/ZCollision.cpp
+1 −1		ZAPD/ZCollisionPoly.cpp
+1 −1		ZAPD/ZCutscene.cpp
+1 −1		ZAPD/ZDisplayList.cpp
+1 −1		ZAPD/ZFile.cpp
+1 −1		ZAPD/ZLimb.cpp
+1 −1		ZAPD/ZMtx.cpp
+1 −1		ZAPD/ZPath.cpp
+1 −1		ZAPD/ZPlayerAnimationData.cpp
+1 −1		ZAPD/ZPointer.cpp
+1 −1		ZAPD/ZResource.cpp
+37 −2		ZAPD/ZRom.cpp
+1 −1		ZAPD/ZRoom/Commands/SetActorList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
+1 −1		ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetCameraSettings.cpp
+1 −1		ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
+1 −1		ZAPD/ZRoom/Commands/SetCsCamera.cpp
+1 −1		ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetCutscenes.cpp
+1 −1		ZAPD/ZRoom/Commands/SetEchoSettings.cpp
+1 −1		ZAPD/ZRoom/Commands/SetEntranceList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetExitList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetLightList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetLightingSettings.cpp
+1 −1		ZAPD/ZRoom/Commands/SetMesh.cpp
+1 −1		ZAPD/ZRoom/Commands/SetMinimapChests.cpp
+1 −1		ZAPD/ZRoom/Commands/SetMinimapList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetObjectList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetPathways.cpp
+1 −1		ZAPD/ZRoom/Commands/SetRoomBehavior.cpp
+1 −1		ZAPD/ZRoom/Commands/SetRoomList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp
+1 −1		ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp
+1 −1		ZAPD/ZRoom/Commands/SetSoundSettings.cpp
+1 −1		ZAPD/ZRoom/Commands/SetSpecialObjects.cpp
+1 −1		ZAPD/ZRoom/Commands/SetStartPositionList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetTimeSettings.cpp
+1 −1		ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
+1 −1		ZAPD/ZRoom/Commands/SetWind.cpp
+1 −1		ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp
+1 −1		ZAPD/ZRoom/Commands/Unused09.cpp
+1 −1		ZAPD/ZRoom/Commands/Unused1D.cpp
+1 −1		ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp
+1 −1		ZAPD/ZRoom/ZNames.h
+1 −1		ZAPD/ZRoom/ZRoom.cpp
+1 −1		ZAPD/ZRoom/ZRoomCommand.cpp
+1 −1		ZAPD/ZScalar.cpp
+1 −1		ZAPD/ZSkeleton.cpp
+1 −1		ZAPD/ZString.cpp
+1 −1		ZAPD/ZSurfaceType.cpp
+1 −1		ZAPD/ZSymbol.cpp
+1 −1		ZAPD/ZText.cpp
+44 −6		ZAPD/ZTextMM.cpp
+1 −1		ZAPD/ZVector.cpp
+1 −1		ZAPD/ZVtx.cpp
+1 −1		ZAPD/ZWaterbox.cpp