diff --git a/config/GM8E01_48/splits.txt b/config/GM8E01_48/splits.txt index 9b50aed1..38774c22 100644 --- a/config/GM8E01_48/splits.txt +++ b/config/GM8E01_48/splits.txt @@ -16,6 +16,46 @@ Sections: MetroTRK/mslsupp.c: .text start:0x80003640 end:0x80003658 +Kyoto/Text/CFontImageDef.cpp: + .text start:0x803595D0 end:0x803598AC + .rodata start:0x803D8458 end:0x803D8460 + .sdata2 start:0x805AE6D8 end:0x805AE6F0 + +Kyoto/Text/CImageInstruction.cpp: + .text start:0x803598AC end:0x80359C80 + .data start:0x803EF898 end:0x803EF8B8 + .sdata2 start:0x805AE6F0 end:0x805AE6F8 + +Kyoto/Text/CTextRenderBuffer.cpp: + .text start:0x80359C80 end:0x8035B770 + .rodata start:0x803D8460 end:0x803D8480 + .sdata start:0x805A86C0 end:0x805A86C8 + .sdata2 start:0x805AE6F8 end:0x805AE708 + +Kyoto/Graphics/CCubeMoviePlayer.cpp: + .text start:0x8035B770 end:0x8035DD7C + .rodata start:0x803D8480 end:0x803D84E0 + .bss start:0x8053FD00 end:0x80540200 + .sdata start:0x805A86C8 end:0x805A86D8 + .sbss start:0x805A9340 end:0x805A9358 + .sdata2 start:0x805AE708 end:0x805AE738 + +Kyoto/Animation/CAdditiveAnimPlayback.cpp: + .text start:0x8035DD7C end:0x8035E158 + .sdata start:0x805A86D8 end:0x805A86F0 + .sdata2 start:0x805AE738 end:0x805AE740 + +Kyoto/Particles/CParticleElectricDataFactory.cpp: + .text start:0x8035E158 end:0x8035EB44 + .rodata start:0x803D84E0 end:0x803D84E8 + +Kyoto/Particles/CParticleElectric.cpp: + .text start:0x8035EB44 end:0x803632D8 + .rodata start:0x803D84E8 end:0x803D8500 + .data start:0x803EF8B8 end:0x803EF930 + .sdata start:0x805A86F0 end:0x805A8700 + .sdata2 start:0x805AE740 end:0x805AE798 + Kyoto/Graphics/DolphinCColor.cpp: .text start:0x803632D8 end:0x8036374C .sdata start:0x805A8700 end:0x805A8710 @@ -32,7 +72,7 @@ Kyoto/Audio/CDSPStreamManager.cpp: Kyoto/CDependencyGroup.cpp: .text start:0x803651C0 end:0x80365664 .rodata start:0x803D8508 end:0x803D8510 - .data start:0x803EF940 end:0x803EF940 + .data start:0x803EF930 end:0x803EF940 Kyoto/Audio/CStreamAudioManager.cpp: .text start:0x80365664 end:0x803669B4 diff --git a/config/GM8E01_48/symbols.txt b/config/GM8E01_48/symbols.txt index 2e0db875..88e889a6 100644 --- a/config/GM8E01_48/symbols.txt +++ b/config/GM8E01_48/symbols.txt @@ -14471,11 +14471,11 @@ reserve__Q24rstl47vector<10SObjectTag,Q24rstl17rmemory_allocator>Fi = .text:0x80 fn_80340BE8 = .text:0x80340BE8; // type:function size:0x24C fn_80340E34 = .text:0x80340E34; // type:function size:0x7C fn_80340EB0 = .text:0x80340EB0; // type:function size:0x44 -fn_80340EF4 = .text:0x80340EF4; // type:function size:0x44 +Lock__6CTokenFv = .text:0x80340EF4; // type:function size:0x44 fn_80340F38 = .text:0x80340F38; // type:function size:0x44 -fn_80340F7C = .text:0x80340F7C; // type:function size:0x34 +GetObj__6CTokenFv = .text:0x80340F7C; // type:function size:0x34 __dt__6CTokenFv = .text:0x80340FB0; // type:function size:0x68 -fn_80341018 = .text:0x80341018; // type:function size:0x5C +__ct__6CTokenFRC6CToken = .text:0x80341018; // type:function size:0x5C fn_80341074 = .text:0x80341074; // type:function size:0xE0 fn_80341154 = .text:0x80341154; // type:function size:0x20 fn_80341174 = .text:0x80341174; // type:function size:0x108 @@ -14987,10 +14987,10 @@ 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 -fn_803595D0 = .text:0x803595D0; // type:function size:0xB8 -fn_80359688 = .text:0x80359688; // type:function size:0x40 -fn_803596C8 = .text:0x803596C8; // type:function size:0x110 -fn_803597D8 = .text:0x803597D8; // type:function size:0xD4 +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 +__ct__13CFontImageDefFRC17TToken<8CTexture>RC9CVector2f = .text:0x803597D8; // type:function size:0xD4 fn_803598AC = .text:0x803598AC; // type:function size:0x78 fn_80359924 = .text:0x80359924; // type:function size:0x8 fn_8035992C = .text:0x8035992C; // type:function size:0xA4 @@ -15042,9 +15042,9 @@ fn_8035CBA8 = .text:0x8035CBA8; // type:function size:0x8C __dt__Q24rstl56vector,Q24rstl17rmemory_allocator>Fv = .text:0x8035CC34; // type:function size:0xB8 fn_8035CCEC = .text:0x8035CCEC; // type:function size:0x49C fn_8035D188 = .text:0x8035D188; // type:function size:0x204 -fn_8035D38C = .text:0x8035D38C; // type:function size:0x174 -fn_8035D500 = .text:0x8035D500; // type:function size:0x51C -fn_8035DA1C = .text:0x8035DA1C; // type:function size:0x84 +MyTHPYuv2RgbTextureSetup__FPvPvPvUsUs = .text:0x8035D38C; // type:function size:0x174 +MyTHPGXYuv2RgbSetup__Fbb = .text:0x8035D500; // type:function size:0x51C +MyTHPGXRestore__Fv = .text:0x8035DA1C; // type:function size:0x84 fn_8035DAA0 = .text:0x8035DAA0; // type:function size:0x144 fn_8035DBE4 = .text:0x8035DBE4; // type:function size:0x90 reserve__Q24rstl56vector,Q24rstl17rmemory_allocator>Fi = .text:0x8035DC74; // type:function size:0x108 @@ -17910,7 +17910,7 @@ 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 -lbl_803D8458 = .rodata:0x803D8458; // type:object size:0x8 +@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 lbl_803D8480 = .rodata:0x803D8480; // type:object size:0x58 @@ -18833,7 +18833,7 @@ lbl_803EF878 = .data:0x803EF878; // type:object size:0x10 lbl_803EF888 = .data:0x803EF888; // type:object size:0x10 lbl_803EF898 = .data:0x803EF898; // type:object size:0x20 lbl_803EF8B8 = .data:0x803EF8B8; // type:object size:0x78 -__vt__44TObjOwnerDerivedFromIObj<16CDependencyGroup> = .data:0x803EF930; // type:object size:0x10 +__vt__44TObjOwnerDerivedFromIObj<16CDependencyGroup> = .data:0x803EF930; // type:object size:0xC scope:weak ...data.0 = .data:0x803EF940; // type:label scope:local power2 = .data:0x803EF940; // type:object size:0x1E scope:local _dqlntab = .data:0x803EF960; // type:object size:0x20 scope:local @@ -26664,10 +26664,10 @@ lbl_805AE6C0 = .sdata2:0x805AE6C0; // type:object size:0x8 align:8 data:double lbl_805AE6C8 = .sdata2:0x805AE6C8; // type:object size:0x8 align:8 data:double lbl_805AE6D0 = .sdata2:0x805AE6D0; // type:object size:0x4 align:4 data:float lbl_805AE6D4 = .sdata2:0x805AE6D4; // type:object size:0x4 align:4 data:float -lbl_805AE6D8 = .sdata2:0x805AE6D8; // type:object size:0x4 align:4 data:float -lbl_805AE6DC = .sdata2:0x805AE6DC; // type:object size:0x4 align:4 data:float -lbl_805AE6E0 = .sdata2:0x805AE6E0; // type:object size:0x8 align:8 data:double -lbl_805AE6E8 = .sdata2:0x805AE6E8; // type:object size:0x4 align:4 data:float +@178 = .sdata2:0x805AE6D8; // type:object size:0x4 scope:local align:4 data:float +@179 = .sdata2:0x805AE6DC; // type:object size:0x4 scope:local align:4 data:float +@181 = .sdata2:0x805AE6E0; // type:object size:0x8 scope:local align:8 data:double +@334 = .sdata2:0x805AE6E8; // type:object size:0x4 scope:local align:4 data:float lbl_805AE6F0 = .sdata2:0x805AE6F0; // type:object size:0x8 align:8 data:double lbl_805AE6F8 = .sdata2:0x805AE6F8; // type:object size:0x8 align:8 data:double lbl_805AE700 = .sdata2:0x805AE700; // type:object size:0x4 align:4 data:float diff --git a/configure.py b/configure.py index 03f9b9dc..11efdff6 100755 --- a/configure.py +++ b/configure.py @@ -1064,7 +1064,7 @@ config.libs = [ 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"), "Kyoto/Text/CFontImageDef.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"), Object(NonMatching, "Kyoto/Graphics/CCubeMoviePlayer.cpp"),