diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index e94192e9..a6ac17a4 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -2904,6 +2904,8 @@ nw4r/snd/snd_AxVoice.cpp: nw4r/snd/snd_AxVoiceManager.cpp: .text start:0x80467640 end:0x80467DC8 align:16 + .sbss start:0x80576668 end:0x80576670 + .bss start:0x80659390 end:0x806593C8 nw4r/snd/snd_AxfxImpl.cpp: .text start:0x80467DD0 end:0x80467FC8 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 2c386f32..a44a13fb 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -25088,7 +25088,7 @@ SetVoiceSrcType__Q44nw4r3snd6detail17AxVoiceParamBlockFUl = .text:0x804671E0; // SetVoiceRmtMix__Q44nw4r3snd6detail17AxVoiceParamBlockFRC11_AXPBRMTMIX = .text:0x804672C0; // type:function size:0x1EC SetVoiceRmtIIRCoefs__Q44nw4r3snd6detail17AxVoiceParamBlockFUse = .text:0x804674B0; // type:function size:0x184 GetInstance__Q44nw4r3snd6detail14AxVoiceManagerFv = .text:0x80467640; // type:function size:0x8C -__dt__Q44nw4r3snd6detail14AxVoiceManagerFv = .text:0x804676D0; // type:function size:0x84 +__dt__Q44nw4r3snd6detail14AxVoiceManagerFv = .text:0x804676D0; // type:function size:0x84 scope:weak GetRequiredMemSize__Q44nw4r3snd6detail14AxVoiceManagerFi = .text:0x80467760; // type:function size:0xC Setup__Q44nw4r3snd6detail14AxVoiceManagerFPvUl = .text:0x80467770; // type:function size:0xBC AcquireAxVoice__Q44nw4r3snd6detail14AxVoiceManagerFUlPFPQ44nw4r3snd6detail7AxVoiceQ54nw4r3snd6detail7AxVoice21AxVoiceCallbackStatusPv_vPv = .text:0x80467830; // type:function size:0x2B8 @@ -42421,7 +42421,7 @@ sBiquadFilterBpf1024__Q44nw4r3snd6detail9AxManager = .sbss:0x8057665C; // type:o sBiquadFilterBpf2048__Q44nw4r3snd6detail9AxManager = .sbss:0x80576660; // type:object size:0x4 data:4byte @GUARD@GetInstance__Q44nw4r3snd6detail9AxManagerFv@instance = .sbss:0x80576664; // type:object size:0x1 scope:weak data:byte @LOCAL@AiDmaCallbackFunc__Q44nw4r3snd6detail9AxManagerFv@finishedFlag = .sbss:0x80576665; // type:object size:0x1 scope:weak data:byte -lbl_80576668 = .sbss:0x80576668; // type:object size:0x8 data:byte +@GUARD@GetInstance__Q44nw4r3snd6detail14AxVoiceManagerFv@instance = .sbss:0x80576668; // type:object size:0x1 scope:weak data:byte lbl_80576670 = .sbss:0x80576670; // type:object size:0x4 data:4byte lbl_80576674 = .sbss:0x80576674; // type:object size:0x4 data:4byte lbl_80576678 = .sbss:0x80576678; // type:object size:0x8 data:4byte @@ -51933,8 +51933,8 @@ sZeroBuffer__Q44nw4r3snd6detail9AxManager = .bss:0x80658F80; // type:object size sBiquadFilterCallbackTable__Q44nw4r3snd6detail9AxManager = .bss:0x80659080; // type:object size:0x200 @1190 = .bss:0x80659280; // type:object size:0xC scope:local @LOCAL@GetInstance__Q44nw4r3snd6detail9AxManagerFv@instance = .bss:0x8065928C; // type:object size:0x104 scope:weak data:4byte -lbl_80659390 = .bss:0x80659390; // type:object size:0xC -lbl_8065939C = .bss:0x8065939C; // type:object size:0x2C data:4byte +@986 = .bss:0x80659390; // type:object size:0xC scope:local +@LOCAL@GetInstance__Q44nw4r3snd6detail14AxVoiceManagerFv@instance = .bss:0x8065939C; // type:object size:0x2C scope:weak data:4byte lbl_806593C8 = .bss:0x806593C8; // type:object size:0x10 lbl_806593D8 = .bss:0x806593D8; // type:object size:0x20 data:4byte @781 = .bss:0x806593F8; // type:object size:0xC scope:local diff --git a/configure.py b/configure.py index 693a0f7d..7003dbba 100644 --- a/configure.py +++ b/configure.py @@ -1015,7 +1015,7 @@ config.libs = [ Object(NonMatching, "nw4r/snd/snd_AnimSound.cpp"), Object(Matching, "nw4r/snd/snd_AxManager.cpp"), Object(NonMatching, "nw4r/snd/snd_AxVoice.cpp"), - Object(NonMatching, "nw4r/snd/snd_AxVoiceManager.cpp"), + Object(Matching, "nw4r/snd/snd_AxVoiceManager.cpp"), Object(NonMatching, "nw4r/snd/snd_AxfxImpl.cpp"), Object(NonMatching, "nw4r/snd/snd_Bank.cpp"), Object(NonMatching, "nw4r/snd/snd_BankFile.cpp"),