From 64ff1f9f7d784cf8b8c10b31693dbc3e69138996 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Thu, 6 Oct 2022 19:43:03 -0700 Subject: [PATCH] PR audio --- src/code/z_play.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/code/z_play.c b/src/code/z_play.c index 48fd91676c..00f5beca03 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -611,20 +611,20 @@ void Play_UpdateTransition(PlayState* this) { ((this->nextEntrance == ENTRANCE(ROAD_TO_IKANA, 1)) && !(gSaveContext.save.weekEventReg[0x34] & 0x20))) && (!func_800FE590(this) || (Entrance_GetSceneId(this->nextEntrance + sceneLayer) < 0) || - (Audio_GetActiveSequence(0) != NA_BGM_FINAL_HOURS))) { + (Audio_GetActiveSequence(SEQ_PLAYER_BGM_MAIN) != NA_BGM_FINAL_HOURS))) { func_801A4058(20); - gSaveContext.seqId = 0xFF; - gSaveContext.ambienceId = 0xFF; + gSaveContext.seqId = (u8)NA_BGM_DISABLED; + gSaveContext.ambienceId = AMBIENCE_ID_DISABLED; } if (func_800FD768()) { func_801A4058(20); - gSaveContext.seqId = 0xFF; - gSaveContext.ambienceId = 0xFF; + gSaveContext.seqId = (u8)NA_BGM_DISABLED; + gSaveContext.ambienceId = AMBIENCE_ID_DISABLED; } if (func_800FE590(this) && (Entrance_GetSceneId(this->nextEntrance + sceneLayer) >= 0) && - (Audio_GetActiveSequence(0) == NA_BGM_FINAL_HOURS)) { + (Audio_GetActiveSequence(SEQ_PLAYER_BGM_MAIN) == NA_BGM_FINAL_HOURS)) { func_801A41C8(20); } }