encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into work7

Browse Source
This commit is contained in:
Trueffeloot
2023-04-25 18:33:26 +02:00
parent 1c5bacc97b af265612c1
commit fd6e75ee71
72 changed files with 277 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Progress.md
+4 -4
View File
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 26.574623% | 955768 | 3596544
.text | 26.599313% | 956656 | 3596544
.ctors | 100.000000% | 448 | 448
.dtors | 100.000000% | 32 | 32
.rodata | 100.000000% | 193856 | 193856
.data | 100.000000% | 197632 | 197632
.sdata | 100.000000% | 1408 | 1408
.sdata2 | 100.000000% | 20832 | 20832
Total | 34.315259% | 1379704 | 4020672
Total | 34.337345% | 1380592 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 34.315259% | 1379704 | 4020672
main.dol | 34.337345% | 1380592 | 4020672
RELs | 33.516030% | 3854452 | 11500324
Total | 33.723068% | 5234156 | 15520996
Total | 33.728789% | 5235044 | 15520996
## RELs
asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__14J3DAnmColorKeyFv.s
-22
View File
@@ -1,22 +0,0 @@
lbl_8032AB00:
/* 8032AB00 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032AB04 7C 08 02 A6 */ mflr r0
/* 8032AB08 90 01 00 14 */ stw r0, 0x14(r1)
/* 8032AB0C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8032AB10 7C 7F 1B 78 */ mr r31, r3
/* 8032AB14 4B FF FD 15 */ bl __ct__11J3DAnmColorFv
/* 8032AB18 3C 60 80 3D */ lis r3, __vt__14J3DAnmColorKey@ha /* 0x803CED70@ha */
/* 8032AB1C 38 03 ED 70 */ addi r0, r3, __vt__14J3DAnmColorKey@l /* 0x803CED70@l */
/* 8032AB20 90 1F 00 00 */ stw r0, 0(r31)
/* 8032AB24 38 00 00 00 */ li r0, 0
/* 8032AB28 90 1F 00 2C */ stw r0, 0x2c(r31)
/* 8032AB2C 90 1F 00 30 */ stw r0, 0x30(r31)
/* 8032AB30 90 1F 00 34 */ stw r0, 0x34(r31)
/* 8032AB34 90 1F 00 38 */ stw r0, 0x38(r31)
/* 8032AB38 90 1F 00 3C */ stw r0, 0x3c(r31)
/* 8032AB3C 7F E3 FB 78 */ mr r3, r31
/* 8032AB40 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8032AB44 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032AB48 7C 08 03 A6 */ mtlr r0
/* 8032AB4C 38 21 00 10 */ addi r1, r1, 0x10
/* 8032AB50 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__15J3DAnmColorFullFv.s
-22
View File
@@ -1,22 +0,0 @@
lbl_8032A93C:
/* 8032A93C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032A940 7C 08 02 A6 */ mflr r0
/* 8032A944 90 01 00 14 */ stw r0, 0x14(r1)
/* 8032A948 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8032A94C 7C 7F 1B 78 */ mr r31, r3
/* 8032A950 4B FF FE D9 */ bl __ct__11J3DAnmColorFv
/* 8032A954 3C 60 80 3D */ lis r3, __vt__15J3DAnmColorFull@ha /* 0x803CED84@ha */
/* 8032A958 38 03 ED 84 */ addi r0, r3, __vt__15J3DAnmColorFull@l /* 0x803CED84@l */
/* 8032A95C 90 1F 00 00 */ stw r0, 0(r31)
/* 8032A960 38 00 00 00 */ li r0, 0
/* 8032A964 90 1F 00 2C */ stw r0, 0x2c(r31)
/* 8032A968 90 1F 00 30 */ stw r0, 0x30(r31)
/* 8032A96C 90 1F 00 34 */ stw r0, 0x34(r31)
/* 8032A970 90 1F 00 38 */ stw r0, 0x38(r31)
/* 8032A974 90 1F 00 3C */ stw r0, 0x3c(r31)
/* 8032A978 7F E3 FB 78 */ mr r3, r31
/* 8032A97C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8032A980 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032A984 7C 08 03 A6 */ mtlr r0
/* 8032A988 38 21 00 10 */ addi r1, r1, 0x10
/* 8032A98C 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__17J3DAnmVtxColorKeyFv.s
-25
View File
@@ -1,25 +0,0 @@
lbl_8032A4E0:
/* 8032A4E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032A4E4 7C 08 02 A6 */ mflr r0
/* 8032A4E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 8032A4EC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8032A4F0 7C 7F 1B 78 */ mr r31, r3
/* 8032A4F4 4B FF FD A9 */ bl __ct__14J3DAnmVtxColorFv
/* 8032A4F8 3C 60 80 3D */ lis r3, __vt__17J3DAnmVtxColorKey@ha /* 0x803CEDAC@ha */
/* 8032A4FC 38 03 ED AC */ addi r0, r3, __vt__17J3DAnmVtxColorKey@l /* 0x803CEDAC@l */
/* 8032A500 90 1F 00 00 */ stw r0, 0(r31)
/* 8032A504 38 60 00 00 */ li r3, 0
/* 8032A508 7C 64 1B 78 */ mr r4, r3
/* 8032A50C 38 00 00 02 */ li r0, 2
/* 8032A510 7C 09 03 A6 */ mtctr r0
lbl_8032A514:
/* 8032A514 38 03 00 18 */ addi r0, r3, 0x18
/* 8032A518 7C 9F 01 2E */ stwx r4, r31, r0
/* 8032A51C 38 63 00 04 */ addi r3, r3, 4
/* 8032A520 42 00 FF F4 */ bdnz lbl_8032A514
/* 8032A524 7F E3 FB 78 */ mr r3, r31
/* 8032A528 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8032A52C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032A530 7C 08 03 A6 */ mtlr r0
/* 8032A534 38 21 00 10 */ addi r1, r1, 0x10
/* 8032A538 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/__ct__18J3DAnmVtxColorFullFv.s
-25
View File
@@ -1,25 +0,0 @@
lbl_8032A30C:
/* 8032A30C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032A310 7C 08 02 A6 */ mflr r0
/* 8032A314 90 01 00 14 */ stw r0, 0x14(r1)
/* 8032A318 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8032A31C 7C 7F 1B 78 */ mr r31, r3
/* 8032A320 4B FF FF 7D */ bl __ct__14J3DAnmVtxColorFv
/* 8032A324 3C 60 80 3D */ lis r3, __vt__18J3DAnmVtxColorFull@ha /* 0x803CEDC0@ha */
/* 8032A328 38 03 ED C0 */ addi r0, r3, __vt__18J3DAnmVtxColorFull@l /* 0x803CEDC0@l */
/* 8032A32C 90 1F 00 00 */ stw r0, 0(r31)
/* 8032A330 38 60 00 00 */ li r3, 0
/* 8032A334 7C 64 1B 78 */ mr r4, r3
/* 8032A338 38 00 00 02 */ li r0, 2
/* 8032A33C 7C 09 03 A6 */ mtctr r0
lbl_8032A340:
/* 8032A340 38 03 00 18 */ addi r0, r3, 0x18
/* 8032A344 7C 9F 01 2E */ stwx r4, r31, r0
/* 8032A348 38 63 00 04 */ addi r3, r3, 4
/* 8032A34C 42 00 FF F4 */ bdnz lbl_8032A340
/* 8032A350 7F E3 FB 78 */ mr r3, r31
/* 8032A354 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8032A358 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032A35C 7C 08 03 A6 */ mtlr r0
/* 8032A360 38 21 00 10 */ addi r1, r1, 0x10
/* 8032A364 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData.s
-10
View File
@@ -1,10 +0,0 @@
lbl_8032B87C:
/* 8032B87C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032B880 7C 08 02 A6 */ mflr r0
/* 8032B884 90 01 00 14 */ stw r0, 0x14(r1)
/* 8032B888 38 84 00 58 */ addi r4, r4, 0x58
/* 8032B88C 4B FF FE F5 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable
/* 8032B890 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032B894 7C 08 03 A6 */ mtlr r0
/* 8032B898 38 21 00 10 */ addi r1, r1, 0x10
/* 8032B89C 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData.s
-10
View File
@@ -1,10 +0,0 @@
lbl_8032B09C:
/* 8032B09C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032B0A0 7C 08 02 A6 */ mflr r0
/* 8032B0A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8032B0A8 38 84 00 58 */ addi r4, r4, 0x58
/* 8032B0AC 4B FF FF 59 */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable
/* 8032B0B0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032B0B4 7C 08 03 A6 */ mtlr r0
/* 8032B0B8 38 21 00 10 */ addi r1, r1, 0x10
/* 8032B0BC 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable.s
-43
View File
@@ -1,43 +0,0 @@
lbl_8032B004:
/* 8032B004 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8032B008 7C 08 02 A6 */ mflr r0
/* 8032B00C 90 01 00 24 */ stw r0, 0x24(r1)
/* 8032B010 39 61 00 20 */ addi r11, r1, 0x20
/* 8032B014 48 03 71 C5 */ bl _savegpr_28
/* 8032B018 7C 7C 1B 78 */ mr r28, r3
/* 8032B01C 7C 9D 23 78 */ mr r29, r4
/* 8032B020 3B C0 00 00 */ li r30, 0
/* 8032B024 48 00 00 50 */ b lbl_8032B074
lbl_8032B028:
/* 8032B028 83 FD 00 0C */ lwz r31, 0xc(r29)
/* 8032B02C 38 7C 00 1C */ addi r3, r28, 0x1c
/* 8032B030 7F C4 F3 78 */ mr r4, r30
/* 8032B034 4B FB 3A C5 */ bl getName__10JUTNameTabCFUs
/* 8032B038 7C 64 1B 78 */ mr r4, r3
/* 8032B03C 7F E3 FB 78 */ mr r3, r31
/* 8032B040 4B FB 3A 19 */ bl getIndex__10JUTNameTabCFPCc
/* 8032B044 2C 03 FF FF */ cmpwi r3, -1
/* 8032B048 41 82 00 14 */ beq lbl_8032B05C
/* 8032B04C 80 9C 00 18 */ lwz r4, 0x18(r28)
/* 8032B050 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e
/* 8032B054 7C 64 03 2E */ sthx r3, r4, r0
/* 8032B058 48 00 00 18 */ b lbl_8032B070
lbl_8032B05C:
/* 8032B05C 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */
/* 8032B060 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */
/* 8032B064 80 7C 00 18 */ lwz r3, 0x18(r28)
/* 8032B068 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e
/* 8032B06C 7C 83 03 2E */ sthx r4, r3, r0
lbl_8032B070:
/* 8032B070 3B DE 00 01 */ addi r30, r30, 1
lbl_8032B074:
/* 8032B074 57 C3 04 3E */ clrlwi r3, r30, 0x10
/* 8032B078 A0 1C 00 16 */ lhz r0, 0x16(r28)
/* 8032B07C 7C 03 00 40 */ cmplw r3, r0
/* 8032B080 41 80 FF A8 */ blt lbl_8032B028
/* 8032B084 39 61 00 20 */ addi r11, r1, 0x20
/* 8032B088 48 03 71 9D */ bl _restgpr_28
/* 8032B08C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8032B090 7C 08 03 A6 */ mtlr r0
/* 8032B094 38 21 00 20 */ addi r1, r1, 0x20
/* 8032B098 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData.s
-10
View File
@@ -1,10 +0,0 @@
lbl_8032B1D4:
/* 8032B1D4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032B1D8 7C 08 02 A6 */ mflr r0
/* 8032B1DC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8032B1E0 38 84 00 58 */ addi r4, r4, 0x58
/* 8032B1E4 4B FF FE DD */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable
/* 8032B1E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032B1EC 7C 08 03 A6 */ mtlr r0
/* 8032B1F0 38 21 00 10 */ addi r1, r1, 0x10
/* 8032B1F4 4E 80 00 20 */ blr
asm/JSystem/J3DGraphAnimator/J3DAnimation/searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable.s
-78
View File
@@ -1,78 +0,0 @@
lbl_8032B0C0:
/* 8032B0C0 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8032B0C4 7C 08 02 A6 */ mflr r0
/* 8032B0C8 90 01 00 24 */ stw r0, 0x24(r1)
/* 8032B0CC 39 61 00 20 */ addi r11, r1, 0x20
/* 8032B0D0 48 03 71 09 */ bl _savegpr_28
/* 8032B0D4 7C 7E 1B 78 */ mr r30, r3
/* 8032B0D8 7C 9F 23 78 */ mr r31, r4
/* 8032B0DC 3B 80 00 00 */ li r28, 0
/* 8032B0E0 48 00 00 50 */ b lbl_8032B130
lbl_8032B0E4:
/* 8032B0E4 83 BF 00 0C */ lwz r29, 0xc(r31)
/* 8032B0E8 38 7E 00 30 */ addi r3, r30, 0x30
/* 8032B0EC 7F 84 E3 78 */ mr r4, r28
/* 8032B0F0 4B FB 3A 09 */ bl getName__10JUTNameTabCFUs
/* 8032B0F4 7C 64 1B 78 */ mr r4, r3
/* 8032B0F8 7F A3 EB 78 */ mr r3, r29
/* 8032B0FC 4B FB 39 5D */ bl getIndex__10JUTNameTabCFPCc
/* 8032B100 2C 03 FF FF */ cmpwi r3, -1
/* 8032B104 41 82 00 14 */ beq lbl_8032B118
/* 8032B108 80 9E 00 2C */ lwz r4, 0x2c(r30)
/* 8032B10C 57 80 0B FC */ rlwinm r0, r28, 1, 0xf, 0x1e
/* 8032B110 7C 64 03 2E */ sthx r3, r4, r0
/* 8032B114 48 00 00 18 */ b lbl_8032B12C
lbl_8032B118:
/* 8032B118 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */
/* 8032B11C 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */
/* 8032B120 80 7E 00 2C */ lwz r3, 0x2c(r30)
/* 8032B124 57 80 0B FC */ rlwinm r0, r28, 1, 0xf, 0x1e
/* 8032B128 7C 83 03 2E */ sthx r4, r3, r0
lbl_8032B12C:
/* 8032B12C 3B 9C 00 01 */ addi r28, r28, 1
lbl_8032B130:
/* 8032B130 57 84 04 3E */ clrlwi r4, r28, 0x10
/* 8032B134 A0 7E 00 14 */ lhz r3, 0x14(r30)
/* 8032B138 38 00 00 03 */ li r0, 3
/* 8032B13C 7C 03 03 D6 */ divw r0, r3, r0
/* 8032B140 54 00 04 3E */ clrlwi r0, r0, 0x10
/* 8032B144 7C 04 00 40 */ cmplw r4, r0
/* 8032B148 41 80 FF 9C */ blt lbl_8032B0E4
/* 8032B14C 3B 80 00 00 */ li r28, 0
/* 8032B150 48 00 00 50 */ b lbl_8032B1A0
lbl_8032B154:
/* 8032B154 83 BF 00 0C */ lwz r29, 0xc(r31)
/* 8032B158 38 7E 00 64 */ addi r3, r30, 0x64
/* 8032B15C 7F 84 E3 78 */ mr r4, r28
/* 8032B160 4B FB 39 99 */ bl getName__10JUTNameTabCFUs
/* 8032B164 7C 64 1B 78 */ mr r4, r3
/* 8032B168 7F A3 EB 78 */ mr r3, r29
/* 8032B16C 4B FB 38 ED */ bl getIndex__10JUTNameTabCFPCc
/* 8032B170 2C 03 FF FF */ cmpwi r3, -1
/* 8032B174 41 82 00 14 */ beq lbl_8032B188
/* 8032B178 80 9E 00 60 */ lwz r4, 0x60(r30)
/* 8032B17C 57 80 0B FC */ rlwinm r0, r28, 1, 0xf, 0x1e
/* 8032B180 7C 64 03 2E */ sthx r3, r4, r0
/* 8032B184 48 00 00 18 */ b lbl_8032B19C
lbl_8032B188:
/* 8032B188 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */
/* 8032B18C 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */
/* 8032B190 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 8032B194 57 80 0B FC */ rlwinm r0, r28, 1, 0xf, 0x1e
/* 8032B198 7C 83 03 2E */ sthx r4, r3, r0
lbl_8032B19C:
/* 8032B19C 3B 9C 00 01 */ addi r28, r28, 1
lbl_8032B1A0:
/* 8032B1A0 57 84 04 3E */ clrlwi r4, r28, 0x10
/* 8032B1A4 A0 7E 00 4A */ lhz r3, 0x4a(r30)
/* 8032B1A8 38 00 00 03 */ li r0, 3
/* 8032B1AC 7C 03 03 D6 */ divw r0, r3, r0
/* 8032B1B0 54 00 04 3E */ clrlwi r0, r0, 0x10
/* 8032B1B4 7C 04 00 40 */ cmplw r4, r0
/* 8032B1B8 41 80 FF 9C */ blt lbl_8032B154
/* 8032B1BC 39 61 00 20 */ addi r11, r1, 0x20
/* 8032B1C0 48 03 70 65 */ bl _restgpr_28
/* 8032B1C4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8032B1C8 7C 08 03 A6 */ mtlr r0
/* 8032B1CC 38 21 00 20 */ addi r1, r1, 0x20
/* 8032B1D0 4E 80 00 20 */ blr
include/JSystem/J3DGraphAnimator/J3DAnimation.h
+4 -4
View File
@@ -394,7 +394,7 @@ private:
/* 0x54 */ int field_0x54;
/* 0x58 */ int field_0x58;
/* 0x5C */ u8 field_0x5c[4];
/* 0x60 */ u16 field_0x60[2];
/* 0x60 */ u16* field_0x60;
/* 0x64 */ JUTNameTab field_0x64;
/* 0x74 */ u8 field_0x74[4];
/* 0x78 */ u32 mTexMtxCalcType;
@@ -415,7 +415,7 @@ private:
/* 0x10 */ void* mAnmTable;
/* 0x14 */ u16 field_0x14;
/* 0x16 */ u16 mUpdateMaterialNum;
/* 0x18 */ void* field_0x18;
/* 0x18 */ u16* field_0x18;
/* 0x1C */ JUTNameTab field_0x1c;
}; // Size: 0x2C
@@ -448,9 +448,9 @@ private:
/* 0x1C */ u16 field_0x1c;
/* 0x1E */ u16 field_0x1e;
/* 0x20 */ u16* mCRegUpdateMaterialID;
/* 0x24 */ u8 field_0x24[0x34 - 0x24];
/* 0x24 */ JUTNameTab field_0x24;
/* 0x34 */ u16* mKRegUpdateMaterialID;
/* 0x38 */ u8 field_0x38[0x48 - 0x38];
/* 0x38 */ JUTNameTab field_0x38;
/* 0x48 */ void* field_0x48;
/* 0x4C */ void* field_0x4c;
/* 0x50 */ int field_0x50;
include/JSystem/JAudio2/JASWaveArcLoader.h
-1
View File
@@ -5,7 +5,6 @@
#include "dolphin/types.h"
#include "global.h"
#include "MSL_C/MSL_Common/Src/string.h"
#include "dolphin/os/OSMutex.h"
#include "JSystem/JAudio2/JASDvdThread.h"
include/JSystem/JUtility/JUTFont.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JUTFONT_H
#include "JSystem/JUtility/TColor.h"
#include "MSL_C/MSL_Common/Src/string.h"
#include "MSL_C/string.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
include/MSL_C/MSL_Common/Src/wchar_io.h
+2
View File
@@ -3,7 +3,9 @@
#include "MSL_C/MSL_Common/Src/ansi_files.h"
#ifndef __cplusplus
typedef unsigned short wchar_t;
#endif
int fwide(FILE* file, int mode);
include/MSL_C/stdlib.h
+10
View File
@@ -0,0 +1,10 @@
#ifndef MSL_STDLIB_H_
#define MSL_STDLIB_H_
#include "MSL_C/MSL_Common/Src/abort_exit.h"
#include "MSL_C/MSL_Common/Src/alloc.h"
#include "MSL_C/MSL_Common/Src/arith.h"
#include "MSL_C/MSL_Common/Src/mbstring.h"
#include "MSL_C/MSL_Common/Src/strtoul.h"
#endif
include/MSL_C/string.h
+4 -19
View File
@@ -1,23 +1,8 @@
#ifndef MSL_STRING_H_
#define MSL_STRING_H_
#include "MSL_C/MSL_Common/Src/stddef.h"
#include "MSL_C/MSL_Common/Src/extras.h"
#include "MSL_C/MSL_Common/Src/mem.h"
#include "MSL_C/MSL_Common/Src/string.h"
// TODO: move to MSL_C/
extern "C" {
void memcpy(void*, const void*, size_t);
void* memset(void* dest, int ch, size_t count);
char* strrchr(const char* s, int c);
char* strchr(const char* s, int c);
int strncmp(const char* s1, const char* s2, size_t n);
int strcmp(const char* s1, const char* s2);
int stricmp(const char*, const char*);
char* strcat(char* dest, const char* source);
char* strncpy(char* dest, const char* source, size_t n);
char* strcpy(char* dest, const char* source);
size_t strlen(const char* s);
int tolower(int);
}
#endif
#endif
include/d/save/d_save.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef D_SAVE_D_SAVE_H
#define D_SAVE_D_SAVE_H
#include "MSL_C/MSL_Common/Src/string.h"
#include "MSL_C/string.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/os/OS.h"
#include "dolphin/types.h"
include/init.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef INIT_H
#define INIT_H
#include "MSL_C/MSL_Common/Src/string.h"
#include "dolphin/types.h"
#ifdef __cplusplus
libs/JSystem/J2DGraph/J2DManage.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
//
#include "JSystem/J2DGraph/J2DManage.h"
#include "MSL_C/MSL_Common/Src/string.h"
#include "MSL_C/string.h"
#include "dol2asm.h"
#include "dolphin/types.h"
libs/JSystem/J2DGraph/J2DPrint.cpp
+1 -2
View File
@@ -5,6 +5,7 @@
#include "JSystem/J2DGraph/J2DPrint.h"
#include "MSL_C/stdio.h"
#include "MSL_C/stdlib.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -49,8 +50,6 @@ extern "C" void _restgpr_25();
extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strtol();
extern "C" void strtoul();
extern "C" u8 sSystemHeap__7JKRHeap[4];
//

Some files were not shown because too many files have changed in this diff Show More