diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index ad2ec0230b7..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80672894: -/* 80672894 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672898 7C 08 02 A6 */ mflr r0 -/* 8067289C 90 01 00 14 */ stw r0, 0x14(r1) -/* 806728A0 48 00 08 C5 */ bl CreateHeap__12daMBdoorL1_cFv -/* 806728A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806728A8 7C 08 03 A6 */ mtlr r0 -/* 806728AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 806728B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/Delete__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/Delete__12daMBdoorL1_cFv.s deleted file mode 100644 index c4a330ca928..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/Delete__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_806773DC: -/* 806773DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806773E0 7C 08 02 A6 */ mflr r0 -/* 806773E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806773E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806773EC 7C 7F 1B 78 */ mr r31, r3 -/* 806773F0 80 03 00 F0 */ lwz r0, 0xf0(r3) -/* 806773F4 28 00 00 00 */ cmplwi r0, 0 -/* 806773F8 41 82 00 28 */ beq lbl_80677420 -/* 806773FC 80 7F 05 98 */ lwz r3, 0x598(r31) -/* 80677400 4B BF 0D D5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80677404 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80677408 41 82 00 18 */ beq lbl_80677420 -/* 8067740C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80677410 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80677414 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80677418 80 9F 05 98 */ lwz r4, 0x598(r31) -/* 8067741C 4B 9F CE 35 */ bl Release__4cBgSFP9dBgW_Base -lbl_80677420: -/* 80677420 7F E3 FB 78 */ mr r3, r31 -/* 80677424 4B FF BA C5 */ bl getArcName__12daMBdoorL1_cFv -/* 80677428 7C 64 1B 78 */ mr r4, r3 -/* 8067742C 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80677430 4B 9B 5B D9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80677434 7F E3 FB 78 */ mr r3, r31 -/* 80677438 4B FF BB 3D */ bl getAlwaysArcName__12daMBdoorL1_cFv -/* 8067743C 7C 64 1B 78 */ mr r4, r3 -/* 80677440 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80677444 4B 9B 5B C5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80677448 7F E3 FB 78 */ mr r3, r31 -/* 8067744C 4B FF BA 25 */ bl getAnmArcName__12daMBdoorL1_cFv -/* 80677450 28 03 00 00 */ cmplwi r3, 0 -/* 80677454 41 82 00 18 */ beq lbl_8067746C -/* 80677458 7F E3 FB 78 */ mr r3, r31 -/* 8067745C 4B FF BA 15 */ bl getAnmArcName__12daMBdoorL1_cFv -/* 80677460 7C 64 1B 78 */ mr r4, r3 -/* 80677464 38 7F 05 78 */ addi r3, r31, 0x578 -/* 80677468 4B 9B 5B A1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -lbl_8067746C: -/* 8067746C 38 60 00 01 */ li r3, 1 -/* 80677470 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80677474 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80677478 7C 08 03 A6 */ mtlr r0 -/* 8067747C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80677480 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionCloseWait__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionCloseWait__12daMBdoorL1_cFv.s deleted file mode 100644 index 5f34a4757d1..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionCloseWait__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,139 +0,0 @@ -lbl_80676BE8: -/* 80676BE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676BEC 7C 08 02 A6 */ mflr r0 -/* 80676BF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676BF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676BF8 93 C1 00 08 */ stw r30, 8(r1) -/* 80676BFC 7C 7F 1B 78 */ mr r31, r3 -/* 80676C00 A0 83 00 F8 */ lhz r4, 0xf8(r3) -/* 80676C04 28 04 00 03 */ cmplwi r4, 3 -/* 80676C08 40 82 00 3C */ bne lbl_80676C44 -/* 80676C0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676C10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676C14 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80676C18 3C 80 80 67 */ lis r4, l_staff_name@ha /* 0x80677558@ha */ -/* 80676C1C 38 84 75 58 */ addi r4, r4, l_staff_name@l /* 0x80677558@l */ -/* 80676C20 38 A0 00 00 */ li r5, 0 -/* 80676C24 38 C0 00 00 */ li r6, 0 -/* 80676C28 4B 9D 0E F5 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80676C2C 90 7F 05 E8 */ stw r3, 0x5e8(r31) -/* 80676C30 7F E3 FB 78 */ mr r3, r31 -/* 80676C34 4B FF D2 8D */ bl demoProc__12daMBdoorL1_cFv -/* 80676C38 38 00 00 04 */ li r0, 4 -/* 80676C3C 98 1F 05 CC */ stb r0, 0x5cc(r31) -/* 80676C40 48 00 01 90 */ b lbl_80676DD0 -lbl_80676C44: -/* 80676C44 88 1F 06 00 */ lbz r0, 0x600(r31) -/* 80676C48 28 00 00 00 */ cmplwi r0, 0 -/* 80676C4C 41 82 00 EC */ beq lbl_80676D38 -/* 80676C50 28 04 00 02 */ cmplwi r4, 2 -/* 80676C54 40 82 00 58 */ bne lbl_80676CAC -/* 80676C58 88 1F 05 DF */ lbz r0, 0x5df(r31) -/* 80676C5C 28 00 00 01 */ cmplwi r0, 1 -/* 80676C60 40 82 00 10 */ bne lbl_80676C70 -/* 80676C64 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80676C68 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80676C6C B0 1F 04 E6 */ sth r0, 0x4e6(r31) -lbl_80676C70: -/* 80676C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676C78 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80676C7C 3C 80 80 67 */ lis r4, l_staff_name@ha /* 0x80677558@ha */ -/* 80676C80 38 84 75 58 */ addi r4, r4, l_staff_name@l /* 0x80677558@l */ -/* 80676C84 38 A0 00 00 */ li r5, 0 -/* 80676C88 38 C0 00 00 */ li r6, 0 -/* 80676C8C 4B 9D 0E 91 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80676C90 90 7F 05 E8 */ stw r3, 0x5e8(r31) -/* 80676C94 7F E3 FB 78 */ mr r3, r31 -/* 80676C98 4B FF D2 29 */ bl demoProc__12daMBdoorL1_cFv -/* 80676C9C 38 00 00 05 */ li r0, 5 -/* 80676CA0 98 1F 05 CC */ stb r0, 0x5cc(r31) -/* 80676CA4 38 60 00 01 */ li r3, 1 -/* 80676CA8 48 00 01 2C */ b lbl_80676DD4 -lbl_80676CAC: -/* 80676CAC 4B FF FB 2D */ bl checkStopOpen__12daMBdoorL1_cFv -/* 80676CB0 2C 03 00 00 */ cmpwi r3, 0 -/* 80676CB4 41 82 00 84 */ beq lbl_80676D38 -/* 80676CB8 7F E3 FB 78 */ mr r3, r31 -/* 80676CBC 4B 9C 35 45 */ bl getEventNo__13door_param2_cFP10fopAc_ac_c -/* 80676CC0 7C 7E 1B 78 */ mr r30, r3 -/* 80676CC4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80676CC8 28 00 00 FF */ cmplwi r0, 0xff -/* 80676CCC 41 82 00 24 */ beq lbl_80676CF0 -/* 80676CD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676CD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676CD8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80676CDC 7F E4 FB 78 */ mr r4, r31 -/* 80676CE0 7F C5 F3 78 */ mr r5, r30 -/* 80676CE4 4B 9D 09 B5 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc -/* 80676CE8 B0 7F 05 D2 */ sth r3, 0x5d2(r31) -/* 80676CEC 48 00 00 2C */ b lbl_80676D18 -lbl_80676CF0: -/* 80676CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676CF8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80676CFC 3C 80 80 67 */ lis r4, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80676D00 38 84 76 60 */ addi r4, r4, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80676D04 38 84 02 FE */ addi r4, r4, 0x2fe -/* 80676D08 38 A0 00 FF */ li r5, 0xff -/* 80676D0C 38 C0 FF FF */ li r6, -1 -/* 80676D10 4B 9D 08 05 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80676D14 B0 7F 05 D2 */ sth r3, 0x5d2(r31) -lbl_80676D18: -/* 80676D18 7F E3 FB 78 */ mr r3, r31 -/* 80676D1C A8 9F 05 D2 */ lha r4, 0x5d2(r31) -/* 80676D20 7F C5 F3 78 */ mr r5, r30 -/* 80676D24 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80676D28 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80676D2C 38 E0 00 00 */ li r7, 0 -/* 80676D30 39 00 00 01 */ li r8, 1 -/* 80676D34 4B 9A 49 49 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -lbl_80676D38: -/* 80676D38 7F E3 FB 78 */ mr r3, r31 -/* 80676D3C 4B FF BA FD */ bl getNowLevel__FP10fopAc_ac_c -/* 80676D40 2C 03 00 01 */ cmpwi r3, 1 -/* 80676D44 41 82 00 54 */ beq lbl_80676D98 -/* 80676D48 88 1F 06 00 */ lbz r0, 0x600(r31) -/* 80676D4C 28 00 00 00 */ cmplwi r0, 0 -/* 80676D50 40 82 00 48 */ bne lbl_80676D98 -/* 80676D54 7F E3 FB 78 */ mr r3, r31 -/* 80676D58 4B FF FC 79 */ bl checkStopClose__12daMBdoorL1_cFv -/* 80676D5C 2C 03 00 00 */ cmpwi r3, 0 -/* 80676D60 41 82 00 38 */ beq lbl_80676D98 -/* 80676D64 38 00 00 01 */ li r0, 1 -/* 80676D68 98 1F 06 00 */ stb r0, 0x600(r31) -/* 80676D6C 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80676D70 7F E4 FB 78 */ mr r4, r31 -/* 80676D74 38 A0 00 01 */ li r5, 1 -/* 80676D78 4B FF BB F9 */ bl closeInit__13dDoor_stop2_cFP10fopAc_ac_cUc -/* 80676D7C 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80676D80 7F E4 FB 78 */ mr r4, r31 -/* 80676D84 4B FF BB 31 */ bl calcMtx__13dDoor_stop2_cFP10fopAc_ac_c -/* 80676D88 38 00 00 06 */ li r0, 6 -/* 80676D8C 98 1F 05 CC */ stb r0, 0x5cc(r31) -/* 80676D90 38 60 00 01 */ li r3, 1 -/* 80676D94 48 00 00 40 */ b lbl_80676DD4 -lbl_80676D98: -/* 80676D98 7F E3 FB 78 */ mr r3, r31 -/* 80676D9C 4B FF F5 6D */ bl checkOpen__12daMBdoorL1_cFv -/* 80676DA0 2C 03 00 00 */ cmpwi r3, 0 -/* 80676DA4 41 82 00 2C */ beq lbl_80676DD0 -/* 80676DA8 88 1F 05 DE */ lbz r0, 0x5de(r31) -/* 80676DAC 54 00 08 3C */ slwi r0, r0, 1 -/* 80676DB0 7C 7F 02 14 */ add r3, r31, r0 -/* 80676DB4 A8 03 05 D4 */ lha r0, 0x5d4(r3) -/* 80676DB8 B0 1F 00 FC */ sth r0, 0xfc(r31) -/* 80676DBC 38 00 00 FF */ li r0, 0xff -/* 80676DC0 98 1F 00 FE */ stb r0, 0xfe(r31) -/* 80676DC4 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80676DC8 60 00 00 04 */ ori r0, r0, 4 -/* 80676DCC B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80676DD0: -/* 80676DD0 38 60 00 01 */ li r3, 1 -lbl_80676DD4: -/* 80676DD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80676DD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80676DDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676DE0 7C 08 03 A6 */ mtlr r0 -/* 80676DE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676DE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionDemo__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionDemo__12daMBdoorL1_cFv.s deleted file mode 100644 index 4ea4ac305ae..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionDemo__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80676E40: -/* 80676E40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676E44 7C 08 02 A6 */ mflr r0 -/* 80676E48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676E4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676E50 93 C1 00 08 */ stw r30, 8(r1) -/* 80676E54 7C 7E 1B 78 */ mr r30, r3 -/* 80676E58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676E5C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676E60 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80676E64 A8 9E 05 D2 */ lha r4, 0x5d2(r30) -/* 80676E68 4B 9D 0C 11 */ bl endCheck__16dEvent_manager_cFs -/* 80676E6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80676E70 41 82 00 20 */ beq lbl_80676E90 -/* 80676E74 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80676E78 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 80676E7C 38 00 00 03 */ li r0, 3 -/* 80676E80 98 1E 05 CC */ stb r0, 0x5cc(r30) -/* 80676E84 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 80676E88 4B 9C B5 E1 */ bl reset__14dEvt_control_cFv -/* 80676E8C 48 00 00 0C */ b lbl_80676E98 -lbl_80676E90: -/* 80676E90 7F C3 F3 78 */ mr r3, r30 -/* 80676E94 4B FF D0 2D */ bl demoProc__12daMBdoorL1_cFv -lbl_80676E98: -/* 80676E98 38 60 00 01 */ li r3, 1 -/* 80676E9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80676EA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80676EA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676EA8 7C 08 03 A6 */ mtlr r0 -/* 80676EAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676EB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionOpen__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionOpen__12daMBdoorL1_cFv.s deleted file mode 100644 index 9d2e70b96a9..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionOpen__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80676EB4: -/* 80676EB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676EB8 7C 08 02 A6 */ mflr r0 -/* 80676EBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676EC0 4B FF D0 01 */ bl demoProc__12daMBdoorL1_cFv -/* 80676EC4 38 60 00 01 */ li r3, 1 -/* 80676EC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676ECC 7C 08 03 A6 */ mtlr r0 -/* 80676ED0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676ED4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStartDemo__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStartDemo__12daMBdoorL1_cFv.s deleted file mode 100644 index 35a0a1886e3..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStartDemo__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80676FE4: -/* 80676FE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676FE8 7C 08 02 A6 */ mflr r0 -/* 80676FEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676FF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676FF4 7C 7F 1B 78 */ mr r31, r3 -/* 80676FF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676FFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80677000 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80677004 3C 80 80 67 */ lis r4, l_staff_name@ha /* 0x80677558@ha */ -/* 80677008 38 84 75 58 */ addi r4, r4, l_staff_name@l /* 0x80677558@l */ -/* 8067700C 38 A0 00 00 */ li r5, 0 -/* 80677010 38 C0 00 00 */ li r6, 0 -/* 80677014 4B 9D 0B 09 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80677018 90 7F 05 E8 */ stw r3, 0x5e8(r31) -/* 8067701C 7F E3 FB 78 */ mr r3, r31 -/* 80677020 4B FF CE A1 */ bl demoProc__12daMBdoorL1_cFv -/* 80677024 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80677028 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 8067702C 40 82 00 0C */ bne lbl_80677038 -/* 80677030 38 00 00 03 */ li r0, 3 -/* 80677034 98 1F 05 CC */ stb r0, 0x5cc(r31) -lbl_80677038: -/* 80677038 38 60 00 01 */ li r3, 1 -/* 8067703C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80677040 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80677044 7C 08 03 A6 */ mtlr r0 -/* 80677048 38 21 00 10 */ addi r1, r1, 0x10 -/* 8067704C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStopClose__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStopClose__12daMBdoorL1_cFv.s deleted file mode 100644 index 7fa6fab8e26..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStopClose__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80676DEC: -/* 80676DEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676DF0 7C 08 02 A6 */ mflr r0 -/* 80676DF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676DF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676DFC 7C 7F 1B 78 */ mr r31, r3 -/* 80676E00 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80676E04 7F E4 FB 78 */ mr r4, r31 -/* 80676E08 4B FF BC DD */ bl closeProc__13dDoor_stop2_cFP10fopAc_ac_c -/* 80676E0C 2C 03 00 00 */ cmpwi r3, 0 -/* 80676E10 41 82 00 0C */ beq lbl_80676E1C -/* 80676E14 38 00 00 03 */ li r0, 3 -/* 80676E18 98 1F 05 CC */ stb r0, 0x5cc(r31) -lbl_80676E1C: -/* 80676E1C 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 80676E20 7F E4 FB 78 */ mr r4, r31 -/* 80676E24 4B FF BA 91 */ bl calcMtx__13dDoor_stop2_cFP10fopAc_ac_c -/* 80676E28 38 60 00 01 */ li r3, 1 -/* 80676E2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80676E30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676E34 7C 08 03 A6 */ mtlr r0 -/* 80676E38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676E3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/calcMtx__13dDoor_stop2_cFP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/calcMtx__13dDoor_stop2_cFP10fopAc_ac_c.s deleted file mode 100644 index 1058d301a39..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/calcMtx__13dDoor_stop2_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_806728B4: -/* 806728B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 806728B8 7C 08 02 A6 */ mflr r0 -/* 806728BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 806728C0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 806728C4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 806728C8 7C 7E 1B 78 */ mr r30, r3 -/* 806728CC 7C 9F 23 78 */ mr r31, r4 -/* 806728D0 88 03 00 08 */ lbz r0, 8(r3) -/* 806728D4 28 00 00 00 */ cmplwi r0, 0 -/* 806728D8 41 82 00 80 */ beq lbl_80672958 -/* 806728DC 80 1E 00 00 */ lwz r0, 0(r30) -/* 806728E0 28 00 00 00 */ cmplwi r0, 0 -/* 806728E4 40 82 00 08 */ bne lbl_806728EC -/* 806728E8 48 00 00 70 */ b lbl_80672958 -lbl_806728EC: -/* 806728EC C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 806728F0 D0 21 00 08 */ stfs f1, 8(r1) -/* 806728F4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 806728F8 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 806728FC C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80672900 D0 61 00 10 */ stfs f3, 0x10(r1) -/* 80672904 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80672908 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8067290C C0 1E 00 04 */ lfs f0, 4(r30) -/* 80672910 EC 42 00 2A */ fadds f2, f2, f0 -/* 80672914 4B CD 3F D5 */ bl PSMTXTrans -/* 80672918 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8067291C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80672920 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80672924 4B 99 9B 11 */ bl mDoMtx_YrotM__FPA4_fs -/* 80672928 88 1E 00 09 */ lbz r0, 9(r30) -/* 8067292C 28 00 00 01 */ cmplwi r0, 1 -/* 80672930 40 82 00 14 */ bne lbl_80672944 -/* 80672934 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80672938 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8067293C 38 80 7F FF */ li r4, 0x7fff -/* 80672940 4B 99 9A F5 */ bl mDoMtx_YrotM__FPA4_fs -lbl_80672944: -/* 80672944 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80672948 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8067294C 80 9E 00 00 */ lwz r4, 0(r30) -/* 80672950 38 84 00 24 */ addi r4, r4, 0x24 -/* 80672954 4B CD 3B 5D */ bl PSMTXCopy -lbl_80672958: -/* 80672958 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8067295C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80672960 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80672964 7C 08 03 A6 */ mtlr r0 -/* 80672968 38 21 00 20 */ addi r1, r1, 0x20 -/* 8067296C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackStop__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackStop__12daMBdoorL1_cFv.s deleted file mode 100644 index f9a7a83b9ed..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackStop__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80676610: -/* 80676610 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676614 7C 08 02 A6 */ mflr r0 -/* 80676618 90 01 00 14 */ stw r0, 0x14(r1) -/* 8067661C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676620 93 C1 00 08 */ stw r30, 8(r1) -/* 80676624 7C 7E 1B 78 */ mr r30, r3 -/* 80676628 4B FF FC 7D */ bl checkFront__12daMBdoorL1_cFv -/* 8067662C 2C 03 00 00 */ cmpwi r3, 0 -/* 80676630 41 82 00 0C */ beq lbl_8067663C -/* 80676634 38 60 00 00 */ li r3, 0 -/* 80676638 48 00 00 60 */ b lbl_80676698 -lbl_8067663C: -/* 8067663C 7F C3 F3 78 */ mr r3, r30 -/* 80676640 4B 9C 3B 6D */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80676644 7C 7F 1B 78 */ mr r31, r3 -/* 80676648 7F C3 F3 78 */ mr r3, r30 -/* 8067664C 4B 9C 3B 91 */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80676650 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80676654 28 00 00 01 */ cmplwi r0, 1 -/* 80676658 41 82 00 0C */ beq lbl_80676664 -/* 8067665C 28 00 00 03 */ cmplwi r0, 3 -/* 80676660 40 82 00 34 */ bne lbl_80676694 -lbl_80676664: -/* 80676664 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80676668 28 04 00 FF */ cmplwi r4, 0xff -/* 8067666C 41 82 00 28 */ beq lbl_80676694 -/* 80676670 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676674 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676678 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8067667C 7C 05 07 74 */ extsb r5, r0 -/* 80676680 4B 9B EC E1 */ bl isSwitch__10dSv_info_cCFii -/* 80676684 2C 03 00 00 */ cmpwi r3, 0 -/* 80676688 40 82 00 0C */ bne lbl_80676694 -/* 8067668C 38 60 00 01 */ li r3, 1 -/* 80676690 48 00 00 08 */ b lbl_80676698 -lbl_80676694: -/* 80676694 38 60 00 00 */ li r3, 0 -lbl_80676698: -/* 80676698 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067669C 83 C1 00 08 */ lwz r30, 8(r1) -/* 806766A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806766A4 7C 08 03 A6 */ mtlr r0 -/* 806766A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 806766AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackSw__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackSw__12daMBdoorL1_cFv.s deleted file mode 100644 index 7f1cf09ea26..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackSw__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80676744: -/* 80676744 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676748 7C 08 02 A6 */ mflr r0 -/* 8067674C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676750 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676754 93 C1 00 08 */ stw r30, 8(r1) -/* 80676758 7C 7E 1B 78 */ mr r30, r3 -/* 8067675C 4B FF FB 49 */ bl checkFront__12daMBdoorL1_cFv -/* 80676760 2C 03 00 00 */ cmpwi r3, 0 -/* 80676764 41 82 00 0C */ beq lbl_80676770 -/* 80676768 38 60 00 00 */ li r3, 0 -/* 8067676C 48 00 00 54 */ b lbl_806767C0 -lbl_80676770: -/* 80676770 7F C3 F3 78 */ mr r3, r30 -/* 80676774 4B 9C 3A 39 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80676778 7C 7F 1B 78 */ mr r31, r3 -/* 8067677C 7F C3 F3 78 */ mr r3, r30 -/* 80676780 4B 9C 3A 5D */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80676784 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80676788 40 82 00 34 */ bne lbl_806767BC -/* 8067678C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80676790 28 04 00 FF */ cmplwi r4, 0xff -/* 80676794 41 82 00 28 */ beq lbl_806767BC -/* 80676798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067679C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806767A0 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 806767A4 7C 05 07 74 */ extsb r5, r0 -/* 806767A8 4B 9B EB B9 */ bl isSwitch__10dSv_info_cCFii -/* 806767AC 2C 03 00 00 */ cmpwi r3, 0 -/* 806767B0 40 82 00 0C */ bne lbl_806767BC -/* 806767B4 38 60 00 01 */ li r3, 1 -/* 806767B8 48 00 00 08 */ b lbl_806767C0 -lbl_806767BC: -/* 806767BC 38 60 00 00 */ li r3, 0 -lbl_806767C0: -/* 806767C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806767C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 806767C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806767CC 7C 08 03 A6 */ mtlr r0 -/* 806767D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 806767D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontKey__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontKey__12daMBdoorL1_cFv.s deleted file mode 100644 index 9b3e2c8f167..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontKey__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_806764D0: -/* 806764D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806764D4 7C 08 02 A6 */ mflr r0 -/* 806764D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 806764DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806764E0 93 C1 00 08 */ stw r30, 8(r1) -/* 806764E4 7C 7E 1B 78 */ mr r30, r3 -/* 806764E8 4B FF FD BD */ bl checkFront__12daMBdoorL1_cFv -/* 806764EC 2C 03 00 00 */ cmpwi r3, 0 -/* 806764F0 40 82 00 0C */ bne lbl_806764FC -/* 806764F4 38 60 00 00 */ li r3, 0 -/* 806764F8 48 00 00 58 */ b lbl_80676550 -lbl_806764FC: -/* 806764FC 7F C3 F3 78 */ mr r3, r30 -/* 80676500 4B 9C 3C A1 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80676504 7C 7F 1B 78 */ mr r31, r3 -/* 80676508 7F C3 F3 78 */ mr r3, r30 -/* 8067650C 4B 9C 3C C5 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80676510 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80676514 28 00 00 02 */ cmplwi r0, 2 -/* 80676518 40 82 00 34 */ bne lbl_8067654C -/* 8067651C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80676520 28 04 00 FF */ cmplwi r4, 0xff -/* 80676524 41 82 00 28 */ beq lbl_8067654C -/* 80676528 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067652C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676530 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80676534 7C 05 07 74 */ extsb r5, r0 -/* 80676538 4B 9B EE 29 */ bl isSwitch__10dSv_info_cCFii -/* 8067653C 2C 03 00 00 */ cmpwi r3, 0 -/* 80676540 40 82 00 0C */ bne lbl_8067654C -/* 80676544 38 60 00 01 */ li r3, 1 -/* 80676548 48 00 00 08 */ b lbl_80676550 -lbl_8067654C: -/* 8067654C 38 60 00 00 */ li r3, 0 -lbl_80676550: -/* 80676550 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80676554 83 C1 00 08 */ lwz r30, 8(r1) -/* 80676558 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8067655C 7C 08 03 A6 */ mtlr r0 -/* 80676560 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676564 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontStop__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontStop__12daMBdoorL1_cFv.s deleted file mode 100644 index efe540a5340..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontStop__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80676570: -/* 80676570 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676574 7C 08 02 A6 */ mflr r0 -/* 80676578 90 01 00 14 */ stw r0, 0x14(r1) -/* 8067657C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676580 93 C1 00 08 */ stw r30, 8(r1) -/* 80676584 7C 7E 1B 78 */ mr r30, r3 -/* 80676588 4B FF FD 1D */ bl checkFront__12daMBdoorL1_cFv -/* 8067658C 2C 03 00 00 */ cmpwi r3, 0 -/* 80676590 40 82 00 0C */ bne lbl_8067659C -/* 80676594 38 60 00 00 */ li r3, 0 -/* 80676598 48 00 00 60 */ b lbl_806765F8 -lbl_8067659C: -/* 8067659C 7F C3 F3 78 */ mr r3, r30 -/* 806765A0 4B 9C 3C 01 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 806765A4 7C 7F 1B 78 */ mr r31, r3 -/* 806765A8 7F C3 F3 78 */ mr r3, r30 -/* 806765AC 4B 9C 3C 25 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 806765B0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 806765B4 28 00 00 01 */ cmplwi r0, 1 -/* 806765B8 41 82 00 0C */ beq lbl_806765C4 -/* 806765BC 28 00 00 03 */ cmplwi r0, 3 -/* 806765C0 40 82 00 34 */ bne lbl_806765F4 -lbl_806765C4: -/* 806765C4 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 806765C8 28 04 00 FF */ cmplwi r4, 0xff -/* 806765CC 41 82 00 28 */ beq lbl_806765F4 -/* 806765D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806765D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806765D8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 806765DC 7C 05 07 74 */ extsb r5, r0 -/* 806765E0 4B 9B ED 81 */ bl isSwitch__10dSv_info_cCFii -/* 806765E4 2C 03 00 00 */ cmpwi r3, 0 -/* 806765E8 40 82 00 0C */ bne lbl_806765F4 -/* 806765EC 38 60 00 01 */ li r3, 1 -/* 806765F0 48 00 00 08 */ b lbl_806765F8 -lbl_806765F4: -/* 806765F4 38 60 00 00 */ li r3, 0 -lbl_806765F8: -/* 806765F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806765FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80676600 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676604 7C 08 03 A6 */ mtlr r0 -/* 80676608 38 21 00 10 */ addi r1, r1, 0x10 -/* 8067660C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontSw__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontSw__12daMBdoorL1_cFv.s deleted file mode 100644 index 36fef40a87a..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontSw__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_806766B0: -/* 806766B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806766B4 7C 08 02 A6 */ mflr r0 -/* 806766B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 806766BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806766C0 93 C1 00 08 */ stw r30, 8(r1) -/* 806766C4 7C 7E 1B 78 */ mr r30, r3 -/* 806766C8 4B FF FB DD */ bl checkFront__12daMBdoorL1_cFv -/* 806766CC 2C 03 00 00 */ cmpwi r3, 0 -/* 806766D0 40 82 00 0C */ bne lbl_806766DC -/* 806766D4 38 60 00 00 */ li r3, 0 -/* 806766D8 48 00 00 54 */ b lbl_8067672C -lbl_806766DC: -/* 806766DC 7F C3 F3 78 */ mr r3, r30 -/* 806766E0 4B 9C 3A C1 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 806766E4 7C 7F 1B 78 */ mr r31, r3 -/* 806766E8 7F C3 F3 78 */ mr r3, r30 -/* 806766EC 4B 9C 3A E5 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 806766F0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 806766F4 40 82 00 34 */ bne lbl_80676728 -/* 806766F8 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 806766FC 28 04 00 FF */ cmplwi r4, 0xff -/* 80676700 41 82 00 28 */ beq lbl_80676728 -/* 80676704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8067670C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80676710 7C 05 07 74 */ extsb r5, r0 -/* 80676714 4B 9B EC 4D */ bl isSwitch__10dSv_info_cCFii -/* 80676718 2C 03 00 00 */ cmpwi r3, 0 -/* 8067671C 40 82 00 0C */ bne lbl_80676728 -/* 80676720 38 60 00 01 */ li r3, 1 -/* 80676724 48 00 00 08 */ b lbl_8067672C -lbl_80676728: -/* 80676728 38 60 00 00 */ li r3, 0 -lbl_8067672C: -/* 8067672C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80676730 83 C1 00 08 */ lwz r30, 8(r1) -/* 80676734 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676738 7C 08 03 A6 */ mtlr r0 -/* 8067673C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676740 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFront__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFront__12daMBdoorL1_cFv.s deleted file mode 100644 index de8f3266366..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFront__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_806762A4: -/* 806762A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806762A8 7C 08 02 A6 */ mflr r0 -/* 806762AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 806762B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806762B4 93 C1 00 08 */ stw r30, 8(r1) -/* 806762B8 7C 7E 1B 78 */ mr r30, r3 -/* 806762BC 48 00 06 E9 */ bl checkMBossRoom__12daMBdoorL1_cFv -/* 806762C0 2C 03 00 00 */ cmpwi r3, 0 -/* 806762C4 41 82 00 0C */ beq lbl_806762D0 -/* 806762C8 38 60 00 00 */ li r3, 0 -/* 806762CC 48 00 00 24 */ b lbl_806762F0 -lbl_806762D0: -/* 806762D0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 806762D4 7C 1F 07 74 */ extsb r31, r0 -/* 806762D8 7F C3 F3 78 */ mr r3, r30 -/* 806762DC 4B 9C 3E DD */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 806762E0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 806762E4 7C 1F 00 50 */ subf r0, r31, r0 -/* 806762E8 7C 00 00 34 */ cntlzw r0, r0 -/* 806762EC 54 03 D9 7E */ srwi r3, r0, 5 -lbl_806762F0: -/* 806762F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806762F4 83 C1 00 08 */ lwz r30, 8(r1) -/* 806762F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806762FC 7C 08 03 A6 */ mtlr r0 -/* 80676300 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676304 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s deleted file mode 100644 index b945856c246..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_806769A4: -/* 806769A4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 806769A8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 806769AC 7C 00 07 74 */ extsb r0, r0 -/* 806769B0 2C 00 00 33 */ cmpwi r0, 0x33 -/* 806769B4 41 82 00 0C */ beq lbl_806769C0 -/* 806769B8 2C 00 00 34 */ cmpwi r0, 0x34 -/* 806769BC 40 82 00 0C */ bne lbl_806769C8 -lbl_806769C0: -/* 806769C0 38 60 00 01 */ li r3, 1 -/* 806769C4 4E 80 00 20 */ blr -lbl_806769C8: -/* 806769C8 38 60 00 00 */ li r3, 0 -/* 806769CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeKey__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeKey__12daMBdoorL1_cFv.s deleted file mode 100644 index 8d65c03b01f..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeKey__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80676B64: -/* 80676B64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676B68 7C 08 02 A6 */ mflr r0 -/* 80676B6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676B70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676B74 93 C1 00 08 */ stw r30, 8(r1) -/* 80676B78 7C 7E 1B 78 */ mr r30, r3 -/* 80676B7C 4B 9C 36 25 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80676B80 7C 7F 1B 78 */ mr r31, r3 -/* 80676B84 7F C3 F3 78 */ mr r3, r30 -/* 80676B88 4B 9C 36 49 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80676B8C 7C 64 1B 78 */ mr r4, r3 -/* 80676B90 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80676B94 28 00 00 02 */ cmplwi r0, 2 -/* 80676B98 40 82 00 2C */ bne lbl_80676BC4 -/* 80676B9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676BA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676BA4 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80676BA8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80676BAC 7C 05 07 74 */ extsb r5, r0 -/* 80676BB0 4B 9B E7 B1 */ bl isSwitch__10dSv_info_cCFii -/* 80676BB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80676BB8 40 82 00 0C */ bne lbl_80676BC4 -/* 80676BBC 38 60 00 01 */ li r3, 1 -/* 80676BC0 48 00 00 08 */ b lbl_80676BC8 -lbl_80676BC4: -/* 80676BC4 38 60 00 00 */ li r3, 0 -lbl_80676BC8: -/* 80676BC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80676BCC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80676BD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676BD4 7C 08 03 A6 */ mtlr r0 -/* 80676BD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676BDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeStop__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeStop__12daMBdoorL1_cFv.s deleted file mode 100644 index 2b9f45676cc..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeStop__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80676AB4: -/* 80676AB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80676AB8 7C 08 02 A6 */ mflr r0 -/* 80676ABC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80676AC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80676AC4 93 C1 00 08 */ stw r30, 8(r1) -/* 80676AC8 7C 7E 1B 78 */ mr r30, r3 -/* 80676ACC 4B FF F7 D9 */ bl checkFront__12daMBdoorL1_cFv -/* 80676AD0 2C 03 00 00 */ cmpwi r3, 0 -/* 80676AD4 41 82 00 20 */ beq lbl_80676AF4 -/* 80676AD8 7F C3 F3 78 */ mr r3, r30 -/* 80676ADC 4B 9C 36 C5 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c -/* 80676AE0 7C 7F 1B 78 */ mr r31, r3 -/* 80676AE4 7F C3 F3 78 */ mr r3, r30 -/* 80676AE8 4B 9C 36 E9 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 80676AEC 7C 64 1B 78 */ mr r4, r3 -/* 80676AF0 48 00 00 1C */ b lbl_80676B0C -lbl_80676AF4: -/* 80676AF4 7F C3 F3 78 */ mr r3, r30 -/* 80676AF8 4B 9C 36 B5 */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80676AFC 7C 7F 1B 78 */ mr r31, r3 -/* 80676B00 7F C3 F3 78 */ mr r3, r30 -/* 80676B04 4B 9C 36 D9 */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80676B08 7C 64 1B 78 */ mr r4, r3 -lbl_80676B0C: -/* 80676B0C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80676B10 28 00 00 01 */ cmplwi r0, 1 -/* 80676B14 41 82 00 2C */ beq lbl_80676B40 -/* 80676B18 28 00 00 03 */ cmplwi r0, 3 -/* 80676B1C 40 82 00 2C */ bne lbl_80676B48 -/* 80676B20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676B24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676B28 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80676B2C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80676B30 7C 05 07 74 */ extsb r5, r0 -/* 80676B34 4B 9B E8 2D */ bl isSwitch__10dSv_info_cCFii -/* 80676B38 2C 03 00 00 */ cmpwi r3, 0 -/* 80676B3C 40 82 00 0C */ bne lbl_80676B48 -lbl_80676B40: -/* 80676B40 38 60 00 01 */ li r3, 1 -/* 80676B44 48 00 00 08 */ b lbl_80676B4C -lbl_80676B48: -/* 80676B48 38 60 00 00 */ li r3, 0 -lbl_80676B4C: -/* 80676B4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80676B50 83 C1 00 08 */ lwz r30, 8(r1) -/* 80676B54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676B58 7C 08 03 A6 */ mtlr r0 -/* 80676B5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676B60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkStopOpen__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkStopOpen__12daMBdoorL1_cFv.s deleted file mode 100644 index 12e31004a73..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkStopOpen__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_806767D8: -/* 806767D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806767DC 7C 08 02 A6 */ mflr r0 -/* 806767E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 806767E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806767E8 7C 7F 1B 78 */ mr r31, r3 -/* 806767EC 88 03 05 DF */ lbz r0, 0x5df(r3) -/* 806767F0 28 00 00 00 */ cmplwi r0, 0 -/* 806767F4 40 82 00 10 */ bne lbl_80676804 -/* 806767F8 4B 9C 39 D9 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 806767FC 7C 60 1B 78 */ mr r0, r3 -/* 80676800 48 00 00 0C */ b lbl_8067680C -lbl_80676804: -/* 80676804 4B 9C 39 D9 */ bl getSwbit2__13door_param2_cFP10fopAc_ac_c -/* 80676808 7C 60 1B 78 */ mr r0, r3 -lbl_8067680C: -/* 8067680C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676810 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676814 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80676818 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8067681C 7C 05 07 74 */ extsb r5, r0 -/* 80676820 4B 9B EB 41 */ bl isSwitch__10dSv_info_cCFii -/* 80676824 2C 03 00 00 */ cmpwi r3, 0 -/* 80676828 41 82 00 0C */ beq lbl_80676834 -/* 8067682C 38 60 00 01 */ li r3, 1 -/* 80676830 48 00 00 08 */ b lbl_80676838 -lbl_80676834: -/* 80676834 38 60 00 00 */ li r3, 0 -lbl_80676838: -/* 80676838 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067683C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80676840 7C 08 03 A6 */ mtlr r0 -/* 80676844 38 21 00 10 */ addi r1, r1, 0x10 -/* 80676848 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeProc__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeProc__12daMBdoorL1_cFv.s deleted file mode 100644 index 84c19b9dbc4..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeProc__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_806752BC: -/* 806752BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806752C0 7C 08 02 A6 */ mflr r0 -/* 806752C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806752C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806752CC 93 C1 00 08 */ stw r30, 8(r1) -/* 806752D0 7C 7E 1B 78 */ mr r30, r3 -/* 806752D4 80 63 05 88 */ lwz r3, 0x588(r3) -/* 806752D8 4B 99 81 51 */ bl play__14mDoExt_baseAnmFv -/* 806752DC 7C 7F 1B 78 */ mr r31, r3 -/* 806752E0 7F C3 F3 78 */ mr r3, r30 -/* 806752E4 4B FF E3 15 */ bl calcMtx__12daMBdoorL1_cFv -/* 806752E8 7F E3 FB 78 */ mr r3, r31 -/* 806752EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806752F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 806752F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806752F8 7C 08 03 A6 */ mtlr r0 -/* 806752FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80675300 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/create__13dDoor_stop2_cFP12J3DModelData.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/create__13dDoor_stop2_cFP12J3DModelData.s deleted file mode 100644 index 6109d89ba80..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/create__13dDoor_stop2_cFP12J3DModelData.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80672D80: -/* 80672D80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672D84 7C 08 02 A6 */ mflr r0 -/* 80672D88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672D8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80672D90 7C 7F 1B 78 */ mr r31, r3 -/* 80672D94 7C 83 23 78 */ mr r3, r4 -/* 80672D98 3C 80 00 08 */ lis r4, 8 -/* 80672D9C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80672DA0 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80672DA4 4B 9A 1E B1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80672DA8 90 7F 00 00 */ stw r3, 0(r31) -/* 80672DAC 80 7F 00 00 */ lwz r3, 0(r31) -/* 80672DB0 30 03 FF FF */ addic r0, r3, -1 -/* 80672DB4 7C 60 19 10 */ subfe r3, r0, r3 -/* 80672DB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80672DBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672DC0 7C 08 03 A6 */ mtlr r0 -/* 80672DC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672DC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Create__FP10fopAc_ac_c.s deleted file mode 100644 index f285e8dfdc9..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_806774EC: -/* 806774EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806774F0 7C 08 02 A6 */ mflr r0 -/* 806774F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806774F8 4B FF C6 A5 */ bl create__12daMBdoorL1_cFv -/* 806774FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80677500 7C 08 03 A6 */ mtlr r0 -/* 80677504 38 21 00 10 */ addi r1, r1, 0x10 -/* 80677508 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Delete__FP12daMBdoorL1_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Delete__FP12daMBdoorL1_c.s deleted file mode 100644 index bb2a07a253c..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Delete__FP12daMBdoorL1_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_806774C8: -/* 806774C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806774CC 7C 08 02 A6 */ mflr r0 -/* 806774D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 806774D4 4B FF FF 09 */ bl Delete__12daMBdoorL1_cFv -/* 806774D8 38 60 00 01 */ li r3, 1 -/* 806774DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806774E0 7C 08 03 A6 */ mtlr r0 -/* 806774E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 806774E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Draw__FP12daMBdoorL1_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Draw__FP12daMBdoorL1_c.s deleted file mode 100644 index dd07ead4db5..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Draw__FP12daMBdoorL1_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80677484: -/* 80677484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80677488 7C 08 02 A6 */ mflr r0 -/* 8067748C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80677490 4B FF FC C9 */ bl draw__12daMBdoorL1_cFv -/* 80677494 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80677498 7C 08 03 A6 */ mtlr r0 -/* 8067749C 38 21 00 10 */ addi r1, r1, 0x10 -/* 806774A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Execute__FP12daMBdoorL1_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Execute__FP12daMBdoorL1_c.s deleted file mode 100644 index 3d65f6d6c20..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Execute__FP12daMBdoorL1_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_806774A4: -/* 806774A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806774A8 7C 08 02 A6 */ mflr r0 -/* 806774AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 806774B0 4B FF FB A1 */ bl execute__12daMBdoorL1_cFv -/* 806774B4 38 60 00 01 */ li r3, 1 -/* 806774B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806774BC 7C 08 03 A6 */ mtlr r0 -/* 806774C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 806774C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__12daMBdoorL1_cFv.s deleted file mode 100644 index 61f30c6b7de..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80677158: -/* 80677158 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8067715C 7C 08 02 A6 */ mflr r0 -/* 80677160 90 01 00 14 */ stw r0, 0x14(r1) -/* 80677164 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80677168 7C 7F 1B 78 */ mr r31, r3 -/* 8067716C 4B FF BE 19 */ bl getDoorType__12daMBdoorL1_cFv -/* 80677170 2C 03 00 02 */ cmpwi r3, 2 -/* 80677174 41 82 00 20 */ beq lbl_80677194 -/* 80677178 40 80 00 24 */ bge lbl_8067719C -/* 8067717C 2C 03 00 00 */ cmpwi r3, 0 -/* 80677180 40 80 00 08 */ bge lbl_80677188 -/* 80677184 48 00 00 18 */ b lbl_8067719C -lbl_80677188: -/* 80677188 7F E3 FB 78 */ mr r3, r31 -/* 8067718C 48 00 00 29 */ bl draw_sub0__12daMBdoorL1_cFv -/* 80677190 48 00 00 0C */ b lbl_8067719C -lbl_80677194: -/* 80677194 7F E3 FB 78 */ mr r3, r31 -/* 80677198 48 00 01 2D */ bl draw_sub1__12daMBdoorL1_cFv -lbl_8067719C: -/* 8067719C 38 60 00 01 */ li r3, 1 -/* 806771A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806771A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806771A8 7C 08 03 A6 */ mtlr r0 -/* 806771AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 806771B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__13dDoor_stop2_cFP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__13dDoor_stop2_cFP10fopAc_ac_c.s deleted file mode 100644 index ec5277f41f2..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__13dDoor_stop2_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80672DCC: -/* 80672DCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672DD0 7C 08 02 A6 */ mflr r0 -/* 80672DD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672DD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80672DDC 93 C1 00 08 */ stw r30, 8(r1) -/* 80672DE0 7C 7E 1B 78 */ mr r30, r3 -/* 80672DE4 7C 9F 23 78 */ mr r31, r4 -/* 80672DE8 80 03 00 00 */ lwz r0, 0(r3) -/* 80672DEC 28 00 00 00 */ cmplwi r0, 0 -/* 80672DF0 41 82 00 3C */ beq lbl_80672E2C -/* 80672DF4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80672DF8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80672DFC 38 80 00 10 */ li r4, 0x10 -/* 80672E00 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80672E04 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80672E08 4B B3 09 BD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80672E0C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80672E10 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80672E14 80 9E 00 00 */ lwz r4, 0(r30) -/* 80672E18 80 84 00 04 */ lwz r4, 4(r4) -/* 80672E1C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80672E20 4B B3 1F 81 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80672E24 80 7E 00 00 */ lwz r3, 0(r30) -/* 80672E28 4B 99 AE 9D */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80672E2C: -/* 80672E2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80672E30 83 C1 00 08 */ lwz r30, 8(r1) -/* 80672E34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672E38 7C 08 03 A6 */ mtlr r0 -/* 80672E3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672E40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub0__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub0__12daMBdoorL1_cFv.s deleted file mode 100644 index 4c2ee172d93..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub0__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_806771B4: -/* 806771B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806771B8 7C 08 02 A6 */ mflr r0 -/* 806771BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 806771C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806771C4 93 C1 00 08 */ stw r30, 8(r1) -/* 806771C8 7C 7F 1B 78 */ mr r31, r3 -/* 806771CC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806771D0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806771D4 38 80 00 14 */ li r4, 0x14 -/* 806771D8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 806771DC 38 DF 01 0C */ addi r6, r31, 0x10c -/* 806771E0 4B B2 C5 E5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 806771E4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806771E8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806771EC 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 806771F0 80 84 00 04 */ lwz r4, 4(r4) -/* 806771F4 38 BF 01 0C */ addi r5, r31, 0x10c -/* 806771F8 4B B2 DB A9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 806771FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80677200 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80677204 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80677208 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8067720C 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80677210 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80677214 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80677218 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8067721C 80 7F 05 94 */ lwz r3, 0x594(r31) -/* 80677220 28 03 00 00 */ cmplwi r3, 0 -/* 80677224 41 82 00 18 */ beq lbl_8067723C -/* 80677228 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 8067722C 80 84 00 04 */ lwz r4, 4(r4) -/* 80677230 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80677234 38 84 00 58 */ addi r4, r4, 0x58 -/* 80677238 4B 99 64 A1 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -lbl_8067723C: -/* 8067723C 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80677240 80 83 00 04 */ lwz r4, 4(r3) -/* 80677244 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80677248 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8067724C 4B 99 67 81 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80677250 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80677254 4B 99 6A 71 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80677258 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 8067725C 80 63 00 04 */ lwz r3, 4(r3) -/* 80677260 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80677264 80 63 00 00 */ lwz r3, 0(r3) -/* 80677268 38 00 00 00 */ li r0, 0 -/* 8067726C 90 03 00 54 */ stw r0, 0x54(r3) -/* 80677270 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80677274 80 63 00 04 */ lwz r3, 4(r3) -/* 80677278 4B 99 6B 79 */ bl mDoExt_btkAnmRemove__FP12J3DModelData -/* 8067727C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80677280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80677284 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80677288 90 1E 00 48 */ stw r0, 0x48(r30) -/* 8067728C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80677290 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80677294 88 1F 06 00 */ lbz r0, 0x600(r31) -/* 80677298 28 00 00 00 */ cmplwi r0, 0 -/* 8067729C 41 82 00 10 */ beq lbl_806772AC -/* 806772A0 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 806772A4 7F E4 FB 78 */ mr r4, r31 -/* 806772A8 4B FF BB 25 */ bl draw__13dDoor_stop2_cFP10fopAc_ac_c -lbl_806772AC: -/* 806772AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806772B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 806772B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806772B8 7C 08 03 A6 */ mtlr r0 -/* 806772BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 806772C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub1__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub1__12daMBdoorL1_cFv.s deleted file mode 100644 index fcde4972688..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub1__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_806772C4: -/* 806772C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806772C8 7C 08 02 A6 */ mflr r0 -/* 806772CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 806772D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806772D4 93 C1 00 08 */ stw r30, 8(r1) -/* 806772D8 7C 7F 1B 78 */ mr r31, r3 -/* 806772DC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806772E0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806772E4 38 80 00 14 */ li r4, 0x14 -/* 806772E8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 806772EC 38 DF 01 0C */ addi r6, r31, 0x10c -/* 806772F0 4B B2 C4 D5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 806772F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806772F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806772FC 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 80677300 80 84 00 04 */ lwz r4, 4(r4) -/* 80677304 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80677308 4B B2 DA 99 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8067730C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80677310 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80677314 80 9F 05 84 */ lwz r4, 0x584(r31) -/* 80677318 80 84 00 04 */ lwz r4, 4(r4) -/* 8067731C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80677320 4B B2 DA 81 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80677324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80677328 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8067732C 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80677330 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80677334 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80677338 90 1E 00 48 */ stw r0, 0x48(r30) -/* 8067733C 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80677340 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80677344 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80677348 80 83 00 04 */ lwz r4, 4(r3) -/* 8067734C 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80677350 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80677354 4B 99 66 79 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80677358 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 8067735C 4B 99 69 69 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80677360 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80677364 80 83 00 04 */ lwz r4, 4(r3) -/* 80677368 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 8067736C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80677370 4B 99 66 5D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80677374 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80677378 4B 99 69 4D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8067737C 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80677380 80 63 00 04 */ lwz r3, 4(r3) -/* 80677384 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80677388 80 63 00 00 */ lwz r3, 0(r3) -/* 8067738C 38 00 00 00 */ li r0, 0 -/* 80677390 90 03 00 54 */ stw r0, 0x54(r3) -/* 80677394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80677398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8067739C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 806773A0 90 1E 00 48 */ stw r0, 0x48(r30) -/* 806773A4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 806773A8 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 806773AC 88 1F 06 00 */ lbz r0, 0x600(r31) -/* 806773B0 28 00 00 00 */ cmplwi r0, 0 -/* 806773B4 41 82 00 10 */ beq lbl_806773C4 -/* 806773B8 38 7F 05 F8 */ addi r3, r31, 0x5f8 -/* 806773BC 7F E4 FB 78 */ mr r4, r31 -/* 806773C0 4B FF BA 0D */ bl draw__13dDoor_stop2_cFP10fopAc_ac_c -lbl_806773C4: -/* 806773C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806773C8 83 C1 00 08 */ lwz r30, 8(r1) -/* 806773CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806773D0 7C 08 03 A6 */ mtlr r0 -/* 806773D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 806773D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAlwaysArcName__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAlwaysArcName__12daMBdoorL1_cFv.s deleted file mode 100644 index 31b9f559611..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAlwaysArcName__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80672F74: -/* 80672F74 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80672F78 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80672F7C 38 63 01 6B */ addi r3, r3, 0x16b -/* 80672F80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAnmArcName__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAnmArcName__12daMBdoorL1_cFv.s deleted file mode 100644 index 8b29b6011a0..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAnmArcName__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80672E70: -/* 80672E70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672E74 7C 08 02 A6 */ mflr r0 -/* 80672E78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672E7C 48 00 01 09 */ bl getDoorType__12daMBdoorL1_cFv -/* 80672E80 2C 03 00 01 */ cmpwi r3, 1 -/* 80672E84 41 82 00 30 */ beq lbl_80672EB4 -/* 80672E88 40 80 00 10 */ bge lbl_80672E98 -/* 80672E8C 2C 03 00 00 */ cmpwi r3, 0 -/* 80672E90 40 80 00 14 */ bge lbl_80672EA4 -/* 80672E94 48 00 00 38 */ b lbl_80672ECC -lbl_80672E98: -/* 80672E98 2C 03 00 03 */ cmpwi r3, 3 -/* 80672E9C 40 80 00 30 */ bge lbl_80672ECC -/* 80672EA0 48 00 00 24 */ b lbl_80672EC4 -lbl_80672EA4: -/* 80672EA4 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80672EA8 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80672EAC 38 63 01 2E */ addi r3, r3, 0x12e -/* 80672EB0 48 00 00 28 */ b lbl_80672ED8 -lbl_80672EB4: -/* 80672EB4 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80672EB8 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80672EBC 38 63 01 36 */ addi r3, r3, 0x136 -/* 80672EC0 48 00 00 18 */ b lbl_80672ED8 -lbl_80672EC4: -/* 80672EC4 38 60 00 00 */ li r3, 0 -/* 80672EC8 48 00 00 10 */ b lbl_80672ED8 -lbl_80672ECC: -/* 80672ECC 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80672ED0 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80672ED4 38 63 01 36 */ addi r3, r3, 0x136 -lbl_80672ED8: -/* 80672ED8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672EDC 7C 08 03 A6 */ mtlr r0 -/* 80672EE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672EE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBmd__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBmd__12daMBdoorL1_cFv.s deleted file mode 100644 index 00fccee553a..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBmd__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_806730AC: -/* 806730AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806730B0 7C 08 02 A6 */ mflr r0 -/* 806730B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806730B8 4B FF F7 81 */ bl getNowLevel__FP10fopAc_ac_c -/* 806730BC 2C 03 00 0B */ cmpwi r3, 0xb -/* 806730C0 41 82 00 14 */ beq lbl_806730D4 -/* 806730C4 40 80 00 20 */ bge lbl_806730E4 -/* 806730C8 2C 03 00 05 */ cmpwi r3, 5 -/* 806730CC 41 82 00 08 */ beq lbl_806730D4 -/* 806730D0 48 00 00 14 */ b lbl_806730E4 -lbl_806730D4: -/* 806730D4 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 806730D8 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 806730DC 38 63 01 B4 */ addi r3, r3, 0x1b4 -/* 806730E0 48 00 00 10 */ b lbl_806730F0 -lbl_806730E4: -/* 806730E4 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 806730E8 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 806730EC 38 63 01 C5 */ addi r3, r3, 0x1c5 -lbl_806730F0: -/* 806730F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806730F4 7C 08 03 A6 */ mtlr r0 -/* 806730F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 806730FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBtk__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBtk__12daMBdoorL1_cFv.s deleted file mode 100644 index dd3408a5e17..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBtk__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80673100: -/* 80673100 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80673104 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80673108 38 63 01 D9 */ addi r3, r3, 0x1d9 -/* 8067310C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getCloseAnm__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getCloseAnm__12daMBdoorL1_cFv.s deleted file mode 100644 index 08a2cad4ebe..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getCloseAnm__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80673048: -/* 80673048 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8067304C 7C 08 02 A6 */ mflr r0 -/* 80673050 90 01 00 14 */ stw r0, 0x14(r1) -/* 80673054 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80673058 7C 7F 1B 78 */ mr r31, r3 -/* 8067305C 4B FF FF 29 */ bl getDoorType__12daMBdoorL1_cFv -/* 80673060 2C 03 00 01 */ cmpwi r3, 1 -/* 80673064 40 82 00 14 */ bne lbl_80673078 -/* 80673068 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 8067306C 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80673070 38 63 01 90 */ addi r3, r3, 0x190 -/* 80673074 48 00 00 24 */ b lbl_80673098 -lbl_80673078: -/* 80673078 7F E3 FB 78 */ mr r3, r31 -/* 8067307C 4B FF FF 09 */ bl getDoorType__12daMBdoorL1_cFv -/* 80673080 2C 03 00 00 */ cmpwi r3, 0 -/* 80673084 38 60 00 00 */ li r3, 0 -/* 80673088 40 82 00 10 */ bne lbl_80673098 -/* 8067308C 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80673090 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80673094 38 63 01 A2 */ addi r3, r3, 0x1a2 -lbl_80673098: -/* 80673098 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8067309C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806730A0 7C 08 03 A6 */ mtlr r0 -/* 806730A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 806730A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDemoAction__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDemoAction__12daMBdoorL1_cFv.s deleted file mode 100644 index fe5152db76f..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDemoAction__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80673E78: -/* 80673E78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80673E7C 7C 08 02 A6 */ mflr r0 -/* 80673E80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80673E84 7C 64 1B 78 */ mr r4, r3 -/* 80673E88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80673E8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80673E90 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80673E94 80 84 05 E8 */ lwz r4, 0x5e8(r4) -/* 80673E98 3C A0 80 67 */ lis r5, action_table@ha /* 0x80677A88@ha */ -/* 80673E9C 38 A5 7A 88 */ addi r5, r5, action_table@l /* 0x80677A88@l */ -/* 80673EA0 38 C0 00 1A */ li r6, 0x1a -/* 80673EA4 38 E0 00 00 */ li r7, 0 -/* 80673EA8 39 00 00 00 */ li r8, 0 -/* 80673EAC 4B 9D 3F 65 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80673EB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80673EB4 7C 08 03 A6 */ mtlr r0 -/* 80673EB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80673EBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorModelData__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorModelData__12daMBdoorL1_cFv.s deleted file mode 100644 index 8b1af62e0dc..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorModelData__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80673140: -/* 80673140 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80673144 7C 08 02 A6 */ mflr r0 -/* 80673148 90 01 00 14 */ stw r0, 0x14(r1) -/* 8067314C 4B FF FF 61 */ bl getBmd__12daMBdoorL1_cFv -/* 80673150 4B 9B C2 E5 */ bl dComIfG_getStageRes__FPCc -/* 80673154 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80673158 7C 08 03 A6 */ mtlr r0 -/* 8067315C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80673160 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorType__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorType__12daMBdoorL1_cFv.s deleted file mode 100644 index be27cf5b896..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorType__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80672F84: -/* 80672F84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672F88 7C 08 02 A6 */ mflr r0 -/* 80672F8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672F90 4B FF F8 A9 */ bl getNowLevel__FP10fopAc_ac_c -/* 80672F94 2C 03 00 05 */ cmpwi r3, 5 -/* 80672F98 41 82 00 30 */ beq lbl_80672FC8 -/* 80672F9C 40 80 00 18 */ bge lbl_80672FB4 -/* 80672FA0 2C 03 00 03 */ cmpwi r3, 3 -/* 80672FA4 40 80 00 2C */ bge lbl_80672FD0 -/* 80672FA8 2C 03 00 01 */ cmpwi r3, 1 -/* 80672FAC 40 80 00 14 */ bge lbl_80672FC0 -/* 80672FB0 48 00 00 20 */ b lbl_80672FD0 -lbl_80672FB4: -/* 80672FB4 2C 03 00 0B */ cmpwi r3, 0xb -/* 80672FB8 41 82 00 10 */ beq lbl_80672FC8 -/* 80672FBC 48 00 00 14 */ b lbl_80672FD0 -lbl_80672FC0: -/* 80672FC0 38 60 00 00 */ li r3, 0 -/* 80672FC4 48 00 00 10 */ b lbl_80672FD4 -lbl_80672FC8: -/* 80672FC8 38 60 00 02 */ li r3, 2 -/* 80672FCC 48 00 00 08 */ b lbl_80672FD4 -lbl_80672FD0: -/* 80672FD0 38 60 00 01 */ li r3, 1 -lbl_80672FD4: -/* 80672FD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672FD8 7C 08 03 A6 */ mtlr r0 -/* 80672FDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672FE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDzb__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDzb__12daMBdoorL1_cFv.s deleted file mode 100644 index deb0d2714f9..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDzb__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80673110: -/* 80673110 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80673114 7C 08 02 A6 */ mflr r0 -/* 80673118 90 01 00 14 */ stw r0, 0x14(r1) -/* 8067311C 4B FF F7 1D */ bl getNowLevel__FP10fopAc_ac_c -/* 80673120 2C 03 00 05 */ cmpwi r3, 5 -/* 80673124 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80673128 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 8067312C 38 63 01 ED */ addi r3, r3, 0x1ed -/* 80673130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80673134 7C 08 03 A6 */ mtlr r0 -/* 80673138 38 21 00 10 */ addi r1, r1, 0x10 -/* 8067313C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getNowLevel__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getNowLevel__FP10fopAc_ac_c.s deleted file mode 100644 index 162f8a9a1ce..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getNowLevel__FP10fopAc_ac_c.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80672838: -/* 80672838 88 63 04 99 */ lbz r3, 0x499(r3) -/* 8067283C 7C 63 07 74 */ extsb r3, r3 -/* 80672840 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getOpenAnm__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getOpenAnm__12daMBdoorL1_cFv.s deleted file mode 100644 index c0315ad7c1e..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getOpenAnm__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80672FE4: -/* 80672FE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672FE8 7C 08 02 A6 */ mflr r0 -/* 80672FEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672FF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80672FF4 7C 7F 1B 78 */ mr r31, r3 -/* 80672FF8 4B FF FF 8D */ bl getDoorType__12daMBdoorL1_cFv -/* 80672FFC 2C 03 00 01 */ cmpwi r3, 1 -/* 80673000 40 82 00 14 */ bne lbl_80673014 -/* 80673004 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 80673008 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 8067300C 38 63 01 72 */ addi r3, r3, 0x172 -/* 80673010 48 00 00 24 */ b lbl_80673034 -lbl_80673014: -/* 80673014 7F E3 FB 78 */ mr r3, r31 -/* 80673018 4B FF FF 6D */ bl getDoorType__12daMBdoorL1_cFv -/* 8067301C 2C 03 00 00 */ cmpwi r3, 0 -/* 80673020 38 60 00 00 */ li r3, 0 -/* 80673024 40 82 00 10 */ bne lbl_80673034 -/* 80673028 3C 60 80 67 */ lis r3, d_a_door_mbossL1__stringBase0@ha /* 0x80677660@ha */ -/* 8067302C 38 63 76 60 */ addi r3, r3, d_a_door_mbossL1__stringBase0@l /* 0x80677660@l */ -/* 80673030 38 63 01 81 */ addi r3, r3, 0x181 -lbl_80673034: -/* 80673034 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80673038 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8067303C 7C 08 03 A6 */ mtlr r0 -/* 80673040 38 21 00 10 */ addi r1, r1, 0x10 -/* 80673044 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProcKnob__12daMBdoorL1_cFi.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProcKnob__12daMBdoorL1_cFi.s deleted file mode 100644 index e8389f0a730..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProcKnob__12daMBdoorL1_cFi.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80675678: -/* 80675678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8067567C 7C 08 02 A6 */ mflr r0 -/* 80675680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80675684 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80675688 93 C1 00 08 */ stw r30, 8(r1) -/* 8067568C 7C 7E 1B 78 */ mr r30, r3 -/* 80675690 7C 9F 23 78 */ mr r31, r4 -/* 80675694 80 63 05 90 */ lwz r3, 0x590(r3) -/* 80675698 4B 99 7D 91 */ bl play__14mDoExt_baseAnmFv -/* 8067569C 2C 03 00 00 */ cmpwi r3, 0 -/* 806756A0 41 82 00 0C */ beq lbl_806756AC -/* 806756A4 38 60 00 01 */ li r3, 1 -/* 806756A8 48 00 00 74 */ b lbl_8067571C -lbl_806756AC: -/* 806756AC 2C 1F 00 0E */ cmpwi r31, 0xe -/* 806756B0 41 82 00 0C */ beq lbl_806756BC -/* 806756B4 2C 1F 00 0F */ cmpwi r31, 0xf -/* 806756B8 40 82 00 60 */ bne lbl_80675718 -lbl_806756BC: -/* 806756BC 80 7E 05 90 */ lwz r3, 0x590(r30) -/* 806756C0 3C 80 80 67 */ lis r4, lit_5017@ha /* 0x8067760C@ha */ -/* 806756C4 C0 24 76 0C */ lfs f1, lit_5017@l(r4) /* 0x8067760C@l */ -/* 806756C8 4B CB 2D 65 */ bl checkPass__12J3DFrameCtrlFf -/* 806756CC 2C 03 00 00 */ cmpwi r3, 0 -/* 806756D0 41 82 00 48 */ beq lbl_80675718 -/* 806756D4 7F C3 F3 78 */ mr r3, r30 -/* 806756D8 4B 9C 4B 4D */ bl getExitNo__13door_param2_cFP10fopAc_ac_c -/* 806756DC 7C 64 1B 78 */ mr r4, r3 -/* 806756E0 2C 1F 00 0E */ cmpwi r31, 0xe -/* 806756E4 40 82 00 10 */ bne lbl_806756F4 -/* 806756E8 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 806756EC 38 03 00 01 */ addi r0, r3, 1 -/* 806756F0 54 04 06 3E */ clrlwi r4, r0, 0x18 -lbl_806756F4: -/* 806756F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806756F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806756FC 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80675700 38 A0 00 FF */ li r5, 0xff -/* 80675704 38 C0 00 00 */ li r6, 0 -/* 80675708 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8067570C 81 8C 01 7C */ lwz r12, 0x17c(r12) -/* 80675710 7D 89 03 A6 */ mtctr r12 -/* 80675714 4E 80 04 21 */ bctrl -lbl_80675718: -/* 80675718 38 60 00 00 */ li r3, 0 -lbl_8067571C: -/* 8067571C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80675720 83 C1 00 08 */ lwz r30, 8(r1) -/* 80675724 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80675728 7C 08 03 A6 */ mtlr r0 -/* 8067572C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80675730 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProc__13dDoor_stop2_cFP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProc__13dDoor_stop2_cFP10fopAc_ac_c.s deleted file mode 100644 index 599e74b3dc8..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProc__13dDoor_stop2_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80672CD8: -/* 80672CD8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80672CDC 7C 08 02 A6 */ mflr r0 -/* 80672CE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80672CE4 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80672CE8 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80672CEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80672CF0 93 C1 00 08 */ stw r30, 8(r1) -/* 80672CF4 7C 7E 1B 78 */ mr r30, r3 -/* 80672CF8 7C 9F 23 78 */ mr r31, r4 -/* 80672CFC 88 03 00 0B */ lbz r0, 0xb(r3) -/* 80672D00 28 00 00 00 */ cmplwi r0, 0 -/* 80672D04 40 82 00 0C */ bne lbl_80672D10 -/* 80672D08 38 60 00 01 */ li r3, 1 -/* 80672D0C 48 00 00 54 */ b lbl_80672D60 -lbl_80672D10: -/* 80672D10 48 00 01 35 */ bl getHeight__13dDoor_stop2_cFv -/* 80672D14 FF E0 08 90 */ fmr f31, f1 -/* 80672D18 38 7F 05 2C */ addi r3, r31, 0x52c -/* 80672D1C 3C 80 80 67 */ lis r4, lit_3801@ha /* 0x806775AC@ha */ -/* 80672D20 C0 24 75 AC */ lfs f1, lit_3801@l(r4) /* 0x806775AC@l */ -/* 80672D24 3C 80 80 67 */ lis r4, lit_3802@ha /* 0x806775B0@ha */ -/* 80672D28 C0 44 75 B0 */ lfs f2, lit_3802@l(r4) /* 0x806775B0@l */ -/* 80672D2C 4B BF DA 15 */ bl cLib_chaseF__FPfff -/* 80672D30 38 7E 00 04 */ addi r3, r30, 4 -/* 80672D34 FC 20 F8 90 */ fmr f1, f31 -/* 80672D38 C0 5F 05 2C */ lfs f2, 0x52c(r31) -/* 80672D3C 4B BF DA 05 */ bl cLib_chaseF__FPfff -/* 80672D40 2C 03 00 00 */ cmpwi r3, 0 -/* 80672D44 41 82 00 18 */ beq lbl_80672D5C -/* 80672D48 38 00 00 00 */ li r0, 0 -/* 80672D4C 98 1E 00 0B */ stb r0, 0xb(r30) -/* 80672D50 98 1E 00 08 */ stb r0, 8(r30) -/* 80672D54 38 60 00 02 */ li r3, 2 -/* 80672D58 48 00 00 08 */ b lbl_80672D60 -lbl_80672D5C: -/* 80672D5C 38 60 00 00 */ li r3, 0 -lbl_80672D60: -/* 80672D60 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80672D64 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80672D68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80672D6C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80672D70 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80672D74 7C 08 03 A6 */ mtlr r0 -/* 80672D78 38 21 00 20 */ addi r1, r1, 0x20 -/* 80672D7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/searchStop__FPvPv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/searchStop__FPvPv.s deleted file mode 100644 index e397cff834c..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/searchStop__FPvPv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80672844: -/* 80672844 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80672848 7C 08 02 A6 */ mflr r0 -/* 8067284C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80672850 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80672854 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80672858 41 82 00 24 */ beq lbl_8067287C -/* 8067285C 4B 9A 64 85 */ bl fopAc_IsActor__FPv -/* 80672860 2C 03 00 00 */ cmpwi r3, 0 -/* 80672864 41 82 00 18 */ beq lbl_8067287C -/* 80672868 A8 1F 00 0E */ lha r0, 0xe(r31) -/* 8067286C 2C 00 01 60 */ cmpwi r0, 0x160 -/* 80672870 40 82 00 0C */ bne lbl_8067287C -/* 80672874 7F E3 FB 78 */ mr r3, r31 -/* 80672878 48 00 00 08 */ b lbl_80672880 -lbl_8067287C: -/* 8067287C 38 60 00 00 */ li r3, 0 -lbl_80672880: -/* 80672880 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80672884 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80672888 7C 08 03 A6 */ mtlr r0 -/* 8067288C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80672890 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngleQuickly__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngleQuickly__12daMBdoorL1_cFv.s deleted file mode 100644 index e5940a03c62..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngleQuickly__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80675ADC: -/* 80675ADC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80675AE0 7C 08 02 A6 */ mflr r0 -/* 80675AE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80675AE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80675AEC 93 C1 00 08 */ stw r30, 8(r1) -/* 80675AF0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80675AF4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80675AF8 83 E4 5D AC */ lwz r31, 0x5dac(r4) -/* 80675AFC AB C3 04 E6 */ lha r30, 0x4e6(r3) -/* 80675B00 48 00 07 A5 */ bl checkFront__12daMBdoorL1_cFv -/* 80675B04 2C 03 00 00 */ cmpwi r3, 0 -/* 80675B08 41 82 00 0C */ beq lbl_80675B14 -/* 80675B0C 38 1E 7F FF */ addi r0, r30, 0x7fff -/* 80675B10 7C 1E 07 34 */ extsh r30, r0 -lbl_80675B14: -/* 80675B14 B3 DF 06 06 */ sth r30, 0x606(r31) -/* 80675B18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80675B1C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80675B20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80675B24 7C 08 03 A6 */ mtlr r0 -/* 80675B28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80675B2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngle__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngle__12daMBdoorL1_cFv.s deleted file mode 100644 index cdf5e96eff2..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngle__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_806759E4: -/* 806759E4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 806759E8 7C 08 02 A6 */ mflr r0 -/* 806759EC 90 01 00 34 */ stw r0, 0x34(r1) -/* 806759F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 806759F4 4B CE C7 E9 */ bl _savegpr_29 -/* 806759F8 7C 7D 1B 78 */ mr r29, r3 -/* 806759FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80675A00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80675A04 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80675A08 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80675A0C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80675A10 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80675A14 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80675A18 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80675A1C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80675A20 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 80675A24 B0 01 00 08 */ sth r0, 8(r1) -/* 80675A28 A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 80675A2C 88 1D 05 DF */ lbz r0, 0x5df(r29) -/* 80675A30 28 00 00 01 */ cmplwi r0, 1 -/* 80675A34 40 82 00 0C */ bne lbl_80675A40 -/* 80675A38 38 04 7F FF */ addi r0, r4, 0x7fff -/* 80675A3C 7C 04 07 34 */ extsh r4, r0 -lbl_80675A40: -/* 80675A40 38 61 00 08 */ addi r3, r1, 8 -/* 80675A44 7C 84 07 34 */ extsh r4, r4 -/* 80675A48 3B E4 7F FF */ addi r31, r4, 0x7fff -/* 80675A4C 7F E4 07 34 */ extsh r4, r31 -/* 80675A50 38 A0 00 05 */ li r5, 5 -/* 80675A54 38 C0 0B B8 */ li r6, 0xbb8 -/* 80675A58 4B BF AB B1 */ bl cLib_addCalcAngleS2__FPssss -/* 80675A5C 88 1D 05 CD */ lbz r0, 0x5cd(r29) -/* 80675A60 28 00 00 00 */ cmplwi r0, 0 -/* 80675A64 41 82 00 34 */ beq lbl_80675A98 -/* 80675A68 7F C3 F3 78 */ mr r3, r30 -/* 80675A6C 38 81 00 0C */ addi r4, r1, 0xc -/* 80675A70 A8 A1 00 08 */ lha r5, 8(r1) -/* 80675A74 38 C0 00 00 */ li r6, 0 -/* 80675A78 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80675A7C 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80675A80 7D 89 03 A6 */ mtctr r12 -/* 80675A84 4E 80 04 21 */ bctrl -/* 80675A88 88 7D 05 CD */ lbz r3, 0x5cd(r29) -/* 80675A8C 38 03 FF FF */ addi r0, r3, -1 -/* 80675A90 98 1D 05 CD */ stb r0, 0x5cd(r29) -/* 80675A94 48 00 00 2C */ b lbl_80675AC0 -lbl_80675A98: -/* 80675A98 7F C3 F3 78 */ mr r3, r30 -/* 80675A9C 38 81 00 0C */ addi r4, r1, 0xc -/* 80675AA0 7F E5 07 34 */ extsh r5, r31 -/* 80675AA4 38 C0 00 00 */ li r6, 0 -/* 80675AA8 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80675AAC 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80675AB0 7D 89 03 A6 */ mtctr r12 -/* 80675AB4 4E 80 04 21 */ bctrl -/* 80675AB8 38 60 00 01 */ li r3, 1 -/* 80675ABC 48 00 00 08 */ b lbl_80675AC4 -lbl_80675AC0: -/* 80675AC0 38 60 00 00 */ li r3, 0 -lbl_80675AC4: -/* 80675AC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80675AC8 4B CE C7 61 */ bl _restgpr_29 -/* 80675ACC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80675AD0 7C 08 03 A6 */ mtlr r0 -/* 80675AD4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80675AD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setStart__12daMBdoorL1_cFff.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setStart__12daMBdoorL1_cFff.s deleted file mode 100644 index 78a21c07148..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setStart__12daMBdoorL1_cFff.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80675EE4: -/* 80675EE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80675EE8 7C 08 02 A6 */ mflr r0 -/* 80675EEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80675EF0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80675EF4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80675EF8 80 A4 5D AC */ lwz r5, 0x5dac(r4) -/* 80675EFC C0 A3 04 D0 */ lfs f5, 0x4d0(r3) -/* 80675F00 D0 A1 00 08 */ stfs f5, 8(r1) -/* 80675F04 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80675F08 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80675F0C C0 83 04 D8 */ lfs f4, 0x4d8(r3) -/* 80675F10 D0 81 00 10 */ stfs f4, 0x10(r1) -/* 80675F14 A8 63 04 E6 */ lha r3, 0x4e6(r3) -/* 80675F18 38 03 7F FF */ addi r0, r3, 0x7fff -/* 80675F1C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80675F20 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80675F24 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80675F28 7C C3 04 2E */ lfsx f6, r3, r0 -/* 80675F2C EC 62 01 B2 */ fmuls f3, f2, f6 -/* 80675F30 7C 63 02 14 */ add r3, r3, r0 -/* 80675F34 C0 E3 00 04 */ lfs f7, 4(r3) -/* 80675F38 EC 01 01 F2 */ fmuls f0, f1, f7 -/* 80675F3C EC 03 00 28 */ fsubs f0, f3, f0 -/* 80675F40 EC 05 00 2A */ fadds f0, f5, f0 -/* 80675F44 D0 01 00 08 */ stfs f0, 8(r1) -/* 80675F48 EC 42 01 F2 */ fmuls f2, f2, f7 -/* 80675F4C EC 01 01 B2 */ fmuls f0, f1, f6 -/* 80675F50 EC 02 00 2A */ fadds f0, f2, f0 -/* 80675F54 EC 04 00 2A */ fadds f0, f4, f0 -/* 80675F58 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80675F5C 7C A3 2B 78 */ mr r3, r5 -/* 80675F60 38 81 00 08 */ addi r4, r1, 8 -/* 80675F64 A8 A5 04 E6 */ lha r5, 0x4e6(r5) -/* 80675F68 38 C0 00 00 */ li r6, 0 -/* 80675F6C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80675F70 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 80675F74 7D 89 03 A6 */ mtctr r12 -/* 80675F78 4E 80 04 21 */ bctrl -/* 80675F7C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80675F80 7C 08 03 A6 */ mtlr r0 -/* 80675F84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80675F88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/smokeInit2__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/smokeInit2__12daMBdoorL1_cFv.s deleted file mode 100644 index ace2dc7959c..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/smokeInit2__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80676004: -/* 80676004 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80676008 7C 08 02 A6 */ mflr r0 -/* 8067600C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80676010 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80676014 7C 7F 1B 78 */ mr r31, r3 -/* 80676018 4B FF CF 6D */ bl getDoorType__12daMBdoorL1_cFv -/* 8067601C 2C 03 00 01 */ cmpwi r3, 1 -/* 80676020 40 82 00 80 */ bne lbl_806760A0 -/* 80676024 C0 1F 08 20 */ lfs f0, 0x820(r31) -/* 80676028 3C 60 80 67 */ lis r3, lit_5293@ha /* 0x8067764C@ha */ -/* 8067602C C0 23 76 4C */ lfs f1, lit_5293@l(r3) /* 0x8067764C@l */ -/* 80676030 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80676034 D0 1F 08 20 */ stfs f0, 0x820(r31) -/* 80676038 C0 1F 08 2C */ lfs f0, 0x82c(r31) -/* 8067603C EC 00 08 2A */ fadds f0, f0, f1 -/* 80676040 D0 1F 08 2C */ stfs f0, 0x82c(r31) -/* 80676044 38 7F 06 04 */ addi r3, r31, 0x604 -/* 80676048 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8067604C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676050 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80676054 4B A0 0A 59 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80676058 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8067605C 7C 03 07 74 */ extsb r3, r0 -/* 80676060 38 00 00 00 */ li r0, 0 -/* 80676064 90 01 00 08 */ stw r0, 8(r1) -/* 80676068 90 61 00 0C */ stw r3, 0xc(r1) -/* 8067606C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80676070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80676074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80676078 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 8067607C 3C 80 00 01 */ lis r4, 0x0001 /* 0x00008C50@ha */ -/* 80676080 38 84 8C 50 */ addi r4, r4, 0x8C50 /* 0x00008C50@l */ -/* 80676084 38 BF 06 F4 */ addi r5, r31, 0x6f4 -/* 80676088 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 8067608C 38 FF 01 0C */ addi r7, r31, 0x10c -/* 80676090 39 1F 04 E4 */ addi r8, r31, 0x4e4 -/* 80676094 39 20 00 00 */ li r9, 0 -/* 80676098 39 40 00 00 */ li r10, 0 -/* 8067609C 4B 9D 6F CD */ bl setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz -lbl_806760A0: -/* 806760A0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 806760A4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 806760A8 7C 08 03 A6 */ mtlr r0 -/* 806760AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 806760B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlockInit__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlockInit__12daMBdoorL1_cFv.s deleted file mode 100644 index 03f2375d3f3..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlockInit__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_806753CC: -/* 806753CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806753D0 7C 08 02 A6 */ mflr r0 -/* 806753D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 806753D8 80 03 05 F4 */ lwz r0, 0x5f4(r3) -/* 806753DC 90 01 00 08 */ stw r0, 8(r1) -/* 806753E0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 806753E4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 806753E8 38 81 00 08 */ addi r4, r1, 8 -/* 806753EC 4B 9A 44 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 806753F0 28 03 00 00 */ cmplwi r3, 0 -/* 806753F4 41 82 00 0C */ beq lbl_80675400 -/* 806753F8 38 00 00 01 */ li r0, 1 -/* 806753FC 98 03 2C A4 */ stb r0, 0x2ca4(r3) -lbl_80675400: -/* 80675400 38 60 00 01 */ li r3, 1 -/* 80675404 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80675408 7C 08 03 A6 */ mtlr r0 -/* 8067540C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80675410 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlock__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlock__12daMBdoorL1_cFv.s deleted file mode 100644 index 9096dc06282..00000000000 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlock__12daMBdoorL1_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80675414: -/* 80675414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80675418 7C 08 02 A6 */ mflr r0 -/* 8067541C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80675420 80 03 05 F4 */ lwz r0, 0x5f4(r3) -/* 80675424 90 01 00 08 */ stw r0, 8(r1) -/* 80675428 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 8067542C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80675430 38 81 00 08 */ addi r4, r1, 8 -/* 80675434 4B 9A 43 C5 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80675438 28 03 00 00 */ cmplwi r3, 0 -/* 8067543C 41 82 00 10 */ beq lbl_8067544C -/* 80675440 88 03 2C A4 */ lbz r0, 0x2ca4(r3) -/* 80675444 28 00 00 03 */ cmplwi r0, 3 -/* 80675448 41 82 00 0C */ beq lbl_80675454 -lbl_8067544C: -/* 8067544C 28 03 00 00 */ cmplwi r3, 0 -/* 80675450 40 82 00 0C */ bne lbl_8067545C -lbl_80675454: -/* 80675454 38 60 00 01 */ li r3, 1 -/* 80675458 48 00 00 08 */ b lbl_80675460 -lbl_8067545C: -/* 8067545C 38 60 00 00 */ li r3, 0 -lbl_80675460: -/* 80675460 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80675464 7C 08 03 A6 */ mtlr r0 -/* 80675468 38 21 00 10 */ addi r1, r1, 0x10 -/* 8067546C 4E 80 00 20 */ blr diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index d2949e467b6..3523107a77d 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -205,7 +205,7 @@ public: /* 0x130 */ dBgS_RoofChk m_roof; /* 0x180 */ dBgS_WtrChk m_wtr; /* 0x1D4 */ u8 m_wtr_mode; -}; +}; // Size: 0x1D8 class dBgS_LinkAcch : public dBgS_Acch { public: diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index ed41bb54154..c88d73544bf 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -3321,6 +3321,10 @@ inline void dComIfGp_evmng_remove() { g_dComIfG_gameInfo.play.getEvtManager().remove(); } +inline s16 dComIfGp_evmng_getEventIdx(const char* eventName, u8 mapToolID) { + return g_dComIfG_gameInfo.play.getEvtManager().getEventIdx(eventName, mapToolID, -1); +} + inline void dComIfGp_particle_createCommon(const void* data) { g_dComIfG_gameInfo.play.getParticle()->createCommon(data); } diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h index 72702e886c3..56107e32231 100644 --- a/include/d/d_door_param2.h +++ b/include/d/d_door_param2.h @@ -9,15 +9,15 @@ class door_param2_c { public: /* 8003A188 */ static u32 getKind(fopAc_ac_c* i_actor); /* 8003A194 */ static u32 getDoorModel(fopAc_ac_c* i_actor); - /* 8003A1A0 */ static u32 getFrontOption(fopAc_ac_c* i_actor); - /* 8003A1AC */ static u32 getBackOption(fopAc_ac_c* i_actor); + /* 8003A1A0 */ static u8 getFrontOption(fopAc_ac_c* i_actor); + /* 8003A1AC */ static u8 getBackOption(fopAc_ac_c* i_actor); /* 8003A1B8 */ static u32 getFRoomNo(fopAc_ac_c* i_actor); /* 8003A1C4 */ static u32 getBRoomNo(fopAc_ac_c* i_actor); - /* 8003A1D0 */ static u32 getSwbit(fopAc_ac_c* i_actor); - /* 8003A1DC */ static u32 getSwbit2(fopAc_ac_c* i_actor); - /* 8003A1E8 */ static u32 getSwbit3(fopAc_ac_c* i_actor); + /* 8003A1D0 */ static u8 getSwbit(fopAc_ac_c* i_actor); + /* 8003A1DC */ static u8 getSwbit2(fopAc_ac_c* i_actor); + /* 8003A1E8 */ static u8 getSwbit3(fopAc_ac_c* i_actor); /* 8003A1F4 */ static u32 isMsgDoor(fopAc_ac_c* i_actor); - /* 8003A200 */ static u32 getEventNo(fopAc_ac_c* i_actor); + /* 8003A200 */ static u8 getEventNo(fopAc_ac_c* i_actor); /* 8003A20C */ static u32 getEventNo2(fopAc_ac_c* i_actor); /* 8003A218 */ static u16 getMsgNo(fopAc_ac_c* i_actor); /* 8003A224 */ static u8 getExitNo(fopAc_ac_c* i_actor); diff --git a/include/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.h b/include/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.h index 8d0ac68777b..04313f43758 100644 --- a/include/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.h +++ b/include/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.h @@ -2,5 +2,146 @@ #define D_A_DOOR_MBOSSL1_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" + +struct dDoor_stop2_c { + /* 806728B4 */ void calcMtx(fopAc_ac_c*); + /* 80672970 */ void closeInit(fopAc_ac_c*, u8); + /* 80672AE4 */ int closeProc(fopAc_ac_c*); + /* 80672B70 */ void openInit(fopAc_ac_c*, u8); + /* 80672CD8 */ int openProc(fopAc_ac_c*); + /* 80672D80 */ int create(J3DModelData*); + /* 80672DCC */ void draw(fopAc_ac_c*); + /* 80672E44 */ f32 getHeight(); + + /* 0x0 */ J3DModel* mModel; + /* 0x4 */ f32 field_0x4; + /* 0x8 */ u8 field_0x8; + /* 0x9 */ u8 field_0x9; + /* 0xA */ u8 field_0xa; + /* 0xB */ u8 field_0xb; +}; + +struct daMBdoorL1_c : public fopAc_ac_c { + enum DoorType { + DOOR_TYPE_0, + DOOR_TYPE_1, + DOOR_TYPE_2, + }; + + enum ActionType { + ACTION_INIT, + ACTION_START_DEMO, + ACTION_WAIT, + ACTION_CLOSE_WAIT, + ACTION_OPEN, + ACTION_DEMO, + ACTION_STOP_CLOSE, + }; + + typedef int (daMBdoorL1_c::*actionFunc)(); + + /* 80672E70 */ char* getAnmArcName(); + /* 80672EE8 */ char* getArcName(); + /* 80672F74 */ char* getAlwaysArcName(); + /* 80672F84 */ int getDoorType(); + /* 80672FE4 */ char* getOpenAnm(); + /* 80673048 */ char* getCloseAnm(); + /* 806730AC */ char* getBmd(); + /* 80673100 */ char* getBtk(); + /* 80673110 */ char* getDzb(); + /* 80673140 */ J3DModelData* getDoorModelData(); + /* 80673164 */ int CreateHeap(); + /* 806735F8 */ void calcMtx(); + /* 80673790 */ int createKey(); + /* 806738CC */ int CreateInit(); + /* 80673B9C */ int create(); + /* 80673E78 */ int getDemoAction(); + /* 80673EC0 */ void demoProc(); + /* 80674AF4 */ int openInit(); + /* 80674DA4 */ int openProc(); + /* 80674FDC */ int openEnd(); + /* 80675068 */ int closeInit(); + /* 806752BC */ int closeProc(); + /* 80675304 */ int closeEnd(); + /* 806753CC */ int unlockInit(); + /* 80675414 */ int unlock(); + /* 80675470 */ int openInitKnob(int); + /* 80675678 */ int openProcKnob(int); + /* 80675734 */ int openEndKnob(int); + /* 80675894 */ void calcGoal(cXyz*, int); + /* 806759E4 */ int setAngle(); + /* 80675ADC */ void setAngleQuickly(); + /* 80675B30 */ int adjustmentProc(); + /* 80675DB0 */ void setPos(); + /* 80675EE4 */ void setStart(f32, f32); + /* 80676004 */ void smokeInit2(); + /* 806760B4 */ int checkArea(); + /* 806762A4 */ int checkFront(); + /* 80676308 */ int checkOpen(); + /* 806764D0 */ int checkFrontKey(); + /* 80676568 */ int checkBackKey(); + /* 80676570 */ int checkFrontStop(); + /* 80676610 */ int checkBackStop(); + /* 806766B0 */ int checkFrontSw(); + /* 80676744 */ int checkBackSw(); + /* 806767D8 */ int checkStopOpen(); + /* 8067684C */ int startDemoEnd(); + /* 806769A4 */ int checkMBossRoom(); + /* 806769D0 */ int checkStopClose(); + /* 80676AB4 */ int checkMakeStop(); + /* 80676B64 */ int checkMakeKey(); + /* 80676BE0 */ int actionWait(); + /* 80676BE8 */ int actionCloseWait(); + /* 80676DEC */ int actionStopClose(); + /* 80676E40 */ int actionDemo(); + /* 80676EB4 */ int actionOpen(); + /* 80676ED8 */ int actionInit(); + /* 80676FE4 */ int actionStartDemo(); + /* 80677050 */ int execute(); + /* 80677158 */ int draw(); + /* 806771B4 */ void draw_sub0(); + /* 806772C4 */ void draw_sub1(); + /* 806773DC */ int Delete(); + + void setAction(u8 action) { + mAction = action; + } + + /* 0x568 */ request_of_phase_process_class mPhase1; + /* 0x570 */ request_of_phase_process_class mPhase2; + /* 0x578 */ request_of_phase_process_class mPhase3; + /* 0x580 */ J3DModel* mModels[2]; + /* 0x588 */ mDoExt_bckAnm* mBckAnms[2]; + /* 0x590 */ mDoExt_bckAnm* field_0x590; + /* 0x594 */ mDoExt_btkAnm* field_0x594; + /* 0x598 */ dBgW* field_0x598; + /* 0x59C */ Mtx field_0x59c; + /* 0x5CC */ u8 mAction; + /* 0x5CD */ u8 field_0x5cd; + /* 0x5CE */ s16 field_0x5ce; + /* 0x5D0 */ s16 field_0x5d0; + /* 0x5D2 */ s16 field_0x5d2; + /* 0x5D4 */ s16 field_0x5d4[4]; + /* 0x5DC */ u8 field_0x5dc; + /* 0x5DE */ u8 field_0x5dd; + /* 0x5DE */ u8 field_0x5de; + /* 0x5DF */ u8 field_0x5df; + /* 0x5E0 */ u8 field_0x5e0; + /* 0x5E1 */ u8 field_0x5e1; + /* 0x5E4 */ u32 field_0x5e4; + /* 0x5E8 */ u32 field_0x5e8; + /* 0x5EC */ int field_0x5ec; + /* 0x5F0 */ u32 mStopperId; + /* 0x5F4 */ s32 mKeyHoleId; + /* 0x5F8 */ dDoor_stop2_c mDoorStop; + /* 0x604 */ dBgS_ObjAcch field_0x604; + /* 0x81C */ dBgS_AcchCir field_0x7dc; + /* 0x81C */ cXyz field_0x81c; + /* 0x828 */ cXyz field_0x828; +}; #endif /* D_A_DOOR_MBOSSL1_H */ diff --git a/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h b/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h index 358860a5522..27ac093f647 100644 --- a/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h +++ b/include/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h @@ -2,5 +2,47 @@ #define D_A_OBJ_STOPPER_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +struct daObjStopper_c : public fopAc_ac_c { + enum ActionType { + ACTION_WAIT, + ACTION_WAIT_ORDER_EVENT, + ACTION_ORDER_EVENT, + ACTION_EVENT, + ACTION_DEAD, + ACTION_WAIT_CLOSE, + ACTION_CLOSE, + ACTION_CLOSE_INIT, + }; + + /* 80CECF34 */ void initBaseMtx(); + /* 80CED024 */ void setBaseMtx(); + /* 80CED0B8 */ void Create(); + /* 80CED20C */ void CreateHeap(); + /* 80CED258 */ void create(); + /* 80CED6BC */ void Execute(f32 (**)[3][4]); + /* 80CED708 */ void action(); + /* 80CED824 */ void actionWait(); + /* 80CEDA24 */ void actionWaitOrderEvent(); + /* 80CEDAAC */ void actionOrderEvent(); + /* 80CEDB2C */ void actionEvent(); + /* 80CEE048 */ void actionDead(); + /* 80CEE04C */ void actionWaitClose(); + /* 80CEE05C */ void actionCloseInit(); + /* 80CEE0E0 */ void actionClose(); + /* 80CEE148 */ void hint_action1(); + /* 80CEE5D0 */ void hint_action2(); + /* 80CEEA28 */ void hint_action3(); + /* 80CEECFC */ void Draw(); + /* 80CEED60 */ void Delete(); + + void setOpen() { mAction = ACTION_WAIT_CLOSE; } + void setAction(u8 action) { mAction = action; } + void startClose() { setAction(ACTION_CLOSE_INIT); } + + /* 0x568 */ u8 field_0x568[0x93c - 0x568]; + /* 0x93C */ u8 mAction; +}; #endif /* D_A_OBJ_STOPPER_H */ diff --git a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp index fc51d6667d3..b2e74f5bb6d 100644 --- a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp +++ b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp @@ -116,7 +116,7 @@ int daBdoor_c::CreateInit() { attention_info.flags = 0x20; calcMtx(); mpBgW->Move(); - u8 swbit = door_param2_c::getSwbit(this); + u32 swbit = door_param2_c::getSwbit(this); if (!dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))) { mLocked = true; } else { @@ -169,7 +169,7 @@ void daBdoor_c::demoProc() { switch (action) { case 1: // UNLOCK if (mLocked) { - dComIfGs_onSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)); + dComIfGs_onSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)); mpLockAnm->setPlaySpeed(1.0f); } break; diff --git a/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp b/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp index e5f76eefe62..310ea8050db 100644 --- a/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp +++ b/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp @@ -350,7 +350,7 @@ int daBdoorL1_c::CreateInit() { } calcMtx(); field_0x590->Move(); - u8 swBit = door_param2_c::getSwbit(this); + u32 swBit = door_param2_c::getSwbit(this); eventInfo.setArchiveName((char*)getArcName()); if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(this)) == 0) { field_0x59e = dComIfGp_getEventManager().getEventIdx(this, getDoorEventName(), 0xff); @@ -380,7 +380,7 @@ int daBdoorL1_c::create() { current.angle.z = 0; current.angle.x = 0; s32 roomNo = fopAcM_GetRoomNo(this); - u8 swBit = door_param2_c::getSwbit(this); + u32 swBit = door_param2_c::getSwbit(this); if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) { createKey(); } else { @@ -459,12 +459,12 @@ void daBdoorL1_c::demoProc() { field_0x58c->setFrame(0.0f); field_0x58c->setPlaySpeed(1.0f); } - if (dComIfGs_isSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))) { + if (dComIfGs_isSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))) { field_0x59b = 0; } else { field_0x59b = 1; } - dComIfGs_onSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)); + dComIfGs_onSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)); break; case 16: fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_ON, 0); 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 d4757fcb106..8ab9c22a7ae 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 @@ -172,7 +172,7 @@ int daBdoorL5_c::create() { return rv; } s32 roomNo = fopAcM_GetRoomNo(this); - u8 swBit = door_param2_c::getSwbit(this); + u32 swBit = door_param2_c::getSwbit(this); if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) { createKey(); } else { @@ -201,7 +201,7 @@ void daBdoorL5_c::demoProc() { if (dComIfGp_evmng_getIsAddvance(field_0x59c)) { switch (demoAction) { case 1: - if (dComIfGs_isSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)) == 0) { + if (dComIfGs_isSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)) == 0) { player->onPlayerNoDraw(); player->onPlayerShadowNoDraw(); } @@ -333,7 +333,7 @@ int daBdoorL5_c::unlockInit() { 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)); + dComIfGs_onSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)); return 1; } @@ -445,7 +445,7 @@ int daBdoorL5_c::actionCloseWait() { setAction(ACTION_OPEN); } else { if (checkOpen()) { - if (dComIfGs_isSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))) { + if (dComIfGs_isSwitch(door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))) { eventInfo.setEventId(field_0x59a); eventInfo.setMapToolId(field_0x593); } else { diff --git a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp index 98bc33e4498..a7f41015b88 100644 --- a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp @@ -4,298 +4,16 @@ // #include "rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.h" +#include "rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.h" +#include "rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h" +#include "d/d_door_param2.h" +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "f_op/f_op_actor_mng.h" +#include "SSystem/SComponent/c_lib.h" +#include "SSystem/SComponent/c_math.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&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -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 fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct door_param2_c { - /* 8003A1A0 */ void getFrontOption(fopAc_ac_c*); - /* 8003A1AC */ void getBackOption(fopAc_ac_c*); - /* 8003A1B8 */ void getFRoomNo(fopAc_ac_c*); - /* 8003A1D0 */ void getSwbit(fopAc_ac_c*); - /* 8003A1DC */ void getSwbit2(fopAc_ac_c*); - /* 8003A1E8 */ void getSwbit3(fopAc_ac_c*); - /* 8003A200 */ void getEventNo(fopAc_ac_c*); - /* 8003A224 */ void getExitNo(fopAc_ac_c*); - /* 8003A248 */ void getMFLightInf(fopAc_ac_c*); - /* 8003A254 */ void getMBLightInf(fopAc_ac_c*); -}; - -struct daMBdoorL1_c { - /* 80672E70 */ void getAnmArcName(); - /* 80672EE8 */ void getArcName(); - /* 80672F74 */ void getAlwaysArcName(); - /* 80672F84 */ void getDoorType(); - /* 80672FE4 */ void getOpenAnm(); - /* 80673048 */ void getCloseAnm(); - /* 806730AC */ void getBmd(); - /* 80673100 */ void getBtk(); - /* 80673110 */ void getDzb(); - /* 80673140 */ void getDoorModelData(); - /* 80673164 */ void CreateHeap(); - /* 806735F8 */ void calcMtx(); - /* 80673790 */ void createKey(); - /* 806738CC */ void CreateInit(); - /* 80673B9C */ void create(); - /* 80673E78 */ void getDemoAction(); - /* 80673EC0 */ void demoProc(); - /* 80674AF4 */ void openInit(); - /* 80674DA4 */ void openProc(); - /* 80674FDC */ void openEnd(); - /* 80675068 */ void closeInit(); - /* 806752BC */ void closeProc(); - /* 80675304 */ void closeEnd(); - /* 806753CC */ void unlockInit(); - /* 80675414 */ void unlock(); - /* 80675470 */ void openInitKnob(int); - /* 80675678 */ void openProcKnob(int); - /* 80675734 */ void openEndKnob(int); - /* 80675894 */ void calcGoal(cXyz*, int); - /* 806759E4 */ void setAngle(); - /* 80675ADC */ void setAngleQuickly(); - /* 80675B30 */ void adjustmentProc(); - /* 80675DB0 */ void setPos(); - /* 80675EE4 */ void setStart(f32, f32); - /* 80676004 */ void smokeInit2(); - /* 806760B4 */ void checkArea(); - /* 806762A4 */ void checkFront(); - /* 80676308 */ void checkOpen(); - /* 806764D0 */ void checkFrontKey(); - /* 80676568 */ bool checkBackKey(); - /* 80676570 */ void checkFrontStop(); - /* 80676610 */ void checkBackStop(); - /* 806766B0 */ void checkFrontSw(); - /* 80676744 */ void checkBackSw(); - /* 806767D8 */ void checkStopOpen(); - /* 8067684C */ void startDemoEnd(); - /* 806769A4 */ void checkMBossRoom(); - /* 806769D0 */ void checkStopClose(); - /* 80676AB4 */ void checkMakeStop(); - /* 80676B64 */ void checkMakeKey(); - /* 80676BE0 */ bool actionWait(); - /* 80676BE8 */ void actionCloseWait(); - /* 80676DEC */ void actionStopClose(); - /* 80676E40 */ void actionDemo(); - /* 80676EB4 */ void actionOpen(); - /* 80676ED8 */ void actionInit(); - /* 80676FE4 */ void actionStartDemo(); - /* 80677050 */ void execute(); - /* 80677158 */ void draw(); - /* 806771B4 */ void draw_sub0(); - /* 806772C4 */ void draw_sub1(); - /* 806773DC */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_restart_c { - /* 80034F80 */ void setRoom(cXyz const&, s16, s8); -}; - -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); -}; - -struct dPa_levelEcallBack {}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047514 */ void getEventIdx(char const*, u8, s32); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483C4 */ void setGoal(cXyz*); -}; - -struct dDoor_stop2_c { - /* 806728B4 */ void calcMtx(fopAc_ac_c*); - /* 80672970 */ void closeInit(fopAc_ac_c*, u8); - /* 80672AE4 */ void closeProc(fopAc_ac_c*); - /* 80672B70 */ void openInit(fopAc_ac_c*, u8); - /* 80672CD8 */ void openProc(fopAc_ac_c*); - /* 80672D80 */ void create(J3DModelData*); - /* 80672DCC */ void draw(fopAc_ac_c*); - /* 80672E44 */ void getHeight(); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk { - /* 80675F8C */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 80673E08 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_GndChk { - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80673D98 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -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); - /* 8032842C */ void checkPass(f32); - /* 806735B0 */ ~J3DFrameCtrl(); -}; - // // Forward References: // @@ -477,10 +195,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_20(); extern "C" void _savegpr_23(); @@ -492,16 +206,10 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); 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 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80677D38[4]; @@ -510,79 +218,55 @@ extern "C" extern u8 data_80677D38[4]; // /* 80672838-80672844 000078 000C+00 15/15 0/0 0/0 .text getNowLevel__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getNowLevel(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getNowLevel__FP10fopAc_ac_c.s" +static int getNowLevel(fopAc_ac_c* i_this) { + return static_cast(i_this)->subtype; } -#pragma pop /* 80672844-80672894 000084 0050+00 1/1 0/0 0/0 .text searchStop__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void searchStop(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/searchStop__FPvPv.s" +static void* searchStop(void* param_1, void* param_2) { + if (param_1 != NULL && fopAcM_IsActor(param_1) && + fopAcM_GetProfName(param_1) == PROC_Obj_Stopper) + { + return param_1; + } + return NULL; } -#pragma pop /* 80672894-806728B4 0000D4 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_mbossL1/d_a_door_mbossL1/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 806728B4-80672970 0000F4 00BC+00 6/6 0/0 0/0 .text calcMtx__13dDoor_stop2_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop2_c::calcMtx(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/calcMtx__13dDoor_stop2_cFP10fopAc_ac_c.s" +void dDoor_stop2_c::calcMtx(fopAc_ac_c* param_1) { + if (field_0x8 == 0 || mModel == NULL) { + return; + } + cXyz local_18(param_1->current.pos); + mDoMtx_stack_c::transS(local_18.x, local_18.y + field_0x4, local_18.z); + mDoMtx_stack_c::YrotM(param_1->current.angle.y); + if (field_0x9 == 1) { + mDoMtx_stack_c::YrotM(0x7fff); + } + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* ############################################################################################## */ /* 80677558-80677568 000000 000D+03 19/19 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, -}; +SECTION_RODATA static char const l_staff_name[13] = "SHUTTER_DOOR"; COMPILER_STRIP_GATE(0x80677558, &l_staff_name); /* 80677568-80677580 000010 0018+00 1/1 0/0 0/0 .rodata l_door_heap_size */ -SECTION_RODATA static u8 const l_door_heap_size[24] = { - 0x00, 0x00, 0x0A, 0xE0, 0x18, 0x20, 0x11, 0x80, 0x18, 0x20, 0x13, 0x10, - 0x0A, 0xE0, 0x0A, 0xE0, 0x13, 0xA0, 0x18, 0x20, 0x0A, 0xE0, 0x13, 0x10, +SECTION_RODATA static u16 const l_door_heap_size[12] = { + 0x0000, 0x0AE0, 0x1820, 0x1180, 0x1820, 0x1310, + 0x0AE0, 0x0AE0, 0x13A0, 0x1820, 0x0AE0, 0x1310, }; COMPILER_STRIP_GATE(0x80677568, &l_door_heap_size); /* 80677580-80677598 000028 0018+00 1/1 0/0 0/0 .rodata l_stop_heap_size */ -SECTION_RODATA static u8 const l_stop_heap_size[24] = { - 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x15, 0x40, 0x1B, 0xD0, - 0x0E, 0xA0, 0x08, 0x00, 0x0E, 0xB0, 0x08, 0x00, 0x08, 0x00, 0x1B, 0xD0, +SECTION_RODATA static u16 const l_stop_heap_size[12] = { + 0x0000, 0x0000, 0x0800, 0x0000, 0x1540, 0x1BD0, + 0x0EA0, 0x0800, 0x0EB0, 0x0800, 0x0800, 0x1BD0, }; COMPILER_STRIP_GATE(0x80677580, &l_stop_heap_size); @@ -603,23 +287,6 @@ COMPILER_STRIP_GATE(0x8067759C, &lit_3741); SECTION_RODATA static f32 const lit_3742 = -1.0f; COMPILER_STRIP_GATE(0x806775A0, &lit_3742); -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80677660 = "DEFAULT_MBS_SHUTTER_L1_F"; -SECTION_DEAD static char const* const stringBase_80677679 = "DEFAULT_MBS_SHUTTER_L3_F"; -SECTION_DEAD static char const* const stringBase_80677692 = "DEFAULT_MBS_SHUTTER_L7_F"; -SECTION_DEAD static char const* const stringBase_806776AB = "DEFAULT_MBS_SHUTTER_L8_F"; -SECTION_DEAD static char const* const stringBase_806776C4 = "DEFAULT_MBS_SHUTTER_L1_B"; -SECTION_DEAD static char const* const stringBase_806776DD = "DEFAULT_MBS_SHUTTER_L3_B"; -SECTION_DEAD static char const* const stringBase_806776F6 = "DEFAULT_MBS_SHUTTER_L7_B"; -SECTION_DEAD static char const* const stringBase_8067770F = "DEFAULT_MBS_SHUTTER_L8_B"; -SECTION_DEAD static char const* const stringBase_80677728 = "DEFAULT_MBS_KNOB_OPEN_B"; -SECTION_DEAD static char const* const stringBase_80677740 = "DEFAULT_MBS_KNOB_OPEN_F"; -SECTION_DEAD static char const* const stringBase_80677758 = "DEFAULT_MBS_KNOB_NOTOPEN_B"; -SECTION_DEAD static char const* const stringBase_80677773 = "DEFAULT_MBS_KNOB_NOTOPEN_F"; -#pragma pop - /* 80677970-8067797C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -641,47 +308,47 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { /* 80677990-806779BC -00001 002C+00 0/1 0/0 0/0 .data l_door_open_demo */ #pragma push #pragma force_active on -SECTION_DATA static void* l_door_open_demo[11] = { - (void*)NULL, - (void*)&d_a_door_mbossL1__stringBase0, - (void*)&d_a_door_mbossL1__stringBase0, - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x19), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x19), - (void*)NULL, - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x19), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x32), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x4B), - (void*)&d_a_door_mbossL1__stringBase0, - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x32), +SECTION_DATA static char* l_door_open_demo[11] = { + NULL, + "DEFAULT_MBS_SHUTTER_L1_F", + "DEFAULT_MBS_SHUTTER_L1_F", + "DEFAULT_MBS_SHUTTER_L3_F", + "DEFAULT_MBS_SHUTTER_L3_F", + NULL, + "DEFAULT_MBS_SHUTTER_L3_F", + "DEFAULT_MBS_SHUTTER_L7_F", + "DEFAULT_MBS_SHUTTER_L8_F", + "DEFAULT_MBS_SHUTTER_L1_F", + "DEFAULT_MBS_SHUTTER_L7_F", }; #pragma pop /* 806779BC-806779E8 -00001 002C+00 0/1 0/0 0/0 .data l_door_open_demoB */ #pragma push #pragma force_active on -SECTION_DATA static void* l_door_open_demoB[11] = { - (void*)NULL, - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x64), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x64), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x7D), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x7D), - (void*)NULL, - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x7D), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x96), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0xAF), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x64), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x96), +SECTION_DATA static char* l_door_open_demoB[11] = { + NULL, + "DEFAULT_MBS_SHUTTER_L1_B", + "DEFAULT_MBS_SHUTTER_L1_B", + "DEFAULT_MBS_SHUTTER_L3_B", + "DEFAULT_MBS_SHUTTER_L3_B", + NULL, + "DEFAULT_MBS_SHUTTER_L3_B", + "DEFAULT_MBS_SHUTTER_L7_B", + "DEFAULT_MBS_SHUTTER_L8_B", + "DEFAULT_MBS_SHUTTER_L1_B", + "DEFAULT_MBS_SHUTTER_L7_B", }; #pragma pop /* 806779E8-806779F8 -00001 0010+00 0/1 0/0 0/0 .data l_door_open_demoLv5 */ #pragma push #pragma force_active on -SECTION_DATA static void* l_door_open_demoLv5[4] = { - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0xC8), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0xE0), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0xF8), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x113), +SECTION_DATA static char* l_door_open_demoLv5[4] = { + "DEFAULT_MBS_KNOB_OPEN_B", + "DEFAULT_MBS_KNOB_OPEN_F", + "DEFAULT_MBS_KNOB_NOTOPEN_B", + "DEFAULT_MBS_KNOB_NOTOPEN_F", }; #pragma pop @@ -703,6 +370,32 @@ SECTION_DATA static void* lit_3743[12] = { /* 80672970-80672AE4 0001B0 0174+00 3/2 0/0 0/0 .text closeInit__13dDoor_stop2_cFP10fopAc_ac_cUc */ +// Matches with literals +#ifdef NONMATCHING +void dDoor_stop2_c::closeInit(fopAc_ac_c* param_1, u8 param_2) { + field_0x4 = getHeight(); + param_1->speedF = 0.0f; + field_0xb = 1; + if (param_2 != 0) { + switch (getNowLevel(param_1)) { + case 1: + fopAcM_seStart(param_1, Z2SE_OBJ_DOOR_WOOD_BAR_CL, 0); + break; + case 2: + case 4: + case 5: + case 6: + case 7: + case 10: + case 11: + fopAcM_seStart(param_1, Z2SE_OBJ_DOOR_STEEL_BAR_CL, 0); + break; + case 8: + fopAcM_seStart(param_1, Z2SE_OBJ_L8_MBOSS_SHTR_CL, 0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -711,6 +404,7 @@ asm void dDoor_stop2_c::closeInit(fopAc_ac_c* param_0, u8 param_1) { #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeInit__13dDoor_stop2_cFP10fopAc_ac_cUc.s" } #pragma pop +#endif /* ############################################################################################## */ /* 806775A4-806775A8 00004C 0004+00 0/1 0/0 0/0 .rodata @3752 */ @@ -728,14 +422,29 @@ COMPILER_STRIP_GATE(0x806775A8, &lit_3753); #pragma pop /* 80672AE4-80672B70 000324 008C+00 2/2 0/0 0/0 .text closeProc__13dDoor_stop2_cFP10fopAc_ac_c */ +// Matches with literals +#ifdef NONMATCHING +int dDoor_stop2_c::closeProc(fopAc_ac_c* param_1) { + if (field_0xb == 0) { + return 1; + } + cLib_chaseF(¶m_1->speedF, 60.0f, 6.0f); + if (cLib_chaseF(&field_0x4, 0.0f, param_1->speedF)) { + field_0xb = 0; + return 2; + } + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDoor_stop2_c::closeProc(fopAc_ac_c* param_0) { +asm int dDoor_stop2_c::closeProc(fopAc_ac_c* param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeProc__13dDoor_stop2_cFP10fopAc_ac_c.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80677A28-80677A58 -00001 0030+00 1/1 0/0 0/0 .data @3792 */ @@ -755,6 +464,32 @@ SECTION_DATA static void* lit_3792[12] = { }; /* 80672B70-80672CD8 0003B0 0168+00 2/1 0/0 0/0 .text openInit__13dDoor_stop2_cFP10fopAc_ac_cUc */ +// Matches with literals +#ifdef NONMATCHING +void dDoor_stop2_c::openInit(fopAc_ac_c* param_1, u8 param_2) { + field_0x4 = 0; + param_1->speedF = 0.0f; + field_0xb = 1; + if (param_2 != 0) { + switch (getNowLevel(param_1)) { + case 1: + fopAcM_seStart(param_1, Z2SE_OBJ_DOOR_WOOD_BAR_OP, 0); + break; + case 2: + case 4: + case 5: + case 6: + case 7: + case 10: + case 0xb: + fopAcM_seStart(param_1, Z2SE_OBJ_DOOR_STEEL_BAR, 0); + break; + case 8: + fopAcM_seStart(param_1, Z2SE_OBJ_L8_MBOSS_SHTR_OP, 0); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -763,46 +498,42 @@ asm void dDoor_stop2_c::openInit(fopAc_ac_c* param_0, u8 param_1) { #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openInit__13dDoor_stop2_cFP10fopAc_ac_cUc.s" } #pragma pop - -/* ############################################################################################## */ -/* 806775AC-806775B0 000054 0004+00 1/2 0/0 0/0 .rodata @3801 */ -SECTION_RODATA static f32 const lit_3801 = 30.0f; -COMPILER_STRIP_GATE(0x806775AC, &lit_3801); - -/* 806775B0-806775B4 000058 0004+00 1/1 0/0 0/0 .rodata @3802 */ -SECTION_RODATA static f32 const lit_3802 = 4.0f; -COMPILER_STRIP_GATE(0x806775B0, &lit_3802); +#endif /* 80672CD8-80672D80 000518 00A8+00 1/1 0/0 0/0 .text openProc__13dDoor_stop2_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop2_c::openProc(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProc__13dDoor_stop2_cFP10fopAc_ac_c.s" +int dDoor_stop2_c::openProc(fopAc_ac_c* param_1) { + if (field_0xb == 0) { + return 1; + } + f32 height = getHeight(); + cLib_chaseF(¶m_1->speedF, 30.0f, 4.0f); + if (cLib_chaseF(&field_0x4, height, param_1->speedF)) { + field_0xb = 0; + field_0x8 = 0; + return 2; + } else { + return 0; + } } -#pragma pop /* 80672D80-80672DCC 0005C0 004C+00 1/1 0/0 0/0 .text create__13dDoor_stop2_cFP12J3DModelData */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop2_c::create(J3DModelData* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/create__13dDoor_stop2_cFP12J3DModelData.s" +int dDoor_stop2_c::create(J3DModelData* modelData) { + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mModel == NULL) { + return 0; + } + return 1; } -#pragma pop /* 80672DCC-80672E44 00060C 0078+00 2/2 0/0 0/0 .text draw__13dDoor_stop2_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDoor_stop2_c::draw(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__13dDoor_stop2_cFP10fopAc_ac_c.s" +void dDoor_stop2_c::draw(fopAc_ac_c* param_1) { + if (mModel != NULL) { + g_env_light.settingTevStruct(16, ¶m_1->current.pos, ¶m_1->tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, ¶m_1->tevStr); + mDoExt_modelUpdateDL(mModel); + } } -#pragma pop /* ############################################################################################## */ /* 806775B4-806775B8 00005C 0004+00 2/3 0/0 0/0 .rodata @3834 */ @@ -810,32 +541,39 @@ SECTION_RODATA static f32 const lit_3834 = 300.0f; COMPILER_STRIP_GATE(0x806775B4, &lit_3834); /* 80672E44-80672E70 000684 002C+00 2/2 0/0 0/0 .text getHeight__13dDoor_stop2_cFv */ +// Matches with literals +#ifdef NONMATCHING +f32 dDoor_stop2_c::getHeight() { + if (mModel != NULL) { + J3DJoint* root_jnt = mModel->getModelData()->getJointNodePointer(0); + JUT_ASSERT(360, root_jnt != 0); + return root_jnt->getMax()->y; + } + return 300.0f; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDoor_stop2_c::getHeight() { +asm f32 dDoor_stop2_c::getHeight() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getHeight__13dDoor_stop2_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8067778E = "DoorY00"; -SECTION_DEAD static char const* const stringBase_80677796 = "DoorT00"; -#pragma pop +#endif /* 80672E70-80672EE8 0006B0 0078+00 5/5 0/0 0/0 .text getAnmArcName__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getAnmArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAnmArcName__12daMBdoorL1_cFv.s" +char* daMBdoorL1_c::getAnmArcName() { + switch(getDoorType()) { + case 0: + return "DoorY00"; + case 1: + return "DoorT00"; + case 2: + return NULL; + } + return "DoorT00"; } -#pragma pop /* ############################################################################################## */ /* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -865,141 +603,111 @@ SECTION_DATA static void* lit_3859[12] = { }; /* 80672EE8-80672F74 000728 008C+00 4/3 0/0 0/0 .text getArcName__12daMBdoorL1_cFv */ +#ifdef NONMATCHING +char* daMBdoorL1_c::getArcName() { + switch (getNowLevel(this)) { + case 0: + case 1: + case 2: + case 9: + default: + return "L1MBdoor"; + case 3: + case 4: + case 6: + return "L3MBdoor"; + case 5: + case 11: + return "L5MBdoor"; + case 7: + case 10: + return "L8MBdoor"; + case 8: + return "L7MBdoor"; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::getArcName() { +asm char* daMBdoorL1_c::getArcName() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getArcName__12daMBdoorL1_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_806777CB = "static"; -#pragma pop +#endif /* 80672F74-80672F84 0007B4 0010+00 4/4 0/0 0/0 .text getAlwaysArcName__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getAlwaysArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getAlwaysArcName__12daMBdoorL1_cFv.s" +char* daMBdoorL1_c::getAlwaysArcName() { + return "static"; } -#pragma pop /* 80672F84-80672FE4 0007C4 0060+00 15/15 0/0 0/0 .text getDoorType__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getDoorType() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorType__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::getDoorType() { + switch(getNowLevel(this)) { + case 1: + case 2: + return DOOR_TYPE_0; + case 5: + case 11: + return DOOR_TYPE_2; + default: + return DOOR_TYPE_1; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_806777D2 = "oj_DoorOpD.bck"; -SECTION_DEAD static char const* const stringBase_806777E1 = "oj_DoorOpC.bck"; -#pragma pop /* 80672FE4-80673048 000824 0064+00 2/2 0/0 0/0 .text getOpenAnm__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getOpenAnm() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getOpenAnm__12daMBdoorL1_cFv.s" +char* daMBdoorL1_c::getOpenAnm() { + if (getDoorType() == DOOR_TYPE_1) { + return"oj_DoorOpD.bck"; + } + if (getDoorType() == DOOR_TYPE_0) { + return "oj_DoorOpC.bck"; + } + return NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_806777F0 = "oj_DoorCloseD.bck"; -SECTION_DEAD static char const* const stringBase_80677802 = "oj_DoorCloseC.bck"; -#pragma pop /* 80673048-806730AC 000888 0064+00 1/1 0/0 0/0 .text getCloseAnm__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getCloseAnm() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getCloseAnm__12daMBdoorL1_cFv.s" +char* daMBdoorL1_c::getCloseAnm() { + if (getDoorType() == DOOR_TYPE_1) { + return"oj_DoorCloseD.bck"; + } + if (getDoorType() == DOOR_TYPE_0) { + return "oj_DoorCloseC.bck"; + } + return NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80677814 = "door-knob_00.bmd"; -SECTION_DEAD static char const* const stringBase_80677825 = "door-shutter_00.bmd"; -#pragma pop /* 806730AC-80673100 0008EC 0054+00 1/1 0/0 0/0 .text getBmd__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getBmd() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBmd__12daMBdoorL1_cFv.s" +char* daMBdoorL1_c::getBmd() { + switch(getNowLevel(this)) { + case 5: + case 11: + return "door-knob_00.bmd"; + default: + return"door-shutter_00.bmd"; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80677839 = "door-shutter_00.btk"; -#pragma pop /* 80673100-80673110 000940 0010+00 1/1 0/0 0/0 .text getBtk__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getBtk() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getBtk__12daMBdoorL1_cFv.s" +char* daMBdoorL1_c::getBtk() { + return "door-shutter_00.btk"; } -#pragma pop - -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8067784D = "door-shutter.dzb"; -#pragma pop /* 80673110-80673140 000950 0030+00 1/1 0/0 0/0 .text getDzb__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getDzb() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDzb__12daMBdoorL1_cFv.s" +char* daMBdoorL1_c::getDzb() { + if (getNowLevel(this) == 5) { + return "door-shutter.dzb"; + } + return "door-shutter.dzb"; } -#pragma pop /* 80673140-80673164 000980 0024+00 1/1 0/0 0/0 .text getDoorModelData__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getDoorModelData() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDoorModelData__12daMBdoorL1_cFv.s" +J3DModelData* daMBdoorL1_c::getDoorModelData() { + return static_cast(dComIfG_getStageRes(getBmd())); } -#pragma pop /* ############################################################################################## */ /* 806775B8-806775BC 000060 0004+00 0/2 0/0 0/0 .rodata @4033 */ @@ -1051,33 +759,33 @@ SECTION_DEAD static char const* const stringBase_80677953 = "FDoorB.bck"; #pragma pop /* 80677A88-80677AF0 -00001 0068+00 1/1 0/0 0/0 .data action_table$4271 */ -SECTION_DATA static void* action_table[26] = { - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x217), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x21C), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x225), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x22C), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x231), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x239), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x242), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x248), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x253), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x25D), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x263), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x26D), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x271), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x27B), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x285), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x28F), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x299), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x299), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x29A), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2A5), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2B0), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2BB), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2C9), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2D7), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2DE), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2E8), +SECTION_DATA static char* action_table[26] = { + "WAIT", + "SETANGLE", + "UNLOCK", + "OPEN", + "SETGOAL", + "SETGOAL2", + "CLOSE", + "STOP_CLOSE", + "STOP_OPEN", + "SMOKE", + "SMOKE_END", + "END", + "END_CHECK", + "CHG_SCENE", + "OPEN_PULL", + "OPEN_PUSH", + "", + "", + "ADJUSTMENT", + "OPEN_PUSH2", + "OPEN_PULL2", + "SETSTART_PUSH", + "SETSTART_PULL", + "SETPOS", + "LIGHT_ANM", + "INIT", }; /* 80677AF0-80677B58 -00001 0068+00 1/1 0/0 0/0 .data @4679 */ @@ -1141,11 +849,11 @@ SECTION_DATA static void* lit_4678[26] = { }; /* 80677BC0-80677BD0 -00001 0010+00 1/1 0/0 0/0 .data bck_table$4947 */ -SECTION_DATA static void* bck_table[4] = { - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x1FE), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2F3), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x1FE), - (void*)(((char*)&d_a_door_mbossL1__stringBase0) + 0x2F3), +SECTION_DATA static char* bck_table[4] = { + "FDoorA.bck", + "FDoorB.bck", + "FDoorA.bck", + "FDoorB.bck", }; /* 80677BD0-80677BDC -00001 000C+00 0/1 0/0 0/0 .data @5724 */ @@ -1297,20 +1005,102 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { }; /* 80673164-806735B0 0009A4 044C+00 1/1 0/0 0/0 .text CreateHeap__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::CreateHeap() { + int level = getNowLevel(this); + J3DModelData* modelData = getDoorModelData(); + JUT_ASSERT(579. modelData != 0); + if (getDoorType() == DOOR_TYPE_2) { + for (int i = 0; i < 2; i++) { + mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mModels[i] == NULL) { + return 0; + } + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( + getAlwaysArcName(), "FDoorA.bck"); + JUT_ASSERT(597, anm != 0); + mBckAnms[i] = new mDoExt_bckAnm(); + if (mBckAnms[i] == NULL || !mBckAnms[i]->init(anm, 1, 0, 1.0f, 0, -1, false)) { + return 0; + } + mBckAnms[i]->entry(mModels[0]->getModelData()); + mModels[i]->calc(); + } + } else { + int local_38 = 0x11000084; + int local_3c = 0x80000; + if (level == 8) { + local_38 |= 0x200; + local_3c = 0; + } + mModels[0] = mDoExt_J3DModel__create(modelData, local_3c, local_38); + if (mModels[0] == NULL) { + return 0; + } + J3DAnmTransform* anm = + (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); + JUT_ASSERT(628, anm != 0); + mBckAnms[0] = new mDoExt_bckAnm(); + if (mBckAnms[0] == NULL || !mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, false)) { + return 0; + } + mBckAnms[0]->entry(mModels[0]->getModelData()); + mModels[0]->calc(); + } + if (level == 8) { + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); + JUT_ASSERT(646, pbtk != 0); + field_0x594 = new mDoExt_btkAnm(); + if (field_0x594 == NULL || + !field_0x594->init(mModels[0]->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) + { + return 0; + } + } + if (checkMakeStop()) { + J3DModelData* mdl = (J3DModelData*)dComIfG_getStageRes("door-stop.bmd"); + JUT_ASSERT(671, mdl != 0); + if (!mDoorStop.create(mdl)) { + return 0; + } + mDoorStop.field_0x9 = field_0x5df; + mDoorStop.field_0x4 = 300.0f; + mDoorStop.field_0x8 = 1; + mDoorStop.calcMtx(this); + mDoorStop.field_0x8 = 0; + } + calcMtx(); + cXyz cStack_20(-75.0f, 0.0f, 0.0f); + mDoMtx_stack_c::transS(home.pos); + mDoMtx_stack_c::YrotM(home.angle.y); + if (getDoorType() == DOOR_TYPE_2) { + mDoMtx_stack_c::scaleM(1.0f, 1.4f, 1.0f); + } + MTXCopy(mDoMtx_stack_c::get(), field_0x59c); + field_0x598 = new dBgW(); + if (field_0x598 == NULL || field_0x598->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x59c)) { + return 0; + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::CreateHeap() { +asm int daMBdoorL1_c::CreateHeap() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CreateHeap__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 806735B0-806735F8 000DF0 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +asm void __dt__12J3DFrameCtrlFv() { +//asm J3DFrameCtrl::~J3DFrameCtrl() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/__dt__12J3DFrameCtrlFv.s" } @@ -1332,6 +1122,42 @@ COMPILER_STRIP_GATE(0x806775C4, &lit_4084); #pragma pop /* 806735F8-80673790 000E38 0198+00 4/4 0/0 0/0 .text calcMtx__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMBdoorL1_c::calcMtx() { + cXyz cStack_1c(220.0f, 0.0f, 0.0f); + cXyz cStack_28(-220.0f, 0.0f, 0.0f); + switch(getDoorType()) { + case 0: + default: + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(home.angle.y); + if (field_0x5df == 0) { + mDoMtx_stack_c::YrotM(0x7fff); + } + mModels[0]->setBaseTRMtx(mDoMtx_stack_c::get()); + break; + case 1: + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(home.angle.y); + mModels[0]->setBaseTRMtx(mDoMtx_stack_c::get()); + break; + case 2: + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&cStack_1c, &cStack_1c); + mDoMtx_stack_c::multVec(&cStack_28, &cStack_28); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(cStack_1c); + mDoMtx_stack_c::YrotM(home.angle.y); + mModels[0]->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(cStack_28); + mDoMtx_stack_c::YrotM(home.angle.y + 0x7fff); + mModels[1]->setBaseTRMtx(mDoMtx_stack_c::get()); + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1340,6 +1166,7 @@ asm void daMBdoorL1_c::calcMtx() { #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/calcMtx__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 806775C8-806775CC 000070 0004+00 1/1 0/0 0/0 .rodata @4122 */ @@ -1347,14 +1174,40 @@ SECTION_RODATA static f32 const lit_4122 = 35.0f; COMPILER_STRIP_GATE(0x806775C8, &lit_4122); /* 80673790-806738CC 000FD0 013C+00 1/1 0/0 0/0 .text createKey__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::createKey() { + if (mKeyHoleId == 0xffffffff) { + cXyz cStack_1c(current.pos); + current.pos = home.pos; + csXyz cStack_30(0, 0, 0); + cXyz cStack_28; + u8 unaff_r29; + if ((u8)door_param2_c::getFrontOption(this) == 2) { + cStack_28.set(0.0f, 0.0f, 35.0f); + cStack_30.y = 0; + unaff_r29 = (u8)door_param2_c::getFRoomNo(this); + } + mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, &cStack_28, + unaff_r29, &cStack_30, &scale, + 0xffffffff, NULL); + current.pos = cStack_1c; + if (mKeyHoleId == 0xffffffff) { + return 0; + } + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::createKey() { +asm int daMBdoorL1_c::createKey() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/createKey__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 806775CC-806775D0 000074 0004+00 0/1 0/0 0/0 .rodata @4179 */ @@ -1365,30 +1218,140 @@ COMPILER_STRIP_GATE(0x806775CC, &lit_4179); #pragma pop /* 806738CC-80673B9C 00110C 02D0+00 1/1 0/0 0/0 .text CreateInit__12daMBdoorL1_cFv */ +// rodata/data register load order +#ifdef NONMATCHING +int daMBdoorL1_c::CreateInit() { + field_0x81c = home.pos; + field_0x828 = field_0x81c; + field_0x7dc.SetWall(30.0f, 30.0f); + field_0x604.Set(&field_0x81c, &field_0x828, this, 1, &field_0x7dc, fopAcM_GetSpeed_p(this), + NULL, NULL); + shape_angle.z = 0; + shape_angle.x = 0; + current.angle.z = 0; + current.angle.x = 0; + int rt = dComIfG_Bgsp().Regist(field_0x598, this); + JUT_ASSERT(851, rt == 0); + setAction(ACTION_INIT); + attention_info.position.y += 150.0f; + eyePos.y += 150.0f; + attention_info.flags = 0x20; + calcMtx(); + field_0x598->Move(); + eventInfo.setArchiveName(getArcName()); + if (getDoorType() == DOOR_TYPE_2) { + for (int i = 0; i < 4; i++) { + field_0x5d4[i] = + dComIfGp_getEventManager().getEventIdx(this, l_door_open_demoLv5[i], 0xff); + } + } else { + field_0x5de = 0; + if (field_0x5df == 0) { + field_0x5d4[field_0x5de] = dComIfGp_getEventManager().getEventIdx( + this, l_door_open_demo[getNowLevel(this)], 0xff); + } else { + field_0x5d4[field_0x5de] = dComIfGp_getEventManager().getEventIdx( + this, l_door_open_demoB[getNowLevel(this)], 0xff); + } + } + mKeyHoleId = 0xffffffff; + if (checkMakeKey()) { + createKey(); + } + switch(getNowLevel(this)) { + case 2: + if ((u8)door_param2_c::getFRoomNo(this) == 11) { + if (!fopAcM_isSwitch(this, (u8)door_param2_c::getSwbit2(this))) { + mDoorStop.field_0x8 = 1; + mDoorStop.field_0x4 = 0.0f; + mDoorStop.calcMtx(this); + } + } + break; + case 8: + break; + } + u32 lightInf; + if (dComIfGp_roomControl_getStayNo() == (u8)door_param2_c::getFRoomNo(this)) { + lightInf = door_param2_c::getMFLightInf(this); + } else { + lightInf = door_param2_c::getMBLightInf(this); + } + tevStr.field_0x364 = lightInf; + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::CreateInit() { +asm int daMBdoorL1_c::CreateInit() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CreateInit__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 80673B9C-80673D98 0013DC 01FC+00 1/1 0/0 0/0 .text create__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::create() { + fopAcM_SetupActor(this, daMBdoorL1_c); + int rv = dComIfG_resLoad(&mPhase1, getArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + rv = dComIfG_resLoad(&mPhase2, getAlwaysArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + if (getAnmArcName() != NULL) { + rv = dComIfG_resLoad(&mPhase3, getAnmArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + } + if (getNowLevel(this) == 1 && fopAcM_GetRoomNo(this) == 51) { + base_process_class* processClass = fpcM_Search(searchStop, this); + if (processClass == 0) { + return 0; + } + mStopperId = fopAcM_GetID(processClass); + } + if (fopAcM_GetRoomNo(this) == (u8)door_param2_c::getFRoomNo(this)) { + field_0x5df = 0; + } else { + field_0x5df = 1; + } + int heapSize = l_door_heap_size[getNowLevel(this)]; + if (checkMakeStop()) { + heapSize += l_stop_heap_size[getNowLevel(this)]; + } + if (fopAcM_entrySolidHeap(this, CheckCreateHeap, heapSize) == 0) { + return cPhs_ERROR_e; + } + if (CreateInit()) { + return cPhs_COMPLEATE_e; + } else { + return cPhs_ERROR_e; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::create() { +asm int daMBdoorL1_c::create() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/create__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 80673D98-80673E08 0015D8 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() { +asm void __dt__12dBgS_AcchCirFv() { +//asm dBgS_AcchCir::~dBgS_AcchCir() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/__dt__12dBgS_AcchCirFv.s" } @@ -1398,23 +1361,369 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +asm void __dt__12dBgS_ObjAcchFv() { +//asm dBgS_ObjAcch::~dBgS_ObjAcch() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/__dt__12dBgS_ObjAcchFv.s" } #pragma pop /* 80673E78-80673EC0 0016B8 0048+00 1/1 0/0 0/0 .text getDemoAction__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::getDemoAction() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/getDemoAction__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::getDemoAction() { + return dComIfGp_evmng_getMyActIdx(field_0x5e8, action_table, 26, 0, 0); } -#pragma pop /* 80673EC0-80674AF4 001700 0C34+00 6/4 0/0 0/0 .text demoProc__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMBdoorL1_c::demoProc() { + int demoAction = getDemoAction(); + cXyz cStack_20; + daObjStopper_c* stopper = (daObjStopper_c*)fopAcM_SearchByID(mStopperId); + u32 cVar10 = door_param2_c::getSwbit2(this); + bool bVar2 = false; + int level = getNowLevel(this); + if (dComIfGp_evmng_getIsAddvance(field_0x5e8)) { + switch (demoAction) { + case 0: + int* puVar6 = dComIfGp_evmng_getMyIntegerP(field_0x5e8, "Timer"); + if (puVar6 == NULL) { + field_0x5ec = 1; + } else { + field_0x5ec = *puVar6; + } + break; + case 1: + if (level == 5 || level == 11) { + setAngleQuickly(); + if (field_0x5df == 1) { + shape_angle.y += 0x7fff; + } + } else { + field_0x5cd = 5; + } + break; + case 2: + if (checkFrontKey()) { + cVar10 = door_param2_c::getSwbit(this); + } else { + cVar10 = 0xff; + } + if ((u8)cVar10 != 0xff && !fopAcM_isSwitch(this, (u8)cVar10)) + { + unlockInit(); + fopAcM_onSwitch(this, (u8)cVar10); + dComIfGp_setItemKeyNumCount(0xffffffff); + fopAcM_seStart(this, Z2SE_OBJ_DOOR_CHAIN_LOCK_OPEN, 0); + } + break; + case 3: + if (stopper != NULL) { + stopper->setOpen(); + } + openInit(); + break; + case 4: + if (field_0x5df == 1) { + calcGoal(&cStack_20, 1); + } else { + calcGoal(&cStack_20, 0); + } + dComIfGp_evmng_setGoal(&cStack_20); + break; + case 5: + if (field_0x5df == 1) { + calcGoal(&cStack_20, 2); + } else { + calcGoal(&cStack_20, 3); + } + dComIfGp_evmng_setGoal(&cStack_20); + break; + case 6: + closeInit(); + break; + case 7: + if (field_0x5df == 0) { + cVar10 = door_param2_c::getSwbit(this); + } else { + cVar10 = door_param2_c::getSwbit2(this); + } + if ((u8)cVar10 != 0xff && !fopAcM_isSwitch(this, (u8)cVar10)) { + mDoorStop.closeInit(this, 1); + if (level != 1) { + mDoorStop.field_0x8 = 1; + } + } + break; + case 8: + mDoorStop.openInit(this, 1); + break; + case 13: + field_0x5ce = 0; + break; + case 12: + field_0x5ec = 30; + break; + case 18: + field_0x5cd = 10; + break; + case 15: + openInitKnob(0); + break; + case 14: + openInitKnob(1); + break; + case 19: + openInitKnob(2); + break; + case 20: + openInitKnob(3); + break; + case 21: + if (field_0x5df == 0) { + shape_angle.y += 0x7fff; + } + setStart(37.5f, -70.0f); + if (field_0x598->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x598); + } + if (level == 5 || level == 11) { + if (field_0x5df == 0) { + cVar10 = door_param2_c::getSwbit(this); + } else { + cVar10 = door_param2_c::getSwbit2(this); + } + if ((u8)cVar10 != 0xff && !fopAcM_isSwitch(this, (u8)cVar10)) { + mDoorStop.closeInit(this, 0); + mDoorStop.field_0x8 = 1; + } else { + mDoorStop.field_0x8 = 0; + } + } + break; + case 22: + if (field_0x5df == 0) { + shape_angle.y += 0x7fff; + } + setStart(-37.5f, -70.0f); + if (field_0x598->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x598); + } + if (level == 5 || level == 11) { + if (field_0x5df == 0) { + cVar10 = door_param2_c::getSwbit(this); + } else { + cVar10 = door_param2_c::getSwbit2(this); + } + if ((u8)cVar10 != 0xff && !fopAcM_isSwitch(this, (u8)cVar10)) { + mDoorStop.closeInit(this, 0); + mDoorStop.field_0x8 = 1; + } else { + mDoorStop.field_0x8 = 0; + } + } + break; + case 23: + dComIfG_Bgsp().Release(field_0x598); + setPos(); + break; + case 24: + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_ON, 0); + field_0x594->setPlaySpeed(1.0f); + break; + case 25: + if (level == 8) { + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_ON, 0); + field_0x594->setFrame(0.0f); + field_0x594->setPlaySpeed(1.0f); + } + } + } + switch (demoAction) { + case 0: + if (cLib_calcTimer(&field_0x5ec) == 0) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 1: + if (level == 5 || level == 11) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } else if (setAngle()) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 2: + if (unlock()) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 3: + if (openProc()) { + openEnd(); + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 4: + case 5: + dComIfGp_evmng_cutEnd(field_0x5e8); + break; + case 6: + if (closeProc()) { + if (level == 8) { + if (field_0x594->getPlaySpeed() == 0.0f) { + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_OFF, 0); + closeEnd(); + } + field_0x594->setPlaySpeed(-1.0f); + if (field_0x594->play()) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + } else { + closeEnd(); + if (level == 1 && stopper != NULL && !fopAcM_isSwitch(this, (u8)cVar10)) { + stopper->startClose(); + } + dComIfGp_evmng_cutEnd(field_0x5e8); + } + } + break; + case 7: + if (field_0x5df == 0) { + cVar10 = door_param2_c::getSwbit(this); + } else { + cVar10 = door_param2_c::getSwbit2(this); + } + if (((u8)cVar10 != 0xff && fopAcM_isSwitch(this, (u8)cVar10)) || level == 1) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } else { + if (mDoorStop.closeProc(this) == 2) { + daPy_getPlayerActorClass()->changeOriginalDemo(); + daPy_getPlayerActorClass()->changeDemoMode(25, 0, 0, 0); + dComIfGp_evmng_cutEnd(field_0x5e8); + } + mDoorStop.calcMtx(this); + } + break; + case 8: + if (mDoorStop.openProc(this) == 2) { + mDoorStop.field_0x8 = 0; + dComIfGp_evmng_cutEnd(field_0x5e8); + } + mDoorStop.calcMtx(this); + break; + case 9: + dComIfGp_evmng_cutEnd(field_0x5e8); + break; + case 11: + case 17: + break; + case 12: + if (field_0x5df == 0) { + cVar10 = door_param2_c::getSwbit(this); + } else { + cVar10 = door_param2_c::getSwbit2(this); + } + if ((u8)cVar10 != 0xff && !fopAcM_isSwitch(this, (u8)cVar10)) { + if (cLib_calcTimer(&field_0x5ec) == 0) { + bVar2 = true; + } + } else { + bVar2 = true; + } + if (bVar2) { + startDemoEnd(); + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 13: + if (field_0x5ce == 0) { + daPy_py_c* player = daPy_getPlayerActorClass(); + player->onSceneChangeArea(door_param2_c::getExitNo(this), 0xff, 0); + } + field_0x5ce--; + break; + case 18: + if (adjustmentProc()) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 14: + case 15: + openProcKnob(demoAction); + break; + case 19: + case 20: + if (level == 5 || level == 11) { + switch(field_0x5e0) { + case 0: + if (openProcKnob(demoAction)) { + shape_angle.y = current.angle.y; + openEndKnob(0); + if (field_0x5df == 1) { + cVar10 = door_param2_c::getSwbit2(this); + } else { + cVar10 = door_param2_c::getSwbit(this); + } + if ((u8)cVar10 != 0xff && !fopAcM_isSwitch(this, (u8)cVar10)) { + field_0x5ec = 15; + field_0x5e0 = 1; + } else { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + } + break; + case 1: + if (cLib_calcTimer(&field_0x5ec) == 0) { + field_0x5e0 = 3; + mDoorStop.closeInit(this, 1); + } + break; + case 3: + if (mDoorStop.closeProc(this) == 2) { + daPy_getPlayerActorClass()->changeOriginalDemo(); + daPy_getPlayerActorClass()->changeDemoMode(25, 0, 0, 0); + field_0x5ec = 15; + field_0x5e0 = 4; + } + mDoorStop.calcMtx(this); + break; + case 4: + if (cLib_calcTimer(&field_0x5ec) == 0) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 100: + dComIfGp_evmng_cutEnd(field_0x5e8); + break; + } + } else { + if (openProcKnob(demoAction)) { + shape_angle.y = current.angle.y; + openEndKnob(0); + dComIfGp_evmng_cutEnd(field_0x5e8); + } + } + break; + case 24: + if (field_0x594->play()) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + case 25: + if (level == 8) { + if (field_0x594->play()) { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + } else { + dComIfGp_evmng_cutEnd(field_0x5e8); + } + break; + default: + dComIfGp_evmng_cutEnd(field_0x5e8); + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1423,6 +1732,7 @@ asm void daMBdoorL1_c::demoProc() { #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/demoProc__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 806775D0-806775D4 000078 0004+00 0/0 0/0 0/0 .rodata @4675 */ @@ -1449,11 +1759,9 @@ COMPILER_STRIP_GATE(0x806775D8, &lit_4677); /* 806775DC-806775E0 000084 0004+00 0/1 0/0 0/0 .rodata l_eff_id$4696 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_eff_id[4] = { - 0x82, - 0x95, - 0x82, - 0x96, +SECTION_RODATA static u16 const l_eff_id[2] = { + 0x8295, + 0x8296, }; COMPILER_STRIP_GATE(0x806775DC, &l_eff_id); #pragma pop @@ -1461,20 +1769,12 @@ COMPILER_STRIP_GATE(0x806775DC, &l_eff_id); /* 806775E0-806775EC 000088 000A+02 0/1 0/0 0/0 .rodata l_eff_id_lv3$4705 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_eff_id_lv3[10 + 2 /* padding */] = { - 0x87, - 0x62, - 0x87, - 0x63, - 0x87, - 0x64, - 0x87, - 0x65, - 0x87, - 0x66, - /* padding */ - 0x00, - 0x00, +SECTION_RODATA static u16 const l_eff_id_lv3[5] = { + 0x8762, + 0x8763, + 0x8764, + 0x8765, + 0x8766, }; COMPILER_STRIP_GATE(0x806775E0, &l_eff_id_lv3); #pragma pop @@ -1482,33 +1782,82 @@ COMPILER_STRIP_GATE(0x806775E0, &l_eff_id_lv3); /* 806775EC-806775F8 000094 000A+02 0/1 0/0 0/0 .rodata l_eff_id_lv4$4706 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_eff_id_lv4[10 + 2 /* padding */] = { - 0x8A, - 0xEB, - 0x8A, - 0xEC, - 0x8A, - 0xED, - 0x8A, - 0xEE, - 0x8A, - 0xEF, - /* padding */ - 0x00, - 0x00, +SECTION_RODATA static u16 const l_eff_id_lv4[5] = { + 0x8AEB, + 0x8AEC, + 0x8AED, + 0x8AEE, + 0x8AEF, }; COMPILER_STRIP_GATE(0x806775EC, &l_eff_id_lv4); #pragma pop /* 80674AF4-80674DA4 002334 02B0+00 1/1 0/0 0/0 .text openInit__12daMBdoorL1_cFv */ +// regalloc +#ifdef NONMATCHING +int daMBdoorL1_c::openInit() { + if (field_0x598->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x598); + } + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); + JUT_ASSERT(1550, anm != 0); + int rt = mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(1552, rt == 0); + int level = getNowLevel(this); + u8 swBit3 = door_param2_c::getSwbit3(this); + if (swBit3 != 0xff && !fopAcM_isSwitch(this, swBit3)) { + csXyz acStack_3c(0, home.angle.y, 0); + if (field_0x5df == 1) { + acStack_3c.y += 0x7fff; + } + if (getDoorType() == 0) { + for (int i = 0; i < 2; i++) { + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_set( + l_eff_id[i], + ¤t.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL); + } + } else { + if (getDoorType() == 1) { + for (u32 k = 0; k < 5; k++) { + switch (level) { + case 4: { + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_set( + l_eff_id_lv4[k], + ¤t.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL); + break; + } + default: { + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_set( + l_eff_id_lv3[k], + ¤t.pos, &acStack_3c, 0, 0xff, 0, roomNo, NULL, NULL, NULL); + break; + } + } + } + } + } + if (fopAcM_checkStatus(this, 0x1000)) { + fopAcM_onSwitch(this, swBit3); + } + field_0x5e1 = 1; + } else { + field_0x5e1 = 0; + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::openInit() { +asm int daMBdoorL1_c::openInit() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openInit__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 806775F8-806775FC 0000A0 0004+00 0/1 0/0 0/0 .rodata @4829 */ @@ -1533,24 +1882,75 @@ COMPILER_STRIP_GATE(0x80677600, &lit_4831); #pragma pop /* 80674DA4-80674FDC 0025E4 0238+00 1/1 0/0 0/0 .text openProc__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::openProc() { + int rv = mBckAnms[0]->play(); + if (getDoorType() == DOOR_TYPE_0) { + if (mBckAnms[0]->getFrame() == 17.0f) { + dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f)); + } + } else { + if (getDoorType() == DOOR_TYPE_1 && mBckAnms[0]->getFrame() == 17.0f) { + switch(getNowLevel(this)) { + case 3: + case 4: + case 6: + dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f)); + break; + } + } + } + if (getDoorType() == DOOR_TYPE_0) { + if (mBckAnms[0]->getFrame() == 18.0f) { + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + } else { + + if (getDoorType() == DOOR_TYPE_1 && mBckAnms[0]->getFrame() == 20.0f) { + u32 sfxId; + if (getNowLevel(this) == 8) { + sfxId = Z2SE_OBJ_L8_SHTR_OP; + } else { + sfxId = field_0x5e1 != 0 ? Z2SE_OBJ_LV3_SHTR_OP_FX : Z2SE_OBJ_LV3_SHTR_OP; + } + fopAcM_seStart(this, sfxId, 0); + } + } + calcMtx(); + return rv; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::openProc() { +asm int daMBdoorL1_c::openProc() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProc__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 80674FDC-80675068 00281C 008C+00 1/1 0/0 0/0 .text openEnd__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::openEnd() { + if (getDoorType() == DOOR_TYPE_0) { + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_OPEN_STOP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::openEnd() { +asm int daMBdoorL1_c::openEnd() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openEnd__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80677604-80677608 0000AC 0004+00 0/1 0/0 0/0 .rodata @4901 */ @@ -1561,54 +1961,89 @@ COMPILER_STRIP_GATE(0x80677604, &lit_4901); #pragma pop /* 80675068-806752BC 0028A8 0254+00 1/1 0/0 0/0 .text closeInit__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::closeInit() { + if (getDoorType() == 0) { + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } else if (getDoorType() == 1) { + cXyz acStack_48(home.pos.x, home.pos.y + 200.0f, + home.pos.z); + bool waterCheck = fopAcM_wt_c::waterCheck(&acStack_48); + fopAcM_gc_c::gndCheck(&acStack_48); + if (waterCheck && fopAcM_wt_c::getWaterY() > fopAcM_gc_c::getGroundY()) { + fopAcM_seStart(this, Z2SE_OBJ_LV3_SHTR_CL_WTR, 0); + } + else if (getNowLevel(this) == 8) { + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CL, 0); + } else { + fopAcM_seStart(this, Z2SE_OBJ_LV3_SHTR_CL, 0); + } + smokeInit2(); + } + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm()); + JUT_ASSERT(1762, anm != 0); + int rt = mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(1764, rt != 0); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::closeInit() { +asm int daMBdoorL1_c::closeInit() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeInit__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 806752BC-80675304 002AFC 0048+00 1/1 0/0 0/0 .text closeProc__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::closeProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeProc__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::closeProc() { + int rv = mBckAnms[0]->play(); + calcMtx(); + return rv; } -#pragma pop /* 80675304-806753CC 002B44 00C8+00 1/1 0/0 0/0 .text closeEnd__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::closeEnd() { + ; + dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f)); + if (getDoorType() == DOOR_TYPE_0) { + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_CLOSE_STOP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::closeEnd() { +asm int daMBdoorL1_c::closeEnd() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/closeEnd__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 806753CC-80675414 002C0C 0048+00 1/1 0/0 0/0 .text unlockInit__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::unlockInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlockInit__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::unlockInit() { + obj_keyhole_class* keyHole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId); + if (keyHole != NULL) { + keyHole->setOpen(); + } + return 1; } -#pragma pop /* 80675414-80675470 002C54 005C+00 1/1 0/0 0/0 .text unlock__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::unlock() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/unlock__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::unlock() { + obj_keyhole_class* keyHole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId); + if ((keyHole != NULL && keyHole->checkOpenEnd()) || keyHole == NULL) { + return 1; + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 80677608-8067760C 0000B0 0004+00 0/1 0/0 0/0 .rodata @5000 */ @@ -1619,29 +2054,57 @@ COMPILER_STRIP_GATE(0x80677608, &lit_5000); #pragma pop /* 80675470-80675678 002CB0 0208+00 1/1 0/0 0/0 .text openInitKnob__12daMBdoorL1_cFi */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::openInitKnob(int param_1) { + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( + getAlwaysArcName(), bck_table[param_1]); + JUT_ASSERT(1847, anm != 0); + if ((field_0x5df == 0 && param_1 == 0) || (field_0x5df == 1 && param_1 == 2)) { + field_0x590 = mBckAnms[0]; + } else if ((field_0x5df == 1 && param_1 == 0) || (field_0x5df == 0 && param_1 == 2)) { + field_0x590 = mBckAnms[1]; + } else if ((field_0x5df == 0 && param_1 == 1) || (field_0x5df == 1 && param_1 == 3)) { + field_0x590 = mBckAnms[1]; + } else if ((field_0x5df == 1 && param_1 == 1) || (field_0x5df == 0 && param_1 == 3)) { + field_0x590 = mBckAnms[0]; + } + int rt = field_0x590->init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(1901, rt != 0); + if (param_1 >= 2) { + field_0x590->setFrame(38.0f); + fopAcM_seStart(this, Z2SE_OBJ_KNOB_DOOR_CLOSE, 0); + } else { + dComIfG_Bgsp().Release(field_0x598); + fopAcM_seStart(this, Z2SE_OBJ_KNOB_DOOR_OPEN, 0); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::openInitKnob(int param_0) { +asm int daMBdoorL1_c::openInitKnob(int param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openInitKnob__12daMBdoorL1_cFi.s" } #pragma pop - -/* ############################################################################################## */ -/* 8067760C-80677610 0000B4 0004+00 1/1 0/0 0/0 .rodata @5017 */ -SECTION_RODATA static f32 const lit_5017 = 15.0f; -COMPILER_STRIP_GATE(0x8067760C, &lit_5017); +#endif /* 80675678-80675734 002EB8 00BC+00 1/1 0/0 0/0 .text openProcKnob__12daMBdoorL1_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::openProcKnob(int param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openProcKnob__12daMBdoorL1_cFi.s" +int daMBdoorL1_c::openProcKnob(int param_1) { + if (field_0x590->play()) { + return 1; + } + if ((param_1 == 0xe || param_1 == 0xf) && field_0x590->checkFrame(15.0f)) { + u8 bVar4 = door_param2_c::getExitNo(this); + if (param_1 == 0xe) { + bVar4++; + } + daPy_getPlayerActorClass()->onSceneChangeArea(bVar4, 0xff, 0); + } + return 0; } -#pragma pop /* ############################################################################################## */ /* 80677610-80677614 0000B8 0004+00 0/2 0/0 0/0 .rodata @5069 */ @@ -1659,14 +2122,40 @@ COMPILER_STRIP_GATE(0x80677614, &lit_5070); #pragma pop /* 80675734-80675894 002F74 0160+00 1/1 0/0 0/0 .text openEndKnob__12daMBdoorL1_cFi */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::openEndKnob(int param_1) { + if (field_0x598 != NULL && !field_0x598->ChkUsed()) { + int rt = dComIfG_Bgsp().Regist(field_0x598, this); + JUT_ASSERT(1978, !rt); + } + cXyz local_70(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y)); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz dist = player->current.pos - current.pos; + f32 dVar11 = dist.inprodXZ(local_70); + f32 fVar1 = dVar11 < 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 sVar6; + if (dVar11 > 0.0f) { + sVar6 = current.angle.y; + } else { + sVar6 = current.angle.y + 0x8000; + } + dComIfGs_setRestartRoom(cStack_88, sVar6, roomNo); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::openEndKnob(int param_0) { +asm int daMBdoorL1_c::openEndKnob(int param_0) { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/openEndKnob__12daMBdoorL1_cFi.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80677618-8067761C 0000C0 0004+00 0/1 0/0 0/0 .rodata @5096 */ @@ -1705,6 +2194,36 @@ COMPILER_STRIP_GATE(0x80677628, &lit_5100); #pragma pop /* 80675894-806759E4 0030D4 0150+00 1/1 0/0 0/0 .text calcGoal__12daMBdoorL1_cFP4cXyzi */ +// Matches with literals +#ifdef NONMATCHING +void daMBdoorL1_c::calcGoal(cXyz* param_1, int param_2) { + cXyz dist = dComIfGp_getPlayer(0)->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&dist, &dist); + dist.x = dist.x * 0.5f; + dist.y = 0.0f; + switch(param_2) { + case 0: + dist.z = -1000.0f; + break; + case 1: + dist.z = 1000.0f; + break; + case 2: + dist.z = -240.0f; + break; + case 3: + dist.z = 240.0; + break; + } + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::multVec(&dist, &dist); + param_1->x = dist.x; + param_1->y = 0.0f; + param_1->z = dist.z; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1713,27 +2232,39 @@ asm void daMBdoorL1_c::calcGoal(cXyz* param_0, int param_1) { #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/calcGoal__12daMBdoorL1_cFP4cXyzi.s" } #pragma pop +#endif /* 806759E4-80675ADC 003224 00F8+00 1/1 0/0 0/0 .text setAngle__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::setAngle() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngle__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::setAngle() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz playerPos; + playerPos = player->current.pos; + s16 playerAngle = player->shape_angle.y; + s16 doorAngle = shape_angle.y; + if (field_0x5df == 1) { + doorAngle += 0x7fff; + } + cLib_addCalcAngleS2(&playerAngle, doorAngle + 0x7fff, 5, 3000); + if (field_0x5cd != 0) { + player->setPlayerPosAndAngle(&playerPos, playerAngle, 0); + field_0x5cd--; + } else { + player->setPlayerPosAndAngle(&playerPos, doorAngle + 0x7fff, 0); + return 1; + } + return 0; } -#pragma pop /* 80675ADC-80675B30 00331C 0054+00 1/1 0/0 0/0 .text setAngleQuickly__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::setAngleQuickly() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setAngleQuickly__12daMBdoorL1_cFv.s" +void daMBdoorL1_c::setAngleQuickly() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + s16 doorAngle = shape_angle.y; + if (checkFront()) { + doorAngle += 0x7fff; + } + player->changeDemoMoveAngle(doorAngle); } -#pragma pop /* ############################################################################################## */ /* 8067762C-80677630 0000D4 0004+00 0/1 0/0 0/0 .rodata @5195 */ @@ -1765,14 +2296,67 @@ COMPILER_STRIP_GATE(0x80677638, &lit_5198); #pragma pop /* 80675B30-80675DB0 003370 0280+00 1/1 0/0 0/0 .text adjustmentProc__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::adjustmentProc() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz local_24; + cXyz local_30; + local_30 = player->current.pos; + local_24.y = 0.0f; + if (field_0x5df == 0) { + if (getDoorType() == DOOR_TYPE_2) { + if (field_0x5de == 0 || field_0x5de == 2) { + local_24.x = 75.0f; + } else { + local_24.x = -75.0f; + } + } else { + cXyz local_3c = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-shape_angle.y); + mDoMtx_stack_c::multVec(&local_3c, &local_3c); + local_24.x = local_3c.x; + } + local_24.z = 70.0f; + } else { + if (getDoorType() == DOOR_TYPE_2) { + if (field_0x5de == 0 || field_0x5de == 2) { + local_24.x = -75.0f; + } else { + local_24.x = 75.0f; + } + } else { + cXyz local_48 =player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-shape_angle.y); + mDoMtx_stack_c::multVec(&local_48, &local_48); + local_24.x = local_48.x; + } + local_24.z = -70.0f; + } + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&local_24, &local_24); + local_24 += current.pos; + if (field_0x5cd != 0) { + local_30.x = local_30.x * 0.8f + local_24.x * 0.2f; + local_30.z = local_30.z * 0.8f + local_24.z * 0.2f; + player->setPlayerPosAndAngle(&local_30, player->current.angle.y, 0); + field_0x5cd--; + } else { + player->setPlayerPosAndAngle(&local_24, player->current.angle.y, 0); + return 1; + } + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::adjustmentProc() { +asm int daMBdoorL1_c::adjustmentProc() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/adjustmentProc__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8067763C-80677640 0000E4 0004+00 0/1 0/0 0/0 .rodata @5229 */ @@ -1790,6 +2374,33 @@ COMPILER_STRIP_GATE(0x80677640, &lit_5230); #pragma pop /* 80675DB0-80675EE4 0035F0 0134+00 1/1 0/0 0/0 .text setPos__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daMBdoorL1_c::setPos() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz local_1c; + local_1c.y = 0.0f; + cXyz dist = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-shape_angle.y); + mDoMtx_stack_c::multVec(&dist, &dist); + local_1c.x = dist.x; + if (dist.x > 100.0f) { + local_1c.x = 100.0f; + } + if (local_1c.x < -100.0f) { + local_1c.x = -100.0f; + } + if (field_0x5df == 0) { + local_1c.z = 70.0f; + } else { + local_1c.z = -70.0f; + } + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&local_1c, &local_1c); + local_1c += current.pos; + dComIfGp_evmng_setGoal(&local_1c); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1798,22 +2409,24 @@ asm void daMBdoorL1_c::setPos() { #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setPos__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 80675EE4-80675F8C 003724 00A8+00 1/1 0/0 0/0 .text setStart__12daMBdoorL1_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::setStart(f32 param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/setStart__12daMBdoorL1_cFff.s" +void daMBdoorL1_c::setStart(f32 param_1, f32 param_2) { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz pos(current.pos); + s16 angle = shape_angle.y + 0x7fff; + pos.x += (param_2 * cM_ssin(angle)) - (param_1 * cM_scos(angle)); + pos.z += (param_2 * cM_scos(angle)) + (param_1 * cM_ssin(angle)); + player->setPlayerPosAndAngle(&pos, player->shape_angle.y, 0); } -#pragma pop /* 80675F8C-80676004 0037CC 0078+00 4/3 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +asm void __dt__14dBgS_ObjGndChkFv() { +//asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/__dt__14dBgS_ObjGndChkFv.s" } @@ -1834,19 +2447,17 @@ SECTION_RODATA static f32 const lit_5280 = -1000000000.0f; COMPILER_STRIP_GATE(0x80677648, &lit_5280); #pragma pop -/* 8067764C-80677650 0000F4 0004+00 1/1 0/0 0/0 .rodata @5293 */ -SECTION_RODATA static f32 const lit_5293 = 10.0f; -COMPILER_STRIP_GATE(0x8067764C, &lit_5293); - /* 80676004-806760B4 003844 00B0+00 1/1 0/0 0/0 .text smokeInit2__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::smokeInit2() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/smokeInit2__12daMBdoorL1_cFv.s" +void daMBdoorL1_c::smokeInit2() { + if (getDoorType() == DOOR_TYPE_1) { + field_0x81c.y -= 10.0f; + field_0x828.y += 10.0f; + field_0x604.CrrPos(dComIfG_Bgsp()); + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_setPolyColor(0x8c50, field_0x604.m_gnd, ¤t.pos, &tevStr, + &shape_angle, NULL, 0, NULL, roomNo, 0); + } } -#pragma pop /* ############################################################################################## */ /* 80677650-80677654 0000F8 0004+00 1/1 0/0 0/0 .rodata @5381 */ @@ -1864,317 +2475,544 @@ SECTION_RODATA static u8 const lit_5384[8] = { COMPILER_STRIP_GATE(0x80677658, &lit_5384); /* 806760B4-806762A4 0038F4 01F0+00 1/1 0/0 0/0 .text checkArea__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::checkArea() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz local_48; + cXyz local_54; + if (daPy_py_c::i_checkNowWolf()) { + local_48 = player->attention_info.position - current.pos; + local_54 = player->current.pos - current.pos; + } else { + local_48 = player->current.pos - current.pos; + } + s16 angle = current.angle.y; + if (field_0x5df == 1) { + angle += 0x7fff; + } + mDoMtx_stack_c::YrotS(-angle); + mDoMtx_stack_c::multVec(&local_48, &local_48); + if (fabsf(local_48.x) > 130.0f) { + return 0; + } + if (daPy_py_c::i_checkNowWolf()) { + mDoMtx_stack_c::multVec(&local_54, &local_54); + if (fabsf(local_54.x) > 130.0f) { + return 0; + } + } + if (fabsf(local_48.z) > 110.0f) { + return 0; + } + + if ((s16)fabs(angle - 0x7fff - player->current.angle.y) > 0x4000) { + return 0; + } else { + return 1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::checkArea() { +asm int daMBdoorL1_c::checkArea() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkArea__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 806762A4-80676308 003AE4 0064+00 8/8 0/0 0/0 .text checkFront__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkFront() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFront__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkFront() { + if (checkMBossRoom()) { + return 0; + } + if (fopAcM_GetRoomNo(this) == (u8)door_param2_c::getFRoomNo(this)) { + return 1; + } else { + return 0; + } } -#pragma pop /* 80676308-806764D0 003B48 01C8+00 1/1 0/0 0/0 .text checkOpen__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::checkOpen() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (getDoorType() == DOOR_TYPE_2 && daPy_py_c::i_checkNowWolf()) { + return 0; + } + if ((checkFrontKey() || checkBackKey()) && dComIfGs_getKeyNum() == 0) { + return 0; + } + if (checkFrontStop() || checkBackStop()) { + return 0; + } + + if (checkFrontSw() || checkBackSw()) { + return 0; + } + if (!checkArea()) { + return 0; + } + if (getDoorType() == DOOR_TYPE_2) { + cXyz dist = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-home.angle.y); + mDoMtx_stack_c::multVec(&dist, &dist); + if ((field_0x5df == 0 && dist.x >= 0.0f) || (field_0x5df == 1 && dist.x < 0.0f)) { + field_0x5de = 0; + } else { + field_0x5de = 1; + } + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::checkOpen() { +asm int daMBdoorL1_c::checkOpen() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkOpen__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 806764D0-80676568 003D10 0098+00 2/2 0/0 0/0 .text checkFrontKey__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkFrontKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontKey__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkFrontKey() { + if (!checkFront()) { + return 0; + } + u8 frontOption = door_param2_c::getFrontOption(this); + u8 swBit = door_param2_c::getSwbit(this); + if (frontOption == 2 && swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + return 1; + } + return 0; } -#pragma pop /* 80676568-80676570 003DA8 0008+00 1/1 0/0 0/0 .text checkBackKey__12daMBdoorL1_cFv */ -bool daMBdoorL1_c::checkBackKey() { - return false; +int daMBdoorL1_c::checkBackKey() { + return 0; } /* 80676570-80676610 003DB0 00A0+00 1/1 0/0 0/0 .text checkFrontStop__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkFrontStop() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontStop__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkFrontStop() { + if (!checkFront()) { + return 0; + } + u8 frontOption = door_param2_c::getFrontOption(this); + u8 swBit = door_param2_c::getSwbit(this); + if ((frontOption == 1 || frontOption == 3) && swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + return 1; + } + return 0; } -#pragma pop /* 80676610-806766B0 003E50 00A0+00 1/1 0/0 0/0 .text checkBackStop__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkBackStop() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackStop__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkBackStop() { + if (checkFront()) { + return 0; + } + u8 backOption = door_param2_c::getBackOption(this); + u8 swBit = door_param2_c::getSwbit2(this); + if ((backOption == 1 || backOption == 3) && swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + return 1; + } + return 0; } -#pragma pop /* 806766B0-80676744 003EF0 0094+00 1/1 0/0 0/0 .text checkFrontSw__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkFrontSw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkFrontSw__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkFrontSw() { + if (!checkFront()) { + return 0; + } + u8 frontOption = door_param2_c::getFrontOption(this); + u8 swBit = door_param2_c::getSwbit(this); + if (frontOption == 0 && swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + return 1; + } + return 0; } -#pragma pop /* 80676744-806767D8 003F84 0094+00 1/1 0/0 0/0 .text checkBackSw__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkBackSw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkBackSw__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkBackSw() { + if (checkFront()) { + return 0; + } + u8 backOption = door_param2_c::getBackOption(this); + u8 swBit = door_param2_c::getSwbit2(this); + if (backOption == 0 && swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + return 1; + } + return 0; } -#pragma pop /* 806767D8-8067684C 004018 0074+00 1/1 0/0 0/0 .text checkStopOpen__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkStopOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkStopOpen__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkStopOpen() { + u8 swBit; + if (field_0x5df == 0) { + swBit = door_param2_c::getSwbit(this); + } else { + swBit = door_param2_c::getSwbit2(this); + } + if (fopAcM_isSwitch(this, swBit)) { + return 1; + } + return 0; } -#pragma pop /* 8067684C-806769A4 00408C 0158+00 1/1 0/0 0/0 .text startDemoEnd__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::startDemoEnd() { + if (!field_0x598->ChkUsed()) { + int rt = dComIfG_Bgsp().Regist(field_0x598, this); + JUT_ASSERT(2671, !rt) + } + cXyz local_70(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y)); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz dist = player->current.pos - current.pos; + f32 dVar12 = dist.inprodXZ(local_70); + f32 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); + dComIfGs_setRestartRoom(cStack_88, dVar12 > 0.0f ? current.angle.y : (s16)(current.angle.y + 0x8000), roomNo); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::startDemoEnd() { +asm int daMBdoorL1_c::startDemoEnd() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/startDemoEnd__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 806769A4-806769D0 0041E4 002C+00 1/1 0/0 0/0 .text checkMBossRoom__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkMBossRoom() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkMBossRoom() { + s32 stayNo = dComIfGp_roomControl_getStayNo(); + if (stayNo == 0x33 || stayNo == 0x34) { + return 1; + } + return 0; } -#pragma pop /* 806769D0-80676AB4 004210 00E4+00 1/1 0/0 0/0 .text checkStopClose__12daMBdoorL1_cFv */ +// regalloc +#ifdef NONMATCHING +int daMBdoorL1_c::checkStopClose() { + s32 FRoomNo = door_param2_c::getFRoomNo(this); + door_param2_c::getFRoomNo(this); + s32 roomNo = fopAcM_GetRoomNo(this); + if (mDoorStop.mModel == NULL) { + return 0; + } + int frontOption = door_param2_c::getFrontOption(this); + int backOption = door_param2_c::getBackOption(this); + u8 swBit; + if (roomNo == (u8)FRoomNo) { + if (frontOption != 1) { + return 0; + } + swBit = door_param2_c::getSwbit(this); + } else { + if (backOption != 1) { + return 0; + } + swBit = door_param2_c::getSwbit2(this); + } + if (swBit == 0xff) { + return 0; + } + if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(this))) { + return 0; + } else { + return 1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::checkStopClose() { +asm int daMBdoorL1_c::checkStopClose() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkStopClose__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 80676AB4-80676B64 0042F4 00B0+00 2/2 0/0 0/0 .text checkMakeStop__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkMakeStop() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeStop__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkMakeStop() { + u8 option; + u8 swBit; + + if (checkFront()) { + option = door_param2_c::getFrontOption(this); + swBit = door_param2_c::getSwbit(this); + } + else { + option = door_param2_c::getBackOption(this); + swBit = door_param2_c::getSwbit2(this); + } + if (option == 1 || (option == 3 && !fopAcM_isSwitch(this, swBit))) { + return 1; + } + return 0; } -#pragma pop /* 80676B64-80676BE0 0043A4 007C+00 1/1 0/0 0/0 .text checkMakeKey__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::checkMakeKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMakeKey__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::checkMakeKey() { + u8 frontOption = door_param2_c::getFrontOption(this); + u8 swBit = door_param2_c::getSwbit(this); + if (frontOption == 2 && !fopAcM_isSwitch(this, swBit)) { + return 1; + } + return 0; } -#pragma pop /* 80676BE0-80676BE8 004420 0008+00 1/0 0/0 0/0 .text actionWait__12daMBdoorL1_cFv */ -bool daMBdoorL1_c::actionWait() { - return true; +int daMBdoorL1_c::actionWait() { + return 1; } -/* ############################################################################################## */ -/* 80677660-80677660 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8067795E = "DEFAULT_STOP_OPEN"; -#pragma pop - /* 80676BE8-80676DEC 004428 0204+00 2/1 0/0 0/0 .text actionCloseWait__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::actionCloseWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionCloseWait__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::actionCloseWait() { + if (eventInfo.i_checkCommandDoor()) { + field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + demoProc(); + setAction(ACTION_OPEN); + } else { + if (mDoorStop.field_0x8 != 0) { + if (eventInfo.checkCommandDemoAccrpt()) { + if (field_0x5df == 1) { + shape_angle.y += 0x7fff; + } + field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + demoProc(); + setAction(ACTION_DEMO); + return 1; + } + if (checkStopOpen()) { + u8 eventNo = door_param2_c::getEventNo(this); + if (eventNo != 0xff) { + field_0x5d2 = dComIfGp_getEventManager().getEventIdx(this, eventNo); + } else { + field_0x5d2 = dComIfGp_evmng_getEventIdx("DEFAULT_STOP_OPEN", 0xff); + } + fopAcM_orderOtherEventId(this, field_0x5d2, eventNo, 0xffff, 0, 1); + } + } + if (getNowLevel(this) != 1 && mDoorStop.field_0x8 == 0 && checkStopClose()) { + mDoorStop.field_0x8 = 1; + mDoorStop.closeInit(this, 1); + mDoorStop.calcMtx(this); + setAction(ACTION_STOP_CLOSE); + return 1; + } else { + if (checkOpen()) { + eventInfo.setEventId(field_0x5d4[field_0x5de]); + eventInfo.setMapToolId(0xff); + eventInfo.i_onCondition(4); + } + } + } + return 1; } -#pragma pop /* 80676DEC-80676E40 00462C 0054+00 1/0 0/0 0/0 .text actionStopClose__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::actionStopClose() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStopClose__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::actionStopClose() { + if (mDoorStop.closeProc(this)) { + setAction(ACTION_CLOSE_WAIT); + } + mDoorStop.calcMtx(this); + return 1; } -#pragma pop /* 80676E40-80676EB4 004680 0074+00 1/0 0/0 0/0 .text actionDemo__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::actionDemo() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionDemo__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::actionDemo() { + if (dComIfGp_evmng_endCheck(field_0x5d2)) { + shape_angle.y = current.angle.y; + setAction(ACTION_CLOSE_WAIT); + dComIfGp_event_reset(); + } else { + demoProc(); + } + return 1; } -#pragma pop /* 80676EB4-80676ED8 0046F4 0024+00 1/0 0/0 0/0 .text actionOpen__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::actionOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionOpen__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::actionOpen() { + demoProc(); + return 1; } -#pragma pop /* 80676ED8-80676FE4 004718 010C+00 1/0 0/0 0/0 .text actionInit__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::actionInit() { + if (fopAcM_checkStatus(this, 0x1000)) { + setAction(ACTION_START_DEMO); + actionStartDemo(); + } else { + if (getNowLevel(this) != 1) { + if ((checkFront() && !fopAcM_isSwitch(this, door_param2_c::getSwbit(this))) || + (!checkFront() && !fopAcM_isSwitch(this, door_param2_c::getSwbit2(this)))) + { + mDoorStop.field_0x8 = 1; + mDoorStop.field_0x4 = 0.0f; + } else { + mDoorStop.field_0x8 = 0; + mDoorStop.field_0x4 = 300.0f; + } + mDoorStop.calcMtx(this); + } + setAction(ACTION_CLOSE_WAIT); + actionCloseWait(); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::actionInit() { +asm int daMBdoorL1_c::actionInit() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionInit__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 80676FE4-80677050 004824 006C+00 2/1 0/0 0/0 .text actionStartDemo__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::actionStartDemo() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/actionStartDemo__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::actionStartDemo() { + field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + demoProc(); + if (!fopAcM_checkStatus(this, 0x1000)) { + setAction(ACTION_CLOSE_WAIT); + } + return 1; } -#pragma pop /* 80677050-80677158 004890 0108+00 1/1 0/0 0/0 .text execute__12daMBdoorL1_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daMBdoorL1_c::execute() { + static actionFunc l_action[7] = { + &daMBdoorL1_c::actionInit, + &daMBdoorL1_c::actionStartDemo, + &daMBdoorL1_c::actionWait, + &daMBdoorL1_c::actionCloseWait, + &daMBdoorL1_c::actionOpen, + &daMBdoorL1_c::actionDemo, + &daMBdoorL1_c::actionStopClose, + }; + (this->*(l_action[mAction]))(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daMBdoorL1_c::execute() { +asm int daMBdoorL1_c::execute() { nofralloc #include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/execute__12daMBdoorL1_cFv.s" } #pragma pop +#endif /* 80677158-806771B4 004998 005C+00 1/1 0/0 0/0 .text draw__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::draw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::draw() { + switch(getDoorType()) { + case DOOR_TYPE_0: + case DOOR_TYPE_1: + draw_sub0(); + break; + case DOOR_TYPE_2: + draw_sub1(); + break; + } + return 1; } -#pragma pop /* 806771B4-806772C4 0049F4 0110+00 1/1 0/0 0/0 .text draw_sub0__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::draw_sub0() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub0__12daMBdoorL1_cFv.s" +void daMBdoorL1_c::draw_sub0() { + g_env_light.settingTevStruct( 20, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModels[0], &tevStr); + dComIfGd_setListBG(); + if (field_0x594 != NULL) { + field_0x594->entry(mModels[0]->getModelData()); + } + mBckAnms[0]->entry(mModels[0]->getModelData()); + mDoExt_modelUpdateDL(mModels[0]); + mDoExt_bckAnmRemove(mModels[0]->getModelData()); + mDoExt_btkAnmRemove(mModels[0]->getModelData()); + dComIfGd_setList(); + if (mDoorStop.field_0x8 != 0) { + mDoorStop.draw(this); + } } -#pragma pop /* 806772C4-806773DC 004B04 0118+00 1/1 0/0 0/0 .text draw_sub1__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::draw_sub1() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/draw_sub1__12daMBdoorL1_cFv.s" +void daMBdoorL1_c::draw_sub1() { + g_env_light.settingTevStruct( 20, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModels[0], &tevStr); + g_env_light.setLightTevColorType_MAJI(mModels[1], &tevStr); + dComIfGd_setListBG(); + mBckAnms[0]->entry(mModels[0]->getModelData()); + mDoExt_modelUpdateDL(mModels[0]); + mBckAnms[1]->entry(mModels[1]->getModelData()); + mDoExt_modelUpdateDL(mModels[1]); + mDoExt_bckAnmRemove(mModels[0]->getModelData()); + dComIfGd_setList(); + if (mDoorStop.field_0x8 != 0) { + mDoorStop.draw(this); + } } -#pragma pop /* 806773DC-80677484 004C1C 00A8+00 1/1 0/0 0/0 .text Delete__12daMBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daMBdoorL1_c::Delete() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/Delete__12daMBdoorL1_cFv.s" +int daMBdoorL1_c::Delete() { + if (heap != NULL && field_0x598->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x598); + } + dComIfG_resDelete(&mPhase1, getArcName()); + dComIfG_resDelete(&mPhase2, getAlwaysArcName()); + if (getAnmArcName() != 0) { + dComIfG_resDelete(&mPhase3, getAnmArcName()); + } + return 1; } -#pragma pop /* 80677484-806774A4 004CC4 0020+00 1/0 0/0 0/0 .text daMBdoorL1_Draw__FP12daMBdoorL1_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMBdoorL1_Draw(daMBdoorL1_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Draw__FP12daMBdoorL1_c.s" +static int daMBdoorL1_Draw(daMBdoorL1_c* i_this) { + return i_this->draw(); } -#pragma pop /* 806774A4-806774C8 004CE4 0024+00 1/0 0/0 0/0 .text daMBdoorL1_Execute__FP12daMBdoorL1_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMBdoorL1_Execute(daMBdoorL1_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Execute__FP12daMBdoorL1_c.s" +static int daMBdoorL1_Execute(daMBdoorL1_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 806774C8-806774EC 004D08 0024+00 1/0 0/0 0/0 .text daMBdoorL1_Delete__FP12daMBdoorL1_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMBdoorL1_Delete(daMBdoorL1_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Delete__FP12daMBdoorL1_c.s" +static int daMBdoorL1_Delete(daMBdoorL1_c* i_this) { + i_this->Delete(); + return 1; } -#pragma pop /* 806774EC-8067750C 004D2C 0020+00 1/0 0/0 0/0 .text daMBdoorL1_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daMBdoorL1_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/daMBdoorL1_Create__FP10fopAc_ac_c.s" +static int daMBdoorL1_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 8067750C-80677528 004D4C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPi */ #pragma push diff --git a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp index 8d2bf7c176c..ab3eea29f6c 100644 --- a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp +++ b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp @@ -10,39 +10,6 @@ // Types: // -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjStopper_c { - /* 80CECF34 */ void initBaseMtx(); - /* 80CED024 */ void setBaseMtx(); - /* 80CED0B8 */ void Create(); - /* 80CED20C */ void CreateHeap(); - /* 80CED258 */ void create(); - /* 80CED6BC */ void Execute(f32 (**)[3][4]); - /* 80CED708 */ void action(); - /* 80CED824 */ void actionWait(); - /* 80CEDA24 */ void actionWaitOrderEvent(); - /* 80CEDAAC */ void actionOrderEvent(); - /* 80CEDB2C */ void actionEvent(); - /* 80CEE048 */ void actionDead(); - /* 80CEE04C */ void actionWaitClose(); - /* 80CEE05C */ void actionCloseInit(); - /* 80CEE0E0 */ void actionClose(); - /* 80CEE148 */ void hint_action1(); - /* 80CEE5D0 */ void hint_action2(); - /* 80CEEA28 */ void hint_action3(); - /* 80CEECFC */ void Draw(); - /* 80CEED60 */ void Delete(); -}; - -struct cXyz { - /* 80CECFE8 */ ~cXyz(); -}; - struct dVibration_c { /* 8006FA24 */ void StartShock(int, int, cXyz); /* 8006FB10 */ void StartQuake(int, int, cXyz); @@ -54,15 +21,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - struct dPa_levelEcallBack { /* 80CED4C4 */ void cleanup(); /* 80CEEEC4 */ ~dPa_levelEcallBack(); @@ -74,10 +32,6 @@ struct dPa_followEcallBack { /* 80CED4C8 */ void __defctor(); }; -struct csXyz {}; - -struct _GXColor {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -157,18 +111,6 @@ struct cCcD_GStts { /* 80CEEE7C */ ~cCcD_GStts(); }; -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - struct JPABaseEmitter {}; struct JPAEmitterCallBack { @@ -179,12 +121,6 @@ struct JPAEmitterCallBack { /* 80CEEF44 */ void drawAfter(JPABaseEmitter*); }; -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - // // Forward References: // @@ -286,14 +222,10 @@ extern "C" void cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz(); extern "C" void __dt__18JPAEmitterCallBackFv(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__19dPa_followEcallBack[10]; extern "C" extern void* __vt__8dCcD_Cyl[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; @@ -302,7 +234,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -461,7 +392,8 @@ asm void daObjStopper_c::initBaseMtx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +asm void __dt__4cXyzFv() { +//asm cXyz::~cXyz() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper/__dt__4cXyzFv.s" } diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index 5fdee0b3430..cf2ebd3d5de 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -19,13 +19,13 @@ u32 door_param2_c::getDoorModel(fopAc_ac_c* i_actor) { /* 8003A1A0-8003A1AC 034AE0 000C+00 0/0 0/0 17/17 .text * getFrontOption__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getFrontOption(fopAc_ac_c* i_actor) { +u8 door_param2_c::getFrontOption(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 8, 2); } /* 8003A1AC-8003A1B8 034AEC 000C+00 0/0 0/0 14/14 .text * getBackOption__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getBackOption(fopAc_ac_c* i_actor) { +u8 door_param2_c::getBackOption(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 10, 3); } @@ -42,18 +42,18 @@ u32 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) { } /* 8003A1D0-8003A1DC 034B10 000C+00 0/0 0/0 25/25 .text getSwbit__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getSwbit(fopAc_ac_c* i_actor) { +u8 door_param2_c::getSwbit(fopAc_ac_c* i_actor) { return i_actor->home.angle.z & 0xFF; } /* 8003A1DC-8003A1E8 034B1C 000C+00 0/0 0/0 12/12 .text getSwbit2__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getSwbit2(fopAc_ac_c* i_actor) { +u8 door_param2_c::getSwbit2(fopAc_ac_c* i_actor) { return (i_actor->home.angle.z >> 8) & 0xFF; } /* 8003A1E8-8003A1F4 034B28 000C+00 0/0 0/0 3/3 .text getSwbit3__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) { +u8 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) { return (i_actor->home.angle.x >> 8) & 0xFF; } @@ -63,7 +63,7 @@ u32 door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) { } /* 8003A200-8003A20C 034B40 000C+00 0/0 0/0 3/3 .text getEventNo__13door_param2_cFP10fopAc_ac_c */ -u32 door_param2_c::getEventNo(fopAc_ac_c* i_actor) { +u8 door_param2_c::getEventNo(fopAc_ac_c* i_actor) { return i_actor->home.angle.x & 0xFF; }