diff options
17 files changed, 213 insertions, 901 deletions
diff --git a/Progress.md b/Progress.md index 182abff7d4..7491231f83 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 52.660948% | 2117324 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 52.660948% | 2117324 | 4020672 -RELs | 36.196719% | 4162740 | 11500324 -Total | 40.461733% | 6280064 | 15520996 +RELs | 36.213275% | 4164644 | 11500324 +Total | 40.474001% | 6281968 | 15520996 ## RELs @@ -356,7 +356,7 @@ d_a_obj_bemos | 32.943081% | 10580 | 32116 d_a_obj_bhashi | 31.443815% | 3772 | 11996 d_a_obj_bhbridge | 39.936609% | 2016 | 5048 d_a_obj_bk_leaf | 100.000000% | 2728 | 2728 -d_a_obj_bkdoor | 45.847554% | 1612 | 3516 +d_a_obj_bkdoor | 100.000000% | 3516 | 3516 d_a_obj_bky_rock | 35.592460% | 3172 | 8912 d_a_obj_bmWindow | 38.757933% | 3420 | 8824 d_a_obj_bmshutter | 41.338854% | 2396 | 5796 @@ -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 | 36.196719% | 4162740 | 11500324 +Total | 36.213275% | 4164644 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/CreateHeap__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/CreateHeap__13daObjBkDoor_cFv.s deleted file mode 100644 index 4fa575b80e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/CreateHeap__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80578EA0: -/* 80578EA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80578EA4 7C 08 02 A6 */ mflr r0 -/* 80578EA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80578EAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80578EB0 7C 7F 1B 78 */ mr r31, r3 -/* 80578EB4 3C 60 80 58 */ lis r3, l_arcName@ha /* 0x80579544@ha */ -/* 80578EB8 38 63 95 44 */ addi r3, r3, l_arcName@l /* 0x80579544@l */ -/* 80578EBC 80 63 00 00 */ lwz r3, 0(r3) -/* 80578EC0 88 1F 05 BC */ lbz r0, 0x5bc(r31) -/* 80578EC4 54 00 10 3A */ slwi r0, r0, 2 -/* 80578EC8 3C 80 80 58 */ lis r4, l_bmd@ha /* 0x80579490@ha */ -/* 80578ECC 38 84 94 90 */ addi r4, r4, l_bmd@l /* 0x80579490@l */ -/* 80578ED0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80578ED4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80578ED8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80578EDC 3C A5 00 02 */ addis r5, r5, 2 -/* 80578EE0 38 C0 00 80 */ li r6, 0x80 -/* 80578EE4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80578EE8 4B AC 34 05 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80578EEC 3C 80 00 08 */ lis r4, 8 -/* 80578EF0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80578EF4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80578EF8 4B A9 BD 5D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80578EFC 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80578F00 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80578F04 30 03 FF FF */ addic r0, r3, -1 -/* 80578F08 7C 60 19 10 */ subfe r3, r0, r3 -/* 80578F0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80578F10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80578F14 7C 08 03 A6 */ mtlr r0 -/* 80578F18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80578F1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Create__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Create__13daObjBkDoor_cFv.s deleted file mode 100644 index 31294a198b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Create__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80578E14: -/* 80578E14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80578E18 7C 08 02 A6 */ mflr r0 -/* 80578E1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80578E20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80578E24 7C 7F 1B 78 */ mr r31, r3 -/* 80578E28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80578E2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80578E30 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80578E34 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80578E38 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80578E3C A0 84 00 1E */ lhz r4, 0x1e(r4) -/* 80578E40 4B AB BB 7D */ bl isEventBit__11dSv_event_cCFUs -/* 80578E44 2C 03 00 00 */ cmpwi r3, 0 -/* 80578E48 41 82 00 10 */ beq lbl_80578E58 -/* 80578E4C A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80578E50 38 03 80 00 */ addi r0, r3, -32768 -/* 80578E54 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -lbl_80578E58: -/* 80578E58 7F E3 FB 78 */ mr r3, r31 -/* 80578E5C 4B FF FE F1 */ bl initBaseMtx__13daObjBkDoor_cFv -/* 80578E60 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80578E64 38 03 00 24 */ addi r0, r3, 0x24 -/* 80578E68 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80578E6C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80578E70 80 83 00 04 */ lwz r4, 4(r3) -/* 80578E74 7F E3 FB 78 */ mr r3, r31 -/* 80578E78 4B AA 17 01 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80578E7C 3C 60 80 58 */ lis r3, lit_3702@ha /* 0x80579514@ha */ -/* 80578E80 C0 03 95 14 */ lfs f0, lit_3702@l(r3) /* 0x80579514@l */ -/* 80578E84 D0 1F 05 20 */ stfs f0, 0x520(r31) -/* 80578E88 38 60 00 01 */ li r3, 1 -/* 80578E8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80578E90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80578E94 7C 08 03 A6 */ mtlr r0 -/* 80578E98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80578E9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Delete__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Delete__13daObjBkDoor_cFv.s deleted file mode 100644 index c14cc6a3ec..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Delete__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80579388: -/* 80579388 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057938C 7C 08 02 A6 */ mflr r0 -/* 80579390 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579394 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x80579544@ha */ -/* 80579398 38 84 95 44 */ addi r4, r4, l_arcName@l /* 0x80579544@l */ -/* 8057939C 80 84 00 00 */ lwz r4, 0(r4) -/* 805793A0 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 805793A4 4B AB 3C 65 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 805793A8 38 60 00 01 */ li r3, 1 -/* 805793AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805793B0 7C 08 03 A6 */ mtlr r0 -/* 805793B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 805793B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Draw__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Draw__13daObjBkDoor_cFv.s deleted file mode 100644 index b660c0fcd9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Draw__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_805792E4: -/* 805792E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805792E8 7C 08 02 A6 */ mflr r0 -/* 805792EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 805792F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805792F4 93 C1 00 08 */ stw r30, 8(r1) -/* 805792F8 7C 7E 1B 78 */ mr r30, r3 -/* 805792FC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80579300 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80579304 38 80 00 10 */ li r4, 0x10 -/* 80579308 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8057930C 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80579310 4B C2 A4 B5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80579314 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80579318 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8057931C 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80579320 80 84 00 04 */ lwz r4, 4(r4) -/* 80579324 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80579328 4B C2 BA 79 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8057932C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579330 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80579334 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80579338 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8057933C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80579340 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80579344 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80579348 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8057934C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80579350 4B A9 49 75 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80579354 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579358 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057935C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80579360 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80579364 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80579368 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8057936C 38 60 00 01 */ li r3, 1 -/* 80579370 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80579374 83 C1 00 08 */ lwz r30, 8(r1) -/* 80579378 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057937C 7C 08 03 A6 */ mtlr r0 -/* 80579380 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579384 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Execute__13daObjBkDoor_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Execute__13daObjBkDoor_cFPPA3_A4_f.s deleted file mode 100644 index e8059ee258..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Execute__13daObjBkDoor_cFPPA3_A4_f.s +++ /dev/null @@ -1,180 +0,0 @@ -lbl_8057902C: -/* 8057902C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80579030 7C 08 02 A6 */ mflr r0 -/* 80579034 90 01 00 54 */ stw r0, 0x54(r1) -/* 80579038 39 61 00 50 */ addi r11, r1, 0x50 -/* 8057903C 4B DE 91 99 */ bl _savegpr_27 -/* 80579040 7C 7C 1B 78 */ mr r28, r3 -/* 80579044 7C 9D 23 78 */ mr r29, r4 -/* 80579048 3C 60 80 58 */ lis r3, l_bmd@ha /* 0x80579490@ha */ -/* 8057904C 3B E3 94 90 */ addi r31, r3, l_bmd@l /* 0x80579490@l */ -/* 80579050 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80579054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80579058 83 C3 5D B4 */ lwz r30, 0x5db4(r3) -/* 8057905C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80579060 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80579064 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80579068 A0 84 00 1E */ lhz r4, 0x1e(r4) -/* 8057906C 4B AB B9 51 */ bl isEventBit__11dSv_event_cCFUs -/* 80579070 7C 7B 1B 78 */ mr r27, r3 -/* 80579074 80 7C 05 B8 */ lwz r3, 0x5b8(r28) -/* 80579078 38 03 00 01 */ addi r0, r3, 1 -/* 8057907C 90 1C 05 B8 */ stw r0, 0x5b8(r28) -/* 80579080 7F 83 E3 78 */ mr r3, r28 -/* 80579084 4B FF FF 3D */ bl openCheck__13daObjBkDoor_cFv -/* 80579088 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 8057908C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80579090 41 82 01 E8 */ beq lbl_80579278 -/* 80579094 2C 1B 00 00 */ cmpwi r27, 0 -/* 80579098 40 82 01 E0 */ bne lbl_80579278 -/* 8057909C 88 1C 05 BC */ lbz r0, 0x5bc(r28) -/* 805790A0 28 00 00 01 */ cmplwi r0, 1 -/* 805790A4 40 82 00 50 */ bne lbl_805790F4 -/* 805790A8 38 7F 00 54 */ addi r3, r31, 0x54 -/* 805790AC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 805790B0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805790B4 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 805790B8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 805790BC C0 03 00 14 */ lfs f0, 0x14(r3) -/* 805790C0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 805790C4 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 805790C8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 805790CC C0 03 00 28 */ lfs f0, 0x28(r3) -/* 805790D0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 805790D4 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 805790D8 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805790DC 88 1C 05 BE */ lbz r0, 0x5be(r28) -/* 805790E0 28 00 00 00 */ cmplwi r0, 0 -/* 805790E4 41 82 00 58 */ beq lbl_8057913C -/* 805790E8 C0 1F 00 88 */ lfs f0, 0x88(r31) -/* 805790EC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805790F0 48 00 00 4C */ b lbl_8057913C -lbl_805790F4: -/* 805790F4 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 805790F8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805790FC 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80579100 C0 03 00 04 */ lfs f0, 4(r3) -/* 80579104 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80579108 C0 03 00 08 */ lfs f0, 8(r3) -/* 8057910C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80579110 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80579114 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80579118 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 8057911C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80579120 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80579124 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80579128 88 1C 05 BE */ lbz r0, 0x5be(r28) -/* 8057912C 28 00 00 00 */ cmplwi r0, 0 -/* 80579130 41 82 00 0C */ beq lbl_8057913C -/* 80579134 C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80579138 D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_8057913C: -/* 8057913C 7F C3 F3 78 */ mr r3, r30 -/* 80579140 7F 84 E3 78 */ mr r4, r28 -/* 80579144 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80579148 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8057914C 4B AB 95 09 */ bl dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz -/* 80579150 2C 03 00 00 */ cmpwi r3, 0 -/* 80579154 41 82 01 24 */ beq lbl_80579278 -/* 80579158 88 1C 05 BC */ lbz r0, 0x5bc(r28) -/* 8057915C 28 00 00 01 */ cmplwi r0, 1 -/* 80579160 40 82 00 B8 */ bne lbl_80579218 -/* 80579164 C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 80579168 D0 1C 05 B4 */ stfs f0, 0x5b4(r28) -/* 8057916C 88 1C 05 BE */ lbz r0, 0x5be(r28) -/* 80579170 28 00 00 00 */ cmplwi r0, 0 -/* 80579174 41 82 00 54 */ beq lbl_805791C8 -/* 80579178 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 8057917C 7C 03 07 74 */ extsb r3, r0 -/* 80579180 4B AB 3E ED */ bl dComIfGp_getReverb__Fi -/* 80579184 7C 67 1B 78 */ mr r7, r3 -/* 80579188 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080233@ha */ -/* 8057918C 38 03 02 33 */ addi r0, r3, 0x0233 /* 0x00080233@l */ -/* 80579190 90 01 00 10 */ stw r0, 0x10(r1) -/* 80579194 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80579198 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8057919C 80 63 00 00 */ lwz r3, 0(r3) -/* 805791A0 38 81 00 10 */ addi r4, r1, 0x10 -/* 805791A4 38 BC 05 38 */ addi r5, r28, 0x538 -/* 805791A8 38 C0 00 00 */ li r6, 0 -/* 805791AC C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 805791B0 FC 40 08 90 */ fmr f2, f1 -/* 805791B4 C0 7F 00 98 */ lfs f3, 0x98(r31) -/* 805791B8 FC 80 18 90 */ fmr f4, f3 -/* 805791BC 39 00 00 00 */ li r8, 0 -/* 805791C0 4B D3 27 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 805791C4 48 00 00 B4 */ b lbl_80579278 -lbl_805791C8: -/* 805791C8 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 805791CC 7C 03 07 74 */ extsb r3, r0 -/* 805791D0 4B AB 3E 9D */ bl dComIfGp_getReverb__Fi -/* 805791D4 7C 67 1B 78 */ mr r7, r3 -/* 805791D8 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080232@ha */ -/* 805791DC 38 03 02 32 */ addi r0, r3, 0x0232 /* 0x00080232@l */ -/* 805791E0 90 01 00 0C */ stw r0, 0xc(r1) -/* 805791E4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 805791E8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 805791EC 80 63 00 00 */ lwz r3, 0(r3) -/* 805791F0 38 81 00 0C */ addi r4, r1, 0xc -/* 805791F4 38 BC 05 38 */ addi r5, r28, 0x538 -/* 805791F8 38 C0 00 00 */ li r6, 0 -/* 805791FC C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80579200 FC 40 08 90 */ fmr f2, f1 -/* 80579204 C0 7F 00 98 */ lfs f3, 0x98(r31) -/* 80579208 FC 80 18 90 */ fmr f4, f3 -/* 8057920C 39 00 00 00 */ li r8, 0 -/* 80579210 4B D3 27 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80579214 48 00 00 64 */ b lbl_80579278 -lbl_80579218: -/* 80579218 C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 8057921C D0 1C 05 B4 */ stfs f0, 0x5b4(r28) -/* 80579220 88 1C 05 BE */ lbz r0, 0x5be(r28) -/* 80579224 28 00 00 00 */ cmplwi r0, 0 -/* 80579228 41 82 00 50 */ beq lbl_80579278 -/* 8057922C 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 80579230 7C 03 07 74 */ extsb r3, r0 -/* 80579234 4B AB 3E 39 */ bl dComIfGp_getReverb__Fi -/* 80579238 7C 67 1B 78 */ mr r7, r3 -/* 8057923C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080233@ha */ -/* 80579240 38 03 02 33 */ addi r0, r3, 0x0233 /* 0x00080233@l */ -/* 80579244 90 01 00 08 */ stw r0, 8(r1) -/* 80579248 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8057924C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80579250 80 63 00 00 */ lwz r3, 0(r3) -/* 80579254 38 81 00 08 */ addi r4, r1, 8 -/* 80579258 38 BC 05 38 */ addi r5, r28, 0x538 -/* 8057925C 38 C0 00 00 */ li r6, 0 -/* 80579260 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80579264 FC 40 08 90 */ fmr f2, f1 -/* 80579268 C0 7F 00 98 */ lfs f3, 0x98(r31) -/* 8057926C FC 80 18 90 */ fmr f4, f3 -/* 80579270 39 00 00 00 */ li r8, 0 -/* 80579274 4B D3 27 11 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80579278: -/* 80579278 38 1C 05 6C */ addi r0, r28, 0x56c -/* 8057927C 90 1D 00 00 */ stw r0, 0(r29) -/* 80579280 7F 83 E3 78 */ mr r3, r28 -/* 80579284 4B FF FB 05 */ bl setBaseMtx__13daObjBkDoor_cFv -/* 80579288 80 1C 05 B8 */ lwz r0, 0x5b8(r28) -/* 8057928C 1C 00 0F A0 */ mulli r0, r0, 0xfa0 -/* 80579290 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80579294 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80579298 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8057929C 7C 23 04 2E */ lfsx f1, r3, r0 -/* 805792A0 C0 1C 05 B4 */ lfs f0, 0x5b4(r28) -/* 805792A4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 805792A8 FC 00 00 1E */ fctiwz f0, f0 -/* 805792AC D8 01 00 30 */ stfd f0, 0x30(r1) -/* 805792B0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 805792B4 B0 1C 05 AE */ sth r0, 0x5ae(r28) -/* 805792B8 38 7C 05 B4 */ addi r3, r28, 0x5b4 -/* 805792BC C0 3F 00 A0 */ lfs f1, 0xa0(r31) -/* 805792C0 C0 5F 00 A4 */ lfs f2, 0xa4(r31) -/* 805792C4 4B CF 67 BD */ bl cLib_addCalc0__FPfff -/* 805792C8 38 60 00 01 */ li r3, 1 -/* 805792CC 39 61 00 50 */ addi r11, r1, 0x50 -/* 805792D0 4B DE 8F 51 */ bl _restgpr_27 -/* 805792D4 80 01 00 54 */ lwz r0, 0x54(r1) -/* 805792D8 7C 08 03 A6 */ mtlr r0 -/* 805792DC 38 21 00 50 */ addi r1, r1, 0x50 -/* 805792E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/create1st__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/create1st__13daObjBkDoor_cFv.s deleted file mode 100644 index 899fe1dee9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/create1st__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80578F20: -/* 80578F20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80578F24 7C 08 02 A6 */ mflr r0 -/* 80578F28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80578F2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80578F30 7C 7F 1B 78 */ mr r31, r3 -/* 80578F34 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80578F38 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 80578F3C 98 03 05 BC */ stb r0, 0x5bc(r3) -/* 80578F40 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80578F44 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x80579544@ha */ -/* 80578F48 38 84 95 44 */ addi r4, r4, l_arcName@l /* 0x80579544@l */ -/* 80578F4C 80 84 00 00 */ lwz r4, 0(r4) -/* 80578F50 4B AB 3F 6D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80578F54 7C 60 1B 78 */ mr r0, r3 -/* 80578F58 2C 00 00 04 */ cmpwi r0, 4 -/* 80578F5C 40 82 00 4C */ bne lbl_80578FA8 -/* 80578F60 7F E3 FB 78 */ mr r3, r31 -/* 80578F64 3C 80 80 58 */ lis r4, l_arcName@ha /* 0x80579544@ha */ -/* 80578F68 38 84 95 44 */ addi r4, r4, l_arcName@l /* 0x80579544@l */ -/* 80578F6C 80 84 00 00 */ lwz r4, 0(r4) -/* 80578F70 88 1F 05 BC */ lbz r0, 0x5bc(r31) -/* 80578F74 54 00 10 3A */ slwi r0, r0, 2 -/* 80578F78 3C A0 80 58 */ lis r5, l_dzb@ha /* 0x80579498@ha */ -/* 80578F7C 38 A5 94 98 */ addi r5, r5, l_dzb@l /* 0x80579498@l */ -/* 80578F80 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80578F84 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80578F88 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80578F8C 38 E0 0B D0 */ li r7, 0xbd0 -/* 80578F90 39 00 00 00 */ li r8, 0 -/* 80578F94 4B AF F8 29 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80578F98 7C 60 1B 78 */ mr r0, r3 -/* 80578F9C 2C 00 00 05 */ cmpwi r0, 5 -/* 80578FA0 40 82 00 08 */ bne lbl_80578FA8 -/* 80578FA4 48 00 00 08 */ b lbl_80578FAC -lbl_80578FA8: -/* 80578FA8 7C 03 03 78 */ mr r3, r0 -lbl_80578FAC: -/* 80578FAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80578FB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80578FB4 7C 08 03 A6 */ mtlr r0 -/* 80578FB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80578FBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c.s deleted file mode 100644 index 97303b469b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057941C: -/* 8057941C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80579420 7C 08 02 A6 */ mflr r0 -/* 80579424 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579428 4B AF F4 B5 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 8057942C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80579430 7C 08 03 A6 */ mtlr r0 -/* 80579434 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579438 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c.s deleted file mode 100644 index 148899573f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8057945C: -/* 8057945C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80579460 7C 08 02 A6 */ mflr r0 -/* 80579464 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579468 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 8057946C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80579470 7D 89 03 A6 */ mtctr r12 -/* 80579474 4E 80 04 21 */ bctrl -/* 80579478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057947C 7C 08 03 A6 */ mtlr r0 -/* 80579480 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579484 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c.s deleted file mode 100644 index 531304c75c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057943C: -/* 8057943C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80579440 7C 08 02 A6 */ mflr r0 -/* 80579444 90 01 00 14 */ stw r0, 0x14(r1) -/* 80579448 4B AF F5 09 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 8057944C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80579450 7C 08 03 A6 */ mtlr r0 -/* 80579454 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579458 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_create1st__FP13daObjBkDoor_c.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_create1st__FP13daObjBkDoor_c.s deleted file mode 100644 index ba6aeef26e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_create1st__FP13daObjBkDoor_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_805793BC: -/* 805793BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805793C0 7C 08 02 A6 */ mflr r0 -/* 805793C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805793C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805793CC 7C 7F 1B 78 */ mr r31, r3 -/* 805793D0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 805793D4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 805793D8 40 82 00 28 */ bne lbl_80579400 -/* 805793DC 28 1F 00 00 */ cmplwi r31, 0 -/* 805793E0 41 82 00 14 */ beq lbl_805793F4 -/* 805793E4 4B AF F2 41 */ bl __ct__16dBgS_MoveBgActorFv -/* 805793E8 3C 60 80 58 */ lis r3, __vt__13daObjBkDoor_c@ha /* 0x80579598@ha */ -/* 805793EC 38 03 95 98 */ addi r0, r3, __vt__13daObjBkDoor_c@l /* 0x80579598@l */ -/* 805793F0 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_805793F4: -/* 805793F4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 805793F8 60 00 00 08 */ ori r0, r0, 8 -/* 805793FC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80579400: -/* 80579400 7F E3 FB 78 */ mr r3, r31 -/* 80579404 4B FF FB 1D */ bl create1st__13daObjBkDoor_cFv -/* 80579408 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057940C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80579410 7C 08 03 A6 */ mtlr r0 -/* 80579414 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579418 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/initBaseMtx__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/initBaseMtx__13daObjBkDoor_cFv.s deleted file mode 100644 index 02dfdc6156..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/initBaseMtx__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80578D4C: -/* 80578D4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80578D50 7C 08 02 A6 */ mflr r0 -/* 80578D54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80578D58 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80578D5C C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80578D60 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80578D64 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80578D68 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80578D6C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80578D70 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80578D74 48 00 00 15 */ bl setBaseMtx__13daObjBkDoor_cFv -/* 80578D78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80578D7C 7C 08 03 A6 */ mtlr r0 -/* 80578D80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80578D84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/openCheck__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/openCheck__13daObjBkDoor_cFv.s deleted file mode 100644 index 082d65ccfd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/openCheck__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80578FC0: -/* 80578FC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80578FC4 7C 08 02 A6 */ mflr r0 -/* 80578FC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80578FCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80578FD0 7C 7F 1B 78 */ mr r31, r3 -/* 80578FD4 88 03 05 BD */ lbz r0, 0x5bd(r3) -/* 80578FD8 28 00 00 00 */ cmplwi r0, 0 -/* 80578FDC 40 82 00 3C */ bne lbl_80579018 -/* 80578FE0 3C 60 80 58 */ lis r3, search_door__FPvPv@ha /* 0x80578D18@ha */ -/* 80578FE4 38 63 8D 18 */ addi r3, r3, search_door__FPvPv@l /* 0x80578D18@l */ -/* 80578FE8 7F E4 FB 78 */ mr r4, r31 -/* 80578FEC 4B AA 08 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80578FF0 28 03 00 00 */ cmplwi r3, 0 -/* 80578FF4 41 82 00 14 */ beq lbl_80579008 -/* 80578FF8 A8 63 04 B6 */ lha r3, 0x4b6(r3) -/* 80578FFC A8 1F 04 B6 */ lha r0, 0x4b6(r31) -/* 80579000 7C 03 00 51 */ subf. r0, r3, r0 -/* 80579004 41 82 00 0C */ beq lbl_80579010 -lbl_80579008: -/* 80579008 38 00 00 01 */ li r0, 1 -/* 8057900C 98 1F 05 BE */ stb r0, 0x5be(r31) -lbl_80579010: -/* 80579010 38 00 00 01 */ li r0, 1 -/* 80579014 98 1F 05 BD */ stb r0, 0x5bd(r31) -lbl_80579018: -/* 80579018 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057901C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80579020 7C 08 03 A6 */ mtlr r0 -/* 80579024 38 21 00 10 */ addi r1, r1, 0x10 -/* 80579028 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/search_door__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/search_door__FPvPv.s deleted file mode 100644 index 13e17c05fc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/search_door__FPvPv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80578D18: -/* 80578D18 28 03 00 00 */ cmplwi r3, 0 -/* 80578D1C 41 82 00 28 */ beq lbl_80578D44 -/* 80578D20 A8 03 00 0E */ lha r0, 0xe(r3) -/* 80578D24 2C 00 00 62 */ cmpwi r0, 0x62 -/* 80578D28 40 82 00 1C */ bne lbl_80578D44 -/* 80578D2C 80 04 00 B0 */ lwz r0, 0xb0(r4) -/* 80578D30 54 04 07 FE */ clrlwi r4, r0, 0x1f -/* 80578D34 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80578D38 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 80578D3C 7C 04 00 40 */ cmplw r4, r0 -/* 80578D40 4C 82 00 20 */ bnelr -lbl_80578D44: -/* 80578D44 38 60 00 00 */ li r3, 0 -/* 80578D48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/setBaseMtx__13daObjBkDoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/setBaseMtx__13daObjBkDoor_cFv.s deleted file mode 100644 index 98bbac3b54..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/setBaseMtx__13daObjBkDoor_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80578D88: -/* 80578D88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80578D8C 7C 08 02 A6 */ mflr r0 -/* 80578D90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80578D94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80578D98 7C 7F 1B 78 */ mr r31, r3 -/* 80578D9C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80578DA0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80578DA4 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80578DA8 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80578DAC C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80578DB0 4B DC DB 39 */ bl PSMTXTrans -/* 80578DB4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80578DB8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80578DBC A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80578DC0 4B A9 36 75 */ bl mDoMtx_YrotM__FPA4_fs -/* 80578DC4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80578DC8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80578DCC A8 9F 05 AC */ lha r4, 0x5ac(r31) -/* 80578DD0 A8 BF 05 AE */ lha r5, 0x5ae(r31) -/* 80578DD4 A8 DF 05 B0 */ lha r6, 0x5b0(r31) -/* 80578DD8 4B A9 34 C9 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80578DDC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80578DE0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80578DE4 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80578DE8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80578DEC 4B DC D6 C5 */ bl PSMTXCopy -/* 80578DF0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80578DF4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80578DF8 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80578DFC 4B DC D6 B5 */ bl PSMTXCopy -/* 80578E00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80578E04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80578E08 7C 08 03 A6 */ mtlr r0 -/* 80578E0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80578E10 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h b/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h index cfed40c512..b379531a8b 100644 --- a/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h +++ b/include/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h @@ -1,6 +1,35 @@ #ifndef D_A_OBJ_BKDOOR_H #define D_A_OBJ_BKDOOR_H +#include "d/bg/d_bg_s_movebg_actor.h" +#include "SSystem/SComponent/c_phase.h" #include "dolphin/types.h" +class J3DModel; + +class daObjBkDoor_c : public dBgS_MoveBgActor { +public: + /* 80578D4C */ void initBaseMtx(); + /* 80578D88 */ void setBaseMtx(); + /* 80578E14 */ virtual int Create(); + /* 80578EA0 */ virtual int CreateHeap(); + /* 80578F20 */ int create1st(); + /* 80578FC0 */ void openCheck(); + /* 8057902C */ virtual int Execute(Mtx**); + /* 805792E4 */ virtual int Draw(); + /* 80579388 */ virtual int Delete(); + +private: + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ csXyz mRotation; + /* 0x5B4 */ f32 mSwingSpeed; + /* 0x5B8 */ s32 mFrameCounter; + /* 0x5BC */ u8 mOrientation; + /* 0x5BD */ bool mOpenCheckDone; + /* 0x5BE */ bool mOpening; +}; // Size: 0x5C0 + +STATIC_ASSERT(sizeof(daObjBkDoor_c) == 0x5C0); + #endif /* D_A_OBJ_BKDOOR_H */ diff --git a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp index 9daf878043..1bf16ce3e3 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp @@ -4,455 +4,242 @@ // #include "rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.h" -#include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjBkDoor_c { - /* 80578D4C */ void initBaseMtx(); - /* 80578D88 */ void setBaseMtx(); - /* 80578E14 */ void Create(); - /* 80578EA0 */ void CreateHeap(); - /* 80578F20 */ void create1st(); - /* 80578FC0 */ void openCheck(); - /* 8057902C */ void Execute(f32 (**)[3][4]); - /* 805792E4 */ void Draw(); - /* 80579388 */ void Delete(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -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 dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 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 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 JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void search_door__FPvPv(); -extern "C" void initBaseMtx__13daObjBkDoor_cFv(); -extern "C" void setBaseMtx__13daObjBkDoor_cFv(); -extern "C" void Create__13daObjBkDoor_cFv(); -extern "C" void CreateHeap__13daObjBkDoor_cFv(); -extern "C" void create1st__13daObjBkDoor_cFv(); -extern "C" void openCheck__13daObjBkDoor_cFv(); -extern "C" void Execute__13daObjBkDoor_cFPPA3_A4_f(); -extern "C" void Draw__13daObjBkDoor_cFv(); -extern "C" void Delete__13daObjBkDoor_cFv(); -extern "C" static void daObjBkDoor_create1st__FP13daObjBkDoor_c(); -extern "C" static void daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c(); -extern "C" static void daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c(); -extern "C" static void daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c(); -extern "C" extern char const* const d_a_obj_bkdoor__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -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 dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -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 cLib_addCalc0__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_27(); -extern "C" void _restgpr_27(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -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 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "f_op/f_op_actor_mng.h" // // Declarations: // /* 80578D18-80578D4C 000078 0034+00 1/1 0/0 0/0 .text search_door__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void search_door(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/search_door__FPvPv.s" +static void* search_door(void* i_actor, void* i_this) { + if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_Obj_BkDoor && + fopAcM_GetParamBit(i_this, 0, 1) != fopAcM_GetParamBit(i_actor, 0, 1)) + { + return i_actor; + } + return NULL; } -#pragma pop /* 80578D4C-80578D88 0000AC 003C+00 1/1 0/0 0/0 .text initBaseMtx__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/initBaseMtx__13daObjBkDoor_cFv.s" +void daObjBkDoor_c::initBaseMtx() { + mpModel->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80578D88-80578E14 0000E8 008C+00 2/2 0/0 0/0 .text setBaseMtx__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/setBaseMtx__13daObjBkDoor_cFv.s" +void daObjBkDoor_c::setBaseMtx() { + mDoMtx_trans(mDoMtx_stack_c::get(), current.pos.x, current.pos.y, current.pos.z); + mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y); + mDoMtx_ZXYrotM(mDoMtx_stack_c::get(), mRotation.x, mRotation.y, mRotation.z); + + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop -/* ############################################################################################## */ -/* 80579490-80579498 000000 0008+00 2/2 0/0 0/0 .rodata l_bmd */ -SECTION_RODATA static u8 const l_bmd[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, -}; -COMPILER_STRIP_GATE(0x80579490, &l_bmd); +static char* l_arcName = "A_BkDoor"; -/* 80579498-805794A0 000008 0008+00 1/1 0/0 0/0 .rodata l_dzb */ -SECTION_RODATA static u8 const l_dzb[8] = { - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, -}; -COMPILER_STRIP_GATE(0x80579498, &l_dzb); - -/* 805794A0-805794B4 000010 0014+00 0/0 0/0 0/0 .rodata l_col_offsetX */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_col_offsetX[20] = { - 0x42, 0xA0, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0x43, 0x70, - 0x00, 0x00, 0x43, 0xA0, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x805794A0, &l_col_offsetX); -#pragma pop - -/* 805794B4-805794E4 000024 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_roll_crash_check_areaL[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, +static int const l_bmd[] = {0x04, 0x05}; +static int const l_dzb[] = {0x08, 0x09}; + +// Unused +static f32 const l_col_offsetX[] = { + 80.0f, 160.0f, 240.0f, 320.0f, 400.0f, }; -COMPILER_STRIP_GATE(0x805794B4, &l_roll_crash_check_areaL); -#pragma pop - -/* 805794E4-80579514 000054 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaR */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_roll_crash_check_areaR[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0xC4, 0x89, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0xC4, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, + +static Vec const l_roll_crash_check_areaL[] = { + {0.0f, 0.0f, -140.0f}, + {1100.0f, 0.0f, -140.0f}, // Unused + {1100.0f, 0.0f, 140.0f}, + {0.0f, 0.0f, 140.0f}, // Unused }; -COMPILER_STRIP_GATE(0x805794E4, &l_roll_crash_check_areaR); -#pragma pop -/* 80579514-80579518 000084 0004+00 1/1 0/0 0/0 .rodata @3702 */ -SECTION_RODATA static f32 const lit_3702 = 2.0f; -COMPILER_STRIP_GATE(0x80579514, &lit_3702); +static Vec const l_roll_crash_check_areaR[] = { + {0.0f, 0.0f, -140.0f}, // Unused + {-1100.0f, 0.0f, -140.0f}, + {-1100.0f, 0.0f, 140.0f}, // Unused + {0.0f, 0.0f, 140.0f}, +}; /* 80578E14-80578EA0 000174 008C+00 1/0 0/0 0/0 .text Create__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Create__13daObjBkDoor_cFv.s" +int daObjBkDoor_c::Create() { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[15])) { + shape_angle.y -= 0x8000; + } + + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + fopAcM_setCullSizeFar(this, 2.0f); + + return TRUE; } -#pragma pop /* ############################################################################################## */ /* 80579538-80579538 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80579538 = "A_BkDoor"; -#pragma pop - -/* 80579544-80579548 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bkdoor__stringBase0; /* 80578EA0-80578F20 000200 0080+00 1/0 0/0 0/0 .text CreateHeap__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/CreateHeap__13daObjBkDoor_cFv.s" +int daObjBkDoor_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mOrientation]); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + + if (mpModel == NULL) { + return false; + } + return true; } -#pragma pop /* 80578F20-80578FC0 000280 00A0+00 1/1 0/0 0/0 .text create1st__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/create1st__13daObjBkDoor_cFv.s" +int daObjBkDoor_c::create1st() { + mOrientation = fopAcM_GetParamBit(this, 0, 1); + + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName); + if (step == cPhs_COMPLEATE_e) { + step = (cPhs__Step)MoveBGCreate(l_arcName, l_dzb[mOrientation], dBgS_MoveBGProc_TypicalRotY, + 0xBD0, NULL); + if (step == cPhs_ERROR_e) { + return step; + } + } + + return step; } -#pragma pop /* 80578FC0-8057902C 000320 006C+00 1/1 0/0 0/0 .text openCheck__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::openCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/openCheck__13daObjBkDoor_cFv.s" +void daObjBkDoor_c::openCheck() { + if (!mOpenCheckDone) { + fopAc_ac_c* actor = fopAcM_Search((fopAcIt_JudgeFunc)search_door, this); + if (actor == NULL || (orig.angle.GetY() - actor->orig.angle.GetY()) != 0) { + mOpening = true; + } + mOpenCheckDone = true; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80579518-8057951C 000088 0004+00 0/1 0/0 0/0 .rodata @3817 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3817 = -600.0f; -COMPILER_STRIP_GATE(0x80579518, &lit_3817); -#pragma pop - -/* 8057951C-80579520 00008C 0004+00 0/1 0/0 0/0 .rodata @3818 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3818 = 600.0f; -COMPILER_STRIP_GATE(0x8057951C, &lit_3818); -#pragma pop - -/* 80579520-80579524 000090 0004+00 0/1 0/0 0/0 .rodata @3819 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3819 = 700.0f; -COMPILER_STRIP_GATE(0x80579520, &lit_3819); -#pragma pop - -/* 80579524-80579528 000094 0004+00 0/1 0/0 0/0 .rodata @3820 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3820 = 1.0f; -COMPILER_STRIP_GATE(0x80579524, &lit_3820); -#pragma pop - -/* 80579528-8057952C 000098 0004+00 0/1 0/0 0/0 .rodata @3821 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3821 = -1.0f; -COMPILER_STRIP_GATE(0x80579528, &lit_3821); -#pragma pop - -/* 8057952C-80579530 00009C 0004+00 0/1 0/0 0/0 .rodata @3822 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3822 = -700.0f; -COMPILER_STRIP_GATE(0x8057952C, &lit_3822); -#pragma pop - -/* 80579530-80579534 0000A0 0004+00 0/1 0/0 0/0 .rodata @3823 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3823 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80579530, &lit_3823); -#pragma pop - -/* 80579534-80579538 0000A4 0004+00 0/1 0/0 0/0 .rodata @3824 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3824 = 20.0f; -COMPILER_STRIP_GATE(0x80579534, &lit_3824); -#pragma pop /* 8057902C-805792E4 00038C 02B8+00 1/0 0/0 0/0 .text Execute__13daObjBkDoor_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Execute__13daObjBkDoor_cFPPA3_A4_f.s" +int daObjBkDoor_c::Execute(Mtx** i_mtxP) { + daPy_py_c* player = dComIfGp_getLinkPlayer(); + BOOL unk_event = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[15]); + + mFrameCounter++; + openCheck(); + + if (player->checkFrontRollCrash() && !unk_event) { + cXyz check_area_posA; + cXyz check_area_posB; + + if (mOrientation == 1) { + check_area_posA = l_roll_crash_check_areaR[1]; + check_area_posB = l_roll_crash_check_areaR[3]; + + if (mOpening) { + check_area_posA.x = -600.0f; + } + } else { + check_area_posA = l_roll_crash_check_areaL[0]; + check_area_posB = l_roll_crash_check_areaL[2]; + + if (mOpening) { + check_area_posB.x = 600.0f; + } + } + + if (dLib_checkActorInRectangle(player, this, &check_area_posA, &check_area_posB)) { + if (mOrientation == 1) { + mSwingSpeed = 700.0f; + + if (mOpening) { + fopAcM_seStart(this, Z2SE_OBJ_BK_DOOR_ATK_OP, 0); + } else { + fopAcM_seStart(this, Z2SE_OBJ_BK_DOOR_ATK_CL, 0); + } + } else { + mSwingSpeed = -700.0f; + + if (mOpening) { + fopAcM_seStart(this, Z2SE_OBJ_BK_DOOR_ATK_OP, 0); + } + } + } + } + + *i_mtxP = &mBgMtx; + setBaseMtx(); + + mRotation.y = mSwingSpeed * cM_ssin(mFrameCounter * 4000); + cLib_addCalc0(&this->mSwingSpeed, 0.1f, 20.0f); + + return TRUE; } -#pragma pop /* 805792E4-80579388 000644 00A4+00 1/0 0/0 0/0 .text Draw__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Draw__13daObjBkDoor_cFv.s" +int daObjBkDoor_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + return TRUE; } -#pragma pop /* 80579388-805793BC 0006E8 0034+00 1/0 0/0 0/0 .text Delete__13daObjBkDoor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjBkDoor_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/Delete__13daObjBkDoor_cFv.s" +int daObjBkDoor_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + return TRUE; } -#pragma pop - -/* ############################################################################################## */ -/* 80579548-80579568 -00001 0020+00 1/0 0/0 0/0 .data daObjBkDoor_METHODS */ -SECTION_DATA static void* daObjBkDoor_METHODS[8] = { - (void*)daObjBkDoor_create1st__FP13daObjBkDoor_c, - (void*)daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c, - (void*)daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c, - (void*)NULL, - (void*)daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80579568-80579598 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BkDoor */ -SECTION_DATA extern void* g_profile_Obj_BkDoor[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00620000, (void*)&g_fpcLf_Method, - (void*)0x000005C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01C30000, (void*)&daObjBkDoor_METHODS, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80579598-805795C0 000054 0028+00 1/1 0/0 0/0 .data __vt__13daObjBkDoor_c */ -SECTION_DATA extern void* __vt__13daObjBkDoor_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daObjBkDoor_cFv, - (void*)Create__13daObjBkDoor_cFv, - (void*)Execute__13daObjBkDoor_cFPPA3_A4_f, - (void*)Draw__13daObjBkDoor_cFv, - (void*)Delete__13daObjBkDoor_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 805793BC-8057941C 00071C 0060+00 1/0 0/0 0/0 .text daObjBkDoor_create1st__FP13daObjBkDoor_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBkDoor_create1st(daObjBkDoor_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_create1st__FP13daObjBkDoor_c.s" +static int daObjBkDoor_create1st(daObjBkDoor_c* i_this) { + fopAcM_SetupActor(i_this, daObjBkDoor_c); + return i_this->create1st(); } -#pragma pop /* 8057941C-8057943C 00077C 0020+00 1/0 0/0 0/0 .text daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBkDoor_MoveBGDelete(daObjBkDoor_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c.s" +static int daObjBkDoor_MoveBGDelete(daObjBkDoor_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 8057943C-8057945C 00079C 0020+00 1/0 0/0 0/0 .text daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBkDoor_MoveBGExecute(daObjBkDoor_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c.s" +static int daObjBkDoor_MoveBGExecute(daObjBkDoor_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 8057945C-80579488 0007BC 002C+00 1/0 0/0 0/0 .text daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjBkDoor_MoveBGDraw(daObjBkDoor_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor/daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c.s" +static int daObjBkDoor_MoveBGDraw(daObjBkDoor_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 80579538-80579538 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* ############################################################################################## */ +/* 80579548-80579568 -00001 0020+00 1/0 0/0 0/0 .data daObjBkDoor_METHODS */ +static actor_method_class daObjBkDoor_METHODS = { + (process_method_func)daObjBkDoor_create1st, (process_method_func)daObjBkDoor_MoveBGDelete, + (process_method_func)daObjBkDoor_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjBkDoor_MoveBGDraw, +}; + +/* 80579568-80579598 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BkDoor */ +extern actor_process_profile_definition g_profile_Obj_BkDoor = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_BkDoor, // mProcName + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daObjBkDoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 451, // mPriority + &daObjBkDoor_METHODS, // mSubMtd + 0x40100, // mStatus + 0, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType +}; |