From 5eb6264efda959442c2a1bbc8f78301f7698e09a Mon Sep 17 00:00:00 2001 From: Luke Street Date: Tue, 8 Oct 2024 20:35:42 -0600 Subject: [PATCH] Symbol renaming & cleanup --- config/GM8E01_00/symbols.txt | 42 ++++++++++++++++---------------- config/GM8E01_01/symbols.txt | 40 +++++++++++++++--------------- include/WorldFormat/COBBTree.hpp | 17 ++++++------- src/WorldFormat/COBBTree.cpp | 4 +-- 4 files changed, 50 insertions(+), 53 deletions(-) diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 615d656d..5541a7dd 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -185,7 +185,7 @@ Clamp__5CMathFRCfRCfRCf = .text:0x8000C2B4; // type:function size:0x2C scope: sort,Q24rstl63pair_sorter_finder,Q24rstl7less>>__4rstlFPQ24rstl18pairPQ24rstl18pairQ24rstl63pair_sorter_finder,Q24rstl7less> = .text:0x8000C2E0; // type:function size:0x128 reserve__Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Fi = .text:0x8000C408; // type:function size:0xEC scope:global erase__Q24rstl51list<16CCameraShakeData,Q24rstl17rmemory_allocator>FRCQ34rstl51list<16CCameraShakeData,Q24rstl17rmemory_allocator>8iterator = .text:0x8000C4F4; // type:function size:0xC0 scope:global -fn_8000C5B4 = .text:0x8000C5B4; // type:function size:0xC0 +__dt__Q24rstl51list<16CCameraShakeData,Q24rstl17rmemory_allocator>Fv = .text:0x8000C5B4; // type:function size:0xC0 __insertion_sort,Q24rstl63pair_sorter_finder,Q24rstl7less>>__4rstlFPQ24rstl18pairPQ24rstl18pairQ24rstl63pair_sorter_finder,Q24rstl7less> = .text:0x8000C674; // type:function size:0x84 __sort3,Q24rstl63pair_sorter_finder,Q24rstl7less>>__4rstlFRQ24rstl18pairRQ24rstl18pairRQ24rstl18pairQ24rstl63pair_sorter_finder,Q24rstl7less> = .text:0x8000C6F8; // type:function size:0x90 SetCommandFiltered__13ControlMapperFQ213ControlMapper9ECommandsb = .text:0x8000C788; // type:function size:0x14 scope:global @@ -1770,7 +1770,7 @@ Touch__14CScriptTriggerFR6CActorR13CStateManager = .text:0x80076748; // type:fun __dt__14CScriptTriggerFv = .text:0x80076C80; // type:function size:0xD8 scope:global __ct__14CScriptTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibbb = .text:0x80076D58; // type:function size:0x214 scope:global GetPtr__Q24rstl22rc_ptr<12CPlayerState>CFv = .text:0x80076F6C; // type:function size:0xC scope:global -erase__Q24rstl67listFRCQ34rstl67list8iteratorRCQ34rstl67list8iterator = .text:0x80076F78; // type:function size:0x7C scope:global +do_erase__Q24rstl67listFPQ34rstl67list4node = .text:0x80076F78; // type:function size:0x7C scope:global __dt__Q24rstl67listFv = .text:0x80076FF4; // type:function size:0x78 scope:global Accept__15CScriptWaypointFR8IVisitor = .text:0x8007706C; // type:function size:0x38 scope:global Render__15CScriptWaypointCFRC13CStateManager = .text:0x800770A4; // type:function size:0x4 scope:global @@ -5516,7 +5516,7 @@ Move__15CScriptPlatformFR13CStateManager = .text:0x800B10E0; // type:function si IsSlave__15CScriptPlatformCF9TUniqueId = .text:0x800B1BF8; // type:function size:0x158 scope:global IsRider__15CScriptPlatformCF9TUniqueId = .text:0x800B1D50; // type:function size:0xB4 scope:global erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800B1E04; // type:function size:0x4C scope:global -fn_800B1E50 = .text:0x800B1E50; // type:function size:0xE0 +erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800B1E50; // type:function size:0xE0 AddSlave__15CScriptPlatformF9TUniqueIdR13CStateManager = .text:0x800B1F30; // type:function size:0x1CC scope:global SplashThink__15CScriptPlatformCFRC6CAABoxRC11CFluidPlanefR13CStateManager = .text:0x800B20FC; // type:function size:0x4 scope:global GetPrimitiveTransform__15CScriptPlatformCFv = .text:0x800B2100; // type:function size:0x88 scope:global @@ -6017,8 +6017,8 @@ __dt__17CScriptSpawnPointFv = .text:0x800E25FC; // type:function size:0xC0 scope __ct__17CScriptSpawnPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRCQ24rstl21reserved_vectorbbb = .text:0x800E26BC; // type:function size:0xC8 scope:global Accept__18CScriptRandomRelayFR8IVisitor = .text:0x800E2784; // type:function size:0x38 scope:global SendLocalScriptMsgs__18CScriptRandomRelayF18EScriptObjectStateR13CStateManager = .text:0x800E27BC; // type:function size:0x3C8 scope:global -fn_800E2B84 = .text:0x800E2B84; // type:function size:0x4C -fn_800E2BD0 = .text:0x800E2BD0; // type:function size:0x9C +erase__Q24rstl82vector,Q24rstl17rmemory_allocator>FQ24rstl184pointer_iterator,Q24rstl82vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800E2B84; // type:function size:0x4C +erase__Q24rstl82vector,Q24rstl17rmemory_allocator>FQ24rstl184pointer_iterator,Q24rstl82vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl184pointer_iterator,Q24rstl82vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800E2BD0; // type:function size:0x9C AcceptScriptMsg__18CScriptRandomRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x800E2C6C; // type:function size:0x78 scope:global __dt__18CScriptRandomRelayFv = .text:0x800E2CE4; // type:function size:0x60 scope:global __ct__18CScriptRandomRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoiibb = .text:0x800E2D44; // type:function size:0xA4 scope:global @@ -7023,7 +7023,7 @@ GetCurrentState__14CBodyStateInfoFv = .text:0x80134014; // type:function size:0x GetCurrentState__14CBodyStateInfoCFv = .text:0x80134078; // type:function size:0x64 scope:global SetState__14CBodyStateInfoFQ23pas15EAnimationState = .text:0x801340DC; // type:function size:0x9C scope:global __dt__14CBodyStateInfoFv = .text:0x80134178; // type:function size:0xEC scope:global -fn_80134264 = .text:0x80134264; // type:function size:0xD8 +__dt__Q24rstl91vector>,Q24rstl17rmemory_allocator>Fv = .text:0x80134264; // type:function size:0xD8 __dt__18CAdditiveBodyStateFv = .text:0x8013433C; // type:function size:0x48 scope:global __ct__14CBodyStateInfoFR6CActor9EBodyType = .text:0x80134384; // type:function size:0x654 scope:global IsDead__10CBodyStateCFv = .text:0x801349D8; // type:function size:0x8 scope:global @@ -9723,25 +9723,25 @@ AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager Accept__11CScriptMidiFR8IVisitor = .text:0x8020BD08; // type:function size:0x38 scope:global __ct__11CScriptMidiF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bUiffi = .text:0x8020BD40; // type:function size:0xDC scope:global __dt__20CScriptStreamedMusicFv = .text:0x8020BE1C; // type:function size:0x74 scope:global -fn_8020BE90 = .text:0x8020BE90; // type:function size:0x204 +sub_8020be90__20CScriptStreamedMusicFv = .text:0x8020BE90; // type:function size:0x204 __pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>c = .text:0x8020C094; // type:function size:0x60 scope:global __pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PCc = .text:0x8020C0F4; // type:function size:0x60 scope:global fn_8020C154 = .text:0x8020C154; // type:function size:0xF0 TweakOverride__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C244; // type:function size:0x128 scope:global StopStream__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C36C; // type:function size:0x38 scope:global StartStream__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C3A4; // type:function size:0x4C scope:global -fn_8020C3F0 = .text:0x8020C3F0; // type:function size:0x24 -fn_8020C414 = .text:0x8020C414; // type:function size:0x60 +sub_8020c3f0__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C3F0; // type:function size:0x24 +sub_8020c414__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C414; // type:function size:0x60 Stop__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C474; // type:function size:0x34 scope:global Play__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C4A8; // type:function size:0x60 scope:global Accept__20CScriptStreamedMusicFR8IVisitor = .text:0x8020C508; // type:function size:0x38 scope:global AcceptScriptMsg__20CScriptStreamedMusicF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x8020C540; // type:function size:0x130 scope:global IsDSPFile__20CScriptStreamedMusicFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator> = .text:0x8020C670; // type:function size:0xB4 scope:global -fn_8020C724 = .text:0x8020C724; // type:function size:0x4 +nullsub_42 = .text:0x8020C724; // type:function size:0x4 __ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bffUibb = .text:0x8020C728; // type:function size:0xB8 scope:global IsOneShot__20CScriptStreamedMusicFb = .text:0x8020C7E0; // type:function size:0x10 scope:global fn_8020C7F0 = .text:0x8020C7F0; // type:function size:0x54 -fn_8020C844 = .text:0x8020C844; // type:function size:0x10 +sub_8020c844 = .text:0x8020C844; // type:function size:0x10 PreRender__8CRagDollFRC9CVector3fR10CModelData = .text:0x8020C854; // type:function size:0x4 scope:global CalculateRenderBounds__8CRagDollCFv = .text:0x8020C858; // type:function size:0x104 scope:global BoneAlign__8CRagDollFR21CHierarchyPoseBuilderRC15CCharLayoutInfoiiRC11CQuaternion = .text:0x8020C95C; // type:function size:0x194 scope:global @@ -11552,11 +11552,11 @@ IsLoaded__13CArtifactDollCFv = .text:0x8029D420; // type:function size:0x18 scop CheckLoadComplete__13CArtifactDollFv = .text:0x8029D438; // type:function size:0x88 scope:global __ct__13CArtifactDollFv = .text:0x8029D4C0; // type:function size:0x1C0 scope:global __sinit_CArtifactDoll_cpp = .text:0x8029D680; // type:function size:0x48 scope:local -fn_8029D6C8 = .text:0x8029D6C8; // type:function size:0xC +sub_8029d6c8__16CProjectedShadowFv = .text:0x8029D6C8; // type:function size:0xC Render__16CProjectedShadowFRC13CStateManager = .text:0x8029D6D4; // type:function size:0x5C4 scope:global -fn_8029DC98 = .text:0x8029DC98; // type:function size:0xF0 +sub_8029dc98__16CProjectedShadowFv = .text:0x8029DC98; // type:function size:0xF0 RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransform4fiRC9CVector3fff = .text:0x8029DD88; // type:function size:0x48C scope:global -fn_8029E214 = .text:0x8029E214; // type:function size:0xF0 +sub_8029e214__16CProjectedShadowFv = .text:0x8029E214; // type:function size:0xF0 ModelDrawCallback__16CProjectedShadowFPCfPCfPC18SShadowDrawContext = .text:0x8029E304; // type:function size:0x7C scope:global __dt__16CProjectedShadowFv = .text:0x8029E380; // type:function size:0x5C scope:global __ct__16CProjectedShadowFiiUc = .text:0x8029E3DC; // type:function size:0xC8 scope:global @@ -12834,8 +12834,8 @@ Available__Q211CSfxManager15CBaseSfxWrapperCFv = .text:0x802EAFE0; // type:funct __ct__Q211CSfxManager15CBaseSfxWrapperFbs10CSfxHandlebi = .text:0x802EAFEC; // type:function size:0x7C scope:global reserve__Q24rstl36vectorFi = .text:0x802EB068; // type:function size:0xEC scope:global __sinit_CSfxManager_cpp = .text:0x802EB154; // type:function size:0xC0 scope:local -__dt__Q24rstl49reserved_vectorFv = .text:0x802EB214; // type:function size:0x9C scope:global -__dt__Q24rstl56reserved_vectorFv = .text:0x802EB2B0; // type:function size:0x9C scope:global +__dt__Q24rstl48reserved_vectorFv = .text:0x802EB214; // type:function size:0x9C scope:global +__dt__Q24rstl55reserved_vectorFv = .text:0x802EB2B0; // type:function size:0x9C scope:global __arraydtor$147 = .text:0x802EB34C; // type:function size:0x38 scope:global __dt__Q211CSfxManager11CSfxChannelFv = .text:0x802EB384; // type:function size:0x9C scope:global __ct__Q211CSfxManager11CSfxChannelFv = .text:0x802EB420; // type:function size:0xDC scope:global @@ -14583,7 +14583,7 @@ __ct<15CAudioGrpSetLoc>__16CFactoryFnReturnFP15CAudioGrpSetLoc = .text:0x8034A09 __dt__43TObjOwnerDerivedFromIObj<15CAudioGrpSetLoc>Fv = .text:0x8034A1B0; // type:function size:0xF4 scope:global GetIObjObjectFor__25TToken<15CAudioGrpSetLoc>FRCQ24rstl27auto_ptr<15CAudioGrpSetLoc> = .text:0x8034A2A4; // type:function size:0x2C scope:global GetNewDerivedObject__43TObjOwnerDerivedFromIObj<15CAudioGrpSetLoc>FRCQ24rstl27auto_ptr<15CAudioGrpSetLoc> = .text:0x8034A2D0; // type:function size:0x9C scope:global -fn_8034A36C = .text:0x8034A36C; // type:function size:0x88 +FreeSampleBuffer__15CAudioGrpSetLocFv = .text:0x8034A36C; // type:function size:0x88 __ct__15CAudioGrpSetLocFRCQ24rstl12auto_ptri = .text:0x8034A3F4; // type:function size:0x260 scope:global FreeSampleBuffer__14CAudioGroupSetFv = .text:0x8034A654; // type:function size:0x24 scope:global Reload__14CAudioGroupSetFv = .text:0x8034A678; // type:function size:0x4 scope:global @@ -14858,7 +14858,7 @@ BuildNormals__10CSkinRulesCFPVv = .text:0x80353F14; // type:function size:0x9C s BuildPoints__10CSkinRulesCFPVv = .text:0x80353FB0; // type:function size:0x9C scope:global BuildAccumulatedTransforms__10CSkinRulesCFRC17CPoseAsTransformsRC15CCharLayoutInfo = .text:0x8035404C; // type:function size:0x128 scope:global __dt__10CSkinRulesFv = .text:0x80354174; // type:function size:0x6C scope:global -fn_803541E0 = .text:0x803541E0; // type:function size:0xF0 +__dt__Q24rstl49vector<12CVirtualBone,Q24rstl17rmemory_allocator>Fv = .text:0x803541E0; // type:function size:0xF0 __ct__10CSkinRulesFR12CInputStream = .text:0x803542D0; // type:function size:0x70 scope:global __ct__Q24rstl49vector<12CVirtualBone,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x80354340; // type:function size:0x19C scope:global Get<12CVirtualBone>__12CInputStreamFRC21TType<12CVirtualBone> = .text:0x803544DC; // type:function size:0x3C scope:global @@ -16707,7 +16707,7 @@ lbl_803CBE7E = .rodata:0x803CBE7E; // type:object size:0xF data:string lbl_803CBE8D = .rodata:0x803CBE8D; // type:object size:0x8 data:string lbl_803CBE95 = .rodata:0x803CBE95; // type:object size:0xD data:string lbl_803CBEA2 = .rodata:0x803CBEA2; // type:object size:0x186 -lbl_803CC028 = .rodata:0x803CC028; // type:object size:0x8 +@stringBase0 = .rodata:0x803CC028; // type:object size:0x8 data:string_table @stringBase0 = .rodata:0x803CC030; // type:object size:0x3EA scope:local data:string_table lbl_803CC420 = .rodata:0x803CC420; // type:object size:0x18 skPlayerLandSfxSoft = .rodata:0x803CC438; // type:object size:0x30 scope:local data:short @@ -19549,8 +19549,8 @@ sThirdPersonFOV__14CCameraManager = .sdata:0x805A6BD4; // type:object size:0x4 s sNearPlane__14CCameraManager = .sdata:0x805A6BD8; // type:object size:0x4 scope:global data:float sFarPlane__14CCameraManager = .sdata:0x805A6BDC; // type:object size:0x4 scope:global data:float sAspectRatio__14CCameraManager = .sdata:0x805A6BE0; // type:object size:0x4 scope:global data:float -lbl_805A6BE4 = .sdata:0x805A6BE4; // type:object size:0x4 -lbl_805A6BE8 = .sdata:0x805A6BE8; // type:object size:0x8 +lbl_805A6BE4__14CCameraManager = .sdata:0x805A6BE4; // type:object size:0x4 +lbl_805A6BE8__14CCameraManager = .sdata:0x805A6BE8; // type:object size:0x8 @26 = .sdata:0x805A6BF0; // type:object size:0x1 scope:local data:byte lbl_805A6BF8 = .sdata:0x805A6BF8; // type:object size:0x4 lbl_805A6BFC = .sdata:0x805A6BFC; // type:object size:0x4 diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index 08351934..fe1a9d69 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -185,7 +185,7 @@ Clamp__5CMathFRCfRCfRCf = .text:0x8000C330; // type:function size:0x2C scope: sort,Q24rstl63pair_sorter_finder,Q24rstl7less>>__4rstlFPQ24rstl18pairPQ24rstl18pairQ24rstl63pair_sorter_finder,Q24rstl7less> = .text:0x8000C35C; // type:function size:0x128 scope:global reserve__Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Fi = .text:0x8000C484; // type:function size:0xEC scope:global erase__Q24rstl51list<16CCameraShakeData,Q24rstl17rmemory_allocator>FRCQ34rstl51list<16CCameraShakeData,Q24rstl17rmemory_allocator>8iterator = .text:0x8000C570; // type:function size:0xC0 scope:global -fn_8000C5B4 = .text:0x8000C630; // type:function size:0xC0 scope:global +__dt__Q24rstl51list<16CCameraShakeData,Q24rstl17rmemory_allocator>Fv = .text:0x8000C630; // type:function size:0xC0 scope:global __insertion_sort,Q24rstl63pair_sorter_finder,Q24rstl7less>>__4rstlFPQ24rstl18pairPQ24rstl18pairQ24rstl63pair_sorter_finder,Q24rstl7less> = .text:0x8000C6F0; // type:function size:0x84 scope:global __sort3,Q24rstl63pair_sorter_finder,Q24rstl7less>>__4rstlFRQ24rstl18pairRQ24rstl18pairRQ24rstl18pairQ24rstl63pair_sorter_finder,Q24rstl7less> = .text:0x8000C774; // type:function size:0x90 scope:global SetCommandFiltered__13ControlMapperFQ213ControlMapper9ECommandsb = .text:0x8000C804; // type:function size:0x14 scope:global @@ -1770,7 +1770,7 @@ Touch__14CScriptTriggerFR6CActorR13CStateManager = .text:0x800767C4; // type:fun __dt__14CScriptTriggerFv = .text:0x80076CFC; // type:function size:0xD8 scope:global __ct__14CScriptTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibbb = .text:0x80076DD4; // type:function size:0x214 scope:global GetPtr__Q24rstl22rc_ptr<12CPlayerState>CFv = .text:0x80076FE8; // type:function size:0xC scope:global -erase__Q24rstl67listFRCQ34rstl67list8iteratorRCQ34rstl67list8iterator = .text:0x80076FF4; // type:function size:0x7C scope:global +do_erase__Q24rstl67listFPQ34rstl67list4node = .text:0x80076FF4; // type:function size:0x7C scope:global __dt__Q24rstl67listFv = .text:0x80077070; // type:function size:0x78 scope:global Accept__15CScriptWaypointFR8IVisitor = .text:0x800770E8; // type:function size:0x38 scope:global Render__15CScriptWaypointCFRC13CStateManager = .text:0x80077120; // type:function size:0x4 scope:global @@ -5518,7 +5518,7 @@ Move__15CScriptPlatformFR13CStateManager = .text:0x800B115C; // type:function si IsSlave__15CScriptPlatformCF9TUniqueId = .text:0x800B1C74; // type:function size:0x158 scope:global IsRider__15CScriptPlatformCF9TUniqueId = .text:0x800B1DCC; // type:function size:0xB4 scope:global erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800B1E80; // type:function size:0x4C scope:global -fn_800B1E50 = .text:0x800B1ECC; // type:function size:0xE0 scope:global +erase__Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>FQ24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl106pointer_iterator<7SRiders,Q24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800B1ECC; // type:function size:0xE0 scope:global AddSlave__15CScriptPlatformF9TUniqueIdR13CStateManager = .text:0x800B1FAC; // type:function size:0x1CC scope:global SplashThink__15CScriptPlatformCFRC6CAABoxRC11CFluidPlanefR13CStateManager = .text:0x800B2178; // type:function size:0x4 scope:global GetPrimitiveTransform__15CScriptPlatformCFv = .text:0x800B217C; // type:function size:0x88 scope:global @@ -6019,8 +6019,8 @@ __dt__17CScriptSpawnPointFv = .text:0x800E2678; // type:function size:0xC0 scope __ct__17CScriptSpawnPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRCQ24rstl21reserved_vectorbbb = .text:0x800E2738; // type:function size:0xC8 scope:global Accept__18CScriptRandomRelayFR8IVisitor = .text:0x800E2800; // type:function size:0x38 scope:global SendLocalScriptMsgs__18CScriptRandomRelayF18EScriptObjectStateR13CStateManager = .text:0x800E2838; // type:function size:0x3C8 scope:global -fn_800E2B84 = .text:0x800E2C00; // type:function size:0x4C scope:global -fn_800E2BD0 = .text:0x800E2C4C; // type:function size:0x9C scope:global +erase__Q24rstl82vector,Q24rstl17rmemory_allocator>FQ24rstl184pointer_iterator,Q24rstl82vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800E2C00; // type:function size:0x4C scope:global +erase__Q24rstl82vector,Q24rstl17rmemory_allocator>FQ24rstl184pointer_iterator,Q24rstl82vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl184pointer_iterator,Q24rstl82vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator> = .text:0x800E2C4C; // type:function size:0x9C scope:global AcceptScriptMsg__18CScriptRandomRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x800E2CE8; // type:function size:0x78 scope:global __dt__18CScriptRandomRelayFv = .text:0x800E2D60; // type:function size:0x60 scope:global __ct__18CScriptRandomRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoiibb = .text:0x800E2DC0; // type:function size:0xA4 scope:global @@ -7026,7 +7026,7 @@ GetCurrentState__14CBodyStateInfoFv = .text:0x80134090; // type:function size:0x GetCurrentState__14CBodyStateInfoCFv = .text:0x801340F4; // type:function size:0x64 scope:global SetState__14CBodyStateInfoFQ23pas15EAnimationState = .text:0x80134158; // type:function size:0x9C scope:global __dt__14CBodyStateInfoFv = .text:0x801341F4; // type:function size:0xEC scope:global -fn_80134264 = .text:0x801342E0; // type:function size:0xD8 scope:global +__dt__Q24rstl91vector>,Q24rstl17rmemory_allocator>Fv = .text:0x801342E0; // type:function size:0xD8 scope:global __dt__18CAdditiveBodyStateFv = .text:0x801343B8; // type:function size:0x48 scope:global __ct__14CBodyStateInfoFR6CActor9EBodyType = .text:0x80134400; // type:function size:0x654 scope:global IsDead__10CBodyStateCFv = .text:0x80134A54; // type:function size:0x8 scope:global @@ -9729,15 +9729,15 @@ AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager Accept__11CScriptMidiFR8IVisitor = .text:0x8020BD84; // type:function size:0x38 scope:global __ct__11CScriptMidiF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bUiffi = .text:0x8020BDBC; // type:function size:0xDC scope:global __dt__20CScriptStreamedMusicFv = .text:0x8020BE98; // type:function size:0x74 scope:global -fn_8020BE90__20CScriptStreamedMusicFv = .text:0x8020BF0C; // type:function size:0x204 scope:global +sub_8020be90__20CScriptStreamedMusicFv__20CScriptStreamedMusicFv = .text:0x8020BF0C; // type:function size:0x204 scope:global __pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>c = .text:0x8020C110; // type:function size:0x60 scope:global __pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PCc = .text:0x8020C170; // type:function size:0x60 scope:global fn_8020C154__FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ii = .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 -fn_8020C3F0__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C46C; // type:function size:0x24 scope:global -fn_8020C414__20CScriptStreamedMusicFR13CStateManager = .text:0x8020C490; // type:function size:0x60 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 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 @@ -9747,7 +9747,7 @@ nullsub_42 = .text:0x8020C7A0; // type:function size:0x4 scope:global __ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bffUibb = .text:0x8020C7A4; // type:function size:0xB8 scope:global IsOneShot__20CScriptStreamedMusicFb = .text:0x8020C85C; // type:function size:0x10 scope:global fn_8020C7F0__FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator> = .text:0x8020C86C; // type:function size:0x54 scope:global -fn_8020C844 = .text:0x8020C8C0; // type:function size:0x10 scope:global +sub_8020c844 = .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 @@ -11565,11 +11565,11 @@ IsLoaded__13CArtifactDollCFv = .text:0x8029D4CC; // type:function size:0x18 scop CheckLoadComplete__13CArtifactDollFv = .text:0x8029D4E4; // type:function size:0x88 scope:global __ct__13CArtifactDollFv = .text:0x8029D56C; // type:function size:0x1C0 scope:global __sinit_CArtifactDoll_cpp = .text:0x8029D72C; // type:function size:0x48 scope:global -fn_8029D6C8__16CProjectedShadowFv = .text:0x8029D774; // type:function size:0xC scope:global +sub_8029d6c8__16CProjectedShadowFv__16CProjectedShadowFv = .text:0x8029D774; // type:function size:0xC scope:global Render__16CProjectedShadowFRC13CStateManager = .text:0x8029D780; // type:function size:0x5C4 scope:global -fn_8029DC98__16CProjectedShadowFv = .text:0x8029DD44; // type:function size:0xF0 scope:global +sub_8029dc98__16CProjectedShadowFv__16CProjectedShadowFv = .text:0x8029DD44; // type:function size:0xF0 scope:global RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransform4fiRC9CVector3fff = .text:0x8029DE34; // type:function size:0x48C scope:global -fn_8029E214__16CProjectedShadowFv = .text:0x8029E2C0; // type:function size:0xF0 scope:global +sub_8029e214__16CProjectedShadowFv__16CProjectedShadowFv = .text:0x8029E2C0; // type:function size:0xF0 scope:global ModelDrawCallback__16CProjectedShadowFPCfPCfPC18SShadowDrawContext = .text:0x8029E3B0; // type:function size:0x7C scope:global __dt__16CProjectedShadowFv = .text:0x8029E42C; // type:function size:0x5C scope:global __ct__16CProjectedShadowFiiUc = .text:0x8029E488; // type:function size:0xC8 scope:global @@ -12849,8 +12849,8 @@ Available__Q211CSfxManager15CBaseSfxWrapperCFv = .text:0x802EB0C0; // type:funct __ct__Q211CSfxManager15CBaseSfxWrapperFbs10CSfxHandlebi = .text:0x802EB0CC; // type:function size:0x7C scope:global reserve__Q24rstl36vectorFi = .text:0x802EB148; // type:function size:0xEC scope:global __sinit_CSfxManager_cpp = .text:0x802EB234; // type:function size:0xC0 scope:global -__dt__Q24rstl49reserved_vectorFv = .text:0x802EB2F4; // type:function size:0x9C scope:global -__dt__Q24rstl56reserved_vectorFv = .text:0x802EB390; // type:function size:0x9C scope:global +__dt__Q24rstl48reserved_vectorFv = .text:0x802EB2F4; // type:function size:0x9C scope:global +__dt__Q24rstl55reserved_vectorFv = .text:0x802EB390; // type:function size:0x9C scope:global __arraydtor$147 = .text:0x802EB42C; // type:function size:0x38 scope:local __dt__Q211CSfxManager11CSfxChannelFv = .text:0x802EB464; // type:function size:0x9C scope:global __ct__Q211CSfxManager11CSfxChannelFv = .text:0x802EB500; // type:function size:0xDC scope:global @@ -14598,7 +14598,7 @@ __ct<15CAudioGrpSetLoc>__16CFactoryFnReturnFP15CAudioGrpSetLoc = .text:0x8034A17 __dt__43TObjOwnerDerivedFromIObj<15CAudioGrpSetLoc>Fv = .text:0x8034A290; // type:function size:0xF4 scope:global GetIObjObjectFor__25TToken<15CAudioGrpSetLoc>FRCQ24rstl27auto_ptr<15CAudioGrpSetLoc> = .text:0x8034A384; // type:function size:0x2C scope:global GetNewDerivedObject__43TObjOwnerDerivedFromIObj<15CAudioGrpSetLoc>FRCQ24rstl27auto_ptr<15CAudioGrpSetLoc> = .text:0x8034A3B0; // type:function size:0x9C scope:global -fn_8034A36C = .text:0x8034A44C; // type:function size:0x88 scope:global +FreeSampleBuffer__15CAudioGrpSetLocFv = .text:0x8034A44C; // type:function size:0x88 scope:global __ct__15CAudioGrpSetLocFRCQ24rstl12auto_ptri = .text:0x8034A4D4; // type:function size:0x260 scope:global FreeSampleBuffer__14CAudioGroupSetFv = .text:0x8034A734; // type:function size:0x24 scope:global Reload__14CAudioGroupSetFv = .text:0x8034A758; // type:function size:0x4 scope:global @@ -14873,7 +14873,7 @@ BuildNormals__10CSkinRulesCFPVv = .text:0x80354018; // type:function size:0x9C s BuildPoints__10CSkinRulesCFPVv = .text:0x803540B4; // type:function size:0x9C scope:global BuildAccumulatedTransforms__10CSkinRulesCFRC17CPoseAsTransformsRC15CCharLayoutInfo = .text:0x80354150; // type:function size:0x128 scope:global __dt__10CSkinRulesFv = .text:0x80354278; // type:function size:0x6C scope:global -fn_803541E0 = .text:0x803542E4; // type:function size:0xF0 scope:global +__dt__Q24rstl49vector<12CVirtualBone,Q24rstl17rmemory_allocator>Fv = .text:0x803542E4; // type:function size:0xF0 scope:global __ct__10CSkinRulesFR12CInputStream = .text:0x803543D4; // type:function size:0x70 scope:global __ct__Q24rstl49vector<12CVirtualBone,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator = .text:0x80354444; // type:function size:0x19C scope:global Get<12CVirtualBone>__12CInputStreamFRC21TType<12CVirtualBone> = .text:0x803545E0; // type:function size:0x3C scope:global @@ -16723,7 +16723,7 @@ lbl_803CBE7E = .rodata:0x803CC05E; // type:object size:0xF scope:local data:stri lbl_803CBE8D = .rodata:0x803CC06D; // type:object size:0x8 scope:local data:string lbl_803CBE95 = .rodata:0x803CC075; // type:object size:0xD scope:local data:string lbl_803CBEA2 = .rodata:0x803CC082; // type:object size:0x186 scope:local -lbl_803CC028 = .rodata:0x803CC208; // type:object size:0x8 scope:global +@stringBase0 = .rodata:0x803CC208; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x803CC210; // type:object size:0x3F0 scope:local data:string_table lbl_803CC420 = .rodata:0x803CC600; // type:object size:0x18 scope:global skPlayerLandSfxSoft__7CPlayer = .rodata:0x803CC618; // type:object size:0x30 scope:global @@ -19589,8 +19589,8 @@ sThirdPersonFOV__14CCameraManager = .sdata:0x805A6DB4; // type:object size:0x4 s sNearPlane__14CCameraManager = .sdata:0x805A6DB8; // type:object size:0x4 scope:global data:float sFarPlane__14CCameraManager = .sdata:0x805A6DBC; // type:object size:0x4 scope:global data:float sAspectRatio__14CCameraManager = .sdata:0x805A6DC0; // type:object size:0x4 scope:global data:float -lbl_805A6BE4 = .sdata:0x805A6DC4; // type:object size:0x4 scope:global -lbl_805A6BE8 = .sdata:0x805A6DC8; // type:object size:0x8 scope:global +lbl_805A6BE4__14CCameraManager = .sdata:0x805A6DC4; // type:object size:0x4 scope:global +lbl_805A6BE8__14CCameraManager = .sdata:0x805A6DC8; // type:object size:0x8 scope:global @26 = .sdata:0x805A6DD0; // type:object size:0x1 scope:local data:byte lbl_805A6BF8 = .sdata:0x805A6DD8; // type:object size:0x4 scope:global lbl_805A6BFC = .sdata:0x805A6DDC; // type:object size:0x4 scope:global diff --git a/include/WorldFormat/COBBTree.hpp b/include/WorldFormat/COBBTree.hpp index 2b8ac142..2cfc2d20 100644 --- a/include/WorldFormat/COBBTree.hpp +++ b/include/WorldFormat/COBBTree.hpp @@ -5,25 +5,24 @@ #include "WorldFormat/CCollisionEdge.hpp" - #include "rstl/vector.hpp" - class COBBTree { struct SIndexData { - rstl::vector x0_materials; - rstl::vector x10_vertMaterials; - rstl::vector x20_edgeMaterials; - rstl::vector x30_surfaceMaterials; - rstl::vector x40_edges; - rstl::vector x50_surfaceIndices; - rstl::vector x60_vertices; + rstl::vector< u32 > x0_materials; + rstl::vector< u8 > x10_vertMaterials; + rstl::vector< u8 > x20_edgeMaterials; + rstl::vector< u8 > x30_surfaceMaterials; + rstl::vector< CCollisionEdge > x40_edges; + rstl::vector< u16 > x50_surfaceIndices; + rstl::vector< CVector3f > x60_vertices; SIndexData(CInputStream& in); }; public: COBBTree(CInputStream& in); ~COBBTree(); + private: char data[0x8c]; }; diff --git a/src/WorldFormat/COBBTree.cpp b/src/WorldFormat/COBBTree.cpp index ac24f904..d9e5789a 100644 --- a/src/WorldFormat/COBBTree.cpp +++ b/src/WorldFormat/COBBTree.cpp @@ -2,7 +2,6 @@ #include "Kyoto/Streams/CInputStream.hpp" - COBBTree::SIndexData::SIndexData(CInputStream& in) : x0_materials(in) , x10_vertMaterials(in) @@ -10,5 +9,4 @@ COBBTree::SIndexData::SIndexData(CInputStream& in) , x30_surfaceMaterials(in) , x40_edges(in) , x50_surfaceIndices(in) -, x60_vertices(in) { -} +, x60_vertices(in) {}