diff --git a/config/GM8E01_48/splits.txt b/config/GM8E01_48/splits.txt index 38774c22..100790c5 100644 --- a/config/GM8E01_48/splits.txt +++ b/config/GM8E01_48/splits.txt @@ -16,6 +16,50 @@ Sections: MetroTRK/mslsupp.c: .text start:0x80003640 end:0x80003658 +Kyoto/Text/CStringTable.cpp: + .text start:0x80356694 end:0x80356AA0 + .rodata start:0x803D8420 end:0x803D8438 + .sdata start:0x805A86B8 end:0x805A86C0 + +Kyoto/Particles/CEmitterElement.cpp: + .text start:0x80356AA0 end:0x803574AC + .data start:0x803EF848 end:0x803EF888 + .sdata2 start:0x805AE6A0 end:0x805AE6B8 + +Kyoto/Particles/CEffectComponent.cpp: + .text start:0x803574AC end:0x80357598 + +Kyoto/Particles/CParticleData.cpp: + .text start:0x80357598 end:0x80357674 + .sbss start:0x805A9330 end:0x805A9338 + +Kyoto/Animation/CVertexMorphEffect.cpp: + .text start:0x80357674 end:0x80357B38 + .rodata start:0x803D8438 end:0x803D8440 + .sdata2 start:0x805AE6B8 end:0x805AE6D0 + +Kyoto/Animation/CSkinnedModelWithAvgNormals.cpp: + .text start:0x80357B38 end:0x803583F0 + .rodata start:0x803D8440 end:0x803D8448 + .sdata2 start:0x805AE6D0 end:0x805AE6D8 + +Kyoto/CTimeProvider.cpp: + .text start:0x803583F0 end:0x803584C8 + .sbss start:0x805A9338 end:0x805A9340 + +Kyoto/CARAMToken.cpp: + .text start:0x803584C8 end:0x80358CF8 + .rodata start:0x803D8448 end:0x803D8450 + .bss start:0x805A64EC end:0x805A6508 align:4 common + +Kyoto/Audio/CMidiManager.cpp: + .text start:0x80358CF8 end:0x803595D0 + .ctors start:0x803CB468 end:0x803CB46C + .rodata start:0x803D8450 end:0x803D8458 + .data start:0x803EF888 end:0x803EF898 + .bss start:0x8053FCF0 end:0x8053FD00 + .bss start:0x805A6508 end:0x805A6540 align:4 common + Kyoto/Text/CFontImageDef.cpp: .text start:0x803595D0 end:0x803598AC .rodata start:0x803D8458 end:0x803D8460 diff --git a/config/GM8E01_48/symbols.txt b/config/GM8E01_48/symbols.txt index ffa48253..7b363666 100644 --- a/config/GM8E01_48/symbols.txt +++ b/config/GM8E01_48/symbols.txt @@ -1384,7 +1384,7 @@ fn_800591E0 = .text:0x800591E0; // type:function size:0x48 fn_80059228 = .text:0x80059228; // type:function size:0x68 fn_80059290 = .text:0x80059290; // type:function size:0x2A0 fn_80059530 = .text:0x80059530; // type:function size:0x3C -fn_8005956C = .text:0x8005956C; // type:function size:0x28 +cinput_stream_helper,Q24rstl17rmemory_allocator>>__FRC82TType,Q24rstl17rmemory_allocator>>R12CInputStream = .text:0x8005956C; // type:function size:0x28 fn_80059594 = .text:0x80059594; // type:function size:0xDC fn_80059670 = .text:0x80059670; // type:function size:0x10C fn_8005977C = .text:0x8005977C; // type:function size:0x164 @@ -12737,7 +12737,7 @@ fn_802E7998 = .text:0x802E7998; // type:function size:0x8 fn_802E79A0 = .text:0x802E79A0; // type:function size:0x2C fn_802E79CC = .text:0x802E79CC; // type:function size:0x8 fn_802E79D4 = .text:0x802E79D4; // type:function size:0x8 -fn_802E79DC = .text:0x802E79DC; // type:function size:0x1C +__ct__10CSfxHandleFUi = .text:0x802E79DC; // type:function size:0x1C fn_802E79F8 = .text:0x802E79F8; // type:function size:0x5C fn_802E7A54 = .text:0x802E7A54; // type:function size:0xE8 fn_802E7B3C = .text:0x802E7B3C; // type:function size:0x100 @@ -14499,20 +14499,20 @@ fn_80344048 = .text:0x80344048; // type:function size:0x534 fn_8034457C = .text:0x8034457C; // type:function size:0x180 fn_803446FC = .text:0x803446FC; // type:function size:0x34 fn_80344730 = .text:0x80344730; // type:function size:0x28 -fn_80344758 = .text:0x80344758; // type:function size:0x20 -fn_80344778 = .text:0x80344778; // type:function size:0x74 -fn_803447EC = .text:0x803447EC; // type:function size:0x40 -fn_8034482C = .text:0x8034482C; // type:function size:0x4C -fn_80344878 = .text:0x80344878; // type:function size:0x40 -fn_803448B8 = .text:0x803448B8; // type:function size:0x7C -fn_80344934 = .text:0x80344934; // type:function size:0x8C -fn_803449C0 = .text:0x803449C0; // type:function size:0x138 -fn_80344AF8 = .text:0x80344AF8; // type:function size:0x134 -fn_80344C2C = .text:0x80344C2C; // type:function size:0xDC -fn_80344D08 = .text:0x80344D08; // type:function size:0x90 -fn_80344D98 = .text:0x80344D98; // type:function size:0x9C -fn_80344E34 = .text:0x80344E34; // type:function size:0x50 -fn_80344E84 = .text:0x80344E84; // type:function size:0x170 +CollectGarbage__12CARAMManagerFv = .text:0x80344758; // type:function size:0x20 +RefreshActiveDMAList__12CARAMManagerFv = .text:0x80344778; // type:function size:0x74 +AramManagerDMACallback__12CARAMManagerFUl = .text:0x803447EC; // type:function size:0x40 +CancelDMA__12CARAMManagerFUi = .text:0x8034482C; // type:function size:0x4C +WaitForAllDMAsToComplete__12CARAMManagerFv = .text:0x80344878; // type:function size:0x40 +WaitForDMACompletion__12CARAMManagerFUi = .text:0x803448B8; // type:function size:0x7C +IsDMACompleted__12CARAMManagerFUi = .text:0x80344934; // type:function size:0x8C +DMAToMRAM__12CARAMManagerFPvPvUiQ212CARAMManager12EDMAPriority = .text:0x803449C0; // type:function size:0x138 +DMAToARAM__12CARAMManagerFPvPvUiQ212CARAMManager12EDMAPriority = .text:0x80344AF8; // type:function size:0x134 +Free__12CARAMManagerFPCv = .text:0x80344C2C; // type:function size:0xDC +FindFreeBlocks__12CARAMManagerFUiUiUi = .text:0x80344D08; // type:function size:0x90 +Alloc__12CARAMManagerFUi = .text:0x80344D98; // type:function size:0x9C +Shutdown__12CARAMManagerFv = .text:0x80344E34; // type:function size:0x50 +Initialize__12CARAMManagerFUi = .text:0x80344E84; // type:function size:0x170 fn_80344FF4 = .text:0x80344FF4; // type:function size:0x7C fn_80345070 = .text:0x80345070; // type:function size:0x54 fn_803450C4 = .text:0x803450C4; // type:function size:0x78 @@ -14597,9 +14597,9 @@ fn_8034A97C = .text:0x8034A97C; // type:function size:0x8 fn_8034A984 = .text:0x8034A984; // type:function size:0x8 fn_8034A98C = .text:0x8034A98C; // type:function size:0x78 fn_8034AA04 = .text:0x8034AA04; // type:function size:0x48 -fn_8034AA4C = .text:0x8034AA4C; // type:function size:0x2C -fn_8034AA78 = .text:0x8034AA78; // type:function size:0x20 -fn_8034AA98 = .text:0x8034AA98; // type:function size:0x2C +SeqVolume__9CAudioSysFUcUsUlUc = .text:0x8034AA4C; // type:function size:0x2C +SeqStop__9CAudioSysFUl = .text:0x8034AA78; // type:function size:0x20 +SeqPlayEx__9CAudioSysFUsUsPvP12SND_PLAYPARAUc = .text:0x8034AA98; // type:function size:0x2C fn_8034AAC4 = .text:0x8034AAC4; // type:function size:0x8C fn_8034AB50 = .text:0x8034AB50; // type:function size:0x3C fn_8034AB8C = .text:0x8034AB8C; // type:function size:0x58 @@ -14912,30 +14912,30 @@ fn_803564D4 = .text:0x803564D4; // type:function size:0x3C fn_80356510 = .text:0x80356510; // type:function size:0xD0 fn_803565E0 = .text:0x803565E0; // type:function size:0x4C fn_8035662C = .text:0x8035662C; // type:function size:0x68 -fn_80356694 = .text:0x80356694; // type:function size:0x64 -fn_803566F8 = .text:0x803566F8; // type:function size:0xD0 -fn_803567C8 = .text:0x803567C8; // type:function size:0x2C -fn_803567F4 = .text:0x803567F4; // type:function size:0x9C -fn_80356890 = .text:0x80356890; // type:function size:0x34 -fn_803568C4 = .text:0x803568C4; // type:function size:0x1DC -fn_80356AA0 = .text:0x80356AA0; // type:function size:0x294 -fn_80356D34 = .text:0x80356D34; // type:function size:0x160 -fn_80356E94 = .text:0x80356E94; // type:function size:0x54 -fn_80356EE8 = .text:0x80356EE8; // type:function size:0x60 -fn_80356F48 = .text:0x80356F48; // type:function size:0x2C4 -fn_8035720C = .text:0x8035720C; // type:function size:0xE0 -fn_803572EC = .text:0x803572EC; // type:function size:0x34 -fn_80357320 = .text:0x80357320; // type:function size:0x9C -fn_803573BC = .text:0x803573BC; // type:function size:0xC0 -fn_8035747C = .text:0x8035747C; // type:function size:0x30 -fn_803574AC = .text:0x803574AC; // type:function size:0x58 -fn_80357504 = .text:0x80357504; // type:function size:0x94 -fn_80357598 = .text:0x80357598; // type:function size:0xA0 -fn_80357638 = .text:0x80357638; // type:function size:0x3C -fn_80357674 = .text:0x80357674; // type:function size:0xB8 -fn_8035772C = .text:0x8035772C; // type:function size:0x3D4 -fn_80357B00 = .text:0x80357B00; // type:function size:0x38 -fn_80357B38 = .text:0x80357B38; // type:function size:0x35C +FStringTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer = .text:0x80356694; // type:function size:0x64 +__ct<12CStringTable>__16CFactoryFnReturnFP12CStringTable = .text:0x803566F8; // type:function size:0xD0 +GetIObjObjectFor__22TToken<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable> = .text:0x803567C8; // type:function size:0x2C +GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable> = .text:0x803567F4; // type:function size:0x9C +GetString__12CStringTableCFi = .text:0x80356890; // type:function size:0x34 +__ct__12CStringTableFR12CInputStream = .text:0x803568C4; // type:function size:0x1DC +GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f = .text:0x80356AA0; // type:function size:0x294 +__dt__14CVEAngleSphereFv = .text:0x80356D34; // type:function size:0x160 +__ct__14CVEAngleSphereFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElement = .text:0x80356E94; // type:function size:0x54 +__dt__15CEmitterElementFv = .text:0x80356EE8; // type:function size:0x60 +GetValue__9CVESphereCFiR9CVector3fR9CVector3f = .text:0x80356F48; // type:function size:0x2C4 +__dt__9CVESphereFv = .text:0x8035720C; // type:function size:0xE0 +__ct__9CVESphereFP14CVectorElementP12CRealElementP12CRealElement = .text:0x803572EC; // type:function size:0x34 +GetValue__16CEESimpleEmitterCFiR9CVector3fR9CVector3f = .text:0x80357320; // type:function size:0x9C +__dt__16CEESimpleEmitterFv = .text:0x803573BC; // type:function size:0xC0 +__ct__16CEESimpleEmitterFP14CVectorElementP14CVectorElement = .text:0x8035747C; // type:function size:0x30 +GetSObjectTagFromStream__16CEffectComponentFR12CInputStream = .text:0x803574AC; // type:function size:0x58 +__ct__16CEffectComponentFR12CInputStream = .text:0x80357504; // type:function size:0x94 +__ct__13CParticleDataFR12CInputStream = .text:0x80357598; // type:function size:0xA0 +Get,Q24rstl17rmemory_allocator>>__12CInputStreamFRC82TType,Q24rstl17rmemory_allocator>> = .text:0x80357638; // type:function size:0x3C +Reset__18CVertexMorphEffectFRC13CUnitVector3fRC9CVector3ff = .text:0x80357674; // type:function size:0xB8 +MorphVertices__18CVertexMorphEffectCFP9CVector3fPC9CVector3fRC26TLockedToken<10CSkinRules>RC17CPoseAsTransformsUi = .text:0x8035772C; // type:function size:0x3D4 +Update__18CVertexMorphEffectFf = .text:0x80357B00; // type:function size:0x38 +__ct__27CSkinnedModelWithAvgNormalsFRC13CSkinnedModel = .text:0x80357B38; // type:function size:0x35C fn_80357E94 = .text:0x80357E94; // type:function size:0x7C fn_80357F10 = .text:0x80357F10; // type:function size:0x28 fn_80357F38 = .text:0x80357F38; // type:function size:0x54 @@ -14945,48 +14945,48 @@ fn_803580D8 = .text:0x803580D8; // type:function size:0x8C fn_80358164 = .text:0x80358164; // type:function size:0x50 fn_803581B4 = .text:0x803581B4; // type:function size:0x7C fn_80358230 = .text:0x80358230; // type:function size:0x78 -fn_803582A8 = .text:0x803582A8; // type:function size:0xE0 +reserve__Q24rstl105vector>,Q24rstl17rmemory_allocator>Fi = .text:0x803582A8; // type:function size:0xE0 fn_80358388 = .text:0x80358388; // type:function size:0x68 -fn_803583F0 = .text:0x803583F0; // type:function size:0x78 -fn_80358468 = .text:0x80358468; // type:function size:0x60 -fn_803584C8 = .text:0x803584C8; // type:function size:0x54 -fn_8035851C = .text:0x8035851C; // type:function size:0x4C -fn_80358568 = .text:0x80358568; // type:function size:0x40 -fn_803585A8 = .text:0x803585A8; // type:function size:0x4C -fn_803585F4 = .text:0x803585F4; // type:function size:0x48 -fn_8035863C = .text:0x8035863C; // type:function size:0x50 -fn_8035868C = .text:0x8035868C; // type:function size:0x40 -fn_803586CC = .text:0x803586CC; // type:function size:0x70 -fn_8035873C = .text:0x8035873C; // type:function size:0xD0 -fn_8035880C = .text:0x8035880C; // type:function size:0xF4 -fn_80358900 = .text:0x80358900; // type:function size:0x108 -fn_80358A08 = .text:0x80358A08; // type:function size:0x60 -fn_80358A68 = .text:0x80358A68; // type:function size:0x70 -fn_80358AD8 = .text:0x80358AD8; // type:function size:0x88 -fn_80358B60 = .text:0x80358B60; // type:function size:0x80 -fn_80358BE0 = .text:0x80358BE0; // type:function size:0xB0 -fn_80358C90 = .text:0x80358C90; // type:function size:0x68 -fn_80358CF8 = .text:0x80358CF8; // type:function size:0x64 -fn_80358D5C = .text:0x80358D5C; // type:function size:0xDC -fn_80358E38 = .text:0x80358E38; // type:function size:0xB8 -fn_80358EF0 = .text:0x80358EF0; // type:function size:0x2C -fn_80358F1C = .text:0x80358F1C; // type:function size:0x9C -fn_80358FB8 = .text:0x80358FB8; // type:function size:0x118 -fn_803590D0 = .text:0x803590D0; // type:function size:0xE4 -fn_803591B4 = .text:0x803591B4; // type:function size:0x7C -fn_80359230 = .text:0x80359230; // type:function size:0xC0 -fn_803592F0 = .text:0x803592F0; // type:function size:0x1B4 -fn_803594A4 = .text:0x803594A4; // type:function size:0x8 -fn_803594AC = .text:0x803594AC; // type:function size:0xC -fn_803594B8 = .text:0x803594B8; // type:function size:0x8 -fn_803594C0 = .text:0x803594C0; // type:function size:0x8 -fn_803594C8 = .text:0x803594C8; // type:function size:0x8 -fn_803594D0 = .text:0x803594D0; // type:function size:0x8 -fn_803594D8 = .text:0x803594D8; // type:function size:0x8 -fn_803594E0 = .text:0x803594E0; // type:function size:0x8 -fn_803594E8 = .text:0x803594E8; // type:function size:0x18 -fn_80359500 = .text:0x80359500; // type:function size:0x3C -fn_8035953C = .text:0x8035953C; // type:function size:0x94 +__dt__13CTimeProviderFv = .text:0x803583F0; // type:function size:0x78 +__ct__13CTimeProviderFRCf = .text:0x80358468; // type:function size:0x60 +GetMRAMSafe__10CARAMTokenFv = .text:0x803584C8; // type:function size:0x54 +ForceSyncARAM__10CARAMTokenFv = .text:0x8035851C; // type:function size:0x4C +ForceSyncMRAM__10CARAMTokenFv = .text:0x80358568; // type:function size:0x40 +MakeInvalid__10CARAMTokenFv = .text:0x803585A8; // type:function size:0x4C +RemoveFromList__10CARAMTokenFv = .text:0x803585F4; // type:function size:0x48 +MoveToList__10CARAMTokenFQ210CARAMToken7EStatus = .text:0x8035863C; // type:function size:0x50 +InitiallyMoveToList__10CARAMTokenFv = .text:0x8035868C; // type:function size:0x40 +UpdateAllDMAs__10CARAMTokenFv = .text:0x803586CC; // type:function size:0x70 +RefreshStatus__10CARAMTokenFv = .text:0x8035873C; // type:function size:0xD0 +LoadToARAM__10CARAMTokenFv = .text:0x8035880C; // type:function size:0xF4 +LoadToMRAM__10CARAMTokenFv = .text:0x80358900; // type:function size:0x108 +__as__10CARAMTokenFRC10CARAMToken = .text:0x80358A08; // type:function size:0x60 +PostConstruct__10CARAMTokenFPvUii = .text:0x80358A68; // type:function size:0x70 +__dt__10CARAMTokenFv = .text:0x80358AD8; // type:function size:0x88 +__ct__10CARAMTokenFRC10CARAMToken = .text:0x80358B60; // type:function size:0x80 +__ct__10CARAMTokenFPvUii = .text:0x80358BE0; // type:function size:0xB0 +__ct__10CARAMTokenFv = .text:0x80358C90; // type:function size:0x68 +FMidiDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer = .text:0x80358CF8; // type:function size:0x64 +__ct__16CFactoryFnReturnFPQ212CMidiManager9CMidiData = .text:0x80358D5C; // type:function size:0xDC +__dt__52TObjOwnerDerivedFromIObjFv = .text:0x80358E38; // type:function size:0xB8 +GetIObjObjectFor__34TTokenFRCQ24rstl36auto_ptr = .text:0x80358EF0; // type:function size:0x2C +GetNewDerivedObject__52TObjOwnerDerivedFromIObjFRCQ24rstl36auto_ptr = .text:0x80358F1C; // type:function size:0x9C +__ct__Q212CMidiManager9CMidiDataFR12CInputStream = .text:0x80358FB8; // type:function size:0x118 +LocateHandle__12CMidiManagerFv = .text:0x803590D0; // type:function size:0xE4 +StopAll__12CMidiManagerFv = .text:0x803591B4; // type:function size:0x7C +Stop__12CMidiManagerFRC10CSfxHandleUs = .text:0x80359230; // type:function size:0xC0 +Play__12CMidiManagerFRCQ212CMidiManager9CMidiDataUsbs = .text:0x803592F0; // type:function size:0x1B4 +SetSongId__Q212CMidiManager12CMidiWrapperFs = .text:0x803594A4; // type:function size:0x8 +SetMidiHandle__Q212CMidiManager12CMidiWrapperFRC10CSfxHandle = .text:0x803594AC; // type:function size:0xC +SetAudioSysHandle__Q212CMidiManager12CMidiWrapperFUl = .text:0x803594B8; // type:function size:0x8 +SetAvailable__Q212CMidiManager12CMidiWrapperFb = .text:0x803594C0; // type:function size:0x8 +GetSongId__Q212CMidiManager12CMidiWrapperCFv = .text:0x803594C8; // type:function size:0x8 +IsAvailable__Q212CMidiManager12CMidiWrapperCFv = .text:0x803594D0; // type:function size:0x8 +GetAudioSysHandle__Q212CMidiManager12CMidiWrapperCFv = .text:0x803594D8; // type:function size:0x8 +GetManagerHandle__Q212CMidiManager12CMidiWrapperCFv = .text:0x803594E0; // type:function size:0x8 +__ct__Q212CMidiManager12CMidiWrapperFv = .text:0x803594E8; // type:function size:0x18 +__sinit_CMidiManager_cpp = .text:0x80359500; // type:function size:0x3C scope:local +__dt__Q24rstl49reserved_vectorFv = .text:0x8035953C; // type:function size:0x94 CalculateBaseline__13CFontImageDefFv = .text:0x803595D0; // type:function size:0xB8 IsLoaded__13CFontImageDefCFv = .text:0x80359688; // type:function size:0x40 __ct__13CFontImageDefFRCQ24rstl54vector<17TToken<8CTexture>,Q24rstl17rmemory_allocator>fRC9CVector2f = .text:0x803596C8; // type:function size:0x110 @@ -17904,12 +17904,12 @@ lbl_803D8358 = .rodata:0x803D8358; // type:object size:0xB0 lbl_803D8408 = .rodata:0x803D8408; // type:object size:0x8 lbl_803D8410 = .rodata:0x803D8410; // type:object size:0x8 lbl_803D8418 = .rodata:0x803D8418; // type:object size:0x8 -lbl_803D8420 = .rodata:0x803D8420; // type:object size:0x10 data:wstring -lbl_803D8430 = .rodata:0x803D8430; // type:object size:0x8 +skInvalidString = .rodata:0x803D8420; // type:object size:0x10 data:wstring +@stringBase0 = .rodata:0x803D8430; // type:object size:0x7 scope:local data:string_table lbl_803D8438 = .rodata:0x803D8438; // type:object size:0x8 lbl_803D8440 = .rodata:0x803D8440; // type:object size:0x8 -lbl_803D8448 = .rodata:0x803D8448; // type:object size:0x8 -lbl_803D8450 = .rodata:0x803D8450; // type:object size:0x8 +@stringBase0 = .rodata:0x803D8448; // type:object size:0x7 scope:local data:string_table +@stringBase0 = .rodata:0x803D8450; // type:object size:0x7 scope:local data:string_table @stringBase0 = .rodata:0x803D8458; // type:object size:0x7 scope:local data:string_table lbl_803D8460 = .rodata:0x803D8460; // type:object size:0x18 lbl_803D8478 = .rodata:0x803D8478; // type:object size:0x8 @@ -17996,7 +17996,7 @@ lbl_803D9A98 = .data:0x803D9A98; // type:object size:0x1C jumptable_803D9AB4 = .data:0x803D9AB4; // type:object size:0x20 scope:local lbl_803D9AD4 = .data:0x803D9AD4; // type:object size:0x1C lbl_803D9AF0 = .data:0x803D9AF0; // type:object size:0x1C -lbl_803D9B0C = .data:0x803D9B0C; // type:object size:0xC +__vt__40TObjOwnerDerivedFromIObj<12CStringTable> = .data:0x803D9B0C; // type:object size:0xC lbl_803D9B18 = .data:0x803D9B18; // type:object size:0x1C lbl_803D9B34 = .data:0x803D9B34; // type:object size:0x1C lbl_803D9B50 = .data:0x803D9B50; // type:object size:0x1C @@ -18604,7 +18604,7 @@ lbl_803EC654 = .data:0x803EC654; // type:object size:0x14 lbl_803EC668 = .data:0x803EC668; // type:object size:0x1C lbl_803EC684 = .data:0x803EC684; // type:object size:0x10 lbl_803EC694 = .data:0x803EC694; // type:object size:0x14 -lbl_803EC6A8 = .data:0x803EC6A8; // type:object size:0xC +__vt__8IElement = .data:0x803EC6A8; // type:object size:0xC lbl_803EC6B4 = .data:0x803EC6B4; // type:object size:0x14 lbl_803EC6C8 = .data:0x803EC6C8; // type:object size:0x10 lbl_803EC6D8 = .data:0x803EC6D8; // type:object size:0x120 @@ -18827,10 +18827,10 @@ lbl_803EF818 = .data:0x803EF818; // type:object size:0x10 lbl_803EF828 = .data:0x803EF828; // type:object size:0x10 lbl_803EF838 = .data:0x803EF838; // type:object size:0x10 lbl_803EF848 = .data:0x803EF848; // type:object size:0x10 -lbl_803EF858 = .data:0x803EF858; // type:object size:0x10 -lbl_803EF868 = .data:0x803EF868; // type:object size:0x10 +__vt__15CEmitterElement = .data:0x803EF858; // type:object size:0x10 +__vt__9CVESphere = .data:0x803EF868; // type:object size:0x10 __vt__16CEESimpleEmitter = .data:0x803EF878; // type:object size:0x10 -__vt__52TObjOwnerDerivedFromIObj = .data:0x803EF888; // type:object size:0x10 +__vt__52TObjOwnerDerivedFromIObj = .data:0x803EF888; // type:object size:0xC scope:weak __vt__17CImageInstruction = .data:0x803EF898; // type:object size:0x20 __vt__17CParticleElectric = .data:0x803EF8B8; // type:object size:0x78 __vt__44TObjOwnerDerivedFromIObj<16CDependencyGroup> = .data:0x803EF930; // type:object size:0xC scope:weak @@ -19220,7 +19220,7 @@ lbl_804BFC8C = .bss:0x804BFC8C; // type:object size:0x14 sStaticSkinningData__8Skinning = .bss:0x804BFCA0; // type:object size:0x80000 align:32 sSkinningBuffer__8Skinning = .bss:0x8053FCAC; // type:object size:0x1C data:byte sAllocations__8Skinning = .bss:0x8053FCD4; // type:object size:0x1C -lbl_8053FCF0 = .bss:0x8053FCF0; // type:object size:0xC +@148 = .bss:0x8053FCF0; // type:object size:0xC scope:local lbl_8053FD00 = .bss:0x8053FD00; // type:object size:0x500 align:32 lbl_80540200 = .bss:0x80540200; // type:object size:0x30 lbl_80540230 = .bss:0x80540230; // type:object size:0x30 @@ -19502,7 +19502,7 @@ mpDefaultInvalidString__9CAudioSys = .bss:0x805A64AC; // type:object size:0x10 lbl_805A64BC = .bss:0x805A64BC; // type:object size:0x20 lbl_805A64DC = .bss:0x805A64DC; // type:object size:0x10 sLists__10CARAMToken = .bss:0x805A64EC; // type:object size:0x1C -mMidiWrappers__12CMidiManager = .bss:0x805A6508; // type:object size:0x38 data:4byte +mMidiWrappers__12CMidiManager = .bss:0x805A6508; // type:object size:0x28 data:4byte lbl_805A6540 = .bss:0x805A6540; // type:object size:0x300 align:32 data:4byte lbl_805A6840 = .bss:0x805A6840; // type:object size:0x10 data:4byte lbl_805A6870 = .bss:0x805A6870; // type:object size:0x10 data:4byte @@ -21338,7 +21338,7 @@ lbl_805A86A4 = .sdata:0x805A86A4; // type:object size:0x1 data:byte lbl_805A86A8 = .sdata:0x805A86A8; // type:object size:0x4 data:4byte lbl_805A86AC = .sdata:0x805A86AC; // type:object size:0x4 data:4byte lbl_805A86B0 = .sdata:0x805A86B0; // type:object size:0x8 data:byte -lbl_805A86B8 = .sdata:0x805A86B8; // type:object size:0x8 data:4byte +mCurrentLanguage = .sdata:0x805A86B8; // type:object size:0x4 scope:local data:4byte lbl_805A86C0 = .sdata:0x805A86C0; // type:object size:0x8 lbl_805A86C8 = .sdata:0x805A86C8; // type:object size:0x1 data:byte lbl_805A86C9 = .sdata:0x805A86C9; // type:object size:0x1 data:byte @@ -22042,7 +22042,7 @@ lbl_805A9324 = .sbss:0x805A9324; // type:object size:0x4 data:4byte lbl_805A9328 = .sbss:0x805A9328; // type:object size:0x8 data:4byte lbl_805A9330 = .sbss:0x805A9330; // type:object size:0x1 data:byte lbl_805A9334 = .sbss:0x805A9334; // type:object size:0x1 data:byte -lbl_805A9338 = .sbss:0x805A9338; // type:object size:0x8 data:4byte +gCurrentTimeProvider__13CTimeProvider = .sbss:0x805A9338; // type:object size:0x4 data:4byte lbl_805A9340 = .sbss:0x805A9340; // type:object size:0x4 data:4byte lbl_805A9344 = .sbss:0x805A9344; // type:object size:0x4 data:4byte lbl_805A9348 = .sbss:0x805A9348; // type:object size:0x4 data:4byte @@ -26601,8 +26601,8 @@ lbl_805AE588 = .sdata2:0x805AE588; // type:object size:0x4 align:4 data:float lbl_805AE58C = .sdata2:0x805AE58C; // type:object size:0x4 align:4 data:float lbl_805AE590 = .sdata2:0x805AE590; // type:object size:0x8 align:4 data:float lbl_805AE598 = .sdata2:0x805AE598; // type:object size:0x8 data:4byte -lbl_805AE5A0 = .sdata2:0x805AE5A0; // type:object size:0x4 data:4byte -lbl_805AE5A4 = .sdata2:0x805AE5A4; // type:object size:0x4 data:4byte +kInvalidAlloc__12CARAMManager = .sdata2:0x805AE5A0; // type:object size:0x4 data:4byte +kInvalidHandle__12CARAMManager = .sdata2:0x805AE5A4; // type:object size:0x4 data:4byte lbl_805AE5A8 = .sdata2:0x805AE5A8; // type:object size:0x4 align:4 data:float lbl_805AE5AC = .sdata2:0x805AE5AC; // type:object size:0x4 align:4 data:float lbl_805AE5B0 = .sdata2:0x805AE5B0; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index f89d58b5..c58bf1e9 100755 --- a/configure.py +++ b/configure.py @@ -1056,15 +1056,15 @@ config.libs = [ Object(NonMatching, "Kyoto/Animation/DolphinCSkinRules.cpp"), Object(NonMatching, "Kyoto/Animation/DolphinCVirtualBone.cpp"), Object(NonMatching, "Kyoto/Graphics/DolphinCModel.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Text/CStringTable.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Text/CStringTable.cpp"), Object(NonMatching, "Kyoto/Particles/CEmitterElement.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Particles/CEffectComponent.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Particles/CEffectComponent.cpp"), Object(NonMatching, "Kyoto/Particles/CParticleData.cpp"), Object(NonMatching, "Kyoto/Animation/CVertexMorphEffect.cpp"), Object(NonMatching, "Kyoto/Animation/CSkinnedModelWithAvgNormals.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/CTimeProvider.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/CARAMToken.cpp"), - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Audio/CMidiManager.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/CTimeProvider.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/CARAMToken.cpp"), + Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Audio/CMidiManager.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Text/CFontImageDef.cpp"), Object(NonMatching, "Kyoto/Text/CImageInstruction.cpp"), Object(NonMatching, "Kyoto/Text/CTextRenderBuffer.cpp"),