From c19d9b02be5d894f91cd45884eed67152dffffa4 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Tue, 6 Feb 2024 07:04:35 +0200 Subject: J3D work (#2064) --- .../newMatColor__22J3DMaterialFactory_v21CFii.s | 26 -------------- .../newTevKColor__22J3DMaterialFactory_v21CFii.s | 26 -------------- ...evSwapModeTable__22J3DMaterialFactory_v21CFii.s | 41 ---------------------- 3 files changed, 93 deletions(-) delete mode 100644 asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newMatColor__22J3DMaterialFactory_v21CFii.s delete mode 100644 asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevKColor__22J3DMaterialFactory_v21CFii.s delete mode 100644 asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevSwapModeTable__22J3DMaterialFactory_v21CFii.s (limited to 'asm/JSystem/J3DGraphLoader') diff --git a/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newMatColor__22J3DMaterialFactory_v21CFii.s b/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newMatColor__22J3DMaterialFactory_v21CFii.s deleted file mode 100644 index 4f842a7c12..0000000000 --- a/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newMatColor__22J3DMaterialFactory_v21CFii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_803337D8: -/* 803337D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803337DC 81 22 CA B8 */ lwz r9, lit_1130(r2) -/* 803337E0 91 21 00 08 */ stw r9, 8(r1) -/* 803337E4 91 21 00 0C */ stw r9, 0xc(r1) -/* 803337E8 81 04 00 04 */ lwz r8, 4(r4) -/* 803337EC 80 E4 00 08 */ lwz r7, 8(r4) -/* 803337F0 54 A0 08 3C */ slwi r0, r5, 1 -/* 803337F4 7C 07 02 2E */ lhzx r0, r7, r0 -/* 803337F8 1C 00 01 38 */ mulli r0, r0, 0x138 -/* 803337FC 7C A8 02 14 */ add r5, r8, r0 -/* 80333800 54 C0 08 3C */ slwi r0, r6, 1 -/* 80333804 7C A5 02 14 */ add r5, r5, r0 -/* 80333808 A0 05 00 08 */ lhz r0, 8(r5) -/* 8033380C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80333810 41 82 00 18 */ beq lbl_80333828 -/* 80333814 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80333818 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 8033381C 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80333820 90 03 00 00 */ stw r0, 0(r3) -/* 80333824 48 00 00 08 */ b lbl_8033382C -lbl_80333828: -/* 80333828 91 23 00 00 */ stw r9, 0(r3) -lbl_8033382C: -/* 8033382C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333830 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevKColor__22J3DMaterialFactory_v21CFii.s b/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevKColor__22J3DMaterialFactory_v21CFii.s deleted file mode 100644 index b94b95178d..0000000000 --- a/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevKColor__22J3DMaterialFactory_v21CFii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80333C74: -/* 80333C74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80333C78 81 22 CA BC */ lwz r9, lit_1317(r2) -/* 80333C7C 91 21 00 08 */ stw r9, 8(r1) -/* 80333C80 91 21 00 0C */ stw r9, 0xc(r1) -/* 80333C84 81 04 00 04 */ lwz r8, 4(r4) -/* 80333C88 80 E4 00 08 */ lwz r7, 8(r4) -/* 80333C8C 54 A0 08 3C */ slwi r0, r5, 1 -/* 80333C90 7C 07 02 2E */ lhzx r0, r7, r0 -/* 80333C94 1C 00 01 38 */ mulli r0, r0, 0x138 -/* 80333C98 7C A8 02 14 */ add r5, r8, r0 -/* 80333C9C 54 C0 08 3C */ slwi r0, r6, 1 -/* 80333CA0 7C A5 02 14 */ add r5, r5, r0 -/* 80333CA4 A0 05 00 80 */ lhz r0, 0x80(r5) -/* 80333CA8 28 00 FF FF */ cmplwi r0, 0xffff -/* 80333CAC 41 82 00 18 */ beq lbl_80333CC4 -/* 80333CB0 80 84 00 3C */ lwz r4, 0x3c(r4) -/* 80333CB4 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 80333CB8 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80333CBC 90 03 00 00 */ stw r0, 0(r3) -/* 80333CC0 48 00 00 08 */ b lbl_80333CC8 -lbl_80333CC4: -/* 80333CC4 91 23 00 00 */ stw r9, 0(r3) -lbl_80333CC8: -/* 80333CC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333CCC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevSwapModeTable__22J3DMaterialFactory_v21CFii.s b/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevSwapModeTable__22J3DMaterialFactory_v21CFii.s deleted file mode 100644 index 6f5f72c2e1..0000000000 --- a/asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/newTevSwapModeTable__22J3DMaterialFactory_v21CFii.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80333D68: -/* 80333D68 81 04 00 04 */ lwz r8, 4(r4) -/* 80333D6C 80 E4 00 08 */ lwz r7, 8(r4) -/* 80333D70 54 A0 08 3C */ slwi r0, r5, 1 -/* 80333D74 7C 07 02 2E */ lhzx r0, r7, r0 -/* 80333D78 1C 00 01 38 */ mulli r0, r0, 0x138 -/* 80333D7C 7C A8 02 14 */ add r5, r8, r0 -/* 80333D80 54 C0 08 3C */ slwi r0, r6, 1 -/* 80333D84 7C A5 02 14 */ add r5, r5, r0 -/* 80333D88 A0 05 01 10 */ lhz r0, 0x110(r5) -/* 80333D8C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80333D90 41 82 00 40 */ beq lbl_80333DD0 -/* 80333D94 80 84 00 4C */ lwz r4, 0x4c(r4) -/* 80333D98 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 80333D9C 7C E4 02 14 */ add r7, r4, r0 -/* 80333DA0 88 87 00 00 */ lbz r4, 0(r7) -/* 80333DA4 88 C7 00 03 */ lbz r6, 3(r7) -/* 80333DA8 88 07 00 02 */ lbz r0, 2(r7) -/* 80333DAC 54 05 15 BA */ rlwinm r5, r0, 2, 0x16, 0x1d -/* 80333DB0 54 84 30 32 */ slwi r4, r4, 6 -/* 80333DB4 88 07 00 01 */ lbz r0, 1(r7) -/* 80333DB8 54 00 25 36 */ rlwinm r0, r0, 4, 0x14, 0x1b -/* 80333DBC 7C 00 2A 14 */ add r0, r0, r5 -/* 80333DC0 7C 00 32 14 */ add r0, r0, r6 -/* 80333DC4 7C 04 02 14 */ add r0, r4, r0 -/* 80333DC8 98 03 00 00 */ stb r0, 0(r3) -/* 80333DCC 4E 80 00 20 */ blr -lbl_80333DD0: -/* 80333DD0 38 82 C9 E8 */ la r4, j3dDefaultTevSwapModeTable(r2) /* 804563E8-_SDA2_BASE_ */ -/* 80333DD4 88 E4 00 01 */ lbz r7, 1(r4) -/* 80333DD8 88 C4 00 03 */ lbz r6, 3(r4) -/* 80333DDC 88 04 00 02 */ lbz r0, 2(r4) -/* 80333DE0 54 05 15 BA */ rlwinm r5, r0, 2, 0x16, 0x1d -/* 80333DE4 88 02 C9 E8 */ lbz r0, j3dDefaultTevSwapModeTable(r2) -/* 80333DE8 54 04 34 B2 */ rlwinm r4, r0, 6, 0x12, 0x19 -/* 80333DEC 54 E0 20 36 */ slwi r0, r7, 4 -/* 80333DF0 7C 00 2A 14 */ add r0, r0, r5 -/* 80333DF4 7C 00 32 14 */ add r0, r0, r6 -/* 80333DF8 7C 04 02 14 */ add r0, r4, r0 -/* 80333DFC 98 03 00 00 */ stb r0, 0(r3) -/* 80333E00 4E 80 00 20 */ blr -- cgit v1.2.3