From fadcd7bcdfdfa664677e9caaf272dd1895dbd8cd Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:42:44 +0100 Subject: [PATCH] d_a_dbdoor00 OK (#1973) * initial work on d_a_door_dbdoor00 * dbdoor mostly OK * finish all functions and header * remove externs * remove unused asm --- .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__12daDbDoor00_cFv.s | 114 -- .../CreateInit__12daDbDoor00_cFv.s | 47 - .../Delete__12daDbDoor00_cFv.s | 31 - .../actionCloseWait__12daDbDoor00_cFv.s | 51 - .../actionLockDemo__12daDbDoor00_cFv.s | 32 - .../actionLockOff__12daDbDoor00_cFv.s | 40 - .../actionLockWait__12daDbDoor00_cFv.s | 27 - .../actionOpen__12daDbDoor00_cFv.s | 10 - .../actionWait__12daDbDoor00_cFv.s | 10 - .../calcMtx__12daDbDoor00_cFv.s | 111 -- .../checkArea__12daDbDoor00_cFv.s | 83 -- .../checkDraw__12daDbDoor00_cFv.s | 17 - .../create__12daDbDoor00_cFv.s | 55 - .../daDbdoor00_Create__FP10fopAc_ac_c.s | 9 - .../daDbdoor00_Delete__FP12daDbDoor00_c.s | 10 - .../daDbdoor00_Draw__FP12daDbDoor00_c.s | 9 - .../daDbdoor00_Execute__FP12daDbDoor00_c.s | 10 - .../demoProc__12daDbDoor00_cFv.s | 249 ---- .../draw__12daDbDoor00_cFv.s | 72 -- .../execute__12daDbDoor00_cFv.s | 62 - .../getAlwaysArcName__12daDbDoor00_cFv.s | 5 - .../getBmdArcName__12daDbDoor00_cFv.s | 5 - .../getBmdName__12daDbDoor00_cFv.s | 22 - .../getDemoAction__12daDbDoor00_cFv.s | 19 - .../getDoorModelData__12daDbDoor00_cFv.s | 30 - .../getDummyBmdName__12daDbDoor00_cFv.s | 5 - .../getDzb__12daDbDoor00_cFv.s | 5 - .../nodeCallBack__FP8J3DJointi.s | 66 - include/d/a/d_a_player.h | 2 + include/d/com/d_com_inf_game.h | 4 + include/d/d_door_param2.h | 32 +- include/d/d_stage.h | 2 +- .../d_a_door_dbdoor00/d_a_door_dbdoor00.h | 56 +- .../d_a_door_dbdoor00/d_a_door_dbdoor00.cpp | 1116 ++++++----------- src/d/d_door_param2.cpp | 32 +- src/d/d_stage.cpp | 6 +- 37 files changed, 453 insertions(+), 2012 deletions(-) delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateHeap__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateInit__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/Delete__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionCloseWait__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockDemo__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockOff__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockWait__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionOpen__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionWait__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/calcMtx__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkArea__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkDraw__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/create__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Delete__FP12daDbDoor00_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Draw__FP12daDbDoor00_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Execute__FP12daDbDoor00_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/demoProc__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/draw__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/execute__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getAlwaysArcName__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdArcName__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdName__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDemoAction__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDoorModelData__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDummyBmdName__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDzb__12daDbDoor00_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/nodeCallBack__FP8J3DJointi.s diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 89326f99f..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8045D574: -/* 8045D574 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045D578 7C 08 02 A6 */ mflr r0 -/* 8045D57C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045D580 48 00 00 15 */ bl CreateHeap__12daDbDoor00_cFv -/* 8045D584 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045D588 7C 08 03 A6 */ mtlr r0 -/* 8045D58C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045D590 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateHeap__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateHeap__12daDbDoor00_cFv.s deleted file mode 100644 index e5a0353d9..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateHeap__12daDbDoor00_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_8045D594: -/* 8045D594 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8045D598 7C 08 02 A6 */ mflr r0 -/* 8045D59C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8045D5A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045D5A4 4B F0 4C 39 */ bl _savegpr_29 -/* 8045D5A8 7C 7E 1B 78 */ mr r30, r3 -/* 8045D5AC 4B FF FE E5 */ bl getDummyBmdName__12daDbDoor00_cFv -/* 8045D5B0 7C 7D 1B 78 */ mr r29, r3 -/* 8045D5B4 7F C3 F3 78 */ mr r3, r30 -/* 8045D5B8 4B FF FE B9 */ bl getAlwaysArcName__12daDbDoor00_cFv -/* 8045D5BC 7F A4 EB 78 */ mr r4, r29 -/* 8045D5C0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045D5C4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045D5C8 3F E5 00 02 */ addis r31, r5, 2 -/* 8045D5CC 3B FF C2 F8 */ addi r31, r31, -15624 -/* 8045D5D0 7F E5 FB 78 */ mr r5, r31 -/* 8045D5D4 38 C0 00 80 */ li r6, 0x80 -/* 8045D5D8 4B BD ED A5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045D5DC 3C 80 00 08 */ lis r4, 8 -/* 8045D5E0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8045D5E4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8045D5E8 4B BB 76 6D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8045D5EC 90 7E 05 78 */ stw r3, 0x578(r30) -/* 8045D5F0 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 8045D5F4 28 00 00 00 */ cmplwi r0, 0 -/* 8045D5F8 40 82 00 0C */ bne lbl_8045D604 -/* 8045D5FC 38 60 00 00 */ li r3, 0 -/* 8045D600 48 00 01 2C */ b lbl_8045D72C -lbl_8045D604: -/* 8045D604 7F C3 F3 78 */ mr r3, r30 -/* 8045D608 4B FF FE FD */ bl getDoorModelData__12daDbDoor00_cFv -/* 8045D60C 7C 7D 1B 78 */ mr r29, r3 -/* 8045D610 3C 80 00 08 */ lis r4, 8 -/* 8045D614 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8045D618 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8045D61C 4B BB 76 39 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8045D620 90 7E 05 7C */ stw r3, 0x57c(r30) -/* 8045D624 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 8045D628 28 00 00 00 */ cmplwi r0, 0 -/* 8045D62C 40 82 00 0C */ bne lbl_8045D638 -/* 8045D630 38 60 00 00 */ li r3, 0 -/* 8045D634 48 00 00 F8 */ b lbl_8045D72C -lbl_8045D638: -/* 8045D638 80 7D 00 54 */ lwz r3, 0x54(r29) -/* 8045D63C 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045D640 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045D644 38 84 00 58 */ addi r4, r4, 0x58 -/* 8045D648 4B E8 14 11 */ bl getIndex__10JUTNameTabCFPCc -/* 8045D64C 98 7E 05 C0 */ stb r3, 0x5c0(r30) -/* 8045D650 80 7D 00 54 */ lwz r3, 0x54(r29) -/* 8045D654 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045D658 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045D65C 38 84 00 63 */ addi r4, r4, 0x63 -/* 8045D660 4B E8 13 F9 */ bl getIndex__10JUTNameTabCFPCc -/* 8045D664 98 7E 05 C1 */ stb r3, 0x5c1(r30) -/* 8045D668 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 8045D66C 80 63 00 04 */ lwz r3, 4(r3) -/* 8045D670 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8045D674 88 1E 05 C0 */ lbz r0, 0x5c0(r30) -/* 8045D678 7C 00 07 74 */ extsb r0, r0 -/* 8045D67C 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 8045D680 7C 83 00 2E */ lwzx r4, r3, r0 -/* 8045D684 88 1E 05 C1 */ lbz r0, 0x5c1(r30) -/* 8045D688 7C 00 07 74 */ extsb r0, r0 -/* 8045D68C 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 8045D690 7C A3 00 2E */ lwzx r5, r3, r0 -/* 8045D694 3C 60 80 46 */ lis r3, nodeCallBack__FP8J3DJointi@ha /* 0x8045D378@ha */ -/* 8045D698 38 03 D3 78 */ addi r0, r3, nodeCallBack__FP8J3DJointi@l /* 0x8045D378@l */ -/* 8045D69C 90 04 00 04 */ stw r0, 4(r4) -/* 8045D6A0 90 05 00 04 */ stw r0, 4(r5) -/* 8045D6A4 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 8045D6A8 93 C3 00 14 */ stw r30, 0x14(r3) -/* 8045D6AC 38 60 00 C0 */ li r3, 0xc0 -/* 8045D6B0 4B E7 15 9D */ bl __nw__FUl -/* 8045D6B4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8045D6B8 41 82 00 0C */ beq lbl_8045D6C4 -/* 8045D6BC 4B C1 E2 B5 */ bl __ct__4dBgWFv -/* 8045D6C0 7C 60 1B 78 */ mr r0, r3 -lbl_8045D6C4: -/* 8045D6C4 90 1E 05 80 */ stw r0, 0x580(r30) -/* 8045D6C8 7F C3 F3 78 */ mr r3, r30 -/* 8045D6CC 4B FF FD B5 */ bl getDzb__12daDbDoor00_cFv -/* 8045D6D0 7C 7D 1B 78 */ mr r29, r3 -/* 8045D6D4 7F C3 F3 78 */ mr r3, r30 -/* 8045D6D8 4B FF FD 99 */ bl getAlwaysArcName__12daDbDoor00_cFv -/* 8045D6DC 7F A4 EB 78 */ mr r4, r29 -/* 8045D6E0 7F E5 FB 78 */ mr r5, r31 -/* 8045D6E4 38 C0 00 80 */ li r6, 0x80 -/* 8045D6E8 4B BD EC 95 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8045D6EC 7C 7D 1B 79 */ or. r29, r3, r3 -/* 8045D6F0 40 82 00 0C */ bne lbl_8045D6FC -/* 8045D6F4 38 60 00 00 */ li r3, 0 -/* 8045D6F8 48 00 00 34 */ b lbl_8045D72C -lbl_8045D6FC: -/* 8045D6FC 7F C3 F3 78 */ mr r3, r30 -/* 8045D700 48 00 00 45 */ bl calcMtx__12daDbDoor00_cFv -/* 8045D704 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 8045D708 38 C3 00 24 */ addi r6, r3, 0x24 -/* 8045D70C 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 8045D710 7F A4 EB 78 */ mr r4, r29 -/* 8045D714 38 A0 00 01 */ li r5, 1 -/* 8045D718 4B C1 C8 21 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 8045D71C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8045D720 20 60 00 01 */ subfic r3, r0, 1 -/* 8045D724 30 03 FF FF */ addic r0, r3, -1 -/* 8045D728 7C 60 19 10 */ subfe r3, r0, r3 -lbl_8045D72C: -/* 8045D72C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045D730 4B F0 4A F9 */ bl _restgpr_29 -/* 8045D734 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8045D738 7C 08 03 A6 */ mtlr r0 -/* 8045D73C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8045D740 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateInit__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateInit__12daDbDoor00_cFv.s deleted file mode 100644 index 42a25aaac..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateInit__12daDbDoor00_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8045D8F4: -/* 8045D8F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045D8F8 7C 08 02 A6 */ mflr r0 -/* 8045D8FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045D900 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045D904 7C 7F 1B 78 */ mr r31, r3 -/* 8045D908 4B BD C8 B1 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c -/* 8045D90C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8045D910 7C 00 07 74 */ extsb r0, r0 -/* 8045D914 2C 00 FF FF */ cmpwi r0, -1 -/* 8045D918 40 82 00 10 */ bne lbl_8045D928 -/* 8045D91C 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 8045D920 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8045D924 98 1F 04 8C */ stb r0, 0x48c(r31) -lbl_8045D928: -/* 8045D928 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045D92C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045D930 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8045D934 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 8045D938 7F E5 FB 78 */ mr r5, r31 -/* 8045D93C 4B C1 70 CD */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 8045D940 38 00 00 01 */ li r0, 1 -/* 8045D944 98 1F 05 84 */ stb r0, 0x584(r31) -/* 8045D948 38 00 00 04 */ li r0, 4 -/* 8045D94C 98 1F 05 86 */ stb r0, 0x586(r31) -/* 8045D950 38 00 00 1E */ li r0, 0x1e -/* 8045D954 90 1F 05 94 */ stw r0, 0x594(r31) -/* 8045D958 C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 8045D95C 3C 60 80 46 */ lis r3, lit_3826@ha /* 0x8045E54C@ha */ -/* 8045D960 C0 23 E5 4C */ lfs f1, lit_3826@l(r3) /* 0x8045E54C@l */ -/* 8045D964 EC 00 08 2A */ fadds f0, f0, f1 -/* 8045D968 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 8045D96C C0 1F 05 3C */ lfs f0, 0x53c(r31) -/* 8045D970 EC 00 08 2A */ fadds f0, f0, f1 -/* 8045D974 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 8045D978 38 00 00 20 */ li r0, 0x20 -/* 8045D97C 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 8045D980 7F E3 FB 78 */ mr r3, r31 -/* 8045D984 4B FF FD C1 */ bl calcMtx__12daDbDoor00_cFv -/* 8045D988 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 8045D98C 4B C1 E0 35 */ bl Move__4dBgWFv -/* 8045D990 38 60 00 01 */ li r3, 1 -/* 8045D994 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045D998 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045D99C 7C 08 03 A6 */ mtlr r0 -/* 8045D9A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045D9A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/Delete__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/Delete__12daDbDoor00_cFv.s deleted file mode 100644 index f8f9b4126..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/Delete__12daDbDoor00_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8045E428: -/* 8045E428 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E42C 7C 08 02 A6 */ mflr r0 -/* 8045E430 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E434 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045E438 7C 7F 1B 78 */ mr r31, r3 -/* 8045E43C 80 03 00 F0 */ lwz r0, 0xf0(r3) -/* 8045E440 28 00 00 00 */ cmplwi r0, 0 -/* 8045E444 41 82 00 18 */ beq lbl_8045E45C -/* 8045E448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E44C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E450 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8045E454 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 8045E458 4B C1 5D F9 */ bl Release__4cBgSFP9dBgW_Base -lbl_8045E45C: -/* 8045E45C 7F E3 FB 78 */ mr r3, r31 -/* 8045E460 4B FF F0 41 */ bl getBmdArcName__12daDbDoor00_cFv -/* 8045E464 7C 64 1B 78 */ mr r4, r3 -/* 8045E468 38 7F 05 68 */ addi r3, r31, 0x568 -/* 8045E46C 4B BC EB 9D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8045E470 7F E3 FB 78 */ mr r3, r31 -/* 8045E474 4B FF EF FD */ bl getAlwaysArcName__12daDbDoor00_cFv -/* 8045E478 7C 64 1B 78 */ mr r4, r3 -/* 8045E47C 38 7F 05 70 */ addi r3, r31, 0x570 -/* 8045E480 4B BC EB 89 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8045E484 38 60 00 01 */ li r3, 1 -/* 8045E488 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045E48C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E490 7C 08 03 A6 */ mtlr r0 -/* 8045E494 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E498 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionCloseWait__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionCloseWait__12daDbDoor00_cFv.s deleted file mode 100644 index 733d75681..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionCloseWait__12daDbDoor00_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8045E108: -/* 8045E108 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E10C 7C 08 02 A6 */ mflr r0 -/* 8045E110 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E114 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045E118 93 C1 00 08 */ stw r30, 8(r1) -/* 8045E11C 7C 7E 1B 78 */ mr r30, r3 -/* 8045E120 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8045E124 28 00 00 03 */ cmplwi r0, 3 -/* 8045E128 40 82 00 58 */ bne lbl_8045E180 -/* 8045E12C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E130 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E134 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8045E138 38 7F 40 C0 */ addi r3, r31, 0x40c0 -/* 8045E13C 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045E140 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045E144 38 84 00 D1 */ addi r4, r4, 0xd1 -/* 8045E148 38 A0 00 00 */ li r5, 0 -/* 8045E14C 38 C0 00 00 */ li r6, 0 -/* 8045E150 4B BE 99 CD */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8045E154 90 7E 05 98 */ stw r3, 0x598(r30) -/* 8045E158 7F C3 F3 78 */ mr r3, r30 -/* 8045E15C 4B FF F9 55 */ bl demoProc__12daDbDoor00_cFv -/* 8045E160 38 00 00 05 */ li r0, 5 -/* 8045E164 98 1E 05 86 */ stb r0, 0x586(r30) -/* 8045E168 7F E3 FB 78 */ mr r3, r31 -/* 8045E16C 80 9E 05 80 */ lwz r4, 0x580(r30) -/* 8045E170 4B C1 60 E1 */ bl Release__4cBgSFP9dBgW_Base -/* 8045E174 38 00 00 00 */ li r0, 0 -/* 8045E178 98 1E 05 84 */ stb r0, 0x584(r30) -/* 8045E17C 48 00 00 30 */ b lbl_8045E1AC -lbl_8045E180: -/* 8045E180 4B FF FC C5 */ bl checkArea__12daDbDoor00_cFv -/* 8045E184 2C 03 00 00 */ cmpwi r3, 0 -/* 8045E188 41 82 00 24 */ beq lbl_8045E1AC -/* 8045E18C 38 7E 00 F4 */ addi r3, r30, 0xf4 -/* 8045E190 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045E194 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045E198 38 84 00 DD */ addi r4, r4, 0xdd -/* 8045E19C 4B BE 52 8D */ bl setEventName__11dEvt_info_cFPc -/* 8045E1A0 A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 8045E1A4 60 00 00 04 */ ori r0, r0, 4 -/* 8045E1A8 B0 1E 00 FA */ sth r0, 0xfa(r30) -lbl_8045E1AC: -/* 8045E1AC 38 60 00 01 */ li r3, 1 -/* 8045E1B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045E1B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045E1B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E1BC 7C 08 03 A6 */ mtlr r0 -/* 8045E1C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E1C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockDemo__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockDemo__12daDbDoor00_cFv.s deleted file mode 100644 index db09f35a7..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockDemo__12daDbDoor00_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8045E094: -/* 8045E094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E098 7C 08 02 A6 */ mflr r0 -/* 8045E09C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E0A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045E0A4 93 C1 00 08 */ stw r30, 8(r1) -/* 8045E0A8 7C 7E 1B 78 */ mr r30, r3 -/* 8045E0AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E0B0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E0B4 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8045E0B8 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045E0BC 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045E0C0 38 84 00 BE */ addi r4, r4, 0xbe -/* 8045E0C4 4B BE 9A 19 */ bl endCheckOld__16dEvent_manager_cFPCc -/* 8045E0C8 2C 03 00 00 */ cmpwi r3, 0 -/* 8045E0CC 41 82 00 18 */ beq lbl_8045E0E4 -/* 8045E0D0 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8045E0D4 4B BE 43 95 */ bl reset__14dEvt_control_cFv -/* 8045E0D8 38 00 00 04 */ li r0, 4 -/* 8045E0DC 98 1E 05 86 */ stb r0, 0x586(r30) -/* 8045E0E0 48 00 00 0C */ b lbl_8045E0EC -lbl_8045E0E4: -/* 8045E0E4 7F C3 F3 78 */ mr r3, r30 -/* 8045E0E8 4B FF F9 C9 */ bl demoProc__12daDbDoor00_cFv -lbl_8045E0EC: -/* 8045E0EC 38 60 00 01 */ li r3, 1 -/* 8045E0F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045E0F4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045E0F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E0FC 7C 08 03 A6 */ mtlr r0 -/* 8045E100 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E104 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockOff__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockOff__12daDbDoor00_cFv.s deleted file mode 100644 index 7d4fd8cfe..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockOff__12daDbDoor00_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8045E000: -/* 8045E000 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E004 7C 08 02 A6 */ mflr r0 -/* 8045E008 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E00C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045E010 7C 7F 1B 78 */ mr r31, r3 -/* 8045E014 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8045E018 28 00 00 02 */ cmplwi r0, 2 -/* 8045E01C 40 82 00 40 */ bne lbl_8045E05C -/* 8045E020 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E024 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E028 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8045E02C 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045E030 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045E034 38 84 00 D1 */ addi r4, r4, 0xd1 -/* 8045E038 38 A0 00 00 */ li r5, 0 -/* 8045E03C 38 C0 00 00 */ li r6, 0 -/* 8045E040 4B BE 9A DD */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8045E044 90 7F 05 98 */ stw r3, 0x598(r31) -/* 8045E048 7F E3 FB 78 */ mr r3, r31 -/* 8045E04C 4B FF FA 65 */ bl demoProc__12daDbDoor00_cFv -/* 8045E050 38 00 00 03 */ li r0, 3 -/* 8045E054 98 1F 05 86 */ stb r0, 0x586(r31) -/* 8045E058 48 00 00 24 */ b lbl_8045E07C -lbl_8045E05C: -/* 8045E05C 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045E060 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045E064 38 84 00 BE */ addi r4, r4, 0xbe -/* 8045E068 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 8045E06C 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 8045E070 38 C0 00 01 */ li r6, 1 -/* 8045E074 38 E0 00 00 */ li r7, 0 -/* 8045E078 4B BB D3 55 */ bl fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs -lbl_8045E07C: -/* 8045E07C 38 60 00 01 */ li r3, 1 -/* 8045E080 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045E084 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E088 7C 08 03 A6 */ mtlr r0 -/* 8045E08C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E090 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockWait__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockWait__12daDbDoor00_cFv.s deleted file mode 100644 index d1121a454..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockWait__12daDbDoor00_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8045DF9C: -/* 8045DF9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045DFA0 7C 08 02 A6 */ mflr r0 -/* 8045DFA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045DFA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045DFAC 7C 7F 1B 78 */ mr r31, r3 -/* 8045DFB0 4B FF FF C1 */ bl checkUnlock__12daDbDoor00_cFv -/* 8045DFB4 2C 03 00 00 */ cmpwi r3, 0 -/* 8045DFB8 41 82 00 30 */ beq lbl_8045DFE8 -/* 8045DFBC 38 00 00 02 */ li r0, 2 -/* 8045DFC0 98 1F 05 86 */ stb r0, 0x586(r31) -/* 8045DFC4 7F E3 FB 78 */ mr r3, r31 -/* 8045DFC8 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045DFCC 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045DFD0 38 84 00 BE */ addi r4, r4, 0xbe -/* 8045DFD4 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 8045DFD8 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 8045DFDC 38 C0 00 01 */ li r6, 1 -/* 8045DFE0 38 E0 00 00 */ li r7, 0 -/* 8045DFE4 4B BB D3 E9 */ bl fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs -lbl_8045DFE8: -/* 8045DFE8 38 60 00 01 */ li r3, 1 -/* 8045DFEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045DFF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045DFF4 7C 08 03 A6 */ mtlr r0 -/* 8045DFF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045DFFC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionOpen__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionOpen__12daDbDoor00_cFv.s deleted file mode 100644 index 775326107..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionOpen__12daDbDoor00_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8045E1C8: -/* 8045E1C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E1CC 7C 08 02 A6 */ mflr r0 -/* 8045E1D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E1D4 4B FF F8 DD */ bl demoProc__12daDbDoor00_cFv -/* 8045E1D8 38 60 00 01 */ li r3, 1 -/* 8045E1DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E1E0 7C 08 03 A6 */ mtlr r0 -/* 8045E1E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E1E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionWait__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionWait__12daDbDoor00_cFv.s deleted file mode 100644 index 7fce7bbd9..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionWait__12daDbDoor00_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8045DF78: -/* 8045DF78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045DF7C 7C 08 02 A6 */ mflr r0 -/* 8045DF80 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045DF84 4B FF F7 C1 */ bl calcMtx__12daDbDoor00_cFv -/* 8045DF88 38 60 00 01 */ li r3, 1 -/* 8045DF8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045DF90 7C 08 03 A6 */ mtlr r0 -/* 8045DF94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045DF98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/calcMtx__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/calcMtx__12daDbDoor00_cFv.s deleted file mode 100644 index 15e123c5e..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/calcMtx__12daDbDoor00_cFv.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_8045D744: -/* 8045D744 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8045D748 7C 08 02 A6 */ mflr r0 -/* 8045D74C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8045D750 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8045D754 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8045D758 7C 7E 1B 78 */ mr r30, r3 -/* 8045D75C 3C 60 80 46 */ lis r3, lit_3806@ha /* 0x8045E534@ha */ -/* 8045D760 3B E3 E5 34 */ addi r31, r3, lit_3806@l /* 0x8045E534@l */ -/* 8045D764 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D768 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D76C C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 8045D770 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 8045D774 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 8045D778 4B EE 91 71 */ bl PSMTXTrans -/* 8045D77C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D780 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D784 A8 9E 04 B6 */ lha r4, 0x4b6(r30) -/* 8045D788 4B BA EC AD */ bl mDoMtx_YrotM__FPA4_fs -/* 8045D78C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D790 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D794 80 9E 05 78 */ lwz r4, 0x578(r30) -/* 8045D798 38 84 00 24 */ addi r4, r4, 0x24 -/* 8045D79C 4B EE 8D 15 */ bl PSMTXCopy -/* 8045D7A0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D7A4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D7A8 80 9E 05 7C */ lwz r4, 0x57c(r30) -/* 8045D7AC 38 84 00 24 */ addi r4, r4, 0x24 -/* 8045D7B0 4B EE 8D 01 */ bl PSMTXCopy -/* 8045D7B4 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8045D7B8 D0 01 00 08 */ stfs f0, 8(r1) -/* 8045D7BC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8045D7C0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 8045D7C4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8045D7C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D7CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D7D0 38 81 00 08 */ addi r4, r1, 8 -/* 8045D7D4 38 BE 05 A8 */ addi r5, r30, 0x5a8 -/* 8045D7D8 4B EE 95 95 */ bl PSMTXMultVec -/* 8045D7DC C0 1F 00 00 */ lfs f0, 0(r31) -/* 8045D7E0 D0 01 00 08 */ stfs f0, 8(r1) -/* 8045D7E4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8045D7E8 C0 1F 00 08 */ lfs f0, 8(r31) -/* 8045D7EC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8045D7F0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D7F4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D7F8 38 81 00 08 */ addi r4, r1, 8 -/* 8045D7FC 38 BE 05 B4 */ addi r5, r30, 0x5b4 -/* 8045D800 4B EE 95 6D */ bl PSMTXMultVec -/* 8045D804 88 1E 05 85 */ lbz r0, 0x585(r30) -/* 8045D808 28 00 00 00 */ cmplwi r0, 0 -/* 8045D80C 40 82 00 68 */ bne lbl_8045D874 -/* 8045D810 4B BA F4 B9 */ bl push__14mDoMtx_stack_cFv -/* 8045D814 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D818 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D81C A8 1E 05 8A */ lha r0, 0x58a(r30) -/* 8045D820 7C 00 00 D0 */ neg r0, r0 -/* 8045D824 7C 04 07 34 */ extsh r4, r0 -/* 8045D828 4B BA EB B5 */ bl mDoMtx_YrotS__FPA4_fs -/* 8045D82C C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 8045D830 C0 5F 00 00 */ lfs f2, 0(r31) -/* 8045D834 C0 7F 00 10 */ lfs f3, 0x10(r31) -/* 8045D838 4B BA F5 65 */ bl transM__14mDoMtx_stack_cFfff -/* 8045D83C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D840 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D844 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8045D848 D0 1E 05 9C */ stfs f0, 0x59c(r30) -/* 8045D84C C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 8045D850 D0 1E 05 A0 */ stfs f0, 0x5a0(r30) -/* 8045D854 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 8045D858 D0 1E 05 A4 */ stfs f0, 0x5a4(r30) -/* 8045D85C 4B BA F4 B9 */ bl pop__14mDoMtx_stack_cFv -/* 8045D860 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D864 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D868 38 9E 05 9C */ addi r4, r30, 0x59c -/* 8045D86C 7C 85 23 78 */ mr r5, r4 -/* 8045D870 4B EE 94 FD */ bl PSMTXMultVec -lbl_8045D874: -/* 8045D874 88 1E 05 85 */ lbz r0, 0x585(r30) -/* 8045D878 28 00 00 01 */ cmplwi r0, 1 -/* 8045D87C 40 82 00 60 */ bne lbl_8045D8DC -/* 8045D880 4B BA F4 49 */ bl push__14mDoMtx_stack_cFv -/* 8045D884 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D888 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D88C A8 9E 05 8A */ lha r4, 0x58a(r30) -/* 8045D890 4B BA EB 4D */ bl mDoMtx_YrotS__FPA4_fs -/* 8045D894 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 8045D898 C0 5F 00 00 */ lfs f2, 0(r31) -/* 8045D89C C0 7F 00 10 */ lfs f3, 0x10(r31) -/* 8045D8A0 4B BA F4 FD */ bl transM__14mDoMtx_stack_cFfff -/* 8045D8A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D8A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D8AC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8045D8B0 D0 1E 05 9C */ stfs f0, 0x59c(r30) -/* 8045D8B4 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 8045D8B8 D0 1E 05 A0 */ stfs f0, 0x5a0(r30) -/* 8045D8BC C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 8045D8C0 D0 1E 05 A4 */ stfs f0, 0x5a4(r30) -/* 8045D8C4 4B BA F4 51 */ bl pop__14mDoMtx_stack_cFv -/* 8045D8C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D8CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D8D0 38 9E 05 9C */ addi r4, r30, 0x59c -/* 8045D8D4 7C 85 23 78 */ mr r5, r4 -/* 8045D8D8 4B EE 94 95 */ bl PSMTXMultVec -lbl_8045D8DC: -/* 8045D8DC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8045D8E0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8045D8E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8045D8E8 7C 08 03 A6 */ mtlr r0 -/* 8045D8EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8045D8F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkArea__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkArea__12daDbDoor00_cFv.s deleted file mode 100644 index 7b2129277..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkArea__12daDbDoor00_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_8045DE44: -/* 8045DE44 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8045DE48 7C 08 02 A6 */ mflr r0 -/* 8045DE4C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8045DE50 39 61 00 40 */ addi r11, r1, 0x40 -/* 8045DE54 4B F0 43 89 */ bl _savegpr_29 -/* 8045DE58 7C 7D 1B 78 */ mr r29, r3 -/* 8045DE5C 3C 60 80 46 */ lis r3, lit_3806@ha /* 0x8045E534@ha */ -/* 8045DE60 3B E3 E5 34 */ addi r31, r3, lit_3806@l /* 0x8045E534@l */ -/* 8045DE64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045DE68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045DE6C 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 8045DE70 38 61 00 08 */ addi r3, r1, 8 -/* 8045DE74 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8045DE78 38 BD 04 A8 */ addi r5, r29, 0x4a8 -/* 8045DE7C 4B E0 8C B9 */ bl __mi__4cXyzCFRC3Vec -/* 8045DE80 C0 81 00 08 */ lfs f4, 8(r1) -/* 8045DE84 D0 81 00 20 */ stfs f4, 0x20(r1) -/* 8045DE88 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8045DE8C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8045DE90 C0 61 00 10 */ lfs f3, 0x10(r1) -/* 8045DE94 D0 61 00 28 */ stfs f3, 0x28(r1) -/* 8045DE98 D0 81 00 14 */ stfs f4, 0x14(r1) -/* 8045DE9C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8045DEA0 D0 61 00 1C */ stfs f3, 0x1c(r1) -/* 8045DEA4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8045DEA8 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8045DEAC 38 83 00 04 */ addi r4, r3, 4 -/* 8045DEB0 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 8045DEB4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8045DEB8 7C A4 04 2E */ lfsx f5, r4, r0 -/* 8045DEBC 7C C3 04 2E */ lfsx f6, r3, r0 -/* 8045DEC0 EC 23 01 B2 */ fmuls f1, f3, f6 -/* 8045DEC4 EC 04 01 72 */ fmuls f0, f4, f5 -/* 8045DEC8 EC 41 00 28 */ fsubs f2, f1, f0 -/* 8045DECC D0 41 00 14 */ stfs f2, 0x14(r1) -/* 8045DED0 EC 23 01 72 */ fmuls f1, f3, f5 -/* 8045DED4 EC 04 01 B2 */ fmuls f0, f4, f6 -/* 8045DED8 EC 21 00 2A */ fadds f1, f1, f0 -/* 8045DEDC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 8045DEE0 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 8045DEE4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8045DEE8 40 81 00 0C */ ble lbl_8045DEF4 -/* 8045DEEC 38 60 00 00 */ li r3, 0 -/* 8045DEF0 48 00 00 68 */ b lbl_8045DF58 -lbl_8045DEF4: -/* 8045DEF4 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 8045DEF8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8045DEFC 41 81 00 10 */ bgt lbl_8045DF0C -/* 8045DF00 C0 1F 00 34 */ lfs f0, 0x34(r31) -/* 8045DF04 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8045DF08 40 80 00 0C */ bge lbl_8045DF14 -lbl_8045DF0C: -/* 8045DF0C 38 60 00 00 */ li r3, 0 -/* 8045DF10 48 00 00 48 */ b lbl_8045DF58 -lbl_8045DF14: -/* 8045DF14 7F C3 F3 78 */ mr r3, r30 -/* 8045DF18 7F A4 EB 78 */ mr r4, r29 -/* 8045DF1C 4B BB C8 81 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8045DF20 2C 03 30 00 */ cmpwi r3, 0x3000 -/* 8045DF24 40 81 00 0C */ ble lbl_8045DF30 -/* 8045DF28 38 60 00 00 */ li r3, 0 -/* 8045DF2C 48 00 00 2C */ b lbl_8045DF58 -lbl_8045DF30: -/* 8045DF30 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 8045DF34 C0 1F 00 00 */ lfs f0, 0(r31) -/* 8045DF38 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8045DF3C 40 81 00 10 */ ble lbl_8045DF4C -/* 8045DF40 38 00 00 01 */ li r0, 1 -/* 8045DF44 98 1D 05 85 */ stb r0, 0x585(r29) -/* 8045DF48 48 00 00 0C */ b lbl_8045DF54 -lbl_8045DF4C: -/* 8045DF4C 38 00 00 00 */ li r0, 0 -/* 8045DF50 98 1D 05 85 */ stb r0, 0x585(r29) -lbl_8045DF54: -/* 8045DF54 38 60 00 01 */ li r3, 1 -lbl_8045DF58: -/* 8045DF58 39 61 00 40 */ addi r11, r1, 0x40 -/* 8045DF5C 4B F0 42 CD */ bl _restgpr_29 -/* 8045DF60 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8045DF64 7C 08 03 A6 */ mtlr r0 -/* 8045DF68 38 21 00 40 */ addi r1, r1, 0x40 -/* 8045DF6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkDraw__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkDraw__12daDbDoor00_cFv.s deleted file mode 100644 index acdeda397..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkDraw__12daDbDoor00_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8045E2DC: -/* 8045E2DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E2E0 7C 08 02 A6 */ mflr r0 -/* 8045E2E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E2E8 7C 64 1B 78 */ mr r4, r3 -/* 8045E2EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E2F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E2F4 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8045E2F8 88 04 04 E2 */ lbz r0, 0x4e2(r4) -/* 8045E2FC 7C 04 07 74 */ extsb r4, r0 -/* 8045E300 4B BC 61 E9 */ bl checkRoomDisp__20dStage_roomControl_cCFi -/* 8045E304 30 03 FF FF */ addic r0, r3, -1 -/* 8045E308 7C 60 19 10 */ subfe r3, r0, r3 -/* 8045E30C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E310 7C 08 03 A6 */ mtlr r0 -/* 8045E314 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E318 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/create__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/create__12daDbDoor00_cFv.s deleted file mode 100644 index 59b8a36df..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/create__12daDbDoor00_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8045D9A8: -/* 8045D9A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045D9AC 7C 08 02 A6 */ mflr r0 -/* 8045D9B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045D9B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045D9B8 7C 7F 1B 78 */ mr r31, r3 -/* 8045D9BC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8045D9C0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8045D9C4 40 82 00 1C */ bne lbl_8045D9E0 -/* 8045D9C8 28 1F 00 00 */ cmplwi r31, 0 -/* 8045D9CC 41 82 00 08 */ beq lbl_8045D9D4 -/* 8045D9D0 4B BB B1 95 */ bl __ct__10fopAc_ac_cFv -lbl_8045D9D4: -/* 8045D9D4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8045D9D8 60 00 00 08 */ ori r0, r0, 8 -/* 8045D9DC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8045D9E0: -/* 8045D9E0 7F E3 FB 78 */ mr r3, r31 -/* 8045D9E4 4B FF FA 8D */ bl getAlwaysArcName__12daDbDoor00_cFv -/* 8045D9E8 7C 64 1B 78 */ mr r4, r3 -/* 8045D9EC 38 7F 05 70 */ addi r3, r31, 0x570 -/* 8045D9F0 4B BC F4 CD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8045D9F4 2C 03 00 04 */ cmpwi r3, 4 -/* 8045D9F8 41 82 00 08 */ beq lbl_8045DA00 -/* 8045D9FC 48 00 00 58 */ b lbl_8045DA54 -lbl_8045DA00: -/* 8045DA00 7F E3 FB 78 */ mr r3, r31 -/* 8045DA04 4B FF FA 9D */ bl getBmdArcName__12daDbDoor00_cFv -/* 8045DA08 7C 64 1B 78 */ mr r4, r3 -/* 8045DA0C 38 7F 05 68 */ addi r3, r31, 0x568 -/* 8045DA10 4B BC F4 AD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8045DA14 2C 03 00 04 */ cmpwi r3, 4 -/* 8045DA18 41 82 00 08 */ beq lbl_8045DA20 -/* 8045DA1C 48 00 00 38 */ b lbl_8045DA54 -lbl_8045DA20: -/* 8045DA20 7F E3 FB 78 */ mr r3, r31 -/* 8045DA24 3C 80 80 46 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x8045D574@ha */ -/* 8045DA28 38 84 D5 74 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x8045D574@l */ -/* 8045DA2C 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008200@ha */ -/* 8045DA30 38 A5 82 00 */ addi r5, r5, 0x8200 /* 0x00008200@l */ -/* 8045DA34 4B BB CA 7D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8045DA38 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8045DA3C 40 82 00 0C */ bne lbl_8045DA48 -/* 8045DA40 38 60 00 05 */ li r3, 5 -/* 8045DA44 48 00 00 10 */ b lbl_8045DA54 -lbl_8045DA48: -/* 8045DA48 7F E3 FB 78 */ mr r3, r31 -/* 8045DA4C 4B FF FE A9 */ bl CreateInit__12daDbDoor00_cFv -/* 8045DA50 38 60 00 04 */ li r3, 4 -lbl_8045DA54: -/* 8045DA54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045DA58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045DA5C 7C 08 03 A6 */ mtlr r0 -/* 8045DA60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045DA64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 6a0bd0b5f..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8045E50C: -/* 8045E50C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E510 7C 08 02 A6 */ mflr r0 -/* 8045E514 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E518 4B FF F4 91 */ bl create__12daDbDoor00_cFv -/* 8045E51C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E520 7C 08 03 A6 */ mtlr r0 -/* 8045E524 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E528 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Delete__FP12daDbDoor00_c.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Delete__FP12daDbDoor00_c.s deleted file mode 100644 index 37bd4cbbb..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Delete__FP12daDbDoor00_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8045E4E8: -/* 8045E4E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E4EC 7C 08 02 A6 */ mflr r0 -/* 8045E4F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E4F4 4B FF FF 35 */ bl Delete__12daDbDoor00_cFv -/* 8045E4F8 38 60 00 01 */ li r3, 1 -/* 8045E4FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E500 7C 08 03 A6 */ mtlr r0 -/* 8045E504 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E508 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Draw__FP12daDbDoor00_c.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Draw__FP12daDbDoor00_c.s deleted file mode 100644 index c7fa18a7d..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Draw__FP12daDbDoor00_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8045E49C: -/* 8045E49C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E4A0 7C 08 02 A6 */ mflr r0 -/* 8045E4A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E4A8 4B FF FE 75 */ bl draw__12daDbDoor00_cFv -/* 8045E4AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E4B0 7C 08 03 A6 */ mtlr r0 -/* 8045E4B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E4B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Execute__FP12daDbDoor00_c.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Execute__FP12daDbDoor00_c.s deleted file mode 100644 index 7d3f43fbc..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Execute__FP12daDbDoor00_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8045E4BC: -/* 8045E4BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E4C0 7C 08 02 A6 */ mflr r0 -/* 8045E4C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E4C8 4B FF FD 25 */ bl execute__12daDbDoor00_cFv -/* 8045E4CC 38 60 00 01 */ li r3, 1 -/* 8045E4D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E4D4 7C 08 03 A6 */ mtlr r0 -/* 8045E4D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E4DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/demoProc__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/demoProc__12daDbDoor00_cFv.s deleted file mode 100644 index 3a49cc698..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/demoProc__12daDbDoor00_cFv.s +++ /dev/null @@ -1,249 +0,0 @@ -lbl_8045DAB0: -/* 8045DAB0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8045DAB4 7C 08 02 A6 */ mflr r0 -/* 8045DAB8 90 01 00 44 */ stw r0, 0x44(r1) -/* 8045DABC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8045DAC0 4B F0 47 11 */ bl _savegpr_26 -/* 8045DAC4 7C 7A 1B 78 */ mr r26, r3 -/* 8045DAC8 3C 80 80 46 */ lis r4, lit_3806@ha /* 0x8045E534@ha */ -/* 8045DACC 3B A4 E5 34 */ addi r29, r4, lit_3806@l /* 0x8045E534@l */ -/* 8045DAD0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045DAD4 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045DAD8 83 7E 5D AC */ lwz r27, 0x5dac(r30) -/* 8045DADC 4B FF FF 8D */ bl getDemoAction__12daDbDoor00_cFv -/* 8045DAE0 7C 7F 1B 78 */ mr r31, r3 -/* 8045DAE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045DAE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045DAEC 3B 83 4F F8 */ addi r28, r3, 0x4ff8 -/* 8045DAF0 7F 83 E3 78 */ mr r3, r28 -/* 8045DAF4 80 9A 05 98 */ lwz r4, 0x598(r26) -/* 8045DAF8 4B BE A2 55 */ bl getIsAddvance__16dEvent_manager_cFi -/* 8045DAFC 2C 03 00 00 */ cmpwi r3, 0 -/* 8045DB00 41 82 01 54 */ beq lbl_8045DC54 -/* 8045DB04 28 1F 00 08 */ cmplwi r31, 8 -/* 8045DB08 41 81 01 4C */ bgt lbl_8045DC54 -/* 8045DB0C 3C 60 80 46 */ lis r3, lit_3957@ha /* 0x8045E6AC@ha */ -/* 8045DB10 38 63 E6 AC */ addi r3, r3, lit_3957@l /* 0x8045E6AC@l */ -/* 8045DB14 57 E0 10 3A */ slwi r0, r31, 2 -/* 8045DB18 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8045DB1C 7C 09 03 A6 */ mtctr r0 -/* 8045DB20 4E 80 04 20 */ bctr -lbl_8045DB24: -/* 8045DB24 7F 43 D3 78 */ mr r3, r26 -/* 8045DB28 4B FF FC 1D */ bl calcMtx__12daDbDoor00_cFv -/* 8045DB2C C0 1A 05 9C */ lfs f0, 0x59c(r26) -/* 8045DB30 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8045DB34 C0 1A 05 A0 */ lfs f0, 0x5a0(r26) -/* 8045DB38 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8045DB3C C0 1A 05 A4 */ lfs f0, 0x5a4(r26) -/* 8045DB40 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8045DB44 7F 83 E3 78 */ mr r3, r28 -/* 8045DB48 38 81 00 10 */ addi r4, r1, 0x10 -/* 8045DB4C 4B BE A8 79 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 8045DB50 48 00 01 04 */ b lbl_8045DC54 -lbl_8045DB54: -/* 8045DB54 A8 7A 04 DE */ lha r3, 0x4de(r26) -/* 8045DB58 38 03 7F FF */ addi r0, r3, 0x7fff -/* 8045DB5C B0 01 00 08 */ sth r0, 8(r1) -/* 8045DB60 B0 1B 06 06 */ sth r0, 0x606(r27) -/* 8045DB64 48 00 00 F0 */ b lbl_8045DC54 -lbl_8045DB68: -/* 8045DB68 38 00 00 00 */ li r0, 0 -/* 8045DB6C B0 1A 05 8C */ sth r0, 0x58c(r26) -/* 8045DB70 38 00 00 1E */ li r0, 0x1e -/* 8045DB74 B0 1A 05 C2 */ sth r0, 0x5c2(r26) -/* 8045DB78 88 1A 04 E2 */ lbz r0, 0x4e2(r26) -/* 8045DB7C 7C 03 07 74 */ extsb r3, r0 -/* 8045DB80 4B BC F4 ED */ bl dComIfGp_getReverb__Fi -/* 8045DB84 7C 67 1B 78 */ mr r7, r3 -/* 8045DB88 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008009C@ha */ -/* 8045DB8C 38 03 00 9C */ addi r0, r3, 0x009C /* 0x0008009C@l */ -/* 8045DB90 90 01 00 0C */ stw r0, 0xc(r1) -/* 8045DB94 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8045DB98 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8045DB9C 80 63 00 00 */ lwz r3, 0(r3) -/* 8045DBA0 38 81 00 0C */ addi r4, r1, 0xc -/* 8045DBA4 38 BA 05 38 */ addi r5, r26, 0x538 -/* 8045DBA8 38 C0 00 00 */ li r6, 0 -/* 8045DBAC C0 3D 00 1C */ lfs f1, 0x1c(r29) -/* 8045DBB0 FC 40 08 90 */ fmr f2, f1 -/* 8045DBB4 C0 7D 00 20 */ lfs f3, 0x20(r29) -/* 8045DBB8 FC 80 18 90 */ fmr f4, f3 -/* 8045DBBC 39 00 00 00 */ li r8, 0 -/* 8045DBC0 4B E4 DD C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8045DBC4 48 00 00 90 */ b lbl_8045DC54 -lbl_8045DBC8: -/* 8045DBC8 C0 1A 05 A8 */ lfs f0, 0x5a8(r26) -/* 8045DBCC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8045DBD0 C0 1A 05 AC */ lfs f0, 0x5ac(r26) -/* 8045DBD4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8045DBD8 C0 1A 05 B0 */ lfs f0, 0x5b0(r26) -/* 8045DBDC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8045DBE0 7F 83 E3 78 */ mr r3, r28 -/* 8045DBE4 38 81 00 10 */ addi r4, r1, 0x10 -/* 8045DBE8 4B BE A7 DD */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 8045DBEC 48 00 00 68 */ b lbl_8045DC54 -lbl_8045DBF0: -/* 8045DBF0 C0 1A 05 B4 */ lfs f0, 0x5b4(r26) -/* 8045DBF4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8045DBF8 C0 1A 05 B8 */ lfs f0, 0x5b8(r26) -/* 8045DBFC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8045DC00 C0 1A 05 BC */ lfs f0, 0x5bc(r26) -/* 8045DC04 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8045DC08 7F 83 E3 78 */ mr r3, r28 -/* 8045DC0C 38 81 00 10 */ addi r4, r1, 0x10 -/* 8045DC10 4B BE A7 B5 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 8045DC14 48 00 00 40 */ b lbl_8045DC54 -lbl_8045DC18: -/* 8045DC18 7F 43 D3 78 */ mr r3, r26 -/* 8045DC1C 4B FF FB 29 */ bl calcMtx__12daDbDoor00_cFv -/* 8045DC20 38 00 00 00 */ li r0, 0 -/* 8045DC24 B0 1A 05 90 */ sth r0, 0x590(r26) -/* 8045DC28 7F 83 E3 78 */ mr r3, r28 -/* 8045DC2C 80 9A 05 98 */ lwz r4, 0x598(r26) -/* 8045DC30 3C A0 80 46 */ lis r5, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045DC34 38 A5 E5 6C */ addi r5, r5, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045DC38 38 A5 00 B8 */ addi r5, r5, 0xb8 -/* 8045DC3C 38 C0 00 03 */ li r6, 3 -/* 8045DC40 4B BE A4 AD */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 8045DC44 28 03 00 00 */ cmplwi r3, 0 -/* 8045DC48 41 82 00 0C */ beq lbl_8045DC54 -/* 8045DC4C 80 03 00 00 */ lwz r0, 0(r3) -/* 8045DC50 B0 1A 05 90 */ sth r0, 0x590(r26) -lbl_8045DC54: -/* 8045DC54 2C 1F 00 05 */ cmpwi r31, 5 -/* 8045DC58 41 82 01 D4 */ beq lbl_8045DE2C -/* 8045DC5C 40 80 00 14 */ bge lbl_8045DC70 -/* 8045DC60 2C 1F 00 03 */ cmpwi r31, 3 -/* 8045DC64 41 82 01 C8 */ beq lbl_8045DE2C -/* 8045DC68 40 80 00 14 */ bge lbl_8045DC7C -/* 8045DC6C 48 00 01 B4 */ b lbl_8045DE20 -lbl_8045DC70: -/* 8045DC70 2C 1F 00 08 */ cmpwi r31, 8 -/* 8045DC74 41 82 00 F8 */ beq lbl_8045DD6C -/* 8045DC78 48 00 01 A8 */ b lbl_8045DE20 -lbl_8045DC7C: -/* 8045DC7C A8 7A 05 8C */ lha r3, 0x58c(r26) -/* 8045DC80 2C 03 00 FA */ cmpwi r3, 0xfa -/* 8045DC84 40 80 00 0C */ bge lbl_8045DC90 -/* 8045DC88 38 03 00 32 */ addi r0, r3, 0x32 -/* 8045DC8C B0 1A 05 8C */ sth r0, 0x58c(r26) -lbl_8045DC90: -/* 8045DC90 A8 7A 05 8C */ lha r3, 0x58c(r26) -/* 8045DC94 A8 1A 05 8A */ lha r0, 0x58a(r26) -/* 8045DC98 7C 03 00 50 */ subf r0, r3, r0 -/* 8045DC9C 2C 00 E3 8F */ cmpwi r0, -7281 -/* 8045DCA0 40 80 00 1C */ bge lbl_8045DCBC -/* 8045DCA4 38 00 E3 8F */ li r0, -7281 -/* 8045DCA8 B0 1A 05 8A */ sth r0, 0x58a(r26) -/* 8045DCAC 7F 83 E3 78 */ mr r3, r28 -/* 8045DCB0 80 9A 05 98 */ lwz r4, 0x598(r26) -/* 8045DCB4 4B BE A4 C9 */ bl cutEnd__16dEvent_manager_cFi -/* 8045DCB8 48 00 00 08 */ b lbl_8045DCC0 -lbl_8045DCBC: -/* 8045DCBC B0 1A 05 8A */ sth r0, 0x58a(r26) -lbl_8045DCC0: -/* 8045DCC0 7F 43 D3 78 */ mr r3, r26 -/* 8045DCC4 4B FF FA 81 */ bl calcMtx__12daDbDoor00_cFv -/* 8045DCC8 88 1A 05 85 */ lbz r0, 0x585(r26) -/* 8045DCCC 28 00 00 00 */ cmplwi r0, 0 -/* 8045DCD0 41 82 00 1C */ beq lbl_8045DCEC -/* 8045DCD4 A8 9A 05 8A */ lha r4, 0x58a(r26) -/* 8045DCD8 A8 7A 04 DE */ lha r3, 0x4de(r26) -/* 8045DCDC 38 03 7F FF */ addi r0, r3, 0x7fff -/* 8045DCE0 7C 04 00 50 */ subf r0, r4, r0 -/* 8045DCE4 7C 00 07 34 */ extsh r0, r0 -/* 8045DCE8 48 00 00 18 */ b lbl_8045DD00 -lbl_8045DCEC: -/* 8045DCEC A8 7A 04 DE */ lha r3, 0x4de(r26) -/* 8045DCF0 A8 1A 05 8A */ lha r0, 0x58a(r26) -/* 8045DCF4 7C 63 02 14 */ add r3, r3, r0 -/* 8045DCF8 38 03 7F FF */ addi r0, r3, 0x7fff -/* 8045DCFC 7C 00 07 34 */ extsh r0, r0 -lbl_8045DD00: -/* 8045DD00 B0 01 00 08 */ sth r0, 8(r1) -/* 8045DD04 7F 63 DB 78 */ mr r3, r27 -/* 8045DD08 38 9A 05 9C */ addi r4, r26, 0x59c -/* 8045DD0C 7C 05 07 34 */ extsh r5, r0 -/* 8045DD10 38 C0 00 00 */ li r6, 0 -/* 8045DD14 81 9B 06 28 */ lwz r12, 0x628(r27) -/* 8045DD18 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 8045DD1C 7D 89 03 A6 */ mtctr r12 -/* 8045DD20 4E 80 04 21 */ bctrl -/* 8045DD24 A8 1A 05 C2 */ lha r0, 0x5c2(r26) -/* 8045DD28 2C 00 00 00 */ cmpwi r0, 0 -/* 8045DD2C 40 82 00 30 */ bne lbl_8045DD5C -/* 8045DD30 83 7E 5D AC */ lwz r27, 0x5dac(r30) -/* 8045DD34 7F 43 D3 78 */ mr r3, r26 -/* 8045DD38 4B BD C4 ED */ bl getExitNo__13door_param2_cFP10fopAc_ac_c -/* 8045DD3C 7C 64 1B 78 */ mr r4, r3 -/* 8045DD40 7F 63 DB 78 */ mr r3, r27 -/* 8045DD44 38 A0 00 FF */ li r5, 0xff -/* 8045DD48 38 C0 00 00 */ li r6, 0 -/* 8045DD4C 81 9B 06 28 */ lwz r12, 0x628(r27) -/* 8045DD50 81 8C 01 7C */ lwz r12, 0x17c(r12) -/* 8045DD54 7D 89 03 A6 */ mtctr r12 -/* 8045DD58 4E 80 04 21 */ bctrl -lbl_8045DD5C: -/* 8045DD5C A8 7A 05 C2 */ lha r3, 0x5c2(r26) -/* 8045DD60 38 03 FF FF */ addi r0, r3, -1 -/* 8045DD64 B0 1A 05 C2 */ sth r0, 0x5c2(r26) -/* 8045DD68 48 00 00 C4 */ b lbl_8045DE2C -lbl_8045DD6C: -/* 8045DD6C A8 1B 04 E6 */ lha r0, 0x4e6(r27) -/* 8045DD70 B0 01 00 08 */ sth r0, 8(r1) -/* 8045DD74 38 61 00 08 */ addi r3, r1, 8 -/* 8045DD78 A8 9A 04 DE */ lha r4, 0x4de(r26) -/* 8045DD7C 38 04 7F FF */ addi r0, r4, 0x7fff -/* 8045DD80 7C 04 07 34 */ extsh r4, r0 -/* 8045DD84 38 A0 00 0A */ li r5, 0xa -/* 8045DD88 38 C0 08 00 */ li r6, 0x800 -/* 8045DD8C 4B E1 28 7D */ bl cLib_addCalcAngleS2__FPssss -/* 8045DD90 C0 3B 04 D0 */ lfs f1, 0x4d0(r27) -/* 8045DD94 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8045DD98 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) -/* 8045DD9C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8045DDA0 C0 9B 04 D8 */ lfs f4, 0x4d8(r27) -/* 8045DDA4 D0 81 00 18 */ stfs f4, 0x18(r1) -/* 8045DDA8 C0 7D 00 24 */ lfs f3, 0x24(r29) -/* 8045DDAC EC 23 00 72 */ fmuls f1, f3, f1 -/* 8045DDB0 C0 5D 00 28 */ lfs f2, 0x28(r29) -/* 8045DDB4 C0 1A 05 9C */ lfs f0, 0x59c(r26) -/* 8045DDB8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8045DDBC EC 01 00 2A */ fadds f0, f1, f0 -/* 8045DDC0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8045DDC4 EC 23 01 32 */ fmuls f1, f3, f4 -/* 8045DDC8 C0 1A 05 A4 */ lfs f0, 0x5a4(r26) -/* 8045DDCC EC 02 00 32 */ fmuls f0, f2, f0 -/* 8045DDD0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8045DDD4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8045DDD8 7F 63 DB 78 */ mr r3, r27 -/* 8045DDDC 38 81 00 10 */ addi r4, r1, 0x10 -/* 8045DDE0 A8 A1 00 08 */ lha r5, 8(r1) -/* 8045DDE4 38 C0 00 00 */ li r6, 0 -/* 8045DDE8 81 9B 06 28 */ lwz r12, 0x628(r27) -/* 8045DDEC 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 8045DDF0 7D 89 03 A6 */ mtctr r12 -/* 8045DDF4 4E 80 04 21 */ bctrl -/* 8045DDF8 A8 7A 05 90 */ lha r3, 0x590(r26) -/* 8045DDFC 2C 03 00 00 */ cmpwi r3, 0 -/* 8045DE00 40 81 00 10 */ ble lbl_8045DE10 -/* 8045DE04 38 03 FF FF */ addi r0, r3, -1 -/* 8045DE08 B0 1A 05 90 */ sth r0, 0x590(r26) -/* 8045DE0C 48 00 00 20 */ b lbl_8045DE2C -lbl_8045DE10: -/* 8045DE10 7F 83 E3 78 */ mr r3, r28 -/* 8045DE14 80 9A 05 98 */ lwz r4, 0x598(r26) -/* 8045DE18 4B BE A3 65 */ bl cutEnd__16dEvent_manager_cFi -/* 8045DE1C 48 00 00 10 */ b lbl_8045DE2C -lbl_8045DE20: -/* 8045DE20 7F 83 E3 78 */ mr r3, r28 -/* 8045DE24 80 9A 05 98 */ lwz r4, 0x598(r26) -/* 8045DE28 4B BE A3 55 */ bl cutEnd__16dEvent_manager_cFi -lbl_8045DE2C: -/* 8045DE2C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8045DE30 4B F0 43 ED */ bl _restgpr_26 -/* 8045DE34 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8045DE38 7C 08 03 A6 */ mtlr r0 -/* 8045DE3C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8045DE40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/draw__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/draw__12daDbDoor00_cFv.s deleted file mode 100644 index 1c86a9c6d..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/draw__12daDbDoor00_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8045E31C: -/* 8045E31C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E320 7C 08 02 A6 */ mflr r0 -/* 8045E324 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E328 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045E32C 93 C1 00 08 */ stw r30, 8(r1) -/* 8045E330 7C 7F 1B 78 */ mr r31, r3 -/* 8045E334 4B FF FF A9 */ bl checkDraw__12daDbDoor00_cFv -/* 8045E338 2C 03 00 00 */ cmpwi r3, 0 -/* 8045E33C 40 82 00 34 */ bne lbl_8045E370 -/* 8045E340 88 1F 05 84 */ lbz r0, 0x584(r31) -/* 8045E344 28 00 00 00 */ cmplwi r0, 0 -/* 8045E348 41 82 00 20 */ beq lbl_8045E368 -/* 8045E34C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E350 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E354 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8045E358 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 8045E35C 4B C1 5E F5 */ bl Release__4cBgSFP9dBgW_Base -/* 8045E360 38 00 00 00 */ li r0, 0 -/* 8045E364 98 1F 05 84 */ stb r0, 0x584(r31) -lbl_8045E368: -/* 8045E368 38 60 00 01 */ li r3, 1 -/* 8045E36C 48 00 00 A4 */ b lbl_8045E410 -lbl_8045E370: -/* 8045E370 88 1F 05 84 */ lbz r0, 0x584(r31) -/* 8045E374 28 00 00 00 */ cmplwi r0, 0 -/* 8045E378 40 82 00 24 */ bne lbl_8045E39C -/* 8045E37C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E380 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E384 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8045E388 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 8045E38C 7F E5 FB 78 */ mr r5, r31 -/* 8045E390 4B C1 66 79 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 8045E394 38 00 00 01 */ li r0, 1 -/* 8045E398 98 1F 05 84 */ stb r0, 0x584(r31) -lbl_8045E39C: -/* 8045E39C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8045E3A0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8045E3A4 38 80 00 10 */ li r4, 0x10 -/* 8045E3A8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8045E3AC 38 DF 01 0C */ addi r6, r31, 0x10c -/* 8045E3B0 4B D4 54 15 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8045E3B4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8045E3B8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8045E3BC 80 9F 05 7C */ lwz r4, 0x57c(r31) -/* 8045E3C0 80 84 00 04 */ lwz r4, 4(r4) -/* 8045E3C4 38 BF 01 0C */ addi r5, r31, 0x10c -/* 8045E3C8 4B D4 69 D9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8045E3CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E3D0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E3D4 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 8045E3D8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8045E3DC 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8045E3E0 90 1E 00 48 */ stw r0, 0x48(r30) -/* 8045E3E4 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8045E3E8 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8045E3EC 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 8045E3F0 4B BA F8 D5 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8045E3F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045E3F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045E3FC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 8045E400 90 1E 00 48 */ stw r0, 0x48(r30) -/* 8045E404 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 8045E408 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 8045E40C 38 60 00 01 */ li r3, 1 -lbl_8045E410: -/* 8045E410 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045E414 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045E418 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E41C 7C 08 03 A6 */ mtlr r0 -/* 8045E420 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E424 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/execute__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/execute__12daDbDoor00_cFv.s deleted file mode 100644 index c2bd94f37..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/execute__12daDbDoor00_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8045E1EC: -/* 8045E1EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045E1F0 7C 08 02 A6 */ mflr r0 -/* 8045E1F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045E1F8 3C 80 80 46 */ lis r4, cNullVec__6Z2Calc@ha /* 0x8045E664@ha */ -/* 8045E1FC 38 84 E6 64 */ addi r4, r4, cNullVec__6Z2Calc@l /* 0x8045E664@l */ -/* 8045E200 3C A0 80 46 */ lis r5, data_8045E7D0@ha /* 0x8045E7D0@ha */ -/* 8045E204 38 E5 E7 D0 */ addi r7, r5, data_8045E7D0@l /* 0x8045E7D0@l */ -/* 8045E208 88 07 00 00 */ lbz r0, 0(r7) -/* 8045E20C 7C 00 07 75 */ extsb. r0, r0 -/* 8045E210 40 82 00 A0 */ bne lbl_8045E2B0 -/* 8045E214 80 A4 00 6C */ lwz r5, 0x6c(r4) -/* 8045E218 80 04 00 70 */ lwz r0, 0x70(r4) -/* 8045E21C 90 A4 00 B4 */ stw r5, 0xb4(r4) -/* 8045E220 90 04 00 B8 */ stw r0, 0xb8(r4) -/* 8045E224 80 04 00 74 */ lwz r0, 0x74(r4) -/* 8045E228 90 04 00 BC */ stw r0, 0xbc(r4) -/* 8045E22C 38 C4 00 B4 */ addi r6, r4, 0xb4 -/* 8045E230 80 A4 00 78 */ lwz r5, 0x78(r4) -/* 8045E234 80 04 00 7C */ lwz r0, 0x7c(r4) -/* 8045E238 90 A6 00 0C */ stw r5, 0xc(r6) -/* 8045E23C 90 06 00 10 */ stw r0, 0x10(r6) -/* 8045E240 80 04 00 80 */ lwz r0, 0x80(r4) -/* 8045E244 90 06 00 14 */ stw r0, 0x14(r6) -/* 8045E248 80 A4 00 84 */ lwz r5, 0x84(r4) -/* 8045E24C 80 04 00 88 */ lwz r0, 0x88(r4) -/* 8045E250 90 A6 00 18 */ stw r5, 0x18(r6) -/* 8045E254 90 06 00 1C */ stw r0, 0x1c(r6) -/* 8045E258 80 04 00 8C */ lwz r0, 0x8c(r4) -/* 8045E25C 90 06 00 20 */ stw r0, 0x20(r6) -/* 8045E260 80 A4 00 90 */ lwz r5, 0x90(r4) -/* 8045E264 80 04 00 94 */ lwz r0, 0x94(r4) -/* 8045E268 90 A6 00 24 */ stw r5, 0x24(r6) -/* 8045E26C 90 06 00 28 */ stw r0, 0x28(r6) -/* 8045E270 80 04 00 98 */ lwz r0, 0x98(r4) -/* 8045E274 90 06 00 2C */ stw r0, 0x2c(r6) -/* 8045E278 80 A4 00 9C */ lwz r5, 0x9c(r4) -/* 8045E27C 80 04 00 A0 */ lwz r0, 0xa0(r4) -/* 8045E280 90 A6 00 30 */ stw r5, 0x30(r6) -/* 8045E284 90 06 00 34 */ stw r0, 0x34(r6) -/* 8045E288 80 04 00 A4 */ lwz r0, 0xa4(r4) -/* 8045E28C 90 06 00 38 */ stw r0, 0x38(r6) -/* 8045E290 80 A4 00 A8 */ lwz r5, 0xa8(r4) -/* 8045E294 80 04 00 AC */ lwz r0, 0xac(r4) -/* 8045E298 90 A6 00 3C */ stw r5, 0x3c(r6) -/* 8045E29C 90 06 00 40 */ stw r0, 0x40(r6) -/* 8045E2A0 80 04 00 B0 */ lwz r0, 0xb0(r4) -/* 8045E2A4 90 06 00 44 */ stw r0, 0x44(r6) -/* 8045E2A8 38 00 00 01 */ li r0, 1 -/* 8045E2AC 98 07 00 00 */ stb r0, 0(r7) -lbl_8045E2B0: -/* 8045E2B0 88 03 05 86 */ lbz r0, 0x586(r3) -/* 8045E2B4 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8045E2B8 39 84 00 B4 */ addi r12, r4, 0xb4 -/* 8045E2BC 7D 8C 02 14 */ add r12, r12, r0 -/* 8045E2C0 4B F0 3D C5 */ bl __ptmf_scall -/* 8045E2C4 60 00 00 00 */ nop -/* 8045E2C8 38 60 00 01 */ li r3, 1 -/* 8045E2CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045E2D0 7C 08 03 A6 */ mtlr r0 -/* 8045E2D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045E2D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getAlwaysArcName__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getAlwaysArcName__12daDbDoor00_cFv.s deleted file mode 100644 index 37ac578fb..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getAlwaysArcName__12daDbDoor00_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8045D470: -/* 8045D470 3C 60 80 46 */ lis r3, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045D474 38 63 E5 6C */ addi r3, r3, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045D478 38 63 00 11 */ addi r3, r3, 0x11 -/* 8045D47C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdArcName__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdArcName__12daDbDoor00_cFv.s deleted file mode 100644 index 1935899a6..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdArcName__12daDbDoor00_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8045D4A0: -/* 8045D4A0 3C 60 80 46 */ lis r3, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045D4A4 38 63 E5 6C */ addi r3, r3, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045D4A8 38 63 00 45 */ addi r3, r3, 0x45 -/* 8045D4AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdName__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdName__12daDbDoor00_cFv.s deleted file mode 100644 index c5848b577..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdName__12daDbDoor00_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8045D4B0: -/* 8045D4B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045D4B4 7C 08 02 A6 */ mflr r0 -/* 8045D4B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045D4BC 4B BD CC D9 */ bl getDoorModel__13door_param2_cFP10fopAc_ac_c -/* 8045D4C0 7C 66 1B 78 */ mr r6, r3 -/* 8045D4C4 3C 60 80 46 */ lis r3, l_bmdName@ha /* 0x8045E7B0@ha */ -/* 8045D4C8 38 63 E7 B0 */ addi r3, r3, l_bmdName@l /* 0x8045E7B0@l */ -/* 8045D4CC 3C 80 80 46 */ lis r4, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045D4D0 38 84 E5 6C */ addi r4, r4, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045D4D4 38 84 00 4D */ addi r4, r4, 0x4d -/* 8045D4D8 3C A0 80 46 */ lis r5, l_bmd_base_name@ha /* 0x8045E684@ha */ -/* 8045D4DC 38 A5 E6 84 */ addi r5, r5, l_bmd_base_name@l /* 0x8045E684@l */ -/* 8045D4E0 80 A5 00 00 */ lwz r5, 0(r5) -/* 8045D4E4 4C C6 31 82 */ crclr 6 -/* 8045D4E8 4B F0 8F F5 */ bl sprintf -/* 8045D4EC 3C 60 80 46 */ lis r3, l_bmdName@ha /* 0x8045E7B0@ha */ -/* 8045D4F0 38 63 E7 B0 */ addi r3, r3, l_bmdName@l /* 0x8045E7B0@l */ -/* 8045D4F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045D4F8 7C 08 03 A6 */ mtlr r0 -/* 8045D4FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045D500 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDemoAction__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDemoAction__12daDbDoor00_cFv.s deleted file mode 100644 index 1d85833f3..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDemoAction__12daDbDoor00_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8045DA68: -/* 8045DA68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045DA6C 7C 08 02 A6 */ mflr r0 -/* 8045DA70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045DA74 7C 64 1B 78 */ mr r4, r3 -/* 8045DA78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045DA7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045DA80 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8045DA84 80 84 05 98 */ lwz r4, 0x598(r4) -/* 8045DA88 3C A0 80 46 */ lis r5, action_table@ha /* 0x8045E688@ha */ -/* 8045DA8C 38 A5 E6 88 */ addi r5, r5, action_table@l /* 0x8045E688@l */ -/* 8045DA90 38 C0 00 09 */ li r6, 9 -/* 8045DA94 38 E0 00 00 */ li r7, 0 -/* 8045DA98 39 00 00 00 */ li r8, 0 -/* 8045DA9C 4B BE A3 75 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 8045DAA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045DAA4 7C 08 03 A6 */ mtlr r0 -/* 8045DAA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045DAAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDoorModelData__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDoorModelData__12daDbDoor00_cFv.s deleted file mode 100644 index 2ed43a1a3..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDoorModelData__12daDbDoor00_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8045D504: -/* 8045D504 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8045D508 7C 08 02 A6 */ mflr r0 -/* 8045D50C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8045D510 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8045D514 93 C1 00 08 */ stw r30, 8(r1) -/* 8045D518 7C 7E 1B 78 */ mr r30, r3 -/* 8045D51C 4B FF FF 95 */ bl getBmdName__12daDbDoor00_cFv -/* 8045D520 4B BD 1F 15 */ bl dComIfG_getStageRes__FPCc -/* 8045D524 28 03 00 00 */ cmplwi r3, 0 -/* 8045D528 40 82 00 34 */ bne lbl_8045D55C -/* 8045D52C 7F C3 F3 78 */ mr r3, r30 -/* 8045D530 4B FF FF 81 */ bl getBmdName__12daDbDoor00_cFv -/* 8045D534 7C 7F 1B 78 */ mr r31, r3 -/* 8045D538 7F C3 F3 78 */ mr r3, r30 -/* 8045D53C 4B FF FF 65 */ bl getBmdArcName__12daDbDoor00_cFv -/* 8045D540 7F E4 FB 78 */ mr r4, r31 -/* 8045D544 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8045D548 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8045D54C 3C A5 00 02 */ addis r5, r5, 2 -/* 8045D550 38 C0 00 80 */ li r6, 0x80 -/* 8045D554 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8045D558 4B BD EE 25 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -lbl_8045D55C: -/* 8045D55C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8045D560 83 C1 00 08 */ lwz r30, 8(r1) -/* 8045D564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8045D568 7C 08 03 A6 */ mtlr r0 -/* 8045D56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8045D570 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDummyBmdName__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDummyBmdName__12daDbDoor00_cFv.s deleted file mode 100644 index c5b9b7406..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDummyBmdName__12daDbDoor00_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8045D490: -/* 8045D490 3C 60 80 46 */ lis r3, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045D494 38 63 E5 6C */ addi r3, r3, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045D498 38 63 00 2C */ addi r3, r3, 0x2c -/* 8045D49C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDzb__12daDbDoor00_cFv.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDzb__12daDbDoor00_cFv.s deleted file mode 100644 index d762545f7..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDzb__12daDbDoor00_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8045D480: -/* 8045D480 3C 60 80 46 */ lis r3, d_a_door_dbdoor00__stringBase0@ha /* 0x8045E56C@ha */ -/* 8045D484 38 63 E5 6C */ addi r3, r3, d_a_door_dbdoor00__stringBase0@l /* 0x8045E56C@l */ -/* 8045D488 38 63 00 18 */ addi r3, r3, 0x18 -/* 8045D48C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/nodeCallBack__FP8J3DJointi.s b/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/nodeCallBack__FP8J3DJointi.s deleted file mode 100644 index 8e9ea1883..000000000 --- a/asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/nodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_8045D378: -/* 8045D378 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8045D37C 7C 08 02 A6 */ mflr r0 -/* 8045D380 90 01 00 24 */ stw r0, 0x24(r1) -/* 8045D384 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045D388 4B F0 4E 51 */ bl _savegpr_28 -/* 8045D38C 2C 04 00 00 */ cmpwi r4, 0 -/* 8045D390 40 82 00 C4 */ bne lbl_8045D454 -/* 8045D394 A3 83 00 14 */ lhz r28, 0x14(r3) -/* 8045D398 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8045D39C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8045D3A0 83 E3 00 38 */ lwz r31, 0x38(r3) -/* 8045D3A4 83 BF 00 14 */ lwz r29, 0x14(r31) -/* 8045D3A8 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 8045D3AC 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8045D3B0 1F DC 00 30 */ mulli r30, r28, 0x30 -/* 8045D3B4 7C 60 F2 14 */ add r3, r0, r30 -/* 8045D3B8 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D3BC 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D3C0 4B EE 90 F1 */ bl PSMTXCopy -/* 8045D3C4 88 1D 05 C0 */ lbz r0, 0x5c0(r29) -/* 8045D3C8 7C 00 07 74 */ extsb r0, r0 -/* 8045D3CC 7C 1C 00 00 */ cmpw r28, r0 -/* 8045D3D0 40 82 00 2C */ bne lbl_8045D3FC -/* 8045D3D4 88 1D 05 85 */ lbz r0, 0x585(r29) -/* 8045D3D8 28 00 00 01 */ cmplwi r0, 1 -/* 8045D3DC 40 82 00 20 */ bne lbl_8045D3FC -/* 8045D3E0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D3E4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D3E8 A8 1D 05 8A */ lha r0, 0x58a(r29) -/* 8045D3EC 7C 00 00 D0 */ neg r0, r0 -/* 8045D3F0 7C 04 07 34 */ extsh r4, r0 -/* 8045D3F4 4B BA F0 41 */ bl mDoMtx_YrotM__FPA4_fs -/* 8045D3F8 48 00 00 30 */ b lbl_8045D428 -lbl_8045D3FC: -/* 8045D3FC 88 1D 05 C1 */ lbz r0, 0x5c1(r29) -/* 8045D400 7C 00 07 74 */ extsb r0, r0 -/* 8045D404 7C 1C 00 00 */ cmpw r28, r0 -/* 8045D408 40 82 00 20 */ bne lbl_8045D428 -/* 8045D40C 88 1D 05 85 */ lbz r0, 0x585(r29) -/* 8045D410 28 00 00 00 */ cmplwi r0, 0 -/* 8045D414 40 82 00 14 */ bne lbl_8045D428 -/* 8045D418 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D41C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D420 A8 9D 05 8A */ lha r4, 0x58a(r29) -/* 8045D424 4B BA F0 11 */ bl mDoMtx_YrotM__FPA4_fs -lbl_8045D428: -/* 8045D428 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D42C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D430 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 8045D434 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8045D438 7C 80 F2 14 */ add r4, r0, r30 -/* 8045D43C 4B EE 90 75 */ bl PSMTXCopy -/* 8045D440 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8045D444 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8045D448 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 8045D44C 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 8045D450 4B EE 90 61 */ bl PSMTXCopy -lbl_8045D454: -/* 8045D454 38 60 00 01 */ li r3, 1 -/* 8045D458 39 61 00 20 */ addi r11, r1, 0x20 -/* 8045D45C 4B F0 4D C9 */ bl _restgpr_28 -/* 8045D460 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8045D464 7C 08 03 A6 */ mtlr r0 -/* 8045D468 38 21 00 20 */ addi r1, r1, 0x20 -/* 8045D46C 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index e1cad14db..3573bce81 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -792,6 +792,8 @@ public: void i_changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); } + void changeDemoMoveAngle(s16 i_angle) { mDemo.setMoveAngle(i_angle); } + inline static u32 i_getLastSceneMode(); inline static u32 getLastSceneMode(); inline static bool checkWoodSwordEquip(); diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 36050fe6f..1265d0be1 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -2908,6 +2908,10 @@ inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int i_roomNo) { return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(i_roomNo); } +inline BOOL dComIfGp_roomControl_checkRoomDisp(int i_roomNo) { + return g_dComIfG_gameInfo.play.getRoomControl()->checkRoomDisp(i_roomNo); +} + inline BOOL dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 flag) { return g_dComIfG_gameInfo.play.getRoomControl()->checkStatusFlag(i_roomNo, flag); } diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h index 398af6531..72702e886 100644 --- a/include/d/d_door_param2.h +++ b/include/d/d_door_param2.h @@ -7,24 +7,24 @@ class fopAc_ac_c; class door_param2_c { public: - /* 8003A188 */ static u8 getKind(fopAc_ac_c* i_actor); - /* 8003A194 */ static u8 getDoorModel(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 u8 getFRoomNo(fopAc_ac_c* i_actor); - /* 8003A1C4 */ static u8 getBRoomNo(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 u8 isMsgDoor(fopAc_ac_c* i_actor); - /* 8003A200 */ static u8 getEventNo(fopAc_ac_c* i_actor); - /* 8003A20C */ static u8 getEventNo2(fopAc_ac_c* i_actor); + /* 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); + /* 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); + /* 8003A1F4 */ static u32 isMsgDoor(fopAc_ac_c* i_actor); + /* 8003A200 */ static u32 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); - /* 8003A230 */ static u8 getFLightInf(fopAc_ac_c* i_actor); - /* 8003A23C */ static u8 getBLightInf(fopAc_ac_c* i_actor); - /* 8003A248 */ static u8 getMFLightInf(fopAc_ac_c* i_actor); - /* 8003A254 */ static u8 getMBLightInf(fopAc_ac_c* i_actor); + /* 8003A230 */ static u32 getFLightInf(fopAc_ac_c* i_actor); + /* 8003A23C */ static u32 getBLightInf(fopAc_ac_c* i_actor); + /* 8003A248 */ static u32 getMFLightInf(fopAc_ac_c* i_actor); + /* 8003A254 */ static u32 getMBLightInf(fopAc_ac_c* i_actor); }; #endif /* D_D_DOOR_PARAM2_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index b1943fc7f..e919c1ffa 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -789,7 +789,7 @@ public: /* 800243B0 */ static JKRExpHeap* getMemoryBlock(int); /* 800243E8 */ static void setStayNo(int); /* 80024424 */ static void setNextStayNo(int); - /* 800244E8 */ bool checkRoomDisp(int) const; + /* 800244E8 */ BOOL checkRoomDisp(int) const; /* 8002451C */ int loadRoom(int, u8*, bool); /* 8002471C */ void zoneCountCheck(int) const; /* 80024844 */ static JKRExpHeap* createMemoryBlock(int, u32); diff --git a/include/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.h b/include/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.h index bb3ddd340..a79636d5d 100644 --- a/include/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.h +++ b/include/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.h @@ -1,6 +1,60 @@ #ifndef D_A_DOOR_DBDOOR00_H #define D_A_DOOR_DBDOOR00_H -#include "dolphin/types.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daDbDoor00_c : public fopAc_ac_c { +public: + /* 8045D470 */ char* getAlwaysArcName(); + /* 8045D480 */ char* getDzb(); + /* 8045D490 */ char* getDummyBmdName(); + /* 8045D4A0 */ char* getBmdArcName(); + /* 8045D4B0 */ char* getBmdName(); + /* 8045D504 */ J3DModelData* getDoorModelData(); + /* 8045D594 */ int CreateHeap(); + /* 8045D744 */ void calcMtx(); + /* 8045D8F4 */ int CreateInit(); + /* 8045D9A8 */ int create(); + /* 8045DA68 */ int getDemoAction(); + /* 8045DAB0 */ void demoProc(); + /* 8045DE44 */ int checkArea(); + /* 8045DF70 */ int checkUnlock(); + /* 8045DF78 */ int actionWait(); + /* 8045DF9C */ int actionLockWait(); + /* 8045E000 */ int actionLockOff(); + /* 8045E094 */ int actionLockDemo(); + /* 8045E108 */ int actionCloseWait(); + /* 8045E1C8 */ int actionOpen(); + /* 8045E1EC */ int execute(); + /* 8045E2DC */ int checkDraw(); + /* 8045E31C */ int draw(); + /* 8045E428 */ int Delete(); + + void setAction(u8 i_action) { mAction = i_action; } + + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ request_of_phase_process_class mPhaseReq2; + /* 0x578 */ J3DModel* mpModel; + /* 0x57C */ J3DModel* mpModel2; + /* 0x580 */ dBgW* mpBgW; + /* 0x584 */ u8 field_0x584; + /* 0x585 */ u8 field_0x585; + /* 0x586 */ u8 mAction; + /* 0x587 */ u8 field_0x587[0x58A - 0x587]; + /* 0x58A */ s16 field_0x58a; + /* 0x58C */ s16 field_0x58c; + /* 0x58E */ u8 field_0x58E[0x590 - 0x58E]; + /* 0x590 */ s16 field_0x590; + /* 0x594 */ s32 field_0x594; + /* 0x598 */ s32 field_0x598; + /* 0x59C */ cXyz field_0x59c; + /* 0x5A8 */ cXyz field_0x5a8; + /* 0x5B4 */ cXyz field_0x5b4; + /* 0x5C0 */ s8 field_0x5c0; + /* 0x5C1 */ s8 field_0x5c1; + /* 0x5C2 */ s16 field_0x5c2; +}; #endif /* D_A_DOOR_DBDOOR00_H */ diff --git a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp index 0d580c542..4e49b65e2 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp @@ -4,347 +4,64 @@ // #include "rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "MSL_C/MSL_Common/Src/printf.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/d_door_param2.h" +#include "d/d_procname.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct door_param2_c { - /* 8003A194 */ void getDoorModel(fopAc_ac_c*); - /* 8003A1B8 */ void getFRoomNo(fopAc_ac_c*); - /* 8003A224 */ void getExitNo(fopAc_ac_c*); -}; - -struct daDbDoor00_c { - /* 8045D470 */ void getAlwaysArcName(); - /* 8045D480 */ void getDzb(); - /* 8045D490 */ void getDummyBmdName(); - /* 8045D4A0 */ void getBmdArcName(); - /* 8045D4B0 */ void getBmdName(); - /* 8045D504 */ void getDoorModelData(); - /* 8045D594 */ void CreateHeap(); - /* 8045D744 */ void calcMtx(); - /* 8045D8F4 */ void CreateInit(); - /* 8045D9A8 */ void create(); - /* 8045DA68 */ void getDemoAction(); - /* 8045DAB0 */ void demoProc(); - /* 8045DE44 */ void checkArea(); - /* 8045DF70 */ bool checkUnlock(); - /* 8045DF78 */ void actionWait(); - /* 8045DF9C */ void actionLockWait(); - /* 8045E000 */ void actionLockOff(); - /* 8045E094 */ void actionLockDemo(); - /* 8045E108 */ void actionCloseWait(); - /* 8045E1C8 */ void actionOpen(); - /* 8045E1EC */ void execute(); - /* 8045E2DC */ void checkDraw(); - /* 8045E31C */ void draw(); - /* 8045E428 */ void Delete(); -}; - -struct dStage_roomControl_c { - /* 800244E8 */ void checkRoomDisp(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -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 dEvt_info_c { - /* 80043428 */ void setEventName(char*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047ADC */ void endCheckOld(char const*); - /* 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 dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -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 JUTNameTab { - /* 802DEA58 */ void getIndex(char const*) const; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -// -// Forward References: -// - -extern "C" static void nodeCallBack__FP8J3DJointi(); -extern "C" void getAlwaysArcName__12daDbDoor00_cFv(); -extern "C" void getDzb__12daDbDoor00_cFv(); -extern "C" void getDummyBmdName__12daDbDoor00_cFv(); -extern "C" void getBmdArcName__12daDbDoor00_cFv(); -extern "C" void getBmdName__12daDbDoor00_cFv(); -extern "C" void getDoorModelData__12daDbDoor00_cFv(); -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void CreateHeap__12daDbDoor00_cFv(); -extern "C" void calcMtx__12daDbDoor00_cFv(); -extern "C" void CreateInit__12daDbDoor00_cFv(); -extern "C" void create__12daDbDoor00_cFv(); -extern "C" void getDemoAction__12daDbDoor00_cFv(); -extern "C" void demoProc__12daDbDoor00_cFv(); -extern "C" void checkArea__12daDbDoor00_cFv(); -extern "C" bool checkUnlock__12daDbDoor00_cFv(); -extern "C" void actionWait__12daDbDoor00_cFv(); -extern "C" void actionLockWait__12daDbDoor00_cFv(); -extern "C" void actionLockOff__12daDbDoor00_cFv(); -extern "C" void actionLockDemo__12daDbDoor00_cFv(); -extern "C" void actionCloseWait__12daDbDoor00_cFv(); -extern "C" void actionOpen__12daDbDoor00_cFv(); -extern "C" void execute__12daDbDoor00_cFv(); -extern "C" void checkDraw__12daDbDoor00_cFv(); -extern "C" void draw__12daDbDoor00_cFv(); -extern "C" void Delete__12daDbDoor00_cFv(); -extern "C" static void daDbdoor00_Draw__FP12daDbDoor00_c(); -extern "C" static void daDbdoor00_Execute__FP12daDbDoor00_c(); -extern "C" static bool daDbdoor00_IsDelete__FP12daDbDoor00_c(); -extern "C" static void daDbdoor00_Delete__FP12daDbDoor00_c(); -extern "C" static void daDbdoor00_Create__FP10fopAc_ac_c(); extern "C" extern char const* const d_a_door_dbdoor00__stringBase0; -extern "C" extern void* g_profile_DBDOOR[12]; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void push__14mDoMtx_stack_cFv(); -extern "C" void pop__14mDoMtx_stack_cFv(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs(); -extern "C" void checkRoomDisp__20dStage_roomControl_cCFi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void dComIfG_getStageRes__FPCc(); -extern "C" void getDoorModel__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getFRoomNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getExitNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void setEventName__11dEvt_info_cFPc(); -extern "C" void endCheckOld__16dEvent_manager_cFPCc(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void setGoal__16dEvent_manager_cFP4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void getIndex__10JUTNameTabCFPCc(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void sprintf(); -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 mCurrentMtx__6J3DSys[48]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// /* 8045D378-8045D470 000078 00F8+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void nodeCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/nodeCallBack__FP8J3DJointi.s" +static int nodeCallBack(J3DJoint* i_joint, int param_1) { + if (param_1 == 0) { + u16 jointNo = i_joint->getJntNo(); + J3DModel* model = j3dSys.getModel(); + daDbDoor00_c* area = (daDbDoor00_c*)model->getUserArea(); + MTXCopy(model->i_getAnmMtx(jointNo), mDoMtx_stack_c::get()); + if (jointNo == area->field_0x5c0 && area->field_0x585 == 1) { + mDoMtx_stack_c::YrotM(-area->field_0x58a); + } else if (jointNo == area->field_0x5c1 && area->field_0x585 == 0) { + mDoMtx_stack_c::YrotM(area->field_0x58a); + } + model->i_setAnmMtx(jointNo, mDoMtx_stack_c::get()); + mDoMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + } + return 1; } -#pragma pop -/* ############################################################################################## */ /* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push #pragma force_active on SECTION_DEAD static char const* const stringBase_8045E56C = "door-pushDouble_"; -SECTION_DEAD static char const* const stringBase_8045E57D = "static"; #pragma pop /* 8045D470-8045D480 000170 0010+00 3/3 0/0 0/0 .text getAlwaysArcName__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::getAlwaysArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getAlwaysArcName__12daDbDoor00_cFv.s" +char* daDbDoor00_c::getAlwaysArcName() { + return "static"; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E584 = "door-pushDouble.dzb"; -#pragma pop /* 8045D480-8045D490 000180 0010+00 1/1 0/0 0/0 .text getDzb__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::getDzb() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDzb__12daDbDoor00_cFv.s" +char* daDbDoor00_c::getDzb() { + return "door-pushDouble.dzb"; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E598 = "door-pushDoubleDummy.bmd"; -#pragma pop /* 8045D490-8045D4A0 000190 0010+00 1/1 0/0 0/0 .text getDummyBmdName__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::getDummyBmdName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDummyBmdName__12daDbDoor00_cFv.s" +char* daDbDoor00_c::getDummyBmdName() { + return "door-pushDoubleDummy.bmd"; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E5B1 = "DbDoor0"; -#pragma pop /* 8045D4A0-8045D4B0 0001A0 0010+00 3/3 0/0 0/0 .text getBmdArcName__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::getBmdArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdArcName__12daDbDoor00_cFv.s" +char* daDbDoor00_c::getBmdArcName() { + return "DbDoor0"; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E5B9 = "%s%02d.bmd"; -#pragma pop /* 8045E664-8045E670 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -364,538 +81,417 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { /* 8045E684-8045E688 -00001 0004+00 1/1 0/0 0/0 .data l_bmd_base_name */ SECTION_DATA static void* l_bmd_base_name = (void*)&d_a_door_dbdoor00__stringBase0; -/* 8045E7B0-8045E7D0 000000 0020+00 1/1 0/0 0/0 .bss l_bmdName$3699 */ -static u8 l_bmdName[32]; - /* 8045D4B0-8045D504 0001B0 0054+00 1/1 0/0 0/0 .text getBmdName__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::getBmdName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getBmdName__12daDbDoor00_cFv.s" +char* daDbDoor00_c::getBmdName() { + static char l_bmdName[32]; + sprintf(l_bmdName, "%s%02d.bmd", l_bmd_base_name, door_param2_c::getDoorModel(this)); + return l_bmdName; } -#pragma pop /* 8045D504-8045D574 000204 0070+00 1/1 0/0 0/0 .text getDoorModelData__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::getDoorModelData() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDoorModelData__12daDbDoor00_cFv.s" +J3DModelData* daDbDoor00_c::getDoorModelData() { + J3DModelData* res = (J3DModelData*)dComIfG_getStageRes(getBmdName()); + if (res == NULL) { + res = (J3DModelData*)dComIfG_getObjectRes(getBmdArcName(), getBmdName()); + } + return res; } -#pragma pop /* 8045D574-8045D594 000274 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_dbdoor00/d_a_door_dbdoor00/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E5C4 = "DbDoor00_L"; -SECTION_DEAD static char const* const stringBase_8045E5CF = "DbDoor00_R"; -#pragma pop /* 8045D594-8045D744 000294 01B0+00 1/1 0/0 0/0 .text CreateHeap__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateHeap__12daDbDoor00_cFv.s" +int daDbDoor00_c::CreateHeap() { + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(getAlwaysArcName(), getDummyBmdName()); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + modelData = getDoorModelData(); + mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel2 == NULL) { + return 0; + } + + field_0x5c0 = modelData->getJointName()->getIndex("DbDoor00_L"); + field_0x5c1 = modelData->getJointName()->getIndex("DbDoor00_R"); + modelData = mpModel2->getModelData(); + J3DJoint* nodePointerL = modelData->getJointNodePointer(field_0x5c0); + J3DJoint* nodePointerR = modelData->getJointNodePointer(field_0x5c1); + nodePointerL->setCallBack(nodeCallBack); + nodePointerR->setCallBack(nodeCallBack); + mpModel2->setUserArea((u32)this); + + mpBgW = new dBgW(); + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()); + if (dzb == NULL) { + return 0; + } + calcMtx(); + return mpBgW->Set(dzb, 1, &mpModel->getBaseTRMtx()) != 1 ? 1 : 0; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E534-8045E538 000000 0004+00 3/3 0/0 0/0 .rodata @3806 */ -SECTION_RODATA static u8 const lit_3806[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8045E534, &lit_3806); - -/* 8045E538-8045E53C 000004 0004+00 0/1 0/0 0/0 .rodata @3807 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3807 = -150.0f; -COMPILER_STRIP_GATE(0x8045E538, &lit_3807); -#pragma pop - -/* 8045E53C-8045E540 000008 0004+00 0/1 0/0 0/0 .rodata @3808 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3808 = -400.0f; -COMPILER_STRIP_GATE(0x8045E53C, &lit_3808); -#pragma pop - -/* 8045E540-8045E544 00000C 0004+00 0/1 0/0 0/0 .rodata @3809 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3809 = 80.0f; -COMPILER_STRIP_GATE(0x8045E540, &lit_3809); -#pragma pop - -/* 8045E544-8045E548 000010 0004+00 0/1 0/0 0/0 .rodata @3810 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3810 = 70.0f; -COMPILER_STRIP_GATE(0x8045E544, &lit_3810); -#pragma pop - -/* 8045E548-8045E54C 000014 0004+00 0/1 0/0 0/0 .rodata @3811 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3811 = -80.0f; -COMPILER_STRIP_GATE(0x8045E548, &lit_3811); -#pragma pop /* 8045D744-8045D8F4 000444 01B0+00 4/4 0/0 0/0 .text calcMtx__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::calcMtx() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/calcMtx__12daDbDoor00_cFv.s" -} -#pragma pop +void daDbDoor00_c::calcMtx() { + cXyz xyz; -/* ############################################################################################## */ -/* 8045E54C-8045E550 000018 0004+00 1/1 0/0 0/0 .rodata @3826 */ -SECTION_RODATA static f32 const lit_3826 = 250.0f; -COMPILER_STRIP_GATE(0x8045E54C, &lit_3826); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(orig.angle.y); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel2->i_setBaseTRMtx(mDoMtx_stack_c::get()); + xyz.set(0.0f, 0.0f, -150.0f); + mDoMtx_stack_c::multVec(&xyz, &field_0x5a8); + xyz.set(0.0f, 0.0f, -400.0f); + mDoMtx_stack_c::multVec(&xyz, &field_0x5b4); + + if (field_0x585 == 0) { + mDoMtx_stack_c::push(); + mDoMtx_stack_c::YrotS(-field_0x58a); + mDoMtx_stack_c::transM(80.0f, 0.0f, 70.0f); + mDoMtx_stack_c::multVecZero(&field_0x59c); + mDoMtx_stack_c::pop(); + mDoMtx_stack_c::multVec(&field_0x59c, &field_0x59c); + } + + if (field_0x585 == 1) { + mDoMtx_stack_c::push(); + mDoMtx_stack_c::YrotS(field_0x58a); + mDoMtx_stack_c::transM(-80.0f, 0.0f, 70.0f); + mDoMtx_stack_c::multVecZero(&field_0x59c); + mDoMtx_stack_c::pop(); + mDoMtx_stack_c::multVec(&field_0x59c, &field_0x59c); + } +} /* 8045D8F4-8045D9A8 0005F4 00B4+00 1/1 0/0 0/0 .text CreateInit__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::CreateInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/CreateInit__12daDbDoor00_cFv.s" +int daDbDoor00_c::CreateInit() { + s32 fRoomNo = door_param2_c::getFRoomNo(this); + if (fopAcM_GetRoomNo(this) == -1) { + fopAcM_SetRoomNo(this, fRoomNo); + mTevStr.mRoomNo = current.roomNo; + } + dComIfG_Bgsp().Regist(mpBgW, this); + field_0x584 = 1; + setAction(4); + field_0x594 = 0x1e; + mAttentionInfo.mPosition.y += 250.0f; + mEyePos.y += 250.0f; + mAttentionInfo.mFlags = 0x20; + calcMtx(); + mpBgW->Move(); + return 1; } -#pragma pop /* 8045D9A8-8045DA68 0006A8 00C0+00 1/1 0/0 0/0 .text create__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::create() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/create__12daDbDoor00_cFv.s" +int daDbDoor00_c::create() { + fopAcM_SetupActor(this, daDbDoor00_c); + + int phase = dComIfG_resLoad(&mPhaseReq2, getAlwaysArcName()); + if (phase != cPhs_COMPLEATE_e) { + return phase; + } + phase = dComIfG_resLoad(&mPhaseReq, getBmdArcName()); + if (phase != cPhs_COMPLEATE_e) { + return phase; + } + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x8200)) { + return cPhs_ERROR_e; + } + CreateInit(); + return cPhs_COMPLEATE_e; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E5DA = "WAIT"; -SECTION_DEAD static char const* const stringBase_8045E5DF = "SET_START"; -SECTION_DEAD static char const* const stringBase_8045E5E9 = "SET_ANGLE"; -SECTION_DEAD static char const* const stringBase_8045E5F3 = "END"; -SECTION_DEAD static char const* const stringBase_8045E5F7 = "OPEN"; -SECTION_DEAD static char const* const stringBase_8045E5FC = "STOP_OPEN"; -SECTION_DEAD static char const* const stringBase_8045E606 = "SET_GOAL"; -SECTION_DEAD static char const* const stringBase_8045E60F = "SET_GOAL2"; -SECTION_DEAD static char const* const stringBase_8045E619 = "ADJUSTMENT"; -#pragma pop - -/* 8045E688-8045E6AC -00001 0024+00 1/1 0/0 0/0 .data action_table$3865 */ -SECTION_DATA static void* action_table[9] = { - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x6E), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x73), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x7D), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x87), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x8B), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x90), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0x9A), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0xA3), - (void*)(((char*)&d_a_door_dbdoor00__stringBase0) + 0xAD), -}; /* 8045DA68-8045DAB0 000768 0048+00 1/1 0/0 0/0 .text getDemoAction__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::getDemoAction() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/getDemoAction__12daDbDoor00_cFv.s" +int daDbDoor00_c::getDemoAction() { + static char* action_table[9] = { + "WAIT", "SET_START", "SET_ANGLE", "END", "OPEN", + "STOP_OPEN", "SET_GOAL", "SET_GOAL2", "ADJUSTMENT", + }; + return dComIfGp_evmng_getMyActIdx(field_0x598, action_table, ARRAY_SIZE(action_table), 0, 0); } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E624 = "Timer"; -#pragma pop - -/* 8045E6AC-8045E6D0 -00001 0024+00 1/1 0/0 0/0 .data @3957 */ -SECTION_DATA static void* lit_3957[9] = { - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x1A4), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x74), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0xA4), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x1A4), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0xB8), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x1A4), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x118), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x140), - (void*)(((char*)demoProc__12daDbDoor00_cFv) + 0x168), -}; /* 8045DAB0-8045DE44 0007B0 0394+00 5/4 0/0 0/0 .text demoProc__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::demoProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/demoProc__12daDbDoor00_cFv.s" +void daDbDoor00_c::demoProc() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(LINK_PTR); + s16 doorAngle; + cXyz xyz; + s32 demoAction = getDemoAction(); + + if (dComIfGp_evmng_getIsAddvance(field_0x598) != 0) { + switch (demoAction) { + case 1: + calcMtx(); + xyz = field_0x59c; + dComIfGp_evmng_setGoal(&xyz); + break; + case 2: + doorAngle = current.angle.y + 0x7fff; + player->changeDemoMoveAngle(doorAngle); + break; + case 4: + field_0x58c = 0; + field_0x5c2 = 0x1e; + fopAcM_seStart(this, Z2SE_OBJ_OPEN_ZELDAROOM_DOOR, 0); + break; + case 6: + xyz = field_0x5a8; + dComIfGp_evmng_setGoal(&xyz); + break; + case 7: + xyz = field_0x5b4; + dComIfGp_evmng_setGoal(&xyz); + break; + case 8: + calcMtx(); + field_0x590 = 0; + int* integerP = dComIfGp_evmng_getMyIntegerP(field_0x598, "Timer"); + if (integerP != NULL) { + field_0x590 = *integerP; + } + } + } + + switch (demoAction) { + case 4: + if (field_0x58c < 0xfa) { + field_0x58c += 0x32; + } + if (field_0x58a - field_0x58c < -0x1c71) { + field_0x58a = -0x1c71; + dComIfGp_evmng_cutEnd(field_0x598); + } else { + field_0x58a -= field_0x58c; + } + calcMtx(); + if (field_0x585 != 0) { + doorAngle = current.angle.y + 0x7fff - field_0x58a; + + } else { + doorAngle = current.angle.y + 0x7fff + field_0x58a; + } + player->setPlayerPosAndAngle(&field_0x59c, doorAngle, 0); + if (field_0x5c2 == 0) { + daPy_getPlayerActorClass()->onSceneChangeArea(door_param2_c::getExitNo(this), 0xff, + NULL); + } + field_0x5c2--; + case 3: + case 5: + return; + + case 8: + doorAngle = player->shape_angle.y; + cLib_addCalcAngleS2(&doorAngle, current.angle.y + 0x7fff, 10, 0x800); + xyz = player->current.pos; + xyz.x = xyz.x * 0.9f + field_0x59c.x * 0.1f; + xyz.z = xyz.z * 0.9f + field_0x59c.z * 0.1f; + player->setPlayerPosAndAngle(&xyz, doorAngle, 0); + if (field_0x590 > 0) { + field_0x590--; + return; + } + dComIfGp_evmng_cutEnd(field_0x598); + return; + } + dComIfGp_evmng_cutEnd(field_0x598); } -#pragma pop - -/* ############################################################################################## */ -/* 8045E550-8045E554 00001C 0004+00 0/0 0/0 0/0 .rodata @3953 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3953 = 1.0f; -COMPILER_STRIP_GATE(0x8045E550, &lit_3953); -#pragma pop - -/* 8045E554-8045E558 000020 0004+00 0/0 0/0 0/0 .rodata @3954 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3954 = -1.0f; -COMPILER_STRIP_GATE(0x8045E554, &lit_3954); -#pragma pop - -/* 8045E558-8045E55C 000024 0004+00 0/0 0/0 0/0 .rodata @3955 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3955 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(0x8045E558, &lit_3955); -#pragma pop - -/* 8045E55C-8045E560 000028 0004+00 0/0 0/0 0/0 .rodata @3956 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3956 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x8045E55C, &lit_3956); -#pragma pop - -/* 8045E560-8045E564 00002C 0004+00 0/1 0/0 0/0 .rodata @4032 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4032 = 160.0f; -COMPILER_STRIP_GATE(0x8045E560, &lit_4032); -#pragma pop - -/* 8045E564-8045E568 000030 0004+00 0/1 0/0 0/0 .rodata @4033 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4033 = 200.0f; -COMPILER_STRIP_GATE(0x8045E564, &lit_4033); -#pragma pop - -/* 8045E568-8045E56C 000034 0004+00 0/1 0/0 0/0 .rodata @4034 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4034 = -200.0f; -COMPILER_STRIP_GATE(0x8045E568, &lit_4034); -#pragma pop /* 8045DE44-8045DF70 000B44 012C+00 1/1 0/0 0/0 .text checkArea__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::checkArea() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkArea__12daDbDoor00_cFv.s" +int daDbDoor00_c::checkArea() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(LINK_PTR); + cXyz sub = player->current.pos - orig.pos; + cXyz area = sub; + + area.x = sub.z * cM_ssin(current.angle.y) - sub.x * cM_scos(current.angle.y); + area.z = sub.z * cM_scos(current.angle.y) + sub.x * cM_ssin(current.angle.y); + + if (area.z > 160.0f) { + return 0; + } + if (area.x > 200.0f || area.x < -200.0f) { + return 0; + } + if (fopAcM_seenActorAngleY(player, this) > 0x3000) { + return 0; + } + if (area.x > 0.0f) { + field_0x585 = 1; + } else { + field_0x585 = 0; + } + return 1; } -#pragma pop /* 8045DF70-8045DF78 000C70 0008+00 1/1 0/0 0/0 .text checkUnlock__12daDbDoor00_cFv */ -bool daDbDoor00_c::checkUnlock() { - return true; +int daDbDoor00_c::checkUnlock() { + return 1; } /* 8045DF78-8045DF9C 000C78 0024+00 1/0 0/0 0/0 .text actionWait__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::actionWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionWait__12daDbDoor00_cFv.s" +int daDbDoor00_c::actionWait() { + calcMtx(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E62A = "DBDOOR00_STOP_OPEN"; -#pragma pop /* 8045DF9C-8045E000 000C9C 0064+00 1/0 0/0 0/0 .text actionLockWait__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::actionLockWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockWait__12daDbDoor00_cFv.s" +int daDbDoor00_c::actionLockWait() { + if (checkUnlock() != 0) { + setAction(2); + fopAcM_orderOtherEvent(this, "DBDOOR00_STOP_OPEN", 0xffff, 1, 0); + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E63D = "DOUBLE_DOOR"; -#pragma pop /* 8045E000-8045E094 000D00 0094+00 1/0 0/0 0/0 .text actionLockOff__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::actionLockOff() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockOff__12daDbDoor00_cFv.s" +int daDbDoor00_c::actionLockOff() { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); + demoProc(); + setAction(3); + } else { + fopAcM_orderOtherEvent(this, "DBDOOR00_STOP_OPEN", 0xffff, 1, 0); + } + return 1; } -#pragma pop /* 8045E094-8045E108 000D94 0074+00 1/0 0/0 0/0 .text actionLockDemo__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::actionLockDemo() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionLockDemo__12daDbDoor00_cFv.s" +int daDbDoor00_c::actionLockDemo() { + if (dComIfGp_evmng_endCheck("DBDOOR00_STOP_OPEN")) { + i_dComIfGp_event_reset(); + setAction(4); + } else { + demoProc(); + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045E649 = "DEFAULT_DOUBLE_DOOR_OPEN"; -#pragma pop /* 8045E108-8045E1C8 000E08 00C0+00 1/0 0/0 0/0 .text actionCloseWait__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::actionCloseWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionCloseWait__12daDbDoor00_cFv.s" +int daDbDoor00_c::actionCloseWait() { + if (mEvtInfo.i_checkCommandDoor()) { + field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); + demoProc(); + setAction(5); + dComIfG_Bgsp().Release(mpBgW); + field_0x584 = 0; + } else { + if (checkArea() != 0) { + mEvtInfo.setEventName("DEFAULT_DOUBLE_DOOR_OPEN"); + mEvtInfo.i_onCondition(4); + } + } + return 1; } -#pragma pop /* 8045E1C8-8045E1EC 000EC8 0024+00 1/0 0/0 0/0 .text actionOpen__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::actionOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/actionOpen__12daDbDoor00_cFv.s" +int daDbDoor00_c::actionOpen() { + demoProc(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8045E6D0-8045E6DC -00001 000C+00 0/1 0/0 0/0 .data @4092 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4092[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__12daDbDoor00_cFv, -}; -#pragma pop - -/* 8045E6DC-8045E6E8 -00001 000C+00 0/1 0/0 0/0 .data @4093 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4093[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionLockWait__12daDbDoor00_cFv, -}; -#pragma pop - -/* 8045E6E8-8045E6F4 -00001 000C+00 0/1 0/0 0/0 .data @4094 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4094[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionLockOff__12daDbDoor00_cFv, -}; -#pragma pop - -/* 8045E6F4-8045E700 -00001 000C+00 0/1 0/0 0/0 .data @4095 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4095[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionLockDemo__12daDbDoor00_cFv, -}; -#pragma pop - -/* 8045E700-8045E70C -00001 000C+00 0/1 0/0 0/0 .data @4096 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4096[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionCloseWait__12daDbDoor00_cFv, -}; -#pragma pop - -/* 8045E70C-8045E718 -00001 000C+00 0/1 0/0 0/0 .data @4097 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4097[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOpen__12daDbDoor00_cFv, -}; -#pragma pop - -/* 8045E718-8045E760 0000B4 0048+00 0/1 0/0 0/0 .data l_action$4091 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_action[72] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 8045E7D0-8045E7D4 000020 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_8045E7D0[4]; /* 8045E1EC-8045E2DC 000EEC 00F0+00 1/1 0/0 0/0 .text execute__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::execute() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/execute__12daDbDoor00_cFv.s" +int daDbDoor00_c::execute() { + typedef int (daDbDoor00_c::*actionFunc)(); + static actionFunc l_action[] = { + &daDbDoor00_c::actionWait, &daDbDoor00_c::actionLockWait, &daDbDoor00_c::actionLockOff, + &daDbDoor00_c::actionLockDemo, &daDbDoor00_c::actionCloseWait, &daDbDoor00_c::actionOpen, + }; + (this->*l_action[mAction])(); + return 1; } -#pragma pop /* 8045E2DC-8045E31C 000FDC 0040+00 1/1 0/0 0/0 .text checkDraw__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::checkDraw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/checkDraw__12daDbDoor00_cFv.s" +int daDbDoor00_c::checkDraw() { + return dComIfGp_roomControl_checkRoomDisp(fopAcM_GetRoomNo(this)) != 0 ? 1 : 0; } -#pragma pop /* 8045E31C-8045E428 00101C 010C+00 1/1 0/0 0/0 .text draw__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::draw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/draw__12daDbDoor00_cFv.s" +int daDbDoor00_c::draw() { + if (checkDraw() == 0) { + if (field_0x584 != 0) { + dComIfG_Bgsp().Release(mpBgW); + field_0x584 = 0; + } + return 1; + } + if (field_0x584 == 0) { + dComIfG_Bgsp().Regist(mpBgW, this); + field_0x584 = 1; + } + g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel2, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel2); + dComIfGd_setList(); + return 1; } -#pragma pop /* 8045E428-8045E49C 001128 0074+00 1/1 0/0 0/0 .text Delete__12daDbDoor00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daDbDoor00_c::Delete() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/Delete__12daDbDoor00_cFv.s" +int daDbDoor00_c::Delete() { + if (mHeap != NULL) { + dComIfG_Bgsp().Release(mpBgW); + } + dComIfG_resDelete(&mPhaseReq, getBmdArcName()); + dComIfG_resDelete(&mPhaseReq2, getAlwaysArcName()); + return 1; } -#pragma pop /* 8045E49C-8045E4BC 00119C 0020+00 1/0 0/0 0/0 .text daDbdoor00_Draw__FP12daDbDoor00_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDbdoor00_Draw(daDbDoor00_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Draw__FP12daDbDoor00_c.s" +static int daDbdoor00_Draw(daDbDoor00_c* i_this) { + return i_this->draw(); } -#pragma pop /* 8045E4BC-8045E4E0 0011BC 0024+00 1/0 0/0 0/0 .text daDbdoor00_Execute__FP12daDbDoor00_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDbdoor00_Execute(daDbDoor00_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Execute__FP12daDbDoor00_c.s" +static int daDbdoor00_Execute(daDbDoor00_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 8045E4E0-8045E4E8 0011E0 0008+00 1/0 0/0 0/0 .text daDbdoor00_IsDelete__FP12daDbDoor00_c */ -static bool daDbdoor00_IsDelete(daDbDoor00_c* param_0) { - return true; +static int daDbdoor00_IsDelete(daDbDoor00_c* i_this) { + return 1; } /* 8045E4E8-8045E50C 0011E8 0024+00 1/0 0/0 0/0 .text daDbdoor00_Delete__FP12daDbDoor00_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDbdoor00_Delete(daDbDoor00_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Delete__FP12daDbDoor00_c.s" +static int daDbdoor00_Delete(daDbDoor00_c* i_this) { + i_this->Delete(); + return 1; } -#pragma pop /* 8045E50C-8045E52C 00120C 0020+00 1/0 0/0 0/0 .text daDbdoor00_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDbdoor00_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00/daDbdoor00_Create__FP10fopAc_ac_c.s" +static int daDbdoor00_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* ############################################################################################## */ /* 8045E760-8045E780 -00001 0020+00 1/0 0/0 0/0 .data l_daDbdoor00_Method */ -SECTION_DATA static void* l_daDbdoor00_Method[8] = { - (void*)daDbdoor00_Create__FP10fopAc_ac_c, - (void*)daDbdoor00_Delete__FP12daDbDoor00_c, - (void*)daDbdoor00_Execute__FP12daDbDoor00_c, - (void*)daDbdoor00_IsDelete__FP12daDbDoor00_c, - (void*)daDbdoor00_Draw__FP12daDbDoor00_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daDbdoor00_Method = { + (process_method_func)daDbdoor00_Create, (process_method_func)daDbdoor00_Delete, + (process_method_func)daDbdoor00_Execute, (process_method_func)daDbdoor00_IsDelete, + (process_method_func)daDbdoor00_Draw, }; /* 8045E780-8045E7B0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_DBDOOR */ -SECTION_DATA extern void* g_profile_DBDOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02270000, (void*)&g_fpcLf_Method, - (void*)0x000005C4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01270000, (void*)&l_daDbdoor00_Method, - (void*)0x00044000, (void*)0x00060000, +extern actor_process_profile_definition g_profile_DBDOOR = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_DBDOOR, // mProcName + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daDbDoor00_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 295, // mPriority + &l_daDbdoor00_Method, // mSubMtd + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_6_e, // mCullType }; - -/* 8045E56C-8045E56C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index 19d0bb7de..dab9a6122 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -7,69 +7,69 @@ #include "f_op/f_op_actor_mng.h" /* 8003A188-8003A194 034AC8 000C+00 0/0 0/0 17/17 .text getKind__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getKind(fopAc_ac_c* i_actor) { +u32 door_param2_c::getKind(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 0, 5); } /* 8003A194-8003A1A0 034AD4 000C+00 0/0 0/0 2/2 .text getDoorModel__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getDoorModel(fopAc_ac_c* i_actor) { +u32 door_param2_c::getDoorModel(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 5, 3); } /* 8003A1A0-8003A1AC 034AE0 000C+00 0/0 0/0 17/17 .text * getFrontOption__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getFrontOption(fopAc_ac_c* i_actor) { +u32 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 */ -u8 door_param2_c::getBackOption(fopAc_ac_c* i_actor) { +u32 door_param2_c::getBackOption(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 10, 3); } /* 8003A1B8-8003A1C4 034AF8 000C+00 0/0 0/0 19/19 .text getFRoomNo__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getFRoomNo(fopAc_ac_c* i_actor) { +u32 door_param2_c::getFRoomNo(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 13, 6); } /* 8003A1C4-8003A1D0 034B04 000C+00 0/0 0/0 10/10 .text getBRoomNo__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) { +u32 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 19, 6); } /* 8003A1D0-8003A1DC 034B10 000C+00 0/0 0/0 25/25 .text getSwbit__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getSwbit(fopAc_ac_c* i_actor) { +u32 door_param2_c::getSwbit(fopAc_ac_c* i_actor) { return i_actor->orig.angle.z & 0xFF; } /* 8003A1DC-8003A1E8 034B1C 000C+00 0/0 0/0 12/12 .text getSwbit2__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getSwbit2(fopAc_ac_c* i_actor) { +u32 door_param2_c::getSwbit2(fopAc_ac_c* i_actor) { return (i_actor->orig.angle.z >> 8) & 0xFF; } /* 8003A1E8-8003A1F4 034B28 000C+00 0/0 0/0 3/3 .text getSwbit3__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) { +u32 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) { return (i_actor->orig.angle.x >> 8) & 0xFF; } /* 8003A1F4-8003A200 034B34 000C+00 0/0 0/0 4/4 .text isMsgDoor__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) { +u32 door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 31, 1); } /* 8003A200-8003A20C 034B40 000C+00 0/0 0/0 3/3 .text getEventNo__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getEventNo(fopAc_ac_c* i_actor) { +u32 door_param2_c::getEventNo(fopAc_ac_c* i_actor) { return i_actor->orig.angle.x & 0xFF; } /* 8003A20C-8003A218 034B4C 000C+00 0/0 0/0 2/2 .text getEventNo2__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) { +u32 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) { return (i_actor->orig.angle.x >> 8) & 0xFF; } @@ -85,24 +85,24 @@ u8 door_param2_c::getExitNo(fopAc_ac_c* i_actor) { /* 8003A230-8003A23C 034B70 000C+00 0/0 0/0 1/1 .text getFLightInf__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getFLightInf(fopAc_ac_c* i_actor) { +u32 door_param2_c::getFLightInf(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 25, 3); } /* 8003A23C-8003A248 034B7C 000C+00 0/0 0/0 1/1 .text getBLightInf__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getBLightInf(fopAc_ac_c* i_actor) { +u32 door_param2_c::getBLightInf(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 28, 3); } /* 8003A248-8003A254 034B88 000C+00 0/0 0/0 1/1 .text getMFLightInf__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getMFLightInf(fopAc_ac_c* i_actor) { +u32 door_param2_c::getMFLightInf(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 19, 3); } /* 8003A254-8003A260 034B94 000C+00 0/0 0/0 1/1 .text getMBLightInf__13door_param2_cFP10fopAc_ac_c */ -u8 door_param2_c::getMBLightInf(fopAc_ac_c* i_actor) { +u32 door_param2_c::getMBLightInf(fopAc_ac_c* i_actor) { return fopAcM_GetParamBit(i_actor, 22, 3); } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index d74a80721..5fa251d9d 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1545,12 +1545,12 @@ static int createRoomScene(int param_0) { } /* 800244E8-8002451C 01EE28 0034+00 0/0 0/0 8/13 .text checkRoomDisp__20dStage_roomControl_cCFi */ -bool dStage_roomControl_c::checkRoomDisp(int i_roomNo) const { +BOOL dStage_roomControl_c::checkRoomDisp(int i_roomNo) const { if (checkStatusFlag(i_roomNo, 8)) { - return false; + return 0; } - return checkStatusFlag(i_roomNo, 16) ? true : false; + return checkStatusFlag(i_roomNo, 16) ? 1 : 0; } /* 8002451C-8002471C 01EE5C 0200+00 2/2 0/0 0/2 .text loadRoom__20dStage_roomControl_cFiPUcb */