From 98f5df52eb9e8e5d55db99c5011c6cc2243a74b3 Mon Sep 17 00:00:00 2001 From: robojumper Date: Mon, 26 May 2025 02:05:57 +0200 Subject: [PATCH] snd_MmlParser OK --- config/SOUE01/splits.txt | 4 ++++ config/SOUE01/symbols.txt | 26 +++++++++++++------------- configure.py | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index b32a4628..e170b4ed 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -2979,6 +2979,10 @@ nw4r/snd/snd_MidiSeqPlayer.cpp: nw4r/snd/snd_MmlParser.cpp: .text start:0x8046E460 end:0x8046F63C align:16 + .data start:0x8056DD18 end:0x8056DF48 + .sdata start:0x80574E90 end:0x80574EA0 + .sbss start:0x80576690 end:0x80576698 + .sdata2 start:0x8057F048 end:0x8057F068 nw4r/snd/snd_MmlSeqTrack.cpp: .text start:0x8046F640 end:0x8046F6F8 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index af37808a..2d802951 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -38594,9 +38594,9 @@ __vt__Q34nw4r3snd15DvdSoundArchive = .data:0x8056DC50; // type:object size:0x20 lbl_8056DC70 = .data:0x8056DC70; // type:object size:0x28 __vt__Q44nw4r3snd18MemorySoundArchive16MemoryFileStream = .data:0x8056DC98; // type:object size:0x5C __vt__Q34nw4r3snd18MemorySoundArchive = .data:0x8056DCF8; // type:object size:0x20 -lbl_8056DD18 = .data:0x8056DD18; // type:object size:0x28 -jumptable_8056DD40 = .data:0x8056DD40; // type:object size:0x1F4 scope:local -lbl_8056DF38 = .data:0x8056DF38; // type:object size:0x10 +@3186 = .data:0x8056DD18; // type:object size:0x27 scope:local data:string +@3190 = .data:0x8056DD40; // type:object size:0x1F4 scope:local +__vt__Q44nw4r3snd6detail9MmlParser = .data:0x8056DF38; // type:object size:0x10 lbl_8056DF48 = .data:0x8056DF48; // type:object size:0x10 lbl_8056DF58 = .data:0x8056DF58; // type:object size:0x18 lbl_8056DF70 = .data:0x8056DF70; // type:object size:0x60 @@ -41144,9 +41144,9 @@ pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@ = .sdata:0x8057 @13309 = .sdata:0x80574E78; // type:object size:0x8 scope:local data:string @13310 = .sdata:0x80574E80; // type:object size:0x8 scope:local data:string NW4R_G3D_Version___22@unnamed@g3d_init_cpp@ = .sdata:0x80574E88; // type:object size:0x4 scope:local data:4byte -lbl_80574E90 = .sdata:0x80574E90; // type:object size:0x4 -lbl_80574E94 = .sdata:0x80574E94; // type:object size:0x4 -lbl_80574E98 = .sdata:0x80574E98; // type:object size:0x8 +@3183 = .sdata:0x80574E90; // type:object size:0x2 scope:local data:string +@3184 = .sdata:0x80574E94; // type:object size:0x2 scope:local data:string +@3185 = .sdata:0x80574E98; // type:object size:0x1 scope:local lbl_80574EA0 = .sdata:0x80574EA0; // type:object size:0x8 data:4byte @LOCAL@CalcRandom__Q44nw4r3snd6detail4UtilFv@u = .sdata:0x80574EA8; // type:object size:0x4 scope:weak data:4byte NW4R_LYT_Version___22@unnamed@lyt_init_cpp@ = .sdata:0x80574EB0; // type:object size:0x4 scope:local data:4byte @@ -42426,7 +42426,7 @@ lbl_80576674 = .sbss:0x80576674; // type:object size:0x4 data:4byte lbl_80576678 = .sbss:0x80576678; // type:object size:0x8 data:4byte @GUARD@GetInstance__Q44nw4r3snd6detail14ChannelManagerFv@instance = .sbss:0x80576680; // type:object size:0x1 scope:weak data:byte @GUARD@GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv@instance = .sbss:0x80576688; // type:object size:0x1 scope:weak data:byte -lbl_80576690 = .sbss:0x80576690; // type:object size:0x8 data:byte +mPrintVarEnabledFlag__Q44nw4r3snd6detail9MmlParser = .sbss:0x80576690; // type:object size:0x1 data:byte lbl_80576698 = .sbss:0x80576698; // type:object size:0x4 data:4byte lbl_8057669C = .sbss:0x8057669C; // type:object size:0x1 data:byte @GUARD@GetInstance__Q44nw4r3snd6detail20RemoteSpeakerManagerFv@instance = .sbss:0x805766A0; // type:object size:0x1 scope:weak data:byte @@ -49698,12 +49698,12 @@ lbl_8057F014 = .sdata2:0x8057F014; // type:object size:0x4 align:4 data:float @124 = .sdata2:0x8057F034; // type:object size:0x4 scope:local align:4 data:float @125 = .sdata2:0x8057F038; // type:object size:0x4 scope:local align:4 data:float @129 = .sdata2:0x8057F040; // type:object size:0x8 scope:local align:8 data:double -lbl_8057F048 = .sdata2:0x8057F048; // type:object size:0x4 align:4 data:float -lbl_8057F04C = .sdata2:0x8057F04C; // type:object size:0x4 align:4 data:float -lbl_8057F050 = .sdata2:0x8057F050; // type:object size:0x4 align:4 data:float -lbl_8057F054 = .sdata2:0x8057F054; // type:object size:0x4 align:4 data:float -lbl_8057F058 = .sdata2:0x8057F058; // type:object size:0x8 align:8 data:double -lbl_8057F060 = .sdata2:0x8057F060; // type:object size:0x8 align:8 data:double +@3179 = .sdata2:0x8057F048; // type:object size:0x4 scope:local align:4 data:float +@3180 = .sdata2:0x8057F04C; // type:object size:0x4 scope:local align:4 data:float +@3181 = .sdata2:0x8057F050; // type:object size:0x4 scope:local align:4 data:float +@3182 = .sdata2:0x8057F054; // type:object size:0x4 scope:local align:4 data:float +@3191 = .sdata2:0x8057F058; // type:object size:0x8 scope:local align:8 data:double +@3192 = .sdata2:0x8057F060; // type:object size:0x8 scope:local align:8 data:double lbl_8057F068 = .sdata2:0x8057F068; // type:object size:0x4 align:4 data:float lbl_8057F06C = .sdata2:0x8057F06C; // type:object size:0x4 align:4 data:float lbl_8057F070 = .sdata2:0x8057F070; // type:object size:0x8 align:8 data:double diff --git a/configure.py b/configure.py index b4c83b6f..7d6c9e89 100644 --- a/configure.py +++ b/configure.py @@ -1040,7 +1040,7 @@ config.libs = [ Object(Matching, "nw4r/snd/snd_Lfo.cpp"), Object(Matching, "nw4r/snd/snd_MemorySoundArchive.cpp"), Object(Matching, "nw4r/snd/snd_MidiSeqPlayer.cpp"), - Object(NonMatching, "nw4r/snd/snd_MmlParser.cpp"), + Object(Matching, "nw4r/snd/snd_MmlParser.cpp"), Object(NonMatching, "nw4r/snd/snd_MmlSeqTrack.cpp"), Object(NonMatching, "nw4r/snd/snd_MmlSeqTrackAllocator.cpp"), Object(NonMatching, "nw4r/snd/snd_NandSoundArchive.cpp"),