J3D setup (#155)

* setup j3d classes

* remove asm

* fixes

* fix newDifferedDisplayList

11 files changed, 0 insertions, 218 deletions

diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__12J3DMatPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__12J3DMatPacketFv.s
deleted file mode 100644
index 1f6a2f6e5d..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__12J3DMatPacketFv.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_80312948:
-/* 80312948  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8031294C  7C 08 02 A6 */	mflr r0
-/* 80312950  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80312954  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80312958  7C 7F 1B 78 */	mr r31, r3
-/* 8031295C  4B FF FE 1D */	bl __ct__13J3DDrawPacketFv
-/* 80312960  3C 60 80 3D */	lis r3, __vt__12J3DMatPacket@ha /* 0x803CD954@ha */
-/* 80312964  38 03 D9 54 */	addi r0, r3, __vt__12J3DMatPacket@l /* 0x803CD954@l */
-/* 80312968  90 1F 00 00 */	stw r0, 0(r31)
-/* 8031296C  38 60 00 00 */	li r3, 0
-/* 80312970  90 7F 00 28 */	stw r3, 0x28(r31)
-/* 80312974  90 7F 00 2C */	stw r3, 0x2c(r31)
-/* 80312978  90 7F 00 30 */	stw r3, 0x30(r31)
-/* 8031297C  38 00 FF FF */	li r0, -1
-/* 80312980  90 1F 00 34 */	stw r0, 0x34(r31)
-/* 80312984  90 7F 00 38 */	stw r3, 0x38(r31)
-/* 80312988  90 7F 00 3C */	stw r3, 0x3c(r31)
-/* 8031298C  7F E3 FB 78 */	mr r3, r31
-/* 80312990  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80312994  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80312998  7C 08 03 A6 */	mtlr r0
-/* 8031299C  38 21 00 10 */	addi r1, r1, 0x10
-/* 803129A0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__13J3DDrawPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__13J3DDrawPacketFv.s
deleted file mode 100644
index 47147f96a8..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__13J3DDrawPacketFv.s
+++ /dev/null
@@ -1,15 +0,0 @@
-lbl_80312778:
-/* 80312778  3C 80 80 3D */	lis r4, __vt__9J3DPacket@ha /* 0x803CD97C@ha */
-/* 8031277C  38 04 D9 7C */	addi r0, r4, __vt__9J3DPacket@l /* 0x803CD97C@l */
-/* 80312780  90 03 00 00 */	stw r0, 0(r3)
-/* 80312784  38 A0 00 00 */	li r5, 0
-/* 80312788  90 A3 00 04 */	stw r5, 4(r3)
-/* 8031278C  90 A3 00 08 */	stw r5, 8(r3)
-/* 80312790  90 A3 00 0C */	stw r5, 0xc(r3)
-/* 80312794  3C 80 80 3D */	lis r4, __vt__13J3DDrawPacket@ha /* 0x803CD968@ha */
-/* 80312798  38 04 D9 68 */	addi r0, r4, __vt__13J3DDrawPacket@l /* 0x803CD968@l */
-/* 8031279C  90 03 00 00 */	stw r0, 0(r3)
-/* 803127A0  90 A3 00 10 */	stw r5, 0x10(r3)
-/* 803127A4  90 A3 00 20 */	stw r5, 0x20(r3)
-/* 803127A8  90 A3 00 24 */	stw r5, 0x24(r3)
-/* 803127AC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__14J3DShapePacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__ct__14J3DShapePacketFv.s
deleted file mode 100644
index f3c8e9c9bf..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/__ct__14J3DShapePacketFv.s
+++ /dev/null
@@ -1,22 +0,0 @@
-lbl_80312B20:
-/* 80312B20  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80312B24  7C 08 02 A6 */	mflr r0
-/* 80312B28  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80312B2C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80312B30  7C 7F 1B 78 */	mr r31, r3
-/* 80312B34  4B FF FC 45 */	bl __ct__13J3DDrawPacketFv
-/* 80312B38  3C 60 80 3D */	lis r3, __vt__14J3DShapePacket@ha /* 0x803CD940@ha */
-/* 80312B3C  38 03 D9 40 */	addi r0, r3, __vt__14J3DShapePacket@l /* 0x803CD940@l */
-/* 80312B40  90 1F 00 00 */	stw r0, 0(r31)
-/* 80312B44  38 00 00 00 */	li r0, 0
-/* 80312B48  90 1F 00 28 */	stw r0, 0x28(r31)
-/* 80312B4C  90 1F 00 2C */	stw r0, 0x2c(r31)
-/* 80312B50  90 1F 00 30 */	stw r0, 0x30(r31)
-/* 80312B54  90 1F 00 34 */	stw r0, 0x34(r31)
-/* 80312B58  90 1F 00 38 */	stw r0, 0x38(r31)
-/* 80312B5C  7F E3 FB 78 */	mr r3, r31
-/* 80312B60  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80312B64  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80312B68  7C 08 03 A6 */	mtlr r0
-/* 80312B6C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80312B70  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__12J3DMatPacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__12J3DMatPacketFv.s
deleted file mode 100644
index c1dbbe7164..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__12J3DMatPacketFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_803129A4:
-/* 803129A4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 803129A8  7C 08 02 A6 */	mflr r0
-/* 803129AC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 803129B0  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 803129B4  93 C1 00 08 */	stw r30, 8(r1)
-/* 803129B8  7C 7E 1B 79 */	or. r30, r3, r3
-/* 803129BC  7C 9F 23 78 */	mr r31, r4
-/* 803129C0  41 82 00 28 */	beq lbl_803129E8
-/* 803129C4  3C 80 80 3D */	lis r4, __vt__12J3DMatPacket@ha /* 0x803CD954@ha */
-/* 803129C8  38 04 D9 54 */	addi r0, r4, __vt__12J3DMatPacket@l /* 0x803CD954@l */
-/* 803129CC  90 1E 00 00 */	stw r0, 0(r30)
-/* 803129D0  38 80 00 00 */	li r4, 0
-/* 803129D4  4B FF FD DD */	bl __dt__13J3DDrawPacketFv
-/* 803129D8  7F E0 07 35 */	extsh. r0, r31
-/* 803129DC  40 81 00 0C */	ble lbl_803129E8
-/* 803129E0  7F C3 F3 78 */	mr r3, r30
-/* 803129E4  4B FB C3 59 */	bl __dl__FPv
-lbl_803129E8:
-/* 803129E8  7F C3 F3 78 */	mr r3, r30
-/* 803129EC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 803129F0  83 C1 00 08 */	lwz r30, 8(r1)
-/* 803129F4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 803129F8  7C 08 03 A6 */	mtlr r0
-/* 803129FC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80312A00  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__14J3DShapePacketFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/__dt__14J3DShapePacketFv.s
deleted file mode 100644
index ea49f8a537..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/__dt__14J3DShapePacketFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_80312B74:
-/* 80312B74  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80312B78  7C 08 02 A6 */	mflr r0
-/* 80312B7C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80312B80  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80312B84  93 C1 00 08 */	stw r30, 8(r1)
-/* 80312B88  7C 7E 1B 79 */	or. r30, r3, r3
-/* 80312B8C  7C 9F 23 78 */	mr r31, r4
-/* 80312B90  41 82 00 28 */	beq lbl_80312BB8
-/* 80312B94  3C 80 80 3D */	lis r4, __vt__14J3DShapePacket@ha /* 0x803CD940@ha */
-/* 80312B98  38 04 D9 40 */	addi r0, r4, __vt__14J3DShapePacket@l /* 0x803CD940@l */
-/* 80312B9C  90 1E 00 00 */	stw r0, 0(r30)
-/* 80312BA0  38 80 00 00 */	li r4, 0
-/* 80312BA4  4B FF FC 0D */	bl __dt__13J3DDrawPacketFv
-/* 80312BA8  7F E0 07 35 */	extsh. r0, r31
-/* 80312BAC  40 81 00 0C */	ble lbl_80312BB8
-/* 80312BB0  7F C3 F3 78 */	mr r3, r30
-/* 80312BB4  4B FB C1 89 */	bl __dl__FPv
-lbl_80312BB8:
-/* 80312BB8  7F C3 F3 78 */	mr r3, r30
-/* 80312BBC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80312BC0  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80312BC4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80312BC8  7C 08 03 A6 */	mtlr r0
-/* 80312BCC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80312BD0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/beginDL__17J3DDisplayListObjFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/beginDL__17J3DDisplayListObjFv.s
deleted file mode 100644
index e90ca259cf..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/beginDL__17J3DDisplayListObjFv.s
+++ /dev/null
@@ -1,22 +0,0 @@
-lbl_80312644:
-/* 80312644  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80312648  7C 08 02 A6 */	mflr r0
-/* 8031264C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80312650  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80312654  7C 7F 1B 78 */	mr r31, r3
-/* 80312658  4B FF FF AD */	bl swapBuffer__17J3DDisplayListObjFv
-/* 8031265C  48 02 B0 99 */	bl OSDisableInterrupts
-/* 80312660  90 6D 90 20 */	stw r3, sInterruptFlag__17J3DDisplayListObj(r13)
-/* 80312664  3C 60 80 43 */	lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */
-/* 80312668  38 63 4C 70 */	addi r3, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */
-/* 8031266C  80 9F 00 00 */	lwz r4, 0(r31)
-/* 80312670  80 BF 00 0C */	lwz r5, 0xc(r31)
-/* 80312674  48 04 E9 25 */	bl GDInitGDLObj
-/* 80312678  3C 60 80 43 */	lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */
-/* 8031267C  38 03 4C 70 */	addi r0, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */
-/* 80312680  90 0D 94 00 */	stw r0, __GDCurrentDL(r13)
-/* 80312684  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80312688  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8031268C  7C 08 03 A6 */	mtlr r0
-/* 80312690  38 21 00 10 */	addi r1, r1, 0x10
-/* 80312694  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/beginPatch__17J3DDisplayListObjFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/beginPatch__17J3DDisplayListObjFv.s
deleted file mode 100644
index d868ed80f5..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/beginPatch__17J3DDisplayListObjFv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_803126F4:
-/* 803126F4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 803126F8  7C 08 02 A6 */	mflr r0
-/* 803126FC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80312700  4B FF FF 45 */	bl beginDL__17J3DDisplayListObjFv
-/* 80312704  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80312708  7C 08 03 A6 */	mtlr r0
-/* 8031270C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80312710  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/endDL__17J3DDisplayListObjFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/endDL__17J3DDisplayListObjFv.s
deleted file mode 100644
index 8c8dc0dcf2..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/endDL__17J3DDisplayListObjFv.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_80312698:
-/* 80312698  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8031269C  7C 08 02 A6 */	mflr r0
-/* 803126A0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 803126A4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 803126A8  7C 7F 1B 78 */	mr r31, r3
-/* 803126AC  48 04 E9 31 */	bl GDPadCurr32
-/* 803126B0  80 6D 90 20 */	lwz r3, sInterruptFlag__17J3DDisplayListObj(r13)
-/* 803126B4  48 02 B0 69 */	bl OSRestoreInterrupts
-/* 803126B8  3C 60 80 43 */	lis r3, sGDLObj__17J3DDisplayListObj@ha /* 0x80434C70@ha */
-/* 803126BC  38 83 4C 70 */	addi r4, r3, sGDLObj__17J3DDisplayListObj@l /* 0x80434C70@l */
-/* 803126C0  80 64 00 00 */	lwz r3, 0(r4)
-/* 803126C4  80 04 00 08 */	lwz r0, 8(r4)
-/* 803126C8  7C 03 00 50 */	subf r0, r3, r0
-/* 803126CC  90 1F 00 08 */	stw r0, 8(r31)
-/* 803126D0  48 04 E8 E1 */	bl GDFlushCurrToMem
-/* 803126D4  38 00 00 00 */	li r0, 0
-/* 803126D8  90 0D 94 00 */	stw r0, __GDCurrentDL(r13)
-/* 803126DC  80 7F 00 08 */	lwz r3, 8(r31)
-/* 803126E0  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 803126E4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 803126E8  7C 08 03 A6 */	mtlr r0
-/* 803126EC  38 21 00 10 */	addi r1, r1, 0x10
-/* 803126F0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/endPatch__17J3DDisplayListObjFv.s b/asm/JSystem/J3DGraphBase/J3DPacket/endPatch__17J3DDisplayListObjFv.s
deleted file mode 100644
index 080ad89d5a..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/endPatch__17J3DDisplayListObjFv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80312714:
-/* 80312714  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80312718  7C 08 02 A6 */	mflr r0
-/* 8031271C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80312720  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80312724  7C 7F 1B 78 */	mr r31, r3
-/* 80312728  80 6D 90 20 */	lwz r3, sInterruptFlag__17J3DDisplayListObj(r13)
-/* 8031272C  48 02 AF F1 */	bl OSRestoreInterrupts
-/* 80312730  38 00 00 00 */	li r0, 0
-/* 80312734  90 0D 94 00 */	stw r0, __GDCurrentDL(r13)
-/* 80312738  80 7F 00 08 */	lwz r3, 8(r31)
-/* 8031273C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80312740  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80312744  7C 08 03 A6 */	mtlr r0
-/* 80312748  38 21 00 10 */	addi r1, r1, 0x10
-/* 8031274C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/isSame__12J3DMatPacketCFP12J3DMatPacket.s b/asm/JSystem/J3DGraphBase/J3DPacket/isSame__12J3DMatPacketCFP12J3DMatPacket.s
deleted file mode 100644
index fc90b19820..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/isSame__12J3DMatPacketCFP12J3DMatPacket.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80312A74:
-/* 80312A74  38 A0 00 00 */	li r5, 0
-/* 80312A78  80 63 00 34 */	lwz r3, 0x34(r3)
-/* 80312A7C  80 04 00 34 */	lwz r0, 0x34(r4)
-/* 80312A80  7C 03 00 40 */	cmplw r3, r0
-/* 80312A84  40 82 00 10 */	bne lbl_80312A94
-/* 80312A88  54 60 0F FF */	rlwinm. r0, r3, 1, 0x1f, 0x1f
-/* 80312A8C  40 82 00 08 */	bne lbl_80312A94
-/* 80312A90  38 A0 00 01 */	li r5, 1
-lbl_80312A94:
-/* 80312A94  7C A3 2B 78 */	mr r3, r5
-/* 80312A98  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DPacket/newDifferedDisplayList__14J3DShapePacketFUl.s b/asm/JSystem/J3DGraphBase/J3DPacket/newDifferedDisplayList__14J3DShapePacketFUl.s
deleted file mode 100644
index bd4a445872..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DPacket/newDifferedDisplayList__14J3DShapePacketFUl.s
+++ /dev/null
@@ -1,22 +0,0 @@
-lbl_80312DBC:
-/* 80312DBC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80312DC0  7C 08 02 A6 */	mflr r0
-/* 80312DC4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80312DC8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80312DCC  7C 7F 1B 78 */	mr r31, r3
-/* 80312DD0  90 83 00 34 */	stw r4, 0x34(r3)
-/* 80312DD4  4B FF FE 01 */	bl calcDifferedBufferSize__14J3DShapePacketFUl
-/* 80312DD8  7C 64 1B 78 */	mr r4, r3
-/* 80312DDC  7F E3 FB 78 */	mr r3, r31
-/* 80312DE0  4B FF FA 2D */	bl newDisplayList__13J3DDrawPacketFUl
-/* 80312DE4  2C 03 00 00 */	cmpwi r3, 0
-/* 80312DE8  41 82 00 08 */	beq lbl_80312DF0
-/* 80312DEC  48 00 00 08 */	b lbl_80312DF4
-lbl_80312DF0:
-/* 80312DF0  38 60 00 00 */	li r3, 0
-lbl_80312DF4:
-/* 80312DF4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80312DF8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80312DFC  7C 08 03 A6 */	mtlr r0
-/* 80312E00  38 21 00 10 */	addi r1, r1, 0x10
-/* 80312E04  4E 80 00 20 */	blr