mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +00:00
Code Issues Projects Releases Wiki Activity

Reverb and ReverbBits have nothing to do with reverbs

Browse source
This commit is contained in:
zelda2774 2021-08-26 00:16:39 +02:00
parent 1b057824f7
commit 65f324c3c9
6 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/functions.h
View file

@ -1979,7 +1979,7 @@ void Audio_InitMesgQueues(void);
void Audio_osInvalDCache(void* buf, s32 size);
void Audio_osWritebackDCache(void* mem, s32 size);
s32 osAiSetNextBuffer(void*, u32);
void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb);
void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs);
void Audio_NoteSetResamplingRate(NoteSubEu* noteSubEu, f32 resamplingRateInput);
void Audio_NoteInit(Note* note);
void Audio_NoteDisable(Note* note);

24
include/z64audio.h
View file

@ -285,25 +285,25 @@ typedef struct {
} AdsrState;
typedef struct {
/* 0x00 */ u8 bit0 : 1;
/* 0x00 */ u8 bit1 : 1;
/* 0x00 */ u8 bit0 : 1; // unused?
/* 0x00 */ u8 bit1 : 1; // unused?
/* 0x00 */ u8 bit2 : 2;
/* 0x00 */ u8 strongRight : 1;
/* 0x00 */ u8 strongLeft : 1;
/* 0x00 */ u8 stereoHeadsetEffects : 1;
/* 0x00 */ u8 usesHeadsetPanEffects : 1;
} ReverbBitsData;
} StereoData;
typedef union {
/* 0x00 */ ReverbBitsData s;
/* 0x00 */ StereoData s;
/* 0x00 */ u8 asByte;
} ReverbBits;
} Stereo;
typedef struct {
/* 0x00 */ u8 reverb;
/* 0x01 */ u8 unk_1;
/* 0x02 */ u8 pan;
/* 0x03 */ ReverbBits reverbBits;
/* 0x03 */ Stereo stereo;
/* 0x04 */ u8 unk_4;
/* 0x06 */ u16 unk_6;
/* 0x08 */ f32 freqScale;
@ -374,7 +374,7 @@ typedef struct SequenceChannel {
/* 0x84 */ NotePool notePool;
/* 0xC4 */ s8 soundScriptIO[8]; // bridge between sound script and audio lib
/* 0xCC */ s16* filter;
/* 0xD0 */ ReverbBits reverbBits;
/* 0xD0 */ Stereo stereo;
} SequenceChannel; // size = 0xD4
// Also known as a Track, according to debug strings.
@ -387,7 +387,7 @@ typedef struct SequenceChannelLayer {
/* 0x00 */ u8 ignoreDrumPan : 1;
/* 0x00 */ u8 bit1 : 1; // "has initialized continuous notes"?
/* 0x00 */ u8 notePropertiesNeedInit : 1;
/* 0x01 */ ReverbBits reverbBits;
/* 0x01 */ Stereo stereo;
/* 0x02 */ u8 instOrWave;
/* 0x03 */ u8 noteDuration;
/* 0x04 */ u8 semitone;
@ -485,7 +485,7 @@ typedef struct {
/* 0x00 */ vu8 enabled : 1;
/* 0x00 */ u8 needsInit : 1;
/*?0x00 */ u8 finished : 1;
/*?0x00 */ u8 envMixerNeedsInit : 1;
/* 0x00 */ u8 unused : 1;
/* 0x00 */ u8 stereoStrongRight : 1;
/* 0x00 */ u8 stereoStrongLeft : 1;
/* 0x00 */ u8 stereoHeadsetEffects : 1;
@ -981,17 +981,17 @@ typedef struct {
} AudioContext; // size = 0x6450
typedef struct {
/* 0x00 */ u8 vol;
/* 0x00 */ u8 reverbVol;
/* 0x01 */ u8 unk_1;
/* 0x02 */ u8 pan;
/* 0x03 */ ReverbBits reverbBits;
/* 0x03 */ Stereo stereo;
/* 0x04 */ f32 frequency;
/* 0x08 */ f32 velocity;
/* 0x0C */ char unk_0C[0x4];
/* 0x10 */ s16* filter;
/* 0x14 */ u8 unk_14;
/* 0x16 */ u16 unk_16;
} Reverb; // size >= 0x18
} NoteSubAttributes; // size = 0x18
typedef struct {
/* 0x0000 */ u32 heap;