PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-09 00:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

More KOR splits

Browse Source
This commit is contained in:
Phillip Stephens
2025-05-21 13:22:56 -07:00
parent 23fea228ab
commit 6031d1875f
4 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/GM8E01_48/splits.txt
View File

@@ -16,6 +16,32 @@ Sections:
MetroTRK/mslsupp.c: MetroTRK/mslsupp.c:
.text start:0x80003640 end:0x80003658 .text start:0x80003640 end:0x80003658
Kyoto/rstl/RstlExtras.cpp:
.text start:0x8033E5A0 end:0x8033ED98
.ctors start:0x803CB444 end:0x803CB448
.rodata start:0x803D7B60 end:0x803D7B78
.bss start:0x804BFC10 end:0x804BFC20
.sbss start:0x805A91C8 end:0x805A91D0
Kyoto/Streams/CInputStream.cpp:
.text start:0x8033ED98 end:0x8033F334
.rodata start:0x803D7B78 end:0x803D7B80
.data start:0x803EE488 end:0x803EE498
.sbss start:0x805A91D0 end:0x805A91E8
Kyoto/Streams/CMemoryInStream.cpp:
.text start:0x8033F334 end:0x8033F3C0
.data start:0x803EE498 end:0x803EE4A8
Kyoto/Streams/CMemoryStreamOut.cpp:
.text start:0x8033F3C0 end:0x8033F52C
.data start:0x803EE4A8 end:0x803EE4B8
Kyoto/Streams/COutputStream.cpp:
.text start:0x8033F52C end:0x8033F91C
.rodata start:0x803D7B80 end:0x803D7B88
.data start:0x803EE4B8 end:0x803EE4C8
Kyoto/Streams/CZipInputStream.cpp: Kyoto/Streams/CZipInputStream.cpp:
.text start:0x8033F91C end:0x8033FB5C .text start:0x8033F91C end:0x8033FB5C
.rodata start:0x803D7B88 end:0x803D7B98 .rodata start:0x803D7B88 end:0x803D7B98

43
config/GM8E01_48/symbols.txt
View File

@@ -9724,7 +9724,7 @@ fn_8020BD7C = .text:0x8020BD7C; // type:function size:0x38
fn_8020BDB4 = .text:0x8020BDB4; // type:function size:0xDC fn_8020BDB4 = .text:0x8020BDB4; // type:function size:0xDC
fn_8020BE90 = .text:0x8020BE90; // type:function size:0x74 fn_8020BE90 = .text:0x8020BE90; // type:function size:0x74
fn_8020BF04 = .text:0x8020BF04; // type:function size:0x204 fn_8020BF04 = .text:0x8020BF04; // type:function size:0x204
fn_8020C108 = .text:0x8020C108; // type:function size:0x60 __pl__4rstlFRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>c = .text:0x8020C108; // type:function size:0x60
fn_8020C168 = .text:0x8020C168; // type:function size:0x60 fn_8020C168 = .text:0x8020C168; // type:function size:0x60
fn_8020C1C8 = .text:0x8020C1C8; // type:function size:0xF0 fn_8020C1C8 = .text:0x8020C1C8; // type:function size:0xF0
fn_8020C2B8 = .text:0x8020C2B8; // type:function size:0x128 fn_8020C2B8 = .text:0x8020C2B8; // type:function size:0x128
@@ -16050,11 +16050,11 @@ sprintf = .text:0x8038DDE0; // type:function size:0xE0
vsprintf = .text:0x8038DEC0; // type:function size:0x78 vsprintf = .text:0x8038DEC0; // type:function size:0x78
vprintf = .text:0x8038DF38; // type:function size:0x7C scope:global vprintf = .text:0x8038DF38; // type:function size:0x7C scope:global
printf = .text:0x8038DFB4; // type:function size:0xCC printf = .text:0x8038DFB4; // type:function size:0xCC
__StringWrite = .text:0x8038E080; // type:function size:0x6C scope:global __StringWrite = .text:0x8038E080; // type:function size:0x6C scope:local
__FileWrite = .text:0x8038E0EC; // type:function size:0x58 scope:global __FileWrite = .text:0x8038E0EC; // type:function size:0x58 scope:local
__pformatter = .text:0x8038E144; // type:function size:0x774 scope:local __pformatter = .text:0x8038E144; // type:function size:0x774 scope:local
float2str = .text:0x8038E8B8; // type:function size:0x6EC scope:local float2str = .text:0x8038E8B8; // type:function size:0x6EC scope:local
round_decimal = .text:0x8038EFA4; // type:function size:0x12C round_decimal = .text:0x8038EFA4; // type:function size:0x12C scope:local
double2hex = .text:0x8038F0D0; // type:function size:0x338 scope:local double2hex = .text:0x8038F0D0; // type:function size:0x338 scope:local
longlong2str = .text:0x8038F408; // type:function size:0x2DC scope:local longlong2str = .text:0x8038F408; // type:function size:0x2DC scope:local
long2str = .text:0x8038F6E4; // type:function size:0x220 scope:local long2str = .text:0x8038F6E4; // type:function size:0x220 scope:local
@@ -17875,8 +17875,8 @@ lbl_803D7B38 = .rodata:0x803D7B38; // type:object size:0x10
lbl_803D7B48 = .rodata:0x803D7B48; // type:object size:0x10 lbl_803D7B48 = .rodata:0x803D7B48; // type:object size:0x10
lbl_803D7B58 = .rodata:0x803D7B58; // type:object size:0x8 lbl_803D7B58 = .rodata:0x803D7B58; // type:object size:0x8
lbl_803D7B60 = .rodata:0x803D7B60; // type:object size:0x18 lbl_803D7B60 = .rodata:0x803D7B60; // type:object size:0x18
lbl_803D7B78 = .rodata:0x803D7B78; // type:object size:0x8 @stringBase0 = .rodata:0x803D7B78; // type:object size:0x7 scope:local data:string_table
lbl_803D7B80 = .rodata:0x803D7B80; // type:object size:0x8 @stringBase0 = .rodata:0x803D7B80; // type:object size:0x7 scope:local data:string_table
@stringBase0 = .rodata:0x803D7B88; // type:object size:0xD scope:local data:string_table @stringBase0 = .rodata:0x803D7B88; // type:object size:0xD scope:local data:string_table
@stringBase0 = .rodata:0x803D7B98; // type:object size:0xD scope:local data:string_table @stringBase0 = .rodata:0x803D7B98; // type:object size:0xD scope:local data:string_table
lbl_803D7BA8 = .rodata:0x803D7BA8; // type:object size:0x8 lbl_803D7BA8 = .rodata:0x803D7BA8; // type:object size:0x8
@@ -19015,10 +19015,10 @@ __ctype_map = .data:0x803F26F0; // type:object size:0x100
__lower_map = .data:0x803F27F0; // type:object size:0x100 __lower_map = .data:0x803F27F0; // type:object size:0x100
__upper_map = .data:0x803F28F0; // type:object size:0x100 __upper_map = .data:0x803F28F0; // type:object size:0x100
__lconv = .data:0x803F29F0; // type:object size:0x38 data:4byte __lconv = .data:0x803F29F0; // type:object size:0x38 data:4byte
@1249 = .data:0x803F2A28; // type:object size:0x84 scope:local @1307 = .data:0x803F2A28; // type:object size:0x84 scope:local
jumptable_803F2AAC = .data:0x803F2AAC; // type:object size:0x84 scope:local @1365 = .data:0x803F2AAC; // type:object size:0x84 scope:local
jumptable_803F2B30 = .data:0x803F2B30; // type:object size:0xE0 scope:local @1500 = .data:0x803F2B30; // type:object size:0xE0 scope:local
jumptable_803F2C10 = .data:0x803F2C10; // type:object size:0x44 scope:local @1499 = .data:0x803F2C10; // type:object size:0x44 scope:local
@1680 = .data:0x803F2C58; // type:object size:0x50 scope:local @1680 = .data:0x803F2C58; // type:object size:0x50 scope:local
kf$483 = .data:0x803F2CA8; // type:object size:0x1A scope:local kf$483 = .data:0x803F2CA8; // type:object size:0x1A scope:local
midi2TimeTab = .data:0x803F2CC4; // type:object size:0x200 scope:local midi2TimeTab = .data:0x803F2CC4; // type:object size:0x200 scope:local
@@ -21950,21 +21950,20 @@ lbl_805A91AC = .sbss:0x805A91AC; // type:object size:0x1 data:byte
lbl_805A91B0 = .sbss:0x805A91B0; // type:object size:0x1 data:byte lbl_805A91B0 = .sbss:0x805A91B0; // type:object size:0x1 data:byte
lbl_805A91B4 = .sbss:0x805A91B4; // type:object size:0x1 data:byte lbl_805A91B4 = .sbss:0x805A91B4; // type:object size:0x1 data:byte
lbl_805A91B5 = .sbss:0x805A91B5; // type:object size:0x1 data:byte lbl_805A91B5 = .sbss:0x805A91B5; // type:object size:0x1 data:byte
lbl_805A91B8 = .sbss:0x805A91B8; // type:object size:0x1 data:byte mNull__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator> = .sbss:0x805A91B8; // type:object size:0x1 data:byte
lbl_805A91BA = .sbss:0x805A91BA; // type:object size:0x2 data:2byte mNull__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator> = .sbss:0x805A91BA; // type:object size:0x2 data:2byte
lbl_805A91BC = .sbss:0x805A91BC; // type:object size:0x1 data:byte lbl_805A91BC = .sbss:0x805A91BC; // type:object size:0x1 data:byte
lbl_805A91BE = .sbss:0x805A91BE; // type:object size:0x2 data:2byte lbl_805A91BE = .sbss:0x805A91BE; // type:object size:0x2 data:2byte
lbl_805A91C0 = .sbss:0x805A91C0; // type:object size:0x1 data:byte lbl_805A91C0 = .sbss:0x805A91C0; // type:object size:0x1 data:byte
lbl_805A91C1 = .sbss:0x805A91C1; // type:object size:0x1 data:byte lbl_805A91C1 = .sbss:0x805A91C1; // type:object size:0x1 data:byte
lbl_805A91C2 = .sbss:0x805A91C2; // type:object size:0x1 data:byte lbl_805A91C2 = .sbss:0x805A91C2; // type:object size:0x1 data:byte
lbl_805A91C3 = .sbss:0x805A91C3; // type:object size:0x5 data:byte lbl_805A91C3 = .sbss:0x805A91C3; // type:object size:0x5 data:byte
lbl_805A91C8 = .sbss:0x805A91C8; // type:object size:0x8 data:4byte sNull__Q24rstl8CRefData = .sbss:0x805A91C8; // type:object size:0x8 data:4byte
lbl_805A91D0 = .sbss:0x805A91D0; // type:object size:0x1 data:byte c$107 = .sbss:0x805A91D0; // type:object size:0x1 scope:local data:byte
lbl_805A91D2 = .sbss:0x805A91D2; // type:object size:0x2 data:2byte s$114 = .sbss:0x805A91D2; // type:object size:0x2 scope:local data:2byte
lbl_805A91D4 = .sbss:0x805A91D4; // type:object size:0x4 data:4byte l$118 = .sbss:0x805A91D4; // type:object size:0x4 scope:local data:4byte
lbl_805A91D8 = .sbss:0x805A91D8; // type:object size:0x4 data:4byte ll$122 = .sbss:0x805A91D8; // type:object size:0x8 scope:local data:8byte
lbl_805A91DC = .sbss:0x805A91DC; // type:object size:0x4 data:4byte f$126 = .sbss:0x805A91E0; // type:object size:0x4 scope:local align:4 data:float
lbl_805A91E0 = .sbss:0x805A91E0; // type:object size:0x8 align:4 data:float
lbl_805A91E8 = .sbss:0x805A91E8; // type:object size:0x8 data:byte lbl_805A91E8 = .sbss:0x805A91E8; // type:object size:0x8 data:byte
gkInvalidObjectTag = .sbss:0x805A91F0; // type:object size:0x8 data:4byte gkInvalidObjectTag = .sbss:0x805A91F0; // type:object size:0x8 data:4byte
text$52 = .sbss:0x805A91F8; // type:object size:0x5 scope:local data:byte text$52 = .sbss:0x805A91F8; // type:object size:0x5 scope:local data:byte
@@ -26630,8 +26629,8 @@ lbl_805AE5FC = .sdata2:0x805AE5FC; // type:object size:0x4 align:4 data:float
lbl_805AE600 = .sdata2:0x805AE600; // type:object size:0x4 align:4 data:float lbl_805AE600 = .sdata2:0x805AE600; // type:object size:0x4 align:4 data:float
lbl_805AE604 = .sdata2:0x805AE604; // type:object size:0x4 align:4 data:float lbl_805AE604 = .sdata2:0x805AE604; // type:object size:0x4 align:4 data:float
lbl_805AE608 = .sdata2:0x805AE608; // type:object size:0x8 align:8 data:double lbl_805AE608 = .sdata2:0x805AE608; // type:object size:0x8 align:8 data:double
@23 = .sdata2:0x805AE610; // type:object size:0x4 scope:local align:4 data:float @24 = .sdata2:0x805AE610; // type:object size:0x4 scope:local align:4 data:float
@24 = .sdata2:0x805AE614; // type:object size:0x4 scope:local align:4 data:float @25 = .sdata2:0x805AE614; // type:object size:0x4 scope:local align:4 data:float
@249 = .sdata2:0x805AE618; // type:object size:0x4 scope:local align:4 data:float @249 = .sdata2:0x805AE618; // type:object size:0x4 scope:local align:4 data:float
kInput_AnalogOnThreshhold__11CFinalInput = .sdata2:0x805AE620; // type:object size:0x4 align:4 data:float kInput_AnalogOnThreshhold__11CFinalInput = .sdata2:0x805AE620; // type:object size:0x4 align:4 data:float
kInput_AnalogTriggerOnThreshhold__11CFinalInput = .sdata2:0x805AE624; // type:object size:0x4 align:4 data:float kInput_AnalogTriggerOnThreshhold__11CFinalInput = .sdata2:0x805AE624; // type:object size:0x4 align:4 data:float
@@ -26797,7 +26796,7 @@ lbl_805AE92C = .sdata2:0x805AE92C; // type:object size:0x4 data:4byte
@698 = .sdata2:0x805AE950; // type:object size:0x8 scope:local align:8 data:double @698 = .sdata2:0x805AE950; // type:object size:0x8 scope:local align:8 data:double
@699 = .sdata2:0x805AE958; // type:object size:0x8 scope:local align:8 data:double @699 = .sdata2:0x805AE958; // type:object size:0x8 scope:local align:8 data:double
@38 = .sdata2:0x805AE960; // type:object size:0x4 scope:local data:4byte @38 = .sdata2:0x805AE960; // type:object size:0x4 scope:local data:4byte
lbl_805AE968 = .sdata2:0x805AE968; // type:object size:0x8 align:8 data:double @1151 = .sdata2:0x805AE968; // type:object size:0x8 scope:local align:8 data:double
@150 = .sdata2:0x805AE970; // type:object size:0x5 scope:local data:string @150 = .sdata2:0x805AE970; // type:object size:0x5 scope:local data:string
@375 = .sdata2:0x805AE978; // type:object size:0x8 scope:local align:8 data:double @375 = .sdata2:0x805AE978; // type:object size:0x8 scope:local align:8 data:double
@689 = .sdata2:0x805AE980; // type:object size:0x8 scope:local align:8 data:double @689 = .sdata2:0x805AE980; // type:object size:0x8 scope:local align:8 data:double

8
configure.py
View File

@@ -995,10 +995,10 @@ config.libs = [
Object(NonMatching, "Kyoto/rstl/rstl_map.cpp"), Object(NonMatching, "Kyoto/rstl/rstl_map.cpp"),
Object(NonMatching, "Kyoto/rstl/rstl_strings.cpp"), Object(NonMatching, "Kyoto/rstl/rstl_strings.cpp"),
Object(NonMatching, "Kyoto/rstl/RstlExtras.cpp"), Object(NonMatching, "Kyoto/rstl/RstlExtras.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Streams/CInputStream.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CInputStream.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Streams/CMemoryInStream.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CMemoryInStream.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Streams/CMemoryStreamOut.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CMemoryStreamOut.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Kyoto/Streams/COutputStream.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/COutputStream.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CZipInputStream.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CZipInputStream.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CZipOutputStream.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CZipOutputStream.cpp"),
Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CZipSupport.cpp"), Object(MatchingFor("GM8E01_00", "GM8E01_01", "GM8E01_48"), "Kyoto/Streams/CZipSupport.cpp"),

5
src/Kyoto/rstl/RstlExtras.cpp
View File

@@ -19,10 +19,9 @@ int CStringExtras::IndexOfSubstring(const rstl::string& left, const rstl::string
return -1; return -1;
} }
int i;
int j;
for (int i = 0; i < (leftSize - rightSize) + 1; ++i) { for (int i = 0; i < (leftSize - rightSize) + 1; ++i) {
for (int j = 0; j < rightSize; ++j) { int j = 0;
for (; j < rightSize; ++j) {
if (ConvertToUpperCase(right.at(i)) != ConvertToUpperCase(left.at(i + j))) { if (ConvertToUpperCase(right.at(i)) != ConvertToUpperCase(left.at(i + j))) {
break; break;
} }