diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-01-24 04:00:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 14:00:46 +0200 |
| commit | ba44ade90c3f04f5c163278fcadc4361c263acbb (patch) | |
| tree | 3b7948dc4dcf260ff61230da15ddea595635cbc8 /asm/JSystem/J3DGraphBase/J3DMatBlock | |
| parent | b2310b84b65e62d9f1a82a5b9e52766b325b765f (diff) | |
more various JSystem work (#2046)
* most of J3DAnmLoader done
* J3D / JKernel / JUTConsole work
* remove asm
* fix build
* dol 50%
Diffstat (limited to 'asm/JSystem/J3DGraphBase/J3DMatBlock')
19 files changed, 0 insertions, 813 deletions
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffAmbColor__20J3DColorBlockLightOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffAmbColor__20J3DColorBlockLightOnFv.s deleted file mode 100644 index 0aed6f252a..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffAmbColor__20J3DColorBlockLightOnFv.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_8031A1DC: -/* 8031A1DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031A1E0 7C 08 02 A6 */ mflr r0 -/* 8031A1E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031A1E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031A1EC 7C 7F 1B 78 */ mr r31, r3 -/* 8031A1F0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A1F4 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A1F8 80 0D 83 E4 */ lwz r0, SizeOfLoadAmbColors(r13) -/* 8031A1FC 7C 63 02 14 */ add r3, r3, r0 -/* 8031A200 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031A204 7C 03 00 40 */ cmplw r3, r0 -/* 8031A208 40 81 00 08 */ ble lbl_8031A210 -/* 8031A20C 48 04 6E C9 */ bl GDOverflowed -lbl_8031A210: -/* 8031A210 38 C0 00 10 */ li r6, 0x10 -/* 8031A214 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A218 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A21C 38 03 00 01 */ addi r0, r3, 1 -/* 8031A220 90 04 00 08 */ stw r0, 8(r4) -/* 8031A224 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A228 38 A0 00 00 */ li r5, 0 -/* 8031A22C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A230 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A234 38 03 00 01 */ addi r0, r3, 1 -/* 8031A238 90 04 00 08 */ stw r0, 8(r4) -/* 8031A23C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A240 38 A0 00 01 */ li r5, 1 -/* 8031A244 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A248 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A24C 38 03 00 01 */ addi r0, r3, 1 -/* 8031A250 90 04 00 08 */ stw r0, 8(r4) -/* 8031A254 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A258 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A25C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A260 38 03 00 01 */ addi r0, r3, 1 -/* 8031A264 90 04 00 08 */ stw r0, 8(r4) -/* 8031A268 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A26C 38 A0 00 0A */ li r5, 0xa -/* 8031A270 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A274 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A278 38 03 00 01 */ addi r0, r3, 1 -/* 8031A27C 90 04 00 08 */ stw r0, 8(r4) -/* 8031A280 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A284 80 DF 00 0C */ lwz r6, 0xc(r31) -/* 8031A288 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031A28C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A290 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A294 38 03 00 01 */ addi r0, r3, 1 -/* 8031A298 90 04 00 08 */ stw r0, 8(r4) -/* 8031A29C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A2A0 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031A2A4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A2A8 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A2AC 38 03 00 01 */ addi r0, r3, 1 -/* 8031A2B0 90 04 00 08 */ stw r0, 8(r4) -/* 8031A2B4 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A2B8 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031A2BC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A2C0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A2C4 38 03 00 01 */ addi r0, r3, 1 -/* 8031A2C8 90 04 00 08 */ stw r0, 8(r4) -/* 8031A2CC 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A2D0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A2D4 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A2D8 38 03 00 01 */ addi r0, r3, 1 -/* 8031A2DC 90 04 00 08 */ stw r0, 8(r4) -/* 8031A2E0 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A2E4 80 DF 00 10 */ lwz r6, 0x10(r31) -/* 8031A2E8 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031A2EC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A2F0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A2F4 38 03 00 01 */ addi r0, r3, 1 -/* 8031A2F8 90 04 00 08 */ stw r0, 8(r4) -/* 8031A2FC 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A300 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031A304 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A308 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A30C 38 03 00 01 */ addi r0, r3, 1 -/* 8031A310 90 04 00 08 */ stw r0, 8(r4) -/* 8031A314 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A318 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031A31C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A320 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A324 38 03 00 01 */ addi r0, r3, 1 -/* 8031A328 90 04 00 08 */ stw r0, 8(r4) -/* 8031A32C 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A330 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A334 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A338 38 03 00 01 */ addi r0, r3, 1 -/* 8031A33C 90 04 00 08 */ stw r0, 8(r4) -/* 8031A340 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A344 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031A348 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031A34C 7C 08 03 A6 */ mtlr r0 -/* 8031A350 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031A354 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffMatColor__20J3DColorBlockLightOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffMatColor__20J3DColorBlockLightOnFv.s deleted file mode 100644 index 45001ff9d1..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffMatColor__20J3DColorBlockLightOnFv.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_8031A358: -/* 8031A358 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031A35C 7C 08 02 A6 */ mflr r0 -/* 8031A360 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031A364 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031A368 7C 7F 1B 78 */ mr r31, r3 -/* 8031A36C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A370 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A374 80 0D 83 E0 */ lwz r0, SizeOfLoadMatColors(r13) -/* 8031A378 7C 63 02 14 */ add r3, r3, r0 -/* 8031A37C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8031A380 7C 03 00 40 */ cmplw r3, r0 -/* 8031A384 40 81 00 08 */ ble lbl_8031A38C -/* 8031A388 48 04 6D 4D */ bl GDOverflowed -lbl_8031A38C: -/* 8031A38C 38 C0 00 10 */ li r6, 0x10 -/* 8031A390 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A394 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A398 38 03 00 01 */ addi r0, r3, 1 -/* 8031A39C 90 04 00 08 */ stw r0, 8(r4) -/* 8031A3A0 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A3A4 38 A0 00 00 */ li r5, 0 -/* 8031A3A8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A3AC 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A3B0 38 03 00 01 */ addi r0, r3, 1 -/* 8031A3B4 90 04 00 08 */ stw r0, 8(r4) -/* 8031A3B8 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A3BC 38 A0 00 01 */ li r5, 1 -/* 8031A3C0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A3C4 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A3C8 38 03 00 01 */ addi r0, r3, 1 -/* 8031A3CC 90 04 00 08 */ stw r0, 8(r4) -/* 8031A3D0 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A3D4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A3D8 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A3DC 38 03 00 01 */ addi r0, r3, 1 -/* 8031A3E0 90 04 00 08 */ stw r0, 8(r4) -/* 8031A3E4 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A3E8 38 A0 00 0C */ li r5, 0xc -/* 8031A3EC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A3F0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A3F4 38 03 00 01 */ addi r0, r3, 1 -/* 8031A3F8 90 04 00 08 */ stw r0, 8(r4) -/* 8031A3FC 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A400 80 DF 00 04 */ lwz r6, 4(r31) -/* 8031A404 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031A408 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A40C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A410 38 03 00 01 */ addi r0, r3, 1 -/* 8031A414 90 04 00 08 */ stw r0, 8(r4) -/* 8031A418 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A41C 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031A420 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A424 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A428 38 03 00 01 */ addi r0, r3, 1 -/* 8031A42C 90 04 00 08 */ stw r0, 8(r4) -/* 8031A430 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A434 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031A438 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A43C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A440 38 03 00 01 */ addi r0, r3, 1 -/* 8031A444 90 04 00 08 */ stw r0, 8(r4) -/* 8031A448 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A44C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A450 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A454 38 03 00 01 */ addi r0, r3, 1 -/* 8031A458 90 04 00 08 */ stw r0, 8(r4) -/* 8031A45C 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A460 80 DF 00 08 */ lwz r6, 8(r31) -/* 8031A464 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031A468 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A46C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A470 38 03 00 01 */ addi r0, r3, 1 -/* 8031A474 90 04 00 08 */ stw r0, 8(r4) -/* 8031A478 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A47C 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 8031A480 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A484 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A488 38 03 00 01 */ addi r0, r3, 1 -/* 8031A48C 90 04 00 08 */ stw r0, 8(r4) -/* 8031A490 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A494 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031A498 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A49C 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A4A0 38 03 00 01 */ addi r0, r3, 1 -/* 8031A4A4 90 04 00 08 */ stw r0, 8(r4) -/* 8031A4A8 98 A3 00 00 */ stb r5, 0(r3) -/* 8031A4AC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A4B0 80 64 00 08 */ lwz r3, 8(r4) -/* 8031A4B4 38 03 00 01 */ addi r0, r3, 1 -/* 8031A4B8 90 04 00 08 */ stw r0, 8(r4) -/* 8031A4BC 98 C3 00 00 */ stb r6, 0(r3) -/* 8031A4C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031A4C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031A4C8 7C 08 03 A6 */ mtlr r0 -/* 8031A4CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031A4D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffMatColor__21J3DColorBlockLightOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diffMatColor__21J3DColorBlockLightOffFv.s deleted file mode 100644 index 23a5a7c926..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diffMatColor__21J3DColorBlockLightOffFv.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_80319BB4: -/* 80319BB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80319BB8 7C 08 02 A6 */ mflr r0 -/* 80319BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80319BC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80319BC4 7C 7F 1B 78 */ mr r31, r3 -/* 80319BC8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319BCC 80 64 00 08 */ lwz r3, 8(r4) -/* 80319BD0 80 0D 83 E0 */ lwz r0, SizeOfLoadMatColors(r13) -/* 80319BD4 7C 63 02 14 */ add r3, r3, r0 -/* 80319BD8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80319BDC 7C 03 00 40 */ cmplw r3, r0 -/* 80319BE0 40 81 00 08 */ ble lbl_80319BE8 -/* 80319BE4 48 04 74 F1 */ bl GDOverflowed -lbl_80319BE8: -/* 80319BE8 38 C0 00 10 */ li r6, 0x10 -/* 80319BEC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319BF0 80 64 00 08 */ lwz r3, 8(r4) -/* 80319BF4 38 03 00 01 */ addi r0, r3, 1 -/* 80319BF8 90 04 00 08 */ stw r0, 8(r4) -/* 80319BFC 98 C3 00 00 */ stb r6, 0(r3) -/* 80319C00 38 A0 00 00 */ li r5, 0 -/* 80319C04 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319C08 80 64 00 08 */ lwz r3, 8(r4) -/* 80319C0C 38 03 00 01 */ addi r0, r3, 1 -/* 80319C10 90 04 00 08 */ stw r0, 8(r4) -/* 80319C14 98 A3 00 00 */ stb r5, 0(r3) -/* 80319C18 38 A0 00 01 */ li r5, 1 -/* 80319C1C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319C20 80 64 00 08 */ lwz r3, 8(r4) -/* 80319C24 38 03 00 01 */ addi r0, r3, 1 -/* 80319C28 90 04 00 08 */ stw r0, 8(r4) -/* 80319C2C 98 A3 00 00 */ stb r5, 0(r3) -/* 80319C30 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319C34 80 64 00 08 */ lwz r3, 8(r4) -/* 80319C38 38 03 00 01 */ addi r0, r3, 1 -/* 80319C3C 90 04 00 08 */ stw r0, 8(r4) -/* 80319C40 98 C3 00 00 */ stb r6, 0(r3) -/* 80319C44 38 A0 00 0C */ li r5, 0xc -/* 80319C48 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319C4C 80 64 00 08 */ lwz r3, 8(r4) -/* 80319C50 38 03 00 01 */ addi r0, r3, 1 -/* 80319C54 90 04 00 08 */ stw r0, 8(r4) -/* 80319C58 98 A3 00 00 */ stb r5, 0(r3) -/* 80319C5C 80 DF 00 04 */ lwz r6, 4(r31) -/* 80319C60 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 80319C64 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319C68 80 64 00 08 */ lwz r3, 8(r4) -/* 80319C6C 38 03 00 01 */ addi r0, r3, 1 -/* 80319C70 90 04 00 08 */ stw r0, 8(r4) -/* 80319C74 98 A3 00 00 */ stb r5, 0(r3) -/* 80319C78 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 80319C7C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319C80 80 64 00 08 */ lwz r3, 8(r4) -/* 80319C84 38 03 00 01 */ addi r0, r3, 1 -/* 80319C88 90 04 00 08 */ stw r0, 8(r4) -/* 80319C8C 98 A3 00 00 */ stb r5, 0(r3) -/* 80319C90 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 80319C94 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319C98 80 64 00 08 */ lwz r3, 8(r4) -/* 80319C9C 38 03 00 01 */ addi r0, r3, 1 -/* 80319CA0 90 04 00 08 */ stw r0, 8(r4) -/* 80319CA4 98 A3 00 00 */ stb r5, 0(r3) -/* 80319CA8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319CAC 80 64 00 08 */ lwz r3, 8(r4) -/* 80319CB0 38 03 00 01 */ addi r0, r3, 1 -/* 80319CB4 90 04 00 08 */ stw r0, 8(r4) -/* 80319CB8 98 C3 00 00 */ stb r6, 0(r3) -/* 80319CBC 80 DF 00 08 */ lwz r6, 8(r31) -/* 80319CC0 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 80319CC4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319CC8 80 64 00 08 */ lwz r3, 8(r4) -/* 80319CCC 38 03 00 01 */ addi r0, r3, 1 -/* 80319CD0 90 04 00 08 */ stw r0, 8(r4) -/* 80319CD4 98 A3 00 00 */ stb r5, 0(r3) -/* 80319CD8 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 80319CDC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319CE0 80 64 00 08 */ lwz r3, 8(r4) -/* 80319CE4 38 03 00 01 */ addi r0, r3, 1 -/* 80319CE8 90 04 00 08 */ stw r0, 8(r4) -/* 80319CEC 98 A3 00 00 */ stb r5, 0(r3) -/* 80319CF0 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 80319CF4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319CF8 80 64 00 08 */ lwz r3, 8(r4) -/* 80319CFC 38 03 00 01 */ addi r0, r3, 1 -/* 80319D00 90 04 00 08 */ stw r0, 8(r4) -/* 80319D04 98 A3 00 00 */ stb r5, 0(r3) -/* 80319D08 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319D0C 80 64 00 08 */ lwz r3, 8(r4) -/* 80319D10 38 03 00 01 */ addi r0, r3, 1 -/* 80319D14 90 04 00 08 */ stw r0, 8(r4) -/* 80319D18 98 C3 00 00 */ stb r6, 0(r3) -/* 80319D1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80319D20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80319D24 7C 08 03 A6 */ mtlr r0 -/* 80319D28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80319D2C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__20J3DColorBlockLightOnFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__20J3DColorBlockLightOnFUl.s deleted file mode 100644 index 7509ad03db..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__20J3DColorBlockLightOnFUl.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8031A13C: -/* 8031A13C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8031A140 7C 08 02 A6 */ mflr r0 -/* 8031A144 90 01 00 14 */ stw r0, 0x14(r1) -/* 8031A148 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8031A14C 93 C1 00 08 */ stw r30, 8(r1) -/* 8031A150 7C 7E 1B 78 */ mr r30, r3 -/* 8031A154 7C 9F 23 78 */ mr r31, r4 -/* 8031A158 54 80 07 7B */ rlwinm. r0, r4, 0, 0x1d, 0x1d -/* 8031A15C 41 82 00 14 */ beq lbl_8031A170 -/* 8031A160 81 83 00 00 */ lwz r12, 0(r3) -/* 8031A164 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8031A168 7D 89 03 A6 */ mtctr r12 -/* 8031A16C 4E 80 04 21 */ bctrl -lbl_8031A170: -/* 8031A170 57 E0 07 FF */ clrlwi. r0, r31, 0x1f -/* 8031A174 41 82 00 18 */ beq lbl_8031A18C -/* 8031A178 7F C3 F3 78 */ mr r3, r30 -/* 8031A17C 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031A180 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 8031A184 7D 89 03 A6 */ mtctr r12 -/* 8031A188 4E 80 04 21 */ bctrl -lbl_8031A18C: -/* 8031A18C 57 E0 07 BD */ rlwinm. r0, r31, 0, 0x1e, 0x1e -/* 8031A190 41 82 00 18 */ beq lbl_8031A1A8 -/* 8031A194 7F C3 F3 78 */ mr r3, r30 -/* 8031A198 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031A19C 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 8031A1A0 7D 89 03 A6 */ mtctr r12 -/* 8031A1A4 4E 80 04 21 */ bctrl -lbl_8031A1A8: -/* 8031A1A8 57 E4 E7 3F */ rlwinm. r4, r31, 0x1c, 0x1c, 0x1f -/* 8031A1AC 41 82 00 18 */ beq lbl_8031A1C4 -/* 8031A1B0 7F C3 F3 78 */ mr r3, r30 -/* 8031A1B4 81 9E 00 00 */ lwz r12, 0(r30) -/* 8031A1B8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8031A1BC 7D 89 03 A6 */ mtctr r12 -/* 8031A1C0 4E 80 04 21 */ bctrl -lbl_8031A1C4: -/* 8031A1C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8031A1C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8031A1CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8031A1D0 7C 08 03 A6 */ mtlr r0 -/* 8031A1D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031A1D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DColorBlockLightOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DColorBlockLightOffFUl.s deleted file mode 100644 index 63414f3991..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/diff__21J3DColorBlockLightOffFUl.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80319B4C: -/* 80319B4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80319B50 7C 08 02 A6 */ mflr r0 -/* 80319B54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80319B58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80319B5C 93 C1 00 08 */ stw r30, 8(r1) -/* 80319B60 7C 7E 1B 78 */ mr r30, r3 -/* 80319B64 7C 9F 23 78 */ mr r31, r4 -/* 80319B68 54 80 07 FF */ clrlwi. r0, r4, 0x1f -/* 80319B6C 41 82 00 14 */ beq lbl_80319B80 -/* 80319B70 81 83 00 00 */ lwz r12, 0(r3) -/* 80319B74 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80319B78 7D 89 03 A6 */ mtctr r12 -/* 80319B7C 4E 80 04 21 */ bctrl -lbl_80319B80: -/* 80319B80 57 E0 07 BD */ rlwinm. r0, r31, 0, 0x1e, 0x1e -/* 80319B84 41 82 00 18 */ beq lbl_80319B9C -/* 80319B88 7F C3 F3 78 */ mr r3, r30 -/* 80319B8C 81 9E 00 00 */ lwz r12, 0(r30) -/* 80319B90 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80319B94 7D 89 03 A6 */ mtctr r12 -/* 80319B98 4E 80 04 21 */ bctrl -lbl_80319B9C: -/* 80319B9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80319BA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80319BA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80319BA8 7C 08 03 A6 */ mtlr r0 -/* 80319BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80319BB0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock1Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock1Fv.s deleted file mode 100644 index 395dbeeb57..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__12J3DTevBlock1Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_803177E8: -/* 803177E8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 803177EC 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 803177F0 B0 03 00 08 */ sth r0, 8(r3) -/* 803177F4 38 00 00 C0 */ li r0, 0xc0 -/* 803177F8 98 03 00 0E */ stb r0, 0xe(r3) -/* 803177FC 38 00 00 C1 */ li r0, 0xc1 -/* 80317800 98 03 00 12 */ stb r0, 0x12(r3) -/* 80317804 38 00 00 00 */ li r0, 0 -/* 80317808 90 03 00 04 */ stw r0, 4(r3) -/* 8031780C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__14J3DPEBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__14J3DPEBlockFullFv.s deleted file mode 100644 index 0b64b833cb..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__14J3DPEBlockFullFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80317B58: -/* 80317B58 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 80317B5C 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 80317B60 B0 03 00 30 */ sth r0, 0x30(r3) -/* 80317B64 B0 03 00 38 */ sth r0, 0x38(r3) -/* 80317B68 38 00 00 FF */ li r0, 0xff -/* 80317B6C 98 03 00 3A */ stb r0, 0x3a(r3) -/* 80317B70 38 00 00 01 */ li r0, 1 -/* 80317B74 98 03 00 3B */ stb r0, 0x3b(r3) -/* 80317B78 38 00 00 00 */ li r0, 0 -/* 80317B7C 90 03 00 3C */ stw r0, 0x3c(r3) -/* 80317B80 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DIndBlockFullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DIndBlockFullFv.s deleted file mode 100644 index 4b616bde5b..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DIndBlockFullFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80317B28: -/* 80317B28 38 00 00 00 */ li r0, 0 -/* 80317B2C 98 03 00 04 */ stb r0, 4(r3) -/* 80317B30 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DTevBlockNullFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DTevBlockNullFv.s deleted file mode 100644 index 6c99892f8d..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DTevBlockNullFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_803176D4: -/* 803176D4 38 00 00 00 */ li r0, 0 -/* 803176D8 90 03 00 04 */ stw r0, 4(r3) -/* 803176DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DTexGenBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DTexGenBlock4Fv.s deleted file mode 100644 index 4394739e3d..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__15J3DTexGenBlock4Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80317674: -/* 80317674 38 A0 00 00 */ li r5, 0 -/* 80317678 90 A3 00 04 */ stw r5, 4(r3) -/* 8031767C 7C A4 2B 78 */ mr r4, r5 -/* 80317680 38 00 00 04 */ li r0, 4 -/* 80317684 7C 09 03 A6 */ mtctr r0 -lbl_80317688: -/* 80317688 38 04 00 38 */ addi r0, r4, 0x38 -/* 8031768C 7C A3 01 2E */ stwx r5, r3, r0 -/* 80317690 38 84 00 04 */ addi r4, r4, 4 -/* 80317694 42 00 FF F4 */ bdnz lbl_80317688 -/* 80317698 38 00 00 00 */ li r0, 0 -/* 8031769C 90 03 00 58 */ stw r0, 0x58(r3) -/* 803176A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__16J3DPEBlockFogOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__16J3DPEBlockFogOffFv.s deleted file mode 100644 index f4255dd6e5..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__16J3DPEBlockFogOffFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80317B34: -/* 80317B34 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 80317B38 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 80317B3C B0 03 00 04 */ sth r0, 4(r3) -/* 80317B40 B0 03 00 0C */ sth r0, 0xc(r3) -/* 80317B44 38 00 00 FF */ li r0, 0xff -/* 80317B48 98 03 00 0E */ stb r0, 0xe(r3) -/* 80317B4C 38 00 00 01 */ li r0, 1 -/* 80317B50 98 03 00 0F */ stb r0, 0xf(r3) -/* 80317B54 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__19J3DTexGenBlockBasicFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__19J3DTexGenBlockBasicFv.s deleted file mode 100644 index 45a2d0d41c..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__19J3DTexGenBlockBasicFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_803176A4: -/* 803176A4 38 A0 00 00 */ li r5, 0 -/* 803176A8 90 A3 00 04 */ stw r5, 4(r3) -/* 803176AC 7C A4 2B 78 */ mr r4, r5 -/* 803176B0 38 00 00 08 */ li r0, 8 -/* 803176B4 7C 09 03 A6 */ mtctr r0 -lbl_803176B8: -/* 803176B8 38 04 00 38 */ addi r0, r4, 0x38 -/* 803176BC 7C A3 01 2E */ stwx r5, r3, r0 -/* 803176C0 38 84 00 04 */ addi r4, r4, 4 -/* 803176C4 42 00 FF F4 */ bdnz lbl_803176B8 -/* 803176C8 38 00 00 00 */ li r0, 0 -/* 803176CC 90 03 00 58 */ stw r0, 0x58(r3) -/* 803176D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DTexGenBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DTexGenBlockPatchedFv.s deleted file mode 100644 index 66b34ee820..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/initialize__21J3DTexGenBlockPatchedFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80317644: -/* 80317644 38 A0 00 00 */ li r5, 0 -/* 80317648 90 A3 00 04 */ stw r5, 4(r3) -/* 8031764C 7C A4 2B 78 */ mr r4, r5 -/* 80317650 38 00 00 08 */ li r0, 8 -/* 80317654 7C 09 03 A6 */ mtctr r0 -lbl_80317658: -/* 80317658 38 04 00 38 */ addi r0, r4, 0x38 -/* 8031765C 7C A3 01 2E */ stwx r5, r3, r0 -/* 80317660 38 84 00 04 */ addi r4, r4, 4 -/* 80317664 42 00 FF F4 */ bdnz lbl_80317658 -/* 80317668 38 00 00 00 */ li r0, 0 -/* 8031766C 90 03 00 58 */ stw r0, 0x58(r3) -/* 80317670 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DTexGenBlock4Fv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DTexGenBlock4Fv.s deleted file mode 100644 index 368a21ef6b..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__15J3DTexGenBlock4Fv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8031A948: -/* 8031A948 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031A94C 7C 08 02 A6 */ mflr r0 -/* 8031A950 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031A954 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A958 48 04 78 81 */ bl _savegpr_28 -/* 8031A95C 7C 7C 1B 78 */ mr r28, r3 -/* 8031A960 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031A964 80 64 00 00 */ lwz r3, 0(r4) -/* 8031A968 80 04 00 08 */ lwz r0, 8(r4) -/* 8031A96C 7C 03 00 50 */ subf r0, r3, r0 -/* 8031A970 90 1C 00 58 */ stw r0, 0x58(r28) -/* 8031A974 3B A0 00 00 */ li r29, 0 -/* 8031A978 3B E0 00 00 */ li r31, 0 -/* 8031A97C 3B C0 00 00 */ li r30, 0 -lbl_8031A980: -/* 8031A980 38 1E 00 38 */ addi r0, r30, 0x38 -/* 8031A984 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8031A988 28 03 00 00 */ cmplwi r3, 0 -/* 8031A98C 41 82 00 1C */ beq lbl_8031A9A8 -/* 8031A990 38 1F 00 0A */ addi r0, r31, 0xa -/* 8031A994 7C 1C 00 AE */ lbzx r0, r28, r0 -/* 8031A998 28 00 00 3C */ cmplwi r0, 0x3c -/* 8031A99C 41 82 00 0C */ beq lbl_8031A9A8 -/* 8031A9A0 7F A4 EB 78 */ mr r4, r29 -/* 8031A9A4 48 00 8F 21 */ bl load__9J3DTexMtxCFUl -lbl_8031A9A8: -/* 8031A9A8 3B BD 00 01 */ addi r29, r29, 1 -/* 8031A9AC 28 1D 00 04 */ cmplwi r29, 4 -/* 8031A9B0 3B FF 00 06 */ addi r31, r31, 6 -/* 8031A9B4 3B DE 00 04 */ addi r30, r30, 4 -/* 8031A9B8 41 80 FF C8 */ blt lbl_8031A980 -/* 8031A9BC 80 7C 00 04 */ lwz r3, 4(r28) -/* 8031A9C0 28 03 00 00 */ cmplwi r3, 0 -/* 8031A9C4 41 82 00 0C */ beq lbl_8031A9D0 -/* 8031A9C8 38 9C 00 08 */ addi r4, r28, 8 -/* 8031A9CC 48 00 8C 79 */ bl loadTexCoordGens__FUlP11J3DTexCoord -lbl_8031A9D0: -/* 8031A9D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A9D4 48 04 78 51 */ bl _restgpr_28 -/* 8031A9D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031A9DC 7C 08 03 A6 */ mtlr r0 -/* 8031A9E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031A9E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__19J3DTexGenBlockBasicFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/load__19J3DTexGenBlockBasicFv.s deleted file mode 100644 index b9fbaf19e9..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/load__19J3DTexGenBlockBasicFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8031A9E8: -/* 8031A9E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031A9EC 7C 08 02 A6 */ mflr r0 -/* 8031A9F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031A9F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A9F8 48 04 77 E1 */ bl _savegpr_28 -/* 8031A9FC 7C 7C 1B 78 */ mr r28, r3 -/* 8031AA00 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AA04 80 64 00 00 */ lwz r3, 0(r4) -/* 8031AA08 80 04 00 08 */ lwz r0, 8(r4) -/* 8031AA0C 7C 03 00 50 */ subf r0, r3, r0 -/* 8031AA10 90 1C 00 58 */ stw r0, 0x58(r28) -/* 8031AA14 3B A0 00 00 */ li r29, 0 -/* 8031AA18 3B E0 00 00 */ li r31, 0 -/* 8031AA1C 3B C0 00 00 */ li r30, 0 -lbl_8031AA20: -/* 8031AA20 38 1E 00 38 */ addi r0, r30, 0x38 -/* 8031AA24 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8031AA28 28 03 00 00 */ cmplwi r3, 0 -/* 8031AA2C 41 82 00 1C */ beq lbl_8031AA48 -/* 8031AA30 38 1F 00 0A */ addi r0, r31, 0xa -/* 8031AA34 7C 1C 00 AE */ lbzx r0, r28, r0 -/* 8031AA38 28 00 00 3C */ cmplwi r0, 0x3c -/* 8031AA3C 41 82 00 0C */ beq lbl_8031AA48 -/* 8031AA40 7F A4 EB 78 */ mr r4, r29 -/* 8031AA44 48 00 8E 81 */ bl load__9J3DTexMtxCFUl -lbl_8031AA48: -/* 8031AA48 3B BD 00 01 */ addi r29, r29, 1 -/* 8031AA4C 28 1D 00 08 */ cmplwi r29, 8 -/* 8031AA50 3B FF 00 06 */ addi r31, r31, 6 -/* 8031AA54 3B DE 00 04 */ addi r30, r30, 4 -/* 8031AA58 41 80 FF C8 */ blt lbl_8031AA20 -/* 8031AA5C 80 7C 00 04 */ lwz r3, 4(r28) -/* 8031AA60 28 03 00 00 */ cmplwi r3, 0 -/* 8031AA64 41 82 00 0C */ beq lbl_8031AA70 -/* 8031AA68 38 9C 00 08 */ addi r4, r28, 8 -/* 8031AA6C 48 00 8B D9 */ bl loadTexCoordGens__FUlP11J3DTexCoord -lbl_8031AA70: -/* 8031AA70 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AA74 48 04 77 B1 */ bl _restgpr_28 -/* 8031AA78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031AA7C 7C 08 03 A6 */ mtlr r0 -/* 8031AA80 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031AA84 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchMatColor__20J3DColorBlockLightOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchMatColor__20J3DColorBlockLightOnFv.s deleted file mode 100644 index b0cee9239b..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchMatColor__20J3DColorBlockLightOnFv.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_80319534: -/* 80319534 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80319538 7C 08 02 A6 */ mflr r0 -/* 8031953C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80319540 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80319544 93 C1 00 08 */ stw r30, 8(r1) -/* 80319548 7C 7E 1B 78 */ mr r30, r3 -/* 8031954C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319550 80 64 00 00 */ lwz r3, 0(r4) -/* 80319554 80 1E 00 44 */ lwz r0, 0x44(r30) -/* 80319558 7C 03 02 14 */ add r0, r3, r0 -/* 8031955C 90 04 00 08 */ stw r0, 8(r4) -/* 80319560 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319564 83 E4 00 08 */ lwz r31, 8(r4) -/* 80319568 80 0D 83 E0 */ lwz r0, SizeOfLoadMatColors(r13) -/* 8031956C 7C 7F 02 14 */ add r3, r31, r0 -/* 80319570 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80319574 7C 03 00 40 */ cmplw r3, r0 -/* 80319578 40 81 00 08 */ ble lbl_80319580 -/* 8031957C 48 04 7B 59 */ bl GDOverflowed -lbl_80319580: -/* 80319580 38 C0 00 10 */ li r6, 0x10 -/* 80319584 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319588 80 64 00 08 */ lwz r3, 8(r4) -/* 8031958C 38 03 00 01 */ addi r0, r3, 1 -/* 80319590 90 04 00 08 */ stw r0, 8(r4) -/* 80319594 98 C3 00 00 */ stb r6, 0(r3) -/* 80319598 38 A0 00 00 */ li r5, 0 -/* 8031959C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 803195A0 80 64 00 08 */ lwz r3, 8(r4) -/* 803195A4 38 03 00 01 */ addi r0, r3, 1 -/* 803195A8 90 04 00 08 */ stw r0, 8(r4) -/* 803195AC 98 A3 00 00 */ stb r5, 0(r3) -/* 803195B0 38 A0 00 01 */ li r5, 1 -/* 803195B4 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 803195B8 80 64 00 08 */ lwz r3, 8(r4) -/* 803195BC 38 03 00 01 */ addi r0, r3, 1 -/* 803195C0 90 04 00 08 */ stw r0, 8(r4) -/* 803195C4 98 A3 00 00 */ stb r5, 0(r3) -/* 803195C8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 803195CC 80 64 00 08 */ lwz r3, 8(r4) -/* 803195D0 38 03 00 01 */ addi r0, r3, 1 -/* 803195D4 90 04 00 08 */ stw r0, 8(r4) -/* 803195D8 98 C3 00 00 */ stb r6, 0(r3) -/* 803195DC 38 A0 00 0C */ li r5, 0xc -/* 803195E0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 803195E4 80 64 00 08 */ lwz r3, 8(r4) -/* 803195E8 38 03 00 01 */ addi r0, r3, 1 -/* 803195EC 90 04 00 08 */ stw r0, 8(r4) -/* 803195F0 98 A3 00 00 */ stb r5, 0(r3) -/* 803195F4 80 DE 00 04 */ lwz r6, 4(r30) -/* 803195F8 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 803195FC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319600 80 64 00 08 */ lwz r3, 8(r4) -/* 80319604 38 03 00 01 */ addi r0, r3, 1 -/* 80319608 90 04 00 08 */ stw r0, 8(r4) -/* 8031960C 98 A3 00 00 */ stb r5, 0(r3) -/* 80319610 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 80319614 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319618 80 64 00 08 */ lwz r3, 8(r4) -/* 8031961C 38 03 00 01 */ addi r0, r3, 1 -/* 80319620 90 04 00 08 */ stw r0, 8(r4) -/* 80319624 98 A3 00 00 */ stb r5, 0(r3) -/* 80319628 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031962C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319630 80 64 00 08 */ lwz r3, 8(r4) -/* 80319634 38 03 00 01 */ addi r0, r3, 1 -/* 80319638 90 04 00 08 */ stw r0, 8(r4) -/* 8031963C 98 A3 00 00 */ stb r5, 0(r3) -/* 80319640 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319644 80 64 00 08 */ lwz r3, 8(r4) -/* 80319648 38 03 00 01 */ addi r0, r3, 1 -/* 8031964C 90 04 00 08 */ stw r0, 8(r4) -/* 80319650 98 C3 00 00 */ stb r6, 0(r3) -/* 80319654 80 DE 00 08 */ lwz r6, 8(r30) -/* 80319658 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 8031965C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319660 80 64 00 08 */ lwz r3, 8(r4) -/* 80319664 38 03 00 01 */ addi r0, r3, 1 -/* 80319668 90 04 00 08 */ stw r0, 8(r4) -/* 8031966C 98 A3 00 00 */ stb r5, 0(r3) -/* 80319670 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 80319674 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319678 80 64 00 08 */ lwz r3, 8(r4) -/* 8031967C 38 03 00 01 */ addi r0, r3, 1 -/* 80319680 90 04 00 08 */ stw r0, 8(r4) -/* 80319684 98 A3 00 00 */ stb r5, 0(r3) -/* 80319688 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 8031968C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319690 80 64 00 08 */ lwz r3, 8(r4) -/* 80319694 38 03 00 01 */ addi r0, r3, 1 -/* 80319698 90 04 00 08 */ stw r0, 8(r4) -/* 8031969C 98 A3 00 00 */ stb r5, 0(r3) -/* 803196A0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 803196A4 80 64 00 08 */ lwz r3, 8(r4) -/* 803196A8 38 03 00 01 */ addi r0, r3, 1 -/* 803196AC 90 04 00 08 */ stw r0, 8(r4) -/* 803196B0 98 C3 00 00 */ stb r6, 0(r3) -/* 803196B4 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 803196B8 80 03 00 08 */ lwz r0, 8(r3) -/* 803196BC 7F E3 FB 78 */ mr r3, r31 -/* 803196C0 7C 9F 00 50 */ subf r4, r31, r0 -/* 803196C4 48 02 1F 19 */ bl DCStoreRange -/* 803196C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803196CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 803196D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803196D4 7C 08 03 A6 */ mtlr r0 -/* 803196D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803196DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchMatColor__21J3DColorBlockLightOffFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patchMatColor__21J3DColorBlockLightOffFv.s deleted file mode 100644 index d2002262ea..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patchMatColor__21J3DColorBlockLightOffFv.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_80318F00: -/* 80318F00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80318F04 7C 08 02 A6 */ mflr r0 -/* 80318F08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80318F0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80318F10 93 C1 00 08 */ stw r30, 8(r1) -/* 80318F14 7C 7E 1B 78 */ mr r30, r3 -/* 80318F18 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318F1C 80 64 00 00 */ lwz r3, 0(r4) -/* 80318F20 80 1E 00 18 */ lwz r0, 0x18(r30) -/* 80318F24 7C 03 02 14 */ add r0, r3, r0 -/* 80318F28 90 04 00 08 */ stw r0, 8(r4) -/* 80318F2C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318F30 83 E4 00 08 */ lwz r31, 8(r4) -/* 80318F34 80 0D 83 E0 */ lwz r0, SizeOfLoadMatColors(r13) -/* 80318F38 7C 7F 02 14 */ add r3, r31, r0 -/* 80318F3C 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80318F40 7C 03 00 40 */ cmplw r3, r0 -/* 80318F44 40 81 00 08 */ ble lbl_80318F4C -/* 80318F48 48 04 81 8D */ bl GDOverflowed -lbl_80318F4C: -/* 80318F4C 38 C0 00 10 */ li r6, 0x10 -/* 80318F50 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318F54 80 64 00 08 */ lwz r3, 8(r4) -/* 80318F58 38 03 00 01 */ addi r0, r3, 1 -/* 80318F5C 90 04 00 08 */ stw r0, 8(r4) -/* 80318F60 98 C3 00 00 */ stb r6, 0(r3) -/* 80318F64 38 A0 00 00 */ li r5, 0 -/* 80318F68 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318F6C 80 64 00 08 */ lwz r3, 8(r4) -/* 80318F70 38 03 00 01 */ addi r0, r3, 1 -/* 80318F74 90 04 00 08 */ stw r0, 8(r4) -/* 80318F78 98 A3 00 00 */ stb r5, 0(r3) -/* 80318F7C 38 A0 00 01 */ li r5, 1 -/* 80318F80 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318F84 80 64 00 08 */ lwz r3, 8(r4) -/* 80318F88 38 03 00 01 */ addi r0, r3, 1 -/* 80318F8C 90 04 00 08 */ stw r0, 8(r4) -/* 80318F90 98 A3 00 00 */ stb r5, 0(r3) -/* 80318F94 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318F98 80 64 00 08 */ lwz r3, 8(r4) -/* 80318F9C 38 03 00 01 */ addi r0, r3, 1 -/* 80318FA0 90 04 00 08 */ stw r0, 8(r4) -/* 80318FA4 98 C3 00 00 */ stb r6, 0(r3) -/* 80318FA8 38 A0 00 0C */ li r5, 0xc -/* 80318FAC 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318FB0 80 64 00 08 */ lwz r3, 8(r4) -/* 80318FB4 38 03 00 01 */ addi r0, r3, 1 -/* 80318FB8 90 04 00 08 */ stw r0, 8(r4) -/* 80318FBC 98 A3 00 00 */ stb r5, 0(r3) -/* 80318FC0 80 DE 00 04 */ lwz r6, 4(r30) -/* 80318FC4 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 80318FC8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318FCC 80 64 00 08 */ lwz r3, 8(r4) -/* 80318FD0 38 03 00 01 */ addi r0, r3, 1 -/* 80318FD4 90 04 00 08 */ stw r0, 8(r4) -/* 80318FD8 98 A3 00 00 */ stb r5, 0(r3) -/* 80318FDC 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 80318FE0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318FE4 80 64 00 08 */ lwz r3, 8(r4) -/* 80318FE8 38 03 00 01 */ addi r0, r3, 1 -/* 80318FEC 90 04 00 08 */ stw r0, 8(r4) -/* 80318FF0 98 A3 00 00 */ stb r5, 0(r3) -/* 80318FF4 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 80318FF8 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80318FFC 80 64 00 08 */ lwz r3, 8(r4) -/* 80319000 38 03 00 01 */ addi r0, r3, 1 -/* 80319004 90 04 00 08 */ stw r0, 8(r4) -/* 80319008 98 A3 00 00 */ stb r5, 0(r3) -/* 8031900C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319010 80 64 00 08 */ lwz r3, 8(r4) -/* 80319014 38 03 00 01 */ addi r0, r3, 1 -/* 80319018 90 04 00 08 */ stw r0, 8(r4) -/* 8031901C 98 C3 00 00 */ stb r6, 0(r3) -/* 80319020 80 DE 00 08 */ lwz r6, 8(r30) -/* 80319024 54 C5 46 3E */ srwi r5, r6, 0x18 -/* 80319028 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031902C 80 64 00 08 */ lwz r3, 8(r4) -/* 80319030 38 03 00 01 */ addi r0, r3, 1 -/* 80319034 90 04 00 08 */ stw r0, 8(r4) -/* 80319038 98 A3 00 00 */ stb r5, 0(r3) -/* 8031903C 54 C5 86 3E */ rlwinm r5, r6, 0x10, 0x18, 0x1f -/* 80319040 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319044 80 64 00 08 */ lwz r3, 8(r4) -/* 80319048 38 03 00 01 */ addi r0, r3, 1 -/* 8031904C 90 04 00 08 */ stw r0, 8(r4) -/* 80319050 98 A3 00 00 */ stb r5, 0(r3) -/* 80319054 54 C5 C6 3E */ rlwinm r5, r6, 0x18, 0x18, 0x1f -/* 80319058 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031905C 80 64 00 08 */ lwz r3, 8(r4) -/* 80319060 38 03 00 01 */ addi r0, r3, 1 -/* 80319064 90 04 00 08 */ stw r0, 8(r4) -/* 80319068 98 A3 00 00 */ stb r5, 0(r3) -/* 8031906C 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 80319070 80 64 00 08 */ lwz r3, 8(r4) -/* 80319074 38 03 00 01 */ addi r0, r3, 1 -/* 80319078 90 04 00 08 */ stw r0, 8(r4) -/* 8031907C 98 C3 00 00 */ stb r6, 0(r3) -/* 80319080 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 80319084 80 03 00 08 */ lwz r0, 8(r3) -/* 80319088 7F E3 FB 78 */ mr r3, r31 -/* 8031908C 7C 9F 00 50 */ subf r4, r31, r0 -/* 80319090 48 02 25 4D */ bl DCStoreRange -/* 80319094 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80319098 83 C1 00 08 */ lwz r30, 8(r1) -/* 8031909C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803190A0 7C 08 03 A6 */ mtlr r0 -/* 803190A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803190A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__20J3DColorBlockLightOnFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__20J3DColorBlockLightOnFv.s deleted file mode 100644 index 13f1be49c7..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__20J3DColorBlockLightOnFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_803194E8: -/* 803194E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803194EC 7C 08 02 A6 */ mflr r0 -/* 803194F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 803194F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803194F8 7C 7F 1B 78 */ mr r31, r3 -/* 803194FC 81 83 00 00 */ lwz r12, 0(r3) -/* 80319500 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80319504 7D 89 03 A6 */ mtctr r12 -/* 80319508 4E 80 04 21 */ bctrl -/* 8031950C 7F E3 FB 78 */ mr r3, r31 -/* 80319510 81 9F 00 00 */ lwz r12, 0(r31) -/* 80319514 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80319518 7D 89 03 A6 */ mtctr r12 -/* 8031951C 4E 80 04 21 */ bctrl -/* 80319520 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80319524 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80319528 7C 08 03 A6 */ mtlr r0 -/* 8031952C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80319530 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DTexGenBlockPatchedFv.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DTexGenBlockPatchedFv.s deleted file mode 100644 index 9a43e3c8c8..0000000000 --- a/asm/JSystem/J3DGraphBase/J3DMatBlock/patch__21J3DTexGenBlockPatchedFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8031AA88: -/* 8031AA88 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8031AA8C 7C 08 02 A6 */ mflr r0 -/* 8031AA90 90 01 00 24 */ stw r0, 0x24(r1) -/* 8031AA94 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AA98 48 04 77 41 */ bl _savegpr_28 -/* 8031AA9C 7C 7C 1B 78 */ mr r28, r3 -/* 8031AAA0 80 8D 94 00 */ lwz r4, __GDCurrentDL(r13) -/* 8031AAA4 80 64 00 00 */ lwz r3, 0(r4) -/* 8031AAA8 80 1C 00 58 */ lwz r0, 0x58(r28) -/* 8031AAAC 7C 03 02 14 */ add r0, r3, r0 -/* 8031AAB0 90 04 00 08 */ stw r0, 8(r4) -/* 8031AAB4 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031AAB8 83 C3 00 08 */ lwz r30, 8(r3) -/* 8031AABC 3B A0 00 00 */ li r29, 0 -/* 8031AAC0 3B E0 00 00 */ li r31, 0 -lbl_8031AAC4: -/* 8031AAC4 38 1F 00 38 */ addi r0, r31, 0x38 -/* 8031AAC8 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8031AACC 28 03 00 00 */ cmplwi r3, 0 -/* 8031AAD0 41 82 00 0C */ beq lbl_8031AADC -/* 8031AAD4 7F A4 EB 78 */ mr r4, r29 -/* 8031AAD8 48 00 8D ED */ bl load__9J3DTexMtxCFUl -lbl_8031AADC: -/* 8031AADC 3B BD 00 01 */ addi r29, r29, 1 -/* 8031AAE0 28 1D 00 08 */ cmplwi r29, 8 -/* 8031AAE4 3B FF 00 04 */ addi r31, r31, 4 -/* 8031AAE8 41 80 FF DC */ blt lbl_8031AAC4 -/* 8031AAEC 80 6D 94 00 */ lwz r3, __GDCurrentDL(r13) -/* 8031AAF0 80 03 00 08 */ lwz r0, 8(r3) -/* 8031AAF4 7F C3 F3 78 */ mr r3, r30 -/* 8031AAF8 7C 9E 00 50 */ subf r4, r30, r0 -/* 8031AAFC 48 02 0A E1 */ bl DCStoreRange -/* 8031AB00 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AB04 48 04 77 21 */ bl _restgpr_28 -/* 8031AB08 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8031AB0C 7C 08 03 A6 */ mtlr r0 -/* 8031AB10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031AB14 4E 80 00 20 */ blr |