From a3e41841bf9f0cb9d86a078fd7a7d028bec9a053 Mon Sep 17 00:00:00 2001 From: Glought <663343+Glought@users.noreply.github.com> Date: Sun, 29 Jun 2025 08:30:50 -0700 Subject: [PATCH] Removed "GameInteractor_ExecuteOnGenerationCompletion()" from "GameInteractor_Hooks.h" and "GameInteractor_Hooks.cpp" The "OnGenerationCompletion" hook is now called directly at the end of "GenerateRandomizerImgui" in "randomizer.cpp" --- soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp | 4 ---- soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h | 1 - soh/soh/Enhancements/randomizer/randomizer.cpp | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp index 52866e683..f69cc29af 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp @@ -306,10 +306,6 @@ void GameInteractor_ExecuteOnFileChooseMain(void* gameState) { GameInteractor::Instance->ExecuteHooks(gameState); } -void GameInteractor_ExecuteOnGenerationCompletion() { - GameInteractor::Instance->ExecuteHooks(); -} - // MARK: - Game void GameInteractor_ExecuteOnSetGameLanguage() { diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h index ba0e56118..a6f1563f2 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h @@ -75,7 +75,6 @@ void GameInteractor_ExecuteOnUpdateFileBossRushOptionSelection(uint8_t optionInd void GameInteractor_ExecuteOnUpdateFileRandomizerOptionSelection(uint8_t optionIndex); void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode); void GameInteractor_ExecuteOnFileChooseMain(void* gameState); -void GameInteractor_ExecuteOnGenerationCompletion(); // MARK: - Game void GameInteractor_ExecuteOnSetGameLanguage(); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 915419d8c..095a0eb6b 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3753,7 +3753,7 @@ void GenerateRandomizerImgui(std::string seed = "") { generated = 1; - GameInteractor_ExecuteOnGenerationCompletion(); + GameInteractor::Instance->ExecuteHooks(); } bool GenerateRandomizer(std::string seed /*= ""*/) {