diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2026-01-20 19:26:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-20 19:26:50 -0600 |
| commit | d7bd6f9c7df615cd1b41a5b482e2589a6a03cca0 (patch) | |
| tree | e7ef22b8eb223bd5cd58310f1c85ae6837e5b2dd /mm/src/code | |
| parent | f237dd2930e60a2128a0a80d4783318025dd8f1d (diff) | |
Implement sarias song hint item (#1161)
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_message.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c index af383621c..04efc6f8c 100644 --- a/mm/src/code/z_message.c +++ b/mm/src/code/z_message.c @@ -5819,8 +5819,10 @@ void Message_Update(PlayState* play) { break; } - if ((msgCtx->textboxEndType == TEXTBOX_ENDTYPE_TWO_CHOICE) && - (play->msgCtx.ocarinaMode == OCARINA_MODE_ACTIVE)) { + if (GameInteractor_Should(VB_MSG_CAPTURE_MSGMODE_TEXT_DONE, false)) { + // no-op + } else if ((msgCtx->textboxEndType == TEXTBOX_ENDTYPE_TWO_CHOICE) && + (play->msgCtx.ocarinaMode == OCARINA_MODE_ACTIVE)) { if (Message_ShouldAdvance(play)) { if (msgCtx->choiceIndex == 0) { play->msgCtx.ocarinaMode = OCARINA_MODE_WARP; @@ -6042,7 +6044,9 @@ void Message_Update(PlayState* play) { if (msgCtx->ocarinaAction != OCARINA_ACTION_CHECK_NOTIME_DONE) { s16 pad; - if (sLastPlayedSong == OCARINA_SONG_TIME) { + if (GameInteractor_Should(VB_MSG_CAPTURE_MSGMODE_TEXT_CLOSING_OCARINA_ACTION, false)) { + // no-op + } else if (sLastPlayedSong == OCARINA_SONG_TIME) { if (interfaceCtx->restrictions.songOfTime == 0) { Message_StartTextbox(play, 0x1B8A, NULL); play->msgCtx.ocarinaMode = OCARINA_MODE_PROCESS_SOT; |