From 2375ac84a56d2bbee3d4725c84d50cceb97d52f3 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Thu, 22 Jul 2021 20:51:42 -0500 Subject: [PATCH] Renamed unknown_066460 to alSynAllocFX, and moved to lib folder. --- .../alSynAllocFX}/alSynAllocFX.s | 0 lib/src/mips1/al/alSynAllocFX.c | 18 +++++++++++++++ src/unknown_066460.c | 22 ------------------- src/unknown_066460.h | 4 ---- 4 files changed, 18 insertions(+), 26 deletions(-) rename {asm/non_matchings/unknown_066460 => lib/asm/non_matchings/alSynAllocFX}/alSynAllocFX.s (100%) create mode 100644 lib/src/mips1/al/alSynAllocFX.c delete mode 100644 src/unknown_066460.c delete mode 100644 src/unknown_066460.h diff --git a/asm/non_matchings/unknown_066460/alSynAllocFX.s b/lib/asm/non_matchings/alSynAllocFX/alSynAllocFX.s similarity index 100% rename from asm/non_matchings/unknown_066460/alSynAllocFX.s rename to lib/asm/non_matchings/alSynAllocFX/alSynAllocFX.s diff --git a/lib/src/mips1/al/alSynAllocFX.c b/lib/src/mips1/al/alSynAllocFX.c new file mode 100644 index 00000000..ff42dc1a --- /dev/null +++ b/lib/src/mips1/al/alSynAllocFX.c @@ -0,0 +1,18 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x80065860 */ + +#include "types.h" +#include "macros.h" +#include "audio_internal.h" + +#ifdef NON_MATCHING +// This is very close to matching. +ALFxRef *alSynAllocFX(ALSynth *s, s16 bus, s32 *arg2) { + alFxNew(&s->auxBus[bus].fx[0], arg2, bus); + alFxParam(&s->auxBus[bus].fx[0], AL_FILTER_SET_SOURCE, &s->auxBus[bus]); + alMainBusParam(s->mainBus, AL_FILTER_ADD_SOURCE, &s->auxBus[bus].fx[0]); + return (ALFxRef)(&s->auxBus[bus].fx[0]); +} +#else +GLOBAL_ASM("lib/asm/non_matchings/alSynAllocFX/alSynAllocFX.s") +#endif \ No newline at end of file diff --git a/src/unknown_066460.c b/src/unknown_066460.c deleted file mode 100644 index d072d9cf..00000000 --- a/src/unknown_066460.c +++ /dev/null @@ -1,22 +0,0 @@ -/* The comment below is needed for this file to be picked up by generate_ld */ -/* RAM_POS: 0x80065860 */ - -#include "unknown_066460.h" - -#include "types.h" -#include "macros.h" -#include "audio_internal.h" - -#if 1 - GLOBAL_ASM("asm/non_matchings/unknown_066460/alSynAllocFX.s") -#else -ALFxRef *alSynAllocFX(ALSynth *s, s16 bus, ALSynConfig *c, ALHeap *hp) -{ - alFxNew(&s->auxBus[bus].fx[0], c, hp); - alFxParam(&s->auxBus[bus].fx[0], AL_FILTER_SET_SOURCE, - &s->auxBus[bus]); - alMainBusParam(s->mainBus, AL_FILTER_ADD_SOURCE,&s->auxBus[bus].fx[0]); - - return (ALFxRef)(&s->auxBus[bus].fx[0]); -} -#endif \ No newline at end of file diff --git a/src/unknown_066460.h b/src/unknown_066460.h deleted file mode 100644 index 582be8b7..00000000 --- a/src/unknown_066460.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _UNKNOWN_066460_H_ -#define _UNKNOWN_066460_H_ - -#endif \ No newline at end of file