J3DModelLoaderCalcSize + J2DScreen work (#2198)

* All literals functions in J2DScreen were matched

* Import J3DModelLoaderCalcSize work

* d_a_obj_rfHole OK

* Minor fixes for daVrbox2

12 files changed, 0 insertions, 388 deletions

diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadMaterialTableSize__14J3DModelLoaderFPCv.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadMaterialTableSize__14J3DModelLoaderFPCv.s
deleted file mode 100644
index 95f2e4eb13..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcLoadMaterialTableSize__14J3DModelLoaderFPCv.s
+++ /dev/null
@@ -1,71 +0,0 @@
-lbl_803369A0:
-/* 803369A0  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 803369A4  7C 08 02 A6 */	mflr r0
-/* 803369A8  90 01 00 34 */	stw r0, 0x34(r1)
-/* 803369AC  39 61 00 30 */	addi r11, r1, 0x30
-/* 803369B0  48 02 B8 1D */	bl _savegpr_25
-/* 803369B4  7C 79 1B 78 */	mr r25, r3
-/* 803369B8  3B 84 00 20 */	addi r28, r4, 0x20
-/* 803369BC  3B 60 00 00 */	li r27, 0
-/* 803369C0  3B 40 00 00 */	li r26, 0
-/* 803369C4  3B A0 00 20 */	li r29, 0x20
-/* 803369C8  3C 60 4D 41 */	lis r3, 0x4D41 /* 0x4D415433@ha */
-/* 803369CC  3B C3 54 33 */	addi r30, r3, 0x5433 /* 0x4D415433@l */
-/* 803369D0  83 E4 00 0C */	lwz r31, 0xc(r4)
-/* 803369D4  48 00 00 94 */	b lbl_80336A68
-lbl_803369D8:
-/* 803369D8  80 9C 00 00 */	lwz r4, 0(r28)
-/* 803369DC  7C 04 F0 00 */	cmpw r4, r30
-/* 803369E0  41 82 00 30 */	beq lbl_80336A10
-/* 803369E4  40 80 00 18 */	bge lbl_803369FC
-/* 803369E8  3C 60 4D 41 */	lis r3, 0x4D41 /* 0x4D415432@ha */
-/* 803369EC  38 03 54 32 */	addi r0, r3, 0x5432 /* 0x4D415432@l */
-/* 803369F0  7C 04 00 00 */	cmpw r4, r0
-/* 803369F4  40 80 00 68 */	bge lbl_80336A5C
-/* 803369F8  48 00 00 54 */	b lbl_80336A4C
-lbl_803369FC:
-/* 803369FC  3C 60 54 45 */	lis r3, 0x5445 /* 0x54455831@ha */
-/* 80336A00  38 03 58 31 */	addi r0, r3, 0x5831 /* 0x54455831@l */
-/* 80336A04  7C 04 00 00 */	cmpw r4, r0
-/* 80336A08  41 82 00 2C */	beq lbl_80336A34
-/* 80336A0C  48 00 00 40 */	b lbl_80336A4C
-lbl_80336A10:
-/* 80336A10  7F 23 CB 78 */	mr r3, r25
-/* 80336A14  7F 84 E3 78 */	mr r4, r28
-/* 80336A18  3C A0 51 10 */	lis r5, 0x5110
-/* 80336A1C  81 99 00 00 */	lwz r12, 0(r25)
-/* 80336A20  81 8C 00 40 */	lwz r12, 0x40(r12)
-/* 80336A24  7D 89 03 A6 */	mtctr r12
-/* 80336A28  4E 80 04 21 */	bctrl 
-/* 80336A2C  7F BD 1A 14 */	add r29, r29, r3
-/* 80336A30  48 00 00 2C */	b lbl_80336A5C
-lbl_80336A34:
-/* 80336A34  7F 23 CB 78 */	mr r3, r25
-/* 80336A38  7F 84 E3 78 */	mr r4, r28
-/* 80336A3C  48 00 05 B5 */	bl calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock
-/* 80336A40  7F BD 1A 14 */	add r29, r29, r3
-/* 80336A44  3B 60 00 01 */	li r27, 1
-/* 80336A48  48 00 00 14 */	b lbl_80336A5C
-lbl_80336A4C:
-/* 80336A4C  3C 60 80 3A */	lis r3, J3DModelLoaderCalcSize__stringBase0@ha /* 0x803A20E8@ha */
-/* 80336A50  38 63 20 E8 */	addi r3, r3, J3DModelLoaderCalcSize__stringBase0@l /* 0x803A20E8@l */
-/* 80336A54  4C C6 31 82 */	crclr 6
-/* 80336A58  4B CD 00 65 */	bl OSReport
-lbl_80336A5C:
-/* 80336A5C  80 1C 00 04 */	lwz r0, 4(r28)
-/* 80336A60  7F 9C 02 14 */	add r28, r28, r0
-/* 80336A64  3B 5A 00 01 */	addi r26, r26, 1
-lbl_80336A68:
-/* 80336A68  7C 1A F8 40 */	cmplw r26, r31
-/* 80336A6C  41 80 FF 6C */	blt lbl_803369D8
-/* 80336A70  57 60 06 3F */	clrlwi. r0, r27, 0x18
-/* 80336A74  40 82 00 08 */	bne lbl_80336A7C
-/* 80336A78  3B BD 00 0C */	addi r29, r29, 0xc
-lbl_80336A7C:
-/* 80336A7C  7F A3 EB 78 */	mr r3, r29
-/* 80336A80  39 61 00 30 */	addi r11, r1, 0x30
-/* 80336A84  48 02 B7 95 */	bl _restgpr_25
-/* 80336A88  80 01 00 34 */	lwz r0, 0x34(r1)
-/* 80336A8C  7C 08 03 A6 */	mtlr r0
-/* 80336A90  38 21 00 30 */	addi r1, r1, 0x30
-/* 80336A94  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock.s
deleted file mode 100644
index c4caf4307b..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock.s
+++ /dev/null
@@ -1,6 +0,0 @@
-lbl_80336DA0:
-/* 80336DA0  A0 63 00 1A */	lhz r3, 0x1a(r3)
-/* 80336DA4  A0 04 00 08 */	lhz r0, 8(r4)
-/* 80336DA8  7C 03 00 50 */	subf r0, r3, r0
-/* 80336DAC  54 03 08 3C */	slwi r3, r0, 1
-/* 80336DB0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock.s
deleted file mode 100644
index b919262a8d..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock.s
+++ /dev/null
@@ -1,5 +0,0 @@
-lbl_80336D90:
-/* 80336D90  A0 04 00 08 */	lhz r0, 8(r4)
-/* 80336D94  B0 03 00 1A */	sth r0, 0x1a(r3)
-/* 80336D98  38 60 00 00 */	li r3, 0
-/* 80336D9C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock.s
deleted file mode 100644
index da654b2e8c..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80336D64:
-/* 80336D64  38 60 00 00 */	li r3, 0
-/* 80336D68  80 04 00 14 */	lwz r0, 0x14(r4)
-/* 80336D6C  28 00 00 00 */	cmplwi r0, 0
-/* 80336D70  41 82 00 08 */	beq lbl_80336D78
-/* 80336D74  38 60 00 10 */	li r3, 0x10
-lbl_80336D78:
-/* 80336D78  A0 84 00 08 */	lhz r4, 8(r4)
-/* 80336D7C  54 80 10 3A */	slwi r0, r4, 2
-/* 80336D80  7C 63 02 14 */	add r3, r3, r0
-/* 80336D84  1C 04 00 5C */	mulli r0, r4, 0x5c
-/* 80336D88  7C 63 02 14 */	add r3, r3, r0
-/* 80336D8C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl.s
deleted file mode 100644
index 3bddb72630..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl.s
+++ /dev/null
@@ -1,62 +0,0 @@
-lbl_803370A0:
-/* 803370A0  94 21 FF 50 */	stwu r1, -0xb0(r1)
-/* 803370A4  7C 08 02 A6 */	mflr r0
-/* 803370A8  90 01 00 B4 */	stw r0, 0xb4(r1)
-/* 803370AC  39 61 00 B0 */	addi r11, r1, 0xb0
-/* 803370B0  48 02 B1 25 */	bl _savegpr_27
-/* 803370B4  7C 7B 1B 78 */	mr r27, r3
-/* 803370B8  7C 9C 23 78 */	mr r28, r4
-/* 803370BC  7C BF 2B 78 */	mr r31, r5
-/* 803370C0  3B C0 00 00 */	li r30, 0
-/* 803370C4  38 61 00 08 */	addi r3, r1, 8
-/* 803370C8  4B FF 91 6D */	bl __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock
-/* 803370CC  88 1B 00 18 */	lbz r0, 0x18(r27)
-/* 803370D0  28 00 00 00 */	cmplwi r0, 0
-/* 803370D4  40 82 00 54 */	bne lbl_80337128
-/* 803370D8  A3 BC 00 08 */	lhz r29, 8(r28)
-/* 803370DC  80 1C 00 20 */	lwz r0, 0x20(r28)
-/* 803370E0  28 00 00 00 */	cmplwi r0, 0
-/* 803370E4  41 82 00 08 */	beq lbl_803370EC
-/* 803370E8  3B C0 00 10 */	li r30, 0x10
-lbl_803370EC:
-/* 803370EC  57 A0 10 3A */	slwi r0, r29, 2
-/* 803370F0  7F DE 02 14 */	add r30, r30, r0
-/* 803370F4  3B 80 00 00 */	li r28, 0
-/* 803370F8  48 00 00 20 */	b lbl_80337118
-lbl_803370FC:
-/* 803370FC  38 61 00 08 */	addi r3, r1, 8
-/* 80337100  38 80 00 00 */	li r4, 0
-/* 80337104  38 A0 00 01 */	li r5, 1
-/* 80337108  7F E7 FB 78 */	mr r7, r31
-/* 8033710C  4B FF A9 71 */	bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl
-/* 80337110  7F DE 1A 14 */	add r30, r30, r3
-/* 80337114  3B 9C 00 01 */	addi r28, r28, 1
-lbl_80337118:
-/* 80337118  57 86 04 3E */	clrlwi r6, r28, 0x10
-/* 8033711C  7C 06 E8 40 */	cmplw r6, r29
-/* 80337120  41 80 FF DC */	blt lbl_803370FC
-/* 80337124  48 00 00 38 */	b lbl_8033715C
-lbl_80337128:
-/* 80337128  A3 9C 00 08 */	lhz r28, 8(r28)
-/* 8033712C  3B A0 00 00 */	li r29, 0
-/* 80337130  48 00 00 20 */	b lbl_80337150
-lbl_80337134:
-/* 80337134  38 61 00 08 */	addi r3, r1, 8
-/* 80337138  7F 64 DB 78 */	mr r4, r27
-/* 8033713C  38 A0 00 01 */	li r5, 1
-/* 80337140  7F E7 FB 78 */	mr r7, r31
-/* 80337144  4B FF A9 39 */	bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl
-/* 80337148  7F DE 1A 14 */	add r30, r30, r3
-/* 8033714C  3B BD 00 01 */	addi r29, r29, 1
-lbl_80337150:
-/* 80337150  57 A6 04 3E */	clrlwi r6, r29, 0x10
-/* 80337154  7C 06 E0 40 */	cmplw r6, r28
-/* 80337158  41 80 FF DC */	blt lbl_80337134
-lbl_8033715C:
-/* 8033715C  7F C3 F3 78 */	mr r3, r30
-/* 80337160  39 61 00 B0 */	addi r11, r1, 0xb0
-/* 80337164  48 02 B0 BD */	bl _restgpr_27
-/* 80337168  80 01 00 B4 */	lwz r0, 0xb4(r1)
-/* 8033716C  7C 08 03 A6 */	mtlr r0
-/* 80337170  38 21 00 B0 */	addi r1, r1, 0xb0
-/* 80337174  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s
deleted file mode 100644
index 1245df62a7..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_80336F60:
-/* 80336F60  94 21 FF 60 */	stwu r1, -0xa0(r1)
-/* 80336F64  7C 08 02 A6 */	mflr r0
-/* 80336F68  90 01 00 A4 */	stw r0, 0xa4(r1)
-/* 80336F6C  39 61 00 A0 */	addi r11, r1, 0xa0
-/* 80336F70  48 02 B2 69 */	bl _savegpr_28
-/* 80336F74  7C 9D 23 78 */	mr r29, r4
-/* 80336F78  7C BC 2B 78 */	mr r28, r5
-/* 80336F7C  3B E0 00 00 */	li r31, 0
-/* 80336F80  A3 C4 00 08 */	lhz r30, 8(r4)
-/* 80336F84  38 61 00 08 */	addi r3, r1, 8
-/* 80336F88  4B FF 90 65 */	bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock
-/* 80336F8C  80 1D 00 14 */	lwz r0, 0x14(r29)
-/* 80336F90  28 00 00 00 */	cmplwi r0, 0
-/* 80336F94  41 82 00 08 */	beq lbl_80336F9C
-/* 80336F98  3B E0 00 10 */	li r31, 0x10
-lbl_80336F9C:
-/* 80336F9C  57 C0 10 3A */	slwi r0, r30, 2
-/* 80336FA0  7F FF 02 14 */	add r31, r31, r0
-/* 80336FA4  3B A0 00 00 */	li r29, 0
-/* 80336FA8  48 00 00 20 */	b lbl_80336FC8
-lbl_80336FAC:
-/* 80336FAC  38 61 00 08 */	addi r3, r1, 8
-/* 80336FB0  38 80 00 00 */	li r4, 0
-/* 80336FB4  38 A0 00 00 */	li r5, 0
-/* 80336FB8  7F 87 E3 78 */	mr r7, r28
-/* 80336FBC  4B FF AA C1 */	bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl
-/* 80336FC0  7F FF 1A 14 */	add r31, r31, r3
-/* 80336FC4  3B BD 00 01 */	addi r29, r29, 1
-lbl_80336FC8:
-/* 80336FC8  57 A6 04 3E */	clrlwi r6, r29, 0x10
-/* 80336FCC  7C 06 F0 40 */	cmplw r6, r30
-/* 80336FD0  41 80 FF DC */	blt lbl_80336FAC
-/* 80336FD4  7F E3 FB 78 */	mr r3, r31
-/* 80336FD8  39 61 00 A0 */	addi r11, r1, 0xa0
-/* 80336FDC  48 02 B2 49 */	bl _restgpr_28
-/* 80336FE0  80 01 00 A4 */	lwz r0, 0xa4(r1)
-/* 80336FE4  7C 08 03 A6 */	mtlr r0
-/* 80336FE8  38 21 00 A0 */	addi r1, r1, 0xa0
-/* 80336FEC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s
deleted file mode 100644
index c0abb0bdd4..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl.s
+++ /dev/null
@@ -1,67 +0,0 @@
-lbl_80336DB4:
-/* 80336DB4  94 21 FF 50 */	stwu r1, -0xb0(r1)
-/* 80336DB8  7C 08 02 A6 */	mflr r0
-/* 80336DBC  90 01 00 B4 */	stw r0, 0xb4(r1)
-/* 80336DC0  39 61 00 B0 */	addi r11, r1, 0xb0
-/* 80336DC4  48 02 B4 11 */	bl _savegpr_27
-/* 80336DC8  7C 9C 23 78 */	mr r28, r4
-/* 80336DCC  7C BB 2B 78 */	mr r27, r5
-/* 80336DD0  3B E0 00 00 */	li r31, 0
-/* 80336DD4  38 61 00 08 */	addi r3, r1, 8
-/* 80336DD8  4B FF 92 15 */	bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock
-/* 80336DDC  A3 DC 00 08 */	lhz r30, 8(r28)
-/* 80336DE0  38 61 00 08 */	addi r3, r1, 8
-/* 80336DE4  4B FF 94 D9 */	bl countUniqueMaterials__18J3DMaterialFactoryFv
-/* 80336DE8  54 7D 04 3E */	clrlwi r29, r3, 0x10
-/* 80336DEC  80 1C 00 14 */	lwz r0, 0x14(r28)
-/* 80336DF0  28 00 00 00 */	cmplwi r0, 0
-/* 80336DF4  41 82 00 08 */	beq lbl_80336DFC
-/* 80336DF8  3B E0 00 10 */	li r31, 0x10
-lbl_80336DFC:
-/* 80336DFC  57 C0 10 3A */	slwi r0, r30, 2
-/* 80336E00  7F FF 02 14 */	add r31, r31, r0
-/* 80336E04  57 64 02 95 */	rlwinm. r4, r27, 0, 0xa, 0xa
-/* 80336E08  41 82 00 14 */	beq lbl_80336E1C
-/* 80336E0C  1C 7D 00 4C */	mulli r3, r29, 0x4c
-/* 80336E10  38 03 00 1F */	addi r0, r3, 0x1f
-/* 80336E14  54 00 00 34 */	rlwinm r0, r0, 0, 0, 0x1a
-/* 80336E18  7F FF 02 14 */	add r31, r31, r0
-lbl_80336E1C:
-/* 80336E1C  28 04 00 00 */	cmplwi r4, 0
-/* 80336E20  41 82 00 34 */	beq lbl_80336E54
-/* 80336E24  3B 80 00 00 */	li r28, 0
-/* 80336E28  48 00 00 24 */	b lbl_80336E4C
-lbl_80336E2C:
-/* 80336E2C  38 61 00 08 */	addi r3, r1, 8
-/* 80336E30  38 80 00 00 */	li r4, 0
-/* 80336E34  38 A0 00 00 */	li r5, 0
-/* 80336E38  7F 86 E3 78 */	mr r6, r28
-/* 80336E3C  7F 67 DB 78 */	mr r7, r27
-/* 80336E40  4B FF AC 3D */	bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl
-/* 80336E44  7F FF 1A 14 */	add r31, r31, r3
-/* 80336E48  3B 9C 00 01 */	addi r28, r28, 1
-lbl_80336E4C:
-/* 80336E4C  7C 1C E8 40 */	cmplw r28, r29
-/* 80336E50  41 80 FF DC */	blt lbl_80336E2C
-lbl_80336E54:
-/* 80336E54  3B 80 00 00 */	li r28, 0
-/* 80336E58  48 00 00 24 */	b lbl_80336E7C
-lbl_80336E5C:
-/* 80336E5C  38 61 00 08 */	addi r3, r1, 8
-/* 80336E60  38 80 00 00 */	li r4, 0
-/* 80336E64  38 A0 00 00 */	li r5, 0
-/* 80336E68  7F 86 E3 78 */	mr r6, r28
-/* 80336E6C  7F 67 DB 78 */	mr r7, r27
-/* 80336E70  4B FF AC 0D */	bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl
-/* 80336E74  7F FF 1A 14 */	add r31, r31, r3
-/* 80336E78  3B 9C 00 01 */	addi r28, r28, 1
-lbl_80336E7C:
-/* 80336E7C  7C 1C F0 40 */	cmplw r28, r30
-/* 80336E80  41 80 FF DC */	blt lbl_80336E5C
-/* 80336E84  7F E3 FB 78 */	mr r3, r31
-/* 80336E88  39 61 00 B0 */	addi r11, r1, 0xb0
-/* 80336E8C  48 02 B3 95 */	bl _restgpr_27
-/* 80336E90  80 01 00 B4 */	lwz r0, 0xb4(r1)
-/* 80336E94  7C 08 03 A6 */	mtlr r0
-/* 80336E98  38 21 00 B0 */	addi r1, r1, 0xb0
-/* 80336E9C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl.s
deleted file mode 100644
index 0a21493189..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_80337010:
-/* 80337010  94 21 FF 60 */	stwu r1, -0xa0(r1)
-/* 80337014  7C 08 02 A6 */	mflr r0
-/* 80337018  90 01 00 A4 */	stw r0, 0xa4(r1)
-/* 8033701C  39 61 00 A0 */	addi r11, r1, 0xa0
-/* 80337020  48 02 B1 B9 */	bl _savegpr_28
-/* 80337024  7C 9D 23 78 */	mr r29, r4
-/* 80337028  7C BC 2B 78 */	mr r28, r5
-/* 8033702C  3B E0 00 00 */	li r31, 0
-/* 80337030  A3 C4 00 08 */	lhz r30, 8(r4)
-/* 80337034  38 61 00 08 */	addi r3, r1, 8
-/* 80337038  4B FF 8F B5 */	bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock
-/* 8033703C  80 1D 00 14 */	lwz r0, 0x14(r29)
-/* 80337040  28 00 00 00 */	cmplwi r0, 0
-/* 80337044  41 82 00 08 */	beq lbl_8033704C
-/* 80337048  3B E0 00 10 */	li r31, 0x10
-lbl_8033704C:
-/* 8033704C  57 C0 10 3A */	slwi r0, r30, 2
-/* 80337050  7F FF 02 14 */	add r31, r31, r0
-/* 80337054  3B A0 00 00 */	li r29, 0
-/* 80337058  48 00 00 20 */	b lbl_80337078
-lbl_8033705C:
-/* 8033705C  38 61 00 08 */	addi r3, r1, 8
-/* 80337060  38 80 00 00 */	li r4, 0
-/* 80337064  38 A0 00 02 */	li r5, 2
-/* 80337068  7F 87 E3 78 */	mr r7, r28
-/* 8033706C  4B FF AA 11 */	bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl
-/* 80337070  7F FF 1A 14 */	add r31, r31, r3
-/* 80337074  3B BD 00 01 */	addi r29, r29, 1
-lbl_80337078:
-/* 80337078  57 A6 04 3E */	clrlwi r6, r29, 0x10
-/* 8033707C  7C 06 F0 40 */	cmplw r6, r30
-/* 80337080  41 80 FF DC */	blt lbl_8033705C
-/* 80337084  7F E3 FB 78 */	mr r3, r31
-/* 80337088  39 61 00 A0 */	addi r11, r1, 0xa0
-/* 8033708C  48 02 B1 99 */	bl _restgpr_28
-/* 80337090  80 01 00 A4 */	lwz r0, 0xa4(r1)
-/* 80337094  7C 08 03 A6 */	mtlr r0
-/* 80337098  38 21 00 A0 */	addi r1, r1, 0xa0
-/* 8033709C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl.s
deleted file mode 100644
index 7d80607dc5..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl.s
+++ /dev/null
@@ -1,46 +0,0 @@
-lbl_80336EA0:
-/* 80336EA0  94 21 FF C0 */	stwu r1, -0x40(r1)
-/* 80336EA4  7C 08 02 A6 */	mflr r0
-/* 80336EA8  90 01 00 44 */	stw r0, 0x44(r1)
-/* 80336EAC  39 61 00 40 */	addi r11, r1, 0x40
-/* 80336EB0  48 02 B3 29 */	bl _savegpr_28
-/* 80336EB4  7C 7C 1B 78 */	mr r28, r3
-/* 80336EB8  7C 9E 23 78 */	mr r30, r4
-/* 80336EBC  7C BD 2B 78 */	mr r29, r5
-/* 80336EC0  3B E0 00 00 */	li r31, 0
-/* 80336EC4  38 61 00 08 */	addi r3, r1, 8
-/* 80336EC8  48 00 04 89 */	bl __ct__15J3DShapeFactoryFRC13J3DShapeBlock
-/* 80336ECC  A0 9E 00 08 */	lhz r4, 8(r30)
-/* 80336ED0  80 1E 00 14 */	lwz r0, 0x14(r30)
-/* 80336ED4  28 00 00 00 */	cmplwi r0, 0
-/* 80336ED8  41 82 00 08 */	beq lbl_80336EE0
-/* 80336EDC  3B E0 00 10 */	li r31, 0x10
-lbl_80336EE0:
-/* 80336EE0  54 80 10 3A */	slwi r0, r4, 2
-/* 80336EE4  7F FF 02 14 */	add r31, r31, r0
-/* 80336EE8  38 61 00 08 */	addi r3, r1, 8
-/* 80336EEC  48 00 0A ED */	bl calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl
-/* 80336EF0  7F FF 1A 14 */	add r31, r31, r3
-/* 80336EF4  83 DC 00 14 */	lwz r30, 0x14(r28)
-/* 80336EF8  48 00 00 24 */	b lbl_80336F1C
-lbl_80336EFC:
-/* 80336EFC  28 00 00 12 */	cmplwi r0, 0x12
-/* 80336F00  40 82 00 18 */	bne lbl_80336F18
-/* 80336F04  38 61 00 08 */	addi r3, r1, 8
-/* 80336F08  A0 9E 00 02 */	lhz r4, 2(r30)
-/* 80336F0C  7F A5 EB 78 */	mr r5, r29
-/* 80336F10  48 00 0A 35 */	bl calcSize__15J3DShapeFactoryFiUl
-/* 80336F14  7F FF 1A 14 */	add r31, r31, r3
-lbl_80336F18:
-/* 80336F18  3B DE 00 04 */	addi r30, r30, 4
-lbl_80336F1C:
-/* 80336F1C  A0 1E 00 00 */	lhz r0, 0(r30)
-/* 80336F20  28 00 00 00 */	cmplwi r0, 0
-/* 80336F24  40 82 FF D8 */	bne lbl_80336EFC
-/* 80336F28  7F E3 FB 78 */	mr r3, r31
-/* 80336F2C  39 61 00 40 */	addi r11, r1, 0x40
-/* 80336F30  48 02 B2 F5 */	bl _restgpr_28
-/* 80336F34  80 01 00 44 */	lwz r0, 0x44(r1)
-/* 80336F38  7C 08 03 A6 */	mtlr r0
-/* 80336F3C  38 21 00 40 */	addi r1, r1, 0x40
-/* 80336F40  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock.s
deleted file mode 100644
index a4a7e398ed..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80336FF0:
-/* 80336FF0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80336FF4  7C 08 02 A6 */	mflr r0
-/* 80336FF8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80336FFC  4B FF FF 49 */	bl calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock
-/* 80337000  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80337004  7C 08 03 A6 */	mtlr r0
-/* 80337008  38 21 00 10 */	addi r1, r1, 0x10
-/* 8033700C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock.s
deleted file mode 100644
index af76fbbb68..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80336F44:
-/* 80336F44  38 60 00 00 */	li r3, 0
-/* 80336F48  80 04 00 10 */	lwz r0, 0x10(r4)
-/* 80336F4C  28 00 00 00 */	cmplwi r0, 0
-/* 80336F50  41 82 00 08 */	beq lbl_80336F58
-/* 80336F54  38 60 00 10 */	li r3, 0x10
-lbl_80336F58:
-/* 80336F58  38 63 00 0C */	addi r3, r3, 0xc
-/* 80336F5C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/countMaterialNum__14J3DModelLoaderFPCv.s b/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/countMaterialNum__14J3DModelLoaderFPCv.s
deleted file mode 100644
index de1b25b0ad..0000000000
--- a/asm/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize/countMaterialNum__14J3DModelLoaderFPCv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80336794:
-/* 80336794  38 A4 00 20 */	addi r5, r4, 0x20
-/* 80336798  80 04 00 0C */	lwz r0, 0xc(r4)
-/* 8033679C  7C 09 03 A6 */	mtctr r0
-/* 803367A0  28 00 00 00 */	cmplwi r0, 0
-/* 803367A4  40 81 00 28 */	ble lbl_803367CC
-lbl_803367A8:
-/* 803367A8  80 65 00 00 */	lwz r3, 0(r5)
-/* 803367AC  3C 03 B2 BF */	addis r0, r3, 0xb2bf
-/* 803367B0  28 00 54 33 */	cmplwi r0, 0x5433
-/* 803367B4  40 82 00 0C */	bne lbl_803367C0
-/* 803367B8  A0 65 00 08 */	lhz r3, 8(r5)
-/* 803367BC  4E 80 00 20 */	blr 
-lbl_803367C0:
-/* 803367C0  80 05 00 04 */	lwz r0, 4(r5)
-/* 803367C4  7C A5 02 14 */	add r5, r5, r0
-/* 803367C8  42 00 FF E0 */	bdnz lbl_803367A8
-lbl_803367CC:
-/* 803367CC  38 60 00 00 */	li r3, 0
-/* 803367D0  4E 80 00 20 */	blr