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

Fix some JSUConvertOffsetToPtr issues (#2063)

Browse Source 
* Fix some JSUConvertOffsetToPtr issues

* Match some J3DAnmLoader functions
This commit is contained in:
hatal175
2024-02-05 07:21:05 +02:00
committed by GitHub
parent f260221f43
commit e98d9c845c
33 changed files with 161 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/JSystem/J2DGraph/J2DMaterialFactory/__ct__11J2DTevStageFRC15J2DTevStageInfo.s
-25
View File
@@ -1,25 +0,0 @@
lbl_802F4110:
/* 802F4110 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802F4114 7C 08 02 A6 */ mflr r0
/* 802F4118 90 01 00 14 */ stw r0, 0x14(r1)
/* 802F411C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802F4120 7C 7F 1B 78 */ mr r31, r3
/* 802F4124 4B FF D8 85 */ bl setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo
/* 802F4128 88 1F 00 07 */ lbz r0, 7(r31)
/* 802F412C 54 04 07 B6 */ rlwinm r4, r0, 0, 0x1e, 0x1b
/* 802F4130 38 62 C7 98 */ la r3, j2dDefaultTevSwapMode(r2) /* 80456198-_SDA2_BASE_ */
/* 802F4134 88 03 00 01 */ lbz r0, 1(r3)
/* 802F4138 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d
/* 802F413C 7C 80 03 78 */ or r0, r4, r0
/* 802F4140 98 1F 00 07 */ stb r0, 7(r31)
/* 802F4144 88 1F 00 07 */ lbz r0, 7(r31)
/* 802F4148 54 03 00 3A */ rlwinm r3, r0, 0, 0, 0x1d
/* 802F414C 88 02 C7 98 */ lbz r0, j2dDefaultTevSwapMode(r2)
/* 802F4150 7C 60 03 78 */ or r0, r3, r0
/* 802F4154 98 1F 00 07 */ stb r0, 7(r31)
/* 802F4158 7F E3 FB 78 */ mr r3, r31
/* 802F415C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802F4160 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802F4164 7C 08 03 A6 */ mtlr r0
/* 802F4168 38 21 00 10 */ addi r1, r1, 0x10
/* 802F416C 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/__ct__18J2DMaterialFactoryFRC16J2DMaterialBlock.s
-116
View File
@@ -1,116 +0,0 @@
lbl_802F2AD0:
/* 802F2AD0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802F2AD4 7C 08 02 A6 */ mflr r0
/* 802F2AD8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802F2ADC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802F2AE0 93 C1 00 08 */ stw r30, 8(r1)
/* 802F2AE4 7C 7E 1B 78 */ mr r30, r3
/* 802F2AE8 7C 9F 23 78 */ mr r31, r4
/* 802F2AEC A0 04 00 08 */ lhz r0, 8(r4)
/* 802F2AF0 B0 03 00 00 */ sth r0, 0(r3)
/* 802F2AF4 7F E3 FB 78 */ mr r3, r31
/* 802F2AF8 80 84 00 0C */ lwz r4, 0xc(r4)
/* 802F2AFC 48 00 17 DD */ bl func_802F42D8
/* 802F2B00 90 7E 00 04 */ stw r3, 4(r30)
/* 802F2B04 7F E3 FB 78 */ mr r3, r31
/* 802F2B08 80 9F 00 10 */ lwz r4, 0x10(r31)
/* 802F2B0C 48 00 17 B5 */ bl func_802F42C0
/* 802F2B10 90 7E 00 08 */ stw r3, 8(r30)
/* 802F2B14 80 9F 00 18 */ lwz r4, 0x18(r31)
/* 802F2B18 28 04 00 00 */ cmplwi r4, 0
/* 802F2B1C 41 82 00 24 */ beq lbl_802F2B40
/* 802F2B20 80 1F 00 14 */ lwz r0, 0x14(r31)
/* 802F2B24 7C 00 20 50 */ subf r0, r0, r4
/* 802F2B28 28 00 00 04 */ cmplwi r0, 4
/* 802F2B2C 40 81 00 14 */ ble lbl_802F2B40
/* 802F2B30 7F E3 FB 78 */ mr r3, r31
/* 802F2B34 48 00 17 75 */ bl func_802F42A8
/* 802F2B38 90 7E 00 0C */ stw r3, 0xc(r30)
/* 802F2B3C 48 00 00 0C */ b lbl_802F2B48
lbl_802F2B40:
/* 802F2B40 38 00 00 00 */ li r0, 0
/* 802F2B44 90 1E 00 0C */ stw r0, 0xc(r30)
lbl_802F2B48:
/* 802F2B48 7F E3 FB 78 */ mr r3, r31
/* 802F2B4C 80 9F 00 1C */ lwz r4, 0x1c(r31)
/* 802F2B50 48 00 17 41 */ bl func_802F4290
/* 802F2B54 90 7E 00 30 */ stw r3, 0x30(r30)
/* 802F2B58 7F E3 FB 78 */ mr r3, r31
/* 802F2B5C 80 9F 00 20 */ lwz r4, 0x20(r31)
/* 802F2B60 48 00 17 19 */ bl func_802F4278
/* 802F2B64 90 7E 00 10 */ stw r3, 0x10(r30)
/* 802F2B68 7F E3 FB 78 */ mr r3, r31
/* 802F2B6C 80 9F 00 24 */ lwz r4, 0x24(r31)
/* 802F2B70 48 00 16 F1 */ bl func_802F4260
/* 802F2B74 90 7E 00 14 */ stw r3, 0x14(r30)
/* 802F2B78 7F E3 FB 78 */ mr r3, r31
/* 802F2B7C 80 9F 00 28 */ lwz r4, 0x28(r31)
/* 802F2B80 48 00 16 C9 */ bl func_802F4248
/* 802F2B84 90 7E 00 18 */ stw r3, 0x18(r30)
/* 802F2B88 7F E3 FB 78 */ mr r3, r31
/* 802F2B8C 80 9F 00 2C */ lwz r4, 0x2c(r31)
/* 802F2B90 48 00 16 D1 */ bl func_802F4260
/* 802F2B94 90 7E 00 1C */ stw r3, 0x1c(r30)
/* 802F2B98 7F E3 FB 78 */ mr r3, r31
/* 802F2B9C 80 9F 00 30 */ lwz r4, 0x30(r31)
/* 802F2BA0 48 00 16 91 */ bl func_802F4230
/* 802F2BA4 90 7E 00 20 */ stw r3, 0x20(r30)
/* 802F2BA8 7F E3 FB 78 */ mr r3, r31
/* 802F2BAC 80 9F 00 34 */ lwz r4, 0x34(r31)
/* 802F2BB0 48 00 16 69 */ bl func_802F4218
/* 802F2BB4 90 7E 00 24 */ stw r3, 0x24(r30)
/* 802F2BB8 7F E3 FB 78 */ mr r3, r31
/* 802F2BBC 80 9F 00 38 */ lwz r4, 0x38(r31)
/* 802F2BC0 48 00 17 01 */ bl func_802F42C0
/* 802F2BC4 90 7E 00 28 */ stw r3, 0x28(r30)
/* 802F2BC8 7F E3 FB 78 */ mr r3, r31
/* 802F2BCC 80 9F 00 3C */ lwz r4, 0x3c(r31)
/* 802F2BD0 48 00 16 F1 */ bl func_802F42C0
/* 802F2BD4 90 7E 00 2C */ stw r3, 0x2c(r30)
/* 802F2BD8 7F E3 FB 78 */ mr r3, r31
/* 802F2BDC 80 9F 00 40 */ lwz r4, 0x40(r31)
/* 802F2BE0 48 00 16 21 */ bl func_802F4200
/* 802F2BE4 90 7E 00 34 */ stw r3, 0x34(r30)
/* 802F2BE8 7F E3 FB 78 */ mr r3, r31
/* 802F2BEC 80 9F 00 44 */ lwz r4, 0x44(r31)
/* 802F2BF0 48 00 15 F9 */ bl func_802F41E8
/* 802F2BF4 90 7E 00 38 */ stw r3, 0x38(r30)
/* 802F2BF8 7F E3 FB 78 */ mr r3, r31
/* 802F2BFC 80 9F 00 48 */ lwz r4, 0x48(r31)
/* 802F2C00 48 00 16 79 */ bl func_802F4278
/* 802F2C04 90 7E 00 3C */ stw r3, 0x3c(r30)
/* 802F2C08 7F E3 FB 78 */ mr r3, r31
/* 802F2C0C 80 9F 00 4C */ lwz r4, 0x4c(r31)
/* 802F2C10 48 00 16 51 */ bl func_802F4260
/* 802F2C14 90 7E 00 40 */ stw r3, 0x40(r30)
/* 802F2C18 7F E3 FB 78 */ mr r3, r31
/* 802F2C1C 80 9F 00 50 */ lwz r4, 0x50(r31)
/* 802F2C20 48 00 15 B1 */ bl func_802F41D0
/* 802F2C24 90 7E 00 44 */ stw r3, 0x44(r30)
/* 802F2C28 7F E3 FB 78 */ mr r3, r31
/* 802F2C2C 80 9F 00 54 */ lwz r4, 0x54(r31)
/* 802F2C30 48 00 15 89 */ bl func_802F41B8
/* 802F2C34 90 7E 00 48 */ stw r3, 0x48(r30)
/* 802F2C38 7F E3 FB 78 */ mr r3, r31
/* 802F2C3C 80 9F 00 58 */ lwz r4, 0x58(r31)
/* 802F2C40 48 00 15 61 */ bl func_802F41A0
/* 802F2C44 90 7E 00 4C */ stw r3, 0x4c(r30)
/* 802F2C48 7F E3 FB 78 */ mr r3, r31
/* 802F2C4C 80 9F 00 5C */ lwz r4, 0x5c(r31)
/* 802F2C50 48 00 15 39 */ bl func_802F4188
/* 802F2C54 90 7E 00 50 */ stw r3, 0x50(r30)
/* 802F2C58 7F E3 FB 78 */ mr r3, r31
/* 802F2C5C 80 9F 00 60 */ lwz r4, 0x60(r31)
/* 802F2C60 48 00 15 11 */ bl func_802F4170
/* 802F2C64 90 7E 00 54 */ stw r3, 0x54(r30)
/* 802F2C68 7F E3 FB 78 */ mr r3, r31
/* 802F2C6C 80 9F 00 64 */ lwz r4, 0x64(r31)
/* 802F2C70 48 00 15 F1 */ bl func_802F4260
/* 802F2C74 90 7E 00 58 */ stw r3, 0x58(r30)
/* 802F2C78 7F C3 F3 78 */ mr r3, r30
/* 802F2C7C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802F2C80 83 C1 00 08 */ lwz r30, 8(r1)
/* 802F2C84 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802F2C88 7C 08 03 A6 */ mtlr r0
/* 802F2C8C 38 21 00 10 */ addi r1, r1, 0x10
/* 802F2C90 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4170.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4170:
/* 802F4170 28 04 00 00 */ cmplwi r4, 0
/* 802F4174 40 82 00 0C */ bne lbl_802F4180
/* 802F4178 38 60 00 00 */ li r3, 0
/* 802F417C 4E 80 00 20 */ blr
lbl_802F4180:
/* 802F4180 7C 63 22 14 */ add r3, r3, r4
/* 802F4184 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4188.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4188:
/* 802F4188 28 04 00 00 */ cmplwi r4, 0
/* 802F418C 40 82 00 0C */ bne lbl_802F4198
/* 802F4190 38 60 00 00 */ li r3, 0
/* 802F4194 4E 80 00 20 */ blr
lbl_802F4198:
/* 802F4198 7C 63 22 14 */ add r3, r3, r4
/* 802F419C 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41A0.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F41A0:
/* 802F41A0 28 04 00 00 */ cmplwi r4, 0
/* 802F41A4 40 82 00 0C */ bne lbl_802F41B0
/* 802F41A8 38 60 00 00 */ li r3, 0
/* 802F41AC 4E 80 00 20 */ blr
lbl_802F41B0:
/* 802F41B0 7C 63 22 14 */ add r3, r3, r4
/* 802F41B4 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41B8.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F41B8:
/* 802F41B8 28 04 00 00 */ cmplwi r4, 0
/* 802F41BC 40 82 00 0C */ bne lbl_802F41C8
/* 802F41C0 38 60 00 00 */ li r3, 0
/* 802F41C4 4E 80 00 20 */ blr
lbl_802F41C8:
/* 802F41C8 7C 63 22 14 */ add r3, r3, r4
/* 802F41CC 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41D0.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F41D0:
/* 802F41D0 28 04 00 00 */ cmplwi r4, 0
/* 802F41D4 40 82 00 0C */ bne lbl_802F41E0
/* 802F41D8 38 60 00 00 */ li r3, 0
/* 802F41DC 4E 80 00 20 */ blr
lbl_802F41E0:
/* 802F41E0 7C 63 22 14 */ add r3, r3, r4
/* 802F41E4 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F41E8.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F41E8:
/* 802F41E8 28 04 00 00 */ cmplwi r4, 0
/* 802F41EC 40 82 00 0C */ bne lbl_802F41F8
/* 802F41F0 38 60 00 00 */ li r3, 0
/* 802F41F4 4E 80 00 20 */ blr
lbl_802F41F8:
/* 802F41F8 7C 63 22 14 */ add r3, r3, r4
/* 802F41FC 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4200.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4200:
/* 802F4200 28 04 00 00 */ cmplwi r4, 0
/* 802F4204 40 82 00 0C */ bne lbl_802F4210
/* 802F4208 38 60 00 00 */ li r3, 0
/* 802F420C 4E 80 00 20 */ blr
lbl_802F4210:
/* 802F4210 7C 63 22 14 */ add r3, r3, r4
/* 802F4214 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4218.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4218:
/* 802F4218 28 04 00 00 */ cmplwi r4, 0
/* 802F421C 40 82 00 0C */ bne lbl_802F4228
/* 802F4220 38 60 00 00 */ li r3, 0
/* 802F4224 4E 80 00 20 */ blr
lbl_802F4228:
/* 802F4228 7C 63 22 14 */ add r3, r3, r4
/* 802F422C 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4230.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4230:
/* 802F4230 28 04 00 00 */ cmplwi r4, 0
/* 802F4234 40 82 00 0C */ bne lbl_802F4240
/* 802F4238 38 60 00 00 */ li r3, 0
/* 802F423C 4E 80 00 20 */ blr
lbl_802F4240:
/* 802F4240 7C 63 22 14 */ add r3, r3, r4
/* 802F4244 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4248.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4248:
/* 802F4248 28 04 00 00 */ cmplwi r4, 0
/* 802F424C 40 82 00 0C */ bne lbl_802F4258
/* 802F4250 38 60 00 00 */ li r3, 0
/* 802F4254 4E 80 00 20 */ blr
lbl_802F4258:
/* 802F4258 7C 63 22 14 */ add r3, r3, r4
/* 802F425C 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4260.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4260:
/* 802F4260 28 04 00 00 */ cmplwi r4, 0
/* 802F4264 40 82 00 0C */ bne lbl_802F4270
/* 802F4268 38 60 00 00 */ li r3, 0
/* 802F426C 4E 80 00 20 */ blr
lbl_802F4270:
/* 802F4270 7C 63 22 14 */ add r3, r3, r4
/* 802F4274 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4278.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4278:
/* 802F4278 28 04 00 00 */ cmplwi r4, 0
/* 802F427C 40 82 00 0C */ bne lbl_802F4288
/* 802F4280 38 60 00 00 */ li r3, 0
/* 802F4284 4E 80 00 20 */ blr
lbl_802F4288:
/* 802F4288 7C 63 22 14 */ add r3, r3, r4
/* 802F428C 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F4290.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F4290:
/* 802F4290 28 04 00 00 */ cmplwi r4, 0
/* 802F4294 40 82 00 0C */ bne lbl_802F42A0
/* 802F4298 38 60 00 00 */ li r3, 0
/* 802F429C 4E 80 00 20 */ blr
lbl_802F42A0:
/* 802F42A0 7C 63 22 14 */ add r3, r3, r4
/* 802F42A4 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42A8.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F42A8:
/* 802F42A8 28 04 00 00 */ cmplwi r4, 0
/* 802F42AC 40 82 00 0C */ bne lbl_802F42B8
/* 802F42B0 38 60 00 00 */ li r3, 0
/* 802F42B4 4E 80 00 20 */ blr
lbl_802F42B8:
/* 802F42B8 7C 63 22 14 */ add r3, r3, r4
/* 802F42BC 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42C0.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F42C0:
/* 802F42C0 28 04 00 00 */ cmplwi r4, 0
/* 802F42C4 40 82 00 0C */ bne lbl_802F42D0
/* 802F42C8 38 60 00 00 */ li r3, 0
/* 802F42CC 4E 80 00 20 */ blr
lbl_802F42D0:
/* 802F42D0 7C 63 22 14 */ add r3, r3, r4
/* 802F42D4 4E 80 00 20 */ blr
asm/JSystem/J2DGraph/J2DMaterialFactory/func_802F42D8.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802F42D8:
/* 802F42D8 28 04 00 00 */ cmplwi r4, 0
/* 802F42DC 40 82 00 0C */ bne lbl_802F42E8
/* 802F42E0 38 60 00 00 */ li r3, 0
/* 802F42E4 4E 80 00 20 */ blr
lbl_802F42E8:
/* 802F42E8 7C 63 22 14 */ add r3, r3, r4
/* 802F42EC 4E 80 00 20 */ blr
asm/JSystem/J3DGraphLoader/J3DClusterLoader/__ct__20J3DClusterLoader_v15Fv.s
-8
View File
@@ -1,8 +0,0 @@
lbl_803341CC:
/* 803341CC 3C 80 80 3D */ lis r4, __vt__16J3DClusterLoader@ha /* 0x803CF0F8@ha */
/* 803341D0 38 04 F0 F8 */ addi r0, r4, __vt__16J3DClusterLoader@l /* 0x803CF0F8@l */
/* 803341D4 90 03 00 00 */ stw r0, 0(r3)
/* 803341D8 3C 80 80 3D */ lis r4, __vt__20J3DClusterLoader_v15@ha /* 0x803CF0E8@ha */
/* 803341DC 38 04 F0 E8 */ addi r0, r4, __vt__20J3DClusterLoader_v15@l /* 0x803CF0E8@l */
/* 803341E0 90 03 00 00 */ stw r0, 0(r3)
/* 803341E4 4E 80 00 20 */ blr
asm/JSystem/J3DGraphLoader/J3DClusterLoader/__dt__20J3DClusterLoader_v15Fv.s
-26
View File
@@ -1,26 +0,0 @@
lbl_803341E8:
/* 803341E8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 803341EC 7C 08 02 A6 */ mflr r0
/* 803341F0 90 01 00 14 */ stw r0, 0x14(r1)
/* 803341F4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 803341F8 7C 7F 1B 79 */ or. r31, r3, r3
/* 803341FC 41 82 00 30 */ beq lbl_8033422C
/* 80334200 3C 60 80 3D */ lis r3, __vt__20J3DClusterLoader_v15@ha /* 0x803CF0E8@ha */
/* 80334204 38 03 F0 E8 */ addi r0, r3, __vt__20J3DClusterLoader_v15@l /* 0x803CF0E8@l */
/* 80334208 90 1F 00 00 */ stw r0, 0(r31)
/* 8033420C 41 82 00 10 */ beq lbl_8033421C
/* 80334210 3C 60 80 3D */ lis r3, __vt__16J3DClusterLoader@ha /* 0x803CF0F8@ha */
/* 80334214 38 03 F0 F8 */ addi r0, r3, __vt__16J3DClusterLoader@l /* 0x803CF0F8@l */
/* 80334218 90 1F 00 00 */ stw r0, 0(r31)
lbl_8033421C:
/* 8033421C 7C 80 07 35 */ extsh. r0, r4
/* 80334220 40 81 00 0C */ ble lbl_8033422C
/* 80334224 7F E3 FB 78 */ mr r3, r31
/* 80334228 4B F9 AB 15 */ bl __dl__FPv
lbl_8033422C:
/* 8033422C 7F E3 FB 78 */ mr r3, r31
/* 80334230 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80334234 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80334238 7C 08 03 A6 */ mtlr r0
/* 8033423C 38 21 00 10 */ addi r1, r1, 0x10
/* 80334240 4E 80 00 20 */ blr

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