Fixup CScriptStreamedMusic

Author: Antidote

config/GM8E01_01/symbols.txt

@@ -1430,13 +1430,13 @@ GetInterpolatedSplinePointByTime__13CCameraSplineCFff = .text:0x8005C04C; // typ
 ValidateLength__13CCameraSplineCFf = .text:0x8005C2A4; // type:function size:0x94 scope:global
 CalculateSplineLength__13CCameraSplineFv = .text:0x8005C338; // type:function size:0x338 scope:global
 ClampLength__13CCameraSplineCF9CVector3fb15CMaterialFilterRC13CStateManager = .text:0x8005C670; // type:function size:0x214 scope:global
-GetSurroundingPoints__13CCameraSplineFiRQ24rstl27reserved_vector<9CVector3f>RQ24rstl27reserved_vector<9CVector3f> = .text:0x8005C884; // type:function size:0x640 scope:global
+GetSurroundingPoints__13CCameraSplineFiRQ24rstl29reserved_vector<9CVector3f,4>RQ24rstl29reserved_vector<9CVector3f,4> = .text:0x8005C884; // type:function size:0x640 scope:global
 Reset__13CCameraSplineFi = .text:0x8005CEC4; // type:function size:0x108 scope:global
 AddKnot__13CCameraSplineF9CVector3f9CVector3f = .text:0x8005CFCC; // type:function size:0x100 scope:global
 SetKnotPosition__13CCameraSplineFi9CVector3f = .text:0x8005D0CC; // type:function size:0x34 scope:global
 GetKnotPosition__13CCameraSplineCFi = .text:0x8005D100; // type:function size:0x54 scope:global
 GetKnotT__13CCameraSplineCFi = .text:0x8005D154; // type:function size:0x24 scope:global
-CalculateKnots__13CCameraSplineFRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R13CStateManager = .text:0x8005D178; // type:function size:0x3B4 scope:global
+CalculateKnots__13CCameraSplineF9TUniqueIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R13CStateManager = .text:0x8005D178; // type:function size:0x3B4 scope:global
 __as__Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>FRCQ24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator> = .text:0x8005D52C; // type:function size:0xF4 scope:global
 Initialise__13CCameraSplineF9TUniqueIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R13CStateManager = .text:0x8005D620; // type:function size:0x44 scope:global
 __dt__13CCameraSplineFv = .text:0x8005D664; // type:function size:0x178 scope:global
@@ -9723,15 +9723,15 @@ AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager
 Accept__11CScriptMidiFR8IVisitor = .text:0x8020BD84; // type:function size:0x38 scope:global
 __ct__11CScriptMidiF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bUiffi = .text:0x8020BDBC; // type:function size:0xDC scope:global
 __dt__20CScriptStreamedMusicFv = .text:0x8020BE98; // type:function size:0x74 scope:global
-sub_8020be90__20CScriptStreamedMusicFv__20CScriptStreamedMusicFv = .text:0x8020BF0C; // type:function size:0x204 scope:global
+sub_8020be90__20CScriptStreamedMusicFv = .text:0x8020BF0C; // type:function size:0x204 scope:global
 __pl__4rstlFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>c = .text:0x8020C110; // type:function size:0x60 scope:global
 __pl__4rstlFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>PCc = .text:0x8020C170; // type:function size:0x60 scope:global
 find__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>CFci = .text:0x8020C1D0; // type:function size:0xF0 scope:global
 TweakOverride__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C2C0; // type:function size:0x128 scope:global
 StopStream__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C3E8; // type:function size:0x38 scope:global
 StartStream__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C420; // type:function size:0x4C scope:global
-sub_8020c3f0__20CScriptStreamedMusicFR13CStateManager__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C46C; // type:function size:0x24 scope:global
-sub_8020c414__20CScriptStreamedMusicFR13CStateManager__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C490; // type:function size:0x60 scope:global
+sub_8020c3f0__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C46C; // type:function size:0x24 scope:global
+sub_8020c414__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C490; // type:function size:0x60 scope:global
 Stop__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C4F0; // type:function size:0x34 scope:global
 Play__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C524; // type:function size:0x60 scope:global
 Accept__20CScriptStreamedMusicFR8IVisitor = .text:0x8020C584; // type:function size:0x38 scope:global
@@ -9741,7 +9741,7 @@ nullsub_42 = .text:0x8020C7A0; // type:function size:0x4 scope:global
 __ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>bffUibb = .text:0x8020C7A4; // type:function size:0xB8 scope:global
 IsOneShot__20CScriptStreamedMusicFb = .text:0x8020C85C; // type:function size:0x10 scope:global
 distance<Q24rstl127const_linear_iterator<c,Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl127const_linear_iterator<c,Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl127const_linear_iterator<c,Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x8020C86C; // type:function size:0x54 scope:global
-sub_8020c844 = .text:0x8020C8C0; // type:function size:0x10 scope:global
+__distance<Q24rstl127const_linear_iterator<c,Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl127const_linear_iterator<c,Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl127const_linear_iterator<c,Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag = .text:0x8020C8C0; // type:function size:0x10 scope:global
 PreRender__8CRagDollFRC9CVector3fR10CModelData = .text:0x8020C8D0; // type:function size:0x4 scope:global
 CalculateRenderBounds__8CRagDollCFv = .text:0x8020C8D4; // type:function size:0x104 scope:global
 BoneAlign__8CRagDollFR21CHierarchyPoseBuilderRC15CCharLayoutInfoiiRC11CQuaternion = .text:0x8020C9D8; // type:function size:0x194 scope:global
@@ -17237,7 +17237,7 @@ vtxDescList$776 = .rodata:0x803D2900; // type:object size:0x18 scope:local
 @stringBase0 = .rodata:0x803D2918; // type:object size:0x17 scope:local data:string_table
 vtxDescrs$1623 = .rodata:0x803D2930; // type:object size:0x18
 lbl_803D2948 = .rodata:0x803D2948; // type:object size:0x10
-lbl_803D2958 = .rodata:0x803D2958; // type:object size:0x18
+@stringBase0 = .rodata:0x803D2958; // type:object size:0x18 data:string_table
 lbl_803D2970 = .rodata:0x803D2970; // type:object size:0x20 data:4byte
 skSnowDesc = .rodata:0x803D2990; // type:object size:0x18 scope:local
 skUnderwaterDesc = .rodata:0x803D29A8; // type:object size:0x18 scope:local

src/MetroidPrime/ScriptObjects/CScriptStreamedMusic.cpp

@@ -145,6 +145,7 @@ void CScriptStreamedMusic::TweakOverride(CStateManager& mgr) {
   }
 }
 
+
 void CScriptStreamedMusic::sub_8020be90() {
   if (x45_fileIsDsp && x34_fileName.find('|', 0) == -1 &&
       static_cast< int >(x34_fileName.size()) >= 5) {
@@ -159,3 +160,5 @@ void CScriptStreamedMusic::sub_8020be90() {
     }
   }
 }
+
+