From b8f175ff6c3a200bbe6856067e60d11a5dc55468 Mon Sep 17 00:00:00 2001 From: mckinlee Date: Mon, 12 Feb 2024 01:25:08 -0500 Subject: [PATCH] Rename OnPauseMenu to OnKaleidoUpdate --- soh/soh/Enhancements/game-interactor/GameInteractor.h | 2 +- soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp | 4 ++-- soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h | 2 +- soh/soh/Enhancements/mods.cpp | 2 +- soh/src/code/z_kaleido_scope_call.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index c326e11e3e9..3e70da37aa3 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -221,7 +221,7 @@ class GameInteractor { DEFINE_HOOK(OnFileDropped, void(std::string filePath)); DEFINE_HOOK(OnAssetAltChange, void()); - DEFINE_HOOK(OnPauseMenu, void()); + DEFINE_HOOK(OnKaleidoUpdate, void()); // Helpers static bool IsSaveLoaded(); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp index a89a75d8033..911c47a71c4 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp @@ -190,6 +190,6 @@ void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)) { //MARK: Pause Menu -void GameInteractor_ExecuteOnPauseMenu() { - GameInteractor::Instance->ExecuteHooks(); +void GameInteractor_ExecuteOnKaleidoUpdate() { + GameInteractor::Instance->ExecuteHooks(); } diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h index a1d89dcd266..5c86cb39b52 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h @@ -61,7 +61,7 @@ void GameInteractor_ExecuteOnSetGameLanguage(); void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)); //Mark: - Pause Menu -void GameInteractor_ExecuteOnPauseMenu(); +void GameInteractor_ExecuteOnKaleidoUpdate(); #ifdef __cplusplus } diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index 54fca6dad7e..8b65cdcbe89 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -1312,7 +1312,7 @@ void RegisterPauseMenuHooks() { return; } if (!pauseWarpHooksRegistered) { - GameInteractor::Instance->RegisterGameHook([]() {PauseWarp_HandleSelection();}); + GameInteractor::Instance->RegisterGameHook([]() {PauseWarp_HandleSelection();}); GameInteractor::Instance->RegisterGameHook([]() { PauseWarp_Execute(); }); diff --git a/soh/src/code/z_kaleido_scope_call.c b/soh/src/code/z_kaleido_scope_call.c index 5c570352949..82922acd039 100644 --- a/soh/src/code/z_kaleido_scope_call.c +++ b/soh/src/code/z_kaleido_scope_call.c @@ -57,7 +57,7 @@ void KaleidoScopeCall_Update(PlayState* play) { KaleidoMgrOverlay* kaleidoScopeOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE]; PauseContext* pauseCtx = &play->pauseCtx; - GameInteractor_ExecuteOnPauseMenu(); + GameInteractor_ExecuteOnKaleidoUpdate(); if (!gSaveContext.sohStats.gameComplete && (!IS_BOSS_RUSH || !gSaveContext.isBossRushPaused)) {