Skip to content

Commit 3ca8f86

Browse files
authored
Merge pull request #37 from LivewireCB/main
Finished cleaning up the splits and file paths.
2 parents dbabe52 + a00b1f2 commit 3ca8f86

File tree

2 files changed

+36
-14
lines changed

2 files changed

+36
-14
lines changed

config/GGVE78/splits.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ bink/src/sdk/dct.c:
912912
bink/src/sdk/bitplane.c:
913913
.text start:0x802A0960 end:0x802A1FAC
914914

915-
ios.cpp:
915+
MSL_C/MSL_Common/ios.cpp:
916916
extab start:0x80005600 end:0x80005608
917917
extabindex start:0x80005700 end:0x8000570C
918918
.text start:0x802A1FAC end:0x802A2000
@@ -1309,28 +1309,28 @@ debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
13091309
debugger/embedded/MetroTRK/Export/mslsupp.c:
13101310
.text start:0x802B8D0C end:0x802B8E84
13111311

1312-
UDP_Stubs.c:
1312+
debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c:
13131313
.text start:0x802B8E84 end:0x802B8ECC
13141314

1315-
main.c:
1315+
gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
13161316
.text start:0x802B8ECC end:0x802B9210
13171317
.rodata start:0x8037EE50 end:0x8037EF30
13181318
.bss start:0x804640F8 end:0x80464918
13191319
.sbss start:0x804B1C60 end:0x804B1C68
13201320

1321-
CircleBuffer.c:
1321+
gamedev/cust_connection/utils/common/CircleBuffer.c:
13221322
.text start:0x802B9210 end:0x802B9478
13231323

1324-
DupeCDir/main.c_1:
1324+
gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
13251325
.text start:0x802B9478 end:0x802B97C4
13261326
.rodata start:0x8037EF30 end:0x8037F010
13271327
.bss start:0x80464918 end:0x80464E38
13281328
.sbss start:0x804B1C68 end:0x804B1C70
13291329

1330-
MWTrace.c:
1330+
gamedev/cust_connection/utils/common/MWTrace.c:
13311331
.text start:0x802B97C4 end:0x802B9814
13321332

1333-
MWCriticalSection_gc.cpp:
1333+
gamedev/cust_connection/utils/gc/MWCriticalSection_gc.cpp:
13341334
.text start:0x802B9814 end:0x802B986C
13351335

13361336
FMOD/src/fmusic.c:
@@ -1963,7 +1963,7 @@ rwsdk/plugin/matfx/gcn/multiTexGcnPipe.c:
19631963
rwsdk/plugin/matfx/gcn/multiTexGcn.c:
19641964
.text start:0x8030B4D4 end:0x8030B53C
19651965

1966-
nbtGen.c:
1966+
rwsdk/plugin/matfx/gcn/nbtGen.c:
19671967
.text start:0x8030B53C end:0x8030CEFC
19681968
.sdata2 start:0x804B4BF8 end:0x804B4C20
19691969

@@ -2059,7 +2059,7 @@ rwsdk/plugin/skin2/gcn/skinmatrixblend.c:
20592059
rwsdk/plugin/skin2/gcn/skingcnasm.c:
20602060
.text start:0x80318010 end:0x80318B14
20612061

2062-
skinmatfxgcn.c:
2062+
rwsdk/plugin/skin2/gcn/skinmatfxgcn.c:
20632063
.text start:0x80318B14 end:0x80318E08
20642064

20652065
rwsdk/plugin/skin2/gcn/skingcnm.c:
@@ -2223,7 +2223,7 @@ rwsdk/tool/anim/rtanim.c:
22232223
.sbss start:0x804B22D0 end:0x804B22D8
22242224
.sdata2 start:0x804B4DC8 end:0x804B4DD0
22252225

2226-
rtfsmgr.c:
2226+
rwsdk/tool/fsyst/rtfsmgr.c:
22272227
.text start:0x8033741C end:0x80337ADC
22282228
.bss start:0x80486798 end:0x804867B0
22292229
.sdata start:0x804B07D0 end:0x804B07E8
@@ -2233,13 +2233,13 @@ rwsdk/tool/intsec/rtintsec.c:
22332233
.text start:0x80337ADC end:0x803390B4
22342234
.sdata2 start:0x804B4DD0 end:0x804B4DD8
22352235

2236-
skinsplit.c:
2236+
rwsdk/tool/sknsplit/skinsplit.c:
22372237
.text start:0x803390B4 end:0x8033A8B4
22382238
.data start:0x803C3BD0 end:0x803C3BE0
22392239
.bss start:0x804867B0 end:0x80486BB0
22402240
.sdata2 start:0x804B4DD8 end:0x804B4DE0
22412241

2242-
rtskinsp.c:
2242+
rwsdk/tool/sknsplit/rtskinsp.c:
22432243
.text start:0x8033A8B4 end:0x8033B170
22442244

22452245
rwsdk/tool/slerp/rtslerp.c:

configure.py

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@ def MatchingFor(*versions):
461461
Object(NonMatching, "bink/src/sdk/decode/binkacd.c"),
462462
Object(NonMatching, "bink/shared/time/radcb.c"),
463463
Object(NonMatching, "bink/src/sdk/decode/expand.c"),
464+
Object(NonMatching, "bink/src/sdk/decode/radmem.c"),
465+
Object(NonMatching, "bink/src/sdk/decode/yuv.c"),
464466
Object(NonMatching, "bink/src/sdk/popmal.c"),
465467
Object(NonMatching, "bink/src/sdk/decode/ngc/ngcrgb.c"),
466468
Object(NonMatching, "bink/src/sdk/decode/ngc/ngcyuy2.c"),
@@ -702,8 +704,10 @@ def MatchingFor(*versions):
702704
Object(NonMatching, "MSL_C/MSL_Common/ctype.c"),
703705
Object(NonMatching, "MSL_C/MSL_Common/direct_io.c"),
704706
Object(Matching, "MSL_C/MSL_Common/errno.c"),
707+
Object(NonMatching, "MSL_C/MSL_Common/extras.c"),
705708
Object(NonMatching, "MSL_C/MSL_Common/file_io.c"),
706709
Object(NonMatching, "MSL_C/MSL_Common/FILE_POS.C"),
710+
Object(NonMatching, "MSL_C/MSL_Common/ios.cpp"),
707711
Object(Matching, "MSL_C/MSL_Common/locale.c"),
708712
Object(NonMatching, "MSL_C/MSL_Common/mbstring.c"),
709713
Object(NonMatching, "MSL_C/MSL_Common/mem.c"),
@@ -735,6 +739,7 @@ def MatchingFor(*versions):
735739
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c"),
736740
Object(NonMatching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c"),
737741
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c"),
742+
Object(NonMatching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c"),
738743
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c"),
739744
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c"),
740745
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c"),
@@ -756,6 +761,7 @@ def MatchingFor(*versions):
756761
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c"),
757762
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log.c"),
758763
Object(Matching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c"),
764+
Object(NonMatching, "MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c"),
759765
Object(Matching, "MSL_C/PPC_EABI/math_ppc.c"),
760766
]
761767
),
@@ -778,9 +784,9 @@ def MatchingFor(*versions):
778784
Object(NonMatching, "debugger/embedded/MetroTRK/Portable/mem_TRK.c"),
779785
Object(NonMatching, "debugger/embedded/MetroTRK/Portable/string_TRK.c"),
780786
Object(Matching, "debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c"),
781-
#Object(NonMatching, "debugger/embedded/MetroTRK/Processor/ppc/Generic/__exception.s"),
787+
# Object(NonMatching, "debugger/embedded/MetroTRK/Processor/ppc/Generic/__exception.s"),
782788
Object(NonMatching, "debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c"),
783-
#Object(NonMatching, "debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s"),
789+
# Object(NonMatching, "debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s"),
784790
Object(Matching, "debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c"),
785791
Object(NonMatching, "debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c"),
786792
Object(NonMatching, "debugger/embedded/MetroTRK/Os/dolphin/usr_put.c"),
@@ -828,6 +834,7 @@ def MatchingFor(*versions):
828834
Object(NonMatching, "rwsdk/plugin/matfx/gcn/multiTexGcnData.c"),
829835
Object(NonMatching, "rwsdk/plugin/matfx/gcn/multiTexGcnPipe.c"),
830836
Object(NonMatching, "rwsdk/plugin/matfx/gcn/multiTexGcn.c"),
837+
Object(NonMatching, "rwsdk/plugin/matfx/gcn/nbtGen.c"),
831838
Object(NonMatching, "rwsdk/plugin/matfx/multiTex.c"),
832839
Object(NonMatching, "rwsdk/plugin/matfx/multiTexEffect.c"),
833840
Object(NonMatching, "rwsdk/plugin/matfx/rpmatfx.c"),
@@ -859,9 +866,11 @@ def MatchingFor(*versions):
859866
Object(NonMatching, "rwsdk/plugin/skin2/bsplit.c"),
860867
Object(NonMatching, "rwsdk/plugin/skin2/rpskin.c"),
861868
Object(NonMatching, "rwsdk/plugin/skin2/gcn/skingcn.c"),
869+
Object(NonMatching, "rwsdk/plugin/skin2/gcn/skingcnm.c"),
862870
Object(NonMatching, "rwsdk/plugin/skin2/gcn/skinstream.c"),
863871
Object(NonMatching, "rwsdk/plugin/skin2/gcn/instance/instanceskin.c"),
864872
Object(NonMatching, "rwsdk/plugin/skin2/gcn/skinmatrixblend.c"),
873+
Object(NonMatching, "rwsdk/plugin/skin2/gcn/skinmatfxgcn.c"),
865874
Object(NonMatching, "rwsdk/plugin/skin2/gcn/skingcnasm.c"),
866875
Object(NonMatching, "rwsdk/plugin/skin2/gcn/skingcng.c"),
867876
],
@@ -907,6 +916,12 @@ def MatchingFor(*versions):
907916
Object(NonMatching, "rwsdk/world/pipe/p2/gcn/instance/vtxdesc.c"),
908917
],
909918
),
919+
RenderWareLib(
920+
"fsyst",
921+
[
922+
Object(NonMatching, "rwsdk/tool/fsyst/rtfsmgr.c"),
923+
],
924+
),
910925
RenderWareLib(
911926
"rtanim",
912927
[
@@ -919,6 +934,13 @@ def MatchingFor(*versions):
919934
Object(NonMatching, "rwsdk/tool/intsec/rtintsec.c"),
920935
],
921936
),
937+
RenderWareLib(
938+
"sknsplit",
939+
[
940+
Object(NonMatching, "rwsdk/tool/sknsplit/skinsplit.c"),
941+
Object(NonMatching, "rwsdk/tool/sknsplit/rtskinsp.c"),
942+
],
943+
),
922944
RenderWareLib(
923945
"rtslerp",
924946
[

0 commit comments

Comments
 (0)