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

review

Browse source
This commit is contained in:
zelda2774 2021-08-30 16:54:04 +02:00
parent 65f324c3c9
commit 559be01e03
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/macros.h
View file

@ -10,6 +10,7 @@
#define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define ALIGN32(val) (((val) + 0x1F) & ~0x1F)
#define ALIGN64(val) (((val) + 0x3F) & ~0x3F)
#define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
#define SQ(x) ((x)*(x))

9
include/z64audio.h
View file

@ -35,9 +35,6 @@
#define CODEC_ADPCM 0
#define CODEC_S8 1
#define DEFAULT_LEN_1CH 0x1A0
#define DEFAULT_LEN_2CH 0x340
struct Note;
struct NotePool;
struct SequenceChannel;
@ -95,7 +92,7 @@ typedef struct {
/* 0x00 */ s32 order;
/* 0x04 */ s32 npredictors;
/* 0x08 */ s16 book[1]; // size 8 * order * npredictors. 8-byte aligned
} AdpcmBook;
} AdpcmBook; // size >= 0x8
typedef struct {
/* 0x00 */ u32 codec : 4;
@ -175,7 +172,7 @@ typedef struct {
/* 0x08 */ AudioBankSound lowNotesSound;
/* 0x10 */ AudioBankSound normalNotesSound;
/* 0x18 */ AudioBankSound highNotesSound;
} Instrument; // size >= 0x20
} Instrument; // size = 0x20
typedef struct {
/* 0x00 */ u8 releaseRate;
@ -183,7 +180,7 @@ typedef struct {
/* 0x02 */ u8 loaded;
/* 0x04 */ AudioBankSound sound;
/* 0x14 */ AdsrEnvelope* envelope;
} Drum; // size >= 0x14
} Drum; // size = 0x14
typedef struct {
/* 0x00 */ u8 numInstruments;