From 3172c9d640427be3e8f70ac7e1faa850d040f604 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Wed, 10 Apr 2024 23:34:53 +0300 Subject: [PATCH] daE_OctBg_c OK (#2121) * daE_OctBg_c OK * Rename data * Remove comments --- .../CreateHeap__11daE_OctBg_cFv.s | 121 - ...JointCallBack__11daE_OctBg_cFP8J3DJointi.s | 21 - .../d_a_e_oct_bg/__ct__15daE_OctBg_HIO_cFv.s | 25 - .../d_a_e_oct_bg/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_e_oct_bg/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_e_oct_bg/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_e_oct_bg/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_e_oct_bg/__dt__12dBgS_ObjAcchFv.s | 30 - .../d_a_e_oct_bg/__dt__15daE_OctBg_HIO_cFv.s | 20 - .../d_a_e_oct_bg/__dt__8cM3dGAabFv.s | 20 - .../d_a_e_oct_bg/__dt__8cM3dGSphFv.s | 20 - .../d_a_e_oct_bg/__sinit_d_a_e_oct_bg_cpp.s | 16 - .../d_a_e_oct_bg/_delete__11daE_OctBg_cFv.s | 29 - .../d_a_e_oct_bg/action__11daE_OctBg_cFv.s | 212 -- .../d_a_e_oct_bg/back_swim__11daE_OctBg_cFv.s | 132 - .../d_a_e_oct_bg/bomb_wait__11daE_OctBg_cFv.s | 140 - .../d_a_e_oct_bg/born_swim__11daE_OctBg_cFv.s | 132 - .../d_a_e_oct_bg/cc_set__11daE_OctBg_cFv.s | 109 - .../chase_core__11daE_OctBg_cFv.s | 401 --- .../checkChase__11daE_OctBg_cFv.s | 38 - .../checkCoreFishAttack__11daE_OctBg_cFv.s | 23 - .../checkExplode__11daE_OctBg_cFv.s | 72 - .../checkNormalAttack__11daE_OctBg_cFv.s | 139 - .../core_fish_attack__11daE_OctBg_cFv.s | 400 --- .../d_a_e_oct_bg/create__11daE_OctBg_cFv.s | 239 -- ...oint__11daE_OctBg_cFP8J3DJointP8J3DModel.s | 63 - .../daE_OctBg_Create__FP11daE_OctBg_c.s | 9 - .../daE_OctBg_Delete__FP11daE_OctBg_c.s | 9 - .../daE_OctBg_Draw__FP11daE_OctBg_c.s | 9 - .../daE_OctBg_Execute__FP11daE_OctBg_c.s | 9 - .../daE_OctBg_IsDelete__FP11daE_OctBg_c.s | 47 - .../d_a_e_oct_bg/damage__11daE_OctBg_cFv.s | 128 - .../damage_check__11daE_OctBg_cFv.s | 148 -- .../d_a_e_oct_bg/draw__11daE_OctBg_cFv.s | 130 - .../d_a_e_oct_bg/execute__11daE_OctBg_cFv.s | 21 - .../d_a_e_oct_bg/d_a_e_oct_bg/func_80739D3C.s | 3 - .../d_a_e_oct_bg/d_a_e_oct_bg/func_80739D44.s | 3 - .../d_a_e_oct_bg/hook__11daE_OctBg_cFv.s | 29 - .../d_a_e_oct_bg/mtx_set__11daE_OctBg_cFv.s | 84 - .../normal_attack__11daE_OctBg_cFv.s | 341 --- ...on__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v.s | 43 - .../setBombCarry__11daE_OctBg_cFi.s | 58 - .../setChasePos__11daE_OctBg_cFR4cXyzf.s | 47 - .../setSparkEffect__11daE_OctBg_cFv.s | 69 - .../d_a_e_oct_bg/swim__11daE_OctBg_cFv.s | 359 --- .../useHeapInit__FP10fopAc_ac_c.s | 9 - include/d/d_bomb.h | 12 + include/f_op/f_op_actor_mng.h | 4 + include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h | 98 + rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp | 2330 ++++++----------- 50 files changed, 935 insertions(+), 5562 deletions(-) delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/CreateHeap__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/JointCallBack__11daE_OctBg_cFP8J3DJointi.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__ct__15daE_OctBg_HIO_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__15daE_OctBg_HIO_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__sinit_d_a_e_oct_bg_cpp.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/_delete__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/action__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/back_swim__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/bomb_wait__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/born_swim__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/cc_set__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/chase_core__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkChase__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkCoreFishAttack__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkExplode__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkNormalAttack__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/core_fish_attack__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/create__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Create__FP11daE_OctBg_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Delete__FP11daE_OctBg_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Draw__FP11daE_OctBg_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Execute__FP11daE_OctBg_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_IsDelete__FP11daE_OctBg_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/draw__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/execute__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D3C.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D44.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/hook__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/mtx_set__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/normal_attack__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setBombCarry__11daE_OctBg_cFi.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setChasePos__11daE_OctBg_cFR4cXyzf.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setSparkEffect__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/swim__11daE_OctBg_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/useHeapInit__FP10fopAc_ac_c.s diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/CreateHeap__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/CreateHeap__11daE_OctBg_cFv.s deleted file mode 100644 index 0effafba0e6..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/CreateHeap__11daE_OctBg_cFv.s +++ /dev/null @@ -1,121 +0,0 @@ -lbl_8073921C: -/* 8073921C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80739220 7C 08 02 A6 */ mflr r0 -/* 80739224 90 01 00 34 */ stw r0, 0x34(r1) -/* 80739228 39 61 00 30 */ addi r11, r1, 0x30 -/* 8073922C 4B C2 8F AD */ bl _savegpr_28 -/* 80739230 7C 7D 1B 78 */ mr r29, r3 -/* 80739234 3C 60 80 74 */ lis r3, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 80739238 38 63 9E 44 */ addi r3, r3, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 8073923C 38 80 00 0A */ li r4, 0xa -/* 80739240 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80739244 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80739248 3F E5 00 02 */ addis r31, r5, 2 -/* 8073924C 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80739250 7F E5 FB 78 */ mr r5, r31 -/* 80739254 38 C0 00 80 */ li r6, 0x80 -/* 80739258 4B 90 30 95 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8073925C 7C 7E 1B 78 */ mr r30, r3 -/* 80739260 38 60 00 58 */ li r3, 0x58 -/* 80739264 4B B9 59 E9 */ bl __nw__FUl -/* 80739268 7C 7C 1B 79 */ or. r28, r3, r3 -/* 8073926C 41 82 00 68 */ beq lbl_807392D4 -/* 80739270 3C 60 80 74 */ lis r3, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 80739274 38 63 9E 44 */ addi r3, r3, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 80739278 38 80 00 07 */ li r4, 7 -/* 8073927C 7F E5 FB 78 */ mr r5, r31 -/* 80739280 38 C0 00 80 */ li r6, 0x80 -/* 80739284 4B 90 30 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80739288 7C 67 1B 78 */ mr r7, r3 -/* 8073928C 38 1D 05 BC */ addi r0, r29, 0x5bc -/* 80739290 90 01 00 08 */ stw r0, 8(r1) -/* 80739294 3C 00 00 08 */ lis r0, 8 -/* 80739298 90 01 00 0C */ stw r0, 0xc(r1) -/* 8073929C 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 807392A0 38 03 00 84 */ addi r0, r3, 0x0084 /* 0x11000084@l */ -/* 807392A4 90 01 00 10 */ stw r0, 0x10(r1) -/* 807392A8 7F 83 E3 78 */ mr r3, r28 -/* 807392AC 7F C4 F3 78 */ mr r4, r30 -/* 807392B0 38 A0 00 00 */ li r5, 0 -/* 807392B4 38 C0 00 00 */ li r6, 0 -/* 807392B8 39 00 00 00 */ li r8, 0 -/* 807392BC 3D 20 80 74 */ lis r9, lit_3823@ha /* 0x80739D78@ha */ -/* 807392C0 C0 29 9D 78 */ lfs f1, lit_3823@l(r9) /* 0x80739D78@l */ -/* 807392C4 39 20 00 00 */ li r9, 0 -/* 807392C8 39 40 FF FF */ li r10, -1 -/* 807392CC 4B 8D 75 05 */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 807392D0 7C 7C 1B 78 */ mr r28, r3 -lbl_807392D4: -/* 807392D4 93 9D 05 B4 */ stw r28, 0x5b4(r29) -/* 807392D8 80 7D 05 B4 */ lwz r3, 0x5b4(r29) -/* 807392DC 28 03 00 00 */ cmplwi r3, 0 -/* 807392E0 41 82 00 10 */ beq lbl_807392F0 -/* 807392E4 83 C3 00 04 */ lwz r30, 4(r3) -/* 807392E8 28 1E 00 00 */ cmplwi r30, 0 -/* 807392EC 40 82 00 0C */ bne lbl_807392F8 -lbl_807392F0: -/* 807392F0 38 60 00 00 */ li r3, 0 -/* 807392F4 48 00 00 D0 */ b lbl_807393C4 -lbl_807392F8: -/* 807392F8 93 BE 00 14 */ stw r29, 0x14(r30) -/* 807392FC 38 C0 00 01 */ li r6, 1 -/* 80739300 3C 60 80 74 */ lis r3, JointCallBack__11daE_OctBg_cFP8J3DJointi@ha /* 0x807391D0@ha */ -/* 80739304 38 83 91 D0 */ addi r4, r3, JointCallBack__11daE_OctBg_cFP8J3DJointi@l /* 0x807391D0@l */ -/* 80739308 48 00 00 18 */ b lbl_80739320 -lbl_8073930C: -/* 8073930C 80 65 00 28 */ lwz r3, 0x28(r5) -/* 80739310 54 C0 13 BA */ rlwinm r0, r6, 2, 0xe, 0x1d -/* 80739314 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80739318 90 83 00 04 */ stw r4, 4(r3) -/* 8073931C 38 C6 00 01 */ addi r6, r6, 1 -lbl_80739320: -/* 80739320 80 BE 00 04 */ lwz r5, 4(r30) -/* 80739324 A0 65 00 2C */ lhz r3, 0x2c(r5) -/* 80739328 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 8073932C 7C 00 18 40 */ cmplw r0, r3 -/* 80739330 41 80 FF DC */ blt lbl_8073930C -/* 80739334 38 60 00 18 */ li r3, 0x18 -/* 80739338 4B B9 59 15 */ bl __nw__FUl -/* 8073933C 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80739340 41 82 00 20 */ beq lbl_80739360 -/* 80739344 3C 80 80 74 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x8073A0DC@ha */ -/* 80739348 38 04 A0 DC */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x8073A0DC@l */ -/* 8073934C 90 1C 00 00 */ stw r0, 0(r28) -/* 80739350 38 80 00 00 */ li r4, 0 -/* 80739354 4B BE F0 A9 */ bl init__12J3DFrameCtrlFs -/* 80739358 38 00 00 00 */ li r0, 0 -/* 8073935C 90 1C 00 14 */ stw r0, 0x14(r28) -lbl_80739360: -/* 80739360 93 9D 05 B8 */ stw r28, 0x5b8(r29) -/* 80739364 80 1D 05 B8 */ lwz r0, 0x5b8(r29) -/* 80739368 28 00 00 00 */ cmplwi r0, 0 -/* 8073936C 40 82 00 0C */ bne lbl_80739378 -/* 80739370 38 60 00 00 */ li r3, 0 -/* 80739374 48 00 00 50 */ b lbl_807393C4 -lbl_80739378: -/* 80739378 3C 60 80 74 */ lis r3, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 8073937C 38 63 9E 44 */ addi r3, r3, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 80739380 38 80 00 0D */ li r4, 0xd -/* 80739384 7F E5 FB 78 */ mr r5, r31 -/* 80739388 38 C0 00 80 */ li r6, 0x80 -/* 8073938C 4B 90 2F 61 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80739390 7C 65 1B 78 */ mr r5, r3 -/* 80739394 80 9E 00 04 */ lwz r4, 4(r30) -/* 80739398 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 8073939C 38 84 00 58 */ addi r4, r4, 0x58 -/* 807393A0 38 C0 00 01 */ li r6, 1 -/* 807393A4 38 E0 00 00 */ li r7, 0 -/* 807393A8 3D 00 80 74 */ lis r8, lit_3823@ha /* 0x80739D78@ha */ -/* 807393AC C0 28 9D 78 */ lfs f1, lit_3823@l(r8) /* 0x80739D78@l */ -/* 807393B0 39 00 00 00 */ li r8, 0 -/* 807393B4 39 20 FF FF */ li r9, -1 -/* 807393B8 4B 8D 43 55 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 807393BC 30 03 FF FF */ addic r0, r3, -1 -/* 807393C0 7C 60 19 10 */ subfe r3, r0, r3 -lbl_807393C4: -/* 807393C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 807393C8 4B C2 8E 5D */ bl _restgpr_28 -/* 807393CC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 807393D0 7C 08 03 A6 */ mtlr r0 -/* 807393D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 807393D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/JointCallBack__11daE_OctBg_cFP8J3DJointi.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/JointCallBack__11daE_OctBg_cFP8J3DJointi.s deleted file mode 100644 index 2358ce86cca..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/JointCallBack__11daE_OctBg_cFP8J3DJointi.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_807391D0: -/* 807391D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807391D4 7C 08 02 A6 */ mflr r0 -/* 807391D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 807391DC 7C 60 1B 78 */ mr r0, r3 -/* 807391E0 2C 04 00 00 */ cmpwi r4, 0 -/* 807391E4 40 82 00 24 */ bne lbl_80739208 -/* 807391E8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 807391EC 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 807391F0 80 A3 00 38 */ lwz r5, 0x38(r3) -/* 807391F4 80 65 00 14 */ lwz r3, 0x14(r5) -/* 807391F8 28 03 00 00 */ cmplwi r3, 0 -/* 807391FC 41 82 00 0C */ beq lbl_80739208 -/* 80739200 7C 04 03 78 */ mr r4, r0 -/* 80739204 4B FF FE E1 */ bl ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel -lbl_80739208: -/* 80739208 38 60 00 01 */ li r3, 1 -/* 8073920C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739210 7C 08 03 A6 */ mtlr r0 -/* 80739214 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739218 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__ct__15daE_OctBg_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__ct__15daE_OctBg_HIO_cFv.s deleted file mode 100644 index 1a1f30bb381..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__ct__15daE_OctBg_HIO_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8073620C: -/* 8073620C 3C 80 80 74 */ lis r4, lit_3768@ha /* 0x80739D60@ha */ -/* 80736210 38 A4 9D 60 */ addi r5, r4, lit_3768@l /* 0x80739D60@l */ -/* 80736214 3C 80 80 74 */ lis r4, __vt__15daE_OctBg_HIO_c@ha /* 0x8073A0E8@ha */ -/* 80736218 38 04 A0 E8 */ addi r0, r4, __vt__15daE_OctBg_HIO_c@l /* 0x8073A0E8@l */ -/* 8073621C 90 03 00 00 */ stw r0, 0(r3) -/* 80736220 38 00 FF FF */ li r0, -1 -/* 80736224 98 03 00 04 */ stb r0, 4(r3) -/* 80736228 C0 05 00 00 */ lfs f0, 0(r5) -/* 8073622C D0 03 00 08 */ stfs f0, 8(r3) -/* 80736230 C0 05 00 04 */ lfs f0, 4(r5) -/* 80736234 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80736238 C0 05 00 08 */ lfs f0, 8(r5) -/* 8073623C D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80736240 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 80736244 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80736248 C0 05 00 10 */ lfs f0, 0x10(r5) -/* 8073624C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80736250 C0 05 00 14 */ lfs f0, 0x14(r5) -/* 80736254 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80736258 38 00 00 00 */ li r0, 0 -/* 8073625C 98 03 00 21 */ stb r0, 0x21(r3) -/* 80736260 38 00 00 01 */ li r0, 1 -/* 80736264 98 03 00 20 */ stb r0, 0x20(r3) -/* 80736268 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 192acf9e68b..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80739C70: -/* 80739C70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739C74 7C 08 02 A6 */ mflr r0 -/* 80739C78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739C7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80739C80 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80739C84 41 82 00 1C */ beq lbl_80739CA0 -/* 80739C88 3C A0 80 74 */ lis r5, __vt__10cCcD_GStts@ha /* 0x8073A088@ha */ -/* 80739C8C 38 05 A0 88 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x8073A088@l */ -/* 80739C90 90 1F 00 00 */ stw r0, 0(r31) -/* 80739C94 7C 80 07 35 */ extsh. r0, r4 -/* 80739C98 40 81 00 08 */ ble lbl_80739CA0 -/* 80739C9C 4B B9 50 A1 */ bl __dl__FPv -lbl_80739CA0: -/* 80739CA0 7F E3 FB 78 */ mr r3, r31 -/* 80739CA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739CA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739CAC 7C 08 03 A6 */ mtlr r0 -/* 80739CB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739CB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 44b484f2c98..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80739848: -/* 80739848 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8073984C 7C 08 02 A6 */ mflr r0 -/* 80739850 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739854 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80739858 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8073985C 41 82 00 30 */ beq lbl_8073988C -/* 80739860 3C 60 80 74 */ lis r3, __vt__10dCcD_GStts@ha /* 0x8073A094@ha */ -/* 80739864 38 03 A0 94 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x8073A094@l */ -/* 80739868 90 1F 00 00 */ stw r0, 0(r31) -/* 8073986C 41 82 00 10 */ beq lbl_8073987C -/* 80739870 3C 60 80 74 */ lis r3, __vt__10cCcD_GStts@ha /* 0x8073A088@ha */ -/* 80739874 38 03 A0 88 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x8073A088@l */ -/* 80739878 90 1F 00 00 */ stw r0, 0(r31) -lbl_8073987C: -/* 8073987C 7C 80 07 35 */ extsh. r0, r4 -/* 80739880 40 81 00 0C */ ble lbl_8073988C -/* 80739884 7F E3 FB 78 */ mr r3, r31 -/* 80739888 4B B9 54 B5 */ bl __dl__FPv -lbl_8073988C: -/* 8073988C 7F E3 FB 78 */ mr r3, r31 -/* 80739890 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739894 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739898 7C 08 03 A6 */ mtlr r0 -/* 8073989C 38 21 00 10 */ addi r1, r1, 0x10 -/* 807398A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index e9a9b82886a..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_807393DC: -/* 807393DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807393E0 7C 08 02 A6 */ mflr r0 -/* 807393E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 807393E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807393EC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 807393F0 41 82 00 1C */ beq lbl_8073940C -/* 807393F4 3C A0 80 74 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x8073A0DC@ha */ -/* 807393F8 38 05 A0 DC */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x8073A0DC@l */ -/* 807393FC 90 1F 00 00 */ stw r0, 0(r31) -/* 80739400 7C 80 07 35 */ extsh. r0, r4 -/* 80739404 40 81 00 08 */ ble lbl_8073940C -/* 80739408 4B B9 59 35 */ bl __dl__FPv -lbl_8073940C: -/* 8073940C 7F E3 FB 78 */ mr r3, r31 -/* 80739410 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739414 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739418 7C 08 03 A6 */ mtlr r0 -/* 8073941C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739420 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 0b99a8dffa0..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80739914: -/* 80739914 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739918 7C 08 02 A6 */ mflr r0 -/* 8073991C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739920 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80739924 93 C1 00 08 */ stw r30, 8(r1) -/* 80739928 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8073992C 7C 9F 23 78 */ mr r31, r4 -/* 80739930 41 82 00 38 */ beq lbl_80739968 -/* 80739934 3C 60 80 74 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x8073A07C@ha */ -/* 80739938 38 03 A0 7C */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x8073A07C@l */ -/* 8073993C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80739940 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80739944 38 80 FF FF */ li r4, -1 -/* 80739948 4B B3 55 D1 */ bl __dt__8cM3dGCirFv -/* 8073994C 7F C3 F3 78 */ mr r3, r30 -/* 80739950 38 80 00 00 */ li r4, 0 -/* 80739954 4B B2 E7 5D */ bl __dt__13cBgS_PolyInfoFv -/* 80739958 7F E0 07 35 */ extsh. r0, r31 -/* 8073995C 40 81 00 0C */ ble lbl_80739968 -/* 80739960 7F C3 F3 78 */ mr r3, r30 -/* 80739964 4B B9 53 D9 */ bl __dl__FPv -lbl_80739968: -/* 80739968 7F C3 F3 78 */ mr r3, r30 -/* 8073996C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739970 83 C1 00 08 */ lwz r30, 8(r1) -/* 80739974 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739978 7C 08 03 A6 */ mtlr r0 -/* 8073997C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739980 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 96f8281f3a6..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_807398A4: -/* 807398A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807398A8 7C 08 02 A6 */ mflr r0 -/* 807398AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 807398B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807398B4 93 C1 00 08 */ stw r30, 8(r1) -/* 807398B8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 807398BC 7C 9F 23 78 */ mr r31, r4 -/* 807398C0 41 82 00 38 */ beq lbl_807398F8 -/* 807398C4 3C 80 80 74 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x8073A0B8@ha */ -/* 807398C8 38 84 A0 B8 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x8073A0B8@l */ -/* 807398CC 90 9E 00 10 */ stw r4, 0x10(r30) -/* 807398D0 38 04 00 0C */ addi r0, r4, 0xc -/* 807398D4 90 1E 00 14 */ stw r0, 0x14(r30) -/* 807398D8 38 04 00 18 */ addi r0, r4, 0x18 -/* 807398DC 90 1E 00 24 */ stw r0, 0x24(r30) -/* 807398E0 38 80 00 00 */ li r4, 0 -/* 807398E4 4B 93 C6 B1 */ bl __dt__9dBgS_AcchFv -/* 807398E8 7F E0 07 35 */ extsh. r0, r31 -/* 807398EC 40 81 00 0C */ ble lbl_807398F8 -/* 807398F0 7F C3 F3 78 */ mr r3, r30 -/* 807398F4 4B B9 54 49 */ bl __dl__FPv -lbl_807398F8: -/* 807398F8 7F C3 F3 78 */ mr r3, r30 -/* 807398FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739900 83 C1 00 08 */ lwz r30, 8(r1) -/* 80739904 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739908 7C 08 03 A6 */ mtlr r0 -/* 8073990C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739910 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__15daE_OctBg_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__15daE_OctBg_HIO_cFv.s deleted file mode 100644 index 852dd44c48c..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__15daE_OctBg_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80739CB8: -/* 80739CB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739CBC 7C 08 02 A6 */ mflr r0 -/* 80739CC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739CC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80739CC8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80739CCC 41 82 00 1C */ beq lbl_80739CE8 -/* 80739CD0 3C A0 80 74 */ lis r5, __vt__15daE_OctBg_HIO_c@ha /* 0x8073A0E8@ha */ -/* 80739CD4 38 05 A0 E8 */ addi r0, r5, __vt__15daE_OctBg_HIO_c@l /* 0x8073A0E8@l */ -/* 80739CD8 90 1F 00 00 */ stw r0, 0(r31) -/* 80739CDC 7C 80 07 35 */ extsh. r0, r4 -/* 80739CE0 40 81 00 08 */ ble lbl_80739CE8 -/* 80739CE4 4B B9 50 59 */ bl __dl__FPv -lbl_80739CE8: -/* 80739CE8 7F E3 FB 78 */ mr r3, r31 -/* 80739CEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739CF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739CF4 7C 08 03 A6 */ mtlr r0 -/* 80739CF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739CFC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGAabFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGAabFv.s deleted file mode 100644 index c71f2cf1adc..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80739800: -/* 80739800 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739804 7C 08 02 A6 */ mflr r0 -/* 80739808 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073980C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80739810 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80739814 41 82 00 1C */ beq lbl_80739830 -/* 80739818 3C A0 80 74 */ lis r5, __vt__8cM3dGAab@ha /* 0x8073A0AC@ha */ -/* 8073981C 38 05 A0 AC */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8073A0AC@l */ -/* 80739820 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80739824 7C 80 07 35 */ extsh. r0, r4 -/* 80739828 40 81 00 08 */ ble lbl_80739830 -/* 8073982C 4B B9 55 11 */ bl __dl__FPv -lbl_80739830: -/* 80739830 7F E3 FB 78 */ mr r3, r31 -/* 80739834 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739838 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073983C 7C 08 03 A6 */ mtlr r0 -/* 80739840 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739844 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGSphFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGSphFv.s deleted file mode 100644 index 3621f46f305..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_807397B8: -/* 807397B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807397BC 7C 08 02 A6 */ mflr r0 -/* 807397C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 807397C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807397C8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 807397CC 41 82 00 1C */ beq lbl_807397E8 -/* 807397D0 3C A0 80 74 */ lis r5, __vt__8cM3dGSph@ha /* 0x8073A0A0@ha */ -/* 807397D4 38 05 A0 A0 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x8073A0A0@l */ -/* 807397D8 90 1F 00 10 */ stw r0, 0x10(r31) -/* 807397DC 7C 80 07 35 */ extsh. r0, r4 -/* 807397E0 40 81 00 08 */ ble lbl_807397E8 -/* 807397E4 4B B9 55 59 */ bl __dl__FPv -lbl_807397E8: -/* 807397E8 7F E3 FB 78 */ mr r3, r31 -/* 807397EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807397F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807397F4 7C 08 03 A6 */ mtlr r0 -/* 807397F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 807397FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__sinit_d_a_e_oct_bg_cpp.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__sinit_d_a_e_oct_bg_cpp.s deleted file mode 100644 index ad490dfd6f8..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__sinit_d_a_e_oct_bg_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80739D00: -/* 80739D00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739D04 7C 08 02 A6 */ mflr r0 -/* 80739D08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739D0C 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80739D10 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80739D14 4B FF C4 F9 */ bl __ct__15daE_OctBg_HIO_cFv -/* 80739D18 3C 80 80 74 */ lis r4, __dt__15daE_OctBg_HIO_cFv@ha /* 0x80739CB8@ha */ -/* 80739D1C 38 84 9C B8 */ addi r4, r4, __dt__15daE_OctBg_HIO_cFv@l /* 0x80739CB8@l */ -/* 80739D20 3C A0 80 74 */ lis r5, lit_3763@ha /* 0x8073A140@ha */ -/* 80739D24 38 A5 A1 40 */ addi r5, r5, lit_3763@l /* 0x8073A140@l */ -/* 80739D28 4B FF C4 71 */ bl __register_global_object -/* 80739D2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739D30 7C 08 03 A6 */ mtlr r0 -/* 80739D34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739D38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/_delete__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/_delete__11daE_OctBg_cFv.s deleted file mode 100644 index 223d5b4f0a4..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/_delete__11daE_OctBg_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80736840: -/* 80736840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80736844 7C 08 02 A6 */ mflr r0 -/* 80736848 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073684C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80736850 7C 7F 1B 78 */ mr r31, r3 -/* 80736854 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80736858 3C 80 80 74 */ lis r4, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 8073685C 38 84 9E 44 */ addi r4, r4, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 80736860 4B 8F 67 A9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80736864 88 1F 0B B3 */ lbz r0, 0xbb3(r31) -/* 80736868 28 00 00 00 */ cmplwi r0, 0 -/* 8073686C 41 82 00 10 */ beq lbl_8073687C -/* 80736870 38 00 00 00 */ li r0, 0 -/* 80736874 3C 60 80 74 */ lis r3, struct_8073A13C+0x1@ha /* 0x8073A13D@ha */ -/* 80736878 98 03 A1 3D */ stb r0, struct_8073A13C+0x1@l(r3) /* 0x8073A13D@l */ -lbl_8073687C: -/* 8073687C 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80736880 28 00 00 00 */ cmplwi r0, 0 -/* 80736884 41 82 00 0C */ beq lbl_80736890 -/* 80736888 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 8073688C 4B 8D AA 85 */ bl stopZelAnime__16mDoExt_McaMorfSOFv -lbl_80736890: -/* 80736890 38 60 00 01 */ li r3, 1 -/* 80736894 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80736898 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073689C 7C 08 03 A6 */ mtlr r0 -/* 807368A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 807368A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/action__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/action__11daE_OctBg_cFv.s deleted file mode 100644 index 361058e9160..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/action__11daE_OctBg_cFv.s +++ /dev/null @@ -1,212 +0,0 @@ -lbl_8073651C: -/* 8073651C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80736520 7C 08 02 A6 */ mflr r0 -/* 80736524 90 01 00 64 */ stw r0, 0x64(r1) -/* 80736528 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 8073652C F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80736530 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80736534 93 C1 00 48 */ stw r30, 0x48(r1) -/* 80736538 7C 7E 1B 78 */ mr r30, r3 -/* 8073653C 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80736540 3B E3 9D 60 */ addi r31, r3, lit_3768@l /* 0x80739D60@l */ -/* 80736544 88 7E 0B AE */ lbz r3, 0xbae(r30) -/* 80736548 28 03 00 00 */ cmplwi r3, 0 -/* 8073654C 41 82 00 0C */ beq lbl_80736558 -/* 80736550 38 03 FF FF */ addi r0, r3, -1 -/* 80736554 98 1E 0B AE */ stb r0, 0xbae(r30) -lbl_80736558: -/* 80736558 A0 7E 0B B0 */ lhz r3, 0xbb0(r30) -/* 8073655C 28 03 00 00 */ cmplwi r3, 0 -/* 80736560 41 82 00 0C */ beq lbl_8073656C -/* 80736564 38 03 FF FF */ addi r0, r3, -1 -/* 80736568 B0 1E 0B B0 */ sth r0, 0xbb0(r30) -lbl_8073656C: -/* 8073656C 88 7E 0B AF */ lbz r3, 0xbaf(r30) -/* 80736570 28 03 00 00 */ cmplwi r3, 0 -/* 80736574 41 82 00 0C */ beq lbl_80736580 -/* 80736578 38 03 FF FF */ addi r0, r3, -1 -/* 8073657C 98 1E 0B AF */ stb r0, 0xbaf(r30) -lbl_80736580: -/* 80736580 88 7E 0B AD */ lbz r3, 0xbad(r30) -/* 80736584 28 03 00 00 */ cmplwi r3, 0 -/* 80736588 41 82 00 0C */ beq lbl_80736594 -/* 8073658C 38 03 FF FF */ addi r0, r3, -1 -/* 80736590 98 1E 0B AD */ stb r0, 0xbad(r30) -lbl_80736594: -/* 80736594 7F C3 F3 78 */ mr r3, r30 -/* 80736598 4B FF FE 81 */ bl checkExplode__11daE_OctBg_cFv -/* 8073659C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807365A0 40 82 02 80 */ bne lbl_80736820 -/* 807365A4 7F C3 F3 78 */ mr r3, r30 -/* 807365A8 48 00 28 89 */ bl damage_check__11daE_OctBg_cFv -/* 807365AC 7F C3 F3 78 */ mr r3, r30 -/* 807365B0 39 9E 0B 58 */ addi r12, r30, 0xb58 -/* 807365B4 4B C2 BA D1 */ bl __ptmf_scall -/* 807365B8 60 00 00 00 */ nop -/* 807365BC A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 807365C0 B0 1E 04 E4 */ sth r0, 0x4e4(r30) -/* 807365C4 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 807365C8 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 807365CC A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 807365D0 B0 1E 04 E8 */ sth r0, 0x4e8(r30) -/* 807365D4 7F C3 F3 78 */ mr r3, r30 -/* 807365D8 38 9E 08 84 */ addi r4, r30, 0x884 -/* 807365DC 4B 8E 40 F1 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 807365E0 38 7E 06 AC */ addi r3, r30, 0x6ac -/* 807365E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807365E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807365EC 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 807365F0 4B 94 04 BD */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 807365F4 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807365F8 88 9E 0B 74 */ lbz r4, 0xb74(r30) -/* 807365FC 4B B8 B5 81 */ bl setLinkSearch__15Z2CreatureEnemyFb -/* 80736600 A8 1E 0B 8C */ lha r0, 0xb8c(r30) -/* 80736604 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 80736608 40 81 00 10 */ ble lbl_80736618 -/* 8073660C 38 00 20 00 */ li r0, 0x2000 -/* 80736610 B0 1E 0B 8C */ sth r0, 0xb8c(r30) -/* 80736614 48 00 00 14 */ b lbl_80736628 -lbl_80736618: -/* 80736618 2C 00 E0 00 */ cmpwi r0, -8192 -/* 8073661C 40 80 00 0C */ bge lbl_80736628 -/* 80736620 38 00 E0 00 */ li r0, -8192 -/* 80736624 B0 1E 0B 8C */ sth r0, 0xb8c(r30) -lbl_80736628: -/* 80736628 38 7E 0B 8A */ addi r3, r30, 0xb8a -/* 8073662C A8 9E 0B 8C */ lha r4, 0xb8c(r30) -/* 80736630 38 A0 00 10 */ li r5, 0x10 -/* 80736634 38 C0 01 00 */ li r6, 0x100 -/* 80736638 38 E0 00 10 */ li r7, 0x10 -/* 8073663C 4B B3 9F 05 */ bl cLib_addCalcAngleS__FPsssss -/* 80736640 A8 1E 0B 80 */ lha r0, 0xb80(r30) -/* 80736644 C8 3F 00 28 */ lfd f1, 0x28(r31) -/* 80736648 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073664C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80736650 3C 00 43 30 */ lis r0, 0x4330 -/* 80736654 90 01 00 10 */ stw r0, 0x10(r1) -/* 80736658 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8073665C EC 20 08 28 */ fsubs f1, f0, f1 -/* 80736660 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80736664 EF E1 00 24 */ fdivs f31, f1, f0 -/* 80736668 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 8073666C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80736670 40 81 00 08 */ ble lbl_80736678 -/* 80736674 FF E0 00 90 */ fmr f31, f0 -lbl_80736678: -/* 80736678 A8 1E 0B 7C */ lha r0, 0xb7c(r30) -/* 8073667C 2C 00 00 00 */ cmpwi r0, 0 -/* 80736680 40 80 00 3C */ bge lbl_807366BC -/* 80736684 A8 1E 0B 7E */ lha r0, 0xb7e(r30) -/* 80736688 2C 00 00 00 */ cmpwi r0, 0 -/* 8073668C 41 80 00 30 */ blt lbl_807366BC -/* 80736690 3C 60 00 07 */ lis r3, 0x0007 /* 0x000702A7@ha */ -/* 80736694 38 03 02 A7 */ addi r0, r3, 0x02A7 /* 0x000702A7@l */ -/* 80736698 90 01 00 0C */ stw r0, 0xc(r1) -/* 8073669C 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807366A0 38 81 00 0C */ addi r4, r1, 0xc -/* 807366A4 38 A0 00 00 */ li r5, 0 -/* 807366A8 38 C0 FF FF */ li r6, -1 -/* 807366AC 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807366B0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807366B4 7D 89 03 A6 */ mtctr r12 -/* 807366B8 4E 80 04 21 */ bctrl -lbl_807366BC: -/* 807366BC 88 1E 0B 75 */ lbz r0, 0xb75(r30) -/* 807366C0 28 00 00 00 */ cmplwi r0, 0 -/* 807366C4 41 82 00 48 */ beq lbl_8073670C -/* 807366C8 A8 1E 0B 7C */ lha r0, 0xb7c(r30) -/* 807366CC 2C 00 00 00 */ cmpwi r0, 0 -/* 807366D0 40 81 00 3C */ ble lbl_8073670C -/* 807366D4 A8 1E 0B 7E */ lha r0, 0xb7e(r30) -/* 807366D8 2C 00 00 00 */ cmpwi r0, 0 -/* 807366DC 41 81 00 30 */ bgt lbl_8073670C -/* 807366E0 3C 60 00 07 */ lis r3, 0x0007 /* 0x000702A7@ha */ -/* 807366E4 38 03 02 A7 */ addi r0, r3, 0x02A7 /* 0x000702A7@l */ -/* 807366E8 90 01 00 08 */ stw r0, 8(r1) -/* 807366EC 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807366F0 38 81 00 08 */ addi r4, r1, 8 -/* 807366F4 38 A0 00 00 */ li r5, 0 -/* 807366F8 38 C0 FF FF */ li r6, -1 -/* 807366FC 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 80736700 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80736704 7D 89 03 A6 */ mtctr r12 -/* 80736708 4E 80 04 21 */ bctrl -lbl_8073670C: -/* 8073670C A8 1E 0B 7C */ lha r0, 0xb7c(r30) -/* 80736710 B0 1E 0B 7E */ sth r0, 0xb7e(r30) -/* 80736714 A8 1E 0B 7C */ lha r0, 0xb7c(r30) -/* 80736718 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8073671C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80736720 38 A3 9A 20 */ addi r5, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80736724 7C 25 04 2E */ lfsx f1, r5, r0 -/* 80736728 A8 1E 0B 82 */ lha r0, 0xb82(r30) -/* 8073672C C8 5F 00 28 */ lfd f2, 0x28(r31) -/* 80736730 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80736734 90 01 00 14 */ stw r0, 0x14(r1) -/* 80736738 3C 80 43 30 */ lis r4, 0x4330 -/* 8073673C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80736740 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80736744 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80736748 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 8073674C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80736750 FC 00 00 1E */ fctiwz f0, f0 -/* 80736754 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80736758 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8073675C B0 1E 0B 84 */ sth r0, 0xb84(r30) -/* 80736760 A8 7E 0B 7C */ lha r3, 0xb7c(r30) -/* 80736764 38 03 40 00 */ addi r0, r3, 0x4000 -/* 80736768 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8073676C 7C 65 04 2E */ lfsx f3, r5, r0 -/* 80736770 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80736774 A8 1E 0B 82 */ lha r0, 0xb82(r30) -/* 80736778 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8073677C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80736780 90 81 00 20 */ stw r4, 0x20(r1) -/* 80736784 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80736788 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8073678C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80736790 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80736794 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80736798 FC 00 00 1E */ fctiwz f0, f0 -/* 8073679C D8 01 00 28 */ stfd f0, 0x28(r1) -/* 807367A0 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 807367A4 B0 1E 0B 86 */ sth r0, 0xb86(r30) -/* 807367A8 A8 7E 0B 7C */ lha r3, 0xb7c(r30) -/* 807367AC 3C 63 00 01 */ addis r3, r3, 1 -/* 807367B0 38 03 80 00 */ addi r0, r3, -32768 -/* 807367B4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 807367B8 7C 65 04 2E */ lfsx f3, r5, r0 -/* 807367BC C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 807367C0 A8 1E 0B 82 */ lha r0, 0xb82(r30) -/* 807367C4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 807367C8 90 01 00 34 */ stw r0, 0x34(r1) -/* 807367CC 90 81 00 30 */ stw r4, 0x30(r1) -/* 807367D0 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 807367D4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 807367D8 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 807367DC EC 00 00 F2 */ fmuls f0, f0, f3 -/* 807367E0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 807367E4 FC 00 00 1E */ fctiwz f0, f0 -/* 807367E8 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 807367EC 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 807367F0 B0 1E 0B 88 */ sth r0, 0xb88(r30) -/* 807367F4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 807367F8 7C 03 07 74 */ extsb r3, r0 -/* 807367FC 4B 8F 68 71 */ bl dComIfGp_getReverb__Fi -/* 80736800 7C 65 1B 78 */ mr r5, r3 -/* 80736804 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 80736808 38 80 00 00 */ li r4, 0 -/* 8073680C 4B 8D A8 A5 */ bl play__16mDoExt_McaMorfSOFUlSc -/* 80736810 7F C3 F3 78 */ mr r3, r30 -/* 80736814 48 00 02 65 */ bl mtx_set__11daE_OctBg_cFv -/* 80736818 7F C3 F3 78 */ mr r3, r30 -/* 8073681C 48 00 00 AD */ bl cc_set__11daE_OctBg_cFv -lbl_80736820: -/* 80736820 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80736824 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80736828 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 8073682C 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 80736830 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80736834 7C 08 03 A6 */ mtlr r0 -/* 80736838 38 21 00 60 */ addi r1, r1, 0x60 -/* 8073683C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/back_swim__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/back_swim__11daE_OctBg_cFv.s deleted file mode 100644 index 663381abfbf..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/back_swim__11daE_OctBg_cFv.s +++ /dev/null @@ -1,132 +0,0 @@ -lbl_80738714: -/* 80738714 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80738718 7C 08 02 A6 */ mflr r0 -/* 8073871C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80738720 39 61 00 50 */ addi r11, r1, 0x50 -/* 80738724 4B C2 9A B5 */ bl _savegpr_28 -/* 80738728 7C 7E 1B 78 */ mr r30, r3 -/* 8073872C 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80738730 3B E3 9D 60 */ addi r31, r3, lit_3768@l /* 0x80739D60@l */ -/* 80738734 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80738738 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073873C 83 9D 5D AC */ lwz r28, 0x5dac(r29) -/* 80738740 80 1E 0B 70 */ lwz r0, 0xb70(r30) -/* 80738744 2C 00 00 00 */ cmpwi r0, 0 -/* 80738748 40 82 00 3C */ bne lbl_80738784 -/* 8073874C 38 00 00 30 */ li r0, 0x30 -/* 80738750 98 1E 0B AE */ stb r0, 0xbae(r30) -/* 80738754 38 00 40 00 */ li r0, 0x4000 -/* 80738758 B0 1E 0B 80 */ sth r0, 0xb80(r30) -/* 8073875C 38 00 10 00 */ li r0, 0x1000 -/* 80738760 B0 1E 0B 82 */ sth r0, 0xb82(r30) -/* 80738764 C0 1F 00 CC */ lfs f0, 0xcc(r31) -/* 80738768 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 8073876C C0 1F 00 68 */ lfs f0, 0x68(r31) -/* 80738770 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80738774 80 7E 0B 70 */ lwz r3, 0xb70(r30) -/* 80738778 38 03 00 01 */ addi r0, r3, 1 -/* 8073877C 90 1E 0B 70 */ stw r0, 0xb70(r30) -/* 80738780 48 00 01 7C */ b lbl_807388FC -lbl_80738784: -/* 80738784 2C 00 FF FF */ cmpwi r0, -1 -/* 80738788 41 82 01 74 */ beq lbl_807388FC -/* 8073878C 38 7E 0B 80 */ addi r3, r30, 0xb80 -/* 80738790 38 80 10 00 */ li r4, 0x1000 -/* 80738794 38 A0 00 08 */ li r5, 8 -/* 80738798 38 C0 04 00 */ li r6, 0x400 -/* 8073879C 38 E0 01 00 */ li r7, 0x100 -/* 807387A0 4B B3 7D A1 */ bl cLib_addCalcAngleS__FPsssss -/* 807387A4 7F C3 F3 78 */ mr r3, r30 -/* 807387A8 80 9D 5D AC */ lwz r4, 0x5dac(r29) -/* 807387AC 4B 8E 1F 65 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 807387B0 7C 64 1B 78 */ mr r4, r3 -/* 807387B4 38 7E 04 DE */ addi r3, r30, 0x4de -/* 807387B8 38 A0 00 10 */ li r5, 0x10 -/* 807387BC 38 C0 04 00 */ li r6, 0x400 -/* 807387C0 38 E0 01 00 */ li r7, 0x100 -/* 807387C4 4B B3 7D 7D */ bl cLib_addCalcAngleS__FPsssss -/* 807387C8 C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 807387CC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 807387D0 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 807387D4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 807387D8 C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 807387DC D0 01 00 28 */ stfs f0, 0x28(r1) -/* 807387E0 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 807387E4 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 807387E8 4B B3 84 8D */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz -/* 807387EC 7C 03 00 D0 */ neg r0, r3 -/* 807387F0 7C 04 07 34 */ extsh r4, r0 -/* 807387F4 38 7E 04 DC */ addi r3, r30, 0x4dc -/* 807387F8 38 A0 00 10 */ li r5, 0x10 -/* 807387FC 38 C0 04 00 */ li r6, 0x400 -/* 80738800 38 E0 01 00 */ li r7, 0x100 -/* 80738804 4B B3 7D 3D */ bl cLib_addCalcAngleS__FPsssss -/* 80738808 7C 60 07 34 */ extsh r0, r3 -/* 8073880C C8 3F 00 28 */ lfd f1, 0x28(r31) -/* 80738810 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80738814 90 01 00 34 */ stw r0, 0x34(r1) -/* 80738818 3C 00 43 30 */ lis r0, 0x4330 -/* 8073881C 90 01 00 30 */ stw r0, 0x30(r1) -/* 80738820 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80738824 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80738828 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8073882C EC 00 08 2A */ fadds f0, f0, f1 -/* 80738830 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80738834 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80738838 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8073883C A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 80738840 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80738844 7C 63 02 14 */ add r3, r3, r0 -/* 80738848 C0 23 00 04 */ lfs f1, 4(r3) -/* 8073884C 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80738850 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 80738854 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80738858 C0 5F 00 98 */ lfs f2, 0x98(r31) -/* 8073885C 4B B3 7E E5 */ bl cLib_chaseF__FPfff -/* 80738860 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 80738864 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80738868 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8073886C 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80738870 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80738874 38 7E 04 FC */ addi r3, r30, 0x4fc -/* 80738878 C0 1F 00 A8 */ lfs f0, 0xa8(r31) -/* 8073887C EC 20 00 72 */ fmuls f1, f0, f1 -/* 80738880 C0 5F 00 98 */ lfs f2, 0x98(r31) -/* 80738884 4B B3 7E BD */ bl cLib_chaseF__FPfff -/* 80738888 88 1E 0B AE */ lbz r0, 0xbae(r30) -/* 8073888C 28 00 00 00 */ cmplwi r0, 0 -/* 80738890 40 82 00 6C */ bne lbl_807388FC -/* 80738894 88 1E 0B AC */ lbz r0, 0xbac(r30) -/* 80738898 28 00 00 00 */ cmplwi r0, 0 -/* 8073889C 41 82 00 34 */ beq lbl_807388D0 -/* 807388A0 3C 60 80 74 */ lis r3, lit_4700@ha /* 0x80739F9C@ha */ -/* 807388A4 38 83 9F 9C */ addi r4, r3, lit_4700@l /* 0x80739F9C@l */ -/* 807388A8 80 64 00 00 */ lwz r3, 0(r4) -/* 807388AC 80 04 00 04 */ lwz r0, 4(r4) -/* 807388B0 90 61 00 14 */ stw r3, 0x14(r1) -/* 807388B4 90 01 00 18 */ stw r0, 0x18(r1) -/* 807388B8 80 04 00 08 */ lwz r0, 8(r4) -/* 807388BC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 807388C0 7F C3 F3 78 */ mr r3, r30 -/* 807388C4 38 81 00 14 */ addi r4, r1, 0x14 -/* 807388C8 4B FF D9 A5 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 807388CC 48 00 00 30 */ b lbl_807388FC -lbl_807388D0: -/* 807388D0 3C 60 80 74 */ lis r3, lit_4703@ha /* 0x80739FA8@ha */ -/* 807388D4 38 83 9F A8 */ addi r4, r3, lit_4703@l /* 0x80739FA8@l */ -/* 807388D8 80 64 00 00 */ lwz r3, 0(r4) -/* 807388DC 80 04 00 04 */ lwz r0, 4(r4) -/* 807388E0 90 61 00 08 */ stw r3, 8(r1) -/* 807388E4 90 01 00 0C */ stw r0, 0xc(r1) -/* 807388E8 80 04 00 08 */ lwz r0, 8(r4) -/* 807388EC 90 01 00 10 */ stw r0, 0x10(r1) -/* 807388F0 7F C3 F3 78 */ mr r3, r30 -/* 807388F4 38 81 00 08 */ addi r4, r1, 8 -/* 807388F8 4B FF D9 75 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -lbl_807388FC: -/* 807388FC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80738900 4B C2 99 25 */ bl _restgpr_28 -/* 80738904 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80738908 7C 08 03 A6 */ mtlr r0 -/* 8073890C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80738910 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/bomb_wait__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/bomb_wait__11daE_OctBg_cFv.s deleted file mode 100644 index 6e2963b9756..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/bomb_wait__11daE_OctBg_cFv.s +++ /dev/null @@ -1,140 +0,0 @@ -lbl_80738C2C: -/* 80738C2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80738C30 7C 08 02 A6 */ mflr r0 -/* 80738C34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80738C38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80738C3C 93 C1 00 08 */ stw r30, 8(r1) -/* 80738C40 7C 7E 1B 78 */ mr r30, r3 -/* 80738C44 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80738C48 3B E3 9D 60 */ addi r31, r3, lit_3768@l /* 0x80739D60@l */ -/* 80738C4C 80 1E 0B 70 */ lwz r0, 0xb70(r30) -/* 80738C50 2C 00 00 00 */ cmpwi r0, 0 -/* 80738C54 40 82 00 64 */ bne lbl_80738CB8 -/* 80738C58 3C 60 80 74 */ lis r3, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 80738C5C 38 63 9E 44 */ addi r3, r3, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 80738C60 38 80 00 05 */ li r4, 5 -/* 80738C64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80738C68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80738C6C 3C A5 00 02 */ addis r5, r5, 2 -/* 80738C70 38 C0 00 80 */ li r6, 0x80 -/* 80738C74 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80738C78 4B 90 36 75 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80738C7C 7C 64 1B 78 */ mr r4, r3 -/* 80738C80 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 80738C84 38 A0 00 02 */ li r5, 2 -/* 80738C88 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80738C8C C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80738C90 C0 7F 00 30 */ lfs f3, 0x30(r31) -/* 80738C94 C0 9F 00 D0 */ lfs f4, 0xd0(r31) -/* 80738C98 4B 8D 81 D9 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80738C9C 38 00 00 00 */ li r0, 0 -/* 80738CA0 B0 1E 0B 82 */ sth r0, 0xb82(r30) -/* 80738CA4 B0 1E 0B 8C */ sth r0, 0xb8c(r30) -/* 80738CA8 80 7E 0B 70 */ lwz r3, 0xb70(r30) -/* 80738CAC 38 03 00 01 */ addi r0, r3, 1 -/* 80738CB0 90 1E 0B 70 */ stw r0, 0xb70(r30) -/* 80738CB4 48 00 01 64 */ b lbl_80738E18 -lbl_80738CB8: -/* 80738CB8 2C 00 FF FF */ cmpwi r0, -1 -/* 80738CBC 41 82 01 5C */ beq lbl_80738E18 -/* 80738CC0 2C 00 00 01 */ cmpwi r0, 1 -/* 80738CC4 40 82 00 94 */ bne lbl_80738D58 -/* 80738CC8 38 00 00 78 */ li r0, 0x78 -/* 80738CCC 90 1E 0B 90 */ stw r0, 0xb90(r30) -/* 80738CD0 A8 7E 04 DE */ lha r3, 0x4de(r30) -/* 80738CD4 A8 1E 0B 96 */ lha r0, 0xb96(r30) -/* 80738CD8 7C 03 02 14 */ add r0, r3, r0 -/* 80738CDC B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 80738CE0 A8 7E 04 DC */ lha r3, 0x4dc(r30) -/* 80738CE4 A8 1E 0B 96 */ lha r0, 0xb96(r30) -/* 80738CE8 7C 03 02 14 */ add r0, r3, r0 -/* 80738CEC B0 1E 04 DC */ sth r0, 0x4dc(r30) -/* 80738CF0 80 1E 06 D8 */ lwz r0, 0x6d8(r30) -/* 80738CF4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80738CF8 41 82 00 1C */ beq lbl_80738D14 -/* 80738CFC 80 7E 0B 70 */ lwz r3, 0xb70(r30) -/* 80738D00 38 03 00 01 */ addi r0, r3, 1 -/* 80738D04 90 1E 0B 70 */ stw r0, 0xb70(r30) -/* 80738D08 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80738D0C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80738D10 48 00 00 14 */ b lbl_80738D24 -lbl_80738D14: -/* 80738D14 38 7E 0B 96 */ addi r3, r30, 0xb96 -/* 80738D18 38 80 01 00 */ li r4, 0x100 -/* 80738D1C 38 A0 00 80 */ li r5, 0x80 -/* 80738D20 4B B3 7E 71 */ bl cLib_chaseAngleS__FPsss -lbl_80738D24: -/* 80738D24 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80738D28 C0 1F 00 D4 */ lfs f0, 0xd4(r31) -/* 80738D2C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738D30 40 80 00 14 */ bge lbl_80738D44 -/* 80738D34 C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80738D38 D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80738D3C C0 1F 00 D8 */ lfs f0, 0xd8(r31) -/* 80738D40 D0 1E 05 34 */ stfs f0, 0x534(r30) -lbl_80738D44: -/* 80738D44 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80738D48 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80738D4C C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 80738D50 4B B3 79 F1 */ bl cLib_chaseF__FPfff -/* 80738D54 48 00 00 C4 */ b lbl_80738E18 -lbl_80738D58: -/* 80738D58 2C 00 00 02 */ cmpwi r0, 2 -/* 80738D5C 40 82 00 BC */ bne lbl_80738E18 -/* 80738D60 A8 7E 04 DE */ lha r3, 0x4de(r30) -/* 80738D64 A8 1E 0B 96 */ lha r0, 0xb96(r30) -/* 80738D68 7C 03 02 14 */ add r0, r3, r0 -/* 80738D6C B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 80738D70 80 1E 06 D8 */ lwz r0, 0x6d8(r30) -/* 80738D74 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80738D78 41 82 00 48 */ beq lbl_80738DC0 -/* 80738D7C 88 1E 0B AE */ lbz r0, 0xbae(r30) -/* 80738D80 28 00 00 00 */ cmplwi r0, 0 -/* 80738D84 41 82 00 14 */ beq lbl_80738D98 -/* 80738D88 38 7E 04 DC */ addi r3, r30, 0x4dc -/* 80738D8C 38 80 80 00 */ li r4, -32768 -/* 80738D90 38 A0 00 80 */ li r5, 0x80 -/* 80738D94 4B B3 7D FD */ bl cLib_chaseAngleS__FPsss -lbl_80738D98: -/* 80738D98 38 7E 0B 96 */ addi r3, r30, 0xb96 -/* 80738D9C 38 80 00 00 */ li r4, 0 -/* 80738DA0 38 A0 00 80 */ li r5, 0x80 -/* 80738DA4 4B B3 7D ED */ bl cLib_chaseAngleS__FPsss -/* 80738DA8 7F C3 F3 78 */ mr r3, r30 -/* 80738DAC 38 80 00 00 */ li r4, 0 -/* 80738DB0 4B FF FB 65 */ bl setBombCarry__11daE_OctBg_cFi -/* 80738DB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80738DB8 41 82 00 30 */ beq lbl_80738DE8 -/* 80738DBC 48 00 00 5C */ b lbl_80738E18 -lbl_80738DC0: -/* 80738DC0 38 00 00 0A */ li r0, 0xa -/* 80738DC4 98 1E 0B AE */ stb r0, 0xbae(r30) -/* 80738DC8 38 7E 0B 96 */ addi r3, r30, 0xb96 -/* 80738DCC 38 80 01 00 */ li r4, 0x100 -/* 80738DD0 38 A0 00 80 */ li r5, 0x80 -/* 80738DD4 4B B3 7D BD */ bl cLib_chaseAngleS__FPsss -/* 80738DD8 38 7E 04 DC */ addi r3, r30, 0x4dc -/* 80738DDC 38 80 80 00 */ li r4, -32768 -/* 80738DE0 38 A0 00 80 */ li r5, 0x80 -/* 80738DE4 4B B3 7D AD */ bl cLib_chaseAngleS__FPsss -lbl_80738DE8: -/* 80738DE8 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80738DEC C0 1F 00 D4 */ lfs f0, 0xd4(r31) -/* 80738DF0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738DF4 40 80 00 14 */ bge lbl_80738E08 -/* 80738DF8 C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80738DFC D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80738E00 C0 1F 00 D8 */ lfs f0, 0xd8(r31) -/* 80738E04 D0 1E 05 34 */ stfs f0, 0x534(r30) -lbl_80738E08: -/* 80738E08 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80738E0C C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80738E10 C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 80738E14 4B B3 79 2D */ bl cLib_chaseF__FPfff -lbl_80738E18: -/* 80738E18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80738E1C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80738E20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80738E24 7C 08 03 A6 */ mtlr r0 -/* 80738E28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80738E2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/born_swim__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/born_swim__11daE_OctBg_cFv.s deleted file mode 100644 index d263919dea6..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/born_swim__11daE_OctBg_cFv.s +++ /dev/null @@ -1,132 +0,0 @@ -lbl_80736E30: -/* 80736E30 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80736E34 7C 08 02 A6 */ mflr r0 -/* 80736E38 90 01 00 44 */ stw r0, 0x44(r1) -/* 80736E3C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80736E40 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80736E44 7C 7F 1B 78 */ mr r31, r3 -/* 80736E48 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80736E4C 3B C3 9D 60 */ addi r30, r3, lit_3768@l /* 0x80739D60@l */ -/* 80736E50 80 1F 0B 70 */ lwz r0, 0xb70(r31) -/* 80736E54 2C 00 00 00 */ cmpwi r0, 0 -/* 80736E58 40 82 00 98 */ bne lbl_80736EF0 -/* 80736E5C 38 00 00 00 */ li r0, 0 -/* 80736E60 90 1F 08 E8 */ stw r0, 0x8e8(r31) -/* 80736E64 B0 1F 0B 8C */ sth r0, 0xb8c(r31) -/* 80736E68 38 00 0C 00 */ li r0, 0xc00 -/* 80736E6C B0 1F 0B 82 */ sth r0, 0xb82(r31) -/* 80736E70 38 00 24 00 */ li r0, 0x2400 -/* 80736E74 B0 1F 0B 80 */ sth r0, 0xb80(r31) -/* 80736E78 C0 3E 00 1C */ lfs f1, 0x1c(r30) -/* 80736E7C 4B B3 0B 11 */ bl cM_rndFX__Ff -/* 80736E80 C0 1E 00 60 */ lfs f0, 0x60(r30) -/* 80736E84 EC 00 08 2A */ fadds f0, f0, f1 -/* 80736E88 FC 00 00 1E */ fctiwz f0, f0 -/* 80736E8C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80736E90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80736E94 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80736E98 C0 3E 00 64 */ lfs f1, 0x64(r30) -/* 80736E9C 4B B3 0A F1 */ bl cM_rndFX__Ff -/* 80736EA0 FC 00 08 1E */ fctiwz f0, f1 -/* 80736EA4 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80736EA8 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80736EAC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 80736EB0 38 00 00 00 */ li r0, 0 -/* 80736EB4 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80736EB8 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80736EBC D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 80736EC0 C0 1E 00 68 */ lfs f0, 0x68(r30) -/* 80736EC4 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80736EC8 C0 3E 00 6C */ lfs f1, 0x6c(r30) -/* 80736ECC 4B B3 0A 89 */ bl cM_rndF__Ff -/* 80736ED0 FC 00 08 1E */ fctiwz f0, f1 -/* 80736ED4 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 80736ED8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80736EDC 98 1F 0B AE */ stb r0, 0xbae(r31) -/* 80736EE0 80 7F 0B 70 */ lwz r3, 0xb70(r31) -/* 80736EE4 38 03 00 01 */ addi r0, r3, 1 -/* 80736EE8 90 1F 0B 70 */ stw r0, 0xb70(r31) -/* 80736EEC 48 00 01 24 */ b lbl_80737010 -lbl_80736EF0: -/* 80736EF0 2C 00 FF FF */ cmpwi r0, -1 -/* 80736EF4 40 82 00 1C */ bne lbl_80736F10 -/* 80736EF8 3C 60 D8 FC */ lis r3, 0xD8FC /* 0xD8FBFDFF@ha */ -/* 80736EFC 38 03 FD FF */ addi r0, r3, 0xFDFF /* 0xD8FBFDFF@l */ -/* 80736F00 90 1F 08 E8 */ stw r0, 0x8e8(r31) -/* 80736F04 38 00 00 04 */ li r0, 4 -/* 80736F08 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80736F0C 48 00 01 04 */ b lbl_80737010 -lbl_80736F10: -/* 80736F10 88 1F 0B AE */ lbz r0, 0xbae(r31) -/* 80736F14 28 00 00 00 */ cmplwi r0, 0 -/* 80736F18 40 82 00 F8 */ bne lbl_80737010 -/* 80736F1C 38 7F 04 DC */ addi r3, r31, 0x4dc -/* 80736F20 38 80 00 00 */ li r4, 0 -/* 80736F24 38 A0 00 10 */ li r5, 0x10 -/* 80736F28 38 C0 0C 00 */ li r6, 0xc00 -/* 80736F2C 38 E0 02 00 */ li r7, 0x200 -/* 80736F30 4B B3 96 11 */ bl cLib_addCalcAngleS__FPsssss -/* 80736F34 38 7F 05 2C */ addi r3, r31, 0x52c -/* 80736F38 C0 3E 00 30 */ lfs f1, 0x30(r30) -/* 80736F3C C0 5E 00 70 */ lfs f2, 0x70(r30) -/* 80736F40 4B B3 98 01 */ bl cLib_chaseF__FPfff -/* 80736F44 38 7F 04 FC */ addi r3, r31, 0x4fc -/* 80736F48 C0 3E 00 30 */ lfs f1, 0x30(r30) -/* 80736F4C C0 5E 00 74 */ lfs f2, 0x74(r30) -/* 80736F50 4B B3 97 F1 */ bl cLib_chaseF__FPfff -/* 80736F54 38 7F 0B 80 */ addi r3, r31, 0xb80 -/* 80736F58 38 80 04 00 */ li r4, 0x400 -/* 80736F5C 38 A0 00 20 */ li r5, 0x20 -/* 80736F60 38 C0 04 00 */ li r6, 0x400 -/* 80736F64 38 E0 00 80 */ li r7, 0x80 -/* 80736F68 4B B3 95 D9 */ bl cLib_addCalcAngleS__FPsssss -/* 80736F6C 7C 60 07 34 */ extsh r0, r3 -/* 80736F70 2C 00 00 80 */ cmpwi r0, 0x80 -/* 80736F74 40 80 00 8C */ bge lbl_80737000 -/* 80736F78 C0 1F 05 2C */ lfs f0, 0x52c(r31) -/* 80736F7C C0 3E 00 30 */ lfs f1, 0x30(r30) -/* 80736F80 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80736F84 40 82 00 7C */ bne lbl_80737000 -/* 80736F88 C0 1F 04 FC */ lfs f0, 0x4fc(r31) -/* 80736F8C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80736F90 40 82 00 70 */ bne lbl_80737000 -/* 80736F94 7F E3 FB 78 */ mr r3, r31 -/* 80736F98 4B FF FE 15 */ bl checkChase__11daE_OctBg_cFv -/* 80736F9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80736FA0 41 82 00 34 */ beq lbl_80736FD4 -/* 80736FA4 3C 60 80 74 */ lis r3, lit_4133@ha /* 0x80739F0C@ha */ -/* 80736FA8 38 83 9F 0C */ addi r4, r3, lit_4133@l /* 0x80739F0C@l */ -/* 80736FAC 80 64 00 00 */ lwz r3, 0(r4) -/* 80736FB0 80 04 00 04 */ lwz r0, 4(r4) -/* 80736FB4 90 61 00 14 */ stw r3, 0x14(r1) -/* 80736FB8 90 01 00 18 */ stw r0, 0x18(r1) -/* 80736FBC 80 04 00 08 */ lwz r0, 8(r4) -/* 80736FC0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80736FC4 7F E3 FB 78 */ mr r3, r31 -/* 80736FC8 38 81 00 14 */ addi r4, r1, 0x14 -/* 80736FCC 4B FF F2 A1 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80736FD0 48 00 00 30 */ b lbl_80737000 -lbl_80736FD4: -/* 80736FD4 3C 60 80 74 */ lis r3, lit_4136@ha /* 0x80739F18@ha */ -/* 80736FD8 38 83 9F 18 */ addi r4, r3, lit_4136@l /* 0x80739F18@l */ -/* 80736FDC 80 64 00 00 */ lwz r3, 0(r4) -/* 80736FE0 80 04 00 04 */ lwz r0, 4(r4) -/* 80736FE4 90 61 00 08 */ stw r3, 8(r1) -/* 80736FE8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80736FEC 80 04 00 08 */ lwz r0, 8(r4) -/* 80736FF0 90 01 00 10 */ stw r0, 0x10(r1) -/* 80736FF4 7F E3 FB 78 */ mr r3, r31 -/* 80736FF8 38 81 00 08 */ addi r4, r1, 8 -/* 80736FFC 4B FF F2 71 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -lbl_80737000: -/* 80737000 A8 7F 0B 7C */ lha r3, 0xb7c(r31) -/* 80737004 A8 1F 0B 80 */ lha r0, 0xb80(r31) -/* 80737008 7C 03 02 14 */ add r0, r3, r0 -/* 8073700C B0 1F 0B 7C */ sth r0, 0xb7c(r31) -lbl_80737010: -/* 80737010 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80737014 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80737018 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8073701C 7C 08 03 A6 */ mtlr r0 -/* 80737020 38 21 00 40 */ addi r1, r1, 0x40 -/* 80737024 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/cc_set__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/cc_set__11daE_OctBg_cFv.s deleted file mode 100644 index fc9a0f6dc9c..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/cc_set__11daE_OctBg_cFv.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_807368C8: -/* 807368C8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 807368CC 7C 08 02 A6 */ mflr r0 -/* 807368D0 90 01 00 44 */ stw r0, 0x44(r1) -/* 807368D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 807368D8 4B C2 B8 FD */ bl _savegpr_27 -/* 807368DC 7C 7C 1B 78 */ mr r28, r3 -/* 807368E0 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 807368E4 3B C3 9D 60 */ addi r30, r3, lit_3768@l /* 0x80739D60@l */ -/* 807368E8 80 7C 05 B4 */ lwz r3, 0x5b4(r28) -/* 807368EC 83 A3 00 04 */ lwz r29, 4(r3) -/* 807368F0 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807368F4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 807368F8 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807368FC 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80736900 4B C0 FB B1 */ bl PSMTXCopy -/* 80736904 C0 5E 00 30 */ lfs f2, 0x30(r30) -/* 80736908 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 8073690C C0 3E 00 34 */ lfs f1, 0x34(r30) -/* 80736910 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80736914 3B E3 A1 4C */ addi r31, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80736918 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 8073691C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80736920 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80736924 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80736928 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073692C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80736930 38 81 00 14 */ addi r4, r1, 0x14 -/* 80736934 38 BC 05 38 */ addi r5, r28, 0x538 -/* 80736938 4B C1 04 35 */ bl PSMTXMultVec -/* 8073693C C0 1C 05 38 */ lfs f0, 0x538(r28) -/* 80736940 D0 1C 05 50 */ stfs f0, 0x550(r28) -/* 80736944 C0 1C 05 3C */ lfs f0, 0x53c(r28) -/* 80736948 D0 1C 05 54 */ stfs f0, 0x554(r28) -/* 8073694C C0 1C 05 40 */ lfs f0, 0x540(r28) -/* 80736950 D0 1C 05 58 */ stfs f0, 0x558(r28) -/* 80736954 C0 5C 05 54 */ lfs f2, 0x554(r28) -/* 80736958 C0 3E 00 34 */ lfs f1, 0x34(r30) -/* 8073695C C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80736960 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80736964 EC 02 00 2A */ fadds f0, f2, f0 -/* 80736968 D0 1C 05 54 */ stfs f0, 0x554(r28) -/* 8073696C 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 80736970 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80736974 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80736978 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073697C 4B C0 FB 35 */ bl PSMTXCopy -/* 80736980 C0 5E 00 30 */ lfs f2, 0x30(r30) -/* 80736984 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80736988 C0 3E 00 34 */ lfs f1, 0x34(r30) -/* 8073698C C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80736990 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80736994 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80736998 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 8073699C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807369A0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807369A4 38 81 00 14 */ addi r4, r1, 0x14 -/* 807369A8 38 A1 00 08 */ addi r5, r1, 8 -/* 807369AC 4B C1 03 C1 */ bl PSMTXMultVec -/* 807369B0 38 7C 09 E4 */ addi r3, r28, 0x9e4 -/* 807369B4 38 81 00 08 */ addi r4, r1, 8 -/* 807369B8 4B B3 8C 91 */ bl SetC__8cM3dGSphFRC4cXyz -/* 807369BC 38 7C 09 E4 */ addi r3, r28, 0x9e4 -/* 807369C0 C0 3E 00 38 */ lfs f1, 0x38(r30) -/* 807369C4 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 807369C8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 807369CC 4B B3 8D 3D */ bl SetR__8cM3dGSphFf -/* 807369D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807369D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807369D8 3B 63 23 3C */ addi r27, r3, 0x233c -/* 807369DC 7F 63 DB 78 */ mr r3, r27 -/* 807369E0 38 9C 08 C0 */ addi r4, r28, 0x8c0 -/* 807369E4 4B B2 E1 C5 */ bl Set__4cCcSFP8cCcD_Obj -/* 807369E8 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807369EC 80 63 00 0C */ lwz r3, 0xc(r3) -/* 807369F0 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807369F4 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807369F8 4B C0 FA B9 */ bl PSMTXCopy -/* 807369FC C0 1E 00 30 */ lfs f0, 0x30(r30) -/* 80736A00 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80736A04 C0 1E 00 34 */ lfs f0, 0x34(r30) -/* 80736A08 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80736A0C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80736A10 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80736A14 C0 1E 00 3C */ lfs f0, 0x3c(r30) -/* 80736A18 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80736A1C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80736A20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80736A24 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80736A28 38 81 00 14 */ addi r4, r1, 0x14 -/* 80736A2C 38 A1 00 08 */ addi r5, r1, 8 -/* 80736A30 4B C1 03 3D */ bl PSMTXMultVec -/* 80736A34 38 7C 0B 1C */ addi r3, r28, 0xb1c -/* 80736A38 38 81 00 08 */ addi r4, r1, 8 -/* 80736A3C 4B B3 8C 0D */ bl SetC__8cM3dGSphFRC4cXyz -/* 80736A40 38 7C 0B 1C */ addi r3, r28, 0xb1c -/* 80736A44 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80736A48 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80736A4C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80736A50 4B B3 8C B9 */ bl SetR__8cM3dGSphFf -/* 80736A54 7F 63 DB 78 */ mr r3, r27 -/* 80736A58 38 9C 09 F8 */ addi r4, r28, 0x9f8 -/* 80736A5C 4B B2 E1 4D */ bl Set__4cCcSFP8cCcD_Obj -/* 80736A60 39 61 00 40 */ addi r11, r1, 0x40 -/* 80736A64 4B C2 B7 BD */ bl _restgpr_27 -/* 80736A68 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80736A6C 7C 08 03 A6 */ mtlr r0 -/* 80736A70 38 21 00 40 */ addi r1, r1, 0x40 -/* 80736A74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/chase_core__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/chase_core__11daE_OctBg_cFv.s deleted file mode 100644 index 47b7d7a9c50..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/chase_core__11daE_OctBg_cFv.s +++ /dev/null @@ -1,401 +0,0 @@ -lbl_80737678: -/* 80737678 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 8073767C 7C 08 02 A6 */ mflr r0 -/* 80737680 90 01 00 84 */ stw r0, 0x84(r1) -/* 80737684 39 61 00 80 */ addi r11, r1, 0x80 -/* 80737688 4B C2 AB 51 */ bl _savegpr_28 -/* 8073768C 7C 7D 1B 78 */ mr r29, r3 -/* 80737690 3C 60 80 74 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80739E54@ha */ -/* 80737694 3B C3 9E 54 */ addi r30, r3, cNullVec__6Z2Calc@l /* 0x80739E54@l */ -/* 80737698 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 8073769C 3B E3 9D 60 */ addi r31, r3, lit_3768@l /* 0x80739D60@l */ -/* 807376A0 80 1D 0B 70 */ lwz r0, 0xb70(r29) -/* 807376A4 2C 00 00 00 */ cmpwi r0, 0 -/* 807376A8 40 82 00 50 */ bne lbl_807376F8 -/* 807376AC 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 807376B0 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 807376B4 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 807376B8 4B B3 02 9D */ bl cM_rndF__Ff -/* 807376BC 7F A3 EB 78 */ mr r3, r29 -/* 807376C0 38 9D 06 60 */ addi r4, r29, 0x660 -/* 807376C4 4B FF FE B1 */ bl setChasePos__11daE_OctBg_cFR4cXyzf -/* 807376C8 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 807376CC 4B B3 02 C1 */ bl cM_rndFX__Ff -/* 807376D0 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 807376D4 EC 00 08 2A */ fadds f0, f0, f1 -/* 807376D8 FC 00 00 1E */ fctiwz f0, f0 -/* 807376DC D8 01 00 60 */ stfd f0, 0x60(r1) -/* 807376E0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 807376E4 98 1D 0B AF */ stb r0, 0xbaf(r29) -/* 807376E8 80 7D 0B 70 */ lwz r3, 0xb70(r29) -/* 807376EC 38 03 00 01 */ addi r0, r3, 1 -/* 807376F0 90 1D 0B 70 */ stw r0, 0xb70(r29) -/* 807376F4 48 00 05 3C */ b lbl_80737C30 -lbl_807376F8: -/* 807376F8 2C 00 FF FF */ cmpwi r0, -1 -/* 807376FC 41 82 05 34 */ beq lbl_80737C30 -/* 80737700 80 7D 04 A4 */ lwz r3, 0x4a4(r29) -/* 80737704 38 81 00 10 */ addi r4, r1, 0x10 -/* 80737708 4B 8E 22 B5 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 8073770C 2C 03 00 00 */ cmpwi r3, 0 -/* 80737710 41 82 00 10 */ beq lbl_80737720 -/* 80737714 80 81 00 10 */ lwz r4, 0x10(r1) -/* 80737718 28 04 00 00 */ cmplwi r4, 0 -/* 8073771C 40 82 00 2C */ bne lbl_80737748 -lbl_80737720: -/* 80737720 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 80737724 80 1E 01 04 */ lwz r0, 0x104(r30) -/* 80737728 90 61 00 44 */ stw r3, 0x44(r1) -/* 8073772C 90 01 00 48 */ stw r0, 0x48(r1) -/* 80737730 80 1E 01 08 */ lwz r0, 0x108(r30) -/* 80737734 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80737738 7F A3 EB 78 */ mr r3, r29 -/* 8073773C 38 81 00 44 */ addi r4, r1, 0x44 -/* 80737740 4B FF EB 2D */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80737744 48 00 04 EC */ b lbl_80737C30 -lbl_80737748: -/* 80737748 C0 44 04 D4 */ lfs f2, 0x4d4(r4) -/* 8073774C C0 3D 04 AC */ lfs f1, 0x4ac(r29) -/* 80737750 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80737754 3B 83 A1 4C */ addi r28, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80737758 C0 1C 00 14 */ lfs f0, 0x14(r28) -/* 8073775C EC 01 00 2A */ fadds f0, f1, f0 -/* 80737760 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80737764 40 80 00 4C */ bge lbl_807377B0 -/* 80737768 38 61 00 38 */ addi r3, r1, 0x38 -/* 8073776C 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80737770 38 BD 06 60 */ addi r5, r29, 0x660 -/* 80737774 4B B2 F3 71 */ bl __pl__4cXyzCFRC3Vec -/* 80737778 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 8073777C D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80737780 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80737784 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80737788 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 8073778C D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80737790 C0 3F 00 84 */ lfs f1, 0x84(r31) -/* 80737794 4B B3 01 C1 */ bl cM_rndF__Ff -/* 80737798 C0 5D 04 AC */ lfs f2, 0x4ac(r29) -/* 8073779C C0 1C 00 14 */ lfs f0, 0x14(r28) -/* 807377A0 EC 02 00 2A */ fadds f0, f2, f0 -/* 807377A4 EC 00 08 2A */ fadds f0, f0, f1 -/* 807377A8 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 807377AC 48 00 00 2C */ b lbl_807377D8 -lbl_807377B0: -/* 807377B0 38 61 00 2C */ addi r3, r1, 0x2c -/* 807377B4 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 807377B8 38 BD 06 60 */ addi r5, r29, 0x660 -/* 807377BC 4B B2 F3 29 */ bl __pl__4cXyzCFRC3Vec -/* 807377C0 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 807377C4 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 807377C8 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 807377CC D0 01 00 54 */ stfs f0, 0x54(r1) -/* 807377D0 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 807377D4 D0 01 00 58 */ stfs f0, 0x58(r1) -lbl_807377D8: -/* 807377D8 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 807377DC 38 81 00 50 */ addi r4, r1, 0x50 -/* 807377E0 4B B3 94 25 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 807377E4 B0 7D 0B 96 */ sth r3, 0xb96(r29) -/* 807377E8 A8 7D 04 DE */ lha r3, 0x4de(r29) -/* 807377EC A8 1D 0B 96 */ lha r0, 0xb96(r29) -/* 807377F0 7C 03 00 50 */ subf r0, r3, r0 -/* 807377F4 B0 1D 0B 8C */ sth r0, 0xb8c(r29) -/* 807377F8 A8 7D 0B 96 */ lha r3, 0xb96(r29) -/* 807377FC A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80737800 7C 63 00 50 */ subf r3, r3, r0 -/* 80737804 4B C2 D8 CD */ bl abs -/* 80737808 2C 03 40 00 */ cmpwi r3, 0x4000 -/* 8073780C 40 81 01 B0 */ ble lbl_807379BC -/* 80737810 38 7D 04 DE */ addi r3, r29, 0x4de -/* 80737814 A8 9D 0B 96 */ lha r4, 0xb96(r29) -/* 80737818 38 A0 04 00 */ li r5, 0x400 -/* 8073781C 4B B3 93 75 */ bl cLib_chaseAngleS__FPsss -/* 80737820 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80737824 38 81 00 50 */ addi r4, r1, 0x50 -/* 80737828 4B B3 94 4D */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz -/* 8073782C 7C 03 00 D0 */ neg r0, r3 -/* 80737830 7C 04 07 34 */ extsh r4, r0 -/* 80737834 38 7D 04 DC */ addi r3, r29, 0x4dc -/* 80737838 38 A0 04 00 */ li r5, 0x400 -/* 8073783C 4B B3 93 55 */ bl cLib_chaseAngleS__FPsss -/* 80737840 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80737844 38 81 00 50 */ addi r4, r1, 0x50 -/* 80737848 4B C0 FB 55 */ bl PSVECSquareDistance -/* 8073784C C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80737850 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80737854 40 81 00 58 */ ble lbl_807378AC -/* 80737858 FC 00 08 34 */ frsqrte f0, f1 -/* 8073785C C8 9F 00 48 */ lfd f4, 0x48(r31) -/* 80737860 FC 44 00 32 */ fmul f2, f4, f0 -/* 80737864 C8 7F 00 50 */ lfd f3, 0x50(r31) -/* 80737868 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073786C FC 01 00 32 */ fmul f0, f1, f0 -/* 80737870 FC 03 00 28 */ fsub f0, f3, f0 -/* 80737874 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737878 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073787C FC 00 00 32 */ fmul f0, f0, f0 -/* 80737880 FC 01 00 32 */ fmul f0, f1, f0 -/* 80737884 FC 03 00 28 */ fsub f0, f3, f0 -/* 80737888 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073788C FC 44 00 32 */ fmul f2, f4, f0 -/* 80737890 FC 00 00 32 */ fmul f0, f0, f0 -/* 80737894 FC 01 00 32 */ fmul f0, f1, f0 -/* 80737898 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073789C FC 02 00 32 */ fmul f0, f2, f0 -/* 807378A0 FC 21 00 32 */ fmul f1, f1, f0 -/* 807378A4 FC 20 08 18 */ frsp f1, f1 -/* 807378A8 48 00 00 88 */ b lbl_80737930 -lbl_807378AC: -/* 807378AC C8 1F 00 58 */ lfd f0, 0x58(r31) -/* 807378B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807378B4 40 80 00 10 */ bge lbl_807378C4 -/* 807378B8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 807378BC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 807378C0 48 00 00 70 */ b lbl_80737930 -lbl_807378C4: -/* 807378C4 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 807378C8 80 81 00 0C */ lwz r4, 0xc(r1) -/* 807378CC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 807378D0 3C 00 7F 80 */ lis r0, 0x7f80 -/* 807378D4 7C 03 00 00 */ cmpw r3, r0 -/* 807378D8 41 82 00 14 */ beq lbl_807378EC -/* 807378DC 40 80 00 40 */ bge lbl_8073791C -/* 807378E0 2C 03 00 00 */ cmpwi r3, 0 -/* 807378E4 41 82 00 20 */ beq lbl_80737904 -/* 807378E8 48 00 00 34 */ b lbl_8073791C -lbl_807378EC: -/* 807378EC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 807378F0 41 82 00 0C */ beq lbl_807378FC -/* 807378F4 38 00 00 01 */ li r0, 1 -/* 807378F8 48 00 00 28 */ b lbl_80737920 -lbl_807378FC: -/* 807378FC 38 00 00 02 */ li r0, 2 -/* 80737900 48 00 00 20 */ b lbl_80737920 -lbl_80737904: -/* 80737904 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80737908 41 82 00 0C */ beq lbl_80737914 -/* 8073790C 38 00 00 05 */ li r0, 5 -/* 80737910 48 00 00 10 */ b lbl_80737920 -lbl_80737914: -/* 80737914 38 00 00 03 */ li r0, 3 -/* 80737918 48 00 00 08 */ b lbl_80737920 -lbl_8073791C: -/* 8073791C 38 00 00 04 */ li r0, 4 -lbl_80737920: -/* 80737920 2C 00 00 01 */ cmpwi r0, 1 -/* 80737924 40 82 00 0C */ bne lbl_80737930 -/* 80737928 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073792C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80737930: -/* 80737930 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80737934 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80737938 C0 43 00 10 */ lfs f2, 0x10(r3) -/* 8073793C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80737940 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80737944 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80737948 40 80 02 1C */ bge lbl_80737B64 -/* 8073794C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737950 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737954 A8 1D 04 DC */ lha r0, 0x4dc(r29) -/* 80737958 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8073795C 7C 63 02 14 */ add r3, r3, r0 -/* 80737960 C0 23 00 04 */ lfs f1, 4(r3) -/* 80737964 38 7D 05 2C */ addi r3, r29, 0x52c -/* 80737968 C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 8073796C EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737970 C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 80737974 4B B3 8D CD */ bl cLib_chaseF__FPfff -/* 80737978 A8 1D 04 DC */ lha r0, 0x4dc(r29) -/* 8073797C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80737980 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737984 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737988 7C 23 04 2E */ lfsx f1, r3, r0 -/* 8073798C 38 7D 04 FC */ addi r3, r29, 0x4fc -/* 80737990 C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 80737994 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737998 C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 8073799C 4B B3 8D A5 */ bl cLib_chaseF__FPfff -/* 807379A0 38 7D 0B 80 */ addi r3, r29, 0xb80 -/* 807379A4 38 80 0C 00 */ li r4, 0xc00 -/* 807379A8 38 A0 00 20 */ li r5, 0x20 -/* 807379AC 38 C0 04 00 */ li r6, 0x400 -/* 807379B0 38 E0 00 80 */ li r7, 0x80 -/* 807379B4 4B B3 8B 8D */ bl cLib_addCalcAngleS__FPsssss -/* 807379B8 48 00 01 AC */ b lbl_80737B64 -lbl_807379BC: -/* 807379BC 38 7D 04 DE */ addi r3, r29, 0x4de -/* 807379C0 A8 9D 0B 96 */ lha r4, 0xb96(r29) -/* 807379C4 38 A0 02 00 */ li r5, 0x200 -/* 807379C8 4B B3 91 C9 */ bl cLib_chaseAngleS__FPsss -/* 807379CC 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 807379D0 38 81 00 50 */ addi r4, r1, 0x50 -/* 807379D4 4B B3 92 A1 */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz -/* 807379D8 7C 03 00 D0 */ neg r0, r3 -/* 807379DC 7C 04 07 34 */ extsh r4, r0 -/* 807379E0 38 7D 04 DC */ addi r3, r29, 0x4dc -/* 807379E4 38 A0 02 00 */ li r5, 0x200 -/* 807379E8 4B B3 91 A9 */ bl cLib_chaseAngleS__FPsss -/* 807379EC 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 807379F0 38 81 00 50 */ addi r4, r1, 0x50 -/* 807379F4 4B C0 F9 A9 */ bl PSVECSquareDistance -/* 807379F8 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 807379FC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80737A00 40 81 00 58 */ ble lbl_80737A58 -/* 80737A04 FC 00 08 34 */ frsqrte f0, f1 -/* 80737A08 C8 9F 00 48 */ lfd f4, 0x48(r31) -/* 80737A0C FC 44 00 32 */ fmul f2, f4, f0 -/* 80737A10 C8 7F 00 50 */ lfd f3, 0x50(r31) -/* 80737A14 FC 00 00 32 */ fmul f0, f0, f0 -/* 80737A18 FC 01 00 32 */ fmul f0, f1, f0 -/* 80737A1C FC 03 00 28 */ fsub f0, f3, f0 -/* 80737A20 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737A24 FC 44 00 32 */ fmul f2, f4, f0 -/* 80737A28 FC 00 00 32 */ fmul f0, f0, f0 -/* 80737A2C FC 01 00 32 */ fmul f0, f1, f0 -/* 80737A30 FC 03 00 28 */ fsub f0, f3, f0 -/* 80737A34 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737A38 FC 44 00 32 */ fmul f2, f4, f0 -/* 80737A3C FC 00 00 32 */ fmul f0, f0, f0 -/* 80737A40 FC 01 00 32 */ fmul f0, f1, f0 -/* 80737A44 FC 03 00 28 */ fsub f0, f3, f0 -/* 80737A48 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737A4C FC 21 00 32 */ fmul f1, f1, f0 -/* 80737A50 FC 20 08 18 */ frsp f1, f1 -/* 80737A54 48 00 00 88 */ b lbl_80737ADC -lbl_80737A58: -/* 80737A58 C8 1F 00 58 */ lfd f0, 0x58(r31) -/* 80737A5C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80737A60 40 80 00 10 */ bge lbl_80737A70 -/* 80737A64 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80737A68 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80737A6C 48 00 00 70 */ b lbl_80737ADC -lbl_80737A70: -/* 80737A70 D0 21 00 08 */ stfs f1, 8(r1) -/* 80737A74 80 81 00 08 */ lwz r4, 8(r1) -/* 80737A78 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80737A7C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80737A80 7C 03 00 00 */ cmpw r3, r0 -/* 80737A84 41 82 00 14 */ beq lbl_80737A98 -/* 80737A88 40 80 00 40 */ bge lbl_80737AC8 -/* 80737A8C 2C 03 00 00 */ cmpwi r3, 0 -/* 80737A90 41 82 00 20 */ beq lbl_80737AB0 -/* 80737A94 48 00 00 34 */ b lbl_80737AC8 -lbl_80737A98: -/* 80737A98 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80737A9C 41 82 00 0C */ beq lbl_80737AA8 -/* 80737AA0 38 00 00 01 */ li r0, 1 -/* 80737AA4 48 00 00 28 */ b lbl_80737ACC -lbl_80737AA8: -/* 80737AA8 38 00 00 02 */ li r0, 2 -/* 80737AAC 48 00 00 20 */ b lbl_80737ACC -lbl_80737AB0: -/* 80737AB0 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80737AB4 41 82 00 0C */ beq lbl_80737AC0 -/* 80737AB8 38 00 00 05 */ li r0, 5 -/* 80737ABC 48 00 00 10 */ b lbl_80737ACC -lbl_80737AC0: -/* 80737AC0 38 00 00 03 */ li r0, 3 -/* 80737AC4 48 00 00 08 */ b lbl_80737ACC -lbl_80737AC8: -/* 80737AC8 38 00 00 04 */ li r0, 4 -lbl_80737ACC: -/* 80737ACC 2C 00 00 01 */ cmpwi r0, 1 -/* 80737AD0 40 82 00 0C */ bne lbl_80737ADC -/* 80737AD4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80737AD8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80737ADC: -/* 80737ADC 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80737AE0 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80737AE4 C0 43 00 10 */ lfs f2, 0x10(r3) -/* 80737AE8 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80737AEC EC 02 00 28 */ fsubs f0, f2, f0 -/* 80737AF0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80737AF4 40 81 00 70 */ ble lbl_80737B64 -/* 80737AF8 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737AFC 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737B00 A8 1D 04 DC */ lha r0, 0x4dc(r29) -/* 80737B04 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80737B08 7C 63 02 14 */ add r3, r3, r0 -/* 80737B0C C0 23 00 04 */ lfs f1, 4(r3) -/* 80737B10 38 7D 05 2C */ addi r3, r29, 0x52c -/* 80737B14 C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 80737B18 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737B1C C0 5F 00 98 */ lfs f2, 0x98(r31) -/* 80737B20 4B B3 8C 21 */ bl cLib_chaseF__FPfff -/* 80737B24 A8 1D 04 DC */ lha r0, 0x4dc(r29) -/* 80737B28 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80737B2C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737B30 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737B34 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80737B38 38 7D 04 FC */ addi r3, r29, 0x4fc -/* 80737B3C C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80737B40 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737B44 C0 5F 00 98 */ lfs f2, 0x98(r31) -/* 80737B48 4B B3 8B F9 */ bl cLib_chaseF__FPfff -/* 80737B4C 38 7D 0B 80 */ addi r3, r29, 0xb80 -/* 80737B50 38 80 24 00 */ li r4, 0x2400 -/* 80737B54 38 A0 00 20 */ li r5, 0x20 -/* 80737B58 38 C0 04 00 */ li r6, 0x400 -/* 80737B5C 38 E0 00 80 */ li r7, 0x80 -/* 80737B60 4B B3 89 E1 */ bl cLib_addCalcAngleS__FPsssss -lbl_80737B64: -/* 80737B64 A8 7D 0B 7C */ lha r3, 0xb7c(r29) -/* 80737B68 A8 1D 0B 80 */ lha r0, 0xb80(r29) -/* 80737B6C 7C 03 02 14 */ add r0, r3, r0 -/* 80737B70 B0 1D 0B 7C */ sth r0, 0xb7c(r29) -/* 80737B74 7F A3 EB 78 */ mr r3, r29 -/* 80737B78 4B FF FA B5 */ bl checkCoreFishAttack__11daE_OctBg_cFv -/* 80737B7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80737B80 41 82 00 2C */ beq lbl_80737BAC -/* 80737B84 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80737B88 80 1E 01 10 */ lwz r0, 0x110(r30) -/* 80737B8C 90 61 00 20 */ stw r3, 0x20(r1) -/* 80737B90 90 01 00 24 */ stw r0, 0x24(r1) -/* 80737B94 80 1E 01 14 */ lwz r0, 0x114(r30) -/* 80737B98 90 01 00 28 */ stw r0, 0x28(r1) -/* 80737B9C 7F A3 EB 78 */ mr r3, r29 -/* 80737BA0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80737BA4 4B FF E6 C9 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80737BA8 48 00 00 88 */ b lbl_80737C30 -lbl_80737BAC: -/* 80737BAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80737BB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80737BB4 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80737BB8 28 00 00 00 */ cmplwi r0, 0 -/* 80737BBC 41 82 00 2C */ beq lbl_80737BE8 -/* 80737BC0 80 7E 01 18 */ lwz r3, 0x118(r30) -/* 80737BC4 80 1E 01 1C */ lwz r0, 0x11c(r30) -/* 80737BC8 90 61 00 14 */ stw r3, 0x14(r1) -/* 80737BCC 90 01 00 18 */ stw r0, 0x18(r1) -/* 80737BD0 80 1E 01 20 */ lwz r0, 0x120(r30) -/* 80737BD4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80737BD8 7F A3 EB 78 */ mr r3, r29 -/* 80737BDC 38 81 00 14 */ addi r4, r1, 0x14 -/* 80737BE0 4B FF E6 8D */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80737BE4 48 00 00 4C */ b lbl_80737C30 -lbl_80737BE8: -/* 80737BE8 88 1D 0B AF */ lbz r0, 0xbaf(r29) -/* 80737BEC 28 00 00 00 */ cmplwi r0, 0 -/* 80737BF0 40 82 00 40 */ bne lbl_80737C30 -/* 80737BF4 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80737BF8 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80737BFC C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80737C00 4B B2 FD 55 */ bl cM_rndF__Ff -/* 80737C04 7F A3 EB 78 */ mr r3, r29 -/* 80737C08 38 9D 06 60 */ addi r4, r29, 0x660 -/* 80737C0C 4B FF F9 69 */ bl setChasePos__11daE_OctBg_cFR4cXyzf -/* 80737C10 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80737C14 4B B2 FD 79 */ bl cM_rndFX__Ff -/* 80737C18 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80737C1C EC 00 08 2A */ fadds f0, f0, f1 -/* 80737C20 FC 00 00 1E */ fctiwz f0, f0 -/* 80737C24 D8 01 00 60 */ stfd f0, 0x60(r1) -/* 80737C28 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80737C2C 98 1D 0B AF */ stb r0, 0xbaf(r29) -lbl_80737C30: -/* 80737C30 39 61 00 80 */ addi r11, r1, 0x80 -/* 80737C34 4B C2 A5 F1 */ bl _restgpr_28 -/* 80737C38 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80737C3C 7C 08 03 A6 */ mtlr r0 -/* 80737C40 38 21 00 80 */ addi r1, r1, 0x80 -/* 80737C44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkChase__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkChase__11daE_OctBg_cFv.s deleted file mode 100644 index 30f20ef5d77..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkChase__11daE_OctBg_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80736DAC: -/* 80736DAC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80736DB0 7C 08 02 A6 */ mflr r0 -/* 80736DB4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80736DB8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80736DBC 7C 7F 1B 78 */ mr r31, r3 -/* 80736DC0 88 03 0B AC */ lbz r0, 0xbac(r3) -/* 80736DC4 28 00 00 00 */ cmplwi r0, 0 -/* 80736DC8 40 82 00 0C */ bne lbl_80736DD4 -/* 80736DCC 38 60 00 00 */ li r3, 0 -/* 80736DD0 48 00 00 4C */ b lbl_80736E1C -lbl_80736DD4: -/* 80736DD4 80 7F 04 A4 */ lwz r3, 0x4a4(r31) -/* 80736DD8 38 81 00 08 */ addi r4, r1, 8 -/* 80736DDC 4B 8E 2B E1 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80736DE0 2C 03 00 00 */ cmpwi r3, 0 -/* 80736DE4 41 82 00 10 */ beq lbl_80736DF4 -/* 80736DE8 80 01 00 08 */ lwz r0, 8(r1) -/* 80736DEC 28 00 00 00 */ cmplwi r0, 0 -/* 80736DF0 40 82 00 28 */ bne lbl_80736E18 -lbl_80736DF4: -/* 80736DF4 38 00 00 00 */ li r0, 0 -/* 80736DF8 98 1F 0B AC */ stb r0, 0xbac(r31) -/* 80736DFC 3C 60 80 74 */ lis r3, struct_8073A14C+0x25@ha /* 0x8073A171@ha */ -/* 80736E00 38 83 A1 71 */ addi r4, r3, struct_8073A14C+0x25@l /* 0x8073A171@l */ -/* 80736E04 88 64 00 00 */ lbz r3, 0(r4) -/* 80736E08 38 03 FF FF */ addi r0, r3, -1 -/* 80736E0C 98 04 00 00 */ stb r0, 0(r4) -/* 80736E10 38 60 00 00 */ li r3, 0 -/* 80736E14 48 00 00 08 */ b lbl_80736E1C -lbl_80736E18: -/* 80736E18 38 60 00 01 */ li r3, 1 -lbl_80736E1C: -/* 80736E1C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80736E20 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80736E24 7C 08 03 A6 */ mtlr r0 -/* 80736E28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80736E2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkCoreFishAttack__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkCoreFishAttack__11daE_OctBg_cFv.s deleted file mode 100644 index d28a1914f11..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkCoreFishAttack__11daE_OctBg_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8073762C: -/* 8073762C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80737630 7C 08 02 A6 */ mflr r0 -/* 80737634 90 01 00 14 */ stw r0, 0x14(r1) -/* 80737638 80 63 04 A4 */ lwz r3, 0x4a4(r3) -/* 8073763C 38 81 00 08 */ addi r4, r1, 8 -/* 80737640 4B 8E 23 7D */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80737644 2C 03 00 00 */ cmpwi r3, 0 -/* 80737648 41 82 00 10 */ beq lbl_80737658 -/* 8073764C 80 61 00 08 */ lwz r3, 8(r1) -/* 80737650 28 03 00 00 */ cmplwi r3, 0 -/* 80737654 40 82 00 0C */ bne lbl_80737660 -lbl_80737658: -/* 80737658 38 60 00 00 */ li r3, 0 -/* 8073765C 48 00 00 0C */ b lbl_80737668 -lbl_80737660: -/* 80737660 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 80737664 54 03 67 FE */ rlwinm r3, r0, 0xc, 0x1f, 0x1f -lbl_80737668: -/* 80737668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8073766C 7C 08 03 A6 */ mtlr r0 -/* 80737670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80737674 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkExplode__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkExplode__11daE_OctBg_cFv.s deleted file mode 100644 index 91ee35c57c0..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkExplode__11daE_OctBg_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80736418: -/* 80736418 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8073641C 7C 08 02 A6 */ mflr r0 -/* 80736420 90 01 00 24 */ stw r0, 0x24(r1) -/* 80736424 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80736428 7C 7F 1B 78 */ mr r31, r3 -/* 8073642C 80 03 0B 90 */ lwz r0, 0xb90(r3) -/* 80736430 2C 00 00 00 */ cmpwi r0, 0 -/* 80736434 41 82 00 D0 */ beq lbl_80736504 -/* 80736438 4B FF FE D9 */ bl setSparkEffect__11daE_OctBg_cFv -/* 8073643C 80 7F 0B 90 */ lwz r3, 0xb90(r31) -/* 80736440 38 03 FF FF */ addi r0, r3, -1 -/* 80736444 90 1F 0B 90 */ stw r0, 0xb90(r31) -/* 80736448 80 1F 0B 90 */ lwz r0, 0xb90(r31) -/* 8073644C 2C 00 00 00 */ cmpwi r0, 0 -/* 80736450 40 82 00 40 */ bne lbl_80736490 -/* 80736454 38 00 00 00 */ li r0, 0 -/* 80736458 90 01 00 08 */ stw r0, 8(r1) -/* 8073645C 38 60 02 21 */ li r3, 0x221 -/* 80736460 38 80 00 12 */ li r4, 0x12 -/* 80736464 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80736468 38 C0 FF FF */ li r6, -1 -/* 8073646C 38 E0 00 00 */ li r7, 0 -/* 80736470 39 00 00 00 */ li r8, 0 -/* 80736474 39 20 FF FF */ li r9, -1 -/* 80736478 39 40 00 00 */ li r10, 0 -/* 8073647C 4B 8E 39 89 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv -/* 80736480 7F E3 FB 78 */ mr r3, r31 -/* 80736484 4B 8E 37 F9 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80736488 38 60 00 01 */ li r3, 1 -/* 8073648C 48 00 00 7C */ b lbl_80736508 -lbl_80736490: -/* 80736490 2C 00 00 1E */ cmpwi r0, 0x1e -/* 80736494 40 80 00 14 */ bge lbl_807364A8 -/* 80736498 A8 7F 0B 94 */ lha r3, 0xb94(r31) -/* 8073649C 38 03 10 00 */ addi r0, r3, 0x1000 -/* 807364A0 B0 1F 0B 94 */ sth r0, 0xb94(r31) -/* 807364A4 48 00 00 28 */ b lbl_807364CC -lbl_807364A8: -/* 807364A8 2C 00 00 2D */ cmpwi r0, 0x2d -/* 807364AC 40 80 00 14 */ bge lbl_807364C0 -/* 807364B0 A8 7F 0B 94 */ lha r3, 0xb94(r31) -/* 807364B4 38 03 08 00 */ addi r0, r3, 0x800 -/* 807364B8 B0 1F 0B 94 */ sth r0, 0xb94(r31) -/* 807364BC 48 00 00 10 */ b lbl_807364CC -lbl_807364C0: -/* 807364C0 A8 7F 0B 94 */ lha r3, 0xb94(r31) -/* 807364C4 38 03 03 00 */ addi r0, r3, 0x300 -/* 807364C8 B0 1F 0B 94 */ sth r0, 0xb94(r31) -lbl_807364CC: -/* 807364CC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 807364D0 7C 03 07 74 */ extsb r3, r0 -/* 807364D4 3C 80 00 08 */ lis r4, 0x0008 /* 0x0008000A@ha */ -/* 807364D8 38 04 00 0A */ addi r0, r4, 0x000A /* 0x0008000A@l */ -/* 807364DC 90 01 00 10 */ stw r0, 0x10(r1) -/* 807364E0 4B 8F 6B 8D */ bl dComIfGp_getReverb__Fi -/* 807364E4 7C 66 1B 78 */ mr r6, r3 -/* 807364E8 38 7F 05 BC */ addi r3, r31, 0x5bc -/* 807364EC 38 81 00 10 */ addi r4, r1, 0x10 -/* 807364F0 38 A0 00 00 */ li r5, 0 -/* 807364F4 81 9F 05 BC */ lwz r12, 0x5bc(r31) -/* 807364F8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 807364FC 7D 89 03 A6 */ mtctr r12 -/* 80736500 4E 80 04 21 */ bctrl -lbl_80736504: -/* 80736504 38 60 00 00 */ li r3, 0 -lbl_80736508: -/* 80736508 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8073650C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80736510 7C 08 03 A6 */ mtlr r0 -/* 80736514 38 21 00 20 */ addi r1, r1, 0x20 -/* 80736518 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkNormalAttack__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkNormalAttack__11daE_OctBg_cFv.s deleted file mode 100644 index d9ada639c61..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkNormalAttack__11daE_OctBg_cFv.s +++ /dev/null @@ -1,139 +0,0 @@ -lbl_80736BB4: -/* 80736BB4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80736BB8 7C 08 02 A6 */ mflr r0 -/* 80736BBC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80736BC0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80736BC4 4B C2 B6 19 */ bl _savegpr_29 -/* 80736BC8 7C 7E 1B 78 */ mr r30, r3 -/* 80736BCC 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80736BD0 3B A3 9D 60 */ addi r29, r3, lit_3768@l /* 0x80739D60@l */ -/* 80736BD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80736BD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80736BDC 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 80736BE0 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80736BE4 28 00 00 00 */ cmplwi r0, 0 -/* 80736BE8 41 82 00 0C */ beq lbl_80736BF4 -/* 80736BEC 38 60 00 00 */ li r3, 0 -/* 80736BF0 48 00 01 A4 */ b lbl_80736D94 -lbl_80736BF4: -/* 80736BF4 3C 60 80 74 */ lis r3, struct_8073A14C+0x26@ha /* 0x8073A172@ha */ -/* 80736BF8 88 83 A1 72 */ lbz r4, struct_8073A14C+0x26@l(r3) /* 0x8073A172@l */ -/* 80736BFC 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80736C00 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80736C04 88 03 00 20 */ lbz r0, 0x20(r3) -/* 80736C08 7C 04 00 40 */ cmplw r4, r0 -/* 80736C0C 40 80 01 84 */ bge lbl_80736D90 -/* 80736C10 C0 5E 04 B0 */ lfs f2, 0x4b0(r30) -/* 80736C14 C0 1E 04 A8 */ lfs f0, 0x4a8(r30) -/* 80736C18 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80736C1C C0 3D 00 30 */ lfs f1, 0x30(r29) -/* 80736C20 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80736C24 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80736C28 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 80736C2C C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80736C30 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80736C34 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80736C38 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80736C3C 38 61 00 0C */ addi r3, r1, 0xc -/* 80736C40 38 81 00 18 */ addi r4, r1, 0x18 -/* 80736C44 4B C1 07 59 */ bl PSVECSquareDistance -/* 80736C48 C0 1D 00 30 */ lfs f0, 0x30(r29) -/* 80736C4C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80736C50 40 81 00 58 */ ble lbl_80736CA8 -/* 80736C54 FC 00 08 34 */ frsqrte f0, f1 -/* 80736C58 C8 9D 00 48 */ lfd f4, 0x48(r29) -/* 80736C5C FC 44 00 32 */ fmul f2, f4, f0 -/* 80736C60 C8 7D 00 50 */ lfd f3, 0x50(r29) -/* 80736C64 FC 00 00 32 */ fmul f0, f0, f0 -/* 80736C68 FC 01 00 32 */ fmul f0, f1, f0 -/* 80736C6C FC 03 00 28 */ fsub f0, f3, f0 -/* 80736C70 FC 02 00 32 */ fmul f0, f2, f0 -/* 80736C74 FC 44 00 32 */ fmul f2, f4, f0 -/* 80736C78 FC 00 00 32 */ fmul f0, f0, f0 -/* 80736C7C FC 01 00 32 */ fmul f0, f1, f0 -/* 80736C80 FC 03 00 28 */ fsub f0, f3, f0 -/* 80736C84 FC 02 00 32 */ fmul f0, f2, f0 -/* 80736C88 FC 44 00 32 */ fmul f2, f4, f0 -/* 80736C8C FC 00 00 32 */ fmul f0, f0, f0 -/* 80736C90 FC 01 00 32 */ fmul f0, f1, f0 -/* 80736C94 FC 03 00 28 */ fsub f0, f3, f0 -/* 80736C98 FC 02 00 32 */ fmul f0, f2, f0 -/* 80736C9C FC 21 00 32 */ fmul f1, f1, f0 -/* 80736CA0 FC 20 08 18 */ frsp f1, f1 -/* 80736CA4 48 00 00 88 */ b lbl_80736D2C -lbl_80736CA8: -/* 80736CA8 C8 1D 00 58 */ lfd f0, 0x58(r29) -/* 80736CAC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80736CB0 40 80 00 10 */ bge lbl_80736CC0 -/* 80736CB4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80736CB8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80736CBC 48 00 00 70 */ b lbl_80736D2C -lbl_80736CC0: -/* 80736CC0 D0 21 00 08 */ stfs f1, 8(r1) -/* 80736CC4 80 81 00 08 */ lwz r4, 8(r1) -/* 80736CC8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80736CCC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80736CD0 7C 03 00 00 */ cmpw r3, r0 -/* 80736CD4 41 82 00 14 */ beq lbl_80736CE8 -/* 80736CD8 40 80 00 40 */ bge lbl_80736D18 -/* 80736CDC 2C 03 00 00 */ cmpwi r3, 0 -/* 80736CE0 41 82 00 20 */ beq lbl_80736D00 -/* 80736CE4 48 00 00 34 */ b lbl_80736D18 -lbl_80736CE8: -/* 80736CE8 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80736CEC 41 82 00 0C */ beq lbl_80736CF8 -/* 80736CF0 38 00 00 01 */ li r0, 1 -/* 80736CF4 48 00 00 28 */ b lbl_80736D1C -lbl_80736CF8: -/* 80736CF8 38 00 00 02 */ li r0, 2 -/* 80736CFC 48 00 00 20 */ b lbl_80736D1C -lbl_80736D00: -/* 80736D00 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80736D04 41 82 00 0C */ beq lbl_80736D10 -/* 80736D08 38 00 00 05 */ li r0, 5 -/* 80736D0C 48 00 00 10 */ b lbl_80736D1C -lbl_80736D10: -/* 80736D10 38 00 00 03 */ li r0, 3 -/* 80736D14 48 00 00 08 */ b lbl_80736D1C -lbl_80736D18: -/* 80736D18 38 00 00 04 */ li r0, 4 -lbl_80736D1C: -/* 80736D1C 2C 00 00 01 */ cmpwi r0, 1 -/* 80736D20 40 82 00 0C */ bne lbl_80736D2C -/* 80736D24 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80736D28 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80736D2C: -/* 80736D2C 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80736D30 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80736D34 C0 03 00 08 */ lfs f0, 8(r3) -/* 80736D38 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80736D3C 40 80 00 54 */ bge lbl_80736D90 -/* 80736D40 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 80736D44 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80736D48 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80736D4C 40 80 00 44 */ bge lbl_80736D90 -/* 80736D50 7F C3 F3 78 */ mr r3, r30 -/* 80736D54 7F E4 FB 78 */ mr r4, r31 -/* 80736D58 4B 8E 60 A5 */ bl fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80736D5C 2C 03 00 00 */ cmpwi r3, 0 -/* 80736D60 40 82 00 30 */ bne lbl_80736D90 -/* 80736D64 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80736D68 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80736D6C 4B B3 9E 99 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80736D70 7C 63 07 34 */ extsh r3, r3 -/* 80736D74 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80736D78 7C 63 00 50 */ subf r3, r3, r0 -/* 80736D7C 4B C2 E3 55 */ bl abs -/* 80736D80 2C 03 20 00 */ cmpwi r3, 0x2000 -/* 80736D84 40 80 00 0C */ bge lbl_80736D90 -/* 80736D88 38 60 00 01 */ li r3, 1 -/* 80736D8C 48 00 00 08 */ b lbl_80736D94 -lbl_80736D90: -/* 80736D90 38 60 00 00 */ li r3, 0 -lbl_80736D94: -/* 80736D94 39 61 00 40 */ addi r11, r1, 0x40 -/* 80736D98 4B C2 B4 91 */ bl _restgpr_29 -/* 80736D9C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80736DA0 7C 08 03 A6 */ mtlr r0 -/* 80736DA4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80736DA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/core_fish_attack__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/core_fish_attack__11daE_OctBg_cFv.s deleted file mode 100644 index 8e71b51434b..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/core_fish_attack__11daE_OctBg_cFv.s +++ /dev/null @@ -1,400 +0,0 @@ -lbl_8073814C: -/* 8073814C 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80738150 7C 08 02 A6 */ mflr r0 -/* 80738154 90 01 00 84 */ stw r0, 0x84(r1) -/* 80738158 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 8073815C F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 80738160 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 80738164 93 C1 00 68 */ stw r30, 0x68(r1) -/* 80738168 7C 7E 1B 78 */ mr r30, r3 -/* 8073816C 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80738170 3B E3 9D 60 */ addi r31, r3, lit_3768@l /* 0x80739D60@l */ -/* 80738174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80738178 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073817C 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 80738180 80 1E 0B 70 */ lwz r0, 0xb70(r30) -/* 80738184 2C 00 00 00 */ cmpwi r0, 0 -/* 80738188 40 82 00 70 */ bne lbl_807381F8 -/* 8073818C 38 00 00 01 */ li r0, 1 -/* 80738190 98 1E 0B 74 */ stb r0, 0xb74(r30) -/* 80738194 C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 80738198 4B B2 F7 BD */ bl cM_rndF__Ff -/* 8073819C C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 807381A0 EC 00 08 2A */ fadds f0, f0, f1 -/* 807381A4 FC 00 00 1E */ fctiwz f0, f0 -/* 807381A8 D8 01 00 50 */ stfd f0, 0x50(r1) -/* 807381AC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 807381B0 B0 1E 0B B0 */ sth r0, 0xbb0(r30) -/* 807381B4 C0 3F 00 B8 */ lfs f1, 0xb8(r31) -/* 807381B8 4B B2 F7 9D */ bl cM_rndF__Ff -/* 807381BC 7F C3 F3 78 */ mr r3, r30 -/* 807381C0 38 9E 06 60 */ addi r4, r30, 0x660 -/* 807381C4 4B FF F3 B1 */ bl setChasePos__11daE_OctBg_cFR4cXyzf -/* 807381C8 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 807381CC 4B B2 F7 C1 */ bl cM_rndFX__Ff -/* 807381D0 C0 1F 00 BC */ lfs f0, 0xbc(r31) -/* 807381D4 EC 00 08 2A */ fadds f0, f0, f1 -/* 807381D8 FC 00 00 1E */ fctiwz f0, f0 -/* 807381DC D8 01 00 58 */ stfd f0, 0x58(r1) -/* 807381E0 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 807381E4 98 1E 0B AF */ stb r0, 0xbaf(r30) -/* 807381E8 80 7E 0B 70 */ lwz r3, 0xb70(r30) -/* 807381EC 38 03 00 01 */ addi r0, r3, 1 -/* 807381F0 90 1E 0B 70 */ stw r0, 0xb70(r30) -/* 807381F4 48 00 05 00 */ b lbl_807386F4 -lbl_807381F8: -/* 807381F8 2C 00 FF FF */ cmpwi r0, -1 -/* 807381FC 40 82 00 10 */ bne lbl_8073820C -/* 80738200 38 00 00 00 */ li r0, 0 -/* 80738204 98 1E 0B 74 */ stb r0, 0xb74(r30) -/* 80738208 48 00 04 EC */ b lbl_807386F4 -lbl_8073820C: -/* 8073820C 2C 00 00 01 */ cmpwi r0, 1 -/* 80738210 40 82 04 E4 */ bne lbl_807386F4 -/* 80738214 C0 04 04 D0 */ lfs f0, 0x4d0(r4) -/* 80738218 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8073821C C0 24 04 D4 */ lfs f1, 0x4d4(r4) -/* 80738220 D0 21 00 38 */ stfs f1, 0x38(r1) -/* 80738224 C0 04 04 D8 */ lfs f0, 0x4d8(r4) -/* 80738228 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 8073822C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 80738230 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 80738234 41 82 00 14 */ beq lbl_80738248 -/* 80738238 C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 8073823C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80738240 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80738244 48 00 00 10 */ b lbl_80738254 -lbl_80738248: -/* 80738248 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 8073824C EC 01 00 2A */ fadds f0, f1, f0 -/* 80738250 D0 01 00 38 */ stfs f0, 0x38(r1) -lbl_80738254: -/* 80738254 38 61 00 1C */ addi r3, r1, 0x1c -/* 80738258 38 81 00 34 */ addi r4, r1, 0x34 -/* 8073825C 38 BE 06 60 */ addi r5, r30, 0x660 -/* 80738260 4B B2 E8 85 */ bl __pl__4cXyzCFRC3Vec -/* 80738264 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80738268 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 8073826C C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80738270 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80738274 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80738278 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 8073827C 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80738280 38 81 00 40 */ addi r4, r1, 0x40 -/* 80738284 4B B3 89 81 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80738288 B0 7E 0B 96 */ sth r3, 0xb96(r30) -/* 8073828C A8 7E 04 DE */ lha r3, 0x4de(r30) -/* 80738290 A8 1E 0B 96 */ lha r0, 0xb96(r30) -/* 80738294 7C 03 00 50 */ subf r0, r3, r0 -/* 80738298 B0 1E 0B 8C */ sth r0, 0xb8c(r30) -/* 8073829C 38 7E 04 DE */ addi r3, r30, 0x4de -/* 807382A0 A8 9E 0B 96 */ lha r4, 0xb96(r30) -/* 807382A4 38 A0 02 00 */ li r5, 0x200 -/* 807382A8 4B B3 88 E9 */ bl cLib_chaseAngleS__FPsss -/* 807382AC 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 807382B0 38 81 00 40 */ addi r4, r1, 0x40 -/* 807382B4 4B B3 89 C1 */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz -/* 807382B8 7C 03 00 D0 */ neg r0, r3 -/* 807382BC 7C 04 07 34 */ extsh r4, r0 -/* 807382C0 38 7E 04 DC */ addi r3, r30, 0x4dc -/* 807382C4 38 A0 02 00 */ li r5, 0x200 -/* 807382C8 4B B3 88 C9 */ bl cLib_chaseAngleS__FPsss -/* 807382CC 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 807382D0 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 807382D4 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 807382D8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 807382DC 7C 63 02 14 */ add r3, r3, r0 -/* 807382E0 C0 23 00 04 */ lfs f1, 4(r3) -/* 807382E4 38 7E 05 2C */ addi r3, r30, 0x52c -/* 807382E8 C0 1F 00 C0 */ lfs f0, 0xc0(r31) -/* 807382EC EC 20 00 72 */ fmuls f1, f0, f1 -/* 807382F0 C0 5F 00 98 */ lfs f2, 0x98(r31) -/* 807382F4 4B B3 84 4D */ bl cLib_chaseF__FPfff -/* 807382F8 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 807382FC 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80738300 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80738304 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80738308 7C 23 04 2E */ lfsx f1, r3, r0 -/* 8073830C 38 7E 04 FC */ addi r3, r30, 0x4fc -/* 80738310 C0 1F 00 C4 */ lfs f0, 0xc4(r31) -/* 80738314 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80738318 C0 5F 00 98 */ lfs f2, 0x98(r31) -/* 8073831C 4B B3 84 25 */ bl cLib_chaseF__FPfff -/* 80738320 38 7E 0B 80 */ addi r3, r30, 0xb80 -/* 80738324 38 80 30 00 */ li r4, 0x3000 -/* 80738328 38 A0 00 20 */ li r5, 0x20 -/* 8073832C 38 C0 04 00 */ li r6, 0x400 -/* 80738330 38 E0 00 80 */ li r7, 0x80 -/* 80738334 4B B3 82 0D */ bl cLib_addCalcAngleS__FPsssss -/* 80738338 A8 7E 0B 7C */ lha r3, 0xb7c(r30) -/* 8073833C A8 1E 0B 80 */ lha r0, 0xb80(r30) -/* 80738340 7C 03 02 14 */ add r0, r3, r0 -/* 80738344 B0 1E 0B 7C */ sth r0, 0xb7c(r30) -/* 80738348 A0 1E 0B B0 */ lhz r0, 0xbb0(r30) -/* 8073834C 28 00 00 00 */ cmplwi r0, 0 -/* 80738350 40 82 00 34 */ bne lbl_80738384 -/* 80738354 3C 60 80 74 */ lis r3, lit_4580@ha /* 0x80739F90@ha */ -/* 80738358 38 83 9F 90 */ addi r4, r3, lit_4580@l /* 0x80739F90@l */ -/* 8073835C 80 64 00 00 */ lwz r3, 0(r4) -/* 80738360 80 04 00 04 */ lwz r0, 4(r4) -/* 80738364 90 61 00 10 */ stw r3, 0x10(r1) -/* 80738368 90 01 00 14 */ stw r0, 0x14(r1) -/* 8073836C 80 04 00 08 */ lwz r0, 8(r4) -/* 80738370 90 01 00 18 */ stw r0, 0x18(r1) -/* 80738374 7F C3 F3 78 */ mr r3, r30 -/* 80738378 38 81 00 10 */ addi r4, r1, 0x10 -/* 8073837C 4B FF DE F1 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80738380 48 00 03 74 */ b lbl_807386F4 -lbl_80738384: -/* 80738384 88 1E 0B AF */ lbz r0, 0xbaf(r30) -/* 80738388 28 00 00 00 */ cmplwi r0, 0 -/* 8073838C 40 82 03 68 */ bne lbl_807386F4 -/* 80738390 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80738394 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80738398 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 8073839C D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 807383A0 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 807383A4 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 807383A8 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 807383AC EC 01 00 2A */ fadds f0, f1, f0 -/* 807383B0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 807383B4 38 61 00 28 */ addi r3, r1, 0x28 -/* 807383B8 4B 8E 59 05 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 807383BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807383C0 41 82 01 C4 */ beq lbl_80738584 -/* 807383C4 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 807383C8 C0 23 0C D0 */ lfs f1, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 807383CC C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 807383D0 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 807383D4 EC 20 08 2A */ fadds f1, f0, f1 -/* 807383D8 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 807383DC 40 80 03 08 */ bge lbl_807386E4 -/* 807383E0 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 807383E4 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 807383E8 40 80 00 38 */ bge lbl_80738420 -/* 807383EC C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 807383F0 4B B2 F5 65 */ bl cM_rndF__Ff -/* 807383F4 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 807383F8 EF E0 08 2A */ fadds f31, f0, f1 -/* 807383FC FC 20 00 90 */ fmr f1, f0 -/* 80738400 4B B2 F5 8D */ bl cM_rndFX__Ff -/* 80738404 C0 1F 00 BC */ lfs f0, 0xbc(r31) -/* 80738408 EC 00 08 2A */ fadds f0, f0, f1 -/* 8073840C FC 00 00 1E */ fctiwz f0, f0 -/* 80738410 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 80738414 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 80738418 98 1E 0B AF */ stb r0, 0xbaf(r30) -/* 8073841C 48 00 02 C8 */ b lbl_807386E4 -lbl_80738420: -/* 80738420 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80738424 38 81 00 34 */ addi r4, r1, 0x34 -/* 80738428 4B C0 EF 75 */ bl PSVECSquareDistance -/* 8073842C C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80738430 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738434 40 81 00 58 */ ble lbl_8073848C -/* 80738438 FC 00 08 34 */ frsqrte f0, f1 -/* 8073843C C8 9F 00 48 */ lfd f4, 0x48(r31) -/* 80738440 FC 44 00 32 */ fmul f2, f4, f0 -/* 80738444 C8 7F 00 50 */ lfd f3, 0x50(r31) -/* 80738448 FC 00 00 32 */ fmul f0, f0, f0 -/* 8073844C FC 01 00 32 */ fmul f0, f1, f0 -/* 80738450 FC 03 00 28 */ fsub f0, f3, f0 -/* 80738454 FC 02 00 32 */ fmul f0, f2, f0 -/* 80738458 FC 44 00 32 */ fmul f2, f4, f0 -/* 8073845C FC 00 00 32 */ fmul f0, f0, f0 -/* 80738460 FC 01 00 32 */ fmul f0, f1, f0 -/* 80738464 FC 03 00 28 */ fsub f0, f3, f0 -/* 80738468 FC 02 00 32 */ fmul f0, f2, f0 -/* 8073846C FC 44 00 32 */ fmul f2, f4, f0 -/* 80738470 FC 00 00 32 */ fmul f0, f0, f0 -/* 80738474 FC 01 00 32 */ fmul f0, f1, f0 -/* 80738478 FC 03 00 28 */ fsub f0, f3, f0 -/* 8073847C FC 02 00 32 */ fmul f0, f2, f0 -/* 80738480 FC 21 00 32 */ fmul f1, f1, f0 -/* 80738484 FC 20 08 18 */ frsp f1, f1 -/* 80738488 48 00 00 88 */ b lbl_80738510 -lbl_8073848C: -/* 8073848C C8 1F 00 58 */ lfd f0, 0x58(r31) -/* 80738490 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738494 40 80 00 10 */ bge lbl_807384A4 -/* 80738498 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073849C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 807384A0 48 00 00 70 */ b lbl_80738510 -lbl_807384A4: -/* 807384A4 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 807384A8 80 81 00 0C */ lwz r4, 0xc(r1) -/* 807384AC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 807384B0 3C 00 7F 80 */ lis r0, 0x7f80 -/* 807384B4 7C 03 00 00 */ cmpw r3, r0 -/* 807384B8 41 82 00 14 */ beq lbl_807384CC -/* 807384BC 40 80 00 40 */ bge lbl_807384FC -/* 807384C0 2C 03 00 00 */ cmpwi r3, 0 -/* 807384C4 41 82 00 20 */ beq lbl_807384E4 -/* 807384C8 48 00 00 34 */ b lbl_807384FC -lbl_807384CC: -/* 807384CC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 807384D0 41 82 00 0C */ beq lbl_807384DC -/* 807384D4 38 00 00 01 */ li r0, 1 -/* 807384D8 48 00 00 28 */ b lbl_80738500 -lbl_807384DC: -/* 807384DC 38 00 00 02 */ li r0, 2 -/* 807384E0 48 00 00 20 */ b lbl_80738500 -lbl_807384E4: -/* 807384E4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 807384E8 41 82 00 0C */ beq lbl_807384F4 -/* 807384EC 38 00 00 05 */ li r0, 5 -/* 807384F0 48 00 00 10 */ b lbl_80738500 -lbl_807384F4: -/* 807384F4 38 00 00 03 */ li r0, 3 -/* 807384F8 48 00 00 08 */ b lbl_80738500 -lbl_807384FC: -/* 807384FC 38 00 00 04 */ li r0, 4 -lbl_80738500: -/* 80738500 2C 00 00 01 */ cmpwi r0, 1 -/* 80738504 40 82 00 0C */ bne lbl_80738510 -/* 80738508 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8073850C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80738510: -/* 80738510 C0 1F 00 C8 */ lfs f0, 0xc8(r31) -/* 80738514 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738518 40 80 00 38 */ bge lbl_80738550 -/* 8073851C C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 80738520 4B B2 F4 35 */ bl cM_rndF__Ff -/* 80738524 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80738528 EF E0 08 2A */ fadds f31, f0, f1 -/* 8073852C FC 20 00 90 */ fmr f1, f0 -/* 80738530 4B B2 F4 5D */ bl cM_rndFX__Ff -/* 80738534 C0 1F 00 BC */ lfs f0, 0xbc(r31) -/* 80738538 EC 00 08 2A */ fadds f0, f0, f1 -/* 8073853C FC 00 00 1E */ fctiwz f0, f0 -/* 80738540 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 80738544 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 80738548 98 1E 0B AF */ stb r0, 0xbaf(r30) -/* 8073854C 48 00 01 98 */ b lbl_807386E4 -lbl_80738550: -/* 80738550 FC 20 00 90 */ fmr f1, f0 -/* 80738554 4B B2 F4 01 */ bl cM_rndF__Ff -/* 80738558 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 8073855C EF E0 08 2A */ fadds f31, f0, f1 -/* 80738560 FC 20 00 90 */ fmr f1, f0 -/* 80738564 4B B2 F4 29 */ bl cM_rndFX__Ff -/* 80738568 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8073856C EC 00 08 2A */ fadds f0, f0, f1 -/* 80738570 FC 00 00 1E */ fctiwz f0, f0 -/* 80738574 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 80738578 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 8073857C 98 1E 0B AF */ stb r0, 0xbaf(r30) -/* 80738580 48 00 01 64 */ b lbl_807386E4 -lbl_80738584: -/* 80738584 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80738588 38 81 00 34 */ addi r4, r1, 0x34 -/* 8073858C 4B C0 EE 11 */ bl PSVECSquareDistance -/* 80738590 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80738594 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738598 40 81 00 58 */ ble lbl_807385F0 -/* 8073859C FC 00 08 34 */ frsqrte f0, f1 -/* 807385A0 C8 9F 00 48 */ lfd f4, 0x48(r31) -/* 807385A4 FC 44 00 32 */ fmul f2, f4, f0 -/* 807385A8 C8 7F 00 50 */ lfd f3, 0x50(r31) -/* 807385AC FC 00 00 32 */ fmul f0, f0, f0 -/* 807385B0 FC 01 00 32 */ fmul f0, f1, f0 -/* 807385B4 FC 03 00 28 */ fsub f0, f3, f0 -/* 807385B8 FC 02 00 32 */ fmul f0, f2, f0 -/* 807385BC FC 44 00 32 */ fmul f2, f4, f0 -/* 807385C0 FC 00 00 32 */ fmul f0, f0, f0 -/* 807385C4 FC 01 00 32 */ fmul f0, f1, f0 -/* 807385C8 FC 03 00 28 */ fsub f0, f3, f0 -/* 807385CC FC 02 00 32 */ fmul f0, f2, f0 -/* 807385D0 FC 44 00 32 */ fmul f2, f4, f0 -/* 807385D4 FC 00 00 32 */ fmul f0, f0, f0 -/* 807385D8 FC 01 00 32 */ fmul f0, f1, f0 -/* 807385DC FC 03 00 28 */ fsub f0, f3, f0 -/* 807385E0 FC 02 00 32 */ fmul f0, f2, f0 -/* 807385E4 FC 21 00 32 */ fmul f1, f1, f0 -/* 807385E8 FC 20 08 18 */ frsp f1, f1 -/* 807385EC 48 00 00 88 */ b lbl_80738674 -lbl_807385F0: -/* 807385F0 C8 1F 00 58 */ lfd f0, 0x58(r31) -/* 807385F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807385F8 40 80 00 10 */ bge lbl_80738608 -/* 807385FC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80738600 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80738604 48 00 00 70 */ b lbl_80738674 -lbl_80738608: -/* 80738608 D0 21 00 08 */ stfs f1, 8(r1) -/* 8073860C 80 81 00 08 */ lwz r4, 8(r1) -/* 80738610 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80738614 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80738618 7C 03 00 00 */ cmpw r3, r0 -/* 8073861C 41 82 00 14 */ beq lbl_80738630 -/* 80738620 40 80 00 40 */ bge lbl_80738660 -/* 80738624 2C 03 00 00 */ cmpwi r3, 0 -/* 80738628 41 82 00 20 */ beq lbl_80738648 -/* 8073862C 48 00 00 34 */ b lbl_80738660 -lbl_80738630: -/* 80738630 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80738634 41 82 00 0C */ beq lbl_80738640 -/* 80738638 38 00 00 01 */ li r0, 1 -/* 8073863C 48 00 00 28 */ b lbl_80738664 -lbl_80738640: -/* 80738640 38 00 00 02 */ li r0, 2 -/* 80738644 48 00 00 20 */ b lbl_80738664 -lbl_80738648: -/* 80738648 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073864C 41 82 00 0C */ beq lbl_80738658 -/* 80738650 38 00 00 05 */ li r0, 5 -/* 80738654 48 00 00 10 */ b lbl_80738664 -lbl_80738658: -/* 80738658 38 00 00 03 */ li r0, 3 -/* 8073865C 48 00 00 08 */ b lbl_80738664 -lbl_80738660: -/* 80738660 38 00 00 04 */ li r0, 4 -lbl_80738664: -/* 80738664 2C 00 00 01 */ cmpwi r0, 1 -/* 80738668 40 82 00 0C */ bne lbl_80738674 -/* 8073866C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80738670 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80738674: -/* 80738674 C0 1F 00 C8 */ lfs f0, 0xc8(r31) -/* 80738678 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073867C 40 80 00 38 */ bge lbl_807386B4 -/* 80738680 C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 80738684 4B B2 F2 D1 */ bl cM_rndF__Ff -/* 80738688 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 8073868C EF E0 08 2A */ fadds f31, f0, f1 -/* 80738690 FC 20 00 90 */ fmr f1, f0 -/* 80738694 4B B2 F2 F9 */ bl cM_rndFX__Ff -/* 80738698 C0 1F 00 BC */ lfs f0, 0xbc(r31) -/* 8073869C EC 00 08 2A */ fadds f0, f0, f1 -/* 807386A0 FC 00 00 1E */ fctiwz f0, f0 -/* 807386A4 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 807386A8 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 807386AC 98 1E 0B AF */ stb r0, 0xbaf(r30) -/* 807386B0 48 00 00 34 */ b lbl_807386E4 -lbl_807386B4: -/* 807386B4 FC 20 00 90 */ fmr f1, f0 -/* 807386B8 4B B2 F2 9D */ bl cM_rndF__Ff -/* 807386BC C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 807386C0 EF E0 08 2A */ fadds f31, f0, f1 -/* 807386C4 FC 20 00 90 */ fmr f1, f0 -/* 807386C8 4B B2 F2 C5 */ bl cM_rndFX__Ff -/* 807386CC C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 807386D0 EC 00 08 2A */ fadds f0, f0, f1 -/* 807386D4 FC 00 00 1E */ fctiwz f0, f0 -/* 807386D8 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 807386DC 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 807386E0 98 1E 0B AF */ stb r0, 0xbaf(r30) -lbl_807386E4: -/* 807386E4 7F C3 F3 78 */ mr r3, r30 -/* 807386E8 38 9E 06 60 */ addi r4, r30, 0x660 -/* 807386EC FC 20 F8 90 */ fmr f1, f31 -/* 807386F0 4B FF EE 85 */ bl setChasePos__11daE_OctBg_cFR4cXyzf -lbl_807386F4: -/* 807386F4 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 807386F8 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 807386FC 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 80738700 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 80738704 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80738708 7C 08 03 A6 */ mtlr r0 -/* 8073870C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80738710 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/create__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/create__11daE_OctBg_cFv.s deleted file mode 100644 index 03b15615845..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/create__11daE_OctBg_cFv.s +++ /dev/null @@ -1,239 +0,0 @@ -lbl_80739424: -/* 80739424 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80739428 7C 08 02 A6 */ mflr r0 -/* 8073942C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80739430 39 61 00 50 */ addi r11, r1, 0x50 -/* 80739434 4B C2 8D 91 */ bl _savegpr_23 -/* 80739438 7C 79 1B 78 */ mr r25, r3 -/* 8073943C 3C 80 80 74 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80739E54@ha */ -/* 80739440 3B A4 9E 54 */ addi r29, r4, cNullVec__6Z2Calc@l /* 0x80739E54@l */ -/* 80739444 3C 80 80 74 */ lis r4, lit_1109@ha /* 0x8073A100@ha */ -/* 80739448 3B C4 A1 00 */ addi r30, r4, lit_1109@l /* 0x8073A100@l */ -/* 8073944C 3C 80 80 74 */ lis r4, lit_3768@ha /* 0x80739D60@ha */ -/* 80739450 3B E4 9D 60 */ addi r31, r4, lit_3768@l /* 0x80739D60@l */ -/* 80739454 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80739458 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8073945C 40 82 01 3C */ bne lbl_80739598 -/* 80739460 7F 20 CB 79 */ or. r0, r25, r25 -/* 80739464 41 82 01 28 */ beq lbl_8073958C -/* 80739468 7C 18 03 78 */ mr r24, r0 -/* 8073946C 4B 8D F6 F9 */ bl __ct__10fopAc_ac_cFv -/* 80739470 38 78 05 BC */ addi r3, r24, 0x5bc -/* 80739474 4B B8 7A F1 */ bl __ct__15Z2CreatureEnemyFv -/* 80739478 38 78 06 6C */ addi r3, r24, 0x66c -/* 8073947C 4B 93 CA 31 */ bl __ct__12dBgS_AcchCirFv -/* 80739480 3A F8 06 AC */ addi r23, r24, 0x6ac -/* 80739484 7E E3 BB 78 */ mr r3, r23 -/* 80739488 4B 93 CC 19 */ bl __ct__9dBgS_AcchFv -/* 8073948C 3C 60 80 74 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x8073A0B8@ha */ -/* 80739490 38 63 A0 B8 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x8073A0B8@l */ -/* 80739494 90 77 00 10 */ stw r3, 0x10(r23) -/* 80739498 38 03 00 0C */ addi r0, r3, 0xc -/* 8073949C 90 17 00 14 */ stw r0, 0x14(r23) -/* 807394A0 38 03 00 18 */ addi r0, r3, 0x18 -/* 807394A4 90 17 00 24 */ stw r0, 0x24(r23) -/* 807394A8 38 77 00 14 */ addi r3, r23, 0x14 -/* 807394AC 4B 93 F9 BD */ bl SetObj__16dBgS_PolyPassChkFv -/* 807394B0 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 807394B4 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 807394B8 90 18 08 9C */ stw r0, 0x89c(r24) -/* 807394BC 38 78 08 A0 */ addi r3, r24, 0x8a0 -/* 807394C0 4B 94 A2 A1 */ bl __ct__10dCcD_GSttsFv -/* 807394C4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 807394C8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 807394CC 90 78 08 9C */ stw r3, 0x89c(r24) -/* 807394D0 38 03 00 20 */ addi r0, r3, 0x20 -/* 807394D4 90 18 08 A0 */ stw r0, 0x8a0(r24) -/* 807394D8 3A F8 08 C0 */ addi r23, r24, 0x8c0 -/* 807394DC 7E E3 BB 78 */ mr r3, r23 -/* 807394E0 4B 94 A5 49 */ bl __ct__12dCcD_GObjInfFv -/* 807394E4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 807394E8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 807394EC 90 17 01 20 */ stw r0, 0x120(r23) -/* 807394F0 3C 60 80 74 */ lis r3, __vt__8cM3dGAab@ha /* 0x8073A0AC@ha */ -/* 807394F4 38 03 A0 AC */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8073A0AC@l */ -/* 807394F8 90 17 01 1C */ stw r0, 0x11c(r23) -/* 807394FC 3C 60 80 74 */ lis r3, __vt__8cM3dGSph@ha /* 0x8073A0A0@ha */ -/* 80739500 38 03 A0 A0 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x8073A0A0@l */ -/* 80739504 90 17 01 34 */ stw r0, 0x134(r23) -/* 80739508 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 8073950C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80739510 90 77 01 20 */ stw r3, 0x120(r23) -/* 80739514 3B 83 00 58 */ addi r28, r3, 0x58 -/* 80739518 93 97 01 34 */ stw r28, 0x134(r23) -/* 8073951C 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80739520 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80739524 90 77 00 3C */ stw r3, 0x3c(r23) -/* 80739528 3B 63 00 2C */ addi r27, r3, 0x2c -/* 8073952C 93 77 01 20 */ stw r27, 0x120(r23) -/* 80739530 3B 43 00 84 */ addi r26, r3, 0x84 -/* 80739534 93 57 01 34 */ stw r26, 0x134(r23) -/* 80739538 3A F8 09 F8 */ addi r23, r24, 0x9f8 -/* 8073953C 7E E3 BB 78 */ mr r3, r23 -/* 80739540 4B 94 A4 E9 */ bl __ct__12dCcD_GObjInfFv -/* 80739544 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80739548 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8073954C 90 17 01 20 */ stw r0, 0x120(r23) -/* 80739550 3C 60 80 74 */ lis r3, __vt__8cM3dGAab@ha /* 0x8073A0AC@ha */ -/* 80739554 38 03 A0 AC */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8073A0AC@l */ -/* 80739558 90 17 01 1C */ stw r0, 0x11c(r23) -/* 8073955C 3C 60 80 74 */ lis r3, __vt__8cM3dGSph@ha /* 0x8073A0A0@ha */ -/* 80739560 38 03 A0 A0 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x8073A0A0@l */ -/* 80739564 90 17 01 34 */ stw r0, 0x134(r23) -/* 80739568 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 8073956C 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80739570 90 17 01 20 */ stw r0, 0x120(r23) -/* 80739574 93 97 01 34 */ stw r28, 0x134(r23) -/* 80739578 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 8073957C 38 03 BF C0 */ addi r0, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80739580 90 17 00 3C */ stw r0, 0x3c(r23) -/* 80739584 93 77 01 20 */ stw r27, 0x120(r23) -/* 80739588 93 57 01 34 */ stw r26, 0x134(r23) -lbl_8073958C: -/* 8073958C 80 19 04 A0 */ lwz r0, 0x4a0(r25) -/* 80739590 60 00 00 08 */ ori r0, r0, 8 -/* 80739594 90 19 04 A0 */ stw r0, 0x4a0(r25) -lbl_80739598: -/* 80739598 38 79 05 AC */ addi r3, r25, 0x5ac -/* 8073959C 3C 80 80 74 */ lis r4, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 807395A0 38 84 9E 44 */ addi r4, r4, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 807395A4 4B 8F 39 19 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 807395A8 7C 7A 1B 78 */ mr r26, r3 -/* 807395AC 2C 1A 00 04 */ cmpwi r26, 4 -/* 807395B0 40 82 01 EC */ bne lbl_8073979C -/* 807395B4 7F 23 CB 78 */ mr r3, r25 -/* 807395B8 3C 80 80 74 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x807390C4@ha */ -/* 807395BC 38 84 90 C4 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x807390C4@l */ -/* 807395C0 38 A0 10 E0 */ li r5, 0x10e0 -/* 807395C4 4B 8E 0E ED */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 807395C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807395CC 40 82 00 0C */ bne lbl_807395D8 -/* 807395D0 38 60 00 05 */ li r3, 5 -/* 807395D4 48 00 01 CC */ b lbl_807397A0 -lbl_807395D8: -/* 807395D8 88 1E 00 3D */ lbz r0, 0x3d(r30) -/* 807395DC 28 00 00 00 */ cmplwi r0, 0 -/* 807395E0 40 82 00 1C */ bne lbl_807395FC -/* 807395E4 38 00 00 01 */ li r0, 1 -/* 807395E8 98 1E 00 3D */ stb r0, 0x3d(r30) -/* 807395EC 98 19 0B B3 */ stb r0, 0xbb3(r25) -/* 807395F0 38 00 FF FF */ li r0, -1 -/* 807395F4 38 7E 00 4C */ addi r3, r30, 0x4c -/* 807395F8 98 03 00 04 */ stb r0, 4(r3) -lbl_807395FC: -/* 807395FC 38 00 00 04 */ li r0, 4 -/* 80739600 90 19 05 5C */ stw r0, 0x55c(r25) -/* 80739604 A0 19 05 8E */ lhz r0, 0x58e(r25) -/* 80739608 60 00 02 00 */ ori r0, r0, 0x200 -/* 8073960C B0 19 05 8E */ sth r0, 0x58e(r25) -/* 80739610 80 79 05 B4 */ lwz r3, 0x5b4(r25) -/* 80739614 80 63 00 04 */ lwz r3, 4(r3) -/* 80739618 38 03 00 24 */ addi r0, r3, 0x24 -/* 8073961C 90 19 05 04 */ stw r0, 0x504(r25) -/* 80739620 7F 23 CB 78 */ mr r3, r25 -/* 80739624 C0 3F 00 DC */ lfs f1, 0xdc(r31) -/* 80739628 FC 40 08 90 */ fmr f2, f1 -/* 8073962C FC 60 08 90 */ fmr f3, f1 -/* 80739630 4B 8E 0E F9 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80739634 7F 23 CB 78 */ mr r3, r25 -/* 80739638 C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 8073963C FC 40 08 90 */ fmr f2, f1 -/* 80739640 FC 60 08 90 */ fmr f3, f1 -/* 80739644 4B 8E 0E F5 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80739648 38 00 00 00 */ li r0, 0 -/* 8073964C 90 01 00 08 */ stw r0, 8(r1) -/* 80739650 38 79 06 AC */ addi r3, r25, 0x6ac -/* 80739654 38 99 04 D0 */ addi r4, r25, 0x4d0 -/* 80739658 38 B9 04 BC */ addi r5, r25, 0x4bc -/* 8073965C 7F 26 CB 78 */ mr r6, r25 -/* 80739660 38 E0 00 01 */ li r7, 1 -/* 80739664 39 19 06 6C */ addi r8, r25, 0x66c -/* 80739668 39 39 04 F8 */ addi r9, r25, 0x4f8 -/* 8073966C 39 40 00 00 */ li r10, 0 -/* 80739670 4B 93 CB D9 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80739674 38 7E 00 4C */ addi r3, r30, 0x4c -/* 80739678 C0 43 00 18 */ lfs f2, 0x18(r3) -/* 8073967C 38 79 06 6C */ addi r3, r25, 0x66c -/* 80739680 C0 1F 00 68 */ lfs f0, 0x68(r31) -/* 80739684 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 80739688 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 8073968C EC 40 00 B2 */ fmuls f2, f0, f2 -/* 80739690 4B 93 C8 C9 */ bl SetWall__12dBgS_AcchCirFff -/* 80739694 38 00 00 0A */ li r0, 0xa -/* 80739698 B0 19 05 62 */ sth r0, 0x562(r25) -/* 8073969C B0 19 05 60 */ sth r0, 0x560(r25) -/* 807396A0 38 79 08 84 */ addi r3, r25, 0x884 -/* 807396A4 38 80 00 64 */ li r4, 0x64 -/* 807396A8 38 A0 00 00 */ li r5, 0 -/* 807396AC 7F 26 CB 78 */ mr r6, r25 -/* 807396B0 4B 94 A1 B1 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 807396B4 38 79 08 C0 */ addi r3, r25, 0x8c0 -/* 807396B8 38 9D 00 2C */ addi r4, r29, 0x2c -/* 807396BC 4B 94 B3 79 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 807396C0 38 19 08 84 */ addi r0, r25, 0x884 -/* 807396C4 90 19 09 04 */ stw r0, 0x904(r25) -/* 807396C8 38 79 09 F8 */ addi r3, r25, 0x9f8 -/* 807396CC 38 9D 00 6C */ addi r4, r29, 0x6c -/* 807396D0 4B 94 B3 65 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 807396D4 38 19 08 84 */ addi r0, r25, 0x884 -/* 807396D8 90 19 0A 3C */ stw r0, 0xa3c(r25) -/* 807396DC 38 79 05 BC */ addi r3, r25, 0x5bc -/* 807396E0 38 99 04 D0 */ addi r4, r25, 0x4d0 -/* 807396E4 38 B9 05 38 */ addi r5, r25, 0x538 -/* 807396E8 38 C0 00 03 */ li r6, 3 -/* 807396EC 38 E0 00 01 */ li r7, 1 -/* 807396F0 4B B8 79 A5 */ bl init__15Z2CreatureEnemyFP3VecP3VecUcUc -/* 807396F4 38 79 05 BC */ addi r3, r25, 0x5bc -/* 807396F8 3C 80 80 74 */ lis r4, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 807396FC 38 84 9E 44 */ addi r4, r4, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 80739700 38 84 00 05 */ addi r4, r4, 5 -/* 80739704 4B B8 84 8D */ bl setEnemyName__15Z2CreatureEnemyFPCc -/* 80739708 38 19 05 BC */ addi r0, r25, 0x5bc -/* 8073970C 90 19 0B 38 */ stw r0, 0xb38(r25) -/* 80739710 38 00 00 01 */ li r0, 1 -/* 80739714 98 19 0B 4E */ stb r0, 0xb4e(r25) -/* 80739718 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 8073971C D0 19 05 30 */ stfs f0, 0x530(r25) -/* 80739720 38 00 00 04 */ li r0, 4 -/* 80739724 98 19 05 46 */ stb r0, 0x546(r25) -/* 80739728 38 00 00 00 */ li r0, 0 -/* 8073972C 98 19 0B 74 */ stb r0, 0xb74(r25) -/* 80739730 28 19 00 00 */ cmplwi r25, 0 -/* 80739734 41 82 00 0C */ beq lbl_80739740 -/* 80739738 80 19 00 04 */ lwz r0, 4(r25) -/* 8073973C 48 00 00 08 */ b lbl_80739744 -lbl_80739740: -/* 80739740 38 00 FF FF */ li r0, -1 -lbl_80739744: -/* 80739744 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 80739748 98 19 0B AC */ stb r0, 0xbac(r25) -/* 8073974C 88 7E 00 70 */ lbz r3, 0x70(r30) -/* 80739750 38 03 00 01 */ addi r0, r3, 1 -/* 80739754 98 1E 00 70 */ stb r0, 0x70(r30) -/* 80739758 88 19 0B AC */ lbz r0, 0xbac(r25) -/* 8073975C 28 00 00 00 */ cmplwi r0, 0 -/* 80739760 41 82 00 10 */ beq lbl_80739770 -/* 80739764 88 7E 00 71 */ lbz r3, 0x71(r30) -/* 80739768 38 03 00 01 */ addi r0, r3, 1 -/* 8073976C 98 1E 00 71 */ stb r0, 0x71(r30) -lbl_80739770: -/* 80739770 80 7D 01 B4 */ lwz r3, 0x1b4(r29) -/* 80739774 80 1D 01 B8 */ lwz r0, 0x1b8(r29) -/* 80739778 90 61 00 10 */ stw r3, 0x10(r1) -/* 8073977C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739780 80 1D 01 BC */ lwz r0, 0x1bc(r29) -/* 80739784 90 01 00 18 */ stw r0, 0x18(r1) -/* 80739788 7F 23 CB 78 */ mr r3, r25 -/* 8073978C 38 81 00 10 */ addi r4, r1, 0x10 -/* 80739790 4B FF CA DD */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80739794 7F 23 CB 78 */ mr r3, r25 -/* 80739798 4B FF F9 0D */ bl daE_OctBg_Execute__FP11daE_OctBg_c -lbl_8073979C: -/* 8073979C 7F 43 D3 78 */ mr r3, r26 -lbl_807397A0: -/* 807397A0 39 61 00 50 */ addi r11, r1, 0x50 -/* 807397A4 4B C2 8A 6D */ bl _restgpr_23 -/* 807397A8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 807397AC 7C 08 03 A6 */ mtlr r0 -/* 807397B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 807397B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel.s deleted file mode 100644 index 7f5f735bcfb..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_807390E4: -/* 807390E4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 807390E8 7C 08 02 A6 */ mflr r0 -/* 807390EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 807390F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 807390F4 4B C2 90 E5 */ bl _savegpr_28 -/* 807390F8 7C 7D 1B 78 */ mr r29, r3 -/* 807390FC 7C BE 2B 78 */ mr r30, r5 -/* 80739100 A3 84 00 14 */ lhz r28, 0x14(r4) -/* 80739104 80 65 00 84 */ lwz r3, 0x84(r5) -/* 80739108 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8073910C 1F FC 00 30 */ mulli r31, r28, 0x30 -/* 80739110 7C 60 FA 14 */ add r3, r0, r31 -/* 80739114 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80739118 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8073911C 4B C0 D3 95 */ bl PSMTXCopy -/* 80739120 2C 1C 00 00 */ cmpwi r28, 0 -/* 80739124 41 82 00 64 */ beq lbl_80739188 -/* 80739128 2C 1C 00 01 */ cmpwi r28, 1 -/* 8073912C 40 82 00 44 */ bne lbl_80739170 -/* 80739130 88 1D 0B 75 */ lbz r0, 0xb75(r29) -/* 80739134 28 00 00 00 */ cmplwi r0, 0 -/* 80739138 40 82 00 18 */ bne lbl_80739150 -/* 8073913C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80739140 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80739144 A8 9D 0B 8A */ lha r4, 0xb8a(r29) -/* 80739148 4B 8D 32 ED */ bl mDoMtx_YrotM__FPA4_fs -/* 8073914C 48 00 00 3C */ b lbl_80739188 -lbl_80739150: -/* 80739150 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80739154 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80739158 A8 9D 0B 84 */ lha r4, 0xb84(r29) -/* 8073915C A8 1D 0B 8A */ lha r0, 0xb8a(r29) -/* 80739160 7C 04 00 50 */ subf r0, r4, r0 -/* 80739164 7C 04 07 34 */ extsh r4, r0 -/* 80739168 4B 8D 32 CD */ bl mDoMtx_YrotM__FPA4_fs -/* 8073916C 48 00 00 1C */ b lbl_80739188 -lbl_80739170: -/* 80739170 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80739174 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80739178 57 80 08 3C */ slwi r0, r28, 1 -/* 8073917C 7C 9D 02 14 */ add r4, r29, r0 -/* 80739180 A8 84 0B 80 */ lha r4, 0xb80(r4) -/* 80739184 4B 8D 32 B1 */ bl mDoMtx_YrotM__FPA4_fs -lbl_80739188: -/* 80739188 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8073918C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80739190 80 9E 00 84 */ lwz r4, 0x84(r30) -/* 80739194 80 04 00 0C */ lwz r0, 0xc(r4) -/* 80739198 7C 80 FA 14 */ add r4, r0, r31 -/* 8073919C 4B C0 D3 15 */ bl PSMTXCopy -/* 807391A0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807391A4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807391A8 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 807391AC 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 807391B0 4B C0 D3 01 */ bl PSMTXCopy -/* 807391B4 38 60 00 01 */ li r3, 1 -/* 807391B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 807391BC 4B C2 90 69 */ bl _restgpr_28 -/* 807391C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 807391C4 7C 08 03 A6 */ mtlr r0 -/* 807391C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 807391CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Create__FP11daE_OctBg_c.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Create__FP11daE_OctBg_c.s deleted file mode 100644 index bcb1d663491..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Create__FP11daE_OctBg_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80739984: -/* 80739984 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739988 7C 08 02 A6 */ mflr r0 -/* 8073998C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739990 4B FF FA 95 */ bl create__11daE_OctBg_cFv -/* 80739994 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739998 7C 08 03 A6 */ mtlr r0 -/* 8073999C 38 21 00 10 */ addi r1, r1, 0x10 -/* 807399A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Delete__FP11daE_OctBg_c.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Delete__FP11daE_OctBg_c.s deleted file mode 100644 index ffaed57cb4f..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Delete__FP11daE_OctBg_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_807368A8: -/* 807368A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807368AC 7C 08 02 A6 */ mflr r0 -/* 807368B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 807368B4 4B FF FF 8D */ bl _delete__11daE_OctBg_cFv -/* 807368B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807368BC 7C 08 03 A6 */ mtlr r0 -/* 807368C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 807368C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Draw__FP11daE_OctBg_c.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Draw__FP11daE_OctBg_c.s deleted file mode 100644 index 50f26ee15d7..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Draw__FP11daE_OctBg_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80739BA0: -/* 80739BA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739BA4 7C 08 02 A6 */ mflr r0 -/* 80739BA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739BAC 4B FF FD F9 */ bl draw__11daE_OctBg_cFv -/* 80739BB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739BB4 7C 08 03 A6 */ mtlr r0 -/* 80739BB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80739BBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Execute__FP11daE_OctBg_c.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Execute__FP11daE_OctBg_c.s deleted file mode 100644 index b59889411c4..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Execute__FP11daE_OctBg_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_807390A4: -/* 807390A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807390A8 7C 08 02 A6 */ mflr r0 -/* 807390AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 807390B0 4B FF FF AD */ bl execute__11daE_OctBg_cFv -/* 807390B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807390B8 7C 08 03 A6 */ mtlr r0 -/* 807390BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 807390C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_IsDelete__FP11daE_OctBg_c.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_IsDelete__FP11daE_OctBg_c.s deleted file mode 100644 index 3a585c9b1cf..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_IsDelete__FP11daE_OctBg_c.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80739BC0: -/* 80739BC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80739BC4 7C 08 02 A6 */ mflr r0 -/* 80739BC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80739BCC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80739BD0 3C 80 80 74 */ lis r4, lit_1109@ha /* 0x8073A100@ha */ -/* 80739BD4 3B E4 A1 00 */ addi r31, r4, lit_1109@l /* 0x8073A100@l */ -/* 80739BD8 88 9F 00 70 */ lbz r4, 0x70(r31) -/* 80739BDC 38 A4 FF FF */ addi r5, r4, -1 -/* 80739BE0 98 BF 00 70 */ stb r5, 0x70(r31) -/* 80739BE4 88 03 0B AC */ lbz r0, 0xbac(r3) -/* 80739BE8 28 00 00 00 */ cmplwi r0, 0 -/* 80739BEC 41 82 00 28 */ beq lbl_80739C14 -/* 80739BF0 88 9F 00 71 */ lbz r4, 0x71(r31) -/* 80739BF4 38 04 FF FF */ addi r0, r4, -1 -/* 80739BF8 98 1F 00 71 */ stb r0, 0x71(r31) -/* 80739BFC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80739C00 54 A0 F6 BE */ rlwinm r0, r5, 0x1e, 0x1a, 0x1f -/* 80739C04 7C 04 00 00 */ cmpw r4, r0 -/* 80739C08 40 80 00 0C */ bge lbl_80739C14 -/* 80739C0C 38 00 00 01 */ li r0, 1 -/* 80739C10 98 1F 00 73 */ stb r0, 0x73(r31) -lbl_80739C14: -/* 80739C14 3C 80 80 74 */ lis r4, lit_3618@ha /* 0x80739E74@ha */ -/* 80739C18 38 A4 9E 74 */ addi r5, r4, lit_3618@l /* 0x80739E74@l */ -/* 80739C1C 80 85 00 00 */ lwz r4, 0(r5) -/* 80739C20 80 05 00 04 */ lwz r0, 4(r5) -/* 80739C24 90 81 00 08 */ stw r4, 8(r1) -/* 80739C28 90 01 00 0C */ stw r0, 0xc(r1) -/* 80739C2C 80 05 00 08 */ lwz r0, 8(r5) -/* 80739C30 90 01 00 10 */ stw r0, 0x10(r1) -/* 80739C34 38 63 0B 58 */ addi r3, r3, 0xb58 -/* 80739C38 38 81 00 08 */ addi r4, r1, 8 -/* 80739C3C 4B C2 84 0D */ bl __ptmf_cmpr -/* 80739C40 7C 60 00 34 */ cntlzw r0, r3 -/* 80739C44 54 00 D9 7F */ rlwinm. r0, r0, 0x1b, 5, 0x1f -/* 80739C48 41 82 00 10 */ beq lbl_80739C58 -/* 80739C4C 88 7F 00 72 */ lbz r3, 0x72(r31) -/* 80739C50 38 03 FF FF */ addi r0, r3, -1 -/* 80739C54 98 1F 00 72 */ stb r0, 0x72(r31) -lbl_80739C58: -/* 80739C58 38 60 00 01 */ li r3, 1 -/* 80739C5C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80739C60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80739C64 7C 08 03 A6 */ mtlr r0 -/* 80739C68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80739C6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage__11daE_OctBg_cFv.s deleted file mode 100644 index 0d1832b3900..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage__11daE_OctBg_cFv.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_80738A4C: -/* 80738A4C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80738A50 7C 08 02 A6 */ mflr r0 -/* 80738A54 90 01 00 24 */ stw r0, 0x24(r1) -/* 80738A58 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80738A5C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80738A60 7C 7E 1B 78 */ mr r30, r3 -/* 80738A64 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80738A68 3B E3 9D 60 */ addi r31, r3, lit_3768@l /* 0x80739D60@l */ -/* 80738A6C 38 00 00 78 */ li r0, 0x78 -/* 80738A70 90 1E 0B 90 */ stw r0, 0xb90(r30) -/* 80738A74 80 1E 0B 70 */ lwz r0, 0xb70(r30) -/* 80738A78 2C 00 00 00 */ cmpwi r0, 0 -/* 80738A7C 40 82 00 A8 */ bne lbl_80738B24 -/* 80738A80 3C 60 80 74 */ lis r3, d_a_e_oct_bg__stringBase0@ha /* 0x80739E44@ha */ -/* 80738A84 38 63 9E 44 */ addi r3, r3, d_a_e_oct_bg__stringBase0@l /* 0x80739E44@l */ -/* 80738A88 38 80 00 06 */ li r4, 6 -/* 80738A8C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80738A90 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80738A94 3C A5 00 02 */ addis r5, r5, 2 -/* 80738A98 38 C0 00 80 */ li r6, 0x80 -/* 80738A9C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80738AA0 4B 90 38 4D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80738AA4 7C 64 1B 78 */ mr r4, r3 -/* 80738AA8 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 80738AAC 38 A0 00 00 */ li r5, 0 -/* 80738AB0 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80738AB4 C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80738AB8 C0 7F 00 30 */ lfs f3, 0x30(r31) -/* 80738ABC C0 9F 00 D0 */ lfs f4, 0xd0(r31) -/* 80738AC0 4B 8D 83 B1 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80738AC4 38 60 00 00 */ li r3, 0 -/* 80738AC8 B0 7E 0B 82 */ sth r3, 0xb82(r30) -/* 80738ACC B0 7E 0B 8C */ sth r3, 0xb8c(r30) -/* 80738AD0 80 1E 08 D8 */ lwz r0, 0x8d8(r30) -/* 80738AD4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80738AD8 90 1E 08 D8 */ stw r0, 0x8d8(r30) -/* 80738ADC 80 1E 09 F8 */ lwz r0, 0x9f8(r30) -/* 80738AE0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80738AE4 90 1E 09 F8 */ stw r0, 0x9f8(r30) -/* 80738AE8 90 7E 05 5C */ stw r3, 0x55c(r30) -/* 80738AEC A8 7E 0B 3E */ lha r3, 0xb3e(r30) -/* 80738AF0 3C 63 00 01 */ addis r3, r3, 1 -/* 80738AF4 38 03 80 00 */ addi r0, r3, -32768 -/* 80738AF8 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 80738AFC C0 1F 00 68 */ lfs f0, 0x68(r31) -/* 80738B00 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80738B04 38 00 10 00 */ li r0, 0x1000 -/* 80738B08 B0 1E 0B 96 */ sth r0, 0xb96(r30) -/* 80738B0C C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80738B10 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80738B14 80 7E 0B 70 */ lwz r3, 0xb70(r30) -/* 80738B18 38 03 00 01 */ addi r0, r3, 1 -/* 80738B1C 90 1E 0B 70 */ stw r0, 0xb70(r30) -/* 80738B20 48 00 00 F4 */ b lbl_80738C14 -lbl_80738B24: -/* 80738B24 2C 00 FF FF */ cmpwi r0, -1 -/* 80738B28 41 82 00 EC */ beq lbl_80738C14 -/* 80738B2C A8 7E 04 DE */ lha r3, 0x4de(r30) -/* 80738B30 A8 1E 0B 96 */ lha r0, 0xb96(r30) -/* 80738B34 7C 03 02 14 */ add r0, r3, r0 -/* 80738B38 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 80738B3C A8 7E 04 DC */ lha r3, 0x4dc(r30) -/* 80738B40 A8 1E 0B 96 */ lha r0, 0xb96(r30) -/* 80738B44 7C 03 02 14 */ add r0, r3, r0 -/* 80738B48 B0 1E 04 DC */ sth r0, 0x4dc(r30) -/* 80738B4C 80 1E 06 D8 */ lwz r0, 0x6d8(r30) -/* 80738B50 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80738B54 41 82 00 18 */ beq lbl_80738B6C -/* 80738B58 38 7E 0B 96 */ addi r3, r30, 0xb96 -/* 80738B5C 38 80 00 00 */ li r4, 0 -/* 80738B60 38 A0 00 80 */ li r5, 0x80 -/* 80738B64 4B B3 80 2D */ bl cLib_chaseAngleS__FPsss -/* 80738B68 48 00 00 14 */ b lbl_80738B7C -lbl_80738B6C: -/* 80738B6C 38 7E 0B 96 */ addi r3, r30, 0xb96 -/* 80738B70 38 80 01 00 */ li r4, 0x100 -/* 80738B74 38 A0 00 60 */ li r5, 0x60 -/* 80738B78 4B B3 80 19 */ bl cLib_chaseAngleS__FPsss -lbl_80738B7C: -/* 80738B7C 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80738B80 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80738B84 C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 80738B88 4B B3 7B B9 */ bl cLib_chaseF__FPfff -/* 80738B8C C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80738B90 C0 1F 00 D4 */ lfs f0, 0xd4(r31) -/* 80738B94 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738B98 40 80 00 14 */ bge lbl_80738BAC -/* 80738B9C C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80738BA0 D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80738BA4 C0 1F 00 D8 */ lfs f0, 0xd8(r31) -/* 80738BA8 D0 1E 05 34 */ stfs f0, 0x534(r30) -lbl_80738BAC: -/* 80738BAC 80 7E 05 B4 */ lwz r3, 0x5b4(r30) -/* 80738BB0 38 80 00 01 */ li r4, 1 -/* 80738BB4 88 03 00 11 */ lbz r0, 0x11(r3) -/* 80738BB8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80738BBC 40 82 00 18 */ bne lbl_80738BD4 -/* 80738BC0 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80738BC4 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80738BC8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80738BCC 41 82 00 08 */ beq lbl_80738BD4 -/* 80738BD0 38 80 00 00 */ li r4, 0 -lbl_80738BD4: -/* 80738BD4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80738BD8 41 82 00 34 */ beq lbl_80738C0C -/* 80738BDC 3C 60 80 74 */ lis r3, lit_4792@ha /* 0x80739FB4@ha */ -/* 80738BE0 38 83 9F B4 */ addi r4, r3, lit_4792@l /* 0x80739FB4@l */ -/* 80738BE4 80 64 00 00 */ lwz r3, 0(r4) -/* 80738BE8 80 04 00 04 */ lwz r0, 4(r4) -/* 80738BEC 90 61 00 08 */ stw r3, 8(r1) -/* 80738BF0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80738BF4 80 04 00 08 */ lwz r0, 8(r4) -/* 80738BF8 90 01 00 10 */ stw r0, 0x10(r1) -/* 80738BFC 7F C3 F3 78 */ mr r3, r30 -/* 80738C00 38 81 00 08 */ addi r4, r1, 8 -/* 80738C04 4B FF D6 69 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80738C08 48 00 00 0C */ b lbl_80738C14 -lbl_80738C0C: -/* 80738C0C 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 80738C10 4B 8D 48 19 */ bl play__14mDoExt_baseAnmFv -lbl_80738C14: -/* 80738C14 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80738C18 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80738C1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80738C20 7C 08 03 A6 */ mtlr r0 -/* 80738C24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80738C28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s deleted file mode 100644 index c4d05c7c427..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_80738E30: -/* 80738E30 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80738E34 7C 08 02 A6 */ mflr r0 -/* 80738E38 90 01 00 64 */ stw r0, 0x64(r1) -/* 80738E3C 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 80738E40 93 C1 00 58 */ stw r30, 0x58(r1) -/* 80738E44 7C 7E 1B 78 */ mr r30, r3 -/* 80738E48 3C 60 80 74 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80739E54@ha */ -/* 80738E4C 3B E3 9E 54 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x80739E54@l */ -/* 80738E50 38 7E 08 A0 */ addi r3, r30, 0x8a0 -/* 80738E54 4B 94 A9 DD */ bl Move__10dCcD_GSttsFv -/* 80738E58 88 1E 0B AD */ lbz r0, 0xbad(r30) -/* 80738E5C 28 00 00 00 */ cmplwi r0, 0 -/* 80738E60 40 82 01 E4 */ bne lbl_80739044 -/* 80738E64 80 7F 01 6C */ lwz r3, 0x16c(r31) -/* 80738E68 80 1F 01 70 */ lwz r0, 0x170(r31) -/* 80738E6C 90 61 00 48 */ stw r3, 0x48(r1) -/* 80738E70 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80738E74 80 1F 01 74 */ lwz r0, 0x174(r31) -/* 80738E78 90 01 00 50 */ stw r0, 0x50(r1) -/* 80738E7C 38 7E 0B 58 */ addi r3, r30, 0xb58 -/* 80738E80 38 81 00 48 */ addi r4, r1, 0x48 -/* 80738E84 4B C2 91 C5 */ bl __ptmf_cmpr -/* 80738E88 2C 03 00 00 */ cmpwi r3, 0 -/* 80738E8C 41 82 00 30 */ beq lbl_80738EBC -/* 80738E90 80 7F 01 78 */ lwz r3, 0x178(r31) -/* 80738E94 80 1F 01 7C */ lwz r0, 0x17c(r31) -/* 80738E98 90 61 00 3C */ stw r3, 0x3c(r1) -/* 80738E9C 90 01 00 40 */ stw r0, 0x40(r1) -/* 80738EA0 80 1F 01 80 */ lwz r0, 0x180(r31) -/* 80738EA4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80738EA8 38 7E 0B 58 */ addi r3, r30, 0xb58 -/* 80738EAC 38 81 00 3C */ addi r4, r1, 0x3c -/* 80738EB0 4B C2 91 99 */ bl __ptmf_cmpr -/* 80738EB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80738EB8 40 82 00 88 */ bne lbl_80738F40 -lbl_80738EBC: -/* 80738EBC 38 7E 09 F8 */ addi r3, r30, 0x9f8 -/* 80738EC0 4B 94 B4 01 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 80738EC4 28 03 00 00 */ cmplwi r3, 0 -/* 80738EC8 41 82 00 78 */ beq lbl_80738F40 -/* 80738ECC 80 1E 0A 54 */ lwz r0, 0xa54(r30) -/* 80738ED0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80738ED4 41 82 00 44 */ beq lbl_80738F18 -/* 80738ED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80738EDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80738EE0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80738EE4 88 03 05 68 */ lbz r0, 0x568(r3) -/* 80738EE8 28 00 00 29 */ cmplwi r0, 0x29 -/* 80738EEC 40 82 00 2C */ bne lbl_80738F18 -/* 80738EF0 80 7F 01 84 */ lwz r3, 0x184(r31) -/* 80738EF4 80 1F 01 88 */ lwz r0, 0x188(r31) -/* 80738EF8 90 61 00 30 */ stw r3, 0x30(r1) -/* 80738EFC 90 01 00 34 */ stw r0, 0x34(r1) -/* 80738F00 80 1F 01 8C */ lwz r0, 0x18c(r31) -/* 80738F04 90 01 00 38 */ stw r0, 0x38(r1) -/* 80738F08 7F C3 F3 78 */ mr r3, r30 -/* 80738F0C 38 81 00 30 */ addi r4, r1, 0x30 -/* 80738F10 4B FF D3 5D */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80738F14 48 00 01 30 */ b lbl_80739044 -lbl_80738F18: -/* 80738F18 80 7F 01 90 */ lwz r3, 0x190(r31) -/* 80738F1C 80 1F 01 94 */ lwz r0, 0x194(r31) -/* 80738F20 90 61 00 24 */ stw r3, 0x24(r1) -/* 80738F24 90 01 00 28 */ stw r0, 0x28(r1) -/* 80738F28 80 1F 01 98 */ lwz r0, 0x198(r31) -/* 80738F2C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80738F30 7F C3 F3 78 */ mr r3, r30 -/* 80738F34 38 81 00 24 */ addi r4, r1, 0x24 -/* 80738F38 4B FF D3 35 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80738F3C 48 00 01 08 */ b lbl_80739044 -lbl_80738F40: -/* 80738F40 38 7E 08 C0 */ addi r3, r30, 0x8c0 -/* 80738F44 4B 94 B5 1D */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80738F48 28 03 00 00 */ cmplwi r3, 0 -/* 80738F4C 41 82 00 F8 */ beq lbl_80739044 -/* 80738F50 38 7E 08 C0 */ addi r3, r30, 0x8c0 -/* 80738F54 4B 94 B5 A5 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80738F58 90 7E 0B 30 */ stw r3, 0xb30(r30) -/* 80738F5C 7F C3 F3 78 */ mr r3, r30 -/* 80738F60 38 9E 0B 30 */ addi r4, r30, 0xb30 -/* 80738F64 4B 94 EC A1 */ bl cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo -/* 80738F68 80 7E 0B 30 */ lwz r3, 0xb30(r30) -/* 80738F6C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80738F70 74 00 D8 00 */ andis. r0, r0, 0xd800 -/* 80738F74 41 82 00 10 */ beq lbl_80738F84 -/* 80738F78 38 00 00 14 */ li r0, 0x14 -/* 80738F7C 98 1E 0B AD */ stb r0, 0xbad(r30) -/* 80738F80 48 00 00 0C */ b lbl_80738F8C -lbl_80738F84: -/* 80738F84 38 00 00 0A */ li r0, 0xa -/* 80738F88 98 1E 0B AD */ stb r0, 0xbad(r30) -lbl_80738F8C: -/* 80738F8C 88 1E 0B 4F */ lbz r0, 0xb4f(r30) -/* 80738F90 7C 00 07 75 */ extsb. r0, r0 -/* 80738F94 41 82 00 0C */ beq lbl_80738FA0 -/* 80738F98 38 00 00 0A */ li r0, 0xa -/* 80738F9C 98 1E 0B AD */ stb r0, 0xbad(r30) -lbl_80738FA0: -/* 80738FA0 38 00 00 00 */ li r0, 0 -/* 80738FA4 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ -/* 80738FA8 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ -/* 80738FAC 38 7E 08 C0 */ addi r3, r30, 0x8c0 -/* 80738FB0 81 9E 08 FC */ lwz r12, 0x8fc(r30) -/* 80738FB4 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80738FB8 7D 89 03 A6 */ mtctr r12 -/* 80738FBC 4E 80 04 21 */ bctrl -/* 80738FC0 3C 60 00 07 */ lis r3, 0x0007 /* 0x000702A8@ha */ -/* 80738FC4 38 03 02 A8 */ addi r0, r3, 0x02A8 /* 0x000702A8@l */ -/* 80738FC8 90 01 00 08 */ stw r0, 8(r1) -/* 80738FCC 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80738FD0 38 81 00 08 */ addi r4, r1, 8 -/* 80738FD4 38 A0 FF FF */ li r5, -1 -/* 80738FD8 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 80738FDC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80738FE0 7D 89 03 A6 */ mtctr r12 -/* 80738FE4 4E 80 04 21 */ bctrl -/* 80738FE8 80 7E 0B 30 */ lwz r3, 0xb30(r30) -/* 80738FEC 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80738FF0 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 -/* 80738FF4 41 82 00 2C */ beq lbl_80739020 -/* 80738FF8 80 7F 01 9C */ lwz r3, 0x19c(r31) -/* 80738FFC 80 1F 01 A0 */ lwz r0, 0x1a0(r31) -/* 80739000 90 61 00 18 */ stw r3, 0x18(r1) -/* 80739004 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80739008 80 1F 01 A4 */ lwz r0, 0x1a4(r31) -/* 8073900C 90 01 00 20 */ stw r0, 0x20(r1) -/* 80739010 7F C3 F3 78 */ mr r3, r30 -/* 80739014 38 81 00 18 */ addi r4, r1, 0x18 -/* 80739018 4B FF D2 55 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 8073901C 48 00 00 28 */ b lbl_80739044 -lbl_80739020: -/* 80739020 80 7F 01 A8 */ lwz r3, 0x1a8(r31) -/* 80739024 80 1F 01 AC */ lwz r0, 0x1ac(r31) -/* 80739028 90 61 00 0C */ stw r3, 0xc(r1) -/* 8073902C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80739030 80 1F 01 B0 */ lwz r0, 0x1b0(r31) -/* 80739034 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739038 7F C3 F3 78 */ mr r3, r30 -/* 8073903C 38 81 00 0C */ addi r4, r1, 0xc -/* 80739040 4B FF D2 2D */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -lbl_80739044: -/* 80739044 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 80739048 83 C1 00 58 */ lwz r30, 0x58(r1) -/* 8073904C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80739050 7C 08 03 A6 */ mtlr r0 -/* 80739054 38 21 00 60 */ addi r1, r1, 0x60 -/* 80739058 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/draw__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/draw__11daE_OctBg_cFv.s deleted file mode 100644 index 1a94ab7d444..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/draw__11daE_OctBg_cFv.s +++ /dev/null @@ -1,130 +0,0 @@ -lbl_807399A4: -/* 807399A4 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 807399A8 7C 08 02 A6 */ mflr r0 -/* 807399AC 90 01 00 54 */ stw r0, 0x54(r1) -/* 807399B0 39 61 00 50 */ addi r11, r1, 0x50 -/* 807399B4 4B C2 88 29 */ bl _savegpr_29 -/* 807399B8 7C 7D 1B 78 */ mr r29, r3 -/* 807399BC 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 807399C0 3B E3 9D 60 */ addi r31, r3, lit_3768@l /* 0x80739D60@l */ -/* 807399C4 80 7D 05 B4 */ lwz r3, 0x5b4(r29) -/* 807399C8 83 C3 00 04 */ lwz r30, 4(r3) -/* 807399CC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807399D0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807399D4 38 80 00 00 */ li r4, 0 -/* 807399D8 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 807399DC 38 DD 01 0C */ addi r6, r29, 0x10c -/* 807399E0 4B A6 9D E5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 807399E4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807399E8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807399EC 80 9E 00 04 */ lwz r4, 4(r30) -/* 807399F0 38 BD 01 0C */ addi r5, r29, 0x10c -/* 807399F4 4B A6 B3 AD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 807399F8 80 9E 00 04 */ lwz r4, 4(r30) -/* 807399FC 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 80739A00 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80739A04 38 84 00 58 */ addi r4, r4, 0x58 -/* 80739A08 4B 8D 3D A1 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80739A0C 3C 60 80 74 */ lis r3, lit_5232@ha /* 0x8073A014@ha */ -/* 80739A10 38 83 A0 14 */ addi r4, r3, lit_5232@l /* 0x8073A014@l */ -/* 80739A14 80 64 00 00 */ lwz r3, 0(r4) -/* 80739A18 80 04 00 04 */ lwz r0, 4(r4) -/* 80739A1C 90 61 00 1C */ stw r3, 0x1c(r1) -/* 80739A20 90 01 00 20 */ stw r0, 0x20(r1) -/* 80739A24 80 04 00 08 */ lwz r0, 8(r4) -/* 80739A28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80739A2C 38 7D 0B 58 */ addi r3, r29, 0xb58 -/* 80739A30 38 81 00 1C */ addi r4, r1, 0x1c -/* 80739A34 4B C2 86 15 */ bl __ptmf_cmpr -/* 80739A38 2C 03 00 00 */ cmpwi r3, 0 -/* 80739A3C 41 82 00 38 */ beq lbl_80739A74 -/* 80739A40 3C 60 80 74 */ lis r3, lit_5234@ha /* 0x8073A020@ha */ -/* 80739A44 38 83 A0 20 */ addi r4, r3, lit_5234@l /* 0x8073A020@l */ -/* 80739A48 80 64 00 00 */ lwz r3, 0(r4) -/* 80739A4C 80 04 00 04 */ lwz r0, 4(r4) -/* 80739A50 90 61 00 10 */ stw r3, 0x10(r1) -/* 80739A54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739A58 80 04 00 08 */ lwz r0, 8(r4) -/* 80739A5C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80739A60 38 7D 0B 58 */ addi r3, r29, 0xb58 -/* 80739A64 38 81 00 10 */ addi r4, r1, 0x10 -/* 80739A68 4B C2 85 E1 */ bl __ptmf_cmpr -/* 80739A6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80739A70 40 82 00 B0 */ bne lbl_80739B20 -lbl_80739A74: -/* 80739A74 80 1D 0B 90 */ lwz r0, 0xb90(r29) -/* 80739A78 2C 00 00 00 */ cmpwi r0, 0 -/* 80739A7C 41 82 00 A4 */ beq lbl_80739B20 -/* 80739A80 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80739A84 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80739A88 A8 1D 0B 94 */ lha r0, 0xb94(r29) -/* 80739A8C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80739A90 7C 63 02 14 */ add r3, r3, r0 -/* 80739A94 C0 23 00 04 */ lfs f1, 4(r3) -/* 80739A98 C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80739A9C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80739AA0 FC 00 02 10 */ fabs f0, f0 -/* 80739AA4 FC 20 00 18 */ frsp f1, f0 -/* 80739AA8 C0 1F 00 E0 */ lfs f0, 0xe0(r31) -/* 80739AAC EC 00 08 28 */ fsubs f0, f0, f1 -/* 80739AB0 FC 00 00 1E */ fctiwz f0, f0 -/* 80739AB4 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 80739AB8 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80739ABC B0 01 00 08 */ sth r0, 8(r1) -/* 80739AC0 38 00 00 00 */ li r0, 0 -/* 80739AC4 B0 01 00 0A */ sth r0, 0xa(r1) -/* 80739AC8 B0 01 00 0C */ sth r0, 0xc(r1) -/* 80739ACC B0 01 00 0E */ sth r0, 0xe(r1) -/* 80739AD0 80 7E 00 04 */ lwz r3, 4(r30) -/* 80739AD4 80 63 00 60 */ lwz r3, 0x60(r3) -/* 80739AD8 80 63 00 00 */ lwz r3, 0(r3) -/* 80739ADC 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80739AE0 38 80 00 00 */ li r4, 0 -/* 80739AE4 38 A1 00 08 */ addi r5, r1, 8 -/* 80739AE8 81 83 00 00 */ lwz r12, 0(r3) -/* 80739AEC 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80739AF0 7D 89 03 A6 */ mtctr r12 -/* 80739AF4 4E 80 04 21 */ bctrl -/* 80739AF8 80 7E 00 04 */ lwz r3, 4(r30) -/* 80739AFC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 80739B00 80 63 00 04 */ lwz r3, 4(r3) -/* 80739B04 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80739B08 38 80 00 00 */ li r4, 0 -/* 80739B0C 38 A1 00 08 */ addi r5, r1, 8 -/* 80739B10 81 83 00 00 */ lwz r12, 0(r3) -/* 80739B14 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80739B18 7D 89 03 A6 */ mtctr r12 -/* 80739B1C 4E 80 04 21 */ bctrl -lbl_80739B20: -/* 80739B20 80 7D 05 B4 */ lwz r3, 0x5b4(r29) -/* 80739B24 4B 8D 76 9D */ bl entryDL__16mDoExt_McaMorfSOFv -/* 80739B28 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 80739B2C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80739B30 C0 7D 04 D4 */ lfs f3, 0x4d4(r29) -/* 80739B34 EC 20 18 2A */ fadds f1, f0, f3 -/* 80739B38 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80739B3C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80739B40 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80739B44 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 80739B48 80 7D 0B 78 */ lwz r3, 0xb78(r29) -/* 80739B4C 38 80 00 01 */ li r4, 1 -/* 80739B50 7F C5 F3 78 */ mr r5, r30 -/* 80739B54 38 C1 00 28 */ addi r6, r1, 0x28 -/* 80739B58 C0 3F 00 84 */ lfs f1, 0x84(r31) -/* 80739B5C C0 5F 00 30 */ lfs f2, 0x30(r31) -/* 80739B60 C0 9D 07 44 */ lfs f4, 0x744(r29) -/* 80739B64 38 FD 07 9C */ addi r7, r29, 0x79c -/* 80739B68 39 1D 01 0C */ addi r8, r29, 0x10c -/* 80739B6C 39 20 00 00 */ li r9, 0 -/* 80739B70 C0 BF 00 18 */ lfs f5, 0x18(r31) -/* 80739B74 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80739B78 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80739B7C 4B 8F 4D 95 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80739B80 90 7D 0B 78 */ stw r3, 0xb78(r29) -/* 80739B84 38 60 00 01 */ li r3, 1 -/* 80739B88 39 61 00 50 */ addi r11, r1, 0x50 -/* 80739B8C 4B C2 86 9D */ bl _restgpr_29 -/* 80739B90 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80739B94 7C 08 03 A6 */ mtlr r0 -/* 80739B98 38 21 00 50 */ addi r1, r1, 0x50 -/* 80739B9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/execute__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/execute__11daE_OctBg_cFv.s deleted file mode 100644 index c1c3d18e160..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/execute__11daE_OctBg_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8073905C: -/* 8073905C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80739060 7C 08 02 A6 */ mflr r0 -/* 80739064 90 01 00 14 */ stw r0, 0x14(r1) -/* 80739068 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8073906C 7C 7F 1B 78 */ mr r31, r3 -/* 80739070 4B 8D F2 39 */ bl cDmrNowMidnaTalk__Fv -/* 80739074 2C 03 00 00 */ cmpwi r3, 0 -/* 80739078 41 82 00 0C */ beq lbl_80739084 -/* 8073907C 38 60 00 01 */ li r3, 1 -/* 80739080 48 00 00 10 */ b lbl_80739090 -lbl_80739084: -/* 80739084 7F E3 FB 78 */ mr r3, r31 -/* 80739088 4B FF D4 95 */ bl action__11daE_OctBg_cFv -/* 8073908C 38 60 00 01 */ li r3, 1 -lbl_80739090: -/* 80739090 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80739094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80739098 7C 08 03 A6 */ mtlr r0 -/* 8073909C 38 21 00 10 */ addi r1, r1, 0x10 -/* 807390A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D3C.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D3C.s deleted file mode 100644 index 838a0701210..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D3C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80739D3C: -/* 80739D3C 38 63 FF DC */ addi r3, r3, -36 -/* 80739D40 4B FF FB 64 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D44.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D44.s deleted file mode 100644 index 498c3dedddf..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D44.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80739D44: -/* 80739D44 38 63 FF EC */ addi r3, r3, -20 -/* 80739D48 4B FF FB 5C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/hook__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/hook__11daE_OctBg_cFv.s deleted file mode 100644 index 0eff6b0cc9f..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/hook__11daE_OctBg_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_807389E8: -/* 807389E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807389EC 7C 08 02 A6 */ mflr r0 -/* 807389F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 807389F4 80 03 0B 70 */ lwz r0, 0xb70(r3) -/* 807389F8 2C 00 00 00 */ cmpwi r0, 0 -/* 807389FC 40 82 00 20 */ bne lbl_80738A1C -/* 80738A00 80 03 09 F8 */ lwz r0, 0x9f8(r3) -/* 80738A04 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80738A08 90 03 09 F8 */ stw r0, 0x9f8(r3) -/* 80738A0C 80 83 0B 70 */ lwz r4, 0xb70(r3) -/* 80738A10 38 04 00 01 */ addi r0, r4, 1 -/* 80738A14 90 03 0B 70 */ stw r0, 0xb70(r3) -/* 80738A18 48 00 00 24 */ b lbl_80738A3C -lbl_80738A1C: -/* 80738A1C 2C 00 FF FF */ cmpwi r0, -1 -/* 80738A20 40 82 00 14 */ bne lbl_80738A34 -/* 80738A24 80 03 09 F8 */ lwz r0, 0x9f8(r3) -/* 80738A28 60 00 00 01 */ ori r0, r0, 1 -/* 80738A2C 90 03 09 F8 */ stw r0, 0x9f8(r3) -/* 80738A30 48 00 00 0C */ b lbl_80738A3C -lbl_80738A34: -/* 80738A34 38 80 00 01 */ li r4, 1 -/* 80738A38 4B FF FE DD */ bl setBombCarry__11daE_OctBg_cFi -lbl_80738A3C: -/* 80738A3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80738A40 7C 08 03 A6 */ mtlr r0 -/* 80738A44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80738A48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/mtx_set__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/mtx_set__11daE_OctBg_cFv.s deleted file mode 100644 index a3eba1f2f06..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/mtx_set__11daE_OctBg_cFv.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_80736A78: -/* 80736A78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80736A7C 7C 08 02 A6 */ mflr r0 -/* 80736A80 90 01 00 24 */ stw r0, 0x24(r1) -/* 80736A84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80736A88 4B C2 B7 55 */ bl _savegpr_29 -/* 80736A8C 7C 7F 1B 78 */ mr r31, r3 -/* 80736A90 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80736A94 3B A3 9D 60 */ addi r29, r3, lit_3768@l /* 0x80739D60@l */ -/* 80736A98 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80736A9C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80736AA0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80736AA4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80736AA8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80736AAC 4B C0 FE 3D */ bl PSMTXTrans -/* 80736AB0 C0 3D 00 30 */ lfs f1, 0x30(r29) -/* 80736AB4 C0 5D 00 34 */ lfs f2, 0x34(r29) -/* 80736AB8 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80736ABC 3B C3 A1 4C */ addi r30, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80736AC0 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 80736AC4 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80736AC8 FC 60 08 90 */ fmr f3, f1 -/* 80736ACC 4B 8D 62 D1 */ bl transM__14mDoMtx_stack_cFfff -/* 80736AD0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80736AD4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80736AD8 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80736ADC A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80736AE0 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80736AE4 4B 8D 57 BD */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80736AE8 C0 3D 00 30 */ lfs f1, 0x30(r29) -/* 80736AEC C0 5D 00 40 */ lfs f2, 0x40(r29) -/* 80736AF0 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 80736AF4 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80736AF8 FC 60 08 90 */ fmr f3, f1 -/* 80736AFC 4B 8D 62 A1 */ bl transM__14mDoMtx_stack_cFfff -/* 80736B00 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80736B04 FC 40 08 90 */ fmr f2, f1 -/* 80736B08 FC 60 08 90 */ fmr f3, f1 -/* 80736B0C 4B 8D 63 2D */ bl scaleM__14mDoMtx_stack_cFfff -/* 80736B10 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 80736B14 83 A3 00 04 */ lwz r29, 4(r3) -/* 80736B18 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80736B1C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80736B20 38 9D 00 24 */ addi r4, r29, 0x24 -/* 80736B24 4B C0 F9 8D */ bl PSMTXCopy -/* 80736B28 38 C0 00 01 */ li r6, 1 -/* 80736B2C 3C 60 80 74 */ lis r3, JointCallBack__11daE_OctBg_cFP8J3DJointi@ha /* 0x807391D0@ha */ -/* 80736B30 38 83 91 D0 */ addi r4, r3, JointCallBack__11daE_OctBg_cFP8J3DJointi@l /* 0x807391D0@l */ -/* 80736B34 48 00 00 18 */ b lbl_80736B4C -lbl_80736B38: -/* 80736B38 80 65 00 28 */ lwz r3, 0x28(r5) -/* 80736B3C 54 C0 13 BA */ rlwinm r0, r6, 2, 0xe, 0x1d -/* 80736B40 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80736B44 90 83 00 04 */ stw r4, 4(r3) -/* 80736B48 38 C6 00 01 */ addi r6, r6, 1 -lbl_80736B4C: -/* 80736B4C 80 BD 00 04 */ lwz r5, 4(r29) -/* 80736B50 A0 65 00 2C */ lhz r3, 0x2c(r5) -/* 80736B54 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 80736B58 7C 00 18 40 */ cmplw r0, r3 -/* 80736B5C 41 80 FF DC */ blt lbl_80736B38 -/* 80736B60 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 80736B64 4B 8D A6 89 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 80736B68 38 C0 00 01 */ li r6, 1 -/* 80736B6C 38 80 00 00 */ li r4, 0 -/* 80736B70 48 00 00 18 */ b lbl_80736B88 -lbl_80736B74: -/* 80736B74 80 65 00 28 */ lwz r3, 0x28(r5) -/* 80736B78 54 C0 13 BA */ rlwinm r0, r6, 2, 0xe, 0x1d -/* 80736B7C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80736B80 90 83 00 04 */ stw r4, 4(r3) -/* 80736B84 38 C6 00 01 */ addi r6, r6, 1 -lbl_80736B88: -/* 80736B88 80 BD 00 04 */ lwz r5, 4(r29) -/* 80736B8C A0 65 00 2C */ lhz r3, 0x2c(r5) -/* 80736B90 54 C0 04 3E */ clrlwi r0, r6, 0x10 -/* 80736B94 7C 00 18 40 */ cmplw r0, r3 -/* 80736B98 41 80 FF DC */ blt lbl_80736B74 -/* 80736B9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80736BA0 4B C2 B6 89 */ bl _restgpr_29 -/* 80736BA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80736BA8 7C 08 03 A6 */ mtlr r0 -/* 80736BAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80736BB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/normal_attack__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/normal_attack__11daE_OctBg_cFv.s deleted file mode 100644 index b8e5f0e347d..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/normal_attack__11daE_OctBg_cFv.s +++ /dev/null @@ -1,341 +0,0 @@ -lbl_80737C48: -/* 80737C48 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80737C4C 7C 08 02 A6 */ mflr r0 -/* 80737C50 90 01 00 74 */ stw r0, 0x74(r1) -/* 80737C54 39 61 00 70 */ addi r11, r1, 0x70 -/* 80737C58 4B C2 A5 81 */ bl _savegpr_28 -/* 80737C5C 7C 7C 1B 78 */ mr r28, r3 -/* 80737C60 3C 60 80 74 */ lis r3, lit_3768@ha /* 0x80739D60@ha */ -/* 80737C64 3B C3 9D 60 */ addi r30, r3, lit_3768@l /* 0x80739D60@l */ -/* 80737C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80737C6C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80737C70 83 BF 5D AC */ lwz r29, 0x5dac(r31) -/* 80737C74 80 1C 0B 70 */ lwz r0, 0xb70(r28) -/* 80737C78 2C 00 00 00 */ cmpwi r0, 0 -/* 80737C7C 40 82 00 50 */ bne lbl_80737CCC -/* 80737C80 38 00 00 01 */ li r0, 1 -/* 80737C84 98 1C 0B 74 */ stb r0, 0xb74(r28) -/* 80737C88 3C 60 80 74 */ lis r3, struct_8073A14C+0x26@ha /* 0x8073A172@ha */ -/* 80737C8C 38 83 A1 72 */ addi r4, r3, struct_8073A14C+0x26@l /* 0x8073A172@l */ -/* 80737C90 88 64 00 00 */ lbz r3, 0(r4) -/* 80737C94 38 03 00 01 */ addi r0, r3, 1 -/* 80737C98 98 04 00 00 */ stb r0, 0(r4) -/* 80737C9C C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80737CA0 4B B2 FC ED */ bl cM_rndFX__Ff -/* 80737CA4 C0 1E 00 A0 */ lfs f0, 0xa0(r30) -/* 80737CA8 EC 00 08 2A */ fadds f0, f0, f1 -/* 80737CAC FC 00 00 1E */ fctiwz f0, f0 -/* 80737CB0 D8 01 00 58 */ stfd f0, 0x58(r1) -/* 80737CB4 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 80737CB8 98 1C 0B AE */ stb r0, 0xbae(r28) -/* 80737CBC 80 7C 0B 70 */ lwz r3, 0xb70(r28) -/* 80737CC0 38 03 00 01 */ addi r0, r3, 1 -/* 80737CC4 90 1C 0B 70 */ stw r0, 0xb70(r28) -/* 80737CC8 48 00 04 6C */ b lbl_80738134 -lbl_80737CCC: -/* 80737CCC 2C 00 FF FF */ cmpwi r0, -1 -/* 80737CD0 40 82 00 24 */ bne lbl_80737CF4 -/* 80737CD4 38 00 00 00 */ li r0, 0 -/* 80737CD8 98 1C 0B 74 */ stb r0, 0xb74(r28) -/* 80737CDC 3C 60 80 74 */ lis r3, struct_8073A14C+0x26@ha /* 0x8073A172@ha */ -/* 80737CE0 38 83 A1 72 */ addi r4, r3, struct_8073A14C+0x26@l /* 0x8073A172@l */ -/* 80737CE4 88 64 00 00 */ lbz r3, 0(r4) -/* 80737CE8 38 03 FF FF */ addi r0, r3, -1 -/* 80737CEC 98 04 00 00 */ stb r0, 0(r4) -/* 80737CF0 48 00 04 44 */ b lbl_80738134 -lbl_80737CF4: -/* 80737CF4 2C 00 00 01 */ cmpwi r0, 1 -/* 80737CF8 40 82 01 4C */ bne lbl_80737E44 -/* 80737CFC C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80737D00 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80737D04 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80737D08 D0 21 00 4C */ stfs f1, 0x4c(r1) -/* 80737D0C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80737D10 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80737D14 80 1F 5F 18 */ lwz r0, 0x5f18(r31) -/* 80737D18 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 80737D1C 41 82 00 14 */ beq lbl_80737D30 -/* 80737D20 C0 1E 00 A0 */ lfs f0, 0xa0(r30) -/* 80737D24 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80737D28 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80737D2C 48 00 00 10 */ b lbl_80737D3C -lbl_80737D30: -/* 80737D30 C0 1E 00 A4 */ lfs f0, 0xa4(r30) -/* 80737D34 EC 01 00 2A */ fadds f0, f1, f0 -/* 80737D38 D0 01 00 4C */ stfs f0, 0x4c(r1) -lbl_80737D3C: -/* 80737D3C 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80737D40 38 81 00 48 */ addi r4, r1, 0x48 -/* 80737D44 4B B3 8E C1 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80737D48 B0 7C 0B 96 */ sth r3, 0xb96(r28) -/* 80737D4C A8 7C 04 DE */ lha r3, 0x4de(r28) -/* 80737D50 A8 1C 0B 96 */ lha r0, 0xb96(r28) -/* 80737D54 7C 03 00 50 */ subf r0, r3, r0 -/* 80737D58 B0 1C 0B 8C */ sth r0, 0xb8c(r28) -/* 80737D5C 38 7C 04 DE */ addi r3, r28, 0x4de -/* 80737D60 A8 9C 0B 96 */ lha r4, 0xb96(r28) -/* 80737D64 38 A0 04 00 */ li r5, 0x400 -/* 80737D68 4B B3 8E 29 */ bl cLib_chaseAngleS__FPsss -/* 80737D6C 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80737D70 38 81 00 48 */ addi r4, r1, 0x48 -/* 80737D74 4B B3 8F 01 */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz -/* 80737D78 7C 03 00 D0 */ neg r0, r3 -/* 80737D7C 7C 04 07 34 */ extsh r4, r0 -/* 80737D80 38 7C 04 DC */ addi r3, r28, 0x4dc -/* 80737D84 38 A0 04 00 */ li r5, 0x400 -/* 80737D88 4B B3 8E 09 */ bl cLib_chaseAngleS__FPsss -/* 80737D8C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737D90 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737D94 A8 1C 04 DC */ lha r0, 0x4dc(r28) -/* 80737D98 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80737D9C 7C 63 02 14 */ add r3, r3, r0 -/* 80737DA0 C0 23 00 04 */ lfs f1, 4(r3) -/* 80737DA4 38 7C 05 2C */ addi r3, r28, 0x52c -/* 80737DA8 C0 1E 00 A8 */ lfs f0, 0xa8(r30) -/* 80737DAC EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737DB0 C0 5E 00 74 */ lfs f2, 0x74(r30) -/* 80737DB4 4B B3 89 8D */ bl cLib_chaseF__FPfff -/* 80737DB8 A8 1C 04 DC */ lha r0, 0x4dc(r28) -/* 80737DBC 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80737DC0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737DC4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737DC8 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80737DCC 38 7C 04 FC */ addi r3, r28, 0x4fc -/* 80737DD0 C0 1E 00 AC */ lfs f0, 0xac(r30) -/* 80737DD4 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737DD8 C0 5E 00 74 */ lfs f2, 0x74(r30) -/* 80737DDC 4B B3 89 65 */ bl cLib_chaseF__FPfff -/* 80737DE0 7F 83 E3 78 */ mr r3, r28 -/* 80737DE4 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 80737DE8 4B 8E 29 29 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80737DEC A8 1C 04 DE */ lha r0, 0x4de(r28) -/* 80737DF0 7C 00 18 50 */ subf r0, r0, r3 -/* 80737DF4 B0 1C 0B 8C */ sth r0, 0xb8c(r28) -/* 80737DF8 38 7C 0B 80 */ addi r3, r28, 0xb80 -/* 80737DFC 38 80 04 00 */ li r4, 0x400 -/* 80737E00 38 A0 00 20 */ li r5, 0x20 -/* 80737E04 38 C0 04 00 */ li r6, 0x400 -/* 80737E08 38 E0 00 80 */ li r7, 0x80 -/* 80737E0C 4B B3 87 35 */ bl cLib_addCalcAngleS__FPsssss -/* 80737E10 A8 7C 0B 7C */ lha r3, 0xb7c(r28) -/* 80737E14 A8 1C 0B 80 */ lha r0, 0xb80(r28) -/* 80737E18 7C 03 02 14 */ add r0, r3, r0 -/* 80737E1C B0 1C 0B 7C */ sth r0, 0xb7c(r28) -/* 80737E20 88 1C 0B AE */ lbz r0, 0xbae(r28) -/* 80737E24 28 00 00 00 */ cmplwi r0, 0 -/* 80737E28 40 82 03 0C */ bne lbl_80738134 -/* 80737E2C 38 00 00 78 */ li r0, 0x78 -/* 80737E30 98 1C 0B AE */ stb r0, 0xbae(r28) -/* 80737E34 80 7C 0B 70 */ lwz r3, 0xb70(r28) -/* 80737E38 38 03 00 01 */ addi r0, r3, 1 -/* 80737E3C 90 1C 0B 70 */ stw r0, 0xb70(r28) -/* 80737E40 48 00 02 F4 */ b lbl_80738134 -lbl_80737E44: -/* 80737E44 2C 00 00 02 */ cmpwi r0, 2 -/* 80737E48 40 82 02 EC */ bne lbl_80738134 -/* 80737E4C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80737E50 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80737E54 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80737E58 D0 21 00 40 */ stfs f1, 0x40(r1) -/* 80737E5C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80737E60 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80737E64 80 1F 5F 18 */ lwz r0, 0x5f18(r31) -/* 80737E68 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 80737E6C 41 82 00 14 */ beq lbl_80737E80 -/* 80737E70 C0 1E 00 A0 */ lfs f0, 0xa0(r30) -/* 80737E74 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80737E78 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80737E7C 48 00 00 10 */ b lbl_80737E8C -lbl_80737E80: -/* 80737E80 C0 1E 00 A4 */ lfs f0, 0xa4(r30) -/* 80737E84 EC 01 00 2A */ fadds f0, f1, f0 -/* 80737E88 D0 01 00 40 */ stfs f0, 0x40(r1) -lbl_80737E8C: -/* 80737E8C 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80737E90 38 81 00 3C */ addi r4, r1, 0x3c -/* 80737E94 4B B3 8D 71 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80737E98 B0 7C 0B 96 */ sth r3, 0xb96(r28) -/* 80737E9C A8 7C 04 DE */ lha r3, 0x4de(r28) -/* 80737EA0 A8 1C 0B 96 */ lha r0, 0xb96(r28) -/* 80737EA4 7C 03 00 50 */ subf r0, r3, r0 -/* 80737EA8 B0 1C 0B 8C */ sth r0, 0xb8c(r28) -/* 80737EAC 38 7C 04 DE */ addi r3, r28, 0x4de -/* 80737EB0 A8 9C 0B 96 */ lha r4, 0xb96(r28) -/* 80737EB4 38 A0 04 00 */ li r5, 0x400 -/* 80737EB8 4B B3 8C D9 */ bl cLib_chaseAngleS__FPsss -/* 80737EBC 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80737EC0 38 81 00 3C */ addi r4, r1, 0x3c -/* 80737EC4 4B B3 8D B1 */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz -/* 80737EC8 7C 03 00 D0 */ neg r0, r3 -/* 80737ECC 7C 04 07 34 */ extsh r4, r0 -/* 80737ED0 38 7C 04 DC */ addi r3, r28, 0x4dc -/* 80737ED4 38 A0 04 00 */ li r5, 0x400 -/* 80737ED8 4B B3 8C B9 */ bl cLib_chaseAngleS__FPsss -/* 80737EDC 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737EE0 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737EE4 A8 1C 04 DC */ lha r0, 0x4dc(r28) -/* 80737EE8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80737EEC 7C 63 02 14 */ add r3, r3, r0 -/* 80737EF0 C0 23 00 04 */ lfs f1, 4(r3) -/* 80737EF4 38 7C 05 2C */ addi r3, r28, 0x52c -/* 80737EF8 C0 1E 00 90 */ lfs f0, 0x90(r30) -/* 80737EFC EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737F00 C0 5E 00 74 */ lfs f2, 0x74(r30) -/* 80737F04 4B B3 88 3D */ bl cLib_chaseF__FPfff -/* 80737F08 A8 1C 04 DC */ lha r0, 0x4dc(r28) -/* 80737F0C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80737F10 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737F14 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737F18 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80737F1C 38 7C 04 FC */ addi r3, r28, 0x4fc -/* 80737F20 C0 1E 00 94 */ lfs f0, 0x94(r30) -/* 80737F24 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737F28 C0 5E 00 74 */ lfs f2, 0x74(r30) -/* 80737F2C 4B B3 88 15 */ bl cLib_chaseF__FPfff -/* 80737F30 7F 83 E3 78 */ mr r3, r28 -/* 80737F34 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 80737F38 4B 8E 27 D9 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80737F3C A8 1C 04 DE */ lha r0, 0x4de(r28) -/* 80737F40 7C 00 18 50 */ subf r0, r0, r3 -/* 80737F44 B0 1C 0B 8C */ sth r0, 0xb8c(r28) -/* 80737F48 38 7C 0B 80 */ addi r3, r28, 0xb80 -/* 80737F4C 38 80 24 00 */ li r4, 0x2400 -/* 80737F50 38 A0 00 20 */ li r5, 0x20 -/* 80737F54 38 C0 04 00 */ li r6, 0x400 -/* 80737F58 38 E0 00 80 */ li r7, 0x80 -/* 80737F5C 4B B3 85 E5 */ bl cLib_addCalcAngleS__FPsssss -/* 80737F60 A8 7C 0B 7C */ lha r3, 0xb7c(r28) -/* 80737F64 A8 1C 0B 80 */ lha r0, 0xb80(r28) -/* 80737F68 7C 03 02 14 */ add r0, r3, r0 -/* 80737F6C B0 1C 0B 7C */ sth r0, 0xb7c(r28) -/* 80737F70 C0 5C 04 B0 */ lfs f2, 0x4b0(r28) -/* 80737F74 C0 1C 04 A8 */ lfs f0, 0x4a8(r28) -/* 80737F78 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80737F7C C0 3E 00 30 */ lfs f1, 0x30(r30) -/* 80737F80 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80737F84 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80737F88 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 80737F8C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80737F90 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80737F94 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80737F98 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80737F9C 38 61 00 0C */ addi r3, r1, 0xc -/* 80737FA0 38 81 00 18 */ addi r4, r1, 0x18 -/* 80737FA4 4B C0 F3 F9 */ bl PSVECSquareDistance -/* 80737FA8 C0 1E 00 30 */ lfs f0, 0x30(r30) -/* 80737FAC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80737FB0 40 81 00 58 */ ble lbl_80738008 -/* 80737FB4 FC 00 08 34 */ frsqrte f0, f1 -/* 80737FB8 C8 9E 00 48 */ lfd f4, 0x48(r30) -/* 80737FBC FC 44 00 32 */ fmul f2, f4, f0 -/* 80737FC0 C8 7E 00 50 */ lfd f3, 0x50(r30) -/* 80737FC4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80737FC8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80737FCC FC 03 00 28 */ fsub f0, f3, f0 -/* 80737FD0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737FD4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80737FD8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80737FDC FC 01 00 32 */ fmul f0, f1, f0 -/* 80737FE0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80737FE4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737FE8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80737FEC FC 00 00 32 */ fmul f0, f0, f0 -/* 80737FF0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80737FF4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80737FF8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737FFC FC 21 00 32 */ fmul f1, f1, f0 -/* 80738000 FC 20 08 18 */ frsp f1, f1 -/* 80738004 48 00 00 88 */ b lbl_8073808C -lbl_80738008: -/* 80738008 C8 1E 00 58 */ lfd f0, 0x58(r30) -/* 8073800C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80738010 40 80 00 10 */ bge lbl_80738020 -/* 80738014 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80738018 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8073801C 48 00 00 70 */ b lbl_8073808C -lbl_80738020: -/* 80738020 D0 21 00 08 */ stfs f1, 8(r1) -/* 80738024 80 81 00 08 */ lwz r4, 8(r1) -/* 80738028 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8073802C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80738030 7C 03 00 00 */ cmpw r3, r0 -/* 80738034 41 82 00 14 */ beq lbl_80738048 -/* 80738038 40 80 00 40 */ bge lbl_80738078 -/* 8073803C 2C 03 00 00 */ cmpwi r3, 0 -/* 80738040 41 82 00 20 */ beq lbl_80738060 -/* 80738044 48 00 00 34 */ b lbl_80738078 -lbl_80738048: -/* 80738048 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8073804C 41 82 00 0C */ beq lbl_80738058 -/* 80738050 38 00 00 01 */ li r0, 1 -/* 80738054 48 00 00 28 */ b lbl_8073807C -lbl_80738058: -/* 80738058 38 00 00 02 */ li r0, 2 -/* 8073805C 48 00 00 20 */ b lbl_8073807C -lbl_80738060: -/* 80738060 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80738064 41 82 00 0C */ beq lbl_80738070 -/* 80738068 38 00 00 05 */ li r0, 5 -/* 8073806C 48 00 00 10 */ b lbl_8073807C -lbl_80738070: -/* 80738070 38 00 00 03 */ li r0, 3 -/* 80738074 48 00 00 08 */ b lbl_8073807C -lbl_80738078: -/* 80738078 38 00 00 04 */ li r0, 4 -lbl_8073807C: -/* 8073807C 2C 00 00 01 */ cmpwi r0, 1 -/* 80738080 40 82 00 0C */ bne lbl_8073808C -/* 80738084 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80738088 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8073808C: -/* 8073808C 3C 60 80 74 */ lis r3, struct_8073A14C+0x0@ha /* 0x8073A14C@ha */ -/* 80738090 38 63 A1 4C */ addi r3, r3, struct_8073A14C+0x0@l /* 0x8073A14C@l */ -/* 80738094 C0 03 00 08 */ lfs f0, 8(r3) -/* 80738098 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073809C 4C 41 13 82 */ cror 2, 1, 2 -/* 807380A0 40 82 00 48 */ bne lbl_807380E8 -/* 807380A4 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 807380A8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 807380AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807380B0 4C 41 13 82 */ cror 2, 1, 2 -/* 807380B4 40 82 00 34 */ bne lbl_807380E8 -/* 807380B8 3C 60 80 74 */ lis r3, lit_4476@ha /* 0x80739F78@ha */ -/* 807380BC 38 83 9F 78 */ addi r4, r3, lit_4476@l /* 0x80739F78@l */ -/* 807380C0 80 64 00 00 */ lwz r3, 0(r4) -/* 807380C4 80 04 00 04 */ lwz r0, 4(r4) -/* 807380C8 90 61 00 30 */ stw r3, 0x30(r1) -/* 807380CC 90 01 00 34 */ stw r0, 0x34(r1) -/* 807380D0 80 04 00 08 */ lwz r0, 8(r4) -/* 807380D4 90 01 00 38 */ stw r0, 0x38(r1) -/* 807380D8 7F 83 E3 78 */ mr r3, r28 -/* 807380DC 38 81 00 30 */ addi r4, r1, 0x30 -/* 807380E0 4B FF E1 8D */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 807380E4 48 00 00 50 */ b lbl_80738134 -lbl_807380E8: -/* 807380E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807380EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807380F0 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 807380F4 28 00 00 00 */ cmplwi r0, 0 -/* 807380F8 40 82 00 10 */ bne lbl_80738108 -/* 807380FC 88 1C 0B AE */ lbz r0, 0xbae(r28) -/* 80738100 28 00 00 00 */ cmplwi r0, 0 -/* 80738104 40 82 00 30 */ bne lbl_80738134 -lbl_80738108: -/* 80738108 3C 60 80 74 */ lis r3, lit_4481@ha /* 0x80739F84@ha */ -/* 8073810C 38 83 9F 84 */ addi r4, r3, lit_4481@l /* 0x80739F84@l */ -/* 80738110 80 64 00 00 */ lwz r3, 0(r4) -/* 80738114 80 04 00 04 */ lwz r0, 4(r4) -/* 80738118 90 61 00 24 */ stw r3, 0x24(r1) -/* 8073811C 90 01 00 28 */ stw r0, 0x28(r1) -/* 80738120 80 04 00 08 */ lwz r0, 8(r4) -/* 80738124 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80738128 7F 83 E3 78 */ mr r3, r28 -/* 8073812C 38 81 00 24 */ addi r4, r1, 0x24 -/* 80738130 4B FF E1 3D */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -lbl_80738134: -/* 80738134 39 61 00 70 */ addi r11, r1, 0x70 -/* 80738138 4B C2 A0 ED */ bl _restgpr_28 -/* 8073813C 80 01 00 74 */ lwz r0, 0x74(r1) -/* 80738140 7C 08 03 A6 */ mtlr r0 -/* 80738144 38 21 00 70 */ addi r1, r1, 0x70 -/* 80738148 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v.s deleted file mode 100644 index be1fbd01031..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8073626C: -/* 8073626C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80736270 7C 08 02 A6 */ mflr r0 -/* 80736274 90 01 00 14 */ stw r0, 0x14(r1) -/* 80736278 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8073627C 93 C1 00 08 */ stw r30, 8(r1) -/* 80736280 7C 7E 1B 78 */ mr r30, r3 -/* 80736284 7C 9F 23 78 */ mr r31, r4 -/* 80736288 38 7E 0B 58 */ addi r3, r30, 0xb58 -/* 8073628C 4B C2 BD 8D */ bl __ptmf_test -/* 80736290 2C 03 00 00 */ cmpwi r3, 0 -/* 80736294 41 82 00 1C */ beq lbl_807362B0 -/* 80736298 38 00 FF FF */ li r0, -1 -/* 8073629C 90 1E 0B 70 */ stw r0, 0xb70(r30) -/* 807362A0 7F C3 F3 78 */ mr r3, r30 -/* 807362A4 39 9E 0B 58 */ addi r12, r30, 0xb58 -/* 807362A8 4B C2 BD DD */ bl __ptmf_scall -/* 807362AC 60 00 00 00 */ nop -lbl_807362B0: -/* 807362B0 80 7E 0B 58 */ lwz r3, 0xb58(r30) -/* 807362B4 80 1E 0B 5C */ lwz r0, 0xb5c(r30) -/* 807362B8 90 7E 0B 64 */ stw r3, 0xb64(r30) -/* 807362BC 90 1E 0B 68 */ stw r0, 0xb68(r30) -/* 807362C0 80 1E 0B 60 */ lwz r0, 0xb60(r30) -/* 807362C4 90 1E 0B 6C */ stw r0, 0xb6c(r30) -/* 807362C8 80 7F 00 00 */ lwz r3, 0(r31) -/* 807362CC 80 1F 00 04 */ lwz r0, 4(r31) -/* 807362D0 90 7E 0B 58 */ stw r3, 0xb58(r30) -/* 807362D4 90 1E 0B 5C */ stw r0, 0xb5c(r30) -/* 807362D8 80 1F 00 08 */ lwz r0, 8(r31) -/* 807362DC 90 1E 0B 60 */ stw r0, 0xb60(r30) -/* 807362E0 38 00 00 00 */ li r0, 0 -/* 807362E4 90 1E 0B 70 */ stw r0, 0xb70(r30) -/* 807362E8 7F C3 F3 78 */ mr r3, r30 -/* 807362EC 39 9E 0B 58 */ addi r12, r30, 0xb58 -/* 807362F0 4B C2 BD 95 */ bl __ptmf_scall -/* 807362F4 60 00 00 00 */ nop -/* 807362F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807362FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80736300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80736304 7C 08 03 A6 */ mtlr r0 -/* 80736308 38 21 00 10 */ addi r1, r1, 0x10 -/* 8073630C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setBombCarry__11daE_OctBg_cFi.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setBombCarry__11daE_OctBg_cFi.s deleted file mode 100644 index 88f072c6686..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setBombCarry__11daE_OctBg_cFi.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80738914: -/* 80738914 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80738918 7C 08 02 A6 */ mflr r0 -/* 8073891C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80738920 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80738924 7C 7F 1B 78 */ mr r31, r3 -/* 80738928 38 60 00 00 */ li r3, 0 -/* 8073892C 2C 04 00 00 */ cmpwi r4, 0 -/* 80738930 40 82 00 54 */ bne lbl_80738984 -/* 80738934 80 1F 05 5C */ lwz r0, 0x55c(r31) -/* 80738938 60 00 00 10 */ ori r0, r0, 0x10 -/* 8073893C 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80738940 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80738944 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80738948 41 82 00 70 */ beq lbl_807389B8 -/* 8073894C 38 00 00 00 */ li r0, 0 -/* 80738950 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80738954 90 01 00 08 */ stw r0, 8(r1) -/* 80738958 38 60 02 21 */ li r3, 0x221 -/* 8073895C 38 80 00 0E */ li r4, 0xe -/* 80738960 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80738964 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80738968 7C 06 07 74 */ extsb r6, r0 -/* 8073896C 38 FF 04 DC */ addi r7, r31, 0x4dc -/* 80738970 39 00 00 00 */ li r8, 0 -/* 80738974 39 20 FF FF */ li r9, -1 -/* 80738978 39 40 00 00 */ li r10, 0 -/* 8073897C 4B 8E 14 89 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv -/* 80738980 48 00 00 38 */ b lbl_807389B8 -lbl_80738984: -/* 80738984 38 00 00 00 */ li r0, 0 -/* 80738988 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 8073898C 90 01 00 08 */ stw r0, 8(r1) -/* 80738990 38 60 02 21 */ li r3, 0x221 -/* 80738994 38 80 00 10 */ li r4, 0x10 -/* 80738998 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8073899C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 807389A0 7C 06 07 74 */ extsb r6, r0 -/* 807389A4 38 FF 04 DC */ addi r7, r31, 0x4dc -/* 807389A8 39 00 00 00 */ li r8, 0 -/* 807389AC 39 20 FF FF */ li r9, -1 -/* 807389B0 39 40 00 00 */ li r10, 0 -/* 807389B4 4B 8E 14 51 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv -lbl_807389B8: -/* 807389B8 28 03 00 00 */ cmplwi r3, 0 -/* 807389BC 41 82 00 14 */ beq lbl_807389D0 -/* 807389C0 7F E3 FB 78 */ mr r3, r31 -/* 807389C4 4B 8E 12 B9 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 807389C8 38 60 00 01 */ li r3, 1 -/* 807389CC 48 00 00 08 */ b lbl_807389D4 -lbl_807389D0: -/* 807389D0 38 60 00 00 */ li r3, 0 -lbl_807389D4: -/* 807389D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 807389D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 807389DC 7C 08 03 A6 */ mtlr r0 -/* 807389E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 807389E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setChasePos__11daE_OctBg_cFR4cXyzf.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setChasePos__11daE_OctBg_cFR4cXyzf.s deleted file mode 100644 index 62d1148d31e..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setChasePos__11daE_OctBg_cFR4cXyzf.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80737574: -/* 80737574 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80737578 7C 08 02 A6 */ mflr r0 -/* 8073757C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80737580 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80737584 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80737588 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8073758C 7C 9F 23 78 */ mr r31, r4 -/* 80737590 FF E0 08 90 */ fmr f31, f1 -/* 80737594 3C 60 80 74 */ lis r3, lit_4149@ha /* 0x80739DC4@ha */ -/* 80737598 C0 23 9D C4 */ lfs f1, lit_4149@l(r3) /* 0x80739DC4@l */ -/* 8073759C 4B B3 03 F1 */ bl cM_rndFX__Ff -/* 807375A0 FC 00 08 1E */ fctiwz f0, f1 -/* 807375A4 D8 01 00 08 */ stfd f0, 8(r1) -/* 807375A8 80 81 00 0C */ lwz r4, 0xc(r1) -/* 807375AC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807375B0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807375B4 4B 8D 4E 29 */ bl mDoMtx_YrotS__FPA4_fs -/* 807375B8 3C 60 80 74 */ lis r3, lit_4149@ha /* 0x80739DC4@ha */ -/* 807375BC C0 23 9D C4 */ lfs f1, lit_4149@l(r3) /* 0x80739DC4@l */ -/* 807375C0 4B B3 03 CD */ bl cM_rndFX__Ff -/* 807375C4 FC 00 08 1E */ fctiwz f0, f1 -/* 807375C8 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807375CC 80 81 00 14 */ lwz r4, 0x14(r1) -/* 807375D0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807375D4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807375D8 4B 8D 4D C5 */ bl mDoMtx_XrotM__FPA4_fs -/* 807375DC 3C 60 80 74 */ lis r3, lit_3985@ha /* 0x80739D90@ha */ -/* 807375E0 C0 23 9D 90 */ lfs f1, lit_3985@l(r3) /* 0x80739D90@l */ -/* 807375E4 FC 40 08 90 */ fmr f2, f1 -/* 807375E8 FC 60 F8 90 */ fmr f3, f31 -/* 807375EC 4B 8D 57 B1 */ bl transM__14mDoMtx_stack_cFfff -/* 807375F0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807375F4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807375F8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 807375FC D0 1F 00 00 */ stfs f0, 0(r31) -/* 80737600 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80737604 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80737608 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 8073760C D0 1F 00 08 */ stfs f0, 8(r31) -/* 80737610 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80737614 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80737618 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8073761C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80737620 7C 08 03 A6 */ mtlr r0 -/* 80737624 38 21 00 30 */ addi r1, r1, 0x30 -/* 80737628 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setSparkEffect__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setSparkEffect__11daE_OctBg_cFv.s deleted file mode 100644 index a8777b101aa..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setSparkEffect__11daE_OctBg_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80736310: -/* 80736310 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80736314 7C 08 02 A6 */ mflr r0 -/* 80736318 90 01 00 44 */ stw r0, 0x44(r1) -/* 8073631C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80736320 4B C2 BE A9 */ bl _savegpr_24 -/* 80736324 7C 7E 1B 78 */ mr r30, r3 -/* 80736328 80 63 05 B4 */ lwz r3, 0x5b4(r3) -/* 8073632C 80 63 00 04 */ lwz r3, 4(r3) -/* 80736330 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80736334 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80736338 38 63 00 30 */ addi r3, r3, 0x30 -/* 8073633C 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80736340 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80736344 4B C1 01 6D */ bl PSMTXCopy -/* 80736348 3B E0 00 00 */ li r31, 0 -/* 8073634C 3B A0 00 00 */ li r29, 0 -/* 80736350 3B 80 00 00 */ li r28, 0 -/* 80736354 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80736358 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8073635C 3C 60 80 74 */ lis r3, enemyBombID@ha /* 0x80739F00@ha */ -/* 80736360 3B 43 9F 00 */ addi r26, r3, enemyBombID@l /* 0x80739F00@l */ -/* 80736364 3C 60 80 74 */ lis r3, lit_3823@ha /* 0x80739D78@ha */ -/* 80736368 3B 63 9D 78 */ addi r27, r3, lit_3823@l /* 0x80739D78@l */ -lbl_8073636C: -/* 8073636C 80 79 5D 3C */ lwz r3, 0x5d3c(r25) -/* 80736370 38 00 00 FF */ li r0, 0xff -/* 80736374 90 01 00 08 */ stw r0, 8(r1) -/* 80736378 38 80 00 00 */ li r4, 0 -/* 8073637C 90 81 00 0C */ stw r4, 0xc(r1) -/* 80736380 38 00 FF FF */ li r0, -1 -/* 80736384 90 01 00 10 */ stw r0, 0x10(r1) -/* 80736388 90 81 00 14 */ stw r4, 0x14(r1) -/* 8073638C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80736390 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80736394 3B 1C 0B 98 */ addi r24, r28, 0xb98 -/* 80736398 7C 9E C0 2E */ lwzx r4, r30, r24 -/* 8073639C 38 A0 00 00 */ li r5, 0 -/* 807363A0 7C DA EA 2E */ lhzx r6, r26, r29 -/* 807363A4 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 807363A8 39 1E 01 0C */ addi r8, r30, 0x10c -/* 807363AC 39 20 00 00 */ li r9, 0 -/* 807363B0 39 40 00 00 */ li r10, 0 -/* 807363B4 C0 3B 00 00 */ lfs f1, 0(r27) -/* 807363B8 4B 91 71 15 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807363BC 7C 7E C1 2E */ stwx r3, r30, r24 -/* 807363C0 80 79 5D 3C */ lwz r3, 0x5d3c(r25) -/* 807363C4 38 63 02 10 */ addi r3, r3, 0x210 -/* 807363C8 7C 9E C0 2E */ lwzx r4, r30, r24 -/* 807363CC 4B 91 55 4D */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 807363D0 7C 65 1B 79 */ or. r5, r3, r3 -/* 807363D4 41 82 00 18 */ beq lbl_807363EC -/* 807363D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807363DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807363E0 38 85 00 68 */ addi r4, r5, 0x68 -/* 807363E4 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 807363E8 4B B4 A3 F9 */ bl func_802807E0 -lbl_807363EC: -/* 807363EC 3B FF 00 01 */ addi r31, r31, 1 -/* 807363F0 2C 1F 00 05 */ cmpwi r31, 5 -/* 807363F4 3B BD 00 02 */ addi r29, r29, 2 -/* 807363F8 3B 9C 00 04 */ addi r28, r28, 4 -/* 807363FC 41 80 FF 70 */ blt lbl_8073636C -/* 80736400 39 61 00 40 */ addi r11, r1, 0x40 -/* 80736404 4B C2 BE 11 */ bl _restgpr_24 -/* 80736408 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8073640C 7C 08 03 A6 */ mtlr r0 -/* 80736410 38 21 00 40 */ addi r1, r1, 0x40 -/* 80736414 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/swim__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/swim__11daE_OctBg_cFv.s deleted file mode 100644 index f073ca86628..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/swim__11daE_OctBg_cFv.s +++ /dev/null @@ -1,359 +0,0 @@ -lbl_80737028: -/* 80737028 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 8073702C 7C 08 02 A6 */ mflr r0 -/* 80737030 90 01 00 94 */ stw r0, 0x94(r1) -/* 80737034 DB E1 00 80 */ stfd f31, 0x80(r1) -/* 80737038 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 8073703C 39 61 00 80 */ addi r11, r1, 0x80 -/* 80737040 4B C2 B1 99 */ bl _savegpr_28 -/* 80737044 7C 7C 1B 78 */ mr r28, r3 -/* 80737048 3C 80 80 74 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80739E54@ha */ -/* 8073704C 3B A4 9E 54 */ addi r29, r4, cNullVec__6Z2Calc@l /* 0x80739E54@l */ -/* 80737050 3C 80 80 74 */ lis r4, lit_1109@ha /* 0x8073A100@ha */ -/* 80737054 3B C4 A1 00 */ addi r30, r4, lit_1109@l /* 0x8073A100@l */ -/* 80737058 3C 80 80 74 */ lis r4, lit_3768@ha /* 0x80739D60@ha */ -/* 8073705C 3B E4 9D 60 */ addi r31, r4, lit_3768@l /* 0x80739D60@l */ -/* 80737060 80 03 0B 70 */ lwz r0, 0xb70(r3) -/* 80737064 2C 00 00 00 */ cmpwi r0, 0 -/* 80737068 40 82 02 5C */ bne lbl_807372C4 -/* 8073706C 38 00 00 00 */ li r0, 0 -/* 80737070 B0 1C 0B 8C */ sth r0, 0xb8c(r28) -/* 80737074 38 00 0C 00 */ li r0, 0xc00 -/* 80737078 B0 1C 0B 82 */ sth r0, 0xb82(r28) -/* 8073707C C0 5C 04 D8 */ lfs f2, 0x4d8(r28) -/* 80737080 C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 80737084 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80737088 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 8073708C D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80737090 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80737094 C0 5C 04 B0 */ lfs f2, 0x4b0(r28) -/* 80737098 C0 1C 04 A8 */ lfs f0, 0x4a8(r28) -/* 8073709C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 807370A0 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 807370A4 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 807370A8 38 61 00 0C */ addi r3, r1, 0xc -/* 807370AC 38 81 00 18 */ addi r4, r1, 0x18 -/* 807370B0 4B C1 02 ED */ bl PSVECSquareDistance -/* 807370B4 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 807370B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807370BC 40 81 00 58 */ ble lbl_80737114 -/* 807370C0 FC 00 08 34 */ frsqrte f0, f1 -/* 807370C4 C8 9F 00 48 */ lfd f4, 0x48(r31) -/* 807370C8 FC 44 00 32 */ fmul f2, f4, f0 -/* 807370CC C8 7F 00 50 */ lfd f3, 0x50(r31) -/* 807370D0 FC 00 00 32 */ fmul f0, f0, f0 -/* 807370D4 FC 01 00 32 */ fmul f0, f1, f0 -/* 807370D8 FC 03 00 28 */ fsub f0, f3, f0 -/* 807370DC FC 02 00 32 */ fmul f0, f2, f0 -/* 807370E0 FC 44 00 32 */ fmul f2, f4, f0 -/* 807370E4 FC 00 00 32 */ fmul f0, f0, f0 -/* 807370E8 FC 01 00 32 */ fmul f0, f1, f0 -/* 807370EC FC 03 00 28 */ fsub f0, f3, f0 -/* 807370F0 FC 02 00 32 */ fmul f0, f2, f0 -/* 807370F4 FC 44 00 32 */ fmul f2, f4, f0 -/* 807370F8 FC 00 00 32 */ fmul f0, f0, f0 -/* 807370FC FC 01 00 32 */ fmul f0, f1, f0 -/* 80737100 FC 03 00 28 */ fsub f0, f3, f0 -/* 80737104 FC 02 00 32 */ fmul f0, f2, f0 -/* 80737108 FC 21 00 32 */ fmul f1, f1, f0 -/* 8073710C FC 20 08 18 */ frsp f1, f1 -/* 80737110 48 00 00 88 */ b lbl_80737198 -lbl_80737114: -/* 80737114 C8 1F 00 58 */ lfd f0, 0x58(r31) -/* 80737118 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8073711C 40 80 00 10 */ bge lbl_8073712C -/* 80737120 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80737124 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80737128 48 00 00 70 */ b lbl_80737198 -lbl_8073712C: -/* 8073712C D0 21 00 08 */ stfs f1, 8(r1) -/* 80737130 80 81 00 08 */ lwz r4, 8(r1) -/* 80737134 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80737138 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8073713C 7C 03 00 00 */ cmpw r3, r0 -/* 80737140 41 82 00 14 */ beq lbl_80737154 -/* 80737144 40 80 00 40 */ bge lbl_80737184 -/* 80737148 2C 03 00 00 */ cmpwi r3, 0 -/* 8073714C 41 82 00 20 */ beq lbl_8073716C -/* 80737150 48 00 00 34 */ b lbl_80737184 -lbl_80737154: -/* 80737154 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80737158 41 82 00 0C */ beq lbl_80737164 -/* 8073715C 38 00 00 01 */ li r0, 1 -/* 80737160 48 00 00 28 */ b lbl_80737188 -lbl_80737164: -/* 80737164 38 00 00 02 */ li r0, 2 -/* 80737168 48 00 00 20 */ b lbl_80737188 -lbl_8073716C: -/* 8073716C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80737170 41 82 00 0C */ beq lbl_8073717C -/* 80737174 38 00 00 05 */ li r0, 5 -/* 80737178 48 00 00 10 */ b lbl_80737188 -lbl_8073717C: -/* 8073717C 38 00 00 03 */ li r0, 3 -/* 80737180 48 00 00 08 */ b lbl_80737188 -lbl_80737184: -/* 80737184 38 00 00 04 */ li r0, 4 -lbl_80737188: -/* 80737188 2C 00 00 01 */ cmpwi r0, 1 -/* 8073718C 40 82 00 0C */ bne lbl_80737198 -/* 80737190 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80737194 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80737198: -/* 80737198 38 7E 00 4C */ addi r3, r30, 0x4c -/* 8073719C C0 43 00 08 */ lfs f2, 8(r3) -/* 807371A0 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 807371A4 EC 02 00 28 */ fsubs f0, f2, f0 -/* 807371A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807371AC 40 80 00 48 */ bge lbl_807371F4 -/* 807371B0 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 807371B4 4B B3 07 D9 */ bl cM_rndFX__Ff -/* 807371B8 A8 7C 04 DE */ lha r3, 0x4de(r28) -/* 807371BC 38 03 80 00 */ addi r0, r3, -32768 -/* 807371C0 C8 5F 00 28 */ lfd f2, 0x28(r31) -/* 807371C4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 807371C8 90 01 00 64 */ stw r0, 0x64(r1) -/* 807371CC 3C 00 43 30 */ lis r0, 0x4330 -/* 807371D0 90 01 00 60 */ stw r0, 0x60(r1) -/* 807371D4 C8 01 00 60 */ lfd f0, 0x60(r1) -/* 807371D8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 807371DC EC 00 08 2A */ fadds f0, f0, f1 -/* 807371E0 FC 00 00 1E */ fctiwz f0, f0 -/* 807371E4 D8 01 00 68 */ stfd f0, 0x68(r1) -/* 807371E8 80 01 00 6C */ lwz r0, 0x6c(r1) -/* 807371EC B0 1C 0B 96 */ sth r0, 0xb96(r28) -/* 807371F0 48 00 00 50 */ b lbl_80737240 -lbl_807371F4: -/* 807371F4 C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 807371F8 4B B3 07 95 */ bl cM_rndFX__Ff -/* 807371FC FF E0 08 90 */ fmr f31, f1 -/* 80737200 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 80737204 38 9C 04 A8 */ addi r4, r28, 0x4a8 -/* 80737208 4B B3 99 FD */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8073720C 7C 60 07 34 */ extsh r0, r3 -/* 80737210 C8 3F 00 28 */ lfd f1, 0x28(r31) -/* 80737214 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80737218 90 01 00 6C */ stw r0, 0x6c(r1) -/* 8073721C 3C 00 43 30 */ lis r0, 0x4330 -/* 80737220 90 01 00 68 */ stw r0, 0x68(r1) -/* 80737224 C8 01 00 68 */ lfd f0, 0x68(r1) -/* 80737228 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8073722C EC 00 F8 2A */ fadds f0, f0, f31 -/* 80737230 FC 00 00 1E */ fctiwz f0, f0 -/* 80737234 D8 01 00 60 */ stfd f0, 0x60(r1) -/* 80737238 80 01 00 64 */ lwz r0, 0x64(r1) -/* 8073723C B0 1C 0B 96 */ sth r0, 0xb96(r28) -lbl_80737240: -/* 80737240 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80737244 4B B3 07 49 */ bl cM_rndFX__Ff -/* 80737248 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8073724C EC 00 08 2A */ fadds f0, f0, f1 -/* 80737250 D0 1C 06 64 */ stfs f0, 0x664(r28) -/* 80737254 A8 1C 0B 96 */ lha r0, 0xb96(r28) -/* 80737258 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8073725C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737260 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737264 7C 03 04 2E */ lfsx f0, r3, r0 -/* 80737268 C0 3F 00 08 */ lfs f1, 8(r31) -/* 8073726C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80737270 D0 1C 06 60 */ stfs f0, 0x660(r28) -/* 80737274 A8 1C 0B 96 */ lha r0, 0xb96(r28) -/* 80737278 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8073727C 7C 63 02 14 */ add r3, r3, r0 -/* 80737280 C0 03 00 04 */ lfs f0, 4(r3) -/* 80737284 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80737288 D0 1C 06 68 */ stfs f0, 0x668(r28) -/* 8073728C C0 3F 00 80 */ lfs f1, 0x80(r31) -/* 80737290 4B B3 06 FD */ bl cM_rndFX__Ff -/* 80737294 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80737298 EC 00 08 2A */ fadds f0, f0, f1 -/* 8073729C FC 00 00 1E */ fctiwz f0, f0 -/* 807372A0 D8 01 00 68 */ stfd f0, 0x68(r1) -/* 807372A4 80 01 00 6C */ lwz r0, 0x6c(r1) -/* 807372A8 98 1C 0B AE */ stb r0, 0xbae(r28) -/* 807372AC 38 00 00 03 */ li r0, 3 -/* 807372B0 98 1C 05 46 */ stb r0, 0x546(r28) -/* 807372B4 80 7C 0B 70 */ lwz r3, 0xb70(r28) -/* 807372B8 38 03 00 01 */ addi r0, r3, 1 -/* 807372BC 90 1C 0B 70 */ stw r0, 0xb70(r28) -/* 807372C0 48 00 02 94 */ b lbl_80737554 -lbl_807372C4: -/* 807372C4 2C 00 FF FF */ cmpwi r0, -1 -/* 807372C8 40 82 00 10 */ bne lbl_807372D8 -/* 807372CC 38 00 00 04 */ li r0, 4 -/* 807372D0 98 1C 05 46 */ stb r0, 0x546(r28) -/* 807372D4 48 00 02 80 */ b lbl_80737554 -lbl_807372D8: -/* 807372D8 4B FF F8 DD */ bl checkNormalAttack__11daE_OctBg_cFv -/* 807372DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807372E0 41 82 00 2C */ beq lbl_8073730C -/* 807372E4 80 7D 00 D0 */ lwz r3, 0xd0(r29) -/* 807372E8 80 1D 00 D4 */ lwz r0, 0xd4(r29) -/* 807372EC 90 61 00 48 */ stw r3, 0x48(r1) -/* 807372F0 90 01 00 4C */ stw r0, 0x4c(r1) -/* 807372F4 80 1D 00 D8 */ lwz r0, 0xd8(r29) -/* 807372F8 90 01 00 50 */ stw r0, 0x50(r1) -/* 807372FC 7F 83 E3 78 */ mr r3, r28 -/* 80737300 38 81 00 48 */ addi r4, r1, 0x48 -/* 80737304 4B FF EF 69 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80737308 48 00 02 4C */ b lbl_80737554 -lbl_8073730C: -/* 8073730C C0 5C 06 64 */ lfs f2, 0x664(r28) -/* 80737310 C0 3C 04 AC */ lfs f1, 0x4ac(r28) -/* 80737314 38 7E 00 4C */ addi r3, r30, 0x4c -/* 80737318 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8073731C EC 21 00 2A */ fadds f1, f1, f0 -/* 80737320 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80737324 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80737328 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8073732C 40 81 00 18 */ ble lbl_80737344 -/* 80737330 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80737334 4B B3 06 21 */ bl cM_rndF__Ff -/* 80737338 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8073733C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80737340 D0 1C 06 64 */ stfs f0, 0x664(r28) -lbl_80737344: -/* 80737344 C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 80737348 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 8073734C C0 3C 04 D4 */ lfs f1, 0x4d4(r28) -/* 80737350 D0 21 00 58 */ stfs f1, 0x58(r1) -/* 80737354 C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 80737358 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 8073735C C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80737360 EC 01 00 2A */ fadds f0, f1, f0 -/* 80737364 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80737368 38 61 00 54 */ addi r3, r1, 0x54 -/* 8073736C 4B 8E 69 51 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80737370 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80737374 41 82 00 34 */ beq lbl_807373A8 -/* 80737378 C0 5C 06 64 */ lfs f2, 0x664(r28) -/* 8073737C C0 3F 00 84 */ lfs f1, 0x84(r31) -/* 80737380 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80737384 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80737388 EC 01 00 2A */ fadds f0, f1, f0 -/* 8073738C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80737390 40 80 00 18 */ bge lbl_807373A8 -/* 80737394 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80737398 4B B3 05 BD */ bl cM_rndF__Ff -/* 8073739C C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 807373A0 EC 00 08 2A */ fadds f0, f0, f1 -/* 807373A4 D0 1C 06 64 */ stfs f0, 0x664(r28) -lbl_807373A8: -/* 807373A8 38 7C 04 DE */ addi r3, r28, 0x4de -/* 807373AC A8 9C 0B 96 */ lha r4, 0xb96(r28) -/* 807373B0 38 A0 02 00 */ li r5, 0x200 -/* 807373B4 4B B3 97 DD */ bl cLib_chaseAngleS__FPsss -/* 807373B8 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 807373BC 38 9C 06 60 */ addi r4, r28, 0x660 -/* 807373C0 4B B3 98 B5 */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz -/* 807373C4 7C 03 00 D0 */ neg r0, r3 -/* 807373C8 7C 04 07 34 */ extsh r4, r0 -/* 807373CC 38 7C 04 DC */ addi r3, r28, 0x4dc -/* 807373D0 38 A0 02 00 */ li r5, 0x200 -/* 807373D4 4B B3 97 BD */ bl cLib_chaseAngleS__FPsss -/* 807373D8 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 807373DC 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 807373E0 A8 1C 04 DC */ lha r0, 0x4dc(r28) -/* 807373E4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 807373E8 7C 63 02 14 */ add r3, r3, r0 -/* 807373EC C0 23 00 04 */ lfs f1, 4(r3) -/* 807373F0 38 7C 05 2C */ addi r3, r28, 0x52c -/* 807373F4 C0 1F 00 88 */ lfs f0, 0x88(r31) -/* 807373F8 EC 20 00 72 */ fmuls f1, f0, f1 -/* 807373FC C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 80737400 4B B3 93 41 */ bl cLib_chaseF__FPfff -/* 80737404 A8 1C 04 DC */ lha r0, 0x4dc(r28) -/* 80737408 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8073740C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80737410 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80737414 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80737418 38 7C 04 FC */ addi r3, r28, 0x4fc -/* 8073741C C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80737420 EC 20 00 72 */ fmuls f1, f0, f1 -/* 80737424 C0 5F 00 74 */ lfs f2, 0x74(r31) -/* 80737428 4B B3 93 19 */ bl cLib_chaseF__FPfff -/* 8073742C A8 7C 04 DE */ lha r3, 0x4de(r28) -/* 80737430 A8 1C 0B 96 */ lha r0, 0xb96(r28) -/* 80737434 7C 03 00 50 */ subf r0, r3, r0 -/* 80737438 B0 1C 0B 8C */ sth r0, 0xb8c(r28) -/* 8073743C 38 7C 0B 80 */ addi r3, r28, 0xb80 -/* 80737440 38 80 10 00 */ li r4, 0x1000 -/* 80737444 38 A0 00 20 */ li r5, 0x20 -/* 80737448 38 C0 04 00 */ li r6, 0x400 -/* 8073744C 38 E0 00 80 */ li r7, 0x80 -/* 80737450 4B B3 90 F1 */ bl cLib_addCalcAngleS__FPsssss -/* 80737454 A8 7C 0B 7C */ lha r3, 0xb7c(r28) -/* 80737458 A8 1C 0B 80 */ lha r0, 0xb80(r28) -/* 8073745C 7C 03 02 14 */ add r0, r3, r0 -/* 80737460 B0 1C 0B 7C */ sth r0, 0xb7c(r28) -/* 80737464 88 1E 00 73 */ lbz r0, 0x73(r30) -/* 80737468 28 00 00 00 */ cmplwi r0, 0 -/* 8073746C 41 82 00 70 */ beq lbl_807374DC -/* 80737470 88 7E 00 71 */ lbz r3, 0x71(r30) -/* 80737474 88 1E 00 70 */ lbz r0, 0x70(r30) -/* 80737478 7C 00 0E 70 */ srawi r0, r0, 1 -/* 8073747C 7C 03 00 00 */ cmpw r3, r0 -/* 80737480 40 80 00 5C */ bge lbl_807374DC -/* 80737484 38 00 00 01 */ li r0, 1 -/* 80737488 98 1C 0B AC */ stb r0, 0xbac(r28) -/* 8073748C 88 7E 00 71 */ lbz r3, 0x71(r30) -/* 80737490 38 03 00 01 */ addi r0, r3, 1 -/* 80737494 98 1E 00 71 */ stb r0, 0x71(r30) -/* 80737498 80 7D 00 DC */ lwz r3, 0xdc(r29) -/* 8073749C 80 1D 00 E0 */ lwz r0, 0xe0(r29) -/* 807374A0 90 61 00 3C */ stw r3, 0x3c(r1) -/* 807374A4 90 01 00 40 */ stw r0, 0x40(r1) -/* 807374A8 80 1D 00 E4 */ lwz r0, 0xe4(r29) -/* 807374AC 90 01 00 44 */ stw r0, 0x44(r1) -/* 807374B0 7F 83 E3 78 */ mr r3, r28 -/* 807374B4 38 81 00 3C */ addi r4, r1, 0x3c -/* 807374B8 4B FF ED B5 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 807374BC 88 7E 00 71 */ lbz r3, 0x71(r30) -/* 807374C0 88 1E 00 70 */ lbz r0, 0x70(r30) -/* 807374C4 7C 00 0E 70 */ srawi r0, r0, 1 -/* 807374C8 7C 03 00 00 */ cmpw r3, r0 -/* 807374CC 41 80 00 88 */ blt lbl_80737554 -/* 807374D0 38 00 00 00 */ li r0, 0 -/* 807374D4 98 1E 00 73 */ stb r0, 0x73(r30) -/* 807374D8 48 00 00 7C */ b lbl_80737554 -lbl_807374DC: -/* 807374DC 88 1C 0B AC */ lbz r0, 0xbac(r28) -/* 807374E0 28 00 00 00 */ cmplwi r0, 0 -/* 807374E4 41 82 00 40 */ beq lbl_80737524 -/* 807374E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807374EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807374F0 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 807374F4 28 00 00 00 */ cmplwi r0, 0 -/* 807374F8 40 82 00 2C */ bne lbl_80737524 -/* 807374FC 80 7D 00 E8 */ lwz r3, 0xe8(r29) -/* 80737500 80 1D 00 EC */ lwz r0, 0xec(r29) -/* 80737504 90 61 00 30 */ stw r3, 0x30(r1) -/* 80737508 90 01 00 34 */ stw r0, 0x34(r1) -/* 8073750C 80 1D 00 F0 */ lwz r0, 0xf0(r29) -/* 80737510 90 01 00 38 */ stw r0, 0x38(r1) -/* 80737514 7F 83 E3 78 */ mr r3, r28 -/* 80737518 38 81 00 30 */ addi r4, r1, 0x30 -/* 8073751C 4B FF ED 51 */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -/* 80737520 48 00 00 34 */ b lbl_80737554 -lbl_80737524: -/* 80737524 88 1C 0B AE */ lbz r0, 0xbae(r28) -/* 80737528 28 00 00 00 */ cmplwi r0, 0 -/* 8073752C 40 82 00 28 */ bne lbl_80737554 -/* 80737530 80 7D 00 F4 */ lwz r3, 0xf4(r29) -/* 80737534 80 1D 00 F8 */ lwz r0, 0xf8(r29) -/* 80737538 90 61 00 24 */ stw r3, 0x24(r1) -/* 8073753C 90 01 00 28 */ stw r0, 0x28(r1) -/* 80737540 80 1D 00 FC */ lwz r0, 0xfc(r29) -/* 80737544 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80737548 7F 83 E3 78 */ mr r3, r28 -/* 8073754C 38 81 00 24 */ addi r4, r1, 0x24 -/* 80737550 4B FF ED 1D */ bl setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v -lbl_80737554: -/* 80737554 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 80737558 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 8073755C 39 61 00 80 */ addi r11, r1, 0x80 -/* 80737560 4B C2 AC C5 */ bl _restgpr_28 -/* 80737564 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80737568 7C 08 03 A6 */ mtlr r0 -/* 8073756C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80737570 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index ae9e78b524f..00000000000 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_807390C4: -/* 807390C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807390C8 7C 08 02 A6 */ mflr r0 -/* 807390CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 807390D0 48 00 01 4D */ bl CreateHeap__11daE_OctBg_cFv -/* 807390D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807390D8 7C 08 03 A6 */ mtlr r0 -/* 807390DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 807390E0 4E 80 00 20 */ blr diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index f12422adf98..5de6f4cf7c3 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -64,6 +64,18 @@ public: static fopAc_ac_c* createFlowerBomb(cXyz* i_pos, csXyz* i_angle, int param_2) { return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 4, i_pos, param_2, i_angle, NULL, -1, NULL, NULL); } + + static fopAc_ac_c* createWaterBombExplode(cXyz* i_pos) { + return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 18, i_pos, -1, NULL, NULL, -1, NULL, NULL); + } + + static fopAc_ac_c* createEnemyWaterBomb(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { + return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 14, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); + } + + static fopAc_ac_c* createEnemyWaterBombHookshot(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { + return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 16, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); + } }; #endif /* D_D_BOMB_H */ diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index feef23fae3f..74a8981cd48 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -398,6 +398,10 @@ inline u16 fopAcM_GetSetId(const fopAc_ac_c* p_actor) { return p_actor->setID; } +inline u32 fopAcM_GetLinkId(const fopAc_ac_c* p_actor) { + return p_actor->parentActorID; +} + inline void dComIfGs_onActor(int bitNo, int roomNo); inline void fopAcM_onActor(const fopAc_ac_c* p_actor) { diff --git a/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h b/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h index 0dd3cb9c125..15c49669109 100644 --- a/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h +++ b/include/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h @@ -2,5 +2,103 @@ #define D_A_E_OCT_BG_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "Z2AudioLib/Z2Creature.h" +#include "d/cc/d_cc_d.h" +#include "d/cc/d_cc_uty.h" +#include "SSystem/SComponent/c_phase.h" + +struct daE_OctBg_c : public fopEn_enemy_c { + typedef void (daE_OctBg_c::*actionFunc)(); + + /* 8073626C */ void setAction(actionFunc); + /* 80736310 */ void setSparkEffect(); + /* 80736418 */ bool checkExplode(); + /* 8073651C */ void action(); + /* 80736840 */ int _delete(); + /* 807368C8 */ void cc_set(); + /* 80736A78 */ void mtx_set(); + /* 80736BB4 */ bool checkNormalAttack(); + /* 80736DAC */ bool checkChase(); + /* 80736E30 */ void born_swim(); + /* 80737028 */ void swim(); + /* 80737574 */ void setChasePos(cXyz&, f32); + /* 8073762C */ bool checkCoreFishAttack(); + /* 80737678 */ void chase_core(); + /* 80737C48 */ void normal_attack(); + /* 8073814C */ void core_fish_attack(); + /* 80738714 */ void back_swim(); + /* 80738914 */ bool setBombCarry(int); + /* 807389E8 */ void hook(); + /* 80738A4C */ void damage(); + /* 80738C2C */ void bomb_wait(); + /* 80738E30 */ void damage_check(); + /* 8073905C */ int execute(); + /* 807390E4 */ int ctrlJoint(J3DJoint*, J3DModel*); + /* 807391D0 */ static int JointCallBack(J3DJoint*, int); + /* 8073921C */ int CreateHeap(); + /* 80739424 */ int create(); + /* 807399A4 */ int draw(); + + u8 getChaseFlag() { return field_0xbac; } + u32 checkAction(actionFunc func) { return field_0xb58 == func; } + bool checkNormalAttk() { return checkAction(&daE_OctBg_c::normal_attack); } + + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ mDoExt_McaMorfSO* field_0x5b4; + /* 0x5B8 */ mDoExt_brkAnm* field_0x5b8; + /* 0x5BC */ Z2CreatureEnemy field_0x5bc; + /* 0x660 */ cXyz field_0x660; + /* 0x66C */ dBgS_AcchCir field_0x66c; + /* 0x6AC */ dBgS_ObjAcch field_0x6ac; + /* 0x884 */ dCcD_Stts field_0x884; + /* 0x8C0 */ dCcD_Sph field_0x8c0; + /* 0x9F8 */ dCcD_Sph field_0x9f8; + /* 0xB30 */ dCcU_AtInfo field_0xb30; + /* 0xB54 */ u8 field_0xb54[0xb58 - 0xb54]; + /* 0xB58 */ actionFunc field_0xb58; + /* 0xB64 */ actionFunc field_0xb64; + /* 0xB70 */ int field_0xb70; + /* 0xB74 */ bool field_0xb74; + /* 0xB75 */ u8 field_0xb75; + /* 0xB76 */ u8 field_0xb76; + /* 0xB77 */ u8 field_0xb77; + /* 0xB78 */ int field_0xb78; + /* 0xB7C */ s16 field_0xb7c; + /* 0xB7E */ s16 field_0xb7e; + /* 0xB80 */ s16 field_0xb80; + /* 0xB82 */ s16 field_0xb82; + /* 0xB84 */ s16 field_0xb84[4]; + /* 0xB8C */ s16 field_0xb8c; + /* 0xB8E */ u8 field_0xb8e[0xb90 - 0xb8e]; + /* 0xB90 */ int field_0xb90; + /* 0xB94 */ s16 field_0xb94; + /* 0xB96 */ s16 field_0xb96; + /* 0xB98 */ u32 field_0xb98[5]; + /* 0xBAC */ u8 field_0xbac; + /* 0xBAD */ u8 field_0xbad; + /* 0xBAE */ u8 field_0xbae; + /* 0xBAF */ u8 field_0xbaf; + /* 0xBB0 */ u16 field_0xbb0; + /* 0xBB2 */ u8 field_0xbb2; + /* 0xBB3 */ u8 field_0xbb3; + +}; + +struct daE_OctBg_HIO_c { + /* 8073620C */ daE_OctBg_HIO_c(); + /* 80739CB8 */ virtual ~daE_OctBg_HIO_c() {} + + /* 0x04 */ s8 field_0x04; + /* 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 */ u8 field_0x20; + /* 0x21 */ u8 field_0x21; +}; #endif /* D_A_E_OCT_BG_H */ diff --git a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp index bcff7f53f4d..7b68f3ac15d 100644 --- a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp @@ -1,474 +1,18 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_e_oct_bg +// d_a_e_oct_bg // +#include "dolphin/types.h" -#include "rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature {}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266AE4 */ void operator+(Vec const&) const; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct daE_OctBg_c { - /* 8073626C */ void setAction(void (daE_OctBg_c::*)()); - /* 80736310 */ void setSparkEffect(); - /* 80736418 */ void checkExplode(); - /* 8073651C */ void action(); - /* 80736840 */ void _delete(); - /* 807368C8 */ void cc_set(); - /* 80736A78 */ void mtx_set(); - /* 80736BB4 */ void checkNormalAttack(); - /* 80736DAC */ void checkChase(); - /* 80736E30 */ void born_swim(); - /* 80737028 */ void swim(); - /* 80737574 */ void setChasePos(cXyz&, f32); - /* 8073762C */ void checkCoreFishAttack(); - /* 80737678 */ void chase_core(); - /* 80737C48 */ void normal_attack(); - /* 8073814C */ void core_fish_attack(); - /* 80738714 */ void back_swim(); - /* 80738914 */ void setBombCarry(int); - /* 807389E8 */ void hook(); - /* 80738A4C */ void damage(); - /* 80738C2C */ void bomb_wait(); - /* 80738E30 */ void damage_check(); - /* 8073905C */ void execute(); - /* 807390E4 */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 807391D0 */ void JointCallBack(J3DJoint*, int); - /* 8073921C */ void CreateHeap(); - /* 80739424 */ void create(); - /* 807399A4 */ void draw(); -}; - -struct daE_OctBg_HIO_c { - /* 8073620C */ daE_OctBg_HIO_c(); - /* 80739CB8 */ ~daE_OctBg_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcU_AtInfo {}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80739848 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 807398A4 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80739914 */ ~dBgS_AcchCir(); -}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 807397B8 */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80739800 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80739C70 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct _GXTexObj {}; - -struct Z2CreatureEnemy { - /* 802C0F64 */ Z2CreatureEnemy(); - /* 802C1094 */ void init(Vec*, Vec*, u8, u8); - /* 802C1B7C */ void setLinkSearch(bool); - /* 802C1B90 */ void setEnemyName(char const*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 807393DC */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void __ct__15daE_OctBg_HIO_cFv(); -extern "C" void setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v(); -extern "C" void setSparkEffect__11daE_OctBg_cFv(); -extern "C" void checkExplode__11daE_OctBg_cFv(); -extern "C" void action__11daE_OctBg_cFv(); -extern "C" void _delete__11daE_OctBg_cFv(); -extern "C" static void daE_OctBg_Delete__FP11daE_OctBg_c(); -extern "C" void cc_set__11daE_OctBg_cFv(); -extern "C" void mtx_set__11daE_OctBg_cFv(); -extern "C" void checkNormalAttack__11daE_OctBg_cFv(); -extern "C" void checkChase__11daE_OctBg_cFv(); -extern "C" void born_swim__11daE_OctBg_cFv(); -extern "C" void swim__11daE_OctBg_cFv(); -extern "C" void setChasePos__11daE_OctBg_cFR4cXyzf(); -extern "C" void checkCoreFishAttack__11daE_OctBg_cFv(); -extern "C" void chase_core__11daE_OctBg_cFv(); -extern "C" void normal_attack__11daE_OctBg_cFv(); -extern "C" void core_fish_attack__11daE_OctBg_cFv(); -extern "C" void back_swim__11daE_OctBg_cFv(); -extern "C" void setBombCarry__11daE_OctBg_cFi(); -extern "C" void hook__11daE_OctBg_cFv(); -extern "C" void damage__11daE_OctBg_cFv(); -extern "C" void bomb_wait__11daE_OctBg_cFv(); -extern "C" void damage_check__11daE_OctBg_cFv(); -extern "C" void execute__11daE_OctBg_cFv(); -extern "C" static void daE_OctBg_Execute__FP11daE_OctBg_c(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel(); -extern "C" void JointCallBack__11daE_OctBg_cFP8J3DJointi(); -extern "C" void CreateHeap__11daE_OctBg_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void create__11daE_OctBg_cFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" static void daE_OctBg_Create__FP11daE_OctBg_c(); -extern "C" void draw__11daE_OctBg_cFv(); -extern "C" static void daE_OctBg_Draw__FP11daE_OctBg_c(); -extern "C" static void daE_OctBg_IsDelete__FP11daE_OctBg_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__15daE_OctBg_HIO_cFv(); -extern "C" void __sinit_d_a_e_oct_bg_cpp(); -extern "C" static void func_80739D3C(); -extern "C" static void func_80739D44(); -extern "C" extern char const* const d_a_e_oct_bg__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void entryDL__16mDoExt_McaMorfSOFv(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void cDmrNowMidnaTalk__Fv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -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 -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __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 ChkAtHit__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo(); -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 __pl__4cXyzCFRC3Vec(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalcAngleS__FPsssss(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void cLib_chaseAngleS__FPsss(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz(); -extern "C" void func_802807E0(); -extern "C" void __ct__15Z2CreatureEnemyFv(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); -extern "C" void setLinkSearch__15Z2CreatureEnemyFb(); -extern "C" void setEnemyName__15Z2CreatureEnemyFPCc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); -extern "C" void __ptmf_test(); -extern "C" void __ptmf_cmpr(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void abs(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -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" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 mCurrentMtx__6J3DSys[48]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 pauseTimer__9dScnPly_c[4]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80739D60-80739D64 000000 0004+00 15/15 0/0 0/0 .rodata @3768 */ -SECTION_RODATA static f32 const lit_3768 = 1200.0f; -COMPILER_STRIP_GATE(0x80739D60, &lit_3768); - -/* 80739D64-80739D68 000004 0004+00 0/1 0/0 0/0 .rodata @3769 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3769 = 1400.0f; -COMPILER_STRIP_GATE(0x80739D64, &lit_3769); -#pragma pop - -/* 80739D68-80739D6C 000008 0004+00 0/2 0/0 0/0 .rodata @3770 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3770 = 500.0f; -COMPILER_STRIP_GATE(0x80739D68, &lit_3770); -#pragma pop - -/* 80739D6C-80739D70 00000C 0004+00 0/5 0/0 0/0 .rodata @3771 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3771 = 100.0f; -COMPILER_STRIP_GATE(0x80739D6C, &lit_3771); -#pragma pop - -/* 80739D70-80739D74 000010 0004+00 0/2 0/0 0/0 .rodata @3772 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3772 = 1.5f; -COMPILER_STRIP_GATE(0x80739D70, &lit_3772); -#pragma pop - -/* 80739D74-80739D78 000014 0004+00 0/2 0/0 0/0 .rodata @3773 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3773 = 2000.0f; -COMPILER_STRIP_GATE(0x80739D74, &lit_3773); -#pragma pop - +// Needs to be declared before checkNormalAttk /* 80739E54-80739E60 000000 000C+00 4/4 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, }; /* 80739E60-80739E74 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, @@ -478,437 +22,161 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80739E74-80739E80 -00001 000C+00 1/1 0/0 0/0 .data @3618 */ -SECTION_DATA static void* lit_3618[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)normal_attack__11daE_OctBg_cFv, -}; +#include "rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.h" +#include "f_op/f_op_actor_mng.h" +#include "c/c_damagereaction.h" +#include "d/particle/d_particle.h" +#include "d/cc/d_cc_uty.h" +#include "d/d_drawlist.h" +#include "d/d_resorce.h" +#include "d/d_bomb.h" +#include "d/a/d_a_player.h" +#include "d/s/d_s_play.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" /* 80739E80-80739EC0 00002C 0040+00 0/1 0/0 0/0 .data cc_obg_src__26@unnamed@d_a_e_oct_bg_cpp@ */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 data_80739E80[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x75, 0x09, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, +static dCcD_SrcSph cc_obg_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr }; -#pragma pop /* 80739EC0-80739F00 00006C 0040+00 0/1 0/0 0/0 .data cc_obg_at_src__26@unnamed@d_a_e_oct_bg_cpp@ */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 data_80739EC0[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, +static dCcD_SrcSph cc_obg_at_src = { + { + {0x0, {{0x400, 0x1, 0xD}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr }; -#pragma pop /* 80739F00-80739F0C 0000AC 000A+02 1/1 0/0 0/0 .data enemyBombID$3784 */ -SECTION_DATA static u8 enemyBombID[10 + 2 /* padding */] = { - 0x0A, - 0x0D, - 0x0A, - 0x0E, - 0x0A, - 0x0F, - 0x0A, - 0x10, - 0x0A, - 0x11, - /* padding */ - 0x00, - 0x00, -}; - -/* 80739F0C-80739F18 -00001 000C+00 1/1 0/0 0/0 .data @4133 */ -SECTION_DATA static void* lit_4133[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)chase_core__11daE_OctBg_cFv, -}; - -/* 80739F18-80739F24 -00001 000C+00 1/1 0/0 0/0 .data @4136 */ -SECTION_DATA static void* lit_4136[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)swim__11daE_OctBg_cFv, -}; - -/* 80739F24-80739F30 -00001 000C+00 0/1 0/0 0/0 .data @4171 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4171[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)normal_attack__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739F30-80739F3C -00001 000C+00 0/1 0/0 0/0 .data @4183 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4183[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)chase_core__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739F3C-80739F48 -00001 000C+00 0/1 0/0 0/0 .data @4190 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4190[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)chase_core__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739F48-80739F54 -00001 000C+00 0/1 0/0 0/0 .data @4194 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4194[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)swim__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739F54-80739F60 -00001 000C+00 0/1 0/0 0/0 .data @4335 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4335[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)swim__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739F60-80739F6C -00001 000C+00 0/1 0/0 0/0 .data @4349 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4349[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)core_fish_attack__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739F6C-80739F78 -00001 000C+00 0/1 0/0 0/0 .data @4353 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4353[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)swim__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739F78-80739F84 -00001 000C+00 1/1 0/0 0/0 .data @4476 */ -SECTION_DATA static void* lit_4476[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)swim__11daE_OctBg_cFv, -}; - -/* 80739F84-80739F90 -00001 000C+00 1/1 0/0 0/0 .data @4481 */ -SECTION_DATA static void* lit_4481[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)swim__11daE_OctBg_cFv, -}; - -/* 80739F90-80739F9C -00001 000C+00 1/1 0/0 0/0 .data @4580 */ -SECTION_DATA static void* lit_4580[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)chase_core__11daE_OctBg_cFv, -}; - -/* 80739F9C-80739FA8 -00001 000C+00 1/1 0/0 0/0 .data @4700 */ -SECTION_DATA static void* lit_4700[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)chase_core__11daE_OctBg_cFv, -}; - -/* 80739FA8-80739FB4 -00001 000C+00 1/1 0/0 0/0 .data @4703 */ -SECTION_DATA static void* lit_4703[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)swim__11daE_OctBg_cFv, -}; - -/* 80739FB4-80739FC0 -00001 000C+00 1/1 0/0 0/0 .data @4792 */ -SECTION_DATA static void* lit_4792[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)bomb_wait__11daE_OctBg_cFv, -}; - -/* 80739FC0-80739FCC -00001 000C+00 0/1 0/0 0/0 .data @4852 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4852[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)core_fish_attack__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739FCC-80739FD8 -00001 000C+00 0/1 0/0 0/0 .data @4854 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4854[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)normal_attack__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739FD8-80739FE4 -00001 000C+00 0/1 0/0 0/0 .data @4865 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4865[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)damage__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739FE4-80739FF0 -00001 000C+00 0/1 0/0 0/0 .data @4867 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4867[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)back_swim__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739FF0-80739FFC -00001 000C+00 0/1 0/0 0/0 .data @4878 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4878[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)hook__11daE_OctBg_cFv, -}; -#pragma pop - -/* 80739FFC-8073A008 -00001 000C+00 0/1 0/0 0/0 .data @4881 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4881[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)damage__11daE_OctBg_cFv, -}; -#pragma pop - -/* 8073A008-8073A014 -00001 000C+00 0/1 0/0 0/0 .data @5042 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_5042[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)born_swim__11daE_OctBg_cFv, -}; -#pragma pop - -/* 8073A014-8073A020 -00001 000C+00 1/1 0/0 0/0 .data @5232 */ -SECTION_DATA static void* lit_5232[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)damage__11daE_OctBg_cFv, -}; - -/* 8073A020-8073A02C -00001 000C+00 1/1 0/0 0/0 .data @5234 */ -SECTION_DATA static void* lit_5234[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)bomb_wait__11daE_OctBg_cFv, -}; - -/* 8073A02C-8073A04C -00001 0020+00 1/0 0/0 0/0 .data l_daE_OctBg_Method */ -SECTION_DATA static void* l_daE_OctBg_Method[8] = { - (void*)daE_OctBg_Create__FP11daE_OctBg_c, - (void*)daE_OctBg_Delete__FP11daE_OctBg_c, - (void*)daE_OctBg_Execute__FP11daE_OctBg_c, - (void*)daE_OctBg_IsDelete__FP11daE_OctBg_c, - (void*)daE_OctBg_Draw__FP11daE_OctBg_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8073A04C-8073A07C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_OctBg */ -SECTION_DATA extern void* g_profile_E_OctBg[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02020000, (void*)&g_fpcLf_Method, - (void*)0x00000BB4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00CD0000, (void*)&l_daE_OctBg_Method, - (void*)0x000C4100, (void*)0x020E0000, -}; - -/* 8073A07C-8073A088 000228 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 8073A088-8073A094 000234 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, -}; - -/* 8073A094-8073A0A0 000240 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, -}; - -/* 8073A0A0-8073A0AC 00024C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 8073A0AC-8073A0B8 000258 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 8073A0B8-8073A0DC 000264 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80739D44, - (void*)NULL, - (void*)NULL, - (void*)func_80739D3C, -}; - -/* 8073A0DC-8073A0E8 000288 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 8073A0E8-8073A0F4 000294 000C+00 2/2 0/0 0/0 .data __vt__15daE_OctBg_HIO_c */ -SECTION_DATA extern void* __vt__15daE_OctBg_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daE_OctBg_HIO_cFv, +static u16 enemyBombID[5] = { + 0x0A0D, + 0x0A0E, + 0x0A0F, + 0x0A10, + 0x0A11, }; /* 8073620C-8073626C 0000EC 0060+00 1/1 0/0 0/0 .text __ct__15daE_OctBg_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daE_OctBg_HIO_c::daE_OctBg_HIO_c() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__ct__15daE_OctBg_HIO_cFv.s" +daE_OctBg_HIO_c::daE_OctBg_HIO_c() { + field_0x04 = -1; + field_0x08 = 1200.0f; + field_0x0c = 1400.0f; + field_0x10 = 500.0f; + field_0x14 = 100.0f; + field_0x18 = 1.5f; + field_0x1c = 2000.0f; + field_0x21 = 0; + field_0x20 = 1; } -#pragma pop /* 8073626C-80736310 00014C 00A4+00 9/9 0/0 0/0 .text * setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::setAction(void (daE_OctBg_c::*param_0)()) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v.s" +void daE_OctBg_c::setAction(actionFunc param_0) { + if (field_0xb58 != NULL) { + field_0xb70 = -1; + (this->*field_0xb58)(); + } + field_0xb64 = field_0xb58; + field_0xb58 = param_0; + field_0xb70 = 0; + (this->*field_0xb58)(); } -#pragma pop - -/* ############################################################################################## */ -/* 80739D78-80739D7C 000018 0004+00 2/6 0/0 0/0 .rodata @3823 */ -SECTION_RODATA static f32 const lit_3823 = 1.0f; -COMPILER_STRIP_GATE(0x80739D78, &lit_3823); /* 80736310-80736418 0001F0 0108+00 1/1 0/0 0/0 .text setSparkEffect__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::setSparkEffect() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setSparkEffect__11daE_OctBg_cFv.s" +void daE_OctBg_c::setSparkEffect() { + mDoMtx_stack_c::copy(field_0x5b4->getModel()->getAnmMtx(1)); + for (int i = 0; i < 5; i++) { + field_0xb98[i] = dComIfGp_particle_set(field_0xb98[i], enemyBombID[i], ¤t.pos, &tevStr); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0xb98[i]); + if (emitter != NULL) { + emitter->setGlobalRTMatrix(mDoMtx_stack_c::get()); + } + } } -#pragma pop /* 80736418-8073651C 0002F8 0104+00 1/1 0/0 0/0 .text checkExplode__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::checkExplode() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkExplode__11daE_OctBg_cFv.s" +bool daE_OctBg_c::checkExplode() { + if (field_0xb90 != 0) { + setSparkEffect(); + field_0xb90--; + if (field_0xb90 == 0) { + dBomb_c::createWaterBombExplode(¤t.pos); + fopAcM_delete(this); + return true; + } + if (field_0xb90 < 30) { + field_0xb94 += 0x1000; + } else if (field_0xb90 < 45) { + field_0xb94 += 0x800; + } else { + field_0xb94 += 0x300; + } + field_0x5bc.startCreatureSoundLevel(Z2SE_OBJ_BOMB_IGNITION, 0, dComIfGp_getReverb( fopAcM_GetRoomNo(this))); + } + return false; } -#pragma pop - -/* ############################################################################################## */ -/* 80739D7C-80739D80 00001C 0004+00 0/2 0/0 0/0 .rodata @3915 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3915 = 4096.0f; -COMPILER_STRIP_GATE(0x80739D7C, &lit_3915); -#pragma pop - -/* 80739D80-80739D88 000020 0004+04 0/4 0/0 0/0 .rodata @3916 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3916[1 + 1 /* padding */] = { - 3.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80739D80, &lit_3916); -#pragma pop - -/* 80739D88-80739D90 000028 0008+00 0/3 0/0 0/0 .rodata @3918 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3918[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80739D88, &lit_3918); -#pragma pop /* 8073651C-80736840 0003FC 0324+00 1/1 0/0 0/0 .text action__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::action() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/action__11daE_OctBg_cFv.s" +void daE_OctBg_c::action() { + if (field_0xbae != 0) { + field_0xbae--; + } + if (field_0xbb0 != 0) { + field_0xbb0--; + } + if (field_0xbaf != 0) { + field_0xbaf--; + } + if (field_0xbad != 0) { + field_0xbad--; + } + if (!checkExplode()) { + damage_check(); + (this->*field_0xb58)(); + shape_angle = current.angle; + fopAcM_posMoveF(this, field_0x884.GetCCMoveP()); + field_0x6ac.CrrPos(dComIfG_Bgsp()); + field_0x5bc.setLinkSearch(field_0xb74); + if (field_0xb8c > 0x2000) { + field_0xb8c = 0x2000; + } else if (field_0xb8c < -0x2000) { + field_0xb8c = -0x2000; + } + cLib_addCalcAngleS(&field_0xb84[3], field_0xb8c, 0x10, 0x100, 0x10); + f32 dVar9 = field_0xb80 / 4096.0f; + if (dVar9 > 1.0f) { + dVar9 = 1.0f; + } + if (field_0xb7c < 0 && field_0xb7e >= 0) { + field_0x5bc.startCreatureSound(Z2SE_EN_BG_SWIM, 0, -1); + } + if (field_0xb75 != 0 && field_0xb7c > 0 && field_0xb7e <= 0) { + field_0x5bc.startCreatureSound(Z2SE_EN_BG_SWIM, 0, -1); + } + field_0xb7e = field_0xb7c; + field_0xb84[0] = (field_0xb82 * dVar9) * cM_ssin(field_0xb7c); + field_0xb84[1] = 1.5f * ((field_0xb82 * dVar9) * cM_ssin(field_0xb7c + 0x4000)); + field_0xb84[2] = 3.0f * ((field_0xb82 * dVar9) * cM_ssin(field_0xb7c + 0x8000)); + field_0x5b4->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mtx_set(); + cc_set(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80739E44-80739E44 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80739E44 = "E_bg"; -#pragma pop /* 8073A100-8073A104 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ static u8 lit_1109[1 + 3 /* padding */]; @@ -1000,753 +268,771 @@ static u8 lit_1010[1 + 3 /* padding */]; /* 8073A13C-8073A140 -00001 0004+00 1/2 0/0 0/0 .bss None */ /* 8073A13C 0001+00 data_8073A13C @1009 */ /* 8073A13D 0003+00 data_8073A13D None */ -static u8 struct_8073A13C[4]; +static u8 struct_8073A13C; +static u8 struct_8073A13D; /* 80736840-807368A8 000720 0068+00 1/1 0/0 0/0 .text _delete__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::_delete() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/_delete__11daE_OctBg_cFv.s" +int daE_OctBg_c::_delete() { + dComIfG_resDelete(&mPhase, "E_bg"); + if (field_0xbb3 != 0) { + struct_8073A13D = 0; + } + if (heap != NULL) { + field_0x5b4->stopZelAnime(); + } + return 1; } -#pragma pop /* 807368A8-807368C8 000788 0020+00 1/0 0/0 0/0 .text daE_OctBg_Delete__FP11daE_OctBg_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_OctBg_Delete(daE_OctBg_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Delete__FP11daE_OctBg_c.s" +static int daE_OctBg_Delete(daE_OctBg_c* i_this) { + return i_this->_delete(); } -#pragma pop - -/* ############################################################################################## */ -/* 80739D90-80739D94 000030 0004+00 1/13 0/0 0/0 .rodata @3985 */ -SECTION_RODATA static u8 const lit_3985[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80739D90, &lit_3985); - -/* 80739D94-80739D98 000034 0004+00 0/2 0/0 0/0 .rodata @3986 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3986 = 25.0f; -COMPILER_STRIP_GATE(0x80739D94, &lit_3986); -#pragma pop - -/* 80739D98-80739D9C 000038 0004+00 0/1 0/0 0/0 .rodata @3987 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3987 = 35.0f; -COMPILER_STRIP_GATE(0x80739D98, &lit_3987); -#pragma pop - -/* 80739D9C-80739DA0 00003C 0004+00 0/5 0/0 0/0 .rodata @3988 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3988 = 20.0f; -COMPILER_STRIP_GATE(0x80739D9C, &lit_3988); -#pragma pop - -/* 8073A140-8073A14C 000048 000C+00 1/1 0/0 0/0 .bss @3763 */ -static u8 lit_3763[12]; /* 8073A14C-8073A174 -00001 0028+00 7/10 0/0 0/0 .bss None */ /* 8073A14C 0024+01 data_8073A14C l_HIO */ /* 8073A171 0001+00 data_8073A171 None */ /* 8073A172 0002+00 data_8073A172 None */ -static u8 struct_8073A14C[40]; +static daE_OctBg_HIO_c struct_8073A14C; +static u8 struct_8073A14C_field_0x23; +static u8 struct_8073A14C_field_0x24; +static u8 struct_8073A14C_field_0x25; +static u8 struct_8073A14C_field_0x26; /* 807368C8-80736A78 0007A8 01B0+00 1/1 0/0 0/0 .text cc_set__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::cc_set() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/cc_set__11daE_OctBg_cFv.s" +void daE_OctBg_c::cc_set() { + cXyz cStack_1c; + cXyz cStack_28; + J3DModel* model = field_0x5b4->getModel(); + mDoMtx_stack_c::copy(model->getAnmMtx(0)); + cStack_1c.set(0.0f, struct_8073A14C.field_0x18 * 25.0f, 0.0f); + mDoMtx_stack_c::multVec(&cStack_1c, &eyePos); + attention_info.position = eyePos; + attention_info.position.y += struct_8073A14C.field_0x18 * 25.0f; + mDoMtx_stack_c::copy(model->getAnmMtx(0)); + cStack_1c.set(0.0f, struct_8073A14C.field_0x18 * 25.0f, 0.0f); + mDoMtx_stack_c::multVec(&cStack_1c, &cStack_28); + field_0x8c0.SetC(cStack_28); + field_0x8c0.SetR(struct_8073A14C.field_0x18 * 35.0f); + dComIfG_Ccsp()->Set(&field_0x8c0); + mDoMtx_stack_c::copy(model->getAnmMtx(0)); + cStack_1c.set(0.0f, struct_8073A14C.field_0x18 * 25.0f, struct_8073A14C.field_0x18 * 20.0f); + mDoMtx_stack_c::multVec(&cStack_1c, &cStack_28); + field_0x9f8.SetC(cStack_28); + field_0x9f8.SetR(struct_8073A14C.field_0x18 * 20.0f); + dComIfG_Ccsp()->Set(&field_0x9f8); } -#pragma pop - -/* ############################################################################################## */ -/* 80739DA0-80739DA8 000040 0004+04 0/1 0/0 0/0 .rodata @4046 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4046[1 + 1 /* padding */] = { - -25.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80739DA0, &lit_4046); -#pragma pop /* 80736A78-80736BB4 000958 013C+00 1/1 0/0 0/0 .text mtx_set__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::mtx_set() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/mtx_set__11daE_OctBg_cFv.s" +void daE_OctBg_c::mtx_set() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::transM(0.0f, struct_8073A14C.field_0x18 * 25.0f, 0.0f); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::transM(0.0f, struct_8073A14C.field_0x18 * -25.0f, 0.0f); + mDoMtx_stack_c::scaleM(struct_8073A14C.field_0x18, struct_8073A14C.field_0x18, struct_8073A14C.field_0x18); + J3DModel* model = field_0x5b4->getModel(); + model->setBaseTRMtx(mDoMtx_stack_c::get()); + for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) { + model->getModelData()->getJointNodePointer(i)->setCallBack(&daE_OctBg_c::JointCallBack); + } + field_0x5b4->modelCalc(); + for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) { + model->getModelData()->getJointNodePointer(i)->setCallBack(NULL); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80739DA8-80739DB0 000048 0008+00 0/5 0/0 0/0 .rodata @4102 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4102[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80739DA8, &lit_4102); -#pragma pop - -/* 80739DB0-80739DB8 000050 0008+00 0/5 0/0 0/0 .rodata @4103 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4103[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80739DB0, &lit_4103); -#pragma pop - -/* 80739DB8-80739DC0 000058 0008+00 0/5 0/0 0/0 .rodata @4104 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4104[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80739DB8, &lit_4104); -#pragma pop /* 80736BB4-80736DAC 000A94 01F8+00 1/1 0/0 0/0 .text checkNormalAttack__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::checkNormalAttack() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkNormalAttack__11daE_OctBg_cFv.s" +bool daE_OctBg_c::checkNormalAttack() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (dComIfGp_event_runCheck() != 0) { + return false; + } + if (struct_8073A14C_field_0x25 < struct_8073A14C.field_0x20 && + home.pos.absXZ(player->current.pos) < struct_8073A14C.field_0x08 && + player->current.pos.y < struct_8073A14C.field_0x0c && + !fopAcM_otherBgCheck(this, player)) + { + s16 targetAngle = cLib_targetAngleY(¤t.pos, &player->current.pos); + if (abs(current.angle.y - targetAngle) < 0x2000) { + return true; + } + } + return false; } -#pragma pop /* 80736DAC-80736E30 000C8C 0084+00 1/1 0/0 0/0 .text checkChase__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::checkChase() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkChase__11daE_OctBg_cFv.s" +bool daE_OctBg_c::checkChase() { + if (field_0xbac == 0) { + return false; + } + + fopAc_ac_c* actor; + if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) { + field_0xbac = 0; + struct_8073A14C_field_0x24--; + return false; + } + return true; } -#pragma pop - -/* ############################################################################################## */ -/* 80739DC0-80739DC4 000060 0004+00 0/1 0/0 0/0 .rodata @4148 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4148 = -16384.0f; -COMPILER_STRIP_GATE(0x80739DC0, &lit_4148); -#pragma pop - -/* 80739DC4-80739DC8 000064 0004+00 1/2 0/0 0/0 .rodata @4149 */ -SECTION_RODATA static f32 const lit_4149 = 32768.0f; -COMPILER_STRIP_GATE(0x80739DC4, &lit_4149); - -/* 80739DC8-80739DCC 000068 0004+00 0/4 0/0 0/0 .rodata @4150 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4150 = 10.0f; -COMPILER_STRIP_GATE(0x80739DC8, &lit_4150); -#pragma pop - -/* 80739DCC-80739DD0 00006C 0004+00 0/2 0/0 0/0 .rodata @4151 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4151 = 18.0f; -COMPILER_STRIP_GATE(0x80739DCC, &lit_4151); -#pragma pop - -/* 80739DD0-80739DD4 000070 0004+00 0/1 0/0 0/0 .rodata @4152 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4152 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80739DD0, &lit_4152); -#pragma pop - -/* 80739DD4-80739DD8 000074 0004+00 0/6 0/0 0/0 .rodata @4153 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4153 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80739DD4, &lit_4153); -#pragma pop /* 80736E30-80737028 000D10 01F8+00 1/0 0/0 0/0 .text born_swim__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::born_swim() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/born_swim__11daE_OctBg_cFv.s" +void daE_OctBg_c::born_swim() { + if (field_0xb70 == 0) { + field_0x8c0.SetTgType(0); + field_0xb8c = 0; + field_0xb82 = 0xc00; + field_0xb80 = 0x2400; + current.angle.x = cM_rndFX(4096.0f) + -16384.0f; + current.angle.y = cM_rndFX(32768.0f); + attention_info.flags = 0; + speedF = 3.0f; + speed.y = 10.0f; + field_0xbae = cM_rndF(18.0f); + field_0xb70++; + } else if (field_0xb70 == -1) { + field_0x8c0.SetTgType(0xd8fbfdff); + attention_info.flags = 4; + } else if (field_0xbae == 0) { + cLib_addCalcAngleS(¤t.angle.x, 0, 0x10, 0xc00, 0x200); + cLib_chaseF(&speedF, 0.0f, 0.05f); + cLib_chaseF(&speed.y, 0.0f, 0.2f); + if (cLib_addCalcAngleS(&field_0xb80, 0x400, 0x20, 0x400, 0x80) < 0x80 && !speedF && + !speed.y) + { + if (checkChase()) { + setAction(&daE_OctBg_c::chase_core); + } else { + setAction(&daE_OctBg_c::swim); + } + } + field_0xb7c += field_0xb80; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80739DD8-80739DDC 000078 0004+00 0/1 0/0 0/0 .rodata @4292 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4292 = 16384.0f; -COMPILER_STRIP_GATE(0x80739DD8, &lit_4292); -#pragma pop - -/* 80739DDC-80739DE0 00007C 0004+00 0/1 0/0 0/0 .rodata @4293 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4293 = 8192.0f; -COMPILER_STRIP_GATE(0x80739DDC, &lit_4293); -#pragma pop - -/* 80739DE0-80739DE4 000080 0004+00 0/2 0/0 0/0 .rodata @4294 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4294 = 30.0f; -COMPILER_STRIP_GATE(0x80739DE0, &lit_4294); -#pragma pop - -/* 80739DE4-80739DE8 000084 0004+00 0/4 0/0 0/0 .rodata @4295 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4295 = 200.0f; -COMPILER_STRIP_GATE(0x80739DE4, &lit_4295); -#pragma pop - -/* 80739DE8-80739DEC 000088 0004+00 0/1 0/0 0/0 .rodata @4296 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4296 = 4.0f; -COMPILER_STRIP_GATE(0x80739DE8, &lit_4296); -#pragma pop - -/* 80739DEC-80739DF0 00008C 0004+00 0/1 0/0 0/0 .rodata @4297 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4297 = -4.0f; -COMPILER_STRIP_GATE(0x80739DEC, &lit_4297); -#pragma pop /* 80737028-80737574 000F08 054C+00 7/0 0/0 0/0 .text swim__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::swim() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/swim__11daE_OctBg_cFv.s" +void daE_OctBg_c::swim() { + if (field_0xb70 == 0) { + field_0xb8c = 0; + field_0xb82 = 0xc00; + if (current.pos.absXZ(home.pos) < (struct_8073A14C.field_0x08 - 100.0f)) { + field_0xb96 = current.angle.y - 0x8000 + cM_rndFX(16384.0f); + } else { + field_0xb96 = cLib_targetAngleY(¤t.pos, &home.pos) + cM_rndFX(8192.0f); + } + field_0x660.y = current.pos.y + cM_rndFX(2000.0f); + field_0x660.x = cM_ssin(field_0xb96) * 500.0f; + field_0x660.z = cM_scos(field_0xb96) * 500.0f; + field_0xbae = cM_rndFX(30.0f) + 100.0f; + attention_info.field_0x0[2] = 3; + field_0xb70++; + } else if (field_0xb70 == -1) { + attention_info.field_0x0[2] = 4; + } else { + if (checkNormalAttack()) { + setAction(&daE_OctBg_c::normal_attack); + } else { + if (field_0x660.y > (home.pos.y + struct_8073A14C.field_0x0c) - 100.0f) { + field_0x660.y = current.pos.y - cM_rndF(2000.0f); + } + cXyz cStack_58(current.pos); + cStack_58.y += 200.0f; + if (fopAcM_gc_c::gndCheck(&cStack_58) && + field_0x660.y < fopAcM_gc_c::getGroundY() + 200.0f) + { + field_0x660.y = current.pos.y + cM_rndF(2000.0f); + } + cLib_chaseAngleS(¤t.angle.y, field_0xb96, 0x200); + cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &field_0x660), + 0x200); + cLib_chaseF(&speedF, cM_scos(current.angle.x) * 4.0f, 0.2f); + cLib_chaseF(&speed.y, cM_ssin(current.angle.x) * -4.0f, 0.2f); + field_0xb8c = field_0xb96 - current.angle.y; + cLib_addCalcAngleS(&field_0xb80, 0x1000, 0x20, 0x400, 0x80); + field_0xb7c += field_0xb80; + if (struct_8073A14C_field_0x26 != 0 && + struct_8073A14C_field_0x24 < struct_8073A14C_field_0x23 >> 1) + { + field_0xbac = 1; + struct_8073A14C_field_0x24++; + setAction(&daE_OctBg_c::chase_core); + if (struct_8073A14C_field_0x24 >= struct_8073A14C_field_0x23 >> 1) { + struct_8073A14C_field_0x26 = 0; + } + } else if (field_0xbac != 0 && !dComIfGp_event_runCheck()) { + setAction(&daE_OctBg_c::chase_core); + } else if (field_0xbae == 0) { + setAction(&daE_OctBg_c::swim); + } + } + } } -#pragma pop /* 80737574-8073762C 001454 00B8+00 2/2 0/0 0/0 .text setChasePos__11daE_OctBg_cFR4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::setChasePos(cXyz& param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setChasePos__11daE_OctBg_cFR4cXyzf.s" +void daE_OctBg_c::setChasePos(cXyz& param_1, f32 param_2) { + mDoMtx_stack_c::YrotS(cM_rndFX(32768.0f)); + mDoMtx_stack_c::XrotM(cM_rndFX(32768.0f)); + mDoMtx_stack_c::transM(0.0f, 0.0f, param_2); + mDoMtx_stack_c::multVecZero(¶m_1); } -#pragma pop /* 8073762C-80737678 00150C 004C+00 1/1 0/0 0/0 .text checkCoreFishAttack__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::checkCoreFishAttack() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/checkCoreFishAttack__11daE_OctBg_cFv.s" +bool daE_OctBg_c::checkCoreFishAttack() { + fopAc_ac_c* actor; + if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) { + return false; + } + if (fopAcM_checkStatus(actor, 0x100000) == 0) { + return false; + } + return true; } -#pragma pop - -/* ############################################################################################## */ -/* 80739DF0-80739DF4 000090 0004+00 0/2 0/0 0/0 .rodata @4445 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4445 = 8.0f; -COMPILER_STRIP_GATE(0x80739DF0, &lit_4445); -#pragma pop - -/* 80739DF4-80739DF8 000094 0004+00 0/2 0/0 0/0 .rodata @4446 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4446 = -8.0f; -COMPILER_STRIP_GATE(0x80739DF4, &lit_4446); -#pragma pop - -/* 80739DF8-80739DFC 000098 0004+00 0/3 0/0 0/0 .rodata @4447 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4447 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(0x80739DF8, &lit_4447); -#pragma pop - -/* 80739DFC-80739E00 00009C 0004+00 0/1 0/0 0/0 .rodata @4448 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4448 = -18.0f; -COMPILER_STRIP_GATE(0x80739DFC, &lit_4448); -#pragma pop /* 80737678-80737C48 001558 05D0+00 5/0 0/0 0/0 .text chase_core__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::chase_core() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/chase_core__11daE_OctBg_cFv.s" +void daE_OctBg_c::chase_core() { + if (field_0xb70 == 0) { + setChasePos(field_0x660, cM_rndF(struct_8073A14C.field_0x10)); + field_0xbaf = cM_rndFX(20.0f) + 100.0f; + field_0xb70++; + } else if (field_0xb70 != -1) { + cXyz acStack_2c; + fopAc_ac_c* local_6c; + if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &local_6c) == 0 || local_6c == NULL) { + setAction(&daE_OctBg_c::swim); + } else { + if (local_6c->current.pos.y < home.pos.y + struct_8073A14C.field_0x14) { + acStack_2c = local_6c->current.pos + field_0x660; + acStack_2c.y = (home.pos.y + struct_8073A14C.field_0x14) + cM_rndF(200.0f); + } else { + acStack_2c = local_6c->current.pos + field_0x660; + } + field_0xb96 = cLib_targetAngleY(¤t.pos, &acStack_2c); + field_0xb8c = field_0xb96 - current.angle.y; + if (abs(current.angle.y - field_0xb96) > 0x4000) { + cLib_chaseAngleS(¤t.angle.y, field_0xb96, 0x400); + cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &acStack_2c), 0x400); + if (current.pos.abs(acStack_2c) < struct_8073A14C.field_0x10 - 100.0f) { + cLib_chaseF(&speedF, cM_scos(current.angle.x) * 8.0f, 0.2f); + cLib_chaseF(&speed.y, cM_ssin(current.angle.x) * -8.0f, 0.2f); + cLib_addCalcAngleS(&field_0xb80, 0xc00, 0x20, 0x400, 0x80); + } + } else { + cLib_chaseAngleS(¤t.angle.y, (int)field_0xb96, 0x200); + cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &acStack_2c), + 0x200); + ; + if (current.pos.abs(acStack_2c) > struct_8073A14C.field_0x10 - 100.0f) { + cLib_chaseF(&speedF, 18.0f * cM_scos(current.angle.x), 0.4f); + cLib_chaseF(&speed.y, (-18.0f * cM_ssin(current.angle.x)), 0.4f); + cLib_addCalcAngleS(&field_0xb80, 0x2400, 0x20, 0x400, 0x80); + } + } + field_0xb7c += field_0xb80; + if (checkCoreFishAttack()) { + setAction(&daE_OctBg_c::core_fish_attack); + } else if (dComIfGp_event_runCheck()) { + setAction(&daE_OctBg_c::swim); + } else if (field_0xbaf == 0) { + setChasePos(field_0x660, cM_rndF(struct_8073A14C.field_0x10)); + field_0xbaf = cM_rndFX(20.0f) + 100.0f; + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80739E00-80739E04 0000A0 0004+00 0/2 0/0 0/0 .rodata @4559 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4559 = 60.0f; -COMPILER_STRIP_GATE(0x80739E00, &lit_4559); -#pragma pop - -/* 80739E04-80739E08 0000A4 0004+00 0/2 0/0 0/0 .rodata @4560 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4560 = 80.0f; -COMPILER_STRIP_GATE(0x80739E04, &lit_4560); -#pragma pop - -/* 80739E08-80739E0C 0000A8 0004+00 0/2 0/0 0/0 .rodata @4561 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4561 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80739E08, &lit_4561); -#pragma pop - -/* 80739E0C-80739E10 0000AC 0004+00 0/3 0/0 0/0 .rodata @4562 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4562 = -1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80739E0C, &lit_4562); -#pragma pop /* 80737C48-8073814C 001B28 0504+00 3/0 0/0 0/0 .text normal_attack__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::normal_attack() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/normal_attack__11daE_OctBg_cFv.s" +void daE_OctBg_c::normal_attack() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (field_0xb70 == 0) { + field_0xb74 = true; + struct_8073A14C_field_0x25++; + field_0xbae = cM_rndFX(20.0f) + 60.0f; + field_0xb70++; + } else if (field_0xb70 == -1) { + field_0xb74 = false; + struct_8073A14C_field_0x25--; + } else if (field_0xb70 == 1) { + cXyz acStack_34; + acStack_34 = player->current.pos; + if (dComIfGp_checkPlayerStatus0(0, 0x100000)) { + acStack_34.y -= 60.0f; + } else { + acStack_34.y += 80.0f; + } + field_0xb96 = cLib_targetAngleY(¤t.pos, &acStack_34); + field_0xb8c = field_0xb96 - current.angle.y; + cLib_chaseAngleS(¤t.angle.y, field_0xb96, 0x400); + cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &acStack_34), 0x400); + cLib_chaseF(&speedF, cM_scos(current.angle.x) * 0.1f, 0.2f); + cLib_chaseF(&speed.y, cM_ssin(current.angle.x) * -0.1f, 0.2f); + field_0xb8c = fopAcM_searchPlayerAngleY(this) - current.angle.y; + cLib_addCalcAngleS(&field_0xb80, 0x400, 0x20, 0x400, 0x80); + field_0xb7c += field_0xb80; + if (field_0xbae == 0) { + field_0xbae = 120; + field_0xb70++; + } + } else if (field_0xb70 == 2) { + cXyz cStack_40; + cStack_40 = player->current.pos; + if (dComIfGp_checkPlayerStatus0(0, 0x100000)) { + cStack_40.y -= 60.0f; + } else { + cStack_40.y += 80.0f; + } + field_0xb96 = cLib_targetAngleY(¤t.pos, &cStack_40); + field_0xb8c = field_0xb96 - current.angle.y; + cLib_chaseAngleS(¤t.angle.y, field_0xb96, 0x400); + cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &cStack_40), 0x400); + cLib_chaseF(&speedF, cM_scos(current.angle.x) * 8.0f, + 0.2f); + cLib_chaseF(&speed.y, (cM_ssin(current.angle.x) * -8.0f), + 0.2f); + field_0xb8c = fopAcM_searchPlayerAngleY(this) - current.angle.y; + cLib_addCalcAngleS(&field_0xb80, 0x2400, 0x20, 0x400, 0x80); + field_0xb7c = field_0xb7c + field_0xb80; + if (home.pos.absXZ(player->current.pos) >= struct_8073A14C.field_0x08 && player->current.pos.y >= struct_8073A14C.field_0x0c) { + setAction(&daE_OctBg_c::swim); + } else { + if (dComIfGp_event_runCheck() || field_0xbae == 0) { + setAction(&daE_OctBg_c::swim); + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80739E10-80739E14 0000B0 0004+00 0/1 0/0 0/0 .rodata @4678 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4678 = 230.0f; -COMPILER_STRIP_GATE(0x80739E10, &lit_4678); -#pragma pop - -/* 80739E14-80739E18 0000B4 0004+00 0/2 0/0 0/0 .rodata @4679 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4679 = 50.0f; -COMPILER_STRIP_GATE(0x80739E14, &lit_4679); -#pragma pop - -/* 80739E18-80739E1C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4680 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4680 = 800.0f; -COMPILER_STRIP_GATE(0x80739E18, &lit_4680); -#pragma pop - -/* 80739E1C-80739E20 0000BC 0004+00 0/1 0/0 0/0 .rodata @4681 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4681 = 40.0f; -COMPILER_STRIP_GATE(0x80739E1C, &lit_4681); -#pragma pop - -/* 80739E20-80739E24 0000C0 0004+00 0/1 0/0 0/0 .rodata @4682 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4682 = 14.0f; -COMPILER_STRIP_GATE(0x80739E20, &lit_4682); -#pragma pop - -/* 80739E24-80739E28 0000C4 0004+00 0/1 0/0 0/0 .rodata @4683 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4683 = -14.0f; -COMPILER_STRIP_GATE(0x80739E24, &lit_4683); -#pragma pop - -/* 80739E28-80739E2C 0000C8 0004+00 0/1 0/0 0/0 .rodata @4684 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4684 = 400.0f; -COMPILER_STRIP_GATE(0x80739E28, &lit_4684); -#pragma pop /* 8073814C-80738714 00202C 05C8+00 2/0 0/0 0/0 .text core_fish_attack__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::core_fish_attack() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/core_fish_attack__11daE_OctBg_cFv.s" +void daE_OctBg_c::core_fish_attack() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (field_0xb70 == 0) { + field_0xb74 = true; + field_0xbb0 = cM_rndF(50.0f) + 230.0f; + setChasePos(field_0x660, cM_rndF(800.0f)); + field_0xbaf = cM_rndFX(20.0f) + 40.0f; + field_0xb70++; + } else if (field_0xb70 == -1) { + field_0xb74 = false; + } else if (field_0xb70 == 1) { + cXyz cStack_50; + cXyz cStack_5c; + cStack_5c = player->current.pos; + if (dComIfGp_checkPlayerStatus0(0, 0x100000)) { + cStack_5c.y -= 60.0f; + } else { + cStack_5c.y += 80.0f; + } + cStack_50 = cStack_5c + field_0x660; + field_0xb96 = cLib_targetAngleY(¤t.pos, &cStack_50); + field_0xb8c = field_0xb96 - current.angle.y; + cLib_chaseAngleS(¤t.angle.y, field_0xb96, 0x200); + cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &cStack_50), 0x200); + cLib_chaseF(&speedF, 14.0f * cM_scos(current.angle.x), 0.4f); + cLib_chaseF(&speed.y, -14.0f * cM_ssin(current.angle.x), 0.4f); + cLib_addCalcAngleS(&field_0xb80, 0x3000, 0x20, 0x400, 0x80); + field_0xb7c += field_0xb80; + if (field_0xbb0 == 0) { + setAction(&daE_OctBg_c::chase_core); + } else if (field_0xbaf == 0) { + cXyz cStack_68(current.pos); + f32 in_f31; + cStack_68.y += 200.0f; + if (fopAcM_gc_c::gndCheck(&cStack_68)) { + f32 groundY = fopAcM_gc_c::getGroundY(); + if (current.pos.y < groundY + 200.0f) { + if (cStack_5c.y < groundY + 200.0f) { + in_f31 = cM_rndF(50.0f) + 20.0f; + field_0xbaf = cM_rndFX(20.0f) + 40.0f; + } else if (current.pos.abs(cStack_5c) < 400.0f) { + in_f31 = cM_rndF(50.0f) + 20.0f; + field_0xbaf = cM_rndFX(20.0f) + 40.0f; + } else { + in_f31 = cM_rndF(400.0f) + 80.0f; + field_0xbaf = cM_rndFX(80.0f) + 100.0f; + } + } + } else if (current.pos.abs(cStack_5c) < 400.0f) { + in_f31 = cM_rndF(50.0f) + 20.0f; + field_0xbaf = cM_rndFX(20.0f) + 40.0f; + } else { + in_f31 = cM_rndF(400.0f) + 80.0f; + field_0xbaf = cM_rndFX(80.0f) + 100.0f; + } + setChasePos(field_0x660, in_f31); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80739E2C-80739E30 0000CC 0004+00 0/1 0/0 0/0 .rodata @4728 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4728 = -10.0f; -COMPILER_STRIP_GATE(0x80739E2C, &lit_4728); -#pragma pop /* 80738714-80738914 0025F4 0200+00 1/0 0/0 0/0 .text back_swim__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::back_swim() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/back_swim__11daE_OctBg_cFv.s" +void daE_OctBg_c::back_swim() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (field_0xb70 == 0) { + field_0xbae = 48; + field_0xb80 = 0x4000; + field_0xb82 = 0x1000; + speedF = -10.0f; + speed.y = 10.0f; + field_0xb70++; + } else if (field_0xb70 != -1) { + cXyz cStack_30; + cLib_addCalcAngleS(&field_0xb80, 0x1000, 8, 0x400, 0x100); + cLib_addCalcAngleS(¤t.angle.y, fopAcM_searchPlayerAngleY(this), 0x10, 0x400, 0x100); + cStack_30 = player->current.pos; + cStack_30.y += cLib_addCalcAngleS(¤t.angle.x, + -cLib_targetAngleX(¤t.pos, &player->current.pos), + 0x10, 0x400, 0x100); + cLib_chaseF(&speedF, cM_scos(current.angle.x) * 0.1f, 0.4f); + cLib_chaseF(&speed.y, cM_ssin(current.angle.x) * 0.1f, 0.4f); + if (field_0xbae == 0) { + if (field_0xbac != 0) { + setAction(&daE_OctBg_c::chase_core); + } else { + setAction(&daE_OctBg_c::swim); + } + } + } } -#pragma pop /* 80738914-807389E8 0027F4 00D4+00 2/2 0/0 0/0 .text setBombCarry__11daE_OctBg_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::setBombCarry(int param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/setBombCarry__11daE_OctBg_cFi.s" +bool daE_OctBg_c::setBombCarry(int param_1) { + fopAc_ac_c* actor = NULL; + if (param_1 == 0) { + cLib_onBit(attention_info.flags, 0x10UL); + if (fopAcM_checkCarryNow(this) != 0) { + current.angle.x = 0; + actor = + dBomb_c::createEnemyWaterBomb(¤t.pos, ¤t.angle, fopAcM_GetRoomNo(this)); + } + } else { + current.angle.x = 0; + actor = dBomb_c::createEnemyWaterBombHookshot(¤t.pos, ¤t.angle, + fopAcM_GetRoomNo(this)); + } + if (actor != 0) { + fopAcM_delete(this); + return true; + } + return false; } -#pragma pop /* 807389E8-80738A4C 0028C8 0064+00 1/0 0/0 0/0 .text hook__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::hook() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/hook__11daE_OctBg_cFv.s" +void daE_OctBg_c::hook() { + if (field_0xb70 == 0) { + field_0x9f8.OffAtSetBit(); + field_0xb70++; + } else if (field_0xb70 == -1) { + field_0x9f8.OnAtSetBit(); + } else { + setBombCarry(1); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80739E30-80739E34 0000D0 0004+00 0/2 0/0 0/0 .rodata @4813 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4813 = -1.0f; -COMPILER_STRIP_GATE(0x80739E30, &lit_4813); -#pragma pop - -/* 80739E34-80739E38 0000D4 0004+00 0/2 0/0 0/0 .rodata @4814 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4814 = 5.0f; -COMPILER_STRIP_GATE(0x80739E34, &lit_4814); -#pragma pop - -/* 80739E38-80739E3C 0000D8 0004+00 0/2 0/0 0/0 .rodata @4815 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4815 = -3.0f; -COMPILER_STRIP_GATE(0x80739E38, &lit_4815); -#pragma pop /* 80738A4C-80738C2C 00292C 01E0+00 3/0 0/0 0/0 .text damage__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::damage() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage__11daE_OctBg_cFv.s" +void daE_OctBg_c::damage() { + field_0xb90 = 120; + if (field_0xb70 == 0) { + J3DAnmTransform* transform = (J3DAnmTransform*)dComIfG_getObjectRes("E_bg", 6); + field_0x5b4->setAnm(transform, 0, 3.0f, 1.0f, 0.0f, -1.0f); + field_0xb82 = 0; + field_0xb8c = 0; + field_0x8c0.OffTgSetBit(); + field_0x9f8.OffAtSetBit(); + attention_info.flags = 0; + current.angle.y = field_0xb30.mHitDirection + 0x8000; + speedF = 10.0f; + field_0xb96 = 0x1000; + speed.y = 0.0f; + field_0xb70++; + } else if (field_0xb70 != -1) { + current.angle.y += field_0xb96; + current.angle.x += field_0xb96; + if (field_0x6ac.ChkGroundHit()) { + cLib_chaseAngleS(&field_0xb96, 0, 0x80); + } else { + cLib_chaseAngleS(&field_0xb96, 0x100, 0x60); + } + cLib_chaseF(&speedF, 0.0f, 0.2f); + if (speedF < 5.0f) { + gravity = -0.1f; + maxFallSpeed = -3.0f; + } + if (field_0x5b4->isStop()) { + setAction(&daE_OctBg_c::bomb_wait); + } else { + field_0x5b8->play(); + } + } } -#pragma pop /* 80738C2C-80738E30 002B0C 0204+00 2/0 0/0 0/0 .text bomb_wait__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::bomb_wait() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/bomb_wait__11daE_OctBg_cFv.s" +void daE_OctBg_c::bomb_wait() { + if (field_0xb70 == 0) { + J3DAnmTransform* transform = (J3DAnmTransform*)dComIfG_getObjectRes("E_bg", 5); + field_0x5b4->setAnm(transform, 2, 3.0f, 1.0f, 0.0f, + -1.0f); + field_0xb82 = 0; + field_0xb8c = 0; + field_0xb70++; + } else if (field_0xb70 != -1) { + if (field_0xb70 == 1) { + field_0xb90 = 120; + current.angle.y += field_0xb96; + current.angle.x += field_0xb96; + if (field_0x6ac.ChkGroundHit()) { + field_0xb70++; + speed.y = 1.0f; + } else { + cLib_chaseAngleS(&field_0xb96, 0x100, 0x80); + } + if (speedF < 5.0f) { + gravity = -0.1f; + maxFallSpeed = -3.0f; + } + cLib_chaseF(&speedF, 0.0f, 0.2f); + } else if (field_0xb70 == 2) { + current.angle.y += field_0xb96; + if (field_0x6ac.ChkGroundHit()) { + if (field_0xbae != 0) { + cLib_chaseAngleS(¤t.angle.x, -0x8000, 0x80); + } + cLib_chaseAngleS(&field_0xb96, 0, 0x80); + if (setBombCarry(0) != 0) { + return; + } + } else { + field_0xbae = 10; + cLib_chaseAngleS(&field_0xb96, 0x100, 0x80); + cLib_chaseAngleS(¤t.angle.x, -0x8000, 0x80); + } + if (speedF < 5.0f) { + gravity = -0.1f; + maxFallSpeed = -3.0f; + } + cLib_chaseF(&speedF, 0.0, 0.2f); + } + } } -#pragma pop /* 80738E30-8073905C 002D10 022C+00 1/1 0/0 0/0 .text damage_check__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::damage_check() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s" +void daE_OctBg_c::damage_check() { + bool bVar1; + field_0x884.Move(); + if (field_0xbad == 0) { + bVar1 = true; + if ((checkAction(&daE_OctBg_c::core_fish_attack) || + checkAction(&daE_OctBg_c::normal_attack)) && + field_0x9f8.ChkAtHit()) + { + if (field_0x9f8.ChkAtShieldHit()) { + if (daPy_getPlayerActorClass()->getCutType() == 41) { + setAction(&daE_OctBg_c::damage); + return; + } + } + setAction(&daE_OctBg_c::back_swim); + } else { + if (field_0x8c0.ChkTgHit()) { + field_0xb30.mpCollider = field_0x8c0.GetTgHitObj(); + cc_at_check(this, &field_0xb30); + if (field_0xb30.mpCollider->ChkAtType(0xd8000000)) { + field_0xbad = 20; + } else { + field_0xbad = 10; + } + if (field_0xb30.mHitStatus != 0) { + field_0xbad = 10; + } + dScnPly_c::setPauseTimer(0); + field_0x8c0.ClrTgHit(); + field_0x5bc.startCreatureVoice(Z2SE_EN_BG_V_DAMAGE, -1); + if (field_0xb30.mpCollider->ChkAtType(0x4000)) { + setAction(&daE_OctBg_c::hook); + } else { + setAction(&daE_OctBg_c::damage); + } + } + } + } } -#pragma pop /* 8073905C-807390A4 002F3C 0048+00 1/1 0/0 0/0 .text execute__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::execute() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/execute__11daE_OctBg_cFv.s" +int daE_OctBg_c::execute() { + if (cDmrNowMidnaTalk()) { + return 1; + } + action(); + return 1; } -#pragma pop /* 807390A4-807390C4 002F84 0020+00 2/1 0/0 0/0 .text daE_OctBg_Execute__FP11daE_OctBg_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_OctBg_Execute(daE_OctBg_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Execute__FP11daE_OctBg_c.s" +static int daE_OctBg_Execute(daE_OctBg_c* i_this) { + return i_this->execute(); } -#pragma pop /* 807390C4-807390E4 002FA4 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 807390E4-807391D0 002FC4 00EC+00 1/1 0/0 0/0 .text * ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel.s" +int daE_OctBg_c::ctrlJoint(J3DJoint* param_1, J3DModel* param_2) { + int jntNo = param_1->getJntNo(); + mDoMtx_stack_c::copy(param_2->getAnmMtx(jntNo)); + if (jntNo != 0) { + if (jntNo == 1) { + if (field_0xb75 == 0) { + mDoMtx_stack_c::YrotM(field_0xb84[3]); + } else { + mDoMtx_stack_c::YrotM(field_0xb84[3] - field_0xb84[0]); + } + } else { + mDoMtx_stack_c::YrotM(field_0xb84[jntNo - 2]); + } + } + param_2->setAnmMtx(jntNo, mDoMtx_stack_c::get()); + cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + return 1; } -#pragma pop /* 807391D0-8073921C 0030B0 004C+00 2/2 0/0 0/0 .text JointCallBack__11daE_OctBg_cFP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::JointCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/JointCallBack__11daE_OctBg_cFP8J3DJointi.s" +int daE_OctBg_c::JointCallBack(J3DJoint* param_0, int param_1) { + if (param_1 == 0) { + J3DModel* model = j3dSys.getModel(); + daE_OctBg_c* octBg = (daE_OctBg_c*)model->getUserArea(); + if (octBg != NULL) { + octBg->ctrlJoint(param_0, model); + } + } + return 1; } -#pragma pop /* 8073921C-807393DC 0030FC 01C0+00 1/1 0/0 0/0 .text CreateHeap__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/CreateHeap__11daE_OctBg_cFv.s" +int daE_OctBg_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_bg", 10); + JUT_ASSERT(1341, modelData != 0); + field_0x5b4 = new mDoExt_McaMorfSO( + modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_bg", 7), 0, 1.0f, 0, -1, &field_0x5bc, + 0x80000, 0x11000084); + if (field_0x5b4 == NULL || field_0x5b4->getModel() == NULL) { + return 0; + } + J3DModel* model = field_0x5b4->getModel(); + model->setUserArea((u32)this); + for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) { + model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack); + } + field_0x5b8 = new mDoExt_brkAnm(); + if (field_0x5b8 == NULL) { + return 0; + } + if (!field_0x5b8->init(model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_bg", 13), 1, 0, 1.0f, 0, -1)) { + return 0; + } + return 1; } -#pragma pop - -/* 807393DC-80739424 0032BC 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80739E3C-80739E40 0000DC 0004+00 0/1 0/0 0/0 .rodata @5138 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5138 = -50.0f; -COMPILER_STRIP_GATE(0x80739E3C, &lit_5138); -#pragma pop - -/* 80739E44-80739E44 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80739E49 = "E_octbg"; -#pragma pop /* 80739424-807397B8 003304 0394+00 1/1 0/0 0/0 .text create__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::create() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/create__11daE_OctBg_cFv.s" -} -#pragma pop +int daE_OctBg_c::create() { + fopAcM_SetupActor(this, daE_OctBg_c); -/* 807397B8-80739800 003698 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGSphFv.s" + int rv = dComIfG_resLoad(&mPhase, "E_bg"); + if (rv == cPhs_COMPLEATE_e) { + OS_REPORT("///////////// E_OctBg ////////////////\n"); + if (fopAcM_entrySolidHeap(this, useHeapInit, 0x10e0) == 0) { + return cPhs_ERROR_e; + } + OS_REPORT("//////////// E_OctBg SET OK //////////\n"); + if (struct_8073A13D == 0) { + struct_8073A13D = 1; + field_0xbb3 = 1; + struct_8073A14C.field_0x04 = -1; + } + attention_info.flags = 4; + onWolfNoLock(); + fopAcM_SetMtx(this, field_0x5b4->getModel()->getBaseTRMtx()); + fopAcM_SetMin(this, -50.0f, -50.0f, -50.0f); + fopAcM_SetMax(this, 50.0f, 50.0f, 50.0f); + field_0x6ac.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, + &field_0x66c, fopAcM_GetSpeed_p(this), NULL, NULL); + field_0x66c.SetWall(struct_8073A14C.field_0x18 * 10.0f, + struct_8073A14C.field_0x18 * 20.0f); + health = 10; + field_0x560 = 10; + field_0x884.Init(100, 0, this); + field_0x8c0.Set(cc_obg_src); + field_0x8c0.SetStts(&field_0x884); + field_0x9f8.Set(cc_obg_at_src); + field_0x9f8.SetStts(&field_0x884); + field_0x5bc.init(¤t.pos, &eyePos, 3, 1); + field_0x5bc.setEnemyName("E_octbg"); + field_0xb30.mpSound = &field_0x5bc; + field_0xb30.mPowerType = 1; + gravity = 0.0f; + attention_info.field_0x0[2] = 4; + field_0xb74 = false; + field_0xbac = fopAcM_GetID(this) & 1; + struct_8073A14C_field_0x23++; + if (field_0xbac != 0) { + struct_8073A14C_field_0x24++; + } + setAction(&daE_OctBg_c::born_swim); + daE_OctBg_Execute(this); + + } + return rv; } -#pragma pop - -/* 80739800-80739848 0036E0 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/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80739848-807398A4 003728 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/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 807398A4-80739914 003784 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80739914-80739984 0037F4 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop /* 80739984-807399A4 003864 0020+00 1/0 0/0 0/0 .text daE_OctBg_Create__FP11daE_OctBg_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_OctBg_Create(daE_OctBg_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Create__FP11daE_OctBg_c.s" +static int daE_OctBg_Create(daE_OctBg_c* i_this) { + return i_this->create(); } -#pragma pop - -/* ############################################################################################## */ -/* 80739E40-80739E44 0000E0 0004+00 0/1 0/0 0/0 .rodata @5288 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5288 = 32.0f; -COMPILER_STRIP_GATE(0x80739E40, &lit_5288); -#pragma pop /* 807399A4-80739BA0 003884 01FC+00 1/1 0/0 0/0 .text draw__11daE_OctBg_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daE_OctBg_c::draw() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/draw__11daE_OctBg_cFv.s" +int daE_OctBg_c::draw() { + J3DModel* model = field_0x5b4->getModel(); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model, &tevStr); + field_0x5b8->entry(model->getModelData()); + if ((checkAction(&daE_OctBg_c::damage) || checkAction(&daE_OctBg_c::bomb_wait)) && field_0xb90 != 0) { + J3DGXColorS10 local_68; + local_68.r = 32.0f - fabsf(cM_scos(field_0xb94) * 30.0f); + local_68.g = 0; + local_68.b = 0; + local_68.a = 0; + model->getModelData()->getMaterialNodePointer(0)->setTevColor(0, &local_68); + model->getModelData()->getMaterialNodePointer(1)->setTevColor(0, &local_68); + } + field_0x5b4->entryDL(); + cXyz cStack_48; + cStack_48.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + field_0xb78 = dComIfGd_setShadow(field_0xb78, 1, model, &cStack_48, 200.0f, 0.0f, current.pos.y, field_0x6ac.GetGroundH(), field_0x6ac.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + return 1; } -#pragma pop /* 80739BA0-80739BC0 003A80 0020+00 1/0 0/0 0/0 .text daE_OctBg_Draw__FP11daE_OctBg_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_OctBg_Draw(daE_OctBg_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_Draw__FP11daE_OctBg_c.s" +static int daE_OctBg_Draw(daE_OctBg_c* i_this) { + return i_this->draw(); } -#pragma pop /* 80739BC0-80739C70 003AA0 00B0+00 1/0 0/0 0/0 .text daE_OctBg_IsDelete__FP11daE_OctBg_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_OctBg_IsDelete(daE_OctBg_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/daE_OctBg_IsDelete__FP11daE_OctBg_c.s" +static int daE_OctBg_IsDelete(daE_OctBg_c* i_this) { + struct_8073A14C_field_0x23--; + if (i_this->getChaseFlag() != 0) { + struct_8073A14C_field_0x24--; + if (struct_8073A14C_field_0x24 < struct_8073A14C_field_0x23 >> 2) { + struct_8073A14C_field_0x26 = 1; + } + } + if (i_this->checkNormalAttk()) { + struct_8073A14C_field_0x25--; + } + return 1; } -#pragma pop - -/* 80739C70-80739CB8 003B50 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/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80739CB8-80739D00 003B98 0048+00 2/1 0/0 0/0 .text __dt__15daE_OctBg_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daE_OctBg_HIO_c::~daE_OctBg_HIO_c() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__dt__15daE_OctBg_HIO_cFv.s" -} -#pragma pop - -/* 80739D00-80739D3C 003BE0 003C+00 0/0 1/0 0/0 .text __sinit_d_a_e_oct_bg_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_e_oct_bg_cpp() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/__sinit_d_a_e_oct_bg_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80739D00, __sinit_d_a_e_oct_bg_cpp); -#pragma pop - -/* 80739D3C-80739D44 003C1C 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80739D3C() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D3C.s" -} -#pragma pop - -/* 80739D44-80739D4C 003C24 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80739D44() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/func_80739D44.s" -} -#pragma pop /* ############################################################################################## */ /* 8073A174-8073A178 00007C 0004+00 0/0 0/0 0/0 .bss @@ -1921,3 +1207,29 @@ static u8 data_8073A1D4[4]; #pragma pop /* 80739E44-80739E44 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ + +static actor_method_class l_daE_OctBg_Method = { + (process_method_func)daE_OctBg_Create, + (process_method_func)daE_OctBg_Delete, + (process_method_func)daE_OctBg_Execute, + (process_method_func)daE_OctBg_IsDelete, + (process_method_func)daE_OctBg_Draw, +}; + +/* 8073A04C-8073A07C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_OctBg */ +extern actor_process_profile_definition g_profile_E_OctBg = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_E_OctBg, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daE_OctBg_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 0xCD, // mPriority + &l_daE_OctBg_Method, // sub_method + 0xC4100, // mStatus + fopAc_ENEMY_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +};