diff --git a/Progress.md b/Progress.md
index dfd04895977..78c88b1d2c1 100644
--- a/Progress.md
+++ b/Progress.md
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
 .init |  97.972973% | 9280 | 9472
 .extab | 100.000000% | 96 | 96
 .extabindex | 100.000000% | 96 | 96
-.text |  34.295590% | 1233456 | 3596544
+.text |  34.326954% | 1234584 | 3596544
 .ctors | 100.000000% | 448 | 448
 .dtors | 100.000000% | 32 | 32
 .rodata | 100.000000% | 193856 | 193856
 .data | 100.000000% | 197632 | 197632
 .sdata | 100.000000% | 1408 | 1408
 .sdata2 | 100.000000% | 20832 | 20832
-Total |  41.221766% | 1657392 | 4020672
+Total |  41.249821% | 1658520 | 4020672
 
 ## Total
 
 Section | Percentage | Decompiled (bytes) | Total (bytes)
 ---|---|---|---
-main.dol |  41.221766% | 1657392 | 4020672
-RELs |  34.619755% | 3981384 | 11500324
-Total |  36.329988% | 5638776 | 15520996
+main.dol |  41.249821% | 1658520 | 4020672
+RELs |  34.630503% | 3982620 | 11500324
+Total |  36.345219% | 5641140 | 15520996
 
 ## RELs
 
@@ -749,7 +749,7 @@ d_a_tag_mstop |  43.995098% | 1436 | 3264
 d_a_tag_mwait | 100.000000% | 2896 | 2896
 d_a_tag_myna2 |  98.401826% | 1724 | 1752
 d_a_tag_myna_light | 100.000000% | 3124 | 3124
-d_a_tag_pachi |  51.107595% | 1292 | 2528
+d_a_tag_pachi | 100.000000% | 2528 | 2528
 d_a_tag_poFire | 100.000000% | 1688 | 1688
 d_a_tag_push |  41.000000% | 1148 | 2800
 d_a_tag_qs |  34.804270% | 1956 | 5620
@@ -785,4 +785,4 @@ d_a_vrbox2 |  44.907111% | 2804 | 6244
 d_a_warp_bug | 100.000000% | 2024 | 2024
 d_a_ykgr |  44.400631% | 2252 | 5072
 f_pc_profile_lst | 100.000000% | 28156 | 28156
-Total |  34.619755% | 3981384 | 11500324
+Total |  34.630503% | 3982620 | 11500324
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/Execute__11daTagPati_cFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/Execute__11daTagPati_cFv.s
deleted file mode 100644
index 7144d130426..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/Execute__11daTagPati_cFv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80D5D78C:
-/* 80D5D78C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D790  7C 08 02 A6 */	mflr r0
-/* 80D5D794  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D798  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D5D79C  7C 7F 1B 78 */	mr r31, r3
-/* 80D5D7A0  48 00 00 29 */	bl col_set__11daTagPati_cFv
-/* 80D5D7A4  7F E3 FB 78 */	mr r3, r31
-/* 80D5D7A8  48 00 00 89 */	bl chk_CoHit__11daTagPati_cFv
-/* 80D5D7AC  90 7F 06 E4 */	stw r3, 0x6e4(r31)
-/* 80D5D7B0  38 60 00 01 */	li r3, 1
-/* 80D5D7B4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D5D7B8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D7BC  7C 08 03 A6 */	mtlr r0
-/* 80D5D7C0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D7C4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10cCcD_GSttsFv.s
deleted file mode 100644
index 10fae87c452..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10cCcD_GSttsFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80D5D8C4:
-/* 80D5D8C4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D8C8  7C 08 02 A6 */	mflr r0
-/* 80D5D8CC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D8D0  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D5D8D4  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80D5D8D8  41 82 00 1C */	beq lbl_80D5D8F4
-/* 80D5D8DC  3C A0 80 D6 */	lis r5, __vt__10cCcD_GStts@ha /* 0x80D5D9C8@ha */
-/* 80D5D8E0  38 05 D9 C8 */	addi r0, r5, __vt__10cCcD_GStts@l /* 0x80D5D9C8@l */
-/* 80D5D8E4  90 1F 00 00 */	stw r0, 0(r31)
-/* 80D5D8E8  7C 80 07 35 */	extsh. r0, r4
-/* 80D5D8EC  40 81 00 08 */	ble lbl_80D5D8F4
-/* 80D5D8F0  4B 57 14 4D */	bl __dl__FPv
-lbl_80D5D8F4:
-/* 80D5D8F4  7F E3 FB 78 */	mr r3, r31
-/* 80D5D8F8  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D5D8FC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D900  7C 08 03 A6 */	mtlr r0
-/* 80D5D904  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D908  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10dCcD_GSttsFv.s
deleted file mode 100644
index c4e1b1bc4fc..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10dCcD_GSttsFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_80D5D6A0:
-/* 80D5D6A0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D6A4  7C 08 02 A6 */	mflr r0
-/* 80D5D6A8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D6AC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D5D6B0  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80D5D6B4  41 82 00 30 */	beq lbl_80D5D6E4
-/* 80D5D6B8  3C 60 80 D6 */	lis r3, __vt__10dCcD_GStts@ha /* 0x80D5D9D4@ha */
-/* 80D5D6BC  38 03 D9 D4 */	addi r0, r3, __vt__10dCcD_GStts@l /* 0x80D5D9D4@l */
-/* 80D5D6C0  90 1F 00 00 */	stw r0, 0(r31)
-/* 80D5D6C4  41 82 00 10 */	beq lbl_80D5D6D4
-/* 80D5D6C8  3C 60 80 D6 */	lis r3, __vt__10cCcD_GStts@ha /* 0x80D5D9C8@ha */
-/* 80D5D6CC  38 03 D9 C8 */	addi r0, r3, __vt__10cCcD_GStts@l /* 0x80D5D9C8@l */
-/* 80D5D6D0  90 1F 00 00 */	stw r0, 0(r31)
-lbl_80D5D6D4:
-/* 80D5D6D4  7C 80 07 35 */	extsh. r0, r4
-/* 80D5D6D8  40 81 00 0C */	ble lbl_80D5D6E4
-/* 80D5D6DC  7F E3 FB 78 */	mr r3, r31
-/* 80D5D6E0  4B 57 16 5D */	bl __dl__FPv
-lbl_80D5D6E4:
-/* 80D5D6E4  7F E3 FB 78 */	mr r3, r31
-/* 80D5D6E8  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D5D6EC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D6F0  7C 08 03 A6 */	mtlr r0
-/* 80D5D6F4  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D6F8  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__11daTagPati_cFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__11daTagPati_cFv.s
deleted file mode 100644
index 2890b78bbfe..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__11daTagPati_cFv.s
+++ /dev/null
@@ -1,85 +0,0 @@
-lbl_80D5D438:
-/* 80D5D438  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D43C  7C 08 02 A6 */	mflr r0
-/* 80D5D440  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D444  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D5D448  93 C1 00 08 */	stw r30, 8(r1)
-/* 80D5D44C  7C 7E 1B 79 */	or. r30, r3, r3
-/* 80D5D450  7C 9F 23 78 */	mr r31, r4
-/* 80D5D454  41 82 01 00 */	beq lbl_80D5D554
-/* 80D5D458  34 1E 06 A4 */	addic. r0, r30, 0x6a4
-/* 80D5D45C  41 82 00 54 */	beq lbl_80D5D4B0
-/* 80D5D460  3C 60 80 3B */	lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
-/* 80D5D464  38 63 C2 E4 */	addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
-/* 80D5D468  90 7E 06 BC */	stw r3, 0x6bc(r30)
-/* 80D5D46C  38 03 00 20 */	addi r0, r3, 0x20
-/* 80D5D470  90 1E 06 C0 */	stw r0, 0x6c0(r30)
-/* 80D5D474  34 1E 06 C0 */	addic. r0, r30, 0x6c0
-/* 80D5D478  41 82 00 24 */	beq lbl_80D5D49C
-/* 80D5D47C  3C 60 80 D6 */	lis r3, __vt__10dCcD_GStts@ha /* 0x80D5D9D4@ha */
-/* 80D5D480  38 03 D9 D4 */	addi r0, r3, __vt__10dCcD_GStts@l /* 0x80D5D9D4@l */
-/* 80D5D484  90 1E 06 C0 */	stw r0, 0x6c0(r30)
-/* 80D5D488  34 1E 06 C0 */	addic. r0, r30, 0x6c0
-/* 80D5D48C  41 82 00 10 */	beq lbl_80D5D49C
-/* 80D5D490  3C 60 80 D6 */	lis r3, __vt__10cCcD_GStts@ha /* 0x80D5D9C8@ha */
-/* 80D5D494  38 03 D9 C8 */	addi r0, r3, __vt__10cCcD_GStts@l /* 0x80D5D9C8@l */
-/* 80D5D498  90 1E 06 C0 */	stw r0, 0x6c0(r30)
-lbl_80D5D49C:
-/* 80D5D49C  34 1E 06 A4 */	addic. r0, r30, 0x6a4
-/* 80D5D4A0  41 82 00 10 */	beq lbl_80D5D4B0
-/* 80D5D4A4  3C 60 80 3C */	lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
-/* 80D5D4A8  38 03 37 28 */	addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
-/* 80D5D4AC  90 1E 06 BC */	stw r0, 0x6bc(r30)
-lbl_80D5D4B0:
-/* 80D5D4B0  34 1E 05 68 */	addic. r0, r30, 0x568
-/* 80D5D4B4  41 82 00 84 */	beq lbl_80D5D538
-/* 80D5D4B8  3C 60 80 3B */	lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
-/* 80D5D4BC  38 63 C0 50 */	addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
-/* 80D5D4C0  90 7E 05 A4 */	stw r3, 0x5a4(r30)
-/* 80D5D4C4  38 03 00 2C */	addi r0, r3, 0x2c
-/* 80D5D4C8  90 1E 06 88 */	stw r0, 0x688(r30)
-/* 80D5D4CC  38 03 00 84 */	addi r0, r3, 0x84
-/* 80D5D4D0  90 1E 06 A0 */	stw r0, 0x6a0(r30)
-/* 80D5D4D4  34 1E 06 6C */	addic. r0, r30, 0x66c
-/* 80D5D4D8  41 82 00 54 */	beq lbl_80D5D52C
-/* 80D5D4DC  3C 60 80 3C */	lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
-/* 80D5D4E0  38 63 35 A4 */	addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
-/* 80D5D4E4  90 7E 06 88 */	stw r3, 0x688(r30)
-/* 80D5D4E8  38 03 00 58 */	addi r0, r3, 0x58
-/* 80D5D4EC  90 1E 06 A0 */	stw r0, 0x6a0(r30)
-/* 80D5D4F0  34 1E 06 8C */	addic. r0, r30, 0x68c
-/* 80D5D4F4  41 82 00 10 */	beq lbl_80D5D504
-/* 80D5D4F8  3C 60 80 D6 */	lis r3, __vt__8cM3dGCyl@ha /* 0x80D5D9BC@ha */
-/* 80D5D4FC  38 03 D9 BC */	addi r0, r3, __vt__8cM3dGCyl@l /* 0x80D5D9BC@l */
-/* 80D5D500  90 1E 06 A0 */	stw r0, 0x6a0(r30)
-lbl_80D5D504:
-/* 80D5D504  34 1E 06 6C */	addic. r0, r30, 0x66c
-/* 80D5D508  41 82 00 24 */	beq lbl_80D5D52C
-/* 80D5D50C  3C 60 80 3C */	lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
-/* 80D5D510  38 03 36 D0 */	addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
-/* 80D5D514  90 1E 06 88 */	stw r0, 0x688(r30)
-/* 80D5D518  34 1E 06 6C */	addic. r0, r30, 0x66c
-/* 80D5D51C  41 82 00 10 */	beq lbl_80D5D52C
-/* 80D5D520  3C 60 80 D6 */	lis r3, __vt__8cM3dGAab@ha /* 0x80D5D9B0@ha */
-/* 80D5D524  38 03 D9 B0 */	addi r0, r3, __vt__8cM3dGAab@l /* 0x80D5D9B0@l */
-/* 80D5D528  90 1E 06 84 */	stw r0, 0x684(r30)
-lbl_80D5D52C:
-/* 80D5D52C  38 7E 05 68 */	addi r3, r30, 0x568
-/* 80D5D530  38 80 00 00 */	li r4, 0
-/* 80D5D534  4B 32 6B B1 */	bl __dt__12dCcD_GObjInfFv
-lbl_80D5D538:
-/* 80D5D538  7F C3 F3 78 */	mr r3, r30
-/* 80D5D53C  38 80 00 00 */	li r4, 0
-/* 80D5D540  4B 2B B7 4D */	bl __dt__10fopAc_ac_cFv
-/* 80D5D544  7F E0 07 35 */	extsh. r0, r31
-/* 80D5D548  40 81 00 0C */	ble lbl_80D5D554
-/* 80D5D54C  7F C3 F3 78 */	mr r3, r30
-/* 80D5D550  4B 57 17 ED */	bl __dl__FPv
-lbl_80D5D554:
-/* 80D5D554  7F C3 F3 78 */	mr r3, r30
-/* 80D5D558  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D5D55C  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80D5D560  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D564  7C 08 03 A6 */	mtlr r0
-/* 80D5D568  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D56C  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGAabFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGAabFv.s
deleted file mode 100644
index 1d28da26aaf..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGAabFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80D5D744:
-/* 80D5D744  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D748  7C 08 02 A6 */	mflr r0
-/* 80D5D74C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D750  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D5D754  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80D5D758  41 82 00 1C */	beq lbl_80D5D774
-/* 80D5D75C  3C A0 80 D6 */	lis r5, __vt__8cM3dGAab@ha /* 0x80D5D9B0@ha */
-/* 80D5D760  38 05 D9 B0 */	addi r0, r5, __vt__8cM3dGAab@l /* 0x80D5D9B0@l */
-/* 80D5D764  90 1F 00 18 */	stw r0, 0x18(r31)
-/* 80D5D768  7C 80 07 35 */	extsh. r0, r4
-/* 80D5D76C  40 81 00 08 */	ble lbl_80D5D774
-/* 80D5D770  4B 57 15 CD */	bl __dl__FPv
-lbl_80D5D774:
-/* 80D5D774  7F E3 FB 78 */	mr r3, r31
-/* 80D5D778  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D5D77C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D780  7C 08 03 A6 */	mtlr r0
-/* 80D5D784  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D788  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGCylFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGCylFv.s
deleted file mode 100644
index 063c8fa74b4..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGCylFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80D5D6FC:
-/* 80D5D6FC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D700  7C 08 02 A6 */	mflr r0
-/* 80D5D704  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D708  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D5D70C  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80D5D710  41 82 00 1C */	beq lbl_80D5D72C
-/* 80D5D714  3C A0 80 D6 */	lis r5, __vt__8cM3dGCyl@ha /* 0x80D5D9BC@ha */
-/* 80D5D718  38 05 D9 BC */	addi r0, r5, __vt__8cM3dGCyl@l /* 0x80D5D9BC@l */
-/* 80D5D71C  90 1F 00 14 */	stw r0, 0x14(r31)
-/* 80D5D720  7C 80 07 35 */	extsh. r0, r4
-/* 80D5D724  40 81 00 08 */	ble lbl_80D5D72C
-/* 80D5D728  4B 57 16 15 */	bl __dl__FPv
-lbl_80D5D72C:
-/* 80D5D72C  7F E3 FB 78 */	mr r3, r31
-/* 80D5D730  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D5D734  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D738  7C 08 03 A6 */	mtlr r0
-/* 80D5D73C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D740  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/chk_CoHit__11daTagPati_cFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/chk_CoHit__11daTagPati_cFv.s
deleted file mode 100644
index cde3e7d1aa4..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/chk_CoHit__11daTagPati_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80D5D830:
-/* 80D5D830  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D834  7C 08 02 A6 */	mflr r0
-/* 80D5D838  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D83C  38 63 05 68 */	addi r3, r3, 0x568
-/* 80D5D840  4B 32 6E 19 */	bl ChkCoHit__12dCcD_GObjInfFv
-/* 80D5D844  30 03 FF FF */	addic r0, r3, -1
-/* 80D5D848  7C 60 19 10 */	subfe r3, r0, r3
-/* 80D5D84C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D850  7C 08 03 A6 */	mtlr r0
-/* 80D5D854  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D858  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/col_set__11daTagPati_cFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/col_set__11daTagPati_cFv.s
deleted file mode 100644
index 26d29147277..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/col_set__11daTagPati_cFv.s
+++ /dev/null
@@ -1,27 +0,0 @@
-lbl_80D5D7C8:
-/* 80D5D7C8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D7CC  7C 08 02 A6 */	mflr r0
-/* 80D5D7D0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D7D4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80D5D7D8  7C 7F 1B 78 */	mr r31, r3
-/* 80D5D7DC  38 7F 06 8C */	addi r3, r31, 0x68c
-/* 80D5D7E0  3C 80 80 D6 */	lis r4, lit_3802@ha /* 0x80D5D958@ha */
-/* 80D5D7E4  C0 24 D9 58 */	lfs f1, lit_3802@l(r4)  /* 0x80D5D958@l */
-/* 80D5D7E8  4B 51 1A 19 */	bl SetR__8cM3dGCylFf
-/* 80D5D7EC  38 7F 06 8C */	addi r3, r31, 0x68c
-/* 80D5D7F0  3C 80 80 D6 */	lis r4, lit_3803@ha /* 0x80D5D95C@ha */
-/* 80D5D7F4  C0 24 D9 5C */	lfs f1, lit_3803@l(r4)  /* 0x80D5D95C@l */
-/* 80D5D7F8  4B 51 1A 01 */	bl SetH__8cM3dGCylFf
-/* 80D5D7FC  38 7F 06 8C */	addi r3, r31, 0x68c
-/* 80D5D800  38 9F 04 A8 */	addi r4, r31, 0x4a8
-/* 80D5D804  4B 51 19 D9 */	bl SetC__8cM3dGCylFRC4cXyz
-/* 80D5D808  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D5D80C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D5D810  38 63 23 3C */	addi r3, r3, 0x233c
-/* 80D5D814  38 9F 05 68 */	addi r4, r31, 0x568
-/* 80D5D818  4B 50 73 91 */	bl Set__4cCcSFP8cCcD_Obj
-/* 80D5D81C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80D5D820  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D824  7C 08 03 A6 */	mtlr r0
-/* 80D5D828  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D82C  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/create__11daTagPati_cFv.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/create__11daTagPati_cFv.s
deleted file mode 100644
index 6c31cdf1198..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/create__11daTagPati_cFv.s
+++ /dev/null
@@ -1,80 +0,0 @@
-lbl_80D5D570:
-/* 80D5D570  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80D5D574  7C 08 02 A6 */	mflr r0
-/* 80D5D578  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80D5D57C  39 61 00 20 */	addi r11, r1, 0x20
-/* 80D5D580  4B 60 4C 5D */	bl _savegpr_29
-/* 80D5D584  7C 7F 1B 78 */	mr r31, r3
-/* 80D5D588  80 03 04 A0 */	lwz r0, 0x4a0(r3)
-/* 80D5D58C  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80D5D590  40 82 00 A8 */	bne lbl_80D5D638
-/* 80D5D594  7F E0 FB 79 */	or. r0, r31, r31
-/* 80D5D598  41 82 00 94 */	beq lbl_80D5D62C
-/* 80D5D59C  7C 1E 03 78 */	mr r30, r0
-/* 80D5D5A0  4B 2B B5 C5 */	bl __ct__10fopAc_ac_cFv
-/* 80D5D5A4  3B BE 05 68 */	addi r29, r30, 0x568
-/* 80D5D5A8  7F A3 EB 78 */	mr r3, r29
-/* 80D5D5AC  4B 32 64 7D */	bl __ct__12dCcD_GObjInfFv
-/* 80D5D5B0  3C 60 80 3C */	lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
-/* 80D5D5B4  38 03 36 D0 */	addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
-/* 80D5D5B8  90 1D 01 20 */	stw r0, 0x120(r29)
-/* 80D5D5BC  3C 60 80 D6 */	lis r3, __vt__8cM3dGAab@ha /* 0x80D5D9B0@ha */
-/* 80D5D5C0  38 03 D9 B0 */	addi r0, r3, __vt__8cM3dGAab@l /* 0x80D5D9B0@l */
-/* 80D5D5C4  90 1D 01 1C */	stw r0, 0x11c(r29)
-/* 80D5D5C8  3C 60 80 D6 */	lis r3, __vt__8cM3dGCyl@ha /* 0x80D5D9BC@ha */
-/* 80D5D5CC  38 03 D9 BC */	addi r0, r3, __vt__8cM3dGCyl@l /* 0x80D5D9BC@l */
-/* 80D5D5D0  90 1D 01 38 */	stw r0, 0x138(r29)
-/* 80D5D5D4  3C 60 80 3C */	lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
-/* 80D5D5D8  38 63 35 A4 */	addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
-/* 80D5D5DC  90 7D 01 20 */	stw r3, 0x120(r29)
-/* 80D5D5E0  38 03 00 58 */	addi r0, r3, 0x58
-/* 80D5D5E4  90 1D 01 38 */	stw r0, 0x138(r29)
-/* 80D5D5E8  3C 60 80 3B */	lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
-/* 80D5D5EC  38 63 C0 50 */	addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
-/* 80D5D5F0  90 7D 00 3C */	stw r3, 0x3c(r29)
-/* 80D5D5F4  38 03 00 2C */	addi r0, r3, 0x2c
-/* 80D5D5F8  90 1D 01 20 */	stw r0, 0x120(r29)
-/* 80D5D5FC  38 03 00 84 */	addi r0, r3, 0x84
-/* 80D5D600  90 1D 01 38 */	stw r0, 0x138(r29)
-/* 80D5D604  3C 60 80 3C */	lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
-/* 80D5D608  38 03 37 28 */	addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
-/* 80D5D60C  90 1E 06 BC */	stw r0, 0x6bc(r30)
-/* 80D5D610  38 7E 06 C0 */	addi r3, r30, 0x6c0
-/* 80D5D614  4B 32 61 4D */	bl __ct__10dCcD_GSttsFv
-/* 80D5D618  3C 60 80 3B */	lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
-/* 80D5D61C  38 63 C2 E4 */	addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
-/* 80D5D620  90 7E 06 BC */	stw r3, 0x6bc(r30)
-/* 80D5D624  38 03 00 20 */	addi r0, r3, 0x20
-/* 80D5D628  90 1E 06 C0 */	stw r0, 0x6c0(r30)
-lbl_80D5D62C:
-/* 80D5D62C  80 1F 04 A0 */	lwz r0, 0x4a0(r31)
-/* 80D5D630  60 00 00 08 */	ori r0, r0, 8
-/* 80D5D634  90 1F 04 A0 */	stw r0, 0x4a0(r31)
-lbl_80D5D638:
-/* 80D5D638  80 1F 00 B0 */	lwz r0, 0xb0(r31)
-/* 80D5D63C  54 00 06 3E */	clrlwi r0, r0, 0x18
-/* 80D5D640  28 00 00 FF */	cmplwi r0, 0xff
-/* 80D5D644  40 82 00 08 */	bne lbl_80D5D64C
-/* 80D5D648  38 00 00 00 */	li r0, 0
-lbl_80D5D64C:
-/* 80D5D64C  90 1F 06 E0 */	stw r0, 0x6e0(r31)
-/* 80D5D650  38 7F 06 A4 */	addi r3, r31, 0x6a4
-/* 80D5D654  38 80 00 FF */	li r4, 0xff
-/* 80D5D658  38 A0 00 FF */	li r5, 0xff
-/* 80D5D65C  7F E6 FB 78 */	mr r6, r31
-/* 80D5D660  4B 32 62 01 */	bl Init__9dCcD_SttsFiiP10fopAc_ac_c
-/* 80D5D664  38 7F 05 68 */	addi r3, r31, 0x568
-/* 80D5D668  3C 80 80 D6 */	lis r4, l_sph_src@ha /* 0x80D5D914@ha */
-/* 80D5D66C  38 84 D9 14 */	addi r4, r4, l_sph_src@l /* 0x80D5D914@l */
-/* 80D5D670  4B 32 72 45 */	bl Set__8dCcD_CylFRC11dCcD_SrcCyl
-/* 80D5D674  38 1F 06 A4 */	addi r0, r31, 0x6a4
-/* 80D5D678  90 1F 05 AC */	stw r0, 0x5ac(r31)
-/* 80D5D67C  38 00 00 00 */	li r0, 0
-/* 80D5D680  90 1F 06 E4 */	stw r0, 0x6e4(r31)
-/* 80D5D684  38 60 00 04 */	li r3, 4
-/* 80D5D688  39 61 00 20 */	addi r11, r1, 0x20
-/* 80D5D68C  4B 60 4B 9D */	bl _restgpr_29
-/* 80D5D690  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80D5D694  7C 08 03 A6 */	mtlr r0
-/* 80D5D698  38 21 00 20 */	addi r1, r1, 0x20
-/* 80D5D69C  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Create__FP10fopAc_ac_c.s
deleted file mode 100644
index 6ac89622abe..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Create__FP10fopAc_ac_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D5D85C:
-/* 80D5D85C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D860  7C 08 02 A6 */	mflr r0
-/* 80D5D864  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D868  4B FF FD 09 */	bl create__11daTagPati_cFv
-/* 80D5D86C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D870  7C 08 03 A6 */	mtlr r0
-/* 80D5D874  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D878  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Delete__FP11daTagPati_c.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Delete__FP11daTagPati_c.s
deleted file mode 100644
index a6aadb74a86..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Delete__FP11daTagPati_c.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80D5D89C:
-/* 80D5D89C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D8A0  7C 08 02 A6 */	mflr r0
-/* 80D5D8A4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D8A8  38 80 FF FF */	li r4, -1
-/* 80D5D8AC  4B FF FB 8D */	bl __dt__11daTagPati_cFv
-/* 80D5D8B0  38 60 00 01 */	li r3, 1
-/* 80D5D8B4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D8B8  7C 08 03 A6 */	mtlr r0
-/* 80D5D8BC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D8C0  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Execute__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Execute__FP10fopAc_ac_c.s
deleted file mode 100644
index 54d4a44b9e6..00000000000
--- a/asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Execute__FP10fopAc_ac_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D5D87C:
-/* 80D5D87C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80D5D880  7C 08 02 A6 */	mflr r0
-/* 80D5D884  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80D5D888  4B FF FF 05 */	bl Execute__11daTagPati_cFv
-/* 80D5D88C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80D5D890  7C 08 03 A6 */	mtlr r0
-/* 80D5D894  38 21 00 10 */	addi r1, r1, 0x10
-/* 80D5D898  4E 80 00 20 */	blr 
diff --git a/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h b/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h
index 73b8737caef..817ecaa85dd 100644
--- a/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h
+++ b/include/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h
@@ -1,6 +1,31 @@
 #ifndef D_A_TAG_PACHI_H
 #define D_A_TAG_PACHI_H
 
+#include "d/cc/d_cc_d.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+class daTagPati_c : public fopAc_ac_c {
+public:
+    /* 80D5D438 */ ~daTagPati_c();
+    /* 80D5D570 */ int create();
+    /* 80D5D78C */ int Execute();
+    /* 80D5D7C8 */ void col_set();
+    /* 80D5D830 */ u32 chk_CoHit();
+
+    u32 get_prm() {
+        u32 retVal = fopAcM_GetParam(this) & 0xFF;
+        if (retVal == 0xFF) {
+            retVal = 0;
+        }
+        return retVal;
+    }
+
+    /* 0x568 */ dCcD_Cyl mCyl;
+    /* 0x6A4 */ dCcD_Stts mStts;
+    /* 0x6E0 */ u32 field_0x6E0;
+    /* 0x6E4 */ u32 field_0x6E4;
+};
+STATIC_ASSERT(sizeof(daTagPati_c) == 0x6E8);
 
 #endif /* D_A_TAG_PACHI_H */
diff --git a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp
index bc9bcd7d77f..01044ec83b1 100644
--- a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp
+++ b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp
@@ -4,307 +4,101 @@
 //
 
 #include "rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.h"
-#include "dol2asm.h"
-
-//
-// Types:
-//
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daTagPati_c {
-    /* 80D5D438 */ ~daTagPati_c();
-    /* 80D5D570 */ void create();
-    /* 80D5D78C */ void Execute();
-    /* 80D5D7C8 */ void col_set();
-    /* 80D5D830 */ void chk_CoHit();
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcCyl {};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80D5D6A0 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ ~dCcD_GObjInf();
-    /* 80084658 */ void ChkCoHit();
-};
-
-struct dCcD_Cyl {
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-};
-
-struct cXyz {};
-
-struct cM3dGCyl {
-    /* 8026F1DC */ void SetC(cXyz const&);
-    /* 8026F1F8 */ void SetH(f32);
-    /* 8026F200 */ void SetR(f32);
-    /* 80D5D6FC */ ~cM3dGCyl();
-};
-
-struct cM3dGAab {
-    /* 80D5D744 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 80D5D8C4 */ ~cCcD_GStts();
-};
-
-//
-// Forward References:
-//
-
-extern "C" void __dt__11daTagPati_cFv();
-extern "C" void create__11daTagPati_cFv();
-extern "C" void __dt__10dCcD_GSttsFv();
-extern "C" void __dt__8cM3dGCylFv();
-extern "C" void __dt__8cM3dGAabFv();
-extern "C" void Execute__11daTagPati_cFv();
-extern "C" void col_set__11daTagPati_cFv();
-extern "C" void chk_CoHit__11daTagPati_cFv();
-extern "C" static void daTagPati_Create__FP10fopAc_ac_c();
-extern "C" static void daTagPati_Execute__FP10fopAc_ac_c();
-extern "C" static void daTagPati_Delete__FP11daTagPati_c();
-extern "C" void __dt__10cCcD_GSttsFv();
-
-//
-// External References:
-//
-
-extern "C" void __ct__10fopAc_ac_cFv();
-extern "C" void __dt__10fopAc_ac_cFv();
-extern "C" void __ct__10dCcD_GSttsFv();
-extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
-extern "C" void __ct__12dCcD_GObjInfFv();
-extern "C" void __dt__12dCcD_GObjInfFv();
-extern "C" void ChkCoHit__12dCcD_GObjInfFv();
-extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
-extern "C" void Set__4cCcSFP8cCcD_Obj();
-extern "C" void SetC__8cM3dGCylFRC4cXyz();
-extern "C" void SetH__8cM3dGCylFf();
-extern "C" void SetR__8cM3dGCylFf();
-extern "C" void __dl__FPv();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_29();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-extern "C" extern void* __vt__8dCcD_Cyl[36];
-extern "C" extern void* __vt__9dCcD_Stts[11];
-extern "C" extern void* __vt__12cCcD_CylAttr[25];
-extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
-extern "C" extern void* __vt__9cCcD_Stts[8];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80D5D960-80D5D980 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagPati_Method */
-SECTION_DATA static void* l_daTagPati_Method[8] = {
-    (void*)daTagPati_Create__FP10fopAc_ac_c,
-    (void*)daTagPati_Delete__FP11daTagPati_c,
-    (void*)daTagPati_Execute__FP10fopAc_ac_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-};
-
-/* 80D5D980-80D5D9B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_PATI */
-SECTION_DATA extern void* g_profile_TAG_PATI[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x02720000, (void*)&g_fpcLf_Method,
-    (void*)0x000006E8, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01730000, (void*)&l_daTagPati_Method,
-    (void*)0x00040000, (void*)0x000E0000,
-};
-
-/* 80D5D9B0-80D5D9BC 000050 000C+00 3/3 0/0 0/0 .data            __vt__8cM3dGAab */
-SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__8cM3dGAabFv,
-};
-
-/* 80D5D9BC-80D5D9C8 00005C 000C+00 3/3 0/0 0/0 .data            __vt__8cM3dGCyl */
-SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__8cM3dGCylFv,
-};
-
-/* 80D5D9C8-80D5D9D4 000068 000C+00 3/3 0/0 0/0 .data            __vt__10cCcD_GStts */
-SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__10cCcD_GSttsFv,
-};
-
-/* 80D5D9D4-80D5D9E0 000074 000C+00 2/2 0/0 0/0 .data            __vt__10dCcD_GStts */
-SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__10dCcD_GSttsFv,
-};
+#include "JSystem/JKernel/JKRHeap.h"
+#include "d/com/d_com_inf_game.h"
+#include "d/d_procname.h"
 
 /* 80D5D438-80D5D570 000078 0138+00 1/1 0/0 0/0 .text            __dt__11daTagPati_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daTagPati_c::~daTagPati_c() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__11daTagPati_cFv.s"
-}
-#pragma pop
+daTagPati_c::~daTagPati_c() {}
 
 /* ############################################################################################## */
 /* 80D5D914-80D5D958 000000 0044+00 1/1 0/0 0/0 .rodata          l_sph_src */
-SECTION_RODATA static u8 const l_sph_src[68] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+static dCcD_SrcCyl const l_sph_src = {
+    {
+        {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x0}, 0x19}},  // mObj
+        {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x8},                 // mGObjAt
+        {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0},                 // mGObjTg
+        {0x0},                                              // mGObjCo
+    },                                                      // mObjInf
+    {
+        {0.0f, 0.0f, 0.0f},  // mCenter
+        0.0f,                // mRadius
+        0.0f                 // mHeight
+    }                        // mCyl
 };
-COMPILER_STRIP_GATE(0x80D5D914, &l_sph_src);
 
 /* 80D5D570-80D5D6A0 0001B0 0130+00 1/1 0/0 0/0 .text            create__11daTagPati_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagPati_c::create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/create__11daTagPati_cFv.s"
+int daTagPati_c::create() {
+    fopAcM_SetupActor(this, daTagPati_c);
+    field_0x6E0 = get_prm();
+    mStts.Init(0xFF, 0xFF, this);
+    mCyl.Set(l_sph_src);
+    mCyl.SetStts(&mStts);
+    field_0x6E4 = 0;
+    return cPhs_COMPLEATE_e;
 }
-#pragma pop
-
-/* 80D5D6A0-80D5D6FC 0002E0 005C+00 1/0 0/0 0/0 .text            __dt__10dCcD_GSttsFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm dCcD_GStts::~dCcD_GStts() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10dCcD_GSttsFv.s"
-}
-#pragma pop
-
-/* 80D5D6FC-80D5D744 00033C 0048+00 1/0 0/0 0/0 .text            __dt__8cM3dGCylFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm cM3dGCyl::~cM3dGCyl() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGCylFv.s"
-}
-#pragma pop
-
-/* 80D5D744-80D5D78C 000384 0048+00 1/0 0/0 0/0 .text            __dt__8cM3dGAabFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm cM3dGAab::~cM3dGAab() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__8cM3dGAabFv.s"
-}
-#pragma pop
 
 /* 80D5D78C-80D5D7C8 0003CC 003C+00 1/1 0/0 0/0 .text            Execute__11daTagPati_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagPati_c::Execute() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/Execute__11daTagPati_cFv.s"
+int daTagPati_c::Execute() {
+    col_set();
+    field_0x6E4 = chk_CoHit();
+    return 1;
 }
-#pragma pop
 
 /* ############################################################################################## */
-/* 80D5D958-80D5D95C 000044 0004+00 1/1 0/0 0/0 .rodata          @3802 */
-SECTION_RODATA static f32 const lit_3802 = 1350.0f;
-COMPILER_STRIP_GATE(0x80D5D958, &lit_3802);
-
-/* 80D5D95C-80D5D960 000048 0004+00 1/1 0/0 0/0 .rodata          @3803 */
-SECTION_RODATA static f32 const lit_3803 = 300000.0f;
-COMPILER_STRIP_GATE(0x80D5D95C, &lit_3803);
-
 /* 80D5D7C8-80D5D830 000408 0068+00 1/1 0/0 0/0 .text            col_set__11daTagPati_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagPati_c::col_set() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/col_set__11daTagPati_cFv.s"
+void daTagPati_c::col_set() {
+    mCyl.SetR(1350.f);
+    mCyl.SetH(300000.0f);
+    mCyl.SetC(orig.pos);
+    dComIfG_Ccsp()->Set(&mCyl);
 }
-#pragma pop
 
 /* 80D5D830-80D5D85C 000470 002C+00 1/1 0/0 0/0 .text            chk_CoHit__11daTagPati_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagPati_c::chk_CoHit() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/chk_CoHit__11daTagPati_cFv.s"
+u32 daTagPati_c::chk_CoHit() {
+    return mCyl.ChkCoHit() ? 1 : 0;
 }
-#pragma pop
 
 /* 80D5D85C-80D5D87C 00049C 0020+00 1/0 0/0 0/0 .text            daTagPati_Create__FP10fopAc_ac_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagPati_Create(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Create__FP10fopAc_ac_c.s"
+static int daTagPati_Create(fopAc_ac_c* i_this) {
+    return static_cast<daTagPati_c*>(i_this)->create();
 }
-#pragma pop
 
 /* 80D5D87C-80D5D89C 0004BC 0020+00 1/0 0/0 0/0 .text            daTagPati_Execute__FP10fopAc_ac_c
  */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagPati_Execute(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Execute__FP10fopAc_ac_c.s"
+static int daTagPati_Execute(fopAc_ac_c* i_this) {
+    return static_cast<daTagPati_c*>(i_this)->Execute();
 }
-#pragma pop
 
 /* 80D5D89C-80D5D8C4 0004DC 0028+00 1/0 0/0 0/0 .text            daTagPati_Delete__FP11daTagPati_c
  */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagPati_Delete(daTagPati_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/daTagPati_Delete__FP11daTagPati_c.s"
+static int daTagPati_Delete(daTagPati_c* i_this) {
+    i_this->~daTagPati_c();
+    return 1;
 }
-#pragma pop
 
-/* 80D5D8C4-80D5D90C 000504 0048+00 1/0 0/0 0/0 .text            __dt__10cCcD_GSttsFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm cCcD_GStts::~cCcD_GStts() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi/__dt__10cCcD_GSttsFv.s"
-}
-#pragma pop
+/* ############################################################################################## */
+/* 80D5D960-80D5D980 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagPati_Method */
+static actor_method_class l_daTagPati_Method = {
+    (process_method_func)daTagPati_Create,
+    (process_method_func)daTagPati_Delete,
+    (process_method_func)daTagPati_Execute,
+};
+
+/* 80D5D980-80D5D9B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_PATI */
+extern actor_process_profile_definition g_profile_TAG_PATI = {
+    fpcLy_CURRENT_e,
+    7,
+    fpcLy_CURRENT_e,
+    PROC_TAG_PATI,
+    &g_fpcLf_Method.mBase,
+    sizeof(daTagPati_c),
+    0,
+    0,
+    &g_fopAc_Method.base,
+    0x173,
+    &l_daTagPati_Method,
+    0x40000,
+    0,
+    fopAc_CULLBOX_CUSTOM_e,
+};