From ecef69b58f43f9899440a03b839d501e33db4d7f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 9 Mar 2025 11:28:39 +1000 Subject: [PATCH] Rename some audio files --- Makefile | 12 +++--------- ld/libfiles.jpn-final.inc | 10 +++++----- ld/libfiles.ntsc-beta.inc | 10 +++++----- ld/libfiles.ntsc-final.inc | 10 +++++----- ld/libfiles.pal-beta.inc | 10 +++++----- ld/libfiles.pal-final.inc | 10 +++++----- src/game/bg.c | 2 +- src/game/bondmove.c | 2 +- src/game/chraction.c | 2 +- src/game/dlights.c | 2 +- src/game/lv.c | 1 - src/game/pak.c | 1 - src/game/player.c | 2 +- src/game/prop.c | 2 +- src/game/propobj.c | 2 +- src/game/splat.c | 2 +- src/include/lib/lib_06440.h | 9 --------- src/include/lib/{lib_2fc60.h => osc.h} | 4 ++-- src/include/lib/{lib_17ce0.h => portal.h} | 4 ++-- src/lib/{speaker.c => alsurround.c} | 2 +- src/lib/audiomgr.c | 2 +- src/lib/collision.c | 2 +- src/lib/{lib_39c80.c => naudio/n_cspchan.c} | 0 src/lib/{lib_3e3e0.c => naudio/n_syngetfxref.c} | 2 +- src/lib/{lib_2fc60.c => naudio/osc.c} | 0 src/lib/{lib_17ce0.c => portal.c} | 2 +- src/lib/snd.c | 2 +- 27 files changed, 46 insertions(+), 63 deletions(-) delete mode 100644 src/include/lib/lib_06440.h rename src/include/lib/{lib_2fc60.h => osc.h} (76%) rename src/include/lib/{lib_17ce0.h => portal.h} (89%) rename src/lib/{speaker.c => alsurround.c} (97%) rename src/lib/{lib_39c80.c => naudio/n_cspchan.c} (100%) rename src/lib/{lib_3e3e0.c => naudio/n_syngetfxref.c} (92%) rename src/lib/{lib_2fc60.c => naudio/osc.c} (100%) rename src/lib/{lib_17ce0.c => portal.c} (99%) diff --git a/Makefile b/Makefile index c6fa7265c..4eda115b8 100644 --- a/Makefile +++ b/Makefile @@ -346,12 +346,8 @@ ifeq ($(COMPILER), ido) $(shell find src/lib/ultra/audio -name '*.c') \ $(shell find src/lib/naudio -name '*.c') \ $(shell find src/lib/mp3 -name '*.c') \ - src/lib/lib_2fc60.c \ - src/lib/lib_317f0.c \ - src/lib/lib_39c80.c \ - src/lib/lib_3e3e0.c \ - src/lib/mp3.c \ - src/lib/speaker.c + src/lib/alsurround.c \ + src/lib/mp3.c O1_C_FILES := \ src/lib/lib_04f60nb.c \ @@ -413,9 +409,7 @@ ifeq ($(COMPILER), ido) IDO71_C_FILES := \ $(shell find src/lib/ultra/audio -name '*.c') \ $(shell find src/lib/naudio -name '*.c') \ - $(shell find src/lib/mp3 -name '*.c') \ - src/lib/lib_2fc60.c \ - src/lib/lib_39c80.c + $(shell find src/lib/mp3 -name '*.c') LOOPUNROLL_O_FILES = $(patsubst src/%.c, $(B_DIR)/%.o, $(LOOPUNROLL_C_FILES)) MIPS3_O_FILES = $(patsubst src/%.c, $(B_DIR)/%.o, $(MIPS3_C_FILES)) diff --git a/ld/libfiles.jpn-final.inc b/ld/libfiles.jpn-final.inc index 88d91f941..5ed034e78 100644 --- a/ld/libfiles.jpn-final.inc +++ b/ld/libfiles.jpn-final.inc @@ -53,7 +53,7 @@ build/ROMID/lib/varsinit.o (section); \ build/ROMID/lib/mtxasm.o (section); \ build/ROMID/lib/mtx.o (section); \ - build/ROMID/lib/lib_17ce0.o (section); \ + build/ROMID/lib/portal.o (section); \ build/ROMID/lib/ailist.o (section); \ build/ROMID/lib/path.o (section); \ build/ROMID/lib/modelasm.o (section); \ @@ -65,11 +65,11 @@ build/ROMID/lib/rmon.o (section); \ build/ROMID/lib/ultra/audio/heap.o (section); \ build/ROMID/lib/naudio/n_sl.o (section); \ - build/ROMID/lib/lib_2fc60.o (section); \ + build/ROMID/lib/naudio/osc.o (section); \ build/ROMID/lib/naudio/n_synthesizer.o (section); \ build/ROMID/lib/ultra/audio/sl.o (section); \ build/ROMID/lib/naudio/n_sndplayer.o (section); \ - build/ROMID/lib/speaker.o (section); \ + build/ROMID/lib/alsurround.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ @@ -79,7 +79,7 @@ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ build/ROMID/lib/naudio/n_cspplay.o (section); \ build/ROMID/lib/naudio/n_cspsetvol.o (section); \ - build/ROMID/lib/lib_39c80.o (section); \ + build/ROMID/lib/naudio/n_cspchan.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ @@ -100,7 +100,7 @@ build/ROMID/lib/naudio/n_seqplayer.o (section); \ build/ROMID/lib/naudio/n_synfilter13.o (section); \ build/ROMID/lib/naudio/n_synfilter12.o (section); \ - build/ROMID/lib/lib_3e3e0.o (section); \ + build/ROMID/lib/naudio/n_syngetfxref.o (section); \ build/ROMID/lib/naudio/n_synsetfxparam.o (section); \ build/ROMID/lib/naudio/n_synfilter11.o (section); \ build/ROMID/lib/ultra/audio/cseq.o (section); \ diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc index 5ff9d8ff0..a44dd2946 100644 --- a/ld/libfiles.ntsc-beta.inc +++ b/ld/libfiles.ntsc-beta.inc @@ -55,7 +55,7 @@ build/ROMID/lib/varsinit.o (section); \ build/ROMID/lib/mtxasm.o (section); \ build/ROMID/lib/mtx.o (section); \ - build/ROMID/lib/lib_17ce0.o (section); \ + build/ROMID/lib/portal.o (section); \ build/ROMID/lib/ailist.o (section); \ build/ROMID/lib/path.o (section); \ build/ROMID/lib/modelasm.o (section); \ @@ -68,11 +68,11 @@ build/ROMID/lib/rmon.o (section); \ build/ROMID/lib/ultra/audio/heap.o (section); \ build/ROMID/lib/naudio/n_sl.o (section); \ - build/ROMID/lib/lib_2fc60.o (section); \ + build/ROMID/lib/naudio/osc.o (section); \ build/ROMID/lib/naudio/n_synthesizer.o (section); \ build/ROMID/lib/ultra/audio/sl.o (section); \ build/ROMID/lib/naudio/n_sndplayer.o (section); \ - build/ROMID/lib/speaker.o (section); \ + build/ROMID/lib/alsurround.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ @@ -82,7 +82,7 @@ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ build/ROMID/lib/naudio/n_cspplay.o (section); \ build/ROMID/lib/naudio/n_cspsetvol.o (section); \ - build/ROMID/lib/lib_39c80.o (section); \ + build/ROMID/lib/naudio/n_cspchan.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ @@ -103,7 +103,7 @@ build/ROMID/lib/naudio/n_seqplayer.o (section); \ build/ROMID/lib/naudio/n_synfilter13.o (section); \ build/ROMID/lib/naudio/n_synfilter12.o (section); \ - build/ROMID/lib/lib_3e3e0.o (section); \ + build/ROMID/lib/naudio/n_syngetfxref.o (section); \ build/ROMID/lib/naudio/n_synsetfxparam.o (section); \ build/ROMID/lib/naudio/n_synfilter11.o (section); \ build/ROMID/lib/ultra/audio/cseq.o (section); \ diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc index 82fbf5a2f..fb4fb691c 100644 --- a/ld/libfiles.ntsc-final.inc +++ b/ld/libfiles.ntsc-final.inc @@ -53,7 +53,7 @@ build/ROMID/lib/varsinit.o (section); \ build/ROMID/lib/mtxasm.o (section); \ build/ROMID/lib/mtx.o (section); \ - build/ROMID/lib/lib_17ce0.o (section); \ + build/ROMID/lib/portal.o (section); \ build/ROMID/lib/ailist.o (section); \ build/ROMID/lib/path.o (section); \ build/ROMID/lib/modelasm.o (section); \ @@ -65,11 +65,11 @@ build/ROMID/lib/rmon.o (section); \ build/ROMID/lib/ultra/audio/heap.o (section); \ build/ROMID/lib/naudio/n_sl.o (section); \ - build/ROMID/lib/lib_2fc60.o (section); \ + build/ROMID/lib/naudio/osc.o (section); \ build/ROMID/lib/naudio/n_synthesizer.o (section); \ build/ROMID/lib/ultra/audio/sl.o (section); \ build/ROMID/lib/naudio/n_sndplayer.o (section); \ - build/ROMID/lib/speaker.o (section); \ + build/ROMID/lib/alsurround.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ @@ -79,7 +79,7 @@ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ build/ROMID/lib/naudio/n_cspplay.o (section); \ build/ROMID/lib/naudio/n_cspsetvol.o (section); \ - build/ROMID/lib/lib_39c80.o (section); \ + build/ROMID/lib/naudio/n_cspchan.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ @@ -100,7 +100,7 @@ build/ROMID/lib/naudio/n_seqplayer.o (section); \ build/ROMID/lib/naudio/n_synfilter13.o (section); \ build/ROMID/lib/naudio/n_synfilter12.o (section); \ - build/ROMID/lib/lib_3e3e0.o (section); \ + build/ROMID/lib/naudio/n_syngetfxref.o (section); \ build/ROMID/lib/naudio/n_synsetfxparam.o (section); \ build/ROMID/lib/naudio/n_synfilter11.o (section); \ build/ROMID/lib/ultra/audio/cseq.o (section); \ diff --git a/ld/libfiles.pal-beta.inc b/ld/libfiles.pal-beta.inc index 88d91f941..5ed034e78 100644 --- a/ld/libfiles.pal-beta.inc +++ b/ld/libfiles.pal-beta.inc @@ -53,7 +53,7 @@ build/ROMID/lib/varsinit.o (section); \ build/ROMID/lib/mtxasm.o (section); \ build/ROMID/lib/mtx.o (section); \ - build/ROMID/lib/lib_17ce0.o (section); \ + build/ROMID/lib/portal.o (section); \ build/ROMID/lib/ailist.o (section); \ build/ROMID/lib/path.o (section); \ build/ROMID/lib/modelasm.o (section); \ @@ -65,11 +65,11 @@ build/ROMID/lib/rmon.o (section); \ build/ROMID/lib/ultra/audio/heap.o (section); \ build/ROMID/lib/naudio/n_sl.o (section); \ - build/ROMID/lib/lib_2fc60.o (section); \ + build/ROMID/lib/naudio/osc.o (section); \ build/ROMID/lib/naudio/n_synthesizer.o (section); \ build/ROMID/lib/ultra/audio/sl.o (section); \ build/ROMID/lib/naudio/n_sndplayer.o (section); \ - build/ROMID/lib/speaker.o (section); \ + build/ROMID/lib/alsurround.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ @@ -79,7 +79,7 @@ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ build/ROMID/lib/naudio/n_cspplay.o (section); \ build/ROMID/lib/naudio/n_cspsetvol.o (section); \ - build/ROMID/lib/lib_39c80.o (section); \ + build/ROMID/lib/naudio/n_cspchan.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ @@ -100,7 +100,7 @@ build/ROMID/lib/naudio/n_seqplayer.o (section); \ build/ROMID/lib/naudio/n_synfilter13.o (section); \ build/ROMID/lib/naudio/n_synfilter12.o (section); \ - build/ROMID/lib/lib_3e3e0.o (section); \ + build/ROMID/lib/naudio/n_syngetfxref.o (section); \ build/ROMID/lib/naudio/n_synsetfxparam.o (section); \ build/ROMID/lib/naudio/n_synfilter11.o (section); \ build/ROMID/lib/ultra/audio/cseq.o (section); \ diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc index 88d91f941..5ed034e78 100644 --- a/ld/libfiles.pal-final.inc +++ b/ld/libfiles.pal-final.inc @@ -53,7 +53,7 @@ build/ROMID/lib/varsinit.o (section); \ build/ROMID/lib/mtxasm.o (section); \ build/ROMID/lib/mtx.o (section); \ - build/ROMID/lib/lib_17ce0.o (section); \ + build/ROMID/lib/portal.o (section); \ build/ROMID/lib/ailist.o (section); \ build/ROMID/lib/path.o (section); \ build/ROMID/lib/modelasm.o (section); \ @@ -65,11 +65,11 @@ build/ROMID/lib/rmon.o (section); \ build/ROMID/lib/ultra/audio/heap.o (section); \ build/ROMID/lib/naudio/n_sl.o (section); \ - build/ROMID/lib/lib_2fc60.o (section); \ + build/ROMID/lib/naudio/osc.o (section); \ build/ROMID/lib/naudio/n_synthesizer.o (section); \ build/ROMID/lib/ultra/audio/sl.o (section); \ build/ROMID/lib/naudio/n_sndplayer.o (section); \ - build/ROMID/lib/speaker.o (section); \ + build/ROMID/lib/alsurround.o (section); \ build/ROMID/lib/naudio/n_csplayer.o (section); \ build/ROMID/lib/naudio/n_cspsetbank.o (section); \ build/ROMID/lib/ultra/audio/bnkf.o (section); \ @@ -79,7 +79,7 @@ build/ROMID/lib/naudio/n_cspsetseq.o (section); \ build/ROMID/lib/naudio/n_cspplay.o (section); \ build/ROMID/lib/naudio/n_cspsetvol.o (section); \ - build/ROMID/lib/lib_39c80.o (section); \ + build/ROMID/lib/naudio/n_cspchan.o (section); \ build/ROMID/lib/naudio/n_seqpstop.o (section); \ build/ROMID/lib/naudio/n_syndelete.o (section); \ build/ROMID/lib/ultra/audio/cents2ratio.o (section); \ @@ -100,7 +100,7 @@ build/ROMID/lib/naudio/n_seqplayer.o (section); \ build/ROMID/lib/naudio/n_synfilter13.o (section); \ build/ROMID/lib/naudio/n_synfilter12.o (section); \ - build/ROMID/lib/lib_3e3e0.o (section); \ + build/ROMID/lib/naudio/n_syngetfxref.o (section); \ build/ROMID/lib/naudio/n_synsetfxparam.o (section); \ build/ROMID/lib/naudio/n_synfilter11.o (section); \ build/ROMID/lib/ultra/audio/cseq.o (section); \ diff --git a/src/game/bg.c b/src/game/bg.c index 0975d1ac6..2b51e187a 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -31,7 +31,7 @@ #include "bss.h" #include "lib/crash.h" #include "lib/dma.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/lib_2f490.h" #include "lib/main.h" #include "lib/mema.h" diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 9f15711d4..e837014c6 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -28,7 +28,7 @@ #include "game/options.h" #include "game/propobj.h" #include "bss.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/vi.h" #include "lib/collision.h" #include "lib/joy.h" diff --git a/src/game/chraction.c b/src/game/chraction.c index ed2b902b4..04760e59d 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -44,7 +44,7 @@ #include "game/wallhit.h" #include "bss.h" #include "lib/joy.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/main.h" #include "lib/model.h" #include "lib/snd.h" diff --git a/src/game/dlights.c b/src/game/dlights.c index 5a9e4b3c2..c86420268 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -23,7 +23,7 @@ #include "lib/memp.h" #include "lib/rng.h" #include "lib/mtx.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/lib_2f490.h" #include "lib/lib_317f0.h" #include "data.h" diff --git a/src/game/lv.c b/src/game/lv.c index 0e8254aed..8d9fdc1c4 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -85,7 +85,6 @@ #include "lib/collision.h" #include "lib/crash.h" #include "lib/joy.h" -#include "lib/lib_06440.h" #include "lib/lib_317f0.h" #include "lib/main.h" #include "lib/mtx.h" diff --git a/src/game/pak.c b/src/game/pak.c index d261eb1a3..775124cd7 100644 --- a/src/game/pak.c +++ b/src/game/pak.c @@ -15,7 +15,6 @@ #include "lib/args.h" #include "lib/crash.h" #include "lib/joy.h" -#include "lib/lib_06440.h" #include "lib/main.h" #include "lib/memp.h" #include "lib/rng.h" diff --git a/src/game/player.c b/src/game/player.c index ef796ae81..9dc1f6d95 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -58,7 +58,7 @@ #include "lib/ailist.h" #include "lib/collision.h" #include "lib/joy.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/vi.h" #include "lib/main.h" #include "lib/snd.h" diff --git a/src/game/prop.c b/src/game/prop.c index b918531fe..494f554ba 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -30,7 +30,7 @@ #include "game/mpstats.h" #include "bss.h" #include "lib/collision.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/model.h" #include "lib/snd.h" #include "lib/rng.h" diff --git a/src/game/propobj.c b/src/game/propobj.c index 60f1e7bd3..9243f508f 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -71,7 +71,7 @@ #include "lib/mtx.h" #include "lib/anim.h" #include "lib/collision.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/lib_317f0.h" #include "data.h" #include "textures.h" diff --git a/src/game/splat.c b/src/game/splat.c index 1b3419b29..10ca1343f 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -7,7 +7,7 @@ #include "game/utils.h" #include "game/wallhit.h" #include "bss.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/model.h" #include "lib/rng.h" #include "lib/mtx.h" diff --git a/src/include/lib/lib_06440.h b/src/include/lib/lib_06440.h deleted file mode 100644 index ccc64ec47..000000000 --- a/src/include/lib/lib_06440.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _IN_LIB_LIB_06440_H -#define _IN_LIB_LIB_06440_H -#include -#include "data.h" -#include "types.h" - -s32 osEepromLongWrite(OSMesgQueue *mq, u8 address, u8 *buffer, int nbytes); - -#endif diff --git a/src/include/lib/lib_2fc60.h b/src/include/lib/osc.h similarity index 76% rename from src/include/lib/lib_2fc60.h rename to src/include/lib/osc.h index 3aa2459f8..b00aa75ae 100644 --- a/src/include/lib/lib_2fc60.h +++ b/src/include/lib/osc.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIB_LIB_2FC60_H -#define _IN_LIB_LIB_2FC60_H +#ifndef _IN_LIB_OSC_H +#define _IN_LIB_OSC_H #include #include "data.h" #include "types.h" diff --git a/src/include/lib/lib_17ce0.h b/src/include/lib/portal.h similarity index 89% rename from src/include/lib/lib_17ce0.h rename to src/include/lib/portal.h index 42672fec6..5a804e875 100644 --- a/src/include/lib/lib_17ce0.h +++ b/src/include/lib/portal.h @@ -1,5 +1,5 @@ -#ifndef _IN_LIB_LIB_17CE0_H -#define _IN_LIB_LIB_17CE0_H +#ifndef _IN_LIB_PORTAL_H +#define _IN_LIB_PORTAL_H #include #include "data.h" #include "types.h" diff --git a/src/lib/speaker.c b/src/lib/alsurround.c similarity index 97% rename from src/lib/speaker.c rename to src/lib/alsurround.c index ccc56370a..0ce369493 100644 --- a/src/lib/speaker.c +++ b/src/lib/alsurround.c @@ -4,7 +4,7 @@ #include "bss.h" #include "lib/snd.h" #include "lib/speaker.h" -#include "lib/lib_2fc60.h" +#include "lib/osc.h" #include "lib/lib_317f0.h" #include "lib/lib_39c80.h" #include "lib/lib_3d280.h" diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c index a2d8ae936..464ddb827 100644 --- a/src/lib/audiomgr.c +++ b/src/lib/audiomgr.c @@ -5,7 +5,7 @@ #include "constants.h" #include "bss.h" #include "lib/audiodma.h" -#include "lib/lib_2fc60.h" +#include "lib/osc.h" #include "lib/profile.h" #include "lib/libc/ll.h" #include "data.h" diff --git a/src/lib/collision.c b/src/lib/collision.c index 604772827..1c2c65c0d 100644 --- a/src/lib/collision.c +++ b/src/lib/collision.c @@ -7,7 +7,7 @@ #include "lib/dma.h" #include "lib/memp.h" #include "lib/mtx.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/anim.h" #include "lib/collision.h" #include "lib/lib_2f490.h" diff --git a/src/lib/lib_39c80.c b/src/lib/naudio/n_cspchan.c similarity index 100% rename from src/lib/lib_39c80.c rename to src/lib/naudio/n_cspchan.c diff --git a/src/lib/lib_3e3e0.c b/src/lib/naudio/n_syngetfxref.c similarity index 92% rename from src/lib/lib_3e3e0.c rename to src/lib/naudio/n_syngetfxref.c index 125bb32d3..27c83229c 100644 --- a/src/lib/lib_3e3e0.c +++ b/src/lib/naudio/n_syngetfxref.c @@ -1,6 +1,6 @@ #include #include -#include "naudio/n_synthInternals.h" +#include "n_synthInternals.h" ALFxRef n_alSynGetFXRef(s16 bus) { diff --git a/src/lib/lib_2fc60.c b/src/lib/naudio/osc.c similarity index 100% rename from src/lib/lib_2fc60.c rename to src/lib/naudio/osc.c diff --git a/src/lib/lib_17ce0.c b/src/lib/portal.c similarity index 99% rename from src/lib/lib_17ce0.c rename to src/lib/portal.c index e70f2f277..813b0058a 100644 --- a/src/lib/lib_17ce0.c +++ b/src/lib/portal.c @@ -3,7 +3,7 @@ #include "game/atan2f.h" #include "game/padhalllv.h" #include "bss.h" -#include "lib/lib_17ce0.h" +#include "lib/portal.h" #include "lib/mtx.h" #include "data.h" #include "types.h" diff --git a/src/lib/snd.c b/src/lib/snd.c index b539c5eff..3390f05d5 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -15,7 +15,7 @@ #include "lib/memp.h" #include "lib/rng.h" #include "lib/str.h" -#include "lib/lib_2fc60.h" +#include "lib/osc.h" #include "lib/lib_317f0.h" #include "lib/mp3.h" #include "lib/lib_39c80.h"