Skip to content

Commit cca64d8

Browse files
RevoSucksRevoSucks
authored
Merge pull request #131 from RevoSucks/naudio
identify naudio files
2 parents 812d1cc + e934004 commit cca64d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3601
-228
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ SPLAT_YAML := $(TARGET)-$(VERSION).yaml
128128

129129
ENCRYPT_LIBLEO := $(PYTHON) tools/encrypt_libleo.py
130130

131-
IINC := -Iinclude -Isrc -Iassets/$(VERSION) -I. -I$(BUILD_DIR)
131+
IINC := -Iinclude -Isrc -Isrc/libnaudio -Iassets/$(VERSION) -I. -I$(BUILD_DIR)
132132
IINC += -Ilib/ultralib/include -Ilib/ultralib/include/PR -Ilib/ultralib/include/ido
133133
IINC += -Iinclude/
134134

@@ -145,7 +145,7 @@ MIPS_BUILTIN_DEFS := -DMIPSEB -D_MIPS_FPSET=16 -D_MIPS_ISA=2 -D_ABIO32=1 -D_MIPS
145145
ifneq ($(RUN_CC_CHECK),0)
146146
# The -MMD flags additionaly creates a .d file with the same name as the .o file.
147147
CC_CHECK := $(CC_CHECK_COMP)
148-
CC_CHECK_FLAGS := -MMD -MP -fno-builtin -fsyntax-only -funsigned-char -fdiagnostics-color -std=gnu89 -m32 -DNON_MATCHING -DAVOID_UB -DCC_CHECK=1
148+
CC_CHECK_FLAGS := -MMD -MP -fno-builtin -fsyntax-only -funsigned-char -fdiagnostics-color -std=gnu89 -m32 -DNON_MATCHING -DAVOID_UB -DCC_CHECK
149149
ifneq ($(WERROR), 0)
150150
CHECK_WARNINGS += -Werror
151151
endif
@@ -160,7 +160,7 @@ WARNINGS := -fullwarn -verbose -woff 624,649,838,712,516,513,596,564,594
160160
ASFLAGS := -march=vr4300 -32 -G0
161161
COMMON_DEFINES := -D_MIPS_SZLONG=32
162162
GBI_DEFINES := -DF3DEX_GBI_2
163-
RELEASE_DEFINES := -DNDEBUG -D_FINALROM
163+
RELEASE_DEFINES := -DNDEBUG -D_FINALROM -DN_MICRO
164164
AS_DEFINES := -DMIPSEB -D_LANGUAGE_ASSEMBLY -D_ULTRA64
165165
C_DEFINES := -DLANGUAGE_C -D_LANGUAGE_C
166166
LIBULTRA_DEFINES := -DBUILD_VERSION=VERSION_$(ULTRALIB_VERSION)

‎linker_scripts/us/symbol_addrs.txt

+9
Original file line numberDiff line numberDiff line change
@@ -262,3 +262,12 @@ D_862082A0 = 0x862082A0; // size:0x10
262262
D_800AE4E8 = 0x800AE4E8; // size:0x30
263263
D_80072EE0 = 0x80072EE0;
264264
D_80077970 = 0x80077970; // size:0x2F3
265+
n_alGlobals = 0x80078580;
266+
n_syn = 0x80078584;
267+
SMALLROOM_PARAMS_N = 0x80079370;
268+
BIGROOM_PARAMS_N = 0x800793D8;
269+
ECHO_PARAMS_N = 0x80079460;
270+
CHORUS_PARAMS_N = 0x80079488;
271+
FLANGE_PARAMS_N = 0x800794B0;
272+
NULL_PARAMS_N = 0x800794D8;
273+
n_eqpower = 0x80078600;

‎linker_scripts/us/symbol_addrs_code.txt

+43-43
Original file line numberDiff line numberDiff line change
@@ -1300,8 +1300,8 @@ func_800420F0 = 0x800420F0; // type:func
13001300
func_80042158 = 0x80042158; // type:func
13011301
func_80042850 = 0x80042850; // type:func
13021302
func_800428FC = 0x800428FC; // type:func
1303-
func_80042920 = 0x80042920; // type:func
1304-
func_8004296C = 0x8004296C; // type:func
1303+
n_alInit = 0x80042920; // type:func
1304+
n_alClose = 0x8004296C; // type:func
13051305
func_800429B0 = 0x800429B0; // type:func
13061306
func_800429D0 = 0x800429D0; // type:func
13071307
func_80042A2C = 0x80042A2C; // type:func
@@ -1363,12 +1363,12 @@ func_80045A80 = 0x80045A80; // type:func
13631363
func_80045C78 = 0x80045C78; // type:func
13641364
func_80045D60 = 0x80045D60; // type:func
13651365
func_80045FF0 = 0x80045FF0; // type:func
1366-
func_80046EF0 = 0x80046EF0; // type:func
1367-
func_80046F60 = 0x80046F60; // type:func
1368-
func_80047500 = 0x80047500; // type:func
1369-
func_800475A4 = 0x800475A4; // type:func
1370-
func_800477D0 = 0x800477D0; // type:func
1371-
func_80047958 = 0x80047958; // type:func
1366+
n_alSynStopVoice = 0x80046EF0; // type:func
1367+
n_alEnvmixerPull = 0x80046F60; // type:func
1368+
n_alEnvmixerParam = 0x80047500; // type:func
1369+
_pullSubFrame = 0x800475A4; // type:func
1370+
_getRate = 0x800477D0; // type:func
1371+
_getVol = 0x80047958; // type:func
13721372
func_800479C0 = 0x800479C0; // type:func
13731373
func_80048014 = 0x80048014; // type:func
13741374
func_80048060 = 0x80048060; // type:func
@@ -1382,17 +1382,17 @@ func_80048590 = 0x80048590; // type:func
13821382
func_80048684 = 0x80048684; // type:func
13831383
func_80048904 = 0x80048904; // type:func
13841384
func_80048B90 = 0x80048B90; // type:func
1385-
func_80048FA0 = 0x80048FA0; // type:func
1386-
func_800490CC = 0x800490CC; // type:func
1387-
func_800491C0 = 0x800491C0; // type:func
1388-
func_80049490 = 0x80049490; // type:func
1389-
func_800495F8 = 0x800495F8; // type:func
1390-
func_80049628 = 0x80049628; // type:func
1391-
func_80049648 = 0x80049648; // type:func
1392-
func_800496AC = 0x800496AC; // type:func
1393-
func_800496E0 = 0x800496E0; // type:func
1394-
func_80049734 = 0x80049734; // type:func
1395-
func_80049760 = 0x80049760; // type:func
1385+
n_alSynAllocVoice = 0x80048FA0; // type:func
1386+
_allocatePVoice = 0x800490CC; // type:func
1387+
n_alSynNew = 0x800491C0; // type:func
1388+
n_alAudioFrame = 0x80049490; // type:func
1389+
__n_allocParam = 0x800495F8; // type:func
1390+
_n_freeParam = 0x80049628; // type:func
1391+
_n_collectPVoices = 0x80049648; // type:func
1392+
_n_freePVoice = 0x800496AC; // type:func
1393+
_n_timeToSamplesNoRound = 0x800496E0; // type:func
1394+
_n_timeToSamples = 0x80049734; // type:func
1395+
n_alSynSetPan = 0x80049760; // type:func
13961396
func_800497E0 = 0x800497E0; // type:func
13971397
func_8004980C = 0x8004980C; // type:func
13981398
func_80049890 = 0x80049890; // type:func
@@ -1448,38 +1448,38 @@ func_8004DF94 = 0x8004DF94; // type:func
14481448
func_8004E304 = 0x8004E304; // type:func
14491449
func_8004E810 = 0x8004E810; // type:func
14501450
func_8004EBC8 = 0x8004EBC8; // type:func
1451-
func_8004EBF0 = 0x8004EBF0; // type:func
1452-
func_8004EC70 = 0x8004EC70; // type:func
1453-
func_8004F084 = 0x8004F084; // type:func
1454-
func_8004F1B0 = 0x8004F1B0; // type:func
1455-
func_8004F260 = 0x8004F260; // type:func
1456-
func_8004F2F0 = 0x8004F2F0; // type:func
1457-
func_8004F350 = 0x8004F350; // type:func
1458-
func_8004F4F8 = 0x8004F4F8; // type:func
1459-
func_8004F520 = 0x8004F520; // type:func
1460-
func_8004F95C = 0x8004F95C; // type:func
1461-
func_8004FB1C = 0x8004FB1C; // type:func
1451+
n_alSynSetPitch = 0x8004EBF0; // type:func
1452+
n_alFxNew = 0x8004EC70; // type:func
1453+
alN_PVoiceNew = 0x8004F084; // type:func
1454+
n_alAuxBusPull = 0x8004F1B0; // type:func
1455+
n_alSynSetFXMix = 0x8004F260; // type:func
1456+
n_alSynAddPlayer = 0x8004F2F0; // type:func
1457+
n_alResamplePull = 0x8004F350; // type:func
1458+
n_alResampleParam = 0x8004F4F8; // type:func
1459+
n_alAdpcmPull = 0x8004F520; // type:func
1460+
n_alLoadParam = 0x8004F95C; // type:func
1461+
_decodeChunk = 0x8004FB1C; // type:func
14621462
func_8004FC60 = 0x8004FC60; // type:func
14631463
func_8004FCD8 = 0x8004FCD8; // type:func
14641464
func_8004FD44 = 0x8004FD44; // type:func
14651465
func_8004FD64 = 0x8004FD64; // type:func
1466-
func_8004FD90 = 0x8004FD90; // type:func
1467-
func_8004FDA0 = 0x8004FDA0; // type:func
1466+
n_alSynDelete = 0x8004FD90; // type:func
1467+
n_alSynAllocFX = 0x8004FDA0; // type:func
14681468
func_8004FE00 = 0x8004FE00; // type:func
14691469
func_8004FF20 = 0x8004FF20; // type:func
1470-
func_8004FF40 = 0x8004FF40; // type:func
1471-
func_80050020 = 0x80050020; // type:func
1472-
func_800500C0 = 0x800500C0; // type:func
1473-
func_800503A0 = 0x800503A0; // type:func
1474-
func_80050600 = 0x80050600; // type:func
1475-
func_80050818 = 0x80050818; // type:func
1476-
func_80050960 = 0x80050960; // type:func
1477-
func_80050A8C = 0x80050A8C; // type:func
1470+
n_alSynStartVoiceParams = 0x8004FF40; // type:func
1471+
n_alSynFreeVoice = 0x80050020; // type:func
1472+
n_alFxPull = 0x800500C0; // type:func
1473+
n_alFxParamHdl = 0x800503A0; // type:func
1474+
_n_loadOutputBuffer = 0x80050600; // type:func
1475+
_n_loadBuffer = 0x80050818; // type:func
1476+
_n_saveBuffer = 0x80050960; // type:func
1477+
_n_filterBuffer = 0x80050A8C; // type:func
14781478
func_80050B40 = 0x80050B40; // type:func
14791479
func_80050BA0 = 0x80050BA0; // type:func
1480-
func_80050C50 = 0x80050C50; // type:func
1481-
func_80050CA0 = 0x80050CA0; // type:func
1482-
func_80050F20 = 0x80050F20; // type:func
1480+
n_alSavePull = 0x80050C50; // type:func
1481+
n_alMainBusPull = 0x80050CA0; // type:func
1482+
n_alSynSetVol = 0x80050F20; // type:func
14831483
LeoReadWrite = 0x80050FC0; // type:func
14841484
leoInitialize = 0x80051050; // type:func
14851485
leoCommand = 0x80051224; // type:func

‎src/43520.c

-26
This file was deleted.

‎src/46680.c

-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@
77
#pragma GLOBAL_ASM("asm/us/nonmatchings/46680/func_80045D60.s")
88

99
#pragma GLOBAL_ASM("asm/us/nonmatchings/46680/func_80045FF0.s")
10-
11-
#pragma GLOBAL_ASM("asm/us/nonmatchings/46680/func_80046EF0.s")

‎src/47B60.c

-11
This file was deleted.

‎src/49BA0.c

-5
This file was deleted.

‎src/49DC0.c

-17
This file was deleted.

‎src/4A360.c

-3
This file was deleted.

‎src/4F7F0.c

-39
This file was deleted.

‎src/4F870.c

-5
This file was deleted.

‎src/4FDB0.c

-3
This file was deleted.

‎src/4FE60.c

-5
This file was deleted.

‎src/4FF50.c

-5
This file was deleted.

‎src/50120.c

-7
This file was deleted.

‎src/50990.c

-5
This file was deleted.

‎src/50A00.c

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
#pragma GLOBAL_ASM("asm/us/nonmatchings/50A00/func_8004FE00.s")
44

55
#pragma GLOBAL_ASM("asm/us/nonmatchings/50A00/func_8004FF20.s")
6-
7-
#pragma GLOBAL_ASM("asm/us/nonmatchings/50A00/func_8004FF40.s")

‎src/50C20.c

-3
This file was deleted.

‎src/50CC0.c

-15
This file was deleted.

‎src/51740.c

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "global.h"
2+
3+
4+
#pragma GLOBAL_ASM("asm/us/nonmatchings/51740/func_80050B40.s")

‎src/51850.c

-3
This file was deleted.

‎src/518A0.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#include "global.h"
22

3-
#pragma GLOBAL_ASM("asm/us/nonmatchings/518A0/func_80050CA0.s")
3+
#pragma GLOBAL_ASM("asm/us/nonmatchings/518A0/n_alMainBusPull.s")

‎src/51B20.c

-3
This file was deleted.

0 commit comments

Comments
 (0)