diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2024-04-15 01:01:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 15:01:11 -0700 |
| commit | fafbfcb833f8c649fcbb064bbb06cdb3af8b1023 (patch) | |
| tree | ff55f9739e462cdf66d01d0861af3b46e605add8 | |
| parent | 5ffd54f2869cfc08f8675d56b198cb47f334888f (diff) | |
daBdoorL5 OK (#2129)
* daBdoorL5 OK
* Remove dol2asm from d_a_door_dbdoor00
46 files changed, 520 insertions, 2742 deletions
diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index b47402c303..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80670CF0: -/* 80670CF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80670CF4 7C 08 02 A6 */ mflr r0 -/* 80670CF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80670CFC 48 00 00 15 */ bl CreateHeap__11daBdoorL5_cFv -/* 80670D00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80670D04 7C 08 03 A6 */ mtlr r0 -/* 80670D08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80670D0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateHeap__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateHeap__11daBdoorL5_cFv.s deleted file mode 100644 index db67372ffe..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateHeap__11daBdoorL5_cFv.s +++ /dev/null @@ -1,117 +0,0 @@ -lbl_80670D10: -/* 80670D10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80670D14 7C 08 02 A6 */ mflr r0 -/* 80670D18 90 01 00 24 */ stw r0, 0x24(r1) -/* 80670D1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80670D20 4B CF 14 B9 */ bl _savegpr_28 -/* 80670D24 7C 7E 1B 78 */ mr r30, r3 -/* 80670D28 4B FF FF 6D */ bl getDoorModelData__11daBdoorL5_cFv -/* 80670D2C 3C 80 00 08 */ lis r4, 8 -/* 80670D30 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80670D34 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80670D38 4B 9A 3F 1D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80670D3C 90 7E 05 80 */ stw r3, 0x580(r30) -/* 80670D40 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 80670D44 28 00 00 00 */ cmplwi r0, 0 -/* 80670D48 40 82 00 0C */ bne lbl_80670D54 -/* 80670D4C 38 60 00 00 */ li r3, 0 -/* 80670D50 48 00 01 58 */ b lbl_80670EA8 -lbl_80670D54: -/* 80670D54 7F C3 F3 78 */ mr r3, r30 -/* 80670D58 4B FF FF 2D */ bl getOpenAnm__11daBdoorL5_cFv -/* 80670D5C 7C 7D 1B 78 */ mr r29, r3 -/* 80670D60 7F C3 F3 78 */ mr r3, r30 -/* 80670D64 4B FF FF 11 */ bl getAnmArcName__11daBdoorL5_cFv -/* 80670D68 7F A4 EB 78 */ mr r4, r29 -/* 80670D6C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80670D70 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80670D74 3F E5 00 02 */ addis r31, r5, 2 -/* 80670D78 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80670D7C 7F E5 FB 78 */ mr r5, r31 -/* 80670D80 38 C0 00 80 */ li r6, 0x80 -/* 80670D84 4B 9C B5 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80670D88 7C 7C 1B 78 */ mr r28, r3 -/* 80670D8C 38 60 00 1C */ li r3, 0x1c -/* 80670D90 4B C5 DE BD */ bl __nw__FUl -/* 80670D94 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80670D98 41 82 00 20 */ beq lbl_80670DB8 -/* 80670D9C 3C 80 80 67 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80672790@ha */ -/* 80670DA0 38 04 27 90 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80672790@l */ -/* 80670DA4 90 1D 00 00 */ stw r0, 0(r29) -/* 80670DA8 38 80 00 00 */ li r4, 0 -/* 80670DAC 4B CB 76 51 */ bl init__12J3DFrameCtrlFs -/* 80670DB0 38 00 00 00 */ li r0, 0 -/* 80670DB4 90 1D 00 18 */ stw r0, 0x18(r29) -lbl_80670DB8: -/* 80670DB8 93 BE 05 84 */ stw r29, 0x584(r30) -/* 80670DBC 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 80670DC0 28 03 00 00 */ cmplwi r3, 0 -/* 80670DC4 41 82 00 30 */ beq lbl_80670DF4 -/* 80670DC8 7F 84 E3 78 */ mr r4, r28 -/* 80670DCC 38 A0 00 01 */ li r5, 1 -/* 80670DD0 38 C0 00 00 */ li r6, 0 -/* 80670DD4 3C E0 80 67 */ lis r7, lit_3757@ha /* 0x8067250C@ha */ -/* 80670DD8 C0 27 25 0C */ lfs f1, lit_3757@l(r7) /* 0x8067250C@l */ -/* 80670DDC 38 E0 00 00 */ li r7, 0 -/* 80670DE0 39 00 FF FF */ li r8, -1 -/* 80670DE4 39 20 00 00 */ li r9, 0 -/* 80670DE8 4B 99 C9 F5 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80670DEC 2C 03 00 00 */ cmpwi r3, 0 -/* 80670DF0 40 82 00 0C */ bne lbl_80670DFC -lbl_80670DF4: -/* 80670DF4 38 60 00 00 */ li r3, 0 -/* 80670DF8 48 00 00 B0 */ b lbl_80670EA8 -lbl_80670DFC: -/* 80670DFC 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80670E00 80 83 00 04 */ lwz r4, 4(r3) -/* 80670E04 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 80670E08 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80670E0C 4B 99 CB C1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80670E10 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80670E14 81 83 00 00 */ lwz r12, 0(r3) -/* 80670E18 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80670E1C 7D 89 03 A6 */ mtctr r12 -/* 80670E20 4E 80 04 21 */ bctrl -/* 80670E24 7F C3 F3 78 */ mr r3, r30 -/* 80670E28 48 00 00 E1 */ bl calcMtx__11daBdoorL5_cFv -/* 80670E2C 38 60 00 C0 */ li r3, 0xc0 -/* 80670E30 4B C5 DE 1D */ bl __nw__FUl -/* 80670E34 7C 60 1B 79 */ or. r0, r3, r3 -/* 80670E38 41 82 00 0C */ beq lbl_80670E44 -/* 80670E3C 4B A0 AB 35 */ bl __ct__4dBgWFv -/* 80670E40 7C 60 1B 78 */ mr r0, r3 -lbl_80670E44: -/* 80670E44 90 1E 05 88 */ stw r0, 0x588(r30) -/* 80670E48 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 80670E4C 28 00 00 00 */ cmplwi r0, 0 -/* 80670E50 41 82 00 4C */ beq lbl_80670E9C -/* 80670E54 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80670E58 3B 83 00 24 */ addi r28, r3, 0x24 -/* 80670E5C 7F C3 F3 78 */ mr r3, r30 -/* 80670E60 4B FF FE 05 */ bl getDzb__11daBdoorL5_cFv -/* 80670E64 7C 7D 1B 78 */ mr r29, r3 -/* 80670E68 7F C3 F3 78 */ mr r3, r30 -/* 80670E6C 4B FF FD D9 */ bl getAlwaysArcName__11daBdoorL5_cFv -/* 80670E70 7F A4 EB 78 */ mr r4, r29 -/* 80670E74 7F E5 FB 78 */ mr r5, r31 -/* 80670E78 38 C0 00 80 */ li r6, 0x80 -/* 80670E7C 4B 9C B5 01 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80670E80 7C 64 1B 78 */ mr r4, r3 -/* 80670E84 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 80670E88 38 A0 00 01 */ li r5, 1 -/* 80670E8C 7F 86 E3 78 */ mr r6, r28 -/* 80670E90 4B A0 90 A9 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80670E94 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80670E98 41 82 00 0C */ beq lbl_80670EA4 -lbl_80670E9C: -/* 80670E9C 38 60 00 00 */ li r3, 0 -/* 80670EA0 48 00 00 08 */ b lbl_80670EA8 -lbl_80670EA4: -/* 80670EA4 38 60 00 01 */ li r3, 1 -lbl_80670EA8: -/* 80670EA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80670EAC 4B CF 13 79 */ bl _restgpr_28 -/* 80670EB0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80670EB4 7C 08 03 A6 */ mtlr r0 -/* 80670EB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80670EBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateInit__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateInit__11daBdoorL5_cFv.s deleted file mode 100644 index 10de41d8a7..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateInit__11daBdoorL5_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80670F5C: -/* 80670F5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80670F60 7C 08 02 A6 */ mflr r0 -/* 80670F64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80670F68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80670F6C 4B CF 12 71 */ bl _savegpr_29 -/* 80670F70 7C 7D 1B 78 */ mr r29, r3 -/* 80670F74 3C 60 80 67 */ lis r3, l_door_open_demo@ha /* 0x806724C8@ha */ -/* 80670F78 3B E3 24 C8 */ addi r31, r3, l_door_open_demo@l /* 0x806724C8@l */ -/* 80670F7C 38 00 00 00 */ li r0, 0 -/* 80670F80 90 01 00 08 */ stw r0, 8(r1) -/* 80670F84 38 7D 05 B8 */ addi r3, r29, 0x5b8 -/* 80670F88 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80670F8C 38 BD 04 BC */ addi r5, r29, 0x4bc -/* 80670F90 7F A6 EB 78 */ mr r6, r29 -/* 80670F94 38 E0 00 01 */ li r7, 1 -/* 80670F98 39 1D 07 90 */ addi r8, r29, 0x790 -/* 80670F9C 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 80670FA0 39 40 00 00 */ li r10, 0 -/* 80670FA4 4B A0 52 A5 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80670FA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80670FAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80670FB0 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 80670FB4 7F C3 F3 78 */ mr r3, r30 -/* 80670FB8 80 9D 05 88 */ lwz r4, 0x588(r29) -/* 80670FBC 7F A5 EB 78 */ mr r5, r29 -/* 80670FC0 4B A0 3A 49 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80670FC4 38 00 00 01 */ li r0, 1 -/* 80670FC8 98 1D 05 91 */ stb r0, 0x591(r29) -/* 80670FCC C0 1D 05 54 */ lfs f0, 0x554(r29) -/* 80670FD0 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 80670FD4 EC 00 08 2A */ fadds f0, f0, f1 -/* 80670FD8 D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 80670FDC C0 1D 05 3C */ lfs f0, 0x53c(r29) -/* 80670FE0 EC 00 08 2A */ fadds f0, f0, f1 -/* 80670FE4 D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 80670FE8 38 00 00 20 */ li r0, 0x20 -/* 80670FEC 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80670FF0 7F A3 EB 78 */ mr r3, r29 -/* 80670FF4 4B FF FF 15 */ bl calcMtx__11daBdoorL5_cFv -/* 80670FF8 80 7D 05 88 */ lwz r3, 0x588(r29) -/* 80670FFC 4B A0 A9 C5 */ bl Move__4dBgWFv -/* 80671000 7F A3 EB 78 */ mr r3, r29 -/* 80671004 4B 9C 91 CD */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80671008 38 00 00 FF */ li r0, 0xff -/* 8067100C 98 1D 05 93 */ stb r0, 0x593(r29) -/* 80671010 7F A3 EB 78 */ mr r3, r29 -/* 80671014 4B FF FC 25 */ bl getArcName__11daBdoorL5_cFv -/* 80671018 90 7D 01 00 */ stw r3, 0x100(r29) -/* 8067101C 3B DE 40 C0 */ addi r30, r30, 0x40c0 -/* 80671020 7F C3 F3 78 */ mr r3, r30 -/* 80671024 7F A4 EB 78 */ mr r4, r29 -/* 80671028 38 BF 00 18 */ addi r5, r31, 0x18 -/* 8067102C 38 C0 00 FF */ li r6, 0xff -/* 80671030 4B 9D 67 29 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80671034 B0 7D 05 98 */ sth r3, 0x598(r29) -/* 80671038 7F C3 F3 78 */ mr r3, r30 -/* 8067103C 7F A4 EB 78 */ mr r4, r29 -/* 80671040 38 BF 00 00 */ addi r5, r31, 0 -/* 80671044 38 C0 00 FF */ li r6, 0xff -/* 80671048 4B 9D 67 11 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 8067104C B0 7D 05 9A */ sth r3, 0x59a(r29) -/* 80671050 38 60 00 01 */ li r3, 1 -/* 80671054 39 61 00 20 */ addi r11, r1, 0x20 -/* 80671058 4B CF 11 D1 */ bl _restgpr_29 -/* 8067105C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80671060 7C 08 03 A6 */ mtlr r0 -/* 80671064 38 21 00 20 */ addi r1, r1, 0x20 -/* 80671068 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/Delete__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/Delete__11daBdoorL5_cFv.s deleted file mode 100644 index e1bad3fa54..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/Delete__11daBdoorL5_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80672374: -/* 80672374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672378 7C 08 02 A6 */ mflr r0 -/* 8067237C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80672384 7C 7F 1B 78 */ mr r31, r3 -/* 80672388 80 03 00 F0 */ lwz r0, 0xf0(r3) -/* 8067238C 28 00 00 00 */ cmplwi r0, 0 -/* 80672390 41 82 00 28 */ beq lbl_806723B8 -/* 80672394 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80672398 4B BF 5E 3D */ bl ChkUsed__9cBgW_BgIdCFv -/* 8067239C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 806723A0 41 82 00 18 */ beq lbl_806723B8 -/* 806723A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806723A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806723AC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 806723B0 80 9F 05 88 */ lwz r4, 0x588(r31) -/* 806723B4 4B A0 1E 9D */ bl Release__4cBgSFP9dBgW_Base -lbl_806723B8: -/* 806723B8 7F E3 FB 78 */ mr r3, r31 -/* 806723BC 4B FF E8 7D */ bl getArcName__11daBdoorL5_cFv -/* 806723C0 7C 64 1B 78 */ mr r4, r3 -/* 806723C4 38 7F 05 68 */ addi r3, r31, 0x568 -/* 806723C8 4B 9B AC 41 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 806723CC 7F E3 FB 78 */ mr r3, r31 -/* 806723D0 4B FF E8 A5 */ bl getAnmArcName__11daBdoorL5_cFv -/* 806723D4 7C 64 1B 78 */ mr r4, r3 -/* 806723D8 38 7F 05 78 */ addi r3, r31, 0x578 -/* 806723DC 4B 9B AC 2D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 806723E0 7F E3 FB 78 */ mr r3, r31 -/* 806723E4 4B FF E8 61 */ bl getAlwaysArcName__11daBdoorL5_cFv -/* 806723E8 7C 64 1B 78 */ mr r4, r3 -/* 806723EC 38 7F 05 70 */ addi r3, r31, 0x570 -/* 806723F0 4B 9B AC 19 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 806723F4 38 60 00 01 */ li r3, 1 -/* 806723F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806723FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672400 7C 08 03 A6 */ mtlr r0 -/* 80672404 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672408 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 2611002384..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80670EC0: -/* 80670EC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80670EC4 7C 08 02 A6 */ mflr r0 -/* 80670EC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80670ECC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80670ED0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80670ED4 41 82 00 1C */ beq lbl_80670EF0 -/* 80670ED8 3C A0 80 67 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80672790@ha */ -/* 80670EDC 38 05 27 90 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80672790@l */ -/* 80670EE0 90 1F 00 00 */ stw r0, 0(r31) -/* 80670EE4 7C 80 07 35 */ extsh. r0, r4 -/* 80670EE8 40 81 00 08 */ ble lbl_80670EF0 -/* 80670EEC 4B C5 DE 51 */ bl __dl__FPv -lbl_80670EF0: -/* 80670EF0 7F E3 FB 78 */ mr r3, r31 -/* 80670EF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80670EF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80670EFC 7C 08 03 A6 */ mtlr r0 -/* 80670F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80670F04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 63be7ae2cb..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_806711FC: -/* 806711FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80671200 7C 08 02 A6 */ mflr r0 -/* 80671204 90 01 00 14 */ stw r0, 0x14(r1) -/* 80671208 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8067120C 93 C1 00 08 */ stw r30, 8(r1) -/* 80671210 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80671214 7C 9F 23 78 */ mr r31, r4 -/* 80671218 41 82 00 38 */ beq lbl_80671250 -/* 8067121C 3C 60 80 67 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80672760@ha */ -/* 80671220 38 03 27 60 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80672760@l */ -/* 80671224 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80671228 38 7E 00 14 */ addi r3, r30, 0x14 -/* 8067122C 38 80 FF FF */ li r4, -1 -/* 80671230 4B BF DC E9 */ bl __dt__8cM3dGCirFv -/* 80671234 7F C3 F3 78 */ mr r3, r30 -/* 80671238 38 80 00 00 */ li r4, 0 -/* 8067123C 4B BF 6E 75 */ bl __dt__13cBgS_PolyInfoFv -/* 80671240 7F E0 07 35 */ extsh. r0, r31 -/* 80671244 40 81 00 0C */ ble lbl_80671250 -/* 80671248 7F C3 F3 78 */ mr r3, r30 -/* 8067124C 4B C5 DA F1 */ bl __dl__FPv -lbl_80671250: -/* 80671250 7F C3 F3 78 */ mr r3, r30 -/* 80671254 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80671258 83 C1 00 08 */ lwz r30, 8(r1) -/* 8067125C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80671260 7C 08 03 A6 */ mtlr r0 -/* 80671264 38 21 00 10 */ addi r1, r1, 0x10 -/* 80671268 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 8f6c48c8ca..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8067126C: -/* 8067126C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80671270 7C 08 02 A6 */ mflr r0 -/* 80671274 90 01 00 14 */ stw r0, 0x14(r1) -/* 80671278 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8067127C 93 C1 00 08 */ stw r30, 8(r1) -/* 80671280 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80671284 7C 9F 23 78 */ mr r31, r4 -/* 80671288 41 82 00 38 */ beq lbl_806712C0 -/* 8067128C 3C 80 80 67 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x8067276C@ha */ -/* 80671290 38 84 27 6C */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x8067276C@l */ -/* 80671294 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80671298 38 04 00 0C */ addi r0, r4, 0xc -/* 8067129C 90 1E 00 14 */ stw r0, 0x14(r30) -/* 806712A0 38 04 00 18 */ addi r0, r4, 0x18 -/* 806712A4 90 1E 00 24 */ stw r0, 0x24(r30) -/* 806712A8 38 80 00 00 */ li r4, 0 -/* 806712AC 4B A0 4C E9 */ bl __dt__9dBgS_AcchFv -/* 806712B0 7F E0 07 35 */ extsh. r0, r31 -/* 806712B4 40 81 00 0C */ ble lbl_806712C0 -/* 806712B8 7F C3 F3 78 */ mr r3, r30 -/* 806712BC 4B C5 DA 81 */ bl __dl__FPv -lbl_806712C0: -/* 806712C0 7F C3 F3 78 */ mr r3, r30 -/* 806712C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806712C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 806712CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806712D0 7C 08 03 A6 */ mtlr r0 -/* 806712D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 806712D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionCloseWait__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionCloseWait__11daBdoorL5_cFv.s deleted file mode 100644 index 8688da4064..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionCloseWait__11daBdoorL5_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80671E78: -/* 80671E78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80671E7C 7C 08 02 A6 */ mflr r0 -/* 80671E80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80671E84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80671E88 93 C1 00 08 */ stw r30, 8(r1) -/* 80671E8C 7C 7F 1B 78 */ mr r31, r3 -/* 80671E90 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80671E94 28 00 00 03 */ cmplwi r0, 3 -/* 80671E98 40 82 00 3C */ bne lbl_80671ED4 -/* 80671E9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671EA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671EA4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80671EA8 3C 80 80 67 */ lis r4, l_staff_name@ha /* 0x806724FC@ha */ -/* 80671EAC 38 84 24 FC */ addi r4, r4, l_staff_name@l /* 0x806724FC@l */ -/* 80671EB0 38 A0 00 00 */ li r5, 0 -/* 80671EB4 38 C0 00 00 */ li r6, 0 -/* 80671EB8 4B 9D 5C 65 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80671EBC 90 7F 05 9C */ stw r3, 0x59c(r31) -/* 80671EC0 7F E3 FB 78 */ mr r3, r31 -/* 80671EC4 4B FF F4 61 */ bl demoProc__11daBdoorL5_cFv -/* 80671EC8 38 00 00 02 */ li r0, 2 -/* 80671ECC 98 1F 05 91 */ stb r0, 0x591(r31) -/* 80671ED0 48 00 00 6C */ b lbl_80671F3C -lbl_80671ED4: -/* 80671ED4 4B FF FF 11 */ bl checkOpen__11daBdoorL5_cFv -/* 80671ED8 2C 03 00 00 */ cmpwi r3, 0 -/* 80671EDC 41 82 00 60 */ beq lbl_80671F3C -/* 80671EE0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80671EE4 7C 1E 07 74 */ extsb r30, r0 -/* 80671EE8 7F E3 FB 78 */ mr r3, r31 -/* 80671EEC 4B 9C 82 E5 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80671EF0 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80671EF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671EF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671EFC 7F C5 F3 78 */ mr r5, r30 -/* 80671F00 4B 9C 34 61 */ bl isSwitch__10dSv_info_cCFii -/* 80671F04 2C 03 00 00 */ cmpwi r3, 0 -/* 80671F08 41 82 00 18 */ beq lbl_80671F20 -/* 80671F0C A8 1F 05 9A */ lha r0, 0x59a(r31) -/* 80671F10 B0 1F 00 FC */ sth r0, 0xfc(r31) -/* 80671F14 88 1F 05 93 */ lbz r0, 0x593(r31) -/* 80671F18 98 1F 00 FE */ stb r0, 0xfe(r31) -/* 80671F1C 48 00 00 14 */ b lbl_80671F30 -lbl_80671F20: -/* 80671F20 A8 1F 05 98 */ lha r0, 0x598(r31) -/* 80671F24 B0 1F 00 FC */ sth r0, 0xfc(r31) -/* 80671F28 88 1F 05 93 */ lbz r0, 0x593(r31) -/* 80671F2C 98 1F 00 FE */ stb r0, 0xfe(r31) -lbl_80671F30: -/* 80671F30 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80671F34 60 00 00 04 */ ori r0, r0, 4 -/* 80671F38 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80671F3C: -/* 80671F3C 38 60 00 01 */ li r3, 1 -/* 80671F40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80671F44 83 C1 00 08 */ lwz r30, 8(r1) -/* 80671F48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80671F4C 7C 08 03 A6 */ mtlr r0 -/* 80671F50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80671F54 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionEnd__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionEnd__11daBdoorL5_cFv.s deleted file mode 100644 index 8d388c62a6..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionEnd__11daBdoorL5_cFv.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_80672004: -/* 80672004 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80672008 7C 08 02 A6 */ mflr r0 -/* 8067200C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80672010 39 61 00 50 */ addi r11, r1, 0x50 -/* 80672014 4B CF 01 C9 */ bl _savegpr_29 -/* 80672018 7C 7F 1B 78 */ mr r31, r3 -/* 8067201C 3C 60 80 67 */ lis r3, l_door_open_demo@ha /* 0x806724C8@ha */ -/* 80672020 3B C3 24 C8 */ addi r30, r3, l_door_open_demo@l /* 0x806724C8@l */ -/* 80672024 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80672028 4B BF 61 AD */ bl ChkUsed__9cBgW_BgIdCFv -/* 8067202C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80672030 40 82 00 1C */ bne lbl_8067204C -/* 80672034 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80672038 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8067203C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80672040 80 9F 05 88 */ lwz r4, 0x588(r31) -/* 80672044 7F E5 FB 78 */ mr r5, r31 -/* 80672048 4B A0 29 C1 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_8067204C: -/* 8067204C 38 00 00 00 */ li r0, 0 -/* 80672050 98 1F 05 91 */ stb r0, 0x591(r31) -/* 80672054 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80672058 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8067205C A8 1F 04 B6 */ lha r0, 0x4b6(r31) -/* 80672060 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80672064 7C 64 02 14 */ add r3, r4, r0 -/* 80672068 C0 23 00 04 */ lfs f1, 4(r3) -/* 8067206C 7C 04 04 2E */ lfsx f0, r4, r0 -/* 80672070 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80672074 C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80672078 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8067207C D0 21 00 34 */ stfs f1, 0x34(r1) -/* 80672080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80672084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80672088 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 8067208C 38 61 00 08 */ addi r3, r1, 8 -/* 80672090 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80672094 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80672098 4B BF 4A 9D */ bl __mi__4cXyzCFRC3Vec -/* 8067209C C0 21 00 08 */ lfs f1, 8(r1) -/* 806720A0 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 806720A4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 806720A8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 806720AC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 806720B0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 806720B4 C0 C1 00 2C */ lfs f6, 0x2c(r1) -/* 806720B8 EC 21 01 B2 */ fmuls f1, f1, f6 -/* 806720BC C0 41 00 34 */ lfs f2, 0x34(r1) -/* 806720C0 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 806720C4 EC 81 00 2A */ fadds f4, f1, f0 -/* 806720C8 C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 806720CC FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 806720D0 40 80 00 0C */ bge lbl_806720DC -/* 806720D4 C0 BE 00 78 */ lfs f5, 0x78(r30) -/* 806720D8 48 00 00 08 */ b lbl_806720E0 -lbl_806720DC: -/* 806720DC C0 BE 00 7C */ lfs f5, 0x7c(r30) -lbl_806720E0: -/* 806720E0 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 806720E4 EC 05 00 B2 */ fmuls f0, f5, f2 -/* 806720E8 EC 61 00 28 */ fsubs f3, f1, f0 -/* 806720EC C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 806720F0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 806720F4 EC 05 01 B2 */ fmuls f0, f5, f6 -/* 806720F8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 806720FC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80672100 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 80672104 D0 61 00 1C */ stfs f3, 0x1c(r1) -/* 80672108 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8067210C 7C 06 07 74 */ extsb r6, r0 -/* 80672110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80672114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80672118 38 63 0D B4 */ addi r3, r3, 0xdb4 -/* 8067211C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80672120 C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80672124 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 80672128 40 81 00 0C */ ble lbl_80672134 -/* 8067212C A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80672130 48 00 00 14 */ b lbl_80672144 -lbl_80672134: -/* 80672134 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80672138 3C A5 00 01 */ addis r5, r5, 1 -/* 8067213C 38 05 80 00 */ addi r0, r5, -32768 -/* 80672140 7C 05 07 34 */ extsh r5, r0 -lbl_80672144: -/* 80672144 4B 9C 2E 3D */ bl setRoom__13dSv_restart_cFRC4cXyzsSc -/* 80672148 38 60 00 01 */ li r3, 1 -/* 8067214C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80672150 4B CF 00 D9 */ bl _restgpr_29 -/* 80672154 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80672158 7C 08 03 A6 */ mtlr r0 -/* 8067215C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80672160 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionOpen__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionOpen__11daBdoorL5_cFv.s deleted file mode 100644 index fdead67796..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionOpen__11daBdoorL5_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80671F58: -/* 80671F58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80671F5C 7C 08 02 A6 */ mflr r0 -/* 80671F60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80671F64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80671F68 7C 7F 1B 78 */ mr r31, r3 -/* 80671F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671F74 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80671F78 3C 80 80 67 */ lis r4, l_staff_name@ha /* 0x806724FC@ha */ -/* 80671F7C 38 84 24 FC */ addi r4, r4, l_staff_name@l /* 0x806724FC@l */ -/* 80671F80 38 A0 00 00 */ li r5, 0 -/* 80671F84 38 C0 00 00 */ li r6, 0 -/* 80671F88 4B 9D 5B 95 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80671F8C 90 7F 05 9C */ stw r3, 0x59c(r31) -/* 80671F90 7F E3 FB 78 */ mr r3, r31 -/* 80671F94 4B FF F3 91 */ bl demoProc__11daBdoorL5_cFv -/* 80671F98 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80671F9C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80671FA0 A0 03 00 B0 */ lhz r0, 0xb0(r3) -/* 80671FA4 60 00 00 02 */ ori r0, r0, 2 -/* 80671FA8 B0 03 00 B0 */ sth r0, 0xb0(r3) -/* 80671FAC 38 7F 05 94 */ addi r3, r31, 0x594 -/* 80671FB0 48 00 04 E5 */ bl func_80672494 -/* 80671FB4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80671FB8 28 00 00 01 */ cmplwi r0, 1 -/* 80671FBC 40 82 00 30 */ bne lbl_80671FEC -/* 80671FC0 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 80671FC4 3C 03 00 01 */ addis r0, r3, 1 -/* 80671FC8 28 00 FF FF */ cmplwi r0, 0xffff -/* 80671FCC 41 82 00 20 */ beq lbl_80671FEC -/* 80671FD0 4B 9B 01 69 */ bl fpcM_IsCreating__FUi -/* 80671FD4 2C 03 00 00 */ cmpwi r3, 0 -/* 80671FD8 40 82 00 14 */ bne lbl_80671FEC -/* 80671FDC 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 80671FE0 4B 9A 7C D9 */ bl fopAcM_delete__FUi -/* 80671FE4 38 00 FF FF */ li r0, -1 -/* 80671FE8 90 1F 05 8C */ stw r0, 0x58c(r31) -lbl_80671FEC: -/* 80671FEC 38 60 00 01 */ li r3, 1 -/* 80671FF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80671FF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80671FF8 7C 08 03 A6 */ mtlr r0 -/* 80671FFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672000 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcGoal__11daBdoorL5_cFP4cXyzi.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcGoal__11daBdoorL5_cFP4cXyzi.s deleted file mode 100644 index 7bac4db46c..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcGoal__11daBdoorL5_cFP4cXyzi.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80671954: -/* 80671954 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80671958 7C 08 02 A6 */ mflr r0 -/* 8067195C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80671960 39 61 00 30 */ addi r11, r1, 0x30 -/* 80671964 4B CF 08 75 */ bl _savegpr_28 -/* 80671968 7C 7D 1B 78 */ mr r29, r3 -/* 8067196C 7C 9E 23 78 */ mr r30, r4 -/* 80671970 7C BC 2B 78 */ mr r28, r5 -/* 80671974 3C 60 80 67 */ lis r3, l_door_open_demo@ha /* 0x806724C8@ha */ -/* 80671978 3B E3 24 C8 */ addi r31, r3, l_door_open_demo@l /* 0x806724C8@l */ -/* 8067197C 38 61 00 08 */ addi r3, r1, 8 -/* 80671980 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671984 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671988 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 8067198C 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80671990 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80671994 4B BF 51 A1 */ bl __mi__4cXyzCFRC3Vec -/* 80671998 C0 01 00 08 */ lfs f0, 8(r1) -/* 8067199C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 806719A0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 806719A4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 806719A8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 806719AC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 806719B0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806719B4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806719B8 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 806719BC 7C 00 00 D0 */ neg r0, r0 -/* 806719C0 7C 04 07 34 */ extsh r4, r0 -/* 806719C4 4B 99 AA 19 */ bl mDoMtx_YrotS__FPA4_fs -/* 806719C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806719CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806719D0 38 81 00 14 */ addi r4, r1, 0x14 -/* 806719D4 7C 85 23 78 */ mr r5, r4 -/* 806719D8 4B CD 53 95 */ bl PSMTXMultVec -/* 806719DC C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 806719E0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 806719E4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 806719E8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 806719EC C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 806719F0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 806719F4 2C 1C 00 00 */ cmpwi r28, 0 -/* 806719F8 40 82 00 10 */ bne lbl_80671A08 -/* 806719FC C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 80671A00 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80671A04 48 00 00 0C */ b lbl_80671A10 -lbl_80671A08: -/* 80671A08 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80671A0C D0 01 00 1C */ stfs f0, 0x1c(r1) -lbl_80671A10: -/* 80671A10 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80671A14 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80671A18 C0 3D 04 D0 */ lfs f1, 0x4d0(r29) -/* 80671A1C C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 80671A20 C0 7D 04 D8 */ lfs f3, 0x4d8(r29) -/* 80671A24 4B CD 4E C5 */ bl PSMTXTrans -/* 80671A28 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80671A2C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80671A30 A8 9D 04 DE */ lha r4, 0x4de(r29) -/* 80671A34 4B 99 AA 01 */ bl mDoMtx_YrotM__FPA4_fs -/* 80671A38 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80671A3C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80671A40 38 81 00 14 */ addi r4, r1, 0x14 -/* 80671A44 7C 85 23 78 */ mr r5, r4 -/* 80671A48 4B CD 53 25 */ bl PSMTXMultVec -/* 80671A4C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80671A50 D0 1E 00 00 */ stfs f0, 0(r30) -/* 80671A54 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80671A58 D0 1E 00 04 */ stfs f0, 4(r30) -/* 80671A5C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80671A60 D0 1E 00 08 */ stfs f0, 8(r30) -/* 80671A64 39 61 00 30 */ addi r11, r1, 0x30 -/* 80671A68 4B CF 07 BD */ bl _restgpr_28 -/* 80671A6C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80671A70 7C 08 03 A6 */ mtlr r0 -/* 80671A74 38 21 00 30 */ addi r1, r1, 0x30 -/* 80671A78 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcMtx__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcMtx__11daBdoorL5_cFv.s deleted file mode 100644 index 11237ccfe1..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcMtx__11daBdoorL5_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80670F08: -/* 80670F08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80670F0C 7C 08 02 A6 */ mflr r0 -/* 80670F10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80670F14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80670F18 7C 7F 1B 78 */ mr r31, r3 -/* 80670F1C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80670F20 4B 99 BE 45 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80670F24 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80670F28 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80670F2C A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 80670F30 4B 99 B5 05 */ bl mDoMtx_YrotM__FPA4_fs -/* 80670F34 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80670F38 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80670F3C 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 80670F40 38 84 00 24 */ addi r4, r4, 0x24 -/* 80670F44 4B CD 55 6D */ bl PSMTXCopy -/* 80670F48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80670F4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80670F50 7C 08 03 A6 */ mtlr r0 -/* 80670F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80670F58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkArea__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkArea__11daBdoorL5_cFv.s deleted file mode 100644 index d8a385d3e1..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkArea__11daBdoorL5_cFv.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_80671C14: -/* 80671C14 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80671C18 7C 08 02 A6 */ mflr r0 -/* 80671C1C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80671C20 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80671C24 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80671C28 7C 7E 1B 78 */ mr r30, r3 -/* 80671C2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671C30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671C34 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 80671C38 38 61 00 08 */ addi r3, r1, 8 -/* 80671C3C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80671C40 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80671C44 4B BF 4E F1 */ bl __mi__4cXyzCFRC3Vec -/* 80671C48 C0 01 00 08 */ lfs f0, 8(r1) -/* 80671C4C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80671C50 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80671C54 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80671C58 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80671C5C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80671C60 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80671C64 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80671C68 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80671C6C 7C 00 00 D0 */ neg r0, r0 -/* 80671C70 7C 04 07 34 */ extsh r4, r0 -/* 80671C74 4B 99 A7 69 */ bl mDoMtx_YrotS__FPA4_fs -/* 80671C78 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80671C7C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80671C80 38 81 00 14 */ addi r4, r1, 0x14 -/* 80671C84 7C 85 23 78 */ mr r5, r4 -/* 80671C88 4B CD 50 E5 */ bl PSMTXMultVec -/* 80671C8C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80671C90 FC 00 02 10 */ fabs f0, f0 -/* 80671C94 FC 20 00 18 */ frsp f1, f0 -/* 80671C98 3C 60 80 67 */ lis r3, lit_4154@ha /* 0x80672530@ha */ -/* 80671C9C C0 03 25 30 */ lfs f0, lit_4154@l(r3) /* 0x80672530@l */ -/* 80671CA0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80671CA4 40 81 00 0C */ ble lbl_80671CB0 -/* 80671CA8 38 60 00 00 */ li r3, 0 -/* 80671CAC 48 00 00 80 */ b lbl_80671D2C -lbl_80671CB0: -/* 80671CB0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80671CB4 FC 00 02 10 */ fabs f0, f0 -/* 80671CB8 FC 20 00 18 */ frsp f1, f0 -/* 80671CBC 3C 60 80 67 */ lis r3, lit_4155@ha /* 0x80672534@ha */ -/* 80671CC0 C0 03 25 34 */ lfs f0, lit_4155@l(r3) /* 0x80672534@l */ -/* 80671CC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80671CC8 40 81 00 0C */ ble lbl_80671CD4 -/* 80671CCC 38 60 00 00 */ li r3, 0 -/* 80671CD0 48 00 00 5C */ b lbl_80671D2C -lbl_80671CD4: -/* 80671CD4 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80671CD8 A8 7E 04 DE */ lha r3, 0x4de(r30) -/* 80671CDC 38 03 80 01 */ addi r0, r3, -32767 -/* 80671CE0 7C 04 00 50 */ subf r0, r4, r0 -/* 80671CE4 3C 60 80 67 */ lis r3, lit_4157@ha /* 0x80672538@ha */ -/* 80671CE8 C8 23 25 38 */ lfd f1, lit_4157@l(r3) /* 0x80672538@l */ -/* 80671CEC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80671CF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80671CF4 3C 00 43 30 */ lis r0, 0x4330 -/* 80671CF8 90 01 00 20 */ stw r0, 0x20(r1) -/* 80671CFC C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80671D00 FC 00 08 28 */ fsub f0, f0, f1 -/* 80671D04 FC 00 02 10 */ fabs f0, f0 -/* 80671D08 FC 00 00 1E */ fctiwz f0, f0 -/* 80671D0C D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80671D10 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80671D14 7C 05 07 34 */ extsh r5, r0 -/* 80671D18 38 00 40 00 */ li r0, 0x4000 -/* 80671D1C 7C 04 FE 70 */ srawi r4, r0, 0x1f -/* 80671D20 54 A3 0F FE */ srwi r3, r5, 0x1f -/* 80671D24 7C 05 00 10 */ subfc r0, r5, r0 -/* 80671D28 7C 64 19 14 */ adde r3, r4, r3 -lbl_80671D2C: -/* 80671D2C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80671D30 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80671D34 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80671D38 7C 08 03 A6 */ mtlr r0 -/* 80671D3C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80671D40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkFront__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkFront__11daBdoorL5_cFv.s deleted file mode 100644 index 269f732741..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkFront__11daBdoorL5_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80671D44: -/* 80671D44 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80671D48 7C 08 02 A6 */ mflr r0 -/* 80671D4C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80671D50 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80671D54 7C 7F 1B 78 */ mr r31, r3 -/* 80671D58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671D5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671D60 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 80671D64 38 61 00 08 */ addi r3, r1, 8 -/* 80671D68 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80671D6C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80671D70 4B BF 4D C5 */ bl __mi__4cXyzCFRC3Vec -/* 80671D74 C0 01 00 08 */ lfs f0, 8(r1) -/* 80671D78 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80671D7C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80671D80 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80671D84 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80671D88 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80671D8C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80671D90 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80671D94 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80671D98 7C 00 00 D0 */ neg r0, r0 -/* 80671D9C 7C 04 07 34 */ extsh r4, r0 -/* 80671DA0 4B 99 A6 3D */ bl mDoMtx_YrotS__FPA4_fs -/* 80671DA4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80671DA8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80671DAC 38 81 00 14 */ addi r4, r1, 0x14 -/* 80671DB0 7C 85 23 78 */ mr r5, r4 -/* 80671DB4 4B CD 4F B9 */ bl PSMTXMultVec -/* 80671DB8 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80671DBC 3C 60 80 67 */ lis r3, lit_4015@ha /* 0x8067251C@ha */ -/* 80671DC0 C0 03 25 1C */ lfs f0, lit_4015@l(r3) /* 0x8067251C@l */ -/* 80671DC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80671DC8 7C 00 00 26 */ mfcr r0 -/* 80671DCC 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80671DD0 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80671DD4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80671DD8 7C 08 03 A6 */ mtlr r0 -/* 80671DDC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80671DE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkOpen__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkOpen__11daBdoorL5_cFv.s deleted file mode 100644 index 9ba545ef55..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkOpen__11daBdoorL5_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80671DE4: -/* 80671DE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80671DE8 7C 08 02 A6 */ mflr r0 -/* 80671DEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80671DF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80671DF4 7C 7F 1B 78 */ mr r31, r3 -/* 80671DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671DFC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671E00 80 64 5D B4 */ lwz r3, 0x5db4(r4) -/* 80671E04 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80671E08 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80671E0C 41 82 00 0C */ beq lbl_80671E18 -/* 80671E10 38 60 00 00 */ li r3, 0 -/* 80671E14 48 00 00 48 */ b lbl_80671E5C -lbl_80671E18: -/* 80671E18 38 64 09 58 */ addi r3, r4, 0x958 -/* 80671E1C 38 80 00 02 */ li r4, 2 -/* 80671E20 4B 9C 2B 15 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80671E24 2C 03 00 00 */ cmpwi r3, 0 -/* 80671E28 40 82 00 0C */ bne lbl_80671E34 -/* 80671E2C 38 60 00 00 */ li r3, 0 -/* 80671E30 48 00 00 2C */ b lbl_80671E5C -lbl_80671E34: -/* 80671E34 7F E3 FB 78 */ mr r3, r31 -/* 80671E38 4B FF FF 0D */ bl checkFront__11daBdoorL5_cFv -/* 80671E3C 2C 03 00 00 */ cmpwi r3, 0 -/* 80671E40 40 82 00 0C */ bne lbl_80671E4C -/* 80671E44 38 60 00 00 */ li r3, 0 -/* 80671E48 48 00 00 14 */ b lbl_80671E5C -lbl_80671E4C: -/* 80671E4C 7F E3 FB 78 */ mr r3, r31 -/* 80671E50 4B FF FD C5 */ bl checkArea__11daBdoorL5_cFv -/* 80671E54 30 03 FF FF */ addic r0, r3, -1 -/* 80671E58 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80671E5C: -/* 80671E5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80671E60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80671E64 7C 08 03 A6 */ mtlr r0 -/* 80671E68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80671E6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeEnd__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeEnd__11daBdoorL5_cFv.s deleted file mode 100644 index 67bba3496d..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeEnd__11daBdoorL5_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80671820: -/* 80671820 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80671824 7C 08 02 A6 */ mflr r0 -/* 80671828 90 01 00 24 */ stw r0, 0x24(r1) -/* 8067182C 3C 60 80 67 */ lis r3, lit_4015@ha /* 0x8067251C@ha */ -/* 80671830 C0 23 25 1C */ lfs f1, lit_4015@l(r3) /* 0x8067251C@l */ -/* 80671834 D0 21 00 08 */ stfs f1, 8(r1) -/* 80671838 3C 60 80 67 */ lis r3, lit_3757@ha /* 0x8067250C@ha */ -/* 8067183C C0 03 25 0C */ lfs f0, lit_3757@l(r3) /* 0x8067250C@l */ -/* 80671840 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80671844 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80671848 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067184C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671850 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80671854 38 80 00 04 */ li r4, 4 -/* 80671858 38 A0 00 1F */ li r5, 0x1f -/* 8067185C 38 C1 00 08 */ addi r6, r1, 8 -/* 80671860 4B 9F E1 C5 */ bl StartShock__12dVibration_cFii4cXyz -/* 80671864 38 60 00 01 */ li r3, 1 -/* 80671868 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8067186C 7C 08 03 A6 */ mtlr r0 -/* 80671870 38 21 00 20 */ addi r1, r1, 0x20 -/* 80671874 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeInit__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeInit__11daBdoorL5_cFv.s deleted file mode 100644 index afafce36ce..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeInit__11daBdoorL5_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80671720: -/* 80671720 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80671724 7C 08 02 A6 */ mflr r0 -/* 80671728 90 01 00 24 */ stw r0, 0x24(r1) -/* 8067172C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80671730 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80671734 7C 7E 1B 78 */ mr r30, r3 -/* 80671738 4B FF F5 55 */ bl getCloseAnm__11daBdoorL5_cFv -/* 8067173C 7C 7F 1B 78 */ mr r31, r3 -/* 80671740 7F C3 F3 78 */ mr r3, r30 -/* 80671744 4B FF F5 31 */ bl getAnmArcName__11daBdoorL5_cFv -/* 80671748 7F E4 FB 78 */ mr r4, r31 -/* 8067174C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671750 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671754 3C A5 00 02 */ addis r5, r5, 2 -/* 80671758 38 C0 00 80 */ li r6, 0x80 -/* 8067175C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80671760 4B 9C AB 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80671764 7C 64 1B 78 */ mr r4, r3 -/* 80671768 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 8067176C 38 A0 00 01 */ li r5, 1 -/* 80671770 38 C0 00 00 */ li r6, 0 -/* 80671774 3C E0 80 67 */ lis r7, lit_3757@ha /* 0x8067250C@ha */ -/* 80671778 C0 27 25 0C */ lfs f1, lit_3757@l(r7) /* 0x8067250C@l */ -/* 8067177C 38 E0 00 00 */ li r7, 0 -/* 80671780 39 00 FF FF */ li r8, -1 -/* 80671784 39 20 00 01 */ li r9, 1 -/* 80671788 4B 99 C0 55 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 8067178C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80671790 7C 03 07 74 */ extsb r3, r0 -/* 80671794 4B 9B B8 D9 */ bl dComIfGp_getReverb__Fi -/* 80671798 7C 67 1B 78 */ mr r7, r3 -/* 8067179C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080192@ha */ -/* 806717A0 38 03 01 92 */ addi r0, r3, 0x0192 /* 0x00080192@l */ -/* 806717A4 90 01 00 08 */ stw r0, 8(r1) -/* 806717A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 806717AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 806717B0 80 63 00 00 */ lwz r3, 0(r3) -/* 806717B4 38 81 00 08 */ addi r4, r1, 8 -/* 806717B8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 806717BC 38 C0 00 00 */ li r6, 0 -/* 806717C0 3D 00 80 67 */ lis r8, lit_3757@ha /* 0x8067250C@ha */ -/* 806717C4 C0 28 25 0C */ lfs f1, lit_3757@l(r8) /* 0x8067250C@l */ -/* 806717C8 FC 40 08 90 */ fmr f2, f1 -/* 806717CC 3D 00 80 67 */ lis r8, lit_3981@ha /* 0x80672518@ha */ -/* 806717D0 C0 68 25 18 */ lfs f3, lit_3981@l(r8) /* 0x80672518@l */ -/* 806717D4 FC 80 18 90 */ fmr f4, f3 -/* 806717D8 39 00 00 00 */ li r8, 0 -/* 806717DC 4B C3 A1 A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 806717E0 38 60 00 01 */ li r3, 1 -/* 806717E4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 806717E8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 806717EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 806717F0 7C 08 03 A6 */ mtlr r0 -/* 806717F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 806717F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeProc__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeProc__11daBdoorL5_cFv.s deleted file mode 100644 index 7f78903f1f..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeProc__11daBdoorL5_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_806717FC: -/* 806717FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80671800 7C 08 02 A6 */ mflr r0 -/* 80671804 90 01 00 14 */ stw r0, 0x14(r1) -/* 80671808 80 63 05 84 */ lwz r3, 0x584(r3) -/* 8067180C 4B 99 BC 1D */ bl play__14mDoExt_baseAnmFv -/* 80671810 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80671814 7C 08 03 A6 */ mtlr r0 -/* 80671818 38 21 00 10 */ addi r1, r1, 0x10 -/* 8067181C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/createKey__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/createKey__11daBdoorL5_cFv.s deleted file mode 100644 index 311095c7f5..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/createKey__11daBdoorL5_cFv.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_80671B14: -/* 80671B14 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80671B18 7C 08 02 A6 */ mflr r0 -/* 80671B1C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80671B20 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80671B24 7C 7F 1B 78 */ mr r31, r3 -/* 80671B28 88 03 05 90 */ lbz r0, 0x590(r3) -/* 80671B2C 28 00 00 00 */ cmplwi r0, 0 -/* 80671B30 40 82 00 CC */ bne lbl_80671BFC -/* 80671B34 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80671B38 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80671B3C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80671B40 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80671B44 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80671B48 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80671B4C C0 1F 04 A8 */ lfs f0, 0x4a8(r31) -/* 80671B50 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80671B54 C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 80671B58 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80671B5C C0 1F 04 B0 */ lfs f0, 0x4b0(r31) -/* 80671B60 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80671B64 3C 60 80 67 */ lis r3, lit_4015@ha /* 0x8067251C@ha */ -/* 80671B68 C0 03 25 1C */ lfs f0, lit_4015@l(r3) /* 0x8067251C@l */ -/* 80671B6C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80671B70 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80671B74 3C 60 80 67 */ lis r3, lit_4110@ha /* 0x8067252C@ha */ -/* 80671B78 C0 03 25 2C */ lfs f0, lit_4110@l(r3) /* 0x8067252C@l */ -/* 80671B7C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80671B80 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80671B84 7C 07 07 74 */ extsb r7, r0 -/* 80671B88 38 00 00 00 */ li r0, 0 -/* 80671B8C 90 01 00 08 */ stw r0, 8(r1) -/* 80671B90 38 60 01 14 */ li r3, 0x114 -/* 80671B94 28 1F 00 00 */ cmplwi r31, 0 -/* 80671B98 41 82 00 0C */ beq lbl_80671BA4 -/* 80671B9C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80671BA0 48 00 00 08 */ b lbl_80671BA8 -lbl_80671BA4: -/* 80671BA4 38 80 FF FF */ li r4, -1 -lbl_80671BA8: -/* 80671BA8 38 A0 FF 05 */ li r5, -251 -/* 80671BAC 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80671BB0 39 1F 04 E4 */ addi r8, r31, 0x4e4 -/* 80671BB4 39 3F 04 EC */ addi r9, r31, 0x4ec -/* 80671BB8 39 40 FF FF */ li r10, -1 -/* 80671BBC 4B 9A 83 BD */ bl fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -/* 80671BC0 90 7F 05 8C */ stw r3, 0x58c(r31) -/* 80671BC4 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80671BC8 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80671BCC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80671BD0 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80671BD4 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80671BD8 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80671BDC 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 80671BE0 3C 03 00 01 */ addis r0, r3, 1 -/* 80671BE4 28 00 FF FF */ cmplwi r0, 0xffff -/* 80671BE8 40 82 00 0C */ bne lbl_80671BF4 -/* 80671BEC 38 60 00 00 */ li r3, 0 -/* 80671BF0 48 00 00 10 */ b lbl_80671C00 -lbl_80671BF4: -/* 80671BF4 38 00 00 01 */ li r0, 1 -/* 80671BF8 98 1F 05 90 */ stb r0, 0x590(r31) -lbl_80671BFC: -/* 80671BFC 38 60 00 01 */ li r3, 1 -lbl_80671C00: -/* 80671C00 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80671C04 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80671C08 7C 08 03 A6 */ mtlr r0 -/* 80671C0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80671C10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/create__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/create__11daBdoorL5_cFv.s deleted file mode 100644 index f33458f204..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/create__11daBdoorL5_cFv.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_8067106C: -/* 8067106C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80671070 7C 08 02 A6 */ mflr r0 -/* 80671074 90 01 00 24 */ stw r0, 0x24(r1) -/* 80671078 39 61 00 20 */ addi r11, r1, 0x20 -/* 8067107C 4B CF 11 61 */ bl _savegpr_29 -/* 80671080 7C 7F 1B 78 */ mr r31, r3 -/* 80671084 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80671088 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8067108C 40 82 00 58 */ bne lbl_806710E4 -/* 80671090 7F E0 FB 79 */ or. r0, r31, r31 -/* 80671094 41 82 00 44 */ beq lbl_806710D8 -/* 80671098 7C 1E 03 78 */ mr r30, r0 -/* 8067109C 4B 9A 7A C9 */ bl __ct__10fopAc_ac_cFv -/* 806710A0 3B BE 05 B8 */ addi r29, r30, 0x5b8 -/* 806710A4 7F A3 EB 78 */ mr r3, r29 -/* 806710A8 4B A0 4F F9 */ bl __ct__9dBgS_AcchFv -/* 806710AC 3C 60 80 67 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x8067276C@ha */ -/* 806710B0 38 63 27 6C */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x8067276C@l */ -/* 806710B4 90 7D 00 10 */ stw r3, 0x10(r29) -/* 806710B8 38 03 00 0C */ addi r0, r3, 0xc -/* 806710BC 90 1D 00 14 */ stw r0, 0x14(r29) -/* 806710C0 38 03 00 18 */ addi r0, r3, 0x18 -/* 806710C4 90 1D 00 24 */ stw r0, 0x24(r29) -/* 806710C8 38 7D 00 14 */ addi r3, r29, 0x14 -/* 806710CC 4B A0 7D 9D */ bl SetObj__16dBgS_PolyPassChkFv -/* 806710D0 38 7E 07 90 */ addi r3, r30, 0x790 -/* 806710D4 4B A0 4D D9 */ bl __ct__12dBgS_AcchCirFv -lbl_806710D8: -/* 806710D8 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 806710DC 60 00 00 08 */ ori r0, r0, 8 -/* 806710E0 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_806710E4: -/* 806710E4 7F E3 FB 78 */ mr r3, r31 -/* 806710E8 4B FF FB 51 */ bl getArcName__11daBdoorL5_cFv -/* 806710EC 7C 64 1B 78 */ mr r4, r3 -/* 806710F0 38 7F 05 68 */ addi r3, r31, 0x568 -/* 806710F4 4B 9B BD C9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 806710F8 2C 03 00 04 */ cmpwi r3, 4 -/* 806710FC 41 82 00 08 */ beq lbl_80671104 -/* 80671100 48 00 00 E4 */ b lbl_806711E4 -lbl_80671104: -/* 80671104 7F E3 FB 78 */ mr r3, r31 -/* 80671108 4B FF FB 6D */ bl getAnmArcName__11daBdoorL5_cFv -/* 8067110C 7C 64 1B 78 */ mr r4, r3 -/* 80671110 38 7F 05 78 */ addi r3, r31, 0x578 -/* 80671114 4B 9B BD A9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80671118 2C 03 00 04 */ cmpwi r3, 4 -/* 8067111C 41 82 00 08 */ beq lbl_80671124 -/* 80671120 48 00 00 C4 */ b lbl_806711E4 -lbl_80671124: -/* 80671124 7F E3 FB 78 */ mr r3, r31 -/* 80671128 4B FF FB 1D */ bl getAlwaysArcName__11daBdoorL5_cFv -/* 8067112C 7C 64 1B 78 */ mr r4, r3 -/* 80671130 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80671134 4B 9B BD 89 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80671138 2C 03 00 04 */ cmpwi r3, 4 -/* 8067113C 41 82 00 08 */ beq lbl_80671144 -/* 80671140 48 00 00 A4 */ b lbl_806711E4 -lbl_80671144: -/* 80671144 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80671148 7C 1E 07 74 */ extsb r30, r0 -/* 8067114C 7F E3 FB 78 */ mr r3, r31 -/* 80671150 4B 9C 90 81 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80671154 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80671158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067115C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671160 7F C5 F3 78 */ mr r5, r30 -/* 80671164 4B 9C 41 FD */ bl isSwitch__10dSv_info_cCFii -/* 80671168 2C 03 00 00 */ cmpwi r3, 0 -/* 8067116C 40 82 00 38 */ bne lbl_806711A4 -/* 80671170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671174 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671178 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8067117C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80671180 7D 89 03 A6 */ mtctr r12 -/* 80671184 4E 80 04 21 */ bctrl -/* 80671188 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8067118C 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 80671190 28 00 00 03 */ cmplwi r0, 3 -/* 80671194 41 82 00 10 */ beq lbl_806711A4 -/* 80671198 7F E3 FB 78 */ mr r3, r31 -/* 8067119C 48 00 09 79 */ bl createKey__11daBdoorL5_cFv -/* 806711A0 48 00 00 0C */ b lbl_806711AC -lbl_806711A4: -/* 806711A4 38 00 FF FF */ li r0, -1 -/* 806711A8 90 1F 05 8C */ stw r0, 0x58c(r31) -lbl_806711AC: -/* 806711AC 7F E3 FB 78 */ mr r3, r31 -/* 806711B0 3C 80 80 67 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80670CF0@ha */ -/* 806711B4 38 84 0C F0 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80670CF0@l */ -/* 806711B8 38 A0 0D 40 */ li r5, 0xd40 -/* 806711BC 4B 9A 92 F5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 806711C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 806711C4 40 82 00 0C */ bne lbl_806711D0 -/* 806711C8 38 60 00 05 */ li r3, 5 -/* 806711CC 48 00 00 18 */ b lbl_806711E4 -lbl_806711D0: -/* 806711D0 7F E3 FB 78 */ mr r3, r31 -/* 806711D4 4B FF FD 89 */ bl CreateInit__11daBdoorL5_cFv -/* 806711D8 20 03 00 00 */ subfic r0, r3, 0 -/* 806711DC 7C 60 01 10 */ subfe r3, r0, r0 -/* 806711E0 38 63 00 05 */ addi r3, r3, 5 -lbl_806711E4: -/* 806711E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 806711E8 4B CF 10 41 */ bl _restgpr_29 -/* 806711EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 806711F0 7C 08 03 A6 */ mtlr r0 -/* 806711F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 806711F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Create__FP10fopAc_ac_c.s deleted file mode 100644 index f70192f18b..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80672474: -/* 80672474 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672478 7C 08 02 A6 */ mflr r0 -/* 8067247C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672480 4B FF EB ED */ bl create__11daBdoorL5_cFv -/* 80672484 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672488 7C 08 03 A6 */ mtlr r0 -/* 8067248C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672490 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Delete__FP11daBdoorL5_c.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Delete__FP11daBdoorL5_c.s deleted file mode 100644 index 41a94f51cd..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Delete__FP11daBdoorL5_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80672450: -/* 80672450 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672454 7C 08 02 A6 */ mflr r0 -/* 80672458 90 01 00 14 */ stw r0, 0x14(r1) -/* 8067245C 4B FF FF 19 */ bl Delete__11daBdoorL5_cFv -/* 80672460 38 60 00 01 */ li r3, 1 -/* 80672464 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672468 7C 08 03 A6 */ mtlr r0 -/* 8067246C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672470 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Draw__FP11daBdoorL5_c.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Draw__FP11daBdoorL5_c.s deleted file mode 100644 index f79746e5b9..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Draw__FP11daBdoorL5_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8067240C: -/* 8067240C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672410 7C 08 02 A6 */ mflr r0 -/* 80672414 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672418 4B FF FE 75 */ bl draw__11daBdoorL5_cFv -/* 8067241C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672420 7C 08 03 A6 */ mtlr r0 -/* 80672424 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672428 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Execute__FP11daBdoorL5_c.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Execute__FP11daBdoorL5_c.s deleted file mode 100644 index 13e3772c6d..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Execute__FP11daBdoorL5_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8067242C: -/* 8067242C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672430 7C 08 02 A6 */ mflr r0 -/* 80672434 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672438 4B FF FD 2D */ bl execute__11daBdoorL5_cFv -/* 8067243C 38 60 00 01 */ li r3, 1 -/* 80672440 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672444 7C 08 03 A6 */ mtlr r0 -/* 80672448 38 21 00 10 */ addi r1, r1, 0x10 -/* 8067244C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/demoProc__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/demoProc__11daBdoorL5_cFv.s deleted file mode 100644 index b239b9d1bc..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/demoProc__11daBdoorL5_cFv.s +++ /dev/null @@ -1,194 +0,0 @@ -lbl_80671324: -/* 80671324 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80671328 7C 08 02 A6 */ mflr r0 -/* 8067132C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80671330 39 61 00 30 */ addi r11, r1, 0x30 -/* 80671334 4B CF 0E 9D */ bl _savegpr_26 -/* 80671338 7C 7B 1B 78 */ mr r27, r3 -/* 8067133C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671340 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671344 83 9E 5D AC */ lwz r28, 0x5dac(r30) -/* 80671348 4B FF FF 95 */ bl getDemoAction__11daBdoorL5_cFv -/* 8067134C 7C 7F 1B 78 */ mr r31, r3 -/* 80671350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671358 3B A3 4F F8 */ addi r29, r3, 0x4ff8 -/* 8067135C 7F A3 EB 78 */ mr r3, r29 -/* 80671360 80 9B 05 9C */ lwz r4, 0x59c(r27) -/* 80671364 4B 9D 69 E9 */ bl getIsAddvance__16dEvent_manager_cFi -/* 80671368 2C 03 00 00 */ cmpwi r3, 0 -/* 8067136C 41 82 01 24 */ beq lbl_80671490 -/* 80671370 28 1F 00 0D */ cmplwi r31, 0xd -/* 80671374 41 81 01 1C */ bgt lbl_80671490 -/* 80671378 3C 60 80 67 */ lis r3, lit_3951@ha /* 0x80672678@ha */ -/* 8067137C 38 63 26 78 */ addi r3, r3, lit_3951@l /* 0x80672678@l */ -/* 80671380 57 E0 10 3A */ slwi r0, r31, 2 -/* 80671384 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80671388 7C 09 03 A6 */ mtctr r0 -/* 8067138C 4E 80 04 20 */ bctr -lbl_80671390: -/* 80671390 88 1B 04 E2 */ lbz r0, 0x4e2(r27) -/* 80671394 7C 1A 07 74 */ extsb r26, r0 -/* 80671398 7F 63 DB 78 */ mr r3, r27 -/* 8067139C 4B 9C 8E 35 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 806713A0 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 806713A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806713A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806713AC 7F 45 D3 78 */ mr r5, r26 -/* 806713B0 4B 9C 3F B1 */ bl isSwitch__10dSv_info_cCFii -/* 806713B4 2C 03 00 00 */ cmpwi r3, 0 -/* 806713B8 40 82 00 1C */ bne lbl_806713D4 -/* 806713BC 80 1C 05 70 */ lwz r0, 0x570(r28) -/* 806713C0 64 00 08 00 */ oris r0, r0, 0x800 -/* 806713C4 90 1C 05 70 */ stw r0, 0x570(r28) -/* 806713C8 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 806713CC 60 00 04 00 */ ori r0, r0, 0x400 -/* 806713D0 90 1C 05 78 */ stw r0, 0x578(r28) -lbl_806713D4: -/* 806713D4 7F 63 DB 78 */ mr r3, r27 -/* 806713D8 48 00 04 A1 */ bl unlockInit__11daBdoorL5_cFv -/* 806713DC 48 00 00 B4 */ b lbl_80671490 -lbl_806713E0: -/* 806713E0 7F 63 DB 78 */ mr r3, r27 -/* 806713E4 48 00 01 ED */ bl openInit__11daBdoorL5_cFv -/* 806713E8 48 00 00 A8 */ b lbl_80671490 -lbl_806713EC: -/* 806713EC 7F 63 DB 78 */ mr r3, r27 -/* 806713F0 38 81 00 0C */ addi r4, r1, 0xc -/* 806713F4 38 A0 00 00 */ li r5, 0 -/* 806713F8 48 00 05 5D */ bl calcGoal__11daBdoorL5_cFP4cXyzi -/* 806713FC 7F A3 EB 78 */ mr r3, r29 -/* 80671400 38 81 00 0C */ addi r4, r1, 0xc -/* 80671404 4B 9D 6F C1 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 80671408 48 00 00 88 */ b lbl_80671490 -lbl_8067140C: -/* 8067140C 7F 63 DB 78 */ mr r3, r27 -/* 80671410 38 81 00 0C */ addi r4, r1, 0xc -/* 80671414 38 A0 00 01 */ li r5, 1 -/* 80671418 48 00 05 3D */ bl calcGoal__11daBdoorL5_cFP4cXyzi -/* 8067141C 7F A3 EB 78 */ mr r3, r29 -/* 80671420 38 81 00 0C */ addi r4, r1, 0xc -/* 80671424 4B 9D 6F A1 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 80671428 48 00 00 68 */ b lbl_80671490 -lbl_8067142C: -/* 8067142C 7F 63 DB 78 */ mr r3, r27 -/* 80671430 48 00 02 F1 */ bl closeInit__11daBdoorL5_cFv -/* 80671434 48 00 00 5C */ b lbl_80671490 -lbl_80671438: -/* 80671438 7F 63 DB 78 */ mr r3, r27 -/* 8067143C 48 00 06 41 */ bl smokeInit__11daBdoorL5_cFv -/* 80671440 48 00 00 50 */ b lbl_80671490 -lbl_80671444: -/* 80671444 38 00 00 00 */ li r0, 0 -/* 80671448 B0 1B 05 96 */ sth r0, 0x596(r27) -/* 8067144C 48 00 00 44 */ b lbl_80671490 -lbl_80671450: -/* 80671450 38 00 00 28 */ li r0, 0x28 -/* 80671454 98 1B 05 94 */ stb r0, 0x594(r27) -/* 80671458 48 00 00 38 */ b lbl_80671490 -lbl_8067145C: -/* 8067145C 80 1C 05 70 */ lwz r0, 0x570(r28) -/* 80671460 64 00 08 00 */ oris r0, r0, 0x800 -/* 80671464 90 1C 05 70 */ stw r0, 0x570(r28) -/* 80671468 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 8067146C 60 00 04 00 */ ori r0, r0, 0x400 -/* 80671470 90 1C 05 78 */ stw r0, 0x578(r28) -/* 80671474 48 00 00 1C */ b lbl_80671490 -lbl_80671478: -/* 80671478 80 1C 05 70 */ lwz r0, 0x570(r28) -/* 8067147C 54 00 01 46 */ rlwinm r0, r0, 0, 5, 3 -/* 80671480 90 1C 05 70 */ stw r0, 0x570(r28) -/* 80671484 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 80671488 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 -/* 8067148C 90 1C 05 78 */ stw r0, 0x578(r28) -lbl_80671490: -/* 80671490 28 1F 00 0A */ cmplwi r31, 0xa -/* 80671494 41 81 01 18 */ bgt lbl_806715AC -/* 80671498 3C 60 80 67 */ lis r3, lit_3952@ha /* 0x8067264C@ha */ -/* 8067149C 38 63 26 4C */ addi r3, r3, lit_3952@l /* 0x8067264C@l */ -/* 806714A0 57 E0 10 3A */ slwi r0, r31, 2 -/* 806714A4 7C 03 00 2E */ lwzx r0, r3, r0 -/* 806714A8 7C 09 03 A6 */ mtctr r0 -/* 806714AC 4E 80 04 20 */ bctr -lbl_806714B0: -/* 806714B0 80 1B 05 8C */ lwz r0, 0x58c(r27) -/* 806714B4 90 01 00 08 */ stw r0, 8(r1) -/* 806714B8 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 806714BC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 806714C0 38 81 00 08 */ addi r4, r1, 8 -/* 806714C4 4B 9A 83 35 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 806714C8 28 03 00 00 */ cmplwi r3, 0 -/* 806714CC 41 82 00 10 */ beq lbl_806714DC -/* 806714D0 88 03 2C A4 */ lbz r0, 0x2ca4(r3) -/* 806714D4 28 00 00 03 */ cmplwi r0, 3 -/* 806714D8 41 82 00 14 */ beq lbl_806714EC -lbl_806714DC: -/* 806714DC 80 7B 05 8C */ lwz r3, 0x58c(r27) -/* 806714E0 3C 03 00 01 */ addis r0, r3, 1 -/* 806714E4 28 00 FF FF */ cmplwi r0, 0xffff -/* 806714E8 40 82 00 D0 */ bne lbl_806715B8 -lbl_806714EC: -/* 806714EC 7F A3 EB 78 */ mr r3, r29 -/* 806714F0 80 9B 05 9C */ lwz r4, 0x59c(r27) -/* 806714F4 4B 9D 6C 89 */ bl cutEnd__16dEvent_manager_cFi -/* 806714F8 48 00 00 C0 */ b lbl_806715B8 -lbl_806714FC: -/* 806714FC 7F 63 DB 78 */ mr r3, r27 -/* 80671500 48 00 01 71 */ bl openProc__11daBdoorL5_cFv -/* 80671504 2C 03 00 00 */ cmpwi r3, 0 -/* 80671508 41 82 00 B0 */ beq lbl_806715B8 -/* 8067150C 7F 63 DB 78 */ mr r3, r27 -/* 80671510 48 00 02 09 */ bl openEnd__11daBdoorL5_cFv -/* 80671514 7F A3 EB 78 */ mr r3, r29 -/* 80671518 80 9B 05 9C */ lwz r4, 0x59c(r27) -/* 8067151C 4B 9D 6C 61 */ bl cutEnd__16dEvent_manager_cFi -/* 80671520 48 00 00 98 */ b lbl_806715B8 -lbl_80671524: -/* 80671524 7F 63 DB 78 */ mr r3, r27 -/* 80671528 48 00 02 D5 */ bl closeProc__11daBdoorL5_cFv -/* 8067152C 2C 03 00 00 */ cmpwi r3, 0 -/* 80671530 41 82 00 88 */ beq lbl_806715B8 -/* 80671534 7F 63 DB 78 */ mr r3, r27 -/* 80671538 48 00 02 E9 */ bl closeEnd__11daBdoorL5_cFv -/* 8067153C 7F A3 EB 78 */ mr r3, r29 -/* 80671540 80 9B 05 9C */ lwz r4, 0x59c(r27) -/* 80671544 4B 9D 6C 39 */ bl cutEnd__16dEvent_manager_cFi -/* 80671548 48 00 00 70 */ b lbl_806715B8 -lbl_8067154C: -/* 8067154C A8 1B 05 96 */ lha r0, 0x596(r27) -/* 80671550 2C 00 00 00 */ cmpwi r0, 0 -/* 80671554 40 82 00 30 */ bne lbl_80671584 -/* 80671558 83 5E 5D AC */ lwz r26, 0x5dac(r30) -/* 8067155C 7F 63 DB 78 */ mr r3, r27 -/* 80671560 4B 9C 8C C5 */ bl getExitNo__13door_param2_cFP10fopAc_ac_c -/* 80671564 7C 64 1B 78 */ mr r4, r3 -/* 80671568 7F 43 D3 78 */ mr r3, r26 -/* 8067156C 38 A0 00 FF */ li r5, 0xff -/* 80671570 38 C0 00 00 */ li r6, 0 -/* 80671574 81 9A 06 28 */ lwz r12, 0x628(r26) -/* 80671578 81 8C 01 7C */ lwz r12, 0x17c(r12) -/* 8067157C 7D 89 03 A6 */ mtctr r12 -/* 80671580 4E 80 04 21 */ bctrl -lbl_80671584: -/* 80671584 A8 7B 05 96 */ lha r3, 0x596(r27) -/* 80671588 38 03 FF FF */ addi r0, r3, -1 -/* 8067158C B0 1B 05 96 */ sth r0, 0x596(r27) -/* 80671590 48 00 00 28 */ b lbl_806715B8 -lbl_80671594: -/* 80671594 38 00 00 03 */ li r0, 3 -/* 80671598 98 1B 05 91 */ stb r0, 0x591(r27) -/* 8067159C 7F A3 EB 78 */ mr r3, r29 -/* 806715A0 80 9B 05 9C */ lwz r4, 0x59c(r27) -/* 806715A4 4B 9D 6B D9 */ bl cutEnd__16dEvent_manager_cFi -/* 806715A8 48 00 00 10 */ b lbl_806715B8 -lbl_806715AC: -/* 806715AC 7F A3 EB 78 */ mr r3, r29 -/* 806715B0 80 9B 05 9C */ lwz r4, 0x59c(r27) -/* 806715B4 4B 9D 6B C9 */ bl cutEnd__16dEvent_manager_cFi -lbl_806715B8: -/* 806715B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 806715BC 4B CF 0C 61 */ bl _restgpr_26 -/* 806715C0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 806715C4 7C 08 03 A6 */ mtlr r0 -/* 806715C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 806715CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/draw__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/draw__11daBdoorL5_cFv.s deleted file mode 100644 index 19248fc350..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/draw__11daBdoorL5_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8067228C: -/* 8067228C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672290 7C 08 02 A6 */ mflr r0 -/* 80672294 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672298 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8067229C 93 C1 00 08 */ stw r30, 8(r1) -/* 806722A0 7C 7E 1B 78 */ mr r30, r3 -/* 806722A4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806722A8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806722AC 38 80 00 10 */ li r4, 0x10 -/* 806722B0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 806722B4 38 DE 01 0C */ addi r6, r30, 0x10c -/* 806722B8 4B B3 15 0D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 806722BC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806722C0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806722C4 80 9E 05 80 */ lwz r4, 0x580(r30) -/* 806722C8 80 84 00 04 */ lwz r4, 4(r4) -/* 806722CC 38 BE 01 0C */ addi r5, r30, 0x10c -/* 806722D0 4B B3 2A D1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 806722D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806722D8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806722DC 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 806722E0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 806722E4 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 806722E8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 806722EC 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 806722F0 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 806722F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806722F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806722FC 80 9E 05 80 */ lwz r4, 0x580(r30) -/* 80672300 80 84 00 04 */ lwz r4, 4(r4) -/* 80672304 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80672308 4B B3 2A 99 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8067230C 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80672310 80 83 00 04 */ lwz r4, 4(r3) -/* 80672314 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 80672318 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8067231C 4B 99 B6 B1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80672320 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80672324 4B 99 B9 A1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80672328 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 8067232C 80 63 00 04 */ lwz r3, 4(r3) -/* 80672330 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80672334 80 63 00 00 */ lwz r3, 0(r3) -/* 80672338 38 00 00 00 */ li r0, 0 -/* 8067233C 90 03 00 54 */ stw r0, 0x54(r3) -/* 80672340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80672344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80672348 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 8067234C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80672350 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80672354 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80672358 38 60 00 01 */ li r3, 1 -/* 8067235C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80672360 83 C1 00 08 */ lwz r30, 8(r1) -/* 80672364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672368 7C 08 03 A6 */ mtlr r0 -/* 8067236C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/execute__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/execute__11daBdoorL5_cFv.s deleted file mode 100644 index 6af80498a5..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/execute__11daBdoorL5_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80672164: -/* 80672164 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672168 7C 08 02 A6 */ mflr r0 -/* 8067216C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672170 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80672174 7C 7F 1B 78 */ mr r31, r3 -/* 80672178 3C 60 80 67 */ lis r3, cNullVec__6Z2Calc@ha /* 0x806725F4@ha */ -/* 8067217C 38 C3 25 F4 */ addi r6, r3, cNullVec__6Z2Calc@l /* 0x806725F4@l */ -/* 80672180 3C 60 80 67 */ lis r3, data_806727A0@ha /* 0x806727A0@ha */ -/* 80672184 38 A3 27 A0 */ addi r5, r3, data_806727A0@l /* 0x806727A0@l */ -/* 80672188 88 05 00 00 */ lbz r0, 0(r5) -/* 8067218C 7C 00 07 75 */ extsb. r0, r0 -/* 80672190 40 82 00 70 */ bne lbl_80672200 -/* 80672194 80 66 00 BC */ lwz r3, 0xbc(r6) -/* 80672198 80 06 00 C0 */ lwz r0, 0xc0(r6) -/* 8067219C 90 66 00 EC */ stw r3, 0xec(r6) -/* 806721A0 90 06 00 F0 */ stw r0, 0xf0(r6) -/* 806721A4 80 06 00 C4 */ lwz r0, 0xc4(r6) -/* 806721A8 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 806721AC 38 86 00 EC */ addi r4, r6, 0xec -/* 806721B0 80 66 00 C8 */ lwz r3, 0xc8(r6) -/* 806721B4 80 06 00 CC */ lwz r0, 0xcc(r6) -/* 806721B8 90 64 00 0C */ stw r3, 0xc(r4) -/* 806721BC 90 04 00 10 */ stw r0, 0x10(r4) -/* 806721C0 80 06 00 D0 */ lwz r0, 0xd0(r6) -/* 806721C4 90 04 00 14 */ stw r0, 0x14(r4) -/* 806721C8 80 66 00 D4 */ lwz r3, 0xd4(r6) -/* 806721CC 80 06 00 D8 */ lwz r0, 0xd8(r6) -/* 806721D0 90 64 00 18 */ stw r3, 0x18(r4) -/* 806721D4 90 04 00 1C */ stw r0, 0x1c(r4) -/* 806721D8 80 06 00 DC */ lwz r0, 0xdc(r6) -/* 806721DC 90 04 00 20 */ stw r0, 0x20(r4) -/* 806721E0 80 66 00 E0 */ lwz r3, 0xe0(r6) -/* 806721E4 80 06 00 E4 */ lwz r0, 0xe4(r6) -/* 806721E8 90 64 00 24 */ stw r3, 0x24(r4) -/* 806721EC 90 04 00 28 */ stw r0, 0x28(r4) -/* 806721F0 80 06 00 E8 */ lwz r0, 0xe8(r6) -/* 806721F4 90 04 00 2C */ stw r0, 0x2c(r4) -/* 806721F8 38 00 00 01 */ li r0, 1 -/* 806721FC 98 05 00 00 */ stb r0, 0(r5) -lbl_80672200: -/* 80672200 38 00 FF FF */ li r0, -1 -/* 80672204 90 1F 05 9C */ stw r0, 0x59c(r31) -/* 80672208 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 8067220C 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 80672210 41 82 00 48 */ beq lbl_80672258 -/* 80672214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80672218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8067221C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80672220 3C 80 80 67 */ lis r4, l_staff_name@ha /* 0x806724FC@ha */ -/* 80672224 38 84 24 FC */ addi r4, r4, l_staff_name@l /* 0x806724FC@l */ -/* 80672228 38 A0 00 00 */ li r5, 0 -/* 8067222C 38 C0 00 00 */ li r6, 0 -/* 80672230 4B 9D 58 ED */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80672234 90 7F 05 9C */ stw r3, 0x59c(r31) -/* 80672238 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8067223C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80672240 A0 03 00 B0 */ lhz r0, 0xb0(r3) -/* 80672244 60 00 00 02 */ ori r0, r0, 2 -/* 80672248 B0 03 00 B0 */ sth r0, 0xb0(r3) -/* 8067224C 7F E3 FB 78 */ mr r3, r31 -/* 80672250 4B FF F0 D5 */ bl demoProc__11daBdoorL5_cFv -/* 80672254 48 00 00 20 */ b lbl_80672274 -lbl_80672258: -/* 80672258 7F E3 FB 78 */ mr r3, r31 -/* 8067225C 88 1F 05 91 */ lbz r0, 0x591(r31) -/* 80672260 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80672264 39 86 00 EC */ addi r12, r6, 0xec -/* 80672268 7D 8C 02 14 */ add r12, r12, r0 -/* 8067226C 4B CE FE 19 */ bl __ptmf_scall -/* 80672270 60 00 00 00 */ nop -lbl_80672274: -/* 80672274 38 60 00 01 */ li r3, 1 -/* 80672278 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067227C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672280 7C 08 03 A6 */ mtlr r0 -/* 80672284 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672288 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_80672494.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_80672494.s deleted file mode 100644 index faccd01b0e..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_80672494.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80672494: -/* 80672494 88 83 00 00 */ lbz r4, 0(r3) -/* 80672498 28 04 00 00 */ cmplwi r4, 0 -/* 8067249C 41 82 00 0C */ beq lbl_806724A8 -/* 806724A0 38 04 FF FF */ addi r0, r4, -1 -/* 806724A4 98 03 00 00 */ stb r0, 0(r3) -lbl_806724A8: -/* 806724A8 88 63 00 00 */ lbz r3, 0(r3) -/* 806724AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B0.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B0.s deleted file mode 100644 index 5c8673f55f..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_806724B0: -/* 806724B0 38 63 FF DC */ addi r3, r3, -36 -/* 806724B4 4B FF ED B8 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B8.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B8.s deleted file mode 100644 index 74b07a3cbc..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B8.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_806724B8: -/* 806724B8 38 63 FF EC */ addi r3, r3, -20 -/* 806724BC 4B FF ED B0 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAlwaysArcName__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAlwaysArcName__11daBdoorL5_cFv.s deleted file mode 100644 index afad61927e..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAlwaysArcName__11daBdoorL5_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80670C44: -/* 80670C44 3C 60 80 67 */ lis r3, d_a_door_bossL5__stringBase0@ha /* 0x80672548@ha */ -/* 80670C48 38 63 25 48 */ addi r3, r3, d_a_door_bossL5__stringBase0@l /* 0x80672548@l */ -/* 80670C4C 38 63 00 09 */ addi r3, r3, 9 -/* 80670C50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAnmArcName__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAnmArcName__11daBdoorL5_cFv.s deleted file mode 100644 index 3e371519b1..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAnmArcName__11daBdoorL5_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80670C74: -/* 80670C74 3C 60 80 67 */ lis r3, d_a_door_bossL5__stringBase0@ha /* 0x80672548@ha */ -/* 80670C78 38 63 25 48 */ addi r3, r3, d_a_door_bossL5__stringBase0@l /* 0x80672548@l */ -/* 80670C7C 38 63 00 32 */ addi r3, r3, 0x32 -/* 80670C80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getArcName__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getArcName__11daBdoorL5_cFv.s deleted file mode 100644 index 762a4ae926..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getArcName__11daBdoorL5_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80670C38: -/* 80670C38 3C 60 80 67 */ lis r3, d_a_door_bossL5__stringBase0@ha /* 0x80672548@ha */ -/* 80670C3C 38 63 25 48 */ addi r3, r3, d_a_door_bossL5__stringBase0@l /* 0x80672548@l */ -/* 80670C40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getBmd__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getBmd__11daBdoorL5_cFv.s deleted file mode 100644 index 9cf2c234be..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getBmd__11daBdoorL5_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80670C54: -/* 80670C54 3C 60 80 67 */ lis r3, d_a_door_bossL5__stringBase0@ha /* 0x80672548@ha */ -/* 80670C58 38 63 25 48 */ addi r3, r3, d_a_door_bossL5__stringBase0@l /* 0x80672548@l */ -/* 80670C5C 38 63 00 10 */ addi r3, r3, 0x10 -/* 80670C60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDemoAction__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDemoAction__11daBdoorL5_cFv.s deleted file mode 100644 index e8161145fb..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDemoAction__11daBdoorL5_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_806712DC: -/* 806712DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806712E0 7C 08 02 A6 */ mflr r0 -/* 806712E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806712E8 7C 64 1B 78 */ mr r4, r3 -/* 806712EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806712F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806712F4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 806712F8 80 84 05 9C */ lwz r4, 0x59c(r4) -/* 806712FC 3C A0 80 67 */ lis r5, action_table@ha /* 0x80672614@ha */ -/* 80671300 38 A5 26 14 */ addi r5, r5, action_table@l /* 0x80672614@l */ -/* 80671304 38 C0 00 0E */ li r6, 0xe -/* 80671308 38 E0 00 00 */ li r7, 0 -/* 8067130C 39 00 00 00 */ li r8, 0 -/* 80671310 4B 9D 6B 01 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80671314 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80671318 7C 08 03 A6 */ mtlr r0 -/* 8067131C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80671320 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDoorModelData__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDoorModelData__11daBdoorL5_cFv.s deleted file mode 100644 index eaae1183e2..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDoorModelData__11daBdoorL5_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80670C94: -/* 80670C94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80670C98 7C 08 02 A6 */ mflr r0 -/* 80670C9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80670CA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80670CA4 93 C1 00 08 */ stw r30, 8(r1) -/* 80670CA8 7C 7E 1B 78 */ mr r30, r3 -/* 80670CAC 4B FF FF A9 */ bl getBmd__11daBdoorL5_cFv -/* 80670CB0 7C 7F 1B 78 */ mr r31, r3 -/* 80670CB4 7F C3 F3 78 */ mr r3, r30 -/* 80670CB8 4B FF FF 81 */ bl getArcName__11daBdoorL5_cFv -/* 80670CBC 7F E4 FB 78 */ mr r4, r31 -/* 80670CC0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80670CC4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80670CC8 3C A5 00 02 */ addis r5, r5, 2 -/* 80670CCC 38 C0 00 80 */ li r6, 0x80 -/* 80670CD0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80670CD4 4B 9C B6 A9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80670CD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80670CDC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80670CE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80670CE4 7C 08 03 A6 */ mtlr r0 -/* 80670CE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80670CEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDzb__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDzb__11daBdoorL5_cFv.s deleted file mode 100644 index cc00c65bc9..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDzb__11daBdoorL5_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80670C64: -/* 80670C64 3C 60 80 67 */ lis r3, d_a_door_bossL5__stringBase0@ha /* 0x80672548@ha */ -/* 80670C68 38 63 25 48 */ addi r3, r3, d_a_door_bossL5__stringBase0@l /* 0x80672548@l */ -/* 80670C6C 38 63 00 1D */ addi r3, r3, 0x1d -/* 80670C70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openInit__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openInit__11daBdoorL5_cFv.s deleted file mode 100644 index 1125dddd1e..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openInit__11daBdoorL5_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_806715D0: -/* 806715D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806715D4 7C 08 02 A6 */ mflr r0 -/* 806715D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 806715DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806715E0 93 C1 00 08 */ stw r30, 8(r1) -/* 806715E4 7C 7E 1B 78 */ mr r30, r3 -/* 806715E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806715EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806715F0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 806715F4 80 9E 05 88 */ lwz r4, 0x588(r30) -/* 806715F8 4B A0 2C 59 */ bl Release__4cBgSFP9dBgW_Base -/* 806715FC 7F C3 F3 78 */ mr r3, r30 -/* 80671600 4B FF F6 85 */ bl getOpenAnm__11daBdoorL5_cFv -/* 80671604 7C 7F 1B 78 */ mr r31, r3 -/* 80671608 7F C3 F3 78 */ mr r3, r30 -/* 8067160C 4B FF F6 69 */ bl getAnmArcName__11daBdoorL5_cFv -/* 80671610 7F E4 FB 78 */ mr r4, r31 -/* 80671614 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671618 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8067161C 3C A5 00 02 */ addis r5, r5, 2 -/* 80671620 38 C0 00 80 */ li r6, 0x80 -/* 80671624 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80671628 4B 9C AC C5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8067162C 7C 64 1B 78 */ mr r4, r3 -/* 80671630 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 80671634 38 A0 00 01 */ li r5, 1 -/* 80671638 38 C0 00 00 */ li r6, 0 -/* 8067163C 3C E0 80 67 */ lis r7, lit_3757@ha /* 0x8067250C@ha */ -/* 80671640 C0 27 25 0C */ lfs f1, lit_3757@l(r7) /* 0x8067250C@l */ -/* 80671644 38 E0 00 00 */ li r7, 0 -/* 80671648 39 00 FF FF */ li r8, -1 -/* 8067164C 39 20 00 01 */ li r9, 1 -/* 80671650 4B 99 C1 8D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80671654 38 60 00 01 */ li r3, 1 -/* 80671658 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067165C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80671660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80671664 7C 08 03 A6 */ mtlr r0 -/* 80671668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8067166C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openProc__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openProc__11daBdoorL5_cFv.s deleted file mode 100644 index 70e16f1bb4..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openProc__11daBdoorL5_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80671670: -/* 80671670 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80671674 7C 08 02 A6 */ mflr r0 -/* 80671678 90 01 00 24 */ stw r0, 0x24(r1) -/* 8067167C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80671680 4B CF 0B 5D */ bl _savegpr_29 -/* 80671684 7C 7D 1B 78 */ mr r29, r3 -/* 80671688 3C 60 80 67 */ lis r3, l_door_open_demo@ha /* 0x806724C8@ha */ -/* 8067168C 3B E3 24 C8 */ addi r31, r3, l_door_open_demo@l /* 0x806724C8@l */ -/* 80671690 80 7D 05 84 */ lwz r3, 0x584(r29) -/* 80671694 4B 99 BD 95 */ bl play__14mDoExt_baseAnmFv -/* 80671698 7C 7E 1B 78 */ mr r30, r3 -/* 8067169C 80 7D 05 84 */ lwz r3, 0x584(r29) -/* 806716A0 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 806716A4 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 806716A8 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 806716AC 40 82 00 50 */ bne lbl_806716FC -/* 806716B0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 806716B4 7C 03 07 74 */ extsb r3, r0 -/* 806716B8 4B 9B B9 B5 */ bl dComIfGp_getReverb__Fi -/* 806716BC 7C 67 1B 78 */ mr r7, r3 -/* 806716C0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080191@ha */ -/* 806716C4 38 03 01 91 */ addi r0, r3, 0x0191 /* 0x00080191@l */ -/* 806716C8 90 01 00 08 */ stw r0, 8(r1) -/* 806716CC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 806716D0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 806716D4 80 63 00 00 */ lwz r3, 0(r3) -/* 806716D8 38 81 00 08 */ addi r4, r1, 8 -/* 806716DC 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 806716E0 38 C0 00 00 */ li r6, 0 -/* 806716E4 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 806716E8 FC 40 08 90 */ fmr f2, f1 -/* 806716EC C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 806716F0 FC 80 18 90 */ fmr f4, f3 -/* 806716F4 39 00 00 00 */ li r8, 0 -/* 806716F8 4B C3 A2 8D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_806716FC: -/* 806716FC 7F C3 F3 78 */ mr r3, r30 -/* 80671700 39 61 00 20 */ addi r11, r1, 0x20 -/* 80671704 4B CF 0B 25 */ bl _restgpr_29 -/* 80671708 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8067170C 7C 08 03 A6 */ mtlr r0 -/* 80671710 38 21 00 20 */ addi r1, r1, 0x20 -/* 80671714 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/smokeInit__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/smokeInit__11daBdoorL5_cFv.s deleted file mode 100644 index 308423e8ab..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/smokeInit__11daBdoorL5_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80671A7C: -/* 80671A7C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80671A80 7C 08 02 A6 */ mflr r0 -/* 80671A84 90 01 00 24 */ stw r0, 0x24(r1) -/* 80671A88 7C 68 1B 78 */ mr r8, r3 -/* 80671A8C C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80671A90 D0 03 05 A4 */ stfs f0, 0x5a4(r3) -/* 80671A94 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80671A98 D0 03 05 A8 */ stfs f0, 0x5a8(r3) -/* 80671A9C C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80671AA0 D0 03 05 AC */ stfs f0, 0x5ac(r3) -/* 80671AA4 A8 03 04 E4 */ lha r0, 0x4e4(r3) -/* 80671AA8 B0 03 05 B0 */ sth r0, 0x5b0(r3) -/* 80671AAC A8 03 04 E6 */ lha r0, 0x4e6(r3) -/* 80671AB0 B0 03 05 B2 */ sth r0, 0x5b2(r3) -/* 80671AB4 A8 03 04 E8 */ lha r0, 0x4e8(r3) -/* 80671AB8 B0 03 05 B4 */ sth r0, 0x5b4(r3) -/* 80671ABC 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80671AC0 7C 03 07 74 */ extsb r3, r0 -/* 80671AC4 38 00 00 00 */ li r0, 0 -/* 80671AC8 90 01 00 08 */ stw r0, 8(r1) -/* 80671ACC 90 61 00 0C */ stw r3, 0xc(r1) -/* 80671AD0 90 01 00 10 */ stw r0, 0x10(r1) -/* 80671AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80671AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671ADC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80671AE0 3C 80 00 01 */ lis r4, 0x0001 /* 0x00008156@ha */ -/* 80671AE4 38 84 81 56 */ addi r4, r4, 0x8156 /* 0x00008156@l */ -/* 80671AE8 38 A8 06 A8 */ addi r5, r8, 0x6a8 -/* 80671AEC 38 C8 05 A4 */ addi r6, r8, 0x5a4 -/* 80671AF0 38 E8 01 0C */ addi r7, r8, 0x10c -/* 80671AF4 39 08 05 B0 */ addi r8, r8, 0x5b0 -/* 80671AF8 39 20 00 00 */ li r9, 0 -/* 80671AFC 39 40 00 00 */ li r10, 0 -/* 80671B00 4B 9D B5 69 */ bl setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz -/* 80671B04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80671B08 7C 08 03 A6 */ mtlr r0 -/* 80671B0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80671B10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/unlockInit__11daBdoorL5_cFv.s b/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/unlockInit__11daBdoorL5_cFv.s deleted file mode 100644 index 4d5f99fef3..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/unlockInit__11daBdoorL5_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80671878: -/* 80671878 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8067187C 7C 08 02 A6 */ mflr r0 -/* 80671880 90 01 00 24 */ stw r0, 0x24(r1) -/* 80671884 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80671888 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8067188C 7C 7F 1B 78 */ mr r31, r3 -/* 80671890 80 63 05 8C */ lwz r3, 0x58c(r3) -/* 80671894 3C 03 00 01 */ addis r0, r3, 1 -/* 80671898 28 00 FF FF */ cmplwi r0, 0xffff -/* 8067189C 40 82 00 0C */ bne lbl_806718A8 -/* 806718A0 38 60 00 01 */ li r3, 1 -/* 806718A4 48 00 00 98 */ b lbl_8067193C -lbl_806718A8: -/* 806718A8 90 61 00 0C */ stw r3, 0xc(r1) -/* 806718AC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 806718B0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 806718B4 38 81 00 0C */ addi r4, r1, 0xc -/* 806718B8 4B 9A 7F 41 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 806718BC 7C 65 1B 79 */ or. r5, r3, r3 -/* 806718C0 41 82 00 54 */ beq lbl_80671914 -/* 806718C4 38 00 00 01 */ li r0, 1 -/* 806718C8 98 05 2C A4 */ stb r0, 0x2ca4(r5) -/* 806718CC 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C6@ha */ -/* 806718D0 38 03 01 C6 */ addi r0, r3, 0x01C6 /* 0x000801C6@l */ -/* 806718D4 90 01 00 08 */ stw r0, 8(r1) -/* 806718D8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 806718DC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 806718E0 80 63 00 00 */ lwz r3, 0(r3) -/* 806718E4 38 81 00 08 */ addi r4, r1, 8 -/* 806718E8 38 A5 04 D0 */ addi r5, r5, 0x4d0 -/* 806718EC 38 C0 00 00 */ li r6, 0 -/* 806718F0 38 E0 00 00 */ li r7, 0 -/* 806718F4 3D 00 80 67 */ lis r8, lit_3757@ha /* 0x8067250C@ha */ -/* 806718F8 C0 28 25 0C */ lfs f1, lit_3757@l(r8) /* 0x8067250C@l */ -/* 806718FC FC 40 08 90 */ fmr f2, f1 -/* 80671900 3D 00 80 67 */ lis r8, lit_3981@ha /* 0x80672518@ha */ -/* 80671904 C0 68 25 18 */ lfs f3, lit_3981@l(r8) /* 0x80672518@l */ -/* 80671908 FC 80 18 90 */ fmr f4, f3 -/* 8067190C 39 00 00 00 */ li r8, 0 -/* 80671910 4B C3 A0 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80671914: -/* 80671914 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80671918 7C 1E 07 74 */ extsb r30, r0 -/* 8067191C 7F E3 FB 78 */ mr r3, r31 -/* 80671920 4B 9C 88 B1 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80671924 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80671928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067192C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80671930 7F C5 F3 78 */ mr r5, r30 -/* 80671934 4B 9C 38 CD */ bl onSwitch__10dSv_info_cFii -/* 80671938 38 60 00 01 */ li r3, 1 -lbl_8067193C: -/* 8067193C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80671940 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80671944 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80671948 7C 08 03 A6 */ mtlr r0 -/* 8067194C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80671950 4E 80 00 20 */ blr diff --git a/include/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.h b/include/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.h index 6085f3561a..9b3aced785 100644 --- a/include/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.h +++ b/include/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.h @@ -2,5 +2,89 @@ #define D_A_DOOR_BOSSL5_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_w.h" +#include "d/bg/d_bg_s_acch.h" +#include "f_pc/f_pc_manager.h" +#include "f_op/f_op_actor_mng.h" + +struct daBdoorL5_c : public fopAc_ac_c { + enum ActionType { + ACTION_WAIT, + ACTION_CLOSE_WAIT, + ACTION_OPEN, + ACTION_END, + }; + + typedef int (daBdoorL5_c::*actionFunc)(); + + /* 80670C38 */ const char* getArcName(); + /* 80670C44 */ const char* getAlwaysArcName(); + /* 80670C54 */ const char* getBmd(); + /* 80670C64 */ const char* getDzb(); + /* 80670C74 */ const char* getAnmArcName(); + /* 80670C84 */ s32 getOpenAnm(); + /* 80670C8C */ s32 getCloseAnm(); + /* 80670C94 */ J3DModelData* getDoorModelData(); + /* 80670D10 */ int CreateHeap(); + /* 80670F08 */ void calcMtx(); + /* 80670F5C */ int CreateInit(); + /* 8067106C */ int create(); + /* 806712DC */ int getDemoAction(); + /* 80671324 */ void demoProc(); + /* 806715D0 */ int openInit(); + /* 80671670 */ int openProc(); + /* 80671718 */ int openEnd(); + /* 80671720 */ int closeInit(); + /* 806717FC */ int closeProc(); + /* 80671820 */ int closeEnd(); + /* 80671878 */ int unlockInit(); + /* 80671954 */ void calcGoal(cXyz*, int); + /* 80671A7C */ void smokeInit(); + /* 80671B14 */ int createKey(); + /* 80671C14 */ int checkArea(); + /* 80671D44 */ int checkFront(); + /* 80671DE4 */ int checkOpen(); + /* 80671E70 */ int actionWait(); + /* 80671E78 */ int actionCloseWait(); + /* 80671F58 */ int actionOpen(); + /* 80672004 */ int actionEnd(); + /* 80672164 */ int execute(); + /* 8067228C */ int draw(); + /* 80672374 */ int Delete(); + + void setAction(u8 action) { mAction = action; } + int deleteKey() { + if (mKeyHoleId != -1 && fpcM_IsCreating(mKeyHoleId) == 0) { + fopAcM_delete(mKeyHoleId); + mKeyHoleId = -1; + } + return 1; + } + + /* 0x568 */ request_of_phase_process_class mPhase1; + /* 0x570 */ request_of_phase_process_class mPhase2; + /* 0x578 */ request_of_phase_process_class mPhase3; + /* 0x580 */ J3DModel* field_0x580; + /* 0x584 */ mDoExt_bckAnm* field_0x584; + /* 0x588 */ dBgW* field_0x588; + /* 0x58C */ u32 mKeyHoleId; + /* 0x590 */ u8 field_0x590; + /* 0x591 */ u8 mAction; + /* 0x592 */ u8 field_0x592; + /* 0x593 */ u8 field_0x593; + /* 0x594 */ u8 field_0x594; + /* 0x596 */ s16 field_0x596; + /* 0x598 */ s16 field_0x598; + /* 0x59A */ s16 field_0x59a; + /* 0x59C */ int field_0x59c; + /* 0x5A0 */ int field_0x5a0; + /* 0x5A4 */ cXyz field_0x5a4; + /* 0x5B0 */ csXyz field_0x5b0; + /* 0x5B6 */ u16 field_0x5b6; + /* 0x5B8 */ dBgS_ObjAcch field_0x5b8; + /* 0x790 */ dBgS_AcchCir field_0x790; +}; #endif /* D_A_DOOR_BOSSL5_H */ diff --git a/rel/d/a/door/d_a_door_bossL5/Makefile b/rel/d/a/door/d_a_door_bossL5/Makefile index 52439283c2..9bb78974bc 100644 --- a/rel/d/a/door/d_a_door_bossL5/Makefile +++ b/rel/d/a/door/d_a_door_bossL5/Makefile @@ -8,12 +8,10 @@ M167_MAP := $(BUILD_DIR)/rel/d/a/door/d_a_door_bossL5.map M167_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp \ rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp \ M167_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.o \ M167_LIBS := \ diff --git a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp index 72eae6bc99..d4757fcb10 100644 --- a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp +++ b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp @@ -1,430 +1,39 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_door_bossL5 +// Boss Door Level 5 // #include "rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct door_param2_c { - /* 8003A1D0 */ void getSwbit(fopAc_ac_c*); - /* 8003A224 */ void getExitNo(fopAc_ac_c*); -}; - -struct daBdoorL5_c { - /* 80670C38 */ void getArcName(); - /* 80670C44 */ void getAlwaysArcName(); - /* 80670C54 */ void getBmd(); - /* 80670C64 */ void getDzb(); - /* 80670C74 */ void getAnmArcName(); - /* 80670C84 */ s32 getOpenAnm(); - /* 80670C8C */ s32 getCloseAnm(); - /* 80670C94 */ void getDoorModelData(); - /* 80670D10 */ void CreateHeap(); - /* 80670F08 */ void calcMtx(); - /* 80670F5C */ void CreateInit(); - /* 8067106C */ void create(); - /* 806712DC */ void getDemoAction(); - /* 80671324 */ void demoProc(); - /* 806715D0 */ void openInit(); - /* 80671670 */ void openProc(); - /* 80671718 */ bool openEnd(); - /* 80671720 */ void closeInit(); - /* 806717FC */ void closeProc(); - /* 80671820 */ void closeEnd(); - /* 80671878 */ void unlockInit(); - /* 80671954 */ void calcGoal(cXyz*, int); - /* 80671A7C */ void smokeInit(); - /* 80671B14 */ void createKey(); - /* 80671C14 */ void checkArea(); - /* 80671D44 */ void checkFront(); - /* 80671DE4 */ void checkOpen(); - /* 80671E70 */ bool actionWait(); - /* 80671E78 */ void actionCloseWait(); - /* 80671F58 */ void actionOpen(); - /* 80672004 */ void actionEnd(); - /* 80672164 */ void execute(); - /* 8067228C */ void draw(); - /* 80672374 */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_restart_c { - /* 80034F80 */ void setRoom(cXyz const&, s16, s8); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -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 { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz {}; - -struct dPa_control_c { - /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 8004817C */ void cutEnd(int); - /* 800483C4 */ void setGoal(cXyz*); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 8067126C */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 806711FC */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -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 {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80670EC0 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void getArcName__11daBdoorL5_cFv(); -extern "C" void getAlwaysArcName__11daBdoorL5_cFv(); -extern "C" void getBmd__11daBdoorL5_cFv(); -extern "C" void getDzb__11daBdoorL5_cFv(); -extern "C" void getAnmArcName__11daBdoorL5_cFv(); -extern "C" s32 getOpenAnm__11daBdoorL5_cFv(); -extern "C" s32 getCloseAnm__11daBdoorL5_cFv(); -extern "C" void getDoorModelData__11daBdoorL5_cFv(); -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void CreateHeap__11daBdoorL5_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void calcMtx__11daBdoorL5_cFv(); -extern "C" void CreateInit__11daBdoorL5_cFv(); -extern "C" void create__11daBdoorL5_cFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void getDemoAction__11daBdoorL5_cFv(); -extern "C" void demoProc__11daBdoorL5_cFv(); -extern "C" void openInit__11daBdoorL5_cFv(); -extern "C" void openProc__11daBdoorL5_cFv(); -extern "C" bool openEnd__11daBdoorL5_cFv(); -extern "C" void closeInit__11daBdoorL5_cFv(); -extern "C" void closeProc__11daBdoorL5_cFv(); -extern "C" void closeEnd__11daBdoorL5_cFv(); -extern "C" void unlockInit__11daBdoorL5_cFv(); -extern "C" void calcGoal__11daBdoorL5_cFP4cXyzi(); -extern "C" void smokeInit__11daBdoorL5_cFv(); -extern "C" void createKey__11daBdoorL5_cFv(); -extern "C" void checkArea__11daBdoorL5_cFv(); -extern "C" void checkFront__11daBdoorL5_cFv(); -extern "C" void checkOpen__11daBdoorL5_cFv(); -extern "C" bool actionWait__11daBdoorL5_cFv(); -extern "C" void actionCloseWait__11daBdoorL5_cFv(); -extern "C" void actionOpen__11daBdoorL5_cFv(); -extern "C" void actionEnd__11daBdoorL5_cFv(); -extern "C" void execute__11daBdoorL5_cFv(); -extern "C" void draw__11daBdoorL5_cFv(); -extern "C" void Delete__11daBdoorL5_cFv(); -extern "C" static void daBdoorL5_Draw__FP11daBdoorL5_c(); -extern "C" static void daBdoorL5_Execute__FP11daBdoorL5_c(); -extern "C" static void daBdoorL5_Delete__FP11daBdoorL5_c(); -extern "C" static void daBdoorL5_Create__FP10fopAc_ac_c(); -extern "C" void func_80672494(void* _this, u8*); -extern "C" static void func_806724B0(); -extern "C" static void func_806724B8(); -extern "C" extern char const* const d_a_door_bossL5__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FUi(); -extern "C" void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fpcM_IsCreating__FUi(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -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 isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void setRoom__13dSv_restart_cFRC4cXyzsSc(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getSwbit__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getExitNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void setGoal__16dEvent_manager_cFP4cXyz(); -extern "C" void -setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" 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 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_806727A0[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80672548 = "Z_bdor00"; -#pragma pop +#include "rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_door_param2.h" +#include "d/a/d_a_player.h" +#include "d/meter/d_meter2_info.h" +#include "SSystem/SComponent/c_math.h" /* 80670C38-80670C44 000078 000C+00 4/4 0/0 0/0 .text getArcName__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::getArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getArcName__11daBdoorL5_cFv.s" +const char* daBdoorL5_c::getArcName() { + return "Z_bdor00"; } -#pragma pop - -/* ############################################################################################## */ -/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80672551 = "static"; -#pragma pop /* 80670C44-80670C54 000084 0010+00 3/3 0/0 0/0 .text getAlwaysArcName__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::getAlwaysArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAlwaysArcName__11daBdoorL5_cFv.s" +const char* daBdoorL5_c::getAlwaysArcName() { + return "static"; } -#pragma pop - -/* ############################################################################################## */ -/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80672558 = "Z_bdor00.bmd"; -#pragma pop /* 80670C54-80670C64 000094 0010+00 1/1 0/0 0/0 .text getBmd__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::getBmd() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getBmd__11daBdoorL5_cFv.s" +const char* daBdoorL5_c::getBmd() { + return "Z_bdor00.bmd"; } -#pragma pop - -/* ############################################################################################## */ -/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80672565 = "door-shutterBoss.dzb"; -#pragma pop /* 80670C64-80670C74 0000A4 0010+00 1/1 0/0 0/0 .text getDzb__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::getDzb() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDzb__11daBdoorL5_cFv.s" +const char* daBdoorL5_c::getDzb() { + return "door-shutterBoss.dzb"; } -#pragma pop -/* ############################################################################################## */ -/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8067257A = "BDoorTAnm"; -#pragma pop - -/* 80670C74-80670C84 0000B4 0010+00 5/5 0/0 0/0 .text getAnmArcName__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::getAnmArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getAnmArcName__11daBdoorL5_cFv.s" +const char* daBdoorL5_c::getAnmArcName() { + return "BDoorTAnm"; } -#pragma pop /* 80670C84-80670C8C 0000C4 0008+00 2/2 0/0 0/0 .text getOpenAnm__11daBdoorL5_cFv */ s32 daBdoorL5_c::getOpenAnm() { @@ -438,147 +47,33 @@ s32 daBdoorL5_c::getCloseAnm() { /* 80670C94-80670CF0 0000D4 005C+00 1/1 0/0 0/0 .text getDoorModelData__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::getDoorModelData() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDoorModelData__11daBdoorL5_cFv.s" +J3DModelData* daBdoorL5_c::getDoorModelData() { + return static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getBmd())); } -#pragma pop /* 80670CF0-80670D10 000130 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast<daBdoorL5_c*>(i_this)->CreateHeap(); } -#pragma pop -/* ############################################################################################## */ /* 806724C8-806724E0 000000 0016+02 4/4 0/0 0/0 .rodata l_door_open_demo */ -SECTION_RODATA static u8 const l_door_open_demo[22 + 2 /* padding */] = { - 0x44, - 0x45, - 0x46, - 0x41, - 0x55, - 0x4C, - 0x54, - 0x5F, - 0x42, - 0x53, - 0x5F, - 0x53, - 0x48, - 0x55, - 0x54, - 0x54, - 0x45, - 0x52, - 0x5F, - 0x4C, - 0x35, - 0x00, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x806724C8, &l_door_open_demo); +static char const l_door_open_demo[22] = "DEFAULT_BS_SHUTTER_L5"; /* 806724E0-806724FC 000018 001A+02 0/1 0/0 0/0 .rodata l_door_open_demo_1st */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_door_open_demo_1st[26 + 2 /* padding */] = { - 0x44, - 0x45, - 0x46, - 0x41, - 0x55, - 0x4C, - 0x54, - 0x5F, - 0x42, - 0x53, - 0x5F, - 0x53, - 0x48, - 0x55, - 0x54, - 0x54, - 0x45, - 0x52, - 0x5F, - 0x4C, - 0x35, - 0x5F, - 0x31, - 0x53, - 0x54, - 0x00, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x806724E0, &l_door_open_demo_1st); -#pragma pop +static char const l_door_open_demo_1st[26] = "DEFAULT_BS_SHUTTER_L5_1ST"; /* 806724FC-8067250C 000034 000D+03 3/3 0/0 0/0 .rodata l_staff_name */ -SECTION_RODATA static u8 const l_staff_name[13 + 3 /* padding */] = { - 0x53, - 0x48, - 0x55, - 0x54, - 0x54, - 0x45, - 0x52, - 0x5F, - 0x44, - 0x4F, - 0x4F, - 0x52, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x806724FC, &l_staff_name); - -/* 8067250C-80672510 000044 0004+00 5/6 0/0 0/0 .rodata @3757 */ -SECTION_RODATA static f32 const lit_3757 = 1.0f; -COMPILER_STRIP_GATE(0x8067250C, &lit_3757); - -/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80672584 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80672589 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_80672590 = "OPEN"; -SECTION_DEAD static char const* const stringBase_80672595 = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_8067259D = "SETGOAL2"; -SECTION_DEAD static char const* const stringBase_806725A6 = "CLOSE"; -SECTION_DEAD static char const* const stringBase_806725AC = "SMOKE"; -SECTION_DEAD static char const* const stringBase_806725B2 = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_806725BC = "END"; -SECTION_DEAD static char const* const stringBase_806725C0 = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_806725CA = "CHG_SCENE"; -SECTION_DEAD static char const* const stringBase_806725D4 = "KEYDELETE"; -SECTION_DEAD static char const* const stringBase_806725DE = "PLY_NODISP"; -SECTION_DEAD static char const* const stringBase_806725E9 = "PLY_DISP"; -#pragma pop +static char const l_staff_name[13] = "SHUTTER_DOOR"; /* 806725F4-80672600 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, }; /* 80672600-80672614 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, @@ -589,592 +84,503 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 80672614-8067264C -00001 0038+00 1/1 0/0 0/0 .data action_table$3861 */ -SECTION_DATA static void* action_table[14] = { - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x3C), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x41), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x48), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x4D), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x55), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x5E), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x64), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x6A), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x74), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x78), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x82), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x8C), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0x96), - (void*)(((char*)&d_a_door_bossL5__stringBase0) + 0xA1), -}; - -/* 8067264C-80672678 -00001 002C+00 1/1 0/0 0/0 .data @3952 */ -SECTION_DATA static void* lit_3952[11] = { - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x288), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x18C), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x1D8), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x288), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x288), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x200), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x288), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x288), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x294), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x270), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x228), -}; - -/* 80672678-806726B0 -00001 0038+00 1/1 0/0 0/0 .data @3951 */ -SECTION_DATA static void* lit_3951[14] = { - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x16C), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x6C), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0xBC), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0xC8), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0xE8), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x108), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x114), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x16C), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x16C), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x16C), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x120), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x12C), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x138), - (void*)(((char*)demoProc__11daBdoorL5_cFv) + 0x154), -}; - -/* 806726B0-806726BC -00001 000C+00 0/1 0/0 0/0 .data @4295 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4295[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__11daBdoorL5_cFv, -}; -#pragma pop - -/* 806726BC-806726C8 -00001 000C+00 0/1 0/0 0/0 .data @4296 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4296[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionCloseWait__11daBdoorL5_cFv, -}; -#pragma pop - -/* 806726C8-806726D4 -00001 000C+00 0/1 0/0 0/0 .data @4297 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4297[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOpen__11daBdoorL5_cFv, -}; -#pragma pop - -/* 806726D4-806726E0 -00001 000C+00 0/1 0/0 0/0 .data @4298 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4298[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEnd__11daBdoorL5_cFv, -}; -#pragma pop - -/* 806726E0-80672710 0000EC 0030+00 0/1 0/0 0/0 .data l_action$4294 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_action[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80672710-80672730 -00001 0020+00 1/0 0/0 0/0 .data l_daBdoorL5_Method */ -SECTION_DATA static void* l_daBdoorL5_Method[8] = { - (void*)daBdoorL5_Create__FP10fopAc_ac_c, - (void*)daBdoorL5_Delete__FP11daBdoorL5_c, - (void*)daBdoorL5_Execute__FP11daBdoorL5_c, - (void*)NULL, - (void*)daBdoorL5_Draw__FP11daBdoorL5_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80672730-80672760 -00001 0030+00 0/0 0/0 1/0 .data g_profile_L5BOSS_DOOR */ -SECTION_DATA extern void* g_profile_L5BOSS_DOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x022B0000, (void*)&g_fpcLf_Method, - (void*)0x000007D0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x012C0000, (void*)&l_daBdoorL5_Method, - (void*)0x00044000, (void*)0x00060000, -}; - -/* 80672760-8067276C 00016C 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 8067276C-80672790 000178 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_806724B8, - (void*)NULL, - (void*)NULL, - (void*)func_806724B0, -}; - -/* 80672790-8067279C 00019C 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, +static char* action_table[14] = { + "WAIT", + "UNLOCK", + "OPEN", + "SETGOAL", + "SETGOAL2", + "CLOSE", + "SMOKE", + "SMOKE_END", + "END", + "END_CHECK", + "CHG_SCENE", + "KEYDELETE", + "PLY_NODISP", + "PLY_DISP", }; /* 80670D10-80670EC0 000150 01B0+00 1/1 0/0 0/0 .text CreateHeap__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateHeap__11daBdoorL5_cFv.s" +int daBdoorL5_c::CreateHeap() { + J3DModelData* modelData = getDoorModelData(); + JUT_ASSERT(313, modelData != 0); + field_0x580 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (field_0x580 == NULL) { + return 0; + } + + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); + JUT_ASSERT(354, anm != 0); + field_0x584 = new mDoExt_bckAnm(); + if (field_0x584 == NULL || !field_0x584->init(anm, 1, 0, 1.0f, 0, -1, false)) { + return 0; + } + + field_0x584->entry(field_0x580->getModelData()); + field_0x580->calc(); + calcMtx(); + field_0x588 = new dBgW(); + if (field_0x588 == NULL || field_0x588->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x580->getBaseTRMtx())) { + return 0; + } + return 1; } -#pragma pop - -/* 80670EC0-80670F08 000300 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop /* 80670F08-80670F5C 000348 0054+00 2/2 0/0 0/0 .text calcMtx__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::calcMtx() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcMtx__11daBdoorL5_cFv.s" +void daBdoorL5_c::calcMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(home.angle.y); + field_0x580->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80672510-80672514 000048 0004+00 0/1 0/0 0/0 .rodata @3787 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3787 = 250.0f; -COMPILER_STRIP_GATE(0x80672510, &lit_3787); -#pragma pop /* 80670F5C-8067106C 00039C 0110+00 1/1 0/0 0/0 .text CreateInit__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::CreateInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/CreateInit__11daBdoorL5_cFv.s" +int daBdoorL5_c::CreateInit() { + field_0x5b8.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, + &field_0x790, fopAcM_GetSpeed_p(this), NULL, NULL); + int rt = dComIfG_Bgsp().Regist(field_0x588, this); + JUT_ASSERT(217, rt == 0); + setAction(ACTION_CLOSE_WAIT); + attention_info.position.y += 250.0f; + eyePos.y += 250.0f; + attention_info.flags = 0x20; + calcMtx(); + field_0x588->Move(); + door_param2_c::getSwbit(this); + field_0x593 = 0xff; + eventInfo.setArchiveName((char*)getArcName()); + field_0x598 = dComIfGp_getEventManager().getEventIdx(this, + l_door_open_demo_1st, 0xff); + field_0x59a = + dComIfGp_getEventManager().getEventIdx(this, l_door_open_demo, 0xff); + return 1; } -#pragma pop /* 8067106C-806711FC 0004AC 0190+00 1/1 0/0 0/0 .text create__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::create() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/create__11daBdoorL5_cFv.s" +int daBdoorL5_c::create() { + fopAcM_SetupActor(this, daBdoorL5_c); + int rv = dComIfG_resLoad(&mPhase1, getArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + rv = dComIfG_resLoad(&mPhase3, getAnmArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + rv = dComIfG_resLoad(&mPhase2, getAlwaysArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + s32 roomNo = fopAcM_GetRoomNo(this); + u8 swBit = door_param2_c::getSwbit(this); + if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) { + createKey(); + } else { + mKeyHoleId = -1; + } + + if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xd40) == 0) { + return cPhs_ERROR_e; + } + if (CreateInit() != 0) { + return cPhs_COMPLEATE_e; + } + return cPhs_ERROR_e; } -#pragma pop - -/* 806711FC-8067126C 00063C 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 8067126C-806712DC 0006AC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 806712DC-80671324 00071C 0048+00 1/1 0/0 0/0 .text getDemoAction__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::getDemoAction() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/getDemoAction__11daBdoorL5_cFv.s" +int daBdoorL5_c::getDemoAction() { + return dComIfGp_evmng_getMyActIdx(field_0x59c, action_table, 14, 0, 0); } -#pragma pop /* 80671324-806715D0 000764 02AC+00 5/3 0/0 0/0 .text demoProc__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::demoProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/demoProc__11daBdoorL5_cFv.s" +void daBdoorL5_c::demoProc() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + int demoAction = getDemoAction(); + cXyz cStack_38; + if (dComIfGp_evmng_getIsAddvance(field_0x59c)) { + switch (demoAction) { + case 1: + if (dComIfGs_isSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)) == 0) { + player->onPlayerNoDraw(); + player->onPlayerShadowNoDraw(); + } + unlockInit(); + break; + case 2: + openInit(); + break; + case 3: + calcGoal(&cStack_38, 0); + dComIfGp_evmng_setGoal(&cStack_38); + break; + case 4: + calcGoal(&cStack_38, 1); + dComIfGp_evmng_setGoal(&cStack_38); + break; + case 5: + closeInit(); + break; + case 6: + smokeInit(); + break; + case 10: + field_0x596 = 0; + break; + case 11: + field_0x594 = 40; + break; + case 12: + player->onPlayerNoDraw(); + player->onPlayerShadowNoDraw(); + break; + case 13: + player->offPlayerNoDraw(); + player->offPlayerShadowNoDraw(); + break; + } + } + switch (demoAction) { + case 1: + obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId); + if ((keyhole != NULL && keyhole->checkOpenEnd()) || mKeyHoleId == -1) { + dComIfGp_evmng_cutEnd(field_0x59c); + } + break; + case 2: + if (openProc() != 0) { + openEnd(); + dComIfGp_evmng_cutEnd(field_0x59c); + } + break; + case 5: + if (closeProc() != 0) { + closeEnd(); + dComIfGp_evmng_cutEnd(field_0x59c); + } + break; + case 8: + break; + case 10: + if (field_0x596 == 0) { + daPy_py_c* player = daPy_getPlayerActorClass(); + player->onSceneChangeArea(door_param2_c::getExitNo(this), 0xff, NULL); + } + field_0x596--; + break; + case 9: + setAction(ACTION_END); + dComIfGp_evmng_cutEnd(field_0x59c); + break; + default: + dComIfGp_evmng_cutEnd(field_0x59c); + break; + } } -#pragma pop /* 806715D0-80671670 000A10 00A0+00 1/1 0/0 0/0 .text openInit__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::openInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openInit__11daBdoorL5_cFv.s" +int daBdoorL5_c::openInit() { + dComIfG_Bgsp().Release(field_0x588); + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); + JUT_ASSERT(454, anm != 0); + int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(456, rt == 0); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80672514-80672518 00004C 0004+00 0/1 0/0 0/0 .rodata @3980 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3980 = 18.0f; -COMPILER_STRIP_GATE(0x80672514, &lit_3980); -#pragma pop - -/* 80672518-8067251C 000050 0004+00 2/3 0/0 0/0 .rodata @3981 */ -SECTION_RODATA static f32 const lit_3981 = -1.0f; -COMPILER_STRIP_GATE(0x80672518, &lit_3981); /* 80671670-80671718 000AB0 00A8+00 1/1 0/0 0/0 .text openProc__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::openProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/openProc__11daBdoorL5_cFv.s" +int daBdoorL5_c::openProc() { + int rv = field_0x584->play(); + if (field_0x584->getFrame() == 18.0f) { + mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_OP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + return rv; } -#pragma pop /* 80671718-80671720 000B58 0008+00 1/1 0/0 0/0 .text openEnd__11daBdoorL5_cFv */ -bool daBdoorL5_c::openEnd() { - return true; +int daBdoorL5_c::openEnd() { + return 1; } /* 80671720-806717FC 000B60 00DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::closeInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeInit__11daBdoorL5_cFv.s" +int daBdoorL5_c::closeInit() { + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm()); + JUT_ASSERT(511, anm != 0); + int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(513, rt == 0); + mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_CL, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + return 1; } -#pragma pop /* 806717FC-80671820 000C3C 0024+00 1/1 0/0 0/0 .text closeProc__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::closeProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeProc__11daBdoorL5_cFv.s" +int daBdoorL5_c::closeProc() { + return field_0x584->play(); } -#pragma pop - -/* ############################################################################################## */ -/* 8067251C-80672520 000054 0004+00 3/5 0/0 0/0 .rodata @4015 */ -SECTION_RODATA static u8 const lit_4015[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8067251C, &lit_4015); /* 80671820-80671878 000C60 0058+00 1/1 0/0 0/0 .text closeEnd__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::closeEnd() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/closeEnd__11daBdoorL5_cFv.s" +int daBdoorL5_c::closeEnd() { + dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); + return 1; } -#pragma pop /* 80671878-80671954 000CB8 00DC+00 1/1 0/0 0/0 .text unlockInit__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::unlockInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/unlockInit__11daBdoorL5_cFv.s" +int daBdoorL5_c::unlockInit() { + if (mKeyHoleId == -1) { + return 1; + } + obj_keyhole_class* keyHole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId); + if (keyHole != NULL) { + keyHole->setOpen(); + mDoAud_seStart(Z2SE_OBJ_BOSS_LOCK_OPEN_LV5, &keyHole->current.pos, 0, 0); + } + dComIfGs_onSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80672520-80672524 000058 0004+00 0/1 0/0 0/0 .rodata @4063 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4063 = 0.5f; -COMPILER_STRIP_GATE(0x80672520, &lit_4063); -#pragma pop - -/* 80672524-80672528 00005C 0004+00 0/1 0/0 0/0 .rodata @4064 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4064 = -1000.0f; -COMPILER_STRIP_GATE(0x80672524, &lit_4064); -#pragma pop - -/* 80672528-8067252C 000060 0004+00 0/1 0/0 0/0 .rodata @4065 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4065 = -240.0f; -COMPILER_STRIP_GATE(0x80672528, &lit_4065); -#pragma pop /* 80671954-80671A7C 000D94 0128+00 1/1 0/0 0/0 .text calcGoal__11daBdoorL5_cFP4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::calcGoal(cXyz* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/calcGoal__11daBdoorL5_cFP4cXyzi.s" +void daBdoorL5_c::calcGoal(cXyz* param_1, int param_2) { + cXyz local_24 = dComIfGp_getPlayer(0)->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&local_24, &local_24); + local_24.x = local_24.x * 0.5f; + local_24.y = 0.0f; + if (param_2 == 0) { + local_24.z = -1000.0f; + } else { + local_24.z = -240.0f; + } + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::multVec(&local_24, &local_24); + param_1->x = local_24.x; + param_1->y = 0.0f; + param_1->z = local_24.z; } -#pragma pop /* 80671A7C-80671B14 000EBC 0098+00 1/1 0/0 0/0 .text smokeInit__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::smokeInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/smokeInit__11daBdoorL5_cFv.s" +void daBdoorL5_c::smokeInit() { + field_0x5a4 = current.pos; + field_0x5b0 = shape_angle; + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_setPolyColor(0x8156, field_0x5b8.m_gnd, &field_0x5a4, &tevStr, &field_0x5b0, + 0, 0, 0, roomNo, 0); } -#pragma pop - -/* ############################################################################################## */ -/* 8067252C-80672530 000064 0004+00 1/1 0/0 0/0 .rodata @4110 */ -SECTION_RODATA static f32 const lit_4110 = 50.0f; -COMPILER_STRIP_GATE(0x8067252C, &lit_4110); /* 80671B14-80671C14 000F54 0100+00 1/1 0/0 0/0 .text createKey__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::createKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/createKey__11daBdoorL5_cFv.s" +int daBdoorL5_c::createKey() { + if (field_0x590 == 0) { + cXyz prevPos(current.pos); + current.pos = home.pos; + cXyz pos(0.0f, 0.0f, 50.0f); + mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffff05, + &pos, fopAcM_GetRoomNo(this), &shape_angle, + &scale, -1, 0); + current.pos = prevPos; + if (mKeyHoleId == -1) { + return 0; + } + field_0x590 = 1; + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80672530-80672534 000068 0004+00 1/1 0/0 0/0 .rodata @4154 */ -SECTION_RODATA static f32 const lit_4154 = 200.0f; -COMPILER_STRIP_GATE(0x80672530, &lit_4154); - -/* 80672534-80672538 00006C 0004+00 1/1 0/0 0/0 .rodata @4155 */ -SECTION_RODATA static f32 const lit_4155 = 100.0f; -COMPILER_STRIP_GATE(0x80672534, &lit_4155); - -/* 80672538-80672540 000070 0008+00 1/1 0/0 0/0 .rodata @4157 */ -SECTION_RODATA static u8 const lit_4157[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80672538, &lit_4157); /* 80671C14-80671D44 001054 0130+00 1/1 0/0 0/0 .text checkArea__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::checkArea() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkArea__11daBdoorL5_cFv.s" +int daBdoorL5_c::checkArea() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz local_48 = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&local_48, &local_48); + if (fabsf(local_48.x) > 200.0f) { + return 0; + } + if (fabsf(local_48.z) > 100.0f) { + return 0; + } + if ((s16)fabs(current.angle.y - 0x7fff - player->current.angle.y) <= 0x4000) { + return 1; + } else { + return 0; + } } -#pragma pop /* 80671D44-80671DE4 001184 00A0+00 1/1 0/0 0/0 .text checkFront__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::checkFront() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkFront__11daBdoorL5_cFv.s" +int daBdoorL5_c::checkFront() { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz distance = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&distance, &distance); + return distance.z > 0.0f; } -#pragma pop /* 80671DE4-80671E70 001224 008C+00 1/1 0/0 0/0 .text checkOpen__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::checkOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/checkOpen__11daBdoorL5_cFv.s" +int daBdoorL5_c::checkOpen() { + // Fake Match - should be daPy_py_c::i_checkNowWolf + if (dComIfGp_getLinkPlayer()->mNoResetFlg1 & daPy_py_c::FLG1_IS_WOLF) { + return 0; + } + + if (!dComIfGs_isDungeonItemBossKey()) { + return 0; + } + if (!checkFront()) { + return 0; + } + if (checkArea()) { + return 1; + } else { + return 0; + } } -#pragma pop /* 80671E70-80671E78 0012B0 0008+00 1/0 0/0 0/0 .text actionWait__11daBdoorL5_cFv */ -bool daBdoorL5_c::actionWait() { - return true; +int daBdoorL5_c::actionWait() { + return 1; } /* 80671E78-80671F58 0012B8 00E0+00 1/0 0/0 0/0 .text actionCloseWait__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::actionCloseWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionCloseWait__11daBdoorL5_cFv.s" +int daBdoorL5_c::actionCloseWait() { + if (eventInfo.i_checkCommandDoor()) { + field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + demoProc(); + setAction(ACTION_OPEN); + } else { + if (checkOpen()) { + if (dComIfGs_isSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))) { + eventInfo.setEventId(field_0x59a); + eventInfo.setMapToolId(field_0x593); + } else { + eventInfo.setEventId(field_0x598); + eventInfo.setMapToolId(field_0x593); + } + eventInfo.i_onCondition(4); + } + } + return 1; } -#pragma pop /* 80671F58-80672004 001398 00AC+00 1/0 0/0 0/0 .text actionOpen__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::actionOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionOpen__11daBdoorL5_cFv.s" +int daBdoorL5_c::actionOpen() { + field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + demoProc(); + dMeter2Info_onGameStatus(2); + if (cLib_calcTimer(&field_0x594) == 1) { + deleteKey(); + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80672540-80672544 000078 0004+00 0/1 0/0 0/0 .rodata @4289 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4289 = 180.0f; -COMPILER_STRIP_GATE(0x80672540, &lit_4289); -#pragma pop - -/* 80672544-80672548 00007C 0004+00 0/1 0/0 0/0 .rodata @4290 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4290 = -180.0f; -COMPILER_STRIP_GATE(0x80672544, &lit_4290); -#pragma pop /* 80672004-80672164 001444 0160+00 1/0 0/0 0/0 .text actionEnd__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::actionEnd() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/actionEnd__11daBdoorL5_cFv.s" +int daBdoorL5_c::actionEnd() { + if (!field_0x588->ChkUsed()) { + bool rt = dComIfG_Bgsp().Regist(field_0x588, this); + JUT_ASSERT(860, rt != 0); + } + setAction(0); + cXyz local_70(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y)); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz cStack_7c = player->current.pos - current.pos; + f32 fVar1; + f32 dVar12 = cStack_7c.inprodXZ(local_70); + fVar1 = dVar12 < 0.0f ? 180.0f : -180.0f; + cXyz cStack_88(current.pos.x - fVar1 * local_70.x, current.pos.y, + current.pos.z - fVar1 * local_70.z); + s32 roomNo = fopAcM_GetRoomNo(player); + s16 angle; + if (dVar12 > 0.0f) { + angle = current.angle.y; + } else { + angle = current.angle.y + 0x8000; + } + dComIfGs_setRestartRoom(cStack_88, angle, roomNo); + return 1; } -#pragma pop /* 80672164-8067228C 0015A4 0128+00 1/1 0/0 0/0 .text execute__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::execute() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/execute__11daBdoorL5_cFv.s" +int daBdoorL5_c::execute() { + static actionFunc l_action[4] = {&daBdoorL5_c::actionWait, &daBdoorL5_c::actionCloseWait, &daBdoorL5_c::actionOpen, &daBdoorL5_c::actionEnd}; + field_0x59c = -1; + if (fopAcM_checkStatus(this, 0x1000)) { + field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + dMeter2Info_onGameStatus(2); + demoProc(); + } else { + (this->*(((actionFunc*)l_action)[mAction]))(); + } + return 1; } -#pragma pop /* 8067228C-80672374 0016CC 00E8+00 1/1 0/0 0/0 .text draw__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::draw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/draw__11daBdoorL5_cFv.s" +int daBdoorL5_c::draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(field_0x580, &tevStr); + dComIfGd_setListBG(); + g_env_light.setLightTevColorType_MAJI(field_0x580, &tevStr); + field_0x584->entry(field_0x580->getModelData()); + mDoExt_modelUpdateDL(field_0x580); + mDoExt_bckAnmRemove(field_0x580->getModelData()); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80672374-8067240C 0017B4 0098+00 1/1 0/0 0/0 .text Delete__11daBdoorL5_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL5_c::Delete() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/Delete__11daBdoorL5_cFv.s" +int daBdoorL5_c::Delete() { + if (heap != NULL && field_0x588->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x588); + } + dComIfG_resDelete(&mPhase1, getArcName()); + dComIfG_resDelete(&mPhase3, getAnmArcName()); + dComIfG_resDelete(&mPhase2, getAlwaysArcName()); + return 1; } -#pragma pop /* 8067240C-8067242C 00184C 0020+00 1/0 0/0 0/0 .text daBdoorL5_Draw__FP11daBdoorL5_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL5_Draw(daBdoorL5_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Draw__FP11daBdoorL5_c.s" +static int daBdoorL5_Draw(daBdoorL5_c* i_this) { + return i_this->draw(); } -#pragma pop /* 8067242C-80672450 00186C 0024+00 1/0 0/0 0/0 .text daBdoorL5_Execute__FP11daBdoorL5_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL5_Execute(daBdoorL5_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Execute__FP11daBdoorL5_c.s" +static int daBdoorL5_Execute(daBdoorL5_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 80672450-80672474 001890 0024+00 1/0 0/0 0/0 .text daBdoorL5_Delete__FP11daBdoorL5_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL5_Delete(daBdoorL5_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Delete__FP11daBdoorL5_c.s" +static int daBdoorL5_Delete(daBdoorL5_c* i_this) { + i_this->Delete(); + return 1; } -#pragma pop /* 80672474-80672494 0018B4 0020+00 1/0 0/0 0/0 .text daBdoorL5_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL5_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/daBdoorL5_Create__FP10fopAc_ac_c.s" +static int daBdoorL5_Create(fopAc_ac_c* i_this) { + return static_cast<daBdoorL5_c*>(i_this)->create(); } -#pragma pop -/* 80672494-806724B0 0018D4 001C+00 1/1 0/0 0/0 .text cLib_calcTimer<Uc>__FPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80672494(void* _this, u8* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_80672494.s" -} -#pragma pop - -/* 806724B0-806724B8 0018F0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_806724B0() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B0.s" -} -#pragma pop -/* 806724B8-806724C0 0018F8 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_806724B8() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5/func_806724B8.s" -} -#pragma pop +/* 80672710-80672730 -00001 0020+00 1/0 0/0 0/0 .data l_daBdoorL5_Method */ +static actor_method_class l_daBdoorL5_Method = { + (process_method_func)daBdoorL5_Create, + (process_method_func)daBdoorL5_Delete, + (process_method_func)daBdoorL5_Execute, + (process_method_func)NULL, + (process_method_func)daBdoorL5_Draw, +}; -/* 80672548-80672548 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80672730-80672760 -00001 0030+00 0/0 0/0 1/0 .data g_profile_L5BOSS_DOOR */ +extern actor_process_profile_definition g_profile_L5BOSS_DOOR = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_L5BOSS_DOOR, + &g_fpcLf_Method.mBase, + sizeof(daBdoorL5_c), + 0, + 0, + &g_fopAc_Method.base, + 0x12C, + &l_daBdoorL5_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_6_e, +}; diff --git a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp deleted file mode 100644 index ef8bce2a44..0000000000 --- a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_806727A0[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 806727A0-806727A4 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_806727A0[4]; -u8 data_806727A0[4]; diff --git a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp index 902e1af1d0..88eec69e8c 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp @@ -1,6 +1,5 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_door_dbdoor00 +// d_a_door_dbdoor00 // #include "rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.h" @@ -8,9 +7,6 @@ #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_player.h" #include "d/d_door_param2.h" -#include "dol2asm.h" - -extern "C" extern char const* const d_a_door_dbdoor00__stringBase0; /* 8045D378-8045D470 000078 00F8+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ static int nodeCallBack(J3DJoint* i_joint, int param_1) { @@ -30,11 +26,9 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { return 1; } -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E56C = "door-pushDouble_"; -#pragma pop +static char* dummyStringFunc() { + return "door-pushDouble_"; +} /* 8045D470-8045D480 000170 0010+00 3/3 0/0 0/0 .text getAlwaysArcName__12daDbDoor00_cFv */ @@ -66,7 +60,7 @@ static u8 cNullVec__6Z2Calc[12] = { /* 8045E670-8045E684 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, @@ -77,7 +71,7 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 8045E684-8045E688 -00001 0004+00 1/1 0/0 0/0 .data l_bmd_base_name */ -SECTION_DATA static void* l_bmd_base_name = (void*)&d_a_door_dbdoor00__stringBase0; +static char* l_bmd_base_name = "door-pushDouble_"; /* 8045D4B0-8045D504 0001B0 0054+00 1/1 0/0 0/0 .text getBmdName__12daDbDoor00_cFv */ char* daDbDoor00_c::getBmdName() { |