summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhatal175 <hatal175@users.noreply.github.com>2024-04-01 12:06:45 +0300
committerGitHub <noreply@github.com>2024-04-01 12:06:45 +0300
commit5fce7e398959587e69bbd1c84666baae456b19d3 (patch)
tree9a50ec00cd4f0121c2453a93799cf639faaaf7b6
parentbaf696d9b8891f53dfbd52b2f14b9a581e6ad0b5 (diff)
daObjWCover_c OK (#2117)
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/CreateHeap__13daObjWCover_cFv.s29
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Create__13daObjWCover_cFv.s20
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Delete__13daObjWCover_cFv.s14
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Draw__13daObjWCover_cFv.s42
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Execute__13daObjWCover_cFPPA3_A4_f.s20
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/action__13daObjWCover_cFv.s37
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Create__FP10fopAc_ac_c.s9
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Delete__FP13daObjWCover_c.s9
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Draw__FP13daObjWCover_c.s12
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Execute__FP13daObjWCover_c.s9
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/func_80D36404.s61
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/initBaseMtx__13daObjWCover_cFv.s16
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/init_modeBreak__13daObjWCover_cFv.s69
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/modeWait__13daObjWCover_cFv.s129
-rw-r--r--asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/setBaseMtx__13daObjWCover_cFv.s30
-rw-r--r--include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h23
-rw-r--r--rel/d/a/obj/d_a_obj_well_cover/Makefile2
-rw-r--r--rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp467
-rw-r--r--rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp26
19 files changed, 144 insertions, 880 deletions
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/CreateHeap__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/CreateHeap__13daObjWCover_cFv.s
deleted file mode 100644
index 8a8fc44012..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/CreateHeap__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,29 +0,0 @@
-lbl_80D36394:
-/* 80D36394 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D36398 7C 08 02 A6 */ mflr r0
-/* 80D3639C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D363A0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80D363A4 7C 7F 1B 78 */ mr r31, r3
-/* 80D363A8 3C 60 80 D3 */ lis r3, l_arcName@ha /* 0x80D36A6C@ha */
-/* 80D363AC 38 63 6A 6C */ addi r3, r3, l_arcName@l /* 0x80D36A6C@l */
-/* 80D363B0 80 63 00 00 */ lwz r3, 0(r3)
-/* 80D363B4 38 80 00 04 */ li r4, 4
-/* 80D363B8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D363BC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D363C0 3C A5 00 02 */ addis r5, r5, 2
-/* 80D363C4 38 C0 00 80 */ li r6, 0x80
-/* 80D363C8 38 A5 C2 F8 */ addi r5, r5, -15624
-/* 80D363CC 4B 30 5F 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
-/* 80D363D0 3C 80 00 08 */ lis r4, 8
-/* 80D363D4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */
-/* 80D363D8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */
-/* 80D363DC 4B 2D E8 79 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
-/* 80D363E0 90 7F 05 A8 */ stw r3, 0x5a8(r31)
-/* 80D363E4 80 7F 05 A8 */ lwz r3, 0x5a8(r31)
-/* 80D363E8 30 03 FF FF */ addic r0, r3, -1
-/* 80D363EC 7C 60 19 10 */ subfe r3, r0, r3
-/* 80D363F0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80D363F4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D363F8 7C 08 03 A6 */ mtlr r0
-/* 80D363FC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D36400 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Create__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Create__13daObjWCover_cFv.s
deleted file mode 100644
index 41d767de80..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Create__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80D36348:
-/* 80D36348 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D3634C 7C 08 02 A6 */ mflr r0
-/* 80D36350 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D36354 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80D36358 7C 7F 1B 78 */ mr r31, r3
-/* 80D3635C 4B FF FF 3D */ bl initBaseMtx__13daObjWCover_cFv
-/* 80D36360 80 7F 05 A8 */ lwz r3, 0x5a8(r31)
-/* 80D36364 38 03 00 24 */ addi r0, r3, 0x24
-/* 80D36368 90 1F 05 04 */ stw r0, 0x504(r31)
-/* 80D3636C 80 7F 05 A8 */ lwz r3, 0x5a8(r31)
-/* 80D36370 80 83 00 04 */ lwz r4, 4(r3)
-/* 80D36374 7F E3 FB 78 */ mr r3, r31
-/* 80D36378 4B 2E 42 01 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData
-/* 80D3637C 38 60 00 01 */ li r3, 1
-/* 80D36380 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80D36384 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D36388 7C 08 03 A6 */ mtlr r0
-/* 80D3638C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D36390 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Delete__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Delete__13daObjWCover_cFv.s
deleted file mode 100644
index 096a446c95..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Delete__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_80D36944:
-/* 80D36944 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D36948 7C 08 02 A6 */ mflr r0
-/* 80D3694C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D36950 3C 80 80 D3 */ lis r4, l_arcName@ha /* 0x80D36A6C@ha */
-/* 80D36954 38 84 6A 6C */ addi r4, r4, l_arcName@l /* 0x80D36A6C@l */
-/* 80D36958 80 84 00 00 */ lwz r4, 0(r4)
-/* 80D3695C 38 63 05 A0 */ addi r3, r3, 0x5a0
-/* 80D36960 4B 2F 66 A9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
-/* 80D36964 38 60 00 01 */ li r3, 1
-/* 80D36968 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D3696C 7C 08 03 A6 */ mtlr r0
-/* 80D36970 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D36974 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Draw__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Draw__13daObjWCover_cFv.s
deleted file mode 100644
index 71da6ee210..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Draw__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,42 +0,0 @@
-lbl_80D368A0:
-/* 80D368A0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D368A4 7C 08 02 A6 */ mflr r0
-/* 80D368A8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D368AC 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80D368B0 93 C1 00 08 */ stw r30, 8(r1)
-/* 80D368B4 7C 7E 1B 78 */ mr r30, r3
-/* 80D368B8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80D368BC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80D368C0 38 80 00 10 */ li r4, 0x10
-/* 80D368C4 38 BE 04 D0 */ addi r5, r30, 0x4d0
-/* 80D368C8 38 DE 01 0C */ addi r6, r30, 0x10c
-/* 80D368CC 4B 46 CE F9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c
-/* 80D368D0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
-/* 80D368D4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
-/* 80D368D8 80 9E 05 A8 */ lwz r4, 0x5a8(r30)
-/* 80D368DC 80 84 00 04 */ lwz r4, 4(r4)
-/* 80D368E0 38 BE 01 0C */ addi r5, r30, 0x10c
-/* 80D368E4 4B 46 E4 BD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
-/* 80D368E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D368EC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D368F0 80 04 5F 70 */ lwz r0, 0x5f70(r4)
-/* 80D368F4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
-/* 80D368F8 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */
-/* 80D368FC 90 1F 00 48 */ stw r0, 0x48(r31)
-/* 80D36900 80 04 5F 74 */ lwz r0, 0x5f74(r4)
-/* 80D36904 90 1F 00 4C */ stw r0, 0x4c(r31)
-/* 80D36908 80 7E 05 A8 */ lwz r3, 0x5a8(r30)
-/* 80D3690C 4B 2D 73 B9 */ bl mDoExt_modelUpdateDL__FP8J3DModel
-/* 80D36910 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D36914 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D36918 80 03 5F 80 */ lwz r0, 0x5f80(r3)
-/* 80D3691C 90 1F 00 48 */ stw r0, 0x48(r31)
-/* 80D36920 80 03 5F 84 */ lwz r0, 0x5f84(r3)
-/* 80D36924 90 1F 00 4C */ stw r0, 0x4c(r31)
-/* 80D36928 38 60 00 01 */ li r3, 1
-/* 80D3692C 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80D36930 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80D36934 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D36938 7C 08 03 A6 */ mtlr r0
-/* 80D3693C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D36940 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Execute__13daObjWCover_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Execute__13daObjWCover_cFPPA3_A4_f.s
deleted file mode 100644
index c25381b3f3..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Execute__13daObjWCover_cFPPA3_A4_f.s
+++ /dev/null
@@ -1,20 +0,0 @@
-lbl_80D364E0:
-/* 80D364E0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D364E4 7C 08 02 A6 */ mflr r0
-/* 80D364E8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D364EC 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80D364F0 93 C1 00 08 */ stw r30, 8(r1)
-/* 80D364F4 7C 7E 1B 78 */ mr r30, r3
-/* 80D364F8 7C 9F 23 78 */ mr r31, r4
-/* 80D364FC 48 00 00 31 */ bl action__13daObjWCover_cFv
-/* 80D36500 38 1E 05 6C */ addi r0, r30, 0x56c
-/* 80D36504 90 1F 00 00 */ stw r0, 0(r31)
-/* 80D36508 7F C3 F3 78 */ mr r3, r30
-/* 80D3650C 4B FF FD C9 */ bl setBaseMtx__13daObjWCover_cFv
-/* 80D36510 38 60 00 01 */ li r3, 1
-/* 80D36514 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80D36518 83 C1 00 08 */ lwz r30, 8(r1)
-/* 80D3651C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D36520 7C 08 03 A6 */ mtlr r0
-/* 80D36524 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D36528 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/action__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/action__13daObjWCover_cFv.s
deleted file mode 100644
index 298117245b..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/action__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,37 +0,0 @@
-lbl_80D3652C:
-/* 80D3652C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D36530 7C 08 02 A6 */ mflr r0
-/* 80D36534 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D36538 3C 80 80 D3 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80D36A4C@ha */
-/* 80D3653C 38 E4 6A 4C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80D36A4C@l */
-/* 80D36540 3C 80 80 D3 */ lis r4, data_80D36B18@ha /* 0x80D36B18@ha */
-/* 80D36544 38 C4 6B 18 */ addi r6, r4, data_80D36B18@l /* 0x80D36B18@l */
-/* 80D36548 88 06 00 00 */ lbz r0, 0(r6)
-/* 80D3654C 7C 00 07 75 */ extsb. r0, r0
-/* 80D36550 40 82 00 40 */ bne lbl_80D36590
-/* 80D36554 80 87 00 24 */ lwz r4, 0x24(r7)
-/* 80D36558 80 07 00 28 */ lwz r0, 0x28(r7)
-/* 80D3655C 90 87 00 3C */ stw r4, 0x3c(r7)
-/* 80D36560 90 07 00 40 */ stw r0, 0x40(r7)
-/* 80D36564 80 07 00 2C */ lwz r0, 0x2c(r7)
-/* 80D36568 90 07 00 44 */ stw r0, 0x44(r7)
-/* 80D3656C 38 A7 00 3C */ addi r5, r7, 0x3c
-/* 80D36570 80 87 00 30 */ lwz r4, 0x30(r7)
-/* 80D36574 80 07 00 34 */ lwz r0, 0x34(r7)
-/* 80D36578 90 85 00 0C */ stw r4, 0xc(r5)
-/* 80D3657C 90 05 00 10 */ stw r0, 0x10(r5)
-/* 80D36580 80 07 00 38 */ lwz r0, 0x38(r7)
-/* 80D36584 90 05 00 14 */ stw r0, 0x14(r5)
-/* 80D36588 38 00 00 01 */ li r0, 1
-/* 80D3658C 98 06 00 00 */ stb r0, 0(r6)
-lbl_80D36590:
-/* 80D36590 88 03 05 B0 */ lbz r0, 0x5b0(r3)
-/* 80D36594 1C 00 00 0C */ mulli r0, r0, 0xc
-/* 80D36598 39 87 00 3C */ addi r12, r7, 0x3c
-/* 80D3659C 7D 8C 02 14 */ add r12, r12, r0
-/* 80D365A0 4B 62 BA E5 */ bl __ptmf_scall
-/* 80D365A4 60 00 00 00 */ nop
-/* 80D365A8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D365AC 7C 08 03 A6 */ mtlr r0
-/* 80D365B0 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D365B4 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Create__FP10fopAc_ac_c.s
deleted file mode 100644
index 433778d1b5..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Create__FP10fopAc_ac_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D369E4:
-/* 80D369E4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D369E8 7C 08 02 A6 */ mflr r0
-/* 80D369EC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D369F0 4B FF FA 15 */ bl create__13daObjWCover_cFv
-/* 80D369F4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D369F8 7C 08 03 A6 */ mtlr r0
-/* 80D369FC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D36A00 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Delete__FP13daObjWCover_c.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Delete__FP13daObjWCover_c.s
deleted file mode 100644
index 87435a9616..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Delete__FP13daObjWCover_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D369C4:
-/* 80D369C4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D369C8 7C 08 02 A6 */ mflr r0
-/* 80D369CC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D369D0 4B 34 1F 0D */ bl MoveBGDelete__16dBgS_MoveBgActorFv
-/* 80D369D4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D369D8 7C 08 03 A6 */ mtlr r0
-/* 80D369DC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D369E0 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Draw__FP13daObjWCover_c.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Draw__FP13daObjWCover_c.s
deleted file mode 100644
index 46496a8162..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Draw__FP13daObjWCover_c.s
+++ /dev/null
@@ -1,12 +0,0 @@
-lbl_80D36978:
-/* 80D36978 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D3697C 7C 08 02 A6 */ mflr r0
-/* 80D36980 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D36984 81 83 05 9C */ lwz r12, 0x59c(r3)
-/* 80D36988 81 8C 00 14 */ lwz r12, 0x14(r12)
-/* 80D3698C 7D 89 03 A6 */ mtctr r12
-/* 80D36990 4E 80 04 21 */ bctrl
-/* 80D36994 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D36998 7C 08 03 A6 */ mtlr r0
-/* 80D3699C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D369A0 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Execute__FP13daObjWCover_c.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Execute__FP13daObjWCover_c.s
deleted file mode 100644
index c86cc15f2b..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Execute__FP13daObjWCover_c.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80D369A4:
-/* 80D369A4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D369A8 7C 08 02 A6 */ mflr r0
-/* 80D369AC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D369B0 4B 34 1F A1 */ bl MoveBGExecute__16dBgS_MoveBgActorFv
-/* 80D369B4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D369B8 7C 08 03 A6 */ mtlr r0
-/* 80D369BC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D369C0 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/func_80D36404.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/func_80D36404.s
deleted file mode 100644
index a42bc89766..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/func_80D36404.s
+++ /dev/null
@@ -1,61 +0,0 @@
-lbl_80D36404:
-/* 80D36404 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D36408 7C 08 02 A6 */ mflr r0
-/* 80D3640C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D36410 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80D36414 7C 7F 1B 78 */ mr r31, r3
-/* 80D36418 80 03 04 A0 */ lwz r0, 0x4a0(r3)
-/* 80D3641C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
-/* 80D36420 40 82 00 28 */ bne lbl_80D36448
-/* 80D36424 28 1F 00 00 */ cmplwi r31, 0
-/* 80D36428 41 82 00 14 */ beq lbl_80D3643C
-/* 80D3642C 4B 34 21 F9 */ bl __ct__16dBgS_MoveBgActorFv
-/* 80D36430 3C 60 80 D3 */ lis r3, __vt__13daObjWCover_c@ha /* 0x80D36AF0@ha */
-/* 80D36434 38 03 6A F0 */ addi r0, r3, __vt__13daObjWCover_c@l /* 0x80D36AF0@l */
-/* 80D36438 90 1F 05 9C */ stw r0, 0x59c(r31)
-lbl_80D3643C:
-/* 80D3643C 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
-/* 80D36440 60 00 00 08 */ ori r0, r0, 8
-/* 80D36444 90 1F 04 A0 */ stw r0, 0x4a0(r31)
-lbl_80D36448:
-/* 80D36448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D3644C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D36450 80 1F 00 B0 */ lwz r0, 0xb0(r31)
-/* 80D36454 54 04 06 3E */ clrlwi r4, r0, 0x18
-/* 80D36458 88 1F 04 BA */ lbz r0, 0x4ba(r31)
-/* 80D3645C 7C 05 07 74 */ extsb r5, r0
-/* 80D36460 4B 2F EF 01 */ bl isSwitch__10dSv_info_cCFii
-/* 80D36464 2C 03 00 00 */ cmpwi r3, 0
-/* 80D36468 41 82 00 0C */ beq lbl_80D36474
-/* 80D3646C 38 60 00 05 */ li r3, 5
-/* 80D36470 48 00 00 5C */ b lbl_80D364CC
-lbl_80D36474:
-/* 80D36474 38 7F 05 A0 */ addi r3, r31, 0x5a0
-/* 80D36478 3C 80 80 D3 */ lis r4, l_arcName@ha /* 0x80D36A6C@ha */
-/* 80D3647C 38 84 6A 6C */ addi r4, r4, l_arcName@l /* 0x80D36A6C@l */
-/* 80D36480 80 84 00 00 */ lwz r4, 0(r4)
-/* 80D36484 4B 2F 6A 39 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
-/* 80D36488 7C 60 1B 78 */ mr r0, r3
-/* 80D3648C 2C 00 00 04 */ cmpwi r0, 4
-/* 80D36490 40 82 00 38 */ bne lbl_80D364C8
-/* 80D36494 7F E3 FB 78 */ mr r3, r31
-/* 80D36498 3C 80 80 D3 */ lis r4, l_arcName@ha /* 0x80D36A6C@ha */
-/* 80D3649C 38 84 6A 6C */ addi r4, r4, l_arcName@l /* 0x80D36A6C@l */
-/* 80D364A0 80 84 00 00 */ lwz r4, 0(r4)
-/* 80D364A4 38 A0 00 07 */ li r5, 7
-/* 80D364A8 38 C0 00 00 */ li r6, 0
-/* 80D364AC 38 E0 0D 90 */ li r7, 0xd90
-/* 80D364B0 39 00 00 00 */ li r8, 0
-/* 80D364B4 4B 34 23 09 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f
-/* 80D364B8 7C 60 1B 78 */ mr r0, r3
-/* 80D364BC 2C 00 00 05 */ cmpwi r0, 5
-/* 80D364C0 40 82 00 08 */ bne lbl_80D364C8
-/* 80D364C4 48 00 00 08 */ b lbl_80D364CC
-lbl_80D364C8:
-/* 80D364C8 7C 03 03 78 */ mr r3, r0
-lbl_80D364CC:
-/* 80D364CC 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80D364D0 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D364D4 7C 08 03 A6 */ mtlr r0
-/* 80D364D8 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D364DC 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/initBaseMtx__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/initBaseMtx__13daObjWCover_cFv.s
deleted file mode 100644
index 16a63a0752..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/initBaseMtx__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_80D36298:
-/* 80D36298 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D3629C 7C 08 02 A6 */ mflr r0
-/* 80D362A0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D362A4 80 83 05 A8 */ lwz r4, 0x5a8(r3)
-/* 80D362A8 C0 03 04 EC */ lfs f0, 0x4ec(r3)
-/* 80D362AC D0 04 00 18 */ stfs f0, 0x18(r4)
-/* 80D362B0 C0 03 04 F0 */ lfs f0, 0x4f0(r3)
-/* 80D362B4 D0 04 00 1C */ stfs f0, 0x1c(r4)
-/* 80D362B8 C0 03 04 F4 */ lfs f0, 0x4f4(r3)
-/* 80D362BC D0 04 00 20 */ stfs f0, 0x20(r4)
-/* 80D362C0 48 00 00 15 */ bl setBaseMtx__13daObjWCover_cFv
-/* 80D362C4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D362C8 7C 08 03 A6 */ mtlr r0
-/* 80D362CC 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D362D0 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/init_modeBreak__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/init_modeBreak__13daObjWCover_cFv.s
deleted file mode 100644
index 4d582dd21a..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/init_modeBreak__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,69 +0,0 @@
-lbl_80D36790:
-/* 80D36790 94 21 FF B0 */ stwu r1, -0x50(r1)
-/* 80D36794 7C 08 02 A6 */ mflr r0
-/* 80D36798 90 01 00 54 */ stw r0, 0x54(r1)
-/* 80D3679C 39 61 00 50 */ addi r11, r1, 0x50
-/* 80D367A0 4B 62 BA 31 */ bl _savegpr_26
-/* 80D367A4 7C 7E 1B 78 */ mr r30, r3
-/* 80D367A8 3C 60 80 D3 */ lis r3, lit_3794@ha /* 0x80D36A0C@ha */
-/* 80D367AC 3B E3 6A 0C */ addi r31, r3, lit_3794@l /* 0x80D36A0C@l */
-/* 80D367B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D367B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D367B8 80 1E 00 B0 */ lwz r0, 0xb0(r30)
-/* 80D367BC 54 04 06 3E */ clrlwi r4, r0, 0x18
-/* 80D367C0 88 1E 04 BA */ lbz r0, 0x4ba(r30)
-/* 80D367C4 7C 05 07 74 */ extsb r5, r0
-/* 80D367C8 4B 2F EA 39 */ bl onSwitch__10dSv_info_cFii
-/* 80D367CC C0 1F 00 00 */ lfs f0, 0(r31)
-/* 80D367D0 D0 01 00 20 */ stfs f0, 0x20(r1)
-/* 80D367D4 C0 1F 00 04 */ lfs f0, 4(r31)
-/* 80D367D8 D0 01 00 24 */ stfs f0, 0x24(r1)
-/* 80D367DC D0 01 00 28 */ stfs f0, 0x28(r1)
-/* 80D367E0 38 7E 04 D0 */ addi r3, r30, 0x4d0
-/* 80D367E4 4B 2D 65 81 */ bl transS__14mDoMtx_stack_cFRC4cXyz
-/* 80D367E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D367EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D367F0 A8 9E 04 E6 */ lha r4, 0x4e6(r30)
-/* 80D367F4 4B 2D 5C 41 */ bl mDoMtx_YrotM__FPA4_fs
-/* 80D367F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D367FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D36800 38 81 00 20 */ addi r4, r1, 0x20
-/* 80D36804 7C 85 23 78 */ mr r5, r4
-/* 80D36808 4B 61 05 65 */ bl PSMTXMultVec
-/* 80D3680C 3B 40 00 00 */ li r26, 0
-/* 80D36810 3B A0 00 00 */ li r29, 0
-/* 80D36814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D36818 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D3681C 3B 9F 00 28 */ addi r28, r31, 0x28
-lbl_80D36820:
-/* 80D36820 80 7B 5D 3C */ lwz r3, 0x5d3c(r27)
-/* 80D36824 38 80 00 00 */ li r4, 0
-/* 80D36828 90 81 00 08 */ stw r4, 8(r1)
-/* 80D3682C 38 00 FF FF */ li r0, -1
-/* 80D36830 90 01 00 0C */ stw r0, 0xc(r1)
-/* 80D36834 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80D36838 90 81 00 14 */ stw r4, 0x14(r1)
-/* 80D3683C 90 81 00 18 */ stw r4, 0x18(r1)
-/* 80D36840 38 80 00 00 */ li r4, 0
-/* 80D36844 7C BC EA 2E */ lhzx r5, r28, r29
-/* 80D36848 38 C1 00 20 */ addi r6, r1, 0x20
-/* 80D3684C 38 E0 00 00 */ li r7, 0
-/* 80D36850 39 00 00 00 */ li r8, 0
-/* 80D36854 39 20 00 00 */ li r9, 0
-/* 80D36858 39 40 00 FF */ li r10, 0xff
-/* 80D3685C C0 3F 00 30 */ lfs f1, 0x30(r31)
-/* 80D36860 4B 31 62 31 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
-/* 80D36864 3B 5A 00 01 */ addi r26, r26, 1
-/* 80D36868 2C 1A 00 03 */ cmpwi r26, 3
-/* 80D3686C 3B BD 00 02 */ addi r29, r29, 2
-/* 80D36870 41 80 FF B0 */ blt lbl_80D36820
-/* 80D36874 7F C3 F3 78 */ mr r3, r30
-/* 80D36878 4B 2E 34 05 */ bl fopAcM_delete__FP10fopAc_ac_c
-/* 80D3687C 38 00 00 01 */ li r0, 1
-/* 80D36880 98 1E 05 B0 */ stb r0, 0x5b0(r30)
-/* 80D36884 39 61 00 50 */ addi r11, r1, 0x50
-/* 80D36888 4B 62 B9 95 */ bl _restgpr_26
-/* 80D3688C 80 01 00 54 */ lwz r0, 0x54(r1)
-/* 80D36890 7C 08 03 A6 */ mtlr r0
-/* 80D36894 38 21 00 50 */ addi r1, r1, 0x50
-/* 80D36898 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/modeWait__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/modeWait__13daObjWCover_cFv.s
deleted file mode 100644
index dc03ad56c0..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/modeWait__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,129 +0,0 @@
-lbl_80D365B8:
-/* 80D365B8 94 21 FF C0 */ stwu r1, -0x40(r1)
-/* 80D365BC 7C 08 02 A6 */ mflr r0
-/* 80D365C0 90 01 00 44 */ stw r0, 0x44(r1)
-/* 80D365C4 39 61 00 40 */ addi r11, r1, 0x40
-/* 80D365C8 4B 62 BC 15 */ bl _savegpr_29
-/* 80D365CC 7C 7F 1B 78 */ mr r31, r3
-/* 80D365D0 3C 60 80 D3 */ lis r3, lit_3794@ha /* 0x80D36A0C@ha */
-/* 80D365D4 3B C3 6A 0C */ addi r30, r3, lit_3794@l /* 0x80D36A0C@l */
-/* 80D365D8 C0 1E 00 00 */ lfs f0, 0(r30)
-/* 80D365DC D0 01 00 24 */ stfs f0, 0x24(r1)
-/* 80D365E0 C0 1E 00 04 */ lfs f0, 4(r30)
-/* 80D365E4 D0 01 00 28 */ stfs f0, 0x28(r1)
-/* 80D365E8 D0 01 00 2C */ stfs f0, 0x2c(r1)
-/* 80D365EC 38 7F 04 D0 */ addi r3, r31, 0x4d0
-/* 80D365F0 4B 2D 67 75 */ bl transS__14mDoMtx_stack_cFRC4cXyz
-/* 80D365F4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D365F8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D365FC A8 9F 04 E6 */ lha r4, 0x4e6(r31)
-/* 80D36600 4B 2D 5E 35 */ bl mDoMtx_YrotM__FPA4_fs
-/* 80D36604 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D36608 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D3660C 38 81 00 24 */ addi r4, r1, 0x24
-/* 80D36610 7C 85 23 78 */ mr r5, r4
-/* 80D36614 4B 61 07 59 */ bl PSMTXMultVec
-/* 80D36618 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80D3661C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80D36620 83 A3 5D AC */ lwz r29, 0x5dac(r3)
-/* 80D36624 C0 5D 04 D8 */ lfs f2, 0x4d8(r29)
-/* 80D36628 C0 1D 04 D0 */ lfs f0, 0x4d0(r29)
-/* 80D3662C D0 01 00 0C */ stfs f0, 0xc(r1)
-/* 80D36630 C0 3E 00 04 */ lfs f1, 4(r30)
-/* 80D36634 D0 21 00 10 */ stfs f1, 0x10(r1)
-/* 80D36638 D0 41 00 14 */ stfs f2, 0x14(r1)
-/* 80D3663C C0 01 00 24 */ lfs f0, 0x24(r1)
-/* 80D36640 D0 01 00 18 */ stfs f0, 0x18(r1)
-/* 80D36644 D0 21 00 1C */ stfs f1, 0x1c(r1)
-/* 80D36648 C0 01 00 2C */ lfs f0, 0x2c(r1)
-/* 80D3664C D0 01 00 20 */ stfs f0, 0x20(r1)
-/* 80D36650 38 61 00 0C */ addi r3, r1, 0xc
-/* 80D36654 38 81 00 18 */ addi r4, r1, 0x18
-/* 80D36658 4B 61 0D 45 */ bl PSVECSquareDistance
-/* 80D3665C C0 1E 00 04 */ lfs f0, 4(r30)
-/* 80D36660 FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80D36664 40 81 00 58 */ ble lbl_80D366BC
-/* 80D36668 FC 00 08 34 */ frsqrte f0, f1
-/* 80D3666C C8 9E 00 08 */ lfd f4, 8(r30)
-/* 80D36670 FC 44 00 32 */ fmul f2, f4, f0
-/* 80D36674 C8 7E 00 10 */ lfd f3, 0x10(r30)
-/* 80D36678 FC 00 00 32 */ fmul f0, f0, f0
-/* 80D3667C FC 01 00 32 */ fmul f0, f1, f0
-/* 80D36680 FC 03 00 28 */ fsub f0, f3, f0
-/* 80D36684 FC 02 00 32 */ fmul f0, f2, f0
-/* 80D36688 FC 44 00 32 */ fmul f2, f4, f0
-/* 80D3668C FC 00 00 32 */ fmul f0, f0, f0
-/* 80D36690 FC 01 00 32 */ fmul f0, f1, f0
-/* 80D36694 FC 03 00 28 */ fsub f0, f3, f0
-/* 80D36698 FC 02 00 32 */ fmul f0, f2, f0
-/* 80D3669C FC 44 00 32 */ fmul f2, f4, f0
-/* 80D366A0 FC 00 00 32 */ fmul f0, f0, f0
-/* 80D366A4 FC 01 00 32 */ fmul f0, f1, f0
-/* 80D366A8 FC 03 00 28 */ fsub f0, f3, f0
-/* 80D366AC FC 02 00 32 */ fmul f0, f2, f0
-/* 80D366B0 FC 21 00 32 */ fmul f1, f1, f0
-/* 80D366B4 FC 20 08 18 */ frsp f1, f1
-/* 80D366B8 48 00 00 88 */ b lbl_80D36740
-lbl_80D366BC:
-/* 80D366BC C8 1E 00 18 */ lfd f0, 0x18(r30)
-/* 80D366C0 FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80D366C4 40 80 00 10 */ bge lbl_80D366D4
-/* 80D366C8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */
-/* 80D366CC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */
-/* 80D366D0 48 00 00 70 */ b lbl_80D36740
-lbl_80D366D4:
-/* 80D366D4 D0 21 00 08 */ stfs f1, 8(r1)
-/* 80D366D8 80 81 00 08 */ lwz r4, 8(r1)
-/* 80D366DC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8
-/* 80D366E0 3C 00 7F 80 */ lis r0, 0x7f80
-/* 80D366E4 7C 03 00 00 */ cmpw r3, r0
-/* 80D366E8 41 82 00 14 */ beq lbl_80D366FC
-/* 80D366EC 40 80 00 40 */ bge lbl_80D3672C
-/* 80D366F0 2C 03 00 00 */ cmpwi r3, 0
-/* 80D366F4 41 82 00 20 */ beq lbl_80D36714
-/* 80D366F8 48 00 00 34 */ b lbl_80D3672C
-lbl_80D366FC:
-/* 80D366FC 54 80 02 7F */ clrlwi. r0, r4, 9
-/* 80D36700 41 82 00 0C */ beq lbl_80D3670C
-/* 80D36704 38 00 00 01 */ li r0, 1
-/* 80D36708 48 00 00 28 */ b lbl_80D36730
-lbl_80D3670C:
-/* 80D3670C 38 00 00 02 */ li r0, 2
-/* 80D36710 48 00 00 20 */ b lbl_80D36730
-lbl_80D36714:
-/* 80D36714 54 80 02 7F */ clrlwi. r0, r4, 9
-/* 80D36718 41 82 00 0C */ beq lbl_80D36724
-/* 80D3671C 38 00 00 05 */ li r0, 5
-/* 80D36720 48 00 00 10 */ b lbl_80D36730
-lbl_80D36724:
-/* 80D36724 38 00 00 03 */ li r0, 3
-/* 80D36728 48 00 00 08 */ b lbl_80D36730
-lbl_80D3672C:
-/* 80D3672C 38 00 00 04 */ li r0, 4
-lbl_80D36730:
-/* 80D36730 2C 00 00 01 */ cmpwi r0, 1
-/* 80D36734 40 82 00 0C */ bne lbl_80D36740
-/* 80D36738 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */
-/* 80D3673C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */
-lbl_80D36740:
-/* 80D36740 C0 41 00 28 */ lfs f2, 0x28(r1)
-/* 80D36744 C0 1D 04 D4 */ lfs f0, 0x4d4(r29)
-/* 80D36748 EC 42 00 28 */ fsubs f2, f2, f0
-/* 80D3674C C0 1E 00 20 */ lfs f0, 0x20(r30)
-/* 80D36750 FC 01 00 40 */ fcmpo cr0, f1, f0
-/* 80D36754 40 80 00 24 */ bge lbl_80D36778
-/* 80D36758 C0 1E 00 04 */ lfs f0, 4(r30)
-/* 80D3675C FC 02 00 40 */ fcmpo cr0, f2, f0
-/* 80D36760 40 81 00 18 */ ble lbl_80D36778
-/* 80D36764 C0 1E 00 24 */ lfs f0, 0x24(r30)
-/* 80D36768 FC 02 00 40 */ fcmpo cr0, f2, f0
-/* 80D3676C 40 80 00 0C */ bge lbl_80D36778
-/* 80D36770 7F E3 FB 78 */ mr r3, r31
-/* 80D36774 48 00 00 1D */ bl init_modeBreak__13daObjWCover_cFv
-lbl_80D36778:
-/* 80D36778 39 61 00 40 */ addi r11, r1, 0x40
-/* 80D3677C 4B 62 BA AD */ bl _restgpr_29
-/* 80D36780 80 01 00 44 */ lwz r0, 0x44(r1)
-/* 80D36784 7C 08 03 A6 */ mtlr r0
-/* 80D36788 38 21 00 40 */ addi r1, r1, 0x40
-/* 80D3678C 4E 80 00 20 */ blr
diff --git a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/setBaseMtx__13daObjWCover_cFv.s b/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/setBaseMtx__13daObjWCover_cFv.s
deleted file mode 100644
index 520bfcd1ac..0000000000
--- a/asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/setBaseMtx__13daObjWCover_cFv.s
+++ /dev/null
@@ -1,30 +0,0 @@
-lbl_80D362D4:
-/* 80D362D4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80D362D8 7C 08 02 A6 */ mflr r0
-/* 80D362DC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80D362E0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80D362E4 7C 7F 1B 78 */ mr r31, r3
-/* 80D362E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D362EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D362F0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31)
-/* 80D362F4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31)
-/* 80D362F8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31)
-/* 80D362FC 4B 61 05 ED */ bl PSMTXTrans
-/* 80D36300 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D36304 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D36308 A8 9F 04 E6 */ lha r4, 0x4e6(r31)
-/* 80D3630C 4B 2D 61 29 */ bl mDoMtx_YrotM__FPA4_fs
-/* 80D36310 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D36314 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D36318 80 9F 05 A8 */ lwz r4, 0x5a8(r31)
-/* 80D3631C 38 84 00 24 */ addi r4, r4, 0x24
-/* 80D36320 4B 61 01 91 */ bl PSMTXCopy
-/* 80D36324 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
-/* 80D36328 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
-/* 80D3632C 38 9F 05 6C */ addi r4, r31, 0x56c
-/* 80D36330 4B 61 01 81 */ bl PSMTXCopy
-/* 80D36334 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80D36338 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80D3633C 7C 08 03 A6 */ mtlr r0
-/* 80D36340 38 21 00 10 */ addi r1, r1, 0x10
-/* 80D36344 4E 80 00 20 */ blr
diff --git a/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h b/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h
index 5c572160e0..f66abe1d4b 100644
--- a/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h
+++ b/include/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.h
@@ -5,4 +5,27 @@
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
+class daObjWCover_c : public dBgS_MoveBgActor {
+public:
+ /* 80D36298 */ void initBaseMtx();
+ /* 80D362D4 */ void setBaseMtx();
+ /* 80D36348 */ int Create();
+ /* 80D36394 */ int CreateHeap();
+ /* 80D36404 */ int create();
+ /* 80D364E0 */ int Execute(Mtx**);
+ /* 80D3652C */ void action();
+ /* 80D365B8 */ void modeWait();
+ /* 80D36790 */ void init_modeBreak();
+ /* 80D3689C */ void modeBreak();
+ /* 80D368A0 */ int Draw();
+ /* 80D36944 */ int Delete();
+
+ u8 getSwNo() { return fopAcM_GetParam(this); }
+
+ /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
+ /* 0x5A8 */ J3DModel* mpModel;
+ /* 0x5AC */ u8 field_0x5AC[0x5B0 - 0x5AC];
+ /* 0x5B0 */ u8 field_0x5b0;
+}; // Size: 0x5B4
+
#endif /* D_A_OBJ_WELL_COVER_H */
diff --git a/rel/d/a/obj/d_a_obj_well_cover/Makefile b/rel/d/a/obj/d_a_obj_well_cover/Makefile
index 378364ba46..dae1d1e331 100644
--- a/rel/d/a/obj/d_a_obj_well_cover/Makefile
+++ b/rel/d/a/obj/d_a_obj_well_cover/Makefile
@@ -8,12 +8,10 @@ M686_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_well_cover.map
M686_CPP_FILES := \
rel/executor.cpp \
- rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp \
rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp \
M686_O_FILES := \
$(BUILD_DIR)/rel/executor.o \
- $(BUILD_DIR)/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.o \
$(BUILD_DIR)/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.o \
M686_LIBS := \
diff --git a/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp b/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp
index c1445284da..38001ad715 100644
--- a/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp
+++ b/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp
@@ -1,5 +1,5 @@
/**
- * d_a_obj_well_cover.cpp
+ * Object - Well Cover
*
*/
@@ -7,131 +7,39 @@
#include "JSystem/JKernel/JKRHeap.h"
#include "d/bg/d_bg_w.h"
#include "d/d_procname.h"
-#include "dol2asm.h"
-
-class daObjWCover_c : public dBgS_MoveBgActor {
-public:
- /* 80D36298 */ void initBaseMtx();
- /* 80D362D4 */ void setBaseMtx();
- /* 80D36348 */ int Create();
- /* 80D36394 */ int CreateHeap();
- /* 80D36404 */ int create();
- /* 80D364E0 */ int Execute(Mtx**);
- /* 80D3652C */ void action();
- /* 80D365B8 */ void modeWait();
- /* 80D36790 */ void init_modeBreak();
- /* 80D3689C */ void modeBreak();
- /* 80D368A0 */ int Draw();
- /* 80D36944 */ int Delete();
-
- u32 getSwNo() { return fopAcM_GetParam(this); }
-
- /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
- /* 0x5A8 */ J3DModel* mpModel;
- /* 0x5AC */ u8 field_0x5AC[0x5B0 - 0x5AC];
- /* 0x5B0 */ u8 field_0x5b0;
-}; // Size: 0x5B4
-
-//
-// Forward References:
-//
-
-extern "C" void initBaseMtx__13daObjWCover_cFv();
-extern "C" void setBaseMtx__13daObjWCover_cFv();
-extern "C" void Create__13daObjWCover_cFv();
-extern "C" void CreateHeap__13daObjWCover_cFv();
-extern "C" void create__13daObjWCover_cFv();
-extern "C" void Execute__13daObjWCover_cFPPA3_A4_f();
-extern "C" void action__13daObjWCover_cFv();
-extern "C" void modeWait__13daObjWCover_cFv();
-extern "C" void init_modeBreak__13daObjWCover_cFv();
-extern "C" void modeBreak__13daObjWCover_cFv();
-extern "C" void Draw__13daObjWCover_cFv();
-extern "C" void Delete__13daObjWCover_cFv();
-extern "C" static void daObjWCover_Draw__FP13daObjWCover_c();
-extern "C" static void daObjWCover_Execute__FP13daObjWCover_c();
-extern "C" static void daObjWCover_Delete__FP13daObjWCover_c();
-extern "C" static void daObjWCover_Create__FP10fopAc_ac_c();
-extern "C" extern char const* const d_a_obj_well_cover__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_YrotM__FPA4_fs();
-extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
-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 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 __ct__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 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
-extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
-extern "C" void __ptmf_scall();
-extern "C" void _savegpr_26();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_26();
-extern "C" void _restgpr_29();
-extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 data_80D36B18[4];
-
-//
-// Declarations:
-//
+#include "d/a/d_a_player.h"
/* 80D36298-80D362D4 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjWCover_c::initBaseMtx() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/initBaseMtx__13daObjWCover_cFv.s"
+void daObjWCover_c::initBaseMtx() {
+ mpModel->setBaseScale(scale);
+ setBaseMtx();
}
-#pragma pop
/* 80D362D4-80D36348 0000B4 0074+00 2/2 0/0 0/0 .text setBaseMtx__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjWCover_c::setBaseMtx() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/setBaseMtx__13daObjWCover_cFv.s"
+void daObjWCover_c::setBaseMtx() {
+ mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
+ mDoMtx_stack_c::YrotM(shape_angle.y);
+ mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+ MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
-#pragma pop
/* 80D36348-80D36394 000128 004C+00 1/0 0/0 0/0 .text Create__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int daObjWCover_c::Create() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Create__13daObjWCover_cFv.s"
+int daObjWCover_c::Create() {
+ initBaseMtx();
+ fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
+ fopAcM_setCullSizeBox2(this, mpModel->getModelData());
+ return 1;
}
-#pragma pop
/* 80D36A4C-80D36A58 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,
};
/* 80D36A58-80D36A6C 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,
@@ -145,222 +53,87 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
static char* l_arcName = "H_Idohuta";
/* 80D36394-80D36404 000174 0070+00 1/0 0/0 0/0 .text CreateHeap__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int daObjWCover_c::CreateHeap() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/CreateHeap__13daObjWCover_cFv.s"
+int daObjWCover_c::CreateHeap() {
+ J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, 4));
+ JUT_ASSERT(194, modelData != 0)
+ mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
+ return mpModel != NULL ? 1 : 0;
}
-#pragma pop
-
-/* ############################################################################################## */
-/* 80D36A70-80D36A7C -00001 000C+00 0/1 0/0 0/0 .data @3731 */
-#ifdef NONMATCHING
-typedef void (daObjWCover_c::*modeFunc)();
-static modeFunc l_func[] = {
- &daObjWCover_c::modeWait,
- &daObjWCover_c::modeBreak,
-};
-#else
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3731[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)modeWait__13daObjWCover_cFv,
-};
-#pragma pop
-
-/* 80D36A7C-80D36A88 -00001 000C+00 0/1 0/0 0/0 .data @3732 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3732[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)modeBreak__13daObjWCover_cFv,
-};
-#pragma pop
-
-/* 80D36A88-80D36AA0 00003C 0018+00 0/1 0/0 0/0 .data l_func$3730 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 l_func[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
-#endif
-/* 80D36AA0-80D36AC0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWCover_Method */
-SECTION_DATA static void* l_daObjWCover_Method[8] = {
- (void*)daObjWCover_Create__FP10fopAc_ac_c,
- (void*)daObjWCover_Delete__FP13daObjWCover_c,
- (void*)daObjWCover_Execute__FP13daObjWCover_c,
- (void*)NULL,
- (void*)daObjWCover_Draw__FP13daObjWCover_c,
- (void*)NULL,
- (void*)NULL,
- (void*)NULL,
-};
-
-/* 80D36AC0-80D36AF0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WellCover */
-SECTION_DATA extern void* g_profile_Obj_WellCover[12] = {
- (void*)0xFFFFFFFD, (void*)0x0003FFFD,
- (void*)0x00860000, (void*)&g_fpcLf_Method,
- (void*)0x000005B4, (void*)NULL,
- (void*)NULL, (void*)&g_fopAc_Method,
- (void*)0x025E0000, (void*)&l_daObjWCover_Method,
- (void*)0x00040100, (void*)0x000E0000,
-};
-
-/* 80D36AF0-80D36B18 0000A4 0028+00 1/1 0/0 0/0 .data __vt__13daObjWCover_c */
-SECTION_DATA extern void* __vt__13daObjWCover_c[10] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)CreateHeap__13daObjWCover_cFv,
- (void*)Create__13daObjWCover_cFv,
- (void*)Execute__13daObjWCover_cFPPA3_A4_f,
- (void*)Draw__13daObjWCover_cFv,
- (void*)Delete__13daObjWCover_cFv,
- (void*)IsDelete__16dBgS_MoveBgActorFv,
- (void*)ToFore__16dBgS_MoveBgActorFv,
- (void*)ToBack__16dBgS_MoveBgActorFv,
-};
/* 80D36404-80D364E0 0001E4 00DC+00 1/1 0/0 0/0 .text create__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int daObjWCover_c::create() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/func_80D36404.s"
+int daObjWCover_c::create() {
+ fopAcM_SetupActor(this, daObjWCover_c);
+ if (fopAcM_isSwitch(this, getSwNo())) {
+ return cPhs_ERROR_e;
+ }
+
+ int rv = dComIfG_resLoad(&mPhaseReq, l_arcName);
+ if (rv == cPhs_COMPLEATE_e) {
+ rv = MoveBGCreate(l_arcName, 7, NULL, 0xd90, NULL);
+ if (rv == cPhs_ERROR_e) {
+ return rv;
+ }
+ }
+
+ return rv;
}
-#pragma pop
/* 80D364E0-80D3652C 0002C0 004C+00 1/0 0/0 0/0 .text Execute__13daObjWCover_cFPPA3_A4_f
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int daObjWCover_c::Execute(Mtx** i_mtx) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Execute__13daObjWCover_cFPPA3_A4_f.s"
+int daObjWCover_c::Execute(Mtx** i_mtx) {
+ action();
+ *i_mtx = &mBgMtx;
+ setBaseMtx();
+ return 1;
}
-#pragma pop
-
-/* 80D3652C-80D365B8 00030C 008C+00 1/1 0/0 0/0 .text action__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjWCover_c::action() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/action__13daObjWCover_cFv.s"
-}
-#pragma pop
-
-/* ############################################################################################## */
-/* 80D36A0C-80D36A10 000000 0004+00 2/2 0/0 0/0 .rodata @3794 */
-SECTION_RODATA static f32 const lit_3794 = 150.0f;
-COMPILER_STRIP_GATE(0x80D36A0C, &lit_3794);
-
-/* 80D36A10-80D36A14 000004 0004+00 0/2 0/0 0/0 .rodata @3795 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3795[4] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
-};
-COMPILER_STRIP_GATE(0x80D36A10, &lit_3795);
-#pragma pop
-
-/* 80D36A14-80D36A1C 000008 0008+00 0/1 0/0 0/0 .rodata @3796 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3796[8] = {
- 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D36A14, &lit_3796);
-#pragma pop
-/* 80D36A1C-80D36A24 000010 0008+00 0/1 0/0 0/0 .rodata @3797 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3797[8] = {
- 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D36A1C, &lit_3797);
-#pragma pop
-
-/* 80D36A24-80D36A2C 000018 0008+00 0/1 0/0 0/0 .rodata @3798 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3798[8] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D36A24, &lit_3798);
-#pragma pop
+typedef void (daObjWCover_c::*modeFunc)();
-/* 80D36A2C-80D36A30 000020 0004+00 0/1 0/0 0/0 .rodata @3799 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3799 = 80.0f;
-COMPILER_STRIP_GATE(0x80D36A2C, &lit_3799);
-#pragma pop
+/* 80D3652C-80D365B8 00030C 008C+00 1/1 0/0 0/0 .text action__13daObjWCover_cFv */
+void daObjWCover_c::action() {
+ static modeFunc l_func[] = {
+ &daObjWCover_c::modeWait,
+ &daObjWCover_c::modeBreak,
+ };
-/* 80D36A30-80D36A34 000024 0004+00 0/1 0/0 0/0 .rodata @3800 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3800 = 200.0f;
-COMPILER_STRIP_GATE(0x80D36A30, &lit_3800);
-#pragma pop
+ (this->*l_func[field_0x5b0])();
+}
/* 80D365B8-80D36790 000398 01D8+00 1/0 0/0 0/0 .text modeWait__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjWCover_c::modeWait() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/modeWait__13daObjWCover_cFv.s"
+void daObjWCover_c::modeWait() {
+ cXyz acStack_48(150.0f, 0.0f, 0.0f);
+ mDoMtx_stack_c::transS(current.pos);
+ mDoMtx_stack_c::YrotM(shape_angle.y);
+ mDoMtx_stack_c::multVec(&acStack_48, &acStack_48);
+ daPy_py_c* player = daPy_getPlayerActorClass();
+ f32 dVar6 = player->current.pos.absXZ(acStack_48);
+ f32 fVar1 = acStack_48.y - player->current.pos.y;
+ if (dVar6 < 80.0f && fVar1 > 0.0f && fVar1 < 200.0f) {
+ init_modeBreak();
+ }
}
-#pragma pop
-/* ############################################################################################## */
/* 80D36A34-80D36A3C 000028 0006+02 0/1 0/0 0/0 .rodata particle_id$3806 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const particle_id[6 + 2 /* padding */] = {
- 0x82,
- 0xAB,
- 0x82,
- 0xAC,
- 0x82,
- 0xAD,
- /* padding */
- 0x00,
- 0x00,
+static u16 const particle_id[3] = {
+ 0x82AB,
+ 0x82AC,
+ 0x82AD,
};
-COMPILER_STRIP_GATE(0x80D36A34, &particle_id);
-#pragma pop
-
-/* 80D36A3C-80D36A40 000030 0004+00 0/1 0/0 0/0 .rodata @3833 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3833 = 1.0f;
-COMPILER_STRIP_GATE(0x80D36A3C, &lit_3833);
-#pragma pop
/* 80D36790-80D3689C 000570 010C+00 1/1 0/0 0/0 .text init_modeBreak__13daObjWCover_cFv
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjWCover_c::init_modeBreak() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/init_modeBreak__13daObjWCover_cFv.s"
+void daObjWCover_c::init_modeBreak() {
+ fopAcM_onSwitch(this, getSwNo());
+ cXyz acStack_28(150.0f, 0.0f, 0.0f);
+ mDoMtx_stack_c::transS(current.pos);
+ mDoMtx_stack_c::YrotM(shape_angle.y);
+ mDoMtx_stack_c::multVec(&acStack_28, &acStack_28);
+ for (int i = 0; i < 3; i++) {
+ dComIfGp_particle_set(particle_id[i], &acStack_28, NULL, NULL);
+ }
+ fopAcM_delete(this);
+ field_0x5b0 = 1;
}
-#pragma pop
/* 80D3689C-80D368A0 00067C 0004+00 1/0 0/0 0/0 .text modeBreak__13daObjWCover_cFv */
void daObjWCover_c::modeBreak() {
@@ -368,63 +141,65 @@ void daObjWCover_c::modeBreak() {
}
/* 80D368A0-80D36944 000680 00A4+00 1/0 0/0 0/0 .text Draw__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int daObjWCover_c::Draw() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Draw__13daObjWCover_cFv.s"
+int daObjWCover_c::Draw() {
+ g_env_light.settingTevStruct(16, &current.pos, &tevStr);
+ g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
+ dComIfGd_setListBG();
+ mDoExt_modelUpdateDL(mpModel);
+ dComIfGd_setList();
+ return 1;
}
-#pragma pop
/* 80D36944-80D36978 000724 0034+00 1/0 0/0 0/0 .text Delete__13daObjWCover_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm int daObjWCover_c::Delete() {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/Delete__13daObjWCover_cFv.s"
+int daObjWCover_c::Delete() {
+ dComIfG_resDelete(&mPhaseReq, l_arcName);
+ return 1;
}
-#pragma pop
/* 80D36978-80D369A4 000758 002C+00 1/0 0/0 0/0 .text daObjWCover_Draw__FP13daObjWCover_c
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjWCover_Draw(daObjWCover_c* i_this) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Draw__FP13daObjWCover_c.s"
+static int daObjWCover_Draw(daObjWCover_c* i_this) {
+ return i_this->Draw();
}
-#pragma pop
/* 80D369A4-80D369C4 000784 0020+00 1/0 0/0 0/0 .text daObjWCover_Execute__FP13daObjWCover_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjWCover_Execute(daObjWCover_c* i_this) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Execute__FP13daObjWCover_c.s"
+static int daObjWCover_Execute(daObjWCover_c* i_this) {
+ return i_this->MoveBGExecute();
}
-#pragma pop
/* 80D369C4-80D369E4 0007A4 0020+00 1/0 0/0 0/0 .text daObjWCover_Delete__FP13daObjWCover_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjWCover_Delete(daObjWCover_c* i_this) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Delete__FP13daObjWCover_c.s"
+static int daObjWCover_Delete(daObjWCover_c* i_this) {
+ return i_this->MoveBGDelete();
}
-#pragma pop
/* 80D369E4-80D36A04 0007C4 0020+00 1/0 0/0 0/0 .text daObjWCover_Create__FP10fopAc_ac_c
*/
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjWCover_Create(fopAc_ac_c* i_this) {
- nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover/daObjWCover_Create__FP10fopAc_ac_c.s"
+static int daObjWCover_Create(fopAc_ac_c* i_this) {
+ return static_cast<daObjWCover_c*>(i_this)->create();
}
-#pragma pop
+
+/* 80D36AA0-80D36AC0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWCover_Method */
+static actor_method_class l_daObjWCover_Method = {
+ (process_method_func)daObjWCover_Create,
+ (process_method_func)daObjWCover_Delete,
+ (process_method_func)daObjWCover_Execute,
+ (process_method_func)NULL,
+ (process_method_func)daObjWCover_Draw,
+};
+
+extern actor_process_profile_definition g_profile_Obj_WellCover = {
+ fpcLy_CURRENT_e, // mLayerID
+ 3, // mListID
+ fpcPi_CURRENT_e, // mListPrio
+ PROC_Obj_WellCover, // mProcName
+ &g_fpcLf_Method.mBase, // sub_method
+ sizeof(daObjWCover_c), // mSize
+ 0, // mSizeOther
+ 0, // mParameters
+ &g_fopAc_Method.base, // sub_method
+ 0x25E, // mPriority
+ &l_daObjWCover_Method, // sub_method
+ 0x40100, // mStatus
+ fopAc_ACTOR_e, // mActorType
+ fopAc_CULLBOX_CUSTOM_e, // cullType
+};
diff --git a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp
deleted file mode 100644
index bc48b7367e..0000000000
--- a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Generated By: dol2asm
-// Translation Unit: unknown_translation_unit_bss
-//
-
-#include "rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.h"
-#include "dolphin/types.h"
-
-//
-// Forward References:
-//
-
-extern "C" extern u8 data_80D36B18[4];
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80D36B18-80D36B1C 000000 0004+00 0/0 1/1 0/0 .bss None */
-extern u8 data_80D36B18[4];
-u8 data_80D36B18[4];