From 4444c5ea35a272e9e9ea157df92d7bb3eac8fc05 Mon Sep 17 00:00:00 2001 From: zelda2774 <69368340+zelda2774@users.noreply.github.com> Date: Wed, 1 Sep 2021 00:53:35 +0200 Subject: audio_synthesis OK + partially documented (#920) * Match func_800DDB64 * Match func_800DC910 * remove stack comments * Move nop padding to ucode_disas * Partially label audio_synthesis To some extent copied from sm64. * cleanup * Reverb and ReverbBits have nothing to do with reverbs * review * naming * Undo changes to permuter_settings.toml Co-authored-by: zelda2774 --- src/code/code_800E4FE0.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/code/code_800E4FE0.c') diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c index 70c4ab979..b36cd0bdc 100644 --- a/src/code/code_800E4FE0.c +++ b/src/code/code_800E4FE0.c @@ -18,7 +18,7 @@ typedef enum { CHAN_UPD_VIBE_X32, // 11 CHAN_UPD_UNK_0F, // 12 CHAN_UPD_UNK_20, // 13 - CHAN_UPD_REVERB_FLG // 14 + CHAN_UPD_STEREO // 14 } ChannelUpdateType; void func_800E6300(SequenceChannel* channel, AudioCmd* arg1); @@ -704,8 +704,8 @@ void func_800E6300(SequenceChannel* channel, AudioCmd* cmd) { case CHAN_UPD_UNK_20: channel->unk_20 = cmd->asUShort; return; - case CHAN_UPD_REVERB_FLG: - channel->reverbBits.asByte = cmd->asUbyte; + case CHAN_UPD_STEREO: + channel->stereo.asByte = cmd->asUbyte; return; } } @@ -792,10 +792,10 @@ s32 func_800E66C0(s32 arg0) { if (temp_a2->adsr.action.s.state != 0) { if (arg0 >= 2) { sound = temp_a3->sound.audioBankSound; - if (sound == NULL || temp_a3->bitField1.s.bit2) { + if (sound == NULL || temp_a3->bitField1.s.isSyntheticWave) { continue; } - if (sound->sample->bits2 == 0) { + if (sound->sample->medium == 0) { continue; } } -- cgit v1.2.3