Rename OnPauseMenu to OnKaleidoUpdate

mckinlee · Feb 12, 2024 · b8f175f · b8f175f
1 parent c80adcc
commit b8f175f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -190,6 +190,6 @@ void GameInteractor_RegisterOnAssetAltChange(void (*fn)(void)) {
 
 //MARK: Pause Menu
 
-void GameInteractor_ExecuteOnPauseMenu() {
-    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPauseMenu>();
+void GameInteractor_ExecuteOnKaleidoUpdate() {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnKaleidoUpdate>();
 }
diff --git 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
@@ -1312,7 +1312,7 @@ void RegisterPauseMenuHooks() {
             return;
         }
         if (!pauseWarpHooksRegistered) {
-            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnPauseMenu>([]() {PauseWarp_HandleSelection();});
+            GameInteractor::Instance->RegisterGameHook<GameInteractor::OnKaleidoUpdate>([]() {PauseWarp_HandleSelection();});
             GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGameFrameUpdate>([]() {
                     PauseWarp_Execute();
             });

diff --git 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)) {