mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-01 04:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Import Audio Synthesis Data (#1010)

Browse Source 
* Import audio synth data, OK

* Cleanup data

* Merge data into 1 file

* naming

* format

* Fix data

* Separate audio_data into it's own file

* CleanUp, more PR suggestions

* Fix audio_effects.data.s

* Format audio_data

* rm asm, always gets me
This commit is contained in:
engineer124
2021-11-13 02:52:17 +11:00
committed by GitHub
parent 0b18419489
commit 80edcc3801
9 changed files with 706 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/audio_seqplayer.c
+5 -5
View File
@@ -18,7 +18,7 @@ u16 AudioSeq_ScriptReadCompressedU16(SeqScriptState* state);
u8 AudioSeq_GetInstrument(SequenceChannel* channel, u8 instId, Instrument** instOut, AdsrSettings* adsr);
u16 AudioSeq_GetScriptControlFlowArgument(SeqScriptState* state, u8 arg1) {
u8 temp_v0 = D_80130470[arg1];
u8 temp_v0 = D_80130520[arg1 - 0xB0];
u8 loBits = temp_v0 & 3;
u16 ret = 0;
@@ -590,7 +590,7 @@ s32 AudioSeq_SeqLayerProcessScriptStep2(SequenceLayer* layer) {
case 0xCE: {
u8 tempByte = AudioSeq_ScriptReadU8(state);
layer->unk_34 = D_8012F4B4[(tempByte + 0x80) & 0xFF];
layer->unk_34 = gBendPitchTwoSemitonesFrequencies[(tempByte + 0x80) & 0xFF];
break;
}
@@ -987,7 +987,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
s32 pad2;
if (command >= 0xB0) {
highBits = D_80130470[(s32)command];
highBits = D_80130520[(s32)command - 0xB0];
lowBits = highBits & 3;
for (i = 0; i < lowBits; i++, highBits <<= 1) {
@@ -1078,13 +1078,13 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
case 0xD3:
command = (u8)parameters[0];
command += 0x80;
channel->freqScale = gPitchBendFrequencyScale[command];
channel->freqScale = gBendPitchOneOctaveFrequencies[command];
channel->changes.s.freqScale = true;
break;
case 0xEE:
command = (u8)parameters[0];
command += 0x80;
channel->freqScale = D_8012F4B4[command];
channel->freqScale = gBendPitchTwoSemitonesFrequencies[command];
channel->changes.s.freqScale = true;
break;
case 0xDD: