From 2e5c4230eae3f72b954521e3a25390a58071a838 Mon Sep 17 00:00:00 2001 From: robojumper Date: Mon, 26 May 2025 02:10:29 +0200 Subject: [PATCH] snd_MmlSeqTrackAllocator OK --- config/SOUE01/splits.txt | 1 + config/SOUE01/symbols.txt | 6 +++--- configure.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 90ac484a..6ad9eaa0 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -2990,6 +2990,7 @@ nw4r/snd/snd_MmlSeqTrack.cpp: nw4r/snd/snd_MmlSeqTrackAllocator.cpp: .text start:0x8046F700 end:0x8046F850 align:16 + .data start:0x8056DF58 end:0x8056DF70 nw4r/snd/snd_NandSoundArchive.cpp: .text start:0x8046F850 end:0x804700B8 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 925dc390..75158385 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -25302,8 +25302,8 @@ AllocTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail9SeqPlay FreeTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail8SeqTrack = .text:0x8046F770; // type:function size:0x68 Create__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPvUl = .text:0x8046F7E0; // type:function size:0xC Destroy__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPvUl = .text:0x8046F7F0; // type:function size:0x8 -GetAllocatableTrackCount__Q44nw4r3snd6detail20MmlSeqTrackAllocatorCFv = .text:0x8046F800; // type:function size:0x8 -__dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv = .text:0x8046F810; // type:function size:0x40 +GetAllocatableTrackCount__Q44nw4r3snd6detail20MmlSeqTrackAllocatorCFv = .text:0x8046F800; // type:function size:0x8 scope:weak +__dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv = .text:0x8046F810; // type:function size:0x40 scope:weak __ct__Q34nw4r3snd16NandSoundArchiveFv = .text:0x8046F850; // type:function size:0x4C __dt__Q34nw4r3snd16NandSoundArchiveFv = .text:0x8046F8A0; // type:function size:0x8C Open__Q34nw4r3snd16NandSoundArchiveFPCc = .text:0x8046F930; // type:function size:0x1BC @@ -38598,7 +38598,7 @@ __vt__Q34nw4r3snd18MemorySoundArchive = .data:0x8056DCF8; // type:object size:0x @3190 = .data:0x8056DD40; // type:object size:0x1F4 scope:local __vt__Q44nw4r3snd6detail9MmlParser = .data:0x8056DF38; // type:object size:0x10 __vt__Q44nw4r3snd6detail11MmlSeqTrack = .data:0x8056DF48; // type:object size:0x10 -lbl_8056DF58 = .data:0x8056DF58; // type:object size:0x18 +__vt__Q44nw4r3snd6detail20MmlSeqTrackAllocator = .data:0x8056DF58; // type:object size:0x18 lbl_8056DF70 = .data:0x8056DF70; // type:object size:0x60 lbl_8056DFD0 = .data:0x8056DFD0; // type:object size:0x20 __vt__Q44nw4r3snd6detail10PlayerHeap = .data:0x8056DFF0; // type:object size:0x10 diff --git a/configure.py b/configure.py index abdcf881..5c6a28c8 100644 --- a/configure.py +++ b/configure.py @@ -1042,7 +1042,7 @@ config.libs = [ Object(Matching, "nw4r/snd/snd_MidiSeqPlayer.cpp"), Object(Matching, "nw4r/snd/snd_MmlParser.cpp"), Object(Matching, "nw4r/snd/snd_MmlSeqTrack.cpp"), - Object(NonMatching, "nw4r/snd/snd_MmlSeqTrackAllocator.cpp"), + Object(Matching, "nw4r/snd/snd_MmlSeqTrackAllocator.cpp"), Object(NonMatching, "nw4r/snd/snd_NandSoundArchive.cpp"), Object(Matching, "nw4r/snd/snd_PlayerHeap.cpp"), Object(Matching, "nw4r/snd/snd_RemoteSpeaker.cpp"),