mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-02 00:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Link jaudio_NES/internal/driver.c

Browse Source 
Co-authored-by: GRAnimated <23510999+GRAnimated@users.noreply.github.com>
This commit is contained in:
Cuyler36
2026-07-15 16:30:59 -04:00
parent b47457d755
commit a863885cb4
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -797,7 +797,7 @@ config.libs = [
Object(Matching, "jaudio_NES/internal/channel.c"),
Object(Matching, "jaudio_NES/internal/cmdstack.c"),
Object(Matching, "jaudio_NES/internal/connect.c"),
Object(Equivalent, "jaudio_NES/internal/driver.c", extra_cflags=["-vector on"]),
Object(Matching, "jaudio_NES/internal/driver.c", extra_cflags=["-vector on"]),
Object(Matching, "jaudio_NES/internal/driverinterface.c"),
Object(Matching, "jaudio_NES/internal/dsp_cardunlock.c"),
Object(Matching, "jaudio_NES/internal/dsp_GBAKey.c"),
src/static/jaudio_NES/internal/driver.c
+6 -8
View File
@@ -396,7 +396,7 @@ static Acmd* Nas_SendLine(Acmd* cmd, delay* del_p, s32 update_idx) {
if (mix_delay->downsample_rate == 1) {
cmd = Nas_LoadAux2nd(cmd, mix_delay, update_idx);
aMix(cmd++, 0x34, del_p->mix_reverb_strength, 0xC40, 0x3A0);
cmd = Nas_LoadAux2nd(cmd, mix_delay, update_idx);
cmd = Nas_SaveAux2nd(cmd, mix_delay, update_idx);
}
return cmd;
@@ -1298,11 +1298,12 @@ extern Acmd* Nas_Synth_Resample(Acmd* cmd, const driverch* driver, s32 size, u16
return cmd;
}
// @non-matching - issues with aSetEnvParam2 macro
extern Acmd* Nas_Synth_Envelope(Acmd* cmd, commonch* common, driverch* driver, s32 samples_per_update, u16 dmem, s32 haasEffectDelaySide, s32 flags) {
s32 targetReverbVol = common->target_reverb_volume;
u32 curVolLeft = driver->current_volume_left & 0xFFFF;
u32 curVolRight = driver->current_volume_right & 0xFFFF;
s16* currentVolume = &driver->current_volume_left;
s16 curVolLeftTemp = *currentVolume++;
u16 curVolRight = *currentVolume & 0xFFFF;
u16 curVolLeft = curVolLeftTemp & 0xFFFF;
u16 targetVolLeft = common->target_volume_left << 4;
u16 targetVolRight = common->target_volume_right << 4;
u32 dmemDests;
@@ -1382,10 +1383,7 @@ extern Acmd* Nas_Synth_Envelope(Acmd* cmd, commonch* common, driverch* driver, s
{
cmd->words.w0 = _SHIFTL(A_CMD_SETENVPARAM2, 24, 8);
curVolLeft = _SHIFTL(curVolLeft, 16, 16);
curVolLeft |= _SHIFTL(curVolRight, 0, 16);
cmd->words.w1 = curVolLeft;
// cmd->words.w1 = ((curVolLeft & 0xFFFF) << 16) | (curVolRight & 0xFFFF);
cmd->words.w1 = _SHIFTL(curVolLeft, 16, 16) | _SHIFTL(curVolRight, 0, 16);
cmd++;
}
// aSetEnvParam2(cmd++, curVolLeft & 0xFFFF, curVolRight & 0xFFFF);