diff --git a/Progress.md b/Progress.md
index aeb38f7a578..2218cfbdf9d 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 |  35.241054% | 1267460 | 3596544
+.text |  35.549238% | 1278544 | 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 |  42.067495% | 1691396 | 4020672
+Total |  42.343170% | 1702480 | 4020672
 
 ## Total
 
 Section | Percentage | Decompiled (bytes) | Total (bytes)
 ---|---|---|---
-main.dol |  42.067495% | 1691396 | 4020672
-RELs |  34.967676% | 4021396 | 11500324
-Total |  36.806865% | 5712792 | 15520996
+main.dol |  42.343170% | 1702480 | 4020672
+RELs |  35.018666% | 4027260 | 11500324
+Total |  36.916059% | 5729740 | 15520996
 
 ## RELs
 
@@ -348,7 +348,7 @@ d_a_obj_ari |  31.622322% | 5372 | 16988
 d_a_obj_automata |  40.573951% | 3676 | 9060
 d_a_obj_avalanche |  41.881443% | 2600 | 6208
 d_a_obj_balloon |  42.722710% | 2724 | 6376
-d_a_obj_barDesk |  49.477072% | 2460 | 4972
+d_a_obj_barDesk | 100.000000% | 4972 | 4972
 d_a_obj_batta |  31.886560% | 5172 | 16220
 d_a_obj_bbox |  78.929766% | 2832 | 3588
 d_a_obj_bed | 100.000000% | 4812 | 4812
@@ -466,7 +466,7 @@ d_a_obj_ki |  41.573034% | 2220 | 5340
 d_a_obj_kiPot |  53.782895% | 1308 | 2432
 d_a_obj_kita |  40.112090% | 2004 | 4996
 d_a_obj_kjgjs | 100.000000% | 2488 | 2488
-d_a_obj_kkanban |  47.103514% | 1984 | 4212
+d_a_obj_kkanban | 100.000000% | 4212 | 4212
 d_a_obj_klift00 |  37.650457% | 3128 | 8308
 d_a_obj_knBullet |  43.076923% | 1568 | 3640
 d_a_obj_kshutter |  35.690936% | 4804 | 13460
@@ -712,7 +712,7 @@ d_a_tag_ajnot | 100.000000% | 1232 | 1232
 d_a_tag_allmato |  30.234070% | 3720 | 12304
 d_a_tag_arena | 100.000000% | 712 | 712
 d_a_tag_assistance | 100.000000% | 824 | 824
-d_a_tag_attack_item |  43.212237% | 1808 | 4184
+d_a_tag_attack_item |  70.076482% | 2932 | 4184
 d_a_tag_attention | 100.000000% | 2024 | 2024
 d_a_tag_bottle_item | 100.000000% | 2656 | 2656
 d_a_tag_camera |  37.023593% | 1632 | 4408
@@ -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.967676% | 4021396 | 11500324
+Total |  35.018666% | 4027260 | 11500324
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/CreateHeap__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/CreateHeap__11daBarDesk_cFv.s
deleted file mode 100644
index ca0804dd98d..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/CreateHeap__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,28 +0,0 @@
-lbl_80BA9288:
-/* 80BA9288  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA928C  7C 08 02 A6 */	mflr r0
-/* 80BA9290  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9294  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA9298  7C 7F 1B 78 */	mr r31, r3
-/* 80BA929C  3C 60 80 BB */	lis r3, d_a_obj_barDesk__stringBase0@ha /* 0x80BA9BB4@ha */
-/* 80BA92A0  38 63 9B B4 */	addi r3, r3, d_a_obj_barDesk__stringBase0@l /* 0x80BA9BB4@l */
-/* 80BA92A4  38 80 00 04 */	li r4, 4
-/* 80BA92A8  3C A0 80 40 */	lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA92AC  38 A5 61 C0 */	addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA92B0  3C A5 00 02 */	addis r5, r5, 2
-/* 80BA92B4  38 C0 00 80 */	li r6, 0x80
-/* 80BA92B8  38 A5 C2 F8 */	addi r5, r5, -15624
-/* 80BA92BC  4B 49 30 31 */	bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80BA92C0  3C 80 00 08 */	lis r4, 8
-/* 80BA92C4  3C A0 11 00 */	lis r5, 0x1100 /* 0x11000084@ha */
-/* 80BA92C8  38 A5 00 84 */	addi r5, r5, 0x0084 /* 0x11000084@l */
-/* 80BA92CC  4B 46 B9 89 */	bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
-/* 80BA92D0  90 7F 05 A8 */	stw r3, 0x5a8(r31)
-/* 80BA92D4  80 7F 05 A8 */	lwz r3, 0x5a8(r31)
-/* 80BA92D8  30 03 FF FF */	addic r0, r3, -1
-/* 80BA92DC  7C 60 19 10 */	subfe r3, r0, r3
-/* 80BA92E0  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA92E4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA92E8  7C 08 03 A6 */	mtlr r0
-/* 80BA92EC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA92F0  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Delete__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Delete__11daBarDesk_cFv.s
deleted file mode 100644
index c374a56cb02..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Delete__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80BA998C:
-/* 80BA998C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9990  7C 08 02 A6 */	mflr r0
-/* 80BA9994  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9998  3C 80 80 BB */	lis r4, d_a_obj_barDesk__stringBase0@ha /* 0x80BA9BB4@ha */
-/* 80BA999C  38 84 9B B4 */	addi r4, r4, d_a_obj_barDesk__stringBase0@l /* 0x80BA9BB4@l */
-/* 80BA99A0  38 63 05 A0 */	addi r3, r3, 0x5a0
-/* 80BA99A4  4B 48 36 65 */	bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
-/* 80BA99A8  38 60 00 01 */	li r3, 1
-/* 80BA99AC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA99B0  7C 08 03 A6 */	mtlr r0
-/* 80BA99B4  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA99B8  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Draw__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Draw__11daBarDesk_cFv.s
deleted file mode 100644
index cd5a4739d1c..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Draw__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,42 +0,0 @@
-lbl_80BA98E8:
-/* 80BA98E8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA98EC  7C 08 02 A6 */	mflr r0
-/* 80BA98F0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA98F4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA98F8  93 C1 00 08 */	stw r30, 8(r1)
-/* 80BA98FC  7C 7E 1B 78 */	mr r30, r3
-/* 80BA9900  3C 60 80 43 */	lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80BA9904  38 63 CA 54 */	addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80BA9908  38 80 00 10 */	li r4, 0x10
-/* 80BA990C  38 BE 04 D0 */	addi r5, r30, 0x4d0
-/* 80BA9910  38 DE 01 0C */	addi r6, r30, 0x10c
-/* 80BA9914  4B 5F 9E B1 */	bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c
-/* 80BA9918  3C 60 80 43 */	lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80BA991C  38 63 CA 54 */	addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80BA9920  80 9E 05 A8 */	lwz r4, 0x5a8(r30)
-/* 80BA9924  80 84 00 04 */	lwz r4, 4(r4)
-/* 80BA9928  38 BE 01 0C */	addi r5, r30, 0x10c
-/* 80BA992C  4B 5F B4 75 */	bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
-/* 80BA9930  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA9934  38 83 61 C0 */	addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA9938  80 04 5F 70 */	lwz r0, 0x5f70(r4)
-/* 80BA993C  3C 60 80 43 */	lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80BA9940  3B E3 4A C8 */	addi r31, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80BA9944  90 1F 00 48 */	stw r0, 0x48(r31)
-/* 80BA9948  80 04 5F 74 */	lwz r0, 0x5f74(r4)
-/* 80BA994C  90 1F 00 4C */	stw r0, 0x4c(r31)
-/* 80BA9950  80 7E 05 A8 */	lwz r3, 0x5a8(r30)
-/* 80BA9954  4B 46 43 71 */	bl mDoExt_modelUpdateDL__FP8J3DModel
-/* 80BA9958  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA995C  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA9960  80 03 5F 80 */	lwz r0, 0x5f80(r3)
-/* 80BA9964  90 1F 00 48 */	stw r0, 0x48(r31)
-/* 80BA9968  80 03 5F 84 */	lwz r0, 0x5f84(r3)
-/* 80BA996C  90 1F 00 4C */	stw r0, 0x4c(r31)
-/* 80BA9970  38 60 00 01 */	li r3, 1
-/* 80BA9974  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA9978  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80BA997C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9980  7C 08 03 A6 */	mtlr r0
-/* 80BA9984  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9988  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Execute__11daBarDesk_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Execute__11daBarDesk_cFPPA3_A4_f.s
deleted file mode 100644
index 8f941c8946d..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Execute__11daBarDesk_cFPPA3_A4_f.s
+++ /dev/null
@@ -1,21 +0,0 @@
-lbl_80BA95A4:
-/* 80BA95A4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA95A8  7C 08 02 A6 */	mflr r0
-/* 80BA95AC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA95B0  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA95B4  93 C1 00 08 */	stw r30, 8(r1)
-/* 80BA95B8  7C 7E 1B 78 */	mr r30, r3
-/* 80BA95BC  7C 9F 23 78 */	mr r31, r4
-/* 80BA95C0  48 00 00 35 */	bl windowProc__11daBarDesk_cFv
-/* 80BA95C4  80 7E 05 A8 */	lwz r3, 0x5a8(r30)
-/* 80BA95C8  38 03 00 24 */	addi r0, r3, 0x24
-/* 80BA95CC  90 1F 00 00 */	stw r0, 0(r31)
-/* 80BA95D0  7F C3 F3 78 */	mr r3, r30
-/* 80BA95D4  4B FF FC 2D */	bl setBaseMtx__11daBarDesk_cFv
-/* 80BA95D8  38 60 00 01 */	li r3, 1
-/* 80BA95DC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA95E0  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80BA95E4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA95E8  7C 08 03 A6 */	mtlr r0
-/* 80BA95EC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA95F0  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__ct__15daBarDesk_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__ct__15daBarDesk_HIO_cFv.s
deleted file mode 100644
index 284449a6fcb..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__ct__15daBarDesk_HIO_cFv.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80BA918C:
-/* 80BA918C  3C 80 80 BB */	lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80BA9D04@ha */
-/* 80BA9190  38 04 9D 04 */	addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80BA9D04@l */
-/* 80BA9194  90 03 00 00 */	stw r0, 0(r3)
-/* 80BA9198  3C 80 80 BB */	lis r4, __vt__15daBarDesk_HIO_c@ha /* 0x80BA9CF8@ha */
-/* 80BA919C  38 04 9C F8 */	addi r0, r4, __vt__15daBarDesk_HIO_c@l /* 0x80BA9CF8@l */
-/* 80BA91A0  90 03 00 00 */	stw r0, 0(r3)
-/* 80BA91A4  38 00 00 0A */	li r0, 0xa
-/* 80BA91A8  98 03 00 04 */	stb r0, 4(r3)
-/* 80BA91AC  38 00 00 03 */	li r0, 3
-/* 80BA91B0  98 03 00 05 */	stb r0, 5(r3)
-/* 80BA91B4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10cCcD_GSttsFv.s
deleted file mode 100644
index a05dde44599..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10cCcD_GSttsFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80BA9A48:
-/* 80BA9A48  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9A4C  7C 08 02 A6 */	mflr r0
-/* 80BA9A50  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9A54  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA9A58  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80BA9A5C  41 82 00 1C */	beq lbl_80BA9A78
-/* 80BA9A60  3C A0 80 BB */	lis r5, __vt__10cCcD_GStts@ha /* 0x80BA9CA0@ha */
-/* 80BA9A64  38 05 9C A0 */	addi r0, r5, __vt__10cCcD_GStts@l /* 0x80BA9CA0@l */
-/* 80BA9A68  90 1F 00 00 */	stw r0, 0(r31)
-/* 80BA9A6C  7C 80 07 35 */	extsh. r0, r4
-/* 80BA9A70  40 81 00 08 */	ble lbl_80BA9A78
-/* 80BA9A74  4B 72 52 C9 */	bl __dl__FPv
-lbl_80BA9A78:
-/* 80BA9A78  7F E3 FB 78 */	mr r3, r31
-/* 80BA9A7C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA9A80  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9A84  7C 08 03 A6 */	mtlr r0
-/* 80BA9A88  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9A8C  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10dCcD_GSttsFv.s
deleted file mode 100644
index 388ce3fd2c6..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10dCcD_GSttsFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_80BA9548:
-/* 80BA9548  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA954C  7C 08 02 A6 */	mflr r0
-/* 80BA9550  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9554  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA9558  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80BA955C  41 82 00 30 */	beq lbl_80BA958C
-/* 80BA9560  3C 60 80 BB */	lis r3, __vt__10dCcD_GStts@ha /* 0x80BA9CAC@ha */
-/* 80BA9564  38 03 9C AC */	addi r0, r3, __vt__10dCcD_GStts@l /* 0x80BA9CAC@l */
-/* 80BA9568  90 1F 00 00 */	stw r0, 0(r31)
-/* 80BA956C  41 82 00 10 */	beq lbl_80BA957C
-/* 80BA9570  3C 60 80 BB */	lis r3, __vt__10cCcD_GStts@ha /* 0x80BA9CA0@ha */
-/* 80BA9574  38 03 9C A0 */	addi r0, r3, __vt__10cCcD_GStts@l /* 0x80BA9CA0@l */
-/* 80BA9578  90 1F 00 00 */	stw r0, 0(r31)
-lbl_80BA957C:
-/* 80BA957C  7C 80 07 35 */	extsh. r0, r4
-/* 80BA9580  40 81 00 0C */	ble lbl_80BA958C
-/* 80BA9584  7F E3 FB 78 */	mr r3, r31
-/* 80BA9588  4B 72 57 B5 */	bl __dl__FPv
-lbl_80BA958C:
-/* 80BA958C  7F E3 FB 78 */	mr r3, r31
-/* 80BA9590  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA9594  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9598  7C 08 03 A6 */	mtlr r0
-/* 80BA959C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA95A0  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__14mDoHIO_entry_cFv.s
deleted file mode 100644
index 337bad1cd4c..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__14mDoHIO_entry_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80BA91B8:
-/* 80BA91B8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA91BC  7C 08 02 A6 */	mflr r0
-/* 80BA91C0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA91C4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA91C8  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80BA91CC  41 82 00 1C */	beq lbl_80BA91E8
-/* 80BA91D0  3C A0 80 BB */	lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80BA9D04@ha */
-/* 80BA91D4  38 05 9D 04 */	addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80BA9D04@l */
-/* 80BA91D8  90 1F 00 00 */	stw r0, 0(r31)
-/* 80BA91DC  7C 80 07 35 */	extsh. r0, r4
-/* 80BA91E0  40 81 00 08 */	ble lbl_80BA91E8
-/* 80BA91E4  4B 72 5B 59 */	bl __dl__FPv
-lbl_80BA91E8:
-/* 80BA91E8  7F E3 FB 78 */	mr r3, r31
-/* 80BA91EC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA91F0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA91F4  7C 08 03 A6 */	mtlr r0
-/* 80BA91F8  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA91FC  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__15daBarDesk_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__15daBarDesk_HIO_cFv.s
deleted file mode 100644
index 9120564a220..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__15daBarDesk_HIO_cFv.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_80BA9A90:
-/* 80BA9A90  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9A94  7C 08 02 A6 */	mflr r0
-/* 80BA9A98  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9A9C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA9AA0  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80BA9AA4  41 82 00 30 */	beq lbl_80BA9AD4
-/* 80BA9AA8  3C 60 80 BB */	lis r3, __vt__15daBarDesk_HIO_c@ha /* 0x80BA9CF8@ha */
-/* 80BA9AAC  38 03 9C F8 */	addi r0, r3, __vt__15daBarDesk_HIO_c@l /* 0x80BA9CF8@l */
-/* 80BA9AB0  90 1F 00 00 */	stw r0, 0(r31)
-/* 80BA9AB4  41 82 00 10 */	beq lbl_80BA9AC4
-/* 80BA9AB8  3C 60 80 BB */	lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80BA9D04@ha */
-/* 80BA9ABC  38 03 9D 04 */	addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80BA9D04@l */
-/* 80BA9AC0  90 1F 00 00 */	stw r0, 0(r31)
-lbl_80BA9AC4:
-/* 80BA9AC4  7C 80 07 35 */	extsh. r0, r4
-/* 80BA9AC8  40 81 00 0C */	ble lbl_80BA9AD4
-/* 80BA9ACC  7F E3 FB 78 */	mr r3, r31
-/* 80BA9AD0  4B 72 52 6D */	bl __dl__FPv
-lbl_80BA9AD4:
-/* 80BA9AD4  7F E3 FB 78 */	mr r3, r31
-/* 80BA9AD8  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA9ADC  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9AE0  7C 08 03 A6 */	mtlr r0
-/* 80BA9AE4  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9AE8  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGAabFv.s
deleted file mode 100644
index 870cfce48fc..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGAabFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80BA9500:
-/* 80BA9500  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9504  7C 08 02 A6 */	mflr r0
-/* 80BA9508  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA950C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA9510  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80BA9514  41 82 00 1C */	beq lbl_80BA9530
-/* 80BA9518  3C A0 80 BB */	lis r5, __vt__8cM3dGAab@ha /* 0x80BA9CC4@ha */
-/* 80BA951C  38 05 9C C4 */	addi r0, r5, __vt__8cM3dGAab@l /* 0x80BA9CC4@l */
-/* 80BA9520  90 1F 00 18 */	stw r0, 0x18(r31)
-/* 80BA9524  7C 80 07 35 */	extsh. r0, r4
-/* 80BA9528  40 81 00 08 */	ble lbl_80BA9530
-/* 80BA952C  4B 72 58 11 */	bl __dl__FPv
-lbl_80BA9530:
-/* 80BA9530  7F E3 FB 78 */	mr r3, r31
-/* 80BA9534  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA9538  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA953C  7C 08 03 A6 */	mtlr r0
-/* 80BA9540  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9544  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGCylFv.s
deleted file mode 100644
index 8e05c348dab..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGCylFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80BA94B8:
-/* 80BA94B8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA94BC  7C 08 02 A6 */	mflr r0
-/* 80BA94C0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA94C4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA94C8  7C 7F 1B 79 */	or. r31, r3, r3
-/* 80BA94CC  41 82 00 1C */	beq lbl_80BA94E8
-/* 80BA94D0  3C A0 80 BB */	lis r5, __vt__8cM3dGCyl@ha /* 0x80BA9CB8@ha */
-/* 80BA94D4  38 05 9C B8 */	addi r0, r5, __vt__8cM3dGCyl@l /* 0x80BA9CB8@l */
-/* 80BA94D8  90 1F 00 14 */	stw r0, 0x14(r31)
-/* 80BA94DC  7C 80 07 35 */	extsh. r0, r4
-/* 80BA94E0  40 81 00 08 */	ble lbl_80BA94E8
-/* 80BA94E4  4B 72 58 59 */	bl __dl__FPv
-lbl_80BA94E8:
-/* 80BA94E8  7F E3 FB 78 */	mr r3, r31
-/* 80BA94EC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA94F0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA94F4  7C 08 03 A6 */	mtlr r0
-/* 80BA94F8  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA94FC  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__sinit_d_a_obj_barDesk_cpp.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__sinit_d_a_obj_barDesk_cpp.s
deleted file mode 100644
index 96cbdf0834f..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__sinit_d_a_obj_barDesk_cpp.s
+++ /dev/null
@@ -1,30 +0,0 @@
-lbl_80BA9AEC:
-/* 80BA9AEC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9AF0  7C 08 02 A6 */	mflr r0
-/* 80BA9AF4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9AF8  3C 60 80 BB */	lis r3, l_HIO@ha /* 0x80BA9D24@ha */
-/* 80BA9AFC  38 63 9D 24 */	addi r3, r3, l_HIO@l /* 0x80BA9D24@l */
-/* 80BA9B00  4B FF F6 8D */	bl __ct__15daBarDesk_HIO_cFv
-/* 80BA9B04  3C 80 80 BB */	lis r4, __dt__15daBarDesk_HIO_cFv@ha /* 0x80BA9A90@ha */
-/* 80BA9B08  38 84 9A 90 */	addi r4, r4, __dt__15daBarDesk_HIO_cFv@l /* 0x80BA9A90@l */
-/* 80BA9B0C  3C A0 80 BB */	lis r5, lit_3643@ha /* 0x80BA9D18@ha */
-/* 80BA9B10  38 A5 9D 18 */	addi r5, r5, lit_3643@l /* 0x80BA9D18@l */
-/* 80BA9B14  4B FF F6 05 */	bl __register_global_object
-/* 80BA9B18  3C 60 80 BB */	lis r3, mCcDCyl__11daBarDesk_c@ha /* 0x80BA9BDC@ha */
-/* 80BA9B1C  38 63 9B DC */	addi r3, r3, mCcDCyl__11daBarDesk_c@l /* 0x80BA9BDC@l */
-/* 80BA9B20  38 A3 FF FC */	addi r5, r3, -4
-/* 80BA9B24  3C 60 80 BB */	lis r3, mCcDObjInfo__11daBarDesk_c@ha /* 0x80BA9B70@ha */
-/* 80BA9B28  38 63 9B 70 */	addi r3, r3, mCcDObjInfo__11daBarDesk_c@l /* 0x80BA9B70@l */
-/* 80BA9B2C  38 83 FF FC */	addi r4, r3, -4
-/* 80BA9B30  38 00 00 06 */	li r0, 6
-/* 80BA9B34  7C 09 03 A6 */	mtctr r0
-lbl_80BA9B38:
-/* 80BA9B38  80 64 00 04 */	lwz r3, 4(r4)
-/* 80BA9B3C  84 04 00 08 */	lwzu r0, 8(r4)
-/* 80BA9B40  90 65 00 04 */	stw r3, 4(r5)
-/* 80BA9B44  94 05 00 08 */	stwu r0, 8(r5)
-/* 80BA9B48  42 00 FF F0 */	bdnz lbl_80BA9B38
-/* 80BA9B4C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9B50  7C 08 03 A6 */	mtlr r0
-/* 80BA9B54  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9B58  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/create__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/create__11daBarDesk_cFv.s
deleted file mode 100644
index ba62bbc5c98..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/create__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,120 +0,0 @@
-lbl_80BA92F4:
-/* 80BA92F4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA92F8  7C 08 02 A6 */	mflr r0
-/* 80BA92FC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9300  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA9304  93 C1 00 08 */	stw r30, 8(r1)
-/* 80BA9308  7C 7F 1B 78 */	mr r31, r3
-/* 80BA930C  80 03 04 A0 */	lwz r0, 0x4a0(r3)
-/* 80BA9310  54 00 07 39 */	rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80BA9314  40 82 00 B4 */	bne lbl_80BA93C8
-/* 80BA9318  7F E0 FB 79 */	or. r0, r31, r31
-/* 80BA931C  41 82 00 A0 */	beq lbl_80BA93BC
-/* 80BA9320  7C 1E 03 78 */	mr r30, r0
-/* 80BA9324  4B 4C F3 01 */	bl __ct__16dBgS_MoveBgActorFv
-/* 80BA9328  3C 60 80 BB */	lis r3, __vt__11daBarDesk_c@ha /* 0x80BA9CD0@ha */
-/* 80BA932C  38 03 9C D0 */	addi r0, r3, __vt__11daBarDesk_c@l /* 0x80BA9CD0@l */
-/* 80BA9330  90 1E 05 9C */	stw r0, 0x59c(r30)
-/* 80BA9334  3C 60 80 3C */	lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
-/* 80BA9338  38 03 37 28 */	addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
-/* 80BA933C  90 1E 05 C8 */	stw r0, 0x5c8(r30)
-/* 80BA9340  38 7E 05 CC */	addi r3, r30, 0x5cc
-/* 80BA9344  4B 4D A4 1D */	bl __ct__10dCcD_GSttsFv
-/* 80BA9348  3C 60 80 3B */	lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
-/* 80BA934C  38 63 C2 E4 */	addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
-/* 80BA9350  90 7E 05 C8 */	stw r3, 0x5c8(r30)
-/* 80BA9354  38 03 00 20 */	addi r0, r3, 0x20
-/* 80BA9358  90 1E 05 CC */	stw r0, 0x5cc(r30)
-/* 80BA935C  3B DE 05 EC */	addi r30, r30, 0x5ec
-/* 80BA9360  7F C3 F3 78 */	mr r3, r30
-/* 80BA9364  4B 4D A6 C5 */	bl __ct__12dCcD_GObjInfFv
-/* 80BA9368  3C 60 80 3C */	lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
-/* 80BA936C  38 03 36 D0 */	addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
-/* 80BA9370  90 1E 01 20 */	stw r0, 0x120(r30)
-/* 80BA9374  3C 60 80 BB */	lis r3, __vt__8cM3dGAab@ha /* 0x80BA9CC4@ha */
-/* 80BA9378  38 03 9C C4 */	addi r0, r3, __vt__8cM3dGAab@l /* 0x80BA9CC4@l */
-/* 80BA937C  90 1E 01 1C */	stw r0, 0x11c(r30)
-/* 80BA9380  3C 60 80 BB */	lis r3, __vt__8cM3dGCyl@ha /* 0x80BA9CB8@ha */
-/* 80BA9384  38 03 9C B8 */	addi r0, r3, __vt__8cM3dGCyl@l /* 0x80BA9CB8@l */
-/* 80BA9388  90 1E 01 38 */	stw r0, 0x138(r30)
-/* 80BA938C  3C 60 80 3C */	lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */
-/* 80BA9390  38 63 35 A4 */	addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */
-/* 80BA9394  90 7E 01 20 */	stw r3, 0x120(r30)
-/* 80BA9398  38 03 00 58 */	addi r0, r3, 0x58
-/* 80BA939C  90 1E 01 38 */	stw r0, 0x138(r30)
-/* 80BA93A0  3C 60 80 3B */	lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */
-/* 80BA93A4  38 63 C0 50 */	addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */
-/* 80BA93A8  90 7E 00 3C */	stw r3, 0x3c(r30)
-/* 80BA93AC  38 03 00 2C */	addi r0, r3, 0x2c
-/* 80BA93B0  90 1E 01 20 */	stw r0, 0x120(r30)
-/* 80BA93B4  38 03 00 84 */	addi r0, r3, 0x84
-/* 80BA93B8  90 1E 01 38 */	stw r0, 0x138(r30)
-lbl_80BA93BC:
-/* 80BA93BC  80 1F 04 A0 */	lwz r0, 0x4a0(r31)
-/* 80BA93C0  60 00 00 08 */	ori r0, r0, 8
-/* 80BA93C4  90 1F 04 A0 */	stw r0, 0x4a0(r31)
-lbl_80BA93C8:
-/* 80BA93C8  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA93CC  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA93D0  80 1F 00 B0 */	lwz r0, 0xb0(r31)
-/* 80BA93D4  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 80BA93D8  88 1F 04 BA */	lbz r0, 0x4ba(r31)
-/* 80BA93DC  7C 05 07 74 */	extsb r5, r0
-/* 80BA93E0  4B 48 BF 81 */	bl isSwitch__10dSv_info_cCFii
-/* 80BA93E4  2C 03 00 00 */	cmpwi r3, 0
-/* 80BA93E8  41 82 00 0C */	beq lbl_80BA93F4
-/* 80BA93EC  38 60 00 05 */	li r3, 5
-/* 80BA93F0  48 00 00 B0 */	b lbl_80BA94A0
-lbl_80BA93F4:
-/* 80BA93F4  38 7F 05 A0 */	addi r3, r31, 0x5a0
-/* 80BA93F8  3C 80 80 BB */	lis r4, d_a_obj_barDesk__stringBase0@ha /* 0x80BA9BB4@ha */
-/* 80BA93FC  38 84 9B B4 */	addi r4, r4, d_a_obj_barDesk__stringBase0@l /* 0x80BA9BB4@l */
-/* 80BA9400  4B 48 3A BD */	bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
-/* 80BA9404  7C 7E 1B 78 */	mr r30, r3
-/* 80BA9408  2C 1E 00 04 */	cmpwi r30, 4
-/* 80BA940C  40 82 00 90 */	bne lbl_80BA949C
-/* 80BA9410  7F E3 FB 78 */	mr r3, r31
-/* 80BA9414  3C 80 80 BB */	lis r4, d_a_obj_barDesk__stringBase0@ha /* 0x80BA9BB4@ha */
-/* 80BA9418  38 84 9B B4 */	addi r4, r4, d_a_obj_barDesk__stringBase0@l /* 0x80BA9BB4@l */
-/* 80BA941C  38 A0 00 07 */	li r5, 7
-/* 80BA9420  3C C0 80 07 */	lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */
-/* 80BA9424  38 C6 5A D8 */	addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */
-/* 80BA9428  38 E0 0E 50 */	li r7, 0xe50
-/* 80BA942C  39 00 00 00 */	li r8, 0
-/* 80BA9430  4B 4C F3 8D */	bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f
-/* 80BA9434  2C 03 00 05 */	cmpwi r3, 5
-/* 80BA9438  40 82 00 0C */	bne lbl_80BA9444
-/* 80BA943C  38 60 00 05 */	li r3, 5
-/* 80BA9440  48 00 00 60 */	b lbl_80BA94A0
-lbl_80BA9444:
-/* 80BA9444  80 7F 05 A8 */	lwz r3, 0x5a8(r31)
-/* 80BA9448  38 03 00 24 */	addi r0, r3, 0x24
-/* 80BA944C  90 1F 05 04 */	stw r0, 0x504(r31)
-/* 80BA9450  80 7F 05 A8 */	lwz r3, 0x5a8(r31)
-/* 80BA9454  80 83 00 04 */	lwz r4, 4(r3)
-/* 80BA9458  7F E3 FB 78 */	mr r3, r31
-/* 80BA945C  4B 47 11 1D */	bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData
-/* 80BA9460  38 7F 05 B0 */	addi r3, r31, 0x5b0
-/* 80BA9464  38 80 00 FF */	li r4, 0xff
-/* 80BA9468  38 A0 00 FF */	li r5, 0xff
-/* 80BA946C  7F E6 FB 78 */	mr r6, r31
-/* 80BA9470  4B 4D A3 F1 */	bl Init__9dCcD_SttsFiiP10fopAc_ac_c
-/* 80BA9474  38 7F 05 EC */	addi r3, r31, 0x5ec
-/* 80BA9478  3C 80 80 BB */	lis r4, mCcDCyl__11daBarDesk_c@ha /* 0x80BA9BDC@ha */
-/* 80BA947C  38 84 9B DC */	addi r4, r4, mCcDCyl__11daBarDesk_c@l /* 0x80BA9BDC@l */
-/* 80BA9480  4B 4D B4 35 */	bl Set__8dCcD_CylFRC11dCcD_SrcCyl
-/* 80BA9484  38 1F 05 B0 */	addi r0, r31, 0x5b0
-/* 80BA9488  90 1F 06 30 */	stw r0, 0x630(r31)
-/* 80BA948C  7F E3 FB 78 */	mr r3, r31
-/* 80BA9490  48 00 01 F1 */	bl init_modeWait__11daBarDesk_cFv
-/* 80BA9494  7F E3 FB 78 */	mr r3, r31
-/* 80BA9498  4B FF FD 69 */	bl setBaseMtx__11daBarDesk_cFv
-lbl_80BA949C:
-/* 80BA949C  7F C3 F3 78 */	mr r3, r30
-lbl_80BA94A0:
-/* 80BA94A0  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA94A4  83 C1 00 08 */	lwz r30, 8(r1)
-/* 80BA94A8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA94AC  7C 08 03 A6 */	mtlr r0
-/* 80BA94B0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA94B4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Create__FP10fopAc_ac_c.s
deleted file mode 100644
index b1eadea8f05..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Create__FP10fopAc_ac_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80BA9A28:
-/* 80BA9A28  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9A2C  7C 08 02 A6 */	mflr r0
-/* 80BA9A30  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9A34  4B FF F8 C1 */	bl create__11daBarDesk_cFv
-/* 80BA9A38  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9A3C  7C 08 03 A6 */	mtlr r0
-/* 80BA9A40  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9A44  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Delete__FP11daBarDesk_c.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Delete__FP11daBarDesk_c.s
deleted file mode 100644
index de6e8b94fcb..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Delete__FP11daBarDesk_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80BA9A08:
-/* 80BA9A08  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9A0C  7C 08 02 A6 */	mflr r0
-/* 80BA9A10  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9A14  4B 4C EE C9 */	bl MoveBGDelete__16dBgS_MoveBgActorFv
-/* 80BA9A18  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9A1C  7C 08 03 A6 */	mtlr r0
-/* 80BA9A20  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9A24  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Draw__FP11daBarDesk_c.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Draw__FP11daBarDesk_c.s
deleted file mode 100644
index 8ab2a820750..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Draw__FP11daBarDesk_c.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80BA99BC:
-/* 80BA99BC  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA99C0  7C 08 02 A6 */	mflr r0
-/* 80BA99C4  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA99C8  81 83 05 9C */	lwz r12, 0x59c(r3)
-/* 80BA99CC  81 8C 00 14 */	lwz r12, 0x14(r12)
-/* 80BA99D0  7D 89 03 A6 */	mtctr r12
-/* 80BA99D4  4E 80 04 21 */	bctrl 
-/* 80BA99D8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA99DC  7C 08 03 A6 */	mtlr r0
-/* 80BA99E0  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA99E4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Execute__FP11daBarDesk_c.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Execute__FP11daBarDesk_c.s
deleted file mode 100644
index bb37f01bb18..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Execute__FP11daBarDesk_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80BA99E8:
-/* 80BA99E8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA99EC  7C 08 02 A6 */	mflr r0
-/* 80BA99F0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA99F4  4B 4C EF 5D */	bl MoveBGExecute__16dBgS_MoveBgActorFv
-/* 80BA99F8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA99FC  7C 08 03 A6 */	mtlr r0
-/* 80BA9A00  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9A04  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeBreak__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeBreak__11daBarDesk_cFv.s
deleted file mode 100644
index bc0c8a7d7d9..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeBreak__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,59 +0,0 @@
-lbl_80BA973C:
-/* 80BA973C  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 80BA9740  7C 08 02 A6 */	mflr r0
-/* 80BA9744  90 01 00 24 */	stw r0, 0x24(r1)
-/* 80BA9748  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 80BA974C  93 C1 00 18 */	stw r30, 0x18(r1)
-/* 80BA9750  7C 7F 1B 78 */	mr r31, r3
-/* 80BA9754  3C 60 80 BB */	lis r3, mCcDObjInfo__11daBarDesk_c@ha /* 0x80BA9B70@ha */
-/* 80BA9758  3B C3 9B 70 */	addi r30, r3, mCcDObjInfo__11daBarDesk_c@l /* 0x80BA9B70@l */
-/* 80BA975C  88 1F 04 E2 */	lbz r0, 0x4e2(r31)
-/* 80BA9760  7C 03 07 74 */	extsb r3, r0
-/* 80BA9764  4B 48 39 09 */	bl dComIfGp_getReverb__Fi
-/* 80BA9768  7C 67 1B 78 */	mr r7, r3
-/* 80BA976C  3C 60 00 08 */	lis r3, 0x0008 /* 0x00080178@ha */
-/* 80BA9770  38 03 01 78 */	addi r0, r3, 0x0178 /* 0x00080178@l */
-/* 80BA9774  90 01 00 08 */	stw r0, 8(r1)
-/* 80BA9778  3C 60 80 45 */	lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */
-/* 80BA977C  38 63 13 68 */	addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */
-/* 80BA9780  80 63 00 00 */	lwz r3, 0(r3)
-/* 80BA9784  38 81 00 08 */	addi r4, r1, 8
-/* 80BA9788  38 BF 04 D0 */	addi r5, r31, 0x4d0
-/* 80BA978C  38 C0 00 00 */	li r6, 0
-/* 80BA9790  C0 3E 00 34 */	lfs f1, 0x34(r30)
-/* 80BA9794  FC 40 08 90 */	fmr f2, f1
-/* 80BA9798  C0 7E 00 38 */	lfs f3, 0x38(r30)
-/* 80BA979C  FC 80 18 90 */	fmr f4, f3
-/* 80BA97A0  39 00 00 00 */	li r8, 0
-/* 80BA97A4  4B 70 21 E1 */	bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
-/* 80BA97A8  7F E3 FB 78 */	mr r3, r31
-/* 80BA97AC  48 00 00 99 */	bl setBreakEffect__11daBarDesk_cFv
-/* 80BA97B0  C0 3E 00 3C */	lfs f1, 0x3c(r30)
-/* 80BA97B4  D0 21 00 0C */	stfs f1, 0xc(r1)
-/* 80BA97B8  C0 1E 00 34 */	lfs f0, 0x34(r30)
-/* 80BA97BC  D0 01 00 10 */	stfs f0, 0x10(r1)
-/* 80BA97C0  D0 21 00 14 */	stfs f1, 0x14(r1)
-/* 80BA97C4  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA97C8  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA97CC  38 63 5B D4 */	addi r3, r3, 0x5bd4
-/* 80BA97D0  3C 80 80 BB */	lis r4, l_HIO@ha /* 0x80BA9D24@ha */
-/* 80BA97D4  38 84 9D 24 */	addi r4, r4, l_HIO@l /* 0x80BA9D24@l */
-/* 80BA97D8  88 84 00 05 */	lbz r4, 5(r4)
-/* 80BA97DC  38 A0 00 0F */	li r5, 0xf
-/* 80BA97E0  38 C1 00 0C */	addi r6, r1, 0xc
-/* 80BA97E4  4B 4C 62 41 */	bl StartShock__12dVibration_cFii4cXyz
-/* 80BA97E8  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA97EC  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA97F0  80 1F 00 B0 */	lwz r0, 0xb0(r31)
-/* 80BA97F4  54 04 06 3E */	clrlwi r4, r0, 0x18
-/* 80BA97F8  88 1F 04 BA */	lbz r0, 0x4ba(r31)
-/* 80BA97FC  7C 05 07 74 */	extsb r5, r0
-/* 80BA9800  4B 48 BA 01 */	bl onSwitch__10dSv_info_cFii
-/* 80BA9804  38 00 00 01 */	li r0, 1
-/* 80BA9808  98 1F 05 AC */	stb r0, 0x5ac(r31)
-/* 80BA980C  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 80BA9810  83 C1 00 18 */	lwz r30, 0x18(r1)
-/* 80BA9814  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 80BA9818  7C 08 03 A6 */	mtlr r0
-/* 80BA981C  38 21 00 20 */	addi r1, r1, 0x20
-/* 80BA9820  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeWait__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeWait__11daBarDesk_cFv.s
deleted file mode 100644
index bc72e26f7bc..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeWait__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_80BA9680:
-/* 80BA9680  38 00 00 00 */	li r0, 0
-/* 80BA9684  98 03 05 AC */	stb r0, 0x5ac(r3)
-/* 80BA9688  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeBreak__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeBreak__11daBarDesk_cFv.s
deleted file mode 100644
index 25944a489a5..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeBreak__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80BA9824:
-/* 80BA9824  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9828  7C 08 02 A6 */	mflr r0
-/* 80BA982C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9830  4B 47 04 4D */	bl fopAcM_delete__FP10fopAc_ac_c
-/* 80BA9834  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9838  7C 08 03 A6 */	mtlr r0
-/* 80BA983C  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9840  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeWait__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeWait__11daBarDesk_cFv.s
deleted file mode 100644
index b245ba67101..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeWait__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,47 +0,0 @@
-lbl_80BA968C:
-/* 80BA968C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9690  7C 08 02 A6 */	mflr r0
-/* 80BA9694  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9698  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA969C  7C 7F 1B 78 */	mr r31, r3
-/* 80BA96A0  38 7F 05 EC */	addi r3, r31, 0x5ec
-/* 80BA96A4  4B 4D AD BD */	bl ChkTgHit__12dCcD_GObjInfFv
-/* 80BA96A8  28 03 00 00 */	cmplwi r3, 0
-/* 80BA96AC  41 82 00 28 */	beq lbl_80BA96D4
-/* 80BA96B0  80 9F 05 68 */	lwz r4, 0x568(r31)
-/* 80BA96B4  28 04 00 00 */	cmplwi r4, 0
-/* 80BA96B8  41 82 00 14 */	beq lbl_80BA96CC
-/* 80BA96BC  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA96C0  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA96C4  38 63 0F 38 */	addi r3, r3, 0xf38
-/* 80BA96C8  4B 4C AB 89 */	bl Release__4cBgSFP9dBgW_Base
-lbl_80BA96CC:
-/* 80BA96CC  7F E3 FB 78 */	mr r3, r31
-/* 80BA96D0  48 00 00 6D */	bl init_modeBreak__11daBarDesk_cFv
-lbl_80BA96D4:
-/* 80BA96D4  38 7F 07 10 */	addi r3, r31, 0x710
-/* 80BA96D8  3C 80 80 BB */	lis r4, lit_3839@ha /* 0x80BA9BA0@ha */
-/* 80BA96DC  C0 24 9B A0 */	lfs f1, lit_3839@l(r4)  /* 0x80BA9BA0@l */
-/* 80BA96E0  4B 6C 5B 21 */	bl SetR__8cM3dGCylFf
-/* 80BA96E4  38 7F 07 10 */	addi r3, r31, 0x710
-/* 80BA96E8  3C 80 80 BB */	lis r4, lit_3839@ha /* 0x80BA9BA0@ha */
-/* 80BA96EC  C0 24 9B A0 */	lfs f1, lit_3839@l(r4)  /* 0x80BA9BA0@l */
-/* 80BA96F0  4B 6C 5B 09 */	bl SetH__8cM3dGCylFf
-/* 80BA96F4  38 7F 07 10 */	addi r3, r31, 0x710
-/* 80BA96F8  38 9F 04 D0 */	addi r4, r31, 0x4d0
-/* 80BA96FC  4B 6C 5A E1 */	bl SetC__8cM3dGCylFRC4cXyz
-/* 80BA9700  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA9704  38 63 61 C0 */	addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA9708  38 63 23 3C */	addi r3, r3, 0x233c
-/* 80BA970C  38 9F 05 EC */	addi r4, r31, 0x5ec
-/* 80BA9710  4B 6B B4 99 */	bl Set__4cCcSFP8cCcD_Obj
-/* 80BA9714  38 7F 05 EC */	addi r3, r31, 0x5ec
-/* 80BA9718  81 9F 06 28 */	lwz r12, 0x628(r31)
-/* 80BA971C  81 8C 00 24 */	lwz r12, 0x24(r12)
-/* 80BA9720  7D 89 03 A6 */	mtctr r12
-/* 80BA9724  4E 80 04 21 */	bctrl 
-/* 80BA9728  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA972C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9730  7C 08 03 A6 */	mtlr r0
-/* 80BA9734  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9738  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBaseMtx__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBaseMtx__11daBarDesk_cFv.s
deleted file mode 100644
index 2679cfd092e..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBaseMtx__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,35 +0,0 @@
-lbl_80BA9200:
-/* 80BA9200  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA9204  7C 08 02 A6 */	mflr r0
-/* 80BA9208  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA920C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 80BA9210  7C 7F 1B 78 */	mr r31, r3
-/* 80BA9214  3C 60 80 3E */	lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80BA9218  38 63 D4 70 */	addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80BA921C  C0 3F 04 D0 */	lfs f1, 0x4d0(r31)
-/* 80BA9220  C0 5F 04 D4 */	lfs f2, 0x4d4(r31)
-/* 80BA9224  C0 7F 04 D8 */	lfs f3, 0x4d8(r31)
-/* 80BA9228  4B 79 D6 C1 */	bl PSMTXTrans
-/* 80BA922C  3C 60 80 3E */	lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80BA9230  38 63 D4 70 */	addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80BA9234  A8 9F 04 E4 */	lha r4, 0x4e4(r31)
-/* 80BA9238  A8 BF 04 E6 */	lha r5, 0x4e6(r31)
-/* 80BA923C  A8 DF 04 E8 */	lha r6, 0x4e8(r31)
-/* 80BA9240  4B 46 30 61 */	bl mDoMtx_ZXYrotM__FPA4_fsss
-/* 80BA9244  80 7F 05 A8 */	lwz r3, 0x5a8(r31)
-/* 80BA9248  C0 1F 04 EC */	lfs f0, 0x4ec(r31)
-/* 80BA924C  D0 03 00 18 */	stfs f0, 0x18(r3)
-/* 80BA9250  C0 1F 04 F0 */	lfs f0, 0x4f0(r31)
-/* 80BA9254  D0 03 00 1C */	stfs f0, 0x1c(r3)
-/* 80BA9258  C0 1F 04 F4 */	lfs f0, 0x4f4(r31)
-/* 80BA925C  D0 03 00 20 */	stfs f0, 0x20(r3)
-/* 80BA9260  3C 60 80 3E */	lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80BA9264  38 63 D4 70 */	addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80BA9268  80 9F 05 A8 */	lwz r4, 0x5a8(r31)
-/* 80BA926C  38 84 00 24 */	addi r4, r4, 0x24
-/* 80BA9270  4B 79 D2 41 */	bl PSMTXCopy
-/* 80BA9274  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80BA9278  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA927C  7C 08 03 A6 */	mtlr r0
-/* 80BA9280  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA9284  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBreakEffect__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBreakEffect__11daBarDesk_cFv.s
deleted file mode 100644
index c82feb4b604..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBreakEffect__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,43 +0,0 @@
-lbl_80BA9844:
-/* 80BA9844  94 21 FF C0 */	stwu r1, -0x40(r1)
-/* 80BA9848  7C 08 02 A6 */	mflr r0
-/* 80BA984C  90 01 00 44 */	stw r0, 0x44(r1)
-/* 80BA9850  39 61 00 40 */	addi r11, r1, 0x40
-/* 80BA9854  4B 7B 89 7D */	bl _savegpr_26
-/* 80BA9858  7C 7A 1B 78 */	mr r26, r3
-/* 80BA985C  3B 60 00 00 */	li r27, 0
-/* 80BA9860  3B E0 00 00 */	li r31, 0
-/* 80BA9864  3C 60 80 40 */	lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80BA9868  3B 83 61 C0 */	addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80BA986C  3C 60 80 BB */	lis r3, particle_id@ha /* 0x80BA9BB0@ha */
-/* 80BA9870  3B A3 9B B0 */	addi r29, r3, particle_id@l /* 0x80BA9BB0@l */
-/* 80BA9874  3C 60 80 BB */	lis r3, lit_3861@ha /* 0x80BA9BA4@ha */
-/* 80BA9878  3B C3 9B A4 */	addi r30, r3, lit_3861@l /* 0x80BA9BA4@l */
-lbl_80BA987C:
-/* 80BA987C  80 7C 5D 3C */	lwz r3, 0x5d3c(r28)
-/* 80BA9880  38 80 00 00 */	li r4, 0
-/* 80BA9884  90 81 00 08 */	stw r4, 8(r1)
-/* 80BA9888  38 00 FF FF */	li r0, -1
-/* 80BA988C  90 01 00 0C */	stw r0, 0xc(r1)
-/* 80BA9890  90 81 00 10 */	stw r4, 0x10(r1)
-/* 80BA9894  90 81 00 14 */	stw r4, 0x14(r1)
-/* 80BA9898  90 81 00 18 */	stw r4, 0x18(r1)
-/* 80BA989C  38 80 00 00 */	li r4, 0
-/* 80BA98A0  7C BD FA 2E */	lhzx r5, r29, r31
-/* 80BA98A4  38 DA 04 D0 */	addi r6, r26, 0x4d0
-/* 80BA98A8  38 E0 00 00 */	li r7, 0
-/* 80BA98AC  39 00 00 00 */	li r8, 0
-/* 80BA98B0  39 3A 04 EC */	addi r9, r26, 0x4ec
-/* 80BA98B4  39 40 00 FF */	li r10, 0xff
-/* 80BA98B8  C0 3E 00 00 */	lfs f1, 0(r30)
-/* 80BA98BC  4B 4A 31 D5 */	bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80BA98C0  3B 7B 00 01 */	addi r27, r27, 1
-/* 80BA98C4  2C 1B 00 02 */	cmpwi r27, 2
-/* 80BA98C8  3B FF 00 02 */	addi r31, r31, 2
-/* 80BA98CC  41 80 FF B0 */	blt lbl_80BA987C
-/* 80BA98D0  39 61 00 40 */	addi r11, r1, 0x40
-/* 80BA98D4  4B 7B 89 49 */	bl _restgpr_26
-/* 80BA98D8  80 01 00 44 */	lwz r0, 0x44(r1)
-/* 80BA98DC  7C 08 03 A6 */	mtlr r0
-/* 80BA98E0  38 21 00 40 */	addi r1, r1, 0x40
-/* 80BA98E4  4E 80 00 20 */	blr 
diff --git a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/windowProc__11daBarDesk_cFv.s b/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/windowProc__11daBarDesk_cFv.s
deleted file mode 100644
index 90a0cc11b62..00000000000
--- a/asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/windowProc__11daBarDesk_cFv.s
+++ /dev/null
@@ -1,37 +0,0 @@
-lbl_80BA95F4:
-/* 80BA95F4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80BA95F8  7C 08 02 A6 */	mflr r0
-/* 80BA95FC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80BA9600  3C 80 80 BB */	lis r4, cNullVec__6Z2Calc@ha /* 0x80BA9BBC@ha */
-/* 80BA9604  38 E4 9B BC */	addi r7, r4, cNullVec__6Z2Calc@l /* 0x80BA9BBC@l */
-/* 80BA9608  3C 80 80 BB */	lis r4, data_80BA9D2C@ha /* 0x80BA9D2C@ha */
-/* 80BA960C  38 C4 9D 2C */	addi r6, r4, data_80BA9D2C@l /* 0x80BA9D2C@l */
-/* 80BA9610  88 06 00 00 */	lbz r0, 0(r6)
-/* 80BA9614  7C 00 07 75 */	extsb. r0, r0
-/* 80BA9618  40 82 00 40 */	bne lbl_80BA9658
-/* 80BA961C  80 87 00 64 */	lwz r4, 0x64(r7)
-/* 80BA9620  80 07 00 68 */	lwz r0, 0x68(r7)
-/* 80BA9624  90 87 00 7C */	stw r4, 0x7c(r7)
-/* 80BA9628  90 07 00 80 */	stw r0, 0x80(r7)
-/* 80BA962C  80 07 00 6C */	lwz r0, 0x6c(r7)
-/* 80BA9630  90 07 00 84 */	stw r0, 0x84(r7)
-/* 80BA9634  38 A7 00 7C */	addi r5, r7, 0x7c
-/* 80BA9638  80 87 00 70 */	lwz r4, 0x70(r7)
-/* 80BA963C  80 07 00 74 */	lwz r0, 0x74(r7)
-/* 80BA9640  90 85 00 0C */	stw r4, 0xc(r5)
-/* 80BA9644  90 05 00 10 */	stw r0, 0x10(r5)
-/* 80BA9648  80 07 00 78 */	lwz r0, 0x78(r7)
-/* 80BA964C  90 05 00 14 */	stw r0, 0x14(r5)
-/* 80BA9650  38 00 00 01 */	li r0, 1
-/* 80BA9654  98 06 00 00 */	stb r0, 0(r6)
-lbl_80BA9658:
-/* 80BA9658  88 03 05 AC */	lbz r0, 0x5ac(r3)
-/* 80BA965C  1C 00 00 0C */	mulli r0, r0, 0xc
-/* 80BA9660  39 87 00 7C */	addi r12, r7, 0x7c
-/* 80BA9664  7D 8C 02 14 */	add r12, r12, r0
-/* 80BA9668  4B 7B 8A 1D */	bl __ptmf_scall
-/* 80BA966C  60 00 00 00 */	nop 
-/* 80BA9670  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80BA9674  7C 08 03 A6 */	mtlr r0
-/* 80BA9678  38 21 00 10 */	addi r1, r1, 0x10
-/* 80BA967C  4E 80 00 20 */	blr 
diff --git a/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h b/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h
index 65888a2e428..077047d57af 100644
--- a/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h
+++ b/include/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h
@@ -1,6 +1,48 @@
 #ifndef D_A_OBJ_BARDESK_H
 #define D_A_OBJ_BARDESK_H
 
-#include "dolphin/types.h"
+#include "SSystem/SComponent/c_phase.h"
+#include "m_Do/m_Do_hostIO.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "d/cc/d_cc_d.h"
+
+class daBarDesk_c : public dBgS_MoveBgActor {
+public:
+    /* 80BA9200 */ void setBaseMtx();
+    /* 80BA9288 */ int CreateHeap();
+    /* 80BA92F4 */ cPhs__Step create();
+    /* 80BA95A4 */ int Execute(Mtx**);
+    /* 80BA95F4 */ void windowProc();
+    /* 80BA9680 */ void init_modeWait();
+    /* 80BA968C */ void modeWait();
+    /* 80BA973C */ void init_modeBreak();
+    /* 80BA9824 */ void modeBreak();
+    /* 80BA9844 */ void setBreakEffect();
+    /* 80BA98E8 */ int Draw();
+    /* 80BA998C */ int Delete();
+
+    /* 0x5A0 */ request_of_phase_process_class mPhase;
+    /* 0x5A8 */ J3DModel* mpModel;
+    /* 0x5AC */ u8 mMode;
+    /* 0x5B0 */ dCcD_Stts mColStatus;
+    /* 0x5EC */ dCcD_Cyl mColCyl;
+    /* 0x728 */ u8 field_0x728[8];
+
+    static dCcD_SrcGObjInf const mCcDObjInfo;
+    static dCcD_SrcCyl mCcDCyl;
+};
+
+STATIC_ASSERT(sizeof(daBarDesk_c) == 0x730);
+
+class daBarDesk_HIO_c : public mDoHIO_entry_c {
+public:
+    /* 80BA918C */ daBarDesk_HIO_c();
+    /* 80BA9A90 */ ~daBarDesk_HIO_c() {}
+
+    /* 0x4 */ u8 field_0x4;
+    /* 0x5 */ u8 field_0x5;
+};
+
+STATIC_ASSERT(sizeof(daBarDesk_HIO_c) == 8);
 
 #endif /* D_A_OBJ_BARDESK_H */
diff --git a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp
index f405d4b6d83..7bd3fd5f135 100644
--- a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp
+++ b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp
@@ -1,274 +1,29 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_obj_barDesk
-//
+/**
+ * d_a_obj_barDesk.cpp
+ * Object - Table
+ */
 
 #include "rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.h"
-#include "dol2asm.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_procname.h"
+#include "d/bg/d_bg_w.h"
+#include "d/com/d_com_inf_game.h"
 
-//
-// Types:
-//
+/* 80BA9D24-80BA9D2C 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
+static daBarDesk_HIO_c l_HIO;
 
-struct request_of_phase_process_class {};
+/* 80BA9D2C-80BA9D30 00001C 0004+00 1/1 0/0 0/0 .bss             None */
+static u8 data_80BA9D2C[4];
 
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct mDoHIO_entry_c {
-    /* 80BA91B8 */ ~mDoHIO_entry_c();
-};
-
-struct fopAc_ac_c {};
-
-struct daBarDesk_c {
-    /* 80BA9200 */ void setBaseMtx();
-    /* 80BA9288 */ void CreateHeap();
-    /* 80BA92F4 */ void create();
-    /* 80BA95A4 */ void Execute(f32 (**)[3][4]);
-    /* 80BA95F4 */ void windowProc();
-    /* 80BA9680 */ void init_modeWait();
-    /* 80BA968C */ void modeWait();
-    /* 80BA973C */ void init_modeBreak();
-    /* 80BA9824 */ void modeBreak();
-    /* 80BA9844 */ void setBreakEffect();
-    /* 80BA98E8 */ void Draw();
-    /* 80BA998C */ void Delete();
-
-    static u8 const mCcDObjInfo[48];
-    static u8 mCcDCyl[68];
-};
-
-struct daBarDesk_HIO_c {
-    /* 80BA918C */ daBarDesk_HIO_c();
-    /* 80BA9A90 */ ~daBarDesk_HIO_c();
-};
-
-struct cXyz {};
-
-struct dVibration_c {
-    /* 8006FA24 */ void StartShock(int, int, cXyz);
-};
-
-struct dSv_info_c {
-    /* 80035200 */ void onSwitch(int, int);
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct dKy_tevstr_c {};
-
-struct J3DModelData {};
-
-struct dScnKy_env_light_c {
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-};
-
-struct dRes_info_c {};
-
-struct dRes_control_c {
-    /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
-};
-
-struct dPa_levelEcallBack {};
-
-struct csXyz {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct dCcD_Stts {
-    /* 80083860 */ void Init(int, int, fopAc_ac_c*);
-};
-
-struct dCcD_SrcCyl {};
-
-struct dCcD_GStts {
-    /* 80083760 */ dCcD_GStts();
-    /* 80BA9548 */ ~dCcD_GStts();
-};
-
-struct dCcD_GObjInf {
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 80084460 */ void ChkTgHit();
-};
-
-struct dCcD_Cyl {
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-};
-
-struct dBgW_Base {};
-
-struct dBgW {};
-
-struct cBgS_PolyInfo {};
-
-struct dBgS_MoveBgActor {
-    /* 80078624 */ dBgS_MoveBgActor();
-    /* 80078690 */ bool Create();
-    /* 800786B0 */ bool IsDelete();
-    /* 800786B8 */ bool ToFore();
-    /* 800786C0 */ bool ToBack();
-    /* 800787BC */ void MoveBGCreate(char const*, int,
-                                     void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*,
-                                              csXyz*, csXyz*),
-                                     u32, f32 (*)[3][4]);
-    /* 800788DC */ void MoveBGDelete();
-    /* 80078950 */ void MoveBGExecute();
-};
-
-struct cM3dGCyl {
-    /* 8026F1DC */ void SetC(cXyz const&);
-    /* 8026F1F8 */ void SetH(f32);
-    /* 8026F200 */ void SetR(f32);
-    /* 80BA94B8 */ ~cM3dGCyl();
-};
-
-struct cM3dGAab {
-    /* 80BA9500 */ ~cM3dGAab();
-};
-
-struct cCcD_Obj {};
-
-struct cCcS {
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-};
-
-struct cCcD_GStts {
-    /* 80BA9A48 */ ~cCcD_GStts();
-};
-
-struct cBgS {
-    /* 80074250 */ void Release(dBgW_Base*);
-};
-
-struct JAISoundID {};
-
-struct Vec {};
-
-struct Z2SeMgr {
-    /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
-};
-
-struct Z2AudioMgr {
-    static u8 mAudioMgrPtr[4 + 4 /* padding */];
-};
-
-struct J3DModel {};
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__15daBarDesk_HIO_cFv();
-extern "C" void __dt__14mDoHIO_entry_cFv();
-extern "C" void setBaseMtx__11daBarDesk_cFv();
-extern "C" void CreateHeap__11daBarDesk_cFv();
-extern "C" void create__11daBarDesk_cFv();
-extern "C" void __dt__8cM3dGCylFv();
-extern "C" void __dt__8cM3dGAabFv();
-extern "C" void __dt__10dCcD_GSttsFv();
-extern "C" void Execute__11daBarDesk_cFPPA3_A4_f();
-extern "C" void windowProc__11daBarDesk_cFv();
-extern "C" void init_modeWait__11daBarDesk_cFv();
-extern "C" void modeWait__11daBarDesk_cFv();
-extern "C" void init_modeBreak__11daBarDesk_cFv();
-extern "C" void modeBreak__11daBarDesk_cFv();
-extern "C" void setBreakEffect__11daBarDesk_cFv();
-extern "C" void Draw__11daBarDesk_cFv();
-extern "C" void Delete__11daBarDesk_cFv();
-extern "C" static void daBarDesk_Draw__FP11daBarDesk_c();
-extern "C" static void daBarDesk_Execute__FP11daBarDesk_c();
-extern "C" static void daBarDesk_Delete__FP11daBarDesk_c();
-extern "C" static void daBarDesk_Create__FP10fopAc_ac_c();
-extern "C" void __dt__10cCcD_GSttsFv();
-extern "C" void __dt__15daBarDesk_HIO_cFv();
-extern "C" void __sinit_d_a_obj_barDesk_cpp();
-extern "C" u8 const mCcDObjInfo__11daBarDesk_c[48];
-extern "C" extern char const* const d_a_obj_barDesk__stringBase0;
-extern "C" u8 mCcDCyl__11daBarDesk_c[68];
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
-extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
-extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
-extern "C" void fopAcM_delete__FP10fopAc_ac_c();
-extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData();
-extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
-extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
-extern "C" void dComIfGp_getReverb__Fi();
-extern "C" void onSwitch__10dSv_info_cFii();
-extern "C" void isSwitch__10dSv_info_cCFii();
-extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
-extern "C" void
-set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
-extern "C" void StartShock__12dVibration_cFii4cXyz();
-extern "C" void Release__4cBgSFP9dBgW_Base();
-extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz();
-extern "C" void __ct__16dBgS_MoveBgActorFv();
-extern "C" bool Create__16dBgS_MoveBgActorFv();
-extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
-extern "C" bool ToFore__16dBgS_MoveBgActorFv();
-extern "C" bool ToBack__16dBgS_MoveBgActorFv();
-extern "C" void
-MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
-extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
-extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
-extern "C" void __ct__10dCcD_GSttsFv();
-extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
-extern "C" void __ct__12dCcD_GObjInfFv();
-extern "C" void ChkTgHit__12dCcD_GObjInfFv();
-extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
-extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
-extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
-extern "C" void Set__4cCcSFP8cCcD_Obj();
-extern "C" void SetC__8cM3dGCylFRC4cXyz();
-extern "C" void SetH__8cM3dGCylFf();
-extern "C" void SetR__8cM3dGCylFf();
-extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void __dl__FPv();
-extern "C" void PSMTXCopy();
-extern "C" void PSMTXTrans();
-extern "C" void __ptmf_scall();
-extern "C" void _savegpr_26();
-extern "C" void _restgpr_26();
-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" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 g_env_light[4880];
-extern "C" extern u8 j3dSys[284];
-extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
-extern "C" void __register_global_object();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
 /* 80BA9BBC-80BA9BC8 000000 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
-SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
+static u8 cNullVec__6Z2Calc[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 /* 80BA9BC8-80BA9BDC 00000C 0004+10 0/0 0/0 0/0 .data            @1787 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
+static u32 lit_1787[1 + 4 /* padding */] = {
     0x02000201,
     /* padding */
     0x40080000,
@@ -276,433 +31,189 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
     0x3FE00000,
     0x00000000,
 };
-#pragma pop
+
+/* 80BA9B70-80BA9BA0 000000 0030+00 2/2 0/0 0/0 .rodata          mCcDObjInfo__11daBarDesk_c */
+dCcD_SrcGObjInf const daBarDesk_c::mCcDObjInfo = {
+    {0, {{0, 0, 0}, {0xD8FAFDBF, 0x11}, {0}}},
+    {1, 0, 0, 0, 0},
+    {0xA, 0, 0, 0, 6},
+    {0}
+};
 
 /* 80BA9BDC-80BA9C20 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daBarDesk_c */
-SECTION_DATA u8 daBarDesk_c::mCcDCyl[68] = {
-    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, 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, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 80BA9C20-80BA9C2C -00001 000C+00 0/1 0/0 0/0 .data            @3821 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3821[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)modeWait__11daBarDesk_cFv,
-};
-#pragma pop
-
-/* 80BA9C2C-80BA9C38 -00001 000C+00 0/1 0/0 0/0 .data            @3822 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3822[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)modeBreak__11daBarDesk_cFv,
-};
-#pragma pop
-
-/* 80BA9C38-80BA9C50 00007C 0018+00 0/1 0/0 0/0 .data            mode_proc$3820 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 mode_proc[24] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-#pragma pop
-
-/* 80BA9C50-80BA9C70 -00001 0020+00 1/0 0/0 0/0 .data            l_daBarDesk_Method */
-SECTION_DATA static void* l_daBarDesk_Method[8] = {
-    (void*)daBarDesk_Create__FP10fopAc_ac_c,
-    (void*)daBarDesk_Delete__FP11daBarDesk_c,
-    (void*)daBarDesk_Execute__FP11daBarDesk_c,
-    (void*)NULL,
-    (void*)daBarDesk_Draw__FP11daBarDesk_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-};
-
-/* 80BA9C70-80BA9CA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BarDesk */
-SECTION_DATA extern void* g_profile_Obj_BarDesk[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0003FFFD,
-    (void*)0x008F0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000730, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02790000, (void*)&l_daBarDesk_Method,
-    (void*)0x00040100, (void*)0x000E0000,
-};
-
-/* 80BA9CA0-80BA9CAC 0000E4 000C+00 2/2 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,
-};
-
-/* 80BA9CAC-80BA9CB8 0000F0 000C+00 1/1 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,
-};
-
-/* 80BA9CB8-80BA9CC4 0000FC 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGCyl */
-SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__8cM3dGCylFv,
-};
-
-/* 80BA9CC4-80BA9CD0 000108 000C+00 2/2 0/0 0/0 .data            __vt__8cM3dGAab */
-SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__8cM3dGAabFv,
-};
-
-/* 80BA9CD0-80BA9CF8 000114 0028+00 1/1 0/0 0/0 .data            __vt__11daBarDesk_c */
-SECTION_DATA extern void* __vt__11daBarDesk_c[10] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)CreateHeap__11daBarDesk_cFv,
-    (void*)Create__16dBgS_MoveBgActorFv,
-    (void*)Execute__11daBarDesk_cFPPA3_A4_f,
-    (void*)Draw__11daBarDesk_cFv,
-    (void*)Delete__11daBarDesk_cFv,
-    (void*)IsDelete__16dBgS_MoveBgActorFv,
-    (void*)ToFore__16dBgS_MoveBgActorFv,
-    (void*)ToBack__16dBgS_MoveBgActorFv,
-};
-
-/* 80BA9CF8-80BA9D04 00013C 000C+00 2/2 0/0 0/0 .data            __vt__15daBarDesk_HIO_c */
-SECTION_DATA extern void* __vt__15daBarDesk_HIO_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__15daBarDesk_HIO_cFv,
-};
-
-/* 80BA9D04-80BA9D10 000148 000C+00 3/3 0/0 0/0 .data            __vt__14mDoHIO_entry_c */
-SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__14mDoHIO_entry_cFv,
+dCcD_SrcCyl daBarDesk_c::mCcDCyl = {
+    mCcDObjInfo,
+    {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
 };
 
 /* 80BA918C-80BA91B8 0000EC 002C+00 1/1 0/0 0/0 .text            __ct__15daBarDesk_HIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daBarDesk_HIO_c::daBarDesk_HIO_c() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__ct__15daBarDesk_HIO_cFv.s"
+daBarDesk_HIO_c::daBarDesk_HIO_c() : field_0x4(10), field_0x5(3) {
+    /* empty function */
 }
-#pragma pop
-
-/* 80BA91B8-80BA9200 000118 0048+00 1/0 0/0 0/0 .text            __dt__14mDoHIO_entry_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm mDoHIO_entry_c::~mDoHIO_entry_c() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__14mDoHIO_entry_cFv.s"
-}
-#pragma pop
 
 /* 80BA9200-80BA9288 000160 0088+00 2/2 0/0 0/0 .text            setBaseMtx__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::setBaseMtx() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBaseMtx__11daBarDesk_cFv.s"
+void daBarDesk_c::setBaseMtx() {
+    mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
+    mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
+    mpModel->setBaseScale(mScale);
+    mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80BA9BB4-80BA9BB4 000044 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80BA9BB4 = "KHdesk";
-#pragma pop
 
 /* 80BA9288-80BA92F4 0001E8 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::CreateHeap() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/CreateHeap__11daBarDesk_cFv.s"
+int daBarDesk_c::CreateHeap() {
+    J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("KHdesk", 4);
+    mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
+    if (mpModel == NULL) {
+        return 0;
+    }
+    return 1;
 }
-#pragma pop
 
 /* 80BA92F4-80BA94B8 000254 01C4+00 1/1 0/0 0/0 .text            create__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::create() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/create__11daBarDesk_cFv.s"
+cPhs__Step daBarDesk_c::create() {
+    fopAcM_SetupActor(this, daBarDesk_c);
+    if (i_fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) {
+        return cPhs_ERROR_e;
+    }
+    cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "KHdesk");
+    if (step == cPhs_COMPLEATE_e) {
+        if (MoveBGCreate("KHdesk", 7, dBgS_MoveBGProc_TypicalRotY, 0xe50, NULL) == cPhs_ERROR_e) {
+            return cPhs_ERROR_e;
+        }
+        fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
+        fopAcM_setCullSizeBox2(this, mpModel->getModelData());
+        mColStatus.Init(0xff, 0xff, this);
+        mColCyl.Set(mCcDCyl);
+        mColCyl.SetStts(&mColStatus);
+        init_modeWait();
+        setBaseMtx();
+    }
+    return step;
 }
-#pragma pop
-
-/* 80BA94B8-80BA9500 000418 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/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGCylFv.s"
-}
-#pragma pop
-
-/* 80BA9500-80BA9548 000460 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/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__8cM3dGAabFv.s"
-}
-#pragma pop
-
-/* 80BA9548-80BA95A4 0004A8 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/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10dCcD_GSttsFv.s"
-}
-#pragma pop
 
 /* 80BA95A4-80BA95F4 000504 0050+00 1/0 0/0 0/0 .text            Execute__11daBarDesk_cFPPA3_A4_f */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::Execute(f32 (**param_0)[3][4]) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Execute__11daBarDesk_cFPPA3_A4_f.s"
+int daBarDesk_c::Execute(Mtx** i_mtxP) {
+    windowProc();
+    *i_mtxP = &mpModel->getBaseTRMtx();
+    setBaseMtx();
+    return 1;
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80BA9D18-80BA9D24 000008 000C+00 1/1 0/0 0/0 .bss             @3643 */
-static u8 lit_3643[12];
-
-/* 80BA9D24-80BA9D2C 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
-static u8 l_HIO[8];
-
-/* 80BA9D2C-80BA9D30 00001C 0004+00 1/1 0/0 0/0 .bss             None */
-static u8 data_80BA9D2C[4];
 
 /* 80BA95F4-80BA9680 000554 008C+00 1/1 0/0 0/0 .text            windowProc__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::windowProc() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/windowProc__11daBarDesk_cFv.s"
+void daBarDesk_c::windowProc() {
+    typedef void (daBarDesk_c::*daBarDesk_modeFunc)();
+    static daBarDesk_modeFunc mode_proc[2] = {
+        &modeWait,
+        &modeBreak,
+    };
+    (this->*mode_proc[mMode])();
 }
-#pragma pop
 
 /* 80BA9680-80BA968C 0005E0 000C+00 1/1 0/0 0/0 .text            init_modeWait__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::init_modeWait() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeWait__11daBarDesk_cFv.s"
+void daBarDesk_c::init_modeWait() {
+    mMode = 0;
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80BA9B70-80BA9BA0 000000 0030+00 2/2 0/0 0/0 .rodata          mCcDObjInfo__11daBarDesk_c */
-SECTION_RODATA u8 const daBarDesk_c::mCcDObjInfo[48] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xD8, 0xFA, 0xFD, 0xBF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80BA9B70, &daBarDesk_c::mCcDObjInfo);
-
-/* 80BA9BA0-80BA9BA4 000030 0004+00 1/1 0/0 0/0 .rodata          @3839 */
-SECTION_RODATA static f32 const lit_3839 = 90.0f;
-COMPILER_STRIP_GATE(0x80BA9BA0, &lit_3839);
 
 /* 80BA968C-80BA973C 0005EC 00B0+00 1/0 0/0 0/0 .text            modeWait__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::modeWait() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeWait__11daBarDesk_cFv.s"
+void daBarDesk_c::modeWait() {
+    if (mColCyl.ChkTgHit()) {
+        if (mpBgW != NULL) {
+            dComIfG_Bgsp().Release(mpBgW);
+        }
+        init_modeBreak();
+    }
+    mColCyl.SetR(90.0f);
+    mColCyl.SetH(90.0f);
+    mColCyl.SetC(current.pos);
+    dComIfG_Ccsp()->Set(&mColCyl);
+    mColCyl.ClrTgHit();
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80BA9BA4-80BA9BA8 000034 0004+00 1/2 0/0 0/0 .rodata          @3861 */
-SECTION_RODATA static f32 const lit_3861 = 1.0f;
-COMPILER_STRIP_GATE(0x80BA9BA4, &lit_3861);
-
-/* 80BA9BA8-80BA9BAC 000038 0004+00 0/1 0/0 0/0 .rodata          @3862 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3862 = -1.0f;
-COMPILER_STRIP_GATE(0x80BA9BA8, &lit_3862);
-#pragma pop
-
-/* 80BA9BAC-80BA9BB0 00003C 0004+00 0/1 0/0 0/0 .rodata          @3863 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3863[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x80BA9BAC, &lit_3863);
-#pragma pop
 
 /* 80BA973C-80BA9824 00069C 00E8+00 1/1 0/0 0/0 .text            init_modeBreak__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::init_modeBreak() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/init_modeBreak__11daBarDesk_cFv.s"
+void daBarDesk_c::init_modeBreak() {
+    mDoAud_seStart(Z2SE_OBJ_TABLE_BRAKE, &current.pos, 0,
+                   dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+    setBreakEffect();
+    dComIfGp_getVibration().StartShock(l_HIO.field_0x5, 15, cXyz(0.0f, 1.0f, 0.0f));
+    i_fopAcM_onSwitch(this, (u8)fopAcM_GetParam(this));
+    mMode = 1;
 }
-#pragma pop
 
 /* 80BA9824-80BA9844 000784 0020+00 1/0 0/0 0/0 .text            modeBreak__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::modeBreak() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/modeBreak__11daBarDesk_cFv.s"
+void daBarDesk_c::modeBreak() {
+    fopAcM_delete(this);
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 80BA9BB0-80BA9BB4 000040 0004+00 1/1 0/0 0/0 .rodata          particle_id$3871 */
-SECTION_RODATA static u8 const particle_id[4] = {
-    0x85,
-    0xF4,
-    0x85,
-    0xF5,
-};
-COMPILER_STRIP_GATE(0x80BA9BB0, &particle_id);
 
 /* 80BA9844-80BA98E8 0007A4 00A4+00 1/1 0/0 0/0 .text            setBreakEffect__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::setBreakEffect() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/setBreakEffect__11daBarDesk_cFv.s"
+void daBarDesk_c::setBreakEffect() {
+    static const u16 particle_id[2] = {0x85F4, 0x85F5};
+    for (int i = 0; i < 2; i++) {
+        dComIfGp_particle_set(particle_id[i], &current.pos, NULL, &mScale,
+                              0xff, NULL, -1, NULL, NULL, NULL);
+    }
 }
-#pragma pop
 
 /* 80BA98E8-80BA998C 000848 00A4+00 1/0 0/0 0/0 .text            Draw__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::Draw() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Draw__11daBarDesk_cFv.s"
+int daBarDesk_c::Draw() {
+    g_env_light.settingTevStruct(0x10, &current.pos, &mTevStr);
+    g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr);
+    dComIfGd_setListBG();
+    mDoExt_modelUpdateDL(mpModel);
+    dComIfGd_setList();
+    return 1;
 }
-#pragma pop
 
 /* 80BA998C-80BA99BC 0008EC 0030+00 1/0 0/0 0/0 .text            Delete__11daBarDesk_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daBarDesk_c::Delete() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/Delete__11daBarDesk_cFv.s"
+int daBarDesk_c::Delete() {
+    dComIfG_resDelete(&mPhase, "KHdesk");
+    return 1;
 }
-#pragma pop
 
 /* 80BA99BC-80BA99E8 00091C 002C+00 1/0 0/0 0/0 .text            daBarDesk_Draw__FP11daBarDesk_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daBarDesk_Draw(daBarDesk_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Draw__FP11daBarDesk_c.s"
+static int daBarDesk_Draw(daBarDesk_c* i_this) {
+    return i_this->MoveBGDraw();
 }
-#pragma pop
 
 /* 80BA99E8-80BA9A08 000948 0020+00 1/0 0/0 0/0 .text            daBarDesk_Execute__FP11daBarDesk_c
  */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daBarDesk_Execute(daBarDesk_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Execute__FP11daBarDesk_c.s"
+static int daBarDesk_Execute(daBarDesk_c* i_this) {
+    return i_this->MoveBGExecute();
 }
-#pragma pop
 
 /* 80BA9A08-80BA9A28 000968 0020+00 1/0 0/0 0/0 .text            daBarDesk_Delete__FP11daBarDesk_c
  */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daBarDesk_Delete(daBarDesk_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Delete__FP11daBarDesk_c.s"
+static int daBarDesk_Delete(daBarDesk_c* i_this) {
+    return i_this->MoveBGDelete();
 }
-#pragma pop
 
 /* 80BA9A28-80BA9A48 000988 0020+00 1/0 0/0 0/0 .text            daBarDesk_Create__FP10fopAc_ac_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daBarDesk_Create(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/daBarDesk_Create__FP10fopAc_ac_c.s"
+static cPhs__Step daBarDesk_Create(fopAc_ac_c* i_this) {
+    return static_cast<daBarDesk_c*>(i_this)->create();
 }
-#pragma pop
 
-/* 80BA9A48-80BA9A90 0009A8 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/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__10cCcD_GSttsFv.s"
-}
-#pragma pop
+/* 80BA9C50-80BA9C70 -00001 0020+00 1/0 0/0 0/0 .data            l_daBarDesk_Method */
+static actor_method_class l_daBarDesk_Method = {
+    (process_method_func)daBarDesk_Create,
+    (process_method_func)daBarDesk_Delete,
+    (process_method_func)daBarDesk_Execute,
+    (process_method_func)NULL,
+    (process_method_func)daBarDesk_Draw,
+};
 
-/* 80BA9A90-80BA9AEC 0009F0 005C+00 2/1 0/0 0/0 .text            __dt__15daBarDesk_HIO_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daBarDesk_HIO_c::~daBarDesk_HIO_c() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__dt__15daBarDesk_HIO_cFv.s"
-}
-#pragma pop
-
-/* 80BA9AEC-80BA9B5C 000A4C 0070+00 0/0 1/0 0/0 .text            __sinit_d_a_obj_barDesk_cpp */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void __sinit_d_a_obj_barDesk_cpp() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk/__sinit_d_a_obj_barDesk_cpp.s"
-}
-#pragma pop
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80BA9AEC, __sinit_d_a_obj_barDesk_cpp);
-#pragma pop
-
-/* 80BA9BB4-80BA9BB4 000044 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+/* 80BA9C70-80BA9CA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BarDesk */
+extern actor_process_profile_definition g_profile_Obj_BarDesk = {
+    fpcLy_CURRENT_e,
+    3,
+    fpcPi_CURRENT_e,
+    PROC_Obj_BarDesk,
+    &g_fpcLf_Method.mBase,
+    sizeof(daBarDesk_c),
+    0,
+    0,
+    &g_fopAc_Method.base,
+    0x279,
+    &l_daBarDesk_Method,
+    0x40100,
+    fopAc_ACTOR_e,
+    fopAc_CULLBOX_CUSTOM_e,
+};