|
|
|
@ -2737,7 +2737,7 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) {
|
|
|
|
|
if (msgCtx->lastPlayedSong < OCARINA_SONG_SARIAS &&
|
|
|
|
|
(msgCtx->ocarinaAction < OCARINA_ACTION_PLAYBACK_MINUET ||
|
|
|
|
|
msgCtx->ocarinaAction >= OCARINA_ACTION_PLAYBACK_SARIA)) {
|
|
|
|
|
if (msgCtx->disableWarpSongs || interfaceCtx->restrictions.warpSongs == 3) {
|
|
|
|
|
if (msgCtx->disableWarpSongs || (interfaceCtx->restrictions.warpSongs == 3 && !gSaveContext.n64ddFlag)) {
|
|
|
|
|
Message_StartTextbox(globalCtx, 0x88C, NULL); // "You can't warp here!"
|
|
|
|
|
globalCtx->msgCtx.ocarinaMode = OCARINA_MODE_04;
|
|
|
|
|
} else if ((gSaveContext.eventInf[0] & 0xF) != 1) {
|
|
|
|
|