d_a_guard_mng OK, d_a_obj_smoke OK, d_a_tag_smk_emt OK, d_a_hitobj OK (#298)

* d_a_guard_mng OK

* d_a_obj_smoke OK

* d_a_tag_smk_emt OK

* d_a_hitobj attempt

* fixes

* rm comment

* cc_sph_src

* rename and move mGuardDataTbl

30 files changed, 0 insertions, 772 deletions

diff --git a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkAppearTag__12daGuardMng_cFP12daTagGuard_c.s b/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkAppearTag__12daGuardMng_cFP12daTagGuard_c.s
deleted file mode 100644
index e4fb1c96ab..0000000000
--- a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkAppearTag__12daGuardMng_cFP12daTagGuard_c.s
+++ /dev/null
@@ -1,34 +0,0 @@
-lbl_80837BEC:
-/* 80837BEC  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80837BF0  7C 08 02 A6 */	mflr r0
-/* 80837BF4  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80837BF8  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 80837BFC  93 C1 00 18 */	stw r30, 0x18(r1)
-/* 80837C00  7C 7E 1B 78 */	mr r30, r3
-/* 80837C04  7C 9F 23 78 */	mr r31, r4
-/* 80837C08  7F E3 FB 78 */	mr r3, r31
-/* 80837C0C  38 81 00 08 */	addi r4, r1, 8
-/* 80837C10  48 52 1B E9 */	bl getAppearPoint__12daTagGuard_cFP3Vec
-/* 80837C14  54 60 06 3F */	clrlwi. r0, r3, 0x18
-/* 80837C18  41 82 00 3C */	beq lbl_80837C54
-/* 80837C1C  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80837C20  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80837C24  80 63 5D AC */	lwz r3, 0x5dac(r3)
-/* 80837C28  38 83 04 D0 */	addi r4, r3, 0x4d0
-/* 80837C2C  38 61 00 08 */	addi r3, r1, 8
-/* 80837C30  7C 65 1B 78 */	mr r5, r3
-/* 80837C34  4B B0 F4 81 */	bl PSVECSubtract
-/* 80837C38  38 61 00 08 */	addi r3, r1, 8
-/* 80837C3C  4B B0 F4 FD */	bl PSVECSquareMag
-/* 80837C40  C0 1E 05 6C */	lfs f0, 0x56c(r30)
-/* 80837C44  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 80837C48  40 81 00 0C */	ble lbl_80837C54
-/* 80837C4C  93 FE 05 68 */	stw r31, 0x568(r30)
-/* 80837C50  D0 3E 05 6C */	stfs f1, 0x56c(r30)
-lbl_80837C54:
-/* 80837C54  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 80837C58  83 C1 00 18 */	lwz r30, 0x18(r1)
-/* 80837C5C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80837C60  7C 08 03 A6 */	mtlr r0
-/* 80837C64  38 21 00 20 */	addi r1, r1, 0x20
-/* 80837C68  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkMerchantNum__12daGuardMng_cFv.s b/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkMerchantNum__12daGuardMng_cFv.s
deleted file mode 100644
index 17a4719403..0000000000
--- a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkMerchantNum__12daGuardMng_cFv.s
+++ /dev/null
@@ -1,21 +0,0 @@
-lbl_80837B9C:
-/* 80837B9C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80837BA0  7C 08 02 A6 */	mflr r0
-/* 80837BA4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80837BA8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80837BAC  7C 7F 1B 78 */	mr r31, r3
-/* 80837BB0  3C 60 80 83 */	lis r3, lit_3663@ha /* 0x80837DEC@ha */
-/* 80837BB4  C0 03 7D EC */	lfs f0, lit_3663@l(r3)  /* 0x80837DEC@l */
-/* 80837BB8  D0 1F 05 6C */	stfs f0, 0x56c(r31)
-/* 80837BBC  38 00 00 00 */	li r0, 0
-/* 80837BC0  98 1F 05 70 */	stb r0, 0x570(r31)
-/* 80837BC4  3C 60 80 83 */	lis r3, s_sub__FPvPv@ha /* 0x80837B18@ha */
-/* 80837BC8  38 63 7B 18 */	addi r3, r3, s_sub__FPvPv@l /* 0x80837B18@l */
-/* 80837BCC  7F E4 FB 78 */	mr r4, r31
-/* 80837BD0  4B 7E 97 69 */	bl fpcEx_Search__FPFPvPv_PvPv
-/* 80837BD4  88 7F 05 70 */	lbz r3, 0x570(r31)
-/* 80837BD8  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80837BDC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80837BE0  7C 08 03 A6 */	mtlr r0
-/* 80837BE4  38 21 00 10 */	addi r1, r1, 0x10
-/* 80837BE8  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Create__FP10fopAc_ac_c.s
deleted file mode 100644
index 292420847f..0000000000
--- a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Create__FP10fopAc_ac_c.s
+++ /dev/null
@@ -1,27 +0,0 @@
-lbl_80837D7C:
-/* 80837D7C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80837D80  7C 08 02 A6 */	mflr r0
-/* 80837D84  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80837D88  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80837D8C  7C 7F 1B 78 */	mr r31, r3
-/* 80837D90  80 03 04 A0 */	lwz r0, 0x4a0(r3)
-/* 80837D94  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80837D98  40 82 00 1C */	bne lbl_80837DB4
-/* 80837D9C  28 1F 00 00 */	cmplwi r31, 0
-/* 80837DA0  41 82 00 08 */	beq lbl_80837DA8
-/* 80837DA4  4B 7E 0D C1 */	bl __ct__10fopAc_ac_cFv
-lbl_80837DA8:
-/* 80837DA8  80 1F 04 A0 */	lwz r0, 0x4a0(r31)
-/* 80837DAC  60 00 00 08 */	ori r0, r0, 8
-/* 80837DB0  90 1F 04 A0 */	stw r0, 0x4a0(r31)
-lbl_80837DB4:
-/* 80837DB4  80 1F 00 B0 */	lwz r0, 0xb0(r31)
-/* 80837DB8  98 1F 05 72 */	stb r0, 0x572(r31)
-/* 80837DBC  38 00 00 00 */	li r0, 0
-/* 80837DC0  98 1F 05 73 */	stb r0, 0x573(r31)
-/* 80837DC4  38 60 00 04 */	li r3, 4
-/* 80837DC8  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80837DCC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80837DD0  7C 08 03 A6 */	mtlr r0
-/* 80837DD4  38 21 00 10 */	addi r1, r1, 0x10
-/* 80837DD8  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Delete__FP12daGuardMng_c.s b/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Delete__FP12daGuardMng_c.s
deleted file mode 100644
index d0cc37e012..0000000000
--- a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Delete__FP12daGuardMng_c.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_80837D4C:
-/* 80837D4C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80837D50  7C 08 02 A6 */	mflr r0
-/* 80837D54  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80837D58  28 03 00 00 */	cmplwi r3, 0
-/* 80837D5C  41 82 00 0C */	beq lbl_80837D68
-/* 80837D60  38 80 00 00 */	li r4, 0
-/* 80837D64  4B 7E 0F 29 */	bl __dt__10fopAc_ac_cFv
-lbl_80837D68:
-/* 80837D68  38 60 00 01 */	li r3, 1
-/* 80837D6C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80837D70  7C 08 03 A6 */	mtlr r0
-/* 80837D74  38 21 00 10 */	addi r1, r1, 0x10
-/* 80837D78  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Execute__FP12daGuardMng_c.s b/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Execute__FP12daGuardMng_c.s
deleted file mode 100644
index 147aacc6b4..0000000000
--- a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Execute__FP12daGuardMng_c.s
+++ /dev/null
@@ -1,60 +0,0 @@
-lbl_80837C6C:
-/* 80837C6C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80837C70  7C 08 02 A6 */	mflr r0
-/* 80837C74  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80837C78  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80837C7C  7C 7F 1B 78 */	mr r31, r3
-/* 80837C80  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80837C84  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80837C88  80 63 5D B4 */	lwz r3, 0x5db4(r3)
-/* 80837C8C  80 03 05 74 */	lwz r0, 0x574(r3)
-/* 80837C90  54 00 01 8D */	rlwinm. r0, r0, 0, 6, 6
-/* 80837C94  41 82 00 14 */	beq lbl_80837CA8
-/* 80837C98  88 7F 05 73 */	lbz r3, 0x573(r31)
-/* 80837C9C  88 1F 05 72 */	lbz r0, 0x572(r31)
-/* 80837CA0  7C 03 00 40 */	cmplw r3, r0
-/* 80837CA4  41 80 00 0C */	blt lbl_80837CB0
-lbl_80837CA8:
-/* 80837CA8  38 60 00 01 */	li r3, 1
-/* 80837CAC  48 00 00 84 */	b lbl_80837D30
-lbl_80837CB0:
-/* 80837CB0  88 1F 05 71 */	lbz r0, 0x571(r31)
-/* 80837CB4  88 7F 05 70 */	lbz r3, 0x570(r31)
-/* 80837CB8  7C 00 18 40 */	cmplw r0, r3
-/* 80837CBC  40 80 00 08 */	bge lbl_80837CC4
-/* 80837CC0  98 7F 05 71 */	stb r3, 0x571(r31)
-lbl_80837CC4:
-/* 80837CC4  7F E3 FB 78 */	mr r3, r31
-/* 80837CC8  4B FF FE D5 */	bl checkMerchantNum__12daGuardMng_cFv
-/* 80837CCC  80 7F 05 68 */	lwz r3, 0x568(r31)
-/* 80837CD0  28 03 00 00 */	cmplwi r3, 0
-/* 80837CD4  41 82 00 58 */	beq lbl_80837D2C
-/* 80837CD8  88 9F 05 71 */	lbz r4, 0x571(r31)
-/* 80837CDC  88 1F 05 70 */	lbz r0, 0x570(r31)
-/* 80837CE0  7C 04 00 40 */	cmplw r4, r0
-/* 80837CE4  40 81 00 48 */	ble lbl_80837D2C
-/* 80837CE8  7C 00 20 50 */	subf r0, r0, r4
-/* 80837CEC  2C 00 00 03 */	cmpwi r0, 3
-/* 80837CF0  40 81 00 3C */	ble lbl_80837D2C
-/* 80837CF4  3C 80 80 83 */	lis r4, data_80837DE4@ha /* 0x80837DE4@ha */
-/* 80837CF8  38 84 7D E4 */	addi r4, r4, data_80837DE4@l /* 0x80837DE4@l */
-/* 80837CFC  80 84 00 00 */	lwz r4, 0(r4)
-/* 80837D00  48 52 1B 5D */	bl createGuard__12daTagGuard_cFUl
-/* 80837D04  88 7F 05 73 */	lbz r3, 0x573(r31)
-/* 80837D08  38 03 00 01 */	addi r0, r3, 1
-/* 80837D0C  98 1F 05 73 */	stb r0, 0x573(r31)
-/* 80837D10  88 1F 05 70 */	lbz r0, 0x570(r31)
-/* 80837D14  98 1F 05 71 */	stb r0, 0x571(r31)
-/* 80837D18  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80837D1C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80837D20  38 63 09 78 */	addi r3, r3, 0x978
-/* 80837D24  38 80 00 3C */	li r4, 0x3c
-/* 80837D28  4B 7F CE 71 */	bl onSwitch__12dSv_danBit_cFi
-lbl_80837D2C:
-/* 80837D2C  38 60 00 01 */	li r3, 1
-lbl_80837D30:
-/* 80837D30  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80837D34  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80837D38  7C 08 03 A6 */	mtlr r0
-/* 80837D3C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80837D40  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/s_sub__FPvPv.s b/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/s_sub__FPvPv.s
deleted file mode 100644
index fd53a9eea9..0000000000
--- a/asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/s_sub__FPvPv.s
+++ /dev/null
@@ -1,37 +0,0 @@
-lbl_80837B18:
-/* 80837B18  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80837B1C  7C 08 02 A6 */	mflr r0
-/* 80837B20  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80837B24  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80837B28  93 C1 00 08 */	stw r30, 8(r1)
-/* 80837B2C  7C 7E 1B 78 */	mr r30, r3
-/* 80837B30  7C 9F 23 78 */	mr r31, r4
-/* 80837B34  4B 7E 11 AD */	bl fopAc_IsActor__FPv
-/* 80837B38  2C 03 00 00 */	cmpwi r3, 0
-/* 80837B3C  41 82 00 44 */	beq lbl_80837B80
-/* 80837B40  A8 1E 00 08 */	lha r0, 8(r30)
-/* 80837B44  2C 00 02 88 */	cmpwi r0, 0x288
-/* 80837B48  41 82 00 14 */	beq lbl_80837B5C
-/* 80837B4C  2C 00 02 8F */	cmpwi r0, 0x28f
-/* 80837B50  41 82 00 0C */	beq lbl_80837B5C
-/* 80837B54  2C 00 02 94 */	cmpwi r0, 0x294
-/* 80837B58  40 82 00 14 */	bne lbl_80837B6C
-lbl_80837B5C:
-/* 80837B5C  88 7F 05 70 */	lbz r3, 0x570(r31)
-/* 80837B60  38 03 00 01 */	addi r0, r3, 1
-/* 80837B64  98 1F 05 70 */	stb r0, 0x570(r31)
-/* 80837B68  48 00 00 18 */	b lbl_80837B80
-lbl_80837B6C:
-/* 80837B6C  2C 00 02 96 */	cmpwi r0, 0x296
-/* 80837B70  40 82 00 10 */	bne lbl_80837B80
-/* 80837B74  7F E3 FB 78 */	mr r3, r31
-/* 80837B78  7F C4 F3 78 */	mr r4, r30
-/* 80837B7C  48 00 00 71 */	bl checkAppearTag__12daGuardMng_cFP12daTagGuard_c
-lbl_80837B80:
-/* 80837B80  38 60 00 00 */	li r3, 0
-/* 80837B84  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80837B88  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80837B8C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80837B90  7C 08 03 A6 */	mtlr r0
-/* 80837B94  38 21 00 10 */	addi r1, r1, 0x10
-/* 80837B98  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGAabFv.s b/asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGAabFv.s
deleted file mode 100644
index a839f1f44e..0000000000
--- a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGAabFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_8046B584:
-/* 8046B584  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8046B588  7C 08 02 A6 */	mflr r0
-/* 8046B58C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8046B590  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8046B594  7C 7F 1B 79 */	or. r31, r3, r3
-/* 8046B598  41 82 00 1C */	beq lbl_8046B5B4
-/* 8046B59C  3C A0 80 47 */	lis r5, __vt__8cM3dGAab@ha /* 0x8046B678@ha */
-/* 8046B5A0  38 05 B6 78 */	addi r0, r5, __vt__8cM3dGAab@l /* 0x8046B678@l */
-/* 8046B5A4  90 1F 00 18 */	stw r0, 0x18(r31)
-/* 8046B5A8  7C 80 07 35 */	extsh. r0, r4
-/* 8046B5AC  40 81 00 08 */	ble lbl_8046B5B4
-/* 8046B5B0  4B E6 37 8D */	bl __dl__FPv
-lbl_8046B5B4:
-/* 8046B5B4  7F E3 FB 78 */	mr r3, r31
-/* 8046B5B8  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8046B5BC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8046B5C0  7C 08 03 A6 */	mtlr r0
-/* 8046B5C4  38 21 00 10 */	addi r1, r1, 0x10
-/* 8046B5C8  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGSphFv.s b/asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGSphFv.s
deleted file mode 100644
index 8b4569c0ef..0000000000
--- a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGSphFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_8046B53C:
-/* 8046B53C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8046B540  7C 08 02 A6 */	mflr r0
-/* 8046B544  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8046B548  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8046B54C  7C 7F 1B 79 */	or. r31, r3, r3
-/* 8046B550  41 82 00 1C */	beq lbl_8046B56C
-/* 8046B554  3C A0 80 47 */	lis r5, __vt__8cM3dGSph@ha /* 0x8046B66C@ha */
-/* 8046B558  38 05 B6 6C */	addi r0, r5, __vt__8cM3dGSph@l /* 0x8046B66C@l */
-/* 8046B55C  90 1F 00 10 */	stw r0, 0x10(r31)
-/* 8046B560  7C 80 07 35 */	extsh. r0, r4
-/* 8046B564  40 81 00 08 */	ble lbl_8046B56C
-/* 8046B568  4B E6 37 D5 */	bl __dl__FPv
-lbl_8046B56C:
-/* 8046B56C  7F E3 FB 78 */	mr r3, r31
-/* 8046B570  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8046B574  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8046B578  7C 08 03 A6 */	mtlr r0
-/* 8046B57C  38 21 00 10 */	addi r1, r1, 0x10
-/* 8046B580  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Create__FP10fopAc_ac_c.s
deleted file mode 100644
index 629bd1082e..0000000000
--- a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Create__FP10fopAc_ac_c.s
+++ /dev/null
@@ -1,83 +0,0 @@
-lbl_8046B400:
-/* 8046B400  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8046B404  7C 08 02 A6 */	mflr r0
-/* 8046B408  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8046B40C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8046B410  93 C1 00 08 */	stw r30, 8(r1)
-/* 8046B414  7C 7F 1B 78 */	mr r31, r3
-/* 8046B418  80 03 04 A0 */	lwz r0, 0x4a0(r3)
-/* 8046B41C  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 8046B420  40 82 00 A8 */	bne lbl_8046B4C8
-/* 8046B424  7F E0 FB 79 */	or. r0, r31, r31
-/* 8046B428  41 82 00 94 */	beq lbl_8046B4BC
-/* 8046B42C  7C 1E 03 78 */	mr r30, r0
-/* 8046B430  4B BA D7 35 */	bl __ct__10fopAc_ac_cFv
-/* 8046B434  3C 60 80 3C */	lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
-/* 8046B438  38 03 37 28 */	addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
-/* 8046B43C  90 1E 05 8C */	stw r0, 0x58c(r30)
-/* 8046B440  38 7E 05 90 */	addi r3, r30, 0x590
-/* 8046B444  4B C1 83 1D */	bl __ct__10dCcD_GSttsFv
-/* 8046B448  3C 60 80 3B */	lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
-/* 8046B44C  38 63 C2 E4 */	addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
-/* 8046B450  90 7E 05 8C */	stw r3, 0x58c(r30)
-/* 8046B454  38 03 00 20 */	addi r0, r3, 0x20
-/* 8046B458  90 1E 05 90 */	stw r0, 0x590(r30)
-/* 8046B45C  3B DE 05 B0 */	addi r30, r30, 0x5b0
-/* 8046B460  7F C3 F3 78 */	mr r3, r30
-/* 8046B464  4B C1 85 C5 */	bl __ct__12dCcD_GObjInfFv
-/* 8046B468  3C 60 80 3C */	lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
-/* 8046B46C  38 03 36 D0 */	addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
-/* 8046B470  90 1E 01 20 */	stw r0, 0x120(r30)
-/* 8046B474  3C 60 80 47 */	lis r3, __vt__8cM3dGAab@ha /* 0x8046B678@ha */
-/* 8046B478  38 03 B6 78 */	addi r0, r3, __vt__8cM3dGAab@l /* 0x8046B678@l */
-/* 8046B47C  90 1E 01 1C */	stw r0, 0x11c(r30)
-/* 8046B480  3C 60 80 47 */	lis r3, __vt__8cM3dGSph@ha /* 0x8046B66C@ha */
-/* 8046B484  38 03 B6 6C */	addi r0, r3, __vt__8cM3dGSph@l /* 0x8046B66C@l */
-/* 8046B488  90 1E 01 34 */	stw r0, 0x134(r30)
-/* 8046B48C  3C 60 80 3C */	lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */
-/* 8046B490  38 63 35 40 */	addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */
-/* 8046B494  90 7E 01 20 */	stw r3, 0x120(r30)
-/* 8046B498  38 03 00 58 */	addi r0, r3, 0x58
-/* 8046B49C  90 1E 01 34 */	stw r0, 0x134(r30)
-/* 8046B4A0  3C 60 80 3B */	lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */
-/* 8046B4A4  38 63 BF C0 */	addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */
-/* 8046B4A8  90 7E 00 3C */	stw r3, 0x3c(r30)
-/* 8046B4AC  38 03 00 2C */	addi r0, r3, 0x2c
-/* 8046B4B0  90 1E 01 20 */	stw r0, 0x120(r30)
-/* 8046B4B4  38 03 00 84 */	addi r0, r3, 0x84
-/* 8046B4B8  90 1E 01 34 */	stw r0, 0x134(r30)
-lbl_8046B4BC:
-/* 8046B4BC  80 1F 04 A0 */	lwz r0, 0x4a0(r31)
-/* 8046B4C0  60 00 00 08 */	ori r0, r0, 8
-/* 8046B4C4  90 1F 04 A0 */	stw r0, 0x4a0(r31)
-lbl_8046B4C8:
-/* 8046B4C8  38 7F 05 68 */	addi r3, r31, 0x568
-/* 8046B4CC  3C 80 80 47 */	lis r4, d_a_hitobj__stringBase0@ha /* 0x8046B5D4@ha */
-/* 8046B4D0  38 84 B5 D4 */	addi r4, r4, d_a_hitobj__stringBase0@l /* 0x8046B5D4@l */
-/* 8046B4D4  4B BC 19 E9 */	bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
-/* 8046B4D8  7C 7E 1B 78 */	mr r30, r3
-/* 8046B4DC  2C 1E 00 04 */	cmpwi r30, 4
-/* 8046B4E0  40 82 00 40 */	bne lbl_8046B520
-/* 8046B4E4  80 1F 00 B0 */	lwz r0, 0xb0(r31)
-/* 8046B4E8  98 1F 05 70 */	stb r0, 0x570(r31)
-/* 8046B4EC  38 7F 05 74 */	addi r3, r31, 0x574
-/* 8046B4F0  38 80 00 FF */	li r4, 0xff
-/* 8046B4F4  38 A0 00 FF */	li r5, 0xff
-/* 8046B4F8  7F E6 FB 78 */	mr r6, r31
-/* 8046B4FC  4B C1 83 65 */	bl Init__9dCcD_SttsFiiP10fopAc_ac_c
-/* 8046B500  38 7F 05 B0 */	addi r3, r31, 0x5b0
-/* 8046B504  3C 80 80 47 */	lis r4, cc_sph_src@ha /* 0x8046B5DC@ha */
-/* 8046B508  38 84 B5 DC */	addi r4, r4, cc_sph_src@l /* 0x8046B5DC@l */
-/* 8046B50C  4B C1 95 29 */	bl Set__8dCcD_SphFRC11dCcD_SrcSph
-/* 8046B510  38 1F 05 74 */	addi r0, r31, 0x574
-/* 8046B514  90 1F 05 F4 */	stw r0, 0x5f4(r31)
-/* 8046B518  38 00 00 03 */	li r0, 3
-/* 8046B51C  B0 1F 05 72 */	sth r0, 0x572(r31)
-lbl_8046B520:
-/* 8046B520  7F C3 F3 78 */	mr r3, r30
-/* 8046B524  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8046B528  83 C1 00 08 */	lwz r30, 8(r1)
-/* 8046B52C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8046B530  7C 08 03 A6 */	mtlr r0
-/* 8046B534  38 21 00 10 */	addi r1, r1, 0x10
-/* 8046B538  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Delete__FP12hitobj_class.s b/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Delete__FP12hitobj_class.s
deleted file mode 100644
index b141c8a8de..0000000000
--- a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Delete__FP12hitobj_class.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_8046B3D0:
-/* 8046B3D0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8046B3D4  7C 08 02 A6 */	mflr r0
-/* 8046B3D8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8046B3DC  3C 80 80 47 */	lis r4, d_a_hitobj__stringBase0@ha /* 0x8046B5D4@ha */
-/* 8046B3E0  38 84 B5 D4 */	addi r4, r4, d_a_hitobj__stringBase0@l /* 0x8046B5D4@l */
-/* 8046B3E4  38 63 05 68 */	addi r3, r3, 0x568
-/* 8046B3E8  4B BC 1C 21 */	bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
-/* 8046B3EC  38 60 00 01 */	li r3, 1
-/* 8046B3F0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8046B3F4  7C 08 03 A6 */	mtlr r0
-/* 8046B3F8  38 21 00 10 */	addi r1, r1, 0x10
-/* 8046B3FC  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Execute__FP12hitobj_class.s b/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Execute__FP12hitobj_class.s
deleted file mode 100644
index 95734254bc..0000000000
--- a/asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Execute__FP12hitobj_class.s
+++ /dev/null
@@ -1,29 +0,0 @@
-lbl_8046B360:
-/* 8046B360  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8046B364  7C 08 02 A6 */	mflr r0
-/* 8046B368  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8046B36C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8046B370  7C 7F 1B 78 */	mr r31, r3
-/* 8046B374  A8 83 05 72 */	lha r4, 0x572(r3)
-/* 8046B378  2C 04 00 00 */	cmpwi r4, 0
-/* 8046B37C  41 82 00 30 */	beq lbl_8046B3AC
-/* 8046B380  38 04 FF FF */	addi r0, r4, -1
-/* 8046B384  B0 1F 05 72 */	sth r0, 0x572(r31)
-/* 8046B388  38 7F 06 D4 */	addi r3, r31, 0x6d4
-/* 8046B38C  38 9F 04 D0 */	addi r4, r31, 0x4d0
-/* 8046B390  4B E0 42 B9 */	bl SetC__8cM3dGSphFRC4cXyz
-/* 8046B394  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8046B398  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8046B39C  38 63 23 3C */	addi r3, r3, 0x233c
-/* 8046B3A0  38 9F 05 B0 */	addi r4, r31, 0x5b0
-/* 8046B3A4  4B DF 98 05 */	bl Set__4cCcSFP8cCcD_Obj
-/* 8046B3A8  48 00 00 08 */	b lbl_8046B3B0
-lbl_8046B3AC:
-/* 8046B3AC  4B BB 43 9D */	bl fopKyM_Delete__FPv
-lbl_8046B3B0:
-/* 8046B3B0  38 60 00 01 */	li r3, 1
-/* 8046B3B4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8046B3B8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8046B3BC  7C 08 03 A6 */	mtlr r0
-/* 8046B3C0  38 21 00 10 */	addi r1, r1, 0x10
-/* 8046B3C4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/Create__12daObjSmoke_cFv.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/Create__12daObjSmoke_cFv.s
deleted file mode 100644
index f7d5839184..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/Create__12daObjSmoke_cFv.s
+++ /dev/null
@@ -1,45 +0,0 @@
-lbl_80CDCEF0:
-/* 80CDCEF0  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 80CDCEF4  7C 08 02 A6 */	mflr r0
-/* 80CDCEF8  90 01 00 34 */	stw r0, 0x34(r1)
-/* 80CDCEFC  93 E1 00 2C */	stw r31, 0x2c(r1)
-/* 80CDCF00  7C 7F 1B 78 */	mr r31, r3
-/* 80CDCF04  4B FF FF 75 */	bl initBaseMtx__12daObjSmoke_cFv
-/* 80CDCF08  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80CDCF0C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80CDCF10  80 1F 00 B0 */	lwz r0, 0xb0(r31)
-/* 80CDCF14  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 80CDCF18  88 1F 04 BA */	lbz r0, 0x4ba(r31)
-/* 80CDCF1C  7C 05 07 74 */	extsb r5, r0
-/* 80CDCF20  4B 35 84 41 */	bl isSwitch__10dSv_info_cCFii
-/* 80CDCF24  2C 03 00 00 */	cmpwi r3, 0
-/* 80CDCF28  41 82 00 5C */	beq lbl_80CDCF84
-/* 80CDCF2C  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80CDCF30  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80CDCF34  80 63 5D 3C */	lwz r3, 0x5d3c(r3)
-/* 80CDCF38  38 80 00 00 */	li r4, 0
-/* 80CDCF3C  90 81 00 08 */	stw r4, 8(r1)
-/* 80CDCF40  38 00 FF FF */	li r0, -1
-/* 80CDCF44  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80CDCF48  90 81 00 10 */	stw r4, 0x10(r1)
-/* 80CDCF4C  90 81 00 14 */	stw r4, 0x14(r1)
-/* 80CDCF50  90 81 00 18 */	stw r4, 0x18(r1)
-/* 80CDCF54  38 80 00 00 */	li r4, 0
-/* 80CDCF58  3C A0 00 01 */	lis r5, 0x0001 /* 0x000085A6@ha */
-/* 80CDCF5C  38 A5 85 A6 */	addi r5, r5, 0x85A6 /* 0x000085A6@l */
-/* 80CDCF60  38 DF 04 D0 */	addi r6, r31, 0x4d0
-/* 80CDCF64  38 E0 00 00 */	li r7, 0
-/* 80CDCF68  39 1F 04 DC */	addi r8, r31, 0x4dc
-/* 80CDCF6C  39 3F 04 EC */	addi r9, r31, 0x4ec
-/* 80CDCF70  39 40 00 FF */	li r10, 0xff
-/* 80CDCF74  3D 60 80 CE */	lis r11, lit_3655@ha /* 0x80CDD160@ha */
-/* 80CDCF78  C0 2B D1 60 */	lfs f1, lit_3655@l(r11)  /* 0x80CDD160@l */
-/* 80CDCF7C  4B 36 FB 15 */	bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80CDCF80  90 7F 05 68 */	stw r3, 0x568(r31)
-lbl_80CDCF84:
-/* 80CDCF84  38 60 00 01 */	li r3, 1
-/* 80CDCF88  83 E1 00 2C */	lwz r31, 0x2c(r1)
-/* 80CDCF8C  80 01 00 34 */	lwz r0, 0x34(r1)
-/* 80CDCF90  7C 08 03 A6 */	mtlr r0
-/* 80CDCF94  38 21 00 30 */	addi r1, r1, 0x30
-/* 80CDCF98  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/_delete__12daObjSmoke_cFv.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/_delete__12daObjSmoke_cFv.s
deleted file mode 100644
index daa556562e..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/_delete__12daObjSmoke_cFv.s
+++ /dev/null
@@ -1,18 +0,0 @@
-lbl_80CDD0B8:
-/* 80CDD0B8  80 83 05 68 */	lwz r4, 0x568(r3)
-/* 80CDD0BC  28 04 00 00 */	cmplwi r4, 0
-/* 80CDD0C0  41 82 00 30 */	beq lbl_80CDD0F0
-/* 80CDD0C4  80 04 00 F4 */	lwz r0, 0xf4(r4)
-/* 80CDD0C8  54 00 06 B0 */	rlwinm r0, r0, 0, 0x1a, 0x18
-/* 80CDD0CC  90 04 00 F4 */	stw r0, 0xf4(r4)
-/* 80CDD0D0  80 83 05 68 */	lwz r4, 0x568(r3)
-/* 80CDD0D4  80 04 00 F4 */	lwz r0, 0xf4(r4)
-/* 80CDD0D8  60 00 00 01 */	ori r0, r0, 1
-/* 80CDD0DC  90 04 00 F4 */	stw r0, 0xf4(r4)
-/* 80CDD0E0  38 00 00 01 */	li r0, 1
-/* 80CDD0E4  90 04 00 24 */	stw r0, 0x24(r4)
-/* 80CDD0E8  38 00 00 00 */	li r0, 0
-/* 80CDD0EC  90 03 05 68 */	stw r0, 0x568(r3)
-lbl_80CDD0F0:
-/* 80CDD0F0  38 60 00 01 */	li r3, 1
-/* 80CDD0F4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Create__FP10fopAc_ac_c.s
deleted file mode 100644
index 111f9a1058..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Create__FP10fopAc_ac_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80CDD138:
-/* 80CDD138  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80CDD13C  7C 08 02 A6 */	mflr r0
-/* 80CDD140  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80CDD144  4B FF FE 59 */	bl create__12daObjSmoke_cFv
-/* 80CDD148  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80CDD14C  7C 08 03 A6 */	mtlr r0
-/* 80CDD150  38 21 00 10 */	addi r1, r1, 0x10
-/* 80CDD154  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Delete__FP12daObjSmoke_c.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Delete__FP12daObjSmoke_c.s
deleted file mode 100644
index 194d79b113..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Delete__FP12daObjSmoke_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80CDD118:
-/* 80CDD118  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80CDD11C  7C 08 02 A6 */	mflr r0
-/* 80CDD120  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80CDD124  4B FF FF 95 */	bl _delete__12daObjSmoke_cFv
-/* 80CDD128  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80CDD12C  7C 08 03 A6 */	mtlr r0
-/* 80CDD130  38 21 00 10 */	addi r1, r1, 0x10
-/* 80CDD134  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Execute__FP12daObjSmoke_c.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Execute__FP12daObjSmoke_c.s
deleted file mode 100644
index 3bf7e6959f..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Execute__FP12daObjSmoke_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80CDD0F8:
-/* 80CDD0F8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80CDD0FC  7C 08 02 A6 */	mflr r0
-/* 80CDD100  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80CDD104  4B FF FF 01 */	bl execute__12daObjSmoke_cFv
-/* 80CDD108  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80CDD10C  7C 08 03 A6 */	mtlr r0
-/* 80CDD110  38 21 00 10 */	addi r1, r1, 0x10
-/* 80CDD114  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/execute__12daObjSmoke_cFv.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/execute__12daObjSmoke_cFv.s
deleted file mode 100644
index 9c1c17ec37..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/execute__12daObjSmoke_cFv.s
+++ /dev/null
@@ -1,47 +0,0 @@
-lbl_80CDD004:
-/* 80CDD004  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 80CDD008  7C 08 02 A6 */	mflr r0
-/* 80CDD00C  90 01 00 34 */	stw r0, 0x34(r1)
-/* 80CDD010  93 E1 00 2C */	stw r31, 0x2c(r1)
-/* 80CDD014  7C 7F 1B 78 */	mr r31, r3
-/* 80CDD018  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80CDD01C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80CDD020  80 1F 00 B0 */	lwz r0, 0xb0(r31)
-/* 80CDD024  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 80CDD028  88 1F 04 BA */	lbz r0, 0x4ba(r31)
-/* 80CDD02C  7C 05 07 74 */	extsb r5, r0
-/* 80CDD030  4B 35 83 31 */	bl isSwitch__10dSv_info_cCFii
-/* 80CDD034  2C 03 00 00 */	cmpwi r3, 0
-/* 80CDD038  41 82 00 68 */	beq lbl_80CDD0A0
-/* 80CDD03C  80 1F 05 68 */	lwz r0, 0x568(r31)
-/* 80CDD040  28 00 00 00 */	cmplwi r0, 0
-/* 80CDD044  40 82 00 5C */	bne lbl_80CDD0A0
-/* 80CDD048  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80CDD04C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80CDD050  80 63 5D 3C */	lwz r3, 0x5d3c(r3)
-/* 80CDD054  38 80 00 00 */	li r4, 0
-/* 80CDD058  90 81 00 08 */	stw r4, 8(r1)
-/* 80CDD05C  38 00 FF FF */	li r0, -1
-/* 80CDD060  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80CDD064  90 81 00 10 */	stw r4, 0x10(r1)
-/* 80CDD068  90 81 00 14 */	stw r4, 0x14(r1)
-/* 80CDD06C  90 81 00 18 */	stw r4, 0x18(r1)
-/* 80CDD070  38 80 00 00 */	li r4, 0
-/* 80CDD074  3C A0 00 01 */	lis r5, 0x0001 /* 0x000085A6@ha */
-/* 80CDD078  38 A5 85 A6 */	addi r5, r5, 0x85A6 /* 0x000085A6@l */
-/* 80CDD07C  38 DF 04 D0 */	addi r6, r31, 0x4d0
-/* 80CDD080  38 E0 00 00 */	li r7, 0
-/* 80CDD084  39 1F 04 DC */	addi r8, r31, 0x4dc
-/* 80CDD088  39 3F 04 EC */	addi r9, r31, 0x4ec
-/* 80CDD08C  39 40 00 FF */	li r10, 0xff
-/* 80CDD090  3D 60 80 CE */	lis r11, lit_3655@ha /* 0x80CDD160@ha */
-/* 80CDD094  C0 2B D1 60 */	lfs f1, lit_3655@l(r11)  /* 0x80CDD160@l */
-/* 80CDD098  4B 36 F9 F9 */	bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80CDD09C  90 7F 05 68 */	stw r3, 0x568(r31)
-lbl_80CDD0A0:
-/* 80CDD0A0  38 60 00 01 */	li r3, 1
-/* 80CDD0A4  83 E1 00 2C */	lwz r31, 0x2c(r1)
-/* 80CDD0A8  80 01 00 34 */	lwz r0, 0x34(r1)
-/* 80CDD0AC  7C 08 03 A6 */	mtlr r0
-/* 80CDD0B0  38 21 00 30 */	addi r1, r1, 0x30
-/* 80CDD0B4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/func_80CDCF9C.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/func_80CDCF9C.s
deleted file mode 100644
index c4dec61789..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/func_80CDCF9C.s
+++ /dev/null
@@ -1,31 +0,0 @@
-lbl_80CDCF9C:
-/* 80CDCF9C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80CDCFA0  7C 08 02 A6 */	mflr r0
-/* 80CDCFA4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80CDCFA8  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80CDCFAC  7C 7F 1B 78 */	mr r31, r3
-/* 80CDCFB0  80 03 04 A0 */	lwz r0, 0x4a0(r3)
-/* 80CDCFB4  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80CDCFB8  40 82 00 1C */	bne lbl_80CDCFD4
-/* 80CDCFBC  28 1F 00 00 */	cmplwi r31, 0
-/* 80CDCFC0  41 82 00 08 */	beq lbl_80CDCFC8
-/* 80CDCFC4  4B 33 BB A1 */	bl __ct__10fopAc_ac_cFv
-lbl_80CDCFC8:
-/* 80CDCFC8  80 1F 04 A0 */	lwz r0, 0x4a0(r31)
-/* 80CDCFCC  60 00 00 08 */	ori r0, r0, 8
-/* 80CDCFD0  90 1F 04 A0 */	stw r0, 0x4a0(r31)
-lbl_80CDCFD4:
-/* 80CDCFD4  7F E3 FB 78 */	mr r3, r31
-/* 80CDCFD8  4B FF FF 19 */	bl Create__12daObjSmoke_cFv
-/* 80CDCFDC  2C 03 00 00 */	cmpwi r3, 0
-/* 80CDCFE0  40 82 00 0C */	bne lbl_80CDCFEC
-/* 80CDCFE4  38 60 00 05 */	li r3, 5
-/* 80CDCFE8  48 00 00 08 */	b lbl_80CDCFF0
-lbl_80CDCFEC:
-/* 80CDCFEC  38 60 00 04 */	li r3, 4
-lbl_80CDCFF0:
-/* 80CDCFF0  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80CDCFF4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80CDCFF8  7C 08 03 A6 */	mtlr r0
-/* 80CDCFFC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80CDD000  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/initBaseMtx__12daObjSmoke_cFv.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/initBaseMtx__12daObjSmoke_cFv.s
deleted file mode 100644
index fe116471c1..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/initBaseMtx__12daObjSmoke_cFv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80CDCE78:
-/* 80CDCE78  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80CDCE7C  7C 08 02 A6 */	mflr r0
-/* 80CDCE80  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80CDCE84  48 00 00 15 */	bl setBaseMtx__12daObjSmoke_cFv
-/* 80CDCE88  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80CDCE8C  7C 08 03 A6 */	mtlr r0
-/* 80CDCE90  38 21 00 10 */	addi r1, r1, 0x10
-/* 80CDCE94  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/setBaseMtx__12daObjSmoke_cFv.s b/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/setBaseMtx__12daObjSmoke_cFv.s
deleted file mode 100644
index 3635247daf..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/setBaseMtx__12daObjSmoke_cFv.s
+++ /dev/null
@@ -1,23 +0,0 @@
-lbl_80CDCE98:
-/* 80CDCE98  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80CDCE9C  7C 08 02 A6 */	mflr r0
-/* 80CDCEA0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80CDCEA4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80CDCEA8  7C 7F 1B 78 */	mr r31, r3
-/* 80CDCEAC  3C 60 80 3E */	lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80CDCEB0  38 63 D4 70 */	addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80CDCEB4  C0 3F 04 D0 */	lfs f1, 0x4d0(r31)
-/* 80CDCEB8  C0 5F 04 D4 */	lfs f2, 0x4d4(r31)
-/* 80CDCEBC  C0 7F 04 D8 */	lfs f3, 0x4d8(r31)
-/* 80CDCEC0  4B 66 9A 29 */	bl PSMTXTrans
-/* 80CDCEC4  3C 60 80 3E */	lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80CDCEC8  38 63 D4 70 */	addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80CDCECC  A8 9F 04 E4 */	lha r4, 0x4e4(r31)
-/* 80CDCED0  A8 BF 04 E6 */	lha r5, 0x4e6(r31)
-/* 80CDCED4  A8 DF 04 E8 */	lha r6, 0x4e8(r31)
-/* 80CDCED8  4B 32 F3 C9 */	bl mDoMtx_ZXYrotM__FPA4_fsss
-/* 80CDCEDC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80CDCEE0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80CDCEE4  7C 08 03 A6 */	mtlr r0
-/* 80CDCEE8  38 21 00 10 */	addi r1, r1, 0x10
-/* 80CDCEEC  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/Delete__13daTagSmkEmt_cFv.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/Delete__13daTagSmkEmt_cFv.s
deleted file mode 100644
index 997c90f4ed..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/Delete__13daTagSmkEmt_cFv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80D613DC:
-/* 80D613DC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D613E0  7C 08 02 A6 */	mflr r0
-/* 80D613E4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D613E8  48 00 01 19 */	bl deleteSmkEmt__13daTagSmkEmt_cFv
-/* 80D613EC  38 60 00 01 */	li r3, 1
-/* 80D613F0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D613F4  7C 08 03 A6 */	mtlr r0
-/* 80D613F8  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D613FC  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__ct__13daTagSmkEmt_cFv.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__ct__13daTagSmkEmt_cFv.s
deleted file mode 100644
index 26a4097006..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__ct__13daTagSmkEmt_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80D612D8:
-/* 80D612D8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D612DC  7C 08 02 A6 */	mflr r0
-/* 80D612E0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D612E4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D612E8  7C 7F 1B 78 */	mr r31, r3
-/* 80D612EC  4B 2B 78 79 */	bl __ct__10fopAc_ac_cFv
-/* 80D612F0  3C 60 80 D6 */	lis r3, __vt__13daTagSmkEmt_c@ha /* 0x80D6165C@ha */
-/* 80D612F4  38 03 16 5C */	addi r0, r3, __vt__13daTagSmkEmt_c@l /* 0x80D6165C@l */
-/* 80D612F8  90 1F 05 68 */	stw r0, 0x568(r31)
-/* 80D612FC  38 7F 05 6C */	addi r3, r31, 0x56c
-/* 80D61300  38 80 00 00 */	li r4, 0
-/* 80D61304  38 A0 00 0C */	li r5, 0xc
-/* 80D61308  4B 2A 21 51 */	bl memset
-/* 80D6130C  7F E3 FB 78 */	mr r3, r31
-/* 80D61310  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D61314  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D61318  7C 08 03 A6 */	mtlr r0
-/* 80D6131C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D61320  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__dt__13daTagSmkEmt_cFv.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__dt__13daTagSmkEmt_cFv.s
deleted file mode 100644
index a9f916b4fe..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__dt__13daTagSmkEmt_cFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_80D61324:
-/* 80D61324  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D61328  7C 08 02 A6 */	mflr r0
-/* 80D6132C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D61330  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D61334  93 C1 00 08 */	stw r30, 8(r1)
-/* 80D61338  7C 7E 1B 79 */	or. r30, r3, r3
-/* 80D6133C  7C 9F 23 78 */	mr r31, r4
-/* 80D61340  41 82 00 28 */	beq lbl_80D61368
-/* 80D61344  3C 80 80 D6 */	lis r4, __vt__13daTagSmkEmt_c@ha /* 0x80D6165C@ha */
-/* 80D61348  38 04 16 5C */	addi r0, r4, __vt__13daTagSmkEmt_c@l /* 0x80D6165C@l */
-/* 80D6134C  90 1E 05 68 */	stw r0, 0x568(r30)
-/* 80D61350  38 80 00 00 */	li r4, 0
-/* 80D61354  4B 2B 79 39 */	bl __dt__10fopAc_ac_cFv
-/* 80D61358  7F E0 07 35 */	extsh. r0, r31
-/* 80D6135C  40 81 00 0C */	ble lbl_80D61368
-/* 80D61360  7F C3 F3 78 */	mr r3, r30
-/* 80D61364  4B 56 D9 D9 */	bl __dl__FPv
-lbl_80D61368:
-/* 80D61368  7F C3 F3 78 */	mr r3, r30
-/* 80D6136C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D61370  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80D61374  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D61378  7C 08 03 A6 */	mtlr r0
-/* 80D6137C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D61380  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/createSmkEmt__13daTagSmkEmt_cFv.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/createSmkEmt__13daTagSmkEmt_cFv.s
deleted file mode 100644
index 034addfd21..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/createSmkEmt__13daTagSmkEmt_cFv.s
+++ /dev/null
@@ -1,62 +0,0 @@
-lbl_80D61410:
-/* 80D61410  94 21 FF A0 */	stwu r1, -0x60(r1)
-/* 80D61414  7C 08 02 A6 */	mflr r0
-/* 80D61418  90 01 00 64 */	stw r0, 0x64(r1)
-/* 80D6141C  39 61 00 60 */	addi r11, r1, 0x60
-/* 80D61420  4B 60 0D AD */	bl _savegpr_25
-/* 80D61424  7C 79 1B 78 */	mr r25, r3
-/* 80D61428  C0 03 04 D0 */	lfs f0, 0x4d0(r3)
-/* 80D6142C  D0 01 00 34 */	stfs f0, 0x34(r1)
-/* 80D61430  C0 03 04 D4 */	lfs f0, 0x4d4(r3)
-/* 80D61434  D0 01 00 38 */	stfs f0, 0x38(r1)
-/* 80D61438  C0 03 04 D8 */	lfs f0, 0x4d8(r3)
-/* 80D6143C  D0 01 00 3C */	stfs f0, 0x3c(r1)
-/* 80D61440  38 61 00 20 */	addi r3, r1, 0x20
-/* 80D61444  38 80 00 00 */	li r4, 0
-/* 80D61448  38 A0 00 00 */	li r5, 0
-/* 80D6144C  38 C0 00 00 */	li r6, 0
-/* 80D61450  4B 50 5F A5 */	bl __ct__5csXyzFsss
-/* 80D61454  3C 60 80 D6 */	lis r3, lit_3677@ha /* 0x80D61608@ha */
-/* 80D61458  3B 63 16 08 */	addi r27, r3, lit_3677@l /* 0x80D61608@l */
-/* 80D6145C  C0 1B 00 00 */	lfs f0, 0(r27)
-/* 80D61460  D0 01 00 28 */	stfs f0, 0x28(r1)
-/* 80D61464  D0 01 00 2C */	stfs f0, 0x2c(r1)
-/* 80D61468  D0 01 00 30 */	stfs f0, 0x30(r1)
-/* 80D6146C  3B 40 00 00 */	li r26, 0
-/* 80D61470  3B E0 00 00 */	li r31, 0
-/* 80D61474  3B C0 00 00 */	li r30, 0
-/* 80D61478  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D6147C  3B 83 61 C0 */	addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D61480  3C 60 80 D6 */	lis r3, PARTICLE_NAME@ha /* 0x80D61600@ha */
-/* 80D61484  3B A3 16 00 */	addi r29, r3, PARTICLE_NAME@l /* 0x80D61600@l */
-lbl_80D61488:
-/* 80D61488  80 7C 5D 3C */	lwz r3, 0x5d3c(r28)
-/* 80D6148C  38 80 00 00 */	li r4, 0
-/* 80D61490  90 81 00 08 */	stw r4, 8(r1)
-/* 80D61494  38 00 FF FF */	li r0, -1
-/* 80D61498  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80D6149C  90 81 00 10 */	stw r4, 0x10(r1)
-/* 80D614A0  90 81 00 14 */	stw r4, 0x14(r1)
-/* 80D614A4  90 81 00 18 */	stw r4, 0x18(r1)
-/* 80D614A8  38 80 00 00 */	li r4, 0
-/* 80D614AC  7C BD F2 2E */	lhzx r5, r29, r30
-/* 80D614B0  38 C1 00 34 */	addi r6, r1, 0x34
-/* 80D614B4  38 E0 00 00 */	li r7, 0
-/* 80D614B8  39 01 00 20 */	addi r8, r1, 0x20
-/* 80D614BC  39 21 00 28 */	addi r9, r1, 0x28
-/* 80D614C0  39 40 00 FF */	li r10, 0xff
-/* 80D614C4  C0 3B 00 00 */	lfs f1, 0(r27)
-/* 80D614C8  4B 2E B5 C9 */	bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80D614CC  38 1F 05 6C */	addi r0, r31, 0x56c
-/* 80D614D0  7C 79 01 2E */	stwx r3, r25, r0
-/* 80D614D4  3B 5A 00 01 */	addi r26, r26, 1
-/* 80D614D8  2C 1A 00 03 */	cmpwi r26, 3
-/* 80D614DC  3B FF 00 04 */	addi r31, r31, 4
-/* 80D614E0  3B DE 00 02 */	addi r30, r30, 2
-/* 80D614E4  41 80 FF A4 */	blt lbl_80D61488
-/* 80D614E8  39 61 00 60 */	addi r11, r1, 0x60
-/* 80D614EC  4B 60 0D 2D */	bl _restgpr_25
-/* 80D614F0  80 01 00 64 */	lwz r0, 0x64(r1)
-/* 80D614F4  7C 08 03 A6 */	mtlr r0
-/* 80D614F8  38 21 00 60 */	addi r1, r1, 0x60
-/* 80D614FC  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/create__13daTagSmkEmt_cFv.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/create__13daTagSmkEmt_cFv.s
deleted file mode 100644
index 0e2c2ab408..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/create__13daTagSmkEmt_cFv.s
+++ /dev/null
@@ -1,25 +0,0 @@
-lbl_80D61384:
-/* 80D61384  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D61388  7C 08 02 A6 */	mflr r0
-/* 80D6138C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D61390  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D61394  7C 7F 1B 78 */	mr r31, r3
-/* 80D61398  80 03 04 A0 */	lwz r0, 0x4a0(r3)
-/* 80D6139C  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80D613A0  40 82 00 1C */	bne lbl_80D613BC
-/* 80D613A4  28 1F 00 00 */	cmplwi r31, 0
-/* 80D613A8  41 82 00 08 */	beq lbl_80D613B0
-/* 80D613AC  4B FF FF 2D */	bl __ct__13daTagSmkEmt_cFv
-lbl_80D613B0:
-/* 80D613B0  80 1F 04 A0 */	lwz r0, 0x4a0(r31)
-/* 80D613B4  60 00 00 08 */	ori r0, r0, 8
-/* 80D613B8  90 1F 04 A0 */	stw r0, 0x4a0(r31)
-lbl_80D613BC:
-/* 80D613BC  7F E3 FB 78 */	mr r3, r31
-/* 80D613C0  48 00 00 51 */	bl createSmkEmt__13daTagSmkEmt_cFv
-/* 80D613C4  38 60 00 04 */	li r3, 4
-/* 80D613C8  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D613CC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D613D0  7C 08 03 A6 */	mtlr r0
-/* 80D613D4  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D613D8  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_Delete__FP13daTagSmkEmt_c.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_Delete__FP13daTagSmkEmt_c.s
deleted file mode 100644
index 3b682c78bc..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_Delete__FP13daTagSmkEmt_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D61598:
-/* 80D61598  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D6159C  7C 08 02 A6 */	mflr r0
-/* 80D615A0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D615A4  4B FF FE 39 */	bl Delete__13daTagSmkEmt_cFv
-/* 80D615A8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D615AC  7C 08 03 A6 */	mtlr r0
-/* 80D615B0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D615B4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_create__FP13daTagSmkEmt_c.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_create__FP13daTagSmkEmt_c.s
deleted file mode 100644
index 5107497e1e..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_create__FP13daTagSmkEmt_c.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_80D61544:
-/* 80D61544  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D61548  7C 08 02 A6 */	mflr r0
-/* 80D6154C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D61550  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D61554  7C 7F 1B 78 */	mr r31, r3
-/* 80D61558  80 03 04 A0 */	lwz r0, 0x4a0(r3)
-/* 80D6155C  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80D61560  40 82 00 1C */	bne lbl_80D6157C
-/* 80D61564  28 1F 00 00 */	cmplwi r31, 0
-/* 80D61568  41 82 00 08 */	beq lbl_80D61570
-/* 80D6156C  4B FF FD 6D */	bl __ct__13daTagSmkEmt_cFv
-lbl_80D61570:
-/* 80D61570  80 1F 04 A0 */	lwz r0, 0x4a0(r31)
-/* 80D61574  60 00 00 08 */	ori r0, r0, 8
-/* 80D61578  90 1F 04 A0 */	stw r0, 0x4a0(r31)
-lbl_80D6157C:
-/* 80D6157C  7F E3 FB 78 */	mr r3, r31
-/* 80D61580  4B FF FE 05 */	bl create__13daTagSmkEmt_cFv
-/* 80D61584  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D61588  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D6158C  7C 08 03 A6 */	mtlr r0
-/* 80D61590  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D61594  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_draw__FP13daTagSmkEmt_c.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_draw__FP13daTagSmkEmt_c.s
deleted file mode 100644
index ae1cf82725..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_draw__FP13daTagSmkEmt_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D615D8:
-/* 80D615D8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D615DC  7C 08 02 A6 */	mflr r0
-/* 80D615E0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D615E4  4B FF FE 1D */	bl draw__13daTagSmkEmt_cFv
-/* 80D615E8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D615EC  7C 08 03 A6 */	mtlr r0
-/* 80D615F0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D615F4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_execute__FP13daTagSmkEmt_c.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_execute__FP13daTagSmkEmt_c.s
deleted file mode 100644
index 7b08e138a6..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_execute__FP13daTagSmkEmt_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D615B8:
-/* 80D615B8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D615BC  7C 08 02 A6 */	mflr r0
-/* 80D615C0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D615C4  4B FF FE 45 */	bl execute__13daTagSmkEmt_cFv
-/* 80D615C8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D615CC  7C 08 03 A6 */	mtlr r0
-/* 80D615D0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D615D4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/deleteSmkEmt__13daTagSmkEmt_cFv.s b/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/deleteSmkEmt__13daTagSmkEmt_cFv.s
deleted file mode 100644
index 95c9977137..0000000000
--- a/asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/deleteSmkEmt__13daTagSmkEmt_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80D61500:
-/* 80D61500  38 80 00 00 */	li r4, 0
-/* 80D61504  38 C0 00 01 */	li r6, 1
-/* 80D61508  7C 85 23 78 */	mr r5, r4
-/* 80D6150C  38 00 00 03 */	li r0, 3
-/* 80D61510  7C 09 03 A6 */	mtctr r0
-lbl_80D61514:
-/* 80D61514  39 04 05 6C */	addi r8, r4, 0x56c
-/* 80D61518  7C E3 40 2E */	lwzx r7, r3, r8
-/* 80D6151C  28 07 00 00 */	cmplwi r7, 0
-/* 80D61520  41 82 00 18 */	beq lbl_80D61538
-/* 80D61524  80 07 00 F4 */	lwz r0, 0xf4(r7)
-/* 80D61528  60 00 00 01 */	ori r0, r0, 1
-/* 80D6152C  90 07 00 F4 */	stw r0, 0xf4(r7)
-/* 80D61530  90 C7 00 24 */	stw r6, 0x24(r7)
-/* 80D61534  7C A3 41 2E */	stwx r5, r3, r8
-lbl_80D61538:
-/* 80D61538  38 84 00 04 */	addi r4, r4, 4
-/* 80D6153C  42 00 FF D8 */	bdnz lbl_80D61514
-/* 80D61540  4E 80 00 20 */	blr