From 7da5cdee5679d8f7995c601f69e46967bfbcdb73 Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Mon, 25 Mar 2024 14:41:20 -0400 Subject: [PATCH] d_a_e_nest OK (#2108) * d_a_e_nest OK * complete merge --- Progress.md | 12 +- .../d_a_e_nest/__ct__14daE_Nest_HIO_cFv.s | 10 - .../d_a_e_nest/__dt__12dBgS_ObjAcchFv.s | 30 - .../d_a_e_nest/__dt__12nest_hahen_sFv.s | 17 - .../d_a_e_nest/__dt__14daE_Nest_HIO_cFv.s | 20 - .../d_a_e_nest/d_a_e_nest/__dt__8cM3dGAabFv.s | 20 - .../d_a_e_nest/d_a_e_nest/__dt__8cM3dGCylFv.s | 20 - .../d_a_e_nest/d_a_e_nest/__dt__8cM3dGSphFv.s | 20 - .../d_a_e_nest/__sinit_d_a_e_nest_cpp.s | 16 - .../bee_nest_action__FP12e_nest_class.s | 317 --- .../daE_Nest_Create__FP10fopAc_ac_c.s | 330 --- .../daE_Nest_Delete__FP12e_nest_class.s | 32 - .../daE_Nest_Draw__FP12e_nest_class.s | 72 - .../daE_Nest_Execute__FP12e_nest_class.s | 314 --- .../demo_camera__FP12e_nest_class.s | 178 -- .../e_nest_carry__FP12e_nest_class.s | 100 - .../e_nest_drop__FP12e_nest_class.s | 220 -- .../e_nest_float__FP12e_nest_class.s | 157 -- .../e_nest_hahen__FP12e_nest_class.s | 275 -- .../e_nest_hook__FP12e_nest_class.s | 46 - .../e_nest_normal__FP12e_nest_class.s | 345 --- .../a/e/d_a_e_nest/d_a_e_nest/func_805046B8.s | 3 - .../a/e/d_a_e_nest/d_a_e_nest/func_805046C0.s | 3 - .../d_a_e_nest/hahen_draw__FP12e_nest_class.s | 39 - .../d_a_e_nest/hahen_move__FP12e_nest_class.s | 82 - ..._normal__FP12e_nest_classP12nest_hahen_s.s | 419 --- .../d_a_e_nest/mtx_cc_set__FP12e_nest_class.s | 105 - .../d_a_e_nest/d_a_e_nest/s_bomb_sub__FPvPv.s | 111 - .../d_a_e_nest/d_a_e_nest/shot_b_sub__FPvPv.s | 33 - .../simple_bg_check__FP12e_nest_class.s | 176 -- .../d_a_e_nest/useHeapInit__FP10fopAc_ac_c.s | 80 - .../wall_angle_get__FP12e_nest_class.s | 113 - .../water_check__FP12e_nest_class.s | 75 - .../CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../CreateHeap__13daTagStatue_cFv.s | 116 - .../Create__13daTagStatue_cFv.s | 121 - .../__dt__12J3DFrameCtrlFv.s | 20 - .../_delete__13daTagStatue_cFv.s | 28 - .../actionEvent__13daTagStatue_cFv.s | 45 - .../actionOrderEvent__13daTagStatue_cFv.s | 38 - .../actionWait__13daTagStatue_cFv.s | 28 - .../checkOnEffect__13daTagStatue_cFv.s | 126 - .../checkStartDemo__13daTagStatue_cFv.s | 98 - .../daTagStatue_Create__FP13daTagStatue_c.s | 9 - .../daTagStatue_Delete__FP13daTagStatue_c.s | 9 - .../daTagStatue_Draw__FP13daTagStatue_c.s | 9 - .../daTagStatue_Execute__FP13daTagStatue_c.s | 9 - .../demoProc__13daTagStatue_cFv.s | 148 -- .../draw__13daTagStatue_cFv.s | 60 - .../endParticle__13daTagStatue_cFv.s | 24 - .../event_proc_call__13daTagStatue_cFv.s | 72 - .../execute__13daTagStatue_cFv.s | 39 - .../d_a_tag_statue_evt/func_805A7424.s | 67 - .../d_a_tag_statue_evt/func_805A80E0.s | 9 - .../getLetterCount__13daTagStatue_cFv.s | 33 - .../initBaseMtx__13daTagStatue_cFv.s | 16 - .../d_a_tag_statue_evt/s_s_sub__FPvPv.s | 22 - .../setBaseMtx__13daTagStatue_cFv.s | 27 - .../setParticle__13daTagStatue_cFv.s | 50 - include/d/d_bomb.h | 8 + include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h | 112 +- rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp | 2257 ++++++++--------- 62 files changed, 1157 insertions(+), 6242 deletions(-) delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__ct__14daE_Nest_HIO_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12nest_hahen_sFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__14daE_Nest_HIO_cFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__sinit_d_a_e_nest_cpp.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/bee_nest_action__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Delete__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Draw__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Execute__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/demo_camera__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_carry__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_drop__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_float__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hahen__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hook__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_normal__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046B8.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046C0.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_draw__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_move__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_normal__FP12e_nest_classP12nest_hahen_s.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/mtx_cc_set__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/s_bomb_sub__FPvPv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/shot_b_sub__FPvPv.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/simple_bg_check__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/wall_angle_get__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/water_check__FP12e_nest_class.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CreateHeap__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/Create__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/_delete__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionEvent__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionOrderEvent__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionWait__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkOnEffect__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkStartDemo__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Create__FP13daTagStatue_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Delete__FP13daTagStatue_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Draw__FP13daTagStatue_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Execute__FP13daTagStatue_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/demoProc__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/draw__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/endParticle__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/event_proc_call__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/execute__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A7424.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A80E0.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/getLetterCount__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/initBaseMtx__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/s_s_sub__FPvPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setBaseMtx__13daTagStatue_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setParticle__13daTagStatue_cFv.s diff --git a/Progress.md b/Progress.md index 78d97d7779d..4b60f0c465f 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 53.029643% | 2132148 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 53.029643% | 2132148 | 4020672 -RELs | 36.734826% | 4224624 | 11500324 -Total | 40.955954% | 6356772 | 15520996 +RELs | 36.975202% | 4252268 | 11500324 +Total | 41.134061% | 6384416 | 15520996 ## RELs @@ -133,7 +133,7 @@ d_a_e_mk_bo | 29.776477% | 4476 | 15032 d_a_e_mm | 27.438612% | 4872 | 17756 d_a_e_mm_mt | 28.672856% | 4200 | 14648 d_a_e_ms | 28.208138% | 5768 | 20448 -d_a_e_nest | 29.119005% | 5804 | 19932 +d_a_e_nest | 100.000000% | 19932 | 19932 d_a_e_nz | 32.041969% | 4764 | 14868 d_a_e_oc | 22.586920% | 11148 | 49356 d_a_e_oct_bg | 30.217151% | 6568 | 21736 @@ -182,7 +182,7 @@ d_a_e_zm | 28.267015% | 5200 | 18396 d_a_e_zs | 31.358336% | 3980 | 12692 d_a_econt | 100.000000% | 1464 | 1464 d_a_ep | 30.950696% | 5248 | 16956 -d_a_formation_mng | 27.806286% | 3468 | 12472 +d_a_formation_mng | 100.000000% | 12472 | 12472 d_a_fr | 34.866377% | 4488 | 12872 d_a_grass | 54.690425% | 31552 | 57692 d_a_guard_mng | 100.000000% | 1504 | 1504 @@ -766,7 +766,7 @@ d_a_tag_spinner | 100.000000% | 1928 | 1928 d_a_tag_sppath | 33.333333% | 2040 | 6120 d_a_tag_spring | 100.000000% | 1896 | 1896 d_a_tag_ss_drink | 100.000000% | 3936 | 3936 -d_a_tag_statue_evt | 38.427948% | 2816 | 7328 +d_a_tag_statue_evt | 100.000000% | 7328 | 7328 d_a_tag_stream | 100.000000% | 1480 | 1480 d_a_tag_telop | 100.000000% | 1040 | 1040 d_a_tag_theB_hint | 100.000000% | 1136 | 1136 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 36.734826% | 4224624 | 11500324 +Total | 36.975202% | 4252268 | 11500324 diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__ct__14daE_Nest_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__ct__14daE_Nest_HIO_cFv.s deleted file mode 100644 index 41d5c9a53cf..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__ct__14daE_Nest_HIO_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80500F8C: -/* 80500F8C 3C 80 80 50 */ lis r4, __vt__14daE_Nest_HIO_c@ha /* 0x8050493C@ha */ -/* 80500F90 38 04 49 3C */ addi r0, r4, __vt__14daE_Nest_HIO_c@l /* 0x8050493C@l */ -/* 80500F94 90 03 00 00 */ stw r0, 0(r3) -/* 80500F98 38 00 FF FF */ li r0, -1 -/* 80500F9C 98 03 00 04 */ stb r0, 4(r3) -/* 80500FA0 3C 80 80 50 */ lis r4, lit_3999@ha /* 0x805046DC@ha */ -/* 80500FA4 C0 04 46 DC */ lfs f0, lit_3999@l(r4) /* 0x805046DC@l */ -/* 80500FA8 D0 03 00 08 */ stfs f0, 8(r3) -/* 80500FAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 01b5bc4dd93..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_805045C4: -/* 805045C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805045C8 7C 08 02 A6 */ mflr r0 -/* 805045CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 805045D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805045D4 93 C1 00 08 */ stw r30, 8(r1) -/* 805045D8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 805045DC 7C 9F 23 78 */ mr r31, r4 -/* 805045E0 41 82 00 38 */ beq lbl_80504618 -/* 805045E4 3C 80 80 50 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80504918@ha */ -/* 805045E8 38 84 49 18 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80504918@l */ -/* 805045EC 90 9E 00 10 */ stw r4, 0x10(r30) -/* 805045F0 38 04 00 0C */ addi r0, r4, 0xc -/* 805045F4 90 1E 00 14 */ stw r0, 0x14(r30) -/* 805045F8 38 04 00 18 */ addi r0, r4, 0x18 -/* 805045FC 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80504600 38 80 00 00 */ li r4, 0 -/* 80504604 4B B7 19 91 */ bl __dt__9dBgS_AcchFv -/* 80504608 7F E0 07 35 */ extsh. r0, r31 -/* 8050460C 40 81 00 0C */ ble lbl_80504618 -/* 80504610 7F C3 F3 78 */ mr r3, r30 -/* 80504614 4B DC A7 29 */ bl __dl__FPv -lbl_80504618: -/* 80504618 7F C3 F3 78 */ mr r3, r30 -/* 8050461C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80504620 83 C1 00 08 */ lwz r30, 8(r1) -/* 80504624 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80504628 7C 08 03 A6 */ mtlr r0 -/* 8050462C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80504630 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12nest_hahen_sFv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12nest_hahen_sFv.s deleted file mode 100644 index 79c3055a8ac..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12nest_hahen_sFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_805044AC: -/* 805044AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805044B0 7C 08 02 A6 */ mflr r0 -/* 805044B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805044B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805044BC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 805044C0 41 82 00 10 */ beq lbl_805044D0 -/* 805044C4 7C 80 07 35 */ extsh. r0, r4 -/* 805044C8 40 81 00 08 */ ble lbl_805044D0 -/* 805044CC 4B DC A8 71 */ bl __dl__FPv -lbl_805044D0: -/* 805044D0 7F E3 FB 78 */ mr r3, r31 -/* 805044D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805044D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805044DC 7C 08 03 A6 */ mtlr r0 -/* 805044E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805044E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__14daE_Nest_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__14daE_Nest_HIO_cFv.s deleted file mode 100644 index fcf15dbb9b0..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__14daE_Nest_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80504634: -/* 80504634 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80504638 7C 08 02 A6 */ mflr r0 -/* 8050463C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80504640 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80504644 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80504648 41 82 00 1C */ beq lbl_80504664 -/* 8050464C 3C A0 80 50 */ lis r5, __vt__14daE_Nest_HIO_c@ha /* 0x8050493C@ha */ -/* 80504650 38 05 49 3C */ addi r0, r5, __vt__14daE_Nest_HIO_c@l /* 0x8050493C@l */ -/* 80504654 90 1F 00 00 */ stw r0, 0(r31) -/* 80504658 7C 80 07 35 */ extsh. r0, r4 -/* 8050465C 40 81 00 08 */ ble lbl_80504664 -/* 80504660 4B DC A6 DD */ bl __dl__FPv -lbl_80504664: -/* 80504664 7F E3 FB 78 */ mr r3, r31 -/* 80504668 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8050466C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80504670 7C 08 03 A6 */ mtlr r0 -/* 80504674 38 21 00 10 */ addi r1, r1, 0x10 -/* 80504678 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGAabFv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGAabFv.s deleted file mode 100644 index c68256a46b1..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8050457C: -/* 8050457C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80504580 7C 08 02 A6 */ mflr r0 -/* 80504584 90 01 00 14 */ stw r0, 0x14(r1) -/* 80504588 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8050458C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80504590 41 82 00 1C */ beq lbl_805045AC -/* 80504594 3C A0 80 50 */ lis r5, __vt__8cM3dGAab@ha /* 0x8050490C@ha */ -/* 80504598 38 05 49 0C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8050490C@l */ -/* 8050459C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 805045A0 7C 80 07 35 */ extsh. r0, r4 -/* 805045A4 40 81 00 08 */ ble lbl_805045AC -/* 805045A8 4B DC A7 95 */ bl __dl__FPv -lbl_805045AC: -/* 805045AC 7F E3 FB 78 */ mr r3, r31 -/* 805045B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805045B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805045B8 7C 08 03 A6 */ mtlr r0 -/* 805045BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 805045C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGCylFv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGCylFv.s deleted file mode 100644 index b01f1c1d4e4..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_805044EC: -/* 805044EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805044F0 7C 08 02 A6 */ mflr r0 -/* 805044F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805044F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805044FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80504500 41 82 00 1C */ beq lbl_8050451C -/* 80504504 3C A0 80 50 */ lis r5, __vt__8cM3dGCyl@ha /* 0x805048F4@ha */ -/* 80504508 38 05 48 F4 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x805048F4@l */ -/* 8050450C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80504510 7C 80 07 35 */ extsh. r0, r4 -/* 80504514 40 81 00 08 */ ble lbl_8050451C -/* 80504518 4B DC A8 25 */ bl __dl__FPv -lbl_8050451C: -/* 8050451C 7F E3 FB 78 */ mr r3, r31 -/* 80504520 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80504524 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80504528 7C 08 03 A6 */ mtlr r0 -/* 8050452C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80504530 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGSphFv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGSphFv.s deleted file mode 100644 index be599ba80a0..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80504534: -/* 80504534 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80504538 7C 08 02 A6 */ mflr r0 -/* 8050453C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80504540 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80504544 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80504548 41 82 00 1C */ beq lbl_80504564 -/* 8050454C 3C A0 80 50 */ lis r5, __vt__8cM3dGSph@ha /* 0x80504900@ha */ -/* 80504550 38 05 49 00 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80504900@l */ -/* 80504554 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80504558 7C 80 07 35 */ extsh. r0, r4 -/* 8050455C 40 81 00 08 */ ble lbl_80504564 -/* 80504560 4B DC A7 DD */ bl __dl__FPv -lbl_80504564: -/* 80504564 7F E3 FB 78 */ mr r3, r31 -/* 80504568 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8050456C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80504570 7C 08 03 A6 */ mtlr r0 -/* 80504574 38 21 00 10 */ addi r1, r1, 0x10 -/* 80504578 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__sinit_d_a_e_nest_cpp.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__sinit_d_a_e_nest_cpp.s deleted file mode 100644 index 89aa38ca7db..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__sinit_d_a_e_nest_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8050467C: -/* 8050467C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80504680 7C 08 02 A6 */ mflr r0 -/* 80504684 90 01 00 14 */ stw r0, 0x14(r1) -/* 80504688 3C 60 80 50 */ lis r3, l_HIO@ha /* 0x80504960@ha */ -/* 8050468C 38 63 49 60 */ addi r3, r3, l_HIO@l /* 0x80504960@l */ -/* 80504690 4B FF C8 FD */ bl __ct__14daE_Nest_HIO_cFv -/* 80504694 3C 80 80 50 */ lis r4, __dt__14daE_Nest_HIO_cFv@ha /* 0x80504634@ha */ -/* 80504698 38 84 46 34 */ addi r4, r4, __dt__14daE_Nest_HIO_cFv@l /* 0x80504634@l */ -/* 8050469C 3C A0 80 50 */ lis r5, lit_3994@ha /* 0x80504954@ha */ -/* 805046A0 38 A5 49 54 */ addi r5, r5, lit_3994@l /* 0x80504954@l */ -/* 805046A4 4B FF C8 75 */ bl __register_global_object -/* 805046A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805046AC 7C 08 03 A6 */ mtlr r0 -/* 805046B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805046B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/bee_nest_action__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/bee_nest_action__FP12e_nest_class.s deleted file mode 100644 index cf85971c9bb..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/bee_nest_action__FP12e_nest_class.s +++ /dev/null @@ -1,317 +0,0 @@ -lbl_805031CC: -/* 805031CC 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 805031D0 7C 08 02 A6 */ mflr r0 -/* 805031D4 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 805031D8 DB E1 00 90 */ stfd f31, 0x90(r1) -/* 805031DC F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* qr0 */ -/* 805031E0 39 61 00 90 */ addi r11, r1, 0x90 -/* 805031E4 4B E5 EF E5 */ bl _savegpr_24 -/* 805031E8 7C 7D 1B 78 */ mr r29, r3 -/* 805031EC 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 805031F0 3B E3 46 DC */ addi r31, r3, lit_3999@l /* 0x805046DC@l */ -/* 805031F4 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 805031F8 D0 1D 05 38 */ stfs f0, 0x538(r29) -/* 805031FC C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80503200 D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 80503204 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80503208 D0 1D 05 40 */ stfs f0, 0x540(r29) -/* 8050320C C0 1D 05 38 */ lfs f0, 0x538(r29) -/* 80503210 D0 1D 05 50 */ stfs f0, 0x550(r29) -/* 80503214 C0 1D 05 3C */ lfs f0, 0x53c(r29) -/* 80503218 D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 8050321C C0 1D 05 40 */ lfs f0, 0x540(r29) -/* 80503220 D0 1D 05 58 */ stfs f0, 0x558(r29) -/* 80503224 C0 5D 05 3C */ lfs f2, 0x53c(r29) -/* 80503228 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 8050322C C0 1D 04 EC */ lfs f0, 0x4ec(r29) -/* 80503230 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80503234 EC 02 00 2A */ fadds f0, f2, f0 -/* 80503238 D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 8050323C 3B 20 00 00 */ li r25, 0 -/* 80503240 3B C0 00 00 */ li r30, 0 -/* 80503244 C3 FF 00 04 */ lfs f31, 4(r31) -/* 80503248 3B 40 00 00 */ li r26, 0 -/* 8050324C 88 7D 05 B0 */ lbz r3, 0x5b0(r29) -/* 80503250 7C 60 07 75 */ extsb. r0, r3 -/* 80503254 41 82 00 0C */ beq lbl_80503260 -/* 80503258 38 03 FF FF */ addi r0, r3, -1 -/* 8050325C 98 1D 05 B0 */ stb r0, 0x5b0(r29) -lbl_80503260: -/* 80503260 38 7D 07 E8 */ addi r3, r29, 0x7e8 -/* 80503264 4B B8 05 CD */ bl Move__10dCcD_GSttsFv -/* 80503268 A8 1D 05 7E */ lha r0, 0x57e(r29) -/* 8050326C 2C 00 00 03 */ cmpwi r0, 3 -/* 80503270 41 82 00 6C */ beq lbl_805032DC -/* 80503274 40 80 00 1C */ bge lbl_80503290 -/* 80503278 2C 00 00 01 */ cmpwi r0, 1 -/* 8050327C 41 82 00 30 */ beq lbl_805032AC -/* 80503280 40 80 00 50 */ bge lbl_805032D0 -/* 80503284 2C 00 00 00 */ cmpwi r0, 0 -/* 80503288 40 80 00 18 */ bge lbl_805032A0 -/* 8050328C 48 00 00 90 */ b lbl_8050331C -lbl_80503290: -/* 80503290 2C 00 00 05 */ cmpwi r0, 5 -/* 80503294 41 82 00 70 */ beq lbl_80503304 -/* 80503298 40 80 00 84 */ bge lbl_8050331C -/* 8050329C 48 00 00 54 */ b lbl_805032F0 -lbl_805032A0: -/* 805032A0 7F A3 EB 78 */ mr r3, r29 -/* 805032A4 4B FF E9 39 */ bl e_nest_normal__FP12e_nest_class -/* 805032A8 48 00 00 74 */ b lbl_8050331C -lbl_805032AC: -/* 805032AC 7F A3 EB 78 */ mr r3, r29 -/* 805032B0 4B FF EF D1 */ bl e_nest_drop__FP12e_nest_class -/* 805032B4 3B 40 00 01 */ li r26, 1 -/* 805032B8 A8 1D 05 82 */ lha r0, 0x582(r29) -/* 805032BC 2C 00 00 00 */ cmpwi r0, 0 -/* 805032C0 40 82 00 08 */ bne lbl_805032C8 -/* 805032C4 3B 20 00 01 */ li r25, 1 -lbl_805032C8: -/* 805032C8 3B C0 00 01 */ li r30, 1 -/* 805032CC 48 00 00 50 */ b lbl_8050331C -lbl_805032D0: -/* 805032D0 7F A3 EB 78 */ mr r3, r29 -/* 805032D4 4B FF FE 4D */ bl e_nest_hook__FP12e_nest_class -/* 805032D8 48 00 00 44 */ b lbl_8050331C -lbl_805032DC: -/* 805032DC 7F A3 EB 78 */ mr r3, r29 -/* 805032E0 4B FF F2 E5 */ bl e_nest_carry__FP12e_nest_class -/* 805032E4 7C 79 1B 78 */ mr r25, r3 -/* 805032E8 C3 FF 00 44 */ lfs f31, 0x44(r31) -/* 805032EC 48 00 00 30 */ b lbl_8050331C -lbl_805032F0: -/* 805032F0 7F A3 EB 78 */ mr r3, r29 -/* 805032F4 4B FF F7 E1 */ bl e_nest_float__FP12e_nest_class -/* 805032F8 3B 20 00 01 */ li r25, 1 -/* 805032FC 3B 40 00 01 */ li r26, 1 -/* 80503300 48 00 00 1C */ b lbl_8050331C -lbl_80503304: -/* 80503304 7F A3 EB 78 */ mr r3, r29 -/* 80503308 4B FF FA 29 */ bl e_nest_hahen__FP12e_nest_class -/* 8050330C 80 1D 05 5C */ lwz r0, 0x55c(r29) -/* 80503310 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80503314 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80503318 48 00 03 30 */ b lbl_80503648 -lbl_8050331C: -/* 8050331C 38 7D 05 8C */ addi r3, r29, 0x58c -/* 80503320 FC 20 F8 90 */ fmr f1, f31 -/* 80503324 C0 5F 00 00 */ lfs f2, 0(r31) -/* 80503328 C0 7F 00 7C */ lfs f3, 0x7c(r31) -/* 8050332C 4B D6 C7 11 */ bl cLib_addCalc2__FPffff -/* 80503330 7F 20 07 75 */ extsb. r0, r25 -/* 80503334 41 82 00 18 */ beq lbl_8050334C -/* 80503338 38 7D 05 F4 */ addi r3, r29, 0x5f4 -/* 8050333C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80503340 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80503344 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80503348 4B B7 37 65 */ bl CrrPos__9dBgS_AcchFR4dBgS -lbl_8050334C: -/* 8050334C 7F 40 07 75 */ extsb. r0, r26 -/* 80503350 41 82 00 44 */ beq lbl_80503394 -/* 80503354 80 1D 05 5C */ lwz r0, 0x55c(r29) -/* 80503358 60 00 00 10 */ ori r0, r0, 0x10 -/* 8050335C 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80503360 38 00 00 2C */ li r0, 0x2c -/* 80503364 98 1D 05 48 */ stb r0, 0x548(r29) -/* 80503368 80 1D 04 9C */ lwz r0, 0x49c(r29) -/* 8050336C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80503370 41 82 00 30 */ beq lbl_805033A0 -/* 80503374 38 00 00 03 */ li r0, 3 -/* 80503378 B0 1D 05 7E */ sth r0, 0x57e(r29) -/* 8050337C 38 00 00 00 */ li r0, 0 -/* 80503380 B0 1D 05 80 */ sth r0, 0x580(r29) -/* 80503384 80 1D 08 34 */ lwz r0, 0x834(r29) -/* 80503388 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 8050338C 90 1D 08 34 */ stw r0, 0x834(r29) -/* 80503390 48 00 00 10 */ b lbl_805033A0 -lbl_80503394: -/* 80503394 80 1D 05 5C */ lwz r0, 0x55c(r29) -/* 80503398 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 8050339C 90 1D 05 5C */ stw r0, 0x55c(r29) -lbl_805033A0: -/* 805033A0 7F C0 07 75 */ extsb. r0, r30 -/* 805033A4 41 82 01 94 */ beq lbl_80503538 -/* 805033A8 7F A3 EB 78 */ mr r3, r29 -/* 805033AC 4B FF F3 85 */ bl water_check__FP12e_nest_class -/* 805033B0 2C 03 00 00 */ cmpwi r3, 0 -/* 805033B4 41 82 01 84 */ beq lbl_80503538 -/* 805033B8 38 00 00 04 */ li r0, 4 -/* 805033BC B0 1D 05 7E */ sth r0, 0x57e(r29) -/* 805033C0 38 00 00 00 */ li r0, 0 -/* 805033C4 B0 1D 05 80 */ sth r0, 0x580(r29) -/* 805033C8 38 00 00 02 */ li r0, 2 -/* 805033CC B0 1D 05 62 */ sth r0, 0x562(r29) -/* 805033D0 C0 3D 05 2C */ lfs f1, 0x52c(r29) -/* 805033D4 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 805033D8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805033DC 40 80 00 40 */ bge lbl_8050341C -/* 805033E0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805033E4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805033E8 80 63 00 00 */ lwz r3, 0(r3) -/* 805033EC A8 9D 04 DE */ lha r4, 0x4de(r29) -/* 805033F0 4B B0 8F ED */ bl mDoMtx_YrotS__FPA4_fs -/* 805033F4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 805033F8 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 805033FC C0 1F 00 C8 */ lfs f0, 0xc8(r31) -/* 80503400 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 80503404 C0 1F 00 CC */ lfs f0, 0xcc(r31) -/* 80503408 D0 01 00 60 */ stfs f0, 0x60(r1) -/* 8050340C 38 61 00 58 */ addi r3, r1, 0x58 -/* 80503410 38 9D 04 F8 */ addi r4, r29, 0x4f8 -/* 80503414 4B D6 DA D9 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80503418 48 00 00 38 */ b lbl_80503450 -lbl_8050341C: -/* 8050341C C0 1D 05 94 */ lfs f0, 0x594(r29) -/* 80503420 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80503424 C0 1F 00 D0 */ lfs f0, 0xd0(r31) -/* 80503428 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 8050342C C0 1D 04 F8 */ lfs f0, 0x4f8(r29) -/* 80503430 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80503434 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80503438 D0 1D 04 F8 */ stfs f0, 0x4f8(r29) -/* 8050343C C0 1D 05 00 */ lfs f0, 0x500(r29) -/* 80503440 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80503444 D0 1D 05 00 */ stfs f0, 0x500(r29) -/* 80503448 C0 1F 00 D4 */ lfs f0, 0xd4(r31) -/* 8050344C D0 1D 0A A8 */ stfs f0, 0xaa8(r29) -lbl_80503450: -/* 80503450 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80503454 D0 1D 05 2C */ stfs f0, 0x52c(r29) -/* 80503458 C0 1D 04 EC */ lfs f0, 0x4ec(r29) -/* 8050345C D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80503460 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80503464 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80503468 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8050346C D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80503470 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80503474 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80503478 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8050347C D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80503480 C0 1D 05 94 */ lfs f0, 0x594(r29) -/* 80503484 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80503488 3B 00 00 00 */ li r24, 0 -/* 8050348C 3B C0 00 00 */ li r30, 0 -/* 80503490 3B 80 00 00 */ li r28, 0 -/* 80503494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80503498 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8050349C 3C 60 80 50 */ lis r3, w_eff_id@ha /* 0x80504814@ha */ -/* 805034A0 3B 63 48 14 */ addi r27, r3, w_eff_id@l /* 0x80504814@l */ -lbl_805034A4: -/* 805034A4 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 805034A8 38 00 00 FF */ li r0, 0xff -/* 805034AC 90 01 00 08 */ stw r0, 8(r1) -/* 805034B0 38 80 00 00 */ li r4, 0 -/* 805034B4 90 81 00 0C */ stw r4, 0xc(r1) -/* 805034B8 38 00 FF FF */ li r0, -1 -/* 805034BC 90 01 00 10 */ stw r0, 0x10(r1) -/* 805034C0 90 81 00 14 */ stw r4, 0x14(r1) -/* 805034C4 90 81 00 18 */ stw r4, 0x18(r1) -/* 805034C8 90 81 00 1C */ stw r4, 0x1c(r1) -/* 805034CC 3B 3C 0A C0 */ addi r25, r28, 0xac0 -/* 805034D0 7C 9D C8 2E */ lwzx r4, r29, r25 -/* 805034D4 38 A0 00 00 */ li r5, 0 -/* 805034D8 7C DB F2 2E */ lhzx r6, r27, r30 -/* 805034DC 38 E1 00 40 */ addi r7, r1, 0x40 -/* 805034E0 39 1D 01 0C */ addi r8, r29, 0x10c -/* 805034E4 39 20 00 00 */ li r9, 0 -/* 805034E8 39 41 00 4C */ addi r10, r1, 0x4c -/* 805034EC C0 3F 00 00 */ lfs f1, 0(r31) -/* 805034F0 4B B4 9F DD */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 805034F4 7C 7D C9 2E */ stwx r3, r29, r25 -/* 805034F8 3B 18 00 01 */ addi r24, r24, 1 -/* 805034FC 2C 18 00 04 */ cmpwi r24, 4 -/* 80503500 3B DE 00 02 */ addi r30, r30, 2 -/* 80503504 3B 9C 00 04 */ addi r28, r28, 4 -/* 80503508 41 80 FF 9C */ blt lbl_805034A4 -/* 8050350C 3C 60 00 03 */ lis r3, 0x0003 /* 0x0003001C@ha */ -/* 80503510 38 03 00 1C */ addi r0, r3, 0x001C /* 0x0003001C@l */ -/* 80503514 90 01 00 24 */ stw r0, 0x24(r1) -/* 80503518 38 7D 0A F8 */ addi r3, r29, 0xaf8 -/* 8050351C 38 81 00 24 */ addi r4, r1, 0x24 -/* 80503520 38 A0 00 00 */ li r5, 0 -/* 80503524 38 C0 FF FF */ li r6, -1 -/* 80503528 81 9D 0B 08 */ lwz r12, 0xb08(r29) -/* 8050352C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80503530 7D 89 03 A6 */ mtctr r12 -/* 80503534 4E 80 04 21 */ bctrl -lbl_80503538: -/* 80503538 88 1D 05 67 */ lbz r0, 0x567(r29) -/* 8050353C 7C 00 07 75 */ extsb. r0, r0 -/* 80503540 41 82 01 00 */ beq lbl_80503640 -/* 80503544 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080046@ha */ -/* 80503548 38 03 00 46 */ addi r0, r3, 0x0046 /* 0x00080046@l */ -/* 8050354C 90 01 00 20 */ stw r0, 0x20(r1) -/* 80503550 38 7D 0A F8 */ addi r3, r29, 0xaf8 -/* 80503554 38 81 00 20 */ addi r4, r1, 0x20 -/* 80503558 38 A0 00 00 */ li r5, 0 -/* 8050355C 38 C0 FF FF */ li r6, -1 -/* 80503560 81 9D 0B 08 */ lwz r12, 0xb08(r29) -/* 80503564 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80503568 7D 89 03 A6 */ mtctr r12 -/* 8050356C 4E 80 04 21 */ bctrl -/* 80503570 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80503574 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80503578 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 8050357C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80503580 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80503584 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80503588 C0 3F 00 D8 */ lfs f1, 0xd8(r31) -/* 8050358C C0 1D 04 EC */ lfs f0, 0x4ec(r29) -/* 80503590 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80503594 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80503598 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8050359C D0 01 00 30 */ stfs f0, 0x30(r1) -/* 805035A0 3B 00 00 00 */ li r24, 0 -/* 805035A4 3B C0 00 00 */ li r30, 0 -/* 805035A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805035AC 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805035B0 3C 60 80 50 */ lis r3, b_eff_id@ha /* 0x8050481C@ha */ -/* 805035B4 3B 83 48 1C */ addi r28, r3, b_eff_id@l /* 0x8050481C@l */ -lbl_805035B8: -/* 805035B8 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 805035BC 38 80 00 00 */ li r4, 0 -/* 805035C0 90 81 00 08 */ stw r4, 8(r1) -/* 805035C4 38 00 FF FF */ li r0, -1 -/* 805035C8 90 01 00 0C */ stw r0, 0xc(r1) -/* 805035CC 90 81 00 10 */ stw r4, 0x10(r1) -/* 805035D0 90 81 00 14 */ stw r4, 0x14(r1) -/* 805035D4 90 81 00 18 */ stw r4, 0x18(r1) -/* 805035D8 38 80 00 00 */ li r4, 0 -/* 805035DC 7C BC F2 2E */ lhzx r5, r28, r30 -/* 805035E0 38 C1 00 34 */ addi r6, r1, 0x34 -/* 805035E4 38 FD 01 0C */ addi r7, r29, 0x10c -/* 805035E8 39 1D 04 E4 */ addi r8, r29, 0x4e4 -/* 805035EC 39 21 00 28 */ addi r9, r1, 0x28 -/* 805035F0 39 40 00 FF */ li r10, 0xff -/* 805035F4 C0 3F 00 00 */ lfs f1, 0(r31) -/* 805035F8 4B B4 94 99 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 805035FC 3B 18 00 01 */ addi r24, r24, 1 -/* 80503600 2C 18 00 02 */ cmpwi r24, 2 -/* 80503604 3B DE 00 02 */ addi r30, r30, 2 -/* 80503608 41 80 FF B0 */ blt lbl_805035B8 -/* 8050360C 38 00 00 01 */ li r0, 1 -/* 80503610 98 1D 0B 18 */ stb r0, 0xb18(r29) -/* 80503614 88 1D 05 67 */ lbz r0, 0x567(r29) -/* 80503618 2C 00 00 01 */ cmpwi r0, 1 -/* 8050361C 40 82 00 1C */ bne lbl_80503638 -/* 80503620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80503624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80503628 88 9D 05 73 */ lbz r4, 0x573(r29) -/* 8050362C 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80503630 7C 05 07 74 */ extsb r5, r0 -/* 80503634 4B B3 1B CD */ bl onSwitch__10dSv_info_cFii -lbl_80503638: -/* 80503638 38 00 00 00 */ li r0, 0 -/* 8050363C 98 1D 05 67 */ stb r0, 0x567(r29) -lbl_80503640: -/* 80503640 7F A3 EB 78 */ mr r3, r29 -/* 80503644 4B FF E3 FD */ bl mtx_cc_set__FP12e_nest_class -lbl_80503648: -/* 80503648 E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* qr0 */ -/* 8050364C CB E1 00 90 */ lfd f31, 0x90(r1) -/* 80503650 39 61 00 90 */ addi r11, r1, 0x90 -/* 80503654 4B E5 EB C1 */ bl _restgpr_24 -/* 80503658 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 8050365C 7C 08 03 A6 */ mtlr r0 -/* 80503660 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80503664 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 866b4e1d7e0..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,330 +0,0 @@ -lbl_80503FCC: -/* 80503FCC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80503FD0 7C 08 02 A6 */ mflr r0 -/* 80503FD4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80503FD8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80503FDC 4B E5 E1 FD */ bl _savegpr_28 -/* 80503FE0 7C 7E 1B 78 */ mr r30, r3 -/* 80503FE4 3C 80 80 50 */ lis r4, lit_3999@ha /* 0x805046DC@ha */ -/* 80503FE8 3B E4 46 DC */ addi r31, r4, lit_3999@l /* 0x805046DC@l */ -/* 80503FEC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80503FF0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80503FF4 40 82 01 70 */ bne lbl_80504164 -/* 80503FF8 7F C0 F3 79 */ or. r0, r30, r30 -/* 80503FFC 41 82 01 5C */ beq lbl_80504158 -/* 80504000 7C 1D 03 78 */ mr r29, r0 -/* 80504004 4B B1 4B 61 */ bl __ct__10fopAc_ac_cFv -/* 80504008 38 7D 05 B4 */ addi r3, r29, 0x5b4 -/* 8050400C 4B B7 1E A1 */ bl __ct__12dBgS_AcchCirFv -/* 80504010 3B 9D 05 F4 */ addi r28, r29, 0x5f4 -/* 80504014 7F 83 E3 78 */ mr r3, r28 -/* 80504018 4B B7 20 89 */ bl __ct__9dBgS_AcchFv -/* 8050401C 3C 60 80 50 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80504918@ha */ -/* 80504020 38 63 49 18 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80504918@l */ -/* 80504024 90 7C 00 10 */ stw r3, 0x10(r28) -/* 80504028 38 03 00 0C */ addi r0, r3, 0xc -/* 8050402C 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80504030 38 03 00 18 */ addi r0, r3, 0x18 -/* 80504034 90 1C 00 24 */ stw r0, 0x24(r28) -/* 80504038 38 7C 00 14 */ addi r3, r28, 0x14 -/* 8050403C 4B B7 4E 2D */ bl SetObj__16dBgS_PolyPassChkFv -/* 80504040 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80504044 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80504048 90 1D 07 E4 */ stw r0, 0x7e4(r29) -/* 8050404C 38 7D 07 E8 */ addi r3, r29, 0x7e8 -/* 80504050 4B B7 F7 11 */ bl __ct__10dCcD_GSttsFv -/* 80504054 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80504058 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 8050405C 90 7D 07 E4 */ stw r3, 0x7e4(r29) -/* 80504060 38 03 00 20 */ addi r0, r3, 0x20 -/* 80504064 90 1D 07 E8 */ stw r0, 0x7e8(r29) -/* 80504068 3B 9D 08 08 */ addi r28, r29, 0x808 -/* 8050406C 7F 83 E3 78 */ mr r3, r28 -/* 80504070 4B B7 F9 B9 */ bl __ct__12dCcD_GObjInfFv -/* 80504074 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80504078 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8050407C 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80504080 3C 60 80 50 */ lis r3, __vt__8cM3dGAab@ha /* 0x8050490C@ha */ -/* 80504084 38 03 49 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8050490C@l */ -/* 80504088 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 8050408C 3C 60 80 50 */ lis r3, __vt__8cM3dGSph@ha /* 0x80504900@ha */ -/* 80504090 38 03 49 00 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80504900@l */ -/* 80504094 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80504098 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 8050409C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 805040A0 90 7C 01 20 */ stw r3, 0x120(r28) -/* 805040A4 38 03 00 58 */ addi r0, r3, 0x58 -/* 805040A8 90 1C 01 34 */ stw r0, 0x134(r28) -/* 805040AC 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 805040B0 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 805040B4 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 805040B8 38 03 00 2C */ addi r0, r3, 0x2c -/* 805040BC 90 1C 01 20 */ stw r0, 0x120(r28) -/* 805040C0 38 03 00 84 */ addi r0, r3, 0x84 -/* 805040C4 90 1C 01 34 */ stw r0, 0x134(r28) -/* 805040C8 3B 9D 09 40 */ addi r28, r29, 0x940 -/* 805040CC 7F 83 E3 78 */ mr r3, r28 -/* 805040D0 4B B7 F9 59 */ bl __ct__12dCcD_GObjInfFv -/* 805040D4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 805040D8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 805040DC 90 1C 01 20 */ stw r0, 0x120(r28) -/* 805040E0 3C 60 80 50 */ lis r3, __vt__8cM3dGAab@ha /* 0x8050490C@ha */ -/* 805040E4 38 03 49 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8050490C@l */ -/* 805040E8 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 805040EC 3C 60 80 50 */ lis r3, __vt__8cM3dGCyl@ha /* 0x805048F4@ha */ -/* 805040F0 38 03 48 F4 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x805048F4@l */ -/* 805040F4 90 1C 01 38 */ stw r0, 0x138(r28) -/* 805040F8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 805040FC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80504100 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80504104 38 03 00 58 */ addi r0, r3, 0x58 -/* 80504108 90 1C 01 38 */ stw r0, 0x138(r28) -/* 8050410C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80504110 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80504114 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 80504118 38 03 00 2C */ addi r0, r3, 0x2c -/* 8050411C 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80504120 38 03 00 84 */ addi r0, r3, 0x84 -/* 80504124 90 1C 01 38 */ stw r0, 0x138(r28) -/* 80504128 38 7D 0A D8 */ addi r3, r29, 0xad8 -/* 8050412C 4B DB DB E5 */ bl __ct__18Z2SoundObjBeeGroupFv -/* 80504130 38 7D 0A F8 */ addi r3, r29, 0xaf8 -/* 80504134 4B DB A7 11 */ bl __ct__16Z2SoundObjSimpleFv -/* 80504138 38 7D 0B 1C */ addi r3, r29, 0xb1c -/* 8050413C 3C 80 80 50 */ lis r4, __ct__12nest_hahen_sFv@ha /* 0x805044E8@ha */ -/* 80504140 38 84 44 E8 */ addi r4, r4, __ct__12nest_hahen_sFv@l /* 0x805044E8@l */ -/* 80504144 3C A0 80 50 */ lis r5, __dt__12nest_hahen_sFv@ha /* 0x805044AC@ha */ -/* 80504148 38 A5 44 AC */ addi r5, r5, __dt__12nest_hahen_sFv@l /* 0x805044AC@l */ -/* 8050414C 38 C0 00 58 */ li r6, 0x58 -/* 80504150 38 E0 00 05 */ li r7, 5 -/* 80504154 4B E5 DC 0D */ bl __construct_array -lbl_80504158: -/* 80504158 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8050415C 60 00 00 08 */ ori r0, r0, 8 -/* 80504160 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80504164: -/* 80504164 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80504168 3C 80 80 50 */ lis r4, d_a_e_nest__stringBase0@ha /* 0x805047EC@ha */ -/* 8050416C 38 84 47 EC */ addi r4, r4, d_a_e_nest__stringBase0@l /* 0x805047EC@l */ -/* 80504170 38 84 00 08 */ addi r4, r4, 8 -/* 80504174 4B B2 8D 49 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80504178 7C 7D 1B 78 */ mr r29, r3 -/* 8050417C 2C 1D 00 04 */ cmpwi r29, 4 -/* 80504180 40 82 03 10 */ bne lbl_80504490 -/* 80504184 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80504188 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8050418C 98 1E 05 73 */ stb r0, 0x573(r30) -/* 80504190 38 60 00 00 */ li r3, 0 -/* 80504194 B0 7E 04 E8 */ sth r3, 0x4e8(r30) -/* 80504198 B0 7E 04 E0 */ sth r3, 0x4e0(r30) -/* 8050419C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805041A0 98 1E 05 70 */ stb r0, 0x570(r30) -/* 805041A4 38 00 00 01 */ li r0, 1 -/* 805041A8 98 1E 05 70 */ stb r0, 0x570(r30) -/* 805041AC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805041B0 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 805041B4 98 1E 05 71 */ stb r0, 0x571(r30) -/* 805041B8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805041BC 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 805041C0 98 1E 05 72 */ stb r0, 0x572(r30) -/* 805041C4 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 805041C8 28 00 00 FF */ cmplwi r0, 0xff -/* 805041CC 40 82 00 08 */ bne lbl_805041D4 -/* 805041D0 98 7E 05 72 */ stb r3, 0x572(r30) -lbl_805041D4: -/* 805041D4 7F C3 F3 78 */ mr r3, r30 -/* 805041D8 3C 80 80 50 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80503EA0@ha */ -/* 805041DC 38 84 3E A0 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80503EA0@l */ -/* 805041E0 38 A0 30 00 */ li r5, 0x3000 -/* 805041E4 4B B1 62 CD */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 805041E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805041EC 40 82 00 0C */ bne lbl_805041F8 -/* 805041F0 38 60 00 05 */ li r3, 5 -/* 805041F4 48 00 02 A0 */ b lbl_80504494 -lbl_805041F8: -/* 805041F8 3C 60 80 50 */ lis r3, data_80504950@ha /* 0x80504950@ha */ -/* 805041FC 8C 03 49 50 */ lbzu r0, data_80504950@l(r3) /* 0x80504950@l */ -/* 80504200 28 00 00 00 */ cmplwi r0, 0 -/* 80504204 40 82 00 20 */ bne lbl_80504224 -/* 80504208 38 00 00 01 */ li r0, 1 -/* 8050420C 98 1E 0C F4 */ stb r0, 0xcf4(r30) -/* 80504210 98 03 00 00 */ stb r0, 0(r3) -/* 80504214 38 00 FF FF */ li r0, -1 -/* 80504218 3C 60 80 50 */ lis r3, l_HIO@ha /* 0x80504960@ha */ -/* 8050421C 38 63 49 60 */ addi r3, r3, l_HIO@l /* 0x80504960@l */ -/* 80504220 98 03 00 04 */ stb r0, 4(r3) -lbl_80504224: -/* 80504224 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80504228 38 03 00 24 */ addi r0, r3, 0x24 -/* 8050422C 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80504230 7F C3 F3 78 */ mr r3, r30 -/* 80504234 C0 3F 01 00 */ lfs f1, 0x100(r31) -/* 80504238 FC 40 08 90 */ fmr f2, f1 -/* 8050423C FC 60 08 90 */ fmr f3, f1 -/* 80504240 4B B1 62 E9 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80504244 7F C3 F3 78 */ mr r3, r30 -/* 80504248 C0 3F 01 04 */ lfs f1, 0x104(r31) -/* 8050424C FC 40 08 90 */ fmr f2, f1 -/* 80504250 FC 60 08 90 */ fmr f3, f1 -/* 80504254 4B B1 62 E5 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80504258 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 8050425C 28 00 00 FF */ cmplwi r0, 0xff -/* 80504260 41 82 00 0C */ beq lbl_8050426C -/* 80504264 28 00 00 00 */ cmplwi r0, 0 -/* 80504268 40 82 00 0C */ bne lbl_80504274 -lbl_8050426C: -/* 8050426C 38 00 00 0A */ li r0, 0xa -/* 80504270 98 1E 05 72 */ stb r0, 0x572(r30) -lbl_80504274: -/* 80504274 C0 5F 00 A4 */ lfs f2, 0xa4(r31) -/* 80504278 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 8050427C C8 3F 01 08 */ lfd f1, 0x108(r31) -/* 80504280 90 01 00 24 */ stw r0, 0x24(r1) -/* 80504284 3C 00 43 30 */ lis r0, 0x4330 -/* 80504288 90 01 00 20 */ stw r0, 0x20(r1) -/* 8050428C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80504290 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80504294 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80504298 D0 1E 04 EC */ stfs f0, 0x4ec(r30) -/* 8050429C A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 805042A0 B0 1E 0A AE */ sth r0, 0xaae(r30) -/* 805042A4 88 9E 05 73 */ lbz r4, 0x573(r30) -/* 805042A8 28 04 00 FF */ cmplwi r4, 0xff -/* 805042AC 41 82 00 A0 */ beq lbl_8050434C -/* 805042B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805042B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805042B8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 805042BC 7C 05 07 74 */ extsb r5, r0 -/* 805042C0 4B B3 10 A1 */ bl isSwitch__10dSv_info_cCFii -/* 805042C4 2C 03 00 00 */ cmpwi r3, 0 -/* 805042C8 41 82 00 84 */ beq lbl_8050434C -/* 805042CC C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 805042D0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 805042D4 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 805042D8 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 805042DC C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 805042E0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 805042E4 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 805042E8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 805042EC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 805042F0 38 61 00 10 */ addi r3, r1, 0x10 -/* 805042F4 4B B1 99 C9 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 805042F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805042FC 41 82 00 10 */ beq lbl_8050430C -/* 80504300 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80504304 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80504308 D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_8050430C: -/* 8050430C 38 60 00 01 */ li r3, 1 -/* 80504310 98 7E 0B 18 */ stb r3, 0xb18(r30) -/* 80504314 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80504318 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 8050431C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80504320 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80504324 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80504328 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 8050432C 38 00 00 05 */ li r0, 5 -/* 80504330 B0 1E 05 7E */ sth r0, 0x57e(r30) -/* 80504334 B0 7E 05 80 */ sth r3, 0x580(r30) -/* 80504338 80 7E 0B 1C */ lwz r3, 0xb1c(r30) -/* 8050433C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80504340 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80504344 7F A3 EB 78 */ mr r3, r29 -/* 80504348 48 00 01 4C */ b lbl_80504494 -lbl_8050434C: -/* 8050434C 38 7E 07 CC */ addi r3, r30, 0x7cc -/* 80504350 38 80 00 64 */ li r4, 0x64 -/* 80504354 38 A0 00 00 */ li r5, 0 -/* 80504358 7F C6 F3 78 */ mr r6, r30 -/* 8050435C 4B B7 F5 05 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80504360 38 7E 08 08 */ addi r3, r30, 0x808 -/* 80504364 3C 80 80 50 */ lis r4, cc_sph_src@ha /* 0x80504820@ha */ -/* 80504368 38 84 48 20 */ addi r4, r4, cc_sph_src@l /* 0x80504820@l */ -/* 8050436C 4B B8 06 C9 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80504370 38 1E 07 CC */ addi r0, r30, 0x7cc -/* 80504374 90 1E 08 4C */ stw r0, 0x84c(r30) -/* 80504378 38 7E 09 40 */ addi r3, r30, 0x940 -/* 8050437C 3C 80 80 50 */ lis r4, cc_cyl_src@ha /* 0x80504860@ha */ -/* 80504380 38 84 48 60 */ addi r4, r4, cc_cyl_src@l /* 0x80504860@l */ -/* 80504384 4B B8 05 31 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80504388 38 1E 07 CC */ addi r0, r30, 0x7cc -/* 8050438C 90 1E 09 84 */ stw r0, 0x984(r30) -/* 80504390 88 1E 05 70 */ lbz r0, 0x570(r30) -/* 80504394 28 00 00 01 */ cmplwi r0, 1 -/* 80504398 40 82 00 9C */ bne lbl_80504434 -/* 8050439C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 805043A0 7C 07 07 74 */ extsb r7, r0 -/* 805043A4 38 00 00 00 */ li r0, 0 -/* 805043A8 90 01 00 08 */ stw r0, 8(r1) -/* 805043AC 38 60 01 ED */ li r3, 0x1ed -/* 805043B0 28 1E 00 00 */ cmplwi r30, 0 -/* 805043B4 41 82 00 0C */ beq lbl_805043C0 -/* 805043B8 80 9E 00 04 */ lwz r4, 4(r30) -/* 805043BC 48 00 00 08 */ b lbl_805043C4 -lbl_805043C0: -/* 805043C0 38 80 FF FF */ li r4, -1 -lbl_805043C4: -/* 805043C4 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 805043C8 54 00 80 1E */ slwi r0, r0, 0x10 -/* 805043CC 60 05 01 00 */ ori r5, r0, 0x100 -/* 805043D0 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 805043D4 7C A5 03 78 */ or r5, r5, r0 -/* 805043D8 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 805043DC 39 00 00 00 */ li r8, 0 -/* 805043E0 39 20 00 00 */ li r9, 0 -/* 805043E4 39 40 FF FF */ li r10, -1 -/* 805043E8 4B B1 5B 09 */ bl fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -/* 805043EC 38 00 00 00 */ li r0, 0 -/* 805043F0 90 01 00 08 */ stw r0, 8(r1) -/* 805043F4 38 7E 05 F4 */ addi r3, r30, 0x5f4 -/* 805043F8 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 805043FC 38 BE 04 BC */ addi r5, r30, 0x4bc -/* 80504400 7F C6 F3 78 */ mr r6, r30 -/* 80504404 38 E0 00 01 */ li r7, 1 -/* 80504408 39 1E 05 B4 */ addi r8, r30, 0x5b4 -/* 8050440C 39 3E 04 F8 */ addi r9, r30, 0x4f8 -/* 80504410 39 40 00 00 */ li r10, 0 -/* 80504414 4B B7 1E 35 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80504418 C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 8050441C C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80504420 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80504424 38 7E 05 B4 */ addi r3, r30, 0x5b4 -/* 80504428 FC 40 08 90 */ fmr f2, f1 -/* 8050442C 4B B7 1B 2D */ bl SetWall__12dBgS_AcchCirFff -/* 80504430 48 00 00 50 */ b lbl_80504480 -lbl_80504434: -/* 80504434 28 00 00 02 */ cmplwi r0, 2 -/* 80504438 40 82 00 48 */ bne lbl_80504480 -/* 8050443C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80504440 7C 07 07 74 */ extsb r7, r0 -/* 80504444 38 00 00 00 */ li r0, 0 -/* 80504448 90 01 00 08 */ stw r0, 8(r1) -/* 8050444C 38 60 01 EC */ li r3, 0x1ec -/* 80504450 28 1E 00 00 */ cmplwi r30, 0 -/* 80504454 41 82 00 0C */ beq lbl_80504460 -/* 80504458 80 9E 00 04 */ lwz r4, 4(r30) -/* 8050445C 48 00 00 08 */ b lbl_80504464 -lbl_80504460: -/* 80504460 38 80 FF FF */ li r4, -1 -lbl_80504464: -/* 80504464 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 80504468 64 05 FF 00 */ oris r5, r0, 0xff00 -/* 8050446C 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80504470 39 00 00 00 */ li r8, 0 -/* 80504474 39 20 00 00 */ li r9, 0 -/* 80504478 39 40 FF FF */ li r10, -1 -/* 8050447C 4B B1 5A 75 */ bl fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -lbl_80504480: -/* 80504480 7F C3 F3 78 */ mr r3, r30 -/* 80504484 4B FF D5 BD */ bl mtx_cc_set__FP12e_nest_class -/* 80504488 38 00 FF FF */ li r0, -1 -/* 8050448C 90 1E 0A A4 */ stw r0, 0xaa4(r30) -lbl_80504490: -/* 80504490 7F A3 EB 78 */ mr r3, r29 -lbl_80504494: -/* 80504494 39 61 00 40 */ addi r11, r1, 0x40 -/* 80504498 4B E5 DD 8D */ bl _restgpr_28 -/* 8050449C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805044A0 7C 08 03 A6 */ mtlr r0 -/* 805044A4 38 21 00 40 */ addi r1, r1, 0x40 -/* 805044A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Delete__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Delete__FP12e_nest_class.s deleted file mode 100644 index ce022854272..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Delete__FP12e_nest_class.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80503E2C: -/* 80503E2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80503E30 7C 08 02 A6 */ mflr r0 -/* 80503E34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80503E38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80503E3C 7C 7F 1B 78 */ mr r31, r3 -/* 80503E40 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80503E44 3C 80 80 50 */ lis r4, d_a_e_nest__stringBase0@ha /* 0x805047EC@ha */ -/* 80503E48 38 84 47 EC */ addi r4, r4, d_a_e_nest__stringBase0@l /* 0x805047EC@l */ -/* 80503E4C 38 84 00 08 */ addi r4, r4, 8 -/* 80503E50 4B B2 91 B9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80503E54 88 1F 0C F4 */ lbz r0, 0xcf4(r31) -/* 80503E58 28 00 00 00 */ cmplwi r0, 0 -/* 80503E5C 41 82 00 10 */ beq lbl_80503E6C -/* 80503E60 38 00 00 00 */ li r0, 0 -/* 80503E64 3C 60 80 50 */ lis r3, data_80504950@ha /* 0x80504950@ha */ -/* 80503E68 98 03 49 50 */ stb r0, data_80504950@l(r3) /* 0x80504950@l */ -lbl_80503E6C: -/* 80503E6C 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80503E70 28 00 00 00 */ cmplwi r0, 0 -/* 80503E74 41 82 00 14 */ beq lbl_80503E88 -/* 80503E78 38 7F 0A F8 */ addi r3, r31, 0xaf8 -/* 80503E7C 4B DB A1 7D */ bl deleteObject__14Z2SoundObjBaseFv -/* 80503E80 38 7F 0A D8 */ addi r3, r31, 0xad8 -/* 80503E84 4B DB A1 75 */ bl deleteObject__14Z2SoundObjBaseFv -lbl_80503E88: -/* 80503E88 38 60 00 01 */ li r3, 1 -/* 80503E8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80503E90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80503E94 7C 08 03 A6 */ mtlr r0 -/* 80503E98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80503E9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Draw__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Draw__FP12e_nest_class.s deleted file mode 100644 index 788f36869ff..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Draw__FP12e_nest_class.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80501930: -/* 80501930 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80501934 7C 08 02 A6 */ mflr r0 -/* 80501938 90 01 00 24 */ stw r0, 0x24(r1) -/* 8050193C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80501940 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80501944 7C 7E 1B 78 */ mr r30, r3 -/* 80501948 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 8050194C 3B E3 46 DC */ addi r31, r3, lit_3999@l /* 0x805046DC@l */ -/* 80501950 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80501954 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80501958 38 80 00 00 */ li r4, 0 -/* 8050195C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80501960 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80501964 4B CA 1E 61 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80501968 88 1E 0B 18 */ lbz r0, 0xb18(r30) -/* 8050196C 7C 00 07 75 */ extsb. r0, r0 -/* 80501970 41 82 00 14 */ beq lbl_80501984 -/* 80501974 7F C3 F3 78 */ mr r3, r30 -/* 80501978 4B FF F6 39 */ bl hahen_draw__FP12e_nest_class -/* 8050197C 38 60 00 01 */ li r3, 1 -/* 80501980 48 00 00 A8 */ b lbl_80501A28 -lbl_80501984: -/* 80501984 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80501988 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8050198C 80 9E 05 78 */ lwz r4, 0x578(r30) -/* 80501990 80 84 00 04 */ lwz r4, 4(r4) -/* 80501994 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80501998 4B CA 34 09 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8050199C 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 805019A0 4B B0 C3 25 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 805019A4 A8 1E 05 7E */ lha r0, 0x57e(r30) -/* 805019A8 2C 00 00 01 */ cmpwi r0, 1 -/* 805019AC 40 82 00 78 */ bne lbl_80501A24 -/* 805019B0 3C 60 80 50 */ lis r3, l_HIO@ha /* 0x80504960@ha */ -/* 805019B4 38 63 49 60 */ addi r3, r3, l_HIO@l /* 0x80504960@l */ -/* 805019B8 C0 23 00 08 */ lfs f1, 8(r3) -/* 805019BC C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 805019C0 EC 81 00 32 */ fmuls f4, f1, f0 -/* 805019C4 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 805019C8 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 805019CC C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 805019D0 EC 20 18 2A */ fadds f1, f0, f3 -/* 805019D4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 805019D8 D0 01 00 08 */ stfs f0, 8(r1) -/* 805019DC D0 21 00 0C */ stfs f1, 0xc(r1) -/* 805019E0 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 805019E4 80 7E 05 A0 */ lwz r3, 0x5a0(r30) -/* 805019E8 38 80 00 01 */ li r4, 1 -/* 805019EC 80 BE 05 78 */ lwz r5, 0x578(r30) -/* 805019F0 38 C1 00 08 */ addi r6, r1, 8 -/* 805019F4 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 805019F8 EC 20 01 32 */ fmuls f1, f0, f4 -/* 805019FC C0 5F 00 04 */ lfs f2, 4(r31) -/* 80501A00 C0 9E 06 8C */ lfs f4, 0x68c(r30) -/* 80501A04 38 FE 06 E4 */ addi r7, r30, 0x6e4 -/* 80501A08 39 1E 01 0C */ addi r8, r30, 0x10c -/* 80501A0C 39 20 00 00 */ li r9, 0 -/* 80501A10 C0 BF 00 00 */ lfs f5, 0(r31) -/* 80501A14 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80501A18 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80501A1C 4B B2 CE F5 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80501A20 90 7E 05 A0 */ stw r3, 0x5a0(r30) -lbl_80501A24: -/* 80501A24 38 60 00 01 */ li r3, 1 -lbl_80501A28: -/* 80501A28 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80501A2C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80501A30 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80501A34 7C 08 03 A6 */ mtlr r0 -/* 80501A38 38 21 00 20 */ addi r1, r1, 0x20 -/* 80501A3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Execute__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Execute__FP12e_nest_class.s deleted file mode 100644 index cf527eb916b..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Execute__FP12e_nest_class.s +++ /dev/null @@ -1,314 +0,0 @@ -lbl_80503984: -/* 80503984 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 80503988 7C 08 02 A6 */ mflr r0 -/* 8050398C 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 80503990 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 80503994 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 80503998 DB C1 00 A0 */ stfd f30, 0xa0(r1) -/* 8050399C F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 /* qr0 */ -/* 805039A0 DB A1 00 90 */ stfd f29, 0x90(r1) -/* 805039A4 F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 /* qr0 */ -/* 805039A8 DB 81 00 80 */ stfd f28, 0x80(r1) -/* 805039AC F3 81 00 88 */ psq_st f28, 136(r1), 0, 0 /* qr0 */ -/* 805039B0 DB 61 00 70 */ stfd f27, 0x70(r1) -/* 805039B4 F3 61 00 78 */ psq_st f27, 120(r1), 0, 0 /* qr0 */ -/* 805039B8 DB 41 00 60 */ stfd f26, 0x60(r1) -/* 805039BC F3 41 00 68 */ psq_st f26, 104(r1), 0, 0 /* qr0 */ -/* 805039C0 39 61 00 60 */ addi r11, r1, 0x60 -/* 805039C4 4B E5 E8 0D */ bl _savegpr_26 -/* 805039C8 7C 7E 1B 78 */ mr r30, r3 -/* 805039CC 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 805039D0 3B E3 46 DC */ addi r31, r3, lit_3999@l /* 0x805046DC@l */ -/* 805039D4 A8 7E 05 7C */ lha r3, 0x57c(r30) -/* 805039D8 38 03 00 01 */ addi r0, r3, 1 -/* 805039DC B0 1E 05 7C */ sth r0, 0x57c(r30) -/* 805039E0 38 60 00 00 */ li r3, 0 -/* 805039E4 38 00 00 03 */ li r0, 3 -/* 805039E8 7C 09 03 A6 */ mtctr r0 -lbl_805039EC: -/* 805039EC 38 A3 05 82 */ addi r5, r3, 0x582 -/* 805039F0 7C 9E 2A AE */ lhax r4, r30, r5 -/* 805039F4 2C 04 00 00 */ cmpwi r4, 0 -/* 805039F8 41 82 00 0C */ beq lbl_80503A04 -/* 805039FC 38 04 FF FF */ addi r0, r4, -1 -/* 80503A00 7C 1E 2B 2E */ sthx r0, r30, r5 -lbl_80503A04: -/* 80503A04 38 63 00 02 */ addi r3, r3, 2 -/* 80503A08 42 00 FF E4 */ bdnz lbl_805039EC -/* 80503A0C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80503A10 7C 03 07 74 */ extsb r3, r0 -/* 80503A14 4B B2 96 59 */ bl dComIfGp_getReverb__Fi -/* 80503A18 7C 65 1B 78 */ mr r5, r3 -/* 80503A1C 38 7E 0A F8 */ addi r3, r30, 0xaf8 -/* 80503A20 38 80 00 00 */ li r4, 0 -/* 80503A24 81 9E 0B 08 */ lwz r12, 0xb08(r30) -/* 80503A28 81 8C 00 08 */ lwz r12, 8(r12) -/* 80503A2C 7D 89 03 A6 */ mtctr r12 -/* 80503A30 4E 80 04 21 */ bctrl -/* 80503A34 88 1E 0B 18 */ lbz r0, 0xb18(r30) -/* 80503A38 2C 00 00 03 */ cmpwi r0, 3 -/* 80503A3C 40 82 02 14 */ bne lbl_80503C50 -/* 80503A40 3C 60 80 50 */ lis r3, shot_b_sub__FPvPv@ha /* 0x80503668@ha */ -/* 80503A44 38 63 36 68 */ addi r3, r3, shot_b_sub__FPvPv@l /* 0x80503668@l */ -/* 80503A48 7F C4 F3 78 */ mr r4, r30 -/* 80503A4C 4B B1 D8 ED */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80503A50 7C 64 1B 79 */ or. r4, r3, r3 -/* 80503A54 41 82 01 FC */ beq lbl_80503C50 -/* 80503A58 38 61 00 0C */ addi r3, r1, 0xc -/* 80503A5C 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80503A60 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80503A64 4B D6 30 D1 */ bl __mi__4cXyzCFRC3Vec -/* 80503A68 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80503A6C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80503A70 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80503A74 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80503A78 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80503A7C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80503A80 38 61 00 18 */ addi r3, r1, 0x18 -/* 80503A84 4B E4 36 B5 */ bl PSVECSquareMag -/* 80503A88 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80503A8C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80503A90 40 81 00 58 */ ble lbl_80503AE8 -/* 80503A94 FC 00 08 34 */ frsqrte f0, f1 -/* 80503A98 C8 9F 00 08 */ lfd f4, 8(r31) -/* 80503A9C FC 44 00 32 */ fmul f2, f4, f0 -/* 80503AA0 C8 7F 00 10 */ lfd f3, 0x10(r31) -/* 80503AA4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80503AA8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80503AAC FC 03 00 28 */ fsub f0, f3, f0 -/* 80503AB0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80503AB4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80503AB8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80503ABC FC 01 00 32 */ fmul f0, f1, f0 -/* 80503AC0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80503AC4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80503AC8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80503ACC FC 00 00 32 */ fmul f0, f0, f0 -/* 80503AD0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80503AD4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80503AD8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80503ADC FC 21 00 32 */ fmul f1, f1, f0 -/* 80503AE0 FC 20 08 18 */ frsp f1, f1 -/* 80503AE4 48 00 00 88 */ b lbl_80503B6C -lbl_80503AE8: -/* 80503AE8 C8 1F 00 18 */ lfd f0, 0x18(r31) -/* 80503AEC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80503AF0 40 80 00 10 */ bge lbl_80503B00 -/* 80503AF4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80503AF8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80503AFC 48 00 00 70 */ b lbl_80503B6C -lbl_80503B00: -/* 80503B00 D0 21 00 08 */ stfs f1, 8(r1) -/* 80503B04 80 81 00 08 */ lwz r4, 8(r1) -/* 80503B08 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80503B0C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80503B10 7C 03 00 00 */ cmpw r3, r0 -/* 80503B14 41 82 00 14 */ beq lbl_80503B28 -/* 80503B18 40 80 00 40 */ bge lbl_80503B58 -/* 80503B1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80503B20 41 82 00 20 */ beq lbl_80503B40 -/* 80503B24 48 00 00 34 */ b lbl_80503B58 -lbl_80503B28: -/* 80503B28 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80503B2C 41 82 00 0C */ beq lbl_80503B38 -/* 80503B30 38 00 00 01 */ li r0, 1 -/* 80503B34 48 00 00 28 */ b lbl_80503B5C -lbl_80503B38: -/* 80503B38 38 00 00 02 */ li r0, 2 -/* 80503B3C 48 00 00 20 */ b lbl_80503B5C -lbl_80503B40: -/* 80503B40 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80503B44 41 82 00 0C */ beq lbl_80503B50 -/* 80503B48 38 00 00 05 */ li r0, 5 -/* 80503B4C 48 00 00 10 */ b lbl_80503B5C -lbl_80503B50: -/* 80503B50 38 00 00 03 */ li r0, 3 -/* 80503B54 48 00 00 08 */ b lbl_80503B5C -lbl_80503B58: -/* 80503B58 38 00 00 04 */ li r0, 4 -lbl_80503B5C: -/* 80503B5C 2C 00 00 01 */ cmpwi r0, 1 -/* 80503B60 40 82 00 0C */ bne lbl_80503B6C -/* 80503B64 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80503B68 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80503B6C: -/* 80503B6C C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80503B70 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80503B74 40 80 00 DC */ bge lbl_80503C50 -/* 80503B78 3B 9E 0B 1C */ addi r28, r30, 0xb1c -/* 80503B7C 3B A0 00 00 */ li r29, 0 -/* 80503B80 C3 5F 00 04 */ lfs f26, 4(r31) -lbl_80503B84: -/* 80503B84 C0 1C 00 20 */ lfs f0, 0x20(r28) -/* 80503B88 FC 00 D0 40 */ fcmpo cr0, f0, f26 -/* 80503B8C 4C 40 13 82 */ cror 2, 0, 2 -/* 80503B90 40 82 00 B0 */ bne lbl_80503C40 -/* 80503B94 38 00 00 01 */ li r0, 1 -/* 80503B98 98 1C 00 53 */ stb r0, 0x53(r28) -/* 80503B9C C0 3F 00 F4 */ lfs f1, 0xf4(r31) -/* 80503BA0 4B D6 3D ED */ bl cM_rndFX__Ff -/* 80503BA4 FC 00 08 1E */ fctiwz f0, f1 -/* 80503BA8 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 80503BAC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80503BB0 B0 1C 00 34 */ sth r0, 0x34(r28) -/* 80503BB4 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 80503BB8 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 80503BBC 80 63 00 00 */ lwz r3, 0(r3) -/* 80503BC0 A8 9C 00 36 */ lha r4, 0x36(r28) -/* 80503BC4 4B B0 88 19 */ bl mDoMtx_YrotS__FPA4_fs -/* 80503BC8 C0 5F 00 04 */ lfs f2, 4(r31) -/* 80503BCC D0 41 00 30 */ stfs f2, 0x30(r1) -/* 80503BD0 C0 3F 00 90 */ lfs f1, 0x90(r31) -/* 80503BD4 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80503BD8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80503BDC D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80503BE0 D0 41 00 38 */ stfs f2, 0x38(r1) -/* 80503BE4 38 61 00 30 */ addi r3, r1, 0x30 -/* 80503BE8 38 81 00 24 */ addi r4, r1, 0x24 -/* 80503BEC 4B D6 D3 01 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80503BF0 38 7C 00 04 */ addi r3, r28, 4 -/* 80503BF4 38 81 00 24 */ addi r4, r1, 0x24 -/* 80503BF8 7C 65 1B 78 */ mr r5, r3 -/* 80503BFC 4B E4 34 95 */ bl PSVECAdd -/* 80503C00 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80503C04 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80503C08 C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 80503C0C 4B D6 3D 49 */ bl cM_rndF__Ff -/* 80503C10 C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 80503C14 EC 20 08 2A */ fadds f1, f0, f1 -/* 80503C18 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80503C1C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80503C20 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80503C24 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80503C28 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80503C2C 38 61 00 30 */ addi r3, r1, 0x30 -/* 80503C30 38 9C 00 1C */ addi r4, r28, 0x1c -/* 80503C34 4B D6 D2 B9 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80503C38 38 00 00 00 */ li r0, 0 -/* 80503C3C 98 1C 00 52 */ stb r0, 0x52(r28) -lbl_80503C40: -/* 80503C40 3B BD 00 01 */ addi r29, r29, 1 -/* 80503C44 2C 1D 00 05 */ cmpwi r29, 5 -/* 80503C48 3B 9C 00 58 */ addi r28, r28, 0x58 -/* 80503C4C 41 80 FF 38 */ blt lbl_80503B84 -lbl_80503C50: -/* 80503C50 88 1E 0B 18 */ lbz r0, 0xb18(r30) -/* 80503C54 2C 00 00 01 */ cmpwi r0, 1 -/* 80503C58 40 82 01 5C */ bne lbl_80503DB4 -/* 80503C5C 38 00 00 02 */ li r0, 2 -/* 80503C60 98 1E 0B 18 */ stb r0, 0xb18(r30) -/* 80503C64 38 00 00 05 */ li r0, 5 -/* 80503C68 B0 1E 05 7E */ sth r0, 0x57e(r30) -/* 80503C6C 38 00 00 00 */ li r0, 0 -/* 80503C70 B0 1E 05 80 */ sth r0, 0x580(r30) -/* 80503C74 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80503C78 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 -/* 80503C7C 90 1E 04 9C */ stw r0, 0x49c(r30) -/* 80503C80 3B 7E 0B 1C */ addi r27, r30, 0xb1c -/* 80503C84 3B 40 00 00 */ li r26, 0 -/* 80503C88 3B A0 00 00 */ li r29, 0 -/* 80503C8C C3 FF 00 D8 */ lfs f31, 0xd8(r31) -/* 80503C90 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 80503C94 3B 83 07 68 */ addi r28, r3, calc_mtx@l /* 0x80450768@l */ -/* 80503C98 C3 5F 00 04 */ lfs f26, 4(r31) -/* 80503C9C C3 7F 00 90 */ lfs f27, 0x90(r31) -/* 80503CA0 C3 9F 00 F8 */ lfs f28, 0xf8(r31) -/* 80503CA4 C3 BF 00 48 */ lfs f29, 0x48(r31) -/* 80503CA8 C3 DF 00 60 */ lfs f30, 0x60(r31) -lbl_80503CAC: -/* 80503CAC 38 00 00 01 */ li r0, 1 -/* 80503CB0 98 1B 00 53 */ stb r0, 0x53(r27) -/* 80503CB4 C0 3F 00 EC */ lfs f1, 0xec(r31) -/* 80503CB8 4B D6 3C 9D */ bl cM_rndF__Ff -/* 80503CBC EC 3F 08 2A */ fadds f1, f31, f1 -/* 80503CC0 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80503CC4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80503CC8 D0 1B 00 28 */ stfs f0, 0x28(r27) -/* 80503CCC D0 1B 00 30 */ stfs f0, 0x30(r27) -/* 80503CD0 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80503CD4 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 80503CD8 D0 1B 00 2C */ stfs f0, 0x2c(r27) -/* 80503CDC C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80503CE0 D0 1B 00 04 */ stfs f0, 4(r27) -/* 80503CE4 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80503CE8 D0 1B 00 08 */ stfs f0, 8(r27) -/* 80503CEC C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80503CF0 D0 1B 00 0C */ stfs f0, 0xc(r27) -/* 80503CF4 B3 BB 00 36 */ sth r29, 0x36(r27) -/* 80503CF8 38 00 C0 00 */ li r0, -16384 -/* 80503CFC B0 1B 00 34 */ sth r0, 0x34(r27) -/* 80503D00 80 7C 00 00 */ lwz r3, 0(r28) -/* 80503D04 A8 9B 00 36 */ lha r4, 0x36(r27) -/* 80503D08 4B B0 86 D5 */ bl mDoMtx_YrotS__FPA4_fs -/* 80503D0C D3 41 00 30 */ stfs f26, 0x30(r1) -/* 80503D10 C0 3E 04 EC */ lfs f1, 0x4ec(r30) -/* 80503D14 EC 1B 00 72 */ fmuls f0, f27, f1 -/* 80503D18 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80503D1C EC 1C 00 72 */ fmuls f0, f28, f1 -/* 80503D20 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80503D24 38 61 00 30 */ addi r3, r1, 0x30 -/* 80503D28 38 81 00 24 */ addi r4, r1, 0x24 -/* 80503D2C 4B D6 D1 C1 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80503D30 38 7B 00 04 */ addi r3, r27, 4 -/* 80503D34 38 81 00 24 */ addi r4, r1, 0x24 -/* 80503D38 7C 65 1B 78 */ mr r5, r3 -/* 80503D3C 4B E4 33 55 */ bl PSVECAdd -/* 80503D40 D3 41 00 30 */ stfs f26, 0x30(r1) -/* 80503D44 C0 3F 00 AC */ lfs f1, 0xac(r31) -/* 80503D48 4B D6 3C 0D */ bl cM_rndF__Ff -/* 80503D4C EC 3D 08 2A */ fadds f1, f29, f1 -/* 80503D50 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80503D54 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80503D58 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80503D5C C0 3F 00 00 */ lfs f1, 0(r31) -/* 80503D60 4B D6 3B F5 */ bl cM_rndF__Ff -/* 80503D64 EC 3E 08 2A */ fadds f1, f30, f1 -/* 80503D68 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80503D6C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80503D70 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80503D74 38 61 00 30 */ addi r3, r1, 0x30 -/* 80503D78 38 9B 00 1C */ addi r4, r27, 0x1c -/* 80503D7C 4B D6 D1 71 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80503D80 38 00 00 00 */ li r0, 0 -/* 80503D84 98 1B 00 52 */ stb r0, 0x52(r27) -/* 80503D88 C0 3F 00 FC */ lfs f1, 0xfc(r31) -/* 80503D8C 4B D6 3B C9 */ bl cM_rndF__Ff -/* 80503D90 FC 00 08 1E */ fctiwz f0, f1 -/* 80503D94 D8 01 00 40 */ stfd f0, 0x40(r1) -/* 80503D98 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80503D9C B0 1B 00 44 */ sth r0, 0x44(r27) -/* 80503DA0 3B 5A 00 01 */ addi r26, r26, 1 -/* 80503DA4 2C 1A 00 05 */ cmpwi r26, 5 -/* 80503DA8 3B BD 33 33 */ addi r29, r29, 0x3333 -/* 80503DAC 3B 7B 00 58 */ addi r27, r27, 0x58 -/* 80503DB0 41 80 FE FC */ blt lbl_80503CAC -lbl_80503DB4: -/* 80503DB4 7F C3 F3 78 */ mr r3, r30 -/* 80503DB8 4B FF DA 45 */ bl hahen_move__FP12e_nest_class -/* 80503DBC 88 1E 05 70 */ lbz r0, 0x570(r30) -/* 80503DC0 28 00 00 01 */ cmplwi r0, 1 -/* 80503DC4 40 82 00 0C */ bne lbl_80503DD0 -/* 80503DC8 7F C3 F3 78 */ mr r3, r30 -/* 80503DCC 4B FF F4 01 */ bl bee_nest_action__FP12e_nest_class -lbl_80503DD0: -/* 80503DD0 7F C3 F3 78 */ mr r3, r30 -/* 80503DD4 4B FF F9 0D */ bl demo_camera__FP12e_nest_class -/* 80503DD8 38 60 00 01 */ li r3, 1 -/* 80503DDC E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 80503DE0 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 80503DE4 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 /* qr0 */ -/* 80503DE8 CB C1 00 A0 */ lfd f30, 0xa0(r1) -/* 80503DEC E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 /* qr0 */ -/* 80503DF0 CB A1 00 90 */ lfd f29, 0x90(r1) -/* 80503DF4 E3 81 00 88 */ psq_l f28, 136(r1), 0, 0 /* qr0 */ -/* 80503DF8 CB 81 00 80 */ lfd f28, 0x80(r1) -/* 80503DFC E3 61 00 78 */ psq_l f27, 120(r1), 0, 0 /* qr0 */ -/* 80503E00 CB 61 00 70 */ lfd f27, 0x70(r1) -/* 80503E04 E3 41 00 68 */ psq_l f26, 104(r1), 0, 0 /* qr0 */ -/* 80503E08 CB 41 00 60 */ lfd f26, 0x60(r1) -/* 80503E0C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80503E10 4B E5 E4 0D */ bl _restgpr_26 -/* 80503E14 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 80503E18 7C 08 03 A6 */ mtlr r0 -/* 80503E1C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80503E20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/demo_camera__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/demo_camera__FP12e_nest_class.s deleted file mode 100644 index 204b0ae1437..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/demo_camera__FP12e_nest_class.s +++ /dev/null @@ -1,178 +0,0 @@ -lbl_805036E0: -/* 805036E0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 805036E4 7C 08 02 A6 */ mflr r0 -/* 805036E8 90 01 00 54 */ stw r0, 0x54(r1) -/* 805036EC 39 61 00 50 */ addi r11, r1, 0x50 -/* 805036F0 4B E5 EA E9 */ bl _savegpr_28 -/* 805036F4 7C 7E 1B 78 */ mr r30, r3 -/* 805036F8 3C 80 80 50 */ lis r4, lit_3999@ha /* 0x805046DC@ha */ -/* 805036FC 3B A4 46 DC */ addi r29, r4, lit_3999@l /* 0x805046DC@l */ -/* 80503700 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80503704 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80503708 88 04 5D B0 */ lbz r0, 0x5db0(r4) -/* 8050370C 7C 00 07 74 */ extsb r0, r0 -/* 80503710 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 80503714 7C 84 02 14 */ add r4, r4, r0 -/* 80503718 83 E4 5D 74 */ lwz r31, 0x5d74(r4) -/* 8050371C 3B 80 00 00 */ li r28, 0 -/* 80503720 A8 03 0C D4 */ lha r0, 0xcd4(r3) -/* 80503724 2C 00 00 01 */ cmpwi r0, 1 -/* 80503728 41 82 00 18 */ beq lbl_80503740 -/* 8050372C 40 80 00 08 */ bge lbl_80503734 -/* 80503730 48 00 01 4C */ b lbl_8050387C -lbl_80503734: -/* 80503734 2C 00 00 03 */ cmpwi r0, 3 -/* 80503738 40 80 01 44 */ bge lbl_8050387C -/* 8050373C 48 00 00 CC */ b lbl_80503808 -lbl_80503740: -/* 80503740 A0 1E 00 F8 */ lhz r0, 0xf8(r30) -/* 80503744 28 00 00 02 */ cmplwi r0, 2 -/* 80503748 41 82 00 28 */ beq lbl_80503770 -/* 8050374C 38 80 00 02 */ li r4, 2 -/* 80503750 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 80503754 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 80503758 38 C0 00 00 */ li r6, 0 -/* 8050375C 4B B1 81 AD */ bl fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs -/* 80503760 A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 80503764 60 00 00 02 */ ori r0, r0, 2 -/* 80503768 B0 1E 00 FA */ sth r0, 0xfa(r30) -/* 8050376C 48 00 02 00 */ b lbl_8050396C -lbl_80503770: -/* 80503770 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80503774 4B C5 DD 5D */ bl Stop__9dCamera_cFv -/* 80503778 38 00 00 02 */ li r0, 2 -/* 8050377C B0 1E 0C D4 */ sth r0, 0xcd4(r30) -/* 80503780 38 00 00 00 */ li r0, 0 -/* 80503784 B0 1E 0C D6 */ sth r0, 0xcd6(r30) -/* 80503788 C0 1D 00 DC */ lfs f0, 0xdc(r29) -/* 8050378C D0 1E 0C F0 */ stfs f0, 0xcf0(r30) -/* 80503790 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80503794 38 80 00 03 */ li r4, 3 -/* 80503798 4B C5 F8 75 */ bl SetTrimSize__9dCamera_cFl -/* 8050379C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805037A0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805037A4 80 A4 5D AC */ lwz r5, 0x5dac(r4) -/* 805037A8 38 00 00 03 */ li r0, 3 -/* 805037AC B0 05 06 04 */ sth r0, 0x604(r5) -/* 805037B0 38 60 00 00 */ li r3, 0 -/* 805037B4 90 65 06 0C */ stw r3, 0x60c(r5) -/* 805037B8 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 805037BC 38 00 00 01 */ li r0, 1 -/* 805037C0 90 04 06 14 */ stw r0, 0x614(r4) -/* 805037C4 90 64 06 0C */ stw r3, 0x60c(r4) -/* 805037C8 90 64 06 10 */ stw r3, 0x610(r4) -/* 805037CC B0 64 06 0A */ sth r3, 0x60a(r4) -/* 805037D0 C0 1E 05 A4 */ lfs f0, 0x5a4(r30) -/* 805037D4 D0 1E 0C E4 */ stfs f0, 0xce4(r30) -/* 805037D8 C0 1E 05 AC */ lfs f0, 0x5ac(r30) -/* 805037DC D0 1E 0C EC */ stfs f0, 0xcec(r30) -/* 805037E0 C0 3E 05 A8 */ lfs f1, 0x5a8(r30) -/* 805037E4 C0 1D 00 B4 */ lfs f0, 0xb4(r29) -/* 805037E8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 805037EC D0 1E 0C E8 */ stfs f0, 0xce8(r30) -/* 805037F0 C0 1D 00 E0 */ lfs f0, 0xe0(r29) -/* 805037F4 D0 1E 0C D8 */ stfs f0, 0xcd8(r30) -/* 805037F8 C0 1D 00 E4 */ lfs f0, 0xe4(r29) -/* 805037FC D0 1E 0C DC */ stfs f0, 0xcdc(r30) -/* 80503800 C0 1D 00 E8 */ lfs f0, 0xe8(r29) -/* 80503804 D0 1E 0C E0 */ stfs f0, 0xce0(r30) -lbl_80503808: -/* 80503808 38 7E 0C E4 */ addi r3, r30, 0xce4 -/* 8050380C C0 3E 05 A4 */ lfs f1, 0x5a4(r30) -/* 80503810 C0 5D 00 EC */ lfs f2, 0xec(r29) -/* 80503814 C0 7D 00 3C */ lfs f3, 0x3c(r29) -/* 80503818 4B D6 C2 25 */ bl cLib_addCalc2__FPffff -/* 8050381C 38 7E 0C E8 */ addi r3, r30, 0xce8 -/* 80503820 C0 3E 05 A8 */ lfs f1, 0x5a8(r30) -/* 80503824 C0 1D 00 B4 */ lfs f0, 0xb4(r29) -/* 80503828 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8050382C C0 5D 00 EC */ lfs f2, 0xec(r29) -/* 80503830 C0 7D 00 3C */ lfs f3, 0x3c(r29) -/* 80503834 4B D6 C2 09 */ bl cLib_addCalc2__FPffff -/* 80503838 38 7E 0C EC */ addi r3, r30, 0xcec -/* 8050383C C0 3E 05 AC */ lfs f1, 0x5ac(r30) -/* 80503840 C0 5D 00 EC */ lfs f2, 0xec(r29) -/* 80503844 C0 7D 00 3C */ lfs f3, 0x3c(r29) -/* 80503848 4B D6 C1 F5 */ bl cLib_addCalc2__FPffff -/* 8050384C A8 1E 0C D6 */ lha r0, 0xcd6(r30) -/* 80503850 2C 00 00 3C */ cmpwi r0, 0x3c -/* 80503854 40 81 00 18 */ ble lbl_8050386C -/* 80503858 38 7E 0C F0 */ addi r3, r30, 0xcf0 -/* 8050385C C0 3D 00 74 */ lfs f1, 0x74(r29) -/* 80503860 C0 5D 00 F0 */ lfs f2, 0xf0(r29) -/* 80503864 C0 7D 00 EC */ lfs f3, 0xec(r29) -/* 80503868 4B D6 C1 D5 */ bl cLib_addCalc2__FPffff -lbl_8050386C: -/* 8050386C A8 1E 0C D6 */ lha r0, 0xcd6(r30) -/* 80503870 2C 00 00 78 */ cmpwi r0, 0x78 -/* 80503874 40 82 00 08 */ bne lbl_8050387C -/* 80503878 3B 80 00 01 */ li r28, 1 -lbl_8050387C: -/* 8050387C 7F 80 07 75 */ extsb. r0, r28 -/* 80503880 41 82 00 8C */ beq lbl_8050390C -/* 80503884 C0 1E 0C E4 */ lfs f0, 0xce4(r30) -/* 80503888 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8050388C C0 1E 0C E8 */ lfs f0, 0xce8(r30) -/* 80503890 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80503894 C0 1E 0C EC */ lfs f0, 0xcec(r30) -/* 80503898 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 8050389C C0 1E 0C D8 */ lfs f0, 0xcd8(r30) -/* 805038A0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805038A4 C0 1E 0C DC */ lfs f0, 0xcdc(r30) -/* 805038A8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 805038AC C0 1E 0C E0 */ lfs f0, 0xce0(r30) -/* 805038B0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 805038B4 38 7F 02 48 */ addi r3, r31, 0x248 -/* 805038B8 38 81 00 2C */ addi r4, r1, 0x2c -/* 805038BC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 805038C0 4B C7 D3 59 */ bl Reset__9dCamera_cF4cXyz4cXyz -/* 805038C4 38 7F 02 48 */ addi r3, r31, 0x248 -/* 805038C8 4B C5 DB E5 */ bl Start__9dCamera_cFv -/* 805038CC 38 7F 02 48 */ addi r3, r31, 0x248 -/* 805038D0 38 80 00 00 */ li r4, 0 -/* 805038D4 4B C5 F7 39 */ bl SetTrimSize__9dCamera_cFl -/* 805038D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805038DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805038E0 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 805038E4 4B B3 EB 85 */ bl reset__14dEvt_control_cFv -/* 805038E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805038EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805038F0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 805038F4 38 00 00 02 */ li r0, 2 -/* 805038F8 B0 03 06 04 */ sth r0, 0x604(r3) -/* 805038FC 38 00 00 01 */ li r0, 1 -/* 80503900 90 03 06 14 */ stw r0, 0x614(r3) -/* 80503904 38 00 00 00 */ li r0, 0 -/* 80503908 B0 1E 0C D4 */ sth r0, 0xcd4(r30) -lbl_8050390C: -/* 8050390C A8 1E 0C D4 */ lha r0, 0xcd4(r30) -/* 80503910 2C 00 00 00 */ cmpwi r0, 0 -/* 80503914 41 82 00 58 */ beq lbl_8050396C -/* 80503918 C0 1E 0C E4 */ lfs f0, 0xce4(r30) -/* 8050391C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80503920 C0 1E 0C E8 */ lfs f0, 0xce8(r30) -/* 80503924 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80503928 C0 1E 0C EC */ lfs f0, 0xcec(r30) -/* 8050392C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80503930 C0 1E 0C D8 */ lfs f0, 0xcd8(r30) -/* 80503934 D0 01 00 08 */ stfs f0, 8(r1) -/* 80503938 C0 1E 0C DC */ lfs f0, 0xcdc(r30) -/* 8050393C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80503940 C0 1E 0C E0 */ lfs f0, 0xce0(r30) -/* 80503944 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80503948 38 7F 02 48 */ addi r3, r31, 0x248 -/* 8050394C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80503950 38 A1 00 08 */ addi r5, r1, 8 -/* 80503954 C0 3E 0C F0 */ lfs f1, 0xcf0(r30) -/* 80503958 38 C0 00 00 */ li r6, 0 -/* 8050395C 4B C7 D1 85 */ bl Set__9dCamera_cF4cXyz4cXyzfs -/* 80503960 A8 7E 0C D6 */ lha r3, 0xcd6(r30) -/* 80503964 38 03 00 01 */ addi r0, r3, 1 -/* 80503968 B0 1E 0C D6 */ sth r0, 0xcd6(r30) -lbl_8050396C: -/* 8050396C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80503970 4B E5 E8 B5 */ bl _restgpr_28 -/* 80503974 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80503978 7C 08 03 A6 */ mtlr r0 -/* 8050397C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80503980 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_carry__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_carry__FP12e_nest_class.s deleted file mode 100644 index b9772108cb9..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_carry__FP12e_nest_class.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_805025C4: -/* 805025C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805025C8 7C 08 02 A6 */ mflr r0 -/* 805025CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 805025D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805025D4 93 C1 00 08 */ stw r30, 8(r1) -/* 805025D8 7C 7E 1B 78 */ mr r30, r3 -/* 805025DC 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 805025E0 38 83 46 DC */ addi r4, r3, lit_3999@l /* 0x805046DC@l */ -/* 805025E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805025E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805025EC 80 A3 5D AC */ lwz r5, 0x5dac(r3) -/* 805025F0 C0 44 00 04 */ lfs f2, 4(r4) -/* 805025F4 D0 5E 04 FC */ stfs f2, 0x4fc(r30) -/* 805025F8 3B E0 00 01 */ li r31, 1 -/* 805025FC A8 1E 05 80 */ lha r0, 0x580(r30) -/* 80502600 2C 00 00 01 */ cmpwi r0, 1 -/* 80502604 41 82 00 68 */ beq lbl_8050266C -/* 80502608 40 80 00 D8 */ bge lbl_805026E0 -/* 8050260C 2C 00 00 00 */ cmpwi r0, 0 -/* 80502610 40 80 00 08 */ bge lbl_80502618 -/* 80502614 48 00 00 CC */ b lbl_805026E0 -lbl_80502618: -/* 80502618 80 1E 05 5C */ lwz r0, 0x55c(r30) -/* 8050261C 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80502620 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80502624 38 00 00 01 */ li r0, 1 -/* 80502628 B0 1E 05 80 */ sth r0, 0x580(r30) -/* 8050262C A8 65 04 E6 */ lha r3, 0x4e6(r5) -/* 80502630 A8 1E 0A AE */ lha r0, 0xaae(r30) -/* 80502634 7C 03 00 50 */ subf r0, r3, r0 -/* 80502638 7C 00 07 34 */ extsh r0, r0 -/* 8050263C 2C 00 40 00 */ cmpwi r0, 0x4000 -/* 80502640 41 81 00 0C */ bgt lbl_8050264C -/* 80502644 2C 00 C0 00 */ cmpwi r0, -16384 -/* 80502648 40 80 00 10 */ bge lbl_80502658 -lbl_8050264C: -/* 8050264C 38 00 80 00 */ li r0, -32768 -/* 80502650 B0 1E 05 98 */ sth r0, 0x598(r30) -/* 80502654 48 00 00 0C */ b lbl_80502660 -lbl_80502658: -/* 80502658 38 00 00 00 */ li r0, 0 -/* 8050265C B0 1E 05 98 */ sth r0, 0x598(r30) -lbl_80502660: -/* 80502660 38 00 00 14 */ li r0, 0x14 -/* 80502664 B0 1E 05 82 */ sth r0, 0x582(r30) -/* 80502668 48 00 00 78 */ b lbl_805026E0 -lbl_8050266C: -/* 8050266C 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80502670 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80502674 40 82 00 68 */ bne lbl_805026DC -/* 80502678 38 60 00 00 */ li r3, 0 -/* 8050267C B0 7E 05 82 */ sth r3, 0x582(r30) -/* 80502680 80 1E 08 34 */ lwz r0, 0x834(r30) -/* 80502684 60 00 00 01 */ ori r0, r0, 1 -/* 80502688 90 1E 08 34 */ stw r0, 0x834(r30) -/* 8050268C 38 00 00 01 */ li r0, 1 -/* 80502690 B0 1E 05 7E */ sth r0, 0x57e(r30) -/* 80502694 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80502698 C0 04 00 00 */ lfs f0, 0(r4) -/* 8050269C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805026A0 4C 41 13 82 */ cror 2, 1, 2 -/* 805026A4 40 82 00 20 */ bne lbl_805026C4 -/* 805026A8 C0 04 00 80 */ lfs f0, 0x80(r4) -/* 805026AC D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 805026B0 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 805026B4 A8 05 04 E6 */ lha r0, 0x4e6(r5) -/* 805026B8 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 805026BC B0 7E 05 80 */ sth r3, 0x580(r30) -/* 805026C0 48 00 00 20 */ b lbl_805026E0 -lbl_805026C4: -/* 805026C4 D0 5E 05 2C */ stfs f2, 0x52c(r30) -/* 805026C8 38 00 00 03 */ li r0, 3 -/* 805026CC B0 1E 05 80 */ sth r0, 0x580(r30) -/* 805026D0 C0 04 00 24 */ lfs f0, 0x24(r4) -/* 805026D4 D0 1E 0A B4 */ stfs f0, 0xab4(r30) -/* 805026D8 48 00 00 08 */ b lbl_805026E0 -lbl_805026DC: -/* 805026DC 3B E0 00 00 */ li r31, 0 -lbl_805026E0: -/* 805026E0 38 7E 0A AE */ addi r3, r30, 0xaae -/* 805026E4 A8 85 04 E6 */ lha r4, 0x4e6(r5) -/* 805026E8 A8 1E 05 98 */ lha r0, 0x598(r30) -/* 805026EC 7C 04 02 14 */ add r0, r4, r0 -/* 805026F0 7C 04 07 34 */ extsh r4, r0 -/* 805026F4 38 A0 00 01 */ li r5, 1 -/* 805026F8 A8 DE 05 9A */ lha r6, 0x59a(r30) -/* 805026FC 4B D6 DF 0D */ bl cLib_addCalcAngleS2__FPssss -/* 80502700 38 7E 05 9A */ addi r3, r30, 0x59a -/* 80502704 38 80 20 00 */ li r4, 0x2000 -/* 80502708 38 A0 00 01 */ li r5, 1 -/* 8050270C 38 C0 01 00 */ li r6, 0x100 -/* 80502710 4B D6 DE F9 */ bl cLib_addCalcAngleS2__FPssss -/* 80502714 7F E3 FB 78 */ mr r3, r31 -/* 80502718 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8050271C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80502720 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80502724 7C 08 03 A6 */ mtlr r0 -/* 80502728 38 21 00 10 */ addi r1, r1, 0x10 -/* 8050272C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_drop__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_drop__FP12e_nest_class.s deleted file mode 100644 index 9566b9ff6b5..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_drop__FP12e_nest_class.s +++ /dev/null @@ -1,220 +0,0 @@ -lbl_80502280: -/* 80502280 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80502284 7C 08 02 A6 */ mflr r0 -/* 80502288 90 01 00 44 */ stw r0, 0x44(r1) -/* 8050228C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80502290 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80502294 7C 7E 1B 78 */ mr r30, r3 -/* 80502298 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 8050229C 3B E3 46 DC */ addi r31, r3, lit_3999@l /* 0x805046DC@l */ -/* 805022A0 80 1E 06 20 */ lwz r0, 0x620(r30) -/* 805022A4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 805022A8 41 82 01 28 */ beq lbl_805023D0 -/* 805022AC 88 1E 05 8A */ lbz r0, 0x58a(r30) -/* 805022B0 7C 00 07 75 */ extsb. r0, r0 -/* 805022B4 41 82 00 18 */ beq lbl_805022CC -/* 805022B8 38 00 00 01 */ li r0, 1 -/* 805022BC 98 1E 05 67 */ stb r0, 0x567(r30) -/* 805022C0 38 00 00 02 */ li r0, 2 -/* 805022C4 B0 1E 05 62 */ sth r0, 0x562(r30) -/* 805022C8 48 00 02 E4 */ b lbl_805025AC -lbl_805022CC: -/* 805022CC 38 7E 08 08 */ addi r3, r30, 0x808 -/* 805022D0 4B B8 21 91 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 805022D4 28 03 00 00 */ cmplwi r3, 0 -/* 805022D8 41 82 00 0C */ beq lbl_805022E4 -/* 805022DC 38 00 00 02 */ li r0, 2 -/* 805022E0 98 1E 05 67 */ stb r0, 0x567(r30) -lbl_805022E4: -/* 805022E4 A8 7E 05 80 */ lha r3, 0x580(r30) -/* 805022E8 2C 03 00 03 */ cmpwi r3, 3 -/* 805022EC 40 80 00 DC */ bge lbl_805023C8 -/* 805022F0 7C 60 07 35 */ extsh. r0, r3 -/* 805022F4 40 82 00 90 */ bne lbl_80502384 -/* 805022F8 38 00 00 02 */ li r0, 2 -/* 805022FC B0 1E 05 62 */ sth r0, 0x562(r30) -/* 80502300 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080045@ha */ -/* 80502304 38 03 00 45 */ addi r0, r3, 0x0045 /* 0x00080045@l */ -/* 80502308 90 01 00 0C */ stw r0, 0xc(r1) -/* 8050230C 38 7E 0A F8 */ addi r3, r30, 0xaf8 -/* 80502310 38 81 00 0C */ addi r4, r1, 0xc -/* 80502314 38 A0 00 00 */ li r5, 0 -/* 80502318 38 C0 FF FF */ li r6, -1 -/* 8050231C 81 9E 0B 08 */ lwz r12, 0xb08(r30) -/* 80502320 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80502324 7D 89 03 A6 */ mtctr r12 -/* 80502328 4E 80 04 21 */ bctrl -/* 8050232C C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 80502330 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80502334 38 7E 0A B8 */ addi r3, r30, 0xab8 -/* 80502338 38 9E 0A BC */ addi r4, r30, 0xabc -/* 8050233C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80502340 38 DE 04 E4 */ addi r6, r30, 0x4e4 -/* 80502344 C0 3E 04 EC */ lfs f1, 0x4ec(r30) -/* 80502348 38 FE 01 0C */ addi r7, r30, 0x10c -/* 8050234C 39 00 00 01 */ li r8, 1 -/* 80502350 4B B1 AC D1 */ bl fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci -/* 80502354 C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 80502358 D0 1E 0A B4 */ stfs f0, 0xab4(r30) -/* 8050235C A8 1E 0A B2 */ lha r0, 0xab2(r30) -/* 80502360 2C 00 00 00 */ cmpwi r0, 0 -/* 80502364 40 82 00 44 */ bne lbl_805023A8 -/* 80502368 C0 3F 00 98 */ lfs f1, 0x98(r31) -/* 8050236C 4B D6 56 21 */ bl cM_rndFX__Ff -/* 80502370 FC 00 08 1E */ fctiwz f0, f1 -/* 80502374 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80502378 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8050237C B0 1E 0A B2 */ sth r0, 0xab2(r30) -/* 80502380 48 00 00 28 */ b lbl_805023A8 -lbl_80502384: -/* 80502384 2C 03 00 01 */ cmpwi r3, 1 -/* 80502388 40 82 00 10 */ bne lbl_80502398 -/* 8050238C C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80502390 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80502394 48 00 00 14 */ b lbl_805023A8 -lbl_80502398: -/* 80502398 2C 03 00 02 */ cmpwi r3, 2 -/* 8050239C 40 82 00 0C */ bne lbl_805023A8 -/* 805023A0 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 805023A4 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -lbl_805023A8: -/* 805023A8 A8 7E 05 80 */ lha r3, 0x580(r30) -/* 805023AC 38 03 00 01 */ addi r0, r3, 1 -/* 805023B0 B0 1E 05 80 */ sth r0, 0x580(r30) -/* 805023B4 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 805023B8 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 805023BC EC 01 00 32 */ fmuls f0, f1, f0 -/* 805023C0 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 805023C4 48 00 00 0C */ b lbl_805023D0 -lbl_805023C8: -/* 805023C8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 805023CC D0 1E 05 2C */ stfs f0, 0x52c(r30) -lbl_805023D0: -/* 805023D0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805023D4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805023D8 80 63 00 00 */ lwz r3, 0(r3) -/* 805023DC A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 805023E0 4B B0 9F FD */ bl mDoMtx_YrotS__FPA4_fs -/* 805023E4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 805023E8 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805023EC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805023F0 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 805023F4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 805023F8 38 61 00 1C */ addi r3, r1, 0x1c -/* 805023FC 38 81 00 10 */ addi r4, r1, 0x10 -/* 80502400 4B D6 EA ED */ bl MtxPosition__FP4cXyzP4cXyz -/* 80502404 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80502408 D0 1E 04 F8 */ stfs f0, 0x4f8(r30) -/* 8050240C C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80502410 D0 1E 05 00 */ stfs f0, 0x500(r30) -/* 80502414 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 80502418 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 8050241C EC 01 00 2A */ fadds f0, f1, f0 -/* 80502420 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80502424 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80502428 38 9E 04 F8 */ addi r4, r30, 0x4f8 -/* 8050242C 7C 65 1B 78 */ mr r5, r3 -/* 80502430 4B E4 4C 61 */ bl PSVECAdd -/* 80502434 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 80502438 C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 8050243C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80502440 40 80 00 08 */ bge lbl_80502448 -/* 80502444 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -lbl_80502448: -/* 80502448 A8 1E 05 84 */ lha r0, 0x584(r30) -/* 8050244C 2C 00 00 00 */ cmpwi r0, 0 -/* 80502450 40 82 00 C8 */ bne lbl_80502518 -/* 80502454 80 1E 06 20 */ lwz r0, 0x620(r30) -/* 80502458 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8050245C 41 82 00 BC */ beq lbl_80502518 -/* 80502460 7F C3 F3 78 */ mr r3, r30 -/* 80502464 4B FF FC 6D */ bl wall_angle_get__FP12e_nest_class -/* 80502468 7C 60 07 34 */ extsh r0, r3 -/* 8050246C 2C 00 00 23 */ cmpwi r0, 0x23 -/* 80502470 41 82 00 A8 */ beq lbl_80502518 -/* 80502474 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80502478 7C 03 00 50 */ subf r0, r3, r0 -/* 8050247C 7C 03 07 34 */ extsh r3, r0 -/* 80502480 C0 5F 00 A0 */ lfs f2, 0xa0(r31) -/* 80502484 C8 3F 00 68 */ lfd f1, 0x68(r31) -/* 80502488 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 8050248C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80502490 3C 00 43 30 */ lis r0, 0x4330 -/* 80502494 90 01 00 28 */ stw r0, 0x28(r1) -/* 80502498 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8050249C EC 00 08 28 */ fsubs f0, f0, f1 -/* 805024A0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 805024A4 FC 00 00 1E */ fctiwz f0, f0 -/* 805024A8 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 805024AC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 805024B0 B0 1E 0A B2 */ sth r0, 0xab2(r30) -/* 805024B4 A8 BE 04 DE */ lha r5, 0x4de(r30) -/* 805024B8 54 64 08 3C */ slwi r4, r3, 1 -/* 805024BC 3C 60 00 01 */ lis r3, 0x0001 /* 0x00008000@ha */ -/* 805024C0 38 03 80 00 */ addi r0, r3, 0x8000 /* 0x00008000@l */ -/* 805024C4 7C 04 00 50 */ subf r0, r4, r0 -/* 805024C8 7C 00 07 34 */ extsh r0, r0 -/* 805024CC 7C 05 02 14 */ add r0, r5, r0 -/* 805024D0 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 805024D4 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 805024D8 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 805024DC EC 01 00 32 */ fmuls f0, f1, f0 -/* 805024E0 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 805024E4 38 00 00 0A */ li r0, 0xa -/* 805024E8 B0 1E 05 84 */ sth r0, 0x584(r30) -/* 805024EC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080045@ha */ -/* 805024F0 38 03 00 45 */ addi r0, r3, 0x0045 /* 0x00080045@l */ -/* 805024F4 90 01 00 08 */ stw r0, 8(r1) -/* 805024F8 38 7E 0A F8 */ addi r3, r30, 0xaf8 -/* 805024FC 38 81 00 08 */ addi r4, r1, 8 -/* 80502500 38 A0 00 00 */ li r5, 0 -/* 80502504 38 C0 FF FF */ li r6, -1 -/* 80502508 81 9E 0B 08 */ lwz r12, 0xb08(r30) -/* 8050250C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80502510 7D 89 03 A6 */ mtctr r12 -/* 80502514 4E 80 04 21 */ bctrl -lbl_80502518: -/* 80502518 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 8050251C D0 1E 05 90 */ stfs f0, 0x590(r30) -/* 80502520 A8 1E 05 7C */ lha r0, 0x57c(r30) -/* 80502524 1C 00 0B B8 */ mulli r0, r0, 0xbb8 -/* 80502528 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8050252C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80502530 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80502534 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80502538 C0 1E 0A B4 */ lfs f0, 0xab4(r30) -/* 8050253C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80502540 FC 00 00 1E */ fctiwz f0, f0 -/* 80502544 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 80502548 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8050254C B0 1E 0A AC */ sth r0, 0xaac(r30) -/* 80502550 A8 1E 05 7C */ lha r0, 0x57c(r30) -/* 80502554 1C 00 0F A0 */ mulli r0, r0, 0xfa0 -/* 80502558 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8050255C 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80502560 C0 1E 0A B4 */ lfs f0, 0xab4(r30) -/* 80502564 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80502568 FC 00 00 1E */ fctiwz f0, f0 -/* 8050256C D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80502570 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80502574 B0 1E 0A B0 */ sth r0, 0xab0(r30) -/* 80502578 38 7E 0A B4 */ addi r3, r30, 0xab4 -/* 8050257C C0 3F 00 A4 */ lfs f1, 0xa4(r31) -/* 80502580 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80502584 4B D6 D4 FD */ bl cLib_addCalc0__FPfff -/* 80502588 A8 7E 0A AE */ lha r3, 0xaae(r30) -/* 8050258C A8 1E 0A B2 */ lha r0, 0xab2(r30) -/* 80502590 7C 03 02 14 */ add r0, r3, r0 -/* 80502594 B0 1E 0A AE */ sth r0, 0xaae(r30) -/* 80502598 38 7E 0A B2 */ addi r3, r30, 0xab2 -/* 8050259C 38 80 00 00 */ li r4, 0 -/* 805025A0 38 A0 00 01 */ li r5, 1 -/* 805025A4 38 C0 00 64 */ li r6, 0x64 -/* 805025A8 4B D6 E0 61 */ bl cLib_addCalcAngleS2__FPssss -lbl_805025AC: -/* 805025AC 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 805025B0 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 805025B4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805025B8 7C 08 03 A6 */ mtlr r0 -/* 805025BC 38 21 00 40 */ addi r1, r1, 0x40 -/* 805025C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_float__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_float__FP12e_nest_class.s deleted file mode 100644 index d33d426a52a..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_float__FP12e_nest_class.s +++ /dev/null @@ -1,157 +0,0 @@ -lbl_80502AD4: -/* 80502AD4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80502AD8 7C 08 02 A6 */ mflr r0 -/* 80502ADC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80502AE0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80502AE4 4B E5 F6 F9 */ bl _savegpr_29 -/* 80502AE8 7C 7E 1B 78 */ mr r30, r3 -/* 80502AEC 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 80502AF0 3B E3 46 DC */ addi r31, r3, lit_3999@l /* 0x805046DC@l */ -/* 80502AF4 38 7E 04 FC */ addi r3, r30, 0x4fc -/* 80502AF8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80502AFC C0 5F 00 B0 */ lfs f2, 0xb0(r31) -/* 80502B00 4B D6 CF 81 */ bl cLib_addCalc0__FPfff -/* 80502B04 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80502B08 38 9E 04 F8 */ addi r4, r30, 0x4f8 -/* 80502B0C 7C 65 1B 78 */ mr r5, r3 -/* 80502B10 4B E4 45 81 */ bl PSVECAdd -/* 80502B14 C0 1E 04 F8 */ lfs f0, 0x4f8(r30) -/* 80502B18 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80502B1C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80502B20 D0 1E 04 F8 */ stfs f0, 0x4f8(r30) -/* 80502B24 C0 1E 05 00 */ lfs f0, 0x500(r30) -/* 80502B28 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80502B2C D0 1E 05 00 */ stfs f0, 0x500(r30) -/* 80502B30 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80502B34 D0 01 00 08 */ stfs f0, 8(r1) -/* 80502B38 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80502B3C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80502B40 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80502B44 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80502B48 C0 5E 05 94 */ lfs f2, 0x594(r30) -/* 80502B4C D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80502B50 C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 80502B54 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80502B58 EC 01 00 2A */ fadds f0, f1, f0 -/* 80502B5C FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80502B60 40 81 00 18 */ ble lbl_80502B78 -/* 80502B64 38 7E 0A D0 */ addi r3, r30, 0xad0 -/* 80502B68 38 81 00 08 */ addi r4, r1, 8 -/* 80502B6C C0 3E 04 EC */ lfs f1, 0x4ec(r30) -/* 80502B70 C0 5F 00 B8 */ lfs f2, 0xb8(r31) -/* 80502B74 4B B1 A5 99 */ bl fopAcM_effHamonSet__FPUlPC4cXyzff -lbl_80502B78: -/* 80502B78 A8 1E 05 7C */ lha r0, 0x57c(r30) -/* 80502B7C 1C 00 03 84 */ mulli r0, r0, 0x384 -/* 80502B80 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80502B84 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80502B88 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80502B8C 7C 63 04 2E */ lfsx f3, r3, r0 -/* 80502B90 38 7E 04 D4 */ addi r3, r30, 0x4d4 -/* 80502B94 C0 3E 05 94 */ lfs f1, 0x594(r30) -/* 80502B98 C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80502B9C EC 41 00 28 */ fsubs f2, f1, f0 -/* 80502BA0 C0 3F 00 BC */ lfs f1, 0xbc(r31) -/* 80502BA4 C0 1E 0A A8 */ lfs f0, 0xaa8(r30) -/* 80502BA8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80502BAC EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80502BB0 EC 22 00 2A */ fadds f1, f2, f0 -/* 80502BB4 C0 5F 00 A4 */ lfs f2, 0xa4(r31) -/* 80502BB8 C0 7F 00 48 */ lfs f3, 0x48(r31) -/* 80502BBC 4B D6 CE 81 */ bl cLib_addCalc2__FPffff -/* 80502BC0 A8 1E 05 7C */ lha r0, 0x57c(r30) -/* 80502BC4 1C 00 03 E8 */ mulli r0, r0, 0x3e8 -/* 80502BC8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80502BCC 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80502BD0 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80502BD4 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80502BD8 C0 1E 0A A8 */ lfs f0, 0xaa8(r30) -/* 80502BDC EC 00 00 72 */ fmuls f0, f0, f1 -/* 80502BE0 FC 00 00 1E */ fctiwz f0, f0 -/* 80502BE4 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80502BE8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80502BEC B0 1E 0A AC */ sth r0, 0xaac(r30) -/* 80502BF0 A8 1E 05 7C */ lha r0, 0x57c(r30) -/* 80502BF4 1C 00 04 4C */ mulli r0, r0, 0x44c -/* 80502BF8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80502BFC 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80502C00 C0 1E 0A A8 */ lfs f0, 0xaa8(r30) -/* 80502C04 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80502C08 FC 00 00 1E */ fctiwz f0, f0 -/* 80502C0C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80502C10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80502C14 B0 1E 0A B0 */ sth r0, 0xab0(r30) -/* 80502C18 38 7E 0A A8 */ addi r3, r30, 0xaa8 -/* 80502C1C C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 80502C20 C0 5F 00 A4 */ lfs f2, 0xa4(r31) -/* 80502C24 C0 7F 00 80 */ lfs f3, 0x80(r31) -/* 80502C28 4B D6 CE 15 */ bl cLib_addCalc2__FPffff -/* 80502C2C A8 7E 0A AE */ lha r3, 0xaae(r30) -/* 80502C30 A8 1E 0A B2 */ lha r0, 0xab2(r30) -/* 80502C34 7C 03 02 14 */ add r0, r3, r0 -/* 80502C38 B0 1E 0A AE */ sth r0, 0xaae(r30) -/* 80502C3C 38 7E 08 08 */ addi r3, r30, 0x808 -/* 80502C40 4B B8 1A 19 */ bl ChkCoHit__12dCcD_GObjInfFv -/* 80502C44 28 03 00 00 */ cmplwi r3, 0 -/* 80502C48 41 82 00 58 */ beq lbl_80502CA0 -/* 80502C4C 37 BE 07 CC */ addic. r29, r30, 0x7cc -/* 80502C50 41 82 00 50 */ beq lbl_80502CA0 -/* 80502C54 38 7E 04 F8 */ addi r3, r30, 0x4f8 -/* 80502C58 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80502C5C C0 1D 00 00 */ lfs f0, 0(r29) -/* 80502C60 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80502C64 C0 5F 00 A4 */ lfs f2, 0xa4(r31) -/* 80502C68 C0 7F 00 00 */ lfs f3, 0(r31) -/* 80502C6C 4B D6 CD D1 */ bl cLib_addCalc2__FPffff -/* 80502C70 38 7E 05 00 */ addi r3, r30, 0x500 -/* 80502C74 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80502C78 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80502C7C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80502C80 C0 5F 00 A4 */ lfs f2, 0xa4(r31) -/* 80502C84 C0 7F 00 00 */ lfs f3, 0(r31) -/* 80502C88 4B D6 CD B5 */ bl cLib_addCalc2__FPffff -/* 80502C8C 38 7E 0A A8 */ addi r3, r30, 0xaa8 -/* 80502C90 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80502C94 C0 5F 00 A4 */ lfs f2, 0xa4(r31) -/* 80502C98 C0 7F 00 3C */ lfs f3, 0x3c(r31) -/* 80502C9C 4B D6 CD A1 */ bl cLib_addCalc2__FPffff -lbl_80502CA0: -/* 80502CA0 38 7E 0A B2 */ addi r3, r30, 0xab2 -/* 80502CA4 38 80 00 00 */ li r4, 0 -/* 80502CA8 38 A0 00 01 */ li r5, 1 -/* 80502CAC 38 C0 00 96 */ li r6, 0x96 -/* 80502CB0 4B D6 D9 59 */ bl cLib_addCalcAngleS2__FPssss -/* 80502CB4 7F C3 F3 78 */ mr r3, r30 -/* 80502CB8 4B FF FB 95 */ bl simple_bg_check__FP12e_nest_class -/* 80502CBC 2C 03 00 00 */ cmpwi r3, 0 -/* 80502CC0 41 82 00 1C */ beq lbl_80502CDC -/* 80502CC4 C0 1E 04 BC */ lfs f0, 0x4bc(r30) -/* 80502CC8 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80502CCC C0 1E 04 C0 */ lfs f0, 0x4c0(r30) -/* 80502CD0 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80502CD4 C0 1E 04 C4 */ lfs f0, 0x4c4(r30) -/* 80502CD8 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -lbl_80502CDC: -/* 80502CDC 80 1E 06 20 */ lwz r0, 0x620(r30) -/* 80502CE0 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80502CE4 41 82 00 1C */ beq lbl_80502D00 -/* 80502CE8 38 00 00 01 */ li r0, 1 -/* 80502CEC B0 1E 05 7E */ sth r0, 0x57e(r30) -/* 80502CF0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80502CF4 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80502CF8 38 00 00 03 */ li r0, 3 -/* 80502CFC B0 1E 05 80 */ sth r0, 0x580(r30) -lbl_80502D00: -/* 80502D00 38 7E 08 08 */ addi r3, r30, 0x808 -/* 80502D04 4B B8 17 5D */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80502D08 28 03 00 00 */ cmplwi r3, 0 -/* 80502D0C 41 82 00 0C */ beq lbl_80502D18 -/* 80502D10 38 00 00 02 */ li r0, 2 -/* 80502D14 98 1E 05 67 */ stb r0, 0x567(r30) -lbl_80502D18: -/* 80502D18 39 61 00 40 */ addi r11, r1, 0x40 -/* 80502D1C 4B E5 F5 0D */ bl _restgpr_29 -/* 80502D20 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80502D24 7C 08 03 A6 */ mtlr r0 -/* 80502D28 38 21 00 40 */ addi r1, r1, 0x40 -/* 80502D2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hahen__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hahen__FP12e_nest_class.s deleted file mode 100644 index 744455d66fb..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hahen__FP12e_nest_class.s +++ /dev/null @@ -1,275 +0,0 @@ -lbl_80502D30: -/* 80502D30 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80502D34 7C 08 02 A6 */ mflr r0 -/* 80502D38 90 01 00 64 */ stw r0, 0x64(r1) -/* 80502D3C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80502D40 4B E5 F4 91 */ bl _savegpr_26 -/* 80502D44 7C 7D 1B 78 */ mr r29, r3 -/* 80502D48 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 80502D4C 3B C3 46 DC */ addi r30, r3, lit_3999@l /* 0x805046DC@l */ -/* 80502D50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80502D54 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80502D58 83 9F 5D AC */ lwz r28, 0x5dac(r31) -/* 80502D5C A8 1D 05 80 */ lha r0, 0x580(r29) -/* 80502D60 2C 00 00 01 */ cmpwi r0, 1 -/* 80502D64 41 82 00 30 */ beq lbl_80502D94 -/* 80502D68 40 80 00 10 */ bge lbl_80502D78 -/* 80502D6C 2C 00 00 00 */ cmpwi r0, 0 -/* 80502D70 40 80 00 14 */ bge lbl_80502D84 -/* 80502D74 48 00 02 90 */ b lbl_80503004 -lbl_80502D78: -/* 80502D78 2C 00 00 03 */ cmpwi r0, 3 -/* 80502D7C 40 80 02 88 */ bge lbl_80503004 -/* 80502D80 48 00 02 70 */ b lbl_80502FF0 -lbl_80502D84: -/* 80502D84 38 00 00 0A */ li r0, 0xa -/* 80502D88 B0 1D 05 82 */ sth r0, 0x582(r29) -/* 80502D8C 38 00 00 01 */ li r0, 1 -/* 80502D90 B0 1D 05 80 */ sth r0, 0x580(r29) -lbl_80502D94: -/* 80502D94 A8 1D 05 82 */ lha r0, 0x582(r29) -/* 80502D98 2C 00 00 01 */ cmpwi r0, 1 -/* 80502D9C 40 82 00 48 */ bne lbl_80502DE4 -/* 80502DA0 88 1D 0A A0 */ lbz r0, 0xaa0(r29) -/* 80502DA4 28 00 00 00 */ cmplwi r0, 0 -/* 80502DA8 41 82 00 3C */ beq lbl_80502DE4 -/* 80502DAC 80 1D 0A A4 */ lwz r0, 0xaa4(r29) -/* 80502DB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80502DB4 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80502DB8 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80502DBC 38 81 00 14 */ addi r4, r1, 0x14 -/* 80502DC0 4B B1 6A 39 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80502DC4 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80502DC8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80502DCC C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80502DD0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80502DD4 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80502DD8 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80502DDC 38 81 00 24 */ addi r4, r1, 0x24 -/* 80502DE0 48 60 76 65 */ bl setHawkSideCamera__10daNPC_TK_cF4cXyz -lbl_80502DE4: -/* 80502DE4 3B 60 00 00 */ li r27, 0 -/* 80502DE8 3B 40 00 00 */ li r26, 0 -lbl_80502DEC: -/* 80502DEC 7C 9D D2 14 */ add r4, r29, r26 -/* 80502DF0 88 04 0B 6F */ lbz r0, 0xb6f(r4) -/* 80502DF4 28 00 00 00 */ cmplwi r0, 0 -/* 80502DF8 41 82 01 E4 */ beq lbl_80502FDC -/* 80502DFC C0 44 0B 24 */ lfs f2, 0xb24(r4) -/* 80502E00 C0 3D 05 94 */ lfs f1, 0x594(r29) -/* 80502E04 C0 1E 00 48 */ lfs f0, 0x48(r30) -/* 80502E08 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80502E0C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80502E10 40 81 01 CC */ ble lbl_80502FDC -/* 80502E14 38 61 00 18 */ addi r3, r1, 0x18 -/* 80502E18 38 84 0B 20 */ addi r4, r4, 0xb20 -/* 80502E1C 38 BC 04 D0 */ addi r5, r28, 0x4d0 -/* 80502E20 4B D6 3D 15 */ bl __mi__4cXyzCFRC3Vec -/* 80502E24 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80502E28 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80502E2C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80502E30 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80502E34 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80502E38 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80502E3C 38 61 00 3C */ addi r3, r1, 0x3c -/* 80502E40 4B E4 42 F9 */ bl PSVECSquareMag -/* 80502E44 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80502E48 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80502E4C 40 81 00 58 */ ble lbl_80502EA4 -/* 80502E50 FC 00 08 34 */ frsqrte f0, f1 -/* 80502E54 C8 9E 00 08 */ lfd f4, 8(r30) -/* 80502E58 FC 44 00 32 */ fmul f2, f4, f0 -/* 80502E5C C8 7E 00 10 */ lfd f3, 0x10(r30) -/* 80502E60 FC 00 00 32 */ fmul f0, f0, f0 -/* 80502E64 FC 01 00 32 */ fmul f0, f1, f0 -/* 80502E68 FC 03 00 28 */ fsub f0, f3, f0 -/* 80502E6C FC 02 00 32 */ fmul f0, f2, f0 -/* 80502E70 FC 44 00 32 */ fmul f2, f4, f0 -/* 80502E74 FC 00 00 32 */ fmul f0, f0, f0 -/* 80502E78 FC 01 00 32 */ fmul f0, f1, f0 -/* 80502E7C FC 03 00 28 */ fsub f0, f3, f0 -/* 80502E80 FC 02 00 32 */ fmul f0, f2, f0 -/* 80502E84 FC 44 00 32 */ fmul f2, f4, f0 -/* 80502E88 FC 00 00 32 */ fmul f0, f0, f0 -/* 80502E8C FC 01 00 32 */ fmul f0, f1, f0 -/* 80502E90 FC 03 00 28 */ fsub f0, f3, f0 -/* 80502E94 FC 02 00 32 */ fmul f0, f2, f0 -/* 80502E98 FC 21 00 32 */ fmul f1, f1, f0 -/* 80502E9C FC 20 08 18 */ frsp f1, f1 -/* 80502EA0 48 00 00 88 */ b lbl_80502F28 -lbl_80502EA4: -/* 80502EA4 C8 1E 00 18 */ lfd f0, 0x18(r30) -/* 80502EA8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80502EAC 40 80 00 10 */ bge lbl_80502EBC -/* 80502EB0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80502EB4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80502EB8 48 00 00 70 */ b lbl_80502F28 -lbl_80502EBC: -/* 80502EBC D0 21 00 08 */ stfs f1, 8(r1) -/* 80502EC0 80 81 00 08 */ lwz r4, 8(r1) -/* 80502EC4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80502EC8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80502ECC 7C 03 00 00 */ cmpw r3, r0 -/* 80502ED0 41 82 00 14 */ beq lbl_80502EE4 -/* 80502ED4 40 80 00 40 */ bge lbl_80502F14 -/* 80502ED8 2C 03 00 00 */ cmpwi r3, 0 -/* 80502EDC 41 82 00 20 */ beq lbl_80502EFC -/* 80502EE0 48 00 00 34 */ b lbl_80502F14 -lbl_80502EE4: -/* 80502EE4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80502EE8 41 82 00 0C */ beq lbl_80502EF4 -/* 80502EEC 38 00 00 01 */ li r0, 1 -/* 80502EF0 48 00 00 28 */ b lbl_80502F18 -lbl_80502EF4: -/* 80502EF4 38 00 00 02 */ li r0, 2 -/* 80502EF8 48 00 00 20 */ b lbl_80502F18 -lbl_80502EFC: -/* 80502EFC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80502F00 41 82 00 0C */ beq lbl_80502F0C -/* 80502F04 38 00 00 05 */ li r0, 5 -/* 80502F08 48 00 00 10 */ b lbl_80502F18 -lbl_80502F0C: -/* 80502F0C 38 00 00 03 */ li r0, 3 -/* 80502F10 48 00 00 08 */ b lbl_80502F18 -lbl_80502F14: -/* 80502F14 38 00 00 04 */ li r0, 4 -lbl_80502F18: -/* 80502F18 2C 00 00 01 */ cmpwi r0, 1 -/* 80502F1C 40 82 00 0C */ bne lbl_80502F28 -/* 80502F20 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80502F24 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80502F28: -/* 80502F28 C0 5E 00 3C */ lfs f2, 0x3c(r30) -/* 80502F2C FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 80502F30 40 80 00 AC */ bge lbl_80502FDC -/* 80502F34 7C 7D D2 14 */ add r3, r29, r26 -/* 80502F38 C0 03 0B 20 */ lfs f0, 0xb20(r3) -/* 80502F3C D0 1D 04 D0 */ stfs f0, 0x4d0(r29) -/* 80502F40 C0 03 0B 24 */ lfs f0, 0xb24(r3) -/* 80502F44 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80502F48 C0 03 0B 28 */ lfs f0, 0xb28(r3) -/* 80502F4C D0 1D 04 D8 */ stfs f0, 0x4d8(r29) -/* 80502F50 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80502F54 D0 1D 05 50 */ stfs f0, 0x550(r29) -/* 80502F58 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80502F5C D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 80502F60 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80502F64 D0 1D 05 58 */ stfs f0, 0x558(r29) -/* 80502F68 C0 1D 05 50 */ lfs f0, 0x550(r29) -/* 80502F6C D0 1D 05 38 */ stfs f0, 0x538(r29) -/* 80502F70 C0 1D 05 54 */ lfs f0, 0x554(r29) -/* 80502F74 D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 80502F78 C0 1D 05 58 */ lfs f0, 0x558(r29) -/* 80502F7C D0 1D 05 40 */ stfs f0, 0x540(r29) -/* 80502F80 A0 1D 00 F8 */ lhz r0, 0xf8(r29) -/* 80502F84 28 00 00 06 */ cmplwi r0, 6 -/* 80502F88 40 82 00 18 */ bne lbl_80502FA0 -/* 80502F8C 38 00 00 02 */ li r0, 2 -/* 80502F90 B0 1D 05 80 */ sth r0, 0x580(r29) -/* 80502F94 38 00 00 3C */ li r0, 0x3c -/* 80502F98 B0 1D 05 82 */ sth r0, 0x582(r29) -/* 80502F9C 48 00 00 68 */ b lbl_80503004 -lbl_80502FA0: -/* 80502FA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80502FA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80502FA8 38 63 5B 54 */ addi r3, r3, 0x5b54 -/* 80502FAC 7F A4 EB 78 */ mr r4, r29 -/* 80502FB0 38 A0 00 76 */ li r5, 0x76 -/* 80502FB4 FC 20 10 90 */ fmr f1, f2 -/* 80502FB8 C0 5E 00 4C */ lfs f2, 0x4c(r30) -/* 80502FBC C0 7E 00 C0 */ lfs f3, 0xc0(r30) -/* 80502FC0 38 C0 50 00 */ li r6, 0x5000 -/* 80502FC4 38 E0 00 01 */ li r7, 1 -/* 80502FC8 4B B7 0A 41 */ bl request__11dAttCatch_cFP10fopAc_ac_cUcfffsi -/* 80502FCC A0 1D 00 FA */ lhz r0, 0xfa(r29) -/* 80502FD0 60 00 00 40 */ ori r0, r0, 0x40 -/* 80502FD4 B0 1D 00 FA */ sth r0, 0xfa(r29) -/* 80502FD8 48 00 00 2C */ b lbl_80503004 -lbl_80502FDC: -/* 80502FDC 3B 7B 00 01 */ addi r27, r27, 1 -/* 80502FE0 2C 1B 00 05 */ cmpwi r27, 5 -/* 80502FE4 3B 5A 00 58 */ addi r26, r26, 0x58 -/* 80502FE8 41 80 FE 04 */ blt lbl_80502DEC -/* 80502FEC 48 00 00 18 */ b lbl_80503004 -lbl_80502FF0: -/* 80502FF0 A8 1D 05 82 */ lha r0, 0x582(r29) -/* 80502FF4 2C 00 00 00 */ cmpwi r0, 0 -/* 80502FF8 40 82 00 0C */ bne lbl_80503004 -/* 80502FFC 38 00 00 01 */ li r0, 1 -/* 80503000 B0 1D 05 80 */ sth r0, 0x580(r29) -lbl_80503004: -/* 80503004 7F A3 EB 78 */ mr r3, r29 -/* 80503008 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 8050300C 4B B1 77 D5 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80503010 C0 1E 00 C4 */ lfs f0, 0xc4(r30) -/* 80503014 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80503018 40 80 00 0C */ bge lbl_80503024 -/* 8050301C 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80503020 4B C5 C4 D1 */ bl setLookPos__9daPy_py_cFP4cXyz -lbl_80503024: -/* 80503024 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80503028 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8050302C 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80503030 3C 80 80 50 */ lis r4, d_a_e_nest__stringBase0@ha /* 0x805047EC@ha */ -/* 80503034 38 84 47 EC */ addi r4, r4, d_a_e_nest__stringBase0@l /* 0x805047EC@l */ -/* 80503038 4B E6 59 5D */ bl strcmp -/* 8050303C 2C 03 00 00 */ cmpwi r3, 0 -/* 80503040 40 82 00 4C */ bne lbl_8050308C -/* 80503044 A8 1D 05 86 */ lha r0, 0x586(r29) -/* 80503048 2C 00 00 46 */ cmpwi r0, 0x46 -/* 8050304C 40 82 00 40 */ bne lbl_8050308C -/* 80503050 38 00 00 0D */ li r0, 0xd -/* 80503054 90 01 00 10 */ stw r0, 0x10(r1) -/* 80503058 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8050305C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80503060 80 63 00 00 */ lwz r3, 0(r3) -/* 80503064 38 81 00 10 */ addi r4, r1, 0x10 -/* 80503068 38 A0 00 00 */ li r5, 0 -/* 8050306C 38 C0 00 00 */ li r6, 0 -/* 80503070 38 E0 00 00 */ li r7, 0 -/* 80503074 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80503078 FC 40 08 90 */ fmr f2, f1 -/* 8050307C C0 7E 00 50 */ lfs f3, 0x50(r30) -/* 80503080 FC 80 18 90 */ fmr f4, f3 -/* 80503084 39 00 00 00 */ li r8, 0 -/* 80503088 4B DA 88 FD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8050308C: -/* 8050308C A8 1D 05 86 */ lha r0, 0x586(r29) -/* 80503090 2C 00 00 01 */ cmpwi r0, 1 -/* 80503094 40 82 00 34 */ bne lbl_805030C8 -/* 80503098 88 1D 0A A0 */ lbz r0, 0xaa0(r29) -/* 8050309C 28 00 00 00 */ cmplwi r0, 0 -/* 805030A0 41 82 00 28 */ beq lbl_805030C8 -/* 805030A4 80 1D 0A A4 */ lwz r0, 0xaa4(r29) -/* 805030A8 90 01 00 0C */ stw r0, 0xc(r1) -/* 805030AC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 805030B0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 805030B4 38 81 00 0C */ addi r4, r1, 0xc -/* 805030B8 4B B1 67 41 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 805030BC 28 03 00 00 */ cmplwi r3, 0 -/* 805030C0 41 82 00 08 */ beq lbl_805030C8 -/* 805030C4 48 60 74 A5 */ bl endHawkCamera__10daNPC_TK_cFv -lbl_805030C8: -/* 805030C8 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 805030CC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 805030D0 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 805030D4 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 805030D8 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 805030DC D0 01 00 38 */ stfs f0, 0x38(r1) -/* 805030E0 C0 1E 00 8C */ lfs f0, 0x8c(r30) -/* 805030E4 EC 01 00 2A */ fadds f0, f1, f0 -/* 805030E8 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 805030EC 38 61 00 30 */ addi r3, r1, 0x30 -/* 805030F0 4B B1 AB CD */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 805030F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805030F8 41 82 00 10 */ beq lbl_80503108 -/* 805030FC 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80503100 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80503104 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -lbl_80503108: -/* 80503108 39 61 00 60 */ addi r11, r1, 0x60 -/* 8050310C 4B E5 F1 11 */ bl _restgpr_26 -/* 80503110 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80503114 7C 08 03 A6 */ mtlr r0 -/* 80503118 38 21 00 60 */ addi r1, r1, 0x60 -/* 8050311C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hook__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hook__FP12e_nest_class.s deleted file mode 100644 index 9d3c47f7fe7..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hook__FP12e_nest_class.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80503120: -/* 80503120 38 00 00 0A */ li r0, 0xa -/* 80503124 98 03 05 B0 */ stb r0, 0x5b0(r3) -/* 80503128 A8 03 05 80 */ lha r0, 0x580(r3) -/* 8050312C 2C 00 00 01 */ cmpwi r0, 1 -/* 80503130 41 82 00 30 */ beq lbl_80503160 -/* 80503134 40 80 00 2C */ bge lbl_80503160 -/* 80503138 2C 00 00 00 */ cmpwi r0, 0 -/* 8050313C 40 80 00 08 */ bge lbl_80503144 -/* 80503140 48 00 00 20 */ b lbl_80503160 -lbl_80503144: -/* 80503144 38 00 00 01 */ li r0, 1 -/* 80503148 B0 03 05 80 */ sth r0, 0x580(r3) -/* 8050314C 3C 80 80 50 */ lis r4, lit_4066@ha /* 0x805046E0@ha */ -/* 80503150 C0 04 46 E0 */ lfs f0, lit_4066@l(r4) /* 0x805046E0@l */ -/* 80503154 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80503158 38 00 00 03 */ li r0, 3 -/* 8050315C B0 03 05 82 */ sth r0, 0x582(r3) -lbl_80503160: -/* 80503160 A8 03 05 82 */ lha r0, 0x582(r3) -/* 80503164 2C 00 00 00 */ cmpwi r0, 0 -/* 80503168 4C 82 00 20 */ bnelr -/* 8050316C 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 80503170 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 80503174 4C 82 00 20 */ bnelr -/* 80503178 38 00 00 01 */ li r0, 1 -/* 8050317C B0 03 05 7E */ sth r0, 0x57e(r3) -/* 80503180 38 00 00 00 */ li r0, 0 -/* 80503184 B0 03 05 80 */ sth r0, 0x580(r3) -/* 80503188 3C 80 80 50 */ lis r4, lit_4431@ha /* 0x80504760@ha */ -/* 8050318C C0 04 47 60 */ lfs f0, lit_4431@l(r4) /* 0x80504760@l */ -/* 80503190 D0 03 05 90 */ stfs f0, 0x590(r3) -/* 80503194 C0 63 04 D4 */ lfs f3, 0x4d4(r3) -/* 80503198 C0 43 04 EC */ lfs f2, 0x4ec(r3) -/* 8050319C C0 23 05 90 */ lfs f1, 0x590(r3) -/* 805031A0 3C 80 80 50 */ lis r4, l_HIO@ha /* 0x80504960@ha */ -/* 805031A4 38 84 49 60 */ addi r4, r4, l_HIO@l /* 0x80504960@l */ -/* 805031A8 C0 04 00 08 */ lfs f0, 8(r4) -/* 805031AC EC 01 00 32 */ fmuls f0, f1, f0 -/* 805031B0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 805031B4 EC 03 00 28 */ fsubs f0, f3, f0 -/* 805031B8 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 805031BC 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 805031C0 54 00 03 56 */ rlwinm r0, r0, 0, 0xd, 0xb -/* 805031C4 90 03 04 9C */ stw r0, 0x49c(r3) -/* 805031C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_normal__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_normal__FP12e_nest_class.s deleted file mode 100644 index 927ca36ada8..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_normal__FP12e_nest_class.s +++ /dev/null @@ -1,345 +0,0 @@ -lbl_80501BDC: -/* 80501BDC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80501BE0 7C 08 02 A6 */ mflr r0 -/* 80501BE4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80501BE8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80501BEC 4B E6 05 F1 */ bl _savegpr_29 -/* 80501BF0 7C 7F 1B 78 */ mr r31, r3 -/* 80501BF4 A8 63 05 88 */ lha r3, 0x588(r3) -/* 80501BF8 2C 03 00 00 */ cmpwi r3, 0 -/* 80501BFC 41 82 01 50 */ beq lbl_80501D4C -/* 80501C00 38 03 FF FF */ addi r0, r3, -1 -/* 80501C04 B0 1F 05 88 */ sth r0, 0x588(r31) -/* 80501C08 A8 BF 05 88 */ lha r5, 0x588(r31) -/* 80501C0C 1C 05 2E E0 */ mulli r0, r5, 0x2ee0 -/* 80501C10 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80501C14 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80501C18 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80501C1C 7C 64 04 2E */ lfsx f3, r4, r0 -/* 80501C20 3C 60 80 50 */ lis r3, lit_4208@ha /* 0x80504728@ha */ -/* 80501C24 C0 43 47 28 */ lfs f2, lit_4208@l(r3) /* 0x80504728@l */ -/* 80501C28 3C 60 80 50 */ lis r3, lit_4215@ha /* 0x80504744@ha */ -/* 80501C2C C8 23 47 44 */ lfd f1, lit_4215@l(r3) /* 0x80504744@l */ -/* 80501C30 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 80501C34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80501C38 3C 60 43 30 */ lis r3, 0x4330 -/* 80501C3C 90 61 00 10 */ stw r3, 0x10(r1) -/* 80501C40 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80501C44 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80501C48 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80501C4C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80501C50 FC 00 00 1E */ fctiwz f0, f0 -/* 80501C54 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80501C58 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80501C5C B0 1F 0A AC */ sth r0, 0xaac(r31) -/* 80501C60 A8 BF 05 88 */ lha r5, 0x588(r31) -/* 80501C64 1C 05 36 B0 */ mulli r0, r5, 0x36b0 -/* 80501C68 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80501C6C 7C 64 04 2E */ lfsx f3, r4, r0 -/* 80501C70 6C A0 80 00 */ xoris r0, r5, 0x8000 -/* 80501C74 90 01 00 24 */ stw r0, 0x24(r1) -/* 80501C78 90 61 00 20 */ stw r3, 0x20(r1) -/* 80501C7C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80501C80 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80501C84 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80501C88 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80501C8C FC 00 00 1E */ fctiwz f0, f0 -/* 80501C90 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80501C94 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80501C98 B0 1F 0A B0 */ sth r0, 0xab0(r31) -/* 80501C9C A8 1F 05 88 */ lha r0, 0x588(r31) -/* 80501CA0 2C 00 00 00 */ cmpwi r0, 0 -/* 80501CA4 40 82 04 14 */ bne lbl_805020B8 -/* 80501CA8 88 1F 05 8A */ lbz r0, 0x58a(r31) -/* 80501CAC 7C 00 07 75 */ extsb. r0, r0 -/* 80501CB0 41 82 00 90 */ beq lbl_80501D40 -/* 80501CB4 38 00 00 01 */ li r0, 1 -/* 80501CB8 B0 1F 05 7E */ sth r0, 0x57e(r31) -/* 80501CBC 38 00 00 00 */ li r0, 0 -/* 80501CC0 B0 1F 05 80 */ sth r0, 0x580(r31) -/* 80501CC4 38 00 00 08 */ li r0, 8 -/* 80501CC8 B0 1F 05 82 */ sth r0, 0x582(r31) -/* 80501CCC 38 00 00 78 */ li r0, 0x78 -/* 80501CD0 B0 1F 05 86 */ sth r0, 0x586(r31) -/* 80501CD4 38 00 00 64 */ li r0, 0x64 -/* 80501CD8 B0 1F 05 84 */ sth r0, 0x584(r31) -/* 80501CDC 3C 60 80 50 */ lis r3, lit_4431@ha /* 0x80504760@ha */ -/* 80501CE0 C0 03 47 60 */ lfs f0, lit_4431@l(r3) /* 0x80504760@l */ -/* 80501CE4 D0 1F 05 90 */ stfs f0, 0x590(r31) -/* 80501CE8 C0 7F 04 D4 */ lfs f3, 0x4d4(r31) -/* 80501CEC C0 5F 04 EC */ lfs f2, 0x4ec(r31) -/* 80501CF0 C0 3F 05 90 */ lfs f1, 0x590(r31) -/* 80501CF4 3C 60 80 50 */ lis r3, l_HIO@ha /* 0x80504960@ha */ -/* 80501CF8 38 63 49 60 */ addi r3, r3, l_HIO@l /* 0x80504960@l */ -/* 80501CFC C0 03 00 08 */ lfs f0, 8(r3) -/* 80501D00 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80501D04 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80501D08 EC 03 00 28 */ fsubs f0, f3, f0 -/* 80501D0C D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80501D10 88 1F 0A A0 */ lbz r0, 0xaa0(r31) -/* 80501D14 28 00 00 00 */ cmplwi r0, 0 -/* 80501D18 41 82 03 A0 */ beq lbl_805020B8 -/* 80501D1C 80 1F 0A A4 */ lwz r0, 0xaa4(r31) -/* 80501D20 90 01 00 08 */ stw r0, 8(r1) -/* 80501D24 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80501D28 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80501D2C 38 81 00 08 */ addi r4, r1, 8 -/* 80501D30 4B B1 7A C9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80501D34 7F E4 FB 78 */ mr r4, r31 -/* 80501D38 48 60 87 C9 */ bl setHawkCamera__10daNPC_TK_cFP10fopAc_ac_c -/* 80501D3C 48 00 03 7C */ b lbl_805020B8 -lbl_80501D40: -/* 80501D40 38 00 00 01 */ li r0, 1 -/* 80501D44 B0 1F 05 62 */ sth r0, 0x562(r31) -/* 80501D48 48 00 03 70 */ b lbl_805020B8 -lbl_80501D4C: -/* 80501D4C 38 00 00 00 */ li r0, 0 -/* 80501D50 B0 1F 05 62 */ sth r0, 0x562(r31) -/* 80501D54 88 1F 05 B0 */ lbz r0, 0x5b0(r31) -/* 80501D58 7C 00 07 75 */ extsb. r0, r0 -/* 80501D5C 40 82 03 5C */ bne lbl_805020B8 -/* 80501D60 38 7F 09 40 */ addi r3, r31, 0x940 -/* 80501D64 4B B8 26 FD */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80501D68 28 03 00 00 */ cmplwi r3, 0 -/* 80501D6C 41 82 00 74 */ beq lbl_80501DE0 -/* 80501D70 38 7F 09 40 */ addi r3, r31, 0x940 -/* 80501D74 4B B8 27 85 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80501D78 90 7F 0A 7C */ stw r3, 0xa7c(r31) -/* 80501D7C 80 7F 0A 7C */ lwz r3, 0xa7c(r31) -/* 80501D80 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80501D84 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80501D88 41 82 00 18 */ beq lbl_80501DA0 -/* 80501D8C 38 00 00 01 */ li r0, 1 -/* 80501D90 98 1F 05 67 */ stb r0, 0x567(r31) -/* 80501D94 7F E3 FB 78 */ mr r3, r31 -/* 80501D98 4B B1 7E E5 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80501D9C 48 00 03 1C */ b lbl_805020B8 -lbl_80501DA0: -/* 80501DA0 38 00 00 0A */ li r0, 0xa -/* 80501DA4 98 1F 05 B0 */ stb r0, 0x5b0(r31) -/* 80501DA8 38 00 00 03 */ li r0, 3 -/* 80501DAC B0 1F 05 88 */ sth r0, 0x588(r31) -/* 80501DB0 38 00 00 01 */ li r0, 1 -/* 80501DB4 98 1F 05 8A */ stb r0, 0x58a(r31) -/* 80501DB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501DBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501DC0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80501DC4 28 03 00 00 */ cmplwi r3, 0 -/* 80501DC8 41 82 00 0C */ beq lbl_80501DD4 -/* 80501DCC 80 03 00 04 */ lwz r0, 4(r3) -/* 80501DD0 48 00 00 08 */ b lbl_80501DD8 -lbl_80501DD4: -/* 80501DD4 38 00 FF FF */ li r0, -1 -lbl_80501DD8: -/* 80501DD8 90 1F 0A A4 */ stw r0, 0xaa4(r31) -/* 80501DDC 48 00 02 DC */ b lbl_805020B8 -lbl_80501DE0: -/* 80501DE0 3B C0 00 00 */ li r30, 0 -/* 80501DE4 38 7F 08 08 */ addi r3, r31, 0x808 -/* 80501DE8 4B B8 26 79 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80501DEC 28 03 00 00 */ cmplwi r3, 0 -/* 80501DF0 41 82 00 B4 */ beq lbl_80501EA4 -/* 80501DF4 38 00 00 0A */ li r0, 0xa -/* 80501DF8 98 1F 05 B0 */ stb r0, 0x5b0(r31) -/* 80501DFC 38 7F 08 08 */ addi r3, r31, 0x808 -/* 80501E00 4B B8 26 F9 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80501E04 90 7F 0A 7C */ stw r3, 0xa7c(r31) -/* 80501E08 7F E3 FB 78 */ mr r3, r31 -/* 80501E0C 38 9F 0A 7C */ addi r4, r31, 0xa7c -/* 80501E10 4B B8 5D F5 */ bl cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo -/* 80501E14 80 7F 0A 7C */ lwz r3, 0xa7c(r31) -/* 80501E18 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80501E1C 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 -/* 80501E20 41 82 00 40 */ beq lbl_80501E60 -/* 80501E24 38 00 00 02 */ li r0, 2 -/* 80501E28 B0 1F 05 7E */ sth r0, 0x57e(r31) -/* 80501E2C 38 00 00 00 */ li r0, 0 -/* 80501E30 B0 1F 05 80 */ sth r0, 0x580(r31) -/* 80501E34 98 1F 05 8A */ stb r0, 0x58a(r31) -/* 80501E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501E40 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80501E44 28 03 00 00 */ cmplwi r3, 0 -/* 80501E48 41 82 00 0C */ beq lbl_80501E54 -/* 80501E4C 80 03 00 04 */ lwz r0, 4(r3) -/* 80501E50 48 00 00 08 */ b lbl_80501E58 -lbl_80501E54: -/* 80501E54 38 00 FF FF */ li r0, -1 -lbl_80501E58: -/* 80501E58 90 1F 0A A4 */ stw r0, 0xaa4(r31) -/* 80501E5C 48 00 00 6C */ b lbl_80501EC8 -lbl_80501E60: -/* 80501E60 54 60 06 31 */ rlwinm. r0, r3, 0, 0x18, 0x18 -/* 80501E64 40 82 00 0C */ bne lbl_80501E70 -/* 80501E68 54 60 02 53 */ rlwinm. r0, r3, 0, 9, 9 -/* 80501E6C 41 82 00 20 */ beq lbl_80501E8C -lbl_80501E70: -/* 80501E70 38 00 00 0A */ li r0, 0xa -/* 80501E74 B0 1F 05 88 */ sth r0, 0x588(r31) -/* 80501E78 38 7F 08 08 */ addi r3, r31, 0x808 -/* 80501E7C 4B B8 26 7D */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80501E80 90 7F 0A 7C */ stw r3, 0xa7c(r31) -/* 80501E84 3B C0 00 01 */ li r30, 1 -/* 80501E88 48 00 00 40 */ b lbl_80501EC8 -lbl_80501E8C: -/* 80501E8C 38 00 00 0A */ li r0, 0xa -/* 80501E90 B0 1F 05 88 */ sth r0, 0x588(r31) -/* 80501E94 38 7F 08 08 */ addi r3, r31, 0x808 -/* 80501E98 4B B8 26 61 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80501E9C 90 7F 0A 7C */ stw r3, 0xa7c(r31) -/* 80501EA0 48 00 00 28 */ b lbl_80501EC8 -lbl_80501EA4: -/* 80501EA4 38 7F 08 08 */ addi r3, r31, 0x808 -/* 80501EA8 4B B8 27 B1 */ bl ChkCoHit__12dCcD_GObjInfFv -/* 80501EAC 28 03 00 00 */ cmplwi r3, 0 -/* 80501EB0 41 82 00 18 */ beq lbl_80501EC8 -/* 80501EB4 38 00 00 05 */ li r0, 5 -/* 80501EB8 B0 1F 05 88 */ sth r0, 0x588(r31) -/* 80501EBC 38 7F 08 08 */ addi r3, r31, 0x808 -/* 80501EC0 4B B8 28 31 */ bl GetCoHitObj__12dCcD_GObjInfFv -/* 80501EC4 90 7F 0A 7C */ stw r3, 0xa7c(r31) -lbl_80501EC8: -/* 80501EC8 A8 1F 05 88 */ lha r0, 0x588(r31) -/* 80501ECC 2C 00 00 00 */ cmpwi r0, 0 -/* 80501ED0 41 82 01 E8 */ beq lbl_805020B8 -/* 80501ED4 38 7F 0A 7C */ addi r3, r31, 0xa7c -/* 80501ED8 4B B8 5B 81 */ bl at_power_check__FP11dCcU_AtInfo -/* 80501EDC 7C 7D 1B 78 */ mr r29, r3 -/* 80501EE0 2C 1E 00 00 */ cmpwi r30, 0 -/* 80501EE4 41 82 00 8C */ beq lbl_80501F70 -/* 80501EE8 38 00 00 0A */ li r0, 0xa -/* 80501EEC 98 1F 05 B0 */ stb r0, 0x5b0(r31) -/* 80501EF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501EF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501EF8 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80501EFC 28 00 00 00 */ cmplwi r0, 0 -/* 80501F00 40 82 01 B8 */ bne lbl_805020B8 -/* 80501F04 38 00 00 14 */ li r0, 0x14 -/* 80501F08 B0 1F 05 88 */ sth r0, 0x588(r31) -/* 80501F0C 38 00 00 01 */ li r0, 1 -/* 80501F10 98 1F 05 8A */ stb r0, 0x58a(r31) -/* 80501F14 80 83 5D AC */ lwz r4, 0x5dac(r3) -/* 80501F18 28 04 00 00 */ cmplwi r4, 0 -/* 80501F1C 41 82 00 0C */ beq lbl_80501F28 -/* 80501F20 80 04 00 04 */ lwz r0, 4(r4) -/* 80501F24 48 00 00 08 */ b lbl_80501F2C -lbl_80501F28: -/* 80501F28 38 00 FF FF */ li r0, -1 -lbl_80501F2C: -/* 80501F2C 90 1F 0A A4 */ stw r0, 0xaa4(r31) -/* 80501F30 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80501F34 3C 80 80 50 */ lis r4, d_a_e_nest__stringBase0@ha /* 0x805047EC@ha */ -/* 80501F38 38 84 47 EC */ addi r4, r4, d_a_e_nest__stringBase0@l /* 0x805047EC@l */ -/* 80501F3C 4B E6 6A 59 */ bl strcmp -/* 80501F40 2C 03 00 00 */ cmpwi r3, 0 -/* 80501F44 40 82 01 74 */ bne lbl_805020B8 -/* 80501F48 38 00 00 01 */ li r0, 1 -/* 80501F4C B0 1F 0C D4 */ sth r0, 0xcd4(r31) -/* 80501F50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501F54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501F58 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80501F5C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80501F60 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80501F64 A0 84 01 6E */ lhz r4, 0x16e(r4) -/* 80501F68 4B B3 2A 25 */ bl onEventBit__11dSv_event_cFUs -/* 80501F6C 48 00 01 4C */ b lbl_805020B8 -lbl_80501F70: -/* 80501F70 88 1F 0A 9C */ lbz r0, 0xa9c(r31) -/* 80501F74 28 00 00 01 */ cmplwi r0, 1 -/* 80501F78 41 82 00 24 */ beq lbl_80501F9C -/* 80501F7C 28 00 00 02 */ cmplwi r0, 2 -/* 80501F80 41 82 00 1C */ beq lbl_80501F9C -/* 80501F84 28 00 00 0F */ cmplwi r0, 0xf -/* 80501F88 41 82 00 14 */ beq lbl_80501F9C -/* 80501F8C 28 00 00 0A */ cmplwi r0, 0xa -/* 80501F90 41 82 00 0C */ beq lbl_80501F9C -/* 80501F94 28 00 00 10 */ cmplwi r0, 0x10 -/* 80501F98 40 82 00 48 */ bne lbl_80501FE0 -lbl_80501F9C: -/* 80501F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501FA4 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80501FA8 28 03 00 00 */ cmplwi r3, 0 -/* 80501FAC 41 82 00 0C */ beq lbl_80501FB8 -/* 80501FB0 80 03 00 04 */ lwz r0, 4(r3) -/* 80501FB4 48 00 00 08 */ b lbl_80501FBC -lbl_80501FB8: -/* 80501FB8 38 00 FF FF */ li r0, -1 -lbl_80501FBC: -/* 80501FBC 90 1F 0A A4 */ stw r0, 0xaa4(r31) -/* 80501FC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501FC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501FC8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80501FCC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80501FD0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80501FD4 A0 84 01 58 */ lhz r4, 0x158(r4) -/* 80501FD8 4B B3 29 B5 */ bl onEventBit__11dSv_event_cFUs -/* 80501FDC 48 00 00 DC */ b lbl_805020B8 -lbl_80501FE0: -/* 80501FE0 A8 1D 00 08 */ lha r0, 8(r29) -/* 80501FE4 2C 00 01 00 */ cmpwi r0, 0x100 -/* 80501FE8 40 82 00 8C */ bne lbl_80502074 -/* 80501FEC A0 1D 06 BE */ lhz r0, 0x6be(r29) -/* 80501FF0 60 00 00 04 */ ori r0, r0, 4 -/* 80501FF4 B0 1D 06 BE */ sth r0, 0x6be(r29) -/* 80501FF8 28 1D 00 00 */ cmplwi r29, 0 -/* 80501FFC 41 82 00 0C */ beq lbl_80502008 -/* 80502000 80 1D 00 04 */ lwz r0, 4(r29) -/* 80502004 48 00 00 08 */ b lbl_8050200C -lbl_80502008: -/* 80502008 38 00 FF FF */ li r0, -1 -lbl_8050200C: -/* 8050200C 90 1F 0A A4 */ stw r0, 0xaa4(r31) -/* 80502010 38 00 00 01 */ li r0, 1 -/* 80502014 98 1F 05 8A */ stb r0, 0x58a(r31) -/* 80502018 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8050201C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80502020 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80502024 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80502028 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8050202C A0 84 01 56 */ lhz r4, 0x156(r4) -/* 80502030 4B B3 29 5D */ bl onEventBit__11dSv_event_cFUs -/* 80502034 38 00 00 14 */ li r0, 0x14 -/* 80502038 B0 1F 05 88 */ sth r0, 0x588(r31) -/* 8050203C 38 00 00 01 */ li r0, 1 -/* 80502040 98 1F 0A A0 */ stb r0, 0xaa0(r31) -/* 80502044 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080044@ha */ -/* 80502048 38 03 00 44 */ addi r0, r3, 0x0044 /* 0x00080044@l */ -/* 8050204C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80502050 38 7F 0A F8 */ addi r3, r31, 0xaf8 -/* 80502054 38 81 00 0C */ addi r4, r1, 0xc -/* 80502058 38 A0 00 00 */ li r5, 0 -/* 8050205C 38 C0 FF FF */ li r6, -1 -/* 80502060 81 9F 0B 08 */ lwz r12, 0xb08(r31) -/* 80502064 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80502068 7D 89 03 A6 */ mtctr r12 -/* 8050206C 4E 80 04 21 */ bctrl -/* 80502070 48 00 00 48 */ b lbl_805020B8 -lbl_80502074: -/* 80502074 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80502078 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8050207C 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80502080 3C 80 80 50 */ lis r4, d_a_e_nest__stringBase0@ha /* 0x805047EC@ha */ -/* 80502084 38 84 47 EC */ addi r4, r4, d_a_e_nest__stringBase0@l /* 0x805047EC@l */ -/* 80502088 4B E6 69 0D */ bl strcmp -/* 8050208C 2C 03 00 00 */ cmpwi r3, 0 -/* 80502090 40 82 00 20 */ bne lbl_805020B0 -/* 80502094 28 1D 00 00 */ cmplwi r29, 0 -/* 80502098 41 82 00 0C */ beq lbl_805020A4 -/* 8050209C 80 1D 00 04 */ lwz r0, 4(r29) -/* 805020A0 48 00 00 08 */ b lbl_805020A8 -lbl_805020A4: -/* 805020A4 38 00 FF FF */ li r0, -1 -lbl_805020A8: -/* 805020A8 90 1F 0A A4 */ stw r0, 0xaa4(r31) -/* 805020AC 48 00 00 0C */ b lbl_805020B8 -lbl_805020B0: -/* 805020B0 38 00 00 00 */ li r0, 0 -/* 805020B4 B0 1F 05 88 */ sth r0, 0x588(r31) -lbl_805020B8: -/* 805020B8 39 61 00 40 */ addi r11, r1, 0x40 -/* 805020BC 4B E6 01 6D */ bl _restgpr_29 -/* 805020C0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805020C4 7C 08 03 A6 */ mtlr r0 -/* 805020C8 38 21 00 40 */ addi r1, r1, 0x40 -/* 805020CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046B8.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046B8.s deleted file mode 100644 index 5b7ffc370bc..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046B8.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_805046B8: -/* 805046B8 38 63 FF DC */ addi r3, r3, -36 -/* 805046BC 4B FF FF 08 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046C0.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046C0.s deleted file mode 100644 index c70790c745f..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046C0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_805046C0: -/* 805046C0 38 63 FF EC */ addi r3, r3, -20 -/* 805046C4 4B FF FF 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_draw__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_draw__FP12e_nest_class.s deleted file mode 100644 index 3c311cae0b8..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_draw__FP12e_nest_class.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80500FB0: -/* 80500FB0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80500FB4 7C 08 02 A6 */ mflr r0 -/* 80500FB8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80500FBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80500FC0 4B E6 12 19 */ bl _savegpr_28 -/* 80500FC4 7C 7C 1B 78 */ mr r28, r3 -/* 80500FC8 3B DC 0B 1C */ addi r30, r28, 0xb1c -/* 80500FCC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80500FD0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80500FD4 38 80 00 00 */ li r4, 0 -/* 80500FD8 38 BC 04 D0 */ addi r5, r28, 0x4d0 -/* 80500FDC 38 DC 01 0C */ addi r6, r28, 0x10c -/* 80500FE0 4B CA 27 E5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80500FE4 3B A0 00 00 */ li r29, 0 -/* 80500FE8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80500FEC 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -lbl_80500FF0: -/* 80500FF0 88 1E 00 53 */ lbz r0, 0x53(r30) -/* 80500FF4 28 00 00 00 */ cmplwi r0, 0 -/* 80500FF8 41 82 00 20 */ beq lbl_80501018 -/* 80500FFC 7F E3 FB 78 */ mr r3, r31 -/* 80501000 80 9E 00 00 */ lwz r4, 0(r30) -/* 80501004 80 84 00 04 */ lwz r4, 4(r4) -/* 80501008 38 BC 01 0C */ addi r5, r28, 0x10c -/* 8050100C 4B CA 3D 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80501010 80 7E 00 00 */ lwz r3, 0(r30) -/* 80501014 4B B0 CC B1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80501018: -/* 80501018 3B BD 00 01 */ addi r29, r29, 1 -/* 8050101C 2C 1D 00 05 */ cmpwi r29, 5 -/* 80501020 3B DE 00 58 */ addi r30, r30, 0x58 -/* 80501024 41 80 FF CC */ blt lbl_80500FF0 -/* 80501028 39 61 00 20 */ addi r11, r1, 0x20 -/* 8050102C 4B E6 11 F9 */ bl _restgpr_28 -/* 80501030 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80501034 7C 08 03 A6 */ mtlr r0 -/* 80501038 38 21 00 20 */ addi r1, r1, 0x20 -/* 8050103C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_move__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_move__FP12e_nest_class.s deleted file mode 100644 index 0d5eee530e3..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_move__FP12e_nest_class.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_805017FC: -/* 805017FC 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80501800 7C 08 02 A6 */ mflr r0 -/* 80501804 90 01 00 94 */ stw r0, 0x94(r1) -/* 80501808 39 61 00 90 */ addi r11, r1, 0x90 -/* 8050180C 4B E6 09 D1 */ bl _savegpr_29 -/* 80501810 7C 7D 1B 78 */ mr r29, r3 -/* 80501814 3B FD 0B 1C */ addi r31, r29, 0xb1c -/* 80501818 38 61 00 08 */ addi r3, r1, 8 -/* 8050181C 4B B7 64 4D */ bl __ct__11dBgS_LinChkFv -/* 80501820 3B C0 00 00 */ li r30, 0 -lbl_80501824: -/* 80501824 88 7F 00 53 */ lbz r3, 0x53(r31) -/* 80501828 28 03 00 00 */ cmplwi r3, 0 -/* 8050182C 41 82 00 BC */ beq lbl_805018E8 -/* 80501830 88 1D 0B 18 */ lbz r0, 0xb18(r29) -/* 80501834 2C 00 00 03 */ cmpwi r0, 3 -/* 80501838 40 82 00 18 */ bne lbl_80501850 -/* 8050183C 28 03 00 01 */ cmplwi r3, 1 -/* 80501840 40 82 00 10 */ bne lbl_80501850 -/* 80501844 7F A3 EB 78 */ mr r3, r29 -/* 80501848 7F E4 FB 78 */ mr r4, r31 -/* 8050184C 4B FF F9 81 */ bl hahen_normal__FP12e_nest_classP12nest_hahen_s -lbl_80501850: -/* 80501850 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80501854 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80501858 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 8050185C 38 60 00 00 */ li r3, 0 -/* 80501860 4B D6 F5 FD */ bl MtxTrans__FfffUc -/* 80501864 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 80501868 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8050186C 80 63 00 00 */ lwz r3, 0(r3) -/* 80501870 A8 9F 00 3A */ lha r4, 0x3a(r31) -/* 80501874 4B B0 AB 29 */ bl mDoMtx_XrotM__FPA4_fs -/* 80501878 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8050187C 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 80501880 80 63 00 00 */ lwz r3, 0(r3) -/* 80501884 A8 9F 00 3C */ lha r4, 0x3c(r31) -/* 80501888 4B B0 AC 45 */ bl mDoMtx_ZrotM__FPA4_fs -/* 8050188C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 80501890 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 80501894 80 63 00 00 */ lwz r3, 0(r3) -/* 80501898 A8 9F 00 36 */ lha r4, 0x36(r31) -/* 8050189C 38 04 40 00 */ addi r0, r4, 0x4000 -/* 805018A0 7C 04 07 34 */ extsh r4, r0 -/* 805018A4 4B B0 AB 91 */ bl mDoMtx_YrotM__FPA4_fs -/* 805018A8 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805018AC 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805018B0 80 63 00 00 */ lwz r3, 0(r3) -/* 805018B4 A8 9F 00 34 */ lha r4, 0x34(r31) -/* 805018B8 4B B0 AC 15 */ bl mDoMtx_ZrotM__FPA4_fs -/* 805018BC C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 805018C0 C0 5F 00 2C */ lfs f2, 0x2c(r31) -/* 805018C4 C0 7F 00 30 */ lfs f3, 0x30(r31) -/* 805018C8 38 60 00 01 */ li r3, 1 -/* 805018CC 4B D6 F5 D9 */ bl MtxScale__FfffUc -/* 805018D0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805018D4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805018D8 80 63 00 00 */ lwz r3, 0(r3) -/* 805018DC 80 9F 00 00 */ lwz r4, 0(r31) -/* 805018E0 38 84 00 24 */ addi r4, r4, 0x24 -/* 805018E4 4B E4 4B CD */ bl PSMTXCopy -lbl_805018E8: -/* 805018E8 3B DE 00 01 */ addi r30, r30, 1 -/* 805018EC 2C 1E 00 05 */ cmpwi r30, 5 -/* 805018F0 3B FF 00 58 */ addi r31, r31, 0x58 -/* 805018F4 41 80 FF 30 */ blt lbl_80501824 -/* 805018F8 88 1D 0B 18 */ lbz r0, 0xb18(r29) -/* 805018FC 2C 00 00 02 */ cmpwi r0, 2 -/* 80501900 40 82 00 0C */ bne lbl_8050190C -/* 80501904 38 00 00 03 */ li r0, 3 -/* 80501908 98 1D 0B 18 */ stb r0, 0xb18(r29) -lbl_8050190C: -/* 8050190C 38 61 00 08 */ addi r3, r1, 8 -/* 80501910 38 80 FF FF */ li r4, -1 -/* 80501914 4B B7 63 C9 */ bl __dt__11dBgS_LinChkFv -/* 80501918 39 61 00 90 */ addi r11, r1, 0x90 -/* 8050191C 4B E6 09 0D */ bl _restgpr_29 -/* 80501920 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80501924 7C 08 03 A6 */ mtlr r0 -/* 80501928 38 21 00 90 */ addi r1, r1, 0x90 -/* 8050192C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_normal__FP12e_nest_classP12nest_hahen_s.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_normal__FP12e_nest_classP12nest_hahen_s.s deleted file mode 100644 index da85a26556d..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_normal__FP12e_nest_classP12nest_hahen_s.s +++ /dev/null @@ -1,419 +0,0 @@ -lbl_805011CC: -/* 805011CC 94 21 FE A0 */ stwu r1, -0x160(r1) -/* 805011D0 7C 08 02 A6 */ mflr r0 -/* 805011D4 90 01 01 64 */ stw r0, 0x164(r1) -/* 805011D8 DB E1 01 50 */ stfd f31, 0x150(r1) -/* 805011DC F3 E1 01 58 */ psq_st f31, 344(r1), 0, 0 /* qr0 */ -/* 805011E0 39 61 01 50 */ addi r11, r1, 0x150 -/* 805011E4 4B E6 0F F5 */ bl _savegpr_28 -/* 805011E8 7C 9C 23 78 */ mr r28, r4 -/* 805011EC 3C 80 80 50 */ lis r4, lit_3999@ha /* 0x805046DC@ha */ -/* 805011F0 3B E4 46 DC */ addi r31, r4, lit_3999@l /* 0x805046DC@l */ -/* 805011F4 7C 7D 1B 78 */ mr r29, r3 -/* 805011F8 38 61 00 B4 */ addi r3, r1, 0xb4 -/* 805011FC 4B B7 6A 6D */ bl __ct__11dBgS_LinChkFv -/* 80501200 38 61 00 60 */ addi r3, r1, 0x60 -/* 80501204 4B B7 65 AD */ bl __ct__18dBgS_ObjGndChk_SplFv -/* 80501208 A8 7C 00 44 */ lha r3, 0x44(r28) -/* 8050120C 38 03 00 01 */ addi r0, r3, 1 -/* 80501210 B0 1C 00 44 */ sth r0, 0x44(r28) -/* 80501214 88 7C 00 54 */ lbz r3, 0x54(r28) -/* 80501218 28 03 00 00 */ cmplwi r3, 0 -/* 8050121C 41 82 00 0C */ beq lbl_80501228 -/* 80501220 38 03 FF FF */ addi r0, r3, -1 -/* 80501224 98 1C 00 54 */ stb r0, 0x54(r28) -lbl_80501228: -/* 80501228 C0 1C 00 04 */ lfs f0, 4(r28) -/* 8050122C D0 1C 00 10 */ stfs f0, 0x10(r28) -/* 80501230 C0 1C 00 08 */ lfs f0, 8(r28) -/* 80501234 D0 1C 00 14 */ stfs f0, 0x14(r28) -/* 80501238 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 8050123C D0 1C 00 18 */ stfs f0, 0x18(r28) -/* 80501240 38 7C 00 04 */ addi r3, r28, 4 -/* 80501244 38 9C 00 1C */ addi r4, r28, 0x1c -/* 80501248 7C 65 1B 78 */ mr r5, r3 -/* 8050124C 4B E4 5E 45 */ bl PSVECAdd -/* 80501250 C0 1C 00 04 */ lfs f0, 4(r28) -/* 80501254 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80501258 C0 3C 00 08 */ lfs f1, 8(r28) -/* 8050125C D0 21 00 58 */ stfs f1, 0x58(r1) -/* 80501260 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 80501264 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 80501268 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 8050126C EC 01 00 2A */ fadds f0, f1, f0 -/* 80501270 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80501274 38 61 00 60 */ addi r3, r1, 0x60 -/* 80501278 38 81 00 54 */ addi r4, r1, 0x54 -/* 8050127C 4B D6 6A AD */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80501280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501288 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 8050128C 7F C3 F3 78 */ mr r3, r30 -/* 80501290 38 81 00 60 */ addi r4, r1, 0x60 -/* 80501294 4B B7 32 0D */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80501298 FF E0 08 90 */ fmr f31, f1 -/* 8050129C C0 1C 00 08 */ lfs f0, 8(r28) -/* 805012A0 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 805012A4 40 80 00 48 */ bge lbl_805012EC -/* 805012A8 C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 805012AC C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 805012B0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 805012B4 D0 1C 00 20 */ stfs f0, 0x20(r28) -/* 805012B8 C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 805012BC C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 805012C0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805012C4 40 80 00 08 */ bge lbl_805012CC -/* 805012C8 D0 1C 00 20 */ stfs f0, 0x20(r28) -lbl_805012CC: -/* 805012CC C0 1C 00 1C */ lfs f0, 0x1c(r28) -/* 805012D0 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 805012D4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 805012D8 D0 1C 00 1C */ stfs f0, 0x1c(r28) -/* 805012DC C0 1C 00 24 */ lfs f0, 0x24(r28) -/* 805012E0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 805012E4 D0 1C 00 24 */ stfs f0, 0x24(r28) -/* 805012E8 48 00 00 28 */ b lbl_80501310 -lbl_805012EC: -/* 805012EC C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 805012F0 C0 1F 00 34 */ lfs f0, 0x34(r31) -/* 805012F4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 805012F8 D0 1C 00 20 */ stfs f0, 0x20(r28) -/* 805012FC C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 80501300 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80501304 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80501308 40 80 00 08 */ bge lbl_80501310 -/* 8050130C D0 1C 00 20 */ stfs f0, 0x20(r28) -lbl_80501310: -/* 80501310 C0 5C 00 0C */ lfs f2, 0xc(r28) -/* 80501314 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80501318 C0 1C 00 08 */ lfs f0, 8(r28) -/* 8050131C EC 21 00 2A */ fadds f1, f1, f0 -/* 80501320 C0 1C 00 04 */ lfs f0, 4(r28) -/* 80501324 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80501328 D0 21 00 4C */ stfs f1, 0x4c(r1) -/* 8050132C D0 41 00 50 */ stfs f2, 0x50(r1) -/* 80501330 38 61 00 48 */ addi r3, r1, 0x48 -/* 80501334 4B B1 C9 89 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80501338 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8050133C 41 82 02 A0 */ beq lbl_805015DC -/* 80501340 C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 80501344 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80501348 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8050134C 4C 40 13 82 */ cror 2, 0, 2 -/* 80501350 40 82 02 38 */ bne lbl_80501588 -/* 80501354 C0 5C 00 08 */ lfs f2, 8(r28) -/* 80501358 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8050135C 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80501360 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80501364 EC 01 00 2A */ fadds f0, f1, f0 -/* 80501368 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8050136C 4C 40 13 82 */ cror 2, 0, 2 -/* 80501370 40 82 02 18 */ bne lbl_80501588 -/* 80501374 D0 1C 00 08 */ stfs f0, 8(r28) -/* 80501378 C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 8050137C C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80501380 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80501384 40 80 01 5C */ bge lbl_805014E0 -/* 80501388 88 1C 00 52 */ lbz r0, 0x52(r28) -/* 8050138C 7C 00 07 75 */ extsb. r0, r0 -/* 80501390 40 82 01 50 */ bne lbl_805014E0 -/* 80501394 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 80501398 4B D6 65 BD */ bl cM_rndF__Ff -/* 8050139C C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 805013A0 EC 00 08 2A */ fadds f0, f0, f1 -/* 805013A4 FC 00 00 1E */ fctiwz f0, f0 -/* 805013A8 D8 01 01 28 */ stfd f0, 0x128(r1) -/* 805013AC 80 01 01 2C */ lwz r0, 0x12c(r1) -/* 805013B0 B0 1C 00 50 */ sth r0, 0x50(r28) -/* 805013B4 88 7C 00 52 */ lbz r3, 0x52(r28) -/* 805013B8 38 03 00 01 */ addi r0, r3, 1 -/* 805013BC 98 1C 00 52 */ stb r0, 0x52(r28) -/* 805013C0 C0 1C 00 04 */ lfs f0, 4(r28) -/* 805013C4 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 805013C8 C0 5C 00 08 */ lfs f2, 8(r28) -/* 805013CC D0 41 00 4C */ stfs f2, 0x4c(r1) -/* 805013D0 C0 3C 00 0C */ lfs f1, 0xc(r28) -/* 805013D4 D0 21 00 50 */ stfs f1, 0x50(r1) -/* 805013D8 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 805013DC EC 02 00 2A */ fadds f0, f2, f0 -/* 805013E0 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 805013E4 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 805013E8 EC 01 00 2A */ fadds f0, f1, f0 -/* 805013EC D0 01 00 50 */ stfs f0, 0x50(r1) -/* 805013F0 38 61 00 48 */ addi r3, r1, 0x48 -/* 805013F4 4B B1 C8 C9 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 805013F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805013FC 41 82 01 20 */ beq lbl_8050151C -/* 80501400 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80501404 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80501408 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 8050140C EC 21 00 2A */ fadds f1, f1, f0 -/* 80501410 D0 21 00 4C */ stfs f1, 0x4c(r1) -/* 80501414 C0 1C 00 08 */ lfs f0, 8(r28) -/* 80501418 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8050141C C0 41 00 50 */ lfs f2, 0x50(r1) -/* 80501420 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 80501424 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80501428 4B D6 62 4D */ bl cM_atan2s__Fff -/* 8050142C 7C 03 00 D0 */ neg r0, r3 -/* 80501430 B0 1C 00 3A */ sth r0, 0x3a(r28) -/* 80501434 A8 1C 00 3A */ lha r0, 0x3a(r28) -/* 80501438 2C 00 30 00 */ cmpwi r0, 0x3000 -/* 8050143C 41 81 00 0C */ bgt lbl_80501448 -/* 80501440 2C 00 D0 00 */ cmpwi r0, -12288 -/* 80501444 40 80 00 0C */ bge lbl_80501450 -lbl_80501448: -/* 80501448 38 00 00 00 */ li r0, 0 -/* 8050144C B0 1C 00 3A */ sth r0, 0x3a(r28) -lbl_80501450: -/* 80501450 C0 5C 00 04 */ lfs f2, 4(r28) -/* 80501454 D0 41 00 48 */ stfs f2, 0x48(r1) -/* 80501458 C0 3C 00 08 */ lfs f1, 8(r28) -/* 8050145C D0 21 00 4C */ stfs f1, 0x4c(r1) -/* 80501460 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 80501464 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80501468 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 8050146C EC 01 00 2A */ fadds f0, f1, f0 -/* 80501470 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80501474 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 80501478 EC 02 00 2A */ fadds f0, f2, f0 -/* 8050147C D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80501480 38 61 00 48 */ addi r3, r1, 0x48 -/* 80501484 4B B1 C8 39 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80501488 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8050148C 41 82 00 90 */ beq lbl_8050151C -/* 80501490 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80501494 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 80501498 C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 8050149C EC 21 00 2A */ fadds f1, f1, f0 -/* 805014A0 D0 21 00 4C */ stfs f1, 0x4c(r1) -/* 805014A4 C0 1C 00 08 */ lfs f0, 8(r28) -/* 805014A8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 805014AC C0 41 00 48 */ lfs f2, 0x48(r1) -/* 805014B0 C0 1C 00 04 */ lfs f0, 4(r28) -/* 805014B4 EC 42 00 28 */ fsubs f2, f2, f0 -/* 805014B8 4B D6 61 BD */ bl cM_atan2s__Fff -/* 805014BC B0 7C 00 3C */ sth r3, 0x3c(r28) -/* 805014C0 A8 1C 00 3C */ lha r0, 0x3c(r28) -/* 805014C4 2C 00 30 00 */ cmpwi r0, 0x3000 -/* 805014C8 41 81 00 0C */ bgt lbl_805014D4 -/* 805014CC 2C 00 D0 00 */ cmpwi r0, -12288 -/* 805014D0 40 80 00 4C */ bge lbl_8050151C -lbl_805014D4: -/* 805014D4 38 00 00 00 */ li r0, 0 -/* 805014D8 B0 1C 00 3C */ sth r0, 0x3c(r28) -/* 805014DC 48 00 00 40 */ b lbl_8050151C -lbl_805014E0: -/* 805014E0 38 00 00 03 */ li r0, 3 -/* 805014E4 98 1C 00 52 */ stb r0, 0x52(r28) -/* 805014E8 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 805014EC D0 1C 00 20 */ stfs f0, 0x20(r28) -/* 805014F0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 805014F4 D0 1C 00 24 */ stfs f0, 0x24(r28) -/* 805014F8 D0 1C 00 1C */ stfs f0, 0x1c(r28) -/* 805014FC 3C 60 80 50 */ lis r3, s_bomb_sub__FPvPv@ha /* 0x80501040@ha */ -/* 80501500 38 63 10 40 */ addi r3, r3, s_bomb_sub__FPvPv@l /* 0x80501040@l */ -/* 80501504 7F 84 E3 78 */ mr r4, r28 -/* 80501508 4B B1 FE 31 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 8050150C 28 03 00 00 */ cmplwi r3, 0 -/* 80501510 41 82 00 0C */ beq lbl_8050151C -/* 80501514 38 00 00 00 */ li r0, 0 -/* 80501518 98 1C 00 53 */ stb r0, 0x53(r28) -lbl_8050151C: -/* 8050151C A8 1C 00 44 */ lha r0, 0x44(r28) -/* 80501520 1C 00 17 00 */ mulli r0, r0, 0x1700 -/* 80501524 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80501528 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8050152C 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80501530 7C 63 04 2E */ lfsx f3, r3, r0 -/* 80501534 C0 5F 00 54 */ lfs f2, 0x54(r31) -/* 80501538 A8 1C 00 50 */ lha r0, 0x50(r28) -/* 8050153C C8 3F 00 68 */ lfd f1, 0x68(r31) -/* 80501540 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80501544 90 01 01 2C */ stw r0, 0x12c(r1) -/* 80501548 3C 00 43 30 */ lis r0, 0x4330 -/* 8050154C 90 01 01 28 */ stw r0, 0x128(r1) -/* 80501550 C8 01 01 28 */ lfd f0, 0x128(r1) -/* 80501554 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80501558 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8050155C EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80501560 FC 00 00 1E */ fctiwz f0, f0 -/* 80501564 D8 01 01 30 */ stfd f0, 0x130(r1) -/* 80501568 80 01 01 34 */ lwz r0, 0x134(r1) -/* 8050156C B0 1C 00 34 */ sth r0, 0x34(r28) -/* 80501570 38 7C 00 50 */ addi r3, r28, 0x50 -/* 80501574 38 80 00 00 */ li r4, 0 -/* 80501578 38 A0 00 01 */ li r5, 1 -/* 8050157C 38 C0 00 01 */ li r6, 1 -/* 80501580 4B D6 F0 89 */ bl cLib_addCalcAngleS2__FPssss -/* 80501584 48 00 00 58 */ b lbl_805015DC -lbl_80501588: -/* 80501588 C0 1C 00 08 */ lfs f0, 8(r28) -/* 8050158C FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 80501590 40 80 00 38 */ bge lbl_805015C8 -/* 80501594 A8 1C 00 44 */ lha r0, 0x44(r28) -/* 80501598 1C 00 05 00 */ mulli r0, r0, 0x500 -/* 8050159C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 805015A0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 805015A4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 805015A8 7C 23 04 2E */ lfsx f1, r3, r0 -/* 805015AC C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 805015B0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 805015B4 FC 00 00 1E */ fctiwz f0, f0 -/* 805015B8 D8 01 01 30 */ stfd f0, 0x130(r1) -/* 805015BC 80 01 01 34 */ lwz r0, 0x134(r1) -/* 805015C0 B0 1C 00 34 */ sth r0, 0x34(r28) -/* 805015C4 48 00 00 18 */ b lbl_805015DC -lbl_805015C8: -/* 805015C8 38 7C 00 34 */ addi r3, r28, 0x34 -/* 805015CC 38 80 00 00 */ li r4, 0 -/* 805015D0 38 A0 00 04 */ li r5, 4 -/* 805015D4 38 C0 04 00 */ li r6, 0x400 -/* 805015D8 4B D6 F0 31 */ bl cLib_addCalcAngleS2__FPssss -lbl_805015DC: -/* 805015DC 88 1C 00 54 */ lbz r0, 0x54(r28) -/* 805015E0 28 00 00 00 */ cmplwi r0, 0 -/* 805015E4 40 82 01 E0 */ bne lbl_805017C4 -/* 805015E8 38 61 00 24 */ addi r3, r1, 0x24 -/* 805015EC 38 9C 00 04 */ addi r4, r28, 4 -/* 805015F0 38 BC 00 10 */ addi r5, r28, 0x10 -/* 805015F4 4B D6 55 41 */ bl __mi__4cXyzCFRC3Vec -/* 805015F8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 805015FC D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80501600 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80501604 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80501608 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 8050160C D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80501610 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80501614 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80501618 38 61 00 3C */ addi r3, r1, 0x3c -/* 8050161C 4B E4 5B 1D */ bl PSVECSquareMag -/* 80501620 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80501624 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80501628 40 81 00 58 */ ble lbl_80501680 -/* 8050162C FC 00 08 34 */ frsqrte f0, f1 -/* 80501630 C8 9F 00 08 */ lfd f4, 8(r31) -/* 80501634 FC 44 00 32 */ fmul f2, f4, f0 -/* 80501638 C8 7F 00 10 */ lfd f3, 0x10(r31) -/* 8050163C FC 00 00 32 */ fmul f0, f0, f0 -/* 80501640 FC 01 00 32 */ fmul f0, f1, f0 -/* 80501644 FC 03 00 28 */ fsub f0, f3, f0 -/* 80501648 FC 02 00 32 */ fmul f0, f2, f0 -/* 8050164C FC 44 00 32 */ fmul f2, f4, f0 -/* 80501650 FC 00 00 32 */ fmul f0, f0, f0 -/* 80501654 FC 01 00 32 */ fmul f0, f1, f0 -/* 80501658 FC 03 00 28 */ fsub f0, f3, f0 -/* 8050165C FC 02 00 32 */ fmul f0, f2, f0 -/* 80501660 FC 44 00 32 */ fmul f2, f4, f0 -/* 80501664 FC 00 00 32 */ fmul f0, f0, f0 -/* 80501668 FC 01 00 32 */ fmul f0, f1, f0 -/* 8050166C FC 03 00 28 */ fsub f0, f3, f0 -/* 80501670 FC 02 00 32 */ fmul f0, f2, f0 -/* 80501674 FC 21 00 32 */ fmul f1, f1, f0 -/* 80501678 FC 20 08 18 */ frsp f1, f1 -/* 8050167C 48 00 00 88 */ b lbl_80501704 -lbl_80501680: -/* 80501680 C8 1F 00 18 */ lfd f0, 0x18(r31) -/* 80501684 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80501688 40 80 00 10 */ bge lbl_80501698 -/* 8050168C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80501690 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80501694 48 00 00 70 */ b lbl_80501704 -lbl_80501698: -/* 80501698 D0 21 00 08 */ stfs f1, 8(r1) -/* 8050169C 80 81 00 08 */ lwz r4, 8(r1) -/* 805016A0 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 805016A4 3C 00 7F 80 */ lis r0, 0x7f80 -/* 805016A8 7C 03 00 00 */ cmpw r3, r0 -/* 805016AC 41 82 00 14 */ beq lbl_805016C0 -/* 805016B0 40 80 00 40 */ bge lbl_805016F0 -/* 805016B4 2C 03 00 00 */ cmpwi r3, 0 -/* 805016B8 41 82 00 20 */ beq lbl_805016D8 -/* 805016BC 48 00 00 34 */ b lbl_805016F0 -lbl_805016C0: -/* 805016C0 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 805016C4 41 82 00 0C */ beq lbl_805016D0 -/* 805016C8 38 00 00 01 */ li r0, 1 -/* 805016CC 48 00 00 28 */ b lbl_805016F4 -lbl_805016D0: -/* 805016D0 38 00 00 02 */ li r0, 2 -/* 805016D4 48 00 00 20 */ b lbl_805016F4 -lbl_805016D8: -/* 805016D8 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 805016DC 41 82 00 0C */ beq lbl_805016E8 -/* 805016E0 38 00 00 05 */ li r0, 5 -/* 805016E4 48 00 00 10 */ b lbl_805016F4 -lbl_805016E8: -/* 805016E8 38 00 00 03 */ li r0, 3 -/* 805016EC 48 00 00 08 */ b lbl_805016F4 -lbl_805016F0: -/* 805016F0 38 00 00 04 */ li r0, 4 -lbl_805016F4: -/* 805016F4 2C 00 00 01 */ cmpwi r0, 1 -/* 805016F8 40 82 00 0C */ bne lbl_80501704 -/* 805016FC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80501700 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80501704: -/* 80501704 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 80501708 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8050170C 40 81 00 B8 */ ble lbl_805017C4 -/* 80501710 38 61 00 18 */ addi r3, r1, 0x18 -/* 80501714 38 81 00 3C */ addi r4, r1, 0x3c -/* 80501718 C0 3F 00 60 */ lfs f1, 0x60(r31) -/* 8050171C 4B D6 54 69 */ bl __ml__4cXyzCFf -/* 80501720 38 61 00 0C */ addi r3, r1, 0xc -/* 80501724 38 9C 00 04 */ addi r4, r28, 4 -/* 80501728 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8050172C 4B D6 53 B9 */ bl __pl__4cXyzCFRC3Vec -/* 80501730 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80501734 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80501738 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8050173C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80501740 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80501744 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80501748 38 61 00 B4 */ addi r3, r1, 0xb4 -/* 8050174C 38 9C 00 10 */ addi r4, r28, 0x10 -/* 80501750 38 A1 00 30 */ addi r5, r1, 0x30 -/* 80501754 7F A6 EB 78 */ mr r6, r29 -/* 80501758 4B B7 66 0D */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 8050175C 7F C3 F3 78 */ mr r3, r30 -/* 80501760 38 81 00 B4 */ addi r4, r1, 0xb4 -/* 80501764 4B B7 2C 51 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 80501768 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8050176C 41 82 00 58 */ beq lbl_805017C4 -/* 80501770 C0 1C 00 10 */ lfs f0, 0x10(r28) -/* 80501774 D0 1C 00 04 */ stfs f0, 4(r28) -/* 80501778 C0 1C 00 14 */ lfs f0, 0x14(r28) -/* 8050177C D0 1C 00 08 */ stfs f0, 8(r28) -/* 80501780 C0 1C 00 18 */ lfs f0, 0x18(r28) -/* 80501784 D0 1C 00 0C */ stfs f0, 0xc(r28) -/* 80501788 C0 1C 00 1C */ lfs f0, 0x1c(r28) -/* 8050178C C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80501790 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80501794 D0 1C 00 1C */ stfs f0, 0x1c(r28) -/* 80501798 C0 1C 00 24 */ lfs f0, 0x24(r28) -/* 8050179C EC 00 00 72 */ fmuls f0, f0, f1 -/* 805017A0 D0 1C 00 24 */ stfs f0, 0x24(r28) -/* 805017A4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 805017A8 D0 1C 00 20 */ stfs f0, 0x20(r28) -/* 805017AC 38 7C 00 04 */ addi r3, r28, 4 -/* 805017B0 38 9C 00 1C */ addi r4, r28, 0x1c -/* 805017B4 7C 65 1B 78 */ mr r5, r3 -/* 805017B8 4B E4 58 D9 */ bl PSVECAdd -/* 805017BC 38 00 00 05 */ li r0, 5 -/* 805017C0 98 1C 00 54 */ stb r0, 0x54(r28) -lbl_805017C4: -/* 805017C4 38 61 00 60 */ addi r3, r1, 0x60 -/* 805017C8 38 80 FF FF */ li r4, -1 -/* 805017CC 4B B7 60 7D */ bl __dt__18dBgS_ObjGndChk_SplFv -/* 805017D0 38 61 00 B4 */ addi r3, r1, 0xb4 -/* 805017D4 38 80 FF FF */ li r4, -1 -/* 805017D8 4B B7 65 05 */ bl __dt__11dBgS_LinChkFv -/* 805017DC E3 E1 01 58 */ psq_l f31, 344(r1), 0, 0 /* qr0 */ -/* 805017E0 CB E1 01 50 */ lfd f31, 0x150(r1) -/* 805017E4 39 61 01 50 */ addi r11, r1, 0x150 -/* 805017E8 4B E6 0A 3D */ bl _restgpr_28 -/* 805017EC 80 01 01 64 */ lwz r0, 0x164(r1) -/* 805017F0 7C 08 03 A6 */ mtlr r0 -/* 805017F4 38 21 01 60 */ addi r1, r1, 0x160 -/* 805017F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/mtx_cc_set__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/mtx_cc_set__FP12e_nest_class.s deleted file mode 100644 index 6bf8c034d66..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/mtx_cc_set__FP12e_nest_class.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_80501A40: -/* 80501A40 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80501A44 7C 08 02 A6 */ mflr r0 -/* 80501A48 90 01 00 44 */ stw r0, 0x44(r1) -/* 80501A4C DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80501A50 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80501A54 39 61 00 30 */ addi r11, r1, 0x30 -/* 80501A58 4B E6 07 85 */ bl _savegpr_29 -/* 80501A5C 7C 7E 1B 78 */ mr r30, r3 -/* 80501A60 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 80501A64 3B E3 46 DC */ addi r31, r3, lit_3999@l /* 0x805046DC@l */ -/* 80501A68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80501A6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80501A70 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80501A74 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80501A78 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80501A7C 4B E4 4E 6D */ bl PSMTXTrans -/* 80501A80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80501A84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80501A88 A8 9E 0A AE */ lha r4, 0xaae(r30) -/* 80501A8C 4B B0 A9 A9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80501A90 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80501A94 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80501A98 A8 9E 0A AC */ lha r4, 0xaac(r30) -/* 80501A9C 4B B0 A9 01 */ bl mDoMtx_XrotM__FPA4_fs -/* 80501AA0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80501AA4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80501AA8 A8 9E 0A B0 */ lha r4, 0xab0(r30) -/* 80501AAC 4B B0 AA 21 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80501AB0 3C 60 80 50 */ lis r3, l_HIO@ha /* 0x80504960@ha */ -/* 80501AB4 38 63 49 60 */ addi r3, r3, l_HIO@l /* 0x80504960@l */ -/* 80501AB8 C0 23 00 08 */ lfs f1, 8(r3) -/* 80501ABC C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80501AC0 EF E1 00 32 */ fmuls f31, f1, f0 -/* 80501AC4 FC 20 F8 90 */ fmr f1, f31 -/* 80501AC8 FC 40 F8 90 */ fmr f2, f31 -/* 80501ACC FC 60 F8 90 */ fmr f3, f31 -/* 80501AD0 4B B0 B3 69 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80501AD4 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80501AD8 C0 5E 05 8C */ lfs f2, 0x58c(r30) -/* 80501ADC C0 1E 05 90 */ lfs f0, 0x590(r30) -/* 80501AE0 EC 42 00 2A */ fadds f2, f2, f0 -/* 80501AE4 FC 60 08 90 */ fmr f3, f1 -/* 80501AE8 4B B0 B2 B5 */ bl transM__14mDoMtx_stack_cFfff -/* 80501AEC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80501AF0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80501AF4 80 9E 05 78 */ lwz r4, 0x578(r30) -/* 80501AF8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80501AFC 4B E4 49 B5 */ bl PSMTXCopy -/* 80501B00 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80501B04 D0 21 00 08 */ stfs f1, 8(r1) -/* 80501B08 C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 80501B0C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80501B10 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80501B14 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80501B18 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80501B1C 38 81 00 08 */ addi r4, r1, 8 -/* 80501B20 38 BE 05 A4 */ addi r5, r30, 0x5a4 -/* 80501B24 4B E4 52 49 */ bl PSMTXMultVec -/* 80501B28 38 7E 09 2C */ addi r3, r30, 0x92c -/* 80501B2C 38 9E 05 A4 */ addi r4, r30, 0x5a4 -/* 80501B30 4B D6 DB 19 */ bl SetC__8cM3dGSphFRC4cXyz -/* 80501B34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80501B38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80501B3C 3B A3 23 3C */ addi r29, r3, 0x233c -/* 80501B40 7F A3 EB 78 */ mr r3, r29 -/* 80501B44 38 9E 08 08 */ addi r4, r30, 0x808 -/* 80501B48 4B D6 30 61 */ bl Set__4cCcSFP8cCcD_Obj -/* 80501B4C 38 7E 09 2C */ addi r3, r30, 0x92c -/* 80501B50 C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80501B54 EC 20 07 F2 */ fmuls f1, f0, f31 -/* 80501B58 4B D6 DB B1 */ bl SetR__8cM3dGSphFf -/* 80501B5C A8 1E 05 7E */ lha r0, 0x57e(r30) -/* 80501B60 2C 00 00 00 */ cmpwi r0, 0 -/* 80501B64 40 82 00 58 */ bne lbl_80501BBC -/* 80501B68 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80501B6C D0 01 00 08 */ stfs f0, 8(r1) -/* 80501B70 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80501B74 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80501B78 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80501B7C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80501B80 C0 1F 00 78 */ lfs f0, 0x78(r31) -/* 80501B84 EC 01 00 2A */ fadds f0, f1, f0 -/* 80501B88 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80501B8C 38 7E 0A 64 */ addi r3, r30, 0xa64 -/* 80501B90 38 81 00 08 */ addi r4, r1, 8 -/* 80501B94 4B D6 D6 49 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80501B98 38 7E 0A 64 */ addi r3, r30, 0xa64 -/* 80501B9C C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 80501BA0 4B D6 D6 61 */ bl SetR__8cM3dGCylFf -/* 80501BA4 38 7E 0A 64 */ addi r3, r30, 0xa64 -/* 80501BA8 C0 3F 00 80 */ lfs f1, 0x80(r31) -/* 80501BAC 4B D6 D6 4D */ bl SetH__8cM3dGCylFf -/* 80501BB0 7F A3 EB 78 */ mr r3, r29 -/* 80501BB4 38 9E 09 40 */ addi r4, r30, 0x940 -/* 80501BB8 4B D6 2F F1 */ bl Set__4cCcSFP8cCcD_Obj -lbl_80501BBC: -/* 80501BBC E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80501BC0 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80501BC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80501BC8 4B E6 06 61 */ bl _restgpr_29 -/* 80501BCC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80501BD0 7C 08 03 A6 */ mtlr r0 -/* 80501BD4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80501BD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/s_bomb_sub__FPvPv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/s_bomb_sub__FPvPv.s deleted file mode 100644 index d8c25f42071..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/s_bomb_sub__FPvPv.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_80501040: -/* 80501040 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80501044 7C 08 02 A6 */ mflr r0 -/* 80501048 90 01 00 44 */ stw r0, 0x44(r1) -/* 8050104C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80501050 4B E6 11 8D */ bl _savegpr_29 -/* 80501054 7C 7D 1B 78 */ mr r29, r3 -/* 80501058 7C 9E 23 78 */ mr r30, r4 -/* 8050105C 3C 80 80 50 */ lis r4, lit_3999@ha /* 0x805046DC@ha */ -/* 80501060 3B E4 46 DC */ addi r31, r4, lit_3999@l /* 0x805046DC@l */ -/* 80501064 4B B1 7C 7D */ bl fopAc_IsActor__FPv -/* 80501068 2C 03 00 00 */ cmpwi r3, 0 -/* 8050106C 41 82 01 44 */ beq lbl_805011B0 -/* 80501070 A8 1D 00 08 */ lha r0, 8(r29) -/* 80501074 2C 00 02 21 */ cmpwi r0, 0x221 -/* 80501078 40 82 01 38 */ bne lbl_805011B0 -/* 8050107C 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80501080 28 00 00 00 */ cmplwi r0, 0 -/* 80501084 40 82 01 2C */ bne lbl_805011B0 -/* 80501088 38 61 00 0C */ addi r3, r1, 0xc -/* 8050108C 38 9E 00 04 */ addi r4, r30, 4 -/* 80501090 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80501094 4B D6 5A A1 */ bl __mi__4cXyzCFRC3Vec -/* 80501098 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8050109C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 805010A0 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 805010A4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805010A8 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 805010AC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805010B0 38 61 00 18 */ addi r3, r1, 0x18 -/* 805010B4 4B E4 60 85 */ bl PSVECSquareMag -/* 805010B8 C0 1F 00 04 */ lfs f0, 4(r31) -/* 805010BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805010C0 40 81 00 58 */ ble lbl_80501118 -/* 805010C4 FC 00 08 34 */ frsqrte f0, f1 -/* 805010C8 C8 9F 00 08 */ lfd f4, 8(r31) -/* 805010CC FC 44 00 32 */ fmul f2, f4, f0 -/* 805010D0 C8 7F 00 10 */ lfd f3, 0x10(r31) -/* 805010D4 FC 00 00 32 */ fmul f0, f0, f0 -/* 805010D8 FC 01 00 32 */ fmul f0, f1, f0 -/* 805010DC FC 03 00 28 */ fsub f0, f3, f0 -/* 805010E0 FC 02 00 32 */ fmul f0, f2, f0 -/* 805010E4 FC 44 00 32 */ fmul f2, f4, f0 -/* 805010E8 FC 00 00 32 */ fmul f0, f0, f0 -/* 805010EC FC 01 00 32 */ fmul f0, f1, f0 -/* 805010F0 FC 03 00 28 */ fsub f0, f3, f0 -/* 805010F4 FC 02 00 32 */ fmul f0, f2, f0 -/* 805010F8 FC 44 00 32 */ fmul f2, f4, f0 -/* 805010FC FC 00 00 32 */ fmul f0, f0, f0 -/* 80501100 FC 01 00 32 */ fmul f0, f1, f0 -/* 80501104 FC 03 00 28 */ fsub f0, f3, f0 -/* 80501108 FC 02 00 32 */ fmul f0, f2, f0 -/* 8050110C FC 21 00 32 */ fmul f1, f1, f0 -/* 80501110 FC 20 08 18 */ frsp f1, f1 -/* 80501114 48 00 00 88 */ b lbl_8050119C -lbl_80501118: -/* 80501118 C8 1F 00 18 */ lfd f0, 0x18(r31) -/* 8050111C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80501120 40 80 00 10 */ bge lbl_80501130 -/* 80501124 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80501128 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8050112C 48 00 00 70 */ b lbl_8050119C -lbl_80501130: -/* 80501130 D0 21 00 08 */ stfs f1, 8(r1) -/* 80501134 80 81 00 08 */ lwz r4, 8(r1) -/* 80501138 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8050113C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80501140 7C 03 00 00 */ cmpw r3, r0 -/* 80501144 41 82 00 14 */ beq lbl_80501158 -/* 80501148 40 80 00 40 */ bge lbl_80501188 -/* 8050114C 2C 03 00 00 */ cmpwi r3, 0 -/* 80501150 41 82 00 20 */ beq lbl_80501170 -/* 80501154 48 00 00 34 */ b lbl_80501188 -lbl_80501158: -/* 80501158 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8050115C 41 82 00 0C */ beq lbl_80501168 -/* 80501160 38 00 00 01 */ li r0, 1 -/* 80501164 48 00 00 28 */ b lbl_8050118C -lbl_80501168: -/* 80501168 38 00 00 02 */ li r0, 2 -/* 8050116C 48 00 00 20 */ b lbl_8050118C -lbl_80501170: -/* 80501170 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80501174 41 82 00 0C */ beq lbl_80501180 -/* 80501178 38 00 00 05 */ li r0, 5 -/* 8050117C 48 00 00 10 */ b lbl_8050118C -lbl_80501180: -/* 80501180 38 00 00 03 */ li r0, 3 -/* 80501184 48 00 00 08 */ b lbl_8050118C -lbl_80501188: -/* 80501188 38 00 00 04 */ li r0, 4 -lbl_8050118C: -/* 8050118C 2C 00 00 01 */ cmpwi r0, 1 -/* 80501190 40 82 00 0C */ bne lbl_8050119C -/* 80501194 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80501198 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8050119C: -/* 8050119C C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 805011A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805011A4 40 80 00 0C */ bge lbl_805011B0 -/* 805011A8 7F A3 EB 78 */ mr r3, r29 -/* 805011AC 48 00 00 08 */ b lbl_805011B4 -lbl_805011B0: -/* 805011B0 38 60 00 00 */ li r3, 0 -lbl_805011B4: -/* 805011B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 805011B8 4B E6 10 71 */ bl _restgpr_29 -/* 805011BC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805011C0 7C 08 03 A6 */ mtlr r0 -/* 805011C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 805011C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/shot_b_sub__FPvPv.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/shot_b_sub__FPvPv.s deleted file mode 100644 index eff31a10713..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/shot_b_sub__FPvPv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80503668: -/* 80503668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8050366C 7C 08 02 A6 */ mflr r0 -/* 80503670 90 01 00 14 */ stw r0, 0x14(r1) -/* 80503674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80503678 7C 7F 1B 78 */ mr r31, r3 -/* 8050367C 4B B1 56 65 */ bl fopAc_IsActor__FPv -/* 80503680 2C 03 00 00 */ cmpwi r3, 0 -/* 80503684 41 82 00 44 */ beq lbl_805036C8 -/* 80503688 A8 1F 00 08 */ lha r0, 8(r31) -/* 8050368C 2C 00 00 FE */ cmpwi r0, 0xfe -/* 80503690 40 82 00 38 */ bne lbl_805036C8 -/* 80503694 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80503698 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8050369C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 805036A0 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc -/* 805036A4 40 82 00 24 */ bne lbl_805036C8 -/* 805036A8 4B C5 C1 F5 */ bl checkBoomerangCharge__9daPy_py_cFv -/* 805036AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805036B0 41 82 00 18 */ beq lbl_805036C8 -/* 805036B4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805036B8 28 00 00 01 */ cmplwi r0, 1 -/* 805036BC 40 82 00 0C */ bne lbl_805036C8 -/* 805036C0 7F E3 FB 78 */ mr r3, r31 -/* 805036C4 48 00 00 08 */ b lbl_805036CC -lbl_805036C8: -/* 805036C8 38 60 00 00 */ li r3, 0 -lbl_805036CC: -/* 805036CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805036D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805036D4 7C 08 03 A6 */ mtlr r0 -/* 805036D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 805036DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/simple_bg_check__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/simple_bg_check__FP12e_nest_class.s deleted file mode 100644 index 503ca9c2b20..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/simple_bg_check__FP12e_nest_class.s +++ /dev/null @@ -1,176 +0,0 @@ -lbl_8050284C: -/* 8050284C 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 80502850 7C 08 02 A6 */ mflr r0 -/* 80502854 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 80502858 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8050285C 4B E5 F9 71 */ bl _savegpr_25 -/* 80502860 7C 79 1B 78 */ mr r25, r3 -/* 80502864 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 80502868 3B 63 46 DC */ addi r27, r3, lit_3999@l /* 0x805046DC@l */ -/* 8050286C 7F 3F CB 78 */ mr r31, r25 -/* 80502870 38 61 00 0C */ addi r3, r1, 0xc -/* 80502874 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80502878 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 8050287C 4B D6 42 B9 */ bl __mi__4cXyzCFRC3Vec -/* 80502880 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80502884 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80502888 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8050288C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80502890 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80502894 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80502898 C0 1B 00 04 */ lfs f0, 4(r27) -/* 8050289C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805028A0 38 61 00 18 */ addi r3, r1, 0x18 -/* 805028A4 4B E4 48 95 */ bl PSVECSquareMag -/* 805028A8 C0 1B 00 04 */ lfs f0, 4(r27) -/* 805028AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805028B0 40 81 00 58 */ ble lbl_80502908 -/* 805028B4 FC 00 08 34 */ frsqrte f0, f1 -/* 805028B8 C8 9B 00 08 */ lfd f4, 8(r27) -/* 805028BC FC 44 00 32 */ fmul f2, f4, f0 -/* 805028C0 C8 7B 00 10 */ lfd f3, 0x10(r27) -/* 805028C4 FC 00 00 32 */ fmul f0, f0, f0 -/* 805028C8 FC 01 00 32 */ fmul f0, f1, f0 -/* 805028CC FC 03 00 28 */ fsub f0, f3, f0 -/* 805028D0 FC 02 00 32 */ fmul f0, f2, f0 -/* 805028D4 FC 44 00 32 */ fmul f2, f4, f0 -/* 805028D8 FC 00 00 32 */ fmul f0, f0, f0 -/* 805028DC FC 01 00 32 */ fmul f0, f1, f0 -/* 805028E0 FC 03 00 28 */ fsub f0, f3, f0 -/* 805028E4 FC 02 00 32 */ fmul f0, f2, f0 -/* 805028E8 FC 44 00 32 */ fmul f2, f4, f0 -/* 805028EC FC 00 00 32 */ fmul f0, f0, f0 -/* 805028F0 FC 01 00 32 */ fmul f0, f1, f0 -/* 805028F4 FC 03 00 28 */ fsub f0, f3, f0 -/* 805028F8 FC 02 00 32 */ fmul f0, f2, f0 -/* 805028FC FC 21 00 32 */ fmul f1, f1, f0 -/* 80502900 FC 20 08 18 */ frsp f1, f1 -/* 80502904 48 00 00 88 */ b lbl_8050298C -lbl_80502908: -/* 80502908 C8 1B 00 18 */ lfd f0, 0x18(r27) -/* 8050290C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80502910 40 80 00 10 */ bge lbl_80502920 -/* 80502914 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80502918 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8050291C 48 00 00 70 */ b lbl_8050298C -lbl_80502920: -/* 80502920 D0 21 00 08 */ stfs f1, 8(r1) -/* 80502924 80 81 00 08 */ lwz r4, 8(r1) -/* 80502928 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8050292C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80502930 7C 03 00 00 */ cmpw r3, r0 -/* 80502934 41 82 00 14 */ beq lbl_80502948 -/* 80502938 40 80 00 40 */ bge lbl_80502978 -/* 8050293C 2C 03 00 00 */ cmpwi r3, 0 -/* 80502940 41 82 00 20 */ beq lbl_80502960 -/* 80502944 48 00 00 34 */ b lbl_80502978 -lbl_80502948: -/* 80502948 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8050294C 41 82 00 0C */ beq lbl_80502958 -/* 80502950 38 00 00 01 */ li r0, 1 -/* 80502954 48 00 00 28 */ b lbl_8050297C -lbl_80502958: -/* 80502958 38 00 00 02 */ li r0, 2 -/* 8050295C 48 00 00 20 */ b lbl_8050297C -lbl_80502960: -/* 80502960 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80502964 41 82 00 0C */ beq lbl_80502970 -/* 80502968 38 00 00 05 */ li r0, 5 -/* 8050296C 48 00 00 10 */ b lbl_8050297C -lbl_80502970: -/* 80502970 38 00 00 03 */ li r0, 3 -/* 80502974 48 00 00 08 */ b lbl_8050297C -lbl_80502978: -/* 80502978 38 00 00 04 */ li r0, 4 -lbl_8050297C: -/* 8050297C 2C 00 00 01 */ cmpwi r0, 1 -/* 80502980 40 82 00 0C */ bne lbl_8050298C -/* 80502984 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80502988 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8050298C: -/* 8050298C C0 1B 00 04 */ lfs f0, 4(r27) -/* 80502990 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80502994 40 81 01 24 */ ble lbl_80502AB8 -/* 80502998 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 8050299C C0 41 00 20 */ lfs f2, 0x20(r1) -/* 805029A0 4B D6 4C D5 */ bl cM_atan2s__Fff -/* 805029A4 7C 64 1B 78 */ mr r4, r3 -/* 805029A8 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 805029AC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 805029B0 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 805029B4 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 805029B8 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 805029BC D0 01 00 38 */ stfs f0, 0x38(r1) -/* 805029C0 C0 3B 00 AC */ lfs f1, 0xac(r27) -/* 805029C4 C0 19 05 94 */ lfs f0, 0x594(r25) -/* 805029C8 EC 01 00 2A */ fadds f0, f1, f0 -/* 805029CC D0 01 00 34 */ stfs f0, 0x34(r1) -/* 805029D0 C0 1B 00 04 */ lfs f0, 4(r27) -/* 805029D4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805029D8 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805029DC 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805029E0 80 63 00 00 */ lwz r3, 0(r3) -/* 805029E4 4B B0 99 F9 */ bl mDoMtx_YrotS__FPA4_fs -/* 805029E8 3B 20 00 00 */ li r25, 0 -/* 805029EC 3B C0 00 00 */ li r30, 0 -/* 805029F0 3C 60 80 50 */ lis r3, l_HIO@ha /* 0x80504960@ha */ -/* 805029F4 3B 63 49 60 */ addi r27, r3, l_HIO@l /* 0x80504960@l */ -/* 805029F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805029FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80502A00 3B 43 0F 38 */ addi r26, r3, 0xf38 -/* 80502A04 3C 60 80 50 */ lis r3, c_x@ha /* 0x805047FC@ha */ -/* 80502A08 3B 83 47 FC */ addi r28, r3, c_x@l /* 0x805047FC@l */ -/* 80502A0C 3C 60 80 50 */ lis r3, c_z@ha /* 0x80504808@ha */ -/* 80502A10 3B A3 48 08 */ addi r29, r3, c_z@l /* 0x80504808@l */ -lbl_80502A14: -/* 80502A14 C0 5F 04 EC */ lfs f2, 0x4ec(r31) -/* 80502A18 C0 3B 00 08 */ lfs f1, 8(r27) -/* 80502A1C 7C 1C F4 2E */ lfsx f0, r28, r30 -/* 80502A20 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80502A24 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80502A28 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80502A2C 7C 1D F4 2E */ lfsx f0, r29, r30 -/* 80502A30 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80502A34 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80502A38 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80502A3C 38 61 00 18 */ addi r3, r1, 0x18 -/* 80502A40 38 81 00 24 */ addi r4, r1, 0x24 -/* 80502A44 4B D6 E4 A9 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80502A48 38 61 00 24 */ addi r3, r1, 0x24 -/* 80502A4C 38 81 00 30 */ addi r4, r1, 0x30 -/* 80502A50 7C 65 1B 78 */ mr r5, r3 -/* 80502A54 4B E4 46 3D */ bl PSVECAdd -/* 80502A58 38 61 00 3C */ addi r3, r1, 0x3c -/* 80502A5C 4B B7 52 0D */ bl __ct__11dBgS_LinChkFv -/* 80502A60 38 61 00 3C */ addi r3, r1, 0x3c -/* 80502A64 38 81 00 30 */ addi r4, r1, 0x30 -/* 80502A68 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80502A6C 7F E6 FB 78 */ mr r6, r31 -/* 80502A70 4B B7 52 F5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 80502A74 7F 43 D3 78 */ mr r3, r26 -/* 80502A78 38 81 00 3C */ addi r4, r1, 0x3c -/* 80502A7C 4B B7 19 39 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 80502A80 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80502A84 41 82 00 18 */ beq lbl_80502A9C -/* 80502A88 38 61 00 3C */ addi r3, r1, 0x3c -/* 80502A8C 38 80 FF FF */ li r4, -1 -/* 80502A90 4B B7 52 4D */ bl __dt__11dBgS_LinChkFv -/* 80502A94 38 60 00 01 */ li r3, 1 -/* 80502A98 48 00 00 24 */ b lbl_80502ABC -lbl_80502A9C: -/* 80502A9C 38 61 00 3C */ addi r3, r1, 0x3c -/* 80502AA0 38 80 FF FF */ li r4, -1 -/* 80502AA4 4B B7 52 39 */ bl __dt__11dBgS_LinChkFv -/* 80502AA8 3B 39 00 01 */ addi r25, r25, 1 -/* 80502AAC 2C 19 00 03 */ cmpwi r25, 3 -/* 80502AB0 3B DE 00 04 */ addi r30, r30, 4 -/* 80502AB4 41 80 FF 60 */ blt lbl_80502A14 -lbl_80502AB8: -/* 80502AB8 38 60 00 00 */ li r3, 0 -lbl_80502ABC: -/* 80502ABC 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 80502AC0 4B E5 F7 59 */ bl _restgpr_25 -/* 80502AC4 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 80502AC8 7C 08 03 A6 */ mtlr r0 -/* 80502ACC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80502AD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 9a4abd11693..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_80503EA0: -/* 80503EA0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80503EA4 7C 08 02 A6 */ mflr r0 -/* 80503EA8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80503EAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80503EB0 4B E5 E3 25 */ bl _savegpr_27 -/* 80503EB4 7C 7B 1B 78 */ mr r27, r3 -/* 80503EB8 3C 60 80 50 */ lis r3, d_a_e_nest__stringBase0@ha /* 0x805047EC@ha */ -/* 80503EBC 38 63 47 EC */ addi r3, r3, d_a_e_nest__stringBase0@l /* 0x805047EC@l */ -/* 80503EC0 38 63 00 08 */ addi r3, r3, 8 -/* 80503EC4 38 80 00 03 */ li r4, 3 -/* 80503EC8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80503ECC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80503ED0 3F A5 00 02 */ addis r29, r5, 2 -/* 80503ED4 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80503ED8 7F A5 EB 78 */ mr r5, r29 -/* 80503EDC 38 C0 00 80 */ li r6, 0x80 -/* 80503EE0 4B B3 84 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80503EE4 3C 80 00 08 */ lis r4, 8 -/* 80503EE8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80503EEC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80503EF0 4B B1 0D 65 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80503EF4 90 7B 05 78 */ stw r3, 0x578(r27) -/* 80503EF8 80 1B 05 78 */ lwz r0, 0x578(r27) -/* 80503EFC 28 00 00 00 */ cmplwi r0, 0 -/* 80503F00 40 82 00 0C */ bne lbl_80503F0C -/* 80503F04 38 60 00 00 */ li r3, 0 -/* 80503F08 48 00 00 AC */ b lbl_80503FB4 -lbl_80503F0C: -/* 80503F0C 90 1B 05 24 */ stw r0, 0x524(r27) -/* 80503F10 3C 60 80 50 */ lis r3, d_a_e_nest__stringBase0@ha /* 0x805047EC@ha */ -/* 80503F14 38 63 47 EC */ addi r3, r3, d_a_e_nest__stringBase0@l /* 0x805047EC@l */ -/* 80503F18 38 63 00 08 */ addi r3, r3, 8 -/* 80503F1C 38 80 00 04 */ li r4, 4 -/* 80503F20 7F A5 EB 78 */ mr r5, r29 -/* 80503F24 38 C0 00 80 */ li r6, 0x80 -/* 80503F28 4B B3 83 C5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80503F2C 7C 7D 1B 78 */ mr r29, r3 -/* 80503F30 3B 80 00 00 */ li r28, 0 -/* 80503F34 3B E0 00 00 */ li r31, 0 -/* 80503F38 3F C0 11 00 */ lis r30, 0x1100 /* 0x11000084@ha */ -lbl_80503F3C: -/* 80503F3C 7F A3 EB 78 */ mr r3, r29 -/* 80503F40 3C 80 00 08 */ lis r4, 8 -/* 80503F44 38 BE 00 84 */ addi r5, r30, 0x0084 /* 0x11000084@l */ -/* 80503F48 4B B1 0D 0D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80503F4C 38 1F 0B 1C */ addi r0, r31, 0xb1c -/* 80503F50 7C 7B 01 2E */ stwx r3, r27, r0 -/* 80503F54 7C 1B 00 2E */ lwzx r0, r27, r0 -/* 80503F58 28 00 00 00 */ cmplwi r0, 0 -/* 80503F5C 40 82 00 0C */ bne lbl_80503F68 -/* 80503F60 38 60 00 00 */ li r3, 0 -/* 80503F64 48 00 00 50 */ b lbl_80503FB4 -lbl_80503F68: -/* 80503F68 3B 9C 00 01 */ addi r28, r28, 1 -/* 80503F6C 2C 1C 00 05 */ cmpwi r28, 5 -/* 80503F70 3B FF 00 58 */ addi r31, r31, 0x58 -/* 80503F74 41 80 FF C8 */ blt lbl_80503F3C -/* 80503F78 38 7B 0A F8 */ addi r3, r27, 0xaf8 -/* 80503F7C 38 9B 04 D0 */ addi r4, r27, 0x4d0 -/* 80503F80 38 A0 00 01 */ li r5, 1 -/* 80503F84 81 9B 0B 08 */ lwz r12, 0xb08(r27) -/* 80503F88 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80503F8C 7D 89 03 A6 */ mtctr r12 -/* 80503F90 4E 80 04 21 */ bctrl -/* 80503F94 38 7B 0A D8 */ addi r3, r27, 0xad8 -/* 80503F98 38 9B 04 D0 */ addi r4, r27, 0x4d0 -/* 80503F9C 38 A0 00 02 */ li r5, 2 -/* 80503FA0 81 9B 0A E8 */ lwz r12, 0xae8(r27) -/* 80503FA4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80503FA8 7D 89 03 A6 */ mtctr r12 -/* 80503FAC 4E 80 04 21 */ bctrl -/* 80503FB0 38 60 00 01 */ li r3, 1 -lbl_80503FB4: -/* 80503FB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80503FB8 4B E5 E2 69 */ bl _restgpr_27 -/* 80503FBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80503FC0 7C 08 03 A6 */ mtlr r0 -/* 80503FC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80503FC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/wall_angle_get__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/wall_angle_get__FP12e_nest_class.s deleted file mode 100644 index 089c2eddab9..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/wall_angle_get__FP12e_nest_class.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_805020D0: -/* 805020D0 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 805020D4 7C 08 02 A6 */ mflr r0 -/* 805020D8 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 805020DC DB E1 00 D0 */ stfd f31, 0xd0(r1) -/* 805020E0 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 /* qr0 */ -/* 805020E4 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 805020E8 4B E6 00 ED */ bl _savegpr_27 -/* 805020EC 3C 80 80 50 */ lis r4, lit_3999@ha /* 0x805046DC@ha */ -/* 805020F0 3B C4 46 DC */ addi r30, r4, lit_3999@l /* 0x805046DC@l */ -/* 805020F4 7C 7C 1B 78 */ mr r28, r3 -/* 805020F8 38 61 00 44 */ addi r3, r1, 0x44 -/* 805020FC 4B B7 5B 6D */ bl __ct__11dBgS_LinChkFv -/* 80502100 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 80502104 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 80502108 80 63 00 00 */ lwz r3, 0(r3) -/* 8050210C A8 9C 04 DE */ lha r4, 0x4de(r28) -/* 80502110 4B B0 A2 CD */ bl mDoMtx_YrotS__FPA4_fs -/* 80502114 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80502118 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8050211C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80502120 C0 3E 00 88 */ lfs f1, 0x88(r30) -/* 80502124 C0 1C 04 EC */ lfs f0, 0x4ec(r28) -/* 80502128 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8050212C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80502130 38 61 00 20 */ addi r3, r1, 0x20 -/* 80502134 38 81 00 14 */ addi r4, r1, 0x14 -/* 80502138 4B D6 ED B5 */ bl MtxPosition__FP4cXyzP4cXyz -/* 8050213C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80502140 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 80502144 7C 65 1B 78 */ mr r5, r3 -/* 80502148 4B E4 4F 49 */ bl PSVECAdd -/* 8050214C C0 1E 00 7C */ lfs f0, 0x7c(r30) -/* 80502150 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80502154 C0 1E 00 04 */ lfs f0, 4(r30) -/* 80502158 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8050215C C0 3E 00 8C */ lfs f1, 0x8c(r30) -/* 80502160 C0 1C 04 EC */ lfs f0, 0x4ec(r28) -/* 80502164 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80502168 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8050216C 3B 60 00 00 */ li r27, 0 -/* 80502170 3B E0 00 00 */ li r31, 0 -/* 80502174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80502178 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8050217C 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 80502180 C3 FE 00 50 */ lfs f31, 0x50(r30) -lbl_80502184: -/* 80502184 38 61 00 20 */ addi r3, r1, 0x20 -/* 80502188 3B C1 00 2C */ addi r30, r1, 0x2c -/* 8050218C 7F DE FA 14 */ add r30, r30, r31 -/* 80502190 7F C4 F3 78 */ mr r4, r30 -/* 80502194 4B D6 ED 59 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80502198 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8050219C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 805021A0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 805021A4 7F C3 F3 78 */ mr r3, r30 -/* 805021A8 38 81 00 14 */ addi r4, r1, 0x14 -/* 805021AC 7F C5 F3 78 */ mr r5, r30 -/* 805021B0 4B E4 4E E1 */ bl PSVECAdd -/* 805021B4 38 61 00 44 */ addi r3, r1, 0x44 -/* 805021B8 38 81 00 14 */ addi r4, r1, 0x14 -/* 805021BC 7F C5 F3 78 */ mr r5, r30 -/* 805021C0 7F 86 E3 78 */ mr r6, r28 -/* 805021C4 4B B7 5B A1 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 805021C8 7F A3 EB 78 */ mr r3, r29 -/* 805021CC 38 81 00 44 */ addi r4, r1, 0x44 -/* 805021D0 4B B7 21 E5 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 805021D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805021D8 41 82 00 20 */ beq lbl_805021F8 -/* 805021DC C0 01 00 74 */ lfs f0, 0x74(r1) -/* 805021E0 D0 1E 00 00 */ stfs f0, 0(r30) -/* 805021E4 C0 01 00 78 */ lfs f0, 0x78(r1) -/* 805021E8 D0 1E 00 04 */ stfs f0, 4(r30) -/* 805021EC C0 01 00 7C */ lfs f0, 0x7c(r1) -/* 805021F0 D0 1E 00 08 */ stfs f0, 8(r30) -/* 805021F4 48 00 00 18 */ b lbl_8050220C -lbl_805021F8: -/* 805021F8 38 61 00 44 */ addi r3, r1, 0x44 -/* 805021FC 38 80 FF FF */ li r4, -1 -/* 80502200 4B B7 5A DD */ bl __dt__11dBgS_LinChkFv -/* 80502204 38 60 00 23 */ li r3, 0x23 -/* 80502208 48 00 00 58 */ b lbl_80502260 -lbl_8050220C: -/* 8050220C 3B 7B 00 01 */ addi r27, r27, 1 -/* 80502210 2C 1B 00 02 */ cmpwi r27, 2 -/* 80502214 3B FF 00 0C */ addi r31, r31, 0xc -/* 80502218 41 80 FF 6C */ blt lbl_80502184 -/* 8050221C 38 61 00 08 */ addi r3, r1, 8 -/* 80502220 38 81 00 38 */ addi r4, r1, 0x38 -/* 80502224 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80502228 4B D6 49 0D */ bl __mi__4cXyzCFRC3Vec -/* 8050222C C0 21 00 08 */ lfs f1, 8(r1) -/* 80502230 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80502234 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80502238 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8050223C C0 41 00 10 */ lfs f2, 0x10(r1) -/* 80502240 D0 41 00 28 */ stfs f2, 0x28(r1) -/* 80502244 4B D6 54 31 */ bl cM_atan2s__Fff -/* 80502248 38 03 40 00 */ addi r0, r3, 0x4000 -/* 8050224C 7C 1E 07 34 */ extsh r30, r0 -/* 80502250 38 61 00 44 */ addi r3, r1, 0x44 -/* 80502254 38 80 FF FF */ li r4, -1 -/* 80502258 4B B7 5A 85 */ bl __dt__11dBgS_LinChkFv -/* 8050225C 7F C3 F3 78 */ mr r3, r30 -lbl_80502260: -/* 80502260 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* qr0 */ -/* 80502264 CB E1 00 D0 */ lfd f31, 0xd0(r1) -/* 80502268 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8050226C 4B E5 FF B5 */ bl _restgpr_27 -/* 80502270 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 80502274 7C 08 03 A6 */ mtlr r0 -/* 80502278 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8050227C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/water_check__FP12e_nest_class.s b/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/water_check__FP12e_nest_class.s deleted file mode 100644 index 6ddc1bf6a91..00000000000 --- a/asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/water_check__FP12e_nest_class.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80502730: -/* 80502730 94 21 FF 10 */ stwu r1, -0xf0(r1) -/* 80502734 7C 08 02 A6 */ mflr r0 -/* 80502738 90 01 00 F4 */ stw r0, 0xf4(r1) -/* 8050273C 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80502740 4B E5 FA 9D */ bl _savegpr_29 -/* 80502744 7C 7D 1B 78 */ mr r29, r3 -/* 80502748 3C 60 80 50 */ lis r3, lit_3999@ha /* 0x805046DC@ha */ -/* 8050274C 3B E3 46 DC */ addi r31, r3, lit_3999@l /* 0x805046DC@l */ -/* 80502750 38 61 00 68 */ addi r3, r1, 0x68 -/* 80502754 4B B7 55 15 */ bl __ct__11dBgS_LinChkFv -/* 80502758 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8050275C D0 01 00 08 */ stfs f0, 8(r1) -/* 80502760 C0 3F 00 A8 */ lfs f1, 0xa8(r31) -/* 80502764 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80502768 EC 01 00 2A */ fadds f0, f1, f0 -/* 8050276C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80502770 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80502774 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80502778 38 61 00 68 */ addi r3, r1, 0x68 -/* 8050277C 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80502780 38 A1 00 08 */ addi r5, r1, 8 -/* 80502784 7F A6 EB 78 */ mr r6, r29 -/* 80502788 4B B7 55 DD */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 8050278C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80502790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80502794 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 80502798 7F C3 F3 78 */ mr r3, r30 -/* 8050279C 38 81 00 68 */ addi r4, r1, 0x68 -/* 805027A0 4B B7 1C 15 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 805027A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805027A8 41 82 00 14 */ beq lbl_805027BC -/* 805027AC C0 21 00 9C */ lfs f1, 0x9c(r1) -/* 805027B0 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 805027B4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 805027B8 D0 01 00 0C */ stfs f0, 0xc(r1) -lbl_805027BC: -/* 805027BC 38 61 00 14 */ addi r3, r1, 0x14 -/* 805027C0 4B B7 4F F1 */ bl __ct__18dBgS_ObjGndChk_SplFv -/* 805027C4 38 61 00 14 */ addi r3, r1, 0x14 -/* 805027C8 38 81 00 08 */ addi r4, r1, 8 -/* 805027CC 4B D6 55 5D */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 805027D0 7F C3 F3 78 */ mr r3, r30 -/* 805027D4 38 81 00 14 */ addi r4, r1, 0x14 -/* 805027D8 4B B7 1C C9 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 805027DC D0 3D 05 94 */ stfs f1, 0x594(r29) -/* 805027E0 C0 5D 05 94 */ lfs f2, 0x594(r29) -/* 805027E4 C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 805027E8 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 805027EC EC 01 00 2A */ fadds f0, f1, f0 -/* 805027F0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 805027F4 40 81 00 24 */ ble lbl_80502818 -/* 805027F8 38 61 00 14 */ addi r3, r1, 0x14 -/* 805027FC 38 80 FF FF */ li r4, -1 -/* 80502800 4B B7 50 49 */ bl __dt__18dBgS_ObjGndChk_SplFv -/* 80502804 38 61 00 68 */ addi r3, r1, 0x68 -/* 80502808 38 80 FF FF */ li r4, -1 -/* 8050280C 4B B7 54 D1 */ bl __dt__11dBgS_LinChkFv -/* 80502810 38 60 00 01 */ li r3, 1 -/* 80502814 48 00 00 20 */ b lbl_80502834 -lbl_80502818: -/* 80502818 38 61 00 14 */ addi r3, r1, 0x14 -/* 8050281C 38 80 FF FF */ li r4, -1 -/* 80502820 4B B7 50 29 */ bl __dt__18dBgS_ObjGndChk_SplFv -/* 80502824 38 61 00 68 */ addi r3, r1, 0x68 -/* 80502828 38 80 FF FF */ li r4, -1 -/* 8050282C 4B B7 54 B1 */ bl __dt__11dBgS_LinChkFv -/* 80502830 38 60 00 00 */ li r3, 0 -lbl_80502834: -/* 80502834 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80502838 4B E5 F9 F1 */ bl _restgpr_29 -/* 8050283C 80 01 00 F4 */ lwz r0, 0xf4(r1) -/* 80502840 7C 08 03 A6 */ mtlr r0 -/* 80502844 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80502848 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 549cb78b3c9..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A6F58: -/* 805A6F58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A6F5C 7C 08 02 A6 */ mflr r0 -/* 805A6F60 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A6F64 48 00 02 CD */ bl CreateHeap__13daTagStatue_cFv -/* 805A6F68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A6F6C 7C 08 03 A6 */ mtlr r0 -/* 805A6F70 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A6F74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CreateHeap__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CreateHeap__13daTagStatue_cFv.s deleted file mode 100644 index b273e838543..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/CreateHeap__13daTagStatue_cFv.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_805A7230: -/* 805A7230 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A7234 7C 08 02 A6 */ mflr r0 -/* 805A7238 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A723C 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A7240 4B DB AF 95 */ bl _savegpr_27 -/* 805A7244 7C 7E 1B 78 */ mr r30, r3 -/* 805A7248 3C 60 80 5B */ lis r3, l_arcName@ha /* 0x805A821C@ha */ -/* 805A724C 38 63 82 1C */ addi r3, r3, l_arcName@l /* 0x805A821C@l */ -/* 805A7250 80 63 00 00 */ lwz r3, 0(r3) -/* 805A7254 38 80 00 06 */ li r4, 6 -/* 805A7258 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A725C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7260 3F 85 00 02 */ addis r28, r5, 2 -/* 805A7264 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 805A7268 7F 85 E3 78 */ mr r5, r28 -/* 805A726C 38 C0 00 80 */ li r6, 0x80 -/* 805A7270 4B A9 50 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 805A7274 7C 7F 1B 78 */ mr r31, r3 -/* 805A7278 3C 80 00 08 */ lis r4, 8 -/* 805A727C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 805A7280 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 805A7284 4B A6 D9 D1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 805A7288 90 7E 05 78 */ stw r3, 0x578(r30) -/* 805A728C 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 805A7290 28 00 00 00 */ cmplwi r0, 0 -/* 805A7294 40 82 00 0C */ bne lbl_805A72A0 -/* 805A7298 38 60 00 00 */ li r3, 0 -/* 805A729C 48 00 01 28 */ b lbl_805A73C4 -lbl_805A72A0: -/* 805A72A0 3C 60 80 5B */ lis r3, l_arcName@ha /* 0x805A821C@ha */ -/* 805A72A4 38 63 82 1C */ addi r3, r3, l_arcName@l /* 0x805A821C@l */ -/* 805A72A8 80 63 00 00 */ lwz r3, 0(r3) -/* 805A72AC 38 80 00 0C */ li r4, 0xc -/* 805A72B0 7F 85 E3 78 */ mr r5, r28 -/* 805A72B4 38 C0 00 80 */ li r6, 0x80 -/* 805A72B8 4B A9 50 35 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 805A72BC 7C 7B 1B 78 */ mr r27, r3 -/* 805A72C0 38 60 00 18 */ li r3, 0x18 -/* 805A72C4 4B D2 79 89 */ bl __nw__FUl -/* 805A72C8 7C 7D 1B 79 */ or. r29, r3, r3 -/* 805A72CC 41 82 00 20 */ beq lbl_805A72EC -/* 805A72D0 3C 80 80 5B */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x805A8380@ha */ -/* 805A72D4 38 04 83 80 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x805A8380@l */ -/* 805A72D8 90 1D 00 00 */ stw r0, 0(r29) -/* 805A72DC 38 80 00 00 */ li r4, 0 -/* 805A72E0 4B D8 11 1D */ bl init__12J3DFrameCtrlFs -/* 805A72E4 38 00 00 00 */ li r0, 0 -/* 805A72E8 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_805A72EC: -/* 805A72EC 93 BE 05 7C */ stw r29, 0x57c(r30) -/* 805A72F0 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 805A72F4 28 03 00 00 */ cmplwi r3, 0 -/* 805A72F8 41 82 00 30 */ beq lbl_805A7328 -/* 805A72FC 38 9F 00 58 */ addi r4, r31, 0x58 -/* 805A7300 7F 65 DB 78 */ mr r5, r27 -/* 805A7304 38 C0 00 01 */ li r6, 1 -/* 805A7308 38 E0 00 00 */ li r7, 0 -/* 805A730C 3D 00 80 5B */ lis r8, lit_3690@ha /* 0x805A8110@ha */ -/* 805A7310 C0 28 81 10 */ lfs f1, lit_3690@l(r8) /* 0x805A8110@l */ -/* 805A7314 39 00 00 00 */ li r8, 0 -/* 805A7318 39 20 FF FF */ li r9, -1 -/* 805A731C 4B A6 63 21 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 805A7320 2C 03 00 00 */ cmpwi r3, 0 -/* 805A7324 40 82 00 0C */ bne lbl_805A7330 -lbl_805A7328: -/* 805A7328 38 60 00 00 */ li r3, 0 -/* 805A732C 48 00 00 98 */ b lbl_805A73C4 -lbl_805A7330: -/* 805A7330 3C 60 80 5B */ lis r3, l_arcName@ha /* 0x805A821C@ha */ -/* 805A7334 38 63 82 1C */ addi r3, r3, l_arcName@l /* 0x805A821C@l */ -/* 805A7338 80 63 00 00 */ lwz r3, 0(r3) -/* 805A733C 38 80 00 09 */ li r4, 9 -/* 805A7340 7F 85 E3 78 */ mr r5, r28 -/* 805A7344 38 C0 00 80 */ li r6, 0x80 -/* 805A7348 4B A9 4F A5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 805A734C 7C 7B 1B 78 */ mr r27, r3 -/* 805A7350 38 60 00 18 */ li r3, 0x18 -/* 805A7354 4B D2 78 F9 */ bl __nw__FUl -/* 805A7358 7C 7D 1B 79 */ or. r29, r3, r3 -/* 805A735C 41 82 00 20 */ beq lbl_805A737C -/* 805A7360 3C 80 80 5B */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x805A8380@ha */ -/* 805A7364 38 04 83 80 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x805A8380@l */ -/* 805A7368 90 1D 00 00 */ stw r0, 0(r29) -/* 805A736C 38 80 00 00 */ li r4, 0 -/* 805A7370 4B D8 10 8D */ bl init__12J3DFrameCtrlFs -/* 805A7374 38 00 00 00 */ li r0, 0 -/* 805A7378 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_805A737C: -/* 805A737C 93 BE 05 80 */ stw r29, 0x580(r30) -/* 805A7380 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 805A7384 28 03 00 00 */ cmplwi r3, 0 -/* 805A7388 41 82 00 30 */ beq lbl_805A73B8 -/* 805A738C 38 9F 00 58 */ addi r4, r31, 0x58 -/* 805A7390 7F 65 DB 78 */ mr r5, r27 -/* 805A7394 38 C0 00 01 */ li r6, 1 -/* 805A7398 38 E0 00 00 */ li r7, 0 -/* 805A739C 3D 00 80 5B */ lis r8, lit_3690@ha /* 0x805A8110@ha */ -/* 805A73A0 C0 28 81 10 */ lfs f1, lit_3690@l(r8) /* 0x805A8110@l */ -/* 805A73A4 39 00 00 00 */ li r8, 0 -/* 805A73A8 39 20 FF FF */ li r9, -1 -/* 805A73AC 4B A6 63 61 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 805A73B0 2C 03 00 00 */ cmpwi r3, 0 -/* 805A73B4 40 82 00 0C */ bne lbl_805A73C0 -lbl_805A73B8: -/* 805A73B8 38 60 00 00 */ li r3, 0 -/* 805A73BC 48 00 00 08 */ b lbl_805A73C4 -lbl_805A73C0: -/* 805A73C0 38 60 00 01 */ li r3, 1 -lbl_805A73C4: -/* 805A73C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A73C8 4B DB AE 59 */ bl _restgpr_27 -/* 805A73CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A73D0 7C 08 03 A6 */ mtlr r0 -/* 805A73D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A73D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/Create__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/Create__13daTagStatue_cFv.s deleted file mode 100644 index b5450f86fd7..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/Create__13daTagStatue_cFv.s +++ /dev/null @@ -1,121 +0,0 @@ -lbl_805A7068: -/* 805A7068 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A706C 7C 08 02 A6 */ mflr r0 -/* 805A7070 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A7074 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 805A7078 93 C1 00 18 */ stw r30, 0x18(r1) -/* 805A707C 7C 7E 1B 78 */ mr r30, r3 -/* 805A7080 3C 60 80 5B */ lis r3, cNullVec__6Z2Calc@ha /* 0x805A81FC@ha */ -/* 805A7084 3B E3 81 FC */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x805A81FC@l */ -/* 805A7088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A708C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7090 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805A7094 54 04 A6 3E */ rlwinm r4, r0, 0x14, 0x18, 0x1f -/* 805A7098 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 805A709C 7C 05 07 74 */ extsb r5, r0 -/* 805A70A0 4B A8 E2 C1 */ bl isSwitch__10dSv_info_cCFii -/* 805A70A4 2C 03 00 00 */ cmpwi r3, 0 -/* 805A70A8 41 82 00 28 */ beq lbl_805A70D0 -/* 805A70AC 38 00 00 03 */ li r0, 3 -/* 805A70B0 98 1E 05 94 */ stb r0, 0x594(r30) -/* 805A70B4 3C 60 80 5B */ lis r3, lit_3756@ha /* 0x805A8114@ha */ -/* 805A70B8 C0 03 81 14 */ lfs f0, lit_3756@l(r3) /* 0x805A8114@l */ -/* 805A70BC 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 805A70C0 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 805A70C4 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 805A70C8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 805A70CC 48 00 00 80 */ b lbl_805A714C -lbl_805A70D0: -/* 805A70D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A70D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A70D8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805A70DC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 805A70E0 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 805A70E4 7C 05 07 74 */ extsb r5, r0 -/* 805A70E8 4B A8 E2 79 */ bl isSwitch__10dSv_info_cCFii -/* 805A70EC 2C 03 00 00 */ cmpwi r3, 0 -/* 805A70F0 41 82 00 3C */ beq lbl_805A712C -/* 805A70F4 7F C3 F3 78 */ mr r3, r30 -/* 805A70F8 48 00 09 71 */ bl setParticle__13daTagStatue_cFv -/* 805A70FC 80 9E 05 80 */ lwz r4, 0x580(r30) -/* 805A7100 A8 04 00 08 */ lha r0, 8(r4) -/* 805A7104 3C 60 80 5B */ lis r3, lit_3758@ha /* 0x805A811C@ha */ -/* 805A7108 C8 23 81 1C */ lfd f1, lit_3758@l(r3) /* 0x805A811C@l */ -/* 805A710C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 805A7110 90 01 00 0C */ stw r0, 0xc(r1) -/* 805A7114 3C 00 43 30 */ lis r0, 0x4330 -/* 805A7118 90 01 00 08 */ stw r0, 8(r1) -/* 805A711C C8 01 00 08 */ lfd f0, 8(r1) -/* 805A7120 EC 00 08 28 */ fsubs f0, f0, f1 -/* 805A7124 D0 04 00 10 */ stfs f0, 0x10(r4) -/* 805A7128 48 00 00 1C */ b lbl_805A7144 -lbl_805A712C: -/* 805A712C 3C 60 80 5B */ lis r3, lit_3756@ha /* 0x805A8114@ha */ -/* 805A7130 C0 03 81 14 */ lfs f0, lit_3756@l(r3) /* 0x805A8114@l */ -/* 805A7134 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 805A7138 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 805A713C 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 805A7140 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_805A7144: -/* 805A7144 38 00 00 00 */ li r0, 0 -/* 805A7148 98 1E 05 94 */ stb r0, 0x594(r30) -lbl_805A714C: -/* 805A714C 88 1E 05 97 */ lbz r0, 0x597(r30) -/* 805A7150 3C 60 80 5B */ lis r3, lit_3759@ha /* 0x805A8124@ha */ -/* 805A7154 C8 23 81 24 */ lfd f1, lit_3759@l(r3) /* 0x805A8124@l */ -/* 805A7158 90 01 00 0C */ stw r0, 0xc(r1) -/* 805A715C 3C 00 43 30 */ lis r0, 0x4330 -/* 805A7160 90 01 00 08 */ stw r0, 8(r1) -/* 805A7164 C8 01 00 08 */ lfd f0, 8(r1) -/* 805A7168 EC 00 08 28 */ fsubs f0, f0, f1 -/* 805A716C 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 805A7170 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 805A7174 7F C3 F3 78 */ mr r3, r30 -/* 805A7178 4B FF FE 4D */ bl initBaseMtx__13daTagStatue_cFv -/* 805A717C 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 805A7180 38 03 00 24 */ addi r0, r3, 0x24 -/* 805A7184 90 1E 05 04 */ stw r0, 0x504(r30) -/* 805A7188 7F C3 F3 78 */ mr r3, r30 -/* 805A718C C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 805A7190 38 9F 00 5C */ addi r4, r31, 0x5c -/* 805A7194 C0 44 00 04 */ lfs f2, 4(r4) -/* 805A7198 C0 64 00 08 */ lfs f3, 8(r4) -/* 805A719C C0 84 00 0C */ lfs f4, 0xc(r4) -/* 805A71A0 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 805A71A4 C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 805A71A8 4B A7 33 A1 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 805A71AC 88 1E 05 97 */ lbz r0, 0x597(r30) -/* 805A71B0 54 00 10 3A */ slwi r0, r0, 2 -/* 805A71B4 38 7F 00 44 */ addi r3, r31, 0x44 -/* 805A71B8 7C 03 00 2E */ lwzx r0, r3, r0 -/* 805A71BC 28 00 00 00 */ cmplwi r0, 0 -/* 805A71C0 40 82 00 10 */ bne lbl_805A71D0 -/* 805A71C4 80 1F 00 20 */ lwz r0, 0x20(r31) -/* 805A71C8 90 1E 01 00 */ stw r0, 0x100(r30) -/* 805A71CC 48 00 00 08 */ b lbl_805A71D4 -lbl_805A71D0: -/* 805A71D0 90 1E 01 00 */ stw r0, 0x100(r30) -lbl_805A71D4: -/* 805A71D4 38 00 00 FF */ li r0, 0xff -/* 805A71D8 98 1E 05 96 */ stb r0, 0x596(r30) -/* 805A71DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A71E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A71E4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 805A71E8 7F C4 F3 78 */ mr r4, r30 -/* 805A71EC 88 1E 05 97 */ lbz r0, 0x597(r30) -/* 805A71F0 54 00 10 3A */ slwi r0, r0, 2 -/* 805A71F4 38 BF 00 2C */ addi r5, r31, 0x2c -/* 805A71F8 7C A5 00 2E */ lwzx r5, r5, r0 -/* 805A71FC 38 C0 00 FF */ li r6, 0xff -/* 805A7200 4B AA 05 59 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 805A7204 B0 7E 05 98 */ sth r3, 0x598(r30) -/* 805A7208 38 00 FF FF */ li r0, -1 -/* 805A720C 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 805A7210 90 1E 05 A0 */ stw r0, 0x5a0(r30) -/* 805A7214 38 60 00 01 */ li r3, 1 -/* 805A7218 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 805A721C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 805A7220 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A7224 7C 08 03 A6 */ mtlr r0 -/* 805A7228 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A722C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index a904e3dda0c..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_805A73DC: -/* 805A73DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A73E0 7C 08 02 A6 */ mflr r0 -/* 805A73E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A73E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A73EC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 805A73F0 41 82 00 1C */ beq lbl_805A740C -/* 805A73F4 3C A0 80 5B */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x805A8380@ha */ -/* 805A73F8 38 05 83 80 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x805A8380@l */ -/* 805A73FC 90 1F 00 00 */ stw r0, 0(r31) -/* 805A7400 7C 80 07 35 */ extsh. r0, r4 -/* 805A7404 40 81 00 08 */ ble lbl_805A740C -/* 805A7408 4B D2 79 35 */ bl __dl__FPv -lbl_805A740C: -/* 805A740C 7F E3 FB 78 */ mr r3, r31 -/* 805A7410 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A7414 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A7418 7C 08 03 A6 */ mtlr r0 -/* 805A741C 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A7420 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/_delete__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/_delete__13daTagStatue_cFv.s deleted file mode 100644 index 91bb2435279..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/_delete__13daTagStatue_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_805A7FF8: -/* 805A7FF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A7FFC 7C 08 02 A6 */ mflr r0 -/* 805A8000 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A8004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A8008 7C 7F 1B 78 */ mr r31, r3 -/* 805A800C 4B FF FB 19 */ bl endParticle__13daTagStatue_cFv -/* 805A8010 38 7F 05 68 */ addi r3, r31, 0x568 -/* 805A8014 3C 80 80 5B */ lis r4, l_arcName@ha /* 0x805A821C@ha */ -/* 805A8018 38 84 82 1C */ addi r4, r4, l_arcName@l /* 0x805A821C@l */ -/* 805A801C 80 84 00 00 */ lwz r4, 0(r4) -/* 805A8020 4B A8 4F E9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 805A8024 88 1F 05 97 */ lbz r0, 0x597(r31) -/* 805A8028 54 00 10 3A */ slwi r0, r0, 2 -/* 805A802C 3C 60 80 5B */ lis r3, l_evArcName@ha /* 0x805A8240@ha */ -/* 805A8030 38 63 82 40 */ addi r3, r3, l_evArcName@l /* 0x805A8240@l */ -/* 805A8034 7C 83 00 2E */ lwzx r4, r3, r0 -/* 805A8038 28 04 00 00 */ cmplwi r4, 0 -/* 805A803C 41 82 00 0C */ beq lbl_805A8048 -/* 805A8040 38 7F 05 70 */ addi r3, r31, 0x570 -/* 805A8044 4B A8 4F C5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -lbl_805A8048: -/* 805A8048 38 60 00 01 */ li r3, 1 -/* 805A804C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A8050 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A8054 7C 08 03 A6 */ mtlr r0 -/* 805A8058 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A805C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionEvent__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionEvent__13daTagStatue_cFv.s deleted file mode 100644 index 2934b9b9442..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionEvent__13daTagStatue_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_805A77A0: -/* 805A77A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A77A4 7C 08 02 A6 */ mflr r0 -/* 805A77A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A77AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A77B0 93 C1 00 08 */ stw r30, 8(r1) -/* 805A77B4 7C 7E 1B 78 */ mr r30, r3 -/* 805A77B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A77BC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A77C0 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 805A77C4 A8 9E 05 98 */ lha r4, 0x598(r30) -/* 805A77C8 4B AA 02 B1 */ bl endCheck__16dEvent_manager_cFs -/* 805A77CC 2C 03 00 00 */ cmpwi r3, 0 -/* 805A77D0 41 82 00 58 */ beq lbl_805A7828 -/* 805A77D4 38 00 00 03 */ li r0, 3 -/* 805A77D8 98 1E 05 94 */ stb r0, 0x594(r30) -/* 805A77DC 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 805A77E0 4B A9 AC 89 */ bl reset__14dEvt_control_cFv -/* 805A77E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A77E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A77EC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805A77F0 54 04 A6 3E */ rlwinm r4, r0, 0x14, 0x18, 0x1f -/* 805A77F4 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 805A77F8 7C 05 07 74 */ extsb r5, r0 -/* 805A77FC 4B A8 DA 05 */ bl onSwitch__10dSv_info_cFii -/* 805A7800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7804 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7808 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 805A780C 88 1E 05 97 */ lbz r0, 0x597(r30) -/* 805A7810 54 00 08 3C */ slwi r0, r0, 1 -/* 805A7814 3C 80 80 5B */ lis r4, l_event_bit@ha /* 0x805A8104@ha */ -/* 805A7818 38 84 81 04 */ addi r4, r4, l_event_bit@l /* 0x805A8104@l */ -/* 805A781C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 805A7820 4B A8 D1 6D */ bl onEventBit__11dSv_event_cFUs -/* 805A7824 48 00 00 0C */ b lbl_805A7830 -lbl_805A7828: -/* 805A7828 7F C3 F3 78 */ mr r3, r30 -/* 805A782C 48 00 00 21 */ bl demoProc__13daTagStatue_cFv -lbl_805A7830: -/* 805A7830 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A7834 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A7838 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A783C 7C 08 03 A6 */ mtlr r0 -/* 805A7840 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A7844 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionOrderEvent__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionOrderEvent__13daTagStatue_cFv.s deleted file mode 100644 index f9ea8c59037..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionOrderEvent__13daTagStatue_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_805A7714: -/* 805A7714 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A7718 7C 08 02 A6 */ mflr r0 -/* 805A771C 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A7720 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A7724 7C 7F 1B 78 */ mr r31, r3 -/* 805A7728 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 805A772C 28 00 00 02 */ cmplwi r0, 2 -/* 805A7730 40 82 00 34 */ bne lbl_805A7764 -/* 805A7734 38 00 00 02 */ li r0, 2 -/* 805A7738 98 1F 05 94 */ stb r0, 0x594(r31) -/* 805A773C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 805A7740 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 805A7744 80 63 00 00 */ lwz r3, 0(r3) -/* 805A7748 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 805A774C 3C 80 01 00 */ lis r4, 0x0100 /* 0x010000A4@ha */ -/* 805A7750 38 84 00 A4 */ addi r4, r4, 0x00A4 /* 0x010000A4@l */ -/* 805A7754 4B D0 7D 49 */ bl subBgmStart__8Z2SeqMgrFUl -/* 805A7758 7F E3 FB 78 */ mr r3, r31 -/* 805A775C 48 00 00 F1 */ bl demoProc__13daTagStatue_cFv -/* 805A7760 48 00 00 2C */ b lbl_805A778C -lbl_805A7764: -/* 805A7764 A8 9F 05 98 */ lha r4, 0x598(r31) -/* 805A7768 88 BF 05 96 */ lbz r5, 0x596(r31) -/* 805A776C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 805A7770 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 805A7774 38 E0 00 00 */ li r7, 0 -/* 805A7778 39 00 00 01 */ li r8, 1 -/* 805A777C 4B A7 3F 01 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 805A7780 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 805A7784 60 00 00 02 */ ori r0, r0, 2 -/* 805A7788 B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_805A778C: -/* 805A778C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A7790 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A7794 7C 08 03 A6 */ mtlr r0 -/* 805A7798 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A779C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionWait__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionWait__13daTagStatue_cFv.s deleted file mode 100644 index 473cec75363..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/actionWait__13daTagStatue_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_805A76AC: -/* 805A76AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A76B0 7C 08 02 A6 */ mflr r0 -/* 805A76B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A76B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A76BC 7C 7F 1B 78 */ mr r31, r3 -/* 805A76C0 48 00 04 B9 */ bl checkStartDemo__13daTagStatue_cFv -/* 805A76C4 2C 03 00 00 */ cmpwi r3, 0 -/* 805A76C8 41 82 00 38 */ beq lbl_805A7700 -/* 805A76CC 38 00 00 01 */ li r0, 1 -/* 805A76D0 98 1F 05 94 */ stb r0, 0x594(r31) -/* 805A76D4 7F E3 FB 78 */ mr r3, r31 -/* 805A76D8 A8 9F 05 98 */ lha r4, 0x598(r31) -/* 805A76DC 88 BF 05 96 */ lbz r5, 0x596(r31) -/* 805A76E0 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 805A76E4 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 805A76E8 38 E0 00 00 */ li r7, 0 -/* 805A76EC 39 00 00 01 */ li r8, 1 -/* 805A76F0 4B A7 3F 8D */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 805A76F4 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 805A76F8 60 00 00 02 */ ori r0, r0, 2 -/* 805A76FC B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_805A7700: -/* 805A7700 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A7704 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A7708 7C 08 03 A6 */ mtlr r0 -/* 805A770C 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A7710 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkOnEffect__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkOnEffect__13daTagStatue_cFv.s deleted file mode 100644 index 8a679e3bb17..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkOnEffect__13daTagStatue_cFv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_805A7CD0: -/* 805A7CD0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 805A7CD4 7C 08 02 A6 */ mflr r0 -/* 805A7CD8 90 01 00 34 */ stw r0, 0x34(r1) -/* 805A7CDC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 805A7CE0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 805A7CE4 7C 7E 1B 78 */ mr r30, r3 -/* 805A7CE8 3C 60 80 5B */ lis r3, l_event_bit@ha /* 0x805A8104@ha */ -/* 805A7CEC 3B E3 81 04 */ addi r31, r3, l_event_bit@l /* 0x805A8104@l */ -/* 805A7CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7CF8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 805A7CFC 54 04 A6 3E */ rlwinm r4, r0, 0x14, 0x18, 0x1f -/* 805A7D00 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 805A7D04 7C 05 07 74 */ extsb r5, r0 -/* 805A7D08 4B A8 D6 59 */ bl isSwitch__10dSv_info_cCFii -/* 805A7D0C 2C 03 00 00 */ cmpwi r3, 0 -/* 805A7D10 40 82 01 68 */ bne lbl_805A7E78 -/* 805A7D14 80 7E 05 A0 */ lwz r3, 0x5a0(r30) -/* 805A7D18 3C 03 00 01 */ addis r0, r3, 1 -/* 805A7D1C 28 00 FF FF */ cmplwi r0, 0xffff -/* 805A7D20 41 82 01 58 */ beq lbl_805A7E78 -/* 805A7D24 90 61 00 0C */ stw r3, 0xc(r1) -/* 805A7D28 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 805A7D2C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 805A7D30 38 81 00 0C */ addi r4, r1, 0xc -/* 805A7D34 4B A7 1A C5 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 805A7D38 28 03 00 00 */ cmplwi r3, 0 -/* 805A7D3C 41 82 01 34 */ beq lbl_805A7E70 -/* 805A7D40 C0 43 04 D8 */ lfs f2, 0x4d8(r3) -/* 805A7D44 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 805A7D48 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 805A7D4C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 805A7D50 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 805A7D54 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 805A7D58 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 805A7D5C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 805A7D60 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805A7D64 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 805A7D68 D0 41 00 24 */ stfs f2, 0x24(r1) -/* 805A7D6C 38 61 00 10 */ addi r3, r1, 0x10 -/* 805A7D70 38 81 00 1C */ addi r4, r1, 0x1c -/* 805A7D74 4B D9 F6 29 */ bl PSVECSquareDistance -/* 805A7D78 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 805A7D7C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A7D80 40 81 00 58 */ ble lbl_805A7DD8 -/* 805A7D84 FC 00 08 34 */ frsqrte f0, f1 -/* 805A7D88 C8 9F 00 30 */ lfd f4, 0x30(r31) -/* 805A7D8C FC 44 00 32 */ fmul f2, f4, f0 -/* 805A7D90 C8 7F 00 38 */ lfd f3, 0x38(r31) -/* 805A7D94 FC 00 00 32 */ fmul f0, f0, f0 -/* 805A7D98 FC 01 00 32 */ fmul f0, f1, f0 -/* 805A7D9C FC 03 00 28 */ fsub f0, f3, f0 -/* 805A7DA0 FC 02 00 32 */ fmul f0, f2, f0 -/* 805A7DA4 FC 44 00 32 */ fmul f2, f4, f0 -/* 805A7DA8 FC 00 00 32 */ fmul f0, f0, f0 -/* 805A7DAC FC 01 00 32 */ fmul f0, f1, f0 -/* 805A7DB0 FC 03 00 28 */ fsub f0, f3, f0 -/* 805A7DB4 FC 02 00 32 */ fmul f0, f2, f0 -/* 805A7DB8 FC 44 00 32 */ fmul f2, f4, f0 -/* 805A7DBC FC 00 00 32 */ fmul f0, f0, f0 -/* 805A7DC0 FC 01 00 32 */ fmul f0, f1, f0 -/* 805A7DC4 FC 03 00 28 */ fsub f0, f3, f0 -/* 805A7DC8 FC 02 00 32 */ fmul f0, f2, f0 -/* 805A7DCC FC 21 00 32 */ fmul f1, f1, f0 -/* 805A7DD0 FC 20 08 18 */ frsp f1, f1 -/* 805A7DD4 48 00 00 88 */ b lbl_805A7E5C -lbl_805A7DD8: -/* 805A7DD8 C8 1F 00 40 */ lfd f0, 0x40(r31) -/* 805A7DDC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A7DE0 40 80 00 10 */ bge lbl_805A7DF0 -/* 805A7DE4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 805A7DE8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 805A7DEC 48 00 00 70 */ b lbl_805A7E5C -lbl_805A7DF0: -/* 805A7DF0 D0 21 00 08 */ stfs f1, 8(r1) -/* 805A7DF4 80 81 00 08 */ lwz r4, 8(r1) -/* 805A7DF8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 805A7DFC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 805A7E00 7C 03 00 00 */ cmpw r3, r0 -/* 805A7E04 41 82 00 14 */ beq lbl_805A7E18 -/* 805A7E08 40 80 00 40 */ bge lbl_805A7E48 -/* 805A7E0C 2C 03 00 00 */ cmpwi r3, 0 -/* 805A7E10 41 82 00 20 */ beq lbl_805A7E30 -/* 805A7E14 48 00 00 34 */ b lbl_805A7E48 -lbl_805A7E18: -/* 805A7E18 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 805A7E1C 41 82 00 0C */ beq lbl_805A7E28 -/* 805A7E20 38 00 00 01 */ li r0, 1 -/* 805A7E24 48 00 00 28 */ b lbl_805A7E4C -lbl_805A7E28: -/* 805A7E28 38 00 00 02 */ li r0, 2 -/* 805A7E2C 48 00 00 20 */ b lbl_805A7E4C -lbl_805A7E30: -/* 805A7E30 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 805A7E34 41 82 00 0C */ beq lbl_805A7E40 -/* 805A7E38 38 00 00 05 */ li r0, 5 -/* 805A7E3C 48 00 00 10 */ b lbl_805A7E4C -lbl_805A7E40: -/* 805A7E40 38 00 00 03 */ li r0, 3 -/* 805A7E44 48 00 00 08 */ b lbl_805A7E4C -lbl_805A7E48: -/* 805A7E48 38 00 00 04 */ li r0, 4 -lbl_805A7E4C: -/* 805A7E4C 2C 00 00 01 */ cmpwi r0, 1 -/* 805A7E50 40 82 00 0C */ bne lbl_805A7E5C -/* 805A7E54 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 805A7E58 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_805A7E5C: -/* 805A7E5C C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 805A7E60 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A7E64 40 81 00 14 */ ble lbl_805A7E78 -/* 805A7E68 38 60 00 01 */ li r3, 1 -/* 805A7E6C 48 00 00 10 */ b lbl_805A7E7C -lbl_805A7E70: -/* 805A7E70 38 60 00 01 */ li r3, 1 -/* 805A7E74 48 00 00 08 */ b lbl_805A7E7C -lbl_805A7E78: -/* 805A7E78 38 60 00 00 */ li r3, 0 -lbl_805A7E7C: -/* 805A7E7C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 805A7E80 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 805A7E84 80 01 00 34 */ lwz r0, 0x34(r1) -/* 805A7E88 7C 08 03 A6 */ mtlr r0 -/* 805A7E8C 38 21 00 30 */ addi r1, r1, 0x30 -/* 805A7E90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkStartDemo__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkStartDemo__13daTagStatue_cFv.s deleted file mode 100644 index c3c730c9b4e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/checkStartDemo__13daTagStatue_cFv.s +++ /dev/null @@ -1,98 +0,0 @@ -lbl_805A7B78: -/* 805A7B78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A7B7C 7C 08 02 A6 */ mflr r0 -/* 805A7B80 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A7B84 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A7B88 4B DB A6 55 */ bl _savegpr_29 -/* 805A7B8C 7C 7D 1B 78 */ mr r29, r3 -/* 805A7B90 3C 80 80 5B */ lis r4, l_event_bit@ha /* 0x805A8104@ha */ -/* 805A7B94 3B E4 81 04 */ addi r31, r4, l_event_bit@l /* 0x805A8104@l */ -/* 805A7B98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7B9C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7BA0 83 C4 5D AC */ lwz r30, 0x5dac(r4) -/* 805A7BA4 48 00 01 2D */ bl checkOnEffect__13daTagStatue_cFv -/* 805A7BA8 2C 03 00 00 */ cmpwi r3, 0 -/* 805A7BAC 40 82 00 0C */ bne lbl_805A7BB8 -/* 805A7BB0 38 60 00 00 */ li r3, 0 -/* 805A7BB4 48 00 01 04 */ b lbl_805A7CB8 -lbl_805A7BB8: -/* 805A7BB8 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 805A7BBC 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 805A7BC0 4B D9 F7 DD */ bl PSVECSquareDistance -/* 805A7BC4 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 805A7BC8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A7BCC 40 81 00 58 */ ble lbl_805A7C24 -/* 805A7BD0 FC 00 08 34 */ frsqrte f0, f1 -/* 805A7BD4 C8 9F 00 30 */ lfd f4, 0x30(r31) -/* 805A7BD8 FC 44 00 32 */ fmul f2, f4, f0 -/* 805A7BDC C8 7F 00 38 */ lfd f3, 0x38(r31) -/* 805A7BE0 FC 00 00 32 */ fmul f0, f0, f0 -/* 805A7BE4 FC 01 00 32 */ fmul f0, f1, f0 -/* 805A7BE8 FC 03 00 28 */ fsub f0, f3, f0 -/* 805A7BEC FC 02 00 32 */ fmul f0, f2, f0 -/* 805A7BF0 FC 44 00 32 */ fmul f2, f4, f0 -/* 805A7BF4 FC 00 00 32 */ fmul f0, f0, f0 -/* 805A7BF8 FC 01 00 32 */ fmul f0, f1, f0 -/* 805A7BFC FC 03 00 28 */ fsub f0, f3, f0 -/* 805A7C00 FC 02 00 32 */ fmul f0, f2, f0 -/* 805A7C04 FC 44 00 32 */ fmul f2, f4, f0 -/* 805A7C08 FC 00 00 32 */ fmul f0, f0, f0 -/* 805A7C0C FC 01 00 32 */ fmul f0, f1, f0 -/* 805A7C10 FC 03 00 28 */ fsub f0, f3, f0 -/* 805A7C14 FC 02 00 32 */ fmul f0, f2, f0 -/* 805A7C18 FC 21 00 32 */ fmul f1, f1, f0 -/* 805A7C1C FC 20 08 18 */ frsp f1, f1 -/* 805A7C20 48 00 00 88 */ b lbl_805A7CA8 -lbl_805A7C24: -/* 805A7C24 C8 1F 00 40 */ lfd f0, 0x40(r31) -/* 805A7C28 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A7C2C 40 80 00 10 */ bge lbl_805A7C3C -/* 805A7C30 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 805A7C34 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 805A7C38 48 00 00 70 */ b lbl_805A7CA8 -lbl_805A7C3C: -/* 805A7C3C D0 21 00 08 */ stfs f1, 8(r1) -/* 805A7C40 80 81 00 08 */ lwz r4, 8(r1) -/* 805A7C44 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 805A7C48 3C 00 7F 80 */ lis r0, 0x7f80 -/* 805A7C4C 7C 03 00 00 */ cmpw r3, r0 -/* 805A7C50 41 82 00 14 */ beq lbl_805A7C64 -/* 805A7C54 40 80 00 40 */ bge lbl_805A7C94 -/* 805A7C58 2C 03 00 00 */ cmpwi r3, 0 -/* 805A7C5C 41 82 00 20 */ beq lbl_805A7C7C -/* 805A7C60 48 00 00 34 */ b lbl_805A7C94 -lbl_805A7C64: -/* 805A7C64 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 805A7C68 41 82 00 0C */ beq lbl_805A7C74 -/* 805A7C6C 38 00 00 01 */ li r0, 1 -/* 805A7C70 48 00 00 28 */ b lbl_805A7C98 -lbl_805A7C74: -/* 805A7C74 38 00 00 02 */ li r0, 2 -/* 805A7C78 48 00 00 20 */ b lbl_805A7C98 -lbl_805A7C7C: -/* 805A7C7C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 805A7C80 41 82 00 0C */ beq lbl_805A7C8C -/* 805A7C84 38 00 00 05 */ li r0, 5 -/* 805A7C88 48 00 00 10 */ b lbl_805A7C98 -lbl_805A7C8C: -/* 805A7C8C 38 00 00 03 */ li r0, 3 -/* 805A7C90 48 00 00 08 */ b lbl_805A7C98 -lbl_805A7C94: -/* 805A7C94 38 00 00 04 */ li r0, 4 -lbl_805A7C98: -/* 805A7C98 2C 00 00 01 */ cmpwi r0, 1 -/* 805A7C9C 40 82 00 0C */ bne lbl_805A7CA8 -/* 805A7CA0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 805A7CA4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_805A7CA8: -/* 805A7CA8 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 805A7CAC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A7CB0 7C 00 00 26 */ mfcr r0 -/* 805A7CB4 54 03 0F FE */ srwi r3, r0, 0x1f -lbl_805A7CB8: -/* 805A7CB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A7CBC 4B DB A5 6D */ bl _restgpr_29 -/* 805A7CC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A7CC4 7C 08 03 A6 */ mtlr r0 -/* 805A7CC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A7CCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Create__FP13daTagStatue_c.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Create__FP13daTagStatue_c.s deleted file mode 100644 index c13563aa449..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Create__FP13daTagStatue_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A80C0: -/* 805A80C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A80C4 7C 08 02 A6 */ mflr r0 -/* 805A80C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A80CC 4B FF F3 59 */ bl create__13daTagStatue_cFv -/* 805A80D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A80D4 7C 08 03 A6 */ mtlr r0 -/* 805A80D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A80DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Delete__FP13daTagStatue_c.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Delete__FP13daTagStatue_c.s deleted file mode 100644 index 89cde42898b..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Delete__FP13daTagStatue_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A80A0: -/* 805A80A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A80A4 7C 08 02 A6 */ mflr r0 -/* 805A80A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A80AC 4B FF FF 4D */ bl _delete__13daTagStatue_cFv -/* 805A80B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A80B4 7C 08 03 A6 */ mtlr r0 -/* 805A80B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A80BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Draw__FP13daTagStatue_c.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Draw__FP13daTagStatue_c.s deleted file mode 100644 index 1f245a749bb..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Draw__FP13daTagStatue_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A8060: -/* 805A8060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A8064 7C 08 02 A6 */ mflr r0 -/* 805A8068 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A806C 4B FF FE A1 */ bl draw__13daTagStatue_cFv -/* 805A8070 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A8074 7C 08 03 A6 */ mtlr r0 -/* 805A8078 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A807C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Execute__FP13daTagStatue_c.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Execute__FP13daTagStatue_c.s deleted file mode 100644 index 5a5cdea0b7e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/daTagStatue_Execute__FP13daTagStatue_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A8080: -/* 805A8080 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A8084 7C 08 02 A6 */ mflr r0 -/* 805A8088 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A808C 4B FF F4 89 */ bl execute__13daTagStatue_cFv -/* 805A8090 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A8094 7C 08 03 A6 */ mtlr r0 -/* 805A8098 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A809C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/demoProc__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/demoProc__13daTagStatue_cFv.s deleted file mode 100644 index 01b96c83e96..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/demoProc__13daTagStatue_cFv.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_805A784C: -/* 805A784C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A7850 7C 08 02 A6 */ mflr r0 -/* 805A7854 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A7858 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A785C 4B DB A9 79 */ bl _savegpr_27 -/* 805A7860 7C 7D 1B 78 */ mr r29, r3 -/* 805A7864 3C 60 80 5B */ lis r3, cNullVec__6Z2Calc@ha /* 0x805A81FC@ha */ -/* 805A7868 3B 63 81 FC */ addi r27, r3, cNullVec__6Z2Calc@l /* 0x805A81FC@l */ -/* 805A786C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7870 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7874 3B DC 4F F8 */ addi r30, r28, 0x4ff8 -/* 805A7878 7F C3 F3 78 */ mr r3, r30 -/* 805A787C 80 9D 05 90 */ lwz r4, 0x590(r29) -/* 805A7880 38 BB 00 D4 */ addi r5, r27, 0xd4 -/* 805A7884 38 C0 00 03 */ li r6, 3 -/* 805A7888 38 E0 00 00 */ li r7, 0 -/* 805A788C 39 00 00 00 */ li r8, 0 -/* 805A7890 4B AA 05 81 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 805A7894 7C 7F 1B 78 */ mr r31, r3 -/* 805A7898 7F C3 F3 78 */ mr r3, r30 -/* 805A789C 80 9D 05 90 */ lwz r4, 0x590(r29) -/* 805A78A0 4B AA 04 AD */ bl getIsAddvance__16dEvent_manager_cFi -/* 805A78A4 2C 03 00 00 */ cmpwi r3, 0 -/* 805A78A8 41 82 01 50 */ beq lbl_805A79F8 -/* 805A78AC 2C 1F 00 01 */ cmpwi r31, 1 -/* 805A78B0 41 82 00 5C */ beq lbl_805A790C -/* 805A78B4 40 80 00 10 */ bge lbl_805A78C4 -/* 805A78B8 2C 1F 00 00 */ cmpwi r31, 0 -/* 805A78BC 40 80 00 14 */ bge lbl_805A78D0 -/* 805A78C0 48 00 01 38 */ b lbl_805A79F8 -lbl_805A78C4: -/* 805A78C4 2C 1F 00 03 */ cmpwi r31, 3 -/* 805A78C8 40 80 01 30 */ bge lbl_805A79F8 -/* 805A78CC 48 00 00 C0 */ b lbl_805A798C -lbl_805A78D0: -/* 805A78D0 7F C3 F3 78 */ mr r3, r30 -/* 805A78D4 80 9D 05 90 */ lwz r4, 0x590(r29) -/* 805A78D8 3C A0 80 5B */ lis r5, d_a_tag_statue_evt__stringBase0@ha /* 0x805A8154@ha */ -/* 805A78DC 38 A5 81 54 */ addi r5, r5, d_a_tag_statue_evt__stringBase0@l /* 0x805A8154@l */ -/* 805A78E0 38 A5 00 A2 */ addi r5, r5, 0xa2 -/* 805A78E4 38 C0 00 03 */ li r6, 3 -/* 805A78E8 4B AA 08 05 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 805A78EC 28 03 00 00 */ cmplwi r3, 0 -/* 805A78F0 40 82 00 10 */ bne lbl_805A7900 -/* 805A78F4 38 00 00 01 */ li r0, 1 -/* 805A78F8 98 1D 05 95 */ stb r0, 0x595(r29) -/* 805A78FC 48 00 00 FC */ b lbl_805A79F8 -lbl_805A7900: -/* 805A7900 80 03 00 00 */ lwz r0, 0(r3) -/* 805A7904 98 1D 05 95 */ stb r0, 0x595(r29) -/* 805A7908 48 00 00 F0 */ b lbl_805A79F8 -lbl_805A790C: -/* 805A790C 88 1D 05 97 */ lbz r0, 0x597(r29) -/* 805A7910 28 00 00 01 */ cmplwi r0, 1 -/* 805A7914 41 82 00 E4 */ beq lbl_805A79F8 -/* 805A7918 28 00 00 04 */ cmplwi r0, 4 -/* 805A791C 41 82 00 DC */ beq lbl_805A79F8 -/* 805A7920 28 00 00 05 */ cmplwi r0, 5 -/* 805A7924 41 82 00 D4 */ beq lbl_805A79F8 -/* 805A7928 3C 60 80 5A */ lis r3, s_s_sub__FPvPv@ha /* 0x805A6F78@ha */ -/* 805A792C 38 63 6F 78 */ addi r3, r3, s_s_sub__FPvPv@l /* 0x805A6F78@l */ -/* 805A7930 7F A4 EB 78 */ mr r4, r29 -/* 805A7934 4B A7 9A 05 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 805A7938 28 03 00 00 */ cmplwi r3, 0 -/* 805A793C 41 82 00 BC */ beq lbl_805A79F8 -/* 805A7940 88 1D 05 97 */ lbz r0, 0x597(r29) -/* 805A7944 1C 00 00 0C */ mulli r0, r0, 0xc -/* 805A7948 38 9B 00 E0 */ addi r4, r27, 0xe0 -/* 805A794C 7C 84 02 14 */ add r4, r4, r0 -/* 805A7950 C0 04 00 00 */ lfs f0, 0(r4) -/* 805A7954 D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 805A7958 C0 04 00 04 */ lfs f0, 4(r4) -/* 805A795C D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 805A7960 C0 04 00 08 */ lfs f0, 8(r4) -/* 805A7964 D0 03 04 D8 */ stfs f0, 0x4d8(r3) -/* 805A7968 88 1D 05 97 */ lbz r0, 0x597(r29) -/* 805A796C 54 00 08 3C */ slwi r0, r0, 1 -/* 805A7970 38 9B 01 28 */ addi r4, r27, 0x128 -/* 805A7974 7C 04 02 AE */ lhax r0, r4, r0 -/* 805A7978 B0 03 04 E6 */ sth r0, 0x4e6(r3) -/* 805A797C 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 805A7980 60 00 08 00 */ ori r0, r0, 0x800 -/* 805A7984 90 03 04 9C */ stw r0, 0x49c(r3) -/* 805A7988 48 00 00 70 */ b lbl_805A79F8 -lbl_805A798C: -/* 805A798C 7F A3 EB 78 */ mr r3, r29 -/* 805A7990 48 00 05 05 */ bl getLetterCount__13daTagStatue_cFv -/* 805A7994 2C 03 00 05 */ cmpwi r3, 5 -/* 805A7998 40 82 00 20 */ bne lbl_805A79B8 -/* 805A799C 3B 60 00 EB */ li r27, 0xeb -/* 805A79A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A79A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A79A8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 805A79AC 38 80 60 04 */ li r4, 0x6004 -/* 805A79B0 4B A8 CF DD */ bl onEventBit__11dSv_event_cFUs -/* 805A79B4 48 00 00 08 */ b lbl_805A79BC -lbl_805A79B8: -/* 805A79B8 3B 60 00 EA */ li r27, 0xea -lbl_805A79BC: -/* 805A79BC 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 805A79C0 7F 64 DB 78 */ mr r4, r27 -/* 805A79C4 38 A0 FF FF */ li r5, -1 -/* 805A79C8 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 805A79CC 7C 06 07 74 */ extsb r6, r0 -/* 805A79D0 38 E0 00 00 */ li r7, 0 -/* 805A79D4 39 00 00 00 */ li r8, 0 -/* 805A79D8 4B A7 42 9D */ bl fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz -/* 805A79DC 90 7D 05 9C */ stw r3, 0x59c(r29) -/* 805A79E0 80 9D 05 9C */ lwz r4, 0x59c(r29) -/* 805A79E4 3C 04 00 01 */ addis r0, r4, 1 -/* 805A79E8 28 00 FF FF */ cmplwi r0, 0xffff -/* 805A79EC 41 82 00 0C */ beq lbl_805A79F8 -/* 805A79F0 38 7C 4E C8 */ addi r3, r28, 0x4ec8 -/* 805A79F4 4B A9 BC F9 */ bl setPtI_Id__14dEvt_control_cFUi -lbl_805A79F8: -/* 805A79F8 2C 1F 00 01 */ cmpwi r31, 1 -/* 805A79FC 41 82 00 34 */ beq lbl_805A7A30 -/* 805A7A00 40 80 00 40 */ bge lbl_805A7A40 -/* 805A7A04 2C 1F 00 00 */ cmpwi r31, 0 -/* 805A7A08 40 80 00 08 */ bge lbl_805A7A10 -/* 805A7A0C 48 00 00 34 */ b lbl_805A7A40 -lbl_805A7A10: -/* 805A7A10 38 7D 05 95 */ addi r3, r29, 0x595 -/* 805A7A14 48 00 06 CD */ bl func_805A80E0 -/* 805A7A18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805A7A1C 40 82 00 30 */ bne lbl_805A7A4C -/* 805A7A20 7F C3 F3 78 */ mr r3, r30 -/* 805A7A24 80 9D 05 90 */ lwz r4, 0x590(r29) -/* 805A7A28 4B AA 07 55 */ bl cutEnd__16dEvent_manager_cFi -/* 805A7A2C 48 00 00 20 */ b lbl_805A7A4C -lbl_805A7A30: -/* 805A7A30 7F C3 F3 78 */ mr r3, r30 -/* 805A7A34 80 9D 05 90 */ lwz r4, 0x590(r29) -/* 805A7A38 4B AA 07 45 */ bl cutEnd__16dEvent_manager_cFi -/* 805A7A3C 48 00 00 10 */ b lbl_805A7A4C -lbl_805A7A40: -/* 805A7A40 7F C3 F3 78 */ mr r3, r30 -/* 805A7A44 80 9D 05 90 */ lwz r4, 0x590(r29) -/* 805A7A48 4B AA 07 35 */ bl cutEnd__16dEvent_manager_cFi -lbl_805A7A4C: -/* 805A7A4C 38 60 00 00 */ li r3, 0 -/* 805A7A50 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A7A54 4B DB A7 CD */ bl _restgpr_27 -/* 805A7A58 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A7A5C 7C 08 03 A6 */ mtlr r0 -/* 805A7A60 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A7A64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/draw__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/draw__13daTagStatue_cFv.s deleted file mode 100644 index 801c8f5da88..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/draw__13daTagStatue_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_805A7F0C: -/* 805A7F0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A7F10 7C 08 02 A6 */ mflr r0 -/* 805A7F14 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A7F18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A7F1C 93 C1 00 08 */ stw r30, 8(r1) -/* 805A7F20 7C 7F 1B 78 */ mr r31, r3 -/* 805A7F24 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 805A7F28 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 805A7F2C 38 80 00 00 */ li r4, 0 -/* 805A7F30 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 805A7F34 38 DF 01 0C */ addi r6, r31, 0x10c -/* 805A7F38 4B BF B8 8D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 805A7F3C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 805A7F40 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 805A7F44 80 9F 05 78 */ lwz r4, 0x578(r31) -/* 805A7F48 80 84 00 04 */ lwz r4, 4(r4) -/* 805A7F4C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 805A7F50 4B BF CE 51 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 805A7F54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7F58 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7F5C 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 805A7F60 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 805A7F64 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 805A7F68 90 1E 00 48 */ stw r0, 0x48(r30) -/* 805A7F6C 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 805A7F70 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 805A7F74 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 805A7F78 80 83 00 04 */ lwz r4, 4(r3) -/* 805A7F7C 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 805A7F80 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 805A7F84 38 84 00 58 */ addi r4, r4, 0x58 -/* 805A7F88 4B A6 58 21 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 805A7F8C 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 805A7F90 80 83 00 04 */ lwz r4, 4(r3) -/* 805A7F94 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 805A7F98 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 805A7F9C 38 84 00 58 */ addi r4, r4, 0x58 -/* 805A7FA0 4B A6 57 39 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 805A7FA4 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 805A7FA8 4B A6 5D 1D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 805A7FAC 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 805A7FB0 80 63 00 04 */ lwz r3, 4(r3) -/* 805A7FB4 4B A6 5E D9 */ bl mDoExt_brkAnmRemove__FP12J3DModelData -/* 805A7FB8 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 805A7FBC 80 63 00 04 */ lwz r3, 4(r3) -/* 805A7FC0 4B A6 5E 31 */ bl mDoExt_btkAnmRemove__FP12J3DModelData -/* 805A7FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7FCC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 805A7FD0 90 1E 00 48 */ stw r0, 0x48(r30) -/* 805A7FD4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 805A7FD8 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 805A7FDC 38 60 00 01 */ li r3, 1 -/* 805A7FE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A7FE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A7FE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A7FEC 7C 08 03 A6 */ mtlr r0 -/* 805A7FF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A7FF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/endParticle__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/endParticle__13daTagStatue_cFv.s deleted file mode 100644 index 998e30ebd13..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/endParticle__13daTagStatue_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_805A7B24: -/* 805A7B24 38 80 00 00 */ li r4, 0 -/* 805A7B28 38 E0 00 01 */ li r7, 1 -/* 805A7B2C 7C 85 23 78 */ mr r5, r4 -/* 805A7B30 38 00 00 03 */ li r0, 3 -/* 805A7B34 7C 09 03 A6 */ mtctr r0 -lbl_805A7B38: -/* 805A7B38 39 04 05 84 */ addi r8, r4, 0x584 -/* 805A7B3C 7C C3 40 2E */ lwzx r6, r3, r8 -/* 805A7B40 28 06 00 00 */ cmplwi r6, 0 -/* 805A7B44 41 82 00 28 */ beq lbl_805A7B6C -/* 805A7B48 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 805A7B4C 60 00 00 01 */ ori r0, r0, 1 -/* 805A7B50 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 805A7B54 90 E6 00 24 */ stw r7, 0x24(r6) -/* 805A7B58 7C C3 40 2E */ lwzx r6, r3, r8 -/* 805A7B5C 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 805A7B60 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 805A7B64 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 805A7B68 7C A3 41 2E */ stwx r5, r3, r8 -lbl_805A7B6C: -/* 805A7B6C 38 84 00 04 */ addi r4, r4, 4 -/* 805A7B70 42 00 FF C8 */ bdnz lbl_805A7B38 -/* 805A7B74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/event_proc_call__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/event_proc_call__13daTagStatue_cFv.s deleted file mode 100644 index 5caa529ed43..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/event_proc_call__13daTagStatue_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_805A759C: -/* 805A759C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A75A0 7C 08 02 A6 */ mflr r0 -/* 805A75A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A75A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A75AC 7C 7F 1B 78 */ mr r31, r3 -/* 805A75B0 3C 60 80 5B */ lis r3, cNullVec__6Z2Calc@ha /* 0x805A81FC@ha */ -/* 805A75B4 38 C3 81 FC */ addi r6, r3, cNullVec__6Z2Calc@l /* 0x805A81FC@l */ -/* 805A75B8 3C 60 80 5B */ lis r3, data_805A8390@ha /* 0x805A8390@ha */ -/* 805A75BC 38 A3 83 90 */ addi r5, r3, data_805A8390@l /* 0x805A8390@l */ -/* 805A75C0 88 05 00 00 */ lbz r0, 0(r5) -/* 805A75C4 7C 00 07 75 */ extsb. r0, r0 -/* 805A75C8 40 82 00 70 */ bne lbl_805A7638 -/* 805A75CC 80 66 00 74 */ lwz r3, 0x74(r6) -/* 805A75D0 80 06 00 78 */ lwz r0, 0x78(r6) -/* 805A75D4 90 66 00 A4 */ stw r3, 0xa4(r6) -/* 805A75D8 90 06 00 A8 */ stw r0, 0xa8(r6) -/* 805A75DC 80 06 00 7C */ lwz r0, 0x7c(r6) -/* 805A75E0 90 06 00 AC */ stw r0, 0xac(r6) -/* 805A75E4 38 86 00 A4 */ addi r4, r6, 0xa4 -/* 805A75E8 80 66 00 80 */ lwz r3, 0x80(r6) -/* 805A75EC 80 06 00 84 */ lwz r0, 0x84(r6) -/* 805A75F0 90 64 00 0C */ stw r3, 0xc(r4) -/* 805A75F4 90 04 00 10 */ stw r0, 0x10(r4) -/* 805A75F8 80 06 00 88 */ lwz r0, 0x88(r6) -/* 805A75FC 90 04 00 14 */ stw r0, 0x14(r4) -/* 805A7600 80 66 00 8C */ lwz r3, 0x8c(r6) -/* 805A7604 80 06 00 90 */ lwz r0, 0x90(r6) -/* 805A7608 90 64 00 18 */ stw r3, 0x18(r4) -/* 805A760C 90 04 00 1C */ stw r0, 0x1c(r4) -/* 805A7610 80 06 00 94 */ lwz r0, 0x94(r6) -/* 805A7614 90 04 00 20 */ stw r0, 0x20(r4) -/* 805A7618 80 66 00 98 */ lwz r3, 0x98(r6) -/* 805A761C 80 06 00 9C */ lwz r0, 0x9c(r6) -/* 805A7620 90 64 00 24 */ stw r3, 0x24(r4) -/* 805A7624 90 04 00 28 */ stw r0, 0x28(r4) -/* 805A7628 80 06 00 A0 */ lwz r0, 0xa0(r6) -/* 805A762C 90 04 00 2C */ stw r0, 0x2c(r4) -/* 805A7630 38 00 00 01 */ li r0, 1 -/* 805A7634 98 05 00 00 */ stb r0, 0(r5) -lbl_805A7638: -/* 805A7638 7F E3 FB 78 */ mr r3, r31 -/* 805A763C 88 1F 05 94 */ lbz r0, 0x594(r31) -/* 805A7640 1C 00 00 0C */ mulli r0, r0, 0xc -/* 805A7644 39 86 00 A4 */ addi r12, r6, 0xa4 -/* 805A7648 7D 8C 02 14 */ add r12, r12, r0 -/* 805A764C 4B DB AA 39 */ bl __ptmf_scall -/* 805A7650 60 00 00 00 */ nop -/* 805A7654 7F E3 FB 78 */ mr r3, r31 -/* 805A7658 48 00 06 79 */ bl checkOnEffect__13daTagStatue_cFv -/* 805A765C 2C 03 00 00 */ cmpwi r3, 0 -/* 805A7660 41 82 00 20 */ beq lbl_805A7680 -/* 805A7664 7F E3 FB 78 */ mr r3, r31 -/* 805A7668 48 00 04 01 */ bl setParticle__13daTagStatue_cFv -/* 805A766C 3C 60 80 5B */ lis r3, lit_3690@ha /* 0x805A8110@ha */ -/* 805A7670 C0 03 81 10 */ lfs f0, lit_3690@l(r3) /* 0x805A8110@l */ -/* 805A7674 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 805A7678 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 805A767C 48 00 00 1C */ b lbl_805A7698 -lbl_805A7680: -/* 805A7680 7F E3 FB 78 */ mr r3, r31 -/* 805A7684 48 00 04 A1 */ bl endParticle__13daTagStatue_cFv -/* 805A7688 3C 60 80 5B */ lis r3, lit_3894@ha /* 0x805A812C@ha */ -/* 805A768C C0 03 81 2C */ lfs f0, lit_3894@l(r3) /* 0x805A812C@l */ -/* 805A7690 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 805A7694 D0 03 00 0C */ stfs f0, 0xc(r3) -lbl_805A7698: -/* 805A7698 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A769C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A76A0 7C 08 03 A6 */ mtlr r0 -/* 805A76A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A76A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/execute__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/execute__13daTagStatue_cFv.s deleted file mode 100644 index 559bdcf461d..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/execute__13daTagStatue_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_805A7514: -/* 805A7514 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A7518 7C 08 02 A6 */ mflr r0 -/* 805A751C 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A7520 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A7524 7C 7F 1B 78 */ mr r31, r3 -/* 805A7528 80 63 05 A0 */ lwz r3, 0x5a0(r3) -/* 805A752C 3C 03 00 01 */ addis r0, r3, 1 -/* 805A7530 28 00 FF FF */ cmplwi r0, 0xffff -/* 805A7534 40 82 00 30 */ bne lbl_805A7564 -/* 805A7538 3C 60 80 5A */ lis r3, s_s_sub__FPvPv@ha /* 0x805A6F78@ha */ -/* 805A753C 38 63 6F 78 */ addi r3, r3, s_s_sub__FPvPv@l /* 0x805A6F78@l */ -/* 805A7540 7F E4 FB 78 */ mr r4, r31 -/* 805A7544 4B A7 9D F5 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 805A7548 28 03 00 00 */ cmplwi r3, 0 -/* 805A754C 41 82 00 18 */ beq lbl_805A7564 -/* 805A7550 41 82 00 0C */ beq lbl_805A755C -/* 805A7554 80 03 00 04 */ lwz r0, 4(r3) -/* 805A7558 48 00 00 08 */ b lbl_805A7560 -lbl_805A755C: -/* 805A755C 38 00 FF FF */ li r0, -1 -lbl_805A7560: -/* 805A7560 90 1F 05 A0 */ stw r0, 0x5a0(r31) -lbl_805A7564: -/* 805A7564 7F E3 FB 78 */ mr r3, r31 -/* 805A7568 48 00 00 35 */ bl event_proc_call__13daTagStatue_cFv -/* 805A756C 7F E3 FB 78 */ mr r3, r31 -/* 805A7570 4B FF FA 91 */ bl setBaseMtx__13daTagStatue_cFv -/* 805A7574 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 805A7578 28 03 00 00 */ cmplwi r3, 0 -/* 805A757C 41 82 00 08 */ beq lbl_805A7584 -/* 805A7580 4B A6 5E A9 */ bl play__14mDoExt_baseAnmFv -lbl_805A7584: -/* 805A7584 38 60 00 01 */ li r3, 1 -/* 805A7588 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A758C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A7590 7C 08 03 A6 */ mtlr r0 -/* 805A7594 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A7598 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A7424.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A7424.s deleted file mode 100644 index 395de1769b0..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A7424.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_805A7424: -/* 805A7424 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A7428 7C 08 02 A6 */ mflr r0 -/* 805A742C 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A7430 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A7434 93 C1 00 08 */ stw r30, 8(r1) -/* 805A7438 7C 7F 1B 78 */ mr r31, r3 -/* 805A743C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 805A7440 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 805A7444 40 82 00 1C */ bne lbl_805A7460 -/* 805A7448 28 1F 00 00 */ cmplwi r31, 0 -/* 805A744C 41 82 00 08 */ beq lbl_805A7454 -/* 805A7450 4B A7 17 15 */ bl __ct__10fopAc_ac_cFv -lbl_805A7454: -/* 805A7454 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 805A7458 60 00 00 08 */ ori r0, r0, 8 -/* 805A745C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_805A7460: -/* 805A7460 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805A7464 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 805A7468 98 1F 05 97 */ stb r0, 0x597(r31) -/* 805A746C 88 1F 05 97 */ lbz r0, 0x597(r31) -/* 805A7470 54 00 10 3A */ slwi r0, r0, 2 -/* 805A7474 3C 60 80 5B */ lis r3, l_evArcName@ha /* 0x805A8240@ha */ -/* 805A7478 38 63 82 40 */ addi r3, r3, l_evArcName@l /* 0x805A8240@l */ -/* 805A747C 7C 83 00 2E */ lwzx r4, r3, r0 -/* 805A7480 28 04 00 00 */ cmplwi r4, 0 -/* 805A7484 41 82 00 18 */ beq lbl_805A749C -/* 805A7488 38 7F 05 70 */ addi r3, r31, 0x570 -/* 805A748C 4B A8 5A 31 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 805A7490 2C 03 00 04 */ cmpwi r3, 4 -/* 805A7494 41 82 00 08 */ beq lbl_805A749C -/* 805A7498 48 00 00 64 */ b lbl_805A74FC -lbl_805A749C: -/* 805A749C 38 7F 05 68 */ addi r3, r31, 0x568 -/* 805A74A0 3C 80 80 5B */ lis r4, l_arcName@ha /* 0x805A821C@ha */ -/* 805A74A4 38 84 82 1C */ addi r4, r4, l_arcName@l /* 0x805A821C@l */ -/* 805A74A8 80 84 00 00 */ lwz r4, 0(r4) -/* 805A74AC 4B A8 5A 11 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 805A74B0 7C 7E 1B 78 */ mr r30, r3 -/* 805A74B4 2C 1E 00 04 */ cmpwi r30, 4 -/* 805A74B8 40 82 00 40 */ bne lbl_805A74F8 -/* 805A74BC 7F E3 FB 78 */ mr r3, r31 -/* 805A74C0 3C 80 80 5A */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x805A6F58@ha */ -/* 805A74C4 38 84 6F 58 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x805A6F58@l */ -/* 805A74C8 38 A0 11 00 */ li r5, 0x1100 -/* 805A74CC 4B A7 2F E5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 805A74D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805A74D4 40 82 00 0C */ bne lbl_805A74E0 -/* 805A74D8 38 60 00 05 */ li r3, 5 -/* 805A74DC 48 00 00 20 */ b lbl_805A74FC -lbl_805A74E0: -/* 805A74E0 7F E3 FB 78 */ mr r3, r31 -/* 805A74E4 4B FF FB 85 */ bl Create__13daTagStatue_cFv -/* 805A74E8 2C 03 00 00 */ cmpwi r3, 0 -/* 805A74EC 40 82 00 0C */ bne lbl_805A74F8 -/* 805A74F0 38 60 00 05 */ li r3, 5 -/* 805A74F4 48 00 00 08 */ b lbl_805A74FC -lbl_805A74F8: -/* 805A74F8 7F C3 F3 78 */ mr r3, r30 -lbl_805A74FC: -/* 805A74FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A7500 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A7504 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A7508 7C 08 03 A6 */ mtlr r0 -/* 805A750C 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A7510 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A80E0.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A80E0.s deleted file mode 100644 index 8ece9f1423a..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/func_805A80E0.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A80E0: -/* 805A80E0 88 83 00 00 */ lbz r4, 0(r3) -/* 805A80E4 28 04 00 00 */ cmplwi r4, 0 -/* 805A80E8 41 82 00 0C */ beq lbl_805A80F4 -/* 805A80EC 38 04 FF FF */ addi r0, r4, -1 -/* 805A80F0 98 03 00 00 */ stb r0, 0(r3) -lbl_805A80F4: -/* 805A80F4 88 63 00 00 */ lbz r3, 0(r3) -/* 805A80F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/getLetterCount__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/getLetterCount__13daTagStatue_cFv.s deleted file mode 100644 index 576640abf53..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/getLetterCount__13daTagStatue_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_805A7E94: -/* 805A7E94 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A7E98 7C 08 02 A6 */ mflr r0 -/* 805A7E9C 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A7EA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A7EA4 4B DB A3 31 */ bl _savegpr_27 -/* 805A7EA8 3B 80 00 00 */ li r28, 0 -/* 805A7EAC 3B 60 00 00 */ li r27, 0 -/* 805A7EB0 3B E0 00 00 */ li r31, 0 -/* 805A7EB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7EB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A7EBC 3B A3 07 F0 */ addi r29, r3, 0x7f0 -/* 805A7EC0 3C 60 80 5B */ lis r3, l_event_bit@ha /* 0x805A8104@ha */ -/* 805A7EC4 3B C3 81 04 */ addi r30, r3, l_event_bit@l /* 0x805A8104@l */ -lbl_805A7EC8: -/* 805A7EC8 7F A3 EB 78 */ mr r3, r29 -/* 805A7ECC 7C 9E FA 2E */ lhzx r4, r30, r31 -/* 805A7ED0 4B A8 CA ED */ bl isEventBit__11dSv_event_cCFUs -/* 805A7ED4 2C 03 00 00 */ cmpwi r3, 0 -/* 805A7ED8 41 82 00 08 */ beq lbl_805A7EE0 -/* 805A7EDC 3B 9C 00 01 */ addi r28, r28, 1 -lbl_805A7EE0: -/* 805A7EE0 3B 7B 00 01 */ addi r27, r27, 1 -/* 805A7EE4 2C 1B 00 06 */ cmpwi r27, 6 -/* 805A7EE8 3B FF 00 02 */ addi r31, r31, 2 -/* 805A7EEC 41 80 FF DC */ blt lbl_805A7EC8 -/* 805A7EF0 7F 83 E3 78 */ mr r3, r28 -/* 805A7EF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A7EF8 4B DB A3 29 */ bl _restgpr_27 -/* 805A7EFC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A7F00 7C 08 03 A6 */ mtlr r0 -/* 805A7F04 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A7F08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/initBaseMtx__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/initBaseMtx__13daTagStatue_cFv.s deleted file mode 100644 index 3b34b926336..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/initBaseMtx__13daTagStatue_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_805A6FC4: -/* 805A6FC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A6FC8 7C 08 02 A6 */ mflr r0 -/* 805A6FCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A6FD0 80 83 05 78 */ lwz r4, 0x578(r3) -/* 805A6FD4 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 805A6FD8 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 805A6FDC C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 805A6FE0 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 805A6FE4 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 805A6FE8 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 805A6FEC 48 00 00 15 */ bl setBaseMtx__13daTagStatue_cFv -/* 805A6FF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A6FF4 7C 08 03 A6 */ mtlr r0 -/* 805A6FF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A6FFC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/s_s_sub__FPvPv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/s_s_sub__FPvPv.s deleted file mode 100644 index 01e60df4f49..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/s_s_sub__FPvPv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_805A6F78: -/* 805A6F78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A6F7C 7C 08 02 A6 */ mflr r0 -/* 805A6F80 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A6F84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A6F88 7C 7F 1B 78 */ mr r31, r3 -/* 805A6F8C 4B A7 1D 55 */ bl fopAc_IsActor__FPv -/* 805A6F90 2C 03 00 00 */ cmpwi r3, 0 -/* 805A6F94 41 82 00 18 */ beq lbl_805A6FAC -/* 805A6F98 A8 1F 00 08 */ lha r0, 8(r31) -/* 805A6F9C 2C 00 00 BB */ cmpwi r0, 0xbb -/* 805A6FA0 40 82 00 0C */ bne lbl_805A6FAC -/* 805A6FA4 7F E3 FB 78 */ mr r3, r31 -/* 805A6FA8 48 00 00 08 */ b lbl_805A6FB0 -lbl_805A6FAC: -/* 805A6FAC 38 60 00 00 */ li r3, 0 -lbl_805A6FB0: -/* 805A6FB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A6FB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A6FB8 7C 08 03 A6 */ mtlr r0 -/* 805A6FBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A6FC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setBaseMtx__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setBaseMtx__13daTagStatue_cFv.s deleted file mode 100644 index db1a15446a8..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setBaseMtx__13daTagStatue_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_805A7000: -/* 805A7000 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A7004 7C 08 02 A6 */ mflr r0 -/* 805A7008 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A700C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A7010 7C 7F 1B 78 */ mr r31, r3 -/* 805A7014 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805A7018 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805A701C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 805A7020 3C 80 80 5B */ lis r4, lit_3690@ha /* 0x805A8110@ha */ -/* 805A7024 C0 44 81 10 */ lfs f2, lit_3690@l(r4) /* 0x805A8110@l */ -/* 805A7028 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 805A702C EC 42 00 2A */ fadds f2, f2, f0 -/* 805A7030 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 805A7034 4B D9 F8 B5 */ bl PSMTXTrans -/* 805A7038 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 805A703C 4B A6 5F 09 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 805A7040 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805A7044 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805A7048 80 9F 05 78 */ lwz r4, 0x578(r31) -/* 805A704C 38 84 00 24 */ addi r4, r4, 0x24 -/* 805A7050 4B D9 F4 61 */ bl PSMTXCopy -/* 805A7054 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A7058 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A705C 7C 08 03 A6 */ mtlr r0 -/* 805A7060 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A7064 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setParticle__13daTagStatue_cFv.s b/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setParticle__13daTagStatue_cFv.s deleted file mode 100644 index 7a0b5d30a9a..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt/setParticle__13daTagStatue_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_805A7A68: -/* 805A7A68 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 805A7A6C 7C 08 02 A6 */ mflr r0 -/* 805A7A70 90 01 00 44 */ stw r0, 0x44(r1) -/* 805A7A74 39 61 00 40 */ addi r11, r1, 0x40 -/* 805A7A78 4B DB A7 59 */ bl _savegpr_26 -/* 805A7A7C 7C 7A 1B 78 */ mr r26, r3 -/* 805A7A80 3B 60 00 00 */ li r27, 0 -/* 805A7A84 3B E0 00 00 */ li r31, 0 -/* 805A7A88 3B C0 00 00 */ li r30, 0 -/* 805A7A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A7A90 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_805A7A94: -/* 805A7A94 3B 9E 05 84 */ addi r28, r30, 0x584 -/* 805A7A98 7C 1A E0 2E */ lwzx r0, r26, r28 -/* 805A7A9C 28 00 00 00 */ cmplwi r0, 0 -/* 805A7AA0 40 82 00 58 */ bne lbl_805A7AF8 -/* 805A7AA4 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 805A7AA8 38 80 00 00 */ li r4, 0 -/* 805A7AAC 90 81 00 08 */ stw r4, 8(r1) -/* 805A7AB0 38 00 FF FF */ li r0, -1 -/* 805A7AB4 90 01 00 0C */ stw r0, 0xc(r1) -/* 805A7AB8 90 81 00 10 */ stw r4, 0x10(r1) -/* 805A7ABC 90 81 00 14 */ stw r4, 0x14(r1) -/* 805A7AC0 90 81 00 18 */ stw r4, 0x18(r1) -/* 805A7AC4 38 80 00 00 */ li r4, 0 -/* 805A7AC8 3C A0 80 5B */ lis r5, l_eff_id@ha /* 0x805A8220@ha */ -/* 805A7ACC 38 A5 82 20 */ addi r5, r5, l_eff_id@l /* 0x805A8220@l */ -/* 805A7AD0 7C A5 FA 2E */ lhzx r5, r5, r31 -/* 805A7AD4 38 DA 04 D0 */ addi r6, r26, 0x4d0 -/* 805A7AD8 38 E0 00 00 */ li r7, 0 -/* 805A7ADC 39 1A 04 B4 */ addi r8, r26, 0x4b4 -/* 805A7AE0 39 3A 04 EC */ addi r9, r26, 0x4ec -/* 805A7AE4 39 40 00 FF */ li r10, 0xff -/* 805A7AE8 3D 60 80 5B */ lis r11, lit_3690@ha /* 0x805A8110@ha */ -/* 805A7AEC C0 2B 81 10 */ lfs f1, lit_3690@l(r11) /* 0x805A8110@l */ -/* 805A7AF0 4B AA 4F A1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 805A7AF4 7C 7A E1 2E */ stwx r3, r26, r28 -lbl_805A7AF8: -/* 805A7AF8 3B 7B 00 01 */ addi r27, r27, 1 -/* 805A7AFC 2C 1B 00 03 */ cmpwi r27, 3 -/* 805A7B00 3B FF 00 02 */ addi r31, r31, 2 -/* 805A7B04 3B DE 00 04 */ addi r30, r30, 4 -/* 805A7B08 41 80 FF 8C */ blt lbl_805A7A94 -/* 805A7B0C 39 61 00 40 */ addi r11, r1, 0x40 -/* 805A7B10 4B DB A7 0D */ bl _restgpr_26 -/* 805A7B14 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805A7B18 7C 08 03 A6 */ mtlr r0 -/* 805A7B1C 38 21 00 40 */ addi r1, r1, 0x40 -/* 805A7B20 4E 80 00 20 */ blr diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index 8d833f2f6df..f12422adf98 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -41,6 +41,14 @@ public: bool checkWaterBomb(fopAc_ac_c*); bool checkInsectBombMove(fopAc_ac_c*); + bool checkStateExplode() { + return fopAcM_GetParam(this) == 0; + } + + static bool checkBombActor(fopAc_ac_c* i_actor) { + return fopAcM_GetName(i_actor) == PROC_NBOMB; + } + static fopAc_ac_c* createNormalBombPlayer(cXyz* i_pos) { return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL); } diff --git a/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h b/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h index 736663a51a9..335fb0945bb 100644 --- a/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h +++ b/include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h @@ -1,6 +1,116 @@ #ifndef D_A_E_NEST_H #define D_A_E_NEST_H -#include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/cc/d_cc_d.h" +#include "d/cc/d_cc_uty.h" +#include "d/bg/d_bg_s_acch.h" +#include "Z2AudioLib/Z2Creature.h" + +struct nest_hahen_s { + /* 805044E8 */ nest_hahen_s() {} + /* 805044AC */ ~nest_hahen_s() {} + + /* 0x00 */ J3DModel* mpModel; + /* 0x04 */ cXyz mPos; + /* 0x10 */ cXyz mLastPos; + /* 0x1C */ cXyz mSpeed; + /* 0x28 */ cXyz mScale; + /* 0x34 */ s16 mAngleZ; + /* 0x36 */ s16 mAngleY; + /* 0x38 */ u8 unused_0x38[2]; + /* 0x3A */ s16 mGroundAngleX; + /* 0x3C */ s16 mGroundAngleZ; + /* 0x3E */ u8 unused_0x3e[6]; + /* 0x44 */ s16 mCounter; + /* 0x46 */ u8 unused_0x46[0xa]; + /* 0x50 */ s16 mMaxRotationZ; + /* 0x52 */ s8 mGroundHitStage; + /* 0x53 */ bool mActive; + /* 0x54 */ u8 mTimer; +}; + +STATIC_ASSERT(sizeof(nest_hahen_s) == 0x58); + +class e_nest_class : public fopAc_ac_c { +public: + enum Type { + TYPE_BEE = 1, + TYPE_BUG = 2, + }; + + enum Action { + ACT_NORMAL = 0, + ACT_DROP = 1, + ACT_HOOK = 2, + ACT_CARRY = 3, + ACT_FLOAT = 4, + ACT_DEBRIS = 5, + }; + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ u8 mParamType; + /* 0x571 */ u8 mParam1; + /* 0x572 */ u8 mParamScale; + /* 0x573 */ u8 mBrokenSwitch; + /* 0x574 */ u8 unused_0x574[4]; + /* 0x578 */ J3DModel* mpModel; + /* 0x57C */ s16 mFrame; + /* 0x57E */ s16 mAction; + /* 0x580 */ s16 mMode; + /* 0x582 */ s16 mTimers[3]; + /* 0x588 */ s16 mHitTimer; + /* 0x58A */ s8 mKnockDown; + /* 0x58C */ f32 mCarryOffset; + /* 0x590 */ f32 mDropOffset; + /* 0x594 */ f32 mWaterHeight; + /* 0x598 */ s16 mCarryAngle; + /* 0x59A */ s16 mCarryAngleSpeed; + /* 0x59C */ u8 unused_0x59c[4]; + /* 0x5A0 */ u32 mShadowKey; + /* 0x5A4 */ cXyz mCenterPos; + /* 0x5B0 */ s8 mIframes; + /* 0x5B4 */ dBgS_AcchCir mAcchCir; + /* 0x5F4 */ dBgS_ObjAcch mAcch; + /* 0x7CC */ dCcD_Stts mCcStts; + /* 0x808 */ dCcD_Sph mCcSph; + /* 0x940 */ dCcD_Cyl mCcCyl; + /* 0xA7C */ dCcU_AtInfo mAtInfo; + /* 0xAA0 */ bool mHawkHit; + /* 0xAA4 */ int mHitActorID; + /* 0xAA8 */ f32 mBob; + /* 0xAAC */ csXyz mRotation; + /* 0xAB2 */ s16 mSpin; + /* 0xAB4 */ f32 mWobble; + /* 0xAB8 */ u32 mSmokeKey1; + /* 0xABC */ u32 mSmokeKey2; + /* 0xAC0 */ u32 mParticleKey[4]; + /* 0xAD0 */ u32 mRippleKey; + /* 0xAD4 */ u8 unused_0xad4[4]; + /* 0xAD8 */ Z2SoundObjBeeGroup mBeeSound; + /* 0xAF8 */ Z2SoundObjSimple mSound; + /* 0xB18 */ s8 mBreakStage; + /* 0xB1C */ nest_hahen_s mDebris[5]; + /* 0xCD4 */ s16 mDemoStage; + /* 0xCD6 */ s16 mDemoTimer; + /* 0xCD8 */ cXyz mDemoCameraEye; + /* 0xCE4 */ cXyz mDemoCameraCenter; + /* 0xCF0 */ f32 mDemoCameraFovY; + /* 0xCF4 */ bool mHIOInit; +}; + +STATIC_ASSERT(sizeof(e_nest_class) == 0xCF8); + +class daE_Nest_HIO_c { +public: + /* 80500F8C */ daE_Nest_HIO_c(); + /* 80504634 */ virtual ~daE_Nest_HIO_c() {} + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mScale; +}; + +STATIC_ASSERT(sizeof(daE_Nest_HIO_c) == 0xC); #endif /* D_A_E_NEST_H */ diff --git a/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp b/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp index 048235360c8..dfdb7faf2c4 100644 --- a/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp +++ b/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp @@ -1,1309 +1,1116 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_e_nest -// +/** + * d_a_e_nest.cpp + * Enemy - Beehive + */ #include "rel/d/a/e/d_a_e_nest/d_a_e_nest.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct nest_hahen_s { - /* 805044AC */ ~nest_hahen_s(); - /* 805044E8 */ nest_hahen_s(); -}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct e_nest_class {}; - -struct daPy_py_c { - /* 8015F4F0 */ void setLookPos(cXyz*); - /* 8015F89C */ void checkBoomerangCharge(); -}; - -struct daNPC_TK_c { - /* 80B0A444 */ void setHawkSideCamera(cXyz); - /* 80B0A500 */ void setHawkCamera(fopAc_ac_c*); - /* 80B0A568 */ void endHawkCamera(); -}; - -struct daE_Nest_HIO_c { - /* 80500F8C */ daE_Nest_HIO_c(); - /* 80504634 */ ~daE_Nest_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 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 dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcU_AtInfo {}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); - /* 80180C18 */ void Reset(cXyz, cXyz); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjGndChk_Spl { - /* 800777B0 */ dBgS_ObjGndChk_Spl(); - /* 80077848 */ ~dBgS_ObjGndChk_Spl(); -}; - -struct dBgS_ObjAcch { - /* 805045C4 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -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 dAttCatch_c { - /* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBeeGroup { - /* 802C1D10 */ Z2SoundObjBeeGroup(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__14daE_Nest_HIO_cFv(); -extern "C" static void hahen_draw__FP12e_nest_class(); -extern "C" static void s_bomb_sub__FPvPv(); -extern "C" static void hahen_normal__FP12e_nest_classP12nest_hahen_s(); -extern "C" static void hahen_move__FP12e_nest_class(); -extern "C" static void daE_Nest_Draw__FP12e_nest_class(); -extern "C" static void mtx_cc_set__FP12e_nest_class(); -extern "C" static void e_nest_normal__FP12e_nest_class(); -extern "C" static void wall_angle_get__FP12e_nest_class(); -extern "C" static void e_nest_drop__FP12e_nest_class(); -extern "C" static void e_nest_carry__FP12e_nest_class(); -extern "C" static void water_check__FP12e_nest_class(); -extern "C" static void simple_bg_check__FP12e_nest_class(); -extern "C" static void e_nest_float__FP12e_nest_class(); -extern "C" static void e_nest_hahen__FP12e_nest_class(); -extern "C" static void e_nest_hook__FP12e_nest_class(); -extern "C" static void bee_nest_action__FP12e_nest_class(); -extern "C" static void shot_b_sub__FPvPv(); -extern "C" static void demo_camera__FP12e_nest_class(); -extern "C" static void daE_Nest_Execute__FP12e_nest_class(); -extern "C" static bool daE_Nest_IsDelete__FP12e_nest_class(); -extern "C" static void daE_Nest_Delete__FP12e_nest_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_Nest_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12nest_hahen_sFv(); -extern "C" void __ct__12nest_hahen_sFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__14daE_Nest_HIO_cFv(); -extern "C" void __sinit_d_a_e_nest_cpp(); -extern "C" static void func_805046B8(); -extern "C" static void func_805046C0(); -extern "C" extern char const* const d_a_e_nest__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -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_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(); -extern "C" void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(); -extern "C" void fopAcM_effHamonSet__FPUlPC4cXyzff(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void onEventBit__11dSv_event_cFUs(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void request__11dAttCatch_cFP10fopAc_ac_cUcfffsi(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -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 __ct__18dBgS_ObjGndChk_SplFv(); -extern "C" void __dt__18dBgS_ObjGndChk_SplFv(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -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 ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void ChkCoHit__12dCcD_GObjInfFv(); -extern "C" void GetCoHitObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void at_power_check__FP11dCcU_AtInfo(); -extern "C" void cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo(); -extern "C" void setLookPos__9daPy_py_cFP4cXyz(); -extern "C" void checkBoomerangCharge__9daPy_py_cFv(); -extern "C" void Start__9dCamera_cFv(); -extern "C" void Stop__9dCamera_cFv(); -extern "C" void SetTrimSize__9dCamera_cFl(); -extern "C" void Set__9dCamera_cF4cXyz4cXyzfs(); -extern "C" void Reset__9dCamera_cF4cXyz4cXyz(); -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 __mi__4cXyzCFRC3Vec(); -extern "C" void __ml__4cXyzCFf(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_addCalc0__FPfff(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void MtxTrans__FfffUc(); -extern "C" void MtxScale__FfffUc(); -extern "C" void MtxPosition__FP4cXyzP4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __ct__18Z2SoundObjBeeGroupFv(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void __construct_array(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); -extern "C" void setHawkSideCamera__10daNPC_TK_cF4cXyz(); -extern "C" void setHawkCamera__10daNPC_TK_cFP10fopAc_ac_c(); -extern "C" void endHawkCamera__10daNPC_TK_cFv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 805046DC-805046E0 000000 0004+00 16/16 0/0 0/0 .rodata @3999 */ -SECTION_RODATA static f32 const lit_3999 = 1.0f; -COMPILER_STRIP_GATE(0x805046DC, &lit_3999); - -/* 805047FC-80504808 000000 000C+00 1/1 0/0 0/0 .data c_x$4617 */ -SECTION_DATA static u8 c_x[12] = { - 0x42, 0x48, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80504808-80504814 00000C 000C+00 1/1 0/0 0/0 .data c_z$4618 */ -SECTION_DATA static u8 c_z[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, -}; - -/* 80504814-8050481C 000018 0008+00 1/1 0/0 0/0 .data w_eff_id$4885 */ -SECTION_DATA static u8 w_eff_id[8] = { - 0x01, 0xB8, 0x01, 0xB9, 0x01, 0xBA, 0x01, 0xBB, -}; - -/* 8050481C-80504820 000020 0004+00 1/1 0/0 0/0 .data b_eff_id$4895 */ -SECTION_DATA static u8 b_eff_id[4] = { - 0x83, - 0x2C, - 0x83, - 0x2D, -}; - -/* 80504820-80504860 000024 0040+00 1/1 0/0 0/0 .data cc_sph_src$5262 */ -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x1}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 30.0f} // mSph - } // mSphAttr -}; - -/* 80504860-805048A4 000064 0044+00 1/1 0/0 0/0 .data cc_cyl_src$5263 */ -static dCcD_SrcCyl cc_cyl_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x2020, 0x3}, 0x79}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 5.0f, // mRadius - 10.0f // mHeight - } // mCyl -}; - -/* 805048A4-805048C4 -00001 0020+00 1/0 0/0 0/0 .data l_daE_Nest_Method */ -SECTION_DATA static void* l_daE_Nest_Method[8] = { - (void*)daE_Nest_Create__FP10fopAc_ac_c, - (void*)daE_Nest_Delete__FP12e_nest_class, - (void*)daE_Nest_Execute__FP12e_nest_class, - (void*)daE_Nest_IsDelete__FP12e_nest_class, - (void*)daE_Nest_Draw__FP12e_nest_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 805048C4-805048F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_NEST */ -SECTION_DATA extern void* g_profile_E_NEST[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01E80000, (void*)&g_fpcLf_Method, - (void*)0x00000CF8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00B20000, (void*)&l_daE_Nest_Method, - (void*)0x000D4100, (void*)0x000E0000, -}; - -/* 805048F4-80504900 0000F8 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80504900-8050490C 000104 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, -}; - -/* 8050490C-80504918 000110 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, -}; - -/* 80504918-8050493C 00011C 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_805046C0, - (void*)NULL, - (void*)NULL, - (void*)func_805046B8, -}; - -/* 8050493C-80504948 000140 000C+00 2/2 0/0 0/0 .data __vt__14daE_Nest_HIO_c */ -SECTION_DATA extern void* __vt__14daE_Nest_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daE_Nest_HIO_cFv, -}; +#include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "d/d_bomb.h" +#include "d/d_procname.h" + +/* 80504950-80504954 000008 0004+00 2/2 0/0 0/0 .bss None */ +static bool l_hioInit; + +/* 80504960-8050496C 000018 000C+00 7/7 0/0 0/0 .bss l_HIO */ +static daE_Nest_HIO_c l_HIO; /* 80500F8C-80500FB0 0000EC 0024+00 1/1 0/0 0/0 .text __ct__14daE_Nest_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daE_Nest_HIO_c::daE_Nest_HIO_c() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__ct__14daE_Nest_HIO_cFv.s" +daE_Nest_HIO_c::daE_Nest_HIO_c() { + field_0x4 = -1; + mScale = 1.0f; } -#pragma pop /* 80500FB0-80501040 000110 0090+00 1/1 0/0 0/0 .text hahen_draw__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void hahen_draw(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_draw__FP12e_nest_class.s" +static void hahen_draw(e_nest_class* i_this) { + nest_hahen_s* debris = i_this->mDebris; + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + for (int i = 0; i < 5; i++, debris++) { + if (debris->mActive) { + g_env_light.setLightTevColorType_MAJI(debris->mpModel, &i_this->tevStr); + mDoExt_modelUpdateDL(debris->mpModel); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 805046E0-805046E4 000004 0004+00 1/13 0/0 0/0 .rodata @4066 */ -SECTION_RODATA static u8 const lit_4066[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x805046E0, &lit_4066); - -/* 805046E4-805046EC 000008 0008+00 0/5 0/0 0/0 .rodata @4067 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4067[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x805046E4, &lit_4067); -#pragma pop - -/* 805046EC-805046F4 000010 0008+00 0/5 0/0 0/0 .rodata @4068 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4068[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x805046EC, &lit_4068); -#pragma pop - -/* 805046F4-805046FC 000018 0008+00 0/5 0/0 0/0 .rodata @4069 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4069[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x805046F4, &lit_4069); -#pragma pop - -/* 805046FC-80504700 000020 0004+00 0/1 0/0 0/0 .rodata @4070 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4070 = 120.0f; -COMPILER_STRIP_GATE(0x805046FC, &lit_4070); -#pragma pop /* 80501040-805011CC 0001A0 018C+00 1/1 0/0 0/0 .text s_bomb_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_bomb_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/s_bomb_sub__FPvPv.s" +static void* s_bomb_sub(void* i_actor, void* i_debris) { + if (fopAcM_IsActor(i_actor)) { + fopAc_ac_c* actor = static_cast(i_actor); + if (dBomb_c::checkBombActor(actor)) { + dBomb_c* bomb = static_cast(actor); + if (bomb->checkStateExplode()) { + nest_hahen_s* debris = static_cast(i_debris); + cXyz delta = debris->mPos - bomb->current.pos; + if (delta.abs() < 120.0f) { + return i_actor; + } + } + } + } + return NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 80504700-80504704 000024 0004+00 0/4 0/0 0/0 .rodata @4198 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4198 = 500.0f; -COMPILER_STRIP_GATE(0x80504700, &lit_4198); -#pragma pop - -/* 80504704-80504708 000028 0004+00 0/4 0/0 0/0 .rodata @4199 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4199 = 0.5f; -COMPILER_STRIP_GATE(0x80504704, &lit_4199); -#pragma pop - -/* 80504708-8050470C 00002C 0004+00 0/2 0/0 0/0 .rodata @4200 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4200 = -5.0f; -COMPILER_STRIP_GATE(0x80504708, &lit_4200); -#pragma pop - -/* 8050470C-80504710 000030 0004+00 0/2 0/0 0/0 .rodata @4201 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4201 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(0x8050470C, &lit_4201); -#pragma pop - -/* 80504710-80504714 000034 0004+00 0/1 0/0 0/0 .rodata @4202 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4202 = 4.0f; -COMPILER_STRIP_GATE(0x80504710, &lit_4202); -#pragma pop - -/* 80504714-80504718 000038 0004+00 0/1 0/0 0/0 .rodata @4203 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4203 = -50.0f; -COMPILER_STRIP_GATE(0x80504714, &lit_4203); -#pragma pop - -/* 80504718-8050471C 00003C 0004+00 0/5 0/0 0/0 .rodata @4204 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4204 = 100.0f; -COMPILER_STRIP_GATE(0x80504718, &lit_4204); -#pragma pop - -/* 8050471C-80504720 000040 0004+00 0/1 0/0 0/0 .rodata @4205 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4205 = -7.0f; -COMPILER_STRIP_GATE(0x8050471C, &lit_4205); -#pragma pop - -/* 80504720-80504724 000044 0004+00 0/2 0/0 0/0 .rodata @4206 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4206 = 15.0f; -COMPILER_STRIP_GATE(0x80504720, &lit_4206); -#pragma pop - -/* 80504724-80504728 000048 0004+00 0/5 0/0 0/0 .rodata @4207 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4207 = 10.0f; -COMPILER_STRIP_GATE(0x80504724, &lit_4207); -#pragma pop - -/* 80504728-8050472C 00004C 0004+00 1/7 0/0 0/0 .rodata @4208 */ -SECTION_RODATA static f32 const lit_4208 = 50.0f; -COMPILER_STRIP_GATE(0x80504728, &lit_4208); - -/* 8050472C-80504730 000050 0004+00 0/3 0/0 0/0 .rodata @4209 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4209 = -1.0f; -COMPILER_STRIP_GATE(0x8050472C, &lit_4209); -#pragma pop - -/* 80504730-80504734 000054 0004+00 0/1 0/0 0/0 .rodata @4210 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4210 = 400.0f; -COMPILER_STRIP_GATE(0x80504730, &lit_4210); -#pragma pop - -/* 80504734-80504738 000058 0004+00 0/1 0/0 0/0 .rodata @4211 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4211 = 5000.0f; -COMPILER_STRIP_GATE(0x80504734, &lit_4211); -#pragma pop - -/* 80504738-8050473C 00005C 0004+00 0/1 0/0 0/0 .rodata @4212 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4212 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80504738, &lit_4212); -#pragma pop - -/* 8050473C-80504744 000060 0004+04 0/3 0/0 0/0 .rodata @4213 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4213[1 + 1 /* padding */] = { - 2.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x8050473C, &lit_4213); -#pragma pop - -/* 80504744-8050474C 000068 0008+00 1/3 0/0 0/0 .rodata @4215 */ -SECTION_RODATA static u8 const lit_4215[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80504744, &lit_4215); /* 805011CC-805017FC 00032C 0630+00 1/1 0/0 0/0 .text * hahen_normal__FP12e_nest_classP12nest_hahen_s */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void hahen_normal(e_nest_class* param_0, nest_hahen_s* param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_normal__FP12e_nest_classP12nest_hahen_s.s" +static void hahen_normal(e_nest_class* i_this, nest_hahen_s* i_debris) { + fopAc_ac_c* a_this = static_cast(i_this); + dBgS_LinChk lin_chk; + dBgS_ObjGndChk_Spl gnd_chk; + + i_debris->mCounter++; + if (i_debris->mTimer != 0) { + i_debris->mTimer--; + } + + i_debris->mLastPos = i_debris->mPos; + i_debris->mPos += i_debris->mSpeed; + + cXyz vec1 = i_debris->mPos; + vec1.y += 500.0f; + gnd_chk.SetPos(&vec1); + f32 ground_cross = dComIfG_Bgsp().GroundCross(&gnd_chk); + if (i_debris->mPos.y < ground_cross) { + i_debris->mSpeed.y -= 0.5f; + if (i_debris->mSpeed.y < -5.0f) { + i_debris->mSpeed.y = -5.0f; + } + i_debris->mSpeed.x *= 0.95f; + i_debris->mSpeed.z *= 0.95f; + } else { + i_debris->mSpeed.y -= 4.0f; + if (i_debris->mSpeed.y < -50.0f) { + i_debris->mSpeed.y = -50.0f; + } + } + + cXyz vec2; + vec2.set(i_debris->mPos.x, i_debris->mPos.y + 100.0f, i_debris->mPos.z); + if (fopAcM_gc_c::gndCheck(&vec2)) { + if (i_debris->mSpeed.y <= 0.0f && i_debris->mPos.y <= fopAcM_gc_c::getGroundY() + 1.0f) { + i_debris->mPos.y = fopAcM_gc_c::getGroundY() + 1.0f; + if (i_debris->mSpeed.y < -7.0f && i_debris->mGroundHitStage == 0) { + i_debris->mMaxRotationZ = cM_rndF(10.0f) + 15.0f; + i_debris->mGroundHitStage++; + vec2 = i_debris->mPos; + vec2.y += 50.0f; + vec2.z += 10.0f; + if (fopAcM_gc_c::gndCheck(&vec2)) { + vec2.y = fopAcM_gc_c::getGroundY() + 1.0f; + i_debris->mGroundAngleX = -cM_atan2s(vec2.y - i_debris->mPos.y, + vec2.z - i_debris->mPos.z); + if (i_debris->mGroundAngleX > 0x3000 || i_debris->mGroundAngleX < -0x3000) { + i_debris->mGroundAngleX = 0; + } + vec2 = i_debris->mPos; + vec2.y += 50.0f; + vec2.x += 10.0f; + if (fopAcM_gc_c::gndCheck(&vec2)) { + vec2.y = fopAcM_gc_c::getGroundY() + 1.0f; + i_debris->mGroundAngleZ = cM_atan2s(vec2.y - i_debris->mPos.y, + vec2.x - i_debris->mPos.x); + if (i_debris->mGroundAngleZ > 0x3000 || i_debris->mGroundAngleZ < -0x3000) { + i_debris->mGroundAngleZ = 0; + } + } + } + } else { + i_debris->mGroundHitStage = 3; + i_debris->mSpeed.y = -1.0f; + i_debris->mSpeed.z = 0.0f; + i_debris->mSpeed.x = 0.0f; + if (fpcM_Search(s_bomb_sub, i_debris) != NULL) { + i_debris->mActive = false; + } + } + i_debris->mAngleZ = i_debris->mMaxRotationZ * 400.0f + * cM_ssin(i_debris->mCounter * 0x1700); + cLib_addCalcAngleS2(&i_debris->mMaxRotationZ, 0, 1, 1); + } else { + if (i_debris->mPos.y < ground_cross) { + i_debris->mAngleZ = cM_ssin(i_debris->mCounter * 0x500) * 5000.0f; + } else { + cLib_addCalcAngleS2(&i_debris->mAngleZ, 0, 4, 0x400); + } + } + } + + if (i_debris->mTimer == 0) { + cXyz delta_xz = i_debris->mPos - i_debris->mLastPos; + delta_xz.y = 0.0f; + if (delta_xz.abs() > 0.01f) { + cXyz lin_end = i_debris->mPos + delta_xz * 2.0f; + lin_chk.Set(&i_debris->mLastPos, &lin_end, a_this); + if (dComIfG_Bgsp().LineCross(&lin_chk)) { + i_debris->mPos = i_debris->mLastPos; + i_debris->mSpeed.x *= -1.0f; + i_debris->mSpeed.z *= -1.0f; + i_debris->mSpeed.y = 0.0f; + i_debris->mPos += i_debris->mSpeed; + i_debris->mTimer = 5; + } + } + } } -#pragma pop /* 805017FC-80501930 00095C 0134+00 1/1 0/0 0/0 .text hahen_move__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void hahen_move(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/hahen_move__FP12e_nest_class.s" +static void hahen_move(e_nest_class* i_this) { + nest_hahen_s* debris = i_this->mDebris; + dBgS_LinChk lin_chk; + + for (int i = 0; i < 5; i++, debris++) { + if (debris->mActive) { + if (i_this->mBreakStage == 3 && debris->mActive == true) { + hahen_normal(i_this, debris); + } + MtxTrans(debris->mPos.x, debris->mPos.y, debris->mPos.z, 0); + mDoMtx_XrotM(*calc_mtx, debris->mGroundAngleX); + mDoMtx_ZrotM(*calc_mtx, debris->mGroundAngleZ); + mDoMtx_YrotM(*calc_mtx, debris->mAngleY + 0x4000); + mDoMtx_ZrotM(*calc_mtx, debris->mAngleZ); + MtxScale(debris->mScale.x, debris->mScale.y, debris->mScale.z, 1); + debris->mpModel->setBaseTRMtx(*calc_mtx); + } + } + + if (i_this->mBreakStage == 2) { + i_this->mBreakStage = 3; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80504950-80504954 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80504950[4]; - -/* 80504954-80504960 00000C 000C+00 1/1 0/0 0/0 .bss @3994 */ -static u8 lit_3994[12]; - -/* 80504960-8050496C 000018 000C+00 7/7 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[12]; /* 80501930-80501A40 000A90 0110+00 1/0 0/0 0/0 .text daE_Nest_Draw__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_Nest_Draw(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Draw__FP12e_nest_class.s" +static int daE_Nest_Draw(e_nest_class* i_this) { + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + if (i_this->mBreakStage != 0) { + hahen_draw(i_this); + return 1; + } else { + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr); + mDoExt_modelUpdateDL(i_this->mpModel); + if (i_this->mAction == e_nest_class::ACT_DROP) { + cXyz vec; + f32 scale = l_HIO.mScale * i_this->scale.x; + vec.set(i_this->current.pos.x, i_this->current.pos.y + 50.0f, i_this->current.pos.z); + i_this->mShadowKey = + dComIfGd_setShadow(i_this->mShadowKey, 1, i_this->mpModel, &vec, scale * 500.0f, + 0.0f, i_this->current.pos.y, i_this->mAcch.GetGroundH(), + i_this->mAcch.m_gnd, &i_this->tevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); + } + return 1; + } } -#pragma pop - -/* ############################################################################################## */ -/* 8050474C-80504750 000070 0004+00 0/1 0/0 0/0 .rodata @4297 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4297 = -90.0f; -COMPILER_STRIP_GATE(0x8050474C, &lit_4297); -#pragma pop - -/* 80504750-80504754 000074 0004+00 0/3 0/0 0/0 .rodata @4298 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4298 = 40.0f; -COMPILER_STRIP_GATE(0x80504750, &lit_4298); -#pragma pop - -/* 80504754-80504758 000078 0004+00 0/1 0/0 0/0 .rodata @4299 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4299 = -30.0f; -COMPILER_STRIP_GATE(0x80504754, &lit_4299); -#pragma pop - -/* 80504758-8050475C 00007C 0004+00 0/5 0/0 0/0 .rodata @4300 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4300 = 5.0f; -COMPILER_STRIP_GATE(0x80504758, &lit_4300); -#pragma pop - -/* 8050475C-80504760 000080 0004+00 0/3 0/0 0/0 .rodata @4301 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4301 = 30.0f; -COMPILER_STRIP_GATE(0x8050475C, &lit_4301); -#pragma pop /* 80501A40-80501BDC 000BA0 019C+00 2/2 0/0 0/0 .text mtx_cc_set__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void mtx_cc_set(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/mtx_cc_set__FP12e_nest_class.s" +static void mtx_cc_set(e_nest_class* i_this) { + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->mRotation.y); + mDoMtx_stack_c::XrotM(i_this->mRotation.x); + mDoMtx_stack_c::ZrotM(i_this->mRotation.z); + f32 scale = l_HIO.mScale * i_this->scale.x; + mDoMtx_stack_c::scaleM(scale, scale, scale); + mDoMtx_stack_c::transM(0.0f, i_this->mCarryOffset + i_this->mDropOffset, 0.0f); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + + cXyz vec; + vec.x = 0.0f; + vec.y = -90.0f; + vec.z = 0.0f; + mDoMtx_stack_c::multVec(&vec, &i_this->mCenterPos); + + i_this->mCcSph.SetC(i_this->mCenterPos); + dComIfG_Ccsp()->Set(&i_this->mCcSph); + i_this->mCcSph.SetR(scale * 40.0f); + + if (i_this->mAction == e_nest_class::ACT_NORMAL) { + vec = i_this->current.pos; + vec.y += -30.0f; + i_this->mCcCyl.SetC(vec); + i_this->mCcCyl.SetR(5.0f); + i_this->mCcCyl.SetH(30.0f); + dComIfG_Ccsp()->Set(&i_this->mCcCyl); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80504760-80504764 000084 0004+00 2/3 0/0 0/0 .rodata @4431 */ -SECTION_RODATA static f32 const lit_4431 = 135.0f; -COMPILER_STRIP_GATE(0x80504760, &lit_4431); - -/* 805047EC-805047EC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_805047EC = "F_SP103"; -#pragma pop /* 80501BDC-805020D0 000D3C 04F4+00 1/1 0/0 0/0 .text e_nest_normal__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_nest_normal(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_normal__FP12e_nest_class.s" +static void e_nest_normal(e_nest_class* i_this) { + fopAc_ac_c* a_this = static_cast(i_this); + if (i_this->mHitTimer != 0) { + i_this->mHitTimer--; + i_this->mRotation.x = i_this->mHitTimer * cM_ssin(i_this->mHitTimer * 12000) * 50.0f; + i_this->mRotation.z = i_this->mHitTimer * cM_ssin(i_this->mHitTimer * 14000) * 50.0f; + if (i_this->mHitTimer == 0) { + if (i_this->mKnockDown != 0) { + i_this->mAction = e_nest_class::ACT_DROP; + i_this->mMode = 0; + i_this->mTimers[0] = 8; + i_this->mTimers[2] = 120; + i_this->mTimers[1] = 100; + i_this->mDropOffset = 135.0f; + a_this->current.pos.y -= i_this->mDropOffset * l_HIO.mScale * a_this->scale.x; + if (i_this->mHawkHit) { + daNPC_TK_c* hawk = + static_cast(fopAcM_SearchByID(i_this->mHitActorID)); + hawk->setHawkCamera(a_this); + } + } else { + a_this->health = 1; + } + } + } else { + a_this->health = 0; + if (i_this->mIframes == 0) { + if (i_this->mCcCyl.ChkTgHit()) { + i_this->mAtInfo.mpCollider = i_this->mCcCyl.GetTgHitObj(); + if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOMB)) { + a_this->field_0x567 = 1; + fopAcM_delete(a_this); + } else { + i_this->mIframes = 10; + i_this->mHitTimer = 3; + i_this->mKnockDown = 1; + i_this->mHitActorID = fopAcM_GetID(daPy_getPlayerActorClass()); + } + } else { + int knock_down = false; + + if (i_this->mCcSph.ChkTgHit()) { + i_this->mIframes = 10; + i_this->mAtInfo.mpCollider = i_this->mCcSph.GetTgHitObj(); + cc_at_check(a_this, &i_this->mAtInfo); + if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { + i_this->mAction = e_nest_class::ACT_HOOK; + i_this->mMode = 0; + i_this->mKnockDown = 0; + i_this->mHitActorID = fopAcM_GetID(daPy_getPlayerActorClass()); + } else if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) || + i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { + i_this->mHitTimer = 10; + i_this->mAtInfo.mpCollider = i_this->mCcSph.GetTgHitObj(); + knock_down = true; + } else { + i_this->mHitTimer = 10; + i_this->mAtInfo.mpCollider = i_this->mCcSph.GetTgHitObj(); + } + } else if (i_this->mCcSph.ChkCoHit()) { + i_this->mHitTimer = 5; + i_this->mAtInfo.mpCollider = i_this->mCcSph.GetCoHitObj(); + } + + if (i_this->mHitTimer != 0) { + fopAc_ac_c* actor = at_power_check(&i_this->mAtInfo); + if (knock_down) { + i_this->mIframes = 10; + if (!dComIfGp_event_runCheck()) { + i_this->mHitTimer = 20; + i_this->mKnockDown = 1; + i_this->mHitActorID = fopAcM_GetID(daPy_getPlayerActorClass()); + if (!strcmp(dComIfGp_getStartStageName(), "F_SP103")) { + i_this->mDemoStage = 1; + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[183]); + } + } + } else if (i_this->mAtInfo.mHitType == HIT_TYPE_LINK_NORMAL_ATTACK + || i_this->mAtInfo.mHitType == HIT_TYPE_BOMB + || i_this->mAtInfo.mHitType == HIT_TYPE_ARROW + || i_this->mAtInfo.mHitType == HIT_TYPE_BOOMERANG + || i_this->mAtInfo.mHitType == HIT_TYPE_STUN) { + i_this->mHitActorID = fopAcM_GetID(daPy_getPlayerActorClass()); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[172]); + } else if (fopAcM_GetName(actor) == PROC_NPC_TK) { + daNPC_TK_c* hawk = static_cast(actor); + hawk->setBump(); + i_this->mHitActorID = fopAcM_GetID(hawk); + i_this->mKnockDown = 1; + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[171]); + i_this->mHitTimer = 20; + i_this->mHawkHit = true; + i_this->mSound.startSound(Z2SE_OBJ_HACHINOSU_HIT, 0, -1); + } else if (!strcmp(dComIfGp_getStartStageName(), "F_SP103")) { + i_this->mHitActorID = fopAcM_GetID(actor); + } else { + i_this->mHitTimer = 0; + } + } + } + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80504764-80504768 000088 0004+00 0/1 0/0 0/0 .rodata @4489 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4489 = -10.0f; -COMPILER_STRIP_GATE(0x80504764, &lit_4489); -#pragma pop - -/* 80504768-8050476C 00008C 0004+00 0/3 0/0 0/0 .rodata @4490 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4490 = 200.0f; -COMPILER_STRIP_GATE(0x80504768, &lit_4490); -#pragma pop /* 805020D0-80502280 001230 01B0+00 1/1 0/0 0/0 .text wall_angle_get__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void wall_angle_get(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/wall_angle_get__FP12e_nest_class.s" +static s16 wall_angle_get(e_nest_class* i_this) { + fopAc_ac_c* a_this = static_cast(i_this); + dBgS_LinChk lin_chk; + cXyz vec1, vec2, vec3[2]; + mDoMtx_YrotS(*calc_mtx, a_this->current.angle.y); + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = a_this->scale.x * -10.0f; + MtxPosition(&vec1, &vec2); + vec2 += a_this->current.pos; + vec1.x = 5.0f; + vec1.y = 0.0f; + vec1.z = a_this->scale.x * 200.0f; + for (int i = 0; i < 2; i++) { + MtxPosition(&vec1, &vec3[i]); + vec1.x *= -1.0f; + vec3[i] += vec2; + lin_chk.Set(&vec2, &vec3[i], a_this); + if (dComIfG_Bgsp().LineCross(&lin_chk)) { + vec3[i] = lin_chk.i_GetCross(); + } else { + return 0x23; + } + } + vec1 = vec3[1] - vec3[0]; + return cM_atan2s(vec1.x, vec1.z) + 0x4000; } -#pragma pop - -/* ############################################################################################## */ -/* 8050476C-80504770 000090 0004+00 0/2 0/0 0/0 .rodata @4547 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4547 = 20.0f; -COMPILER_STRIP_GATE(0x8050476C, &lit_4547); -#pragma pop - -/* 80504770-80504774 000094 0004+00 0/2 0/0 0/0 .rodata @4548 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4548 = 1000.0f; -COMPILER_STRIP_GATE(0x80504770, &lit_4548); -#pragma pop - -/* 80504774-80504778 000098 0004+00 0/1 0/0 0/0 .rodata @4549 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4549 = 1300.0f; -COMPILER_STRIP_GATE(0x80504774, &lit_4549); -#pragma pop - -/* 80504778-8050477C 00009C 0004+00 0/2 0/0 0/0 .rodata @4550 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4550 = -80.0f; -COMPILER_STRIP_GATE(0x80504778, &lit_4550); -#pragma pop - -/* 8050477C-80504780 0000A0 0004+00 0/1 0/0 0/0 .rodata @4551 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4551 = -3.0f / 10.0f; -COMPILER_STRIP_GATE(0x8050477C, &lit_4551); -#pragma pop - -/* 80504780-80504784 0000A4 0004+00 0/3 0/0 0/0 .rodata @4552 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4552 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80504780, &lit_4552); -#pragma pop /* 80502280-805025C4 0013E0 0344+00 1/1 0/0 0/0 .text e_nest_drop__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_nest_drop(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_drop__FP12e_nest_class.s" +static void e_nest_drop(e_nest_class* i_this) { + if (i_this->mAcch.ChkGroundHit()) { + if (i_this->mKnockDown != 0) { + i_this->field_0x567 = 1; + i_this->health = 2; + return; + } + if (i_this->mCcSph.ChkTgHit()) { + i_this->field_0x567 = 2; + } + if (i_this->mMode < 3) { + if (i_this->mMode == 0) { + i_this->health = 2; + i_this->mSound.startSound(Z2SE_OBJ_HACHINOSU_BOUND, 0, -1); + i_this->speed.y = 20.0f; + fopAcM_effSmokeSet1(&i_this->mSmokeKey1, &i_this->mSmokeKey2, + &i_this->current.pos, &i_this->shape_angle, + i_this->scale.x, &i_this->tevStr, 1); + i_this->mWobble = 1000.0f; + if (i_this->mSpin == 0) { + i_this->mSpin = cM_rndFX(1300.0f); + } + } else if (i_this->mMode == 1) { + i_this->speed.y = 5.0f; + } else if (i_this->mMode == 2) { + i_this->speed.y = 2.0f; + } + i_this->mMode++; + i_this->speedF *= 0.5f; + } else { + i_this->speedF = 0.0f; + } + } + + cXyz vec1, vec2; + mDoMtx_YrotS(*calc_mtx, i_this->current.angle.y); + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = i_this->speedF; + MtxPosition(&vec1, &vec2); + i_this->speed.x = vec2.x; + i_this->speed.z = vec2.z; + i_this->speed.y += -5.0f; + i_this->current.pos += i_this->speed; + if (i_this->speed.y < -80.0f) { + i_this->speed.y = -80.0f; + } + + if (i_this->mTimers[1] == 0 && i_this->mAcch.ChkWallHit()) { + s16 wall_angle = wall_angle_get(i_this); + if (wall_angle != 0x23) { + s16 angle_delta = i_this->current.angle.y - wall_angle; + i_this->mSpin = angle_delta * -0.3f; + i_this->current.angle.y += (s16)(0x8000 - (angle_delta << 1)); + i_this->speedF *= 0.5f; + i_this->mTimers[1] = 10; + i_this->mSound.startSound(Z2SE_OBJ_HACHINOSU_BOUND, 0, -1); + } + } + + i_this->mDropOffset = 135.0f; + i_this->mRotation.x = i_this->mWobble * cM_ssin(i_this->mFrame * 3000); + i_this->mRotation.z = i_this->mWobble * cM_ssin(i_this->mFrame * 4000); + cLib_addCalc0(&i_this->mWobble, 0.1f, 50.0f); + i_this->mRotation.y += i_this->mSpin; + cLib_addCalcAngleS2(&i_this->mSpin, 0, 1, 100); } -#pragma pop /* 805025C4-80502730 001724 016C+00 1/1 0/0 0/0 .text e_nest_carry__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_nest_carry(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_carry__FP12e_nest_class.s" -} -#pragma pop +static s8 e_nest_carry(e_nest_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + i_this->speed.y = 0.0f; + s8 ret = true; -/* ############################################################################################## */ -/* 80504784-80504788 0000A8 0004+00 0/1 0/0 0/0 .rodata @4611 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4611 = 3000.0f; -COMPILER_STRIP_GATE(0x80504784, &lit_4611); -#pragma pop + switch (i_this->mMode) { + case 0: + cLib_offBit(i_this->attention_info.flags, 0x10); + i_this->mMode = 1; + s16 angle_delta_y = i_this->mRotation.y - player->shape_angle.y; + if (angle_delta_y > 0x4000 || angle_delta_y < -0x4000) { + i_this->mCarryAngle = 0x8000; + } else { + i_this->mCarryAngle = 0; + } + i_this->mTimers[0] = 20; + break; + + case 1: + if (!fopAcM_checkCarryNow(i_this)) { + i_this->mTimers[0] = 0; + i_this->mCcSph.OnCoSetBit(); + i_this->mAction = e_nest_class::ACT_DROP; + if (i_this->speedF >= 1.0f) { + i_this->speedF = 30.0f; + i_this->speed.y = 30.0f; + i_this->current.angle.y = player->shape_angle.y; + i_this->mMode = 0; + } else { + i_this->speedF = 0.0f; + i_this->mMode = 3; + i_this->mWobble = 500.0f; + } + } else { + ret = false; + } + break; + } + + cLib_addCalcAngleS2(&i_this->mRotation.y, player->shape_angle.y + i_this->mCarryAngle, + 1, i_this->mCarryAngleSpeed); + cLib_addCalcAngleS2(&i_this->mCarryAngleSpeed, 0x2000, 1, 0x100); + return ret; +} /* 80502730-8050284C 001890 011C+00 1/1 0/0 0/0 .text water_check__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void water_check(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/water_check__FP12e_nest_class.s" +static int water_check(e_nest_class* i_this) { + dBgS_LinChk lin_chk; + cXyz vec; + vec.x = i_this->current.pos.x; + vec.y = i_this->current.pos.y + 3000.0f; + vec.z = i_this->current.pos.z; + lin_chk.Set(&i_this->current.pos, &vec, i_this); + if (dComIfG_Bgsp().LineCross(&lin_chk)) { + vec.y = lin_chk.i_GetCross().y - 10.0f; + } + dBgS_ObjGndChk_Spl gnd_chk; + gnd_chk.SetPos(&vec); + i_this->mWaterHeight = dComIfG_Bgsp().GroundCross(&gnd_chk); + if (i_this->mWaterHeight > i_this->current.pos.y + 50.0f) { + return true; + } else { + return false; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80504788-8050478C 0000AC 0004+00 0/2 0/0 0/0 .rodata @4683 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4683 = 3.0f; -COMPILER_STRIP_GATE(0x80504788, &lit_4683); -#pragma pop /* 8050284C-80502AD4 0019AC 0288+00 1/1 0/0 0/0 .text simple_bg_check__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void simple_bg_check(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/simple_bg_check__FP12e_nest_class.s" +static int simple_bg_check(e_nest_class* i_this) { + fopAc_ac_c* a_this = static_cast(i_this); + cXyz vec2, vec3, vec1; + vec1 = a_this->current.pos - a_this->old.pos; + vec1.y = 0.0f; + if (vec1.abs() > 0.0f) { + s16 angle_y = cM_atan2s(vec1.x, vec1.z); + vec2 = a_this->current.pos; + vec2.y = i_this->mWaterHeight + 3.0f; + vec1.y = 0.0f; + mDoMtx_YrotS(*calc_mtx, angle_y); + static f32 c_x[3] = {50.0f, -50.0f, 0.0f}; + static f32 c_z[3] = {0.0f, 0.0f, 50.0f}; + for (int i = 0; i < 3; i++) { + vec1.x = c_x[i] * l_HIO.mScale * a_this->scale.x; + vec1.z = c_z[i] * l_HIO.mScale * a_this->scale.x; + MtxPosition(&vec1, &vec3); + vec3 += vec2; + dBgS_LinChk lin_chk; + lin_chk.Set(&vec2, &vec3, a_this); + if (dComIfG_Bgsp().LineCross(&lin_chk)) { + return true; + } + } + } + return false; } -#pragma pop - -/* ############################################################################################## */ -/* 8050478C-80504790 0000B0 0004+00 0/1 0/0 0/0 .rodata @4717 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4717 = 0.25f; -COMPILER_STRIP_GATE(0x8050478C, &lit_4717); -#pragma pop - -/* 80504790-80504794 0000B4 0004+00 0/2 0/0 0/0 .rodata @4718 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4718 = 60.0f; -COMPILER_STRIP_GATE(0x80504790, &lit_4718); -#pragma pop - -/* 80504794-80504798 0000B8 0004+00 0/1 0/0 0/0 .rodata @4719 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4719 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80504794, &lit_4719); -#pragma pop - -/* 80504798-8050479C 0000BC 0004+00 0/1 0/0 0/0 .rodata @4720 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4720 = 0x3B83126F; -COMPILER_STRIP_GATE(0x80504798, &lit_4720); -#pragma pop /* 80502AD4-80502D30 001C34 025C+00 1/1 0/0 0/0 .text e_nest_float__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_nest_float(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_float__FP12e_nest_class.s" +static void e_nest_float(e_nest_class* i_this) { + cLib_addCalc0(&i_this->speed.y, 1.0f, 0.25f); + i_this->current.pos += i_this->speed; + i_this->speed.x *= 0.95f; + i_this->speed.z *= 0.95f; + + cXyz vec = i_this->current.pos; + vec.y = i_this->mWaterHeight; + if (i_this->current.pos.y + 60.0f > vec.y) { + fopAcM_effHamonSet(&i_this->mRippleKey, &vec, i_this->scale.x, 0.05f); + } + + cLib_addCalc2(&i_this->current.pos.y, i_this->mWaterHeight - 40.0f + + i_this->mBob * 0.004f * cM_ssin(i_this->mFrame * 900), 0.1f, 10.0f); + i_this->mRotation.x = i_this->mBob * cM_ssin(i_this->mFrame * 1000); + i_this->mRotation.z = i_this->mBob * cM_ssin(i_this->mFrame * 1100); + cLib_addCalc2(&i_this->mBob, 500.0f, 0.1f, 30.0f); + i_this->mRotation.y += i_this->mSpin; + + if (i_this->mCcSph.ChkCoHit()) { + cXyz* move_p = i_this->mCcStts.GetCCMoveP(); + if (move_p != NULL) { + cLib_addCalc2(&i_this->speed.x, move_p->x * 0.5f, 0.1f, 1.0f); + cLib_addCalc2(&i_this->speed.z, move_p->z * 0.5f, 0.1f, 1.0f); + cLib_addCalc2(&i_this->mBob, 1000.0f, 0.1f, 100.0f); + } + } + + cLib_addCalcAngleS2(&i_this->mSpin, 0, 1, 150); + + if (simple_bg_check(i_this)) { + i_this->current.pos = i_this->old.pos; + } + + if (i_this->mAcch.ChkGroundHit()) { + i_this->mAction = e_nest_class::ACT_DROP; + i_this->speedF = 0.0f; + i_this->mMode = 3; + } + + if (i_this->mCcSph.ChkTgHit()) { + i_this->field_0x567 = 2; + } } -#pragma pop - -/* ############################################################################################## */ -/* 8050479C-805047A0 0000C0 0004+00 0/1 0/0 0/0 .rodata @4844 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4844 = -150.0f; -COMPILER_STRIP_GATE(0x8050479C, &lit_4844); -#pragma pop - -/* 805047A0-805047A4 0000C4 0004+00 0/1 0/0 0/0 .rodata @4845 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4845 = 230.0f; -COMPILER_STRIP_GATE(0x805047A0, &lit_4845); -#pragma pop /* 80502D30-80503120 001E90 03F0+00 1/1 0/0 0/0 .text e_nest_hahen__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_nest_hahen(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hahen__FP12e_nest_class.s" +static void e_nest_hahen(e_nest_class* i_this) { + fopAc_ac_c* a_this = static_cast(i_this); + daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); + + switch (i_this->mMode) { + case 0: + i_this->mTimers[0] = 10; + i_this->mMode = 1; + // no break + + case 1: + if (i_this->mTimers[0] == 1 && i_this->mHawkHit) { + daNPC_TK_c* hawk = static_cast(fopAcM_SearchByID(i_this->mHitActorID)); + hawk->setHawkSideCamera(a_this->current.pos); + } + + for (int i = 0; i < 5; i++) { + if (i_this->mDebris[i].mActive + && i_this->mDebris[i].mPos.y > i_this->mWaterHeight - 10.0f) { + cXyz player_to_debris = i_this->mDebris[i].mPos - player->current.pos; + if (player_to_debris.abs() < 100.0f) { + a_this->current.pos = i_this->mDebris[i].mPos; + a_this->attention_info.position = a_this->current.pos; + a_this->eyePos = a_this->attention_info.position; + if (a_this->eventInfo.i_checkCommandCatch()) { + i_this->mMode = 2; + i_this->mTimers[0] = 60; + } else { + dComIfGp_att_CatchRequest(a_this, 0x76, 100.0f, 50.0f, -150.0f, 0x5000, 1); + a_this->eventInfo.i_onCondition(0x40); + } + break; + } + } + } + break; + + case 2: + if (i_this->mTimers[0] == 0) { + i_this->mMode = 1; + } + break; + } + + if (fopAcM_searchPlayerDistance(a_this) < 230.0f) { + player->setLookPos(&a_this->current.pos); + } + + if (!strcmp(dComIfGp_getStartStageName(), "F_SP103") && i_this->mTimers[2] == 70) { + mDoAud_seStart(Z2SE_READ_RIDDLE_B, 0, 0, 0); + } + + if (i_this->mTimers[2] == 1 && i_this->mHawkHit) { + daNPC_TK_c* hawk = static_cast(fopAcM_SearchByID(i_this->mHitActorID)); + if (hawk != NULL) { + hawk->endHawkCamera(); + } + } + + cXyz gnd_chk_pos = a_this->current.pos; + gnd_chk_pos.y += 200.0f; + if (fopAcM_gc_c::gndCheck(&gnd_chk_pos)) { + a_this->current.pos.y = fopAcM_gc_c::getGroundY(); + } } -#pragma pop /* 80503120-805031CC 002280 00AC+00 1/1 0/0 0/0 .text e_nest_hook__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_nest_hook(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/e_nest_hook__FP12e_nest_class.s" +static void e_nest_hook(e_nest_class* i_this) { + i_this->mIframes = 10; + + switch (i_this->mMode) { + case 0: + i_this->mMode = 1; + i_this->speedF = 0.0f; + i_this->mTimers[0] = 3; + // no break + + case 1: + default: + if (i_this->mTimers[0] == 0 && !fopAcM_checkHookCarryNow(i_this)) { + i_this->mAction = e_nest_class::ACT_DROP; + i_this->mMode = 0; + i_this->mDropOffset = 135.0f; + i_this->current.pos.y -= i_this->mDropOffset * l_HIO.mScale * i_this->scale.x; + fopAcM_OffStatus(i_this, 0x80000); + } + break; + } } -#pragma pop - -/* ############################################################################################## */ -/* 805047A4-805047A8 0000C8 0004+00 0/1 0/0 0/0 .rodata @5004 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5004 = -2.0f; -COMPILER_STRIP_GATE(0x805047A4, &lit_5004); -#pragma pop - -/* 805047A8-805047AC 0000CC 0004+00 0/1 0/0 0/0 .rodata @5005 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5005 = 2.5f; -COMPILER_STRIP_GATE(0x805047A8, &lit_5005); -#pragma pop - -/* 805047AC-805047B0 0000D0 0004+00 0/1 0/0 0/0 .rodata @5006 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5006 = -8.0f; -COMPILER_STRIP_GATE(0x805047AC, &lit_5006); -#pragma pop - -/* 805047B0-805047B4 0000D4 0004+00 0/1 0/0 0/0 .rodata @5007 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5007 = 2500.0f; -COMPILER_STRIP_GATE(0x805047B0, &lit_5007); -#pragma pop - -/* 805047B4-805047B8 0000D8 0004+00 0/2 0/0 0/0 .rodata @5008 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5008 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(0x805047B4, &lit_5008); -#pragma pop /* 805031CC-80503668 00232C 049C+00 1/1 0/0 0/0 .text bee_nest_action__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void bee_nest_action(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/bee_nest_action__FP12e_nest_class.s" +static void bee_nest_action(e_nest_class* i_this) { + i_this->attention_info.position = i_this->eyePos = i_this->current.pos; + i_this->eyePos.y += i_this->scale.x * -80.0f; + + s8 bvar7 = false; + s8 float_check = false; + f32 carry_offset = 0.0f; + s8 carry_check = false; + + if (i_this->mIframes != 0) { + i_this->mIframes--; + } + + i_this->mCcStts.Move(); + + switch (i_this->mAction) { + case e_nest_class::ACT_NORMAL: + e_nest_normal(i_this); + break; + case e_nest_class::ACT_DROP: + e_nest_drop(i_this); + carry_check = true; + if (i_this->mTimers[0] == 0) { + bvar7 = true; + } + float_check = true; + break; + case e_nest_class::ACT_HOOK: + e_nest_hook(i_this); + break; + case e_nest_class::ACT_CARRY: + bvar7 = e_nest_carry(i_this); + carry_offset = 15.0f; + break; + case e_nest_class::ACT_FLOAT: + e_nest_float(i_this); + bvar7 = true; + carry_check = true; + break; + case e_nest_class::ACT_DEBRIS: + e_nest_hahen(i_this); + cLib_offBit(i_this->attention_info.flags, 0x10); + return; + } + + cLib_addCalc2(&i_this->mCarryOffset, carry_offset, 1.0f, 5.0f); + + if (bvar7) { + i_this->mAcch.CrrPos(dComIfG_Bgsp()); + } + + if (carry_check) { + cLib_onBit(i_this->attention_info.flags, 0x10); + i_this->attention_info.field_0x0[4] = 0x2c; + if (fopAcM_checkCarryNow(i_this)) { + i_this->mAction = e_nest_class::ACT_CARRY; + i_this->mMode = 0; + i_this->mCcSph.OffCoSetBit(); + } + } else { + cLib_offBit(i_this->attention_info.flags, 0x10); + } + + if (float_check && water_check(i_this)) { + i_this->mAction = e_nest_class::ACT_FLOAT; + i_this->mMode = 0; + i_this->health = 2; + if (i_this->speedF < 5.0f) { + mDoMtx_YrotS(*calc_mtx, i_this->current.angle.y); + cXyz vec; + vec.x = 0.0f; + vec.y = -2.0f; + vec.z = 2.5f; + MtxPosition(&vec, &i_this->speed); + } else { + i_this->current.pos.y = i_this->mWaterHeight; + i_this->speed.y = -8.0f; + i_this->speed.x *= 0.5f; + i_this->speed.z *= 0.5f; + i_this->mBob = 2500.0f; + } + i_this->speedF = 0.0f; + cXyz vec1(i_this->scale.x, i_this->scale.x, i_this->scale.x); + cXyz vec2 = i_this->current.pos; + vec2.y = i_this->mWaterHeight; + static u16 w_eff_id[] = {0x01B8, 0x01B9, 0x01BA, 0x01BB}; + for (int i = 0; i < 4; i++) { + i_this->mParticleKey[i] = + dComIfGp_particle_set(i_this->mParticleKey[i], w_eff_id[i], &vec2, &i_this->tevStr, + NULL, &vec1, -1, NULL, -1, NULL, NULL, NULL); + } + i_this->mSound.startSound(Z2SE_AL_INTO_WATER, 0, -1); + } + + if (i_this->field_0x567 != 0) { + i_this->mSound.startSound(Z2SE_OBJ_HACHINOSU_BREAK, 0, -1); + cXyz vec1 = i_this->current.pos; + f32 scale = i_this->scale.x * 0.7f; + cXyz vec2(scale, scale, scale); + static u16 b_eff_id[] = {0x832C, 0x832D}; + for (int i = 0; i < 2; i++) { + dComIfGp_particle_set(b_eff_id[i], &vec1, &i_this->tevStr, &i_this->shape_angle, &vec2); + } + i_this->mBreakStage = 1; + if (i_this->field_0x567 == 1) { + dComIfGs_onSwitch(i_this->mBrokenSwitch, fopAcM_GetRoomNo(i_this)); + } + i_this->field_0x567 = 0; + } + + mtx_cc_set(i_this); } -#pragma pop /* 80503668-805036E0 0027C8 0078+00 1/1 0/0 0/0 .text shot_b_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void shot_b_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/shot_b_sub__FPvPv.s" +static void* shot_b_sub(void* i_actor, void* i_data) { + daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG + && !dComIfGp_checkPlayerStatus0(0, 0x80000) && player->checkBoomerangCharge() + && fopAcM_GetParam(i_actor) == 1) { + return i_actor; + } + return NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 805047B8-805047BC 0000DC 0004+00 0/1 0/0 0/0 .rodata @5110 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5110 = 55.0f; -COMPILER_STRIP_GATE(0x805047B8, &lit_5110); -#pragma pop - -/* 805047BC-805047C0 0000E0 0004+00 0/1 0/0 0/0 .rodata @5111 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5111 = -1290.0f; -COMPILER_STRIP_GATE(0x805047BC, &lit_5111); -#pragma pop - -/* 805047C0-805047C4 0000E4 0004+00 0/1 0/0 0/0 .rodata @5112 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5112 = 1342.0f; -COMPILER_STRIP_GATE(0x805047C0, &lit_5112); -#pragma pop - -/* 805047C4-805047C8 0000E8 0004+00 0/1 0/0 0/0 .rodata @5113 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5113 = 1077.0f; -COMPILER_STRIP_GATE(0x805047C4, &lit_5113); -#pragma pop - -/* 805047C8-805047CC 0000EC 0004+00 0/2 0/0 0/0 .rodata @5114 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5114 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x805047C8, &lit_5114); -#pragma pop - -/* 805047CC-805047D0 0000F0 0004+00 0/1 0/0 0/0 .rodata @5115 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5115 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(0x805047CC, &lit_5115); -#pragma pop /* 805036E0-80503984 002840 02A4+00 1/1 0/0 0/0 .text demo_camera__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void demo_camera(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/demo_camera__FP12e_nest_class.s" +static void demo_camera(e_nest_class* i_this) { + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + s8 end_demo = false; + + switch (i_this->mDemoStage) { + case 0: + break; + + case 1: + if (!i_this->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(i_this, 2, -1, 0); + i_this->eventInfo.i_onCondition(2); + return; + } + camera->mCamera.Stop(); + i_this->mDemoStage = 2; + i_this->mDemoTimer = 0; + i_this->mDemoCameraFovY = 55.0f; + camera->mCamera.SetTrimSize(3); + daPy_getPlayerActorClass()->changeOriginalDemo(); + daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); + i_this->mDemoCameraCenter.x = i_this->mCenterPos.x; + i_this->mDemoCameraCenter.z = i_this->mCenterPos.z; + i_this->mDemoCameraCenter.y = i_this->mCenterPos.y - 60.0f; + i_this->mDemoCameraEye.set(-1290.0f, 1342.0f, 1077.0f); + // no break + + case 2: + cLib_addCalc2(&i_this->mDemoCameraCenter.x, i_this->mCenterPos.x, 0.2f, 100.0f); + cLib_addCalc2(&i_this->mDemoCameraCenter.y, i_this->mCenterPos.y - 60.0f, 0.2f, 100.0f); + cLib_addCalc2(&i_this->mDemoCameraCenter.z, i_this->mCenterPos.z, 0.2f, 100.0f); + if (i_this->mDemoTimer > 60) { + cLib_addCalc2(&i_this->mDemoCameraFovY, 40.0f, 0.15f, 0.2f); + } + if (i_this->mDemoTimer == 120) { + end_demo = true; + } + break; + } + + if (end_demo) { + camera->mCamera.Reset(i_this->mDemoCameraCenter, i_this->mDemoCameraEye); + camera->mCamera.Start(); + camera->mCamera.SetTrimSize(0); + dComIfGp_event_reset(); + daPy_getPlayerActorClass()->cancelOriginalDemo(); + i_this->mDemoStage = 0; + } + + if (i_this->mDemoStage != 0) { + camera->mCamera.Set(i_this->mDemoCameraCenter, i_this->mDemoCameraEye, + i_this->mDemoCameraFovY, 0); + i_this->mDemoTimer++; + } } -#pragma pop - -/* ############################################################################################## */ -/* 805047D0-805047D4 0000F4 0004+00 0/1 0/0 0/0 .rodata @5202 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5202 = 10000.0f; -COMPILER_STRIP_GATE(0x805047D0, &lit_5202); -#pragma pop - -/* 805047D4-805047D8 0000F8 0004+00 0/1 0/0 0/0 .rodata @5203 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5203 = 25.0f; -COMPILER_STRIP_GATE(0x805047D4, &lit_5203); -#pragma pop - -/* 805047D8-805047DC 0000FC 0004+00 0/1 0/0 0/0 .rodata @5204 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5204 = 65536.0f; -COMPILER_STRIP_GATE(0x805047D8, &lit_5204); -#pragma pop /* 80503984-80503E24 002AE4 04A0+00 1/0 0/0 0/0 .text daE_Nest_Execute__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_Nest_Execute(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Execute__FP12e_nest_class.s" +static int daE_Nest_Execute(e_nest_class* i_this) { + cXyz vec1, vec2; + + i_this->mFrame++; + for (int i = 0; i < 3; i++) { + if (i_this->mTimers[i] != 0) { + i_this->mTimers[i]--; + } + } + + i_this->mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); + + if (i_this->mBreakStage == 3) { + fopAc_ac_c* boomerang = (fopAc_ac_c*)fpcM_Search(shot_b_sub, i_this); + if (boomerang != NULL) { + cXyz delta = boomerang->current.pos - i_this->current.pos; + if (delta.abs() < 200.0f) { + nest_hahen_s* debris = i_this->mDebris; + for (int i = 0; i < 5; i++, debris++) { + if (debris->mSpeed.y <= 0.0f) { + debris->mActive = true; + debris->mAngleZ = cM_rndFX(10000.0f); + mDoMtx_YrotS(*calc_mtx, debris->mAngleY); + vec1.x = 0.0f; + vec1.y = i_this->scale.x * 20.0f; + vec1.z = 0.0f; + MtxPosition(&vec1, &vec2); + debris->mPos += vec2; + vec1.x = 0.0f; + vec1.y = i_this->scale.x * (cM_rndF(5.0f) + 20.0f); + vec1.z = 0.0f; + MtxPosition(&vec1, &debris->mSpeed); + debris->mGroundHitStage = 0; + } + } + } + } + } + + if (i_this->mBreakStage == 1) { + i_this->mBreakStage = 2; + i_this->mAction = e_nest_class::ACT_DEBRIS; + i_this->mMode = 0; + fopAcM_OffStatus(i_this, fopAcStts_CULL_e); + nest_hahen_s* debris = i_this->mDebris; + for (int i = 0; i < 5; i++, debris++) { + debris->mActive = true; + float scale = i_this->scale.x * (cM_rndF(0.2f) + 0.7f); + debris->mScale.x = scale; + debris->mScale.z = scale; + debris->mScale.y = i_this->scale.x * 0.7f; + debris->mPos = i_this->current.pos; + debris->mAngleY = i * 0x3333; + debris->mAngleZ = -0x4000; + mDoMtx_YrotS(*calc_mtx, debris->mAngleY); + vec1.x = 0.0f; + vec1.y = i_this->scale.x * 20.0f; + vec1.z = i_this->scale.x * 25.0f; + MtxPosition(&vec1, &vec2); + debris->mPos += vec2; + vec1.x = 0.0f; + vec1.y = i_this->scale.x * (cM_rndF(3.0f) + 10.0f); + vec1.z = i_this->scale.x * (cM_rndF(1.0f) + 2.0f); + MtxPosition(&vec1, &debris->mSpeed); + debris->mGroundHitStage = 0; + debris->mCounter = cM_rndF(0x10000); + } + } + + hahen_move(i_this); + if (i_this->mParamType == e_nest_class::TYPE_BEE) { + bee_nest_action(i_this); + } + demo_camera(i_this); + return 1; } -#pragma pop /* 80503E24-80503E2C 002F84 0008+00 1/0 0/0 0/0 .text daE_Nest_IsDelete__FP12e_nest_class */ -static bool daE_Nest_IsDelete(e_nest_class* param_0) { - return true; +static int daE_Nest_IsDelete(e_nest_class* param_0) { + return 1; } -/* ############################################################################################## */ -/* 805047EC-805047EC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_805047F4 = "E_nest"; -#pragma pop - /* 80503E2C-80503EA0 002F8C 0074+00 1/0 0/0 0/0 .text daE_Nest_Delete__FP12e_nest_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_Nest_Delete(e_nest_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Delete__FP12e_nest_class.s" +static int daE_Nest_Delete(e_nest_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "E_nest"); + + if (i_this->mHIOInit) { + l_hioInit = false; + } + + if (i_this->heap != NULL) { + i_this->mSound.deleteObject(); + i_this->mBeeSound.deleteObject(); + } + + return 1; } -#pragma pop /* 80503EA0-80503FCC 003000 012C+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_nest/d_a_e_nest/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + e_nest_class* _this = static_cast(i_this); + + J3DModelData* model_data = static_cast(dComIfG_getObjectRes("E_nest", 3)); + _this->mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (_this->mpModel == NULL) { + return 0; + } + _this->model = _this->mpModel; + + J3DModelData* debris_model_data = static_cast(dComIfG_getObjectRes("E_nest", 4)); + for (int i = 0; i < 5; i++) { + _this->mDebris[i].mpModel = mDoExt_J3DModel__create(debris_model_data, 0x80000, 0x11000084); + if (_this->mDebris[i].mpModel == NULL) { + return 0; + } + } + + _this->mSound.init(&_this->current.pos, 1); + _this->mBeeSound.init(&_this->current.pos, 2); + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 805047DC-805047E0 000100 0004+00 0/1 0/0 0/0 .rodata @5399 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5399 = -300.0f; -COMPILER_STRIP_GATE(0x805047DC, &lit_5399); -#pragma pop - -/* 805047E0-805047E4 000104 0004+00 0/1 0/0 0/0 .rodata @5400 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5400 = 300.0f; -COMPILER_STRIP_GATE(0x805047E0, &lit_5400); -#pragma pop - -/* 805047E4-805047EC 000108 0008+00 0/1 0/0 0/0 .rodata @5402 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_5402[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x805047E4, &lit_5402); -#pragma pop /* 80503FCC-805044AC 00312C 04E0+00 1/0 0/0 0/0 .text daE_Nest_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_Nest_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/daE_Nest_Create__FP10fopAc_ac_c.s" -} -#pragma pop +static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) { + fopAcM_SetupActor(i_this, e_nest_class); + e_nest_class* _this = static_cast(i_this); -/* 805044AC-805044E8 00360C 003C+00 1/1 0/0 0/0 .text __dt__12nest_hahen_sFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm nest_hahen_s::~nest_hahen_s() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__12nest_hahen_sFv.s" -} -#pragma pop + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_nest"); + if (step == cPhs_COMPLEATE_e) { + _this->mBrokenSwitch = (u8)((u16)_this->current.angle.z >> 8); + _this->shape_angle.z = 0; + _this->current.angle.z = 0; + _this->mParamType = (u8)fopAcM_GetParam(_this); + _this->mParamType = e_nest_class::TYPE_BEE; + _this->mParam1 = (u8)(fopAcM_GetParam(_this) >> 8); + _this->mParamScale = (u8)(fopAcM_GetParam(_this) >> 16); + if (_this->mParamScale == 0xff) { + _this->mParamScale = 0; + } -/* 805044E8-805044EC 003648 0004+00 1/1 0/0 0/0 .text __ct__12nest_hahen_sFv */ -nest_hahen_s::nest_hahen_s() { - /* empty function */ + if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x3000)) { + return cPhs_ERROR_e; + } + + if (!l_hioInit) { + _this->mHIOInit = true; + l_hioInit = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); + fopAcM_SetMin(_this, -300.0f, -300.0f, -300.0f); + fopAcM_SetMax(_this, 300.0f, 300.0f, 300.0f); + + if (_this->mParamScale == 0xff || _this->mParamScale == 0) { + _this->mParamScale = 10; + } + _this->scale.x = _this->mParamScale * 0.1f; + + _this->mRotation.y = _this->current.angle.y; + + if (_this->mBrokenSwitch != 0xff + && dComIfGs_isSwitch(_this->mBrokenSwitch, fopAcM_GetRoomNo(_this))) + { + cXyz pos = _this->current.pos; + pos.y -= 100.0f; + if (fopAcM_gc_c::gndCheck(&pos)) { + pos.y = fopAcM_gc_c::mGroundY; + } + _this->mBreakStage = 1; + _this->current.pos = pos; + _this->mAction = e_nest_class::ACT_DEBRIS; + _this->mMode = 1; + fopAcM_SetMtx(_this, _this->mDebris[0].mpModel->getBaseTRMtx()); + return step; + } + + _this->mCcStts.Init(100, 0, _this); + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x1}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 30.0f} // mCcSph + } // mCcSphAttr + }; + _this->mCcSph.Set(cc_sph_src); + _this->mCcSph.SetStts(&_this->mCcStts); + static dCcD_SrcCyl cc_cyl_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x2020, 0x3}, 0x79}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 5.0f, // mRadius + 10.0f // mHeight + } // mCcCyl + }; + _this->mCcCyl.Set(cc_cyl_src); + _this->mCcCyl.SetStts(&_this->mCcStts); + + if (_this->mParamType == e_nest_class::TYPE_BEE) { + fopAcM_createChild(PROC_E_BEE, fopAcM_GetID(_this), + _this->mParamScale << 16 | 0x100 | _this->mParam1, + &_this->current.pos, fopAcM_GetRoomNo(_this), + NULL, NULL, -1, NULL); + _this->mAcch.Set(&_this->current.pos, &_this->old.pos, _this, 1, + &_this->mAcchCir, &_this->speed, NULL, NULL); + _this->mAcchCir.SetWall(_this->scale.x * 50.0f, _this->scale.x * 50.0f); + } else if (_this->mParamType == e_nest_class::TYPE_BUG) { + fopAcM_createChild(PROC_E_BUG, fopAcM_GetID(_this), + _this->mParam1 | 0xff000000, &_this->current.pos, + fopAcM_GetRoomNo(_this), NULL, NULL, -1, NULL); + } + + mtx_cc_set(_this); + _this->mHitActorID = -1; + } + return step; } -/* 805044EC-80504534 00364C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGCylFv.s" -} -#pragma pop +/* 805048A4-805048C4 -00001 0020+00 1/0 0/0 0/0 .data l_daE_Nest_Method */ +static actor_method_class l_daE_Nest_Method = { + (process_method_func)daE_Nest_Create, + (process_method_func)daE_Nest_Delete, + (process_method_func)daE_Nest_Execute, + (process_method_func)daE_Nest_IsDelete, + (process_method_func)daE_Nest_Draw, +}; -/* 80504534-8050457C 003694 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGSph::~cM3dGSph() { -extern "C" asm void __dt__8cM3dGSphFv() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 8050457C-805045C4 0036DC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 805045C4-80504634 003724 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_nest/d_a_e_nest/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80504634-8050467C 003794 0048+00 2/1 0/0 0/0 .text __dt__14daE_Nest_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daE_Nest_HIO_c::~daE_Nest_HIO_c() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__dt__14daE_Nest_HIO_cFv.s" -} -#pragma pop - -/* 8050467C-805046B8 0037DC 003C+00 0/0 1/0 0/0 .text __sinit_d_a_e_nest_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_e_nest_cpp() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/__sinit_d_a_e_nest_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8050467C, __sinit_d_a_e_nest_cpp); -#pragma pop - -/* 805046B8-805046C0 003818 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_805046B8() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046B8.s" -} -#pragma pop - -/* 805046C0-805046C8 003820 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_805046C0() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_nest/d_a_e_nest/func_805046C0.s" -} -#pragma pop - -/* 805047EC-805047EC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 805048C4-805048F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_NEST */ +extern actor_process_profile_definition g_profile_E_NEST = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_E_NEST, + &g_fpcLf_Method.mBase, + sizeof(e_nest_class), + 0, + 0, + &g_fopAc_Method.base, + 0xB2, + &l_daE_Nest_Method, + 0xD4100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +};