summaryrefslogtreecommitdiff
path: root/soh/src/code/audio_seqplayer.c
diff options
context:
space:
mode:
Diffstat (limited to 'soh/src/code/audio_seqplayer.c')
-rw-r--r--soh/src/code/audio_seqplayer.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/soh/src/code/audio_seqplayer.c b/soh/src/code/audio_seqplayer.c
index 3dd7b811e..52d14a9a1 100644
--- a/soh/src/code/audio_seqplayer.c
+++ b/soh/src/code/audio_seqplayer.c
@@ -938,8 +938,16 @@ u8 AudioSeq_GetInstrument(SequenceChannel* channel, u8 instId, Instrument** inst
*instOut = NULL;
return 0;
}
- adsr->envelope = inst->envelope;
- adsr->releaseRate = inst->releaseRate;
+
+ if (inst->envelope != NULL)
+ {
+ adsr->envelope = inst->envelope;
+ adsr->releaseRate = (inst->releaseRate);
+ }
+ else {
+ adsr->envelope = gDefaultEnvelope;
+ }
+
*instOut = inst;
instId += 2;
return instId;