From 7b3d16dc24624623207d9b8d38ed7a32bb86e2f6 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 17 Oct 2021 16:29:25 +1000 Subject: [PATCH] Decompile n_alResampleParam --- ld/libfiles.ntsc-beta.inc | 2 +- ld/libfiles.ntsc-final.inc | 2 +- ld/libfiles.pal-final.inc | 2 +- src/include/lib/lib_47a90.h | 9 ------ src/lib/{lib_47a90.c => naudio/n_resample.c} | 31 +++++--------------- 5 files changed, 11 insertions(+), 35 deletions(-) delete mode 100644 src/include/lib/lib_47a90.h rename src/lib/{lib_47a90.c => naudio/n_resample.c} (88%) diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 487c258ab..42f5b61dd 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -113,7 +113,7 @@ build/ROMID/lib/lib_461c0.o (section); \ build/ROMID/lib/lib_46650.o (section); \ build/ROMID/lib/lib_47550.o (section); \ - build/ROMID/lib/lib_47a90.o (section); \ + build/ROMID/lib/naudio/n_resample.o (section); \ build/ROMID/lib/lib_47d20.o (section); \ build/ROMID/lib/ultra/io/vitbl.o (section); \ build/ROMID/lib/ultra/os/writebackdcacheall.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 67b36a72d..0cf092e30 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -110,7 +110,7 @@ build/ROMID/lib/lib_461c0.o (section); \ build/ROMID/lib/lib_46650.o (section); \ build/ROMID/lib/lib_47550.o (section); \ - build/ROMID/lib/lib_47a90.o (section); \ + build/ROMID/lib/naudio/n_resample.o (section); \ build/ROMID/lib/lib_47d20.o (section); \ build/ROMID/lib/ultra/io/vitbl.o (section); \ build/ROMID/lib/ultra/os/writebackdcacheall.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index a33d0c5e0..fce5dc6e1 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -110,7 +110,7 @@ build/ROMID/lib/lib_461c0.o (section); \ build/ROMID/lib/lib_46650.o (section); \ build/ROMID/lib/lib_47550.o (section); \ - build/ROMID/lib/lib_47a90.o (section); \ + build/ROMID/lib/naudio/n_resample.o (section); \ build/ROMID/lib/lib_47d20.o (section); \ build/ROMID/lib/ultra/io/vitbl.o (section); \ build/ROMID/lib/ultra/os/writebackdcacheall.o (section); \ diff --git a/src/include/lib/lib_47a90.h b/src/include/lib/lib_47a90.h deleted file mode 100644 index a7ac79545..000000000 --- a/src/include/lib/lib_47a90.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _IN_LIB_LIB_47A90_H -#define _IN_LIB_LIB_47A90_H -#include -#include "data.h" -#include "types.h" - -u32 func00047a90(void); - -#endif diff --git a/src/lib/lib_47a90.c b/src/lib/naudio/n_resample.c similarity index 88% rename from src/lib/lib_47a90.c rename to src/lib/naudio/n_resample.c index f3df7695f..1b8f0922a 100644 --- a/src/lib/lib_47a90.c +++ b/src/lib/naudio/n_resample.c @@ -1,8 +1,5 @@ -#include -#include "constants.h" -#include "bss.h" -#include "data.h" -#include "types.h" +#include "n_synthInternals.h" +#include const u32 var70059e00[] = {0x3fffffd6}; const u32 var70059e04[] = {0x0e94ee39}; @@ -159,22 +156,10 @@ glabel func00047a90 /* 47cc8: 27bd0038 */ addiu $sp,$sp,0x38 /* 47ccc: 03e00008 */ jr $ra /* 47cd0: 00000000 */ nop -/* 47cd4: 27bdffe8 */ addiu $sp,$sp,-24 -/* 47cd8: afbf0014 */ sw $ra,0x14($sp) -/* 47cdc: afa40018 */ sw $a0,0x18($sp) -/* 47ce0: afa5001c */ sw $a1,0x1c($sp) -/* 47ce4: afa60020 */ sw $a2,0x20($sp) -/* 47ce8: 8fa40018 */ lw $a0,0x18($sp) -/* 47cec: 8fa5001c */ lw $a1,0x1c($sp) -/* 47cf0: 0c011582 */ jal n_alLoadParam -/* 47cf4: 8fa60020 */ lw $a2,0x20($sp) -/* 47cf8: 10000003 */ b .L00047d08 -/* 47cfc: 00001025 */ or $v0,$zero,$zero -/* 47d00: 10000001 */ b .L00047d08 -/* 47d04: 00000000 */ nop -.L00047d08: -/* 47d08: 8fbf0014 */ lw $ra,0x14($sp) -/* 47d0c: 27bd0018 */ addiu $sp,$sp,0x18 -/* 47d10: 03e00008 */ jr $ra -/* 47d14: 00000000 */ nop ); + +s32 n_alResampleParam(N_PVoice *filter, s32 paramID, void *param) +{ + n_alLoadParam(filter, paramID, param); + return 0; +}