summaryrefslogtreecommitdiff
path: root/soh/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'soh/src/code')
-rw-r--r--soh/src/code/z_message_PAL.c1
-rw-r--r--soh/src/code/z_play.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index c88c698c7..78eac4ece 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -3384,6 +3384,7 @@ void Message_Update(PlayState* play) {
}
sLastPlayedSong = 0xFF;
osSyncPrintf("OCARINA_MODE=%d chk_ocarina_no=%d\n", play->msgCtx.ocarinaMode, msgCtx->unk_E3F2);
+ CheckTracker_OnMessageClose();
break;
case MSGMODE_PAUSED:
break;
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index db938a4c2..dfafbb7ff 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -967,6 +967,7 @@ void Play_Update(PlayState* play) {
R_UPDATE_RATE = 3;
}
+ // Transition end for standard transitions
GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum);
}
play->sceneLoadFlag = 0;
@@ -1075,6 +1076,9 @@ void Play_Update(PlayState* play) {
R_UPDATE_RATE = 3;
play->sceneLoadFlag = 0;
play->transitionMode = 0;
+
+ // Transition end for sandstorm effect (delayed until effect is finished)
+ GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum);
}
} else {
if (play->envCtx.sandstormEnvA == 255) {
@@ -1109,6 +1113,9 @@ void Play_Update(PlayState* play) {
R_UPDATE_RATE = 3;
play->sceneLoadFlag = 0;
play->transitionMode = 0;
+
+ // Transition end for sandstorm effect (delayed until effect is finished)
+ GameInteractor_ExecuteOnTransitionEndHooks(play->sceneNum);
}
}
break;