diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 9e10f49..9db53a7 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -16,7 +16,8 @@ osPfsRepairId = 0x80096E60; // rom:0x27260 osPfsFreeBlocks = 0x80096980; // rom:0x26D80 osPfsFindFile = 0x800967C0; // rom:0x26BC0 -osAiGetStatus = 0x80099BC0; // rom:0x29FC0 +osAiSetNextBuffer = 0x8008C550; // rom:0x1C950 +__osAiDeviceBusy = 0x80099BC0; // rom:0x29FC0 __OVERLAY_INFO_8018F330 = 0x8018F330; // size:0x14 __OVERLAY_INFO_8018F344 = 0x8018F344; // size:0x14 @@ -690,7 +691,7 @@ alResampleParam = 0x8008EA6C; alEnvmixerNew = 0x8008CB2C; alEnvmixerParam = 0x8008DF40; alAuxBusParam = 0x8008DA0C; -alAudioFrame = 0x8008FBEC; + __allocParam = 0x8008FD9C; __freeParam = 0x8008FDC8; _collectPVoices = 0x8008FDE0; @@ -984,6 +985,7 @@ n64_wave_data_VRAM = 0xD_8010A760; // rom:0x5FCF0 alSynAddPlayer = 0x80088000; // rom:0x18400 alSynAllocVoice = 0x80088050; // rom:0x18450 alSynStopVoice = 0x80088550; // rom:0x18950 +alAudioFrame = 0x80088840; // rom:0x18C40 alSynAllocFX = 0x8008FF70; alFxNew = 0x8008C694; diff --git a/linker_scripts/symbols/libmus_addr.txt b/linker_scripts/symbols/libmus_addr.txt index 1e88fff..9a3e825 100644 --- a/linker_scripts/symbols/libmus_addr.txt +++ b/linker_scripts/symbols/libmus_addr.txt @@ -30,6 +30,8 @@ __MusIntMemSet = 0x80085B30; // rom:0x15F30 __MusIntMemMove = 0x80085B5C; // rom:0x15F5C __MusIntRemapPtrs = 0x80083A3C; // rom:0x13E3C +__MusIntSamplesCurrent = 0x80085C74; // rom:0x16074 +__MusIntDmaProcess = 0x80085334; // rom:0x15734 // player_fifo.c __MusIntFifoOpen = 0x80082130; // rom:0x12530 diff --git a/splat.yaml b/splat.yaml index dfac600..c41641a 100644 --- a/splat.yaml +++ b/splat.yaml @@ -257,7 +257,7 @@ segments: - [0x29CC0, asm, "libultra/io/pigetcmdq"] - [0x29CE0, asm, "libultra/io/epirawread"] - [0x29E50, asm, "libultra/io/epirawwrite"] - - [0x29FC0, asm, "libultra/io/aigetstat"] + - [0x29FC0, asm, "libultra/io/ai"] - [0x29FE0, asm, "libc/xprintf"] - [0x2AA30, asm, "libultra/io/dpsetnextbuf"] - [0x2AAD0, asm, "libultra/os/getcause"] @@ -284,7 +284,7 @@ segments: - [0x2BA70, asm, "libc/xlitob"] - [0x2BCC0, asm, "libc/xldtob"] - [0x2C750, asm, "libultra/io/dp"] - - [0x2C770, asm] + - [0x2C770, asm, "libultra/io/si"] - [0x2C790, asm] - [0x2C950, asm] - [0x2C990, asm]