J3D setup (#155)

* setup j3d classes

* remove asm

* fixes

* fix newDifferedDisplayList

22 files changed, 0 insertions, 611 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 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/__ct__13J3DVertexDataFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/__ct__13J3DVertexDataFv.s
deleted file mode 100644
index a302bbe75c..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/__ct__13J3DVertexDataFv.s
+++ /dev/null
@@ -1,35 +0,0 @@
-lbl_80310EF8:
-/* 80310EF8  38 A0 00 00 */	li r5, 0
-/* 80310EFC  90 A3 00 00 */	stw r5, 0(r3)
-/* 80310F00  90 A3 00 04 */	stw r5, 4(r3)
-/* 80310F04  90 A3 00 08 */	stw r5, 8(r3)
-/* 80310F08  90 A3 00 0C */	stw r5, 0xc(r3)
-/* 80310F0C  90 A3 00 10 */	stw r5, 0x10(r3)
-/* 80310F10  90 A3 00 14 */	stw r5, 0x14(r3)
-/* 80310F14  90 A3 00 18 */	stw r5, 0x18(r3)
-/* 80310F18  90 A3 00 1C */	stw r5, 0x1c(r3)
-/* 80310F1C  90 A3 00 20 */	stw r5, 0x20(r3)
-/* 80310F20  7C A4 2B 78 */	mr r4, r5
-/* 80310F24  38 00 00 02 */	li r0, 2
-/* 80310F28  7C 09 03 A6 */	mtctr r0
-lbl_80310F2C:
-/* 80310F2C  38 04 00 24 */	addi r0, r4, 0x24
-/* 80310F30  7C A3 01 2E */	stwx r5, r3, r0
-/* 80310F34  38 84 00 04 */	addi r4, r4, 4
-/* 80310F38  42 00 FF F4 */	bdnz lbl_80310F2C
-/* 80310F3C  38 80 00 00 */	li r4, 0
-/* 80310F40  38 A0 00 00 */	li r5, 0
-/* 80310F44  38 00 00 08 */	li r0, 8
-/* 80310F48  7C 09 03 A6 */	mtctr r0
-lbl_80310F4C:
-/* 80310F4C  38 04 00 2C */	addi r0, r4, 0x2c
-/* 80310F50  7C A3 01 2E */	stwx r5, r3, r0
-/* 80310F54  38 84 00 04 */	addi r4, r4, 4
-/* 80310F58  42 00 FF F4 */	bdnz lbl_80310F4C
-/* 80310F5C  38 80 00 00 */	li r4, 0
-/* 80310F60  98 83 00 4C */	stb r4, 0x4c(r3)
-/* 80310F64  38 00 00 04 */	li r0, 4
-/* 80310F68  90 03 00 50 */	stw r0, 0x50(r3)
-/* 80310F6C  98 83 00 54 */	stb r4, 0x54(r3)
-/* 80310F70  90 03 00 58 */	stw r0, 0x58(r3)
-/* 80310F74  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/__ct__14J3DDrawMtxDataFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/__ct__14J3DDrawMtxDataFv.s
deleted file mode 100644
index 795cf4f0fe..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/__ct__14J3DDrawMtxDataFv.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_803115E0:
-/* 803115E0  38 00 00 00 */	li r0, 0
-/* 803115E4  B0 03 00 00 */	sth r0, 0(r3)
-/* 803115E8  90 03 00 04 */	stw r0, 4(r3)
-/* 803115EC  90 03 00 08 */	stw r0, 8(r3)
-/* 803115F0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/__dt__14J3DDrawMtxDataFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/__dt__14J3DDrawMtxDataFv.s
deleted file mode 100644
index 5171a9c3b7..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/__dt__14J3DDrawMtxDataFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_803115F4:
-/* 803115F4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 803115F8  7C 08 02 A6 */	mflr r0
-/* 803115FC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80311600  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80311604  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80311608  41 82 00 10 */	beq lbl_80311618
-/* 8031160C  7C 80 07 35 */	extsh. r0, r4
-/* 80311610  40 81 00 08 */	ble lbl_80311618
-/* 80311614  4B FB D7 29 */	bl __dl__FPv
-lbl_80311618:
-/* 80311618  7F E3 FB 78 */	mr r3, r31
-/* 8031161C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80311620  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80311624  7C 08 03 A6 */	mtlr r0
-/* 80311628  38 21 00 10 */	addi r1, r1, 0x10
-/* 8031162C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/__dt__15J3DVertexBufferFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/__dt__15J3DVertexBufferFv.s
deleted file mode 100644
index 5cee1a11c7..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/__dt__15J3DVertexBufferFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80311030:
-/* 80311030  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80311034  7C 08 02 A6 */	mflr r0
-/* 80311038  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8031103C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80311040  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80311044  41 82 00 10 */	beq lbl_80311054
-/* 80311048  7C 80 07 35 */	extsh. r0, r4
-/* 8031104C  40 81 00 08 */	ble lbl_80311054
-/* 80311050  4B FB DC ED */	bl __dl__FPv
-lbl_80311054:
-/* 80311054  7F E3 FB 78 */	mr r3, r31
-/* 80311058  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8031105C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80311060  7C 08 03 A6 */	mtlr r0
-/* 80311064  38 21 00 10 */	addi r1, r1, 0x10
-/* 80311068  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/allocTransformedVtxNrmArray__15J3DVertexBufferFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/allocTransformedVtxNrmArray__15J3DVertexBufferFv.s
deleted file mode 100644
index 28237ee16a..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/allocTransformedVtxNrmArray__15J3DVertexBufferFv.s
+++ /dev/null
@@ -1,51 +0,0 @@
-lbl_8031152C:
-/* 8031152C  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80311530  7C 08 02 A6 */	mflr r0
-/* 80311534  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80311538  39 61 00 20 */	addi r11, r1, 0x20
-/* 8031153C  48 05 0C A1 */	bl _savegpr_29
-/* 80311540  7C 7D 1B 78 */	mr r29, r3
-/* 80311544  80 03 00 24 */	lwz r0, 0x24(r3)
-/* 80311548  28 00 00 00 */	cmplwi r0, 0
-/* 8031154C  41 82 00 18 */	beq lbl_80311564
-/* 80311550  80 1D 00 28 */	lwz r0, 0x28(r29)
-/* 80311554  28 00 00 00 */	cmplwi r0, 0
-/* 80311558  41 82 00 0C */	beq lbl_80311564
-/* 8031155C  38 60 00 00 */	li r3, 0
-/* 80311560  48 00 00 68 */	b lbl_803115C8
-lbl_80311564:
-/* 80311564  3B C0 00 00 */	li r30, 0
-/* 80311568  3B E0 00 00 */	li r31, 0
-lbl_8031156C:
-/* 8031156C  2C 1E 00 00 */	cmpwi r30, 0
-/* 80311570  41 82 00 14 */	beq lbl_80311584
-/* 80311574  38 1F 00 24 */	addi r0, r31, 0x24
-/* 80311578  7C 1D 00 2E */	lwzx r0, r29, r0
-/* 8031157C  28 00 00 00 */	cmplwi r0, 0
-/* 80311580  40 82 00 34 */	bne lbl_803115B4
-lbl_80311584:
-/* 80311584  80 7D 00 00 */	lwz r3, 0(r29)
-/* 80311588  80 03 00 04 */	lwz r0, 4(r3)
-/* 8031158C  1C 60 00 0C */	mulli r3, r0, 0xc
-/* 80311590  38 80 00 20 */	li r4, 0x20
-/* 80311594  4B FB D7 59 */	bl __nwa__FUli
-/* 80311598  38 1F 00 24 */	addi r0, r31, 0x24
-/* 8031159C  7C 7D 01 2E */	stwx r3, r29, r0
-/* 803115A0  7C 1D 00 2E */	lwzx r0, r29, r0
-/* 803115A4  28 00 00 00 */	cmplwi r0, 0
-/* 803115A8  40 82 00 0C */	bne lbl_803115B4
-/* 803115AC  38 60 00 04 */	li r3, 4
-/* 803115B0  48 00 00 18 */	b lbl_803115C8
-lbl_803115B4:
-/* 803115B4  3B DE 00 01 */	addi r30, r30, 1
-/* 803115B8  2C 1E 00 02 */	cmpwi r30, 2
-/* 803115BC  3B FF 00 04 */	addi r31, r31, 4
-/* 803115C0  41 80 FF AC */	blt lbl_8031156C
-/* 803115C4  38 60 00 00 */	li r3, 0
-lbl_803115C8:
-/* 803115C8  39 61 00 20 */	addi r11, r1, 0x20
-/* 803115CC  48 05 0C 5D */	bl _restgpr_29
-/* 803115D0  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 803115D4  7C 08 03 A6 */	mtlr r0
-/* 803115D8  38 21 00 20 */	addi r1, r1, 0x20
-/* 803115DC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/allocTransformedVtxPosArray__15J3DVertexBufferFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/allocTransformedVtxPosArray__15J3DVertexBufferFv.s
deleted file mode 100644
index b5e9b7c48f..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/allocTransformedVtxPosArray__15J3DVertexBufferFv.s
+++ /dev/null
@@ -1,51 +0,0 @@
-lbl_80311478:
-/* 80311478  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 8031147C  7C 08 02 A6 */	mflr r0
-/* 80311480  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80311484  39 61 00 20 */	addi r11, r1, 0x20
-/* 80311488  48 05 0D 55 */	bl _savegpr_29
-/* 8031148C  7C 7D 1B 78 */	mr r29, r3
-/* 80311490  80 03 00 1C */	lwz r0, 0x1c(r3)
-/* 80311494  28 00 00 00 */	cmplwi r0, 0
-/* 80311498  41 82 00 18 */	beq lbl_803114B0
-/* 8031149C  80 1D 00 20 */	lwz r0, 0x20(r29)
-/* 803114A0  28 00 00 00 */	cmplwi r0, 0
-/* 803114A4  41 82 00 0C */	beq lbl_803114B0
-/* 803114A8  38 60 00 00 */	li r3, 0
-/* 803114AC  48 00 00 68 */	b lbl_80311514
-lbl_803114B0:
-/* 803114B0  3B C0 00 00 */	li r30, 0
-/* 803114B4  3B E0 00 00 */	li r31, 0
-lbl_803114B8:
-/* 803114B8  2C 1E 00 00 */	cmpwi r30, 0
-/* 803114BC  41 82 00 14 */	beq lbl_803114D0
-/* 803114C0  38 1F 00 1C */	addi r0, r31, 0x1c
-/* 803114C4  7C 1D 00 2E */	lwzx r0, r29, r0
-/* 803114C8  28 00 00 00 */	cmplwi r0, 0
-/* 803114CC  40 82 00 34 */	bne lbl_80311500
-lbl_803114D0:
-/* 803114D0  80 7D 00 00 */	lwz r3, 0(r29)
-/* 803114D4  80 03 00 00 */	lwz r0, 0(r3)
-/* 803114D8  1C 60 00 0C */	mulli r3, r0, 0xc
-/* 803114DC  38 80 00 20 */	li r4, 0x20
-/* 803114E0  4B FB D8 0D */	bl __nwa__FUli
-/* 803114E4  38 1F 00 1C */	addi r0, r31, 0x1c
-/* 803114E8  7C 7D 01 2E */	stwx r3, r29, r0
-/* 803114EC  7C 1D 00 2E */	lwzx r0, r29, r0
-/* 803114F0  28 00 00 00 */	cmplwi r0, 0
-/* 803114F4  40 82 00 0C */	bne lbl_80311500
-/* 803114F8  38 60 00 04 */	li r3, 4
-/* 803114FC  48 00 00 18 */	b lbl_80311514
-lbl_80311500:
-/* 80311500  3B DE 00 01 */	addi r30, r30, 1
-/* 80311504  2C 1E 00 02 */	cmpwi r30, 2
-/* 80311508  3B FF 00 04 */	addi r31, r31, 4
-/* 8031150C  41 80 FF AC */	blt lbl_803114B8
-/* 80311510  38 60 00 00 */	li r3, 0
-lbl_80311514:
-/* 80311514  39 61 00 20 */	addi r11, r1, 0x20
-/* 80311518  48 05 0D 11 */	bl _restgpr_29
-/* 8031151C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80311520  7C 08 03 A6 */	mtlr r0
-/* 80311524  38 21 00 20 */	addi r1, r1, 0x20
-/* 80311528  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/copyLocalVtxNrmArray__15J3DVertexBufferFUl.s b/asm/JSystem/J3DGraphBase/J3DVertex/copyLocalVtxNrmArray__15J3DVertexBufferFUl.s
deleted file mode 100644
index 1bb89bada2..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/copyLocalVtxNrmArray__15J3DVertexBufferFUl.s
+++ /dev/null
@@ -1,79 +0,0 @@
-lbl_803111B0:
-/* 803111B0  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 803111B4  7C 08 02 A6 */	mflr r0
-/* 803111B8  90 01 00 24 */	stw r0, 0x24(r1)
-/* 803111BC  39 61 00 20 */	addi r11, r1, 0x20
-/* 803111C0  48 05 10 19 */	bl _savegpr_28
-/* 803111C4  7C 7F 1B 78 */	mr r31, r3
-/* 803111C8  54 80 07 FF */	clrlwi. r0, r4, 0x1f
-/* 803111CC  41 82 00 78 */	beq lbl_80311244
-/* 803111D0  3B 80 00 00 */	li r28, 0
-/* 803111D4  3B C0 00 00 */	li r30, 0
-lbl_803111D8:
-/* 803111D8  80 7F 00 00 */	lwz r3, 0(r31)
-/* 803111DC  80 03 00 04 */	lwz r0, 4(r3)
-/* 803111E0  1C 60 00 0C */	mulli r3, r0, 0xc
-/* 803111E4  38 80 00 20 */	li r4, 0x20
-/* 803111E8  4B FB DB 05 */	bl __nwa__FUli
-/* 803111EC  3B BE 00 0C */	addi r29, r30, 0xc
-/* 803111F0  7C 7F E9 2E */	stwx r3, r31, r29
-/* 803111F4  7C 7F E8 2E */	lwzx r3, r31, r29
-/* 803111F8  28 03 00 00 */	cmplwi r3, 0
-/* 803111FC  40 82 00 0C */	bne lbl_80311208
-/* 80311200  38 60 00 04 */	li r3, 4
-/* 80311204  48 00 00 B4 */	b lbl_803112B8
-lbl_80311208:
-/* 80311208  80 9F 00 00 */	lwz r4, 0(r31)
-/* 8031120C  80 04 00 04 */	lwz r0, 4(r4)
-/* 80311210  80 84 00 1C */	lwz r4, 0x1c(r4)
-/* 80311214  1C A0 00 0C */	mulli r5, r0, 0xc
-/* 80311218  4B CF 23 29 */	bl memcpy
-/* 8031121C  80 7F 00 00 */	lwz r3, 0(r31)
-/* 80311220  80 03 00 04 */	lwz r0, 4(r3)
-/* 80311224  7C 7F E8 2E */	lwzx r3, r31, r29
-/* 80311228  1C 80 00 0C */	mulli r4, r0, 0xc
-/* 8031122C  48 02 A3 B1 */	bl DCStoreRange
-/* 80311230  3B 9C 00 01 */	addi r28, r28, 1
-/* 80311234  2C 1C 00 02 */	cmpwi r28, 2
-/* 80311238  3B DE 00 04 */	addi r30, r30, 4
-/* 8031123C  41 80 FF 9C */	blt lbl_803111D8
-/* 80311240  48 00 00 74 */	b lbl_803112B4
-lbl_80311244:
-/* 80311244  80 7F 00 00 */	lwz r3, 0(r31)
-/* 80311248  80 03 00 1C */	lwz r0, 0x1c(r3)
-/* 8031124C  90 1F 00 0C */	stw r0, 0xc(r31)
-/* 80311250  80 1F 00 10 */	lwz r0, 0x10(r31)
-/* 80311254  28 00 00 00 */	cmplwi r0, 0
-/* 80311258  40 82 00 30 */	bne lbl_80311288
-/* 8031125C  80 7F 00 00 */	lwz r3, 0(r31)
-/* 80311260  80 03 00 04 */	lwz r0, 4(r3)
-/* 80311264  1C 60 00 0C */	mulli r3, r0, 0xc
-/* 80311268  38 80 00 20 */	li r4, 0x20
-/* 8031126C  4B FB DA 81 */	bl __nwa__FUli
-/* 80311270  90 7F 00 10 */	stw r3, 0x10(r31)
-/* 80311274  80 1F 00 10 */	lwz r0, 0x10(r31)
-/* 80311278  28 00 00 00 */	cmplwi r0, 0
-/* 8031127C  40 82 00 0C */	bne lbl_80311288
-/* 80311280  38 60 00 04 */	li r3, 4
-/* 80311284  48 00 00 34 */	b lbl_803112B8
-lbl_80311288:
-/* 80311288  80 7F 00 00 */	lwz r3, 0(r31)
-/* 8031128C  80 03 00 04 */	lwz r0, 4(r3)
-/* 80311290  80 83 00 1C */	lwz r4, 0x1c(r3)
-/* 80311294  80 7F 00 10 */	lwz r3, 0x10(r31)
-/* 80311298  1C A0 00 0C */	mulli r5, r0, 0xc
-/* 8031129C  4B CF 22 A5 */	bl memcpy
-/* 803112A0  80 7F 00 00 */	lwz r3, 0(r31)
-/* 803112A4  80 03 00 04 */	lwz r0, 4(r3)
-/* 803112A8  80 7F 00 10 */	lwz r3, 0x10(r31)
-/* 803112AC  1C 80 00 0C */	mulli r4, r0, 0xc
-/* 803112B0  48 02 A3 2D */	bl DCStoreRange
-lbl_803112B4:
-/* 803112B4  38 60 00 00 */	li r3, 0
-lbl_803112B8:
-/* 803112B8  39 61 00 20 */	addi r11, r1, 0x20
-/* 803112BC  48 05 0F 69 */	bl _restgpr_28
-/* 803112C0  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 803112C4  7C 08 03 A6 */	mtlr r0
-/* 803112C8  38 21 00 20 */	addi r1, r1, 0x20
-/* 803112CC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/copyLocalVtxPosArray__15J3DVertexBufferFUl.s b/asm/JSystem/J3DGraphBase/J3DVertex/copyLocalVtxPosArray__15J3DVertexBufferFUl.s
deleted file mode 100644
index 675cfcdf58..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/copyLocalVtxPosArray__15J3DVertexBufferFUl.s
+++ /dev/null
@@ -1,79 +0,0 @@
-lbl_80311090:
-/* 80311090  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80311094  7C 08 02 A6 */	mflr r0
-/* 80311098  90 01 00 24 */	stw r0, 0x24(r1)
-/* 8031109C  39 61 00 20 */	addi r11, r1, 0x20
-/* 803110A0  48 05 11 39 */	bl _savegpr_28
-/* 803110A4  7C 7F 1B 78 */	mr r31, r3
-/* 803110A8  54 80 07 FF */	clrlwi. r0, r4, 0x1f
-/* 803110AC  41 82 00 78 */	beq lbl_80311124
-/* 803110B0  3B 80 00 00 */	li r28, 0
-/* 803110B4  3B C0 00 00 */	li r30, 0
-lbl_803110B8:
-/* 803110B8  80 7F 00 00 */	lwz r3, 0(r31)
-/* 803110BC  80 03 00 00 */	lwz r0, 0(r3)
-/* 803110C0  1C 60 00 0C */	mulli r3, r0, 0xc
-/* 803110C4  38 80 00 20 */	li r4, 0x20
-/* 803110C8  4B FB DC 25 */	bl __nwa__FUli
-/* 803110CC  3B BE 00 04 */	addi r29, r30, 4
-/* 803110D0  7C 7F E9 2E */	stwx r3, r31, r29
-/* 803110D4  7C 7F E8 2E */	lwzx r3, r31, r29
-/* 803110D8  28 03 00 00 */	cmplwi r3, 0
-/* 803110DC  40 82 00 0C */	bne lbl_803110E8
-/* 803110E0  38 60 00 04 */	li r3, 4
-/* 803110E4  48 00 00 B4 */	b lbl_80311198
-lbl_803110E8:
-/* 803110E8  80 9F 00 00 */	lwz r4, 0(r31)
-/* 803110EC  80 04 00 00 */	lwz r0, 0(r4)
-/* 803110F0  80 84 00 18 */	lwz r4, 0x18(r4)
-/* 803110F4  1C A0 00 0C */	mulli r5, r0, 0xc
-/* 803110F8  4B CF 24 49 */	bl memcpy
-/* 803110FC  80 7F 00 00 */	lwz r3, 0(r31)
-/* 80311100  80 03 00 00 */	lwz r0, 0(r3)
-/* 80311104  7C 7F E8 2E */	lwzx r3, r31, r29
-/* 80311108  1C 80 00 0C */	mulli r4, r0, 0xc
-/* 8031110C  48 02 A4 D1 */	bl DCStoreRange
-/* 80311110  3B 9C 00 01 */	addi r28, r28, 1
-/* 80311114  2C 1C 00 02 */	cmpwi r28, 2
-/* 80311118  3B DE 00 04 */	addi r30, r30, 4
-/* 8031111C  41 80 FF 9C */	blt lbl_803110B8
-/* 80311120  48 00 00 74 */	b lbl_80311194
-lbl_80311124:
-/* 80311124  80 7F 00 00 */	lwz r3, 0(r31)
-/* 80311128  80 03 00 18 */	lwz r0, 0x18(r3)
-/* 8031112C  90 1F 00 04 */	stw r0, 4(r31)
-/* 80311130  80 1F 00 08 */	lwz r0, 8(r31)
-/* 80311134  28 00 00 00 */	cmplwi r0, 0
-/* 80311138  40 82 00 30 */	bne lbl_80311168
-/* 8031113C  80 7F 00 00 */	lwz r3, 0(r31)
-/* 80311140  80 03 00 00 */	lwz r0, 0(r3)
-/* 80311144  1C 60 00 0C */	mulli r3, r0, 0xc
-/* 80311148  38 80 00 20 */	li r4, 0x20
-/* 8031114C  4B FB DB A1 */	bl __nwa__FUli
-/* 80311150  90 7F 00 08 */	stw r3, 8(r31)
-/* 80311154  80 1F 00 08 */	lwz r0, 8(r31)
-/* 80311158  28 00 00 00 */	cmplwi r0, 0
-/* 8031115C  40 82 00 0C */	bne lbl_80311168
-/* 80311160  38 60 00 04 */	li r3, 4
-/* 80311164  48 00 00 34 */	b lbl_80311198
-lbl_80311168:
-/* 80311168  80 7F 00 00 */	lwz r3, 0(r31)
-/* 8031116C  80 03 00 00 */	lwz r0, 0(r3)
-/* 80311170  80 83 00 18 */	lwz r4, 0x18(r3)
-/* 80311174  80 7F 00 08 */	lwz r3, 8(r31)
-/* 80311178  1C A0 00 0C */	mulli r5, r0, 0xc
-/* 8031117C  4B CF 23 C5 */	bl memcpy
-/* 80311180  80 7F 00 00 */	lwz r3, 0(r31)
-/* 80311184  80 03 00 00 */	lwz r0, 0(r3)
-/* 80311188  80 7F 00 08 */	lwz r3, 8(r31)
-/* 8031118C  1C 80 00 0C */	mulli r4, r0, 0xc
-/* 80311190  48 02 A4 4D */	bl DCStoreRange
-lbl_80311194:
-/* 80311194  38 60 00 00 */	li r3, 0
-lbl_80311198:
-/* 80311198  39 61 00 20 */	addi r11, r1, 0x20
-/* 8031119C  48 05 10 89 */	bl _restgpr_28
-/* 803111A0  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 803111A4  7C 08 03 A6 */	mtlr r0
-/* 803111A8  38 21 00 20 */	addi r1, r1, 0x20
-/* 803111AC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/init__15J3DVertexBufferFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/init__15J3DVertexBufferFv.s
deleted file mode 100644
index bffd4fc4ad..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/init__15J3DVertexBufferFv.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_80310FD8:
-/* 80310FD8  38 00 00 00 */	li r0, 0
-/* 80310FDC  90 03 00 00 */	stw r0, 0(r3)
-/* 80310FE0  90 03 00 08 */	stw r0, 8(r3)
-/* 80310FE4  90 03 00 04 */	stw r0, 4(r3)
-/* 80310FE8  90 03 00 10 */	stw r0, 0x10(r3)
-/* 80310FEC  90 03 00 0C */	stw r0, 0xc(r3)
-/* 80310FF0  90 03 00 18 */	stw r0, 0x18(r3)
-/* 80310FF4  90 03 00 14 */	stw r0, 0x14(r3)
-/* 80310FF8  90 03 00 20 */	stw r0, 0x20(r3)
-/* 80310FFC  90 03 00 1C */	stw r0, 0x1c(r3)
-/* 80311000  90 03 00 28 */	stw r0, 0x28(r3)
-/* 80311004  90 03 00 24 */	stw r0, 0x24(r3)
-/* 80311008  90 03 00 2C */	stw r0, 0x2c(r3)
-/* 8031100C  90 03 00 30 */	stw r0, 0x30(r3)
-/* 80311010  90 03 00 34 */	stw r0, 0x34(r3)
-/* 80311014  80 03 00 04 */	lwz r0, 4(r3)
-/* 80311018  90 03 00 2C */	stw r0, 0x2c(r3)
-/* 8031101C  80 03 00 0C */	lwz r0, 0xc(r3)
-/* 80311020  90 03 00 30 */	stw r0, 0x30(r3)
-/* 80311024  80 03 00 14 */	lwz r0, 0x14(r3)
-/* 80311028  90 03 00 34 */	stw r0, 0x34(r3)
-/* 8031102C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/setArray__15J3DVertexBufferCFv.s b/asm/JSystem/J3DGraphBase/J3DVertex/setArray__15J3DVertexBufferCFv.s
deleted file mode 100644
index 2a455b69c5..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/setArray__15J3DVertexBufferCFv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8031106C:
-/* 8031106C  80 03 00 2C */	lwz r0, 0x2c(r3)
-/* 80311070  3C 80 80 43 */	lis r4, j3dSys@ha /* 0x80434AC8@ha */
-/* 80311074  38 84 4A C8 */	addi r4, r4, j3dSys@l /* 0x80434AC8@l */
-/* 80311078  90 04 01 0C */	stw r0, 0x10c(r4)
-/* 8031107C  80 03 00 30 */	lwz r0, 0x30(r3)
-/* 80311080  90 04 01 10 */	stw r0, 0x110(r4)
-/* 80311084  80 03 00 34 */	lwz r0, 0x34(r3)
-/* 80311088  90 04 01 14 */	stw r0, 0x114(r4)
-/* 8031108C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DVertex/setVertexData__15J3DVertexBufferFP13J3DVertexData.s b/asm/JSystem/J3DGraphBase/J3DVertex/setVertexData__15J3DVertexBufferFP13J3DVertexData.s
deleted file mode 100644
index 067e29e8c1..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DVertex/setVertexData__15J3DVertexBufferFP13J3DVertexData.s
+++ /dev/null
@@ -1,25 +0,0 @@
-lbl_80310F78:
-/* 80310F78  90 83 00 00 */	stw r4, 0(r3)
-/* 80310F7C  80 04 00 18 */	lwz r0, 0x18(r4)
-/* 80310F80  90 03 00 04 */	stw r0, 4(r3)
-/* 80310F84  80 04 00 1C */	lwz r0, 0x1c(r4)
-/* 80310F88  90 03 00 0C */	stw r0, 0xc(r3)
-/* 80310F8C  80 04 00 24 */	lwz r0, 0x24(r4)
-/* 80310F90  90 03 00 14 */	stw r0, 0x14(r3)
-/* 80310F94  38 A0 00 00 */	li r5, 0
-/* 80310F98  90 A3 00 08 */	stw r5, 8(r3)
-/* 80310F9C  90 A3 00 10 */	stw r5, 0x10(r3)
-/* 80310FA0  90 A3 00 18 */	stw r5, 0x18(r3)
-/* 80310FA4  80 04 00 18 */	lwz r0, 0x18(r4)
-/* 80310FA8  90 03 00 1C */	stw r0, 0x1c(r3)
-/* 80310FAC  80 04 00 1C */	lwz r0, 0x1c(r4)
-/* 80310FB0  90 03 00 24 */	stw r0, 0x24(r3)
-/* 80310FB4  90 A3 00 20 */	stw r5, 0x20(r3)
-/* 80310FB8  90 A3 00 28 */	stw r5, 0x28(r3)
-/* 80310FBC  80 03 00 04 */	lwz r0, 4(r3)
-/* 80310FC0  90 03 00 2C */	stw r0, 0x2c(r3)
-/* 80310FC4  80 03 00 0C */	lwz r0, 0xc(r3)
-/* 80310FC8  90 03 00 30 */	stw r0, 0x30(r3)
-/* 80310FCC  80 03 00 14 */	lwz r0, 0x14(r3)
-/* 80310FD0  90 03 00 34 */	stw r0, 0x34(r3)
-/* 80310FD4  4E 80 00 20 */	blr