mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol names (#118)

Browse Source 
* checkpoint

* checkpoint

* rename f_pc

* checkpoint

* small symbol rename and fix some fpc symbols

* remove unneeded entries from ldscript

* simplify ok check, update docker container

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-03-15 07:12:44 +01:00
committed by GitHub
parent 3b69d4cba0
commit 80ba3d9fd2
3357 changed files with 59145 additions and 59695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPane.h
+9 -7
View File
@@ -18,9 +18,9 @@
// additional symbols needed for J2DPane.cpp
// autogenerated by split.py v0.3 at 2021-01-19 06:47:42.730250
extern "C" {
void J2DDataManage_NS_get_X1_(void);
void get__13J2DDataManageFP14JSUInputStream(void);
void J2DGrafContext_NS_scissor(void);
void J2DGrafContext_NS_setScissor(void);
void setScissor__14J2DGrafContextFv(void);
void J2DOrthoGraph_NS_scissorBounds(void);
void J2DCast_F32_to_S16__7J2DPaneFfUc(void);
void animationPane__7J2DPaneFPC15J2DAnmTransform(void);
@@ -55,9 +55,11 @@ void updateTransform__7J2DPaneFPC15J2DAnmTransform(void);
void J2DPane_X1_(void);
void J2DPane_X2_(void);
void __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc(void);
void JSURandomInputStream_NS_align(void);
void JSURandomInputStream_NS_peek(void);
void* JUTResReference_NS_getResource(JSURandomInputStream* stream, u32 arg2, JKRArchive* archive);
void align__20JSURandomInputStreamFl(void);
void peek__20JSURandomInputStreamFPvl(void);
void* getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive(JSURandomInputStream* stream,
u32 arg2,
JKRArchive* archive);
void move__7J2DPaneFff(void);
void add__7J2DPaneFff(void);
void makeMatrix__7J2DPaneFffff(void);
@@ -70,7 +72,7 @@ void func_802F8428(void);
void func_802F8464(void);
void func_802F8474(void);
void func_802F8478(void);
void func_802F847C(void);
void __sinit_J2DPane_cpp(void);
}
// additional symbols needed for J2DPane.cpp
@@ -103,7 +105,7 @@ public:
/* 0x18 */ virtual void resize(f32 x, f32 y);
/* 0x1c */ virtual void setCullBack(bool cull);
/* 0x20 */ virtual void setCullBack(GXCullMode cmode);
/* 0x24 */ virtual void setAlpha();
/* 0x24 */ virtual void setAlpha__FP16J3DMaterialTable();
/* 0x28 */ virtual bool setConnectParent(bool connected);
/* 0x2c */ virtual void calcMtx();
/* 0x30 */ virtual void update();
include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s
+4 -4
View File
@@ -29,7 +29,7 @@
/* 802F600C 002F2F4C 7F C3 F3 78 */ mr r3, r30
/* 802F6010 002F2F50 38 81 00 10 */ addi r4, r1, 0x10
/* 802F6014 002F2F54 38 A0 00 08 */ li r5, 8
/* 802F6018 002F2F58 4B FE 62 81 */ bl JSUInputStream_NS_read
/* 802F6018 002F2F58 4B FE 62 81 */ bl read__14JSUInputStreamFPvl
/* 802F601C 002F2F5C 80 01 00 10 */ lwz r0, 0x10(r1)
/* 802F6020 002F2F60 90 1B 00 08 */ stw r0, 8(r27)
/* 802F6024 002F2F64 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -41,7 +41,7 @@
/* 802F603C 002F2F7C 7F C3 F3 78 */ mr r3, r30
/* 802F6040 002F2F80 7F E4 FB 78 */ mr r4, r31
/* 802F6044 002F2F84 38 A0 00 00 */ li r5, 0
/* 802F6048 002F2F88 4B FE 64 95 */ bl JSURandomInputStream_NS_seek
/* 802F6048 002F2F88 4B FE 64 95 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
/* 802F604C 002F2F8C 48 00 00 5C */ b lbl_802F60A8
lbl_802F6050:
/* 802F6050 002F2F90 7F C3 F3 78 */ mr r3, r30
@@ -53,7 +53,7 @@ lbl_802F6050:
/* 802F6068 002F2FA8 7F C3 F3 78 */ mr r3, r30
/* 802F606C 002F2FAC 38 81 00 08 */ addi r4, r1, 8
/* 802F6070 002F2FB0 38 A0 00 08 */ li r5, 8
/* 802F6074 002F2FB4 4B FE 63 E5 */ bl JSURandomInputStream_NS_peek
/* 802F6074 002F2FB4 4B FE 63 E5 */ bl peek__20JSURandomInputStreamFPvl
/* 802F6078 002F2FB8 80 01 00 08 */ lwz r0, 8(r1)
/* 802F607C 002F2FBC 90 1B 00 08 */ stw r0, 8(r27)
/* 802F6080 002F2FC0 80 01 00 0C */ lwz r0, 0xc(r1)
@@ -65,7 +65,7 @@ lbl_802F6050:
/* 802F6098 002F2FD8 7F C3 F3 78 */ mr r3, r30
/* 802F609C 002F2FDC 7F E4 FB 78 */ mr r4, r31
/* 802F60A0 002F2FE0 38 A0 00 00 */ li r5, 0
/* 802F60A4 002F2FE4 4B FE 64 39 */ bl JSURandomInputStream_NS_seek
/* 802F60A4 002F2FE4 4B FE 64 39 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
lbl_802F60A8:
/* 802F60A8 002F2FE8 7F 63 DB 78 */ mr r3, r27
/* 802F60AC 002F2FEC 39 61 00 30 */ addi r11, r1, 0x30
include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s
+12 -12
View File
@@ -15,11 +15,11 @@
/* 802F60FC 002F303C 7F E3 FB 78 */ mr r3, r31
/* 802F6100 002F3040 38 81 00 0B */ addi r4, r1, 0xb
/* 802F6104 002F3044 38 A0 00 01 */ li r5, 1
/* 802F6108 002F3048 4B FE 61 91 */ bl JSUInputStream_NS_read
/* 802F6108 002F3048 4B FE 61 91 */ bl read__14JSUInputStreamFPvl
/* 802F610C 002F304C 7F E3 FB 78 */ mr r3, r31
/* 802F6110 002F3050 38 9D 00 B0 */ addi r4, r29, 0xb0
/* 802F6114 002F3054 38 A0 00 01 */ li r5, 1
/* 802F6118 002F3058 4B FE 61 81 */ bl JSUInputStream_NS_read
/* 802F6118 002F3058 4B FE 61 81 */ bl read__14JSUInputStreamFPvl
/* 802F611C 002F305C 7F E3 FB 78 */ mr r3, r31
/* 802F6120 002F3060 38 80 00 02 */ li r4, 2
/* 802F6124 002F3064 81 9F 00 00 */ lwz r12, 0(r31)
@@ -29,7 +29,7 @@
/* 802F6134 002F3074 7F E3 FB 78 */ mr r3, r31
/* 802F6138 002F3078 38 81 00 18 */ addi r4, r1, 0x18
/* 802F613C 002F307C 38 A0 00 04 */ li r5, 4
/* 802F6140 002F3080 4B FE 61 59 */ bl JSUInputStream_NS_read
/* 802F6140 002F3080 4B FE 61 59 */ bl read__14JSUInputStreamFPvl
/* 802F6144 002F3084 80 61 00 18 */ lwz r3, 0x18(r1)
/* 802F6148 002F3088 38 00 00 00 */ li r0, 0
/* 802F614C 002F308C 90 7D 00 14 */ stw r3, 0x14(r29)
@@ -37,7 +37,7 @@
/* 802F6154 002F3094 7F E3 FB 78 */ mr r3, r31
/* 802F6158 002F3098 38 81 00 14 */ addi r4, r1, 0x14
/* 802F615C 002F309C 38 A0 00 02 */ li r5, 2
/* 802F6160 002F30A0 4B FE 61 39 */ bl JSUInputStream_NS_read
/* 802F6160 002F30A0 4B FE 61 39 */ bl read__14JSUInputStreamFPvl
/* 802F6164 002F30A4 A8 01 00 14 */ lha r0, 0x14(r1)
/* 802F6168 002F30A8 C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
/* 802F616C 002F30AC 6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -49,7 +49,7 @@
/* 802F6184 002F30C4 7F E3 FB 78 */ mr r3, r31
/* 802F6188 002F30C8 38 81 00 12 */ addi r4, r1, 0x12
/* 802F618C 002F30CC 38 A0 00 02 */ li r5, 2
/* 802F6190 002F30D0 4B FE 61 09 */ bl JSUInputStream_NS_read
/* 802F6190 002F30D0 4B FE 61 09 */ bl read__14JSUInputStreamFPvl
/* 802F6194 002F30D4 A8 01 00 12 */ lha r0, 0x12(r1)
/* 802F6198 002F30D8 C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
/* 802F619C 002F30DC 6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -61,7 +61,7 @@
/* 802F61B4 002F30F4 7F E3 FB 78 */ mr r3, r31
/* 802F61B8 002F30F8 38 81 00 10 */ addi r4, r1, 0x10
/* 802F61BC 002F30FC 38 A0 00 02 */ li r5, 2
/* 802F61C0 002F3100 4B FE 60 D9 */ bl JSUInputStream_NS_read
/* 802F61C0 002F3100 4B FE 60 D9 */ bl read__14JSUInputStreamFPvl
/* 802F61C4 002F3104 A8 01 00 10 */ lha r0, 0x10(r1)
/* 802F61C8 002F3108 C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
/* 802F61CC 002F310C 6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -74,7 +74,7 @@
/* 802F61E8 002F3128 7F E3 FB 78 */ mr r3, r31
/* 802F61EC 002F312C 38 81 00 0E */ addi r4, r1, 0xe
/* 802F61F0 002F3130 38 A0 00 02 */ li r5, 2
/* 802F61F4 002F3134 4B FE 60 A5 */ bl JSUInputStream_NS_read
/* 802F61F4 002F3134 4B FE 60 A5 */ bl read__14JSUInputStreamFPvl
/* 802F61F8 002F3138 A8 01 00 0E */ lha r0, 0xe(r1)
/* 802F61FC 002F313C C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
/* 802F6200 002F3140 6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -101,7 +101,7 @@
/* 802F6254 002F3194 7F E3 FB 78 */ mr r3, r31
/* 802F6258 002F3198 38 81 00 0C */ addi r4, r1, 0xc
/* 802F625C 002F319C 38 A0 00 02 */ li r5, 2
/* 802F6260 002F31A0 4B FE 60 39 */ bl JSUInputStream_NS_read
/* 802F6260 002F31A0 4B FE 60 39 */ bl read__14JSUInputStreamFPvl
/* 802F6264 002F31A4 A0 01 00 0C */ lhz r0, 0xc(r1)
/* 802F6268 002F31A8 C8 22 C8 00 */ lfd f1, lbl_80456200-_SDA2_BASE_(r2)
/* 802F626C 002F31AC 90 01 00 3C */ stw r0, 0x3c(r1)
@@ -120,7 +120,7 @@ lbl_802F6290:
/* 802F629C 002F31DC 7F E3 FB 78 */ mr r3, r31
/* 802F62A0 002F31E0 38 81 00 0A */ addi r4, r1, 0xa
/* 802F62A4 002F31E4 38 A0 00 01 */ li r5, 1
/* 802F62A8 002F31E8 4B FE 5F F1 */ bl JSUInputStream_NS_read
/* 802F62A8 002F31E8 4B FE 5F F1 */ bl read__14JSUInputStreamFPvl
/* 802F62AC 002F31EC 88 01 00 0A */ lbz r0, 0xa(r1)
/* 802F62B0 002F31F0 98 1D 00 B7 */ stb r0, 0xb7(r29)
/* 802F62B4 002F31F4 88 61 00 0B */ lbz r3, 0xb(r1)
@@ -141,7 +141,7 @@ lbl_802F62CC:
/* 802F62E8 002F3228 7F E3 FB 78 */ mr r3, r31
/* 802F62EC 002F322C 38 81 00 09 */ addi r4, r1, 9
/* 802F62F0 002F3230 38 A0 00 01 */ li r5, 1
/* 802F62F4 002F3234 4B FE 5F A5 */ bl JSUInputStream_NS_read
/* 802F62F4 002F3234 4B FE 5F A5 */ bl read__14JSUInputStreamFPvl
/* 802F62F8 002F3238 88 01 00 09 */ lbz r0, 9(r1)
/* 802F62FC 002F323C 98 1D 00 B2 */ stb r0, 0xb2(r29)
/* 802F6300 002F3240 88 61 00 0B */ lbz r3, 0xb(r1)
@@ -156,7 +156,7 @@ lbl_802F630C:
/* 802F6320 002F3260 7F E3 FB 78 */ mr r3, r31
/* 802F6324 002F3264 38 81 00 08 */ addi r4, r1, 8
/* 802F6328 002F3268 38 A0 00 01 */ li r5, 1
/* 802F632C 002F326C 4B FE 5F 6D */ bl JSUInputStream_NS_read
/* 802F632C 002F326C 4B FE 5F 6D */ bl read__14JSUInputStreamFPvl
/* 802F6330 002F3270 88 61 00 08 */ lbz r3, 8(r1)
/* 802F6334 002F3274 30 03 FF FF */ addic r0, r3, -1
/* 802F6338 002F3278 7C 00 19 10 */ subfe r0, r0, r3
@@ -167,7 +167,7 @@ lbl_802F630C:
lbl_802F634C:
/* 802F634C 002F328C 7F E3 FB 78 */ mr r3, r31
/* 802F6350 002F3290 38 80 00 04 */ li r4, 4
/* 802F6354 002F3294 4B FE 60 1D */ bl JSURandomInputStream_NS_align
/* 802F6354 002F3294 4B FE 60 1D */ bl align__20JSURandomInputStreamFl
/* 802F6358 002F3298 28 1E 00 00 */ cmplwi r30, 0
/* 802F635C 002F329C 41 82 00 18 */ beq lbl_802F6374
/* 802F6360 002F32A0 34 9D 00 DC */ addic. r4, r29, 0xdc
include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s
+1 -1
View File
@@ -306,7 +306,7 @@ lbl_802F6C14:
/* 802F6C64 002F3BA4 38 81 00 08 */ addi r4, r1, 8
/* 802F6C68 002F3BA8 4B FF 24 59 */ bl J2DGrafContext_NS_scissor
/* 802F6C6C 002F3BAC 38 61 00 18 */ addi r3, r1, 0x18
/* 802F6C70 002F3BB0 4B FF 21 B1 */ bl J2DGrafContext_NS_setScissor
/* 802F6C70 002F3BB0 4B FF 21 B1 */ bl setScissor__14J2DGrafContextFv
lbl_802F6C74:
/* 802F6C74 002F3BB4 88 7B 00 B1 */ lbz r3, 0xb1(r27)
/* 802F6C78 002F3BB8 48 06 5D 0D */ bl GXSetCullMode
include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s
+1 -1
View File
@@ -14,7 +14,7 @@
/* 802F7B4C 002F4A8C 7F A3 EB 78 */ mr r3, r29
/* 802F7B50 002F4A90 38 81 00 08 */ addi r4, r1, 8
/* 802F7B54 002F4A94 38 A0 00 48 */ li r5, 0x48
/* 802F7B58 002F4A98 4B FE 47 41 */ bl JSUInputStream_NS_read
/* 802F7B58 002F4A98 4B FE 47 41 */ bl read__14JSUInputStreamFPvl
/* 802F7B5C 002F4A9C A0 01 00 12 */ lhz r0, 0x12(r1)
/* 802F7B60 002F4AA0 B0 1E 00 04 */ sth r0, 4(r30)
/* 802F7B64 002F4AA4 88 61 00 14 */ lbz r3, 0x14(r1)
include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s
+9 -9
View File
@@ -14,7 +14,7 @@
/* 802F7DEC 002F4D2C 40 82 00 14 */ bne lbl_802F7E00
/* 802F7DF0 002F4D30 38 61 00 08 */ addi r3, r1, 8
/* 802F7DF4 002F4D34 38 C0 00 00 */ li r6, 0
/* 802F7DF8 002F4D38 4B FE 62 81 */ bl JUTResReference_NS_getResource
/* 802F7DF8 002F4D38 4B FE 62 81 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
/* 802F7DFC 002F4D3C 48 00 00 E0 */ b lbl_802F7EDC
lbl_802F7E00:
/* 802F7E00 002F4D40 7F 83 E3 78 */ mr r3, r28
@@ -27,16 +27,16 @@ lbl_802F7E00:
/* 802F7E1C 002F4D5C 7F 84 E3 78 */ mr r4, r28
/* 802F7E20 002F4D60 7F A5 EB 78 */ mr r5, r29
/* 802F7E24 002F4D64 38 C0 00 00 */ li r6, 0
/* 802F7E28 002F4D68 4B FE 62 51 */ bl JUTResReference_NS_getResource
/* 802F7E28 002F4D68 4B FE 62 51 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
/* 802F7E2C 002F4D6C 28 03 00 00 */ cmplwi r3, 0
/* 802F7E30 002F4D70 40 82 00 AC */ bne lbl_802F7EDC
/* 802F7E34 002F4D74 7F 83 E3 78 */ mr r3, r28
/* 802F7E38 002F4D78 7F E4 FB 78 */ mr r4, r31
/* 802F7E3C 002F4D7C 38 A0 00 00 */ li r5, 0
/* 802F7E40 002F4D80 4B FE 46 9D */ bl JSURandomInputStream_NS_seek
/* 802F7E40 002F4D80 4B FE 46 9D */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
/* 802F7E44 002F4D84 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13)
/* 802F7E48 002F4D88 7F 84 E3 78 */ mr r4, r28
/* 802F7E4C 002F4D8C 48 01 50 31 */ bl J2DDataManage_NS_get_X1_
/* 802F7E4C 002F4D8C 48 01 50 31 */ bl get__13J2DDataManageFP14JSUInputStream
/* 802F7E50 002F4D90 48 00 00 8C */ b lbl_802F7EDC
lbl_802F7E54:
/* 802F7E54 002F4D94 7F 83 E3 78 */ mr r3, r28
@@ -49,18 +49,18 @@ lbl_802F7E54:
/* 802F7E70 002F4DB0 7F 84 E3 78 */ mr r4, r28
/* 802F7E74 002F4DB4 7F A5 EB 78 */ mr r5, r29
/* 802F7E78 002F4DB8 7F C6 F3 78 */ mr r6, r30
/* 802F7E7C 002F4DBC 4B FE 61 FD */ bl JUTResReference_NS_getResource
/* 802F7E7C 002F4DBC 4B FE 61 FD */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
/* 802F7E80 002F4DC0 28 03 00 00 */ cmplwi r3, 0
/* 802F7E84 002F4DC4 40 82 00 28 */ bne lbl_802F7EAC
/* 802F7E88 002F4DC8 7F 83 E3 78 */ mr r3, r28
/* 802F7E8C 002F4DCC 7F E4 FB 78 */ mr r4, r31
/* 802F7E90 002F4DD0 38 A0 00 00 */ li r5, 0
/* 802F7E94 002F4DD4 4B FE 46 49 */ bl JSURandomInputStream_NS_seek
/* 802F7E94 002F4DD4 4B FE 46 49 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
/* 802F7E98 002F4DD8 38 61 00 08 */ addi r3, r1, 8
/* 802F7E9C 002F4DDC 7F 84 E3 78 */ mr r4, r28
/* 802F7EA0 002F4DE0 7F A5 EB 78 */ mr r5, r29
/* 802F7EA4 002F4DE4 38 C0 00 00 */ li r6, 0
/* 802F7EA8 002F4DE8 4B FE 61 D1 */ bl JUTResReference_NS_getResource
/* 802F7EA8 002F4DE8 4B FE 61 D1 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
lbl_802F7EAC:
/* 802F7EAC 002F4DEC 28 03 00 00 */ cmplwi r3, 0
/* 802F7EB0 002F4DF0 40 82 00 2C */ bne lbl_802F7EDC
@@ -70,10 +70,10 @@ lbl_802F7EAC:
/* 802F7EC0 002F4E00 7F 83 E3 78 */ mr r3, r28
/* 802F7EC4 002F4E04 7F E4 FB 78 */ mr r4, r31
/* 802F7EC8 002F4E08 38 A0 00 00 */ li r5, 0
/* 802F7ECC 002F4E0C 4B FE 46 11 */ bl JSURandomInputStream_NS_seek
/* 802F7ECC 002F4E0C 4B FE 46 11 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
/* 802F7ED0 002F4E10 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13)
/* 802F7ED4 002F4E14 7F 84 E3 78 */ mr r4, r28
/* 802F7ED8 002F4E18 48 01 4F A5 */ bl J2DDataManage_NS_get_X1_
/* 802F7ED8 002F4E18 48 01 4F A5 */ bl get__13J2DDataManageFP14JSUInputStream
lbl_802F7EDC:
/* 802F7EDC 002F4E1C 39 61 01 20 */ addi r11, r1, 0x120
/* 802F7EE0 002F4E20 48 06 A3 45 */ bl _restgpr_28
include/JSystem/J3DUClipper.h
+2 -2
View File
@@ -25,8 +25,8 @@ public:
extern J3DUClipper lbl_803DD8E4;
extern "C" {
u32 J3DUClipper_NS_clip(const J3DUClipper*, const Mtx, Vec*, f32);
u32 J3DUClipper_NS_clip_X1_(const J3DUClipper*, const Mtx, Vec*, Vec*);
u32 clip__11J3DUClipperCFPA4_Cf3Vecf(const J3DUClipper*, const Mtx, Vec*, f32);
u32 clip__11J3DUClipperCFPA4_CfP3VecP3Vec(const J3DUClipper*, const Mtx, Vec*, Vec*);
}
#endif
include/JSystem/JAudio2/JAIAudible.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAIAUDIBLE_H_
extern "C" {
void JAIAudible_NS_dtor(void);
void __dt__10JAIAudibleFv(void);
}
#endif // JAIAUDIBLE_H_
include/JSystem/JAudio2/JAIAudience/JAIAudience.h
+1 -1
View File
@@ -4,7 +4,7 @@
struct JAIAudience {};
extern "C" {
void JAIAudience_NS_dtor(void);
void __dt__11JAIAudienceFv(void);
}
#endif // JAIAUDIENCE_H_
include/JSystem/JAudio2/JAISeCategoryMgr.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define JAISECATEGORYMGR_H_
extern "C" {
void JAISeCategoryMgr_NS_pause(void);
void JAISeCategoryMgr_NS_stop(void);
void pause__16JAISeCategoryMgrFb(void);
void stop__16JAISeCategoryMgrFUl(void);
}
#endif // JAISECATEGORYMGR_H_
include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h
+9 -9
View File
@@ -8,16 +8,16 @@ public:
extern "C" {
void JAISeMgr_NS_dtor(void);
void JAISeMgr_NS_calc(void);
void JAISeMgr_NS_getNumActiveSe(void);
void JAISeMgr_NS_initParams(void);
void JAISeMgr_NS_mixOut(void);
void JAISeMgr_NS_setAudience(void);
void JAISeMgr_NS_setCategoryArrangement(void);
void JAISeMgr_NS_setSeqDataMgr(void);
void calc__8JAISeMgrFv(void);
void getNumActiveSe__8JAISeMgrCFv(void);
void initParams__8JAISeMgrFv(void);
void mixOut__8JAISeMgrFv(void);
void setAudience__8JAISeMgrFP11JAIAudience(void);
void setCategoryArrangement__8JAISeMgrFRC24JAISeCategoryArrangement(void);
void setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr(void);
void JAISeMgr_NS_startSound(void);
void JAISeMgr_NS_stop(void);
void JAISeMgr_NS_stopSoundID(void);
void stop__8JAISeMgrFv(void);
void stopSoundID__8JAISeMgrF10JAISoundID(void);
}
#endif // JAI_SE_MGR_H_
include/JSystem/JAudio2/JAISeqMgr.h
+5 -5
View File
@@ -3,12 +3,12 @@
// Additional symbols needed for JAISeqMgr
extern "C" {
void JAISeqMgr_NS_calc(void);
void JAISeqMgr_NS_mixOut(void);
void calc__9JAISeqMgrFv(void);
void mixOut__9JAISeqMgrFv(void);
void JAISeqMgr_NS_startSound(void);
void JAISeqMgr_NS_stopSoundID(void);
void JAISeqMgr_NS_stop(void);
void JAISeqMgr_NS_stop_X1_(void);
void stopSoundID__9JAISeqMgrF10JAISoundID(void);
void stop__9JAISeqMgrFv(void);
void stop__9JAISeqMgrFUl(void);
}
#endif // JAISEQMGR_H_
include/JSystem/JAudio2/JAISound/JAISound.h
+5 -5
View File
@@ -149,13 +149,13 @@ void JAISoundHandle_NS_dtor(void);
void stop__8JAISoundFUl(JAISound*, u32 fadeout);
void stop__8JAISoundFv(JAISound*);
void JAISoundID_NS___as(void);
void JAISoundID_X1_(void);
void __as__10JAISoundIDFRC10JAISoundID(void);
void __ct__10JAISoundIDFUl(void);
void JAISound_NS_acceptsNewAudible(void);
void JAISound_NS_getID(void);
void acceptsNewAudible__8JAISoundCFv(void);
void getID__8JAISoundCFv(void);
void JAISound_NS_newAudible(void);
void JAISound_NS_releaseHandle(void);
void releaseHandle__8JAISoundFv(void);
}
#endif
include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h
+2 -2
View File
@@ -9,8 +9,8 @@ public:
};
extern "C" {
void JAISoundHandles_NS_getFreeHandle(void);
void JAISoundHandles_NS_getHandleSoundID(void);
void getFreeHandle__15JAISoundHandlesFv(void);
void getHandleSoundID__15JAISoundHandlesF10JAISoundID(void);
}
#endif // JAISOUNDHANDLES_H_
include/JSystem/JAudio2/JAISoundInfo.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define JAISOUNDINFO_H_
extern "C" {
void JAISoundInfo(void);
void JAISoundInfo_NS_dtor(void);
void __ct__12JAISoundInfoFb(void);
void __dt__12JAISoundInfoFv(void);
}
#endif // JAISOUNDINFO_H_
include/JSystem/JAudio2/JAISoundParamsMove.h
+4 -4
View File
@@ -2,10 +2,10 @@
#define JAISOUNDPARAMSMOVE_H_
extern "C" {
void JAISoundParamsMove_NS_moveDolby(void);
void JAISoundParamsMove_NS_moveFxMix(void);
void JAISoundParamsMove_NS_movePan(void);
void JAISoundParamsMove_NS_movePitch(void);
void moveDolby__18JAISoundParamsMoveFfUl(void);
void moveFxMix__18JAISoundParamsMoveFfUl(void);
void movePan__18JAISoundParamsMoveFfUl(void);
void movePitch__18JAISoundParamsMoveFfUl(void);
void moveVolume__18JAISoundParamsMoveFfUl(void);
}
include/JSystem/JAudio2/JAISoundStarter.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define JAISOUNDSTARTER_H_
extern "C" {
void JAISoundStarter_NS_ctor(void);
void JAISoundStarter_NS_dtor(void);
void __ct__15JAISoundStarterFb(void);
void __dt__15JAISoundStarterFv(void);
void JAISoundStarter_NS_startLevelSound(void);
}
include/JSystem/JAudio2/JAISoundStatus.h
+2 -2
View File
@@ -3,8 +3,8 @@
// Additional symbols needed for JAISoundStatus
extern "C" {
void JAISoundStatus__NS_lockWhenPrepared(void);
void JAISoundStatus__NS_unlockIfLocked(void);
void lockWhenPrepared__15JAISoundStatus_Fv(void);
void unlockIfLocked__15JAISoundStatus_Fv(void);
}
#endif // JAISOUNDSTATUS_H_
include/JSystem/JAudio2/JAIStreamAramMgr.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAISTREAMARAMMGR_H_
extern "C" {
void JAIStreamAramMgr_NS_dtor(void);
void __dt__16JAIStreamAramMgrFv(void);
}
#endif // JAISTREAMARAMMGR_H_
include/JSystem/JAudio2/JAIStreamDataMgr.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAISTREAMDATAMGR_H_
extern "C" {
void JAIStreamDataMgr_NS_dtor(void);
void __dt__16JAIStreamDataMgrFv(void);
}
#endif // JAISTREAMDATAMGR_H_
include/JSystem/JAudio2/JAIStreamMgr.h
+6 -6
View File
@@ -3,13 +3,13 @@
// Additional symbols needed for JAIStreamMgr
extern "C" {
void JAIStreamMgr_NS_calc(void);
void JAIStreamMgr_NS_isActive(void);
void JAIStreamMgr_NS_mixOut(void);
void calc__12JAIStreamMgrFv(void);
void isActive__12JAIStreamMgrCFv(void);
void mixOut__12JAIStreamMgrFv(void);
void JAIStreamMgr_NS_startSound(void);
void JAIStreamMgr_NS_stop(void);
void JAIStreamMgr_NS_stop_X1_(void);
void JAIStreamMgr_NS_stopSoundID(void);
void stop__12JAIStreamMgrFv(void);
void stop__12JAIStreamMgrFUl(void);
void stopSoundID__12JAIStreamMgrF10JAISoundID(void);
}
#endif // JAISTREAMMGR_H_
include/JSystem/JAudio2/JASAudioReseter.h
+4 -4
View File
@@ -2,10 +2,10 @@
#define JASAUDIORESETER_H_
extern "C" {
void JASAudioReseter(void);
void JASAudioReseter_NS_checkDone(void);
void JASAudioReseter_NS_resume(void);
void JASAudioReseter_NS_start(void);
void __ct__15JASAudioReseterFv(void);
void checkDone__15JASAudioReseterCFv(void);
void resume__15JASAudioReseterFv(void);
void start__15JASAudioReseterFUlb(void);
}
#endif // JASAUDIORESETER_H_
include/JSystem/JAudio2/JASDriver.h
+2 -2
View File
@@ -4,9 +4,9 @@
extern "C" {
void setOutputMode__9JASDriverFUl(void);
void JASDriver_NS_getSubFrames(void);
void getSubFrames__9JASDriverFv(void);
void JASDriver_NS_setOutputMode(void);
void JASDriver_NS_waitSubFrame(void);
void waitSubFrame__9JASDriverFv(void);
}
#endif // JASDRIVER_H_
include/JSystem/JAudio2/JASDsp.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JASDSP_H_
extern "C" {
void JASDsp_NS_setFXLine(void);
void setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_(void);
}
#endif // JASDSP_H_
include/JSystem/JAudio2/JASGenericMemPool.h
+5 -5
View File
@@ -2,11 +2,11 @@
#define JASGENERICMEMPOOL_H_
extern "C" {
void JASGenericMemPool(void);
void JASGenericMemPool_NS_alloc(void);
void JASGenericMemPool_NS_dtor(void);
void JASGenericMemPool_NS_free(void);
void JASGenericMemPool_NS_newMemPool(void);
void __ct__17JASGenericMemPoolFv(void);
void alloc__17JASGenericMemPoolFUl(void);
void __dt__17JASGenericMemPoolFv(void);
void free__17JASGenericMemPoolFPvUl(void);
void newMemPool__17JASGenericMemPoolFUli(void);
}
#endif // JASGENERICMEMPOOL_H_
include/JSystem/JAudio2/JASHeap.h
+4 -4
View File
@@ -2,10 +2,10 @@
#define JASHEAP_H_
extern "C" {
void JASHeap_NS_alloc(void);
void JASHeap_NS___defctor(void);
void JASHeap_NS_dtor(void);
void JASHeap_NS_free(void);
void alloc__7JASHeapFP7JASHeapUl(void);
void __defctor__7JASHeapFv(void);
void __dt__7JASHeapFv(void);
void free__7JASHeapFv(void);
}
#endif // JASHEAP_H_
include/JSystem/JAudio2/JASKernel.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JASKERNEL_H_
extern "C" {
void JASKernel_NS_getAramHeap(void);
void getAramHeap__9JASKernelFv(void);
}
#endif // JASKERNEL_H_
include/JSystem/JAudio2/JASResArcLoader.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JASRESARCLOADER_H_
extern "C" {
void JASResArcLoader_NS_getResMaxSize(void);
void getResMaxSize__15JASResArcLoaderFPC10JKRArchive(void);
}
#endif // JASRESARCLOADER_H_
include/JSystem/JAudio2/JASSoundParams.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define JASSOUNDPARAMS_H_
extern "C" {
void JASSoundParams_NS_clamp(void);
void JASSoundParams_NS_combine(void);
void clamp__14JASSoundParamsFv(void);
void combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams(void);
}
#endif // JASSOUNDPARAMS_H_
include/JSystem/JAudio2/JASTrack.h
+5 -5
View File
@@ -2,11 +2,11 @@
#define JASTRACK_H_
extern "C" {
void JASTrack_NS_openChild(void);
void JASTrack_NS_readPort(void);
void JASTrack_NS_setFIR(void);
void JASTrack_NS_setIIR(void);
void JASTrack_NS_writePort(void);
void openChild__8JASTrackFUl(void);
void readPort__8JASTrackFUl(void);
void setFIR__8JASTrackFPCs(void);
void setIIR__8JASTrackFPCs(void);
void writePort__8JASTrackFUlUs(void);
}
#endif // JASTRACK_H_
include/JSystem/JAudio2/JASWaveArc.h
+3 -3
View File
@@ -3,9 +3,9 @@
// Additional symbols needed for JASWaveArc
extern "C" {
void JASWaveArc_NS_erase(void);
void JASWaveArc_NS_load(void);
void JASWaveArc_NS_loadTail(void);
void erase__10JASWaveArcFv(void);
void load__10JASWaveArcFP7JASHeap(void);
void loadTail__10JASWaveArcFP7JASHeap(void);
}
#endif // JASWAVEARC_H_
include/JSystem/JAudio2/JAU.h
+4 -4
View File
@@ -2,10 +2,10 @@
#define JAU_H_
extern "C" {
void JAU_JAIInitializer(void);
void JAU_JAIInitializer_NS_initJAInterface(void);
void JAU_JASInitializer(void);
void JAU_JASInitializer_NS_initJASystem(void);
void __ct__18JAU_JAIInitializerFv(void);
void initJAInterface__18JAU_JAIInitializerFv(void);
void __ct__18JAU_JASInitializerFv(void);
void initJASystem__18JAU_JASInitializerFP12JKRSolidHeap(void);
}
#endif // JAU_H_
include/JSystem/JAudio2/JAUAudioArcInterpreter.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAUAUDIOARCINTERPRETER_H_
extern "C" {
void JAUAudioArcInterpreter_NS_dtor(void);
void __dt__22JAUAudioArcInterpreterFv(void);
}
#endif // JAUAUDIOARCINTERPRETER_H_
include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h
+2 -2
View File
@@ -5,8 +5,8 @@ struct JAUSection; // goes in JAudio2.a JAUAudioArcLoader.o
extern "C" {
void __ct__16Z2AudioArcLoaderFP10JAUSection(void);
void JAUAudioArcLoader(void); // ctor
void JAUAudioArcLoader_NS_load(void);
void __ct__17JAUAudioArcLoaderFP10JAUSection(void); // ctor
void load__17JAUAudioArcLoaderFPCv(void);
}
#endif // JAUAUDIOARCLOADER_H_
include/JSystem/JAudio2/JAUNewSectionHeap.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAUNEWSECTIONHEAP_H_
extern "C" {
void JAUNewSectionHeap_X1_(void);
void JAUNewSectionHeap__Fb(void);
}
#endif // JAUNEWSECTIONHEAP_H_
include/JSystem/JAudio2/JAUSection.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JAUSECTION_H_
extern "C" {
void JAUSection_NS_finishBuild(void);
void finishBuild__10JAUSectionFv(void);
}
#endif // JAUSECTION_H_
include/JSystem/JAudio2/JAUSectionHeap.h
+5 -5
View File
@@ -2,11 +2,11 @@
#define JAUSECTIONHEAP_H_
extern "C" {
void JAUSectionHeap_NS_getOpenSection(void);
void JAUSectionHeap_NS_loadDynamicSeq(void);
void JAUSectionHeap_NS_newDynamicSeqBlock(void);
void JAUSectionHeap_NS_releaseIdleDynamicSeqDataBlock(void);
void JAUSectionHeap_NS_setSeqDataArchive(void);
void getOpenSection__14JAUSectionHeapFv(void);
void loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb(void);
void newDynamicSeqBlock__14JAUSectionHeapFUl(void);
void releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv(void);
void setSeqDataArchive__14JAUSectionHeapFP10JKRArchive(void);
}
#endif // JAUSECTIONHEAP_H_
include/JSystem/JAudio2/JAUSoundAnimation.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define JAUSOUNDANIMATION_H_
extern "C" {
void JAUSoundAnimation_NS_getStartSoundIndex(void);
void JAUSoundAnimation_NS_getEndSoundIndex(void);
void getStartSoundIndex__17JAUSoundAnimationCFf(void);
void getEndSoundIndex__17JAUSoundAnimationCFf(void);
}
#endif // JAUSOUNDANIMATION_H_
include/JSystem/JAudio2/JAUSoundTable.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define JAUSOUNDTABLE_H_
extern "C" {
void JAUSoundTable_NS_getData(void);
void JAUSoundTable_NS_getTypeID(void);
void getData__13JAUSoundTableCF10JAISoundID(void);
void getTypeID__13JAUSoundTableCF10JAISoundID(void);
}
#endif // JAUSOUNDTABLE_H_
include/JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s
+1 -1
View File
@@ -45,7 +45,7 @@ lbl_802D78E4:
/* 802D78F0 002D4830 38 A3 00 13 */ addi r5, r3, 0x13
/* 802D78F4 002D4834 38 C3 00 16 */ addi r6, r3, 0x16
/* 802D78F8 002D4838 4C C6 31 82 */ crclr 6
/* 802D78FC 002D483C 48 00 A9 01 */ bl JUTException_NS_panic_f
/* 802D78FC 002D483C 48 00 A9 01 */ bl panic_f__12JUTExceptionFPCciPCce
/* 802D7900 002D4840 38 60 00 00 */ li r3, 0
lbl_802D7904:
/* 802D7904 002D4844 80 01 00 14 */ lwz r0, 0x14(r1)
include/JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s
+1 -1
View File
@@ -79,7 +79,7 @@ lbl_802D7A2C:
/* 802D7A38 002D4978 38 A3 00 13 */ addi r5, r3, 0x13
/* 802D7A3C 002D497C 38 C3 00 16 */ addi r6, r3, 0x16
/* 802D7A40 002D4980 4C C6 31 82 */ crclr 6
/* 802D7A44 002D4984 48 00 A7 B9 */ bl JUTException_NS_panic_f
/* 802D7A44 002D4984 48 00 A7 B9 */ bl panic_f__12JUTExceptionFPCciPCce
/* 802D7A48 002D4988 38 60 00 00 */ li r3, 0
lbl_802D7A4C:
/* 802D7A4C 002D498C 39 61 00 70 */ addi r11, r1, 0x70
include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s
+3 -3
View File
@@ -76,14 +76,14 @@ lbl_802D3DD8:
/* 802D3DE4 002D0D24 38 A3 00 12 */ addi r5, r3, 0x12
/* 802D3DE8 002D0D28 38 C3 00 15 */ addi r6, r3, 0x15
/* 802D3DEC 002D0D2C 4C C6 31 82 */ crclr 6
/* 802D3DF0 002D0D30 48 00 E4 0D */ bl JUTException_NS_panic_f
/* 802D3DF0 002D0D30 48 00 E4 0D */ bl panic_f__12JUTExceptionFPCciPCce
lbl_802D3DF4:
/* 802D3DF4 002D0D34 28 1A 00 00 */ cmplwi r26, 0
/* 802D3DF8 002D0D38 41 82 00 AC */ beq lbl_802D3EA4
/* 802D3DFC 002D0D3C 80 78 00 10 */ lwz r3, 0x10(r24)
/* 802D3E00 002D0D40 7F A4 EB 78 */ mr r4, r29
/* 802D3E04 002D0D44 38 A0 00 00 */ li r5, 0
/* 802D3E08 002D0D48 48 00 86 D5 */ bl JSURandomInputStream_NS_seek
/* 802D3E08 002D0D48 48 00 86 D5 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
/* 802D3E0C 002D0D4C 48 00 00 70 */ b lbl_802D3E7C
lbl_802D3E10:
/* 802D3E10 002D0D50 7C 1E F8 40 */ cmplw r30, r31
@@ -94,7 +94,7 @@ lbl_802D3E20:
/* 802D3E20 002D0D60 80 78 00 10 */ lwz r3, 0x10(r24)
/* 802D3E24 002D0D64 7F 44 D3 78 */ mr r4, r26
/* 802D3E28 002D0D68 7F 25 CB 78 */ mr r5, r25
/* 802D3E2C 002D0D6C 48 00 84 6D */ bl JSUInputStream_NS_read
/* 802D3E2C 002D0D6C 48 00 84 6D */ bl read__14JSUInputStreamFPvl
/* 802D3E30 002D0D70 2C 03 00 00 */ cmpwi r3, 0
/* 802D3E34 002D0D74 40 82 00 0C */ bne lbl_802D3E40
/* 802D3E38 002D0D78 3B 80 00 00 */ li r28, 0
include/JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s
+1 -1
View File
@@ -102,7 +102,7 @@ lbl_802D921C:
/* 802D9228 002D6168 38 A3 00 13 */ addi r5, r3, 0x13
/* 802D922C 002D616C 38 C3 00 16 */ addi r6, r3, 0x16
/* 802D9230 002D6170 4C C6 31 82 */ crclr 6
/* 802D9234 002D6174 48 00 8F C9 */ bl JUTException_NS_panic_f
/* 802D9234 002D6174 48 00 8F C9 */ bl panic_f__12JUTExceptionFPCciPCce
lbl_802D9238:
/* 802D9238 002D6178 28 1F 00 00 */ cmplwi r31, 0
/* 802D923C 002D617C 41 82 00 08 */ beq lbl_802D9244
include/JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s
+1 -1
View File
@@ -93,7 +93,7 @@ lbl_802D94A4:
/* 802D94B0 002D63F0 38 A3 00 13 */ addi r5, r3, 0x13
/* 802D94B4 002D63F4 38 C3 00 27 */ addi r6, r3, 0x27
/* 802D94B8 002D63F8 4C C6 31 82 */ crclr 6
/* 802D94BC 002D63FC 48 00 8D 41 */ bl JUTException_NS_panic_f
/* 802D94BC 002D63FC 48 00 8D 41 */ bl panic_f__12JUTExceptionFPCciPCce
lbl_802D94C0:
/* 802D94C0 002D6400 88 BD 00 07 */ lbz r5, 7(r29)
/* 802D94C4 002D6404 88 9D 00 06 */ lbz r4, 6(r29)
include/JSystem/JKernel/JKRCompression.h
+27 -27
View File
@@ -1,28 +1,28 @@
#ifndef JKRCOMPREESION_H_
#define JKRCOMPREESION_H_
#include "JSystem/JKernel/SArc.h"
#include "dolphin/types.h"
inline u32 read_big_endian_u32(void* ptr) {
u8* uptr = (u8*)ptr;
return ((u32)uptr[0] << 0x18) | ((u32)uptr[1] << 0x10) | ((u32)uptr[2] << 8) | (u32)uptr[3];
}
inline u16 read_big_endian_u16(void* ptr) {
u8* uptr = (u8*)ptr;
return ((u16)uptr[0] << 8) | ((u16)uptr[1]);
}
typedef int JKRCompression;
const JKRCompression COMPRESSION_NONE = 0;
const JKRCompression COMPRESSION_YAY0 = 1;
const JKRCompression COMPRESSION_YAZ0 = 2;
const JKRCompression COMPRESSION_ASR = 3;
inline u32 JKRDecompExpandSize(SArcHeader* header) {
u8* fileLength = (u8*)&header->file_length;
return read_big_endian_u32(fileLength);
}
#ifndef JKRCOMPREESION_H_
#define JKRCOMPREESION_H_
#include "JSystem/JKernel/SArc.h"
#include "dolphin/types.h"
inline u32 read_big_endian_u32(void* ptr) {
u8* uptr = (u8*)ptr;
return ((u32)uptr[0] << 0x18) | ((u32)uptr[1] << 0x10) | ((u32)uptr[2] << 8) | (u32)uptr[3];
}
inline u16 read_big_endian_u16(void* ptr) {
u8* uptr = (u8*)ptr;
return ((u16)uptr[0] << 8) | ((u16)uptr[1]);
}
typedef int JKRCompression;
const JKRCompression COMPRESSION_NONE = 0;
const JKRCompression COMPRESSION_YAY0 = 1;
const JKRCompression COMPRESSION_YAZ0 = 2;
const JKRCompression COMPRESSION_ASR = 3;
inline u32 JKRDecompExpandSize(SArcHeader* header) {
u8* fileLength = (u8*)&header->file_length;
return read_big_endian_u32(fileLength);
}
#endif
include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_802DAAC8:
/* 802DAAE0 002D7A20 7C 7C 1B 79 */ or. r28, r3, r3
/* 802DAAE4 002D7A24 41 82 00 10 */ beq lbl_802DAAF4
/* 802DAAE8 002D7A28 7F C4 F3 78 */ mr r4, r30
/* 802DAAEC 002D7A2C 48 00 1B 4D */ bl JSUFileInputStream_ct
/* 802DAAEC 002D7A2C 48 00 1B 4D */ bl __ct__18JSUFileInputStreamFP7JKRFile
/* 802DAAF0 002D7A30 7C 7C 1B 78 */ mr r28, r3
lbl_802DAAF4:
/* 802DAAF4 002D7A34 93 9E 00 54 */ stw r28, 0x54(r30)
include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s
+1 -1
View File
@@ -16,7 +16,7 @@
/* 802DAE0C 002D7D4C 38 04 C4 B0 */ addi r0, r4, lbl_803CC4B0@l
/* 802DAE10 002D7D50 90 1E 00 00 */ stw r0, 0(r30)
/* 802DAE14 002D7D54 38 80 00 00 */ li r4, 0
/* 802DAE18 002D7D58 48 00 14 25 */ bl JSUInputStream_NS_dtor
/* 802DAE18 002D7D58 48 00 14 25 */ bl __dt__14JSUInputStreamFv
lbl_802DAE1C:
/* 802DAE1C 002D7D5C 7F E0 07 35 */ extsh. r0, r31
/* 802DAE20 002D7D60 40 81 00 0C */ ble lbl_802DAE2C
include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s
+2 -2
View File
@@ -253,7 +253,7 @@ lbl_802DA06C:
/* 802DA078 002D6FB8 38 A3 00 11 */ addi r5, r3, 0x11
/* 802DA07C 002D6FBC 38 C3 00 14 */ addi r6, r3, 0x14
/* 802DA080 002D6FC0 4C C6 31 82 */ crclr 6
/* 802DA084 002D6FC4 48 00 81 79 */ bl JUTException_NS_panic_f
/* 802DA084 002D6FC4 48 00 81 79 */ bl panic_f__12JUTExceptionFPCciPCce
lbl_802DA088:
/* 802DA088 002D6FC8 7F 83 E3 78 */ mr r3, r28
/* 802DA08C 002D6FCC 48 00 01 40 */ b lbl_802DA1CC
@@ -268,7 +268,7 @@ lbl_802DA090:
/* 802DA0AC 002D6FEC 38 A3 00 11 */ addi r5, r3, 0x11
/* 802DA0B0 002D6FF0 38 C3 00 38 */ addi r6, r3, 0x38
/* 802DA0B4 002D6FF4 4C C6 31 82 */ crclr 6
/* 802DA0B8 002D6FF8 48 00 81 45 */ bl JUTException_NS_panic_f
/* 802DA0B8 002D6FF8 48 00 81 45 */ bl panic_f__12JUTExceptionFPCciPCce
lbl_802DA0BC:
/* 802DA0BC 002D6FFC 38 76 00 5C */ addi r3, r22, 0x5c
/* 802DA0C0 002D7000 7F A4 EB 78 */ mr r4, r29
include/JSystem/JKernel/JKRExpHeap/asm/func_802CFDCC.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 802CFDFC 002CCD3C 38 A6 00 34 */ addi r5, r6, 0x34
/* 802CFE00 002CCD40 38 C6 00 37 */ addi r6, r6, 0x37
/* 802CFE04 002CCD44 4C C6 31 82 */ crclr 6
/* 802CFE08 002CCD48 48 01 23 F5 */ bl JUTException_NS_panic_f
/* 802CFE08 002CCD48 48 01 23 F5 */ bl panic_f__12JUTExceptionFPCciPCce
lbl_802CFE0C:
/* 802CFE0C 002CCD4C 80 7E 00 84 */ lwz r3, 0x84(r30)
/* 802CFE10 002CCD50 38 00 48 4D */ li r0, 0x484d
include/JSystem/JKernel/JKRExpHeap/asm/func_802D00B4.s
+1 -1
View File
@@ -33,7 +33,7 @@
/* 802D012C 002CD06C 38 A6 00 34 */ addi r5, r6, 0x34
/* 802D0130 002CD070 38 C6 00 6F */ addi r6, r6, 0x6f
/* 802D0134 002CD074 4C C6 31 82 */ crclr 6
/* 802D0138 002CD078 48 01 20 C5 */ bl JUTException_NS_panic_f
/* 802D0138 002CD078 48 01 20 C5 */ bl panic_f__12JUTExceptionFPCciPCce
lbl_802D013C:
/* 802D013C 002CD07C 7C 1D D8 40 */ cmplw r29, r27
/* 802D0140 002CD080 40 82 00 38 */ bne lbl_802D0178
include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s
+5 -5
View File
@@ -21,10 +21,10 @@
/* 802D1CC4 002CEC04 80 DA 00 1C */ lwz r6, 0x1c(r26)
/* 802D1CC8 002CEC08 80 FA 00 10 */ lwz r7, 0x10(r26)
/* 802D1CCC 002CEC0C 4C C6 31 82 */ crclr 6
/* 802D1CD0 002CEC10 48 01 5E E9 */ bl JUTConsole_NS_print_f
/* 802D1CD0 002CEC10 48 01 5E E9 */ bl print_f__10JUTConsoleFPCce
/* 802D1CD4 002CEC14 7F 83 E3 78 */ mr r3, r28
/* 802D1CD8 002CEC18 7F A4 EB 78 */ mr r4, r29
/* 802D1CDC 002CEC1C 48 01 5F 5D */ bl JUTConsole_NS_print
/* 802D1CDC 002CEC1C 48 01 5F 5D */ bl print__10JUTConsoleFPCc
lbl_802D1CE0:
/* 802D1CE0 002CEC20 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha
/* 802D1CE4 002CEC24 83 C3 42 8C */ lwz r30, sThreadList__9JKRThread@l(r3)
@@ -61,13 +61,13 @@ lbl_802D1D38:
/* 802D1D4C 002CEC8C 38 84 00 A7 */ addi r4, r4, 0xa7
/* 802D1D50 002CEC90 80 B9 00 70 */ lwz r5, 0x70(r25)
/* 802D1D54 002CEC94 4C C6 31 82 */ crclr 6
/* 802D1D58 002CEC98 48 09 47 85 */ bl func_803664DC
/* 802D1D58 002CEC98 48 09 47 85 */ bl sprintf
/* 802D1D5C 002CEC9C 3B A1 00 08 */ addi r29, r1, 8
lbl_802D1D60:
/* 802D1D60 002CECA0 83 F9 00 68 */ lwz r31, 0x68(r25)
/* 802D1D64 002CECA4 80 7A 00 18 */ lwz r3, 0x18(r26)
/* 802D1D68 002CECA8 80 9A 00 1C */ lwz r4, 0x1c(r26)
/* 802D1D6C 002CECAC 48 09 09 51 */ bl func_803626BC
/* 802D1D6C 002CECAC 48 09 09 51 */ bl __cvt_sll_flt
/* 802D1D70 002CECB0 80 19 00 64 */ lwz r0, 0x64(r25)
/* 802D1D74 002CECB4 C8 42 C5 C8 */ lfd f2, lbl_80455FC8-_SDA2_BASE_(r2)
/* 802D1D78 002CECB8 90 01 00 1C */ stw r0, 0x1c(r1)
@@ -97,7 +97,7 @@ lbl_802D1D60:
/* 802D1DD8 002CED18 7F E6 FB 78 */ mr r6, r31
/* 802D1DDC 002CED1C 7F 27 CB 78 */ mr r7, r25
/* 802D1DE0 002CED20 4C C6 31 82 */ crclr 6
/* 802D1DE4 002CED24 48 01 5D D5 */ bl JUTConsole_NS_print_f
/* 802D1DE4 002CED24 48 01 5D D5 */ bl print_f__10JUTConsoleFPCce
lbl_802D1DE8:
/* 802D1DE8 002CED28 83 DE 00 0C */ lwz r30, 0xc(r30)
lbl_802D1DEC:
include/JSystem/JKernel/SArc.h
+63 -63
View File
@@ -1,64 +1,64 @@
#ifndef SARC_H_
#define SARC_H_
#include "dolphin/types.h"
struct SArcHeader {
u32 signature;
u32 file_length;
u32 header_length;
u32 file_data_offset;
u32 file_data_length;
u32 field_0x14;
u32 field_0x18;
u32 field_0x1c;
};
struct SArcDataInfo {
u32 num_nodes;
u32 node_offset;
u32 num_file_entries;
u32 file_entry_offset;
u32 string_table_length;
u32 string_table_offset;
u16 next_free_file_id;
bool sync_file_ids_and_indices;
u8 field_1b[5];
};
struct SDirEntry {
union {
u32 type;
struct {
u8 flags;
u8 padding;
u16 id;
} other;
};
const char* name;
u16 field_0x8;
u16 num_entries;
s32 first_file_index;
};
struct SDIFileEntry {
u16 file_id;
u16 name_hash;
u32 type_flags_and_name_offset;
u32 data_offset;
u32 data_size;
void* data;
u32 getNameOffset() const { return type_flags_and_name_offset & 0xFFFFFF; }
u16 getNameHash() const { return name_hash; }
u32 getFlags() const { return type_flags_and_name_offset >> 24; }
u32 getAttr() const { return getFlags(); }
u16 getFileID() const { return file_id; }
bool isDirectory() const { return (getFlags() & 0x02) != 0; }
bool isUnknownFlag1() const { return (getFlags() & 0x01) != 0; }
bool isCompressed() const { return (getFlags() & 0x04) != 0; }
bool isYAZ0Compressed() const { return (getFlags() & 0x80) != 0; }
};
#ifndef SARC_H_
#define SARC_H_
#include "dolphin/types.h"
struct SArcHeader {
u32 signature;
u32 file_length;
u32 header_length;
u32 file_data_offset;
u32 file_data_length;
u32 field_0x14;
u32 field_0x18;
u32 field_0x1c;
};
struct SArcDataInfo {
u32 num_nodes;
u32 node_offset;
u32 num_file_entries;
u32 file_entry_offset;
u32 string_table_length;
u32 string_table_offset;
u16 next_free_file_id;
bool sync_file_ids_and_indices;
u8 field_1b[5];
};
struct SDirEntry {
union {
u32 type;
struct {
u8 flags;
u8 padding;
u16 id;
} other;
};
const char* name;
u16 field_0x8;
u16 num_entries;
s32 first_file_index;
};
struct SDIFileEntry {
u16 file_id;
u16 name_hash;
u32 type_flags_and_name_offset;
u32 data_offset;
u32 data_size;
void* data;
u32 getNameOffset() const { return type_flags_and_name_offset & 0xFFFFFF; }
u16 getNameHash() const { return name_hash; }
u32 getFlags() const { return type_flags_and_name_offset >> 24; }
u32 getAttr() const { return getFlags(); }
u16 getFileID() const { return file_id; }
bool isDirectory() const { return (getFlags() & 0x02) != 0; }
bool isUnknownFlag1() const { return (getFlags() & 0x01) != 0; }
bool isCompressed() const { return (getFlags() & 0x04) != 0; }
bool isYAZ0Compressed() const { return (getFlags() & 0x80) != 0; }
};
#endif
include/JSystem/JMath/vector.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JSYSTEM_JMATH_VECTOR_H_
extern "C" {
void JMAFastVECNormalize(void);
void JMAFastVECNormalize__FPC3VecP3Vec(void);
}
#endif // JSYSTEM_JMATH_VECTOR_H_
include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s
+2 -2
View File
@@ -52,7 +52,7 @@ lbl_80281F70:
/* 80281F80 0027EEC0 48 00 00 70 */ b lbl_80281FF0
lbl_80281F84:
/* 80281F84 0027EEC4 38 9F FF FF */ addi r4, r31, -1
/* 80281F88 0027EEC8 48 0E 30 F1 */ bl func_80365078
/* 80281F88 0027EEC8 48 0E 30 F1 */ bl div
/* 80281F8C 0027EECC 90 81 00 14 */ stw r4, 0x14(r1)
/* 80281F90 0027EED0 90 61 00 10 */ stw r3, 0x10(r1)
/* 80281F94 0027EED4 7C 83 23 79 */ or. r3, r4, r4
@@ -70,7 +70,7 @@ lbl_80281FBC:
/* 80281FBC 0027EEFC 38 1F FF FE */ addi r0, r31, -2
/* 80281FC0 0027EF00 54 1D 08 3C */ slwi r29, r0, 1
/* 80281FC4 0027EF04 7F A4 EB 78 */ mr r4, r29
/* 80281FC8 0027EF08 48 0E 30 B1 */ bl func_80365078
/* 80281FC8 0027EF08 48 0E 30 B1 */ bl div
/* 80281FCC 0027EF0C 90 81 00 0C */ stw r4, 0xc(r1)
/* 80281FD0 0027EF10 90 61 00 08 */ stw r3, 8(r1)
/* 80281FD4 0027EF14 7C 83 23 79 */ or. r3, r4, r4
include/JSystem/JStudio/asm/parseHeader_next__Q37JStudio3stb6TParseFPPCvPUlUl.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 802896F8 00286638 80 61 00 08 */ lwz r3, 8(r1)
/* 802896FC 0028663C 38 82 BA D8 */ addi r4, r2, 0x804554D8 - 0x80459A00 /*SDA HACK; original: lbl_804554D8-_SDA2_BASE_*/
/* 80289700 00286640 38 A0 00 04 */ li r5, 4
/* 80289704 00286644 48 0D C9 89 */ bl func_8036608C
/* 80289704 00286644 48 0D C9 89 */ bl memcmp
/* 80289708 00286648 2C 03 00 00 */ cmpwi r3, 0
/* 8028970C 0028664C 41 82 00 0C */ beq lbl_80289718
/* 80289710 00286650 38 60 00 00 */ li r3, 0
include/JSystem/JStudio/asm/prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl.s
+3 -3
View File
@@ -28,7 +28,7 @@ lbl_80284030:
/* 80284030 00280F70 90 61 00 10 */ stw r3, 0x10(r1)
/* 80284034 00280F74 38 61 00 10 */ addi r3, r1, 0x10
/* 80284038 00280F78 38 81 00 20 */ addi r4, r1, 0x20
/* 8028403C 00280F7C 48 00 10 71 */ bl JStudio_NS_fvb_NS_data_NS_TParse_TParagraph_NS_getData
/* 8028403C 00280F7C 48 00 10 71 */ bl getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData
/* 80284040 00280F80 80 81 00 28 */ lwz r4, 0x28(r1)
/* 80284044 00280F84 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80284048 00280F88 28 00 00 16 */ cmplwi r0, 0x16
@@ -65,7 +65,7 @@ lbl_8028409C:
/* 802840C0 00281000 7F E3 FB 78 */ mr r3, r31
/* 802840C4 00281004 80 9F 00 08 */ lwz r4, 8(r31)
/* 802840C8 00281008 38 A1 00 0C */ addi r5, r1, 0xc
/* 802840CC 0028100C 48 05 8C D9 */ bl JGadget_NS_TVector_pointer_void_NS_insert
/* 802840CC 0028100C 48 05 8C D9 */ bl insert__Q27JGadget20TVector_pointer_voidFPPvRCPv
lbl_802840D0:
/* 802840D0 00281010 38 17 00 03 */ addi r0, r23, 3
/* 802840D4 00281014 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d
@@ -92,7 +92,7 @@ lbl_80284104:
/* 80284120 00281060 7F E3 FB 78 */ mr r3, r31
/* 80284124 00281064 80 9F 00 08 */ lwz r4, 8(r31)
/* 80284128 00281068 38 A1 00 08 */ addi r5, r1, 8
/* 8028412C 0028106C 48 05 8C 79 */ bl JGadget_NS_TVector_pointer_void_NS_insert
/* 8028412C 0028106C 48 05 8C 79 */ bl insert__Q27JGadget20TVector_pointer_voidFPPvRCPv
lbl_80284130:
/* 80284130 00281070 3B 18 FF FF */ addi r24, r24, -1
lbl_80284134:
include/JSystem/JStudio/asm/process_sequence___Q37JStudio3stb7TObjectFv.s
+2 -2
View File
@@ -8,7 +8,7 @@
/* 80288E48 00285D88 90 01 00 0C */ stw r0, 0xc(r1)
/* 80288E4C 00285D8C 38 61 00 0C */ addi r3, r1, 0xc
/* 80288E50 00285D90 38 81 00 20 */ addi r4, r1, 0x20
/* 80288E54 00285D94 48 00 0B 69 */ bl JStudio_NS_stb_NS_data_NS_TParse_TSequence_NS_getData
/* 80288E54 00285D94 48 00 0B 69 */ bl getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData
/* 80288E58 00285D98 88 01 00 20 */ lbz r0, 0x20(r1)
/* 80288E5C 00285D9C 80 A1 00 24 */ lwz r5, 0x24(r1)
/* 80288E60 00285DA0 80 61 00 28 */ lwz r3, 0x28(r1)
@@ -67,7 +67,7 @@ lbl_80288F10:
/* 80288F10 00285E50 90 61 00 08 */ stw r3, 8(r1)
/* 80288F14 00285E54 38 61 00 08 */ addi r3, r1, 8
/* 80288F18 00285E58 38 81 00 10 */ addi r4, r1, 0x10
/* 80288F1C 00285E5C 48 00 0A ED */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData
/* 80288F1C 00285E5C 48 00 0A ED */ bl getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData
/* 80288F20 00285E60 80 81 00 10 */ lwz r4, 0x10(r1)
/* 80288F24 00285E64 28 04 00 FF */ cmplwi r4, 0xff
/* 80288F28 00285E68 41 81 00 18 */ bgt lbl_80288F40
include/JSystem/JStudio/asm/removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject.s
+1 -1
View File
@@ -7,7 +7,7 @@
/* 80289290 002861D0 38 A4 00 0C */ addi r5, r4, 0xc
/* 80289294 002861D4 38 61 00 08 */ addi r3, r1, 8
/* 80289298 002861D8 38 86 00 10 */ addi r4, r6, 0x10
/* 8028929C 002861DC 48 05 39 39 */ bl JGadget_NS_TNodeLinkList_NS_Erase
/* 8028929C 002861DC 48 05 39 39 */ bl Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode
/* 802892A0 002861E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802892A4 002861E4 7C 08 03 A6 */ mtlr r0
/* 802892A8 002861E8 38 21 00 10 */ addi r1, r1, 0x10
include/JSystem/JStudio/asm/std_NS_find_if_X2_.s
+1 -1
View File
@@ -26,7 +26,7 @@ lbl_8028995C:
/* 80289984 002868C4 80 7D 00 00 */ lwz r3, 0(r29)
/* 80289988 002868C8 38 63 FF F4 */ addi r3, r3, -12
/* 8028998C 002868CC 7F E4 FB 78 */ mr r4, r31
/* 80289990 002868D0 4B FF EF F9 */ bl JStudio_NS_object_NS_TIDData_NS_isEqual
/* 80289990 002868D0 4B FF EF F9 */ bl isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData
/* 80289994 002868D4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80289998 002868D8 41 82 FF B8 */ beq lbl_80289950
lbl_8028999C:
include/JSystem/JStudio/functionvalue.h
+1 -1
View File
@@ -11,7 +11,7 @@ extern "C" {
extern void toFunction_outside__Q27JStudio14TFunctionValueFi();
extern void JGadget_NS_TVector_pointer_void();
extern void __ct__Q27JStudio14TFunctionValueFv();
extern void func_80365078();
extern void div();
extern void interpolateValue_hermite__Q27JStudio13functionvalueFddddddd();
extern void interpolateValue_BSpline_uniform__Q27JStudio13functionvalueFddddd();
extern void JGadget_NS_findUpperBound_binary_current();
include/JSystem/JSupport/JSUInputStream.h
+16 -16
View File
@@ -1,16 +1,16 @@
#ifndef JSUINPUTSTREAM_H_
#define JSUINPUTSTREAM_H_
#include "JSystem/JSupport/JSUIosBase.h"
#include "dolphin/types.h"
class JSUInputStream : public JSUIosBase {
public:
JSUInputStream();
virtual ~JSUInputStream();
/* vt[3] */ virtual s32 getAvailable() const = 0;
/* vt[4] */ virtual s32 skip(s32);
};
#endif
#ifndef JSUINPUTSTREAM_H_
#define JSUINPUTSTREAM_H_
#include "JSystem/JSupport/JSUIosBase.h"
#include "dolphin/types.h"
class JSUInputStream : public JSUIosBase {
public:
JSUInputStream();
virtual ~JSUInputStream();
/* vt[3] */ virtual s32 getAvailable() const = 0;
/* vt[4] */ virtual s32 skip(s32);
};
#endif
include/JSystem/JSupport/JSUIosBase.h
+24 -24
View File
@@ -1,24 +1,24 @@
#ifndef JSUIOSBASE_H_
#define JSUIOSBASE_H_
#include "dolphin/types.h"
enum EIoState {
IOS_STATE_1 = 1,
};
class JSUIosBase {
public:
JSUIosBase() { mState = false; }
virtual ~JSUIosBase();
bool isGood() const { return mState == 0; }
void clrState(EIoState state) { mState &= ~state; }
void setState(EIoState state) { mState |= state; }
private:
u8 mState;
};
#endif
#ifndef JSUIOSBASE_H_
#define JSUIOSBASE_H_
#include "dolphin/types.h"
enum EIoState {
IOS_STATE_1 = 1,
};
class JSUIosBase {
public:
JSUIosBase() { mState = false; }
virtual ~JSUIosBase();
bool isGood() const { return mState == 0; }
void clrState(EIoState state) { mState &= ~state; }
void setState(EIoState state) { mState |= state; }
private:
u8 mState;
};
#endif
include/JSystem/JSupport/JSUMemoryInputStream.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define JSUMEMORYINPUTSTREAM_H_
extern "C" {
void JSUMemoryInputStream_NS_setBuffer(void);
void setBuffer__20JSUMemoryInputStreamFPCvl(void);
}
#endif // JSUMEMORYINPUTSTREAM_H_
include/JSystem/JUtility/JUTGamePad/JUTGamePad.h
+11 -7
View File
@@ -7,9 +7,6 @@
#include "os/OS.h"
#include "pad/pad.h"
typedef u32 EStickMode;
typedef u32 EWhichStick;
namespace CButton {
enum {
DPAD_LEFT = 0x0001,
@@ -29,6 +26,8 @@ enum {
struct JUTGamePad : public JKRDisposer {
public:
enum EStickMode {};
enum EWhichStick {};
// typedef u32 EPadPort;
enum EPadPort { Port_1 = 0, Port_2 = 0, Port_3 = 0, Port_4 = 0 };
JUTGamePad(JUTGamePad::EPadPort port);
@@ -77,7 +76,8 @@ public:
CStick();
void clear();
void clear(JUTGamePad* pad);
u32 update(s8 unk0, s8 unk1, EStickMode mode, EWhichStick stick, u32 unk2);
u32 update(s8 unk0, s8 unk1, JUTGamePad::EStickMode mode, JUTGamePad::EWhichStick stick,
u32 unk2);
u32 getButton(u32 unk);
float mPosX;
@@ -89,7 +89,11 @@ public:
};
struct CRumble {
typedef s32 ERumble; // should probably be an enum
enum ERumble {
VAL_0 = 0,
VAL_1 = 1,
VAL_2 = 2,
};
void clear();
void clear(JUTGamePad* pad);
@@ -129,7 +133,7 @@ public:
};
struct JUTGamePadLongPress {
void checkCallback(s32 unk0, u32 unk2);
void checkCallback(int unk0, u32 unk2);
u8 unk0[17];
bool field_0x11; // bool?
@@ -145,7 +149,7 @@ struct JUTGamePadLongPress {
extern "C" {
// s32 JUTGamePad_NS_init(void);
bool getNumBit(u8* unk0, u32 unk1);
bool getNumBit__FPUci(u8* unk0, u32 unk1);
}
extern float lbl_80456028; // JUTGamePad::CStick::clear() init to 0.0
include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
+6 -6
View File
@@ -45,7 +45,7 @@ lbl_802E0954:
/* 802E0984 002DD8C4 3A FF 00 48 */ addi r23, r31, 0x48
/* 802E0988 002DD8C8 7E F7 E2 14 */ add r23, r23, r28
/* 802E098C 002DD8CC 81 17 00 00 */ lwz r8, 0(r23)
/* 802E0990 002DD8D0 48 00 08 A9 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0990 002DD8D0 48 00 08 A9 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0994 002DD8D4 54 76 C0 0E */ slwi r22, r3, 0x18
/* 802E0998 002DD8D8 38 7F 01 48 */ addi r3, r31, 0x148
/* 802E099C 002DD8DC 7C 63 DA 14 */ add r3, r3, r27
@@ -54,7 +54,7 @@ lbl_802E0954:
/* 802E09A8 002DD8E8 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E09AC 002DD8EC 38 E0 00 01 */ li r7, 1
/* 802E09B0 002DD8F0 81 17 00 00 */ lwz r8, 0(r23)
/* 802E09B4 002DD8F4 48 00 08 85 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E09B4 002DD8F4 48 00 08 85 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E09B8 002DD8F8 54 60 80 1E */ slwi r0, r3, 0x10
/* 802E09BC 002DD8FC 7E D6 03 78 */ or r22, r22, r0
/* 802E09C0 002DD900 7E E3 BB 78 */ mr r3, r23
@@ -73,7 +73,7 @@ lbl_802E09D4:
/* 802E09F0 002DD930 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E09F4 002DD934 38 E0 00 00 */ li r7, 0
/* 802E09F8 002DD938 39 00 00 00 */ li r8, 0
/* 802E09FC 002DD93C 48 00 08 3D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E09FC 002DD93C 48 00 08 3D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0A00 002DD940 38 7F 01 48 */ addi r3, r31, 0x148
/* 802E0A04 002DD944 7C 63 DA 14 */ add r3, r3, r27
/* 802E0A08 002DD948 38 80 00 00 */ li r4, 0
@@ -81,7 +81,7 @@ lbl_802E09D4:
/* 802E0A10 002DD950 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E0A14 002DD954 38 E0 00 01 */ li r7, 1
/* 802E0A18 002DD958 39 00 00 00 */ li r8, 0
/* 802E0A1C 002DD95C 48 00 08 1D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0A1C 002DD95C 48 00 08 1D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0A20 002DD960 38 7F 00 48 */ addi r3, r31, 0x48
/* 802E0A24 002DD964 7C 63 E2 14 */ add r3, r3, r28
/* 802E0A28 002DD968 38 80 00 00 */ li r4, 0
@@ -128,7 +128,7 @@ lbl_802E0A80:
/* 802E0AC0 002DDA00 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E0AC4 002DDA04 38 E0 00 00 */ li r7, 0
/* 802E0AC8 002DDA08 81 08 00 18 */ lwz r8, 0x18(r8)
/* 802E0ACC 002DDA0C 48 00 07 6D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0ACC 002DDA0C 48 00 07 6D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0AD0 002DDA10 54 76 C0 0E */ slwi r22, r3, 0x18
/* 802E0AD4 002DDA14 81 19 00 00 */ lwz r8, 0(r25)
/* 802E0AD8 002DDA18 38 68 00 58 */ addi r3, r8, 0x58
@@ -137,7 +137,7 @@ lbl_802E0A80:
/* 802E0AE4 002DDA24 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E0AE8 002DDA28 38 E0 00 01 */ li r7, 1
/* 802E0AEC 002DDA2C 81 08 00 18 */ lwz r8, 0x18(r8)
/* 802E0AF0 002DDA30 48 00 07 49 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0AF0 002DDA30 48 00 07 49 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0AF4 002DDA34 54 60 80 1E */ slwi r0, r3, 0x10
/* 802E0AF8 002DDA38 7E D6 03 78 */ or r22, r22, r0
/* 802E0AFC 002DDA3C 80 79 00 00 */ lwz r3, 0(r25)
include/JSystem/JUtility/JUTGamePad/asm/func_802E0CD8.s
+1 -1
View File
@@ -151,7 +151,7 @@ lbl_802E0EB8:
/* 802E0F18 002DDE58 7C A5 20 10 */ subfc r5, r5, r4
/* 802E0F1C 002DDE5C 80 7F 00 00 */ lwz r3, 0(r31)
/* 802E0F20 002DDE60 A8 9E 00 7C */ lha r4, 0x7c(r30)
/* 802E0F24 002DDE64 48 00 0B D9 */ bl checkCallback__19JUTGamePadLongPressFlUl
/* 802E0F24 002DDE64 48 00 0B D9 */ bl checkCallback__19JUTGamePadLongPressFiUl
/* 802E0F28 002DDE68 48 00 00 3C */ b lbl_802E0F64
lbl_802E0F2C:
/* 802E0F2C 002DDE6C 38 00 00 01 */ li r0, 1
include/JSystem/JUtility/JUTGamePad/asm/func_802E1720.s
+2 -2
View File
@@ -52,7 +52,7 @@ lbl_802E17DC:
/* 802E17E0 002DE720 7C 05 23 96 */ divwu r0, r5, r4
/* 802E17E4 002DE724 7C 00 21 D6 */ mullw r0, r0, r4
/* 802E17E8 002DE728 7C 80 28 50 */ subf r4, r0, r5
/* 802E17EC 002DE72C 4B FF FF 0D */ bl getNumBit
/* 802E17EC 002DE72C 4B FF FF 0D */ bl getNumBit__FPUci
/* 802E17F0 002DE730 7F A0 07 34 */ extsh r0, r29
/* 802E17F4 002DE734 38 8D 8F 64 */ addi r4, r13, 0x804514E4-0x80458580/*lbl_804514E4-_SDA_BASE_*/
/* 802E17F8 002DE738 7C 84 00 AE */ lbzx r4, r4, r0
@@ -78,7 +78,7 @@ lbl_802E1824:
/* 802E1844 002DE784 7C 05 23 96 */ divwu r0, r5, r4
/* 802E1848 002DE788 7C 00 21 D6 */ mullw r0, r0, r4
/* 802E184C 002DE78C 7C 80 28 50 */ subf r4, r0, r5
/* 802E1850 002DE790 4B FF FE A9 */ bl getNumBit
/* 802E1850 002DE790 4B FF FE A9 */ bl getNumBit__FPUci
/* 802E1854 002DE794 7C 64 1B 78 */ mr r4, r3
lbl_802E1858:
/* 802E1858 002DE798 28 1D 00 00 */ cmplwi r29, 0
include/JSystem/JUtility/JUTXfb/JUTXfb.h
+7 -2
View File
@@ -7,12 +7,17 @@
class JUTXfb {
public:
typedef s32 EXfbNumber;
enum EXfbNumber { // TODO: placeholder
UNK_0 = 0,
UNK_1 = 1,
UNK_2 = 2,
UNK_3 = 3,
};
JUTXfb(GXRenderModeObj* obj, JKRHeap* heap, EXfbNumber xfb_number);
~JUTXfb();
void clearIndex();
void common_init(s32 xfb_number);
void common_init(int xfb_number);
void delXfb(s32 index);
static JUTXfb* createManager(JKRHeap* heap, EXfbNumber xfb_number);
static void destroyManager();
include/JSystem/JUtility/JUTXfb/asm/func_802E5260.s
+3 -3
View File
@@ -8,7 +8,7 @@
/* 802E527C 002E21BC 7C BC 2B 78 */ mr r28, r5
/* 802E5280 002E21C0 7C DD 33 78 */ mr r29, r6
/* 802E5284 002E21C4 7F A4 EB 78 */ mr r4, r29
/* 802E5288 002E21C8 4B FF FF A1 */ bl common_init__6JUTXfbFl
/* 802E5288 002E21C8 4B FF FF A1 */ bl common_init__6JUTXfbFi
/* 802E528C 002E21CC 28 1E 00 00 */ cmplwi r30, 0
/* 802E5290 002E21D0 41 82 00 20 */ beq lbl_802E52B0
/* 802E5294 002E21D4 7F 63 DB 78 */ mr r3, r27
@@ -16,7 +16,7 @@
/* 802E529C 002E21DC A0 BE 00 08 */ lhz r5, 8(r30)
/* 802E52A0 002E21E0 7F 86 E3 78 */ mr r6, r28
/* 802E52A4 002E21E4 7F A7 EB 78 */ mr r7, r29
/* 802E52A8 002E21E8 48 00 01 AD */ bl initiate__6JUTXfbFUsUsP7JKRHeapl
/* 802E52A8 002E21E8 48 00 01 AD */ bl initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber
/* 802E52AC 002E21EC 48 00 00 40 */ b lbl_802E52EC
lbl_802E52B0:
/* 802E52B0 002E21F0 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13)
@@ -33,7 +33,7 @@ lbl_802E52B0:
/* 802E52DC 002E221C 7F E4 FB 78 */ mr r4, r31
/* 802E52E0 002E2220 7F 86 E3 78 */ mr r6, r28
/* 802E52E4 002E2224 7F A7 EB 78 */ mr r7, r29
/* 802E52E8 002E2228 48 00 01 6D */ bl initiate__6JUTXfbFUsUsP7JKRHeapl
/* 802E52E8 002E2228 48 00 01 6D */ bl initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber
lbl_802E52EC:
/* 802E52EC 002E222C 7F 63 DB 78 */ mr r3, r27
/* 802E52F0 002E2230 39 61 00 20 */ addi r11, r1, 0x20