Rename some audio files

This commit is contained in:
Ryan Dwyer 2025-03-09 11:28:39 +10:00
parent d7909db729
commit ecef69b58f
27 changed files with 46 additions and 63 deletions

View File

@ -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))

View File

@ -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); \

View File

@ -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); \

View File

@ -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); \

View File

@ -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); \

View File

@ -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); \

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -1,9 +0,0 @@
#ifndef _IN_LIB_LIB_06440_H
#define _IN_LIB_LIB_06440_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
s32 osEepromLongWrite(OSMesgQueue *mq, u8 address, u8 *buffer, int nbytes);
#endif

View File

@ -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 <ultra64.h>
#include "data.h"
#include "types.h"

View File

@ -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 <ultra64.h>
#include "data.h"
#include "types.h"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -1,6 +1,6 @@
#include <ultra64.h>
#include <n_libaudio.h>
#include "naudio/n_synthInternals.h"
#include "n_synthInternals.h"
ALFxRef n_alSynGetFXRef(s16 bus)
{

View File

@ -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"

View File

@ -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"