From 5d87d0cfa281ad568931cac540a2ced7e4237832 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sun, 5 May 2024 19:13:52 +0300 Subject: [PATCH] d_a_obj_bmWindow OK (#2148) --- .../CreateHeap__12daBmWindow_cFv.s | 28 - .../Delete__12daBmWindow_cFv.s | 13 - .../d_a_obj_bmWindow/Draw__12daBmWindow_cFv.s | 46 - .../Execute__12daBmWindow_cFPPA3_A4_f.s | 23 - .../__ct__16daBmWindow_HIO_cFv.s | 41 - .../d_a_obj_bmWindow/__ct__8dCcD_CylFv.s | 34 - .../d_a_obj_bmWindow/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_obj_bmWindow/__dt__10dCcD_GSttsFv.s | 26 - .../__dt__14mDoHIO_entry_cFv.s | 20 - .../__dt__16daBmWindow_HIO_cFv.s | 30 - .../__dt__18fOpAcm_HIO_entry_cFv.s | 26 - .../d_a_obj_bmWindow/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_bmWindow/__dt__8cM3dGCylFv.s | 20 - .../d_a_obj_bmWindow/__dt__8dCcD_CylFv.s | 55 - .../__sinit_d_a_obj_bmWindow_cpp.s | 30 - ...daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz.s | 68 - .../create__12daBmWindow_cFv.s | 150 --- .../daBmWindow_Create__FP10fopAc_ac_c.s | 9 - .../daBmWindow_Delete__FP12daBmWindow_c.s | 9 - .../daBmWindow_Draw__FP12daBmWindow_c.s | 12 - .../daBmWindow_Execute__FP12daBmWindow_c.s | 9 - .../init_modeBreakEff__12daBmWindow_cFv.s | 55 - .../init_modeBreak__12daBmWindow_cFv.s | 77 -- .../init_modeWait__12daBmWindow_cFv.s | 4 - .../modeBreakEff__12daBmWindow_cFv.s | 9 - .../modeBreak__12daBmWindow_cFv.s | 9 - .../modeWait__12daBmWindow_cFv.s | 305 ----- .../setBaseMtx__12daBmWindow_cFv.s | 45 - .../setBreakEffect__12daBmWindow_cFi.s | 97 -- .../windowProc__12daBmWindow_cFv.s | 133 -- include/d/a/d_a_player.h | 3 +- include/d/s/d_s_play.h | 6 +- include/f_op/f_op_actor_mng.h | 12 + .../a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h | 83 ++ .../obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp | 1151 +++++------------ src/d/a/d_a_alink_wolf.inc | 2 +- src/d/a/d_a_npc_cd.cpp | 13 +- 37 files changed, 401 insertions(+), 2292 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/CreateHeap__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Delete__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Draw__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Execute__12daBmWindow_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__16daBmWindow_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__8dCcD_CylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__14mDoHIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__16daBmWindow_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__18fOpAcm_HIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8dCcD_CylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__sinit_d_a_obj_bmWindow_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/create__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Delete__FP12daBmWindow_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Draw__FP12daBmWindow_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Execute__FP12daBmWindow_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreakEff__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreak__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeWait__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreakEff__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreak__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeWait__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBaseMtx__12daBmWindow_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBreakEffect__12daBmWindow_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/windowProc__12daBmWindow_cFv.s diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/CreateHeap__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/CreateHeap__12daBmWindow_cFv.s deleted file mode 100644 index 34a30fd42af..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/CreateHeap__12daBmWindow_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80BB8400: -/* 80BB8400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB8404 7C 08 02 A6 */ mflr r0 -/* 80BB8408 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB840C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB8410 7C 7F 1B 78 */ mr r31, r3 -/* 80BB8414 3C 60 80 BC */ lis r3, d_a_obj_bmWindow__stringBase0@ha /* 0x80BB9800@ha */ -/* 80BB8418 38 63 98 00 */ addi r3, r3, d_a_obj_bmWindow__stringBase0@l /* 0x80BB9800@l */ -/* 80BB841C 38 80 00 04 */ li r4, 4 -/* 80BB8420 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB8424 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB8428 3C A5 00 02 */ addis r5, r5, 2 -/* 80BB842C 38 C0 00 80 */ li r6, 0x80 -/* 80BB8430 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BB8434 4B 48 3E B9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BB8438 38 80 00 00 */ li r4, 0 -/* 80BB843C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80BB8440 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80BB8444 4B 45 C8 11 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BB8448 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80BB844C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BB8450 30 03 FF FF */ addic r0, r3, -1 -/* 80BB8454 7C 60 19 10 */ subfe r3, r0, r3 -/* 80BB8458 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB845C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB8460 7C 08 03 A6 */ mtlr r0 -/* 80BB8464 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB8468 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Delete__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Delete__12daBmWindow_cFv.s deleted file mode 100644 index 9ea7acd9646..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Delete__12daBmWindow_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80BB9548: -/* 80BB9548 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB954C 7C 08 02 A6 */ mflr r0 -/* 80BB9550 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB9554 3C 80 80 BC */ lis r4, d_a_obj_bmWindow__stringBase0@ha /* 0x80BB9800@ha */ -/* 80BB9558 38 84 98 00 */ addi r4, r4, d_a_obj_bmWindow__stringBase0@l /* 0x80BB9800@l */ -/* 80BB955C 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80BB9560 4B 47 3A A9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BB9564 38 60 00 01 */ li r3, 1 -/* 80BB9568 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB956C 7C 08 03 A6 */ mtlr r0 -/* 80BB9570 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB9574 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Draw__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Draw__12daBmWindow_cFv.s deleted file mode 100644 index 84307722c92..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Draw__12daBmWindow_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80BB9494: -/* 80BB9494 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB9498 7C 08 02 A6 */ mflr r0 -/* 80BB949C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB94A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB94A4 93 C1 00 08 */ stw r30, 8(r1) -/* 80BB94A8 7C 7E 1B 78 */ mr r30, r3 -/* 80BB94AC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BB94B0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BB94B4 38 80 00 10 */ li r4, 0x10 -/* 80BB94B8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BB94BC 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BB94C0 4B 5E A3 05 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BB94C4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BB94C8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BB94CC 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80BB94D0 80 84 00 04 */ lwz r4, 4(r4) -/* 80BB94D4 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BB94D8 4B 5E B8 C9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BB94DC 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BB94E0 80 83 00 04 */ lwz r4, 4(r3) -/* 80BB94E4 7F C3 F3 78 */ mr r3, r30 -/* 80BB94E8 4B 46 3F 45 */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData -/* 80BB94EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB94F0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB94F4 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80BB94F8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80BB94FC 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80BB9500 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BB9504 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80BB9508 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BB950C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BB9510 4B 45 47 B5 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BB9514 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB9518 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB951C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80BB9520 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BB9524 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80BB9528 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BB952C 38 60 00 01 */ li r3, 1 -/* 80BB9530 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB9534 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BB9538 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB953C 7C 08 03 A6 */ mtlr r0 -/* 80BB9540 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB9544 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Execute__12daBmWindow_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Execute__12daBmWindow_cFPPA3_A4_f.s deleted file mode 100644 index 5fcdc08d83e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Execute__12daBmWindow_cFPPA3_A4_f.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BB88D8: -/* 80BB88D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB88DC 7C 08 02 A6 */ mflr r0 -/* 80BB88E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB88E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB88E8 93 C1 00 08 */ stw r30, 8(r1) -/* 80BB88EC 7C 7E 1B 78 */ mr r30, r3 -/* 80BB88F0 7C 9F 23 78 */ mr r31, r4 -/* 80BB88F4 48 00 00 3D */ bl windowProc__12daBmWindow_cFv -/* 80BB88F8 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BB88FC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BB8900 90 1F 00 00 */ stw r0, 0(r31) -/* 80BB8904 38 7E 05 CC */ addi r3, r30, 0x5cc -/* 80BB8908 4B 4C AF 29 */ bl Move__10dCcD_GSttsFv -/* 80BB890C 7F C3 F3 78 */ mr r3, r30 -/* 80BB8910 4B FF FA 41 */ bl setBaseMtx__12daBmWindow_cFv -/* 80BB8914 38 60 00 01 */ li r3, 1 -/* 80BB8918 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB891C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BB8920 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB8924 7C 08 03 A6 */ mtlr r0 -/* 80BB8928 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB892C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__16daBmWindow_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__16daBmWindow_HIO_cFv.s deleted file mode 100644 index 5643a2d1886..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__16daBmWindow_HIO_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80BB820C: -/* 80BB820C 3C 80 80 BC */ lis r4, lit_3653@ha /* 0x80BB973C@ha */ -/* 80BB8210 38 A4 97 3C */ addi r5, r4, lit_3653@l /* 0x80BB973C@l */ -/* 80BB8214 3C 80 80 BC */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80BB9978@ha */ -/* 80BB8218 38 04 99 78 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80BB9978@l */ -/* 80BB821C 90 03 00 00 */ stw r0, 0(r3) -/* 80BB8220 3C 80 80 BC */ lis r4, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80BB996C@ha */ -/* 80BB8224 38 04 99 6C */ addi r0, r4, __vt__18fOpAcm_HIO_entry_c@l /* 0x80BB996C@l */ -/* 80BB8228 90 03 00 00 */ stw r0, 0(r3) -/* 80BB822C 3C 80 80 BC */ lis r4, __vt__16daBmWindow_HIO_c@ha /* 0x80BB9960@ha */ -/* 80BB8230 38 04 99 60 */ addi r0, r4, __vt__16daBmWindow_HIO_c@l /* 0x80BB9960@l */ -/* 80BB8234 90 03 00 00 */ stw r0, 0(r3) -/* 80BB8238 38 00 00 0A */ li r0, 0xa -/* 80BB823C 98 03 00 04 */ stb r0, 4(r3) -/* 80BB8240 38 80 00 03 */ li r4, 3 -/* 80BB8244 98 83 00 05 */ stb r4, 5(r3) -/* 80BB8248 C0 65 00 00 */ lfs f3, 0(r5) -/* 80BB824C D0 63 00 0C */ stfs f3, 0xc(r3) -/* 80BB8250 C0 45 00 04 */ lfs f2, 4(r5) -/* 80BB8254 D0 43 00 10 */ stfs f2, 0x10(r3) -/* 80BB8258 C0 05 00 08 */ lfs f0, 8(r5) -/* 80BB825C D0 03 00 08 */ stfs f0, 8(r3) -/* 80BB8260 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 80BB8264 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80BB8268 C0 25 00 10 */ lfs f1, 0x10(r5) -/* 80BB826C D0 23 00 18 */ stfs f1, 0x18(r3) -/* 80BB8270 C0 05 00 14 */ lfs f0, 0x14(r5) -/* 80BB8274 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80BB8278 D0 63 00 20 */ stfs f3, 0x20(r3) -/* 80BB827C D0 43 00 24 */ stfs f2, 0x24(r3) -/* 80BB8280 C0 05 00 18 */ lfs f0, 0x18(r5) -/* 80BB8284 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80BB8288 C0 05 00 1C */ lfs f0, 0x1c(r5) -/* 80BB828C D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80BB8290 D0 23 00 30 */ stfs f1, 0x30(r3) -/* 80BB8294 C0 05 00 20 */ lfs f0, 0x20(r5) -/* 80BB8298 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 80BB829C 38 00 00 3C */ li r0, 0x3c -/* 80BB82A0 98 03 00 38 */ stb r0, 0x38(r3) -/* 80BB82A4 98 83 00 39 */ stb r4, 0x39(r3) -/* 80BB82A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__8dCcD_CylFv.s deleted file mode 100644 index 98b37a9a4de..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__8dCcD_CylFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80BB8768: -/* 80BB8768 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB876C 7C 08 02 A6 */ mflr r0 -/* 80BB8770 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB8774 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB8778 7C 7F 1B 78 */ mr r31, r3 -/* 80BB877C 4B 4C B2 AD */ bl __ct__12dCcD_GObjInfFv -/* 80BB8780 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BB8784 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BB8788 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80BB878C 3C 60 80 BC */ lis r3, __vt__8cM3dGAab@ha /* 0x80BB9920@ha */ -/* 80BB8790 38 03 99 20 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BB9920@l */ -/* 80BB8794 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80BB8798 3C 60 80 BC */ lis r3, __vt__8cM3dGCyl@ha /* 0x80BB992C@ha */ -/* 80BB879C 38 03 99 2C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80BB992C@l */ -/* 80BB87A0 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80BB87A4 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80BB87A8 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80BB87AC 90 7F 01 20 */ stw r3, 0x120(r31) -/* 80BB87B0 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BB87B4 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80BB87B8 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80BB87BC 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80BB87C0 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 80BB87C4 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BB87C8 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80BB87CC 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BB87D0 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80BB87D4 7F E3 FB 78 */ mr r3, r31 -/* 80BB87D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB87DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB87E0 7C 08 03 A6 */ mtlr r0 -/* 80BB87E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB87E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 4e29a687554..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BB9604: -/* 80BB9604 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB9608 7C 08 02 A6 */ mflr r0 -/* 80BB960C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB9610 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB9614 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BB9618 41 82 00 1C */ beq lbl_80BB9634 -/* 80BB961C 3C A0 80 BC */ lis r5, __vt__10cCcD_GStts@ha /* 0x80BB9908@ha */ -/* 80BB9620 38 05 99 08 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80BB9908@l */ -/* 80BB9624 90 1F 00 00 */ stw r0, 0(r31) -/* 80BB9628 7C 80 07 35 */ extsh. r0, r4 -/* 80BB962C 40 81 00 08 */ ble lbl_80BB9634 -/* 80BB9630 4B 71 57 0D */ bl __dl__FPv -lbl_80BB9634: -/* 80BB9634 7F E3 FB 78 */ mr r3, r31 -/* 80BB9638 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB963C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB9640 7C 08 03 A6 */ mtlr r0 -/* 80BB9644 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB9648 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index b9e64226afc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BB887C: -/* 80BB887C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB8880 7C 08 02 A6 */ mflr r0 -/* 80BB8884 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB8888 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB888C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BB8890 41 82 00 30 */ beq lbl_80BB88C0 -/* 80BB8894 3C 60 80 BC */ lis r3, __vt__10dCcD_GStts@ha /* 0x80BB9914@ha */ -/* 80BB8898 38 03 99 14 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80BB9914@l */ -/* 80BB889C 90 1F 00 00 */ stw r0, 0(r31) -/* 80BB88A0 41 82 00 10 */ beq lbl_80BB88B0 -/* 80BB88A4 3C 60 80 BC */ lis r3, __vt__10cCcD_GStts@ha /* 0x80BB9908@ha */ -/* 80BB88A8 38 03 99 08 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80BB9908@l */ -/* 80BB88AC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80BB88B0: -/* 80BB88B0 7C 80 07 35 */ extsh. r0, r4 -/* 80BB88B4 40 81 00 0C */ ble lbl_80BB88C0 -/* 80BB88B8 7F E3 FB 78 */ mr r3, r31 -/* 80BB88BC 4B 71 64 81 */ bl __dl__FPv -lbl_80BB88C0: -/* 80BB88C0 7F E3 FB 78 */ mr r3, r31 -/* 80BB88C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB88C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB88CC 7C 08 03 A6 */ mtlr r0 -/* 80BB88D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB88D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 7bee81f1735..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BB8308: -/* 80BB8308 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB830C 7C 08 02 A6 */ mflr r0 -/* 80BB8310 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB8314 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB8318 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BB831C 41 82 00 1C */ beq lbl_80BB8338 -/* 80BB8320 3C A0 80 BC */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80BB9978@ha */ -/* 80BB8324 38 05 99 78 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80BB9978@l */ -/* 80BB8328 90 1F 00 00 */ stw r0, 0(r31) -/* 80BB832C 7C 80 07 35 */ extsh. r0, r4 -/* 80BB8330 40 81 00 08 */ ble lbl_80BB8338 -/* 80BB8334 4B 71 6A 09 */ bl __dl__FPv -lbl_80BB8338: -/* 80BB8338 7F E3 FB 78 */ mr r3, r31 -/* 80BB833C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB8340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB8344 7C 08 03 A6 */ mtlr r0 -/* 80BB8348 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB834C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__16daBmWindow_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__16daBmWindow_HIO_cFv.s deleted file mode 100644 index bee586d4f60..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__16daBmWindow_HIO_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BB964C: -/* 80BB964C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB9650 7C 08 02 A6 */ mflr r0 -/* 80BB9654 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB9658 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB965C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BB9660 41 82 00 40 */ beq lbl_80BB96A0 -/* 80BB9664 3C 60 80 BC */ lis r3, __vt__16daBmWindow_HIO_c@ha /* 0x80BB9960@ha */ -/* 80BB9668 38 03 99 60 */ addi r0, r3, __vt__16daBmWindow_HIO_c@l /* 0x80BB9960@l */ -/* 80BB966C 90 1F 00 00 */ stw r0, 0(r31) -/* 80BB9670 41 82 00 20 */ beq lbl_80BB9690 -/* 80BB9674 3C 60 80 BC */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80BB996C@ha */ -/* 80BB9678 38 03 99 6C */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80BB996C@l */ -/* 80BB967C 90 1F 00 00 */ stw r0, 0(r31) -/* 80BB9680 41 82 00 10 */ beq lbl_80BB9690 -/* 80BB9684 3C 60 80 BC */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80BB9978@ha */ -/* 80BB9688 38 03 99 78 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80BB9978@l */ -/* 80BB968C 90 1F 00 00 */ stw r0, 0(r31) -lbl_80BB9690: -/* 80BB9690 7C 80 07 35 */ extsh. r0, r4 -/* 80BB9694 40 81 00 0C */ ble lbl_80BB96A0 -/* 80BB9698 7F E3 FB 78 */ mr r3, r31 -/* 80BB969C 4B 71 56 A1 */ bl __dl__FPv -lbl_80BB96A0: -/* 80BB96A0 7F E3 FB 78 */ mr r3, r31 -/* 80BB96A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB96A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB96AC 7C 08 03 A6 */ mtlr r0 -/* 80BB96B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB96B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__18fOpAcm_HIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__18fOpAcm_HIO_entry_cFv.s deleted file mode 100644 index 880b785c195..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__18fOpAcm_HIO_entry_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BB82AC: -/* 80BB82AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB82B0 7C 08 02 A6 */ mflr r0 -/* 80BB82B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB82B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB82BC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BB82C0 41 82 00 30 */ beq lbl_80BB82F0 -/* 80BB82C4 3C 60 80 BC */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80BB996C@ha */ -/* 80BB82C8 38 03 99 6C */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80BB996C@l */ -/* 80BB82CC 90 1F 00 00 */ stw r0, 0(r31) -/* 80BB82D0 41 82 00 10 */ beq lbl_80BB82E0 -/* 80BB82D4 3C 60 80 BC */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80BB9978@ha */ -/* 80BB82D8 38 03 99 78 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80BB9978@l */ -/* 80BB82DC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80BB82E0: -/* 80BB82E0 7C 80 07 35 */ extsh. r0, r4 -/* 80BB82E4 40 81 00 0C */ ble lbl_80BB82F0 -/* 80BB82E8 7F E3 FB 78 */ mr r3, r31 -/* 80BB82EC 4B 71 6A 51 */ bl __dl__FPv -lbl_80BB82F0: -/* 80BB82F0 7F E3 FB 78 */ mr r3, r31 -/* 80BB82F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB82F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB82FC 7C 08 03 A6 */ mtlr r0 -/* 80BB8300 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB8304 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGAabFv.s deleted file mode 100644 index 651da9041bd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BB8834: -/* 80BB8834 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB8838 7C 08 02 A6 */ mflr r0 -/* 80BB883C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB8840 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB8844 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BB8848 41 82 00 1C */ beq lbl_80BB8864 -/* 80BB884C 3C A0 80 BC */ lis r5, __vt__8cM3dGAab@ha /* 0x80BB9920@ha */ -/* 80BB8850 38 05 99 20 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80BB9920@l */ -/* 80BB8854 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80BB8858 7C 80 07 35 */ extsh. r0, r4 -/* 80BB885C 40 81 00 08 */ ble lbl_80BB8864 -/* 80BB8860 4B 71 64 DD */ bl __dl__FPv -lbl_80BB8864: -/* 80BB8864 7F E3 FB 78 */ mr r3, r31 -/* 80BB8868 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB886C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB8870 7C 08 03 A6 */ mtlr r0 -/* 80BB8874 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB8878 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGCylFv.s deleted file mode 100644 index 61582b49abf..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BB87EC: -/* 80BB87EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB87F0 7C 08 02 A6 */ mflr r0 -/* 80BB87F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB87F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB87FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BB8800 41 82 00 1C */ beq lbl_80BB881C -/* 80BB8804 3C A0 80 BC */ lis r5, __vt__8cM3dGCyl@ha /* 0x80BB992C@ha */ -/* 80BB8808 38 05 99 2C */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80BB992C@l */ -/* 80BB880C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80BB8810 7C 80 07 35 */ extsh. r0, r4 -/* 80BB8814 40 81 00 08 */ ble lbl_80BB881C -/* 80BB8818 4B 71 65 25 */ bl __dl__FPv -lbl_80BB881C: -/* 80BB881C 7F E3 FB 78 */ mr r3, r31 -/* 80BB8820 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB8824 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB8828 7C 08 03 A6 */ mtlr r0 -/* 80BB882C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB8830 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8dCcD_CylFv.s deleted file mode 100644 index 09fdadb86a6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8dCcD_CylFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80BB869C: -/* 80BB869C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB86A0 7C 08 02 A6 */ mflr r0 -/* 80BB86A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB86A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB86AC 93 C1 00 08 */ stw r30, 8(r1) -/* 80BB86B0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BB86B4 7C 9F 23 78 */ mr r31, r4 -/* 80BB86B8 41 82 00 94 */ beq lbl_80BB874C -/* 80BB86BC 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80BB86C0 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80BB86C4 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80BB86C8 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BB86CC 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80BB86D0 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BB86D4 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80BB86D8 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BB86DC 41 82 00 54 */ beq lbl_80BB8730 -/* 80BB86E0 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80BB86E4 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80BB86E8 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80BB86EC 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BB86F0 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80BB86F4 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 80BB86F8 41 82 00 10 */ beq lbl_80BB8708 -/* 80BB86FC 3C 60 80 BC */ lis r3, __vt__8cM3dGCyl@ha /* 0x80BB992C@ha */ -/* 80BB8700 38 03 99 2C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80BB992C@l */ -/* 80BB8704 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80BB8708: -/* 80BB8708 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BB870C 41 82 00 24 */ beq lbl_80BB8730 -/* 80BB8710 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BB8714 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BB8718 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80BB871C 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BB8720 41 82 00 10 */ beq lbl_80BB8730 -/* 80BB8724 3C 60 80 BC */ lis r3, __vt__8cM3dGAab@ha /* 0x80BB9920@ha */ -/* 80BB8728 38 03 99 20 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BB9920@l */ -/* 80BB872C 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_80BB8730: -/* 80BB8730 7F C3 F3 78 */ mr r3, r30 -/* 80BB8734 38 80 00 00 */ li r4, 0 -/* 80BB8738 4B 4C B9 AD */ bl __dt__12dCcD_GObjInfFv -/* 80BB873C 7F E0 07 35 */ extsh. r0, r31 -/* 80BB8740 40 81 00 0C */ ble lbl_80BB874C -/* 80BB8744 7F C3 F3 78 */ mr r3, r30 -/* 80BB8748 4B 71 65 F5 */ bl __dl__FPv -lbl_80BB874C: -/* 80BB874C 7F C3 F3 78 */ mr r3, r30 -/* 80BB8750 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB8754 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BB8758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB875C 7C 08 03 A6 */ mtlr r0 -/* 80BB8760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB8764 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__sinit_d_a_obj_bmWindow_cpp.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__sinit_d_a_obj_bmWindow_cpp.s deleted file mode 100644 index 0130893eb52..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__sinit_d_a_obj_bmWindow_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BB96B8: -/* 80BB96B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB96BC 7C 08 02 A6 */ mflr r0 -/* 80BB96C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB96C4 3C 60 80 BC */ lis r3, l_HIO@ha /* 0x80BB999C@ha */ -/* 80BB96C8 38 63 99 9C */ addi r3, r3, l_HIO@l /* 0x80BB999C@l */ -/* 80BB96CC 4B FF EB 41 */ bl __ct__16daBmWindow_HIO_cFv -/* 80BB96D0 3C 80 80 BC */ lis r4, __dt__16daBmWindow_HIO_cFv@ha /* 0x80BB964C@ha */ -/* 80BB96D4 38 84 96 4C */ addi r4, r4, __dt__16daBmWindow_HIO_cFv@l /* 0x80BB964C@l */ -/* 80BB96D8 3C A0 80 BC */ lis r5, lit_3645@ha /* 0x80BB9990@ha */ -/* 80BB96DC 38 A5 99 90 */ addi r5, r5, lit_3645@l /* 0x80BB9990@l */ -/* 80BB96E0 4B FF EA B9 */ bl __register_global_object -/* 80BB96E4 3C 60 80 BC */ lis r3, mCcDCyl__12daBmWindow_c@ha /* 0x80BB982C@ha */ -/* 80BB96E8 38 63 98 2C */ addi r3, r3, mCcDCyl__12daBmWindow_c@l /* 0x80BB982C@l */ -/* 80BB96EC 38 A3 FF FC */ addi r5, r3, -4 -/* 80BB96F0 3C 60 80 BC */ lis r3, mCcDObjInfo__12daBmWindow_c@ha /* 0x80BB9760@ha */ -/* 80BB96F4 38 63 97 60 */ addi r3, r3, mCcDObjInfo__12daBmWindow_c@l /* 0x80BB9760@l */ -/* 80BB96F8 38 83 FF FC */ addi r4, r3, -4 -/* 80BB96FC 38 00 00 06 */ li r0, 6 -/* 80BB9700 7C 09 03 A6 */ mtctr r0 -lbl_80BB9704: -/* 80BB9704 80 64 00 04 */ lwz r3, 4(r4) -/* 80BB9708 84 04 00 08 */ lwzu r0, 8(r4) -/* 80BB970C 90 65 00 04 */ stw r3, 4(r5) -/* 80BB9710 94 05 00 08 */ stwu r0, 8(r5) -/* 80BB9714 42 00 FF F0 */ bdnz lbl_80BB9704 -/* 80BB9718 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB971C 7C 08 03 A6 */ mtlr r0 -/* 80BB9720 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB9724 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz.s deleted file mode 100644 index b4e9e970f00..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80BB8FDC: -/* 80BB8FDC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BB8FE0 7C 08 02 A6 */ mflr r0 -/* 80BB8FE4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BB8FE8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BB8FEC 4B 7A 91 F1 */ bl _savegpr_29 -/* 80BB8FF0 7C 7D 1B 78 */ mr r29, r3 -/* 80BB8FF4 7C BE 2B 78 */ mr r30, r5 -/* 80BB8FF8 7C DF 33 78 */ mr r31, r6 -/* 80BB8FFC 38 61 00 08 */ addi r3, r1, 8 -/* 80BB9000 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80BB9004 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80BB9008 4B 6A DB 2D */ bl __mi__4cXyzCFRC3Vec -/* 80BB900C C0 01 00 08 */ lfs f0, 8(r1) -/* 80BB9010 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BB9014 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80BB9018 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BB901C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80BB9020 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BB9024 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB9028 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB902C A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80BB9030 7C 00 00 D0 */ neg r0, r0 -/* 80BB9034 7C 04 07 34 */ extsh r4, r0 -/* 80BB9038 4B 45 33 A5 */ bl mDoMtx_YrotS__FPA4_fs -/* 80BB903C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB9040 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB9044 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BB9048 7C 85 23 78 */ mr r5, r4 -/* 80BB904C 4B 78 DD 21 */ bl PSMTXMultVec -/* 80BB9050 C0 1E 00 00 */ lfs f0, 0(r30) -/* 80BB9054 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 80BB9058 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80BB905C 4C 40 13 82 */ cror 2, 0, 2 -/* 80BB9060 40 82 00 64 */ bne lbl_80BB90C4 -/* 80BB9064 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80BB9068 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BB906C 4C 40 13 82 */ cror 2, 0, 2 -/* 80BB9070 40 82 00 54 */ bne lbl_80BB90C4 -/* 80BB9074 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80BB9078 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 80BB907C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80BB9080 4C 40 13 82 */ cror 2, 0, 2 -/* 80BB9084 40 82 00 40 */ bne lbl_80BB90C4 -/* 80BB9088 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80BB908C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BB9090 4C 40 13 82 */ cror 2, 0, 2 -/* 80BB9094 40 82 00 30 */ bne lbl_80BB90C4 -/* 80BB9098 C0 1E 00 08 */ lfs f0, 8(r30) -/* 80BB909C C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80BB90A0 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80BB90A4 4C 40 13 82 */ cror 2, 0, 2 -/* 80BB90A8 40 82 00 1C */ bne lbl_80BB90C4 -/* 80BB90AC C0 1F 00 08 */ lfs f0, 8(r31) -/* 80BB90B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BB90B4 4C 40 13 82 */ cror 2, 0, 2 -/* 80BB90B8 40 82 00 0C */ bne lbl_80BB90C4 -/* 80BB90BC 38 60 00 01 */ li r3, 1 -/* 80BB90C0 48 00 00 08 */ b lbl_80BB90C8 -lbl_80BB90C4: -/* 80BB90C4 38 60 00 00 */ li r3, 0 -lbl_80BB90C8: -/* 80BB90C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BB90CC 4B 7A 91 5D */ bl _restgpr_29 -/* 80BB90D0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BB90D4 7C 08 03 A6 */ mtlr r0 -/* 80BB90D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BB90DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/create__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/create__12daBmWindow_cFv.s deleted file mode 100644 index e725d1cba3c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/create__12daBmWindow_cFv.s +++ /dev/null @@ -1,150 +0,0 @@ -lbl_80BB846C: -/* 80BB846C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BB8470 7C 08 02 A6 */ mflr r0 -/* 80BB8474 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BB8478 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BB847C 4B 7A 9D 51 */ bl _savegpr_25 -/* 80BB8480 7C 7E 1B 78 */ mr r30, r3 -/* 80BB8484 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BB8488 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BB848C 40 82 00 74 */ bne lbl_80BB8500 -/* 80BB8490 7F C0 F3 79 */ or. r0, r30, r30 -/* 80BB8494 41 82 00 60 */ beq lbl_80BB84F4 -/* 80BB8498 7C 19 03 78 */ mr r25, r0 -/* 80BB849C 4B 4C 01 89 */ bl __ct__16dBgS_MoveBgActorFv -/* 80BB84A0 3C 60 80 BC */ lis r3, __vt__12daBmWindow_c@ha /* 0x80BB9938@ha */ -/* 80BB84A4 38 03 99 38 */ addi r0, r3, __vt__12daBmWindow_c@l /* 0x80BB9938@l */ -/* 80BB84A8 90 19 05 9C */ stw r0, 0x59c(r25) -/* 80BB84AC 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80BB84B0 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80BB84B4 90 19 05 C8 */ stw r0, 0x5c8(r25) -/* 80BB84B8 38 79 05 CC */ addi r3, r25, 0x5cc -/* 80BB84BC 4B 4C B2 A5 */ bl __ct__10dCcD_GSttsFv -/* 80BB84C0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80BB84C4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80BB84C8 90 79 05 C8 */ stw r3, 0x5c8(r25) -/* 80BB84CC 38 03 00 20 */ addi r0, r3, 0x20 -/* 80BB84D0 90 19 05 CC */ stw r0, 0x5cc(r25) -/* 80BB84D4 38 79 05 EC */ addi r3, r25, 0x5ec -/* 80BB84D8 3C 80 80 BC */ lis r4, __ct__8dCcD_CylFv@ha /* 0x80BB8768@ha */ -/* 80BB84DC 38 84 87 68 */ addi r4, r4, __ct__8dCcD_CylFv@l /* 0x80BB8768@l */ -/* 80BB84E0 3C A0 80 BC */ lis r5, __dt__8dCcD_CylFv@ha /* 0x80BB869C@ha */ -/* 80BB84E4 38 A5 86 9C */ addi r5, r5, __dt__8dCcD_CylFv@l /* 0x80BB869C@l */ -/* 80BB84E8 38 C0 01 3C */ li r6, 0x13c -/* 80BB84EC 38 E0 00 07 */ li r7, 7 -/* 80BB84F0 4B 7A 98 71 */ bl __construct_array -lbl_80BB84F4: -/* 80BB84F4 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80BB84F8 60 00 00 08 */ ori r0, r0, 8 -/* 80BB84FC 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80BB8500: -/* 80BB8500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB8504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB8508 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BB850C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BB8510 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80BB8514 7C 05 07 74 */ extsb r5, r0 -/* 80BB8518 4B 47 CE 49 */ bl isSwitch__10dSv_info_cCFii -/* 80BB851C 2C 03 00 00 */ cmpwi r3, 0 -/* 80BB8520 41 82 00 0C */ beq lbl_80BB852C -/* 80BB8524 38 60 00 05 */ li r3, 5 -/* 80BB8528 48 00 01 5C */ b lbl_80BB8684 -lbl_80BB852C: -/* 80BB852C 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80BB8530 3C 80 80 BC */ lis r4, d_a_obj_bmWindow__stringBase0@ha /* 0x80BB9800@ha */ -/* 80BB8534 38 84 98 00 */ addi r4, r4, d_a_obj_bmWindow__stringBase0@l /* 0x80BB9800@l */ -/* 80BB8538 4B 47 49 85 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BB853C 7C 7F 1B 78 */ mr r31, r3 -/* 80BB8540 2C 1F 00 04 */ cmpwi r31, 4 -/* 80BB8544 40 82 01 3C */ bne lbl_80BB8680 -/* 80BB8548 7F C3 F3 78 */ mr r3, r30 -/* 80BB854C 3C 80 80 BC */ lis r4, d_a_obj_bmWindow__stringBase0@ha /* 0x80BB9800@ha */ -/* 80BB8550 38 84 98 00 */ addi r4, r4, d_a_obj_bmWindow__stringBase0@l /* 0x80BB9800@l */ -/* 80BB8554 38 A0 00 07 */ li r5, 7 -/* 80BB8558 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80BB855C 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80BB8560 38 E0 1D 20 */ li r7, 0x1d20 -/* 80BB8564 39 00 00 00 */ li r8, 0 -/* 80BB8568 4B 4C 02 55 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80BB856C 2C 03 00 05 */ cmpwi r3, 5 -/* 80BB8570 40 82 00 0C */ bne lbl_80BB857C -/* 80BB8574 38 60 00 05 */ li r3, 5 -/* 80BB8578 48 00 01 0C */ b lbl_80BB8684 -lbl_80BB857C: -/* 80BB857C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BB8580 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BB8584 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80BB8588 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BB858C 80 83 00 04 */ lwz r4, 4(r3) -/* 80BB8590 7F C3 F3 78 */ mr r3, r30 -/* 80BB8594 4B 46 1F E5 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80BB8598 38 00 00 00 */ li r0, 0 -/* 80BB859C B0 1E 0E 98 */ sth r0, 0xe98(r30) -/* 80BB85A0 B0 1E 0E 9A */ sth r0, 0xe9a(r30) -/* 80BB85A4 B0 1E 0E 9C */ sth r0, 0xe9c(r30) -/* 80BB85A8 3C 60 80 BC */ lis r3, lit_3769@ha /* 0x80BB97C0@ha */ -/* 80BB85AC C0 03 97 C0 */ lfs f0, lit_3769@l(r3) /* 0x80BB97C0@l */ -/* 80BB85B0 D0 1E 0E A0 */ stfs f0, 0xea0(r30) -/* 80BB85B4 D0 1E 0E B8 */ stfs f0, 0xeb8(r30) -/* 80BB85B8 D0 1E 0E BC */ stfs f0, 0xebc(r30) -/* 80BB85BC D0 1E 0E C0 */ stfs f0, 0xec0(r30) -/* 80BB85C0 D0 1E 0E CC */ stfs f0, 0xecc(r30) -/* 80BB85C4 D0 1E 0E A8 */ stfs f0, 0xea8(r30) -/* 80BB85C8 D0 1E 0E A4 */ stfs f0, 0xea4(r30) -/* 80BB85CC D0 1E 0E AC */ stfs f0, 0xeac(r30) -/* 80BB85D0 D0 1E 0E B0 */ stfs f0, 0xeb0(r30) -/* 80BB85D4 D0 1E 0E B4 */ stfs f0, 0xeb4(r30) -/* 80BB85D8 D0 1E 0E C4 */ stfs f0, 0xec4(r30) -/* 80BB85DC D0 1E 0E C8 */ stfs f0, 0xec8(r30) -/* 80BB85E0 D0 1E 0E D0 */ stfs f0, 0xed0(r30) -/* 80BB85E4 D0 1E 0E D4 */ stfs f0, 0xed4(r30) -/* 80BB85E8 D0 1E 0E D8 */ stfs f0, 0xed8(r30) -/* 80BB85EC 90 1E 0E 94 */ stw r0, 0xe94(r30) -/* 80BB85F0 98 1E 0E 91 */ stb r0, 0xe91(r30) -/* 80BB85F4 B0 1E 0E DC */ sth r0, 0xedc(r30) -/* 80BB85F8 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80BB85FC 38 80 00 FF */ li r4, 0xff -/* 80BB8600 38 A0 00 01 */ li r5, 1 -/* 80BB8604 7F C6 F3 78 */ mr r6, r30 -/* 80BB8608 4B 4C B2 59 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80BB860C 3B 20 00 00 */ li r25, 0 -/* 80BB8610 3B A0 00 00 */ li r29, 0 -/* 80BB8614 3C 60 80 BC */ lis r3, mCcDCyl__12daBmWindow_c@ha /* 0x80BB982C@ha */ -/* 80BB8618 3B 63 98 2C */ addi r27, r3, mCcDCyl__12daBmWindow_c@l /* 0x80BB982C@l */ -/* 80BB861C 3B 9E 05 B0 */ addi r28, r30, 0x5b0 -lbl_80BB8620: -/* 80BB8620 7F 5E EA 14 */ add r26, r30, r29 -/* 80BB8624 38 7A 05 EC */ addi r3, r26, 0x5ec -/* 80BB8628 7F 64 DB 78 */ mr r4, r27 -/* 80BB862C 4B 4C C2 89 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80BB8630 93 9A 06 30 */ stw r28, 0x630(r26) -/* 80BB8634 3B 39 00 01 */ addi r25, r25, 1 -/* 80BB8638 2C 19 00 07 */ cmpwi r25, 7 -/* 80BB863C 3B BD 01 3C */ addi r29, r29, 0x13c -/* 80BB8640 41 80 FF E0 */ blt lbl_80BB8620 -/* 80BB8644 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BB8648 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80BB864C 98 1E 0E 90 */ stb r0, 0xe90(r30) -/* 80BB8650 88 1E 0E 90 */ lbz r0, 0xe90(r30) -/* 80BB8654 28 00 00 01 */ cmplwi r0, 1 -/* 80BB8658 41 82 00 10 */ beq lbl_80BB8668 -/* 80BB865C 7F C3 F3 78 */ mr r3, r30 -/* 80BB8660 48 00 04 DD */ bl init_modeWait__12daBmWindow_cFv -/* 80BB8664 48 00 00 0C */ b lbl_80BB8670 -lbl_80BB8668: -/* 80BB8668 7F C3 F3 78 */ mr r3, r30 -/* 80BB866C 48 00 0B C1 */ bl init_modeBreakEff__12daBmWindow_cFv -lbl_80BB8670: -/* 80BB8670 38 00 00 00 */ li r0, 0 -/* 80BB8674 98 1E 0E DE */ stb r0, 0xede(r30) -/* 80BB8678 7F C3 F3 78 */ mr r3, r30 -/* 80BB867C 4B FF FC D5 */ bl setBaseMtx__12daBmWindow_cFv -lbl_80BB8680: -/* 80BB8680 7F E3 FB 78 */ mr r3, r31 -lbl_80BB8684: -/* 80BB8684 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BB8688 4B 7A 9B 91 */ bl _restgpr_25 -/* 80BB868C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BB8690 7C 08 03 A6 */ mtlr r0 -/* 80BB8694 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BB8698 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Create__FP10fopAc_ac_c.s deleted file mode 100644 index ea36bb57c39..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BB95E4: -/* 80BB95E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB95E8 7C 08 02 A6 */ mflr r0 -/* 80BB95EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB95F0 4B FF EE 7D */ bl create__12daBmWindow_cFv -/* 80BB95F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB95F8 7C 08 03 A6 */ mtlr r0 -/* 80BB95FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB9600 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Delete__FP12daBmWindow_c.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Delete__FP12daBmWindow_c.s deleted file mode 100644 index 10b6844d4af..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Delete__FP12daBmWindow_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BB95C4: -/* 80BB95C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB95C8 7C 08 02 A6 */ mflr r0 -/* 80BB95CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB95D0 4B 4B F3 0D */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80BB95D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB95D8 7C 08 03 A6 */ mtlr r0 -/* 80BB95DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB95E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Draw__FP12daBmWindow_c.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Draw__FP12daBmWindow_c.s deleted file mode 100644 index b5a4b7818ee..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Draw__FP12daBmWindow_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BB9578: -/* 80BB9578 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB957C 7C 08 02 A6 */ mflr r0 -/* 80BB9580 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB9584 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80BB9588 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80BB958C 7D 89 03 A6 */ mtctr r12 -/* 80BB9590 4E 80 04 21 */ bctrl -/* 80BB9594 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB9598 7C 08 03 A6 */ mtlr r0 -/* 80BB959C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB95A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Execute__FP12daBmWindow_c.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Execute__FP12daBmWindow_c.s deleted file mode 100644 index 6cf8f63852c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Execute__FP12daBmWindow_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BB95A4: -/* 80BB95A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB95A8 7C 08 02 A6 */ mflr r0 -/* 80BB95AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB95B0 4B 4B F3 A1 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BB95B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB95B8 7C 08 03 A6 */ mtlr r0 -/* 80BB95BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB95C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreakEff__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreakEff__12daBmWindow_cFv.s deleted file mode 100644 index 214fafdb5fb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreakEff__12daBmWindow_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80BB922C: -/* 80BB922C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BB9230 7C 08 02 A6 */ mflr r0 -/* 80BB9234 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BB9238 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BB923C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80BB9240 7C 7E 1B 78 */ mr r30, r3 -/* 80BB9244 3C 60 80 BC */ lis r3, lit_3653@ha /* 0x80BB973C@ha */ -/* 80BB9248 3B E3 97 3C */ addi r31, r3, lit_3653@l /* 0x80BB973C@l */ -/* 80BB924C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BB9250 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BB9254 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BB9258 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BB925C C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 80BB9260 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80BB9264 C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80BB9268 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BB926C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BB9270 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80BB9274 7C 03 07 74 */ extsb r3, r0 -/* 80BB9278 4B 47 3D F5 */ bl dComIfGp_getReverb__Fi -/* 80BB927C 7C 67 1B 78 */ mr r7, r3 -/* 80BB9280 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080173@ha */ -/* 80BB9284 38 03 01 73 */ addi r0, r3, 0x0173 /* 0x00080173@l */ -/* 80BB9288 90 01 00 08 */ stw r0, 8(r1) -/* 80BB928C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BB9290 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BB9294 80 63 00 00 */ lwz r3, 0(r3) -/* 80BB9298 38 81 00 08 */ addi r4, r1, 8 -/* 80BB929C 38 A1 00 0C */ addi r5, r1, 0xc -/* 80BB92A0 38 C0 00 00 */ li r6, 0 -/* 80BB92A4 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80BB92A8 FC 40 08 90 */ fmr f2, f1 -/* 80BB92AC C0 7F 00 90 */ lfs f3, 0x90(r31) -/* 80BB92B0 FC 80 18 90 */ fmr f4, f3 -/* 80BB92B4 39 00 00 00 */ li r8, 0 -/* 80BB92B8 4B 6F 26 CD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BB92BC 7F C3 F3 78 */ mr r3, r30 -/* 80BB92C0 38 80 00 01 */ li r4, 1 -/* 80BB92C4 48 00 00 61 */ bl setBreakEffect__12daBmWindow_cFi -/* 80BB92C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB92CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB92D0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BB92D4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BB92D8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80BB92DC 7C 05 07 74 */ extsb r5, r0 -/* 80BB92E0 4B 47 BF 21 */ bl onSwitch__10dSv_info_cFii -/* 80BB92E4 38 00 00 02 */ li r0, 2 -/* 80BB92E8 98 1E 05 AC */ stb r0, 0x5ac(r30) -/* 80BB92EC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BB92F0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80BB92F4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BB92F8 7C 08 03 A6 */ mtlr r0 -/* 80BB92FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BB9300 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreak__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreak__12daBmWindow_cFv.s deleted file mode 100644 index a22f60392d0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreak__12daBmWindow_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80BB90E0: -/* 80BB90E0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BB90E4 7C 08 02 A6 */ mflr r0 -/* 80BB90E8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BB90EC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80BB90F0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80BB90F4 7C 7F 1B 78 */ mr r31, r3 -/* 80BB90F8 3C 60 80 BC */ lis r3, lit_3653@ha /* 0x80BB973C@ha */ -/* 80BB90FC 3B C3 97 3C */ addi r30, r3, lit_3653@l /* 0x80BB973C@l */ -/* 80BB9100 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80BB9104 28 04 00 00 */ cmplwi r4, 0 -/* 80BB9108 41 82 00 14 */ beq lbl_80BB911C -/* 80BB910C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB9110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB9114 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BB9118 4B 4B B1 39 */ bl Release__4cBgSFP9dBgW_Base -lbl_80BB911C: -/* 80BB911C 7F E3 FB 78 */ mr r3, r31 -/* 80BB9120 38 80 00 00 */ li r4, 0 -/* 80BB9124 48 00 02 01 */ bl setBreakEffect__12daBmWindow_cFi -/* 80BB9128 C0 3E 00 84 */ lfs f1, 0x84(r30) -/* 80BB912C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80BB9130 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80BB9134 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BB9138 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80BB913C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB9140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB9144 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80BB9148 3C 80 80 BC */ lis r4, l_HIO@ha /* 0x80BB999C@ha */ -/* 80BB914C 38 84 99 9C */ addi r4, r4, l_HIO@l /* 0x80BB999C@l */ -/* 80BB9150 88 84 00 05 */ lbz r4, 5(r4) -/* 80BB9154 38 A0 00 0F */ li r5, 0xf -/* 80BB9158 38 C1 00 0C */ addi r6, r1, 0xc -/* 80BB915C 4B 4B 68 C9 */ bl StartShock__12dVibration_cFii4cXyz -/* 80BB9160 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80BB9164 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BB9168 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80BB916C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BB9170 C0 3F 04 D8 */ lfs f1, 0x4d8(r31) -/* 80BB9174 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80BB9178 C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 80BB917C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BB9180 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80BB9184 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80BB9188 7C 03 07 74 */ extsb r3, r0 -/* 80BB918C 4B 47 3E E1 */ bl dComIfGp_getReverb__Fi -/* 80BB9190 7C 67 1B 78 */ mr r7, r3 -/* 80BB9194 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080110@ha */ -/* 80BB9198 38 03 01 10 */ addi r0, r3, 0x0110 /* 0x00080110@l */ -/* 80BB919C 90 01 00 08 */ stw r0, 8(r1) -/* 80BB91A0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BB91A4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BB91A8 80 63 00 00 */ lwz r3, 0(r3) -/* 80BB91AC 38 81 00 08 */ addi r4, r1, 8 -/* 80BB91B0 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80BB91B4 38 C0 00 00 */ li r6, 0 -/* 80BB91B8 C0 3E 00 20 */ lfs f1, 0x20(r30) -/* 80BB91BC FC 40 08 90 */ fmr f2, f1 -/* 80BB91C0 C0 7E 00 90 */ lfs f3, 0x90(r30) -/* 80BB91C4 FC 80 18 90 */ fmr f4, f3 -/* 80BB91C8 39 00 00 00 */ li r8, 0 -/* 80BB91CC 4B 6F 27 B9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BB91D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB91D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB91D8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80BB91DC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80BB91E0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80BB91E4 7C 05 07 74 */ extsb r5, r0 -/* 80BB91E8 4B 47 C0 19 */ bl onSwitch__10dSv_info_cFii -/* 80BB91EC 38 00 00 01 */ li r0, 1 -/* 80BB91F0 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80BB91F4 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80BB91F8 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80BB91FC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BB9200 7C 08 03 A6 */ mtlr r0 -/* 80BB9204 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BB9208 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeWait__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeWait__12daBmWindow_cFv.s deleted file mode 100644 index 47811eee53a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeWait__12daBmWindow_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80BB8B3C: -/* 80BB8B3C 38 00 00 00 */ li r0, 0 -/* 80BB8B40 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80BB8B44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreakEff__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreakEff__12daBmWindow_cFv.s deleted file mode 100644 index 904c9f34420..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreakEff__12daBmWindow_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BB9304: -/* 80BB9304 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB9308 7C 08 02 A6 */ mflr r0 -/* 80BB930C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB9310 4B 46 09 6D */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80BB9314 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB9318 7C 08 03 A6 */ mtlr r0 -/* 80BB931C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB9320 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreak__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreak__12daBmWindow_cFv.s deleted file mode 100644 index 0fc10f7dabf..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreak__12daBmWindow_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BB920C: -/* 80BB920C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB9210 7C 08 02 A6 */ mflr r0 -/* 80BB9214 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB9218 4B 46 0A 65 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80BB921C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB9220 7C 08 03 A6 */ mtlr r0 -/* 80BB9224 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB9228 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeWait__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeWait__12daBmWindow_cFv.s deleted file mode 100644 index b6255d7f7ee..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeWait__12daBmWindow_cFv.s +++ /dev/null @@ -1,305 +0,0 @@ -lbl_80BB8B48: -/* 80BB8B48 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 80BB8B4C 7C 08 02 A6 */ mflr r0 -/* 80BB8B50 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 80BB8B54 DB E1 00 C0 */ stfd f31, 0xc0(r1) -/* 80BB8B58 F3 E1 00 C8 */ psq_st f31, 200(r1), 0, 0 /* qr0 */ -/* 80BB8B5C DB C1 00 B0 */ stfd f30, 0xb0(r1) -/* 80BB8B60 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, 0 /* qr0 */ -/* 80BB8B64 DB A1 00 A0 */ stfd f29, 0xa0(r1) -/* 80BB8B68 F3 A1 00 A8 */ psq_st f29, 168(r1), 0, 0 /* qr0 */ -/* 80BB8B6C DB 81 00 90 */ stfd f28, 0x90(r1) -/* 80BB8B70 F3 81 00 98 */ psq_st f28, 152(r1), 0, 0 /* qr0 */ -/* 80BB8B74 39 61 00 90 */ addi r11, r1, 0x90 -/* 80BB8B78 4B 7A 96 4D */ bl _savegpr_23 -/* 80BB8B7C 7C 7E 1B 78 */ mr r30, r3 -/* 80BB8B80 3C 60 80 BC */ lis r3, lit_3653@ha /* 0x80BB973C@ha */ -/* 80BB8B84 3B E3 97 3C */ addi r31, r3, lit_3653@l /* 0x80BB973C@l */ -/* 80BB8B88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB8B8C 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB8B90 83 1B 5D B4 */ lwz r24, 0x5db4(r27) -/* 80BB8B94 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BB8B98 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80BB8B9C 38 7F 00 54 */ addi r3, r31, 0x54 -/* 80BB8BA0 C0 03 00 04 */ lfs f0, 4(r3) -/* 80BB8BA4 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80BB8BA8 C0 03 00 08 */ lfs f0, 8(r3) -/* 80BB8BAC D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80BB8BB0 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80BB8BB4 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80BB8BB8 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80BB8BBC D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80BB8BC0 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80BB8BC4 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80BB8BC8 80 18 05 78 */ lwz r0, 0x578(r24) -/* 80BB8BCC 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf -/* 80BB8BD0 40 82 00 3C */ bne lbl_80BB8C0C -/* 80BB8BD4 7F 03 C3 78 */ mr r3, r24 -/* 80BB8BD8 81 98 06 28 */ lwz r12, 0x628(r24) -/* 80BB8BDC 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80BB8BE0 7D 89 03 A6 */ mtctr r12 -/* 80BB8BE4 4E 80 04 21 */ bctrl -/* 80BB8BE8 2C 03 00 00 */ cmpwi r3, 0 -/* 80BB8BEC 40 82 00 20 */ bne lbl_80BB8C0C -/* 80BB8BF0 7F 03 C3 78 */ mr r3, r24 -/* 80BB8BF4 81 98 06 28 */ lwz r12, 0x628(r24) -/* 80BB8BF8 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 80BB8BFC 7D 89 03 A6 */ mtctr r12 -/* 80BB8C00 4E 80 04 21 */ bctrl -/* 80BB8C04 2C 03 00 00 */ cmpwi r3, 0 -/* 80BB8C08 41 82 00 28 */ beq lbl_80BB8C30 -lbl_80BB8C0C: -/* 80BB8C0C 7F C3 F3 78 */ mr r3, r30 -/* 80BB8C10 7F 04 C3 78 */ mr r4, r24 -/* 80BB8C14 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80BB8C18 38 C1 00 40 */ addi r6, r1, 0x40 -/* 80BB8C1C 48 00 03 C1 */ bl checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz -/* 80BB8C20 2C 03 00 00 */ cmpwi r3, 0 -/* 80BB8C24 41 82 00 0C */ beq lbl_80BB8C30 -/* 80BB8C28 7F C3 F3 78 */ mr r3, r30 -/* 80BB8C2C 48 00 04 B5 */ bl init_modeBreak__12daBmWindow_cFv -lbl_80BB8C30: -/* 80BB8C30 7F 03 C3 78 */ mr r3, r24 -/* 80BB8C34 81 98 06 28 */ lwz r12, 0x628(r24) -/* 80BB8C38 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 80BB8C3C 7D 89 03 A6 */ mtctr r12 -/* 80BB8C40 4E 80 04 21 */ bctrl -/* 80BB8C44 2C 03 00 00 */ cmpwi r3, 0 -/* 80BB8C48 41 82 00 C4 */ beq lbl_80BB8D0C -/* 80BB8C4C 7F C3 F3 78 */ mr r3, r30 -/* 80BB8C50 7F 04 C3 78 */ mr r4, r24 -/* 80BB8C54 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80BB8C58 38 C1 00 40 */ addi r6, r1, 0x40 -/* 80BB8C5C 48 00 03 81 */ bl checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz -/* 80BB8C60 2C 03 00 00 */ cmpwi r3, 0 -/* 80BB8C64 41 82 00 B0 */ beq lbl_80BB8D14 -/* 80BB8C68 80 7B 5D B4 */ lwz r3, 0x5db4(r27) -/* 80BB8C6C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80BB8C70 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80BB8C74 41 82 00 8C */ beq lbl_80BB8D00 -/* 80BB8C78 88 1E 0E DE */ lbz r0, 0xede(r30) -/* 80BB8C7C 28 00 00 00 */ cmplwi r0, 0 -/* 80BB8C80 40 82 00 94 */ bne lbl_80BB8D14 -/* 80BB8C84 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BB8C88 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80BB8C8C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BB8C90 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80BB8C94 C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 80BB8C98 D0 21 00 3C */ stfs f1, 0x3c(r1) -/* 80BB8C9C C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80BB8CA0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BB8CA4 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80BB8CA8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80BB8CAC 7C 03 07 74 */ extsb r3, r0 -/* 80BB8CB0 4B 47 43 BD */ bl dComIfGp_getReverb__Fi -/* 80BB8CB4 7C 67 1B 78 */ mr r7, r3 -/* 80BB8CB8 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080172@ha */ -/* 80BB8CBC 38 03 01 72 */ addi r0, r3, 0x0172 /* 0x00080172@l */ -/* 80BB8CC0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BB8CC4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BB8CC8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BB8CCC 80 63 00 00 */ lwz r3, 0(r3) -/* 80BB8CD0 38 81 00 0C */ addi r4, r1, 0xc -/* 80BB8CD4 38 A1 00 34 */ addi r5, r1, 0x34 -/* 80BB8CD8 38 C0 00 00 */ li r6, 0 -/* 80BB8CDC C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80BB8CE0 FC 40 08 90 */ fmr f2, f1 -/* 80BB8CE4 C0 7F 00 90 */ lfs f3, 0x90(r31) -/* 80BB8CE8 FC 80 18 90 */ fmr f4, f3 -/* 80BB8CEC 39 00 00 00 */ li r8, 0 -/* 80BB8CF0 4B 6F 2C 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BB8CF4 38 00 00 01 */ li r0, 1 -/* 80BB8CF8 98 1E 0E DE */ stb r0, 0xede(r30) -/* 80BB8CFC 48 00 00 18 */ b lbl_80BB8D14 -lbl_80BB8D00: -/* 80BB8D00 7F C3 F3 78 */ mr r3, r30 -/* 80BB8D04 48 00 03 DD */ bl init_modeBreak__12daBmWindow_cFv -/* 80BB8D08 48 00 00 0C */ b lbl_80BB8D14 -lbl_80BB8D0C: -/* 80BB8D0C 38 00 00 00 */ li r0, 0 -/* 80BB8D10 98 1E 0E DE */ stb r0, 0xede(r30) -lbl_80BB8D14: -/* 80BB8D14 3B 00 00 00 */ li r24, 0 -/* 80BB8D18 3B A0 00 00 */ li r29, 0 -lbl_80BB8D1C: -/* 80BB8D1C 38 7D 05 EC */ addi r3, r29, 0x5ec -/* 80BB8D20 7C 7E 1A 14 */ add r3, r30, r3 -/* 80BB8D24 4B 4C B7 3D */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80BB8D28 28 03 00 00 */ cmplwi r3, 0 -/* 80BB8D2C 41 82 00 10 */ beq lbl_80BB8D3C -/* 80BB8D30 7F C3 F3 78 */ mr r3, r30 -/* 80BB8D34 48 00 03 AD */ bl init_modeBreak__12daBmWindow_cFv -/* 80BB8D38 48 00 00 14 */ b lbl_80BB8D4C -lbl_80BB8D3C: -/* 80BB8D3C 3B 18 00 01 */ addi r24, r24, 1 -/* 80BB8D40 2C 18 00 07 */ cmpwi r24, 7 -/* 80BB8D44 3B BD 01 3C */ addi r29, r29, 0x13c -/* 80BB8D48 41 80 FF D4 */ blt lbl_80BB8D1C -lbl_80BB8D4C: -/* 80BB8D4C A0 1E 0E DC */ lhz r0, 0xedc(r30) -/* 80BB8D50 28 00 00 00 */ cmplwi r0, 0 -/* 80BB8D54 40 82 01 34 */ bne lbl_80BB8E88 -/* 80BB8D58 3C 60 80 BC */ lis r3, l_HIO@ha /* 0x80BB999C@ha */ -/* 80BB8D5C 38 63 99 9C */ addi r3, r3, l_HIO@l /* 0x80BB999C@l */ -/* 80BB8D60 C0 03 00 08 */ lfs f0, 8(r3) -/* 80BB8D64 D0 1E 0E A0 */ stfs f0, 0xea0(r30) -/* 80BB8D68 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80BB8D6C D0 1E 0E A8 */ stfs f0, 0xea8(r30) -/* 80BB8D70 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80BB8D74 D0 1E 0E A4 */ stfs f0, 0xea4(r30) -/* 80BB8D78 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80BB8D7C D0 1E 0E AC */ stfs f0, 0xeac(r30) -/* 80BB8D80 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80BB8D84 D0 1E 0E B0 */ stfs f0, 0xeb0(r30) -/* 80BB8D88 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80BB8D8C D0 1E 0E B4 */ stfs f0, 0xeb4(r30) -/* 80BB8D90 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80BB8D94 D0 1E 0E CC */ stfs f0, 0xecc(r30) -/* 80BB8D98 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80BB8D9C D0 1E 0E C4 */ stfs f0, 0xec4(r30) -/* 80BB8DA0 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80BB8DA4 D0 1E 0E C8 */ stfs f0, 0xec8(r30) -/* 80BB8DA8 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80BB8DAC D0 1E 0E D0 */ stfs f0, 0xed0(r30) -/* 80BB8DB0 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80BB8DB4 D0 1E 0E D4 */ stfs f0, 0xed4(r30) -/* 80BB8DB8 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80BB8DBC D0 1E 0E D8 */ stfs f0, 0xed8(r30) -/* 80BB8DC0 88 03 00 39 */ lbz r0, 0x39(r3) -/* 80BB8DC4 C8 3F 00 A8 */ lfd f1, 0xa8(r31) -/* 80BB8DC8 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80BB8DCC 3C 00 43 30 */ lis r0, 0x4330 -/* 80BB8DD0 90 01 00 58 */ stw r0, 0x58(r1) -/* 80BB8DD4 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 80BB8DD8 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80BB8DDC C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 80BB8DE0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80BB8DE4 4B 6A EB 71 */ bl cM_rndF__Ff -/* 80BB8DE8 C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 80BB8DEC EC 20 00 72 */ fmuls f1, f0, f1 -/* 80BB8DF0 C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 80BB8DF4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80BB8DF8 FC 00 00 1E */ fctiwz f0, f0 -/* 80BB8DFC D8 01 00 60 */ stfd f0, 0x60(r1) -/* 80BB8E00 80 81 00 64 */ lwz r4, 0x64(r1) -/* 80BB8E04 3C 60 80 BC */ lis r3, l_HIO@ha /* 0x80BB999C@ha */ -/* 80BB8E08 38 63 99 9C */ addi r3, r3, l_HIO@l /* 0x80BB999C@l */ -/* 80BB8E0C 88 03 00 38 */ lbz r0, 0x38(r3) -/* 80BB8E10 7C 00 22 14 */ add r0, r0, r4 -/* 80BB8E14 B0 1E 0E DC */ sth r0, 0xedc(r30) -/* 80BB8E18 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BB8E1C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80BB8E20 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BB8E24 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80BB8E28 C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 80BB8E2C D0 21 00 30 */ stfs f1, 0x30(r1) -/* 80BB8E30 C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80BB8E34 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BB8E38 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80BB8E3C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80BB8E40 7C 03 07 74 */ extsb r3, r0 -/* 80BB8E44 4B 47 42 29 */ bl dComIfGp_getReverb__Fi -/* 80BB8E48 7C 67 1B 78 */ mr r7, r3 -/* 80BB8E4C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080171@ha */ -/* 80BB8E50 38 03 01 71 */ addi r0, r3, 0x0171 /* 0x00080171@l */ -/* 80BB8E54 90 01 00 08 */ stw r0, 8(r1) -/* 80BB8E58 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BB8E5C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BB8E60 80 63 00 00 */ lwz r3, 0(r3) -/* 80BB8E64 38 81 00 08 */ addi r4, r1, 8 -/* 80BB8E68 38 A1 00 28 */ addi r5, r1, 0x28 -/* 80BB8E6C 38 C0 00 00 */ li r6, 0 -/* 80BB8E70 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80BB8E74 FC 40 08 90 */ fmr f2, f1 -/* 80BB8E78 C0 7F 00 90 */ lfs f3, 0x90(r31) -/* 80BB8E7C FC 80 18 90 */ fmr f4, f3 -/* 80BB8E80 39 00 00 00 */ li r8, 0 -/* 80BB8E84 4B 6F 2B 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80BB8E88: -/* 80BB8E88 A0 7E 0E DC */ lhz r3, 0xedc(r30) -/* 80BB8E8C 28 03 00 00 */ cmplwi r3, 0 -/* 80BB8E90 41 82 00 0C */ beq lbl_80BB8E9C -/* 80BB8E94 38 03 FF FF */ addi r0, r3, -1 -/* 80BB8E98 B0 1E 0E DC */ sth r0, 0xedc(r30) -lbl_80BB8E9C: -/* 80BB8E9C 3A E0 00 00 */ li r23, 0 -/* 80BB8EA0 3B A0 00 00 */ li r29, 0 -/* 80BB8EA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB8EA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB8EAC 3B 43 23 3C */ addi r26, r3, 0x233c -/* 80BB8EB0 C3 9F 00 84 */ lfs f28, 0x84(r31) -/* 80BB8EB4 C3 BF 00 9C */ lfs f29, 0x9c(r31) -/* 80BB8EB8 CB DF 00 B0 */ lfd f30, 0xb0(r31) -/* 80BB8EBC 3F 60 43 30 */ lis r27, 0x4330 -/* 80BB8EC0 C3 FF 00 A0 */ lfs f31, 0xa0(r31) -/* 80BB8EC4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB8EC8 3B 83 D4 70 */ addi r28, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -lbl_80BB8ECC: -/* 80BB8ECC D3 81 00 1C */ stfs f28, 0x1c(r1) -/* 80BB8ED0 D3 81 00 20 */ stfs f28, 0x20(r1) -/* 80BB8ED4 D3 81 00 24 */ stfs f28, 0x24(r1) -/* 80BB8ED8 6E E0 80 00 */ xoris r0, r23, 0x8000 -/* 80BB8EDC 90 01 00 64 */ stw r0, 0x64(r1) -/* 80BB8EE0 93 61 00 60 */ stw r27, 0x60(r1) -/* 80BB8EE4 C8 01 00 60 */ lfd f0, 0x60(r1) -/* 80BB8EE8 EC 00 F0 28 */ fsubs f0, f0, f30 -/* 80BB8EEC EC 1D 00 32 */ fmuls f0, f29, f0 -/* 80BB8EF0 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 80BB8EF4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BB8EF8 7F 83 E3 78 */ mr r3, r28 -/* 80BB8EFC A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 80BB8F00 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80BB8F04 A8 DE 04 E8 */ lha r6, 0x4e8(r30) -/* 80BB8F08 4B 45 33 01 */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80BB8F0C 7F 83 E3 78 */ mr r3, r28 -/* 80BB8F10 38 81 00 1C */ addi r4, r1, 0x1c -/* 80BB8F14 7C 85 23 78 */ mr r5, r4 -/* 80BB8F18 4B 78 DE 55 */ bl PSMTXMultVec -/* 80BB8F1C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BB8F20 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BB8F24 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BB8F28 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BB8F2C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BB8F30 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BB8F34 38 61 00 10 */ addi r3, r1, 0x10 -/* 80BB8F38 38 81 00 1C */ addi r4, r1, 0x1c -/* 80BB8F3C 7C 65 1B 78 */ mr r5, r3 -/* 80BB8F40 4B 78 E1 51 */ bl PSVECAdd -/* 80BB8F44 7F 1E EA 14 */ add r24, r30, r29 -/* 80BB8F48 3B 38 07 10 */ addi r25, r24, 0x710 -/* 80BB8F4C 7F 23 CB 78 */ mr r3, r25 -/* 80BB8F50 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80BB8F54 4B 6B 62 AD */ bl SetR__8cM3dGCylFf -/* 80BB8F58 7F 23 CB 78 */ mr r3, r25 -/* 80BB8F5C C0 3F 00 A4 */ lfs f1, 0xa4(r31) -/* 80BB8F60 4B 6B 62 99 */ bl SetH__8cM3dGCylFf -/* 80BB8F64 7F 23 CB 78 */ mr r3, r25 -/* 80BB8F68 38 81 00 10 */ addi r4, r1, 0x10 -/* 80BB8F6C 4B 6B 62 71 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80BB8F70 7F 43 D3 78 */ mr r3, r26 -/* 80BB8F74 3B 18 05 EC */ addi r24, r24, 0x5ec -/* 80BB8F78 7F 04 C3 78 */ mr r4, r24 -/* 80BB8F7C 4B 6A BC 2D */ bl Set__4cCcSFP8cCcD_Obj -/* 80BB8F80 7F 03 C3 78 */ mr r3, r24 -/* 80BB8F84 81 98 00 3C */ lwz r12, 0x3c(r24) -/* 80BB8F88 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80BB8F8C 7D 89 03 A6 */ mtctr r12 -/* 80BB8F90 4E 80 04 21 */ bctrl -/* 80BB8F94 3A F7 00 01 */ addi r23, r23, 1 -/* 80BB8F98 2C 17 00 07 */ cmpwi r23, 7 -/* 80BB8F9C 3B BD 01 3C */ addi r29, r29, 0x13c -/* 80BB8FA0 41 80 FF 2C */ blt lbl_80BB8ECC -/* 80BB8FA4 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* qr0 */ -/* 80BB8FA8 CB E1 00 C0 */ lfd f31, 0xc0(r1) -/* 80BB8FAC E3 C1 00 B8 */ psq_l f30, 184(r1), 0, 0 /* qr0 */ -/* 80BB8FB0 CB C1 00 B0 */ lfd f30, 0xb0(r1) -/* 80BB8FB4 E3 A1 00 A8 */ psq_l f29, 168(r1), 0, 0 /* qr0 */ -/* 80BB8FB8 CB A1 00 A0 */ lfd f29, 0xa0(r1) -/* 80BB8FBC E3 81 00 98 */ psq_l f28, 152(r1), 0, 0 /* qr0 */ -/* 80BB8FC0 CB 81 00 90 */ lfd f28, 0x90(r1) -/* 80BB8FC4 39 61 00 90 */ addi r11, r1, 0x90 -/* 80BB8FC8 4B 7A 92 49 */ bl _restgpr_23 -/* 80BB8FCC 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 80BB8FD0 7C 08 03 A6 */ mtlr r0 -/* 80BB8FD4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80BB8FD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBaseMtx__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBaseMtx__12daBmWindow_cFv.s deleted file mode 100644 index 311b686227f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBaseMtx__12daBmWindow_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80BB8350: -/* 80BB8350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BB8354 7C 08 02 A6 */ mflr r0 -/* 80BB8358 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BB835C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BB8360 7C 7F 1B 78 */ mr r31, r3 -/* 80BB8364 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB8368 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB836C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80BB8370 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80BB8374 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80BB8378 4B 78 E5 71 */ bl PSMTXTrans -/* 80BB837C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB8380 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB8384 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80BB8388 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80BB838C A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80BB8390 4B 45 3F 11 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80BB8394 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB8398 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB839C A8 9F 0E 98 */ lha r4, 0xe98(r31) -/* 80BB83A0 A8 BF 0E 9A */ lha r5, 0xe9a(r31) -/* 80BB83A4 A8 DF 0E 9C */ lha r6, 0xe9c(r31) -/* 80BB83A8 4B 45 3E F9 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80BB83AC C0 3F 0E B8 */ lfs f1, 0xeb8(r31) -/* 80BB83B0 C0 5F 0E BC */ lfs f2, 0xebc(r31) -/* 80BB83B4 C0 7F 0E C0 */ lfs f3, 0xec0(r31) -/* 80BB83B8 4B 45 49 E5 */ bl transM__14mDoMtx_stack_cFfff -/* 80BB83BC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80BB83C0 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80BB83C4 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80BB83C8 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80BB83CC D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80BB83D0 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80BB83D4 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80BB83D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB83DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB83E0 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80BB83E4 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BB83E8 4B 78 E0 C9 */ bl PSMTXCopy -/* 80BB83EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BB83F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB83F4 7C 08 03 A6 */ mtlr r0 -/* 80BB83F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BB83FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBreakEffect__12daBmWindow_cFi.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBreakEffect__12daBmWindow_cFi.s deleted file mode 100644 index f08a3308702..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBreakEffect__12daBmWindow_cFi.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_80BB9324: -/* 80BB9324 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80BB9328 7C 08 02 A6 */ mflr r0 -/* 80BB932C 90 01 00 74 */ stw r0, 0x74(r1) -/* 80BB9330 39 61 00 70 */ addi r11, r1, 0x70 -/* 80BB9334 4B 7A 8E 99 */ bl _savegpr_25 -/* 80BB9338 7C 7D 1B 78 */ mr r29, r3 -/* 80BB933C 7C 9E 23 79 */ or. r30, r4, r4 -/* 80BB9340 3C 60 80 BC */ lis r3, lit_3653@ha /* 0x80BB973C@ha */ -/* 80BB9344 3B E3 97 3C */ addi r31, r3, lit_3653@l /* 0x80BB973C@l */ -/* 80BB9348 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BB934C D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80BB9350 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80BB9354 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80BB9358 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80BB935C D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80BB9360 80 1D 04 E4 */ lwz r0, 0x4e4(r29) -/* 80BB9364 90 01 00 20 */ stw r0, 0x20(r1) -/* 80BB9368 A0 1D 04 E8 */ lhz r0, 0x4e8(r29) -/* 80BB936C B0 01 00 24 */ sth r0, 0x24(r1) -/* 80BB9370 40 82 00 88 */ bne lbl_80BB93F8 -/* 80BB9374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB9378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB937C 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 80BB9380 38 61 00 28 */ addi r3, r1, 0x28 -/* 80BB9384 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80BB9388 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80BB938C 4B 6A D7 A9 */ bl __mi__4cXyzCFRC3Vec -/* 80BB9390 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80BB9394 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80BB9398 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80BB939C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80BB93A0 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80BB93A4 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80BB93A8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB93AC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB93B0 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80BB93B4 7C 00 00 D0 */ neg r0, r0 -/* 80BB93B8 7C 04 07 34 */ extsh r4, r0 -/* 80BB93BC 4B 45 30 21 */ bl mDoMtx_YrotS__FPA4_fs -/* 80BB93C0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BB93C4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BB93C8 38 81 00 34 */ addi r4, r1, 0x34 -/* 80BB93CC 7C 85 23 78 */ mr r5, r4 -/* 80BB93D0 4B 78 D9 9D */ bl PSMTXMultVec -/* 80BB93D4 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 80BB93D8 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80BB93DC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BB93E0 40 80 00 28 */ bge lbl_80BB9408 -/* 80BB93E4 A8 61 00 22 */ lha r3, 0x22(r1) -/* 80BB93E8 3C 63 00 01 */ addis r3, r3, 1 -/* 80BB93EC 38 03 80 00 */ addi r0, r3, -32768 -/* 80BB93F0 B0 01 00 22 */ sth r0, 0x22(r1) -/* 80BB93F4 48 00 00 14 */ b lbl_80BB9408 -lbl_80BB93F8: -/* 80BB93F8 A8 61 00 22 */ lha r3, 0x22(r1) -/* 80BB93FC 3C 63 00 01 */ addis r3, r3, 1 -/* 80BB9400 38 03 80 00 */ addi r0, r3, -32768 -/* 80BB9404 B0 01 00 22 */ sth r0, 0x22(r1) -lbl_80BB9408: -/* 80BB9408 1C 9E 00 03 */ mulli r4, r30, 3 -/* 80BB940C 7C 99 23 78 */ mr r25, r4 -/* 80BB9410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BB9414 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BB9418 3B 7F 00 B8 */ addi r27, r31, 0xb8 -/* 80BB941C 3B 84 00 03 */ addi r28, r4, 3 -/* 80BB9420 54 9E 08 3C */ slwi r30, r4, 1 -/* 80BB9424 48 00 00 50 */ b lbl_80BB9474 -lbl_80BB9428: -/* 80BB9428 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 80BB942C 38 80 00 00 */ li r4, 0 -/* 80BB9430 90 81 00 08 */ stw r4, 8(r1) -/* 80BB9434 38 00 FF FF */ li r0, -1 -/* 80BB9438 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BB943C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80BB9440 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BB9444 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BB9448 38 80 00 00 */ li r4, 0 -/* 80BB944C 7C BB F2 2E */ lhzx r5, r27, r30 -/* 80BB9450 38 C1 00 40 */ addi r6, r1, 0x40 -/* 80BB9454 38 E0 00 00 */ li r7, 0 -/* 80BB9458 39 01 00 20 */ addi r8, r1, 0x20 -/* 80BB945C 39 3D 04 EC */ addi r9, r29, 0x4ec -/* 80BB9460 39 40 00 FF */ li r10, 0xff -/* 80BB9464 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80BB9468 4B 49 36 29 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BB946C 3B 39 00 01 */ addi r25, r25, 1 -/* 80BB9470 3B DE 00 02 */ addi r30, r30, 2 -lbl_80BB9474: -/* 80BB9474 7C 19 E0 00 */ cmpw r25, r28 -/* 80BB9478 41 80 FF B0 */ blt lbl_80BB9428 -/* 80BB947C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80BB9480 4B 7A 8D 99 */ bl _restgpr_25 -/* 80BB9484 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80BB9488 7C 08 03 A6 */ mtlr r0 -/* 80BB948C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80BB9490 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/windowProc__12daBmWindow_cFv.s b/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/windowProc__12daBmWindow_cFv.s deleted file mode 100644 index 7f8a419a617..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/windowProc__12daBmWindow_cFv.s +++ /dev/null @@ -1,133 +0,0 @@ -lbl_80BB8930: -/* 80BB8930 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BB8934 7C 08 02 A6 */ mflr r0 -/* 80BB8938 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BB893C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BB8940 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80BB8944 7C 7E 1B 78 */ mr r30, r3 -/* 80BB8948 3C 60 80 BC */ lis r3, cNullVec__6Z2Calc@ha /* 0x80BB980C@ha */ -/* 80BB894C 38 C3 98 0C */ addi r6, r3, cNullVec__6Z2Calc@l /* 0x80BB980C@l */ -/* 80BB8950 3C 60 80 BC */ lis r3, data_80BB99D8@ha /* 0x80BB99D8@ha */ -/* 80BB8954 38 A3 99 D8 */ addi r5, r3, data_80BB99D8@l /* 0x80BB99D8@l */ -/* 80BB8958 88 05 00 00 */ lbz r0, 0(r5) -/* 80BB895C 7C 00 07 75 */ extsb. r0, r0 -/* 80BB8960 40 82 00 58 */ bne lbl_80BB89B8 -/* 80BB8964 80 66 00 64 */ lwz r3, 0x64(r6) -/* 80BB8968 80 06 00 68 */ lwz r0, 0x68(r6) -/* 80BB896C 90 66 00 88 */ stw r3, 0x88(r6) -/* 80BB8970 90 06 00 8C */ stw r0, 0x8c(r6) -/* 80BB8974 80 06 00 6C */ lwz r0, 0x6c(r6) -/* 80BB8978 90 06 00 90 */ stw r0, 0x90(r6) -/* 80BB897C 38 86 00 88 */ addi r4, r6, 0x88 -/* 80BB8980 80 66 00 70 */ lwz r3, 0x70(r6) -/* 80BB8984 80 06 00 74 */ lwz r0, 0x74(r6) -/* 80BB8988 90 64 00 0C */ stw r3, 0xc(r4) -/* 80BB898C 90 04 00 10 */ stw r0, 0x10(r4) -/* 80BB8990 80 06 00 78 */ lwz r0, 0x78(r6) -/* 80BB8994 90 04 00 14 */ stw r0, 0x14(r4) -/* 80BB8998 80 66 00 7C */ lwz r3, 0x7c(r6) -/* 80BB899C 80 06 00 80 */ lwz r0, 0x80(r6) -/* 80BB89A0 90 64 00 18 */ stw r3, 0x18(r4) -/* 80BB89A4 90 04 00 1C */ stw r0, 0x1c(r4) -/* 80BB89A8 80 06 00 84 */ lwz r0, 0x84(r6) -/* 80BB89AC 90 04 00 20 */ stw r0, 0x20(r4) -/* 80BB89B0 38 00 00 01 */ li r0, 1 -/* 80BB89B4 98 05 00 00 */ stb r0, 0(r5) -lbl_80BB89B8: -/* 80BB89B8 7F C3 F3 78 */ mr r3, r30 -/* 80BB89BC 88 1E 05 AC */ lbz r0, 0x5ac(r30) -/* 80BB89C0 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80BB89C4 39 86 00 88 */ addi r12, r6, 0x88 -/* 80BB89C8 7D 8C 02 14 */ add r12, r12, r0 -/* 80BB89CC 4B 7A 96 B9 */ bl __ptmf_scall -/* 80BB89D0 60 00 00 00 */ nop -/* 80BB89D4 3C 60 80 BC */ lis r3, lit_3897@ha /* 0x80BB97C4@ha */ -/* 80BB89D8 C0 23 97 C4 */ lfs f1, lit_3897@l(r3) /* 0x80BB97C4@l */ -/* 80BB89DC C0 1E 0E A8 */ lfs f0, 0xea8(r30) -/* 80BB89E0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BB89E4 FC 00 00 1E */ fctiwz f0, f0 -/* 80BB89E8 D8 01 00 08 */ stfd f0, 8(r1) -/* 80BB89EC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80BB89F0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80BB89F4 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80BB89F8 3B E4 00 04 */ addi r31, r4, 4 -/* 80BB89FC 80 7E 0E 94 */ lwz r3, 0xe94(r30) -/* 80BB8A00 7C 00 07 34 */ extsh r0, r0 -/* 80BB8A04 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80BB8A08 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80BB8A0C 7C 5F 04 2E */ lfsx f2, r31, r0 -/* 80BB8A10 C0 1E 0E A0 */ lfs f0, 0xea0(r30) -/* 80BB8A14 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80BB8A18 FC 00 00 1E */ fctiwz f0, f0 -/* 80BB8A1C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80BB8A20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BB8A24 B0 1E 0E 9C */ sth r0, 0xe9c(r30) -/* 80BB8A28 C0 1E 0E A4 */ lfs f0, 0xea4(r30) -/* 80BB8A2C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BB8A30 FC 00 00 1E */ fctiwz f0, f0 -/* 80BB8A34 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80BB8A38 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80BB8A3C 80 7E 0E 94 */ lwz r3, 0xe94(r30) -/* 80BB8A40 7C 00 07 34 */ extsh r0, r0 -/* 80BB8A44 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80BB8A48 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80BB8A4C 7C 24 04 2E */ lfsx f1, r4, r0 -/* 80BB8A50 C0 1E 0E A0 */ lfs f0, 0xea0(r30) -/* 80BB8A54 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80BB8A58 FC 00 00 1E */ fctiwz f0, f0 -/* 80BB8A5C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80BB8A60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BB8A64 B0 1E 0E 9A */ sth r0, 0xe9a(r30) -/* 80BB8A68 38 7E 0E A0 */ addi r3, r30, 0xea0 -/* 80BB8A6C 3C 80 80 BC */ lis r4, lit_3769@ha /* 0x80BB97C0@ha */ -/* 80BB8A70 C0 24 97 C0 */ lfs f1, lit_3769@l(r4) /* 0x80BB97C0@l */ -/* 80BB8A74 C0 5E 0E AC */ lfs f2, 0xeac(r30) -/* 80BB8A78 C0 7E 0E B0 */ lfs f3, 0xeb0(r30) -/* 80BB8A7C C0 9E 0E B4 */ lfs f4, 0xeb4(r30) -/* 80BB8A80 4B 6B 6E FD */ bl cLib_addCalc__FPfffff -/* 80BB8A84 3C 60 80 BC */ lis r3, lit_3897@ha /* 0x80BB97C4@ha */ -/* 80BB8A88 C0 23 97 C4 */ lfs f1, lit_3897@l(r3) /* 0x80BB97C4@l */ -/* 80BB8A8C C0 1E 0E C4 */ lfs f0, 0xec4(r30) -/* 80BB8A90 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BB8A94 FC 00 00 1E */ fctiwz f0, f0 -/* 80BB8A98 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BB8A9C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80BB8AA0 80 7E 0E 94 */ lwz r3, 0xe94(r30) -/* 80BB8AA4 7C 00 07 34 */ extsh r0, r0 -/* 80BB8AA8 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80BB8AAC 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80BB8AB0 7C 5F 04 2E */ lfsx f2, r31, r0 -/* 80BB8AB4 C0 1E 0E CC */ lfs f0, 0xecc(r30) -/* 80BB8AB8 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80BB8ABC D0 1E 0E B8 */ stfs f0, 0xeb8(r30) -/* 80BB8AC0 C0 1E 0E C8 */ lfs f0, 0xec8(r30) -/* 80BB8AC4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BB8AC8 FC 00 00 1E */ fctiwz f0, f0 -/* 80BB8ACC D8 01 00 30 */ stfd f0, 0x30(r1) -/* 80BB8AD0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BB8AD4 80 7E 0E 94 */ lwz r3, 0xe94(r30) -/* 80BB8AD8 7C 00 07 34 */ extsh r0, r0 -/* 80BB8ADC 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80BB8AE0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80BB8AE4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80BB8AE8 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80BB8AEC 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80BB8AF0 C0 1E 0E CC */ lfs f0, 0xecc(r30) -/* 80BB8AF4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80BB8AF8 D0 1E 0E BC */ stfs f0, 0xebc(r30) -/* 80BB8AFC 38 7E 0E CC */ addi r3, r30, 0xecc -/* 80BB8B00 3C 80 80 BC */ lis r4, lit_3769@ha /* 0x80BB97C0@ha */ -/* 80BB8B04 C0 24 97 C0 */ lfs f1, lit_3769@l(r4) /* 0x80BB97C0@l */ -/* 80BB8B08 C0 5E 0E D0 */ lfs f2, 0xed0(r30) -/* 80BB8B0C C0 7E 0E D4 */ lfs f3, 0xed4(r30) -/* 80BB8B10 C0 9E 0E D8 */ lfs f4, 0xed8(r30) -/* 80BB8B14 4B 6B 6E 69 */ bl cLib_addCalc__FPfffff -/* 80BB8B18 80 7E 0E 94 */ lwz r3, 0xe94(r30) -/* 80BB8B1C 38 03 00 01 */ addi r0, r3, 1 -/* 80BB8B20 90 1E 0E 94 */ stw r0, 0xe94(r30) -/* 80BB8B24 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BB8B28 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80BB8B2C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BB8B30 7C 08 03 A6 */ mtlr r0 -/* 80BB8B34 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BB8B38 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index f3179a955cb..a4a51062a5e 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -295,7 +295,7 @@ public: FLG2_UNK_80000 = 0x80000, FLG2_FORCE_GAMEOVER = 0x40000, FLG2_UNK_20000 = 0x20000, - FLG2_UNK_10000 = 0x10000, + FLG2_WOLF_DASH_AUTO_JUMP = 0x10000, FLG2_SCN_CHG_START = 0x8000, FLG2_UNK_4000 = 0x4000, FLG2_UNK_2000 = 0x2000, @@ -831,6 +831,7 @@ public: void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); } u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } + u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); } void changeOriginalDemo() { mDemo.setOriginalDemoType(); diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h index 39e1579fda8..c01f7a3fc52 100644 --- a/include/d/s/d_s_play.h +++ b/include/d/s/d_s_play.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "f_op/f_op_scene.h" +#include "m_Do/m_Do_hostIO.h" class mDoDvdThd_mountXArchive_c; class mDoDvdThd_toMainRam_c; @@ -24,11 +25,6 @@ public: #endif }; -class mDoHIO_entry_c { -public: - virtual ~mDoHIO_entry_c() {} -}; - class dScnPly_preLoad_HIO_c : public mDoHIO_entry_c { public: /* 8025ADC0 */ virtual ~dScnPly_preLoad_HIO_c() {} diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 8a7fc7f1529..186910df6a9 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -9,6 +9,7 @@ #include "d/bg/d_bg_s_lin_chk.h" #include "d/bg/d_bg_s_wtr_chk.h" #include "d/bg/d_bg_s_roof_chk.h" +#include "m_Do/m_Do_hostIO.h" #define fopAcM_SetupActor(ptr,ClassName) \ if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ @@ -61,6 +62,17 @@ struct fopAcM_search_prm { /* 0x0A */ s8 mSubType; }; +// define to avoid vtable mess in WIP TUs +#ifndef HIO_entry_c_NO_VIRTUAL +struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { + virtual ~fOpAcm_HIO_entry_c() {} +}; +#else +struct fOpAcm_HIO_entry_c { + ~fOpAcm_HIO_entry_c(); +}; +#endif + class l_HIO { public: /* 8001E098 */ ~l_HIO() {} diff --git a/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h b/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h index e5b0afbcc4a..32c68956ff3 100644 --- a/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h +++ b/include/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h @@ -2,5 +2,88 @@ #define D_A_OBJ_BMWINDOW_H #include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" +#include "f_op/f_op_actor_mng.h" + +class daBmWindow_c : public dBgS_MoveBgActor +{ +public: + enum Mode { + WAIT, + BREAK, + BREAK_EFF, + }; + + /* 80BB8350 */ void setBaseMtx(); + /* 80BB8400 */ int CreateHeap(); + /* 80BB846C */ int create(); + /* 80BB88D8 */ int Execute(Mtx**); + /* 80BB8930 */ void windowProc(); + /* 80BB8B3C */ void init_modeWait(); + /* 80BB8B48 */ void modeWait(); + /* 80BB8FDC */ int checkActorInRectangle(fopAc_ac_c*, cXyz const*, cXyz const*); + /* 80BB90E0 */ void init_modeBreak(); + /* 80BB920C */ void modeBreak(); + /* 80BB922C */ void init_modeBreakEff(); + /* 80BB9304 */ void modeBreakEff(); + /* 80BB9324 */ void setBreakEffect(int); + /* 80BB9494 */ int Draw(); + /* 80BB9548 */ int Delete(); + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ u8 mMode; + /* 0x5B0 */ dCcD_Stts field_0x5b0; + /* 0x5B0 */ dCcD_Cyl field_0x5ec[7]; + /* 0xE98 */ u8 field_0xe90; + /* 0xE98 */ u8 field_0xe91; + /* 0xE98 */ u32 field_0xe94; + /* 0xE98 */ csXyz field_0xe98; + /* 0xEA0 */ f32 field_0xea0; + /* 0xEA0 */ f32 field_0xea4; + /* 0xEA0 */ f32 field_0xea8; + /* 0xEA0 */ f32 field_0xeac; + /* 0xEA0 */ f32 field_0xeb0; + /* 0xEA0 */ f32 field_0xeb4; + /* 0xEB8 */ cXyz field_0xeb8; + /* 0xEA0 */ f32 field_0xec4; + /* 0xEA0 */ f32 field_0xec8; + /* 0xEA0 */ f32 field_0xecc; + /* 0xEA0 */ f32 field_0xed0; + /* 0xEA0 */ f32 field_0xed4; + /* 0xEA0 */ f32 field_0xed8; + /* 0xEDC */ u16 field_0xedc; + /* 0xEDE */ u8 field_0xede; + + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; +}; + +class daBmWindow_HIO_c : public fOpAcm_HIO_entry_c { +public: + /* 80BB820C */ daBmWindow_HIO_c(); + /* 80BB964C */ virtual ~daBmWindow_HIO_c() {} + + /* 0x04 */ u8 field_0x04; + /* 0x05 */ u8 field_0x05; + /* 0x08 */ f32 field_0x08; + /* 0x0c */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ u8 field_0x38; + /* 0x39 */ u8 field_0x39; + /* 0x3A */ u8 field_0x3a; + /* 0x3B */ u8 field_0x3b; +}; #endif /* D_A_OBJ_BMWINDOW_H */ diff --git a/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp b/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp index d38cbe463ee..c33324cf9f1 100644 --- a/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp +++ b/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp @@ -1,376 +1,22 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_bmWindow +// Bm Window // #include "rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80BB8308 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct fOpAcm_HIO_entry_c { - /* 80BB82AC */ ~fOpAcm_HIO_entry_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct daBmWindow_c { - /* 80BB8350 */ void setBaseMtx(); - /* 80BB8400 */ void CreateHeap(); - /* 80BB846C */ void create(); - /* 80BB88D8 */ void Execute(f32 (**)[3][4]); - /* 80BB8930 */ void windowProc(); - /* 80BB8B3C */ void init_modeWait(); - /* 80BB8B48 */ void modeWait(); - /* 80BB8FDC */ void checkActorInRectangle(fopAc_ac_c*, cXyz const*, cXyz const*); - /* 80BB90E0 */ void init_modeBreak(); - /* 80BB920C */ void modeBreak(); - /* 80BB922C */ void init_modeBreakEff(); - /* 80BB9304 */ void modeBreakEff(); - /* 80BB9324 */ void setBreakEffect(int); - /* 80BB9494 */ void Draw(); - /* 80BB9548 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daBmWindow_HIO_c { - /* 80BB820C */ daBmWindow_HIO_c(); - /* 80BB964C */ ~daBmWindow_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -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); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80BB887C */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); - /* 80BB869C */ ~dCcD_Cyl(); - /* 80BB8768 */ dCcD_Cyl(); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80BB87EC */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80BB8834 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80BB9604 */ ~cCcD_GStts(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__16daBmWindow_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daBmWindow_cFv(); -extern "C" void CreateHeap__12daBmWindow_cFv(); -extern "C" void create__12daBmWindow_cFv(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void Execute__12daBmWindow_cFPPA3_A4_f(); -extern "C" void windowProc__12daBmWindow_cFv(); -extern "C" void init_modeWait__12daBmWindow_cFv(); -extern "C" void modeWait__12daBmWindow_cFv(); -extern "C" void checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz(); -extern "C" void init_modeBreak__12daBmWindow_cFv(); -extern "C" void modeBreak__12daBmWindow_cFv(); -extern "C" void init_modeBreakEff__12daBmWindow_cFv(); -extern "C" void modeBreakEff__12daBmWindow_cFv(); -extern "C" void setBreakEffect__12daBmWindow_cFi(); -extern "C" void Draw__12daBmWindow_cFv(); -extern "C" void Delete__12daBmWindow_cFv(); -extern "C" static void daBmWindow_Draw__FP12daBmWindow_c(); -extern "C" static void daBmWindow_Execute__FP12daBmWindow_c(); -extern "C" static void daBmWindow_Delete__FP12daBmWindow_c(); -extern "C" static void daBmWindow_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__16daBmWindow_HIO_cFv(); -extern "C" void __sinit_d_a_obj_bmWindow_cpp(); -extern "C" u8 const mCcDObjInfo__12daBmWindow_c[48]; -extern "C" extern char const* const d_a_obj_bmWindow__stringBase0; -extern "C" u8 mCcDCyl__12daBmWindow_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -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 onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cM_rndF__Ff(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_25(); -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_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -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 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BB973C-80BB9740 000000 0004+00 5/5 0/0 0/0 .rodata @3653 */ -SECTION_RODATA static f32 const lit_3653 = 90.0f; -COMPILER_STRIP_GATE(0x80BB973C, &lit_3653); - -/* 80BB9740-80BB9744 000004 0004+00 0/1 0/0 0/0 .rodata @3654 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3654 = 45.0f; -COMPILER_STRIP_GATE(0x80BB9740, &lit_3654); -#pragma pop - -/* 80BB9744-80BB9748 000008 0004+00 0/1 0/0 0/0 .rodata @3655 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3655 = 100.0f; -COMPILER_STRIP_GATE(0x80BB9744, &lit_3655); -#pragma pop - -/* 80BB9748-80BB974C 00000C 0004+00 0/1 0/0 0/0 .rodata @3656 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3656 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80BB9748, &lit_3656); -#pragma pop - -/* 80BB974C-80BB9750 000010 0004+00 0/1 0/0 0/0 .rodata @3657 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3657 = 5.0f; -COMPILER_STRIP_GATE(0x80BB974C, &lit_3657); -#pragma pop - -/* 80BB9750-80BB9754 000014 0004+00 0/1 0/0 0/0 .rodata @3658 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3658 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80BB9750, &lit_3658); -#pragma pop - -/* 80BB9754-80BB9758 000018 0004+00 0/1 0/0 0/0 .rodata @3659 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3659 = 3.0f; -COMPILER_STRIP_GATE(0x80BB9754, &lit_3659); -#pragma pop - -/* 80BB9758-80BB975C 00001C 0004+00 0/1 0/0 0/0 .rodata @3660 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3660 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80BB9758, &lit_3660); -#pragma pop - -/* 80BB975C-80BB9760 000020 0004+00 0/6 0/0 0/0 .rodata @3661 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3661 = 1.0f; -COMPILER_STRIP_GATE(0x80BB975C, &lit_3661); -#pragma pop +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_w.h" +#include "SSystem/SComponent/c_math.h" /* 80BB980C-80BB9818 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, }; /* 80BB9818-80BB982C 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, @@ -380,578 +26,377 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80BB982C-80BB9870 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daBmWindow_c */ -SECTION_DATA u8 daBmWindow_c::mCcDCyl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BB9870-80BB987C -00001 000C+00 0/1 0/0 0/0 .data @3865 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3865[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__12daBmWindow_cFv, -}; -#pragma pop - -/* 80BB987C-80BB9888 -00001 000C+00 0/1 0/0 0/0 .data @3866 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3866[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__12daBmWindow_cFv, -}; -#pragma pop - -/* 80BB9888-80BB9894 -00001 000C+00 0/1 0/0 0/0 .data @3867 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3867[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreakEff__12daBmWindow_cFv, -}; -#pragma pop - -/* 80BB9894-80BB98B8 000088 0024+00 0/1 0/0 0/0 .data mode_proc$3864 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[36] = { - 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 - -/* 80BB98B8-80BB98D8 -00001 0020+00 1/0 0/0 0/0 .data l_daBmWindow_Method */ -SECTION_DATA static void* l_daBmWindow_Method[8] = { - (void*)daBmWindow_Create__FP10fopAc_ac_c, - (void*)daBmWindow_Delete__FP12daBmWindow_c, - (void*)daBmWindow_Execute__FP12daBmWindow_c, - (void*)NULL, - (void*)daBmWindow_Draw__FP12daBmWindow_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BB98D8-80BB9908 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BmWindow */ -SECTION_DATA extern void* g_profile_Obj_BmWindow[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00420000, (void*)&g_fpcLf_Method, - (void*)0x00000EE0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02010000, (void*)&l_daBmWindow_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80BB9908-80BB9914 0000FC 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80BB9914-80BB9920 000108 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80BB9920-80BB992C 000114 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80BB992C-80BB9938 000120 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80BB9938-80BB9960 00012C 0028+00 1/1 0/0 0/0 .data __vt__12daBmWindow_c */ -SECTION_DATA extern void* __vt__12daBmWindow_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daBmWindow_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__12daBmWindow_cFPPA3_A4_f, - (void*)Draw__12daBmWindow_cFv, - (void*)Delete__12daBmWindow_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80BB9960-80BB996C 000154 000C+00 2/2 0/0 0/0 .data __vt__16daBmWindow_HIO_c */ -SECTION_DATA extern void* __vt__16daBmWindow_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daBmWindow_HIO_cFv, -}; - -/* 80BB996C-80BB9978 000160 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, -}; - -/* 80BB9978-80BB9984 00016C 000C+00 4/4 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - /* 80BB820C-80BB82AC 0000EC 00A0+00 1/1 0/0 0/0 .text __ct__16daBmWindow_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daBmWindow_HIO_c::daBmWindow_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__16daBmWindow_HIO_cFv.s" +daBmWindow_HIO_c::daBmWindow_HIO_c() { + field_0x04 = 10; + field_0x05 = 3; + field_0x0c = 90.0f; + field_0x10 = 45.0f; + field_0x08 = 100.0f; + field_0x14 = 0.05f; + field_0x18 = 5.0f; + field_0x1c = 0.1f; + field_0x20 = 90.0f; + field_0x24 = 45.0f; + field_0x28 = 3.0f; + field_0x2c = 0.01f; + field_0x30 = 5.0f; + field_0x34 = 1.0f; + field_0x38 = 60; + field_0x39 = 3; } -#pragma pop - -/* 80BB82AC-80BB8308 00018C 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__18fOpAcm_HIO_entry_cFv.s" -} -#pragma pop - -/* 80BB8308-80BB8350 0001E8 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop /* 80BB8350-80BB8400 000230 00B0+00 2/2 0/0 0/0 .text setBaseMtx__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBaseMtx__12daBmWindow_cFv.s" +void daBmWindow_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::ZXYrotM(field_0xe98.x, field_0xe98.y, field_0xe98.z); + mDoMtx_stack_c::transM(field_0xeb8.x, field_0xeb8.y, field_0xeb8.z); + mModel->setBaseScale(scale); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80BB9800-80BB9800 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BB9800 = "H_Window"; -#pragma pop /* 80BB8400-80BB846C 0002E0 006C+00 1/0 0/0 0/0 .text CreateHeap__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/CreateHeap__12daBmWindow_cFv.s" +int daBmWindow_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("H_Window", 4); + JUT_ASSERT(285, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); + return mModel != NULL ? 1 : 0; } -#pragma pop /* ############################################################################################## */ /* 80BB9760-80BB9790 000024 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__12daBmWindow_c */ -SECTION_RODATA u8 const daBmWindow_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD8, 0xFA, 0xFD, 0xBF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x00, 0x00, 0x00, 0x00, +dCcD_SrcGObjInf const daBmWindow_c::mCcDObjInfo = { + {0, {{0, 0, 0}, {0xd8fafdbf, 0x11}, {0}}}, + {1, 0, 0, 0, 0}, + {0xa, 0, 0, 0, 0xa6}, + {0}, }; -COMPILER_STRIP_GATE(0x80BB9760, &daBmWindow_c::mCcDObjInfo); /* 80BB9790-80BB97C0 000054 0030+00 0/1 0/0 0/0 .rodata l_check_area */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_check_area[48] = { - 0xC2, 0xC8, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, - 0x43, 0x91, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x91, 0x00, 0x00, - 0x43, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, +static Vec const l_check_area[4] = { + {-100.0f, -50.0f, -200.0f}, + {-100.0f, 290.0f, -200.0f}, + {100.0f, 290.0f, 200.0f}, + {100.0f, -50.0f, 200.0f}, }; -COMPILER_STRIP_GATE(0x80BB9790, &l_check_area); -#pragma pop - -/* 80BB97C0-80BB97C4 000084 0004+00 2/5 0/0 0/0 .rodata @3769 */ -SECTION_RODATA static u8 const lit_3769[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BB97C0, &lit_3769); /* 80BB846C-80BB869C 00034C 0230+00 1/1 0/0 0/0 .text create__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/create__12daBmWindow_cFv.s" +int daBmWindow_c::create() { + fopAcM_SetupActor(this, daBmWindow_c); + if (fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) { + return cPhs_ERROR_e; + } + int rv = dComIfG_resLoad(&mPhase, "H_Window"); + if (rv == cPhs_COMPLEATE_e) { + int movert = MoveBGCreate("H_Window", 7, + dBgS_MoveBGProc_TypicalRotY, 0x1d20, NULL); + if (movert == cPhs_ERROR_e) { + return 5; + } + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mModel->getModelData()); + field_0xe98.x = 0; + field_0xe98.y = 0; + field_0xe98.z = 0; + field_0xea0 = 0.0f; + field_0xeb8.x = 0.0f; + field_0xeb8.y = 0.0f; + field_0xeb8.z = 0.0f; + field_0xecc = 0.0f; + field_0xea8 = 0.0f; + field_0xea4 = 0.0f; + field_0xeac = 0.0f; + field_0xeb0 = 0.0f; + field_0xeb4 = 0.0f; + field_0xec4 = 0.0f; + field_0xec8 = 0.0f; + field_0xed0 = 0.0f; + field_0xed4 = 0.0f; + field_0xed8 = 0.0f; + + field_0xe94 = 0; + field_0xe91 = 0; + field_0xedc = 0; + field_0x5b0.Init(0xff, 1, this); + for (int i = 0; i < 7; i = i + 1) { + field_0x5ec[i].Set(mCcDCyl); + field_0x5ec[i].SetStts(&field_0x5b0); + } + field_0xe90 = (fopAcM_GetParam(this) >> 8) & 0xff; + if (field_0xe90 != 1) { + init_modeWait(); + } else { + init_modeBreakEff(); + } + field_0xede = 0; + setBaseMtx(); + } + return rv; } -#pragma pop - -/* 80BB869C-80BB8768 00057C 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_Cyl::~dCcD_Cyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8dCcD_CylFv.s" -} -#pragma pop - -/* 80BB8768-80BB87EC 000648 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_Cyl::dCcD_Cyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__ct__8dCcD_CylFv.s" -} -#pragma pop - -/* 80BB87EC-80BB8834 0006CC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80BB8834-80BB887C 000714 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80BB887C-80BB88D8 00075C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10dCcD_GSttsFv.s" -} -#pragma pop /* 80BB88D8-80BB8930 0007B8 0058+00 1/0 0/0 0/0 .text Execute__12daBmWindow_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Execute__12daBmWindow_cFPPA3_A4_f.s" +int daBmWindow_c::Execute(Mtx** param_1) { + windowProc(); + *param_1 = &mModel->getBaseTRMtx(); + field_0x5b0.Move(); + setBaseMtx(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BB97C4-80BB97C8 000088 0004+00 1/1 0/0 0/0 .rodata @3897 */ -SECTION_RODATA static u32 const lit_3897 = 0x43360B61; -COMPILER_STRIP_GATE(0x80BB97C4, &lit_3897); - -/* 80BB9990-80BB999C 000008 000C+00 1/1 0/0 0/0 .bss @3645 */ -static u8 lit_3645[12]; /* 80BB999C-80BB99D8 000014 003C+00 3/3 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[60]; +static daBmWindow_HIO_c l_HIO; -/* 80BB99D8-80BB99DC 000050 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80BB99D8[4]; +/* 80BB982C-80BB9870 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daBmWindow_c */ +dCcD_SrcCyl daBmWindow_c::mCcDCyl = { + daBmWindow_c::mCcDObjInfo, + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f, // mHeight + } // mCyl +}; /* 80BB8930-80BB8B3C 000810 020C+00 1/1 0/0 0/0 .text windowProc__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::windowProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/windowProc__12daBmWindow_cFv.s" +void daBmWindow_c::windowProc() { + typedef void (daBmWindow_c::*modeFunc)(); + static modeFunc mode_proc[3] = {&daBmWindow_c::modeWait, &daBmWindow_c::modeBreak, + &daBmWindow_c::modeBreakEff}; + (this->*mode_proc[mMode])(); + field_0xe98.z = (field_0xea0 * cM_scos(field_0xe94 * cM_deg2s(field_0xea8))); + field_0xe98.y = (field_0xea0 * cM_ssin((field_0xe94 * cM_deg2s(field_0xea4)))); + cLib_addCalc(&field_0xea0, 0.0f, field_0xeac, field_0xeb0, field_0xeb4); + field_0xeb8.x = (field_0xecc * cM_scos((field_0xe94 * cM_deg2s(field_0xec4)))); + field_0xeb8.y = (field_0xecc * cM_ssin((field_0xe94 * cM_deg2s(field_0xec8)))); + cLib_addCalc(&field_0xecc, 0.0f, field_0xed0, field_0xed4, field_0xed8); + field_0xe94++; } -#pragma pop /* 80BB8B3C-80BB8B48 000A1C 000C+00 1/1 0/0 0/0 .text init_modeWait__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeWait__12daBmWindow_cFv.s" +void daBmWindow_c::init_modeWait() { + mMode = WAIT; } -#pragma pop - -/* ############################################################################################## */ -/* 80BB97C8-80BB97CC 00008C 0004+00 0/3 0/0 0/0 .rodata @3997 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3997 = 200.0f; -COMPILER_STRIP_GATE(0x80BB97C8, &lit_3997); -#pragma pop - -/* 80BB97CC-80BB97D0 000090 0004+00 0/3 0/0 0/0 .rodata @3998 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3998 = -1.0f; -COMPILER_STRIP_GATE(0x80BB97CC, &lit_3998); -#pragma pop - -/* 80BB97D0-80BB97D4 000094 0004+00 0/1 0/0 0/0 .rodata @3999 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3999 = 30.0f; -COMPILER_STRIP_GATE(0x80BB97D0, &lit_3999); -#pragma pop - -/* 80BB97D4-80BB97D8 000098 0004+00 0/1 0/0 0/0 .rodata @4000 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4000 = 10.0f; -COMPILER_STRIP_GATE(0x80BB97D4, &lit_4000); -#pragma pop - -/* 80BB97D8-80BB97DC 00009C 0004+00 0/1 0/0 0/0 .rodata @4001 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4001 = 43.0f; -COMPILER_STRIP_GATE(0x80BB97D8, &lit_4001); -#pragma pop - -/* 80BB97DC-80BB97E0 0000A0 0004+00 0/1 0/0 0/0 .rodata @4002 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4002 = 128.0f; -COMPILER_STRIP_GATE(0x80BB97DC, &lit_4002); -#pragma pop - -/* 80BB97E0-80BB97E4 0000A4 0004+00 0/1 0/0 0/0 .rodata @4003 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4003 = 300.0f; -COMPILER_STRIP_GATE(0x80BB97E0, &lit_4003); -#pragma pop - -/* 80BB97E4-80BB97EC 0000A8 0008+00 0/1 0/0 0/0 .rodata @4005 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4005[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BB97E4, &lit_4005); -#pragma pop - -/* 80BB97EC-80BB97F4 0000B0 0008+00 0/1 0/0 0/0 .rodata @4007 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4007[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BB97EC, &lit_4007); -#pragma pop /* 80BB8B48-80BB8FDC 000A28 0494+00 1/0 0/0 0/0 .text modeWait__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeWait__12daBmWindow_cFv.s" +void daBmWindow_c::modeWait() { + daPy_py_c* player = (daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); + cXyz cStack_2c; + cXyz cStack_38; + cStack_2c = l_check_area[0]; + cStack_38 = l_check_area[2]; + if (player->checkWolfDashAutoJump() || player->checkWolfDash() || player->checkFrontRoll()) + { + if (checkActorInRectangle(player, &cStack_2c, &cStack_38)) { + init_modeBreak(); + } + } + if (player->checkAutoJump()) { + if (checkActorInRectangle(player, &cStack_2c, &cStack_38)) { + if (daPy_py_c::i_checkNowWolf()) { + if (field_0xede == 0) { + cXyz soundPos(current.pos); + soundPos.z -= 200.0f; + mDoAud_seStart(Z2SE_OBJ_MADO_NOT_BREAK, &soundPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + field_0xede = 1; + } + } else { + init_modeBreak(); + } + } + } else { + field_0xede = 0; + } + for (int i = 0; i < 7; i++) { + if (field_0x5ec[i].ChkTgHit()) { + init_modeBreak(); + break; + } + } + + if (field_0xedc == 0) { + field_0xea0 = l_HIO.field_0x08; + field_0xea8 = l_HIO.field_0x10; + field_0xea4 = l_HIO.field_0x0c; + field_0xeac = l_HIO.field_0x14; + field_0xeb0 = l_HIO.field_0x18; + field_0xeb4 = l_HIO.field_0x1c; + field_0xecc = l_HIO.field_0x28; + field_0xec4 = l_HIO.field_0x20; + field_0xec8 = l_HIO.field_0x24; + field_0xed0 = l_HIO.field_0x2c; + field_0xed4 = l_HIO.field_0x30; + field_0xed8 = l_HIO.field_0x34; + int rnd = (cM_rndF(l_HIO.field_0x39 / 10.0f) * 10.0f) * 30.0f; + field_0xedc = l_HIO.field_0x38 + rnd; + cXyz soundPos(current.pos); + soundPos.z -= 200.0f; + mDoAud_seStart(Z2SE_OBJ_MADO_YURE, &soundPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + if (field_0xedc != 0) { + field_0xedc--; + } + for (int i = 0; i < 7; i++) { + cXyz local_5c(0.0f, 0.0f, 0.0f); + local_5c.x = i * 43.0f - 128.0f; + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&local_5c, &local_5c); + cXyz cStack_68(current.pos); + cStack_68 += local_5c; + field_0x5ec[i].SetR(30.0f); + field_0x5ec[i].SetH(300.0f); + field_0x5ec[i].SetC(cStack_68); + dComIfG_Ccsp()->Set(&field_0x5ec[i]); + field_0x5ec[i].ClrTgHit(); + } } -#pragma pop /* 80BB8FDC-80BB90E0 000EBC 0104+00 1/1 0/0 0/0 .text * checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::checkActorInRectangle(fopAc_ac_c* param_0, cXyz const* param_1, - cXyz const* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz.s" +int daBmWindow_c::checkActorInRectangle(fopAc_ac_c* i_actor, cXyz const* i_topLeft, + cXyz const* i_bottomRight) { + cXyz actorDist = i_actor->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&actorDist, &actorDist); + if (i_topLeft->x <= actorDist.x && actorDist.x <= i_bottomRight->x && + i_topLeft->y <= actorDist.y && actorDist.y <= i_bottomRight->y && + i_topLeft->z <= actorDist.z && actorDist.z <= i_bottomRight->z) + { + return 1; + } else { + return 0; + } } -#pragma pop /* 80BB90E0-80BB920C 000FC0 012C+00 1/1 0/0 0/0 .text init_modeBreak__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::init_modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreak__12daBmWindow_cFv.s" +void daBmWindow_c::init_modeBreak() { + if (mpBgW != NULL) { + dComIfG_Bgsp().Release(mpBgW); + } + setBreakEffect(0); + dComIfGp_getVibration().StartShock(l_HIO.field_0x05, 0xf, cXyz(0.0f, 1.0f, 0.0f)); + cXyz soundPos(current.pos); + soundPos.z -= 200.0f; + mDoAud_seStart(Z2SE_OBJ_GLASSWINDOW_BREAK, &soundPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + mMode = BREAK; } -#pragma pop /* 80BB920C-80BB922C 0010EC 0020+00 1/0 0/0 0/0 .text modeBreak__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreak__12daBmWindow_cFv.s" +void daBmWindow_c::modeBreak() { + fopAcM_delete(this); } -#pragma pop /* 80BB922C-80BB9304 00110C 00D8+00 1/1 0/0 0/0 .text init_modeBreakEff__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::init_modeBreakEff() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/init_modeBreakEff__12daBmWindow_cFv.s" +// Matches with literals +void daBmWindow_c::init_modeBreakEff() { + cXyz soundPos(current.pos); + soundPos.z -= 200.0f; + mDoAud_seStart(Z2SE_OBJ_MADO_BREAK_PRPR, &soundPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + setBreakEffect(1); + fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + mMode = BREAK_EFF; } -#pragma pop /* 80BB9304-80BB9324 0011E4 0020+00 1/0 0/0 0/0 .text modeBreakEff__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::modeBreakEff() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/modeBreakEff__12daBmWindow_cFv.s" +void daBmWindow_c::modeBreakEff() { + fopAcM_delete(this); } -#pragma pop /* ############################################################################################## */ /* 80BB97F4-80BB9800 0000B8 000C+00 0/1 0/0 0/0 .rodata particle_id$4102 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const particle_id[12] = { - 0x85, 0x06, 0x85, 0x07, 0x85, 0x08, 0x85, 0x09, 0x85, 0x0A, 0x85, 0x0B, +static u16 const particle_id[6] = { + 0x8506, 0x8507, 0x8508, 0x8509, 0x850A, 0x850B, }; -COMPILER_STRIP_GATE(0x80BB97F4, &particle_id); -#pragma pop /* 80BB9324-80BB9494 001204 0170+00 2/2 0/0 0/0 .text setBreakEffect__12daBmWindow_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::setBreakEffect(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/setBreakEffect__12daBmWindow_cFi.s" +void daBmWindow_c::setBreakEffect(int param_1) { + cXyz cStack_2c(current.pos); + csXyz cStack_40(shape_angle); + if (param_1 == 0) { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz playerDist = player->current.pos - current.pos; + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&playerDist, &playerDist); + if (playerDist.z < 0.0f) { + cStack_40.y += 0x8000; + } + } else { + cStack_40.y += 0x8000; + } + int temp = param_1 * 3; + for (int i = temp; i < temp + 3; i++) { + dComIfGp_particle_set(particle_id[i], &cStack_2c, &cStack_40, &scale, 0xff, 0, 0xffffffff, + NULL, NULL, NULL); + } } -#pragma pop /* 80BB9494-80BB9548 001374 00B4+00 1/0 0/0 0/0 .text Draw__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Draw__12daBmWindow_cFv.s" +int daBmWindow_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + fopAcM_setEffectMtx(this, mModel->getModelData()); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80BB9548-80BB9578 001428 0030+00 1/0 0/0 0/0 .text Delete__12daBmWindow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daBmWindow_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/Delete__12daBmWindow_cFv.s" +int daBmWindow_c::Delete() { + dComIfG_resDelete(&mPhase, "H_Window"); + return 1; } -#pragma pop /* 80BB9578-80BB95A4 001458 002C+00 1/0 0/0 0/0 .text daBmWindow_Draw__FP12daBmWindow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBmWindow_Draw(daBmWindow_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Draw__FP12daBmWindow_c.s" +static int daBmWindow_Draw(daBmWindow_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80BB95A4-80BB95C4 001484 0020+00 1/0 0/0 0/0 .text daBmWindow_Execute__FP12daBmWindow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBmWindow_Execute(daBmWindow_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Execute__FP12daBmWindow_c.s" +static int daBmWindow_Execute(daBmWindow_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80BB95C4-80BB95E4 0014A4 0020+00 1/0 0/0 0/0 .text daBmWindow_Delete__FP12daBmWindow_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBmWindow_Delete(daBmWindow_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Delete__FP12daBmWindow_c.s" +static int daBmWindow_Delete(daBmWindow_c* i_this) { + fopAcM_GetID(i_this); + return i_this->MoveBGDelete(); } -#pragma pop /* 80BB95E4-80BB9604 0014C4 0020+00 1/0 0/0 0/0 .text daBmWindow_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daBmWindow_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/daBmWindow_Create__FP10fopAc_ac_c.s" +static int daBmWindow_Create(fopAc_ac_c* i_this) { + fopAcM_GetID(i_this); + return static_cast(i_this)->create(); } -#pragma pop -/* 80BB9604-80BB964C 0014E4 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__10cCcD_GSttsFv.s" -} -#pragma pop +/* 80BB98B8-80BB98D8 -00001 0020+00 1/0 0/0 0/0 .data l_daBmWindow_Method */ +static actor_method_class l_daBmWindow_Method = { + (process_method_func)daBmWindow_Create, (process_method_func)daBmWindow_Delete, + (process_method_func)daBmWindow_Execute, (process_method_func)NULL, + (process_method_func)daBmWindow_Draw, +}; -/* 80BB964C-80BB96B8 00152C 006C+00 2/1 0/0 0/0 .text __dt__16daBmWindow_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daBmWindow_HIO_c::~daBmWindow_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__dt__16daBmWindow_HIO_cFv.s" -} -#pragma pop - -/* 80BB96B8-80BB9728 001598 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_bmWindow_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_bmWindow_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow/__sinit_d_a_obj_bmWindow_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80BB96B8, __sinit_d_a_obj_bmWindow_cpp); -#pragma pop +/* 80BB98D8-80BB9908 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_BmWindow */ +extern actor_process_profile_definition g_profile_Obj_BmWindow = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_BmWindow, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daBmWindow_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 513, // mPriority + &l_daBmWindow_Method, // sub_method + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; /* 80BB9800-80BB9800 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc index 7cf3fc43610..776af7a91a9 100644 --- a/src/d/a/d_a_alink_wolf.inc +++ b/src/d/a/d_a_alink_wolf.inc @@ -2205,7 +2205,7 @@ int daAlink_c::procWolfAutoJumpInit(int param_0) { var_f31 = daAlinkHIO_wlAutoJump_c0::m.field_0x48; var_f30 = daAlinkHIO_wlAutoJump_c0::m.field_0x4c; var_r30 = daAlinkHIO_wlAutoJump_c0::m.field_0x40; - onNoResetFlg2(FLG2_UNK_10000); + onNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); } else { var_f1 = daAlinkHIO_wlAutoJump_c0::m.field_0x60; field_0x594 = daAlinkHIO_wlAutoJump_c0::m.field_0x74; diff --git a/src/d/a/d_a_npc_cd.cpp b/src/d/a/d_a_npc_cd.cpp index 694e3e34ea6..8ad9b57e530 100644 --- a/src/d/a/d_a_npc_cd.cpp +++ b/src/d/a/d_a_npc_cd.cpp @@ -3,6 +3,8 @@ // Translation Unit: a/npc/d_a_npc_cd // +#define HIO_entry_c_NO_VIRTUAL + #include "d/a/d_a_npc_cd.h" #include "dol2asm.h" @@ -10,14 +12,6 @@ // Types: // -struct mDoHIO_entry_c { - /* 8015791C */ ~mDoHIO_entry_c(); -}; - -struct fOpAcm_HIO_entry_c { - /* 801578C0 */ ~fOpAcm_HIO_entry_c(); -}; - struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; @@ -1560,7 +1554,8 @@ asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +asm void __dt__14mDoHIO_entry_cFv() { +//asm mDoHIO_entry_c::~mDoHIO_entry_c() { nofralloc #include "asm/a/npc/d_a_npc_cd/__dt__14mDoHIO_entry_cFv.s" }