diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/__ct__14J2DGrafContextFffff.s b/asm/JSystem/J2DGraph/J2DGrafContext/__ct__14J2DGrafContextFffff.s deleted file mode 100644 index d54dd16c635..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/__ct__14J2DGrafContextFffff.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_802E8B08: -/* 802E8B08 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802E8B0C 7C 08 02 A6 */ mflr r0 -/* 802E8B10 90 01 00 34 */ stw r0, 0x34(r1) -/* 802E8B14 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 802E8B18 7C 7F 1B 78 */ mr r31, r3 -/* 802E8B1C 3C 80 80 3D */ lis r4, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802E8B20 38 04 C9 B8 */ addi r0, r4, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802E8B24 90 03 00 00 */ stw r0, 0(r3) -/* 802E8B28 D0 23 00 04 */ stfs f1, 4(r3) -/* 802E8B2C D0 43 00 08 */ stfs f2, 8(r3) -/* 802E8B30 EC 01 18 2A */ fadds f0, f1, f3 -/* 802E8B34 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 802E8B38 EC 62 20 2A */ fadds f3, f2, f4 -/* 802E8B3C D0 63 00 10 */ stfs f3, 0x10(r3) -/* 802E8B40 D0 23 00 14 */ stfs f1, 0x14(r3) -/* 802E8B44 D0 43 00 18 */ stfs f2, 0x18(r3) -/* 802E8B48 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 802E8B4C D0 63 00 20 */ stfs f3, 0x20(r3) -/* 802E8B50 38 00 FF FF */ li r0, -1 -/* 802E8B54 90 03 00 24 */ stw r0, 0x24(r3) -/* 802E8B58 90 03 00 28 */ stw r0, 0x28(r3) -/* 802E8B5C 90 03 00 2C */ stw r0, 0x2c(r3) -/* 802E8B60 90 03 00 30 */ stw r0, 0x30(r3) -/* 802E8B64 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802E8B68 90 01 00 08 */ stw r0, 8(r1) -/* 802E8B6C 90 01 00 18 */ stw r0, 0x18(r1) -/* 802E8B70 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E8B74 90 01 00 10 */ stw r0, 0x10(r1) -/* 802E8B78 90 01 00 0C */ stw r0, 0xc(r1) -/* 802E8B7C 38 81 00 0C */ addi r4, r1, 0xc -/* 802E8B80 38 A1 00 10 */ addi r5, r1, 0x10 -/* 802E8B84 38 C1 00 14 */ addi r6, r1, 0x14 -/* 802E8B88 38 E1 00 18 */ addi r7, r1, 0x18 -/* 802E8B8C 48 00 05 8D */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 802E8B90 7F E3 FB 78 */ mr r3, r31 -/* 802E8B94 38 80 00 06 */ li r4, 6 -/* 802E8B98 48 00 06 9D */ bl setLineWidth__14J2DGrafContextFUc -/* 802E8B9C 7F E3 FB 78 */ mr r3, r31 -/* 802E8BA0 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 802E8BA4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802E8BA8 7C 08 03 A6 */ mtlr r0 -/* 802E8BAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E8BB0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/__dt__14J2DGrafContextFv.s b/asm/JSystem/J2DGraph/J2DGrafContext/__dt__14J2DGrafContextFv.s deleted file mode 100644 index a535be76402..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/__dt__14J2DGrafContextFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802E95D4: -/* 802E95D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E95D8 7C 08 02 A6 */ mflr r0 -/* 802E95DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E95E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E95E4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802E95E8 41 82 00 1C */ beq lbl_802E9604 -/* 802E95EC 3C A0 80 3D */ lis r5, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802E95F0 38 05 C9 B8 */ addi r0, r5, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802E95F4 90 1F 00 00 */ stw r0, 0(r31) -/* 802E95F8 7C 80 07 35 */ extsh. r0, r4 -/* 802E95FC 40 81 00 08 */ ble lbl_802E9604 -/* 802E9600 4B FE 57 3D */ bl __dl__FPv -lbl_802E9604: -/* 802E9604 7F E3 FB 78 */ mr r3, r31 -/* 802E9608 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E960C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E9610 7C 08 03 A6 */ mtlr r0 -/* 802E9614 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9618 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E90C0.s b/asm/JSystem/J2DGraph/J2DGrafContext/func_802E90C0.s deleted file mode 100644 index a960e2fe4c3..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E90C0.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802E90C0: -/* 802E90C0 80 A4 00 00 */ lwz r5, 0(r4) -/* 802E90C4 80 04 00 04 */ lwz r0, 4(r4) -/* 802E90C8 90 A3 00 14 */ stw r5, 0x14(r3) -/* 802E90CC 90 03 00 18 */ stw r0, 0x18(r3) -/* 802E90D0 80 A4 00 08 */ lwz r5, 8(r4) -/* 802E90D4 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802E90D8 90 A3 00 1C */ stw r5, 0x1c(r3) -/* 802E90DC 90 03 00 20 */ stw r0, 0x20(r3) -/* 802E90E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E90E4.s b/asm/JSystem/J2DGraph/J2DGrafContext/func_802E90E4.s deleted file mode 100644 index 132f17437ae..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E90E4.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_802E90E4: -/* 802E90E4 80 E4 00 00 */ lwz r7, 0(r4) -/* 802E90E8 80 C4 00 04 */ lwz r6, 4(r4) -/* 802E90EC 90 E3 00 04 */ stw r7, 4(r3) -/* 802E90F0 90 C3 00 08 */ stw r6, 8(r3) -/* 802E90F4 80 A4 00 08 */ lwz r5, 8(r4) -/* 802E90F8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802E90FC 90 A3 00 0C */ stw r5, 0xc(r3) -/* 802E9100 90 03 00 10 */ stw r0, 0x10(r3) -/* 802E9104 90 E3 00 14 */ stw r7, 0x14(r3) -/* 802E9108 90 C3 00 18 */ stw r6, 0x18(r3) -/* 802E910C 90 A3 00 1C */ stw r5, 0x1c(r3) -/* 802E9110 90 03 00 20 */ stw r0, 0x20(r3) -/* 802E9114 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9118.s b/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9118.s deleted file mode 100644 index 919d79a0468..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9118.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_802E9118: -/* 802E9118 88 04 00 00 */ lbz r0, 0(r4) -/* 802E911C 98 03 00 24 */ stb r0, 0x24(r3) -/* 802E9120 88 04 00 01 */ lbz r0, 1(r4) -/* 802E9124 98 03 00 25 */ stb r0, 0x25(r3) -/* 802E9128 88 04 00 02 */ lbz r0, 2(r4) -/* 802E912C 98 03 00 26 */ stb r0, 0x26(r3) -/* 802E9130 88 04 00 03 */ lbz r0, 3(r4) -/* 802E9134 98 03 00 27 */ stb r0, 0x27(r3) -/* 802E9138 88 05 00 00 */ lbz r0, 0(r5) -/* 802E913C 98 03 00 28 */ stb r0, 0x28(r3) -/* 802E9140 88 05 00 01 */ lbz r0, 1(r5) -/* 802E9144 98 03 00 29 */ stb r0, 0x29(r3) -/* 802E9148 88 05 00 02 */ lbz r0, 2(r5) -/* 802E914C 98 03 00 2A */ stb r0, 0x2a(r3) -/* 802E9150 88 05 00 03 */ lbz r0, 3(r5) -/* 802E9154 98 03 00 2B */ stb r0, 0x2b(r3) -/* 802E9158 88 06 00 00 */ lbz r0, 0(r6) -/* 802E915C 98 03 00 2C */ stb r0, 0x2c(r3) -/* 802E9160 88 06 00 01 */ lbz r0, 1(r6) -/* 802E9164 98 03 00 2D */ stb r0, 0x2d(r3) -/* 802E9168 88 06 00 02 */ lbz r0, 2(r6) -/* 802E916C 98 03 00 2E */ stb r0, 0x2e(r3) -/* 802E9170 88 06 00 03 */ lbz r0, 3(r6) -/* 802E9174 98 03 00 2F */ stb r0, 0x2f(r3) -/* 802E9178 88 07 00 00 */ lbz r0, 0(r7) -/* 802E917C 98 03 00 30 */ stb r0, 0x30(r3) -/* 802E9180 88 07 00 01 */ lbz r0, 1(r7) -/* 802E9184 98 03 00 31 */ stb r0, 0x31(r3) -/* 802E9188 88 07 00 02 */ lbz r0, 2(r7) -/* 802E918C 98 03 00 32 */ stb r0, 0x32(r3) -/* 802E9190 88 07 00 03 */ lbz r0, 3(r7) -/* 802E9194 98 03 00 33 */ stb r0, 0x33(r3) -/* 802E9198 38 A0 00 01 */ li r5, 1 -/* 802E919C 98 A3 00 B0 */ stb r5, 0xb0(r3) -/* 802E91A0 38 80 00 04 */ li r4, 4 -/* 802E91A4 98 83 00 B1 */ stb r4, 0xb1(r3) -/* 802E91A8 38 00 00 05 */ li r0, 5 -/* 802E91AC 98 03 00 B2 */ stb r0, 0xb2(r3) -/* 802E91B0 98 A3 00 B3 */ stb r5, 0xb3(r3) -/* 802E91B4 98 83 00 B4 */ stb r4, 0xb4(r3) -/* 802E91B8 98 03 00 B5 */ stb r0, 0xb5(r3) -/* 802E91BC 98 A3 00 B6 */ stb r5, 0xb6(r3) -/* 802E91C0 98 83 00 B7 */ stb r4, 0xb7(r3) -/* 802E91C4 98 03 00 B8 */ stb r0, 0xb8(r3) -/* 802E91C8 80 03 00 24 */ lwz r0, 0x24(r3) -/* 802E91CC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802E91D0 28 00 00 FF */ cmplwi r0, 0xff -/* 802E91D4 4C 82 00 20 */ bnelr -/* 802E91D8 38 80 00 00 */ li r4, 0 -/* 802E91DC 98 83 00 B0 */ stb r4, 0xb0(r3) -/* 802E91E0 98 A3 00 B1 */ stb r5, 0xb1(r3) -/* 802E91E4 98 83 00 B2 */ stb r4, 0xb2(r3) -/* 802E91E8 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 802E91EC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802E91F0 28 00 00 FF */ cmplwi r0, 0xff -/* 802E91F4 4C 82 00 20 */ bnelr -/* 802E91F8 98 83 00 B3 */ stb r4, 0xb3(r3) -/* 802E91FC 98 A3 00 B4 */ stb r5, 0xb4(r3) -/* 802E9200 98 83 00 B5 */ stb r4, 0xb5(r3) -/* 802E9204 80 03 00 28 */ lwz r0, 0x28(r3) -/* 802E9208 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802E920C 28 00 00 FF */ cmplwi r0, 0xff -/* 802E9210 4C 82 00 20 */ bnelr -/* 802E9214 80 03 00 30 */ lwz r0, 0x30(r3) -/* 802E9218 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 802E921C 28 00 00 FF */ cmplwi r0, 0xff -/* 802E9220 4C 82 00 20 */ bnelr -/* 802E9224 98 83 00 B6 */ stb r4, 0xb6(r3) -/* 802E9228 98 A3 00 B7 */ stb r5, 0xb7(r3) -/* 802E922C 98 83 00 B8 */ stb r4, 0xb8(r3) -/* 802E9230 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9260.s b/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9260.s deleted file mode 100644 index d512e7751a2..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9260.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_802E9260: -/* 802E9260 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E9264 7C 08 02 A6 */ mflr r0 -/* 802E9268 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E926C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E9270 93 C1 00 08 */ stw r30, 8(r1) -/* 802E9274 7C 7E 1B 78 */ mr r30, r3 -/* 802E9278 7C 9F 23 78 */ mr r31, r4 -/* 802E927C 88 63 00 B6 */ lbz r3, 0xb6(r3) -/* 802E9280 88 9E 00 B7 */ lbz r4, 0xb7(r30) -/* 802E9284 88 BE 00 B8 */ lbz r5, 0xb8(r30) -/* 802E9288 38 C0 00 0F */ li r6, 0xf -/* 802E928C 48 07 69 65 */ bl GXSetBlendMode -/* 802E9290 38 7E 00 80 */ addi r3, r30, 0x80 -/* 802E9294 38 80 00 00 */ li r4, 0 -/* 802E9298 48 07 6F B5 */ bl GXLoadPosMtxImm -/* 802E929C 38 60 00 00 */ li r3, 0 -/* 802E92A0 38 80 00 09 */ li r4, 9 -/* 802E92A4 38 A0 00 01 */ li r5, 1 -/* 802E92A8 38 C0 00 04 */ li r6, 4 -/* 802E92AC 38 E0 00 00 */ li r7, 0 -/* 802E92B0 48 07 23 15 */ bl GXSetVtxAttrFmt -/* 802E92B4 38 60 00 80 */ li r3, 0x80 -/* 802E92B8 38 80 00 00 */ li r4, 0 -/* 802E92BC 38 A0 00 04 */ li r5, 4 -/* 802E92C0 48 07 34 A5 */ bl GXBegin -/* 802E92C4 C0 7F 00 04 */ lfs f3, 4(r31) -/* 802E92C8 C0 5F 00 00 */ lfs f2, 0(r31) -/* 802E92CC 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802E92D0 D0 43 80 00 */ stfs f2, 0x8000(r3) /* 0xCC008000@l */ -/* 802E92D4 D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802E92D8 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E92DC D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E92E0 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 802E92E4 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E92E8 C0 3F 00 08 */ lfs f1, 8(r31) -/* 802E92EC D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802E92F0 D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802E92F4 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E92F8 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E92FC 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 802E9300 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9304 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 802E9308 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802E930C D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802E9310 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E9314 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E9318 80 1E 00 30 */ lwz r0, 0x30(r30) -/* 802E931C 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9320 D0 43 80 00 */ stfs f2, -0x8000(r3) -/* 802E9324 D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802E9328 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E932C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E9330 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 802E9334 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9338 38 60 00 00 */ li r3, 0 -/* 802E933C 38 80 00 09 */ li r4, 9 -/* 802E9340 38 A0 00 01 */ li r5, 1 -/* 802E9344 38 C0 00 03 */ li r6, 3 -/* 802E9348 38 E0 00 00 */ li r7, 0 -/* 802E934C 48 07 22 79 */ bl GXSetVtxAttrFmt -/* 802E9350 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E9354 83 C1 00 08 */ lwz r30, 8(r1) -/* 802E9358 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E935C 7C 08 03 A6 */ mtlr r0 -/* 802E9360 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9364 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9368.s b/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9368.s deleted file mode 100644 index 559516d3c5a..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9368.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_802E9368: -/* 802E9368 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E936C 7C 08 02 A6 */ mflr r0 -/* 802E9370 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E9374 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E9378 93 C1 00 08 */ stw r30, 8(r1) -/* 802E937C 7C 7E 1B 78 */ mr r30, r3 -/* 802E9380 7C 9F 23 78 */ mr r31, r4 -/* 802E9384 88 63 00 B6 */ lbz r3, 0xb6(r3) -/* 802E9388 88 9E 00 B7 */ lbz r4, 0xb7(r30) -/* 802E938C 88 BE 00 B8 */ lbz r5, 0xb8(r30) -/* 802E9390 38 C0 00 0F */ li r6, 0xf -/* 802E9394 48 07 68 5D */ bl GXSetBlendMode -/* 802E9398 38 7E 00 80 */ addi r3, r30, 0x80 -/* 802E939C 38 80 00 00 */ li r4, 0 -/* 802E93A0 48 07 6E AD */ bl GXLoadPosMtxImm -/* 802E93A4 38 60 00 00 */ li r3, 0 -/* 802E93A8 38 80 00 09 */ li r4, 9 -/* 802E93AC 38 A0 00 01 */ li r5, 1 -/* 802E93B0 38 C0 00 04 */ li r6, 4 -/* 802E93B4 38 E0 00 00 */ li r7, 0 -/* 802E93B8 48 07 22 0D */ bl GXSetVtxAttrFmt -/* 802E93BC 38 60 00 B0 */ li r3, 0xb0 -/* 802E93C0 38 80 00 00 */ li r4, 0 -/* 802E93C4 38 A0 00 05 */ li r5, 5 -/* 802E93C8 48 07 33 9D */ bl GXBegin -/* 802E93CC C0 7F 00 04 */ lfs f3, 4(r31) -/* 802E93D0 C0 5F 00 00 */ lfs f2, 0(r31) -/* 802E93D4 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802E93D8 D0 43 80 00 */ stfs f2, 0x8000(r3) /* 0xCC008000@l */ -/* 802E93DC D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802E93E0 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E93E4 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E93E8 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 802E93EC 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E93F0 C0 3F 00 08 */ lfs f1, 8(r31) -/* 802E93F4 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802E93F8 D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802E93FC C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E9400 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E9404 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 802E9408 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E940C C0 9F 00 0C */ lfs f4, 0xc(r31) -/* 802E9410 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802E9414 D0 83 80 00 */ stfs f4, -0x8000(r3) -/* 802E9418 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E941C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E9420 80 1E 00 30 */ lwz r0, 0x30(r30) -/* 802E9424 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9428 D0 43 80 00 */ stfs f2, -0x8000(r3) -/* 802E942C D0 83 80 00 */ stfs f4, -0x8000(r3) -/* 802E9430 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E9434 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E9438 80 1E 00 2C */ lwz r0, 0x2c(r30) -/* 802E943C 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9440 D0 43 80 00 */ stfs f2, -0x8000(r3) -/* 802E9444 D0 63 80 00 */ stfs f3, -0x8000(r3) -/* 802E9448 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E944C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E9450 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 802E9454 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9458 38 60 00 00 */ li r3, 0 -/* 802E945C 38 80 00 09 */ li r4, 9 -/* 802E9460 38 A0 00 01 */ li r5, 1 -/* 802E9464 38 C0 00 03 */ li r6, 3 -/* 802E9468 38 E0 00 00 */ li r7, 0 -/* 802E946C 48 07 21 59 */ bl GXSetVtxAttrFmt -/* 802E9470 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E9474 83 C1 00 08 */ lwz r30, 8(r1) -/* 802E9478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E947C 7C 08 03 A6 */ mtlr r0 -/* 802E9480 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9484 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9488.s b/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9488.s deleted file mode 100644 index a66adcb3de4..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9488.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802E9488: -/* 802E9488 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E948C 7C 08 02 A6 */ mflr r0 -/* 802E9490 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E9494 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E9498 48 07 8D 45 */ bl _savegpr_29 -/* 802E949C 7C 7D 1B 78 */ mr r29, r3 -/* 802E94A0 7C 9E 23 78 */ mr r30, r4 -/* 802E94A4 7C BF 2B 78 */ mr r31, r5 -/* 802E94A8 88 63 00 B3 */ lbz r3, 0xb3(r3) -/* 802E94AC 88 9D 00 B4 */ lbz r4, 0xb4(r29) -/* 802E94B0 88 BD 00 B5 */ lbz r5, 0xb5(r29) -/* 802E94B4 38 C0 00 0F */ li r6, 0xf -/* 802E94B8 48 07 67 39 */ bl GXSetBlendMode -/* 802E94BC 38 7D 00 80 */ addi r3, r29, 0x80 -/* 802E94C0 38 80 00 00 */ li r4, 0 -/* 802E94C4 48 07 6D 89 */ bl GXLoadPosMtxImm -/* 802E94C8 38 60 00 00 */ li r3, 0 -/* 802E94CC 38 80 00 09 */ li r4, 9 -/* 802E94D0 38 A0 00 01 */ li r5, 1 -/* 802E94D4 38 C0 00 04 */ li r6, 4 -/* 802E94D8 38 E0 00 00 */ li r7, 0 -/* 802E94DC 48 07 20 E9 */ bl GXSetVtxAttrFmt -/* 802E94E0 38 60 00 A8 */ li r3, 0xa8 -/* 802E94E4 38 80 00 00 */ li r4, 0 -/* 802E94E8 38 A0 00 02 */ li r5, 2 -/* 802E94EC 48 07 32 79 */ bl GXBegin -/* 802E94F0 C0 3E 00 04 */ lfs f1, 4(r30) -/* 802E94F4 C0 1E 00 00 */ lfs f0, 0(r30) -/* 802E94F8 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 802E94FC D0 03 80 00 */ stfs f0, 0x8000(r3) /* 0xCC008000@l */ -/* 802E9500 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802E9504 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E9508 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E950C 80 1D 00 24 */ lwz r0, 0x24(r29) -/* 802E9510 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9514 C0 3F 00 04 */ lfs f1, 4(r31) -/* 802E9518 C0 1F 00 00 */ lfs f0, 0(r31) -/* 802E951C D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E9520 D0 23 80 00 */ stfs f1, -0x8000(r3) -/* 802E9524 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E9528 D0 03 80 00 */ stfs f0, -0x8000(r3) -/* 802E952C 80 1D 00 2C */ lwz r0, 0x2c(r29) -/* 802E9530 90 03 80 00 */ stw r0, -0x8000(r3) -/* 802E9534 38 60 00 00 */ li r3, 0 -/* 802E9538 38 80 00 09 */ li r4, 9 -/* 802E953C 38 A0 00 01 */ li r5, 1 -/* 802E9540 38 C0 00 03 */ li r6, 3 -/* 802E9544 38 E0 00 00 */ li r7, 0 -/* 802E9548 48 07 20 7D */ bl GXSetVtxAttrFmt -/* 802E954C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E9550 48 07 8C D9 */ bl _restgpr_29 -/* 802E9554 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E9558 7C 08 03 A6 */ mtlr r0 -/* 802E955C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9560 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9564.s b/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9564.s deleted file mode 100644 index 5e7bc2d0a5b..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/func_802E9564.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_802E9564: -/* 802E9564 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E9568 7C 08 02 A6 */ mflr r0 -/* 802E956C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E9570 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802E9574 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802E9578 7C 7E 1B 78 */ mr r30, r3 -/* 802E957C 7C 9F 23 78 */ mr r31, r4 -/* 802E9580 80 84 00 00 */ lwz r4, 0(r4) -/* 802E9584 80 1F 00 04 */ lwz r0, 4(r31) -/* 802E9588 90 81 00 08 */ stw r4, 8(r1) -/* 802E958C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802E9590 80 83 00 38 */ lwz r4, 0x38(r3) -/* 802E9594 80 03 00 3C */ lwz r0, 0x3c(r3) -/* 802E9598 90 81 00 10 */ stw r4, 0x10(r1) -/* 802E959C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E95A0 38 81 00 10 */ addi r4, r1, 0x10 -/* 802E95A4 38 A1 00 08 */ addi r5, r1, 8 -/* 802E95A8 4B FF FE E1 */ bl func_802E9488 -/* 802E95AC C0 1F 00 00 */ lfs f0, 0(r31) -/* 802E95B0 D0 1E 00 38 */ stfs f0, 0x38(r30) -/* 802E95B4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 802E95B8 D0 1E 00 3C */ stfs f0, 0x3c(r30) -/* 802E95BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802E95C0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802E95C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E95C8 7C 08 03 A6 */ mtlr r0 -/* 802E95CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E95D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/place__14J2DGrafContextFffff.s b/asm/JSystem/J2DGraph/J2DGrafContext/place__14J2DGrafContextFffff.s deleted file mode 100644 index 209c6ff6c40..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/place__14J2DGrafContextFffff.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802E961C: -/* 802E961C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E9620 7C 08 02 A6 */ mflr r0 -/* 802E9624 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E9628 D0 21 00 08 */ stfs f1, 8(r1) -/* 802E962C D0 41 00 0C */ stfs f2, 0xc(r1) -/* 802E9630 EC 01 18 2A */ fadds f0, f1, f3 -/* 802E9634 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 802E9638 EC 02 20 2A */ fadds f0, f2, f4 -/* 802E963C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802E9640 38 81 00 08 */ addi r4, r1, 8 -/* 802E9644 81 83 00 00 */ lwz r12, 0(r3) -/* 802E9648 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802E964C 7D 89 03 A6 */ mtctr r12 -/* 802E9650 4E 80 04 21 */ bctrl -/* 802E9654 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E9658 7C 08 03 A6 */ mtlr r0 -/* 802E965C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9660 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/setPort__14J2DGrafContextFv.s b/asm/JSystem/J2DGraph/J2DGrafContext/setPort__14J2DGrafContextFv.s deleted file mode 100644 index e82a8b06c63..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/setPort__14J2DGrafContextFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_802E8BB4: -/* 802E8BB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E8BB8 7C 08 02 A6 */ mflr r0 -/* 802E8BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E8BC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E8BC4 7C 7F 1B 78 */ mr r31, r3 -/* 802E8BC8 81 83 00 00 */ lwz r12, 0(r3) -/* 802E8BCC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802E8BD0 7D 89 03 A6 */ mtctr r12 -/* 802E8BD4 4E 80 04 21 */ bctrl -/* 802E8BD8 7F E3 FB 78 */ mr r3, r31 -/* 802E8BDC 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E8BE0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802E8BE4 7D 89 03 A6 */ mtctr r12 -/* 802E8BE8 4E 80 04 21 */ bctrl -/* 802E8BEC C0 3F 00 04 */ lfs f1, 4(r31) -/* 802E8BF0 C0 5F 00 08 */ lfs f2, 8(r31) -/* 802E8BF4 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 802E8BF8 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 802E8BFC C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E8C00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802E8C04 40 80 00 08 */ bge lbl_802E8C0C -/* 802E8C08 FC 20 00 90 */ fmr f1, f0 -lbl_802E8C0C: -/* 802E8C0C C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E8C10 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802E8C14 40 80 00 08 */ bge lbl_802E8C1C -/* 802E8C18 FC 40 00 90 */ fmr f2, f0 -lbl_802E8C1C: -/* 802E8C1C EC 63 08 28 */ fsubs f3, f3, f1 -/* 802E8C20 EC 84 10 28 */ fsubs f4, f4, f2 -/* 802E8C24 C0 A2 C7 48 */ lfs f5, lit_627(r2) -/* 802E8C28 C0 C2 C7 4C */ lfs f6, lit_628(r2) -/* 802E8C2C 48 07 78 39 */ bl GXSetViewport -/* 802E8C30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E8C34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E8C38 7C 08 03 A6 */ mtlr r0 -/* 802E8C3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E8C40 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/setScissor__14J2DGrafContextFv.s b/asm/JSystem/J2DGraph/J2DGrafContext/setScissor__14J2DGrafContextFv.s deleted file mode 100644 index 407745bdbf1..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/setScissor__14J2DGrafContextFv.s +++ /dev/null @@ -1,187 +0,0 @@ -lbl_802E8E20: -/* 802E8E20 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802E8E24 7C 08 02 A6 */ mflr r0 -/* 802E8E28 90 01 00 74 */ stw r0, 0x74(r1) -/* 802E8E2C DB E1 00 60 */ stfd f31, 0x60(r1) -/* 802E8E30 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 802E8E34 DB C1 00 50 */ stfd f30, 0x50(r1) -/* 802E8E38 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 802E8E3C DB A1 00 40 */ stfd f29, 0x40(r1) -/* 802E8E40 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 802E8E44 DB 81 00 30 */ stfd f28, 0x30(r1) -/* 802E8E48 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 802E8E4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E8E50 48 07 93 8D */ bl _savegpr_29 -/* 802E8E54 C0 23 00 14 */ lfs f1, 0x14(r3) -/* 802E8E58 C3 A3 00 18 */ lfs f29, 0x18(r3) -/* 802E8E5C C3 E3 00 1C */ lfs f31, 0x1c(r3) -/* 802E8E60 C3 C3 00 20 */ lfs f30, 0x20(r3) -/* 802E8E64 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E8E68 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802E8E6C 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8E70 40 82 00 08 */ bne lbl_802E8E78 -/* 802E8E74 D0 03 00 14 */ stfs f0, 0x14(r3) -lbl_802E8E78: -/* 802E8E78 C0 43 00 18 */ lfs f2, 0x18(r3) -/* 802E8E7C C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E8E80 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802E8E84 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8E88 40 82 00 08 */ bne lbl_802E8E90 -/* 802E8E8C D0 03 00 18 */ stfs f0, 0x18(r3) -lbl_802E8E90: -/* 802E8E90 C0 43 00 1C */ lfs f2, 0x1c(r3) -/* 802E8E94 C0 02 C7 50 */ lfs f0, lit_730(r2) -/* 802E8E98 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802E8E9C 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8EA0 40 82 00 08 */ bne lbl_802E8EA8 -/* 802E8EA4 D0 03 00 1C */ stfs f0, 0x1c(r3) -lbl_802E8EA8: -/* 802E8EA8 C0 43 00 20 */ lfs f2, 0x20(r3) -/* 802E8EAC C0 02 C7 50 */ lfs f0, lit_730(r2) -/* 802E8EB0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802E8EB4 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8EB8 40 82 00 08 */ bne lbl_802E8EC0 -/* 802E8EBC D0 03 00 20 */ stfs f0, 0x20(r3) -lbl_802E8EC0: -/* 802E8EC0 38 00 00 00 */ li r0, 0 -/* 802E8EC4 FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 802E8EC8 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8ECC 40 82 00 14 */ bne lbl_802E8EE0 -/* 802E8ED0 FC 1E E8 40 */ fcmpo cr0, f30, f29 -/* 802E8ED4 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8ED8 40 82 00 08 */ bne lbl_802E8EE0 -/* 802E8EDC 38 00 00 01 */ li r0, 1 -lbl_802E8EE0: -/* 802E8EE0 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802E8EE4 40 82 00 84 */ bne lbl_802E8F68 -/* 802E8EE8 FC 00 08 90 */ fmr f0, f1 -/* 802E8EEC FC 40 E8 90 */ fmr f2, f29 -/* 802E8EF0 FC 60 F8 90 */ fmr f3, f31 -/* 802E8EF4 FC 80 F0 90 */ fmr f4, f30 -/* 802E8EF8 FC 01 08 40 */ fcmpo cr0, f1, f1 -/* 802E8EFC 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8F00 FC 1D E8 40 */ fcmpo cr0, f29, f29 -/* 802E8F04 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8F08 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 802E8F0C 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8F10 40 82 00 08 */ bne lbl_802E8F18 -/* 802E8F14 FC 20 F8 90 */ fmr f1, f31 -lbl_802E8F18: -/* 802E8F18 FC 1D F0 40 */ fcmpo cr0, f29, f30 -/* 802E8F1C 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8F20 40 82 00 08 */ bne lbl_802E8F28 -/* 802E8F24 FF A0 F0 90 */ fmr f29, f30 -lbl_802E8F28: -/* 802E8F28 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 802E8F2C 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8F30 40 82 00 08 */ bne lbl_802E8F38 -/* 802E8F34 FF E0 00 90 */ fmr f31, f0 -lbl_802E8F38: -/* 802E8F38 FC 1E 10 40 */ fcmpo cr0, f30, f2 -/* 802E8F3C 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8F40 40 82 00 08 */ bne lbl_802E8F48 -/* 802E8F44 FF C0 10 90 */ fmr f30, f2 -lbl_802E8F48: -/* 802E8F48 FC 1F 18 40 */ fcmpo cr0, f31, f3 -/* 802E8F4C 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8F50 40 82 00 08 */ bne lbl_802E8F58 -/* 802E8F54 FF E0 18 90 */ fmr f31, f3 -lbl_802E8F58: -/* 802E8F58 FC 1E 20 40 */ fcmpo cr0, f30, f4 -/* 802E8F5C 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8F60 40 82 00 08 */ bne lbl_802E8F68 -/* 802E8F64 FF C0 20 90 */ fmr f30, f4 -lbl_802E8F68: -/* 802E8F68 C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E8F6C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802E8F70 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8F74 40 82 00 08 */ bne lbl_802E8F7C -/* 802E8F78 FC 20 00 90 */ fmr f1, f0 -lbl_802E8F7C: -/* 802E8F7C C0 02 C7 48 */ lfs f0, lit_627(r2) -/* 802E8F80 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 802E8F84 4C 40 13 82 */ cror 2, 0, 2 -/* 802E8F88 40 82 00 08 */ bne lbl_802E8F90 -/* 802E8F8C FF A0 00 90 */ fmr f29, f0 -lbl_802E8F90: -/* 802E8F90 C0 02 C7 50 */ lfs f0, lit_730(r2) -/* 802E8F94 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 802E8F98 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8F9C 40 82 00 08 */ bne lbl_802E8FA4 -/* 802E8FA0 FF E0 00 90 */ fmr f31, f0 -lbl_802E8FA4: -/* 802E8FA4 C0 02 C7 50 */ lfs f0, lit_730(r2) -/* 802E8FA8 FC 1E 00 40 */ fcmpo cr0, f30, f0 -/* 802E8FAC 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8FB0 40 82 00 08 */ bne lbl_802E8FB8 -/* 802E8FB4 FF C0 00 90 */ fmr f30, f0 -lbl_802E8FB8: -/* 802E8FB8 38 00 00 00 */ li r0, 0 -/* 802E8FBC FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 802E8FC0 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8FC4 40 82 00 14 */ bne lbl_802E8FD8 -/* 802E8FC8 FC 1E E8 40 */ fcmpo cr0, f30, f29 -/* 802E8FCC 4C 41 13 82 */ cror 2, 1, 2 -/* 802E8FD0 40 82 00 08 */ bne lbl_802E8FD8 -/* 802E8FD4 38 00 00 01 */ li r0, 1 -lbl_802E8FD8: -/* 802E8FD8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802E8FDC 41 82 00 98 */ beq lbl_802E9074 -/* 802E8FE0 48 07 90 CD */ bl __cvt_fp2unsigned -/* 802E8FE4 C8 22 C7 58 */ lfd f1, lit_732(r2) -/* 802E8FE8 90 61 00 0C */ stw r3, 0xc(r1) -/* 802E8FEC 3C 00 43 30 */ lis r0, 0x4330 -/* 802E8FF0 90 01 00 08 */ stw r0, 8(r1) -/* 802E8FF4 C8 01 00 08 */ lfd f0, 8(r1) -/* 802E8FF8 EF 80 08 28 */ fsubs f28, f0, f1 -/* 802E8FFC FC 20 E8 90 */ fmr f1, f29 -/* 802E9000 48 07 90 AD */ bl __cvt_fp2unsigned -/* 802E9004 C8 22 C7 58 */ lfd f1, lit_732(r2) -/* 802E9008 90 61 00 14 */ stw r3, 0x14(r1) -/* 802E900C 3C 00 43 30 */ lis r0, 0x4330 -/* 802E9010 90 01 00 10 */ stw r0, 0x10(r1) -/* 802E9014 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802E9018 EF A0 08 28 */ fsubs f29, f0, f1 -/* 802E901C FC 20 F8 90 */ fmr f1, f31 -/* 802E9020 48 08 2E 9D */ bl ceil -/* 802E9024 FF E0 08 18 */ frsp f31, f1 -/* 802E9028 FC 20 F0 90 */ fmr f1, f30 -/* 802E902C 48 08 2E 91 */ bl ceil -/* 802E9030 FC 00 08 18 */ frsp f0, f1 -/* 802E9034 EC 20 E8 28 */ fsubs f1, f0, f29 -/* 802E9038 48 07 90 75 */ bl __cvt_fp2unsigned -/* 802E903C 7C 7D 1B 78 */ mr r29, r3 -/* 802E9040 EC 3F E0 28 */ fsubs f1, f31, f28 -/* 802E9044 48 07 90 69 */ bl __cvt_fp2unsigned -/* 802E9048 7C 7E 1B 78 */ mr r30, r3 -/* 802E904C FC 20 E8 90 */ fmr f1, f29 -/* 802E9050 48 07 90 5D */ bl __cvt_fp2unsigned -/* 802E9054 7C 7F 1B 78 */ mr r31, r3 -/* 802E9058 FC 20 E0 90 */ fmr f1, f28 -/* 802E905C 48 07 90 51 */ bl __cvt_fp2unsigned -/* 802E9060 7F E4 FB 78 */ mr r4, r31 -/* 802E9064 7F C5 F3 78 */ mr r5, r30 -/* 802E9068 7F A6 EB 78 */ mr r6, r29 -/* 802E906C 48 07 74 65 */ bl GXSetScissor -/* 802E9070 48 00 00 18 */ b lbl_802E9088 -lbl_802E9074: -/* 802E9074 38 60 00 00 */ li r3, 0 -/* 802E9078 38 80 00 00 */ li r4, 0 -/* 802E907C 38 A0 00 00 */ li r5, 0 -/* 802E9080 38 C0 00 00 */ li r6, 0 -/* 802E9084 48 07 74 4D */ bl GXSetScissor -lbl_802E9088: -/* 802E9088 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 802E908C CB E1 00 60 */ lfd f31, 0x60(r1) -/* 802E9090 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 802E9094 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 802E9098 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 802E909C CB A1 00 40 */ lfd f29, 0x40(r1) -/* 802E90A0 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 802E90A4 CB 81 00 30 */ lfd f28, 0x30(r1) -/* 802E90A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E90AC 48 07 91 7D */ bl _restgpr_29 -/* 802E90B0 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802E90B4 7C 08 03 A6 */ mtlr r0 -/* 802E90B8 38 21 00 70 */ addi r1, r1, 0x70 -/* 802E90BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DGrafContext/setup2D__14J2DGrafContextFv.s b/asm/JSystem/J2DGraph/J2DGrafContext/setup2D__14J2DGrafContextFv.s deleted file mode 100644 index 37abc8c33c1..00000000000 --- a/asm/JSystem/J2DGraph/J2DGrafContext/setup2D__14J2DGrafContextFv.s +++ /dev/null @@ -1,121 +0,0 @@ -lbl_802E8C44: -/* 802E8C44 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802E8C48 7C 08 02 A6 */ mflr r0 -/* 802E8C4C 90 01 00 44 */ stw r0, 0x44(r1) -/* 802E8C50 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 802E8C54 93 C1 00 38 */ stw r30, 0x38(r1) -/* 802E8C58 7C 7E 1B 78 */ mr r30, r3 -/* 802E8C5C 38 60 00 00 */ li r3, 0 -/* 802E8C60 48 07 64 75 */ bl GXSetNumIndStages -/* 802E8C64 3B E0 00 00 */ li r31, 0 -lbl_802E8C68: -/* 802E8C68 7F E3 FB 78 */ mr r3, r31 -/* 802E8C6C 48 07 64 8D */ bl GXSetTevDirect -/* 802E8C70 3B FF 00 01 */ addi r31, r31, 1 -/* 802E8C74 2C 1F 00 10 */ cmpwi r31, 0x10 -/* 802E8C78 41 80 FF F0 */ blt lbl_802E8C68 -/* 802E8C7C 38 60 00 00 */ li r3, 0 -/* 802E8C80 48 07 70 51 */ bl GXSetZCompLoc -/* 802E8C84 38 60 00 04 */ li r3, 4 -/* 802E8C88 38 80 00 00 */ li r4, 0 -/* 802E8C8C 38 A0 00 01 */ li r5, 1 -/* 802E8C90 38 C0 00 04 */ li r6, 4 -/* 802E8C94 38 E0 00 00 */ li r7, 0 -/* 802E8C98 48 07 69 8D */ bl GXSetAlphaCompare -/* 802E8C9C 38 60 00 00 */ li r3, 0 -/* 802E8CA0 38 80 00 03 */ li r4, 3 -/* 802E8CA4 38 A0 00 00 */ li r5, 0 -/* 802E8CA8 48 07 6F F5 */ bl GXSetZMode -/* 802E8CAC 38 60 00 00 */ li r3, 0 -/* 802E8CB0 38 80 00 04 */ li r4, 4 -/* 802E8CB4 48 07 64 E5 */ bl GXSetTevOp -/* 802E8CB8 38 60 00 01 */ li r3, 1 -/* 802E8CBC 48 07 4E 75 */ bl GXSetNumChans -/* 802E8CC0 38 60 00 01 */ li r3, 1 -/* 802E8CC4 48 07 6B CD */ bl GXSetNumTevStages -/* 802E8CC8 38 60 00 00 */ li r3, 0 -/* 802E8CCC 48 07 31 31 */ bl GXSetNumTexGens -/* 802E8CD0 38 60 00 00 */ li r3, 0 -/* 802E8CD4 38 80 00 FF */ li r4, 0xff -/* 802E8CD8 38 A0 00 FF */ li r5, 0xff -/* 802E8CDC 38 C0 00 04 */ li r6, 4 -/* 802E8CE0 48 07 6A 15 */ bl GXSetTevOrder -/* 802E8CE4 38 60 00 00 */ li r3, 0 -/* 802E8CE8 48 07 3C 9D */ bl GXSetCullMode -/* 802E8CEC 38 7E 00 80 */ addi r3, r30, 0x80 -/* 802E8CF0 38 80 00 00 */ li r4, 0 -/* 802E8CF4 48 07 75 59 */ bl GXLoadPosMtxImm -/* 802E8CF8 38 61 00 08 */ addi r3, r1, 8 -/* 802E8CFC 48 05 D7 89 */ bl PSMTXIdentity -/* 802E8D00 38 61 00 08 */ addi r3, r1, 8 -/* 802E8D04 38 80 00 3C */ li r4, 0x3c -/* 802E8D08 38 A0 00 00 */ li r5, 0 -/* 802E8D0C 48 07 76 15 */ bl GXLoadTexMtxImm -/* 802E8D10 38 60 00 04 */ li r3, 4 -/* 802E8D14 38 80 00 00 */ li r4, 0 -/* 802E8D18 38 A0 00 00 */ li r5, 0 -/* 802E8D1C 38 C0 00 01 */ li r6, 1 -/* 802E8D20 38 E0 00 00 */ li r7, 0 -/* 802E8D24 39 00 00 00 */ li r8, 0 -/* 802E8D28 39 20 00 02 */ li r9, 2 -/* 802E8D2C 48 07 4E 41 */ bl GXSetChanCtrl -/* 802E8D30 38 60 00 05 */ li r3, 5 -/* 802E8D34 38 80 00 00 */ li r4, 0 -/* 802E8D38 38 A0 00 00 */ li r5, 0 -/* 802E8D3C 38 C0 00 00 */ li r6, 0 -/* 802E8D40 38 E0 00 00 */ li r7, 0 -/* 802E8D44 39 00 00 00 */ li r8, 0 -/* 802E8D48 39 20 00 02 */ li r9, 2 -/* 802E8D4C 48 07 4E 21 */ bl GXSetChanCtrl -/* 802E8D50 38 60 00 00 */ li r3, 0 -/* 802E8D54 48 07 75 99 */ bl GXSetCurrentMtx -/* 802E8D58 38 60 00 00 */ li r3, 0 -/* 802E8D5C 38 80 00 01 */ li r4, 1 -/* 802E8D60 38 A0 00 04 */ li r5, 4 -/* 802E8D64 38 C0 00 3C */ li r6, 0x3c -/* 802E8D68 38 E0 00 00 */ li r7, 0 -/* 802E8D6C 39 00 00 7D */ li r8, 0x7d -/* 802E8D70 48 07 2E 0D */ bl GXSetTexCoordGen2 -/* 802E8D74 38 60 00 00 */ li r3, 0 -/* 802E8D78 38 80 00 09 */ li r4, 9 -/* 802E8D7C 38 A0 00 01 */ li r5, 1 -/* 802E8D80 38 C0 00 03 */ li r6, 3 -/* 802E8D84 38 E0 00 00 */ li r7, 0 -/* 802E8D88 48 07 28 3D */ bl GXSetVtxAttrFmt -/* 802E8D8C 38 60 00 00 */ li r3, 0 -/* 802E8D90 38 80 00 0B */ li r4, 0xb -/* 802E8D94 38 A0 00 01 */ li r5, 1 -/* 802E8D98 38 C0 00 05 */ li r6, 5 -/* 802E8D9C 38 E0 00 00 */ li r7, 0 -/* 802E8DA0 48 07 28 25 */ bl GXSetVtxAttrFmt -/* 802E8DA4 38 60 00 00 */ li r3, 0 -/* 802E8DA8 38 80 00 0D */ li r4, 0xd -/* 802E8DAC 38 A0 00 01 */ li r5, 1 -/* 802E8DB0 38 C0 00 02 */ li r6, 2 -/* 802E8DB4 38 E0 00 0F */ li r7, 0xf -/* 802E8DB8 48 07 28 0D */ bl GXSetVtxAttrFmt -/* 802E8DBC 38 60 00 00 */ li r3, 0 -/* 802E8DC0 38 80 00 0E */ li r4, 0xe -/* 802E8DC4 38 A0 00 01 */ li r5, 1 -/* 802E8DC8 38 C0 00 02 */ li r6, 2 -/* 802E8DCC 38 E0 00 0F */ li r7, 0xf -/* 802E8DD0 48 07 27 F5 */ bl GXSetVtxAttrFmt -/* 802E8DD4 88 7E 00 34 */ lbz r3, 0x34(r30) -/* 802E8DD8 38 80 00 00 */ li r4, 0 -/* 802E8DDC 48 07 3A E1 */ bl GXSetLineWidth -/* 802E8DE0 48 07 27 AD */ bl GXClearVtxDesc -/* 802E8DE4 38 60 00 09 */ li r3, 9 -/* 802E8DE8 38 80 00 01 */ li r4, 1 -/* 802E8DEC 48 07 20 CD */ bl GXSetVtxDesc -/* 802E8DF0 38 60 00 0B */ li r3, 0xb -/* 802E8DF4 38 80 00 01 */ li r4, 1 -/* 802E8DF8 48 07 20 C1 */ bl GXSetVtxDesc -/* 802E8DFC 38 60 00 0D */ li r3, 0xd -/* 802E8E00 38 80 00 00 */ li r4, 0 -/* 802E8E04 48 07 20 B5 */ bl GXSetVtxDesc -/* 802E8E08 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 802E8E0C 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 802E8E10 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802E8E14 7C 08 03 A6 */ mtlr r0 -/* 802E8E18 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E8E1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawFrame__FffffQ28JUtility6TColorUc.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawFrame__FffffQ28JUtility6TColorUc.s deleted file mode 100644 index 646fa846eac..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawFrame__FffffQ28JUtility6TColorUc.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802E9B9C: -/* 802E9B9C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E9BA0 7C 08 02 A6 */ mflr r0 -/* 802E9BA4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E9BA8 7C 85 23 78 */ mr r5, r4 -/* 802E9BAC 80 03 00 00 */ lwz r0, 0(r3) -/* 802E9BB0 90 01 00 08 */ stw r0, 8(r1) -/* 802E9BB4 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 802E9BB8 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 802E9BBC EC 01 18 2A */ fadds f0, f1, f3 -/* 802E9BC0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802E9BC4 EC 02 20 2A */ fadds f0, f2, f4 -/* 802E9BC8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 802E9BCC 38 61 00 0C */ addi r3, r1, 0xc -/* 802E9BD0 38 81 00 08 */ addi r4, r1, 8 -/* 802E9BD4 48 00 00 15 */ bl func_802E9BE8 -/* 802E9BD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E9BDC 7C 08 03 A6 */ mtlr r0 -/* 802E9BE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9BE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawLine__FffffQ28JUtility6TColori.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawLine__FffffQ28JUtility6TColori.s deleted file mode 100644 index 4bd82eebfc0..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawLine__FffffQ28JUtility6TColori.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_802E9998: -/* 802E9998 94 21 FE A0 */ stwu r1, -0x160(r1) -/* 802E999C 7C 08 02 A6 */ mflr r0 -/* 802E99A0 90 01 01 64 */ stw r0, 0x164(r1) -/* 802E99A4 DB E1 01 50 */ stfd f31, 0x150(r1) -/* 802E99A8 F3 E1 01 58 */ psq_st f31, 344(r1), 0, 0 /* qr0 */ -/* 802E99AC DB C1 01 40 */ stfd f30, 0x140(r1) -/* 802E99B0 F3 C1 01 48 */ psq_st f30, 328(r1), 0, 0 /* qr0 */ -/* 802E99B4 DB A1 01 30 */ stfd f29, 0x130(r1) -/* 802E99B8 F3 A1 01 38 */ psq_st f29, 312(r1), 0, 0 /* qr0 */ -/* 802E99BC DB 81 01 20 */ stfd f28, 0x120(r1) -/* 802E99C0 F3 81 01 28 */ psq_st f28, 296(r1), 0, 0 /* qr0 */ -/* 802E99C4 93 E1 01 1C */ stw r31, 0x11c(r1) -/* 802E99C8 93 C1 01 18 */ stw r30, 0x118(r1) -/* 802E99CC FF 80 08 90 */ fmr f28, f1 -/* 802E99D0 FF A0 10 90 */ fmr f29, f2 -/* 802E99D4 FF C0 18 90 */ fmr f30, f3 -/* 802E99D8 FF E0 20 90 */ fmr f31, f4 -/* 802E99DC 7C 7E 1B 78 */ mr r30, r3 -/* 802E99E0 7C 9F 23 78 */ mr r31, r4 -/* 802E99E4 38 61 00 3C */ addi r3, r1, 0x3c -/* 802E99E8 4B FF FC 89 */ bl __ct__13J2DOrthoGraphFv -/* 802E99EC 38 61 00 3C */ addi r3, r1, 0x3c -/* 802E99F0 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802E99F4 4B FF F8 41 */ bl setLineWidth__14J2DGrafContextFUc -/* 802E99F8 80 1E 00 00 */ lwz r0, 0(r30) -/* 802E99FC 90 01 00 18 */ stw r0, 0x18(r1) -/* 802E9A00 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E9A04 90 01 00 10 */ stw r0, 0x10(r1) -/* 802E9A08 90 01 00 0C */ stw r0, 0xc(r1) -/* 802E9A0C 90 01 00 08 */ stw r0, 8(r1) -/* 802E9A10 38 61 00 3C */ addi r3, r1, 0x3c -/* 802E9A14 38 81 00 08 */ addi r4, r1, 8 -/* 802E9A18 38 A1 00 0C */ addi r5, r1, 0xc -/* 802E9A1C 38 C1 00 10 */ addi r6, r1, 0x10 -/* 802E9A20 38 E1 00 14 */ addi r7, r1, 0x14 -/* 802E9A24 4B FF F6 F5 */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 802E9A28 D3 81 00 34 */ stfs f28, 0x34(r1) -/* 802E9A2C D3 A1 00 38 */ stfs f29, 0x38(r1) -/* 802E9A30 80 61 00 34 */ lwz r3, 0x34(r1) -/* 802E9A34 80 01 00 38 */ lwz r0, 0x38(r1) -/* 802E9A38 90 61 00 2C */ stw r3, 0x2c(r1) -/* 802E9A3C 90 01 00 30 */ stw r0, 0x30(r1) -/* 802E9A40 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 802E9A44 D0 01 00 74 */ stfs f0, 0x74(r1) -/* 802E9A48 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 802E9A4C D0 01 00 78 */ stfs f0, 0x78(r1) -/* 802E9A50 D3 C1 00 24 */ stfs f30, 0x24(r1) -/* 802E9A54 D3 E1 00 28 */ stfs f31, 0x28(r1) -/* 802E9A58 80 61 00 24 */ lwz r3, 0x24(r1) -/* 802E9A5C 80 01 00 28 */ lwz r0, 0x28(r1) -/* 802E9A60 90 61 00 1C */ stw r3, 0x1c(r1) -/* 802E9A64 90 01 00 20 */ stw r0, 0x20(r1) -/* 802E9A68 38 61 00 3C */ addi r3, r1, 0x3c -/* 802E9A6C 38 81 00 1C */ addi r4, r1, 0x1c -/* 802E9A70 4B FF FA F5 */ bl func_802E9564 -/* 802E9A74 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802E9A78 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802E9A7C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802E9A80 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802E9A84 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802E9A88 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802E9A8C E3 E1 01 58 */ psq_l f31, 344(r1), 0, 0 /* qr0 */ -/* 802E9A90 CB E1 01 50 */ lfd f31, 0x150(r1) -/* 802E9A94 E3 C1 01 48 */ psq_l f30, 328(r1), 0, 0 /* qr0 */ -/* 802E9A98 CB C1 01 40 */ lfd f30, 0x140(r1) -/* 802E9A9C E3 A1 01 38 */ psq_l f29, 312(r1), 0, 0 /* qr0 */ -/* 802E9AA0 CB A1 01 30 */ lfd f29, 0x130(r1) -/* 802E9AA4 E3 81 01 28 */ psq_l f28, 296(r1), 0, 0 /* qr0 */ -/* 802E9AA8 CB 81 01 20 */ lfd f28, 0x120(r1) -/* 802E9AAC 83 E1 01 1C */ lwz r31, 0x11c(r1) -/* 802E9AB0 83 C1 01 18 */ lwz r30, 0x118(r1) -/* 802E9AB4 80 01 01 64 */ lwz r0, 0x164(r1) -/* 802E9AB8 7C 08 03 A6 */ mtlr r0 -/* 802E9ABC 38 21 01 60 */ addi r1, r1, 0x160 -/* 802E9AC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DFillBox__FffffQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DFillBox__FffffQ28JUtility6TColor.s deleted file mode 100644 index 6f390056e28..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/J2DFillBox__FffffQ28JUtility6TColor.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802E9AC4: -/* 802E9AC4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E9AC8 7C 08 02 A6 */ mflr r0 -/* 802E9ACC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E9AD0 80 03 00 00 */ lwz r0, 0(r3) -/* 802E9AD4 90 01 00 08 */ stw r0, 8(r1) -/* 802E9AD8 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 802E9ADC D0 41 00 10 */ stfs f2, 0x10(r1) -/* 802E9AE0 EC 01 18 2A */ fadds f0, f1, f3 -/* 802E9AE4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802E9AE8 EC 02 20 2A */ fadds f0, f2, f4 -/* 802E9AEC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 802E9AF0 38 61 00 0C */ addi r3, r1, 0xc -/* 802E9AF4 38 81 00 08 */ addi r4, r1, 8 -/* 802E9AF8 48 00 00 15 */ bl func_802E9B0C -/* 802E9AFC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E9B00 7C 08 03 A6 */ mtlr r0 -/* 802E9B04 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9B08 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFffffff.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFffffff.s deleted file mode 100644 index 956b89d66b8..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFffffff.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_802E96D0: -/* 802E96D0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802E96D4 7C 08 02 A6 */ mflr r0 -/* 802E96D8 90 01 00 64 */ stw r0, 0x64(r1) -/* 802E96DC DB E1 00 50 */ stfd f31, 0x50(r1) -/* 802E96E0 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 802E96E4 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 802E96E8 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 802E96EC DB A1 00 30 */ stfd f29, 0x30(r1) -/* 802E96F0 F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 802E96F4 DB 81 00 20 */ stfd f28, 0x20(r1) -/* 802E96F8 F3 81 00 28 */ psq_st f28, 40(r1), 0, 0 /* qr0 */ -/* 802E96FC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802E9700 7C 7F 1B 78 */ mr r31, r3 -/* 802E9704 FF 80 18 90 */ fmr f28, f3 -/* 802E9708 FF A0 20 90 */ fmr f29, f4 -/* 802E970C FF C0 28 90 */ fmr f30, f5 -/* 802E9710 FF E0 30 90 */ fmr f31, f6 -/* 802E9714 4B FF F3 F5 */ bl __ct__14J2DGrafContextFffff -/* 802E9718 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802E971C 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802E9720 90 1F 00 00 */ stw r0, 0(r31) -/* 802E9724 C0 02 C7 60 */ lfs f0, lit_522(r2) -/* 802E9728 D0 01 00 08 */ stfs f0, 8(r1) -/* 802E972C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 802E9730 D3 81 00 10 */ stfs f28, 0x10(r1) -/* 802E9734 D3 A1 00 14 */ stfs f29, 0x14(r1) -/* 802E9738 80 61 00 08 */ lwz r3, 8(r1) -/* 802E973C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802E9740 90 7F 00 BC */ stw r3, 0xbc(r31) -/* 802E9744 90 1F 00 C0 */ stw r0, 0xc0(r31) -/* 802E9748 80 61 00 10 */ lwz r3, 0x10(r1) -/* 802E974C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E9750 90 7F 00 C4 */ stw r3, 0xc4(r31) -/* 802E9754 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 802E9758 FC 00 F8 50 */ fneg f0, f31 -/* 802E975C D0 1F 00 CC */ stfs f0, 0xcc(r31) -/* 802E9760 FC 00 F0 50 */ fneg f0, f30 -/* 802E9764 D0 1F 00 D0 */ stfs f0, 0xd0(r31) -/* 802E9768 7F E3 FB 78 */ mr r3, r31 -/* 802E976C 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E9770 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802E9774 7D 89 03 A6 */ mtctr r12 -/* 802E9778 4E 80 04 21 */ bctrl -/* 802E977C 7F E3 FB 78 */ mr r3, r31 -/* 802E9780 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 802E9784 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 802E9788 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 802E978C CB C1 00 40 */ lfd f30, 0x40(r1) -/* 802E9790 E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 802E9794 CB A1 00 30 */ lfd f29, 0x30(r1) -/* 802E9798 E3 81 00 28 */ psq_l f28, 40(r1), 0, 0 /* qr0 */ -/* 802E979C CB 81 00 20 */ lfd f28, 0x20(r1) -/* 802E97A0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802E97A4 80 01 00 64 */ lwz r0, 0x64(r1) -/* 802E97A8 7C 08 03 A6 */ mtlr r0 -/* 802E97AC 38 21 00 60 */ addi r1, r1, 0x60 -/* 802E97B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFv.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFv.s deleted file mode 100644 index 51136bc57fe..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_802E9670: -/* 802E9670 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E9674 7C 08 02 A6 */ mflr r0 -/* 802E9678 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E967C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E9680 7C 7F 1B 78 */ mr r31, r3 -/* 802E9684 C0 22 C7 60 */ lfs f1, lit_522(r2) -/* 802E9688 FC 40 08 90 */ fmr f2, f1 -/* 802E968C FC 60 08 90 */ fmr f3, f1 -/* 802E9690 FC 80 08 90 */ fmr f4, f1 -/* 802E9694 4B FF F4 75 */ bl __ct__14J2DGrafContextFffff -/* 802E9698 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802E969C 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802E96A0 90 1F 00 00 */ stw r0, 0(r31) -/* 802E96A4 7F E3 FB 78 */ mr r3, r31 -/* 802E96A8 81 9F 00 00 */ lwz r12, 0(r31) -/* 802E96AC 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802E96B0 7D 89 03 A6 */ mtctr r12 -/* 802E96B4 4E 80 04 21 */ bctrl -/* 802E96B8 7F E3 FB 78 */ mr r3, r31 -/* 802E96BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E96C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E96C4 7C 08 03 A6 */ mtlr r0 -/* 802E96C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E96CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E980C.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E980C.s deleted file mode 100644 index f46d57d7730..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E980C.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_802E980C: -/* 802E980C 80 A4 00 00 */ lwz r5, 0(r4) -/* 802E9810 80 04 00 04 */ lwz r0, 4(r4) -/* 802E9814 90 A3 00 BC */ stw r5, 0xbc(r3) -/* 802E9818 90 03 00 C0 */ stw r0, 0xc0(r3) -/* 802E981C 80 A4 00 08 */ lwz r5, 8(r4) -/* 802E9820 80 04 00 0C */ lwz r0, 0xc(r4) -/* 802E9824 90 A3 00 C4 */ stw r5, 0xc4(r3) -/* 802E9828 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 802E982C FC 00 10 50 */ fneg f0, f2 -/* 802E9830 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802E9834 FC 00 08 50 */ fneg f0, f1 -/* 802E9838 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 802E983C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E987C.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E987C.s deleted file mode 100644 index 08ba9d85212..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E987C.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_802E987C: -/* 802E987C C0 03 00 0C */ lfs f0, 0xc(r3) -/* 802E9880 C0 63 00 04 */ lfs f3, 4(r3) -/* 802E9884 EC 20 18 28 */ fsubs f1, f0, f3 -/* 802E9888 C0 03 00 C4 */ lfs f0, 0xc4(r3) -/* 802E988C C0 A3 00 BC */ lfs f5, 0xbc(r3) -/* 802E9890 EC 00 28 28 */ fsubs f0, f0, f5 -/* 802E9894 EC 41 00 24 */ fdivs f2, f1, f0 -/* 802E9898 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 802E989C C0 83 00 08 */ lfs f4, 8(r3) -/* 802E98A0 EC 20 20 28 */ fsubs f1, f0, f4 -/* 802E98A4 C0 03 00 C8 */ lfs f0, 0xc8(r3) -/* 802E98A8 C0 C3 00 C0 */ lfs f6, 0xc0(r3) -/* 802E98AC EC 00 30 28 */ fsubs f0, f0, f6 -/* 802E98B0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 802E98B4 C0 02 C7 60 */ lfs f0, lit_522(r2) -/* 802E98B8 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 802E98BC 4C 41 13 82 */ cror 2, 1, 2 -/* 802E98C0 40 82 00 08 */ bne lbl_802E98C8 -/* 802E98C4 48 00 00 08 */ b lbl_802E98CC -lbl_802E98C8: -/* 802E98C8 FC 60 00 90 */ fmr f3, f0 -lbl_802E98CC: -/* 802E98CC C0 02 C7 60 */ lfs f0, lit_522(r2) -/* 802E98D0 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 802E98D4 4C 41 13 82 */ cror 2, 1, 2 -/* 802E98D8 40 82 00 08 */ bne lbl_802E98E0 -/* 802E98DC 48 00 00 08 */ b lbl_802E98E4 -lbl_802E98E0: -/* 802E98E0 FC 80 00 90 */ fmr f4, f0 -lbl_802E98E4: -/* 802E98E4 C0 05 00 08 */ lfs f0, 8(r5) -/* 802E98E8 EC 00 28 28 */ fsubs f0, f0, f5 -/* 802E98EC EC 02 00 32 */ fmuls f0, f2, f0 -/* 802E98F0 EC E3 00 2A */ fadds f7, f3, f0 -/* 802E98F4 C0 05 00 04 */ lfs f0, 4(r5) -/* 802E98F8 EC 00 30 28 */ fsubs f0, f0, f6 -/* 802E98FC EC 01 00 32 */ fmuls f0, f1, f0 -/* 802E9900 ED 04 00 2A */ fadds f8, f4, f0 -/* 802E9904 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 802E9908 EC 00 30 28 */ fsubs f0, f0, f6 -/* 802E990C EC 01 00 32 */ fmuls f0, f1, f0 -/* 802E9910 EC 24 00 2A */ fadds f1, f4, f0 -/* 802E9914 C0 05 00 00 */ lfs f0, 0(r5) -/* 802E9918 EC 00 28 28 */ fsubs f0, f0, f5 -/* 802E991C EC 02 00 32 */ fmuls f0, f2, f0 -/* 802E9920 EC 03 00 2A */ fadds f0, f3, f0 -/* 802E9924 D0 04 00 00 */ stfs f0, 0(r4) -/* 802E9928 D1 04 00 04 */ stfs f8, 4(r4) -/* 802E992C D0 E4 00 08 */ stfs f7, 8(r4) -/* 802E9930 D0 24 00 0C */ stfs f1, 0xc(r4) -/* 802E9934 C0 04 00 00 */ lfs f0, 0(r4) -/* 802E9938 C0 23 00 14 */ lfs f1, 0x14(r3) -/* 802E993C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802E9940 4C 40 13 82 */ cror 2, 0, 2 -/* 802E9944 40 82 00 08 */ bne lbl_802E994C -/* 802E9948 D0 24 00 00 */ stfs f1, 0(r4) -lbl_802E994C: -/* 802E994C C0 04 00 04 */ lfs f0, 4(r4) -/* 802E9950 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 802E9954 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802E9958 4C 40 13 82 */ cror 2, 0, 2 -/* 802E995C 40 82 00 08 */ bne lbl_802E9964 -/* 802E9960 D0 24 00 04 */ stfs f1, 4(r4) -lbl_802E9964: -/* 802E9964 C0 04 00 08 */ lfs f0, 8(r4) -/* 802E9968 C0 23 00 1C */ lfs f1, 0x1c(r3) -/* 802E996C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802E9970 4C 41 13 82 */ cror 2, 1, 2 -/* 802E9974 40 82 00 08 */ bne lbl_802E997C -/* 802E9978 D0 24 00 08 */ stfs f1, 8(r4) -lbl_802E997C: -/* 802E997C C0 04 00 0C */ lfs f0, 0xc(r4) -/* 802E9980 C0 23 00 20 */ lfs f1, 0x20(r3) -/* 802E9984 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 802E9988 4C 41 13 82 */ cror 2, 1, 2 -/* 802E998C 4C 82 00 20 */ bnelr -/* 802E9990 D0 24 00 0C */ stfs f1, 0xc(r4) -/* 802E9994 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9B0C.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9B0C.s deleted file mode 100644 index d4fa1f1d3dd..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9B0C.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802E9B0C: -/* 802E9B0C 94 21 FF 00 */ stwu r1, -0x100(r1) -/* 802E9B10 7C 08 02 A6 */ mflr r0 -/* 802E9B14 90 01 01 04 */ stw r0, 0x104(r1) -/* 802E9B18 93 E1 00 FC */ stw r31, 0xfc(r1) -/* 802E9B1C 93 C1 00 F8 */ stw r30, 0xf8(r1) -/* 802E9B20 7C 7E 1B 78 */ mr r30, r3 -/* 802E9B24 7C 9F 23 78 */ mr r31, r4 -/* 802E9B28 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9B2C 4B FF FB 45 */ bl __ct__13J2DOrthoGraphFv -/* 802E9B30 80 1F 00 00 */ lwz r0, 0(r31) -/* 802E9B34 90 01 00 18 */ stw r0, 0x18(r1) -/* 802E9B38 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E9B3C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802E9B40 90 01 00 0C */ stw r0, 0xc(r1) -/* 802E9B44 90 01 00 08 */ stw r0, 8(r1) -/* 802E9B48 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9B4C 38 81 00 08 */ addi r4, r1, 8 -/* 802E9B50 38 A1 00 0C */ addi r5, r1, 0xc -/* 802E9B54 38 C1 00 10 */ addi r6, r1, 0x10 -/* 802E9B58 38 E1 00 14 */ addi r7, r1, 0x14 -/* 802E9B5C 4B FF F5 BD */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 802E9B60 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9B64 7F C4 F3 78 */ mr r4, r30 -/* 802E9B68 4B FF F6 F9 */ bl func_802E9260 -/* 802E9B6C 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802E9B70 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802E9B74 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802E9B78 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802E9B7C 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802E9B80 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802E9B84 83 E1 00 FC */ lwz r31, 0xfc(r1) -/* 802E9B88 83 C1 00 F8 */ lwz r30, 0xf8(r1) -/* 802E9B8C 80 01 01 04 */ lwz r0, 0x104(r1) -/* 802E9B90 7C 08 03 A6 */ mtlr r0 -/* 802E9B94 38 21 01 00 */ addi r1, r1, 0x100 -/* 802E9B98 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9BE8.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9BE8.s deleted file mode 100644 index 623dcf9e1d2..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9BE8.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_802E9BE8: -/* 802E9BE8 94 21 FF 00 */ stwu r1, -0x100(r1) -/* 802E9BEC 7C 08 02 A6 */ mflr r0 -/* 802E9BF0 90 01 01 04 */ stw r0, 0x104(r1) -/* 802E9BF4 39 61 01 00 */ addi r11, r1, 0x100 -/* 802E9BF8 48 07 85 E5 */ bl _savegpr_29 -/* 802E9BFC 7C 7D 1B 78 */ mr r29, r3 -/* 802E9C00 7C 9E 23 78 */ mr r30, r4 -/* 802E9C04 7C BF 2B 78 */ mr r31, r5 -/* 802E9C08 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9C0C 4B FF FA 65 */ bl __ct__13J2DOrthoGraphFv -/* 802E9C10 80 1E 00 00 */ lwz r0, 0(r30) -/* 802E9C14 90 01 00 18 */ stw r0, 0x18(r1) -/* 802E9C18 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E9C1C 90 01 00 10 */ stw r0, 0x10(r1) -/* 802E9C20 90 01 00 0C */ stw r0, 0xc(r1) -/* 802E9C24 90 01 00 08 */ stw r0, 8(r1) -/* 802E9C28 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9C2C 38 81 00 08 */ addi r4, r1, 8 -/* 802E9C30 38 A1 00 0C */ addi r5, r1, 0xc -/* 802E9C34 38 C1 00 10 */ addi r6, r1, 0x10 -/* 802E9C38 38 E1 00 14 */ addi r7, r1, 0x14 -/* 802E9C3C 4B FF F4 DD */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 802E9C40 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9C44 7F E4 FB 78 */ mr r4, r31 -/* 802E9C48 4B FF F5 ED */ bl setLineWidth__14J2DGrafContextFUc -/* 802E9C4C 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9C50 7F A4 EB 78 */ mr r4, r29 -/* 802E9C54 4B FF F7 15 */ bl func_802E9368 -/* 802E9C58 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802E9C5C 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802E9C60 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802E9C64 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802E9C68 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802E9C6C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802E9C70 39 61 01 00 */ addi r11, r1, 0x100 -/* 802E9C74 48 07 85 B5 */ bl _restgpr_29 -/* 802E9C78 80 01 01 04 */ lwz r0, 0x104(r1) -/* 802E9C7C 7C 08 03 A6 */ mtlr r0 -/* 802E9C80 38 21 01 00 */ addi r1, r1, 0x100 -/* 802E9C84 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/setLookat__13J2DOrthoGraphFv.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/setLookat__13J2DOrthoGraphFv.s deleted file mode 100644 index 737559c2e8f..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/setLookat__13J2DOrthoGraphFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802E9840: -/* 802E9840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E9844 7C 08 02 A6 */ mflr r0 -/* 802E9848 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E984C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E9850 7C 7F 1B 78 */ mr r31, r3 -/* 802E9854 38 7F 00 80 */ addi r3, r31, 0x80 -/* 802E9858 48 05 CC 2D */ bl PSMTXIdentity -/* 802E985C 38 7F 00 80 */ addi r3, r31, 0x80 -/* 802E9860 38 80 00 00 */ li r4, 0 -/* 802E9864 48 07 69 E9 */ bl GXLoadPosMtxImm -/* 802E9868 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E986C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E9870 7C 08 03 A6 */ mtlr r0 -/* 802E9874 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9878 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DOrthoGraph/setPort__13J2DOrthoGraphFv.s b/asm/JSystem/J2DGraph/J2DOrthoGraph/setPort__13J2DOrthoGraphFv.s deleted file mode 100644 index b487e26340a..00000000000 --- a/asm/JSystem/J2DGraph/J2DOrthoGraph/setPort__13J2DOrthoGraphFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802E97B4: -/* 802E97B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E97B8 7C 08 02 A6 */ mflr r0 -/* 802E97BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E97C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E97C4 7C 7F 1B 78 */ mr r31, r3 -/* 802E97C8 4B FF F3 ED */ bl setPort__14J2DGrafContextFv -/* 802E97CC 38 7F 00 40 */ addi r3, r31, 0x40 -/* 802E97D0 C0 3F 00 C0 */ lfs f1, 0xc0(r31) -/* 802E97D4 C0 5F 00 C8 */ lfs f2, 0xc8(r31) -/* 802E97D8 C0 7F 00 BC */ lfs f3, 0xbc(r31) -/* 802E97DC C0 9F 00 C4 */ lfs f4, 0xc4(r31) -/* 802E97E0 C0 BF 00 CC */ lfs f5, 0xcc(r31) -/* 802E97E4 C0 DF 00 D0 */ lfs f6, 0xd0(r31) -/* 802E97E8 48 05 D8 11 */ bl C_MTXOrtho -/* 802E97EC 38 7F 00 40 */ addi r3, r31, 0x40 -/* 802E97F0 38 80 00 01 */ li r4, 1 -/* 802E97F4 48 07 68 E1 */ bl GXSetProjection -/* 802E97F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E97FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E9800 7C 08 03 A6 */ mtlr r0 -/* 802E9804 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9808 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphAnimator/J3DModel/createShapePacket__8J3DModelFP12J3DModelData.s b/asm/JSystem/J3DGraphAnimator/J3DModel/createShapePacket__8J3DModelFP12J3DModelData.s deleted file mode 100644 index f31dcb65d76..00000000000 --- a/asm/JSystem/J3DGraphAnimator/J3DModel/createShapePacket__8J3DModelFP12J3DModelData.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80327300: -/* 80327300 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80327304 7C 08 02 A6 */ mflr r0 -/* 80327308 90 01 00 24 */ stw r0, 0x24(r1) -/* 8032730C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80327310 48 03 AE CD */ bl _savegpr_29 -/* 80327314 7C 7E 1B 78 */ mr r30, r3 -/* 80327318 7C 9F 23 78 */ mr r31, r4 -/* 8032731C A0 04 00 7C */ lhz r0, 0x7c(r4) -/* 80327320 28 00 00 00 */ cmplwi r0, 0 -/* 80327324 41 82 00 8C */ beq lbl_803273B0 -/* 80327328 54 1D 04 3E */ clrlwi r29, r0, 0x10 -/* 8032732C 1C 7D 00 3C */ mulli r3, r29, 0x3c -/* 80327330 38 63 00 10 */ addi r3, r3, 0x10 -/* 80327334 4B FA 79 91 */ bl __nwa__FUl -/* 80327338 3C 80 80 31 */ lis r4, __ct__14J3DShapePacketFv@ha /* 0x80312B20@ha */ -/* 8032733C 38 84 2B 20 */ addi r4, r4, __ct__14J3DShapePacketFv@l /* 0x80312B20@l */ -/* 80327340 3C A0 80 31 */ lis r5, __dt__14J3DShapePacketFv@ha /* 0x80312B74@ha */ -/* 80327344 38 A5 2B 74 */ addi r5, r5, __dt__14J3DShapePacketFv@l /* 0x80312B74@l */ -/* 80327348 38 C0 00 3C */ li r6, 0x3c -/* 8032734C 7F A7 EB 78 */ mr r7, r29 -/* 80327350 48 03 AB C5 */ bl __construct_new_array -/* 80327354 90 7E 00 C4 */ stw r3, 0xc4(r30) -/* 80327358 80 1E 00 C4 */ lwz r0, 0xc4(r30) -/* 8032735C 28 00 00 00 */ cmplwi r0, 0 -/* 80327360 40 82 00 0C */ bne lbl_8032736C -/* 80327364 38 60 00 04 */ li r3, 4 -/* 80327368 48 00 00 4C */ b lbl_803273B4 -lbl_8032736C: -/* 8032736C 38 C0 00 00 */ li r6, 0 -/* 80327370 38 60 00 00 */ li r3, 0 -/* 80327374 48 00 00 30 */ b lbl_803273A4 -lbl_80327378: -/* 80327378 80 9F 00 80 */ lwz r4, 0x80(r31) -/* 8032737C 54 C0 13 BA */ rlwinm r0, r6, 2, 0xe, 0x1d -/* 80327380 7C A4 00 2E */ lwzx r5, r4, r0 -/* 80327384 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80327388 38 03 00 28 */ addi r0, r3, 0x28 -/* 8032738C 7C A4 01 2E */ stwx r5, r4, r0 -/* 80327390 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80327394 38 03 00 38 */ addi r0, r3, 0x38 -/* 80327398 7F C4 01 2E */ stwx r30, r4, r0 -/* 8032739C 38 C6 00 01 */ addi r6, r6, 1 -/* 803273A0 38 63 00 3C */ addi r3, r3, 0x3c -lbl_803273A4: -/* 803273A4 A0 1F 00 7C */ lhz r0, 0x7c(r31) -/* 803273A8 7C 06 00 00 */ cmpw r6, r0 -/* 803273AC 41 80 FF CC */ blt lbl_80327378 -lbl_803273B0: -/* 803273B0 38 60 00 00 */ li r3, 0 -lbl_803273B4: -/* 803273B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 803273B8 48 03 AE 71 */ bl _restgpr_29 -/* 803273BC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803273C0 7C 08 03 A6 */ mtlr r0 -/* 803273C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 803273C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/getType__15J3DIndBlockNullFv.s b/asm/JSystem/J3DGraphBase/J3DMaterial/getType__15J3DIndBlockNullFv.s deleted file mode 100644 index 530187b3bb2..00000000000 --- a/asm/JSystem/J3DGraphBase/J3DMaterial/getType__15J3DIndBlockNullFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_803173A4: -/* 803173A4 3C 60 49 42 */ lis r3, 0x4942 /* 0x49424C4E@ha */ -/* 803173A8 38 63 4C 4E */ addi r3, r3, 0x4C4E /* 0x49424C4E@l */ -/* 803173AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JParticle/JPAEmitter/createParticle__14JPABaseEmitterFv.s b/asm/JSystem/JParticle/JPAEmitter/createParticle__14JPABaseEmitterFv.s deleted file mode 100644 index 9802ab4102e..00000000000 --- a/asm/JSystem/JParticle/JPAEmitter/createParticle__14JPABaseEmitterFv.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_8027EA40: -/* 8027EA40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8027EA44 7C 08 02 A6 */ mflr r0 -/* 8027EA48 90 01 00 14 */ stw r0, 0x14(r1) -/* 8027EA4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8027EA50 93 C1 00 08 */ stw r30, 8(r1) -/* 8027EA54 7C 7E 1B 78 */ mr r30, r3 -/* 8027EA58 80 83 00 E0 */ lwz r4, 0xe0(r3) -/* 8027EA5C 80 04 00 08 */ lwz r0, 8(r4) -/* 8027EA60 28 00 00 00 */ cmplwi r0, 0 -/* 8027EA64 41 82 00 E0 */ beq lbl_8027EB44 -/* 8027EA68 3B E0 00 00 */ li r31, 0 -/* 8027EA6C 80 04 00 08 */ lwz r0, 8(r4) -/* 8027EA70 28 00 00 01 */ cmplwi r0, 1 -/* 8027EA74 40 82 00 24 */ bne lbl_8027EA98 -/* 8027EA78 83 E4 00 00 */ lwz r31, 0(r4) -/* 8027EA7C 38 00 00 00 */ li r0, 0 -/* 8027EA80 90 04 00 04 */ stw r0, 4(r4) -/* 8027EA84 90 04 00 00 */ stw r0, 0(r4) -/* 8027EA88 80 64 00 08 */ lwz r3, 8(r4) -/* 8027EA8C 38 03 FF FF */ addi r0, r3, -1 -/* 8027EA90 90 04 00 08 */ stw r0, 8(r4) -/* 8027EA94 48 00 00 30 */ b lbl_8027EAC4 -lbl_8027EA98: -/* 8027EA98 28 00 00 00 */ cmplwi r0, 0 -/* 8027EA9C 41 82 00 28 */ beq lbl_8027EAC4 -/* 8027EAA0 83 E4 00 00 */ lwz r31, 0(r4) -/* 8027EAA4 38 00 00 00 */ li r0, 0 -/* 8027EAA8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8027EAAC 90 03 00 00 */ stw r0, 0(r3) -/* 8027EAB0 80 1F 00 04 */ lwz r0, 4(r31) -/* 8027EAB4 90 04 00 00 */ stw r0, 0(r4) -/* 8027EAB8 80 64 00 08 */ lwz r3, 8(r4) -/* 8027EABC 38 03 FF FF */ addi r0, r3, -1 -/* 8027EAC0 90 04 00 08 */ stw r0, 8(r4) -lbl_8027EAC4: -/* 8027EAC4 80 1E 00 C8 */ lwz r0, 0xc8(r30) -/* 8027EAC8 28 00 00 00 */ cmplwi r0, 0 -/* 8027EACC 41 82 00 24 */ beq lbl_8027EAF0 -/* 8027EAD0 38 00 00 00 */ li r0, 0 -/* 8027EAD4 90 1F 00 00 */ stw r0, 0(r31) -/* 8027EAD8 80 1E 00 C8 */ lwz r0, 0xc8(r30) -/* 8027EADC 90 1F 00 04 */ stw r0, 4(r31) -/* 8027EAE0 80 7E 00 C8 */ lwz r3, 0xc8(r30) -/* 8027EAE4 93 E3 00 00 */ stw r31, 0(r3) -/* 8027EAE8 93 FE 00 C8 */ stw r31, 0xc8(r30) -/* 8027EAEC 48 00 00 18 */ b lbl_8027EB04 -lbl_8027EAF0: -/* 8027EAF0 93 FE 00 CC */ stw r31, 0xcc(r30) -/* 8027EAF4 93 FE 00 C8 */ stw r31, 0xc8(r30) -/* 8027EAF8 38 00 00 00 */ li r0, 0 -/* 8027EAFC 90 1F 00 00 */ stw r0, 0(r31) -/* 8027EB00 90 1F 00 04 */ stw r0, 4(r31) -lbl_8027EB04: -/* 8027EB04 80 7E 00 D0 */ lwz r3, 0xd0(r30) -/* 8027EB08 38 03 00 01 */ addi r0, r3, 1 -/* 8027EB0C 90 1E 00 D0 */ stw r0, 0xd0(r30) -/* 8027EB10 80 7E 00 E8 */ lwz r3, 0xe8(r30) -/* 8027EB14 80 83 00 2C */ lwz r4, 0x2c(r3) -/* 8027EB18 80 7E 00 E4 */ lwz r3, 0xe4(r30) -/* 8027EB1C 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8027EB20 81 84 00 04 */ lwz r12, 4(r4) -/* 8027EB24 7D 89 03 A6 */ mtctr r12 -/* 8027EB28 4E 80 04 21 */ bctrl -/* 8027EB2C 38 7F 00 08 */ addi r3, r31, 8 -/* 8027EB30 80 9E 00 E4 */ lwz r4, 0xe4(r30) -/* 8027EB34 80 84 00 20 */ lwz r4, 0x20(r4) -/* 8027EB38 48 00 04 B5 */ bl init_p__15JPABaseParticleFP18JPAEmitterWorkData -/* 8027EB3C 38 7F 00 08 */ addi r3, r31, 8 -/* 8027EB40 48 00 00 08 */ b lbl_8027EB48 -lbl_8027EB44: -/* 8027EB44 38 60 00 00 */ li r3, 0 -lbl_8027EB48: -/* 8027EB48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8027EB4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8027EB50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8027EB54 7C 08 03 A6 */ mtlr r0 -/* 8027EB58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027EB5C 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h index dd85bce171e..7d7efa7a65b 100644 --- a/include/JSystem/J2DGraph/J2DGrafContext.h +++ b/include/JSystem/J2DGraph/J2DGrafContext.h @@ -10,6 +10,7 @@ class J2DGrafContext { public: /* 802E8B08 */ J2DGrafContext(f32, f32, f32, f32); /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); + void setColor(JUtility::TColor c) { this->setColor(c, c, c, c); } /* 802E9118 */ void setColor(JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor); /* 802E9234 */ void setLineWidth(u8); @@ -17,26 +18,33 @@ public: /* 802E9368 */ void drawFrame(JGeometry::TBox2 const&); /* 802E9488 */ void line(JGeometry::TVec2, JGeometry::TVec2); /* 802E9564 */ void lineTo(JGeometry::TVec2); + void lineTo(f32 x, f32 y) { this->lineTo(JGeometry::TVec2(x, y)); } + void moveTo(f32 x, f32 y) { this->moveTo(JGeometry::TVec2(x, y)); } - /* 802E95D4 */ virtual ~J2DGrafContext(); + void moveTo(JGeometry::TVec2 pos) { mPrevPos = pos; } + + /* 802E95D4 */ virtual ~J2DGrafContext() {} /* 802E90E4 */ virtual void place(JGeometry::TBox2 const&); - /* 802E961C */ virtual void place(f32, f32, f32, f32); + /* 802E961C */ virtual void place(f32 x, f32 y, f32 width, f32 height) { + JGeometry::TBox2 box(x, y, x + width, y + height); + this->place(box); + } /* 802E8BB4 */ virtual void setPort(); /* 802E8C44 */ virtual void setup2D(); /* 802E8E20 */ virtual void setScissor(); - /* 802E9664 */ virtual bool getGrafType() const; - /* 802E966C */ virtual void setLookat(); + /* 802E9664 */ virtual s32 getGrafType() const { return 0; } + /* 802E966C */ virtual void setLookat() {} -private: +protected: /* 0x04 */ JGeometry::TBox2 mBounds; /* 0x14 */ JGeometry::TBox2 mScissorBounds; - /* 0x24 */ JUtility::TColor field_0x24; - /* 0x28 */ JUtility::TColor field_0x28; - /* 0x2C */ JUtility::TColor field_0x2c; - /* 0x30 */ JUtility::TColor field_0x30; + /* 0x24 */ JUtility::TColor mColorTL; + /* 0x28 */ JUtility::TColor mColorTR; + /* 0x2C */ JUtility::TColor mColorBR; + /* 0x30 */ JUtility::TColor mColorBL; /* 0x34 */ u8 mLineWidth; - /* 0x38 */ JGeometry::TVec2 field_0x14; - /* 0x40 */ u8 field_0x40[0x40]; + /* 0x38 */ JGeometry::TVec2 mPrevPos; + /* 0x40 */ Mtx44 mMtx44; /* 0x80 */ Mtx mPosMtx; /* 0xB0 */ u8 field_0xb0; /* 0xB1 */ u8 field_0xb1; diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h index 4973087f935..8259b27c946 100644 --- a/include/JSystem/J2DGraph/J2DOrthoGraph.h +++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h @@ -11,10 +11,12 @@ public: /* 802E980C */ void setOrtho(JGeometry::TBox2 const&, f32, f32); /* 802E987C */ void scissorBounds(JGeometry::TBox2*, JGeometry::TBox2 const*); - /* 8000B118 */ virtual ~J2DOrthoGraph(); + /* 8000B118 */ virtual ~J2DOrthoGraph() {} /* 802E97B4 */ virtual void setPort(); - /* 802E9C88 */ virtual bool getGrafType() const; + /* 802E9C88 */ virtual s32 getGrafType() const { return 1; } /* 802E9840 */ virtual void setLookat(); + f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); } + f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); } private: /* 0xBC */ JGeometry::TBox2 mOrtho; @@ -22,4 +24,10 @@ private: /* 0xD0 */ f32 mFar; }; +void J2DFillBox(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color); +void J2DFillBox(JGeometry::TBox2 const& param_0, JUtility::TColor param_1); +void J2DDrawFrame(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor param_4, + u8 param_5); +void J2DDrawFrame(JGeometry::TBox2 const& param_0, JUtility::TColor param_1, u8 param_2); + #endif /* J2DORTHOGRAPH_H */ diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 2bb4e5f8525..0da0a2718b2 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -51,9 +51,9 @@ struct TVec2 { } void setMin(const TVec2& min) { - if (min.x <= x) + if (x >= min.x) x = min.x; - if (min.y <= y) + if (y >= min.y) y = min.y; } @@ -70,7 +70,7 @@ struct TVec2 { } bool isAbove(const TVec2& other) const { - return (other.x <= x) && (other.y <= y) ? true : false; + return (x >= other.x) && (y >= other.y) ? true : false; } T x; @@ -90,14 +90,6 @@ template<> struct TBox > { f32 getWidth() const { return f.x - i.x; } f32 getHeight() const { return f.y - i.y; } - inline void operator= (const TBox >& rhs) { - // ??? - *(u32*)&i.x = *(u32*)&rhs.i.x; - *(u32*)&i.y = *(u32*)&rhs.i.y; - *(u32*)&f.x = *(u32*)&rhs.f.x; - *(u32*)&f.y = *(u32*)&rhs.f.y; - } - bool isValid() const { return f.isAbove(i); } void addPos(const TVec2& pos) { @@ -117,9 +109,19 @@ template<> struct TBox > { template struct TBox2 : TBox > { TBox2() {} + TBox2(const TVec2& i, const TVec2 f) { set(i, f); } TBox2(f32 x0, f32 y0, f32 x1, f32 y1) { set(x0, y0, x1, y1); } - inline const TBox2& operator=(const TBox2& rhs) { *(TBox >*)this = rhs; } + void absolute() { + if (!this->isValid()) { + TBox2 box(*this); + this->i.setMin(box.i); + this->i.setMin(box.f); + this->f.setMax(box.i); + this->f.setMax(box.f); + } + } + void set(const TBox2& other) { set(other.i, other.f); } void set(const TVec2& i, const TVec2 f) { this->i.set(i), this->f.set(f); } void set(f32 x0, f32 y0, f32 x1, f32 y1) { i.set(x0, y0); f.set(x1, y1); } @@ -129,4 +131,4 @@ struct TBox2 : TBox > { } // namespace JGeometry -#endif \ No newline at end of file +#endif diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index a816a208486..e98033adfab 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -909,6 +909,20 @@ void GXSetIndTexMtx(GXIndTexMtxID, Mtx23, s8); void GXSetIndTexCoordScale(GXIndTexStageID, GXIndTexScale, GXIndTexScale); void GXSetIndTexOrder(GXIndTexStageID, GXTexCoordID, GXTexMapID); void GXEnableTexOffsets(GXTexCoordID, GXBool, GXBool); + +#define GFX_FIFO(T) (*(volatile T*)0xCC008000) + +inline void GXPosition3f32(f32 x, f32 y, f32 z) { + GFX_FIFO(f32) = x; + GFX_FIFO(f32) = y; + GFX_FIFO(f32) = z; +} + +inline void GXColor1u32(u32 c) { + GFX_FIFO(u32) = c; +} + +inline void GXEnd() {} }; #endif diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp index 17ba073c94d..8c949073184 100644 --- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp @@ -6,95 +6,23 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__14J2DGrafContextFffff(); -extern "C" void setPort__14J2DGrafContextFv(); -extern "C" void setup2D__14J2DGrafContextFv(); -extern "C" void setScissor__14J2DGrafContextFv(); -extern "C" void func_802E90C0(); -extern "C" void func_802E90E4(); -extern "C" void -setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void setLineWidth__14J2DGrafContextFUc(); -extern "C" void func_802E9260(); -extern "C" void func_802E9368(); -extern "C" void func_802E9488(); -extern "C" void func_802E9564(); -extern "C" void __dt__14J2DGrafContextFv(); -extern "C" void place__14J2DGrafContextFffff(); -extern "C" bool getGrafType__14J2DGrafContextCFv(); -extern "C" void setLookat__14J2DGrafContextFv(); - -// -// External References: -// - -extern "C" void __dl__FPv(); -extern "C" void __cvt_fp2unsigned(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" void ceil(); +#include "msl_c/math.h" // // Declarations: // -/* ############################################################################################## */ -/* 803CC9B8-803CC9E0 029AD8 0028+00 2/2 13/13 0/0 .data __vt__14J2DGrafContext */ -SECTION_DATA extern void* __vt__14J2DGrafContext[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14J2DGrafContextFv, - (void*)func_802E90E4, - (void*)place__14J2DGrafContextFffff, - (void*)setPort__14J2DGrafContextFv, - (void*)setup2D__14J2DGrafContextFv, - (void*)setScissor__14J2DGrafContextFv, - (void*)getGrafType__14J2DGrafContextCFv, - (void*)setLookat__14J2DGrafContextFv, -}; - /* 802E8B08-802E8BB4 2E3448 00AC+00 0/0 2/2 0/0 .text __ct__14J2DGrafContextFffff */ -// reversed stack -#ifdef NONMATCHING J2DGrafContext::J2DGrafContext(f32 left, f32 top, f32 right, f32 bottom) : mBounds(left, top, left + right, top + bottom), - mScissorBounds(left, top, left + right, top + bottom), field_0x24(-1), field_0x28(-1), - field_0x2c(-1), field_0x30(-1) { + mScissorBounds(left, top, left + right, top + bottom), mColorTL(-1), mColorTR(-1), + mColorBR(-1), mColorBL(-1) { JUtility::TColor color(-1); - setColor(color, color, color, color); + setColor(color); setLineWidth(6); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DGrafContext::J2DGrafContext(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/__ct__14J2DGrafContextFffff.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80456148-8045614C 004748 0004+00 5/5 0/0 0/0 .sdata2 @627 */ -SECTION_SDATA2 static u8 lit_627[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8045614C-80456150 00474C 0004+00 1/1 0/0 0/0 .sdata2 @628 */ -SECTION_SDATA2 static f32 lit_628 = 1.0f; /* 802E8BB4-802E8C44 2E34F4 0090+00 1/0 1/1 0/0 .text setPort__14J2DGrafContextFv */ -// matches with literal -#ifdef NONMATCHING void J2DGrafContext::setPort() { setScissor(); setup2D(); @@ -112,160 +40,182 @@ void J2DGrafContext::setPort() { } GXSetViewport(x_origin, y_origin, width - x_origin, height - y_origin, 0.0f, 1.0f); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::setPort() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/setPort__14J2DGrafContextFv.s" -} -#pragma pop -#endif /* 802E8C44-802E8E20 2E3584 01DC+00 1/0 1/0 0/0 .text setup2D__14J2DGrafContextFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::setup2D() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/setup2D__14J2DGrafContextFv.s" +void J2DGrafContext::setup2D() { + GXSetNumIndStages(0); + for (int i = 0; i < GX_MAX_TEVSTAGE; i++) { + GXSetTevDirect((GXTevStageID)i); + } + GXSetZCompLoc(GX_FALSE); + GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0); + GXSetZMode(GX_FALSE, GX_LEQUAL, GX_FALSE); + GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR); + GXSetNumChans(1); + GXSetNumTevStages(1); + GXSetNumTexGens(0); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetCullMode(GX_CULL_NONE); + GXLoadPosMtxImm(mPosMtx, 0); + Mtx mtx; + PSMTXIdentity(mtx); + GXLoadTexMtxImm(mtx, 0x3c, GX_MTX3x4); + GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE, + GX_AF_NONE); + GXSetChanCtrl(GX_COLOR1A1, GX_FALSE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE, + GX_AF_NONE); + GXSetCurrentMtx(0); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3c, GX_FALSE, 0x7d); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 0xf); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX1, GX_CLR_RGBA, GX_RGBX8, 0xf); + GXSetLineWidth(mLineWidth, GX_TO_ZERO); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_NONE); } -#pragma pop - -/* ############################################################################################## */ -/* 80456150-80456158 004750 0004+04 1/1 0/0 0/0 .sdata2 @730 */ -SECTION_SDATA2 static f32 lit_730[1 + 1 /* padding */] = { - 1024.0f, - /* padding */ - 0.0f, -}; - -/* 80456158-80456160 004758 0008+00 1/1 0/0 0/0 .sdata2 @732 */ -SECTION_SDATA2 static f64 lit_732 = 4503599627370496.0 /* cast u32 to float */; /* 802E8E20-802E90C0 2E3760 02A0+00 1/0 2/1 0/0 .text setScissor__14J2DGrafContextFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::setScissor() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/setScissor__14J2DGrafContextFv.s" +void J2DGrafContext::setScissor() { + JGeometry::TBox2 bounds(0, 0, 1024, 1024); + JGeometry::TBox2 curBounds(mScissorBounds); + mScissorBounds.intersect(bounds); + curBounds.absolute(); + if (curBounds.intersect(bounds)) { + curBounds.i.x = (u32)curBounds.i.x; + curBounds.i.y = (u32)curBounds.i.y; + curBounds.f.x = ceil(curBounds.f.x); + curBounds.f.y = ceil(curBounds.f.y); + GXSetScissor(curBounds.i.x, curBounds.i.y, curBounds.getWidth(), curBounds.getHeight()); + } else { + GXSetScissor(0, 0, 0, 0); + } } -#pragma pop /* 802E90C0-802E90E4 2E3A00 0024+00 0/0 10/10 0/0 .text * scissor__14J2DGrafContextFRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::scissor(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/func_802E90C0.s" +void J2DGrafContext::scissor(JGeometry::TBox2 const& bounds) { + mScissorBounds = bounds; } -#pragma pop /* 802E90E4-802E9118 2E3A24 0034+00 1/0 1/0 0/0 .text * place__14J2DGrafContextFRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::place(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/func_802E90E4.s" +void J2DGrafContext::place(JGeometry::TBox2 const& bounds) { + mBounds = bounds; + mScissorBounds = bounds; } -#pragma pop /* 802E9118-802E9234 2E3A58 011C+00 1/1 4/4 0/0 .text * setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::setColor(JUtility::TColor param_0, JUtility::TColor param_1, - JUtility::TColor param_2, JUtility::TColor param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/func_802E9118.s" +void J2DGrafContext::setColor(JUtility::TColor colorTL, JUtility::TColor colorTR, + JUtility::TColor colorBR, JUtility::TColor colorBL) { + mColorTL = colorTL; + mColorTR = colorTR; + mColorBR = colorBR; + mColorBL = colorBL; + field_0xb0 = GX_BM_BLEND; + field_0xb1 = GX_BL_SRC_ALPHA; + field_0xb2 = GX_BL_INV_SRC_ALPHA; + mLineBlendMode = GX_BM_BLEND; + mLineSrcBlendFactor = GX_BL_SRC_ALPHA; + mLineDstBlendFactor = GX_BL_INV_SRC_ALPHA; + mBoxBlendMode = GX_BM_BLEND; + mBoxSrcBlendFactor = GX_BL_SRC_ALPHA; + mBoxDstBlendFactor = GX_BL_INV_SRC_ALPHA; + if ((mColorTL & 0xFF) != 0xFF) { + return; + } + field_0xb0 = GX_BM_NONE; + field_0xb1 = GX_BL_ONE; + field_0xb2 = GX_BL_ZERO; + if ((mColorBR & 0xFF) != 0xFF) { + return; + } + mLineBlendMode = GX_BM_NONE; + mLineSrcBlendFactor = GX_BL_ONE; + mLineDstBlendFactor = GX_BL_ZERO; + if ((mColorTR & 0xFF) != 0xFF) { + return; + } + if ((mColorBL & 0xFF) != 0xFF) { + return; + } + mBoxBlendMode = GX_BM_NONE; + mBoxSrcBlendFactor = GX_BL_ONE; + mBoxDstBlendFactor = GX_BL_ZERO; } -#pragma pop /* 802E9234-802E9260 2E3B74 002C+00 1/1 2/2 0/0 .text setLineWidth__14J2DGrafContextFUc */ -void J2DGrafContext::setLineWidth(u8 param_0) { - mLineWidth = param_0; +void J2DGrafContext::setLineWidth(u8 lineWidth) { + mLineWidth = lineWidth; GXSetLineWidth(mLineWidth, GX_TO_ZERO); } /* 802E9260-802E9368 2E3BA0 0108+00 0/0 2/2 0/0 .text * fillBox__14J2DGrafContextFRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::fillBox(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/func_802E9260.s" +void J2DGrafContext::fillBox(JGeometry::TBox2 const& box) { + GXSetBlendMode((GXBlendMode)mBoxBlendMode, (GXBlendFactor)mBoxSrcBlendFactor, + (GXBlendFactor)mBoxDstBlendFactor, GX_LO_SET); + GXLoadPosMtxImm(mPosMtx, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3f32(box.i.x, box.i.y, 0); + GXColor1u32(mColorTL); + GXPosition3f32(box.f.x, box.i.y, 0); + GXColor1u32(mColorTR); + GXPosition3f32(box.f.x, box.f.y, 0); + GXColor1u32(mColorBL); + GXPosition3f32(box.i.x, box.f.y, 0); + GXColor1u32(mColorBR); + GXEnd(); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); } -#pragma pop /* 802E9368-802E9488 2E3CA8 0120+00 0/0 1/1 0/0 .text * drawFrame__14J2DGrafContextFRCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::drawFrame(JGeometry::TBox2 const& param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/func_802E9368.s" +void J2DGrafContext::drawFrame(JGeometry::TBox2 const& box) { + GXSetBlendMode((GXBlendMode)mBoxBlendMode, (GXBlendFactor)mBoxSrcBlendFactor, + (GXBlendFactor)mBoxDstBlendFactor, GX_LO_SET); + GXLoadPosMtxImm(mPosMtx, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); + GXBegin(GX_LINESTRIP, GX_VTXFMT0, 5); + GXPosition3f32(box.i.x, box.i.y, 0); + GXColor1u32(mColorTL); + GXPosition3f32(box.f.x, box.i.y, 0); + GXColor1u32(mColorTR); + GXPosition3f32(box.f.x, box.f.y, 0); + GXColor1u32(mColorBL); + GXPosition3f32(box.i.x, box.f.y, 0); + GXColor1u32(mColorBR); + GXPosition3f32(box.i.x, box.i.y, 0); + GXColor1u32(mColorTL); + GXEnd(); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); } -#pragma pop /* 802E9488-802E9564 2E3DC8 00DC+00 1/1 0/0 0/0 .text * line__14J2DGrafContextFQ29JGeometry8TVec2Q29JGeometry8TVec2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::line(JGeometry::TVec2 param_0, JGeometry::TVec2 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/func_802E9488.s" +void J2DGrafContext::line(JGeometry::TVec2 start, JGeometry::TVec2 end) { + GXSetBlendMode((GXBlendMode)mLineBlendMode, (GXBlendFactor)mLineSrcBlendFactor, + (GXBlendFactor)mLineDstBlendFactor, GX_LO_SET); + GXLoadPosMtxImm(mPosMtx, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); + GXBegin(GX_LINES, GX_VTXFMT0, 2); + GXPosition3f32(start.x, start.y, 0); + GXColor1u32(mColorTL); + GXPosition3f32(end.x, end.y, 0); + GXColor1u32(mColorBR); + GXEnd(); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); } -#pragma pop /* 802E9564-802E95D4 2E3EA4 0070+00 0/0 1/1 0/0 .text * lineTo__14J2DGrafContextFQ29JGeometry8TVec2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::lineTo(JGeometry::TVec2 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/func_802E9564.s" -} -#pragma pop - -/* 802E95D4-802E961C 2E3F14 0048+00 1/0 0/0 0/0 .text __dt__14J2DGrafContextFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DGrafContext::~J2DGrafContext() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/__dt__14J2DGrafContextFv.s" -} -#pragma pop - -/* 802E961C-802E9664 2E3F5C 0048+00 1/0 1/0 0/0 .text place__14J2DGrafContextFffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DGrafContext::place(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DGrafContext/place__14J2DGrafContextFffff.s" -} -#pragma pop - -/* 802E9664-802E966C 2E3FA4 0008+00 1/0 0/0 0/0 .text getGrafType__14J2DGrafContextCFv */ -bool J2DGrafContext::getGrafType() const { - return false; -} - -/* 802E966C-802E9670 2E3FAC 0004+00 1/0 0/0 0/0 .text setLookat__14J2DGrafContextFv */ -void J2DGrafContext::setLookat() { - /* empty function */ +void J2DGrafContext::lineTo(JGeometry::TVec2 pos) { + this->line(mPrevPos, pos); + mPrevPos = pos; } diff --git a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp index efa8d989a77..6c68036445e 100644 --- a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp +++ b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp @@ -49,147 +49,93 @@ extern "C" extern void* __vt__14J2DGrafContext[10]; // Declarations: // -/* ############################################################################################## */ -/* 803CC9E0-803CCA08 029B00 0028+00 5/5 9/9 0/0 .data __vt__13J2DOrthoGraph */ -SECTION_DATA extern void* __vt__13J2DOrthoGraph[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__13J2DOrthoGraphFv, - (void*)func_802E90E4, - (void*)place__14J2DGrafContextFffff, - (void*)setPort__13J2DOrthoGraphFv, - (void*)setup2D__14J2DGrafContextFv, - (void*)setScissor__14J2DGrafContextFv, - (void*)getGrafType__13J2DOrthoGraphCFv, - (void*)setLookat__13J2DOrthoGraphFv, -}; - -/* 80456160-80456168 004760 0004+04 3/3 0/0 0/0 .sdata2 @522 */ -SECTION_SDATA2 static f32 lit_522[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - /* 802E9670-802E96D0 2E3FB0 0060+00 3/3 1/1 0/0 .text __ct__13J2DOrthoGraphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DOrthoGraph::J2DOrthoGraph() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFv.s" +J2DOrthoGraph::J2DOrthoGraph() : J2DGrafContext(0, 0, 0, 0) { + this->setLookat(); } -#pragma pop /* 802E96D0-802E97B4 2E4010 00E4+00 0/0 7/7 0/0 .text __ct__13J2DOrthoGraphFffffff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DOrthoGraph::J2DOrthoGraph(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/__ct__13J2DOrthoGraphFffffff.s" +J2DOrthoGraph::J2DOrthoGraph(f32 left, f32 top, f32 right, f32 bottom, f32 param_4, f32 param_5) + : J2DGrafContext(left, top, right, bottom) { + mOrtho = JGeometry::TBox2(0, 0, right, bottom); + mNear = -param_5; + mFar = -param_4; + this->setLookat(); } -#pragma pop /* 802E97B4-802E980C 2E40F4 0058+00 1/0 6/6 0/0 .text setPort__13J2DOrthoGraphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DOrthoGraph::setPort() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/setPort__13J2DOrthoGraphFv.s" +void J2DOrthoGraph::setPort() { + this->J2DGrafContext::setPort(); + C_MTXOrtho(mMtx44, mOrtho.i.y, mOrtho.f.y, mOrtho.i.x, mOrtho.f.x, mNear, mFar); + GXSetProjection(mMtx44, GX_ORTHOGRAPHIC); } -#pragma pop /* 802E980C-802E9840 2E414C 0034+00 0/0 5/5 0/0 .text * setOrtho__13J2DOrthoGraphFRCQ29JGeometry8TBox2ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DOrthoGraph::setOrtho(JGeometry::TBox2 const& param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E980C.s" +void J2DOrthoGraph::setOrtho(JGeometry::TBox2 const& bounds, f32 far, f32 near) { + mOrtho = bounds; + mNear = -near; + mFar = -far; } -#pragma pop /* 802E9840-802E987C 2E4180 003C+00 1/0 0/0 0/0 .text setLookat__13J2DOrthoGraphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DOrthoGraph::setLookat() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/setLookat__13J2DOrthoGraphFv.s" +void J2DOrthoGraph::setLookat() { + PSMTXIdentity(mPosMtx); + GXLoadPosMtxImm(mPosMtx, 0); } -#pragma pop /* 802E987C-802E9998 2E41BC 011C+00 0/0 1/1 0/0 .text * scissorBounds__13J2DOrthoGraphFPQ29JGeometry8TBox2PCQ29JGeometry8TBox2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DOrthoGraph::scissorBounds(JGeometry::TBox2* param_0, - JGeometry::TBox2 const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E987C.s" +void J2DOrthoGraph::scissorBounds(JGeometry::TBox2* param_0, + JGeometry::TBox2 const* param_1) { + f32 widthPower = this->getWidthPower(); + f32 heightPower = this->getHeightPower(); + f32 ix = mBounds.i.x >= 0 ? mBounds.i.x : 0; + f32 iy = mBounds.i.y >= 0 ? mBounds.i.y : 0; + f32 f0 = ix + widthPower * (param_1->i.x - mOrtho.i.x); + f32 f2 = ix + widthPower * (param_1->f.x - mOrtho.i.x); + f32 f1 = iy + heightPower * (param_1->i.y - mOrtho.i.y); + f32 f3 = iy + heightPower * (param_1->f.y - mOrtho.i.y); + param_0->set(f0, f1, f2, f3); + param_0->intersect(mScissorBounds); } -#pragma pop /* 802E9998-802E9AC4 2E42D8 012C+00 0/0 6/6 0/0 .text J2DDrawLine__FffffQ28JUtility6TColori */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DDrawLine(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor param_4, - int param_5) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawLine__FffffQ28JUtility6TColori.s" +void J2DDrawLine(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color, + int line_width) { + J2DOrthoGraph oGrph; + oGrph.setLineWidth(line_width); + oGrph.setColor(color); + oGrph.moveTo(param_0, param_1); + oGrph.lineTo(param_2, param_3); } -#pragma pop /* 802E9AC4-802E9B0C 2E4404 0048+00 0/0 10/10 0/0 .text J2DFillBox__FffffQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DFillBox(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor param_4) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/J2DFillBox__FffffQ28JUtility6TColor.s" +void J2DFillBox(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color) { + J2DFillBox(JGeometry::TBox2(param_0, param_1, param_0 + param_2, param_1 + param_3), + color); } -#pragma pop /* 802E9B0C-802E9B9C 2E444C 0090+00 1/1 0/0 0/0 .text * J2DFillBox__FRCQ29JGeometry8TBox2Q28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DFillBox(JGeometry::TBox2 const& param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9B0C.s" +void J2DFillBox(JGeometry::TBox2 const& param_0, JUtility::TColor param_1) { + J2DOrthoGraph oGrph; + oGrph.setColor(param_1); + oGrph.fillBox(param_0); } -#pragma pop /* 802E9B9C-802E9BE8 2E44DC 004C+00 0/0 5/5 0/0 .text J2DDrawFrame__FffffQ28JUtility6TColorUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DDrawFrame(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor param_4, - u8 param_5) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/J2DDrawFrame__FffffQ28JUtility6TColorUc.s" +void J2DDrawFrame(f32 param_0, f32 param_1, f32 param_2, f32 param_3, JUtility::TColor color, + u8 line_width) { + J2DDrawFrame(JGeometry::TBox2(param_0, param_1, param_0 + param_2, param_1 + param_3), + color, line_width); } -#pragma pop /* 802E9BE8-802E9C88 2E4528 00A0+00 1/1 0/0 0/0 .text * J2DDrawFrame__FRCQ29JGeometry8TBox2Q28JUtility6TColorUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DDrawFrame(JGeometry::TBox2 const& param_0, JUtility::TColor param_1, u8 param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DOrthoGraph/func_802E9BE8.s" -} -#pragma pop - -/* 802E9C88-802E9C90 2E45C8 0008+00 1/0 0/0 0/0 .text getGrafType__13J2DOrthoGraphCFv */ -bool J2DOrthoGraph::getGrafType() const { - return true; +void J2DDrawFrame(JGeometry::TBox2 const& param_0, JUtility::TColor color, u8 line_width) { + J2DOrthoGraph oGrph; + oGrph.setColor(color); + oGrph.setLineWidth(line_width); + oGrph.drawFrame(param_0); } diff --git a/libs/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp index c56bbc357ff..1bea7c33c73 100644 --- a/libs/JSystem/JUtility/JUTDbPrint.cpp +++ b/libs/JSystem/JUtility/JUTDbPrint.cpp @@ -4,25 +4,13 @@ // #include "JSystem/JUtility/JUTDbPrint.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JUtility/JUTVideo.h" #include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h" #include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h" #include "dol2asm.h" #include "dolphin/types.h" -class J2DGrafContext { -public: - virtual ~J2DGrafContext(){}; -}; - -class J2DOrthoGraph : public J2DGrafContext { -public: - char fake[0xd0]; - J2DOrthoGraph(f32, f32, f32, f32, f32, f32); - virtual ~J2DOrthoGraph(){}; - void setPort(); -}; - /* 802E0148-802E0190 2DAA88 0048+00 1/1 0/0 0/0 .text __ct__10JUTDbPrintFP7JUTFontP7JKRHeap */ JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont;