Skip to content

Commit 0a899a4

Browse files
authored
fix GC JPN dol splits / d_a_npc_prayer mostly done (#2488)
* jmessage cleanup pass * more JMessage cleanup * d_msg_class cleanup * fix a bunch of gc jpn dol splits * d_a_npc_prayer pretty much equivalent
1 parent 23cba4d commit 0a899a4

File tree

14 files changed

+1764
-1870
lines changed

14 files changed

+1764
-1870
lines changed

config/GZ2J01/splits.txt

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ f_op/f_op_actor.cpp:
143143
.text start:0x80018B64 end:0x800197BC
144144
.rodata start:0x8037AD20 end:0x8037AD28
145145
.data start:0x8039D710 end:0x8039D740
146-
.sbss start:0x8044ADF8 end:0x8044AE0C
146+
.sbss start:0x8044ADF8 end:0x8044AE08
147147
.sdata2 start:0x8044BD08 end:0x8044BD40
148148

149149
f_op/f_op_actor_iter.cpp:
@@ -159,7 +159,7 @@ f_op/f_op_actor_mng.cpp:
159159
.rodata start:0x8037AD28 end:0x8037AEF8
160160
.data start:0x8039D750 end:0x8039D9C0
161161
.bss start:0x803EBD40 end:0x803EBF18
162-
.sbss start:0x8044AE0C end:0x8044AE20
162+
.sbss start:0x8044AE08 end:0x8044AE20
163163
.sdata2 start:0x8044BD40 end:0x8044BDA8
164164

165165
f_op/f_op_camera.cpp:
@@ -395,7 +395,7 @@ d/d_bomb.cpp:
395395
d/d_lib.cpp:
396396
.text start:0x80032044 end:0x80032918
397397
.data start:0x803A13A0 end:0x803A13D0
398-
.sbss start:0x8044AF18 end:0x8044AF38
398+
.sbss start:0x8044AF18 end:0x8044AF30
399399

400400
d/d_save.cpp:
401401
.text start:0x80032918 end:0x80035C88
@@ -415,6 +415,7 @@ d/d_a_obj.cpp:
415415
.text start:0x80037038 end:0x80037A5C
416416
.rodata start:0x8037B740 end:0x8037B758
417417
.bss start:0x8041E728 end:0x8041E788
418+
.sbss start:0x8044AF30 end:0x8044AF38
418419
.sdata2 start:0x8044BED8 end:0x8044BEF0
419420

420421
d/d_a_itembase_static.cpp:
@@ -533,7 +534,7 @@ d/d_drawlist.cpp:
533534
.data start:0x803A2900 end:0x803A2FF8
534535
.bss start:0x8041EA10 end:0x8041EA78
535536
.sdata start:0x8044A788 end:0x8044A7A0
536-
.sbss start:0x8044B014 end:0x8044B028
537+
.sbss start:0x8044B014 end:0x8044B020
537538
.sdata2 start:0x8044C148 end:0x8044C220
538539
.sbss2 start:0x80450C88 end:0x80450C90
539540

@@ -547,6 +548,7 @@ d/d_kankyo_wether.cpp:
547548
.rodata start:0x8037C810 end:0x8037C968
548549
.data start:0x803A3C20 end:0x803A3D00
549550
.bss start:0x8041EA78 end:0x8041EA90
551+
.sbss start:0x8044B020 end:0x8044B028
550552
.sdata2 start:0x8044C220 end:0x8044C2F0
551553

552554
d/d_kankyo_rain.cpp:
@@ -571,7 +573,7 @@ d/d_attention.cpp:
571573
.rodata start:0x8037CC18 end:0x8037CC28
572574
.data start:0x803A3D58 end:0x803A3DD0
573575
.bss start:0x8041EC40 end:0x8041EC60
574-
.sdata start:0x8044A7A0 end:0x8044A7D0
576+
.sdata start:0x8044A7A0 end:0x8044A7C0
575577
.sdata2 start:0x8044C768 end:0x8044C7F8
576578

577579
d/d_att_dist.cpp:
@@ -641,7 +643,7 @@ d/d_bg_w.cpp:
641643
.text start:0x80079204 end:0x8007E5E8
642644
.data start:0x803A5BE0 end:0x803A5E28
643645
.bss start:0x8041ECC0 end:0x8041F0B0
644-
.sbss start:0x8044B0C0 end:0x8044B0D0
646+
.sbss start:0x8044B0C0 end:0x8044B0C8
645647
.sdata2 start:0x8044C838 end:0x8044C858
646648

647649
d/d_bg_w_base.cpp:
@@ -690,6 +692,7 @@ d/d_ev_camera.cpp:
690692
.rodata start:0x8037CC98 end:0x8037D210
691693
.data start:0x803A6688 end:0x803A6700
692694
.bss start:0x8041F4E8 end:0x8041F578
695+
.sbss start:0x8044B0C8 end:0x8044B0D0
693696
.sdata2 start:0x8044C9F8 end:0x8044CD08
694697

695698
d/d_item_data.cpp:
@@ -711,6 +714,7 @@ d/d_tresure.cpp:
711714
.text start:0x8009BC18 end:0x8009C53C
712715
.rodata start:0x8037D580 end:0x8037D5A8
713716
.bss start:0x8041F578 end:0x8041F648
717+
.sdata start:0x8044A7C0 end:0x8044A7C8
714718
.sbss start:0x8044B0D8 end:0x8044B0E0
715719
.sdata2 start:0x8044CD28 end:0x8044CD50
716720

@@ -723,12 +727,14 @@ d/d_model.cpp:
723727
d/d_eye_hl.cpp:
724728
.text start:0x8009C9A4 end:0x8009CBC8
725729
.rodata start:0x8037D5A8 end:0x8037D5E0
726-
.sbss start:0x8044B0E8 end:0x8044B100
730+
.sbss start:0x8044B0E8 end:0x8044B0F0
727731
.sdata2 start:0x8044CD50 end:0x8044CD58
728732

729733
d/d_error_msg.cpp:
730734
.text start:0x8009CBC8 end:0x8009D8B4
731735
.rodata start:0x8037D5E0 end:0x803876D8
736+
.sdata start:0x8044A7C8 end:0x8044A7D0
737+
.sbss start:0x8044B0F0 end:0x8044B0F8
732738
.sdata2 start:0x8044CD58 end:0x8044CD98
733739
.sbss2 start:0x80450C98 end:0x80450CA0
734740

@@ -739,7 +745,7 @@ d/actor/d_a_alink.cpp:
739745
.data start:0x803A9AF0 end:0x803AD770
740746
.bss start:0x8041F648 end:0x8041F848
741747
.sdata start:0x8044A7D0 end:0x8044A7E8
742-
.sbss start:0x8044B100 end:0x8044B118
748+
.sbss start:0x8044B0F8 end:0x8044B118
743749
.sdata2 start:0x8044CD98 end:0x8044D4F0
744750

745751
d/actor/d_a_itembase.cpp:
@@ -904,7 +910,7 @@ d/d_kankyo.cpp:
904910
.data start:0x803B5F18 end:0x803B62B8
905911
.bss start:0x80426B88 end:0x80428930
906912
.sdata start:0x8044A840 end:0x8044A860
907-
.sbss start:0x8044B1A8 end:0x8044B1B8
913+
.sbss start:0x8044B1A8 end:0x8044B1B0
908914
.sdata2 start:0x8044DCF8 end:0x8044DF90
909915

910916
d/d_kyeff.cpp:
@@ -922,6 +928,7 @@ d/d_ky_thunder.cpp:
922928
.rodata start:0x8038EFC0 end:0x8038EFD0
923929
.data start:0x803B6338 end:0x803B6378
924930
.bss start:0x80428930 end:0x80428960
931+
.sbss start:0x8044B1B0 end:0x8044B1B8
925932
.sdata2 start:0x8044DFA8 end:0x8044E030
926933

927934
d/d_kantera_icon_meter.cpp:
@@ -1570,7 +1577,7 @@ JSystem/JParticle/JPAResource.cpp:
15701577
JSystem/JParticle/JPABaseShape.cpp:
15711578
.text start:0x80278EC0 end:0x8027CD48
15721579
.data start:0x803BE420 end:0x803BE5C8
1573-
.sdata start:0x8044A8E0 end:0x8044A8EC
1580+
.sdata start:0x8044A8E0 end:0x8044A8E8
15741581
.sdata2 start:0x8044F3C8 end:0x8044F400
15751582

15761583
JSystem/JParticle/JPAExtraShape.cpp:
@@ -1633,10 +1640,12 @@ JSystem/JStage/JSGAmbientLight.cpp:
16331640

16341641
JSystem/JStage/JSGCamera.cpp:
16351642
.text start:0x80282FD0 end:0x802830B0
1636-
.text start:0x802830B0 end:0x80283158
16371643
.data start:0x803BE7C0 end:0x803BE858
1638-
.data start:0x803BE858 end:0x803BE8B8
16391644
.sdata2 start:0x8044F4F8 end:0x8044F500
1645+
1646+
JSystem/JStage/JSGFog.cpp:
1647+
.text start:0x802830B0 end:0x80283158
1648+
.data start:0x803BE858 end:0x803BE8B8
16401649
.sdata2 start:0x8044F500 end:0x8044F508
16411650

16421651
JSystem/JStage/JSGLight.cpp:
@@ -1697,7 +1706,7 @@ JSystem/JStudio/JStudio/jstudio-object.cpp:
16971706
.rodata start:0x80394BD0 end:0x80394CF0
16981707
.data start:0x803BEC40 end:0x803BF7E0
16991708
.bss start:0x8042B150 end:0x8042B2C8
1700-
.sbss start:0x8044B330 end:0x8044B348
1709+
.sbss start:0x8044B330 end:0x8044B338
17011710
.sdata2 start:0x8044F5C0 end:0x8044F5F0
17021711

17031712
JSystem/JStudio/JStudio/object-id.cpp:
@@ -1761,6 +1770,7 @@ JSystem/JStudio/JStudio_JAudio2/object-sound.cpp:
17611770
.ctors start:0x80375D98 end:0x80375D9C
17621771
.data start:0x803BFBB8 end:0x803BFC18
17631772
.bss start:0x8042B5D0 end:0x8042B680
1773+
.sbss start:0x8044B338 end:0x8044B340
17641774
.sdata2 start:0x8044F630 end:0x8044F640
17651775

17661776
JSystem/JStudio/JStudio_JParticle/control.cpp:
@@ -1772,6 +1782,7 @@ JSystem/JStudio/JStudio_JParticle/object-particle.cpp:
17721782
.text start:0x80290A3C end:0x80291718
17731783
.data start:0x803BFC30 end:0x803BFC98
17741784
.bss start:0x8042B680 end:0x8042B710
1785+
.sbss start:0x8044B340 end:0x8044B348
17751786
.sdata2 start:0x8044F640 end:0x8044F678
17761787

17771788
JSystem/JAudio2/JASCalc.cpp:
@@ -1931,7 +1942,7 @@ JSystem/JAudio2/JASAiCtrl.cpp:
19311942
.rodata start:0x80395448 end:0x803954A0
19321943
.data start:0x803C19F8 end:0x803C1A20
19331944
.bss start:0x8042BD98 end:0x8042BDA8
1934-
.sdata start:0x8044A8EC end:0x8044A8F8
1945+
.sdata start:0x8044A8E8 end:0x8044A8F8
19351946
.sbss start:0x8044B3E0 end:0x8044B418
19361947
.sdata2 start:0x8044F840 end:0x8044F860
19371948

@@ -2255,7 +2266,7 @@ Z2AudioLib/Z2AudioMgr.cpp:
22552266

22562267
dolphin/gf/GFGeometry.cpp:
22572268
.text start:0x802D0264 end:0x802D02F0
2258-
.sdata start:0x8044A9E8 end:0x8044A9F8
2269+
.sdata start:0x8044A9E8 end:0x8044A9F0
22592270

22602271
dolphin/gf/GFLight.cpp:
22612272
.text start:0x802D02F0 end:0x802D0338
@@ -2271,6 +2282,7 @@ JSystem/JKernel/JKRHeap.cpp:
22712282
.text start:0x802D05D4 end:0x802D1250
22722283
.rodata start:0x80396C38 end:0x80396C50
22732284
.data start:0x803C60B0 end:0x803C6110
2285+
.sdata start:0x8044A9F0 end:0x8044A9F1
22742286
.sbss start:0x8044B4B0 end:0x8044B4D8
22752287

22762288
JSystem/JKernel/JKRExpHeap.cpp:
@@ -2340,7 +2352,7 @@ JSystem/JKernel/JKRFileLoader.cpp:
23402352
.rodata start:0x803972B0 end:0x803972B8
23412353
.data start:0x803C6308 end:0x803C6348
23422354
.bss start:0x8042E488 end:0x8042E4A0
2343-
.sdata start:0x8044AA00 end:0x8044AA0C
2355+
.sdata start:0x8044AA00 end:0x8044AA08
23442356
.sbss start:0x8044B558 end:0x8044B560
23452357

23462358
JSystem/JKernel/JKRFileFinder.cpp:
@@ -2395,20 +2407,20 @@ JSystem/JKernel/JKRDvdRipper.cpp:
23952407
.ctors start:0x80375DE4 end:0x80375DE8
23962408
.rodata start:0x803973F0 end:0x80397450
23972409
.bss start:0x8042E4B8 end:0x8042E4E8
2398-
.sdata start:0x8044AA0C end:0x8044AA14
2410+
.sdata start:0x8044AA08 end:0x8044AA10
23992411
.sbss start:0x8044B568 end:0x8044B5A8
24002412

24012413
JSystem/JKernel/JKRDvdAramRipper.cpp:
24022414
.text start:0x802DCD10 end:0x802DDB1C
24032415
.ctors start:0x80375DE8 end:0x80375DEC
24042416
.bss start:0x8042E4E8 end:0x8042E518
2405-
.sdata start:0x8044AA14 end:0x8044AA18
2417+
.sdata start:0x8044AA10 end:0x8044AA18
24062418
.sbss start:0x8044B5A8 end:0x8044B5F0
24072419

24082420
JSystem/JKernel/JKRDecomp.cpp:
24092421
.text start:0x802DDB1C end:0x802DE298
24102422
.data start:0x803C65A0 end:0x803C65F0
2411-
.sbss start:0x8044B5F0 end:0x8044B5FC
2423+
.sbss start:0x8044B5F0 end:0x8044B5F8
24122424

24132425
JSystem/JSupport/JSUList.cpp:
24142426
.text start:0x802DE298 end:0x802DE6D8
@@ -2457,7 +2469,7 @@ JSystem/JUtility/JUTNameTab.cpp:
24572469
JSystem/JUtility/JUTGraphFifo.cpp:
24582470
.text start:0x802E0FF4 end:0x802E1194
24592471
.data start:0x803C66D0 end:0x803C66E0
2460-
.sbss start:0x8044B5FC end:0x8044B608
2472+
.sbss start:0x8044B5F8 end:0x8044B608
24612473

24622474
JSystem/JUtility/JUTFont.cpp:
24632475
.text start:0x802E1194 end:0x802E13E4
@@ -3238,15 +3250,16 @@ PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c:
32383250
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c:
32393251
.text start:0x80364E68 end:0x80364FF4
32403252
.bss start:0x80447580 end:0x80447680
3241-
.sbss start:0x8044BAD0 end:0x8044BAE8
3242-
3243-
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c:
3244-
.sbss start:0x8044BAE8 end:0x8044BAF0
3253+
.sbss start:0x8044BAD0 end:0x8044BAE0
32453254

32463255
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c:
32473256
.text start:0x80364FF4 end:0x803654A8
32483257
.rodata start:0x8039C380 end:0x8039C398
32493258
.bss start:0x80447680 end:0x804476B8
3259+
.sbss start:0x8044BAE0 end:0x8044BAE8
3260+
3261+
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c:
3262+
.sbss start:0x8044BAE8 end:0x8044BAF0
32503263

32513264
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c:
32523265
.text start:0x803654A8 end:0x803655C0
@@ -3305,7 +3318,7 @@ PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c:
33053318
.sdata2 start:0x80450790 end:0x80450798
33063319

33073320
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c:
3308-
.sdata start:0x8044AC20 end:0x8044AC34
3321+
.sdata start:0x8044AC20 end:0x8044AC30
33093322

33103323
PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c:
33113324
.text start:0x8036AC28 end:0x8036ACB8
@@ -3581,6 +3594,7 @@ amcstubs/AmcExi2Stubs.c:
35813594

35823595
odemuexi2/DebuggerDriver.c:
35833596
.text start:0x803751BC end:0x80375C3C
3597+
.sdata start:0x8044AC30 end:0x8044AC34
35843598
.sbss start:0x8044BB10 end:0x8044BB28
35853599

35863600
odenotstub/odenotstub.c:

0 commit comments

Comments
 (0)