moved strings + decompile simple store functions

27 files changed, 2 insertions, 80 deletions

diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s
deleted file mode 100644
index b157afa0c0..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__20J3DColorBlockLightOnFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80322F70:
-/* 80322F70  98 83 00 14 */	stb r4, 0x14(r3)
-/* 80322F74  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s
deleted file mode 100644
index 8a2f9e5e92..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanNum__21J3DColorBlockLightOffFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_803231D0:
-/* 803231D0  98 83 00 0C */	stb r4, 0xc(r3)
-/* 803231D4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s
deleted file mode 100644
index 8d9e7a03cd..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__20J3DColorBlockLightOnFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80323010:
-/* 80323010  90 83 00 48 */	stw r4, 0x48(r3)
-/* 80323014  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s
deleted file mode 100644
index 938569a2de..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setColorChanOffset__21J3DColorBlockLightOffFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80323250:
-/* 80323250  90 83 00 1C */	stw r4, 0x1c(r3)
-/* 80323254  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s
deleted file mode 100644
index c63f8a1a20..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__20J3DColorBlockLightOnFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80322FDC:
-/* 80322FDC  98 83 00 40 */	stb r4, 0x40(r3)
-/* 80322FE0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s
deleted file mode 100644
index 3d9fdf22ea..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setCullMode__21J3DColorBlockLightOffFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_8032321C:
-/* 8032321C  98 83 00 16 */	stb r4, 0x16(r3)
-/* 80323220  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s
deleted file mode 100644
index 568677ba23..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__14J3DPEBlockFullFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321A44:
-/* 80321A44  98 83 00 3B */	stb r4, 0x3b(r3)
-/* 80321A48  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s
deleted file mode 100644
index f6e28759d2..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setDither__16J3DPEBlockFogOffFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321BA8:
-/* 80321BA8  98 83 00 0F */	stb r4, 0xf(r3)
-/* 80321BAC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s
deleted file mode 100644
index fb603485fc..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setFogOffset__14J3DPEBlockFullFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321A68:
-/* 80321A68  90 83 00 3C */	stw r4, 0x3c(r3)
-/* 80321A6C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s
deleted file mode 100644
index 2d6d45c6ce..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setIndTexStageNum__15J3DIndBlockFullFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_8032339C:
-/* 8032339C  98 83 00 04 */	stb r4, 4(r3)
-/* 803233A0  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s
deleted file mode 100644
index 9810ec55ed..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__20J3DColorBlockLightOnFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80323008:
-/* 80323008  90 83 00 44 */	stw r4, 0x44(r3)
-/* 8032300C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s
deleted file mode 100644
index 096f725732..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setMatColorOffset__21J3DColorBlockLightOffFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80323248:
-/* 80323248  90 83 00 18 */	stw r4, 0x18(r3)
-/* 8032324C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s
deleted file mode 100644
index a679e81fae..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock2FUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_8032270C:
-/* 8032270C  90 83 00 68 */	stw r4, 0x68(r3)
-/* 80322710  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s
deleted file mode 100644
index 5589c9b2de..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__12J3DTevBlock4FUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80322348:
-/* 80322348  90 83 00 90 */	stw r4, 0x90(r3)
-/* 8032234C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s
deleted file mode 100644
index c111f1ea91..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__13J3DTevBlock16FUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321F7C:
-/* 80321F7C  90 83 01 70 */	stw r4, 0x170(r3)
-/* 80321F80  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s
deleted file mode 100644
index 8a0af1409a..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevRegOffset__18J3DTevBlockPatchedFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80322C08:
-/* 80322C08  90 83 00 D4 */	stw r4, 0xd4(r3)
-/* 80322C0C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s
deleted file mode 100644
index 08173594d2..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock2FUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80322578:
-/* 80322578  98 83 00 34 */	stb r4, 0x34(r3)
-/* 8032257C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s
deleted file mode 100644
index 951db05058..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__12J3DTevBlock4FUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_803221B4:
-/* 803221B4  98 83 00 20 */	stb r4, 0x20(r3)
-/* 803221B8  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s
deleted file mode 100644
index e49ec826e8..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__13J3DTevBlock16FUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321DE8:
-/* 80321DE8  98 83 00 58 */	stb r4, 0x58(r3)
-/* 80321DEC  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s
deleted file mode 100644
index b1b39bd4d2..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTevStageNum__18J3DTevBlockPatchedFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_803229A4:
-/* 803229A4  98 83 00 D0 */	stb r4, 0xd0(r3)
-/* 803229A8  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s
deleted file mode 100644
index 74ab90d8fa..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexGenNum__21J3DTexGenBlockPatchedFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80322D34:
-/* 80322D34  90 83 00 04 */	stw r4, 4(r3)
-/* 80322D38  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s
deleted file mode 100644
index 50dd47a4ad..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexMtxOffset__21J3DTexGenBlockPatchedFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80322DA0:
-/* 80322DA0  90 83 00 58 */	stw r4, 0x58(r3)
-/* 80322DA4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s
deleted file mode 100644
index 853a7b0b21..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setTexNoOffset__11J3DTevBlockFUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321FE0:
-/* 80321FE0  90 83 00 04 */	stw r4, 4(r3)
-/* 80321FE4  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s
deleted file mode 100644
index 7eeb56ae6b..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__14J3DPEBlockFullFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321A28:
-/* 80321A28  98 83 00 3A */	stb r4, 0x3a(r3)
-/* 80321A2C  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s b/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s
deleted file mode 100644
index 429b88a849..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DMatBlock/setZCompLoc__16J3DPEBlockFogOffFUc.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80321B8C:
-/* 80321B8C  98 83 00 0E */	stb r4, 0xe(r3)
-/* 80321B90  4E 80 00 20 */	blr 
diff --git a/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s b/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s
index 48d044540a..0c951e490e 100644
--- a/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s
+++ b/asm/JSystem/J3DGraphBase/J3DMaterial/createPEBlock__11J3DMaterialFUlUl.s
@@ -65,7 +65,7 @@ lbl_80316018:
 /* 80316050  3C 80 80 3A */	lis r4, j3dDefaultFogInfo@ha /* 0x803A1FBC@ha */
 /* 80316054  38 84 1F BC */	addi r4, r4, j3dDefaultFogInfo@l /* 0x803A1FBC@l */
 /* 80316058  48 00 F7 A9 */	bl __as__10J3DFogInfoFRC10J3DFogInfo
-/* 8031605C  A0 02 C9 FA */	lhz r0, struct_804563F8+0x2(r2)
+/* 8031605C  A0 02 C9 FA */	lhz r0, j3dDefaultAlphaCmpID(r2)
 /* 80316060  B0 1F 00 30 */	sth r0, 0x30(r31)
 /* 80316064  38 00 00 00 */	li r0, 0
 /* 80316068  98 1F 00 32 */	stb r0, 0x32(r31)
@@ -91,7 +91,7 @@ lbl_8031608C:
 /* 803160B4  3C 80 80 3D */	lis r4, __vt__16J3DPEBlockFogOff@ha /* 0x803CE06C@ha */
 /* 803160B8  38 04 E0 6C */	addi r0, r4, __vt__16J3DPEBlockFogOff@l /* 0x803CE06C@l */
 /* 803160BC  90 1F 00 00 */	stw r0, 0(r31)
-/* 803160C0  A0 02 C9 FA */	lhz r0, struct_804563F8+0x2(r2)
+/* 803160C0  A0 02 C9 FA */	lhz r0, j3dDefaultAlphaCmpID(r2)
 /* 803160C4  B0 1F 00 04 */	sth r0, 4(r31)
 /* 803160C8  38 00 00 00 */	li r0, 0
 /* 803160CC  98 1F 00 06 */	stb r0, 6(r31)
diff --git a/asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s b/asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s
deleted file mode 100644
index c50e89a4ab..0000000000
--- a/asm/JSystem/J3DGraphBase/J3DTransform/__MTGQR7__FUl.s
+++ /dev/null
@@ -1,3 +0,0 @@
-lbl_80311630:
-/* 80311630  7C 77 E3 A6 */	mtspr 0x397, r3
-/* 80311634  4E 80 00 20 */	blr