From b36f0f93660b0b1eee5268acad6c1b7b60f0bb5d Mon Sep 17 00:00:00 2001 From: hatal175 Date: Fri, 12 Apr 2024 09:00:55 +0300 Subject: [PATCH] daBdoorL1_c OK (#2126) --- .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__11daBdoorL1_cFv.s | 198 -- .../CreateInit__11daBdoorL1_cFv.s | 105 - .../d_a_door_bossL1/Delete__11daBdoorL1_cFv.s | 41 - .../d_a_door_bossL1/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_door_bossL1/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_door_bossL1/__dt__12dBgS_ObjAcchFv.s | 30 - .../actionCloseWait__11daBdoorL1_cFv.s | 41 - .../actionEnd__11daBdoorL1_cFv.s | 94 - .../actionOpen__11daBdoorL1_cFv.s | 15 - .../calcGoal__11daBdoorL1_cFP4cXyzi.s | 77 - .../calcMtx__11daBdoorL1_cFv.s | 126 - .../checkArea__11daBdoorL1_cFv.s | 124 - .../checkFront__11daBdoorL1_cFv.s | 33 - .../checkOpen__11daBdoorL1_cFv.s | 33 - .../closeInit__11daBdoorL1_cFv.s | 125 - .../closeProc__11daBdoorL1_cFv.s | 128 - .../createKey__11daBdoorL1_cFv.s | 72 - .../d_a_door_bossL1/create__11daBdoorL1_cFv.s | 119 - .../daBdoorL1_Create__FP10fopAc_ac_c.s | 9 - .../daBdoorL1_Delete__FP11daBdoorL1_c.s | 10 - .../daBdoorL1_Draw__FP11daBdoorL1_c.s | 9 - .../daBdoorL1_Execute__FP11daBdoorL1_c.s | 10 - .../deleteEmitter__11daBdoorL1_cFv.s | 24 - .../demoProc__11daBdoorL1_cFv.s | 410 --- .../d_a_door_bossL1/draw__11daBdoorL1_cFv.s | 87 - .../execute__11daBdoorL1_cFv.s | 76 - .../d_a_door_bossL1/func_804E49E0.s | 9 - .../d_a_door_bossL1/func_804E49FC.s | 3 - .../d_a_door_bossL1/func_804E4A04.s | 3 - .../getAlwaysArcName__11daBdoorL1_cFv.s | 5 - .../getAnmArcName__11daBdoorL1_cFv.s | 30 - .../getArcName__11daBdoorL1_cFv.s | 57 - .../d_a_door_bossL1/getBmd__11daBdoorL1_cFv.s | 5 - .../getCloseAnm__11daBdoorL1_cFv.s | 24 - .../getDemoAction__11daBdoorL1_cFv.s | 19 - .../getDoorEventName2__11daBdoorL1_cFv.s | 57 - .../getDoorEventName__11daBdoorL1_cFv.s | 57 - .../getDoorModelData__11daBdoorL1_cFv.s | 24 - .../getDoorType__11daBdoorL1_cFv.s | 20 - .../d_a_door_bossL1/getDzb__11daBdoorL1_cFv.s | 5 - .../d_a_door_bossL1/getNowLevel__Fv.s | 43 - .../getOpenAnm__11daBdoorL1_cFv.s | 24 - .../openEnd__11daBdoorL1_cFv.s | 51 - .../openInit__11daBdoorL1_cFv.s | 272 -- .../openProc__11daBdoorL1_cFv.s | 142 - .../setAngle__11daBdoorL1_cFv.s | 62 - .../d_a_door_bossL1/setPos__11daBdoorL1_cFv.s | 74 - .../unlockInit__11daBdoorL1_cFv.s | 50 - include/d/a/d_a_player.h | 4 +- include/d/meter/d_meter2_info.h | 5 + .../a/door/d_a_door_bossL1/d_a_door_bossL1.h | 91 + .../d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h | 9 + rel/d/a/door/d_a_door_bossL1/Makefile | 2 - .../door/d_a_door_bossL1/d_a_door_bossL1.cpp | 2278 +++++++---------- .../unknown_translation_unit_bss.cpp | 26 - .../a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp | 72 +- 57 files changed, 1013 insertions(+), 4565 deletions(-) delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateHeap__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateInit__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/Delete__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionCloseWait__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionEnd__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionOpen__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcGoal__11daBdoorL1_cFP4cXyzi.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcMtx__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkArea__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkOpen__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeInit__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeProc__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/createKey__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/create__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Delete__FP11daBdoorL1_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Draw__FP11daBdoorL1_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Execute__FP11daBdoorL1_c.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/deleteEmitter__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/demoProc__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/draw__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/execute__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49E0.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49FC.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E4A04.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAlwaysArcName__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAnmArcName__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getArcName__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getBmd__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getCloseAnm__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDemoAction__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName2__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorModelData__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorType__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDzb__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getNowLevel__Fv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getOpenAnm__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openEnd__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openInit__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openProc__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setAngle__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setPos__11daBdoorL1_cFv.s delete mode 100644 asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/unlockInit__11daBdoorL1_cFv.s delete mode 100644 rel/d/a/door/d_a_door_bossL1/unknown_translation_unit_bss.cpp diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index ed83e22a29..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_804E2238: -/* 804E2238 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E223C 7C 08 02 A6 */ mflr r0 -/* 804E2240 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E2244 48 00 00 15 */ bl CreateHeap__11daBdoorL1_cFv -/* 804E2248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E224C 7C 08 03 A6 */ mtlr r0 -/* 804E2250 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2254 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateHeap__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateHeap__11daBdoorL1_cFv.s deleted file mode 100644 index 920bd4baef..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateHeap__11daBdoorL1_cFv.s +++ /dev/null @@ -1,198 +0,0 @@ -lbl_804E2258: -/* 804E2258 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804E225C 7C 08 02 A6 */ mflr r0 -/* 804E2260 90 01 00 24 */ stw r0, 0x24(r1) -/* 804E2264 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E2268 4B E7 FF 71 */ bl _savegpr_28 -/* 804E226C 7C 7F 1B 78 */ mr r31, r3 -/* 804E2270 4B FF FB 29 */ bl getNowLevel__Fv -/* 804E2274 7C 7D 1B 78 */ mr r29, r3 -/* 804E2278 7F E3 FB 78 */ mr r3, r31 -/* 804E227C 4B FF FF 61 */ bl getDoorModelData__11daBdoorL1_cFv -/* 804E2280 7C 7E 1B 78 */ mr r30, r3 -/* 804E2284 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 804E2288 38 A3 00 84 */ addi r5, r3, 0x0084 /* 0x11000084@l */ -/* 804E228C 2C 1D 00 08 */ cmpwi r29, 8 -/* 804E2290 40 82 00 08 */ bne lbl_804E2298 -/* 804E2294 60 A5 02 00 */ ori r5, r5, 0x200 -lbl_804E2298: -/* 804E2298 7F C3 F3 78 */ mr r3, r30 -/* 804E229C 3C 80 00 08 */ lis r4, 8 -/* 804E22A0 4B B3 29 B5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 804E22A4 90 7F 05 80 */ stw r3, 0x580(r31) -/* 804E22A8 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 804E22AC 28 00 00 00 */ cmplwi r0, 0 -/* 804E22B0 40 82 00 0C */ bne lbl_804E22BC -/* 804E22B4 38 60 00 00 */ li r3, 0 -/* 804E22B8 48 00 02 60 */ b lbl_804E2518 -lbl_804E22BC: -/* 804E22BC 7F E3 FB 78 */ mr r3, r31 -/* 804E22C0 4B FF FE 05 */ bl getDoorType__11daBdoorL1_cFv -/* 804E22C4 2C 03 00 00 */ cmpwi r3, 0 -/* 804E22C8 40 82 00 30 */ bne lbl_804E22F8 -/* 804E22CC 7F C3 F3 78 */ mr r3, r30 -/* 804E22D0 3C 80 00 08 */ lis r4, 8 -/* 804E22D4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 804E22D8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 804E22DC 4B B3 29 79 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 804E22E0 90 7F 05 84 */ stw r3, 0x584(r31) -/* 804E22E4 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 804E22E8 28 00 00 00 */ cmplwi r0, 0 -/* 804E22EC 40 82 00 14 */ bne lbl_804E2300 -/* 804E22F0 38 60 00 00 */ li r3, 0 -/* 804E22F4 48 00 02 24 */ b lbl_804E2518 -lbl_804E22F8: -/* 804E22F8 38 00 00 00 */ li r0, 0 -/* 804E22FC 90 1F 05 84 */ stw r0, 0x584(r31) -lbl_804E2300: -/* 804E2300 2C 1D 00 08 */ cmpwi r29, 8 -/* 804E2304 40 82 00 AC */ bne lbl_804E23B0 -/* 804E2308 7F E3 FB 78 */ mr r3, r31 -/* 804E230C 4B FF FC 99 */ bl getArcName__11daBdoorL1_cFv -/* 804E2310 3C 80 80 4E */ lis r4, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E2314 38 84 4A DC */ addi r4, r4, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E2318 38 84 02 71 */ addi r4, r4, 0x271 -/* 804E231C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2320 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2324 3C A5 00 02 */ addis r5, r5, 2 -/* 804E2328 38 C0 00 80 */ li r6, 0x80 -/* 804E232C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804E2330 4B B5 A0 4D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 804E2334 7C 7E 1B 78 */ mr r30, r3 -/* 804E2338 38 60 00 18 */ li r3, 0x18 -/* 804E233C 4B DE C9 11 */ bl __nw__FUl -/* 804E2340 7C 7D 1B 79 */ or. r29, r3, r3 -/* 804E2344 41 82 00 20 */ beq lbl_804E2364 -/* 804E2348 3C 80 80 4E */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x804E5098@ha */ -/* 804E234C 38 04 50 98 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x804E5098@l */ -/* 804E2350 90 1D 00 00 */ stw r0, 0(r29) -/* 804E2354 38 80 00 00 */ li r4, 0 -/* 804E2358 4B E4 60 A5 */ bl init__12J3DFrameCtrlFs -/* 804E235C 38 00 00 00 */ li r0, 0 -/* 804E2360 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_804E2364: -/* 804E2364 93 BF 05 8C */ stw r29, 0x58c(r31) -/* 804E2368 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E236C 28 03 00 00 */ cmplwi r3, 0 -/* 804E2370 41 82 00 38 */ beq lbl_804E23A8 -/* 804E2374 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 804E2378 80 84 00 04 */ lwz r4, 4(r4) -/* 804E237C 38 84 00 58 */ addi r4, r4, 0x58 -/* 804E2380 7F C5 F3 78 */ mr r5, r30 -/* 804E2384 38 C0 00 01 */ li r6, 1 -/* 804E2388 38 E0 00 00 */ li r7, 0 -/* 804E238C 3D 00 80 4E */ lis r8, lit_3861@ha /* 0x804E4A50@ha */ -/* 804E2390 C0 28 4A 50 */ lfs f1, lit_3861@l(r8) /* 0x804E4A50@l */ -/* 804E2394 39 00 00 00 */ li r8, 0 -/* 804E2398 39 20 FF FF */ li r9, -1 -/* 804E239C 4B B2 B2 A1 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 804E23A0 2C 03 00 00 */ cmpwi r3, 0 -/* 804E23A4 40 82 00 0C */ bne lbl_804E23B0 -lbl_804E23A8: -/* 804E23A8 38 60 00 00 */ li r3, 0 -/* 804E23AC 48 00 01 6C */ b lbl_804E2518 -lbl_804E23B0: -/* 804E23B0 7F E3 FB 78 */ mr r3, r31 -/* 804E23B4 4B FF FD 51 */ bl getOpenAnm__11daBdoorL1_cFv -/* 804E23B8 7C 7D 1B 78 */ mr r29, r3 -/* 804E23BC 7F E3 FB 78 */ mr r3, r31 -/* 804E23C0 4B FF FC A1 */ bl getAnmArcName__11daBdoorL1_cFv -/* 804E23C4 7F A4 EB 78 */ mr r4, r29 -/* 804E23C8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E23CC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E23D0 3F C5 00 02 */ addis r30, r5, 2 -/* 804E23D4 3B DE C2 F8 */ addi r30, r30, -15624 -/* 804E23D8 7F C5 F3 78 */ mr r5, r30 -/* 804E23DC 38 C0 00 80 */ li r6, 0x80 -/* 804E23E0 4B B5 9F 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 804E23E4 7C 7C 1B 78 */ mr r28, r3 -/* 804E23E8 38 60 00 1C */ li r3, 0x1c -/* 804E23EC 4B DE C8 61 */ bl __nw__FUl -/* 804E23F0 7C 7D 1B 79 */ or. r29, r3, r3 -/* 804E23F4 41 82 00 20 */ beq lbl_804E2414 -/* 804E23F8 3C 80 80 4E */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x804E5098@ha */ -/* 804E23FC 38 04 50 98 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x804E5098@l */ -/* 804E2400 90 1D 00 00 */ stw r0, 0(r29) -/* 804E2404 38 80 00 00 */ li r4, 0 -/* 804E2408 4B E4 5F F5 */ bl init__12J3DFrameCtrlFs -/* 804E240C 38 00 00 00 */ li r0, 0 -/* 804E2410 90 1D 00 18 */ stw r0, 0x18(r29) -lbl_804E2414: -/* 804E2414 93 BF 05 88 */ stw r29, 0x588(r31) -/* 804E2418 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 804E241C 28 03 00 00 */ cmplwi r3, 0 -/* 804E2420 41 82 00 30 */ beq lbl_804E2450 -/* 804E2424 7F 84 E3 78 */ mr r4, r28 -/* 804E2428 38 A0 00 01 */ li r5, 1 -/* 804E242C 38 C0 00 00 */ li r6, 0 -/* 804E2430 3C E0 80 4E */ lis r7, lit_3861@ha /* 0x804E4A50@ha */ -/* 804E2434 C0 27 4A 50 */ lfs f1, lit_3861@l(r7) /* 0x804E4A50@l */ -/* 804E2438 38 E0 00 00 */ li r7, 0 -/* 804E243C 39 00 FF FF */ li r8, -1 -/* 804E2440 39 20 00 00 */ li r9, 0 -/* 804E2444 4B B2 B3 99 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 804E2448 2C 03 00 00 */ cmpwi r3, 0 -/* 804E244C 40 82 00 0C */ bne lbl_804E2458 -lbl_804E2450: -/* 804E2450 38 60 00 00 */ li r3, 0 -/* 804E2454 48 00 00 C4 */ b lbl_804E2518 -lbl_804E2458: -/* 804E2458 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 804E245C 80 83 00 04 */ lwz r4, 4(r3) -/* 804E2460 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 804E2464 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 804E2468 4B B2 B5 65 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 804E246C 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 804E2470 81 83 00 00 */ lwz r12, 0(r3) -/* 804E2474 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 804E2478 7D 89 03 A6 */ mtctr r12 -/* 804E247C 4E 80 04 21 */ bctrl -/* 804E2480 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 804E2484 28 03 00 00 */ cmplwi r3, 0 -/* 804E2488 41 82 00 14 */ beq lbl_804E249C -/* 804E248C 81 83 00 00 */ lwz r12, 0(r3) -/* 804E2490 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 804E2494 7D 89 03 A6 */ mtctr r12 -/* 804E2498 4E 80 04 21 */ bctrl -lbl_804E249C: -/* 804E249C 7F E3 FB 78 */ mr r3, r31 -/* 804E24A0 48 00 00 D9 */ bl calcMtx__11daBdoorL1_cFv -/* 804E24A4 38 60 00 C0 */ li r3, 0xc0 -/* 804E24A8 4B DE C7 A5 */ bl __nw__FUl -/* 804E24AC 7C 60 1B 79 */ or. r0, r3, r3 -/* 804E24B0 41 82 00 0C */ beq lbl_804E24BC -/* 804E24B4 4B B9 94 BD */ bl __ct__4dBgWFv -/* 804E24B8 7C 60 1B 78 */ mr r0, r3 -lbl_804E24BC: -/* 804E24BC 90 1F 05 90 */ stw r0, 0x590(r31) -/* 804E24C0 80 1F 05 90 */ lwz r0, 0x590(r31) -/* 804E24C4 28 00 00 00 */ cmplwi r0, 0 -/* 804E24C8 41 82 00 44 */ beq lbl_804E250C -/* 804E24CC 7F E3 FB 78 */ mr r3, r31 -/* 804E24D0 4B FF FC FD */ bl getDzb__11daBdoorL1_cFv -/* 804E24D4 7C 7D 1B 78 */ mr r29, r3 -/* 804E24D8 7F E3 FB 78 */ mr r3, r31 -/* 804E24DC 4B FF FC D1 */ bl getAlwaysArcName__11daBdoorL1_cFv -/* 804E24E0 7F A4 EB 78 */ mr r4, r29 -/* 804E24E4 7F C5 F3 78 */ mr r5, r30 -/* 804E24E8 38 C0 00 80 */ li r6, 0x80 -/* 804E24EC 4B B5 9E 91 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 804E24F0 7C 64 1B 78 */ mr r4, r3 -/* 804E24F4 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 804E24F8 38 A0 00 01 */ li r5, 1 -/* 804E24FC 38 DF 07 EC */ addi r6, r31, 0x7ec -/* 804E2500 4B B9 7A 39 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 804E2504 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 804E2508 41 82 00 0C */ beq lbl_804E2514 -lbl_804E250C: -/* 804E250C 38 60 00 00 */ li r3, 0 -/* 804E2510 48 00 00 08 */ b lbl_804E2518 -lbl_804E2514: -/* 804E2514 38 60 00 01 */ li r3, 1 -lbl_804E2518: -/* 804E2518 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E251C 4B E7 FD 09 */ bl _restgpr_28 -/* 804E2520 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804E2524 7C 08 03 A6 */ mtlr r0 -/* 804E2528 38 21 00 20 */ addi r1, r1, 0x20 -/* 804E252C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateInit__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateInit__11daBdoorL1_cFv.s deleted file mode 100644 index 5fce1fc7bd..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateInit__11daBdoorL1_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_804E2754: -/* 804E2754 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804E2758 7C 08 02 A6 */ mflr r0 -/* 804E275C 90 01 00 24 */ stw r0, 0x24(r1) -/* 804E2760 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E2764 4B E7 FA 79 */ bl _savegpr_29 -/* 804E2768 7C 7D 1B 78 */ mr r29, r3 -/* 804E276C 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E2770 3B E3 4A 14 */ addi r31, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E2774 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 804E2778 D0 1D 07 C4 */ stfs f0, 0x7c4(r29) -/* 804E277C C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 804E2780 D0 1D 07 C8 */ stfs f0, 0x7c8(r29) -/* 804E2784 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 804E2788 D0 1D 07 CC */ stfs f0, 0x7cc(r29) -/* 804E278C C0 1D 07 C4 */ lfs f0, 0x7c4(r29) -/* 804E2790 D0 1D 07 D0 */ stfs f0, 0x7d0(r29) -/* 804E2794 C0 1D 07 C8 */ lfs f0, 0x7c8(r29) -/* 804E2798 D0 1D 07 D4 */ stfs f0, 0x7d4(r29) -/* 804E279C C0 1D 07 CC */ lfs f0, 0x7cc(r29) -/* 804E27A0 D0 1D 07 D8 */ stfs f0, 0x7d8(r29) -/* 804E27A4 38 00 00 00 */ li r0, 0 -/* 804E27A8 90 01 00 08 */ stw r0, 8(r1) -/* 804E27AC 38 7D 05 AC */ addi r3, r29, 0x5ac -/* 804E27B0 38 9D 07 C4 */ addi r4, r29, 0x7c4 -/* 804E27B4 38 BD 07 D0 */ addi r5, r29, 0x7d0 -/* 804E27B8 7F A6 EB 78 */ mr r6, r29 -/* 804E27BC 38 E0 00 01 */ li r7, 1 -/* 804E27C0 39 1D 07 84 */ addi r8, r29, 0x784 -/* 804E27C4 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 804E27C8 39 40 00 00 */ li r10, 0 -/* 804E27CC 4B B9 3A 7D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 804E27D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E27D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E27D8 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 804E27DC 7F C3 F3 78 */ mr r3, r30 -/* 804E27E0 80 9D 05 90 */ lwz r4, 0x590(r29) -/* 804E27E4 7F A5 EB 78 */ mr r5, r29 -/* 804E27E8 4B B9 22 21 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 804E27EC 38 00 00 01 */ li r0, 1 -/* 804E27F0 98 1D 05 99 */ stb r0, 0x599(r29) -/* 804E27F4 C0 1D 05 54 */ lfs f0, 0x554(r29) -/* 804E27F8 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 804E27FC EC 00 08 2A */ fadds f0, f0, f1 -/* 804E2800 D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 804E2804 C0 1D 05 3C */ lfs f0, 0x53c(r29) -/* 804E2808 EC 00 08 2A */ fadds f0, f0, f1 -/* 804E280C D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 804E2810 38 00 00 20 */ li r0, 0x20 -/* 804E2814 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 804E2818 7F A3 EB 78 */ mr r3, r29 -/* 804E281C 48 00 1B 11 */ bl checkFront__11daBdoorL1_cFv -/* 804E2820 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2824 41 82 00 10 */ beq lbl_804E2834 -/* 804E2828 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 804E282C D0 1D 05 A8 */ stfs f0, 0x5a8(r29) -/* 804E2830 48 00 00 0C */ b lbl_804E283C -lbl_804E2834: -/* 804E2834 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 804E2838 D0 1D 05 A8 */ stfs f0, 0x5a8(r29) -lbl_804E283C: -/* 804E283C 7F A3 EB 78 */ mr r3, r29 -/* 804E2840 4B FF FD 39 */ bl calcMtx__11daBdoorL1_cFv -/* 804E2844 80 7D 05 90 */ lwz r3, 0x590(r29) -/* 804E2848 4B B9 91 79 */ bl Move__4dBgWFv -/* 804E284C 7F A3 EB 78 */ mr r3, r29 -/* 804E2850 4B B5 79 81 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 804E2854 54 7F 06 3E */ clrlwi r31, r3, 0x18 -/* 804E2858 7F A3 EB 78 */ mr r3, r29 -/* 804E285C 4B FF F7 49 */ bl getArcName__11daBdoorL1_cFv -/* 804E2860 90 7D 01 00 */ stw r3, 0x100(r29) -/* 804E2864 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2868 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E286C 7F E4 FB 78 */ mr r4, r31 -/* 804E2870 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 804E2874 7C 05 07 74 */ extsb r5, r0 -/* 804E2878 4B B5 2A E9 */ bl isSwitch__10dSv_info_cCFii -/* 804E287C 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2880 40 82 00 28 */ bne lbl_804E28A8 -/* 804E2884 7F A3 EB 78 */ mr r3, r29 -/* 804E2888 4B FF F5 A5 */ bl getDoorEventName__11daBdoorL1_cFv -/* 804E288C 7C 65 1B 78 */ mr r5, r3 -/* 804E2890 38 7E 40 C0 */ addi r3, r30, 0x40c0 -/* 804E2894 7F A4 EB 78 */ mr r4, r29 -/* 804E2898 38 C0 00 FF */ li r6, 0xff -/* 804E289C 4B B6 4E BD */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 804E28A0 B0 7D 05 9E */ sth r3, 0x59e(r29) -/* 804E28A4 48 00 00 24 */ b lbl_804E28C8 -lbl_804E28A8: -/* 804E28A8 7F A3 EB 78 */ mr r3, r29 -/* 804E28AC 4B FF F6 3D */ bl getDoorEventName2__11daBdoorL1_cFv -/* 804E28B0 7C 65 1B 78 */ mr r5, r3 -/* 804E28B4 38 7E 40 C0 */ addi r3, r30, 0x40c0 -/* 804E28B8 7F A4 EB 78 */ mr r4, r29 -/* 804E28BC 38 C0 00 FF */ li r6, 0xff -/* 804E28C0 4B B6 4E 99 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 804E28C4 B0 7D 05 9E */ sth r3, 0x59e(r29) -lbl_804E28C8: -/* 804E28C8 38 60 00 01 */ li r3, 1 -/* 804E28CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E28D0 4B E7 F9 59 */ bl _restgpr_29 -/* 804E28D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804E28D8 7C 08 03 A6 */ mtlr r0 -/* 804E28DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 804E28E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/Delete__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/Delete__11daBdoorL1_cFv.s deleted file mode 100644 index 342102707e..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/Delete__11daBdoorL1_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_804E48BC: -/* 804E48BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E48C0 7C 08 02 A6 */ mflr r0 -/* 804E48C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E48C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E48CC 7C 7F 1B 78 */ mr r31, r3 -/* 804E48D0 4B FF F8 35 */ bl deleteEmitter__11daBdoorL1_cFv -/* 804E48D4 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 804E48D8 28 00 00 00 */ cmplwi r0, 0 -/* 804E48DC 41 82 00 28 */ beq lbl_804E4904 -/* 804E48E0 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 804E48E4 4B D8 38 F1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 804E48E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 804E48EC 41 82 00 18 */ beq lbl_804E4904 -/* 804E48F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E48F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E48F8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 804E48FC 80 9F 05 90 */ lwz r4, 0x590(r31) -/* 804E4900 4B B8 F9 51 */ bl Release__4cBgSFP9dBgW_Base -lbl_804E4904: -/* 804E4904 7F E3 FB 78 */ mr r3, r31 -/* 804E4908 4B FF D6 9D */ bl getArcName__11daBdoorL1_cFv -/* 804E490C 7C 64 1B 78 */ mr r4, r3 -/* 804E4910 38 7F 05 68 */ addi r3, r31, 0x568 -/* 804E4914 4B B4 86 F5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 804E4918 7F E3 FB 78 */ mr r3, r31 -/* 804E491C 4B FF D8 91 */ bl getAlwaysArcName__11daBdoorL1_cFv -/* 804E4920 7C 64 1B 78 */ mr r4, r3 -/* 804E4924 38 7F 05 70 */ addi r3, r31, 0x570 -/* 804E4928 4B B4 86 E1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 804E492C 7F E3 FB 78 */ mr r3, r31 -/* 804E4930 4B FF D7 31 */ bl getAnmArcName__11daBdoorL1_cFv -/* 804E4934 7C 64 1B 78 */ mr r4, r3 -/* 804E4938 38 7F 05 78 */ addi r3, r31, 0x578 -/* 804E493C 4B B4 86 CD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 804E4940 38 60 00 01 */ li r3, 1 -/* 804E4944 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E4948 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E494C 7C 08 03 A6 */ mtlr r0 -/* 804E4950 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E4954 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 9a63b37f4c..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_804E2530: -/* 804E2530 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E2534 7C 08 02 A6 */ mflr r0 -/* 804E2538 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E253C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E2540 7C 7F 1B 79 */ or. r31, r3, r3 -/* 804E2544 41 82 00 1C */ beq lbl_804E2560 -/* 804E2548 3C A0 80 4E */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x804E5098@ha */ -/* 804E254C 38 05 50 98 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x804E5098@l */ -/* 804E2550 90 1F 00 00 */ stw r0, 0(r31) -/* 804E2554 7C 80 07 35 */ extsh. r0, r4 -/* 804E2558 40 81 00 08 */ ble lbl_804E2560 -/* 804E255C 4B DE C7 E1 */ bl __dl__FPv -lbl_804E2560: -/* 804E2560 7F E3 FB 78 */ mr r3, r31 -/* 804E2564 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E2568 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E256C 7C 08 03 A6 */ mtlr r0 -/* 804E2570 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2574 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 94456e13da..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_804E2A98: -/* 804E2A98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E2A9C 7C 08 02 A6 */ mflr r0 -/* 804E2AA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E2AA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E2AA8 93 C1 00 08 */ stw r30, 8(r1) -/* 804E2AAC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 804E2AB0 7C 9F 23 78 */ mr r31, r4 -/* 804E2AB4 41 82 00 38 */ beq lbl_804E2AEC -/* 804E2AB8 3C 60 80 4E */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x804E5068@ha */ -/* 804E2ABC 38 03 50 68 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x804E5068@l */ -/* 804E2AC0 90 1E 00 0C */ stw r0, 0xc(r30) -/* 804E2AC4 38 7E 00 14 */ addi r3, r30, 0x14 -/* 804E2AC8 38 80 FF FF */ li r4, -1 -/* 804E2ACC 4B D8 C4 4D */ bl __dt__8cM3dGCirFv -/* 804E2AD0 7F C3 F3 78 */ mr r3, r30 -/* 804E2AD4 38 80 00 00 */ li r4, 0 -/* 804E2AD8 4B D8 55 D9 */ bl __dt__13cBgS_PolyInfoFv -/* 804E2ADC 7F E0 07 35 */ extsh. r0, r31 -/* 804E2AE0 40 81 00 0C */ ble lbl_804E2AEC -/* 804E2AE4 7F C3 F3 78 */ mr r3, r30 -/* 804E2AE8 4B DE C2 55 */ bl __dl__FPv -lbl_804E2AEC: -/* 804E2AEC 7F C3 F3 78 */ mr r3, r30 -/* 804E2AF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E2AF4 83 C1 00 08 */ lwz r30, 8(r1) -/* 804E2AF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E2AFC 7C 08 03 A6 */ mtlr r0 -/* 804E2B00 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2B04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index df0aa356e3..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_804E2B08: -/* 804E2B08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E2B0C 7C 08 02 A6 */ mflr r0 -/* 804E2B10 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E2B14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E2B18 93 C1 00 08 */ stw r30, 8(r1) -/* 804E2B1C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 804E2B20 7C 9F 23 78 */ mr r31, r4 -/* 804E2B24 41 82 00 38 */ beq lbl_804E2B5C -/* 804E2B28 3C 80 80 4E */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x804E5074@ha */ -/* 804E2B2C 38 84 50 74 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x804E5074@l */ -/* 804E2B30 90 9E 00 10 */ stw r4, 0x10(r30) -/* 804E2B34 38 04 00 0C */ addi r0, r4, 0xc -/* 804E2B38 90 1E 00 14 */ stw r0, 0x14(r30) -/* 804E2B3C 38 04 00 18 */ addi r0, r4, 0x18 -/* 804E2B40 90 1E 00 24 */ stw r0, 0x24(r30) -/* 804E2B44 38 80 00 00 */ li r4, 0 -/* 804E2B48 4B B9 34 4D */ bl __dt__9dBgS_AcchFv -/* 804E2B4C 7F E0 07 35 */ extsh. r0, r31 -/* 804E2B50 40 81 00 0C */ ble lbl_804E2B5C -/* 804E2B54 7F C3 F3 78 */ mr r3, r30 -/* 804E2B58 4B DE C1 E5 */ bl __dl__FPv -lbl_804E2B5C: -/* 804E2B5C 7F C3 F3 78 */ mr r3, r30 -/* 804E2B60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E2B64 83 C1 00 08 */ lwz r30, 8(r1) -/* 804E2B68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E2B6C 7C 08 03 A6 */ mtlr r0 -/* 804E2B70 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2B74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionCloseWait__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionCloseWait__11daBdoorL1_cFv.s deleted file mode 100644 index 7207793c07..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionCloseWait__11daBdoorL1_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_804E441C: -/* 804E441C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E4420 7C 08 02 A6 */ mflr r0 -/* 804E4424 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E4428 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E442C 7C 7F 1B 78 */ mr r31, r3 -/* 804E4430 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 804E4434 28 00 00 03 */ cmplwi r0, 3 -/* 804E4438 40 82 00 3C */ bne lbl_804E4474 -/* 804E443C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E4440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E4444 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 804E4448 3C 80 80 4E */ lis r4, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E444C 38 84 4A 14 */ addi r4, r4, l_staff_name@l /* 0x804E4A14@l */ -/* 804E4450 38 A0 00 00 */ li r5, 0 -/* 804E4454 38 C0 00 00 */ li r6, 0 -/* 804E4458 4B B6 36 C5 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 804E445C 90 7F 05 A0 */ stw r3, 0x5a0(r31) -/* 804E4460 7F E3 FB 78 */ mr r3, r31 -/* 804E4464 4B FF E7 5D */ bl demoProc__11daBdoorL1_cFv -/* 804E4468 38 00 00 02 */ li r0, 2 -/* 804E446C 98 1F 05 99 */ stb r0, 0x599(r31) -/* 804E4470 48 00 00 2C */ b lbl_804E449C -lbl_804E4474: -/* 804E4474 4B FF FF 2D */ bl checkOpen__11daBdoorL1_cFv -/* 804E4478 2C 03 00 00 */ cmpwi r3, 0 -/* 804E447C 41 82 00 20 */ beq lbl_804E449C -/* 804E4480 A8 1F 05 9E */ lha r0, 0x59e(r31) -/* 804E4484 B0 1F 00 FC */ sth r0, 0xfc(r31) -/* 804E4488 38 00 00 FF */ li r0, 0xff -/* 804E448C 98 1F 00 FE */ stb r0, 0xfe(r31) -/* 804E4490 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 804E4494 60 00 00 04 */ ori r0, r0, 4 -/* 804E4498 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_804E449C: -/* 804E449C 38 60 00 01 */ li r3, 1 -/* 804E44A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E44A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E44A8 7C 08 03 A6 */ mtlr r0 -/* 804E44AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E44B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionEnd__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionEnd__11daBdoorL1_cFv.s deleted file mode 100644 index 36a9e686c9..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionEnd__11daBdoorL1_cFv.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_804E44EC: -/* 804E44EC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804E44F0 7C 08 02 A6 */ mflr r0 -/* 804E44F4 90 01 00 54 */ stw r0, 0x54(r1) -/* 804E44F8 39 61 00 50 */ addi r11, r1, 0x50 -/* 804E44FC 4B E7 DC E1 */ bl _savegpr_29 -/* 804E4500 7C 7F 1B 78 */ mr r31, r3 -/* 804E4504 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E4508 3B C3 4A 14 */ addi r30, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E450C 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 804E4510 4B D8 3C C5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 804E4514 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 804E4518 40 82 00 1C */ bne lbl_804E4534 -/* 804E451C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E4520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E4524 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 804E4528 80 9F 05 90 */ lwz r4, 0x590(r31) -/* 804E452C 7F E5 FB 78 */ mr r5, r31 -/* 804E4530 4B B9 04 D9 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_804E4534: -/* 804E4534 38 00 00 00 */ li r0, 0 -/* 804E4538 98 1F 05 99 */ stb r0, 0x599(r31) -/* 804E453C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 804E4540 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 804E4544 A8 1F 04 B6 */ lha r0, 0x4b6(r31) -/* 804E4548 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 804E454C 7C 64 02 14 */ add r3, r4, r0 -/* 804E4550 C0 23 00 04 */ lfs f1, 4(r3) -/* 804E4554 7C 04 04 2E */ lfsx f0, r4, r0 -/* 804E4558 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804E455C C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 804E4560 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 804E4564 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 804E4568 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E456C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E4570 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 804E4574 38 61 00 08 */ addi r3, r1, 8 -/* 804E4578 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 804E457C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 804E4580 4B D8 25 B5 */ bl __mi__4cXyzCFRC3Vec -/* 804E4584 C0 21 00 08 */ lfs f1, 8(r1) -/* 804E4588 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 804E458C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 804E4590 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 804E4594 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804E4598 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 804E459C C0 C1 00 2C */ lfs f6, 0x2c(r1) -/* 804E45A0 EC 21 01 B2 */ fmuls f1, f1, f6 -/* 804E45A4 C0 41 00 34 */ lfs f2, 0x34(r1) -/* 804E45A8 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 804E45AC EC 81 00 2A */ fadds f4, f1, f0 -/* 804E45B0 C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 804E45B4 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 804E45B8 40 80 00 0C */ bge lbl_804E45C4 -/* 804E45BC C0 BE 00 C0 */ lfs f5, 0xc0(r30) -/* 804E45C0 48 00 00 08 */ b lbl_804E45C8 -lbl_804E45C4: -/* 804E45C4 C0 BE 00 C4 */ lfs f5, 0xc4(r30) -lbl_804E45C8: -/* 804E45C8 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 804E45CC EC 05 00 B2 */ fmuls f0, f5, f2 -/* 804E45D0 EC 61 00 28 */ fsubs f3, f1, f0 -/* 804E45D4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 804E45D8 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 804E45DC EC 05 01 B2 */ fmuls f0, f5, f6 -/* 804E45E0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 804E45E4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804E45E8 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 804E45EC D0 61 00 1C */ stfs f3, 0x1c(r1) -/* 804E45F0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 804E45F4 7C 06 07 74 */ extsb r6, r0 -/* 804E45F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E45FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E4600 38 63 0D B4 */ addi r3, r3, 0xdb4 -/* 804E4604 38 81 00 14 */ addi r4, r1, 0x14 -/* 804E4608 C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 804E460C FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 804E4610 40 81 00 0C */ ble lbl_804E461C -/* 804E4614 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 804E4618 48 00 00 14 */ b lbl_804E462C -lbl_804E461C: -/* 804E461C A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 804E4620 3C A5 00 01 */ addis r5, r5, 1 -/* 804E4624 38 05 80 00 */ addi r0, r5, -32768 -/* 804E4628 7C 05 07 34 */ extsh r5, r0 -lbl_804E462C: -/* 804E462C 4B B5 09 55 */ bl setRoom__13dSv_restart_cFRC4cXyzsSc -/* 804E4630 38 60 00 01 */ li r3, 1 -/* 804E4634 39 61 00 50 */ addi r11, r1, 0x50 -/* 804E4638 4B E7 DB F1 */ bl _restgpr_29 -/* 804E463C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804E4640 7C 08 03 A6 */ mtlr r0 -/* 804E4644 38 21 00 50 */ addi r1, r1, 0x50 -/* 804E4648 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionOpen__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionOpen__11daBdoorL1_cFv.s deleted file mode 100644 index 72025b41f0..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionOpen__11daBdoorL1_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_804E44B4: -/* 804E44B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E44B8 7C 08 02 A6 */ mflr r0 -/* 804E44BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E44C0 4B FF E7 01 */ bl demoProc__11daBdoorL1_cFv -/* 804E44C4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 804E44C8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 804E44CC A0 03 00 B0 */ lhz r0, 0xb0(r3) -/* 804E44D0 60 00 00 02 */ ori r0, r0, 2 -/* 804E44D4 B0 03 00 B0 */ sth r0, 0xb0(r3) -/* 804E44D8 38 60 00 01 */ li r3, 1 -/* 804E44DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E44E0 7C 08 03 A6 */ mtlr r0 -/* 804E44E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E44E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcGoal__11daBdoorL1_cFP4cXyzi.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcGoal__11daBdoorL1_cFP4cXyzi.s deleted file mode 100644 index b8c37666b5..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcGoal__11daBdoorL1_cFP4cXyzi.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_804E3DE8: -/* 804E3DE8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 804E3DEC 7C 08 02 A6 */ mflr r0 -/* 804E3DF0 90 01 00 34 */ stw r0, 0x34(r1) -/* 804E3DF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 804E3DF8 4B E7 E3 E1 */ bl _savegpr_28 -/* 804E3DFC 7C 7D 1B 78 */ mr r29, r3 -/* 804E3E00 7C 9E 23 78 */ mr r30, r4 -/* 804E3E04 7C BC 2B 78 */ mr r28, r5 -/* 804E3E08 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E3E0C 3B E3 4A 14 */ addi r31, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E3E10 38 61 00 08 */ addi r3, r1, 8 -/* 804E3E14 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3E18 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3E1C 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 804E3E20 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 804E3E24 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 804E3E28 4B D8 2D 0D */ bl __mi__4cXyzCFRC3Vec -/* 804E3E2C C0 01 00 08 */ lfs f0, 8(r1) -/* 804E3E30 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804E3E34 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 804E3E38 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804E3E3C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804E3E40 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804E3E44 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3E48 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3E4C A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 804E3E50 7C 00 00 D0 */ neg r0, r0 -/* 804E3E54 7C 04 07 34 */ extsh r4, r0 -/* 804E3E58 4B B2 85 85 */ bl mDoMtx_YrotS__FPA4_fs -/* 804E3E5C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3E60 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3E64 38 81 00 14 */ addi r4, r1, 0x14 -/* 804E3E68 7C 85 23 78 */ mr r5, r4 -/* 804E3E6C 4B E6 2F 01 */ bl PSMTXMultVec -/* 804E3E70 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 804E3E74 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 804E3E78 EC 01 00 32 */ fmuls f0, f1, f0 -/* 804E3E7C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804E3E80 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 804E3E84 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804E3E88 2C 1C 00 00 */ cmpwi r28, 0 -/* 804E3E8C 40 82 00 10 */ bne lbl_804E3E9C -/* 804E3E90 C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 804E3E94 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804E3E98 48 00 00 0C */ b lbl_804E3EA4 -lbl_804E3E9C: -/* 804E3E9C C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 804E3EA0 D0 01 00 1C */ stfs f0, 0x1c(r1) -lbl_804E3EA4: -/* 804E3EA4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3EA8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3EAC C0 3D 04 D0 */ lfs f1, 0x4d0(r29) -/* 804E3EB0 C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 804E3EB4 C0 7D 04 D8 */ lfs f3, 0x4d8(r29) -/* 804E3EB8 4B E6 2A 31 */ bl PSMTXTrans -/* 804E3EBC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3EC0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3EC4 A8 9D 04 DE */ lha r4, 0x4de(r29) -/* 804E3EC8 4B B2 85 6D */ bl mDoMtx_YrotM__FPA4_fs -/* 804E3ECC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3ED0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3ED4 38 81 00 14 */ addi r4, r1, 0x14 -/* 804E3ED8 7C 85 23 78 */ mr r5, r4 -/* 804E3EDC 4B E6 2E 91 */ bl PSMTXMultVec -/* 804E3EE0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 804E3EE4 D0 1E 00 00 */ stfs f0, 0(r30) -/* 804E3EE8 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 804E3EEC D0 1E 00 04 */ stfs f0, 4(r30) -/* 804E3EF0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 804E3EF4 D0 1E 00 08 */ stfs f0, 8(r30) -/* 804E3EF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 804E3EFC 4B E7 E3 29 */ bl _restgpr_28 -/* 804E3F00 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804E3F04 7C 08 03 A6 */ mtlr r0 -/* 804E3F08 38 21 00 30 */ addi r1, r1, 0x30 -/* 804E3F0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcMtx__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcMtx__11daBdoorL1_cFv.s deleted file mode 100644 index e9bd65e753..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcMtx__11daBdoorL1_cFv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_804E2578: -/* 804E2578 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 804E257C 7C 08 02 A6 */ mflr r0 -/* 804E2580 90 01 00 34 */ stw r0, 0x34(r1) -/* 804E2584 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 804E2588 7C 7F 1B 78 */ mr r31, r3 -/* 804E258C C0 23 05 A8 */ lfs f1, 0x5a8(r3) -/* 804E2590 3C 80 80 4E */ lis r4, lit_3919@ha /* 0x804E4A54@ha */ -/* 804E2594 C0 04 4A 54 */ lfs f0, lit_3919@l(r4) /* 0x804E4A54@l */ -/* 804E2598 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804E259C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804E25A0 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 804E25A4 D0 01 00 08 */ stfs f0, 8(r1) -/* 804E25A8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 804E25AC 3C 80 80 4E */ lis r4, lit_3920@ha /* 0x804E4A58@ha */ -/* 804E25B0 C0 04 4A 58 */ lfs f0, lit_3920@l(r4) /* 0x804E4A58@l */ -/* 804E25B4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804E25B8 4B FF FB 0D */ bl getDoorType__11daBdoorL1_cFv -/* 804E25BC 2C 03 00 01 */ cmpwi r3, 1 -/* 804E25C0 41 82 01 00 */ beq lbl_804E26C0 -/* 804E25C4 40 80 01 7C */ bge lbl_804E2740 -/* 804E25C8 2C 03 00 00 */ cmpwi r3, 0 -/* 804E25CC 40 80 00 08 */ bge lbl_804E25D4 -/* 804E25D0 48 00 01 70 */ b lbl_804E2740 -lbl_804E25D4: -/* 804E25D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E25D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E25DC A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 804E25E0 4B B2 9D FD */ bl mDoMtx_YrotS__FPA4_fs -/* 804E25E4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E25E8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E25EC 38 81 00 14 */ addi r4, r1, 0x14 -/* 804E25F0 7C 85 23 78 */ mr r5, r4 -/* 804E25F4 4B E6 47 79 */ bl PSMTXMultVec -/* 804E25F8 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 804E25FC 4B B2 A7 69 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 804E2600 7F E3 FB 78 */ mr r3, r31 -/* 804E2604 48 00 1D 29 */ bl checkFront__11daBdoorL1_cFv -/* 804E2608 2C 03 00 00 */ cmpwi r3, 0 -/* 804E260C 40 82 00 0C */ bne lbl_804E2618 -/* 804E2610 38 61 00 14 */ addi r3, r1, 0x14 -/* 804E2614 4B B2 A7 C1 */ bl transM__14mDoMtx_stack_cFRC4cXyz -lbl_804E2618: -/* 804E2618 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E261C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E2620 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 804E2624 38 04 7F FF */ addi r0, r4, 0x7fff -/* 804E2628 7C 04 07 34 */ extsh r4, r0 -/* 804E262C 4B B2 9E 09 */ bl mDoMtx_YrotM__FPA4_fs -/* 804E2630 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E2634 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E2638 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 804E263C 38 84 00 24 */ addi r4, r4, 0x24 -/* 804E2640 4B E6 3E 71 */ bl PSMTXCopy -/* 804E2644 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 804E2648 4B B2 A7 1D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 804E264C 7F E3 FB 78 */ mr r3, r31 -/* 804E2650 48 00 1C DD */ bl checkFront__11daBdoorL1_cFv -/* 804E2654 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2658 41 82 00 0C */ beq lbl_804E2664 -/* 804E265C 38 61 00 14 */ addi r3, r1, 0x14 -/* 804E2660 4B B2 A7 75 */ bl transM__14mDoMtx_stack_cFRC4cXyz -lbl_804E2664: -/* 804E2664 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E2668 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E266C A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 804E2670 4B B2 9D C5 */ bl mDoMtx_YrotM__FPA4_fs -/* 804E2674 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E2678 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E267C 80 9F 05 84 */ lwz r4, 0x584(r31) -/* 804E2680 38 84 00 24 */ addi r4, r4, 0x24 -/* 804E2684 4B E6 3E 2D */ bl PSMTXCopy -/* 804E2688 7F E3 FB 78 */ mr r3, r31 -/* 804E268C 48 00 1C A1 */ bl checkFront__11daBdoorL1_cFv -/* 804E2690 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2694 41 82 00 18 */ beq lbl_804E26AC -/* 804E2698 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 804E269C 38 63 00 24 */ addi r3, r3, 0x24 -/* 804E26A0 38 9F 07 EC */ addi r4, r31, 0x7ec -/* 804E26A4 4B E6 3E 0D */ bl PSMTXCopy -/* 804E26A8 48 00 00 98 */ b lbl_804E2740 -lbl_804E26AC: -/* 804E26AC 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 804E26B0 38 63 00 24 */ addi r3, r3, 0x24 -/* 804E26B4 38 9F 07 EC */ addi r4, r31, 0x7ec -/* 804E26B8 4B E6 3D F9 */ bl PSMTXCopy -/* 804E26BC 48 00 00 84 */ b lbl_804E2740 -lbl_804E26C0: -/* 804E26C0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 804E26C4 4B B2 A6 A1 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 804E26C8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E26CC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E26D0 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 804E26D4 4B B2 9D 61 */ bl mDoMtx_YrotM__FPA4_fs -/* 804E26D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E26DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E26E0 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 804E26E4 38 84 00 24 */ addi r4, r4, 0x24 -/* 804E26E8 4B E6 3D C9 */ bl PSMTXCopy -/* 804E26EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E26F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E26F4 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 804E26F8 4B B2 9C E5 */ bl mDoMtx_YrotS__FPA4_fs -/* 804E26FC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E2700 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E2704 38 81 00 08 */ addi r4, r1, 8 -/* 804E2708 7C 85 23 78 */ mr r5, r4 -/* 804E270C 4B E6 46 61 */ bl PSMTXMultVec -/* 804E2710 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 804E2714 4B B2 A6 51 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 804E2718 38 61 00 08 */ addi r3, r1, 8 -/* 804E271C 4B B2 A6 B9 */ bl transM__14mDoMtx_stack_cFRC4cXyz -/* 804E2720 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E2724 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E2728 A8 9F 04 B6 */ lha r4, 0x4b6(r31) -/* 804E272C 4B B2 9D 09 */ bl mDoMtx_YrotM__FPA4_fs -/* 804E2730 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E2734 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E2738 38 9F 07 EC */ addi r4, r31, 0x7ec -/* 804E273C 4B E6 3D 75 */ bl PSMTXCopy -lbl_804E2740: -/* 804E2740 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 804E2744 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804E2748 7C 08 03 A6 */ mtlr r0 -/* 804E274C 38 21 00 30 */ addi r1, r1, 0x30 -/* 804E2750 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkArea__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkArea__11daBdoorL1_cFv.s deleted file mode 100644 index d76611780b..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkArea__11daBdoorL1_cFv.s +++ /dev/null @@ -1,124 +0,0 @@ -lbl_804E4158: -/* 804E4158 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 804E415C 7C 08 02 A6 */ mflr r0 -/* 804E4160 90 01 00 74 */ stw r0, 0x74(r1) -/* 804E4164 39 61 00 70 */ addi r11, r1, 0x70 -/* 804E4168 4B E7 E0 71 */ bl _savegpr_28 -/* 804E416C 7C 7D 1B 78 */ mr r29, r3 -/* 804E4170 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E4174 3B E3 4A 14 */ addi r31, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E4178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E417C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E4180 83 DC 5D AC */ lwz r30, 0x5dac(r28) -/* 804E4184 80 7C 5D B4 */ lwz r3, 0x5db4(r28) -/* 804E4188 80 03 05 74 */ lwz r0, 0x574(r3) -/* 804E418C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 804E4190 41 82 00 58 */ beq lbl_804E41E8 -/* 804E4194 38 61 00 20 */ addi r3, r1, 0x20 -/* 804E4198 38 9E 05 50 */ addi r4, r30, 0x550 -/* 804E419C 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 804E41A0 4B D8 29 95 */ bl __mi__4cXyzCFRC3Vec -/* 804E41A4 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 804E41A8 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 804E41AC C0 01 00 24 */ lfs f0, 0x24(r1) -/* 804E41B0 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 804E41B4 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 804E41B8 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 804E41BC 38 61 00 14 */ addi r3, r1, 0x14 -/* 804E41C0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 804E41C4 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 804E41C8 4B D8 29 6D */ bl __mi__4cXyzCFRC3Vec -/* 804E41CC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 804E41D0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804E41D4 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 804E41D8 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 804E41DC C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 804E41E0 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 804E41E4 48 00 00 2C */ b lbl_804E4210 -lbl_804E41E8: -/* 804E41E8 38 61 00 08 */ addi r3, r1, 8 -/* 804E41EC 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 804E41F0 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 804E41F4 4B D8 29 41 */ bl __mi__4cXyzCFRC3Vec -/* 804E41F8 C0 01 00 08 */ lfs f0, 8(r1) -/* 804E41FC D0 01 00 38 */ stfs f0, 0x38(r1) -/* 804E4200 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 804E4204 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 804E4208 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804E420C D0 01 00 40 */ stfs f0, 0x40(r1) -lbl_804E4210: -/* 804E4210 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E4214 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E4218 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 804E421C 7C 00 00 D0 */ neg r0, r0 -/* 804E4220 7C 04 07 34 */ extsh r4, r0 -/* 804E4224 4B B2 81 B9 */ bl mDoMtx_YrotS__FPA4_fs -/* 804E4228 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E422C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E4230 38 81 00 38 */ addi r4, r1, 0x38 -/* 804E4234 7C 85 23 78 */ mr r5, r4 -/* 804E4238 4B E6 2B 35 */ bl PSMTXMultVec -/* 804E423C C0 01 00 38 */ lfs f0, 0x38(r1) -/* 804E4240 FC 00 02 10 */ fabs f0, f0 -/* 804E4244 FC 20 00 18 */ frsp f1, f0 -/* 804E4248 C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 804E424C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804E4250 40 81 00 0C */ ble lbl_804E425C -/* 804E4254 38 60 00 00 */ li r3, 0 -/* 804E4258 48 00 00 BC */ b lbl_804E4314 -lbl_804E425C: -/* 804E425C 80 7C 5D B4 */ lwz r3, 0x5db4(r28) -/* 804E4260 80 03 05 74 */ lwz r0, 0x574(r3) -/* 804E4264 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 804E4268 41 82 00 38 */ beq lbl_804E42A0 -/* 804E426C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E4270 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E4274 38 81 00 2C */ addi r4, r1, 0x2c -/* 804E4278 7C 85 23 78 */ mr r5, r4 -/* 804E427C 4B E6 2A F1 */ bl PSMTXMultVec -/* 804E4280 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 804E4284 FC 00 02 10 */ fabs f0, f0 -/* 804E4288 FC 20 00 18 */ frsp f1, f0 -/* 804E428C C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 804E4290 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804E4294 40 81 00 0C */ ble lbl_804E42A0 -/* 804E4298 38 60 00 00 */ li r3, 0 -/* 804E429C 48 00 00 78 */ b lbl_804E4314 -lbl_804E42A0: -/* 804E42A0 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 804E42A4 FC 00 02 10 */ fabs f0, f0 -/* 804E42A8 FC 20 00 18 */ frsp f1, f0 -/* 804E42AC C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 804E42B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804E42B4 40 81 00 0C */ ble lbl_804E42C0 -/* 804E42B8 38 60 00 00 */ li r3, 0 -/* 804E42BC 48 00 00 58 */ b lbl_804E4314 -lbl_804E42C0: -/* 804E42C0 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 804E42C4 A8 7D 04 DE */ lha r3, 0x4de(r29) -/* 804E42C8 38 03 80 01 */ addi r0, r3, -32767 -/* 804E42CC 7C 04 00 50 */ subf r0, r4, r0 -/* 804E42D0 C8 3F 00 B8 */ lfd f1, 0xb8(r31) -/* 804E42D4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 804E42D8 90 01 00 4C */ stw r0, 0x4c(r1) -/* 804E42DC 3C 00 43 30 */ lis r0, 0x4330 -/* 804E42E0 90 01 00 48 */ stw r0, 0x48(r1) -/* 804E42E4 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 804E42E8 FC 00 08 28 */ fsub f0, f0, f1 -/* 804E42EC FC 00 02 10 */ fabs f0, f0 -/* 804E42F0 FC 00 00 1E */ fctiwz f0, f0 -/* 804E42F4 D8 01 00 50 */ stfd f0, 0x50(r1) -/* 804E42F8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804E42FC 7C 05 07 34 */ extsh r5, r0 -/* 804E4300 38 00 40 00 */ li r0, 0x4000 -/* 804E4304 7C 04 FE 70 */ srawi r4, r0, 0x1f -/* 804E4308 54 A3 0F FE */ srwi r3, r5, 0x1f -/* 804E430C 7C 05 00 10 */ subfc r0, r5, r0 -/* 804E4310 7C 64 19 14 */ adde r3, r4, r3 -lbl_804E4314: -/* 804E4314 39 61 00 70 */ addi r11, r1, 0x70 -/* 804E4318 4B E7 DF 0D */ bl _restgpr_28 -/* 804E431C 80 01 00 74 */ lwz r0, 0x74(r1) -/* 804E4320 7C 08 03 A6 */ mtlr r0 -/* 804E4324 38 21 00 70 */ addi r1, r1, 0x70 -/* 804E4328 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s deleted file mode 100644 index 41b7e203d2..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_804E432C: -/* 804E432C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E4330 7C 08 02 A6 */ mflr r0 -/* 804E4334 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E4338 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E433C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E4340 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 804E4344 3C 80 80 4E */ lis r4, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E4348 38 84 4A DC */ addi r4, r4, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E434C 38 84 00 70 */ addi r4, r4, 0x70 -/* 804E4350 4B E8 46 45 */ bl strcmp -/* 804E4354 2C 03 00 00 */ cmpwi r3, 0 -/* 804E4358 40 82 00 1C */ bne lbl_804E4374 -/* 804E435C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 804E4360 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 804E4364 2C 00 00 0A */ cmpwi r0, 0xa -/* 804E4368 40 82 00 24 */ bne lbl_804E438C -/* 804E436C 38 60 00 00 */ li r3, 0 -/* 804E4370 48 00 00 20 */ b lbl_804E4390 -lbl_804E4374: -/* 804E4374 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 804E4378 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 804E437C 2C 00 00 32 */ cmpwi r0, 0x32 -/* 804E4380 40 82 00 0C */ bne lbl_804E438C -/* 804E4384 38 60 00 00 */ li r3, 0 -/* 804E4388 48 00 00 08 */ b lbl_804E4390 -lbl_804E438C: -/* 804E438C 38 60 00 01 */ li r3, 1 -lbl_804E4390: -/* 804E4390 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E4394 7C 08 03 A6 */ mtlr r0 -/* 804E4398 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E439C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkOpen__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkOpen__11daBdoorL1_cFv.s deleted file mode 100644 index 0f5c1363f4..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkOpen__11daBdoorL1_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_804E43A0: -/* 804E43A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E43A4 7C 08 02 A6 */ mflr r0 -/* 804E43A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E43AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E43B0 7C 7F 1B 78 */ mr r31, r3 -/* 804E43B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E43B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E43BC 38 63 09 58 */ addi r3, r3, 0x958 -/* 804E43C0 38 80 00 02 */ li r4, 2 -/* 804E43C4 4B B5 05 71 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 804E43C8 2C 03 00 00 */ cmpwi r3, 0 -/* 804E43CC 40 82 00 0C */ bne lbl_804E43D8 -/* 804E43D0 38 60 00 00 */ li r3, 0 -/* 804E43D4 48 00 00 2C */ b lbl_804E4400 -lbl_804E43D8: -/* 804E43D8 7F E3 FB 78 */ mr r3, r31 -/* 804E43DC 4B FF FF 51 */ bl checkFront__11daBdoorL1_cFv -/* 804E43E0 2C 03 00 00 */ cmpwi r3, 0 -/* 804E43E4 40 82 00 0C */ bne lbl_804E43F0 -/* 804E43E8 38 60 00 00 */ li r3, 0 -/* 804E43EC 48 00 00 14 */ b lbl_804E4400 -lbl_804E43F0: -/* 804E43F0 7F E3 FB 78 */ mr r3, r31 -/* 804E43F4 4B FF FD 65 */ bl checkArea__11daBdoorL1_cFv -/* 804E43F8 30 03 FF FF */ addic r0, r3, -1 -/* 804E43FC 7C 60 19 10 */ subfe r3, r0, r3 -lbl_804E4400: -/* 804E4400 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E4404 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E4408 7C 08 03 A6 */ mtlr r0 -/* 804E440C 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E4410 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeInit__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeInit__11daBdoorL1_cFv.s deleted file mode 100644 index 27e7a92d8d..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeInit__11daBdoorL1_cFv.s +++ /dev/null @@ -1,125 +0,0 @@ -lbl_804E3850: -/* 804E3850 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 804E3854 7C 08 02 A6 */ mflr r0 -/* 804E3858 90 01 00 34 */ stw r0, 0x34(r1) -/* 804E385C 39 61 00 30 */ addi r11, r1, 0x30 -/* 804E3860 4B E7 E9 7D */ bl _savegpr_29 -/* 804E3864 7C 7E 1B 78 */ mr r30, r3 -/* 804E3868 3C 80 80 4E */ lis r4, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E386C 3B E4 4A 14 */ addi r31, r4, l_staff_name@l /* 0x804E4A14@l */ -/* 804E3870 4B FF E8 E9 */ bl getCloseAnm__11daBdoorL1_cFv -/* 804E3874 7C 7D 1B 78 */ mr r29, r3 -/* 804E3878 7F C3 F3 78 */ mr r3, r30 -/* 804E387C 4B FF E7 E5 */ bl getAnmArcName__11daBdoorL1_cFv -/* 804E3880 7F A4 EB 78 */ mr r4, r29 -/* 804E3884 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3888 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E388C 3C A5 00 02 */ addis r5, r5, 2 -/* 804E3890 38 C0 00 80 */ li r6, 0x80 -/* 804E3894 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804E3898 4B B5 8A 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 804E389C 7C 64 1B 78 */ mr r4, r3 -/* 804E38A0 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 804E38A4 38 A0 00 01 */ li r5, 1 -/* 804E38A8 38 C0 00 00 */ li r6, 0 -/* 804E38AC C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E38B0 38 E0 00 00 */ li r7, 0 -/* 804E38B4 39 00 FF FF */ li r8, -1 -/* 804E38B8 39 20 00 01 */ li r9, 1 -/* 804E38BC 4B B2 9F 21 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 804E38C0 4B FF E4 D9 */ bl getNowLevel__Fv -/* 804E38C4 2C 03 00 08 */ cmpwi r3, 8 -/* 804E38C8 41 82 00 2C */ beq lbl_804E38F4 -/* 804E38CC 40 80 00 1C */ bge lbl_804E38E8 -/* 804E38D0 2C 03 00 05 */ cmpwi r3, 5 -/* 804E38D4 41 82 00 C0 */ beq lbl_804E3994 -/* 804E38D8 40 80 00 6C */ bge lbl_804E3944 -/* 804E38DC 2C 03 00 04 */ cmpwi r3, 4 -/* 804E38E0 40 80 00 64 */ bge lbl_804E3944 -/* 804E38E4 48 00 00 B0 */ b lbl_804E3994 -lbl_804E38E8: -/* 804E38E8 2C 03 00 0A */ cmpwi r3, 0xa -/* 804E38EC 40 80 00 A8 */ bge lbl_804E3994 -/* 804E38F0 48 00 00 54 */ b lbl_804E3944 -lbl_804E38F4: -/* 804E38F4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804E38F8 7C 03 07 74 */ extsb r3, r0 -/* 804E38FC 4B B4 97 71 */ bl dComIfGp_getReverb__Fi -/* 804E3900 7C 67 1B 78 */ mr r7, r3 -/* 804E3904 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008021A@ha */ -/* 804E3908 38 03 02 1A */ addi r0, r3, 0x021A /* 0x0008021A@l */ -/* 804E390C 90 01 00 08 */ stw r0, 8(r1) -/* 804E3910 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E3914 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E3918 80 63 00 00 */ lwz r3, 0(r3) -/* 804E391C 38 81 00 08 */ addi r4, r1, 8 -/* 804E3920 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804E3924 38 C0 00 00 */ li r6, 0 -/* 804E3928 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E392C FC 40 08 90 */ fmr f2, f1 -/* 804E3930 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 804E3934 FC 80 18 90 */ fmr f4, f3 -/* 804E3938 39 00 00 00 */ li r8, 0 -/* 804E393C 4B DC 80 49 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E3940 48 00 00 A0 */ b lbl_804E39E0 -lbl_804E3944: -/* 804E3944 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804E3948 7C 03 07 74 */ extsb r3, r0 -/* 804E394C 4B B4 97 21 */ bl dComIfGp_getReverb__Fi -/* 804E3950 7C 67 1B 78 */ mr r7, r3 -/* 804E3954 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080192@ha */ -/* 804E3958 38 03 01 92 */ addi r0, r3, 0x0192 /* 0x00080192@l */ -/* 804E395C 90 01 00 10 */ stw r0, 0x10(r1) -/* 804E3960 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E3964 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E3968 80 63 00 00 */ lwz r3, 0(r3) -/* 804E396C 38 81 00 10 */ addi r4, r1, 0x10 -/* 804E3970 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 804E3974 38 C0 00 00 */ li r6, 0 -/* 804E3978 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E397C FC 40 08 90 */ fmr f2, f1 -/* 804E3980 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 804E3984 FC 80 18 90 */ fmr f4, f3 -/* 804E3988 39 00 00 00 */ li r8, 0 -/* 804E398C 4B DC 7F F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E3990 48 00 00 50 */ b lbl_804E39E0 -lbl_804E3994: -/* 804E3994 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804E3998 7C 03 07 74 */ extsb r3, r0 -/* 804E399C 4B B4 96 D1 */ bl dComIfGp_getReverb__Fi -/* 804E39A0 7C 67 1B 78 */ mr r7, r3 -/* 804E39A4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B3@ha */ -/* 804E39A8 38 03 00 B3 */ addi r0, r3, 0x00B3 /* 0x000800B3@l */ -/* 804E39AC 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E39B0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E39B4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E39B8 80 63 00 00 */ lwz r3, 0(r3) -/* 804E39BC 38 81 00 0C */ addi r4, r1, 0xc -/* 804E39C0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 804E39C4 38 C0 00 00 */ li r6, 0 -/* 804E39C8 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E39CC FC 40 08 90 */ fmr f2, f1 -/* 804E39D0 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 804E39D4 FC 80 18 90 */ fmr f4, f3 -/* 804E39D8 39 00 00 00 */ li r8, 0 -/* 804E39DC 4B DC 7F A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804E39E0: -/* 804E39E0 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 804E39E4 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 804E39E8 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 804E39EC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804E39F0 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 804E39F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E39F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E39FC 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 804E3A00 38 80 00 04 */ li r4, 4 -/* 804E3A04 38 A0 00 0F */ li r5, 0xf -/* 804E3A08 38 C1 00 14 */ addi r6, r1, 0x14 -/* 804E3A0C 4B B8 C1 05 */ bl StartQuake__12dVibration_cFii4cXyz -/* 804E3A10 38 60 00 01 */ li r3, 1 -/* 804E3A14 39 61 00 30 */ addi r11, r1, 0x30 -/* 804E3A18 4B E7 E8 11 */ bl _restgpr_29 -/* 804E3A1C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804E3A20 7C 08 03 A6 */ mtlr r0 -/* 804E3A24 38 21 00 30 */ addi r1, r1, 0x30 -/* 804E3A28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeProc__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeProc__11daBdoorL1_cFv.s deleted file mode 100644 index 36056700fd..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeProc__11daBdoorL1_cFv.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_804E3A2C: -/* 804E3A2C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804E3A30 7C 08 02 A6 */ mflr r0 -/* 804E3A34 90 01 00 54 */ stw r0, 0x54(r1) -/* 804E3A38 39 61 00 50 */ addi r11, r1, 0x50 -/* 804E3A3C 4B E7 E7 A1 */ bl _savegpr_29 -/* 804E3A40 7C 7E 1B 78 */ mr r30, r3 -/* 804E3A44 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E3A48 3B A3 4A 14 */ addi r29, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E3A4C 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 804E3A50 4B B2 99 D9 */ bl play__14mDoExt_baseAnmFv -/* 804E3A54 7C 7F 1B 78 */ mr r31, r3 -/* 804E3A58 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 804E3A5C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 804E3A60 C0 1D 00 80 */ lfs f0, 0x80(r29) -/* 804E3A64 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804E3A68 40 82 00 1C */ bne lbl_804E3A84 -/* 804E3A6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3A70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3A74 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 804E3A78 38 80 00 1F */ li r4, 0x1f -/* 804E3A7C 4B B8 C3 19 */ bl StopQuake__12dVibration_cFi -/* 804E3A80 48 00 01 70 */ b lbl_804E3BF0 -lbl_804E3A84: -/* 804E3A84 C0 1D 00 78 */ lfs f0, 0x78(r29) -/* 804E3A88 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804E3A8C 40 82 00 AC */ bne lbl_804E3B38 -/* 804E3A90 C0 3D 00 40 */ lfs f1, 0x40(r29) -/* 804E3A94 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 804E3A98 C0 1D 00 3C */ lfs f0, 0x3c(r29) -/* 804E3A9C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 804E3AA0 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 804E3AA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3AA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3AAC 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 804E3AB0 38 80 00 08 */ li r4, 8 -/* 804E3AB4 38 A0 00 0F */ li r5, 0xf -/* 804E3AB8 38 C1 00 1C */ addi r6, r1, 0x1c -/* 804E3ABC 4B B8 BF 69 */ bl StartShock__12dVibration_cFii4cXyz -/* 804E3AC0 4B FF E2 D9 */ bl getNowLevel__Fv -/* 804E3AC4 2C 03 00 05 */ cmpwi r3, 5 -/* 804E3AC8 41 82 00 20 */ beq lbl_804E3AE8 -/* 804E3ACC 40 80 00 10 */ bge lbl_804E3ADC -/* 804E3AD0 2C 03 00 04 */ cmpwi r3, 4 -/* 804E3AD4 40 80 01 1C */ bge lbl_804E3BF0 -/* 804E3AD8 48 00 00 10 */ b lbl_804E3AE8 -lbl_804E3ADC: -/* 804E3ADC 2C 03 00 0A */ cmpwi r3, 0xa -/* 804E3AE0 40 80 00 08 */ bge lbl_804E3AE8 -/* 804E3AE4 48 00 01 0C */ b lbl_804E3BF0 -lbl_804E3AE8: -/* 804E3AE8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804E3AEC 7C 03 07 74 */ extsb r3, r0 -/* 804E3AF0 4B B4 95 7D */ bl dComIfGp_getReverb__Fi -/* 804E3AF4 7C 67 1B 78 */ mr r7, r3 -/* 804E3AF8 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B5@ha */ -/* 804E3AFC 38 03 00 B5 */ addi r0, r3, 0x00B5 /* 0x000800B5@l */ -/* 804E3B00 90 01 00 18 */ stw r0, 0x18(r1) -/* 804E3B04 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E3B08 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E3B0C 80 63 00 00 */ lwz r3, 0(r3) -/* 804E3B10 38 81 00 18 */ addi r4, r1, 0x18 -/* 804E3B14 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 804E3B18 38 C0 00 00 */ li r6, 0 -/* 804E3B1C C0 3D 00 3C */ lfs f1, 0x3c(r29) -/* 804E3B20 FC 40 08 90 */ fmr f2, f1 -/* 804E3B24 C0 7D 00 54 */ lfs f3, 0x54(r29) -/* 804E3B28 FC 80 18 90 */ fmr f4, f3 -/* 804E3B2C 39 00 00 00 */ li r8, 0 -/* 804E3B30 4B DC 7E 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E3B34 48 00 00 BC */ b lbl_804E3BF0 -lbl_804E3B38: -/* 804E3B38 C0 1D 00 84 */ lfs f0, 0x84(r29) -/* 804E3B3C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804E3B40 40 82 00 B0 */ bne lbl_804E3BF0 -/* 804E3B44 4B FF E2 55 */ bl getNowLevel__Fv -/* 804E3B48 2C 03 00 05 */ cmpwi r3, 5 -/* 804E3B4C 41 82 00 A4 */ beq lbl_804E3BF0 -/* 804E3B50 40 80 00 10 */ bge lbl_804E3B60 -/* 804E3B54 2C 03 00 04 */ cmpwi r3, 4 -/* 804E3B58 40 80 00 10 */ bge lbl_804E3B68 -/* 804E3B5C 48 00 00 94 */ b lbl_804E3BF0 -lbl_804E3B60: -/* 804E3B60 2C 03 00 0A */ cmpwi r3, 0xa -/* 804E3B64 40 80 00 8C */ bge lbl_804E3BF0 -lbl_804E3B68: -/* 804E3B68 C0 1E 07 C8 */ lfs f0, 0x7c8(r30) -/* 804E3B6C C0 3D 00 88 */ lfs f1, 0x88(r29) -/* 804E3B70 EC 00 08 28 */ fsubs f0, f0, f1 -/* 804E3B74 D0 1E 07 C8 */ stfs f0, 0x7c8(r30) -/* 804E3B78 C0 1E 07 D4 */ lfs f0, 0x7d4(r30) -/* 804E3B7C EC 00 08 2A */ fadds f0, f0, f1 -/* 804E3B80 D0 1E 07 D4 */ stfs f0, 0x7d4(r30) -/* 804E3B84 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 804E3B88 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3B8C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3B90 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 804E3B94 4B B9 2F 19 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 804E3B98 C0 1D 00 8C */ lfs f0, 0x8c(r29) -/* 804E3B9C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 804E3BA0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804E3BA4 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 804E3BA8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804E3BAC 7C 03 07 74 */ extsb r3, r0 -/* 804E3BB0 38 00 00 00 */ li r0, 0 -/* 804E3BB4 90 01 00 08 */ stw r0, 8(r1) -/* 804E3BB8 90 61 00 0C */ stw r3, 0xc(r1) -/* 804E3BBC 90 01 00 10 */ stw r0, 0x10(r1) -/* 804E3BC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3BC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3BC8 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 804E3BCC 3C 80 00 01 */ lis r4, 0x0001 /* 0x00008C50@ha */ -/* 804E3BD0 38 84 8C 50 */ addi r4, r4, 0x8C50 /* 0x00008C50@l */ -/* 804E3BD4 38 BE 06 9C */ addi r5, r30, 0x69c -/* 804E3BD8 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804E3BDC 38 FE 01 0C */ addi r7, r30, 0x10c -/* 804E3BE0 39 1E 04 E4 */ addi r8, r30, 0x4e4 -/* 804E3BE4 39 21 00 28 */ addi r9, r1, 0x28 -/* 804E3BE8 39 40 00 00 */ li r10, 0 -/* 804E3BEC 4B B6 94 7D */ bl setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz -lbl_804E3BF0: -/* 804E3BF0 7F E3 FB 78 */ mr r3, r31 -/* 804E3BF4 39 61 00 50 */ addi r11, r1, 0x50 -/* 804E3BF8 4B E7 E6 31 */ bl _restgpr_29 -/* 804E3BFC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804E3C00 7C 08 03 A6 */ mtlr r0 -/* 804E3C04 38 21 00 50 */ addi r1, r1, 0x50 -/* 804E3C08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/createKey__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/createKey__11daBdoorL1_cFv.s deleted file mode 100644 index 549019818c..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/createKey__11daBdoorL1_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_804E3FF8: -/* 804E3FF8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 804E3FFC 7C 08 02 A6 */ mflr r0 -/* 804E4000 90 01 00 34 */ stw r0, 0x34(r1) -/* 804E4004 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 804E4008 7C 7F 1B 78 */ mr r31, r3 -/* 804E400C 88 03 05 98 */ lbz r0, 0x598(r3) -/* 804E4010 28 00 00 00 */ cmplwi r0, 0 -/* 804E4014 40 82 00 D4 */ bne lbl_804E40E8 -/* 804E4018 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 804E401C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804E4020 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804E4024 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 804E4028 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 804E402C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 804E4030 C0 1F 04 A8 */ lfs f0, 0x4a8(r31) -/* 804E4034 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 804E4038 C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 804E403C D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 804E4040 C0 1F 04 B0 */ lfs f0, 0x4b0(r31) -/* 804E4044 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 804E4048 3C 60 80 4E */ lis r3, lit_3919@ha /* 0x804E4A54@ha */ -/* 804E404C C0 03 4A 54 */ lfs f0, lit_3919@l(r3) /* 0x804E4A54@l */ -/* 804E4050 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804E4054 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804E4058 3C 60 80 4E */ lis r3, lit_4706@ha /* 0x804E4ABC@ha */ -/* 804E405C C0 03 4A BC */ lfs f0, lit_4706@l(r3) /* 0x804E4ABC@l */ -/* 804E4060 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804E4064 4B FF DD 35 */ bl getNowLevel__Fv -/* 804E4068 38 A0 FF 00 */ li r5, -256 -/* 804E406C 7C A5 1B 78 */ or r5, r5, r3 -/* 804E4070 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E4074 7C 07 07 74 */ extsb r7, r0 -/* 804E4078 38 00 00 00 */ li r0, 0 -/* 804E407C 90 01 00 08 */ stw r0, 8(r1) -/* 804E4080 38 60 01 14 */ li r3, 0x114 -/* 804E4084 28 1F 00 00 */ cmplwi r31, 0 -/* 804E4088 41 82 00 0C */ beq lbl_804E4094 -/* 804E408C 80 9F 00 04 */ lwz r4, 4(r31) -/* 804E4090 48 00 00 08 */ b lbl_804E4098 -lbl_804E4094: -/* 804E4094 38 80 FF FF */ li r4, -1 -lbl_804E4098: -/* 804E4098 38 C1 00 10 */ addi r6, r1, 0x10 -/* 804E409C 39 00 00 00 */ li r8, 0 -/* 804E40A0 39 3F 04 EC */ addi r9, r31, 0x4ec -/* 804E40A4 39 40 FF FF */ li r10, -1 -/* 804E40A8 4B B3 5E D1 */ bl fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -/* 804E40AC 90 7F 05 94 */ stw r3, 0x594(r31) -/* 804E40B0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 804E40B4 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 804E40B8 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 804E40BC D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 804E40C0 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 804E40C4 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 804E40C8 80 7F 05 94 */ lwz r3, 0x594(r31) -/* 804E40CC 3C 03 00 01 */ addis r0, r3, 1 -/* 804E40D0 28 00 FF FF */ cmplwi r0, 0xffff -/* 804E40D4 40 82 00 0C */ bne lbl_804E40E0 -/* 804E40D8 38 60 00 00 */ li r3, 0 -/* 804E40DC 48 00 00 10 */ b lbl_804E40EC -lbl_804E40E0: -/* 804E40E0 38 00 00 01 */ li r0, 1 -/* 804E40E4 98 1F 05 98 */ stb r0, 0x598(r31) -lbl_804E40E8: -/* 804E40E8 38 60 00 01 */ li r3, 1 -lbl_804E40EC: -/* 804E40EC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 804E40F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804E40F4 7C 08 03 A6 */ mtlr r0 -/* 804E40F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 804E40FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/create__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/create__11daBdoorL1_cFv.s deleted file mode 100644 index a72278d77b..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/create__11daBdoorL1_cFv.s +++ /dev/null @@ -1,119 +0,0 @@ -lbl_804E28E4: -/* 804E28E4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804E28E8 7C 08 02 A6 */ mflr r0 -/* 804E28EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 804E28F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E28F4 4B E7 F8 E9 */ bl _savegpr_29 -/* 804E28F8 7C 7F 1B 78 */ mr r31, r3 -/* 804E28FC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 804E2900 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 804E2904 40 82 00 58 */ bne lbl_804E295C -/* 804E2908 7F E0 FB 79 */ or. r0, r31, r31 -/* 804E290C 41 82 00 44 */ beq lbl_804E2950 -/* 804E2910 7C 1E 03 78 */ mr r30, r0 -/* 804E2914 4B B3 62 51 */ bl __ct__10fopAc_ac_cFv -/* 804E2918 3B BE 05 AC */ addi r29, r30, 0x5ac -/* 804E291C 7F A3 EB 78 */ mr r3, r29 -/* 804E2920 4B B9 37 81 */ bl __ct__9dBgS_AcchFv -/* 804E2924 3C 60 80 4E */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x804E5074@ha */ -/* 804E2928 38 63 50 74 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x804E5074@l */ -/* 804E292C 90 7D 00 10 */ stw r3, 0x10(r29) -/* 804E2930 38 03 00 0C */ addi r0, r3, 0xc -/* 804E2934 90 1D 00 14 */ stw r0, 0x14(r29) -/* 804E2938 38 03 00 18 */ addi r0, r3, 0x18 -/* 804E293C 90 1D 00 24 */ stw r0, 0x24(r29) -/* 804E2940 38 7D 00 14 */ addi r3, r29, 0x14 -/* 804E2944 4B B9 65 25 */ bl SetObj__16dBgS_PolyPassChkFv -/* 804E2948 38 7E 07 84 */ addi r3, r30, 0x784 -/* 804E294C 4B B9 35 61 */ bl __ct__12dBgS_AcchCirFv -lbl_804E2950: -/* 804E2950 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 804E2954 60 00 00 08 */ ori r0, r0, 8 -/* 804E2958 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_804E295C: -/* 804E295C 7F E3 FB 78 */ mr r3, r31 -/* 804E2960 4B FF F6 45 */ bl getArcName__11daBdoorL1_cFv -/* 804E2964 7C 64 1B 78 */ mr r4, r3 -/* 804E2968 38 7F 05 68 */ addi r3, r31, 0x568 -/* 804E296C 4B B4 A5 51 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 804E2970 2C 03 00 04 */ cmpwi r3, 4 -/* 804E2974 41 82 00 08 */ beq lbl_804E297C -/* 804E2978 48 00 01 08 */ b lbl_804E2A80 -lbl_804E297C: -/* 804E297C 7F E3 FB 78 */ mr r3, r31 -/* 804E2980 4B FF F6 E1 */ bl getAnmArcName__11daBdoorL1_cFv -/* 804E2984 7C 64 1B 78 */ mr r4, r3 -/* 804E2988 38 7F 05 78 */ addi r3, r31, 0x578 -/* 804E298C 4B B4 A5 31 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 804E2990 2C 03 00 04 */ cmpwi r3, 4 -/* 804E2994 41 82 00 08 */ beq lbl_804E299C -/* 804E2998 48 00 00 E8 */ b lbl_804E2A80 -lbl_804E299C: -/* 804E299C 7F E3 FB 78 */ mr r3, r31 -/* 804E29A0 4B FF F8 0D */ bl getAlwaysArcName__11daBdoorL1_cFv -/* 804E29A4 7C 64 1B 78 */ mr r4, r3 -/* 804E29A8 38 7F 05 70 */ addi r3, r31, 0x570 -/* 804E29AC 4B B4 A5 11 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 804E29B0 2C 03 00 04 */ cmpwi r3, 4 -/* 804E29B4 41 82 00 08 */ beq lbl_804E29BC -/* 804E29B8 48 00 00 C8 */ b lbl_804E2A80 -lbl_804E29BC: -/* 804E29BC 38 00 00 00 */ li r0, 0 -/* 804E29C0 B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 804E29C4 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 804E29C8 B0 1F 04 E0 */ sth r0, 0x4e0(r31) -/* 804E29CC B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 804E29D0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E29D4 7C 1E 07 74 */ extsb r30, r0 -/* 804E29D8 7F E3 FB 78 */ mr r3, r31 -/* 804E29DC 4B B5 77 F5 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 804E29E0 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 804E29E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E29E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E29EC 7F C5 F3 78 */ mr r5, r30 -/* 804E29F0 4B B5 29 71 */ bl isSwitch__10dSv_info_cCFii -/* 804E29F4 2C 03 00 00 */ cmpwi r3, 0 -/* 804E29F8 40 82 00 38 */ bne lbl_804E2A30 -/* 804E29FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2A00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2A04 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 804E2A08 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 804E2A0C 7D 89 03 A6 */ mtctr r12 -/* 804E2A10 4E 80 04 21 */ bctrl -/* 804E2A14 80 03 00 0C */ lwz r0, 0xc(r3) -/* 804E2A18 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 804E2A1C 28 00 00 03 */ cmplwi r0, 3 -/* 804E2A20 41 82 00 10 */ beq lbl_804E2A30 -/* 804E2A24 7F E3 FB 78 */ mr r3, r31 -/* 804E2A28 48 00 15 D1 */ bl createKey__11daBdoorL1_cFv -/* 804E2A2C 48 00 00 0C */ b lbl_804E2A38 -lbl_804E2A30: -/* 804E2A30 38 00 FF FF */ li r0, -1 -/* 804E2A34 90 1F 05 94 */ stw r0, 0x594(r31) -lbl_804E2A38: -/* 804E2A38 4B FF F3 61 */ bl getNowLevel__Fv -/* 804E2A3C 54 60 10 3A */ slwi r0, r3, 2 -/* 804E2A40 3C 60 80 4E */ lis r3, l_heap_size@ha /* 0x804E4A24@ha */ -/* 804E2A44 38 A3 4A 24 */ addi r5, r3, l_heap_size@l /* 0x804E4A24@l */ -/* 804E2A48 7F E3 FB 78 */ mr r3, r31 -/* 804E2A4C 3C 80 80 4E */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x804E2238@ha */ -/* 804E2A50 38 84 22 38 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x804E2238@l */ -/* 804E2A54 7C A5 00 2E */ lwzx r5, r5, r0 -/* 804E2A58 4B B3 7A 59 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 804E2A5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 804E2A60 40 82 00 0C */ bne lbl_804E2A6C -/* 804E2A64 38 60 00 05 */ li r3, 5 -/* 804E2A68 48 00 00 18 */ b lbl_804E2A80 -lbl_804E2A6C: -/* 804E2A6C 7F E3 FB 78 */ mr r3, r31 -/* 804E2A70 4B FF FC E5 */ bl CreateInit__11daBdoorL1_cFv -/* 804E2A74 20 03 00 00 */ subfic r0, r3, 0 -/* 804E2A78 7C 60 01 10 */ subfe r3, r0, r0 -/* 804E2A7C 38 63 00 05 */ addi r3, r3, 5 -lbl_804E2A80: -/* 804E2A80 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E2A84 4B E7 F7 A5 */ bl _restgpr_29 -/* 804E2A88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804E2A8C 7C 08 03 A6 */ mtlr r0 -/* 804E2A90 38 21 00 20 */ addi r1, r1, 0x20 -/* 804E2A94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Create__FP10fopAc_ac_c.s deleted file mode 100644 index f5142316e3..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_804E49C0: -/* 804E49C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E49C4 7C 08 02 A6 */ mflr r0 -/* 804E49C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E49CC 4B FF DF 19 */ bl create__11daBdoorL1_cFv -/* 804E49D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E49D4 7C 08 03 A6 */ mtlr r0 -/* 804E49D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E49DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Delete__FP11daBdoorL1_c.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Delete__FP11daBdoorL1_c.s deleted file mode 100644 index 8dc89cfad5..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Delete__FP11daBdoorL1_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_804E499C: -/* 804E499C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E49A0 7C 08 02 A6 */ mflr r0 -/* 804E49A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E49A8 4B FF FF 15 */ bl Delete__11daBdoorL1_cFv -/* 804E49AC 38 60 00 01 */ li r3, 1 -/* 804E49B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E49B4 7C 08 03 A6 */ mtlr r0 -/* 804E49B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E49BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Draw__FP11daBdoorL1_c.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Draw__FP11daBdoorL1_c.s deleted file mode 100644 index a7e3ba697a..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Draw__FP11daBdoorL1_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_804E4958: -/* 804E4958 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E495C 7C 08 02 A6 */ mflr r0 -/* 804E4960 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E4964 4B FF FE 09 */ bl draw__11daBdoorL1_cFv -/* 804E4968 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E496C 7C 08 03 A6 */ mtlr r0 -/* 804E4970 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E4974 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Execute__FP11daBdoorL1_c.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Execute__FP11daBdoorL1_c.s deleted file mode 100644 index b2e7639408..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Execute__FP11daBdoorL1_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_804E4978: -/* 804E4978 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E497C 7C 08 02 A6 */ mflr r0 -/* 804E4980 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E4984 4B FF FC C9 */ bl execute__11daBdoorL1_cFv -/* 804E4988 38 60 00 01 */ li r3, 1 -/* 804E498C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E4990 7C 08 03 A6 */ mtlr r0 -/* 804E4994 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E4998 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/deleteEmitter__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/deleteEmitter__11daBdoorL1_cFv.s deleted file mode 100644 index daee154eec..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/deleteEmitter__11daBdoorL1_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_804E4104: -/* 804E4104 38 80 00 00 */ li r4, 0 -/* 804E4108 38 E0 00 01 */ li r7, 1 -/* 804E410C 7C 85 23 78 */ mr r5, r4 -/* 804E4110 38 00 00 02 */ li r0, 2 -/* 804E4114 7C 09 03 A6 */ mtctr r0 -lbl_804E4118: -/* 804E4118 39 04 07 E4 */ addi r8, r4, 0x7e4 -/* 804E411C 7C C3 40 2E */ lwzx r6, r3, r8 -/* 804E4120 28 06 00 00 */ cmplwi r6, 0 -/* 804E4124 41 82 00 28 */ beq lbl_804E414C -/* 804E4128 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 804E412C 60 00 00 01 */ ori r0, r0, 1 -/* 804E4130 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 804E4134 90 E6 00 24 */ stw r7, 0x24(r6) -/* 804E4138 7C C3 40 2E */ lwzx r6, r3, r8 -/* 804E413C 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 804E4140 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 804E4144 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 804E4148 7C A3 41 2E */ stwx r5, r3, r8 -lbl_804E414C: -/* 804E414C 38 84 00 04 */ addi r4, r4, 4 -/* 804E4150 42 00 FF C8 */ bdnz lbl_804E4118 -/* 804E4154 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/demoProc__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/demoProc__11daBdoorL1_cFv.s deleted file mode 100644 index 7327c82ac0..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/demoProc__11daBdoorL1_cFv.s +++ /dev/null @@ -1,410 +0,0 @@ -lbl_804E2BC0: -/* 804E2BC0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804E2BC4 7C 08 02 A6 */ mflr r0 -/* 804E2BC8 90 01 00 54 */ stw r0, 0x54(r1) -/* 804E2BCC 39 61 00 50 */ addi r11, r1, 0x50 -/* 804E2BD0 4B E7 F5 FD */ bl _savegpr_25 -/* 804E2BD4 7C 7F 1B 78 */ mr r31, r3 -/* 804E2BD8 3C 80 80 4E */ lis r4, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E2BDC 3B A4 4A 14 */ addi r29, r4, l_staff_name@l /* 0x804E4A14@l */ -/* 804E2BE0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2BE4 3B 64 61 C0 */ addi r27, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2BE8 83 5B 5D AC */ lwz r26, 0x5dac(r27) -/* 804E2BEC 4B FF FF 8D */ bl getDemoAction__11daBdoorL1_cFv -/* 804E2BF0 7C 7C 1B 78 */ mr r28, r3 -/* 804E2BF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2BF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2BFC 3B 23 0F 38 */ addi r25, r3, 0xf38 -/* 804E2C00 3B D9 40 C0 */ addi r30, r25, 0x40c0 -/* 804E2C04 7F C3 F3 78 */ mr r3, r30 -/* 804E2C08 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2C0C 4B B6 51 41 */ bl getIsAddvance__16dEvent_manager_cFi -/* 804E2C10 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2C14 41 82 02 68 */ beq lbl_804E2E7C -/* 804E2C18 28 1C 00 11 */ cmplwi r28, 0x11 -/* 804E2C1C 41 81 02 60 */ bgt lbl_804E2E7C -/* 804E2C20 3C 60 80 4E */ lis r3, lit_4239@ha /* 0x804E4F70@ha */ -/* 804E2C24 38 63 4F 70 */ addi r3, r3, lit_4239@l /* 0x804E4F70@l */ -/* 804E2C28 57 80 10 3A */ slwi r0, r28, 2 -/* 804E2C2C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 804E2C30 7C 09 03 A6 */ mtctr r0 -/* 804E2C34 4E 80 04 20 */ bctr -lbl_804E2C38: -/* 804E2C38 7F C3 F3 78 */ mr r3, r30 -/* 804E2C3C 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2C40 3C A0 80 4E */ lis r5, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E2C44 38 A5 4A DC */ addi r5, r5, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E2C48 38 A5 03 14 */ addi r5, r5, 0x314 -/* 804E2C4C 38 C0 00 03 */ li r6, 3 -/* 804E2C50 4B B6 54 9D */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 804E2C54 28 03 00 00 */ cmplwi r3, 0 -/* 804E2C58 40 82 00 10 */ bne lbl_804E2C68 -/* 804E2C5C 38 00 00 01 */ li r0, 1 -/* 804E2C60 90 1F 05 A4 */ stw r0, 0x5a4(r31) -/* 804E2C64 48 00 02 18 */ b lbl_804E2E7C -lbl_804E2C68: -/* 804E2C68 80 03 00 00 */ lwz r0, 0(r3) -/* 804E2C6C 90 1F 05 A4 */ stw r0, 0x5a4(r31) -/* 804E2C70 48 00 02 0C */ b lbl_804E2E7C -lbl_804E2C74: -/* 804E2C74 38 00 00 05 */ li r0, 5 -/* 804E2C78 98 1F 05 9A */ stb r0, 0x59a(r31) -/* 804E2C7C 48 00 02 00 */ b lbl_804E2E7C -lbl_804E2C80: -/* 804E2C80 7F E3 FB 78 */ mr r3, r31 -/* 804E2C84 48 00 0F 91 */ bl unlockInit__11daBdoorL1_cFv -/* 804E2C88 48 00 01 F4 */ b lbl_804E2E7C -lbl_804E2C8C: -/* 804E2C8C 7F E3 FB 78 */ mr r3, r31 -/* 804E2C90 48 00 04 F1 */ bl openInit__11daBdoorL1_cFv -/* 804E2C94 48 00 01 E8 */ b lbl_804E2E7C -lbl_804E2C98: -/* 804E2C98 7F E3 FB 78 */ mr r3, r31 -/* 804E2C9C 38 81 00 18 */ addi r4, r1, 0x18 -/* 804E2CA0 38 A0 00 00 */ li r5, 0 -/* 804E2CA4 48 00 11 45 */ bl calcGoal__11daBdoorL1_cFP4cXyzi -/* 804E2CA8 7F C3 F3 78 */ mr r3, r30 -/* 804E2CAC 38 81 00 18 */ addi r4, r1, 0x18 -/* 804E2CB0 4B B6 57 15 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 804E2CB4 48 00 01 C8 */ b lbl_804E2E7C -lbl_804E2CB8: -/* 804E2CB8 7F E3 FB 78 */ mr r3, r31 -/* 804E2CBC 38 81 00 18 */ addi r4, r1, 0x18 -/* 804E2CC0 38 A0 00 01 */ li r5, 1 -/* 804E2CC4 48 00 11 25 */ bl calcGoal__11daBdoorL1_cFP4cXyzi -/* 804E2CC8 7F C3 F3 78 */ mr r3, r30 -/* 804E2CCC 38 81 00 18 */ addi r4, r1, 0x18 -/* 804E2CD0 4B B6 56 F5 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 804E2CD4 48 00 01 A8 */ b lbl_804E2E7C -lbl_804E2CD8: -/* 804E2CD8 7F E3 FB 78 */ mr r3, r31 -/* 804E2CDC 48 00 0B 75 */ bl closeInit__11daBdoorL1_cFv -/* 804E2CE0 48 00 01 9C */ b lbl_804E2E7C -lbl_804E2CE4: -/* 804E2CE4 7F E3 FB 78 */ mr r3, r31 -/* 804E2CE8 48 00 14 19 */ bl smokeInit__11daBdoorL1_cFv -/* 804E2CEC 48 00 01 90 */ b lbl_804E2E7C -lbl_804E2CF0: -/* 804E2CF0 38 00 00 00 */ li r0, 0 -/* 804E2CF4 B0 1F 05 9C */ sth r0, 0x59c(r31) -/* 804E2CF8 48 00 01 84 */ b lbl_804E2E7C -lbl_804E2CFC: -/* 804E2CFC 80 1A 05 70 */ lwz r0, 0x570(r26) -/* 804E2D00 54 00 01 46 */ rlwinm r0, r0, 0, 5, 3 -/* 804E2D04 90 1A 05 70 */ stw r0, 0x570(r26) -/* 804E2D08 80 1A 05 78 */ lwz r0, 0x578(r26) -/* 804E2D0C 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 -/* 804E2D10 90 1A 05 78 */ stw r0, 0x578(r26) -/* 804E2D14 48 00 01 68 */ b lbl_804E2E7C -lbl_804E2D18: -/* 804E2D18 80 1A 05 70 */ lwz r0, 0x570(r26) -/* 804E2D1C 64 00 08 00 */ oris r0, r0, 0x800 -/* 804E2D20 90 1A 05 70 */ stw r0, 0x570(r26) -/* 804E2D24 80 1A 05 78 */ lwz r0, 0x578(r26) -/* 804E2D28 60 00 04 00 */ ori r0, r0, 0x400 -/* 804E2D2C 90 1A 05 78 */ stw r0, 0x578(r26) -/* 804E2D30 48 00 01 4C */ b lbl_804E2E7C -lbl_804E2D34: -/* 804E2D34 7F 23 CB 78 */ mr r3, r25 -/* 804E2D38 80 9F 05 90 */ lwz r4, 0x590(r31) -/* 804E2D3C 4B B9 15 15 */ bl Release__4cBgSFP9dBgW_Base -/* 804E2D40 7F E3 FB 78 */ mr r3, r31 -/* 804E2D44 48 00 0F 89 */ bl setPos__11daBdoorL1_cFv -/* 804E2D48 48 00 01 34 */ b lbl_804E2E7C -lbl_804E2D4C: -/* 804E2D4C 4B FF F0 4D */ bl getNowLevel__Fv -/* 804E2D50 2C 03 00 08 */ cmpwi r3, 8 -/* 804E2D54 40 82 00 68 */ bne lbl_804E2DBC -/* 804E2D58 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E2D5C 7C 03 07 74 */ extsb r3, r0 -/* 804E2D60 4B B4 A3 0D */ bl dComIfGp_getReverb__Fi -/* 804E2D64 7C 67 1B 78 */ mr r7, r3 -/* 804E2D68 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008021B@ha */ -/* 804E2D6C 38 03 02 1B */ addi r0, r3, 0x021B /* 0x0008021B@l */ -/* 804E2D70 90 01 00 10 */ stw r0, 0x10(r1) -/* 804E2D74 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E2D78 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E2D7C 80 63 00 00 */ lwz r3, 0(r3) -/* 804E2D80 38 81 00 10 */ addi r4, r1, 0x10 -/* 804E2D84 38 BF 05 38 */ addi r5, r31, 0x538 -/* 804E2D88 38 C0 00 00 */ li r6, 0 -/* 804E2D8C C0 3D 00 3C */ lfs f1, 0x3c(r29) -/* 804E2D90 FC 40 08 90 */ fmr f2, f1 -/* 804E2D94 C0 7D 00 54 */ lfs f3, 0x54(r29) -/* 804E2D98 FC 80 18 90 */ fmr f4, f3 -/* 804E2D9C 39 00 00 00 */ li r8, 0 -/* 804E2DA0 4B DC 8B E5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E2DA4 C0 1D 00 40 */ lfs f0, 0x40(r29) -/* 804E2DA8 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E2DAC D0 03 00 10 */ stfs f0, 0x10(r3) -/* 804E2DB0 C0 1D 00 3C */ lfs f0, 0x3c(r29) -/* 804E2DB4 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E2DB8 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_804E2DBC: -/* 804E2DBC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E2DC0 7C 1A 07 74 */ extsb r26, r0 -/* 804E2DC4 7F E3 FB 78 */ mr r3, r31 -/* 804E2DC8 4B B5 74 09 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 804E2DCC 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 804E2DD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2DD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2DD8 7F 45 D3 78 */ mr r5, r26 -/* 804E2DDC 4B B5 25 85 */ bl isSwitch__10dSv_info_cCFii -/* 804E2DE0 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2DE4 41 82 00 10 */ beq lbl_804E2DF4 -/* 804E2DE8 38 00 00 00 */ li r0, 0 -/* 804E2DEC 98 1F 05 9B */ stb r0, 0x59b(r31) -/* 804E2DF0 48 00 00 0C */ b lbl_804E2DFC -lbl_804E2DF4: -/* 804E2DF4 38 00 00 01 */ li r0, 1 -/* 804E2DF8 98 1F 05 9B */ stb r0, 0x59b(r31) -lbl_804E2DFC: -/* 804E2DFC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E2E00 7C 1A 07 74 */ extsb r26, r0 -/* 804E2E04 7F E3 FB 78 */ mr r3, r31 -/* 804E2E08 4B B5 73 C9 */ bl getSwbit__13door_param2_cFP10fopAc_ac_c -/* 804E2E0C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 804E2E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2E14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2E18 7F 45 D3 78 */ mr r5, r26 -/* 804E2E1C 4B B5 23 E5 */ bl onSwitch__10dSv_info_cFii -/* 804E2E20 48 00 00 5C */ b lbl_804E2E7C -lbl_804E2E24: -/* 804E2E24 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E2E28 7C 03 07 74 */ extsb r3, r0 -/* 804E2E2C 4B B4 A2 41 */ bl dComIfGp_getReverb__Fi -/* 804E2E30 7C 67 1B 78 */ mr r7, r3 -/* 804E2E34 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008021B@ha */ -/* 804E2E38 38 03 02 1B */ addi r0, r3, 0x021B /* 0x0008021B@l */ -/* 804E2E3C 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E2E40 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E2E44 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E2E48 80 63 00 00 */ lwz r3, 0(r3) -/* 804E2E4C 38 81 00 0C */ addi r4, r1, 0xc -/* 804E2E50 38 BF 05 38 */ addi r5, r31, 0x538 -/* 804E2E54 38 C0 00 00 */ li r6, 0 -/* 804E2E58 C0 3D 00 3C */ lfs f1, 0x3c(r29) -/* 804E2E5C FC 40 08 90 */ fmr f2, f1 -/* 804E2E60 C0 7D 00 54 */ lfs f3, 0x54(r29) -/* 804E2E64 FC 80 18 90 */ fmr f4, f3 -/* 804E2E68 39 00 00 00 */ li r8, 0 -/* 804E2E6C 4B DC 8B 19 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E2E70 C0 1D 00 3C */ lfs f0, 0x3c(r29) -/* 804E2E74 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E2E78 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_804E2E7C: -/* 804E2E7C 28 1C 00 11 */ cmplwi r28, 0x11 -/* 804E2E80 41 81 02 94 */ bgt lbl_804E3114 -/* 804E2E84 3C 60 80 4E */ lis r3, lit_4240@ha /* 0x804E4F28@ha */ -/* 804E2E88 38 63 4F 28 */ addi r3, r3, lit_4240@l /* 0x804E4F28@l */ -/* 804E2E8C 57 80 10 3A */ slwi r0, r28, 2 -/* 804E2E90 7C 03 00 2E */ lwzx r0, r3, r0 -/* 804E2E94 7C 09 03 A6 */ mtctr r0 -/* 804E2E98 4E 80 04 20 */ bctr -lbl_804E2E9C: -/* 804E2E9C 38 7F 05 A4 */ addi r3, r31, 0x5a4 -/* 804E2EA0 48 00 1B 41 */ bl func_804E49E0 -/* 804E2EA4 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2EA8 40 82 02 78 */ bne lbl_804E3120 -/* 804E2EAC 7F C3 F3 78 */ mr r3, r30 -/* 804E2EB0 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2EB4 4B B6 52 C9 */ bl cutEnd__16dEvent_manager_cFi -/* 804E2EB8 48 00 02 68 */ b lbl_804E3120 -lbl_804E2EBC: -/* 804E2EBC 7F E3 FB 78 */ mr r3, r31 -/* 804E2EC0 48 00 10 51 */ bl setAngle__11daBdoorL1_cFv -/* 804E2EC4 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2EC8 41 82 02 58 */ beq lbl_804E3120 -/* 804E2ECC 7F C3 F3 78 */ mr r3, r30 -/* 804E2ED0 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2ED4 4B B6 52 A9 */ bl cutEnd__16dEvent_manager_cFi -/* 804E2ED8 48 00 02 48 */ b lbl_804E3120 -lbl_804E2EDC: -/* 804E2EDC 80 1F 05 94 */ lwz r0, 0x594(r31) -/* 804E2EE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E2EE4 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 804E2EE8 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 804E2EEC 38 81 00 14 */ addi r4, r1, 0x14 -/* 804E2EF0 4B B3 69 09 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 804E2EF4 28 03 00 00 */ cmplwi r3, 0 -/* 804E2EF8 41 82 00 10 */ beq lbl_804E2F08 -/* 804E2EFC 88 03 2C A4 */ lbz r0, 0x2ca4(r3) -/* 804E2F00 28 00 00 03 */ cmplwi r0, 3 -/* 804E2F04 41 82 00 14 */ beq lbl_804E2F18 -lbl_804E2F08: -/* 804E2F08 80 7F 05 94 */ lwz r3, 0x594(r31) -/* 804E2F0C 3C 03 00 01 */ addis r0, r3, 1 -/* 804E2F10 28 00 FF FF */ cmplwi r0, 0xffff -/* 804E2F14 40 82 02 0C */ bne lbl_804E3120 -lbl_804E2F18: -/* 804E2F18 7F C3 F3 78 */ mr r3, r30 -/* 804E2F1C 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2F20 4B B6 52 5D */ bl cutEnd__16dEvent_manager_cFi -/* 804E2F24 48 00 01 FC */ b lbl_804E3120 -lbl_804E2F28: -/* 804E2F28 7F E3 FB 78 */ mr r3, r31 -/* 804E2F2C 48 00 06 51 */ bl openProc__11daBdoorL1_cFv -/* 804E2F30 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2F34 41 82 01 EC */ beq lbl_804E3120 -/* 804E2F38 7F E3 FB 78 */ mr r3, r31 -/* 804E2F3C 48 00 08 59 */ bl openEnd__11daBdoorL1_cFv -/* 804E2F40 7F C3 F3 78 */ mr r3, r30 -/* 804E2F44 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2F48 4B B6 52 35 */ bl cutEnd__16dEvent_manager_cFi -/* 804E2F4C 48 00 01 D4 */ b lbl_804E3120 -lbl_804E2F50: -/* 804E2F50 7F C3 F3 78 */ mr r3, r30 -/* 804E2F54 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2F58 4B B6 52 25 */ bl cutEnd__16dEvent_manager_cFi -/* 804E2F5C 48 00 01 C4 */ b lbl_804E3120 -lbl_804E2F60: -/* 804E2F60 7F C3 F3 78 */ mr r3, r30 -/* 804E2F64 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E2F68 4B B6 52 15 */ bl cutEnd__16dEvent_manager_cFi -/* 804E2F6C 48 00 01 B4 */ b lbl_804E3120 -lbl_804E2F70: -/* 804E2F70 4B FF EE 29 */ bl getNowLevel__Fv -/* 804E2F74 2C 03 00 08 */ cmpwi r3, 8 -/* 804E2F78 40 82 00 A8 */ bne lbl_804E3020 -/* 804E2F7C 7F E3 FB 78 */ mr r3, r31 -/* 804E2F80 48 00 0A AD */ bl closeProc__11daBdoorL1_cFv -/* 804E2F84 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2F88 41 82 01 98 */ beq lbl_804E3120 -/* 804E2F8C 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E2F90 C0 23 00 0C */ lfs f1, 0xc(r3) -/* 804E2F94 C0 1D 00 40 */ lfs f0, 0x40(r29) -/* 804E2F98 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804E2F9C 40 82 00 58 */ bne lbl_804E2FF4 -/* 804E2FA0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E2FA4 7C 03 07 74 */ extsb r3, r0 -/* 804E2FA8 4B B4 A0 C5 */ bl dComIfGp_getReverb__Fi -/* 804E2FAC 7C 67 1B 78 */ mr r7, r3 -/* 804E2FB0 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008021C@ha */ -/* 804E2FB4 38 03 02 1C */ addi r0, r3, 0x021C /* 0x0008021C@l */ -/* 804E2FB8 90 01 00 08 */ stw r0, 8(r1) -/* 804E2FBC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E2FC0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E2FC4 80 63 00 00 */ lwz r3, 0(r3) -/* 804E2FC8 38 81 00 08 */ addi r4, r1, 8 -/* 804E2FCC 38 BF 05 38 */ addi r5, r31, 0x538 -/* 804E2FD0 38 C0 00 00 */ li r6, 0 -/* 804E2FD4 C0 3D 00 3C */ lfs f1, 0x3c(r29) -/* 804E2FD8 FC 40 08 90 */ fmr f2, f1 -/* 804E2FDC C0 7D 00 54 */ lfs f3, 0x54(r29) -/* 804E2FE0 FC 80 18 90 */ fmr f4, f3 -/* 804E2FE4 39 00 00 00 */ li r8, 0 -/* 804E2FE8 4B DC 89 9D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E2FEC 7F E3 FB 78 */ mr r3, r31 -/* 804E2FF0 48 00 07 A5 */ bl openEnd__11daBdoorL1_cFv -lbl_804E2FF4: -/* 804E2FF4 C0 1D 00 54 */ lfs f0, 0x54(r29) -/* 804E2FF8 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E2FFC D0 03 00 0C */ stfs f0, 0xc(r3) -/* 804E3000 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E3004 4B B2 A4 25 */ bl play__14mDoExt_baseAnmFv -/* 804E3008 2C 03 00 00 */ cmpwi r3, 0 -/* 804E300C 41 82 01 14 */ beq lbl_804E3120 -/* 804E3010 7F C3 F3 78 */ mr r3, r30 -/* 804E3014 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E3018 4B B6 51 65 */ bl cutEnd__16dEvent_manager_cFi -/* 804E301C 48 00 01 04 */ b lbl_804E3120 -lbl_804E3020: -/* 804E3020 7F E3 FB 78 */ mr r3, r31 -/* 804E3024 48 00 0A 09 */ bl closeProc__11daBdoorL1_cFv -/* 804E3028 2C 03 00 00 */ cmpwi r3, 0 -/* 804E302C 41 82 00 F4 */ beq lbl_804E3120 -/* 804E3030 7F E3 FB 78 */ mr r3, r31 -/* 804E3034 48 00 0B D9 */ bl closeEnd__11daBdoorL1_cFv -/* 804E3038 7F C3 F3 78 */ mr r3, r30 -/* 804E303C 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E3040 4B B6 51 3D */ bl cutEnd__16dEvent_manager_cFi -/* 804E3044 48 00 00 DC */ b lbl_804E3120 -lbl_804E3048: -/* 804E3048 7F C3 F3 78 */ mr r3, r30 -/* 804E304C 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E3050 4B B6 51 2D */ bl cutEnd__16dEvent_manager_cFi -/* 804E3054 48 00 00 CC */ b lbl_804E3120 -lbl_804E3058: -/* 804E3058 38 00 00 03 */ li r0, 3 -/* 804E305C 98 1F 05 99 */ stb r0, 0x599(r31) -/* 804E3060 7F C3 F3 78 */ mr r3, r30 -/* 804E3064 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E3068 4B B6 51 15 */ bl cutEnd__16dEvent_manager_cFi -/* 804E306C 48 00 00 B4 */ b lbl_804E3120 -lbl_804E3070: -/* 804E3070 A8 1F 05 9C */ lha r0, 0x59c(r31) -/* 804E3074 2C 00 00 00 */ cmpwi r0, 0 -/* 804E3078 40 82 00 30 */ bne lbl_804E30A8 -/* 804E307C 83 5B 5D AC */ lwz r26, 0x5dac(r27) -/* 804E3080 7F E3 FB 78 */ mr r3, r31 -/* 804E3084 4B B5 71 A1 */ bl getExitNo__13door_param2_cFP10fopAc_ac_c -/* 804E3088 7C 64 1B 78 */ mr r4, r3 -/* 804E308C 7F 43 D3 78 */ mr r3, r26 -/* 804E3090 38 A0 00 FF */ li r5, 0xff -/* 804E3094 38 C0 00 00 */ li r6, 0 -/* 804E3098 81 9A 06 28 */ lwz r12, 0x628(r26) -/* 804E309C 81 8C 01 7C */ lwz r12, 0x17c(r12) -/* 804E30A0 7D 89 03 A6 */ mtctr r12 -/* 804E30A4 4E 80 04 21 */ bctrl -lbl_804E30A8: -/* 804E30A8 A8 7F 05 9C */ lha r3, 0x59c(r31) -/* 804E30AC 38 03 FF FF */ addi r0, r3, -1 -/* 804E30B0 B0 1F 05 9C */ sth r0, 0x59c(r31) -/* 804E30B4 48 00 00 6C */ b lbl_804E3120 -lbl_804E30B8: -/* 804E30B8 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E30BC 4B B2 A3 6D */ bl play__14mDoExt_baseAnmFv -/* 804E30C0 2C 03 00 00 */ cmpwi r3, 0 -/* 804E30C4 41 82 00 5C */ beq lbl_804E3120 -/* 804E30C8 7F C3 F3 78 */ mr r3, r30 -/* 804E30CC 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E30D0 4B B6 50 AD */ bl cutEnd__16dEvent_manager_cFi -/* 804E30D4 48 00 00 4C */ b lbl_804E3120 -lbl_804E30D8: -/* 804E30D8 4B FF EC C1 */ bl getNowLevel__Fv -/* 804E30DC 2C 03 00 08 */ cmpwi r3, 8 -/* 804E30E0 40 82 00 24 */ bne lbl_804E3104 -/* 804E30E4 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 804E30E8 4B B2 A3 41 */ bl play__14mDoExt_baseAnmFv -/* 804E30EC 2C 03 00 00 */ cmpwi r3, 0 -/* 804E30F0 41 82 00 30 */ beq lbl_804E3120 -/* 804E30F4 7F C3 F3 78 */ mr r3, r30 -/* 804E30F8 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E30FC 4B B6 50 81 */ bl cutEnd__16dEvent_manager_cFi -/* 804E3100 48 00 00 20 */ b lbl_804E3120 -lbl_804E3104: -/* 804E3104 7F C3 F3 78 */ mr r3, r30 -/* 804E3108 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E310C 4B B6 50 71 */ bl cutEnd__16dEvent_manager_cFi -/* 804E3110 48 00 00 10 */ b lbl_804E3120 -lbl_804E3114: -/* 804E3114 7F C3 F3 78 */ mr r3, r30 -/* 804E3118 80 9F 05 A0 */ lwz r4, 0x5a0(r31) -/* 804E311C 4B B6 50 61 */ bl cutEnd__16dEvent_manager_cFi -lbl_804E3120: -/* 804E3120 3B 20 00 00 */ li r25, 0 -/* 804E3124 3B 40 00 00 */ li r26, 0 -lbl_804E3128: -/* 804E3128 38 1A 07 E4 */ addi r0, r26, 0x7e4 -/* 804E312C 7C BF 00 2E */ lwzx r5, r31, r0 -/* 804E3130 28 05 00 00 */ cmplwi r5, 0 -/* 804E3134 41 82 00 24 */ beq lbl_804E3158 -/* 804E3138 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 804E313C 28 03 00 00 */ cmplwi r3, 0 -/* 804E3140 41 82 00 18 */ beq lbl_804E3158 -/* 804E3144 80 63 00 84 */ lwz r3, 0x84(r3) -/* 804E3148 80 63 00 0C */ lwz r3, 0xc(r3) -/* 804E314C 38 85 00 68 */ addi r4, r5, 0x68 -/* 804E3150 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 804E3154 4B D9 D6 8D */ bl func_802807E0 -lbl_804E3158: -/* 804E3158 3B 39 00 01 */ addi r25, r25, 1 -/* 804E315C 2C 19 00 02 */ cmpwi r25, 2 -/* 804E3160 3B 5A 00 04 */ addi r26, r26, 4 -/* 804E3164 41 80 FF C4 */ blt lbl_804E3128 -/* 804E3168 39 61 00 50 */ addi r11, r1, 0x50 -/* 804E316C 4B E7 F0 AD */ bl _restgpr_25 -/* 804E3170 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804E3174 7C 08 03 A6 */ mtlr r0 -/* 804E3178 38 21 00 50 */ addi r1, r1, 0x50 -/* 804E317C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/draw__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/draw__11daBdoorL1_cFv.s deleted file mode 100644 index c626fbcc76..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/draw__11daBdoorL1_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_804E476C: -/* 804E476C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E4770 7C 08 02 A6 */ mflr r0 -/* 804E4774 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E4778 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E477C 93 C1 00 08 */ stw r30, 8(r1) -/* 804E4780 7C 7E 1B 78 */ mr r30, r3 -/* 804E4784 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 804E4788 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 804E478C 38 80 00 10 */ li r4, 0x10 -/* 804E4790 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 804E4794 38 DE 01 0C */ addi r6, r30, 0x10c -/* 804E4798 4B CB F0 2D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 804E479C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E47A0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E47A4 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 804E47A8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 804E47AC 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 804E47B0 90 1F 00 48 */ stw r0, 0x48(r31) -/* 804E47B4 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 804E47B8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 804E47BC 4B FF D5 DD */ bl getNowLevel__Fv -/* 804E47C0 2C 03 00 08 */ cmpwi r3, 8 -/* 804E47C4 40 82 00 24 */ bne lbl_804E47E8 -/* 804E47C8 80 7E 05 8C */ lwz r3, 0x58c(r30) -/* 804E47CC 28 03 00 00 */ cmplwi r3, 0 -/* 804E47D0 41 82 00 18 */ beq lbl_804E47E8 -/* 804E47D4 80 9E 05 80 */ lwz r4, 0x580(r30) -/* 804E47D8 80 84 00 04 */ lwz r4, 4(r4) -/* 804E47DC C0 23 00 10 */ lfs f1, 0x10(r3) -/* 804E47E0 38 84 00 58 */ addi r4, r4, 0x58 -/* 804E47E4 4B B2 8E F5 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -lbl_804E47E8: -/* 804E47E8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 804E47EC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 804E47F0 80 9E 05 80 */ lwz r4, 0x580(r30) -/* 804E47F4 80 84 00 04 */ lwz r4, 4(r4) -/* 804E47F8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 804E47FC 4B CC 05 A5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 804E4800 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 804E4804 80 83 00 04 */ lwz r4, 4(r3) -/* 804E4808 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 804E480C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 804E4810 4B B2 91 BD */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 804E4814 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 804E4818 4B B2 94 AD */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 804E481C 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 804E4820 80 63 00 04 */ lwz r3, 4(r3) -/* 804E4824 80 63 00 28 */ lwz r3, 0x28(r3) -/* 804E4828 80 63 00 00 */ lwz r3, 0(r3) -/* 804E482C 38 00 00 00 */ li r0, 0 -/* 804E4830 90 03 00 54 */ stw r0, 0x54(r3) -/* 804E4834 80 9E 05 84 */ lwz r4, 0x584(r30) -/* 804E4838 28 04 00 00 */ cmplwi r4, 0 -/* 804E483C 41 82 00 4C */ beq lbl_804E4888 -/* 804E4840 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 804E4844 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 804E4848 80 84 00 04 */ lwz r4, 4(r4) -/* 804E484C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 804E4850 4B CC 05 51 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 804E4854 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 804E4858 80 83 00 04 */ lwz r4, 4(r3) -/* 804E485C 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 804E4860 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 804E4864 4B B2 91 69 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 804E4868 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 804E486C 4B B2 94 59 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 804E4870 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 804E4874 80 63 00 04 */ lwz r3, 4(r3) -/* 804E4878 80 63 00 28 */ lwz r3, 0x28(r3) -/* 804E487C 80 63 00 00 */ lwz r3, 0(r3) -/* 804E4880 38 00 00 00 */ li r0, 0 -/* 804E4884 90 03 00 54 */ stw r0, 0x54(r3) -lbl_804E4888: -/* 804E4888 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E488C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E4890 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 804E4894 90 1F 00 48 */ stw r0, 0x48(r31) -/* 804E4898 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 804E489C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 804E48A0 38 60 00 01 */ li r3, 1 -/* 804E48A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E48A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 804E48AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E48B0 7C 08 03 A6 */ mtlr r0 -/* 804E48B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E48B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/execute__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/execute__11daBdoorL1_cFv.s deleted file mode 100644 index 2c6523fa74..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/execute__11daBdoorL1_cFv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_804E464C: -/* 804E464C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E4650 7C 08 02 A6 */ mflr r0 -/* 804E4654 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E4658 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E465C 7C 7F 1B 78 */ mr r31, r3 -/* 804E4660 3C 60 80 4E */ lis r3, cNullVec__6Z2Calc@ha /* 0x804E4DF8@ha */ -/* 804E4664 38 C3 4D F8 */ addi r6, r3, cNullVec__6Z2Calc@l /* 0x804E4DF8@l */ -/* 804E4668 3C 60 80 4E */ lis r3, data_804E50A8@ha /* 0x804E50A8@ha */ -/* 804E466C 38 A3 50 A8 */ addi r5, r3, data_804E50A8@l /* 0x804E50A8@l */ -/* 804E4670 88 05 00 00 */ lbz r0, 0(r5) -/* 804E4674 7C 00 07 75 */ extsb. r0, r0 -/* 804E4678 40 82 00 70 */ bne lbl_804E46E8 -/* 804E467C 80 66 01 C0 */ lwz r3, 0x1c0(r6) -/* 804E4680 80 06 01 C4 */ lwz r0, 0x1c4(r6) -/* 804E4684 90 66 01 F0 */ stw r3, 0x1f0(r6) -/* 804E4688 90 06 01 F4 */ stw r0, 0x1f4(r6) -/* 804E468C 80 06 01 C8 */ lwz r0, 0x1c8(r6) -/* 804E4690 90 06 01 F8 */ stw r0, 0x1f8(r6) -/* 804E4694 38 86 01 F0 */ addi r4, r6, 0x1f0 -/* 804E4698 80 66 01 CC */ lwz r3, 0x1cc(r6) -/* 804E469C 80 06 01 D0 */ lwz r0, 0x1d0(r6) -/* 804E46A0 90 64 00 0C */ stw r3, 0xc(r4) -/* 804E46A4 90 04 00 10 */ stw r0, 0x10(r4) -/* 804E46A8 80 06 01 D4 */ lwz r0, 0x1d4(r6) -/* 804E46AC 90 04 00 14 */ stw r0, 0x14(r4) -/* 804E46B0 80 66 01 D8 */ lwz r3, 0x1d8(r6) -/* 804E46B4 80 06 01 DC */ lwz r0, 0x1dc(r6) -/* 804E46B8 90 64 00 18 */ stw r3, 0x18(r4) -/* 804E46BC 90 04 00 1C */ stw r0, 0x1c(r4) -/* 804E46C0 80 06 01 E0 */ lwz r0, 0x1e0(r6) -/* 804E46C4 90 04 00 20 */ stw r0, 0x20(r4) -/* 804E46C8 80 66 01 E4 */ lwz r3, 0x1e4(r6) -/* 804E46CC 80 06 01 E8 */ lwz r0, 0x1e8(r6) -/* 804E46D0 90 64 00 24 */ stw r3, 0x24(r4) -/* 804E46D4 90 04 00 28 */ stw r0, 0x28(r4) -/* 804E46D8 80 06 01 EC */ lwz r0, 0x1ec(r6) -/* 804E46DC 90 04 00 2C */ stw r0, 0x2c(r4) -/* 804E46E0 38 00 00 01 */ li r0, 1 -/* 804E46E4 98 05 00 00 */ stb r0, 0(r5) -lbl_804E46E8: -/* 804E46E8 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 804E46EC 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 804E46F0 41 82 00 48 */ beq lbl_804E4738 -/* 804E46F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E46F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E46FC 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 804E4700 3C 80 80 4E */ lis r4, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E4704 38 84 4A 14 */ addi r4, r4, l_staff_name@l /* 0x804E4A14@l */ -/* 804E4708 38 A0 00 00 */ li r5, 0 -/* 804E470C 38 C0 00 00 */ li r6, 0 -/* 804E4710 4B B6 34 0D */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 804E4714 90 7F 05 A0 */ stw r3, 0x5a0(r31) -/* 804E4718 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 804E471C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 804E4720 A0 03 00 B0 */ lhz r0, 0xb0(r3) -/* 804E4724 60 00 00 02 */ ori r0, r0, 2 -/* 804E4728 B0 03 00 B0 */ sth r0, 0xb0(r3) -/* 804E472C 7F E3 FB 78 */ mr r3, r31 -/* 804E4730 4B FF E4 91 */ bl demoProc__11daBdoorL1_cFv -/* 804E4734 48 00 00 20 */ b lbl_804E4754 -lbl_804E4738: -/* 804E4738 7F E3 FB 78 */ mr r3, r31 -/* 804E473C 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 804E4740 1C 00 00 0C */ mulli r0, r0, 0xc -/* 804E4744 39 86 01 F0 */ addi r12, r6, 0x1f0 -/* 804E4748 7D 8C 02 14 */ add r12, r12, r0 -/* 804E474C 4B E7 D9 39 */ bl __ptmf_scall -/* 804E4750 60 00 00 00 */ nop -lbl_804E4754: -/* 804E4754 38 60 00 01 */ li r3, 1 -/* 804E4758 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E475C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E4760 7C 08 03 A6 */ mtlr r0 -/* 804E4764 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E4768 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49E0.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49E0.s deleted file mode 100644 index 020b2db79c..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49E0.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_804E49E0: -/* 804E49E0 80 83 00 00 */ lwz r4, 0(r3) -/* 804E49E4 2C 04 00 00 */ cmpwi r4, 0 -/* 804E49E8 41 82 00 0C */ beq lbl_804E49F4 -/* 804E49EC 38 04 FF FF */ addi r0, r4, -1 -/* 804E49F0 90 03 00 00 */ stw r0, 0(r3) -lbl_804E49F4: -/* 804E49F4 80 63 00 00 */ lwz r3, 0(r3) -/* 804E49F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49FC.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49FC.s deleted file mode 100644 index 43f160ed1d..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49FC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_804E49FC: -/* 804E49FC 38 63 FF DC */ addi r3, r3, -36 -/* 804E4A00 4B FF E1 08 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E4A04.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E4A04.s deleted file mode 100644 index dd587f25d5..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E4A04.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_804E4A04: -/* 804E4A04 38 63 FF EC */ addi r3, r3, -20 -/* 804E4A08 4B FF E1 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAlwaysArcName__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAlwaysArcName__11daBdoorL1_cFv.s deleted file mode 100644 index 5b57802505..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAlwaysArcName__11daBdoorL1_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_804E21AC: -/* 804E21AC 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E21B0 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E21B4 38 63 02 40 */ addi r3, r3, 0x240 -/* 804E21B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAnmArcName__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAnmArcName__11daBdoorL1_cFv.s deleted file mode 100644 index c126386a04..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAnmArcName__11daBdoorL1_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_804E2060: -/* 804E2060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E2064 7C 08 02 A6 */ mflr r0 -/* 804E2068 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E206C 48 00 00 59 */ bl getDoorType__11daBdoorL1_cFv -/* 804E2070 2C 03 00 01 */ cmpwi r3, 1 -/* 804E2074 41 82 00 24 */ beq lbl_804E2098 -/* 804E2078 40 80 00 30 */ bge lbl_804E20A8 -/* 804E207C 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2080 40 80 00 08 */ bge lbl_804E2088 -/* 804E2084 48 00 00 24 */ b lbl_804E20A8 -lbl_804E2088: -/* 804E2088 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E208C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E2090 38 63 02 2C */ addi r3, r3, 0x22c -/* 804E2094 48 00 00 20 */ b lbl_804E20B4 -lbl_804E2098: -/* 804E2098 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E209C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E20A0 38 63 02 36 */ addi r3, r3, 0x236 -/* 804E20A4 48 00 00 10 */ b lbl_804E20B4 -lbl_804E20A8: -/* 804E20A8 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E20AC 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E20B0 38 63 02 2C */ addi r3, r3, 0x22c -lbl_804E20B4: -/* 804E20B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E20B8 7C 08 03 A6 */ mtlr r0 -/* 804E20BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E20C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getArcName__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getArcName__11daBdoorL1_cFv.s deleted file mode 100644 index f57420de45..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getArcName__11daBdoorL1_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_804E1FA4: -/* 804E1FA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E1FA8 7C 08 02 A6 */ mflr r0 -/* 804E1FAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E1FB0 4B FF FD E9 */ bl getNowLevel__Fv -/* 804E1FB4 28 03 00 09 */ cmplwi r3, 9 -/* 804E1FB8 41 81 00 8C */ bgt lbl_804E2044 -/* 804E1FBC 3C 80 80 4E */ lis r4, lit_3726@ha /* 0x804E4EB8@ha */ -/* 804E1FC0 38 84 4E B8 */ addi r4, r4, lit_3726@l /* 0x804E4EB8@l */ -/* 804E1FC4 54 60 10 3A */ slwi r0, r3, 2 -/* 804E1FC8 7C 04 00 2E */ lwzx r0, r4, r0 -/* 804E1FCC 7C 09 03 A6 */ mtctr r0 -/* 804E1FD0 4E 80 04 20 */ bctr -lbl_804E1FD4: -/* 804E1FD4 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1FD8 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1FDC 38 63 01 F4 */ addi r3, r3, 0x1f4 -/* 804E1FE0 48 00 00 70 */ b lbl_804E2050 -lbl_804E1FE4: -/* 804E1FE4 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1FE8 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1FEC 38 63 01 FC */ addi r3, r3, 0x1fc -/* 804E1FF0 48 00 00 60 */ b lbl_804E2050 -lbl_804E1FF4: -/* 804E1FF4 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1FF8 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1FFC 38 63 02 04 */ addi r3, r3, 0x204 -/* 804E2000 48 00 00 50 */ b lbl_804E2050 -lbl_804E2004: -/* 804E2004 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E2008 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E200C 38 63 02 0C */ addi r3, r3, 0x20c -/* 804E2010 48 00 00 40 */ b lbl_804E2050 -lbl_804E2014: -/* 804E2014 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E2018 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E201C 38 63 02 14 */ addi r3, r3, 0x214 -/* 804E2020 48 00 00 30 */ b lbl_804E2050 -lbl_804E2024: -/* 804E2024 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E2028 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E202C 38 63 02 1C */ addi r3, r3, 0x21c -/* 804E2030 48 00 00 20 */ b lbl_804E2050 -lbl_804E2034: -/* 804E2034 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E2038 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E203C 38 63 02 24 */ addi r3, r3, 0x224 -/* 804E2040 48 00 00 10 */ b lbl_804E2050 -lbl_804E2044: -/* 804E2044 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E2048 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E204C 38 63 01 F4 */ addi r3, r3, 0x1f4 -lbl_804E2050: -/* 804E2050 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E2054 7C 08 03 A6 */ mtlr r0 -/* 804E2058 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E205C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getBmd__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getBmd__11daBdoorL1_cFv.s deleted file mode 100644 index 3df2d563d6..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getBmd__11daBdoorL1_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_804E21BC: -/* 804E21BC 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E21C0 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E21C4 38 63 02 47 */ addi r3, r3, 0x247 -/* 804E21C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getCloseAnm__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getCloseAnm__11daBdoorL1_cFv.s deleted file mode 100644 index 2e497eed46..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getCloseAnm__11daBdoorL1_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_804E2158: -/* 804E2158 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E215C 7C 08 02 A6 */ mflr r0 -/* 804E2160 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E2164 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E2168 7C 7F 1B 78 */ mr r31, r3 -/* 804E216C 4B FF FF 59 */ bl getDoorType__11daBdoorL1_cFv -/* 804E2170 2C 03 00 01 */ cmpwi r3, 1 -/* 804E2174 40 82 00 0C */ bne lbl_804E2180 -/* 804E2178 38 60 00 04 */ li r3, 4 -/* 804E217C 48 00 00 1C */ b lbl_804E2198 -lbl_804E2180: -/* 804E2180 7F E3 FB 78 */ mr r3, r31 -/* 804E2184 4B FF FF 41 */ bl getDoorType__11daBdoorL1_cFv -/* 804E2188 2C 03 00 00 */ cmpwi r3, 0 -/* 804E218C 38 60 FF FF */ li r3, -1 -/* 804E2190 40 82 00 08 */ bne lbl_804E2198 -/* 804E2194 38 60 00 04 */ li r3, 4 -lbl_804E2198: -/* 804E2198 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E219C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E21A0 7C 08 03 A6 */ mtlr r0 -/* 804E21A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E21A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDemoAction__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDemoAction__11daBdoorL1_cFv.s deleted file mode 100644 index 83b267bc17..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDemoAction__11daBdoorL1_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_804E2B78: -/* 804E2B78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E2B7C 7C 08 02 A6 */ mflr r0 -/* 804E2B80 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E2B84 7C 64 1B 78 */ mr r4, r3 -/* 804E2B88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E2B8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2B90 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 804E2B94 80 84 05 A0 */ lwz r4, 0x5a0(r4) -/* 804E2B98 3C A0 80 4E */ lis r5, action_table@ha /* 0x804E4EE0@ha */ -/* 804E2B9C 38 A5 4E E0 */ addi r5, r5, action_table@l /* 0x804E4EE0@l */ -/* 804E2BA0 38 C0 00 12 */ li r6, 0x12 -/* 804E2BA4 38 E0 00 00 */ li r7, 0 -/* 804E2BA8 39 00 00 00 */ li r8, 0 -/* 804E2BAC 4B B6 52 65 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 804E2BB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E2BB4 7C 08 03 A6 */ mtlr r0 -/* 804E2BB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2BBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName2__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName2__11daBdoorL1_cFv.s deleted file mode 100644 index c3622cf50e..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName2__11daBdoorL1_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_804E1EE8: -/* 804E1EE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E1EEC 7C 08 02 A6 */ mflr r0 -/* 804E1EF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E1EF4 4B FF FE A5 */ bl getNowLevel__Fv -/* 804E1EF8 28 03 00 09 */ cmplwi r3, 9 -/* 804E1EFC 41 81 00 8C */ bgt lbl_804E1F88 -/* 804E1F00 3C 80 80 4E */ lis r4, lit_3713@ha /* 0x804E4E90@ha */ -/* 804E1F04 38 84 4E 90 */ addi r4, r4, lit_3713@l /* 0x804E4E90@l */ -/* 804E1F08 54 60 10 3A */ slwi r0, r3, 2 -/* 804E1F0C 7C 04 00 2E */ lwzx r0, r4, r0 -/* 804E1F10 7C 09 03 A6 */ mtctr r0 -/* 804E1F14 4E 80 04 20 */ bctr -lbl_804E1F18: -/* 804E1F18 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F1C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F20 38 63 01 3E */ addi r3, r3, 0x13e -/* 804E1F24 48 00 00 70 */ b lbl_804E1F94 -lbl_804E1F28: -/* 804E1F28 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F2C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F30 38 63 01 58 */ addi r3, r3, 0x158 -/* 804E1F34 48 00 00 60 */ b lbl_804E1F94 -lbl_804E1F38: -/* 804E1F38 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F3C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F40 38 63 01 72 */ addi r3, r3, 0x172 -/* 804E1F44 48 00 00 50 */ b lbl_804E1F94 -lbl_804E1F48: -/* 804E1F48 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F4C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F50 38 63 01 8C */ addi r3, r3, 0x18c -/* 804E1F54 48 00 00 40 */ b lbl_804E1F94 -lbl_804E1F58: -/* 804E1F58 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F5C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F60 38 63 01 A6 */ addi r3, r3, 0x1a6 -/* 804E1F64 48 00 00 30 */ b lbl_804E1F94 -lbl_804E1F68: -/* 804E1F68 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F6C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F70 38 63 01 C0 */ addi r3, r3, 0x1c0 -/* 804E1F74 48 00 00 20 */ b lbl_804E1F94 -lbl_804E1F78: -/* 804E1F78 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F7C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F80 38 63 01 DA */ addi r3, r3, 0x1da -/* 804E1F84 48 00 00 10 */ b lbl_804E1F94 -lbl_804E1F88: -/* 804E1F88 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1F8C 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1F90 38 63 00 96 */ addi r3, r3, 0x96 -lbl_804E1F94: -/* 804E1F94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E1F98 7C 08 03 A6 */ mtlr r0 -/* 804E1F9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E1FA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName__11daBdoorL1_cFv.s deleted file mode 100644 index a8a6707f54..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName__11daBdoorL1_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_804E1E2C: -/* 804E1E2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E1E30 7C 08 02 A6 */ mflr r0 -/* 804E1E34 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E1E38 4B FF FF 61 */ bl getNowLevel__Fv -/* 804E1E3C 28 03 00 09 */ cmplwi r3, 9 -/* 804E1E40 41 81 00 8C */ bgt lbl_804E1ECC -/* 804E1E44 3C 80 80 4E */ lis r4, lit_3700@ha /* 0x804E4E68@ha */ -/* 804E1E48 38 84 4E 68 */ addi r4, r4, lit_3700@l /* 0x804E4E68@l */ -/* 804E1E4C 54 60 10 3A */ slwi r0, r3, 2 -/* 804E1E50 7C 04 00 2E */ lwzx r0, r4, r0 -/* 804E1E54 7C 09 03 A6 */ mtctr r0 -/* 804E1E58 4E 80 04 20 */ bctr -lbl_804E1E5C: -/* 804E1E5C 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1E60 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1E64 38 63 00 96 */ addi r3, r3, 0x96 -/* 804E1E68 48 00 00 70 */ b lbl_804E1ED8 -lbl_804E1E6C: -/* 804E1E6C 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1E70 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1E74 38 63 00 AE */ addi r3, r3, 0xae -/* 804E1E78 48 00 00 60 */ b lbl_804E1ED8 -lbl_804E1E7C: -/* 804E1E7C 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1E80 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1E84 38 63 00 C6 */ addi r3, r3, 0xc6 -/* 804E1E88 48 00 00 50 */ b lbl_804E1ED8 -lbl_804E1E8C: -/* 804E1E8C 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1E90 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1E94 38 63 00 DE */ addi r3, r3, 0xde -/* 804E1E98 48 00 00 40 */ b lbl_804E1ED8 -lbl_804E1E9C: -/* 804E1E9C 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1EA0 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1EA4 38 63 00 F6 */ addi r3, r3, 0xf6 -/* 804E1EA8 48 00 00 30 */ b lbl_804E1ED8 -lbl_804E1EAC: -/* 804E1EAC 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1EB0 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1EB4 38 63 01 0E */ addi r3, r3, 0x10e -/* 804E1EB8 48 00 00 20 */ b lbl_804E1ED8 -lbl_804E1EBC: -/* 804E1EBC 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1EC0 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1EC4 38 63 01 26 */ addi r3, r3, 0x126 -/* 804E1EC8 48 00 00 10 */ b lbl_804E1ED8 -lbl_804E1ECC: -/* 804E1ECC 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E1ED0 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E1ED4 38 63 00 96 */ addi r3, r3, 0x96 -lbl_804E1ED8: -/* 804E1ED8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E1EDC 7C 08 03 A6 */ mtlr r0 -/* 804E1EE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E1EE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorModelData__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorModelData__11daBdoorL1_cFv.s deleted file mode 100644 index 300f03a97e..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorModelData__11daBdoorL1_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_804E21DC: -/* 804E21DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E21E0 7C 08 02 A6 */ mflr r0 -/* 804E21E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E21E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E21EC 93 C1 00 08 */ stw r30, 8(r1) -/* 804E21F0 7C 7E 1B 78 */ mr r30, r3 -/* 804E21F4 4B FF FF C9 */ bl getBmd__11daBdoorL1_cFv -/* 804E21F8 7C 7F 1B 78 */ mr r31, r3 -/* 804E21FC 7F C3 F3 78 */ mr r3, r30 -/* 804E2200 4B FF FD A5 */ bl getArcName__11daBdoorL1_cFv -/* 804E2204 7F E4 FB 78 */ mr r4, r31 -/* 804E2208 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E220C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E2210 3C A5 00 02 */ addis r5, r5, 2 -/* 804E2214 38 C0 00 80 */ li r6, 0x80 -/* 804E2218 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804E221C 4B B5 A1 61 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 804E2220 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E2224 83 C1 00 08 */ lwz r30, 8(r1) -/* 804E2228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E222C 7C 08 03 A6 */ mtlr r0 -/* 804E2230 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2234 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorType__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorType__11daBdoorL1_cFv.s deleted file mode 100644 index 5e83244d20..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorType__11daBdoorL1_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_804E20C4: -/* 804E20C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E20C8 7C 08 02 A6 */ mflr r0 -/* 804E20CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E20D0 4B FF FC C9 */ bl getNowLevel__Fv -/* 804E20D4 2C 03 00 03 */ cmpwi r3, 3 -/* 804E20D8 40 80 00 18 */ bge lbl_804E20F0 -/* 804E20DC 2C 03 00 01 */ cmpwi r3, 1 -/* 804E20E0 40 80 00 08 */ bge lbl_804E20E8 -/* 804E20E4 48 00 00 0C */ b lbl_804E20F0 -lbl_804E20E8: -/* 804E20E8 38 60 00 00 */ li r3, 0 -/* 804E20EC 48 00 00 08 */ b lbl_804E20F4 -lbl_804E20F0: -/* 804E20F0 38 60 00 01 */ li r3, 1 -lbl_804E20F4: -/* 804E20F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E20F8 7C 08 03 A6 */ mtlr r0 -/* 804E20FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2100 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDzb__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDzb__11daBdoorL1_cFv.s deleted file mode 100644 index f113c61380..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDzb__11daBdoorL1_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_804E21CC: -/* 804E21CC 3C 60 80 4E */ lis r3, d_a_door_bossL1__stringBase0@ha /* 0x804E4ADC@ha */ -/* 804E21D0 38 63 4A DC */ addi r3, r3, d_a_door_bossL1__stringBase0@l /* 0x804E4ADC@l */ -/* 804E21D4 38 63 02 5C */ addi r3, r3, 0x25c -/* 804E21D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getNowLevel__Fv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getNowLevel__Fv.s deleted file mode 100644 index 6ba453e2aa..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getNowLevel__Fv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_804E1D98: -/* 804E1D98 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804E1D9C 7C 08 02 A6 */ mflr r0 -/* 804E1DA0 90 01 00 24 */ stw r0, 0x24(r1) -/* 804E1DA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E1DA8 4B E8 04 31 */ bl _savegpr_28 -/* 804E1DAC 3B 80 00 00 */ li r28, 0 -/* 804E1DB0 3B E0 00 00 */ li r31, 0 -/* 804E1DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E1DB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E1DBC 3B A3 4E 00 */ addi r29, r3, 0x4e00 -/* 804E1DC0 3C 60 80 4E */ lis r3, l_stageName@ha /* 0x804E4E18@ha */ -/* 804E1DC4 3B C3 4E 18 */ addi r30, r3, l_stageName@l /* 0x804E4E18@l */ -lbl_804E1DC8: -/* 804E1DC8 7F A3 EB 78 */ mr r3, r29 -/* 804E1DCC 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 804E1DD0 4B E8 6B C5 */ bl strcmp -/* 804E1DD4 2C 03 00 00 */ cmpwi r3, 0 -/* 804E1DD8 40 82 00 28 */ bne lbl_804E1E00 -/* 804E1DDC 2C 1C 00 12 */ cmpwi r28, 0x12 -/* 804E1DE0 41 82 00 0C */ beq lbl_804E1DEC -/* 804E1DE4 2C 1C 00 13 */ cmpwi r28, 0x13 -/* 804E1DE8 40 82 00 08 */ bne lbl_804E1DF0 -lbl_804E1DEC: -/* 804E1DEC 3B 80 00 02 */ li r28, 2 -lbl_804E1DF0: -/* 804E1DF0 7F 80 0E 70 */ srawi r0, r28, 1 -/* 804E1DF4 7C 60 01 94 */ addze r3, r0 -/* 804E1DF8 38 63 00 01 */ addi r3, r3, 1 -/* 804E1DFC 48 00 00 18 */ b lbl_804E1E14 -lbl_804E1E00: -/* 804E1E00 3B 9C 00 01 */ addi r28, r28, 1 -/* 804E1E04 2C 1C 00 14 */ cmpwi r28, 0x14 -/* 804E1E08 3B FF 00 04 */ addi r31, r31, 4 -/* 804E1E0C 41 80 FF BC */ blt lbl_804E1DC8 -/* 804E1E10 38 60 FF FF */ li r3, -1 -lbl_804E1E14: -/* 804E1E14 39 61 00 20 */ addi r11, r1, 0x20 -/* 804E1E18 4B E8 04 0D */ bl _restgpr_28 -/* 804E1E1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804E1E20 7C 08 03 A6 */ mtlr r0 -/* 804E1E24 38 21 00 20 */ addi r1, r1, 0x20 -/* 804E1E28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getOpenAnm__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getOpenAnm__11daBdoorL1_cFv.s deleted file mode 100644 index 30ed406d8b..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getOpenAnm__11daBdoorL1_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_804E2104: -/* 804E2104 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804E2108 7C 08 02 A6 */ mflr r0 -/* 804E210C 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E2110 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804E2114 7C 7F 1B 78 */ mr r31, r3 -/* 804E2118 4B FF FF AD */ bl getDoorType__11daBdoorL1_cFv -/* 804E211C 2C 03 00 01 */ cmpwi r3, 1 -/* 804E2120 40 82 00 0C */ bne lbl_804E212C -/* 804E2124 38 60 00 05 */ li r3, 5 -/* 804E2128 48 00 00 1C */ b lbl_804E2144 -lbl_804E212C: -/* 804E212C 7F E3 FB 78 */ mr r3, r31 -/* 804E2130 4B FF FF 95 */ bl getDoorType__11daBdoorL1_cFv -/* 804E2134 2C 03 00 00 */ cmpwi r3, 0 -/* 804E2138 38 60 FF FF */ li r3, -1 -/* 804E213C 40 82 00 08 */ bne lbl_804E2144 -/* 804E2140 38 60 00 05 */ li r3, 5 -lbl_804E2144: -/* 804E2144 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804E2148 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804E214C 7C 08 03 A6 */ mtlr r0 -/* 804E2150 38 21 00 10 */ addi r1, r1, 0x10 -/* 804E2154 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openEnd__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openEnd__11daBdoorL1_cFv.s deleted file mode 100644 index ec2efb03c9..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openEnd__11daBdoorL1_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_804E3794: -/* 804E3794 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804E3798 7C 08 02 A6 */ mflr r0 -/* 804E379C 90 01 00 24 */ stw r0, 0x24(r1) -/* 804E37A0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804E37A4 7C 7F 1B 78 */ mr r31, r3 -/* 804E37A8 4B FF E5 F1 */ bl getNowLevel__Fv -/* 804E37AC 2C 03 00 05 */ cmpwi r3, 5 -/* 804E37B0 41 82 00 20 */ beq lbl_804E37D0 -/* 804E37B4 40 80 00 10 */ bge lbl_804E37C4 -/* 804E37B8 2C 03 00 04 */ cmpwi r3, 4 -/* 804E37BC 40 80 00 68 */ bge lbl_804E3824 -/* 804E37C0 48 00 00 10 */ b lbl_804E37D0 -lbl_804E37C4: -/* 804E37C4 2C 03 00 0A */ cmpwi r3, 0xa -/* 804E37C8 40 80 00 08 */ bge lbl_804E37D0 -/* 804E37CC 48 00 00 58 */ b lbl_804E3824 -lbl_804E37D0: -/* 804E37D0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 804E37D4 7C 03 07 74 */ extsb r3, r0 -/* 804E37D8 4B B4 98 95 */ bl dComIfGp_getReverb__Fi -/* 804E37DC 7C 67 1B 78 */ mr r7, r3 -/* 804E37E0 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B4@ha */ -/* 804E37E4 38 03 00 B4 */ addi r0, r3, 0x00B4 /* 0x000800B4@l */ -/* 804E37E8 90 01 00 08 */ stw r0, 8(r1) -/* 804E37EC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E37F0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E37F4 80 63 00 00 */ lwz r3, 0(r3) -/* 804E37F8 38 81 00 08 */ addi r4, r1, 8 -/* 804E37FC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 804E3800 38 C0 00 00 */ li r6, 0 -/* 804E3804 3D 00 80 4E */ lis r8, lit_3861@ha /* 0x804E4A50@ha */ -/* 804E3808 C0 28 4A 50 */ lfs f1, lit_3861@l(r8) /* 0x804E4A50@l */ -/* 804E380C FC 40 08 90 */ fmr f2, f1 -/* 804E3810 3D 00 80 4E */ lis r8, lit_4238@ha /* 0x804E4A68@ha */ -/* 804E3814 C0 68 4A 68 */ lfs f3, lit_4238@l(r8) /* 0x804E4A68@l */ -/* 804E3818 FC 80 18 90 */ fmr f4, f3 -/* 804E381C 39 00 00 00 */ li r8, 0 -/* 804E3820 4B DC 81 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804E3824: -/* 804E3824 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3828 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E382C 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 804E3830 38 80 00 1F */ li r4, 0x1f -/* 804E3834 4B B8 C5 61 */ bl StopQuake__12dVibration_cFi -/* 804E3838 38 60 00 01 */ li r3, 1 -/* 804E383C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 804E3840 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804E3844 7C 08 03 A6 */ mtlr r0 -/* 804E3848 38 21 00 20 */ addi r1, r1, 0x20 -/* 804E384C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openInit__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openInit__11daBdoorL1_cFv.s deleted file mode 100644 index b28324da15..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openInit__11daBdoorL1_cFv.s +++ /dev/null @@ -1,272 +0,0 @@ -lbl_804E3180: -/* 804E3180 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 804E3184 7C 08 02 A6 */ mflr r0 -/* 804E3188 90 01 00 44 */ stw r0, 0x44(r1) -/* 804E318C 39 61 00 40 */ addi r11, r1, 0x40 -/* 804E3190 4B E7 F0 3D */ bl _savegpr_25 -/* 804E3194 7C 7E 1B 78 */ mr r30, r3 -/* 804E3198 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E319C 3B E3 4A 14 */ addi r31, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E31A0 80 7E 05 90 */ lwz r3, 0x590(r30) -/* 804E31A4 4B D8 50 31 */ bl ChkUsed__9cBgW_BgIdCFv -/* 804E31A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 804E31AC 41 82 00 18 */ beq lbl_804E31C4 -/* 804E31B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E31B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E31B8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 804E31BC 80 9E 05 90 */ lwz r4, 0x590(r30) -/* 804E31C0 4B B9 10 91 */ bl Release__4cBgSFP9dBgW_Base -lbl_804E31C4: -/* 804E31C4 7F C3 F3 78 */ mr r3, r30 -/* 804E31C8 4B FF EF 3D */ bl getOpenAnm__11daBdoorL1_cFv -/* 804E31CC 7C 7A 1B 78 */ mr r26, r3 -/* 804E31D0 7F C3 F3 78 */ mr r3, r30 -/* 804E31D4 4B FF EE 8D */ bl getAnmArcName__11daBdoorL1_cFv -/* 804E31D8 7F 44 D3 78 */ mr r4, r26 -/* 804E31DC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E31E0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E31E4 3C A5 00 02 */ addis r5, r5, 2 -/* 804E31E8 38 C0 00 80 */ li r6, 0x80 -/* 804E31EC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 804E31F0 4B B5 90 FD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 804E31F4 7C 64 1B 78 */ mr r4, r3 -/* 804E31F8 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 804E31FC 38 A0 00 01 */ li r5, 1 -/* 804E3200 38 C0 00 00 */ li r6, 0 -/* 804E3204 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E3208 38 E0 00 00 */ li r7, 0 -/* 804E320C 39 00 FF FF */ li r8, -1 -/* 804E3210 39 20 00 01 */ li r9, 1 -/* 804E3214 4B B2 A5 C9 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 804E3218 88 1E 05 9B */ lbz r0, 0x59b(r30) -/* 804E321C 28 00 00 00 */ cmplwi r0, 0 -/* 804E3220 41 82 03 40 */ beq lbl_804E3560 -/* 804E3224 A8 1E 04 E4 */ lha r0, 0x4e4(r30) -/* 804E3228 B0 1E 07 DC */ sth r0, 0x7dc(r30) -/* 804E322C A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 804E3230 B0 1E 07 DE */ sth r0, 0x7de(r30) -/* 804E3234 A8 1E 04 E8 */ lha r0, 0x4e8(r30) -/* 804E3238 B0 1E 07 E0 */ sth r0, 0x7e0(r30) -/* 804E323C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3244 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 804E3248 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 804E324C 7D 89 03 A6 */ mtctr r12 -/* 804E3250 4E 80 04 21 */ bctrl -/* 804E3254 80 03 00 0C */ lwz r0, 0xc(r3) -/* 804E3258 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 804E325C 28 00 00 03 */ cmplwi r0, 3 -/* 804E3260 40 82 00 10 */ bne lbl_804E3270 -/* 804E3264 A8 7E 07 DE */ lha r3, 0x7de(r30) -/* 804E3268 38 03 7F FF */ addi r0, r3, 0x7fff -/* 804E326C B0 1E 07 DE */ sth r0, 0x7de(r30) -lbl_804E3270: -/* 804E3270 4B FF EB 29 */ bl getNowLevel__Fv -/* 804E3274 2C 03 00 04 */ cmpwi r3, 4 -/* 804E3278 41 82 01 04 */ beq lbl_804E337C -/* 804E327C 40 80 00 1C */ bge lbl_804E3298 -/* 804E3280 2C 03 00 02 */ cmpwi r3, 2 -/* 804E3284 41 82 00 8C */ beq lbl_804E3310 -/* 804E3288 40 80 02 D8 */ bge lbl_804E3560 -/* 804E328C 2C 03 00 01 */ cmpwi r3, 1 -/* 804E3290 40 80 00 14 */ bge lbl_804E32A4 -/* 804E3294 48 00 02 CC */ b lbl_804E3560 -lbl_804E3298: -/* 804E3298 2C 03 00 06 */ cmpwi r3, 6 -/* 804E329C 41 82 01 D4 */ beq lbl_804E3470 -/* 804E32A0 48 00 02 C0 */ b lbl_804E3560 -lbl_804E32A4: -/* 804E32A4 3B A0 00 00 */ li r29, 0 -/* 804E32A8 3B 60 00 00 */ li r27, 0 -/* 804E32AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E32B0 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E32B4 3B 5F 00 58 */ addi r26, r31, 0x58 -lbl_804E32B8: -/* 804E32B8 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 804E32BC 38 80 00 00 */ li r4, 0 -/* 804E32C0 90 81 00 08 */ stw r4, 8(r1) -/* 804E32C4 38 00 FF FF */ li r0, -1 -/* 804E32C8 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E32CC 90 81 00 10 */ stw r4, 0x10(r1) -/* 804E32D0 90 81 00 14 */ stw r4, 0x14(r1) -/* 804E32D4 90 81 00 18 */ stw r4, 0x18(r1) -/* 804E32D8 38 80 00 00 */ li r4, 0 -/* 804E32DC 7C BA DA 2E */ lhzx r5, r26, r27 -/* 804E32E0 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804E32E4 38 E0 00 00 */ li r7, 0 -/* 804E32E8 39 1E 07 DC */ addi r8, r30, 0x7dc -/* 804E32EC 39 3E 04 EC */ addi r9, r30, 0x4ec -/* 804E32F0 39 40 00 FF */ li r10, 0xff -/* 804E32F4 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E32F8 4B B6 97 99 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804E32FC 3B BD 00 01 */ addi r29, r29, 1 -/* 804E3300 28 1D 00 03 */ cmplwi r29, 3 -/* 804E3304 3B 7B 00 02 */ addi r27, r27, 2 -/* 804E3308 41 80 FF B0 */ blt lbl_804E32B8 -/* 804E330C 48 00 02 54 */ b lbl_804E3560 -lbl_804E3310: -/* 804E3310 3B A0 00 00 */ li r29, 0 -/* 804E3314 3B 60 00 00 */ li r27, 0 -/* 804E3318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E331C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3320 3B 5F 00 60 */ addi r26, r31, 0x60 -lbl_804E3324: -/* 804E3324 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 804E3328 38 80 00 00 */ li r4, 0 -/* 804E332C 90 81 00 08 */ stw r4, 8(r1) -/* 804E3330 38 00 FF FF */ li r0, -1 -/* 804E3334 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E3338 90 81 00 10 */ stw r4, 0x10(r1) -/* 804E333C 90 81 00 14 */ stw r4, 0x14(r1) -/* 804E3340 90 81 00 18 */ stw r4, 0x18(r1) -/* 804E3344 38 80 00 00 */ li r4, 0 -/* 804E3348 7C BA DA 2E */ lhzx r5, r26, r27 -/* 804E334C 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804E3350 38 E0 00 00 */ li r7, 0 -/* 804E3354 39 1E 07 DC */ addi r8, r30, 0x7dc -/* 804E3358 39 3E 04 EC */ addi r9, r30, 0x4ec -/* 804E335C 39 40 00 FF */ li r10, 0xff -/* 804E3360 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E3364 4B B6 97 2D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804E3368 3B BD 00 01 */ addi r29, r29, 1 -/* 804E336C 28 1D 00 03 */ cmplwi r29, 3 -/* 804E3370 3B 7B 00 02 */ addi r27, r27, 2 -/* 804E3374 41 80 FF B0 */ blt lbl_804E3324 -/* 804E3378 48 00 01 E8 */ b lbl_804E3560 -lbl_804E337C: -/* 804E337C 3B 80 00 00 */ li r28, 0 -/* 804E3380 3B 60 00 00 */ li r27, 0 -/* 804E3384 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3388 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E338C 3B 5F 00 68 */ addi r26, r31, 0x68 -lbl_804E3390: -/* 804E3390 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 804E3394 38 80 00 00 */ li r4, 0 -/* 804E3398 90 81 00 08 */ stw r4, 8(r1) -/* 804E339C 38 00 FF FF */ li r0, -1 -/* 804E33A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E33A4 90 81 00 10 */ stw r4, 0x10(r1) -/* 804E33A8 90 81 00 14 */ stw r4, 0x14(r1) -/* 804E33AC 90 81 00 18 */ stw r4, 0x18(r1) -/* 804E33B0 38 80 00 00 */ li r4, 0 -/* 804E33B4 7C BA DA 2E */ lhzx r5, r26, r27 -/* 804E33B8 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804E33BC 38 E0 00 00 */ li r7, 0 -/* 804E33C0 39 1E 07 DC */ addi r8, r30, 0x7dc -/* 804E33C4 39 3E 04 EC */ addi r9, r30, 0x4ec -/* 804E33C8 39 40 00 FF */ li r10, 0xff -/* 804E33CC C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E33D0 4B B6 96 C1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804E33D4 3B 9C 00 01 */ addi r28, r28, 1 -/* 804E33D8 28 1C 00 02 */ cmplwi r28, 2 -/* 804E33DC 3B 7B 00 02 */ addi r27, r27, 2 -/* 804E33E0 41 80 FF B0 */ blt lbl_804E3390 -/* 804E33E4 3B 20 00 00 */ li r25, 0 -/* 804E33E8 3B 60 00 00 */ li r27, 0 -/* 804E33EC 3B 80 00 00 */ li r28, 0 -/* 804E33F0 3B 5F 00 6C */ addi r26, r31, 0x6c -lbl_804E33F4: -/* 804E33F4 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 804E33F8 38 80 00 00 */ li r4, 0 -/* 804E33FC 90 81 00 08 */ stw r4, 8(r1) -/* 804E3400 38 00 FF FF */ li r0, -1 -/* 804E3404 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E3408 90 81 00 10 */ stw r4, 0x10(r1) -/* 804E340C 90 81 00 14 */ stw r4, 0x14(r1) -/* 804E3410 90 81 00 18 */ stw r4, 0x18(r1) -/* 804E3414 38 80 00 00 */ li r4, 0 -/* 804E3418 7C BA E2 2E */ lhzx r5, r26, r28 -/* 804E341C 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804E3420 38 E0 00 00 */ li r7, 0 -/* 804E3424 39 1E 07 DC */ addi r8, r30, 0x7dc -/* 804E3428 39 3E 04 EC */ addi r9, r30, 0x4ec -/* 804E342C 39 40 00 FF */ li r10, 0xff -/* 804E3430 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E3434 4B B6 96 5D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804E3438 38 1B 07 E4 */ addi r0, r27, 0x7e4 -/* 804E343C 7C 7E 01 2E */ stwx r3, r30, r0 -/* 804E3440 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 804E3444 28 03 00 00 */ cmplwi r3, 0 -/* 804E3448 41 82 00 10 */ beq lbl_804E3458 -/* 804E344C 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 804E3450 60 00 00 40 */ ori r0, r0, 0x40 -/* 804E3454 90 03 00 F4 */ stw r0, 0xf4(r3) -lbl_804E3458: -/* 804E3458 3B 39 00 01 */ addi r25, r25, 1 -/* 804E345C 28 19 00 02 */ cmplwi r25, 2 -/* 804E3460 3B 7B 00 04 */ addi r27, r27, 4 -/* 804E3464 3B 9C 00 02 */ addi r28, r28, 2 -/* 804E3468 41 80 FF 8C */ blt lbl_804E33F4 -/* 804E346C 48 00 00 F4 */ b lbl_804E3560 -lbl_804E3470: -/* 804E3470 3B 80 00 00 */ li r28, 0 -/* 804E3474 3B 60 00 00 */ li r27, 0 -/* 804E3478 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E347C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3480 3B 5F 00 70 */ addi r26, r31, 0x70 -lbl_804E3484: -/* 804E3484 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 804E3488 38 80 00 00 */ li r4, 0 -/* 804E348C 90 81 00 08 */ stw r4, 8(r1) -/* 804E3490 38 00 FF FF */ li r0, -1 -/* 804E3494 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E3498 90 81 00 10 */ stw r4, 0x10(r1) -/* 804E349C 90 81 00 14 */ stw r4, 0x14(r1) -/* 804E34A0 90 81 00 18 */ stw r4, 0x18(r1) -/* 804E34A4 38 80 00 00 */ li r4, 0 -/* 804E34A8 7C BA DA 2E */ lhzx r5, r26, r27 -/* 804E34AC 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804E34B0 38 E0 00 00 */ li r7, 0 -/* 804E34B4 39 1E 07 DC */ addi r8, r30, 0x7dc -/* 804E34B8 39 3E 04 EC */ addi r9, r30, 0x4ec -/* 804E34BC 39 40 00 FF */ li r10, 0xff -/* 804E34C0 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E34C4 4B B6 95 CD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804E34C8 3B 9C 00 01 */ addi r28, r28, 1 -/* 804E34CC 28 1C 00 02 */ cmplwi r28, 2 -/* 804E34D0 3B 7B 00 02 */ addi r27, r27, 2 -/* 804E34D4 41 80 FF B0 */ blt lbl_804E3484 -/* 804E34D8 3B 20 00 00 */ li r25, 0 -/* 804E34DC 3B 80 00 00 */ li r28, 0 -/* 804E34E0 3B 60 00 00 */ li r27, 0 -/* 804E34E4 3B 5F 00 74 */ addi r26, r31, 0x74 -lbl_804E34E8: -/* 804E34E8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 804E34EC 38 80 00 00 */ li r4, 0 -/* 804E34F0 90 81 00 08 */ stw r4, 8(r1) -/* 804E34F4 38 00 FF FF */ li r0, -1 -/* 804E34F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E34FC 90 81 00 10 */ stw r4, 0x10(r1) -/* 804E3500 90 81 00 14 */ stw r4, 0x14(r1) -/* 804E3504 90 81 00 18 */ stw r4, 0x18(r1) -/* 804E3508 38 80 00 00 */ li r4, 0 -/* 804E350C 7C BA DA 2E */ lhzx r5, r26, r27 -/* 804E3510 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804E3514 38 E0 00 00 */ li r7, 0 -/* 804E3518 39 1E 07 DC */ addi r8, r30, 0x7dc -/* 804E351C 39 3E 04 EC */ addi r9, r30, 0x4ec -/* 804E3520 39 40 00 FF */ li r10, 0xff -/* 804E3524 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E3528 4B B6 95 69 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804E352C 38 1C 07 E4 */ addi r0, r28, 0x7e4 -/* 804E3530 7C 7E 01 2E */ stwx r3, r30, r0 -/* 804E3534 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 804E3538 28 03 00 00 */ cmplwi r3, 0 -/* 804E353C 41 82 00 10 */ beq lbl_804E354C -/* 804E3540 80 03 00 F4 */ lwz r0, 0xf4(r3) -/* 804E3544 60 00 00 40 */ ori r0, r0, 0x40 -/* 804E3548 90 03 00 F4 */ stw r0, 0xf4(r3) -lbl_804E354C: -/* 804E354C 3B 39 00 01 */ addi r25, r25, 1 -/* 804E3550 28 19 00 02 */ cmplwi r25, 2 -/* 804E3554 3B 9C 00 04 */ addi r28, r28, 4 -/* 804E3558 3B 7B 00 02 */ addi r27, r27, 2 -/* 804E355C 41 80 FF 8C */ blt lbl_804E34E8 -lbl_804E3560: -/* 804E3560 38 60 00 01 */ li r3, 1 -/* 804E3564 39 61 00 40 */ addi r11, r1, 0x40 -/* 804E3568 4B E7 EC B1 */ bl _restgpr_25 -/* 804E356C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 804E3570 7C 08 03 A6 */ mtlr r0 -/* 804E3574 38 21 00 40 */ addi r1, r1, 0x40 -/* 804E3578 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openProc__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openProc__11daBdoorL1_cFv.s deleted file mode 100644 index 691684b226..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openProc__11daBdoorL1_cFv.s +++ /dev/null @@ -1,142 +0,0 @@ -lbl_804E357C: -/* 804E357C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 804E3580 7C 08 02 A6 */ mflr r0 -/* 804E3584 90 01 00 44 */ stw r0, 0x44(r1) -/* 804E3588 39 61 00 40 */ addi r11, r1, 0x40 -/* 804E358C 4B E7 EC 51 */ bl _savegpr_29 -/* 804E3590 7C 7D 1B 78 */ mr r29, r3 -/* 804E3594 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E3598 3B E3 4A 14 */ addi r31, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E359C 80 7D 05 88 */ lwz r3, 0x588(r29) -/* 804E35A0 4B B2 9E 89 */ bl play__14mDoExt_baseAnmFv -/* 804E35A4 7C 7E 1B 78 */ mr r30, r3 -/* 804E35A8 80 7D 05 88 */ lwz r3, 0x588(r29) -/* 804E35AC C0 23 00 10 */ lfs f1, 0x10(r3) -/* 804E35B0 C0 1F 00 78 */ lfs f0, 0x78(r31) -/* 804E35B4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804E35B8 40 82 00 38 */ bne lbl_804E35F0 -/* 804E35BC C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 804E35C0 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 804E35C4 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 804E35C8 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804E35CC D0 21 00 20 */ stfs f1, 0x20(r1) -/* 804E35D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E35D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E35D8 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 804E35DC 38 80 00 04 */ li r4, 4 -/* 804E35E0 38 A0 00 0F */ li r5, 0xf -/* 804E35E4 38 C1 00 18 */ addi r6, r1, 0x18 -/* 804E35E8 4B B8 C5 29 */ bl StartQuake__12dVibration_cFii4cXyz -/* 804E35EC 48 00 01 8C */ b lbl_804E3778 -lbl_804E35F0: -/* 804E35F0 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 804E35F4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 804E35F8 40 82 01 80 */ bne lbl_804E3778 -/* 804E35FC 4B FF E7 9D */ bl getNowLevel__Fv -/* 804E3600 2C 03 00 08 */ cmpwi r3, 8 -/* 804E3604 41 82 00 2C */ beq lbl_804E3630 -/* 804E3608 40 80 00 1C */ bge lbl_804E3624 -/* 804E360C 2C 03 00 05 */ cmpwi r3, 5 -/* 804E3610 41 82 01 1C */ beq lbl_804E372C -/* 804E3614 40 80 00 6C */ bge lbl_804E3680 -/* 804E3618 2C 03 00 04 */ cmpwi r3, 4 -/* 804E361C 40 80 00 64 */ bge lbl_804E3680 -/* 804E3620 48 00 01 0C */ b lbl_804E372C -lbl_804E3624: -/* 804E3624 2C 03 00 0A */ cmpwi r3, 0xa -/* 804E3628 40 80 01 04 */ bge lbl_804E372C -/* 804E362C 48 00 00 54 */ b lbl_804E3680 -lbl_804E3630: -/* 804E3630 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 804E3634 7C 03 07 74 */ extsb r3, r0 -/* 804E3638 4B B4 9A 35 */ bl dComIfGp_getReverb__Fi -/* 804E363C 7C 67 1B 78 */ mr r7, r3 -/* 804E3640 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080219@ha */ -/* 804E3644 38 03 02 19 */ addi r0, r3, 0x0219 /* 0x00080219@l */ -/* 804E3648 90 01 00 08 */ stw r0, 8(r1) -/* 804E364C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E3650 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E3654 80 63 00 00 */ lwz r3, 0(r3) -/* 804E3658 38 81 00 08 */ addi r4, r1, 8 -/* 804E365C 38 BD 05 38 */ addi r5, r29, 0x538 -/* 804E3660 38 C0 00 00 */ li r6, 0 -/* 804E3664 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E3668 FC 40 08 90 */ fmr f2, f1 -/* 804E366C C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 804E3670 FC 80 18 90 */ fmr f4, f3 -/* 804E3674 39 00 00 00 */ li r8, 0 -/* 804E3678 4B DC 83 0D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E367C 48 00 00 FC */ b lbl_804E3778 -lbl_804E3680: -/* 804E3680 88 1D 05 9B */ lbz r0, 0x59b(r29) -/* 804E3684 28 00 00 00 */ cmplwi r0, 0 -/* 804E3688 41 82 00 54 */ beq lbl_804E36DC -/* 804E368C 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 804E3690 7C 03 07 74 */ extsb r3, r0 -/* 804E3694 4B B4 99 D9 */ bl dComIfGp_getReverb__Fi -/* 804E3698 7C 67 1B 78 */ mr r7, r3 -/* 804E369C 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008019A@ha */ -/* 804E36A0 38 03 01 9A */ addi r0, r3, 0x019A /* 0x0008019A@l */ -/* 804E36A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804E36A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E36AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E36B0 80 63 00 00 */ lwz r3, 0(r3) -/* 804E36B4 38 81 00 14 */ addi r4, r1, 0x14 -/* 804E36B8 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 804E36BC 38 C0 00 00 */ li r6, 0 -/* 804E36C0 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E36C4 FC 40 08 90 */ fmr f2, f1 -/* 804E36C8 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 804E36CC FC 80 18 90 */ fmr f4, f3 -/* 804E36D0 39 00 00 00 */ li r8, 0 -/* 804E36D4 4B DC 82 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E36D8 48 00 00 A0 */ b lbl_804E3778 -lbl_804E36DC: -/* 804E36DC 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 804E36E0 7C 03 07 74 */ extsb r3, r0 -/* 804E36E4 4B B4 99 89 */ bl dComIfGp_getReverb__Fi -/* 804E36E8 7C 67 1B 78 */ mr r7, r3 -/* 804E36EC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080191@ha */ -/* 804E36F0 38 03 01 91 */ addi r0, r3, 0x0191 /* 0x00080191@l */ -/* 804E36F4 90 01 00 10 */ stw r0, 0x10(r1) -/* 804E36F8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E36FC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E3700 80 63 00 00 */ lwz r3, 0(r3) -/* 804E3704 38 81 00 10 */ addi r4, r1, 0x10 -/* 804E3708 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 804E370C 38 C0 00 00 */ li r6, 0 -/* 804E3710 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E3714 FC 40 08 90 */ fmr f2, f1 -/* 804E3718 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 804E371C FC 80 18 90 */ fmr f4, f3 -/* 804E3720 39 00 00 00 */ li r8, 0 -/* 804E3724 4B DC 82 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804E3728 48 00 00 50 */ b lbl_804E3778 -lbl_804E372C: -/* 804E372C 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 804E3730 7C 03 07 74 */ extsb r3, r0 -/* 804E3734 4B B4 99 39 */ bl dComIfGp_getReverb__Fi -/* 804E3738 7C 67 1B 78 */ mr r7, r3 -/* 804E373C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000800B2@ha */ -/* 804E3740 38 03 00 B2 */ addi r0, r3, 0x00B2 /* 0x000800B2@l */ -/* 804E3744 90 01 00 0C */ stw r0, 0xc(r1) -/* 804E3748 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E374C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E3750 80 63 00 00 */ lwz r3, 0(r3) -/* 804E3754 38 81 00 0C */ addi r4, r1, 0xc -/* 804E3758 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 804E375C 38 C0 00 00 */ li r6, 0 -/* 804E3760 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 804E3764 FC 40 08 90 */ fmr f2, f1 -/* 804E3768 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 804E376C FC 80 18 90 */ fmr f4, f3 -/* 804E3770 39 00 00 00 */ li r8, 0 -/* 804E3774 4B DC 82 11 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804E3778: -/* 804E3778 7F C3 F3 78 */ mr r3, r30 -/* 804E377C 39 61 00 40 */ addi r11, r1, 0x40 -/* 804E3780 4B E7 EA A9 */ bl _restgpr_29 -/* 804E3784 80 01 00 44 */ lwz r0, 0x44(r1) -/* 804E3788 7C 08 03 A6 */ mtlr r0 -/* 804E378C 38 21 00 40 */ addi r1, r1, 0x40 -/* 804E3790 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setAngle__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setAngle__11daBdoorL1_cFv.s deleted file mode 100644 index a4a8386554..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setAngle__11daBdoorL1_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_804E3F10: -/* 804E3F10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804E3F14 7C 08 02 A6 */ mflr r0 -/* 804E3F18 90 01 00 24 */ stw r0, 0x24(r1) -/* 804E3F1C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804E3F20 93 C1 00 18 */ stw r30, 0x18(r1) -/* 804E3F24 7C 7E 1B 78 */ mr r30, r3 -/* 804E3F28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3F2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3F30 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 804E3F34 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 804E3F38 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 804E3F3C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804E3F40 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804E3F44 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 804E3F48 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804E3F4C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 804E3F50 B0 01 00 08 */ sth r0, 8(r1) -/* 804E3F54 38 61 00 08 */ addi r3, r1, 8 -/* 804E3F58 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 804E3F5C 38 04 7F FF */ addi r0, r4, 0x7fff -/* 804E3F60 7C 04 07 34 */ extsh r4, r0 -/* 804E3F64 38 A0 00 05 */ li r5, 5 -/* 804E3F68 38 C0 0B B8 */ li r6, 0xbb8 -/* 804E3F6C 4B D8 C6 9D */ bl cLib_addCalcAngleS2__FPssss -/* 804E3F70 88 1E 05 9A */ lbz r0, 0x59a(r30) -/* 804E3F74 28 00 00 00 */ cmplwi r0, 0 -/* 804E3F78 41 82 00 34 */ beq lbl_804E3FAC -/* 804E3F7C 7F E3 FB 78 */ mr r3, r31 -/* 804E3F80 38 81 00 0C */ addi r4, r1, 0xc -/* 804E3F84 A8 A1 00 08 */ lha r5, 8(r1) -/* 804E3F88 38 C0 00 00 */ li r6, 0 -/* 804E3F8C 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 804E3F90 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 804E3F94 7D 89 03 A6 */ mtctr r12 -/* 804E3F98 4E 80 04 21 */ bctrl -/* 804E3F9C 88 7E 05 9A */ lbz r3, 0x59a(r30) -/* 804E3FA0 38 03 FF FF */ addi r0, r3, -1 -/* 804E3FA4 98 1E 05 9A */ stb r0, 0x59a(r30) -/* 804E3FA8 48 00 00 34 */ b lbl_804E3FDC -lbl_804E3FAC: -/* 804E3FAC 7F E3 FB 78 */ mr r3, r31 -/* 804E3FB0 38 81 00 0C */ addi r4, r1, 0xc -/* 804E3FB4 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 804E3FB8 38 05 7F FF */ addi r0, r5, 0x7fff -/* 804E3FBC 7C 05 07 34 */ extsh r5, r0 -/* 804E3FC0 38 C0 00 00 */ li r6, 0 -/* 804E3FC4 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 804E3FC8 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 804E3FCC 7D 89 03 A6 */ mtctr r12 -/* 804E3FD0 4E 80 04 21 */ bctrl -/* 804E3FD4 38 60 00 01 */ li r3, 1 -/* 804E3FD8 48 00 00 08 */ b lbl_804E3FE0 -lbl_804E3FDC: -/* 804E3FDC 38 60 00 00 */ li r3, 0 -lbl_804E3FE0: -/* 804E3FE0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 804E3FE4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 804E3FE8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804E3FEC 7C 08 03 A6 */ mtlr r0 -/* 804E3FF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 804E3FF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setPos__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setPos__11daBdoorL1_cFv.s deleted file mode 100644 index 69147c0a04..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setPos__11daBdoorL1_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_804E3CCC: -/* 804E3CCC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 804E3CD0 7C 08 02 A6 */ mflr r0 -/* 804E3CD4 90 01 00 44 */ stw r0, 0x44(r1) -/* 804E3CD8 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 804E3CDC 93 C1 00 38 */ stw r30, 0x38(r1) -/* 804E3CE0 7C 7E 1B 78 */ mr r30, r3 -/* 804E3CE4 3C 60 80 4E */ lis r3, l_staff_name@ha /* 0x804E4A14@ha */ -/* 804E3CE8 3B E3 4A 14 */ addi r31, r3, l_staff_name@l /* 0x804E4A14@l */ -/* 804E3CEC 38 61 00 08 */ addi r3, r1, 8 -/* 804E3CF0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3CF4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3CF8 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 804E3CFC 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 804E3D00 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 804E3D04 4B D8 2E 31 */ bl __mi__4cXyzCFRC3Vec -/* 804E3D08 C0 01 00 08 */ lfs f0, 8(r1) -/* 804E3D0C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 804E3D10 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 804E3D14 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804E3D18 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 804E3D1C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804E3D20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3D24 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3D28 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 804E3D2C 7C 00 00 D0 */ neg r0, r0 -/* 804E3D30 7C 04 07 34 */ extsh r4, r0 -/* 804E3D34 4B B2 86 A9 */ bl mDoMtx_YrotS__FPA4_fs -/* 804E3D38 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3D3C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3D40 38 81 00 14 */ addi r4, r1, 0x14 -/* 804E3D44 7C 85 23 78 */ mr r5, r4 -/* 804E3D48 4B E6 30 25 */ bl PSMTXMultVec -/* 804E3D4C C0 21 00 14 */ lfs f1, 0x14(r1) -/* 804E3D50 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 804E3D54 C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 804E3D58 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804E3D5C 40 81 00 08 */ ble lbl_804E3D64 -/* 804E3D60 D0 01 00 20 */ stfs f0, 0x20(r1) -lbl_804E3D64: -/* 804E3D64 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 804E3D68 C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 804E3D6C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 804E3D70 40 80 00 08 */ bge lbl_804E3D78 -/* 804E3D74 D0 01 00 20 */ stfs f0, 0x20(r1) -lbl_804E3D78: -/* 804E3D78 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 804E3D7C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 804E3D80 C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 804E3D84 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 804E3D88 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3D8C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3D90 A8 9E 04 B6 */ lha r4, 0x4b6(r30) -/* 804E3D94 4B B2 86 49 */ bl mDoMtx_YrotS__FPA4_fs -/* 804E3D98 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 804E3D9C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 804E3DA0 38 81 00 20 */ addi r4, r1, 0x20 -/* 804E3DA4 7C 85 23 78 */ mr r5, r4 -/* 804E3DA8 4B E6 2F C5 */ bl PSMTXMultVec -/* 804E3DAC 38 61 00 20 */ addi r3, r1, 0x20 -/* 804E3DB0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 804E3DB4 7C 65 1B 78 */ mr r5, r3 -/* 804E3DB8 4B E6 32 D9 */ bl PSVECAdd -/* 804E3DBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804E3DC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804E3DC4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 804E3DC8 38 81 00 20 */ addi r4, r1, 0x20 -/* 804E3DCC 4B B6 45 F9 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 804E3DD0 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 804E3DD4 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 804E3DD8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 804E3DDC 7C 08 03 A6 */ mtlr r0 -/* 804E3DE0 38 21 00 40 */ addi r1, r1, 0x40 -/* 804E3DE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/unlockInit__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/unlockInit__11daBdoorL1_cFv.s deleted file mode 100644 index 0d2c5a6bfd..0000000000 --- a/asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/unlockInit__11daBdoorL1_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_804E3C14: -/* 804E3C14 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 804E3C18 7C 08 02 A6 */ mflr r0 -/* 804E3C1C 90 01 00 24 */ stw r0, 0x24(r1) -/* 804E3C20 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804E3C24 7C 7F 1B 78 */ mr r31, r3 -/* 804E3C28 80 63 05 94 */ lwz r3, 0x594(r3) -/* 804E3C2C 3C 03 00 01 */ addis r0, r3, 1 -/* 804E3C30 28 00 FF FF */ cmplwi r0, 0xffff -/* 804E3C34 40 82 00 0C */ bne lbl_804E3C40 -/* 804E3C38 38 60 00 01 */ li r3, 1 -/* 804E3C3C 48 00 00 7C */ b lbl_804E3CB8 -lbl_804E3C40: -/* 804E3C40 90 61 00 0C */ stw r3, 0xc(r1) -/* 804E3C44 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 804E3C48 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 804E3C4C 38 81 00 0C */ addi r4, r1, 0xc -/* 804E3C50 4B B3 5B A9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 804E3C54 7C 65 1B 79 */ or. r5, r3, r3 -/* 804E3C58 41 82 00 54 */ beq lbl_804E3CAC -/* 804E3C5C 38 00 00 01 */ li r0, 1 -/* 804E3C60 98 05 2C A4 */ stb r0, 0x2ca4(r5) -/* 804E3C64 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080060@ha */ -/* 804E3C68 38 03 00 60 */ addi r0, r3, 0x0060 /* 0x00080060@l */ -/* 804E3C6C 90 01 00 08 */ stw r0, 8(r1) -/* 804E3C70 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804E3C74 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804E3C78 80 63 00 00 */ lwz r3, 0(r3) -/* 804E3C7C 38 81 00 08 */ addi r4, r1, 8 -/* 804E3C80 38 A5 04 D0 */ addi r5, r5, 0x4d0 -/* 804E3C84 38 C0 00 00 */ li r6, 0 -/* 804E3C88 38 E0 00 00 */ li r7, 0 -/* 804E3C8C 3D 00 80 4E */ lis r8, lit_3861@ha /* 0x804E4A50@ha */ -/* 804E3C90 C0 28 4A 50 */ lfs f1, lit_3861@l(r8) /* 0x804E4A50@l */ -/* 804E3C94 FC 40 08 90 */ fmr f2, f1 -/* 804E3C98 3D 00 80 4E */ lis r8, lit_4238@ha /* 0x804E4A68@ha */ -/* 804E3C9C C0 68 4A 68 */ lfs f3, lit_4238@l(r8) /* 0x804E4A68@l */ -/* 804E3CA0 FC 80 18 90 */ fmr f4, f3 -/* 804E3CA4 39 00 00 00 */ li r8, 0 -/* 804E3CA8 4B DC 7C DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804E3CAC: -/* 804E3CAC 38 00 00 01 */ li r0, 1 -/* 804E3CB0 98 1F 05 9B */ stb r0, 0x59b(r31) -/* 804E3CB4 38 60 00 01 */ li r3, 1 -lbl_804E3CB8: -/* 804E3CB8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 804E3CBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804E3CC0 7C 08 03 A6 */ mtlr r0 -/* 804E3CC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 804E3CC8 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 2bf7ab4e5e..a964f9e1c0 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -300,7 +300,7 @@ public: FLG2_UNK_4000 = 0x4000, FLG2_UNK_2000 = 0x2000, FLG2_UNK_1000 = 0x1000, - FLG2_UNK_400 = 0x400, + FLG2_PLAYER_SHADOW = 0x400, FLG2_UNK_200 = 0x200, FLG2_UNK_80 = 0x80, FLG2_UNK_40 = 0x40, @@ -815,6 +815,8 @@ public: void offPlayerNoDraw() { offNoResetFlg0(FLG0_PLAYER_NO_DRAW); } void onPushPullKeep() { onNoResetFlg0(FLG0_PUSH_PULL_KEEP); } void offPushPullKeep() { offNoResetFlg0(FLG0_PUSH_PULL_KEEP); } + void onPlayerShadowNoDraw() { onNoResetFlg2(FLG2_PLAYER_SHADOW); } + void offPlayerShadowNoDraw() { offNoResetFlg2(FLG2_PLAYER_SHADOW); } void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); } u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 9e28b863a7..7884dc3f4e 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -111,6 +111,7 @@ public: bool isUseButton(int param_0) { return param_0 & mUseButton; } void setMeterMapClass(dMeterMap_c* p_map) { mMeterMap = p_map; } void resetGameStatus() { mGameStatus = 0; } + void onGameStatus(int status) { mGameStatus |= status; } void setMapStatus(u8 status) { mMapStatus = status; } u8 getMapStatus() { return mMapStatus; } void setPauseStatus(u8 status) { mPauseStatus = status; } @@ -406,6 +407,10 @@ inline void dMeter2Info_resetGameStatus() { g_meter2_info.resetGameStatus(); } +inline void dMeter2Info_onGameStatus(int status) { + g_meter2_info.onGameStatus(status); +} + inline void dMeter2Info_setMapStatus(u8 status) { g_meter2_info.setMapStatus(status); } diff --git a/include/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.h b/include/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.h index c3ca5823bf..13f4aaa275 100644 --- a/include/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.h +++ b/include/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.h @@ -2,5 +2,96 @@ #define D_A_DOOR_BOSSL1_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_w.h" +#include "d/bg/d_bg_s_acch.h" +#include "SSystem/SComponent/c_phase.h" + +class JPABaseEmitter; + +struct daBdoorL1_c : public fopAc_ac_c { + enum DoorType { + DOOR_TYPE_0, + DOOR_TYPE_1, + }; + + enum ActionType { + ACTION_WAIT, + ACTION_CLOSE_WAIT, + ACTION_OPEN, + ACTION_END, + }; + + typedef int (daBdoorL1_c::*actionFunc)(); + + /* 804E1E2C */ char* getDoorEventName(); + /* 804E1EE8 */ char* getDoorEventName2(); + /* 804E1FA4 */ const char* getArcName(); + /* 804E2060 */ const char* getAnmArcName(); + /* 804E20C4 */ int getDoorType(); + /* 804E2104 */ int getOpenAnm(); + /* 804E2158 */ int getCloseAnm(); + /* 804E21AC */ const char* getAlwaysArcName(); + /* 804E21BC */ const char* getBmd(); + /* 804E21CC */ const char* getDzb(); + /* 804E21DC */ J3DModelData* getDoorModelData(); + /* 804E2258 */ int CreateHeap(); + /* 804E2578 */ void calcMtx(); + /* 804E2754 */ int CreateInit(); + /* 804E28E4 */ int create(); + /* 804E2B78 */ int getDemoAction(); + /* 804E2BC0 */ void demoProc(); + /* 804E3180 */ int openInit(); + /* 804E357C */ int openProc(); + /* 804E3794 */ int openEnd(); + /* 804E3850 */ int closeInit(); + /* 804E3A2C */ int closeProc(); + /* 804E3C0C */ int closeEnd(); + /* 804E3C14 */ int unlockInit(); + /* 804E3CCC */ void setPos(); + /* 804E3DE8 */ void calcGoal(cXyz*, int); + /* 804E3F10 */ int setAngle(); + /* 804E3FF8 */ int createKey(); + /* 804E4100 */ void smokeInit(); + /* 804E4104 */ void deleteEmitter(); + /* 804E4158 */ int checkArea(); + /* 804E432C */ int checkFront(); + /* 804E43A0 */ int checkOpen(); + /* 804E4414 */ int actionWait(); + /* 804E441C */ int actionCloseWait(); + /* 804E44B4 */ int actionOpen(); + /* 804E44EC */ int actionEnd(); + /* 804E464C */ int execute(); + /* 804E476C */ int draw(); + /* 804E48BC */ int Delete(); + + void setAction(u8 action) { mAction = action; } + + /* 0x568 */ request_of_phase_process_class mPhase1; + /* 0x570 */ request_of_phase_process_class mPhase2; + /* 0x578 */ request_of_phase_process_class mPhase3; + /* 0x580 */ J3DModel* field_0x580; + /* 0x584 */ J3DModel* field_0x584; + /* 0x588 */ mDoExt_bckAnm* field_0x588; + /* 0x58C */ mDoExt_btkAnm* field_0x58c; + /* 0x590 */ dBgW* field_0x590; + /* 0x594 */ u32 mKeyHoleId; + /* 0x598 */ u8 field_0x598; + /* 0x599 */ u8 mAction; + /* 0x59A */ u8 field_0x59a; + /* 0x59B */ u8 field_0x59b; + /* 0x59C */ s16 field_0x59c; + /* 0x59E */ s16 field_0x59e; + /* 0x5A0 */ int field_0x5a0; + /* 0x5A4 */ int field_0x5a4; + /* 0x5A8 */ f32 field_0x5a8; + /* 0x5AC */ dBgS_ObjAcch field_0x5ac; + /* 0x784 */ dBgS_AcchCir field_0x784; + /* 0x7C4 */ cXyz field_0x7c4; + /* 0x7D0 */ cXyz field_0x7d0; + /* 0x7DC */ csXyz field_0x7dc; + /* 0x7E4 */ JPABaseEmitter* field_0x7e4[2]; + /* 0x7EC */ Mtx field_0x7ec; +}; #endif /* D_A_DOOR_BOSSL1_H */ diff --git a/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h b/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h index 6e5a21d7ef..a5461e5f10 100644 --- a/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h +++ b/include/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h @@ -2,5 +2,14 @@ #define D_A_OBJ_KEYHOLE_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +struct obj_keyhole_class : public fopAc_ac_c { + void setOpen() { mOpenState = 1; } + bool checkOpenEnd() { return mOpenState == 3; } + + /* 0x0568 */ u8 field_0x0568[0x2ca4 - 0x568]; + /* 0x2ca4 */ u8 mOpenState; +}; #endif /* D_A_OBJ_KEYHOLE_H */ diff --git a/rel/d/a/door/d_a_door_bossL1/Makefile b/rel/d/a/door/d_a_door_bossL1/Makefile index af64d12772..048c93fa4b 100644 --- a/rel/d/a/door/d_a_door_bossL1/Makefile +++ b/rel/d/a/door/d_a_door_bossL1/Makefile @@ -8,12 +8,10 @@ M64_MAP := $(BUILD_DIR)/rel/d/a/door/d_a_door_bossL1.map M64_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/door/d_a_door_bossL1/unknown_translation_unit_bss.cpp \ rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp \ M64_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/door/d_a_door_bossL1/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.o \ M64_LIBS := \ diff --git a/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp b/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp index a2f898ae55..e5f76eefe6 100644 --- a/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp +++ b/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.cpp @@ -1,431 +1,26 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_door_bossL1 +// Translation Unit: Boss Door L1 // #include "rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct door_param2_c { - /* 8003A1D0 */ void getSwbit(fopAc_ac_c*); - /* 8003A224 */ void getExitNo(fopAc_ac_c*); -}; - -struct daBdoorL1_c { - /* 804E1E2C */ void getDoorEventName(); - /* 804E1EE8 */ void getDoorEventName2(); - /* 804E1FA4 */ void getArcName(); - /* 804E2060 */ void getAnmArcName(); - /* 804E20C4 */ void getDoorType(); - /* 804E2104 */ void getOpenAnm(); - /* 804E2158 */ void getCloseAnm(); - /* 804E21AC */ void getAlwaysArcName(); - /* 804E21BC */ void getBmd(); - /* 804E21CC */ void getDzb(); - /* 804E21DC */ void getDoorModelData(); - /* 804E2258 */ void CreateHeap(); - /* 804E2578 */ void calcMtx(); - /* 804E2754 */ void CreateInit(); - /* 804E28E4 */ void create(); - /* 804E2B78 */ void getDemoAction(); - /* 804E2BC0 */ void demoProc(); - /* 804E3180 */ void openInit(); - /* 804E357C */ void openProc(); - /* 804E3794 */ void openEnd(); - /* 804E3850 */ void closeInit(); - /* 804E3A2C */ void closeProc(); - /* 804E3C0C */ bool closeEnd(); - /* 804E3C14 */ void unlockInit(); - /* 804E3CCC */ void setPos(); - /* 804E3DE8 */ void calcGoal(cXyz*, int); - /* 804E3F10 */ void setAngle(); - /* 804E3FF8 */ void createKey(); - /* 804E4100 */ void smokeInit(); - /* 804E4104 */ void deleteEmitter(); - /* 804E4158 */ void checkArea(); - /* 804E432C */ void checkFront(); - /* 804E43A0 */ void checkOpen(); - /* 804E4414 */ bool actionWait(); - /* 804E441C */ void actionCloseWait(); - /* 804E44B4 */ void actionOpen(); - /* 804E44EC */ void actionEnd(); - /* 804E464C */ void execute(); - /* 804E476C */ void draw(); - /* 804E48BC */ void Delete(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_restart_c { - /* 80034F80 */ void setRoom(cXyz const&, s16, s8); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 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_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 804E2B08 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 804E2A98 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 804E2530 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void getNowLevel__Fv(); -extern "C" void getDoorEventName__11daBdoorL1_cFv(); -extern "C" void getDoorEventName2__11daBdoorL1_cFv(); -extern "C" void getArcName__11daBdoorL1_cFv(); -extern "C" void getAnmArcName__11daBdoorL1_cFv(); -extern "C" void getDoorType__11daBdoorL1_cFv(); -extern "C" void getOpenAnm__11daBdoorL1_cFv(); -extern "C" void getCloseAnm__11daBdoorL1_cFv(); -extern "C" void getAlwaysArcName__11daBdoorL1_cFv(); -extern "C" void getBmd__11daBdoorL1_cFv(); -extern "C" void getDzb__11daBdoorL1_cFv(); -extern "C" void getDoorModelData__11daBdoorL1_cFv(); -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void CreateHeap__11daBdoorL1_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void calcMtx__11daBdoorL1_cFv(); -extern "C" void CreateInit__11daBdoorL1_cFv(); -extern "C" void create__11daBdoorL1_cFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void getDemoAction__11daBdoorL1_cFv(); -extern "C" void demoProc__11daBdoorL1_cFv(); -extern "C" void openInit__11daBdoorL1_cFv(); -extern "C" void openProc__11daBdoorL1_cFv(); -extern "C" void openEnd__11daBdoorL1_cFv(); -extern "C" void closeInit__11daBdoorL1_cFv(); -extern "C" void closeProc__11daBdoorL1_cFv(); -extern "C" bool closeEnd__11daBdoorL1_cFv(); -extern "C" void unlockInit__11daBdoorL1_cFv(); -extern "C" void setPos__11daBdoorL1_cFv(); -extern "C" void calcGoal__11daBdoorL1_cFP4cXyzi(); -extern "C" void setAngle__11daBdoorL1_cFv(); -extern "C" void createKey__11daBdoorL1_cFv(); -extern "C" void smokeInit__11daBdoorL1_cFv(); -extern "C" void deleteEmitter__11daBdoorL1_cFv(); -extern "C" void checkArea__11daBdoorL1_cFv(); -extern "C" void checkFront__11daBdoorL1_cFv(); -extern "C" void checkOpen__11daBdoorL1_cFv(); -extern "C" bool actionWait__11daBdoorL1_cFv(); -extern "C" void actionCloseWait__11daBdoorL1_cFv(); -extern "C" void actionOpen__11daBdoorL1_cFv(); -extern "C" void actionEnd__11daBdoorL1_cFv(); -extern "C" void execute__11daBdoorL1_cFv(); -extern "C" void draw__11daBdoorL1_cFv(); -extern "C" void Delete__11daBdoorL1_cFv(); -extern "C" static void daBdoorL1_Draw__FP11daBdoorL1_c(); -extern "C" static void daBdoorL1_Execute__FP11daBdoorL1_c(); -extern "C" static void daBdoorL1_Delete__FP11daBdoorL1_c(); -extern "C" static void daBdoorL1_Create__FP10fopAc_ac_c(); -extern "C" void func_804E49E0(void* _this, int*); -extern "C" static void func_804E49FC(); -extern "C" static void func_804E4A04(); -extern "C" extern char const* const d_a_door_bossL1__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void transM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void setRoom__13dSv_restart_cFRC4cXyzsSc(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getSwbit__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getExitNo__13door_param2_cFP10fopAc_ac_c(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void setGoal__16dEvent_manager_cFP4cXyz(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void StartQuake__12dVibration_cFii4cXyz(); -extern "C" void StopQuake__12dVibration_cFi(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void func_802807E0(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_804E50A8[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4ADC = "D_MN05"; -SECTION_DEAD static char const* const stringBase_804E4AE3 = "D_MN05A"; -SECTION_DEAD static char const* const stringBase_804E4AEB = "D_MN04"; -SECTION_DEAD static char const* const stringBase_804E4AF2 = "D_MN04A"; -SECTION_DEAD static char const* const stringBase_804E4AFA = "D_MN01"; -SECTION_DEAD static char const* const stringBase_804E4B01 = "D_MN01A"; -SECTION_DEAD static char const* const stringBase_804E4B09 = "D_MN10"; -SECTION_DEAD static char const* const stringBase_804E4B10 = "D_MN10A"; -SECTION_DEAD static char const* const stringBase_804E4B18 = "D_MN11"; -SECTION_DEAD static char const* const stringBase_804E4B1F = "D_MN11A"; -SECTION_DEAD static char const* const stringBase_804E4B27 = "D_MN06"; -SECTION_DEAD static char const* const stringBase_804E4B2E = "D_MN06A"; -SECTION_DEAD static char const* const stringBase_804E4B36 = "D_MN07"; -SECTION_DEAD static char const* const stringBase_804E4B3D = "D_MN07A"; -SECTION_DEAD static char const* const stringBase_804E4B45 = "D_MN08"; -SECTION_DEAD static char const* const stringBase_804E4B4C = "D_MN08A"; -SECTION_DEAD static char const* const stringBase_804E4B54 = "D_MN09"; -SECTION_DEAD static char const* const stringBase_804E4B5B = "D_MN09A"; -SECTION_DEAD static char const* const stringBase_804E4B63 = "D_MN54"; -SECTION_DEAD static char const* const stringBase_804E4B6A = "D_MN54A"; -#pragma pop +#include "rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.h" +#include "d/d_door_param2.h" +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "d/particle/d_particle.h" +#include "d/meter/d_meter2_info.h" +#include "SSystem/SComponent/c_math.h" +#include "f_op/f_op_actor_mng.h" /* 804E4DF8-804E4E04 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, }; /* 804E4E04-804E4E18 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -436,914 +31,845 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 804E4E18-804E4E68 -00001 0050+00 1/1 0/0 0/0 .data l_stageName$3673 */ -SECTION_DATA static void* l_stageName[20] = { - (void*)&d_a_door_bossL1__stringBase0, - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x7), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0xF), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x16), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x1E), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x25), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2D), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x34), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x3C), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x43), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x4B), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x52), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x5A), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x61), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x69), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x70), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x78), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x7F), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x87), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x8E), +static char* l_stageName[20] = { + "D_MN05", + "D_MN05A", + "D_MN04", + "D_MN04A", + "D_MN01", + "D_MN01A", + "D_MN10", + "D_MN10A", + "D_MN11", + "D_MN11A", + "D_MN06", + "D_MN06A", + "D_MN07", + "D_MN07A", + "D_MN08", + "D_MN08A", + "D_MN09", + "D_MN09A", + "D_MN54", + "D_MN54A", }; /* 804E1D98-804E1E2C 000078 0094+00 14/14 0/0 0/0 .text getNowLevel__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void getNowLevel() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getNowLevel__Fv.s" +static int getNowLevel() { + for (int i = 0; i < 20; i++) { + if (strcmp(dComIfGp_getStartStageName(), l_stageName[i]) == 0) { + if ((i == 18) || (i == 19)) { + i = 2; + } + return i / 2 + 1; + } + } + return -1; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4B72 = "DEFAULT_BS_SHUTTER_L1_F"; -SECTION_DEAD static char const* const stringBase_804E4B8A = "DEFAULT_BS_SHUTTER_L2_F"; -SECTION_DEAD static char const* const stringBase_804E4BA2 = "DEFAULT_BS_SHUTTER_L4_F"; -SECTION_DEAD static char const* const stringBase_804E4BBA = "DEFAULT_BS_SHUTTER_L6_F"; -SECTION_DEAD static char const* const stringBase_804E4BD2 = "DEFAULT_BS_SHUTTER_L7_F"; -SECTION_DEAD static char const* const stringBase_804E4BEA = "DEFAULT_BS_SHUTTER_L8_F"; -SECTION_DEAD static char const* const stringBase_804E4C02 = "DEFAULT_BS_SHUTTER_L9_F"; -#pragma pop - -/* 804E4E68-804E4E90 -00001 0028+00 1/1 0/0 0/0 .data @3700 */ -SECTION_DATA static void* lit_3700[10] = { - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0x30), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0x40), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0x50), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0x60), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0x70), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0x80), - (void*)(((char*)getDoorEventName__11daBdoorL1_cFv) + 0x90), -}; /* 804E1E2C-804E1EE8 00010C 00BC+00 2/1 0/0 0/0 .text getDoorEventName__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getDoorEventName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName__11daBdoorL1_cFv.s" +char* daBdoorL1_c::getDoorEventName() { + switch (getNowLevel()) { + case 1: + return "DEFAULT_BS_SHUTTER_L1_F"; + case 2: + return "DEFAULT_BS_SHUTTER_L2_F"; + case 4: + return "DEFAULT_BS_SHUTTER_L4_F"; + case 6: + return "DEFAULT_BS_SHUTTER_L6_F"; + case 7: + return "DEFAULT_BS_SHUTTER_L7_F"; + case 8: + return "DEFAULT_BS_SHUTTER_L8_F"; + case 9: + return "DEFAULT_BS_SHUTTER_L9_F"; + default: + return "DEFAULT_BS_SHUTTER_L1_F"; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4C1A = "DEFAULT_BS_SHUTTER_L1_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C34 = "DEFAULT_BS_SHUTTER_L2_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C4E = "DEFAULT_BS_SHUTTER_L4_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C68 = "DEFAULT_BS_SHUTTER_L6_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C82 = "DEFAULT_BS_SHUTTER_L7_F_2"; -SECTION_DEAD static char const* const stringBase_804E4C9C = "DEFAULT_BS_SHUTTER_L8_F_2"; -SECTION_DEAD static char const* const stringBase_804E4CB6 = "DEFAULT_BS_SHUTTER_L9_F_2"; -#pragma pop - -/* 804E4E90-804E4EB8 -00001 0028+00 1/1 0/0 0/0 .data @3713 */ -SECTION_DATA static void* lit_3713[10] = { - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0x30), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0x40), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0x50), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0x60), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0x70), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0x80), - (void*)(((char*)getDoorEventName2__11daBdoorL1_cFv) + 0x90), -}; /* 804E1EE8-804E1FA4 0001C8 00BC+00 2/1 0/0 0/0 .text getDoorEventName2__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getDoorEventName2() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorEventName2__11daBdoorL1_cFv.s" +char* daBdoorL1_c::getDoorEventName2() { + switch (getNowLevel()) { + case 1: + return "DEFAULT_BS_SHUTTER_L1_F_2"; + case 2: + return "DEFAULT_BS_SHUTTER_L2_F_2"; + case 4: + return "DEFAULT_BS_SHUTTER_L4_F_2"; + case 6: + return "DEFAULT_BS_SHUTTER_L6_F_2"; + case 7: + return "DEFAULT_BS_SHUTTER_L7_F_2"; + case 8: + return "DEFAULT_BS_SHUTTER_L8_F_2"; + case 9: + return "DEFAULT_BS_SHUTTER_L9_F_2"; + default: + // BUG: Shouldn't the default be "DEFAULT_BS_SHUTTER_L1_F_2"? + return "DEFAULT_BS_SHUTTER_L1_F"; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4CD0 = "L1Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CD8 = "L2Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CE0 = "L4Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CE8 = "L6Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CF0 = "L7Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4CF8 = "L8Bdoor"; -SECTION_DEAD static char const* const stringBase_804E4D00 = "L9Bdoor"; -#pragma pop - -/* 804E4EB8-804E4EE0 -00001 0028+00 1/1 0/0 0/0 .data @3726 */ -SECTION_DATA static void* lit_3726[10] = { - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0x30), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0x40), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0x50), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0xA0), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0x60), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0x70), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0x80), - (void*)(((char*)getArcName__11daBdoorL1_cFv) + 0x90), -}; /* 804E1FA4-804E2060 000284 00BC+00 6/5 0/0 0/0 .text getArcName__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getArcName__11daBdoorL1_cFv.s" +const char* daBdoorL1_c::getArcName() { + switch (getNowLevel()) { + case 1: + return "L1Bdoor"; + case 2: + return "L2Bdoor"; + case 4: + return "L4Bdoor"; + case 6: + return "L6Bdoor"; + case 7: + return "L7Bdoor"; + case 8: + return "L8Bdoor"; + case 9: + return "L9Bdoor"; + default: + return "L1Bdoor"; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4D08 = "BDoorYAnm"; -SECTION_DEAD static char const* const stringBase_804E4D12 = "BDoorTAnm"; -#pragma pop /* 804E2060-804E20C4 000340 0064+00 5/5 0/0 0/0 .text getAnmArcName__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getAnmArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAnmArcName__11daBdoorL1_cFv.s" +const char* daBdoorL1_c::getAnmArcName() { + switch(getDoorType()) { + case DOOR_TYPE_0: + return "BDoorYAnm"; + case DOOR_TYPE_1: + return "BDoorTAnm"; + default: + return "BDoorYAnm"; + } } -#pragma pop /* 804E20C4-804E2104 0003A4 0040+00 5/5 0/0 0/0 .text getDoorType__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getDoorType() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorType__11daBdoorL1_cFv.s" +int daBdoorL1_c::getDoorType() { + switch (getNowLevel()) { + case 1: + case 2: + return DOOR_TYPE_0; + default: + return DOOR_TYPE_1; + } } -#pragma pop /* 804E2104-804E2158 0003E4 0054+00 2/2 0/0 0/0 .text getOpenAnm__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getOpenAnm() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getOpenAnm__11daBdoorL1_cFv.s" +int daBdoorL1_c::getOpenAnm() { + if (getDoorType() == 1) { + return 5; + } + + return getDoorType() == 0 ? 5 : -1; } -#pragma pop /* 804E2158-804E21AC 000438 0054+00 1/1 0/0 0/0 .text getCloseAnm__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getCloseAnm() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getCloseAnm__11daBdoorL1_cFv.s" -} -#pragma pop +int daBdoorL1_c::getCloseAnm() { + if (getDoorType() == 1) { + return 4; + } -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4D1C = "static"; -#pragma pop + return getDoorType() == 0 ? 4 : -1; +} /* 804E21AC-804E21BC 00048C 0010+00 3/3 0/0 0/0 .text getAlwaysArcName__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getAlwaysArcName() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getAlwaysArcName__11daBdoorL1_cFv.s" +const char* daBdoorL1_c::getAlwaysArcName() { + return "static"; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4D23 = "door_shutterBoss.bmd"; -#pragma pop /* 804E21BC-804E21CC 00049C 0010+00 1/1 0/0 0/0 .text getBmd__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getBmd() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getBmd__11daBdoorL1_cFv.s" +const char* daBdoorL1_c::getBmd() { + return "door_shutterBoss.bmd"; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4D38 = "door-shutterBoss.dzb"; -#pragma pop /* 804E21CC-804E21DC 0004AC 0010+00 1/1 0/0 0/0 .text getDzb__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getDzb() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDzb__11daBdoorL1_cFv.s" +/* 804E21BC-804E21CC 00049C 0010+00 1/1 0/0 0/0 .text getBmd__11daBdoorL1_cFv */ +const char* daBdoorL1_c::getDzb() { + return "door-shutterBoss.dzb"; } -#pragma pop /* 804E21DC-804E2238 0004BC 005C+00 1/1 0/0 0/0 .text getDoorModelData__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getDoorModelData() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDoorModelData__11daBdoorL1_cFv.s" +J3DModelData* daBdoorL1_c::getDoorModelData() { + J3DModelData* door_model = static_cast(dComIfG_getObjectRes(getArcName(), getBmd())); + JUT_ASSERT(256, door_model != 0) + return door_model; } -#pragma pop /* 804E2238-804E2258 000518 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_bossL1/d_a_door_bossL1/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop -/* ############################################################################################## */ /* 804E4A14-804E4A24 000000 000D+03 12/12 0/0 0/0 .rodata l_staff_name */ -SECTION_RODATA static u8 const l_staff_name[13 + 3 /* padding */] = { - 0x53, - 0x48, - 0x55, - 0x54, - 0x54, - 0x45, - 0x52, - 0x5F, - 0x44, - 0x4F, - 0x4F, - 0x52, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x804E4A14, &l_staff_name); +static char const l_staff_name[13] = "SHUTTER_DOOR"; /* 804E4A24-804E4A50 000010 002C+00 1/1 0/0 0/0 .rodata l_heap_size */ -SECTION_RODATA static u8 const l_heap_size[44] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x22, 0x60, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, - 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x22, 0x60, -}; -COMPILER_STRIP_GATE(0x804E4A24, &l_heap_size); - -/* 804E4A50-804E4A54 00003C 0004+00 3/7 0/0 0/0 .rodata @3861 */ -SECTION_RODATA static f32 const lit_3861 = 1.0f; -COMPILER_STRIP_GATE(0x804E4A50, &lit_3861); - -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4D4D = "door_shutterBoss.btk"; -SECTION_DEAD static char const* const stringBase_804E4D62 = "WAIT"; -SECTION_DEAD static char const* const stringBase_804E4D67 = "SETANGLE"; -SECTION_DEAD static char const* const stringBase_804E4D70 = "UNLOCK"; -SECTION_DEAD static char const* const stringBase_804E4D77 = "OPEN"; -SECTION_DEAD static char const* const stringBase_804E4D7C = "SETGOAL"; -SECTION_DEAD static char const* const stringBase_804E4D84 = "SETGOAL2"; -SECTION_DEAD static char const* const stringBase_804E4D8D = "CLOSE"; -SECTION_DEAD static char const* const stringBase_804E4D93 = "SMOKE"; -SECTION_DEAD static char const* const stringBase_804E4D99 = "SMOKE_END"; -SECTION_DEAD static char const* const stringBase_804E4DA3 = "END"; -SECTION_DEAD static char const* const stringBase_804E4DA7 = "END_CHECK"; -SECTION_DEAD static char const* const stringBase_804E4DB1 = "CHG_SCENE"; -SECTION_DEAD static char const* const stringBase_804E4DBB = "STOP_CLOSE"; -SECTION_DEAD static char const* const stringBase_804E4DC6 = "PLY_DISP"; -SECTION_DEAD static char const* const stringBase_804E4DCF = "PLY_NODISP"; -SECTION_DEAD static char const* const stringBase_804E4DDA = "SETPOS"; -SECTION_DEAD static char const* const stringBase_804E4DE1 = "LIGHT_ANM"; -SECTION_DEAD static char const* const stringBase_804E4DEB = "INIT"; -#pragma pop - -/* 804E4EE0-804E4F28 -00001 0048+00 1/1 0/0 0/0 .data action_table$4021 */ -SECTION_DATA static void* action_table[18] = { - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x286), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x28B), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x294), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x29B), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2A0), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2A8), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2B1), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2B7), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2BD), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2C7), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2CB), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2D5), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2DF), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2EA), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2F3), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x2FE), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x305), - (void*)(((char*)&d_a_door_bossL1__stringBase0) + 0x30F), -}; - -/* 804E4F28-804E4F70 -00001 0048+00 1/1 0/0 0/0 .data @4240 */ -SECTION_DATA static void* lit_4240[18] = { - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x2DC), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x2FC), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x31C), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x368), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x390), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x3A0), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x3B0), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x488), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x554), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x560), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x498), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x4B0), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x554), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x554), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x554), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x554), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x4F8), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x518), -}; - -/* 804E4F70-804E4FB8 -00001 0048+00 1/1 0/0 0/0 .data @4239 */ -SECTION_DATA static void* lit_4239[18] = { - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x78), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0xB4), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0xC0), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0xCC), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0xD8), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0xF8), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x118), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x124), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x2BC), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x2BC), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x2BC), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x130), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x2BC), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x13C), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x158), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x174), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x264), - (void*)(((char*)demoProc__11daBdoorL1_cFv) + 0x18C), -}; - -/* 804E4FB8-804E4FC4 -00001 000C+00 0/1 0/0 0/0 .data @4936 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4936[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__11daBdoorL1_cFv, -}; -#pragma pop - -/* 804E4FC4-804E4FD0 -00001 000C+00 0/1 0/0 0/0 .data @4937 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4937[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionCloseWait__11daBdoorL1_cFv, -}; -#pragma pop - -/* 804E4FD0-804E4FDC -00001 000C+00 0/1 0/0 0/0 .data @4938 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4938[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOpen__11daBdoorL1_cFv, -}; -#pragma pop - -/* 804E4FDC-804E4FE8 -00001 000C+00 0/1 0/0 0/0 .data @4939 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4939[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEnd__11daBdoorL1_cFv, -}; -#pragma pop - -/* 804E4FE8-804E5018 0001F0 0030+00 0/1 0/0 0/0 .data l_action$4935 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_action[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 804E5018-804E5038 -00001 0020+00 1/0 0/0 0/0 .data l_daBdoorL1_Method */ -SECTION_DATA static void* l_daBdoorL1_Method[8] = { - (void*)daBdoorL1_Create__FP10fopAc_ac_c, - (void*)daBdoorL1_Delete__FP11daBdoorL1_c, - (void*)daBdoorL1_Execute__FP11daBdoorL1_c, - (void*)NULL, - (void*)daBdoorL1_Draw__FP11daBdoorL1_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 804E5038-804E5068 -00001 0030+00 0/0 0/0 1/0 .data g_profile_L1BOSS_DOOR */ -SECTION_DATA extern void* g_profile_L1BOSS_DOOR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02290000, (void*)&g_fpcLf_Method, - (void*)0x0000081C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x012A0000, (void*)&l_daBdoorL1_Method, - (void*)0x00044000, (void*)0x00060000, -}; - -/* 804E5068-804E5074 000270 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 804E5074-804E5098 00027C 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_804E4A04, - (void*)NULL, - (void*)NULL, - (void*)func_804E49FC, -}; - -/* 804E5098-804E50A4 0002A0 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, +static u32 const l_heap_size[11] = { + 0x00, 0x1500, 0x2260, + 0x00, 0x2100, 0x00, 0x1500, + 0x1500, 0x1600, 0x1500, 0x2260, }; /* 804E2258-804E2530 000538 02D8+00 1/1 0/0 0/0 .text CreateHeap__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateHeap__11daBdoorL1_cFv.s" -} -#pragma pop +int daBdoorL1_c::CreateHeap() { + int nowLevel = getNowLevel(); + J3DModelData* modelData = getDoorModelData(); + JUT_ASSERT(313, modelData != 0); + u32 dlistFlag = 0x11000084; + if (nowLevel == 8) { + dlistFlag |= 0x200; + } + field_0x580 = mDoExt_J3DModel__create(modelData, 0x80000, dlistFlag); + if (field_0x580 == NULL) { + return 0; + } + if (getDoorType() == DOOR_TYPE_0) { + field_0x584 = + mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (field_0x584 == NULL) { + return 0; + } + } else { + field_0x584 = NULL; + } + if (nowLevel == 8) { + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), "door_shutterBoss.btk"); + JUT_ASSERT(341, pbtk != 0); + field_0x58c = new mDoExt_btkAnm(); + if (field_0x58c == NULL || !field_0x58c->init(field_0x580->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) { + return 0; + } + } + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); + JUT_ASSERT(354, anm != 0); + field_0x588 = new mDoExt_bckAnm(); + if (field_0x588 == NULL || !field_0x588->init(anm, 1, 0, 1.0f, 0, -1,false)) { + return 0; + } -/* 804E2530-804E2578 000810 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12J3DFrameCtrlFv.s" + field_0x588->entry(field_0x580->getModelData()); + field_0x580->calc(); + if (field_0x584 != NULL) { + field_0x584->calc(); + } + calcMtx(); + field_0x590 = new dBgW(); + if (field_0x590 == NULL || field_0x590->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x7ec)) { + return 0; + } + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 804E4A54-804E4A58 000040 0004+00 2/8 0/0 0/0 .rodata @3919 */ -SECTION_RODATA static u8 const lit_3919[4] = { - 0x00, - 0x00, - 0x00, - 0x00, +static char* action_table[18] = { + "WAIT", + "SETANGLE", + "UNLOCK", + "OPEN", + "SETGOAL", + "SETGOAL2", + "CLOSE", + "SMOKE", + "SMOKE_END", + "END", + "END_CHECK", + "CHG_SCENE", + "STOP_CLOSE", + "PLY_DISP", + "PLY_NODISP", + "SETPOS", + "LIGHT_ANM", + "INIT", }; -COMPILER_STRIP_GATE(0x804E4A54, &lit_3919); - -/* 804E4A58-804E4A5C 000044 0004+00 1/1 0/0 0/0 .rodata @3920 */ -SECTION_RODATA static f32 const lit_3920 = 20.0f; -COMPILER_STRIP_GATE(0x804E4A58, &lit_3920); /* 804E2578-804E2754 000858 01DC+00 2/2 0/0 0/0 .text calcMtx__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::calcMtx() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcMtx__11daBdoorL1_cFv.s" +void daBdoorL1_c::calcMtx() { + cXyz cStack_1c(0.0f, 0.0f, field_0x5a8); + cXyz cStack_28(0.0f, 0.0f, 20.0f); + switch(getDoorType()) { + case 0: + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&cStack_1c, &cStack_1c); + mDoMtx_stack_c::transS(current.pos); + if (!checkFront()) { + mDoMtx_stack_c::transM(cStack_1c); + } + mDoMtx_stack_c::YrotM(home.angle.y + 0x7fff); + field_0x580->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::transS(current.pos); + if (checkFront()) { + mDoMtx_stack_c::transM(cStack_1c); + } + mDoMtx_stack_c::YrotM(home.angle.y); + field_0x584->setBaseTRMtx(mDoMtx_stack_c::get()); + if (checkFront()) { + MTXCopy(field_0x580->getBaseTRMtx(), field_0x7ec); + } else { + MTXCopy(field_0x584->getBaseTRMtx(), field_0x7ec); + } + break; + case 1: + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(home.angle.y); + field_0x580->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&cStack_28, &cStack_28); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::transM(cStack_28); + mDoMtx_stack_c::YrotM(home.angle.y); + MTXCopy(mDoMtx_stack_c::get(), field_0x7ec); + break; + default: + JUT_ASSERT(442, 0); + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804E4A5C-804E4A60 000048 0004+00 0/1 0/0 0/0 .rodata @3946 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3946 = 250.0f; -COMPILER_STRIP_GATE(0x804E4A5C, &lit_3946); -#pragma pop - -/* 804E4A60-804E4A64 00004C 0004+00 0/1 0/0 0/0 .rodata @3947 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3947 = -60.0f; -COMPILER_STRIP_GATE(0x804E4A60, &lit_3947); -#pragma pop - -/* 804E4A64-804E4A68 000050 0004+00 0/1 0/0 0/0 .rodata @3948 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3948 = 60.0f; -COMPILER_STRIP_GATE(0x804E4A64, &lit_3948); -#pragma pop /* 804E2754-804E28E4 000A34 0190+00 1/1 0/0 0/0 .text CreateInit__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::CreateInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/CreateInit__11daBdoorL1_cFv.s" +int daBdoorL1_c::CreateInit() { + field_0x7c4 = current.pos; + field_0x7d0 = field_0x7c4; + field_0x5ac.Set(&field_0x7c4, &field_0x7d0, this, 1, &field_0x784, fopAcM_GetSpeed_p(this), + NULL, NULL); + bool rt = dComIfG_Bgsp().Regist(field_0x590, this); + JUT_ASSERT(464, rt == 0); + setAction(ACTION_CLOSE_WAIT); + attention_info.position.y += 250.0f; + eyePos.y += 250.0f; + attention_info.flags = 0x20; + if (checkFront()) { + field_0x5a8 = -60.0f; + } else { + field_0x5a8 = 60.0f; + } + calcMtx(); + field_0x590->Move(); + u8 swBit = door_param2_c::getSwbit(this); + eventInfo.setArchiveName((char*)getArcName()); + if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(this)) == 0) { + field_0x59e = dComIfGp_getEventManager().getEventIdx(this, getDoorEventName(), 0xff); + } else { + field_0x59e = dComIfGp_getEventManager().getEventIdx(this, getDoorEventName2(), 0xff); + } + return 1; } -#pragma pop /* 804E28E4-804E2A98 000BC4 01B4+00 1/1 0/0 0/0 .text create__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::create() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/create__11daBdoorL1_cFv.s" +int daBdoorL1_c::create() { + fopAcM_SetupActor(this, daBdoorL1_c); + int rv = dComIfG_resLoad(&mPhase1, getArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + rv = dComIfG_resLoad(&mPhase3, getAnmArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + rv = dComIfG_resLoad(&mPhase2, getAlwaysArcName()); + if (rv != cPhs_COMPLEATE_e) { + return rv; + } + shape_angle.z = 0; + shape_angle.x = 0; + current.angle.z = 0; + current.angle.x = 0; + s32 roomNo = fopAcM_GetRoomNo(this); + u8 swBit = door_param2_c::getSwbit(this); + if (dComIfGs_isSwitch(swBit, roomNo) == 0 && dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) { + createKey(); + } else { + mKeyHoleId = -1; + } + if (fopAcM_entrySolidHeap(this, CheckCreateHeap, l_heap_size[getNowLevel()]) == 0) { + return cPhs_ERROR_e; + } + if (CreateInit() != 0) { + return cPhs_COMPLEATE_e; + } + return cPhs_ERROR_e; } -#pragma pop - -/* 804E2A98-804E2B08 000D78 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 804E2B08-804E2B78 000DE8 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 804E2B78-804E2BC0 000E58 0048+00 1/1 0/0 0/0 .text getDemoAction__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::getDemoAction() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/getDemoAction__11daBdoorL1_cFv.s" +int daBdoorL1_c::getDemoAction() { + return dComIfGp_evmng_getMyActIdx(field_0x5a0, action_table, 18, 0, 0); } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804E4DF0 = "Timer"; -#pragma pop /* 804E2BC0-804E3180 000EA0 05C0+00 5/3 0/0 0/0 .text demoProc__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::demoProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/demoProc__11daBdoorL1_cFv.s" +void daBdoorL1_c::demoProc() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + int demoAction = getDemoAction(); + cXyz cStack_38; + if (dComIfGp_evmng_getIsAddvance(field_0x5a0)) { + switch (demoAction) { + case 0: + int* puVar3 = dComIfGp_evmng_getMyIntegerP(field_0x5a0, "Timer"); + if (puVar3 == NULL) { + field_0x5a4 = 1; + } else { + field_0x5a4 = *puVar3; + } + break; + case 1: + field_0x59a = 5; + break; + case 2: + unlockInit(); + break; + case 3: + openInit(); + break; + case 4: + calcGoal(&cStack_38, 0); + dComIfGp_evmng_setGoal(&cStack_38); + break; + case 5: + calcGoal(&cStack_38, 1); + dComIfGp_evmng_setGoal(&cStack_38); + break; + case 6: + closeInit(); + break; + case 7: + smokeInit(); + break; + case 11: + field_0x59c = 0; + break; + case 13: + player->offPlayerNoDraw(); + player->offPlayerShadowNoDraw(); + break; + case 14: + player->onPlayerNoDraw(); + player->onPlayerShadowNoDraw(); + break; + case 0xf: + dComIfG_Bgsp().Release(field_0x590); + setPos(); + break; + case 17: + if (getNowLevel() == 8) { + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_ON, 0); + field_0x58c->setFrame(0.0f); + field_0x58c->setPlaySpeed(1.0f); + } + if (dComIfGs_isSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this))) { + field_0x59b = 0; + } else { + field_0x59b = 1; + } + dComIfGs_onSwitch((u8)door_param2_c::getSwbit(this), fopAcM_GetRoomNo(this)); + break; + case 16: + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_ON, 0); + field_0x58c->setPlaySpeed(1.0f); + break; + } + } + switch (demoAction) { + case 0: + if (cLib_calcTimer(&field_0x5a4) == 0) { + dComIfGp_evmng_cutEnd(field_0x5a0); + } + break; + case 1: + if (setAngle() != 0) { + dComIfGp_evmng_cutEnd(field_0x5a0); + } + break; + case 2: + obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId); + if ((keyhole != NULL && keyhole->checkOpenEnd()) || mKeyHoleId == -1) { + dComIfGp_evmng_cutEnd(field_0x5a0); + } + break; + case 3: + if (openProc() != 0) { + openEnd(); + dComIfGp_evmng_cutEnd(field_0x5a0); + } + break; + case 4: + dComIfGp_evmng_cutEnd(field_0x5a0); + break; + case 5: + dComIfGp_evmng_cutEnd(field_0x5a0); + break; + case 6: + if (getNowLevel() == 8) { + if (closeProc() != 0) { + if (field_0x58c->getPlaySpeed() == 0.0f) { + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CREST_OFF, 0); + openEnd(); + } + field_0x58c->setPlaySpeed(-1.0f); + if (field_0x58c->play() != 0) { + dComIfGp_evmng_cutEnd(field_0x5a0); + } + } + } else { + if (closeProc() != 0) { + closeEnd(); + dComIfGp_evmng_cutEnd(field_0x5a0); + } + } + break; + case 7: + dComIfGp_evmng_cutEnd(field_0x5a0); + break; + case 9: + break; + case 10: + setAction(ACTION_END); + dComIfGp_evmng_cutEnd(field_0x5a0); + break; + case 11: + if (field_0x59c == 0) { + daPy_py_c* player = daPy_getPlayerActorClass(); + player->onSceneChangeArea(door_param2_c::getExitNo(this), 0xff, NULL); + } + field_0x59c--; + break; + case 16: + if (field_0x58c->play() != 0) { + dComIfGp_evmng_cutEnd(field_0x5a0); + } + break; + case 17: + if (getNowLevel() == 8) { + if (field_0x58c->play() != 0) { + dComIfGp_evmng_cutEnd(field_0x5a0); + } + } else { + dComIfGp_evmng_cutEnd(field_0x5a0); + } + break; + default: + dComIfGp_evmng_cutEnd(field_0x5a0); + break; + } + for (int i = 0; i < 2; i++) { + if (field_0x7e4[i] != NULL && field_0x580 != NULL) { + field_0x7e4[i]->setGlobalRTMatrix(field_0x580->getAnmMtx(0)); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 804E4A68-804E4A6C 000054 0004+00 2/5 0/0 0/0 .rodata @4238 */ -SECTION_RODATA static f32 const lit_4238 = -1.0f; -COMPILER_STRIP_GATE(0x804E4A68, &lit_4238); /* 804E4A6C-804E4A74 000058 0006+02 0/1 0/0 0/0 .rodata l_lv1_eff$4252 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_lv1_eff[6 + 2 /* padding */] = { - 0x8C, - 0x42, - 0x8C, - 0x43, - 0x8C, - 0x44, - /* padding */ - 0x00, - 0x00, +static u16 const l_lv1_eff[3] = { + 0x8C42, + 0x8C43, + 0x8C44, }; -COMPILER_STRIP_GATE(0x804E4A6C, &l_lv1_eff); -#pragma pop /* 804E4A74-804E4A7C 000060 0006+02 0/1 0/0 0/0 .rodata l_lv2_eff$4253 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_lv2_eff[6 + 2 /* padding */] = { - 0x8C, - 0x45, - 0x8C, - 0x46, - 0x8C, - 0x47, - /* padding */ - 0x00, - 0x00, +static u16 const l_lv2_eff[3] = { + 0x8C45, + 0x8C46, + 0x8C47, }; -COMPILER_STRIP_GATE(0x804E4A74, &l_lv2_eff); -#pragma pop /* 804E4A7C-804E4A80 000068 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_a$4254 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_lv4_eff_a[4] = { - 0x8C, - 0x48, - 0x8C, - 0x49, +static u16 const l_lv4_eff_a[2] = { + 0x8C48, + 0x8C49, }; -COMPILER_STRIP_GATE(0x804E4A7C, &l_lv4_eff_a); -#pragma pop /* 804E4A80-804E4A84 00006C 0004+00 0/1 0/0 0/0 .rodata l_lv4_eff_b$4255 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_lv4_eff_b[4] = { - 0x8C, - 0x4A, - 0x8C, - 0x4B, +static u16 const l_lv4_eff_b[2] = { + 0x8C4A, + 0x8C4B, }; -COMPILER_STRIP_GATE(0x804E4A80, &l_lv4_eff_b); -#pragma pop /* 804E4A84-804E4A88 000070 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_a$4256 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_lv6_eff_a[4] = { - 0x8C, - 0x4C, - 0x8C, - 0x4D, +static u16 const l_lv6_eff_a[2] = { + 0x8C4C, + 0x8C4D, }; -COMPILER_STRIP_GATE(0x804E4A84, &l_lv6_eff_a); -#pragma pop /* 804E4A88-804E4A8C 000074 0004+00 0/1 0/0 0/0 .rodata l_lv6_eff_b$4257 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_lv6_eff_b[4] = { - 0x8C, - 0x4E, - 0x8C, - 0x4F, +static u16 const l_lv6_eff_b[2] = { + 0x8C4E, + 0x8C4F, }; -COMPILER_STRIP_GATE(0x804E4A88, &l_lv6_eff_b); -#pragma pop /* 804E3180-804E357C 001460 03FC+00 1/1 0/0 0/0 .text openInit__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::openInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openInit__11daBdoorL1_cFv.s" +int daBdoorL1_c::openInit() { + u32 i; + if (field_0x590->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x590); + } + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); + JUT_ASSERT(811, anm != 0); + int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(813, rt == 0); + if (field_0x59b != 0) { + field_0x7dc = shape_angle; + ; + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == 3) { + field_0x7dc.y += 0x7fff; + } + switch (getNowLevel()) { + case 1: + for (u32 i = 0; i < 3; i++) { + dComIfGp_particle_set(l_lv1_eff[i], ¤t.pos, &field_0x7dc, &scale, 0xff, 0, -1, + NULL, NULL, NULL); + } + break; + case 2: + for (u32 i = 0; i < 3; i++) { + dComIfGp_particle_set(l_lv2_eff[i], ¤t.pos, &field_0x7dc, &scale, 0xff, 0, -1, + NULL, NULL, NULL); + } + break; + case 4: + for (u32 i = 0; i < 2; i++) { + dComIfGp_particle_set(l_lv4_eff_a[i], ¤t.pos, &field_0x7dc, &scale, 0xff, 0, + -1, NULL, NULL, NULL); + } + u32 i; + for (i = 0; i < 2; i++) { + field_0x7e4[i] = dComIfGp_particle_set(l_lv4_eff_b[i], ¤t.pos, &field_0x7dc, + &scale, 0xff, 0, -1, NULL, NULL, NULL); + if (field_0x7e4[i] != NULL) { + field_0x7e4[i]->becomeImmortalEmitter(); + } + } + break; + case 6: + for (i = 0; i < 2; i++) { + dComIfGp_particle_set(l_lv6_eff_a[i], ¤t.pos, &field_0x7dc, &scale, 0xff, 0, + -1, NULL, NULL, NULL); + } + for (u32 i = 0; i < 2; i++) { + field_0x7e4[i] = dComIfGp_particle_set(l_lv6_eff_b[i], ¤t.pos, &field_0x7dc, + &scale, 0xff, 0, -1, NULL, NULL, NULL); + if (field_0x7e4[i] != NULL) { + field_0x7e4[i]->becomeImmortalEmitter(); + } + } + break; + } + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4A8C-804E4A90 000078 0004+00 0/2 0/0 0/0 .rodata @4466 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4466 = 12.0f; -COMPILER_STRIP_GATE(0x804E4A8C, &lit_4466); -#pragma pop - -/* 804E4A90-804E4A94 00007C 0004+00 0/1 0/0 0/0 .rodata @4467 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4467 = 18.0f; -COMPILER_STRIP_GATE(0x804E4A90, &lit_4467); -#pragma pop /* 804E357C-804E3794 00185C 0218+00 1/1 0/0 0/0 .text openProc__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::openProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openProc__11daBdoorL1_cFv.s" +int daBdoorL1_c::openProc() { + int rv = field_0x588->play(); + f32 frame = field_0x588->getFrame(); + if (frame == 12.0f) { + dComIfGp_getVibration().StartQuake(4, 15, cXyz(0.0f, 1.0f, 0.0f)); + } else if (frame == 18.0f) { + + switch(getNowLevel()) { + case 8: + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_OP, 0); + break; + case 4: + case 6: + case 7: + case 9: + if (field_0x59b != 0) { + mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_OP_FX, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } else { + mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_OP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + break; + default: + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + break; + } + } + + return rv; } -#pragma pop /* 804E3794-804E3850 001A74 00BC+00 1/1 0/0 0/0 .text openEnd__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::openEnd() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/openEnd__11daBdoorL1_cFv.s" +int daBdoorL1_c::openEnd() { + switch(getNowLevel()) { + case 4: + case 6: + case 7: + case 8: + case 9: + break; + default: + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_OPEN_STOP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + break; + } + dComIfGp_getVibration().StopQuake(31); + return 1; } -#pragma pop /* 804E3850-804E3A2C 001B30 01DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::closeInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeInit__11daBdoorL1_cFv.s" +int daBdoorL1_c::closeInit() { + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm()); + JUT_ASSERT(1020, anm != 0); + int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true); + JUT_ASSERT(1022, rt == 0); + switch(getNowLevel()) { + case 8: + fopAcM_seStart(this, Z2SE_OBJ_L8_SHTR_CL, 0); + break; + case 4: + case 6: + case 7: + case 9: + mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_CL, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + break; + default: + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + break; + } + + dComIfGp_getVibration().StartQuake(4, 15, cXyz(0.0f, 1.0f, 0.0f)); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4A94-804E4A98 000080 0004+00 0/1 0/0 0/0 .rodata @4574 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4574 = 11.0f; -COMPILER_STRIP_GATE(0x804E4A94, &lit_4574); -#pragma pop - -/* 804E4A98-804E4A9C 000084 0004+00 0/1 0/0 0/0 .rodata @4575 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4575 = 4.0f; -COMPILER_STRIP_GATE(0x804E4A98, &lit_4575); -#pragma pop - -/* 804E4A9C-804E4AA0 000088 0004+00 0/1 0/0 0/0 .rodata @4576 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4576 = 10.0f; -COMPILER_STRIP_GATE(0x804E4A9C, &lit_4576); -#pragma pop - -/* 804E4AA0-804E4AA4 00008C 0004+00 0/1 0/0 0/0 .rodata @4577 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4577 = 33.0f / 20.0f; -COMPILER_STRIP_GATE(0x804E4AA0, &lit_4577); -#pragma pop /* 804E3A2C-804E3C0C 001D0C 01E0+00 1/1 0/0 0/0 .text closeProc__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::closeProc() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/closeProc__11daBdoorL1_cFv.s" +int daBdoorL1_c::closeProc() { + int rv = field_0x588->play(); + f32 frame = field_0x588->getFrame(); + if (frame == 11.0f) { + dComIfGp_getVibration().StopQuake(31); + } else if (frame == 12.0f) { + ; + dComIfGp_getVibration().StartShock(8, 15, cXyz(0.0f, 1.0f, 0.0f)); + switch(getNowLevel()) { + case 4: + case 6: + case 7: + case 8: + case 9: + break; + default: + mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_CLOSE_STOP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + break; + } + } else if (frame == 4.0f) { + switch(getNowLevel()) { + case 4: + case 6: + case 7: + case 8: + case 9: + field_0x7c4.y -= 10.0f; + field_0x7d0.y += 10.0f; + field_0x5ac.CrrPos(dComIfG_Bgsp()); + cXyz cStack_34(1.65f, 1.65f, 1.65f); + s32 roomNo = fopAcM_GetRoomNo(this); + dComIfGp_particle_setPolyColor(0x8c50, field_0x5ac.m_gnd, ¤t.pos, &tevStr, + &shape_angle, &cStack_34, 0, 0, roomNo, + 0); + break; + } + } + return rv; } -#pragma pop /* 804E3C0C-804E3C14 001EEC 0008+00 1/1 0/0 0/0 .text closeEnd__11daBdoorL1_cFv */ -bool daBdoorL1_c::closeEnd() { - return true; +int daBdoorL1_c::closeEnd() { + return 1; } /* 804E3C14-804E3CCC 001EF4 00B8+00 1/1 0/0 0/0 .text unlockInit__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::unlockInit() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/unlockInit__11daBdoorL1_cFv.s" +int daBdoorL1_c::unlockInit() { + if (mKeyHoleId == -1) { + return 1; + } + obj_keyhole_class* keyhole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId); + if (keyhole != NULL) { + keyhole->setOpen(); + mDoAud_seStart(Z2SE_OBJ_BOSS_LOCK_OPEN, &keyhole->current.pos, 0, 0); + } + field_0x59b = 1; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4AA4-804E4AA8 000090 0004+00 0/2 0/0 0/0 .rodata @4626 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4626 = 100.0f; -COMPILER_STRIP_GATE(0x804E4AA4, &lit_4626); -#pragma pop - -/* 804E4AA8-804E4AAC 000094 0004+00 0/1 0/0 0/0 .rodata @4627 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4627 = -100.0f; -COMPILER_STRIP_GATE(0x804E4AA8, &lit_4627); -#pragma pop - -/* 804E4AAC-804E4AB0 000098 0004+00 0/1 0/0 0/0 .rodata @4628 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4628 = 70.0f; -COMPILER_STRIP_GATE(0x804E4AAC, &lit_4628); -#pragma pop /* 804E3CCC-804E3DE8 001FAC 011C+00 1/1 0/0 0/0 .text setPos__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::setPos() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setPos__11daBdoorL1_cFv.s" +void daBdoorL1_c::setPos() { + cXyz local_1c; + cXyz local_28 = dComIfGp_getPlayer(0)->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-shape_angle.y); + mDoMtx_stack_c::multVec(&local_28, &local_28); + local_1c.x = local_28.x; + if (local_28.x > 100.0f) { + local_1c.x = 100.0f; + } + if (local_1c.x < -100.0f) { + local_1c.x = -100.0f; + } + local_1c.y = 0.0f; + local_1c.z = 70.0f; + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&local_1c, &local_1c); + local_1c += current.pos; + dComIfGp_evmng_setGoal(&local_1c); } -#pragma pop - -/* ############################################################################################## */ -/* 804E4AB0-804E4AB4 00009C 0004+00 0/1 0/0 0/0 .rodata @4655 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4655 = 0.5f; -COMPILER_STRIP_GATE(0x804E4AB0, &lit_4655); -#pragma pop - -/* 804E4AB4-804E4AB8 0000A0 0004+00 0/1 0/0 0/0 .rodata @4656 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4656 = -1000.0f; -COMPILER_STRIP_GATE(0x804E4AB4, &lit_4656); -#pragma pop - -/* 804E4AB8-804E4ABC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4657 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4657 = -240.0f; -COMPILER_STRIP_GATE(0x804E4AB8, &lit_4657); -#pragma pop /* 804E3DE8-804E3F10 0020C8 0128+00 1/1 0/0 0/0 .text calcGoal__11daBdoorL1_cFP4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::calcGoal(cXyz* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/calcGoal__11daBdoorL1_cFP4cXyzi.s" +void daBdoorL1_c::calcGoal(cXyz* param_1, int param_2) { + cXyz local_24 = dComIfGp_getPlayer(0)->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&local_24, &local_24); + local_24.x = local_24.x * 0.5f; + local_24.y = 0.0f; + if (param_2 == 0) { + local_24.z = -1000.0f; + } else { + local_24.z = -240.0f; + } + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::multVec(&local_24, &local_24); + param_1->x = local_24.x; + param_1->y = 0.0f; + param_1->z = local_24.z; } -#pragma pop /* 804E3F10-804E3FF8 0021F0 00E8+00 1/1 0/0 0/0 .text setAngle__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::setAngle() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/setAngle__11daBdoorL1_cFv.s" +int daBdoorL1_c::setAngle() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + cXyz playerPos = player->current.pos; + s16 playerAngle = player->shape_angle.y; + cLib_addCalcAngleS2(&playerAngle, shape_angle.y + 0x7fff, 5, 3000); + if (field_0x59a != 0) { + player->setPlayerPosAndAngle(&playerPos, playerAngle, 0); + field_0x59a--; + } else { + player->setPlayerPosAndAngle(&playerPos, shape_angle.y + 0x7fff, 0); + return 1; + } + return 0; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4ABC-804E4AC0 0000A8 0004+00 1/1 0/0 0/0 .rodata @4706 */ -SECTION_RODATA static f32 const lit_4706 = 50.0f; -COMPILER_STRIP_GATE(0x804E4ABC, &lit_4706); /* 804E3FF8-804E4100 0022D8 0108+00 1/1 0/0 0/0 .text createKey__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::createKey() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/createKey__11daBdoorL1_cFv.s" +int daBdoorL1_c::createKey() { + if (field_0x598 == 0) { + cXyz cStack_24(current.pos); + current.pos = home.pos; + cXyz cStack_30(0.0f, 0.0f, 50.0f); + int actorParams = getNowLevel(); + int flags = ~0xFF; + flags |= actorParams; + mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), flags, + &cStack_30, fopAcM_GetRoomNo(this), 0, + &scale, -1, 0); + current.pos = cStack_24; + if (mKeyHoleId == -1) { + return 0; + } + field_0x598 = 1; + } + return 1; } -#pragma pop /* 804E4100-804E4104 0023E0 0004+00 1/1 0/0 0/0 .text smokeInit__11daBdoorL1_cFv */ void daBdoorL1_c::smokeInit() { @@ -1351,223 +877,223 @@ void daBdoorL1_c::smokeInit() { } /* 804E4104-804E4158 0023E4 0054+00 1/1 0/0 0/0 .text deleteEmitter__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::deleteEmitter() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/deleteEmitter__11daBdoorL1_cFv.s" +void daBdoorL1_c::deleteEmitter() { + for (int i = 0; i < 2; i++) { + if (field_0x7e4[i] != NULL) { + field_0x7e4[i]->becomeInvalidEmitter(); + field_0x7e4[i]->quitImmortalEmitter(); + field_0x7e4[i] = NULL; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 804E4AC0-804E4AC4 0000AC 0004+00 0/1 0/0 0/0 .rodata @4825 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4825 = 200.0f; -COMPILER_STRIP_GATE(0x804E4AC0, &lit_4825); -#pragma pop - -/* 804E4AC4-804E4ACC 0000B0 0004+04 0/1 0/0 0/0 .rodata @4826 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4826[1 + 1 /* padding */] = { - 130.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x804E4AC4, &lit_4826); -#pragma pop - -/* 804E4ACC-804E4AD4 0000B8 0008+00 0/1 0/0 0/0 .rodata @4828 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4828[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x804E4ACC, &lit_4828); -#pragma pop /* 804E4158-804E432C 002438 01D4+00 1/1 0/0 0/0 .text checkArea__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::checkArea() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkArea__11daBdoorL1_cFv.s" +int daBdoorL1_c::checkArea() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz local_48; + cXyz local_54; + // Fake Match. Not the first time this solves this. Something is up with the check wolf (maybe only in REL). + if (dComIfGp_getLinkPlayer()->mNoResetFlg1 & daPy_py_c::FLG1_IS_WOLF) { + local_48 = player->attention_info.position - current.pos; + local_54 = player->current.pos - current.pos; + } else { + local_48 = player->current.pos - current.pos; + } + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&local_48, &local_48); + if (fabsf(local_48.x) > 200.0f) { + return 0; + } + if (dComIfGp_getLinkPlayer()->mNoResetFlg1 & daPy_py_c::FLG1_IS_WOLF) { + mDoMtx_stack_c::multVec(&local_54, &local_54); + if (fabsf(local_54.x) > 130.0f) { + return 0; + } + } + if (fabsf(local_48.z) > 100.0f) { + return 0; + } + if ((s16)fabs(current.angle.y - 0x7fff - player->current.angle.y) <= 0x4000) { + return 1; + } else { + return 0; + } } -#pragma pop /* 804E432C-804E43A0 00260C 0074+00 3/3 0/0 0/0 .text checkFront__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::checkFront() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s" +int daBdoorL1_c::checkFront() { + if (strcmp(dComIfGp_getStartStageName(), "D_MN08A") == 0) { + if (dComIfGp_roomControl_getStayNo() == 10) { + return 0; + } + } else if (dComIfGp_roomControl_getStayNo() == 50) { + return 0; + } + return 1; } -#pragma pop /* 804E43A0-804E4414 002680 0074+00 1/1 0/0 0/0 .text checkOpen__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::checkOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/checkOpen__11daBdoorL1_cFv.s" +int daBdoorL1_c::checkOpen() { + if (!dComIfGs_isDungeonItemBossKey()) { + return 0; + } + if (!checkFront()) { + return 0; + } + if (checkArea()) { + return 1; + } else { + return 0; + } } -#pragma pop /* 804E4414-804E441C 0026F4 0008+00 1/0 0/0 0/0 .text actionWait__11daBdoorL1_cFv */ -bool daBdoorL1_c::actionWait() { - return true; +int daBdoorL1_c::actionWait() { + return 1; } /* 804E441C-804E44B4 0026FC 0098+00 1/0 0/0 0/0 .text actionCloseWait__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::actionCloseWait() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionCloseWait__11daBdoorL1_cFv.s" +int daBdoorL1_c::actionCloseWait() { + if (eventInfo.i_checkCommandDoor()) { + field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + demoProc(); + setAction(ACTION_OPEN); + } else if (checkOpen()) { + eventInfo.setEventId(field_0x59e); + eventInfo.setMapToolId(0xff); + eventInfo.i_onCondition(4); + } + return 1; } -#pragma pop /* 804E44B4-804E44EC 002794 0038+00 1/0 0/0 0/0 .text actionOpen__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::actionOpen() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionOpen__11daBdoorL1_cFv.s" +int daBdoorL1_c::actionOpen() { + demoProc(); + dMeter2Info_onGameStatus(2); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 804E4AD4-804E4AD8 0000C0 0004+00 0/1 0/0 0/0 .rodata @4930 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4930 = 180.0f; -COMPILER_STRIP_GATE(0x804E4AD4, &lit_4930); -#pragma pop - -/* 804E4AD8-804E4ADC 0000C4 0004+00 0/1 0/0 0/0 .rodata @4931 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4931 = -180.0f; -COMPILER_STRIP_GATE(0x804E4AD8, &lit_4931); -#pragma pop /* 804E44EC-804E464C 0027CC 0160+00 1/0 0/0 0/0 .text actionEnd__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::actionEnd() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/actionEnd__11daBdoorL1_cFv.s" +int daBdoorL1_c::actionEnd() { + if (!field_0x590->ChkUsed()) { + bool rt = dComIfG_Bgsp().Regist(field_0x590, this); + JUT_ASSERT(1583, rt != 0); + } + setAction(0); + cXyz local_70(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y)); + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz cStack_7c = player->current.pos - current.pos; + f32 fVar1; + f32 dVar12 = cStack_7c.inprodXZ(local_70); + fVar1 = dVar12 < 0.0f ? 180.0f : -180.0f; + cXyz cStack_88(current.pos.x - fVar1 * local_70.x, current.pos.y, + current.pos.z - fVar1 * local_70.z); + s32 roomNo = fopAcM_GetRoomNo(player); + s16 angle; + if (dVar12 > 0.0f) { + angle = current.angle.y; + } else { + angle = current.angle.y + 0x8000; + } + dComIfGs_setRestartRoom(cStack_88, angle, roomNo); + return 1; } -#pragma pop /* 804E464C-804E476C 00292C 0120+00 1/1 0/0 0/0 .text execute__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::execute() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/execute__11daBdoorL1_cFv.s" +int daBdoorL1_c::execute() { + static actionFunc l_action[4] = {&daBdoorL1_c::actionWait, &daBdoorL1_c::actionCloseWait, &daBdoorL1_c::actionOpen, &daBdoorL1_c::actionEnd}; + if (fopAcM_checkStatus(this, 0x1000)) { + field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + dMeter2Info_onGameStatus(2); + demoProc(); + } else { + (this->*(((actionFunc*)l_action)[mAction]))(); + } + return 1; } -#pragma pop /* 804E476C-804E48BC 002A4C 0150+00 1/1 0/0 0/0 .text draw__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::draw() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/draw__11daBdoorL1_cFv.s" +int daBdoorL1_c::draw() { + g_env_light.settingTevStruct( 0x10, ¤t.pos, &tevStr); + dComIfGd_setListBG(); + if (getNowLevel() == 8 && field_0x58c != NULL) { + field_0x58c->entry(field_0x580->getModelData()); + } + g_env_light.setLightTevColorType_MAJI(field_0x580, &tevStr); + field_0x588->entry(field_0x580->getModelData()); + mDoExt_modelUpdateDL(field_0x580); + mDoExt_bckAnmRemove(field_0x580->getModelData()); + if (field_0x584 != NULL) { + g_env_light.setLightTevColorType_MAJI( + field_0x584, + &tevStr); + field_0x588->entry(field_0x584->getModelData()); + mDoExt_modelUpdateDL(field_0x584); + mDoExt_bckAnmRemove(field_0x584->getModelData()); + } + dComIfGd_setList(); + return 1; } -#pragma pop /* 804E48BC-804E4958 002B9C 009C+00 1/1 0/0 0/0 .text Delete__11daBdoorL1_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBdoorL1_c::Delete() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/Delete__11daBdoorL1_cFv.s" +int daBdoorL1_c::Delete() { + deleteEmitter(); + if (heap != NULL && field_0x590->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x590); + } + dComIfG_resDelete(&mPhase1, getArcName()); + dComIfG_resDelete(&mPhase2, getAlwaysArcName()); + dComIfG_resDelete(&mPhase3, getAnmArcName()); + return 1; } -#pragma pop /* 804E4958-804E4978 002C38 0020+00 1/0 0/0 0/0 .text daBdoorL1_Draw__FP11daBdoorL1_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL1_Draw(daBdoorL1_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Draw__FP11daBdoorL1_c.s" +static int daBdoorL1_Draw(daBdoorL1_c* i_this) { + return i_this->draw(); } -#pragma pop /* 804E4978-804E499C 002C58 0024+00 1/0 0/0 0/0 .text daBdoorL1_Execute__FP11daBdoorL1_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL1_Execute(daBdoorL1_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Execute__FP11daBdoorL1_c.s" +static int daBdoorL1_Execute(daBdoorL1_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 804E499C-804E49C0 002C7C 0024+00 1/0 0/0 0/0 .text daBdoorL1_Delete__FP11daBdoorL1_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL1_Delete(daBdoorL1_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Delete__FP11daBdoorL1_c.s" +static int daBdoorL1_Delete(daBdoorL1_c* i_this) { + i_this->Delete(); + return 1; } -#pragma pop /* 804E49C0-804E49E0 002CA0 0020+00 1/0 0/0 0/0 .text daBdoorL1_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBdoorL1_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/daBdoorL1_Create__FP10fopAc_ac_c.s" +static int daBdoorL1_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 804E49E0-804E49FC 002CC0 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_804E49E0(void* _this, int* param_0) { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49E0.s" -} -#pragma pop +/* 804E5018-804E5038 -00001 0020+00 1/0 0/0 0/0 .data l_daBdoorL1_Method */ +static actor_method_class l_daBdoorL1_Method = { + (process_method_func)daBdoorL1_Create, + (process_method_func)daBdoorL1_Delete, + (process_method_func)daBdoorL1_Execute, + (process_method_func)NULL, + (process_method_func)daBdoorL1_Draw, +}; -/* 804E49FC-804E4A04 002CDC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_804E49FC() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E49FC.s" -} -#pragma pop - -/* 804E4A04-804E4A0C 002CE4 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_804E4A04() { - nofralloc -#include "asm/rel/d/a/door/d_a_door_bossL1/d_a_door_bossL1/func_804E4A04.s" -} -#pragma pop - -/* 804E4ADC-804E4ADC 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 804E5038-804E5068 -00001 0030+00 0/0 0/0 1/0 .data g_profile_L1BOSS_DOOR */ +extern actor_process_profile_definition g_profile_L1BOSS_DOOR = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_L1BOSS_DOOR, + &g_fpcLf_Method.mBase, + sizeof(daBdoorL1_c), + 0, + 0, + &g_fopAc_Method.base, + 0x12A, + &l_daBdoorL1_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_6_e, +}; diff --git a/rel/d/a/door/d_a_door_bossL1/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_bossL1/unknown_translation_unit_bss.cpp deleted file mode 100644 index 2e349c2fa6..0000000000 --- a/rel/d/a/door/d_a_door_bossL1/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/door/d_a_door_bossL1/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_804E50A8[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 804E50A8-804E50AC 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_804E50A8[4]; -u8 data_804E50A8[4]; diff --git a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp index a6026d9c31..af9867105a 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp @@ -11,44 +11,11 @@ // Types: // -struct request_of_phase_process_class {}; - -struct obj_keyhole_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorf { - /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); - /* 800105C8 */ void play(Vec*, u32, s8); - /* 80010680 */ void entryDL(); - /* 800106AC */ void modelCalc(); -}; - struct kh_chain_s { /* 80C436A0 */ ~kh_chain_s(); /* 80C437A4 */ kh_chain_s(); }; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - struct fopAcM_gc_c { /* 8001DCBC */ void gndCheck(cXyz const*); @@ -68,21 +35,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - struct dRes_info_c {}; struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct J3DModel {}; - struct dComIfG_play_c { /* 8002CAF0 */ void addSimpleModel(J3DModelData*, int, u8); /* 8002CB30 */ void removeSimpleModel(J3DModelData*, int); @@ -91,11 +49,6 @@ struct dComIfG_play_c { struct dCcU_AtInfo {}; -struct csXyz { - /* 80C434AC */ ~csXyz(); - /* 80C438FC */ csXyz(); -}; - struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; @@ -106,20 +59,6 @@ struct Z2Creature { /* 802C06F4 */ void stopAnime(); }; -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 8032842C */ void checkPass(f32); -}; - // // Forward References: // @@ -222,8 +161,6 @@ extern "C" void stopAnime__10Z2CreatureFv(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_16(); @@ -242,8 +179,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; @@ -251,8 +186,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; @@ -1079,7 +1012,8 @@ static asm void daObj_Keyhole_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +asm void __dt__5csXyzFv() { +//asm csXyz::~csXyz() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole/__dt__5csXyzFv.s" } @@ -1161,7 +1095,7 @@ extern "C" asm void __ct__8dCcD_SphFv() { #pragma pop /* 80C438FC-80C43900 00279C 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +void __ct__5csXyzFv() { /* empty function */ }