diff --git a/Progress.md b/Progress.md index 8ba2bd3df24..23b7a59e5a5 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 54.398767% | 2187196 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 54.398767% | 2187196 | 4020672 -RELs | 37.972321% | 4366940 | 11500324 -Total | 42.227548% | 6554136 | 15520996 +RELs | 38.064667% | 4377560 | 11500324 +Total | 42.295971% | 6564756 | 15520996 ## RELs @@ -167,7 +167,7 @@ d_a_e_warpappear | 28.864569% | 4220 | 14620 d_a_e_wb | 23.058129% | 20008 | 86772 d_a_e_ws | 29.700483% | 6148 | 20700 d_a_e_ww | 23.418134% | 10052 | 42924 -d_a_e_yc | 30.733107% | 4712 | 15332 +d_a_e_yc | 100.000000% | 15332 | 15332 d_a_e_yd | 27.879315% | 7688 | 27576 d_a_e_yd_leaf | 100.000000% | 2088 | 2088 d_a_e_yg | 28.386013% | 7436 | 26196 @@ -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 | 37.972321% | 4366940 | 11500324 +Total | 38.064667% | 4377560 | 11500324 diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__ct__12daE_YC_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__ct__12daE_YC_HIO_cFv.s deleted file mode 100644 index 6e0ca845c15..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__ct__12daE_YC_HIO_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_807EFECC: -/* 807EFECC 3C 80 80 7F */ lis r4, __vt__12daE_YC_HIO_c@ha /* 0x807F2AF4@ha */ -/* 807EFED0 38 04 2A F4 */ addi r0, r4, __vt__12daE_YC_HIO_c@l /* 0x807F2AF4@l */ -/* 807EFED4 90 03 00 00 */ stw r0, 0(r3) -/* 807EFED8 38 00 FF FF */ li r0, -1 -/* 807EFEDC 98 03 00 04 */ stb r0, 4(r3) -/* 807EFEE0 3C 80 80 7F */ lis r4, lit_3715@ha /* 0x807F2864@ha */ -/* 807EFEE4 C0 04 28 64 */ lfs f0, lit_3715@l(r4) /* 0x807F2864@l */ -/* 807EFEE8 D0 03 00 08 */ stfs f0, 8(r3) -/* 807EFEEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 12a76303c7f..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_807F274C: -/* 807F274C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F2750 7C 08 02 A6 */ mflr r0 -/* 807F2754 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F2758 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F275C 93 C1 00 08 */ stw r30, 8(r1) -/* 807F2760 7C 7E 1B 79 */ or. r30, r3, r3 -/* 807F2764 7C 9F 23 78 */ mr r31, r4 -/* 807F2768 41 82 00 38 */ beq lbl_807F27A0 -/* 807F276C 3C 80 80 7F */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x807F2AD0@ha */ -/* 807F2770 38 84 2A D0 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x807F2AD0@l */ -/* 807F2774 90 9E 00 10 */ stw r4, 0x10(r30) -/* 807F2778 38 04 00 0C */ addi r0, r4, 0xc -/* 807F277C 90 1E 00 14 */ stw r0, 0x14(r30) -/* 807F2780 38 04 00 18 */ addi r0, r4, 0x18 -/* 807F2784 90 1E 00 24 */ stw r0, 0x24(r30) -/* 807F2788 38 80 00 00 */ li r4, 0 -/* 807F278C 4B 88 38 09 */ bl __dt__9dBgS_AcchFv -/* 807F2790 7F E0 07 35 */ extsh. r0, r31 -/* 807F2794 40 81 00 0C */ ble lbl_807F27A0 -/* 807F2798 7F C3 F3 78 */ mr r3, r30 -/* 807F279C 4B AD C5 A1 */ bl __dl__FPv -lbl_807F27A0: -/* 807F27A0 7F C3 F3 78 */ mr r3, r30 -/* 807F27A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F27A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 807F27AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F27B0 7C 08 03 A6 */ mtlr r0 -/* 807F27B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F27B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__12daE_YC_HIO_cFv.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__12daE_YC_HIO_cFv.s deleted file mode 100644 index 0a388315a95..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__12daE_YC_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_807F27BC: -/* 807F27BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F27C0 7C 08 02 A6 */ mflr r0 -/* 807F27C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F27C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F27CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 807F27D0 41 82 00 1C */ beq lbl_807F27EC -/* 807F27D4 3C A0 80 7F */ lis r5, __vt__12daE_YC_HIO_c@ha /* 0x807F2AF4@ha */ -/* 807F27D8 38 05 2A F4 */ addi r0, r5, __vt__12daE_YC_HIO_c@l /* 0x807F2AF4@l */ -/* 807F27DC 90 1F 00 00 */ stw r0, 0(r31) -/* 807F27E0 7C 80 07 35 */ extsh. r0, r4 -/* 807F27E4 40 81 00 08 */ ble lbl_807F27EC -/* 807F27E8 4B AD C5 55 */ bl __dl__FPv -lbl_807F27EC: -/* 807F27EC 7F E3 FB 78 */ mr r3, r31 -/* 807F27F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F27F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F27F8 7C 08 03 A6 */ mtlr r0 -/* 807F27FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F2800 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__8cM3dGAabFv.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__8cM3dGAabFv.s deleted file mode 100644 index 799eb9f4dae..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_807F2704: -/* 807F2704 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F2708 7C 08 02 A6 */ mflr r0 -/* 807F270C 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F2710 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F2714 7C 7F 1B 79 */ or. r31, r3, r3 -/* 807F2718 41 82 00 1C */ beq lbl_807F2734 -/* 807F271C 3C A0 80 7F */ lis r5, __vt__8cM3dGAab@ha /* 0x807F2AC4@ha */ -/* 807F2720 38 05 2A C4 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x807F2AC4@l */ -/* 807F2724 90 1F 00 18 */ stw r0, 0x18(r31) -/* 807F2728 7C 80 07 35 */ extsh. r0, r4 -/* 807F272C 40 81 00 08 */ ble lbl_807F2734 -/* 807F2730 4B AD C6 0D */ bl __dl__FPv -lbl_807F2734: -/* 807F2734 7F E3 FB 78 */ mr r3, r31 -/* 807F2738 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F273C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F2740 7C 08 03 A6 */ mtlr r0 -/* 807F2744 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F2748 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__8cM3dGSphFv.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__8cM3dGSphFv.s deleted file mode 100644 index dc73cbb2842..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_807F26BC: -/* 807F26BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F26C0 7C 08 02 A6 */ mflr r0 -/* 807F26C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F26C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F26CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 807F26D0 41 82 00 1C */ beq lbl_807F26EC -/* 807F26D4 3C A0 80 7F */ lis r5, __vt__8cM3dGSph@ha /* 0x807F2AB8@ha */ -/* 807F26D8 38 05 2A B8 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x807F2AB8@l */ -/* 807F26DC 90 1F 00 10 */ stw r0, 0x10(r31) -/* 807F26E0 7C 80 07 35 */ extsh. r0, r4 -/* 807F26E4 40 81 00 08 */ ble lbl_807F26EC -/* 807F26E8 4B AD C6 55 */ bl __dl__FPv -lbl_807F26EC: -/* 807F26EC 7F E3 FB 78 */ mr r3, r31 -/* 807F26F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F26F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F26F8 7C 08 03 A6 */ mtlr r0 -/* 807F26FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F2700 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__sinit_d_a_e_yc_cpp.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__sinit_d_a_e_yc_cpp.s deleted file mode 100644 index 857d38a330b..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__sinit_d_a_e_yc_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_807F2804: -/* 807F2804 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F2808 7C 08 02 A6 */ mflr r0 -/* 807F280C 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F2810 3C 60 80 7F */ lis r3, l_HIO@ha /* 0x807F2B1C@ha */ -/* 807F2814 38 63 2B 1C */ addi r3, r3, l_HIO@l /* 0x807F2B1C@l */ -/* 807F2818 4B FF D6 B5 */ bl __ct__12daE_YC_HIO_cFv -/* 807F281C 3C 80 80 7F */ lis r4, __dt__12daE_YC_HIO_cFv@ha /* 0x807F27BC@ha */ -/* 807F2820 38 84 27 BC */ addi r4, r4, __dt__12daE_YC_HIO_cFv@l /* 0x807F27BC@l */ -/* 807F2824 3C A0 80 7F */ lis r5, lit_3710@ha /* 0x807F2B10@ha */ -/* 807F2828 38 A5 2B 10 */ addi r5, r5, lit_3710@l /* 0x807F2B10@l */ -/* 807F282C 4B FF D6 2D */ bl __register_global_object -/* 807F2830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F2834 7C 08 03 A6 */ mtlr r0 -/* 807F2838 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F283C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/action__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/action__FP10e_yc_class.s deleted file mode 100644 index 4a11f8dced3..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/action__FP10e_yc_class.s +++ /dev/null @@ -1,140 +0,0 @@ -lbl_807F1AD4: -/* 807F1AD4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 807F1AD8 7C 08 02 A6 */ mflr r0 -/* 807F1ADC 90 01 00 34 */ stw r0, 0x34(r1) -/* 807F1AE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F1AE4 4B B7 06 F9 */ bl _savegpr_29 -/* 807F1AE8 7C 7D 1B 78 */ mr r29, r3 -/* 807F1AEC 3C 80 80 7F */ lis r4, lit_3715@ha /* 0x807F2864@ha */ -/* 807F1AF0 3B C4 28 64 */ addi r30, r4, lit_3715@l /* 0x807F2864@l */ -/* 807F1AF4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F1AF8 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F1AFC 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 807F1B00 4B 82 8C 11 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 807F1B04 B0 7D 06 80 */ sth r3, 0x680(r29) -/* 807F1B08 7F A3 EB 78 */ mr r3, r29 -/* 807F1B0C 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 807F1B10 4B 82 8E 55 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 807F1B14 D0 3D 06 84 */ stfs f1, 0x684(r29) -/* 807F1B18 7F A3 EB 78 */ mr r3, r29 -/* 807F1B1C 4B FF E5 A1 */ bl damage_check__FP10e_yc_class -/* 807F1B20 A8 1D 06 6E */ lha r0, 0x66e(r29) -/* 807F1B24 28 00 00 14 */ cmplwi r0, 0x14 -/* 807F1B28 41 81 00 54 */ bgt lbl_807F1B7C -/* 807F1B2C 3C 60 80 7F */ lis r3, lit_4315@ha /* 0x807F298C@ha */ -/* 807F1B30 38 63 29 8C */ addi r3, r3, lit_4315@l /* 0x807F298C@l */ -/* 807F1B34 54 00 10 3A */ slwi r0, r0, 2 -/* 807F1B38 7C 03 00 2E */ lwzx r0, r3, r0 -/* 807F1B3C 7C 09 03 A6 */ mtctr r0 -/* 807F1B40 4E 80 04 20 */ bctr -lbl_807F1B44: -/* 807F1B44 7F A3 EB 78 */ mr r3, r29 -/* 807F1B48 4B FF E6 65 */ bl e_yc_fly__FP10e_yc_class -/* 807F1B4C 48 00 00 30 */ b lbl_807F1B7C -lbl_807F1B50: -/* 807F1B50 7F A3 EB 78 */ mr r3, r29 -/* 807F1B54 4B FF EB 59 */ bl e_yc_f_fly__FP10e_yc_class -/* 807F1B58 48 00 00 24 */ b lbl_807F1B7C -lbl_807F1B5C: -/* 807F1B5C 7F A3 EB 78 */ mr r3, r29 -/* 807F1B60 4B FF EF 41 */ bl e_yc_hovering__FP10e_yc_class -/* 807F1B64 48 00 00 18 */ b lbl_807F1B7C -lbl_807F1B68: -/* 807F1B68 7F A3 EB 78 */ mr r3, r29 -/* 807F1B6C 4B FF F0 D5 */ bl e_yc_attack__FP10e_yc_class -/* 807F1B70 48 00 00 0C */ b lbl_807F1B7C -lbl_807F1B74: -/* 807F1B74 7F A3 EB 78 */ mr r3, r29 -/* 807F1B78 4B FF F6 A1 */ bl e_yc_wolfbite__FP10e_yc_class -lbl_807F1B7C: -/* 807F1B7C 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 807F1B80 38 80 00 00 */ li r4, 0 -/* 807F1B84 4B AC FF F9 */ bl setLinkSearch__15Z2CreatureEnemyFb -/* 807F1B88 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F1B8C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 807F1B90 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 807F1B94 C0 1D 05 2C */ lfs f0, 0x52c(r29) -/* 807F1B98 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 807F1B9C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 807F1BA0 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 807F1BA4 80 63 00 00 */ lwz r3, 0(r3) -/* 807F1BA8 A8 9D 04 DE */ lha r4, 0x4de(r29) -/* 807F1BAC 4B 81 A8 31 */ bl mDoMtx_YrotS__FPA4_fs -/* 807F1BB0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 807F1BB4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 807F1BB8 80 63 00 00 */ lwz r3, 0(r3) -/* 807F1BBC A8 9D 04 DC */ lha r4, 0x4dc(r29) -/* 807F1BC0 4B 81 A7 DD */ bl mDoMtx_XrotM__FPA4_fs -/* 807F1BC4 38 61 00 14 */ addi r3, r1, 0x14 -/* 807F1BC8 38 9D 04 F8 */ addi r4, r29, 0x4f8 -/* 807F1BCC 4B A7 F3 21 */ bl MtxPosition__FP4cXyzP4cXyz -/* 807F1BD0 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 807F1BD4 38 9D 04 F8 */ addi r4, r29, 0x4f8 -/* 807F1BD8 7C 65 1B 78 */ mr r5, r3 -/* 807F1BDC 4B B5 54 B5 */ bl PSVECAdd -/* 807F1BE0 C0 3D 06 9C */ lfs f1, 0x69c(r29) -/* 807F1BE4 C0 1E 00 C4 */ lfs f0, 0xc4(r30) -/* 807F1BE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F1BEC 40 81 00 58 */ ble lbl_807F1C44 -/* 807F1BF0 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F1BF4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 807F1BF8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 807F1BFC FC 00 08 50 */ fneg f0, f1 -/* 807F1C00 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 807F1C04 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 807F1C08 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 807F1C0C 80 63 00 00 */ lwz r3, 0(r3) -/* 807F1C10 A8 9D 06 A0 */ lha r4, 0x6a0(r29) -/* 807F1C14 4B 81 A7 C9 */ bl mDoMtx_YrotS__FPA4_fs -/* 807F1C18 38 61 00 14 */ addi r3, r1, 0x14 -/* 807F1C1C 38 81 00 08 */ addi r4, r1, 8 -/* 807F1C20 4B A7 F2 CD */ bl MtxPosition__FP4cXyzP4cXyz -/* 807F1C24 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 807F1C28 38 81 00 08 */ addi r4, r1, 8 -/* 807F1C2C 7C 65 1B 78 */ mr r5, r3 -/* 807F1C30 4B B5 54 61 */ bl PSVECAdd -/* 807F1C34 38 7D 06 9C */ addi r3, r29, 0x69c -/* 807F1C38 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F1C3C C0 5E 00 64 */ lfs f2, 0x64(r30) -/* 807F1C40 4B A7 DE 41 */ bl cLib_addCalc0__FPfff -lbl_807F1C44: -/* 807F1C44 38 7D 04 E6 */ addi r3, r29, 0x4e6 -/* 807F1C48 A8 9D 04 DE */ lha r4, 0x4de(r29) -/* 807F1C4C 38 A0 00 04 */ li r5, 4 -/* 807F1C50 38 C0 20 00 */ li r6, 0x2000 -/* 807F1C54 4B A7 E9 B5 */ bl cLib_addCalcAngleS2__FPssss -/* 807F1C58 38 7D 04 E4 */ addi r3, r29, 0x4e4 -/* 807F1C5C 38 80 00 00 */ li r4, 0 -/* 807F1C60 38 A0 00 04 */ li r5, 4 -/* 807F1C64 38 C0 20 00 */ li r6, 0x2000 -/* 807F1C68 4B A7 E9 A1 */ bl cLib_addCalcAngleS2__FPssss -/* 807F1C6C 38 7D 04 E8 */ addi r3, r29, 0x4e8 -/* 807F1C70 A8 9D 04 E0 */ lha r4, 0x4e0(r29) -/* 807F1C74 38 A0 00 04 */ li r5, 4 -/* 807F1C78 38 C0 20 00 */ li r6, 0x2000 -/* 807F1C7C 4B A7 E9 8D */ bl cLib_addCalcAngleS2__FPssss -/* 807F1C80 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 807F1C84 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 807F1C88 EC 00 08 28 */ fsubs f0, f0, f1 -/* 807F1C8C D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 807F1C90 C0 1D 04 C0 */ lfs f0, 0x4c0(r29) -/* 807F1C94 EC 00 08 28 */ fsubs f0, f0, f1 -/* 807F1C98 D0 1D 04 C0 */ stfs f0, 0x4c0(r29) -/* 807F1C9C 38 7D 06 F4 */ addi r3, r29, 0x6f4 -/* 807F1CA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F1CA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F1CA8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 807F1CAC 4B 88 4E 01 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 807F1CB0 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 807F1CB4 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 807F1CB8 EC 00 08 2A */ fadds f0, f0, f1 -/* 807F1CBC D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 807F1CC0 C0 1D 04 C0 */ lfs f0, 0x4c0(r29) -/* 807F1CC4 EC 00 08 2A */ fadds f0, f0, f1 -/* 807F1CC8 D0 1D 04 C0 */ stfs f0, 0x4c0(r29) -/* 807F1CCC 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F1CD0 4B B7 05 59 */ bl _restgpr_29 -/* 807F1CD4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 807F1CD8 7C 08 03 A6 */ mtlr r0 -/* 807F1CDC 38 21 00 30 */ addi r1, r1, 0x30 -/* 807F1CE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_init__FP10e_yc_classifUcf.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_init__FP10e_yc_classifUcf.s deleted file mode 100644 index 56e88e259bc..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_init__FP10e_yc_classifUcf.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_807EFEF0: -/* 807EFEF0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 807EFEF4 7C 08 02 A6 */ mflr r0 -/* 807EFEF8 90 01 00 44 */ stw r0, 0x44(r1) -/* 807EFEFC DB E1 00 30 */ stfd f31, 0x30(r1) -/* 807EFF00 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 807EFF04 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 807EFF08 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 807EFF0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 807EFF10 4B B7 22 CD */ bl _savegpr_29 -/* 807EFF14 7C 7D 1B 78 */ mr r29, r3 -/* 807EFF18 7C 9E 23 78 */ mr r30, r4 -/* 807EFF1C FF C0 08 90 */ fmr f30, f1 -/* 807EFF20 7C BF 2B 78 */ mr r31, r5 -/* 807EFF24 FF E0 10 90 */ fmr f31, f2 -/* 807EFF28 3C 60 80 7F */ lis r3, d_a_e_yc__stringBase0@ha /* 0x807F294C@ha */ -/* 807EFF2C 38 63 29 4C */ addi r3, r3, d_a_e_yc__stringBase0@l /* 0x807F294C@l */ -/* 807EFF30 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807EFF34 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807EFF38 3C A5 00 02 */ addis r5, r5, 2 -/* 807EFF3C 38 C0 00 80 */ li r6, 0x80 -/* 807EFF40 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 807EFF44 4B 84 C3 A9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 807EFF48 7C 64 1B 78 */ mr r4, r3 -/* 807EFF4C 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807EFF50 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 807EFF54 FC 20 F0 90 */ fmr f1, f30 -/* 807EFF58 FC 40 F8 90 */ fmr f2, f31 -/* 807EFF5C 3C C0 80 7F */ lis r6, lit_3729@ha /* 0x807F2868@ha */ -/* 807EFF60 C0 66 28 68 */ lfs f3, lit_3729@l(r6) /* 0x807F2868@l */ -/* 807EFF64 3C C0 80 7F */ lis r6, lit_3730@ha /* 0x807F286C@ha */ -/* 807EFF68 C0 86 28 6C */ lfs f4, lit_3730@l(r6) /* 0x807F286C@l */ -/* 807EFF6C 4B 82 0F 05 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 807EFF70 93 DD 06 60 */ stw r30, 0x660(r29) -/* 807EFF74 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 807EFF78 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 807EFF7C E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 807EFF80 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 807EFF84 39 61 00 20 */ addi r11, r1, 0x20 -/* 807EFF88 4B B7 22 A1 */ bl _restgpr_29 -/* 807EFF8C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 807EFF90 7C 08 03 A6 */ mtlr r0 -/* 807EFF94 38 21 00 40 */ addi r1, r1, 0x40 -/* 807EFF98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_se_set__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_se_set__FP10e_yc_class.s deleted file mode 100644 index 35a136b0d2b..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_se_set__FP10e_yc_class.s +++ /dev/null @@ -1,303 +0,0 @@ -lbl_807F165C: -/* 807F165C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 807F1660 7C 08 02 A6 */ mflr r0 -/* 807F1664 90 01 00 44 */ stw r0, 0x44(r1) -/* 807F1668 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 807F166C 93 C1 00 38 */ stw r30, 0x38(r1) -/* 807F1670 7C 7E 1B 78 */ mr r30, r3 -/* 807F1674 3C 60 80 7F */ lis r3, lit_3715@ha /* 0x807F2864@ha */ -/* 807F1678 3B E3 28 64 */ addi r31, r3, lit_3715@l /* 0x807F2864@l */ -/* 807F167C 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F1680 2C 00 00 09 */ cmpwi r0, 9 -/* 807F1684 40 82 00 1C */ bne lbl_807F16A0 -/* 807F1688 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F168C 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1690 C0 3F 00 A4 */ lfs f1, 0xa4(r31) -/* 807F1694 4B B3 6D 99 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1698 2C 03 00 00 */ cmpwi r3, 0 -/* 807F169C 40 82 00 88 */ bne lbl_807F1724 -lbl_807F16A0: -/* 807F16A0 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F16A4 2C 00 00 06 */ cmpwi r0, 6 -/* 807F16A8 40 82 00 1C */ bne lbl_807F16C4 -/* 807F16AC 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F16B0 38 63 00 0C */ addi r3, r3, 0xc -/* 807F16B4 C0 3F 00 A8 */ lfs f1, 0xa8(r31) -/* 807F16B8 4B B3 6D 75 */ bl checkPass__12J3DFrameCtrlFf -/* 807F16BC 2C 03 00 00 */ cmpwi r3, 0 -/* 807F16C0 40 82 00 64 */ bne lbl_807F1724 -lbl_807F16C4: -/* 807F16C4 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F16C8 2C 00 00 05 */ cmpwi r0, 5 -/* 807F16CC 40 82 00 1C */ bne lbl_807F16E8 -/* 807F16D0 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F16D4 38 63 00 0C */ addi r3, r3, 0xc -/* 807F16D8 C0 3F 00 AC */ lfs f1, 0xac(r31) -/* 807F16DC 4B B3 6D 51 */ bl checkPass__12J3DFrameCtrlFf -/* 807F16E0 2C 03 00 00 */ cmpwi r3, 0 -/* 807F16E4 40 82 00 40 */ bne lbl_807F1724 -lbl_807F16E8: -/* 807F16E8 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F16EC 2C 00 00 04 */ cmpwi r0, 4 -/* 807F16F0 40 82 00 64 */ bne lbl_807F1754 -/* 807F16F4 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F16F8 38 63 00 0C */ addi r3, r3, 0xc -/* 807F16FC C0 3F 00 AC */ lfs f1, 0xac(r31) -/* 807F1700 4B B3 6D 2D */ bl checkPass__12J3DFrameCtrlFf -/* 807F1704 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1708 40 82 00 1C */ bne lbl_807F1724 -/* 807F170C 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F1710 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1714 C0 3F 00 B0 */ lfs f1, 0xb0(r31) -/* 807F1718 4B B3 6D 15 */ bl checkPass__12J3DFrameCtrlFf -/* 807F171C 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1720 41 82 00 34 */ beq lbl_807F1754 -lbl_807F1724: -/* 807F1724 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070234@ha */ -/* 807F1728 38 03 02 34 */ addi r0, r3, 0x0234 /* 0x00070234@l */ -/* 807F172C 90 01 00 34 */ stw r0, 0x34(r1) -/* 807F1730 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1734 38 81 00 34 */ addi r4, r1, 0x34 -/* 807F1738 38 A0 00 00 */ li r5, 0 -/* 807F173C 38 C0 FF FF */ li r6, -1 -/* 807F1740 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F1744 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807F1748 7D 89 03 A6 */ mtctr r12 -/* 807F174C 4E 80 04 21 */ bctrl -/* 807F1750 48 00 03 6C */ b lbl_807F1ABC -lbl_807F1754: -/* 807F1754 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F1758 2C 00 00 0C */ cmpwi r0, 0xc -/* 807F175C 40 82 00 34 */ bne lbl_807F1790 -/* 807F1760 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070235@ha */ -/* 807F1764 38 03 02 35 */ addi r0, r3, 0x0235 /* 0x00070235@l */ -/* 807F1768 90 01 00 30 */ stw r0, 0x30(r1) -/* 807F176C 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1770 38 81 00 30 */ addi r4, r1, 0x30 -/* 807F1774 38 A0 00 00 */ li r5, 0 -/* 807F1778 38 C0 FF FF */ li r6, -1 -/* 807F177C 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F1780 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 807F1784 7D 89 03 A6 */ mtctr r12 -/* 807F1788 4E 80 04 21 */ bctrl -/* 807F178C 48 00 03 30 */ b lbl_807F1ABC -lbl_807F1790: -/* 807F1790 2C 00 00 11 */ cmpwi r0, 0x11 -/* 807F1794 40 82 00 48 */ bne lbl_807F17DC -/* 807F1798 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F179C 38 63 00 0C */ addi r3, r3, 0xc -/* 807F17A0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 807F17A4 4B B3 6C 89 */ bl checkPass__12J3DFrameCtrlFf -/* 807F17A8 2C 03 00 00 */ cmpwi r3, 0 -/* 807F17AC 41 82 00 30 */ beq lbl_807F17DC -/* 807F17B0 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070490@ha */ -/* 807F17B4 38 03 04 90 */ addi r0, r3, 0x0490 /* 0x00070490@l */ -/* 807F17B8 90 01 00 2C */ stw r0, 0x2c(r1) -/* 807F17BC 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F17C0 38 81 00 2C */ addi r4, r1, 0x2c -/* 807F17C4 38 A0 FF FF */ li r5, -1 -/* 807F17C8 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F17CC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 807F17D0 7D 89 03 A6 */ mtctr r12 -/* 807F17D4 4E 80 04 21 */ bctrl -/* 807F17D8 48 00 02 E4 */ b lbl_807F1ABC -lbl_807F17DC: -/* 807F17DC 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F17E0 2C 00 00 12 */ cmpwi r0, 0x12 -/* 807F17E4 40 82 00 48 */ bne lbl_807F182C -/* 807F17E8 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F17EC 38 63 00 0C */ addi r3, r3, 0xc -/* 807F17F0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 807F17F4 4B B3 6C 39 */ bl checkPass__12J3DFrameCtrlFf -/* 807F17F8 2C 03 00 00 */ cmpwi r3, 0 -/* 807F17FC 41 82 00 30 */ beq lbl_807F182C -/* 807F1800 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070491@ha */ -/* 807F1804 38 03 04 91 */ addi r0, r3, 0x0491 /* 0x00070491@l */ -/* 807F1808 90 01 00 28 */ stw r0, 0x28(r1) -/* 807F180C 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1810 38 81 00 28 */ addi r4, r1, 0x28 -/* 807F1814 38 A0 FF FF */ li r5, -1 -/* 807F1818 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F181C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 807F1820 7D 89 03 A6 */ mtctr r12 -/* 807F1824 4E 80 04 21 */ bctrl -/* 807F1828 48 00 02 94 */ b lbl_807F1ABC -lbl_807F182C: -/* 807F182C 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F1830 2C 00 00 10 */ cmpwi r0, 0x10 -/* 807F1834 40 82 00 74 */ bne lbl_807F18A8 -/* 807F1838 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F183C 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1840 C0 3F 00 00 */ lfs f1, 0(r31) -/* 807F1844 4B B3 6B E9 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1848 2C 03 00 00 */ cmpwi r3, 0 -/* 807F184C 41 82 00 5C */ beq lbl_807F18A8 -/* 807F1850 3C 60 00 07 */ lis r3, 0x0007 /* 0x0007048F@ha */ -/* 807F1854 38 03 04 8F */ addi r0, r3, 0x048F /* 0x0007048F@l */ -/* 807F1858 90 01 00 24 */ stw r0, 0x24(r1) -/* 807F185C 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1860 38 81 00 24 */ addi r4, r1, 0x24 -/* 807F1864 38 A0 FF FF */ li r5, -1 -/* 807F1868 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F186C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 807F1870 7D 89 03 A6 */ mtctr r12 -/* 807F1874 4E 80 04 21 */ bctrl -/* 807F1878 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070234@ha */ -/* 807F187C 38 03 02 34 */ addi r0, r3, 0x0234 /* 0x00070234@l */ -/* 807F1880 90 01 00 20 */ stw r0, 0x20(r1) -/* 807F1884 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1888 38 81 00 20 */ addi r4, r1, 0x20 -/* 807F188C 38 A0 00 00 */ li r5, 0 -/* 807F1890 38 C0 FF FF */ li r6, -1 -/* 807F1894 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F1898 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807F189C 7D 89 03 A6 */ mtctr r12 -/* 807F18A0 4E 80 04 21 */ bctrl -/* 807F18A4 48 00 02 18 */ b lbl_807F1ABC -lbl_807F18A8: -/* 807F18A8 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F18AC 2C 00 00 11 */ cmpwi r0, 0x11 -/* 807F18B0 40 82 00 4C */ bne lbl_807F18FC -/* 807F18B4 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F18B8 38 63 00 0C */ addi r3, r3, 0xc -/* 807F18BC C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 807F18C0 4B B3 6B 6D */ bl checkPass__12J3DFrameCtrlFf -/* 807F18C4 2C 03 00 00 */ cmpwi r3, 0 -/* 807F18C8 41 82 00 34 */ beq lbl_807F18FC -/* 807F18CC 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070234@ha */ -/* 807F18D0 38 03 02 34 */ addi r0, r3, 0x0234 /* 0x00070234@l */ -/* 807F18D4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 807F18D8 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F18DC 38 81 00 1C */ addi r4, r1, 0x1c -/* 807F18E0 38 A0 00 00 */ li r5, 0 -/* 807F18E4 38 C0 FF FF */ li r6, -1 -/* 807F18E8 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F18EC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807F18F0 7D 89 03 A6 */ mtctr r12 -/* 807F18F4 4E 80 04 21 */ bctrl -/* 807F18F8 48 00 01 C4 */ b lbl_807F1ABC -lbl_807F18FC: -/* 807F18FC 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F1900 2C 00 00 12 */ cmpwi r0, 0x12 -/* 807F1904 40 82 00 94 */ bne lbl_807F1998 -/* 807F1908 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F190C 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1910 C0 3F 00 00 */ lfs f1, 0(r31) -/* 807F1914 4B B3 6B 19 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1918 2C 03 00 00 */ cmpwi r3, 0 -/* 807F191C 40 82 00 4C */ bne lbl_807F1968 -/* 807F1920 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F1924 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1928 C0 3F 00 B8 */ lfs f1, 0xb8(r31) -/* 807F192C 4B B3 6B 01 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1930 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1934 40 82 00 34 */ bne lbl_807F1968 -/* 807F1938 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F193C 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1940 C0 3F 00 BC */ lfs f1, 0xbc(r31) -/* 807F1944 4B B3 6A E9 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1948 2C 03 00 00 */ cmpwi r3, 0 -/* 807F194C 40 82 00 1C */ bne lbl_807F1968 -/* 807F1950 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F1954 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1958 C0 3F 00 B0 */ lfs f1, 0xb0(r31) -/* 807F195C 4B B3 6A D1 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1960 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1964 41 82 00 34 */ beq lbl_807F1998 -lbl_807F1968: -/* 807F1968 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070234@ha */ -/* 807F196C 38 03 02 34 */ addi r0, r3, 0x0234 /* 0x00070234@l */ -/* 807F1970 90 01 00 18 */ stw r0, 0x18(r1) -/* 807F1974 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1978 38 81 00 18 */ addi r4, r1, 0x18 -/* 807F197C 38 A0 00 00 */ li r5, 0 -/* 807F1980 38 C0 FF FF */ li r6, -1 -/* 807F1984 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F1988 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807F198C 7D 89 03 A6 */ mtctr r12 -/* 807F1990 4E 80 04 21 */ bctrl -/* 807F1994 48 00 01 28 */ b lbl_807F1ABC -lbl_807F1998: -/* 807F1998 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 807F199C 2C 00 00 13 */ cmpwi r0, 0x13 -/* 807F19A0 40 82 00 A8 */ bne lbl_807F1A48 -/* 807F19A4 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F19A8 38 63 00 0C */ addi r3, r3, 0xc -/* 807F19AC C0 3F 00 00 */ lfs f1, 0(r31) -/* 807F19B0 4B B3 6A 7D */ bl checkPass__12J3DFrameCtrlFf -/* 807F19B4 2C 03 00 00 */ cmpwi r3, 0 -/* 807F19B8 41 82 00 30 */ beq lbl_807F19E8 -/* 807F19BC 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070495@ha */ -/* 807F19C0 38 03 04 95 */ addi r0, r3, 0x0495 /* 0x00070495@l */ -/* 807F19C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F19C8 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F19CC 38 81 00 14 */ addi r4, r1, 0x14 -/* 807F19D0 38 A0 FF FF */ li r5, -1 -/* 807F19D4 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F19D8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 807F19DC 7D 89 03 A6 */ mtctr r12 -/* 807F19E0 4E 80 04 21 */ bctrl -/* 807F19E4 48 00 00 D8 */ b lbl_807F1ABC -lbl_807F19E8: -/* 807F19E8 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F19EC 38 63 00 0C */ addi r3, r3, 0xc -/* 807F19F0 C0 3F 00 B4 */ lfs f1, 0xb4(r31) -/* 807F19F4 4B B3 6A 39 */ bl checkPass__12J3DFrameCtrlFf -/* 807F19F8 2C 03 00 00 */ cmpwi r3, 0 -/* 807F19FC 40 82 00 1C */ bne lbl_807F1A18 -/* 807F1A00 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F1A04 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1A08 C0 3F 00 C0 */ lfs f1, 0xc0(r31) -/* 807F1A0C 4B B3 6A 21 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1A10 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1A14 41 82 00 A8 */ beq lbl_807F1ABC -lbl_807F1A18: -/* 807F1A18 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070234@ha */ -/* 807F1A1C 38 03 02 34 */ addi r0, r3, 0x0234 /* 0x00070234@l */ -/* 807F1A20 90 01 00 10 */ stw r0, 0x10(r1) -/* 807F1A24 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1A28 38 81 00 10 */ addi r4, r1, 0x10 -/* 807F1A2C 38 A0 00 00 */ li r5, 0 -/* 807F1A30 38 C0 FF FF */ li r6, -1 -/* 807F1A34 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F1A38 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807F1A3C 7D 89 03 A6 */ mtctr r12 -/* 807F1A40 4E 80 04 21 */ bctrl -/* 807F1A44 48 00 00 78 */ b lbl_807F1ABC -lbl_807F1A48: -/* 807F1A48 2C 00 00 15 */ cmpwi r0, 0x15 -/* 807F1A4C 40 82 00 70 */ bne lbl_807F1ABC -/* 807F1A50 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070493@ha */ -/* 807F1A54 38 03 04 93 */ addi r0, r3, 0x0493 /* 0x00070493@l */ -/* 807F1A58 90 01 00 0C */ stw r0, 0xc(r1) -/* 807F1A5C 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1A60 38 81 00 0C */ addi r4, r1, 0xc -/* 807F1A64 38 A0 FF FF */ li r5, -1 -/* 807F1A68 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F1A6C 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 807F1A70 7D 89 03 A6 */ mtctr r12 -/* 807F1A74 4E 80 04 21 */ bctrl -/* 807F1A78 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F1A7C 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1A80 C0 3F 00 AC */ lfs f1, 0xac(r31) -/* 807F1A84 4B B3 69 A9 */ bl checkPass__12J3DFrameCtrlFf -/* 807F1A88 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1A8C 41 82 00 30 */ beq lbl_807F1ABC -/* 807F1A90 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070234@ha */ -/* 807F1A94 38 03 02 34 */ addi r0, r3, 0x0234 /* 0x00070234@l */ -/* 807F1A98 90 01 00 08 */ stw r0, 8(r1) -/* 807F1A9C 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F1AA0 38 81 00 08 */ addi r4, r1, 8 -/* 807F1AA4 38 A0 00 00 */ li r5, 0 -/* 807F1AA8 38 C0 FF FF */ li r6, -1 -/* 807F1AAC 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F1AB0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807F1AB4 7D 89 03 A6 */ mtctr r12 -/* 807F1AB8 4E 80 04 21 */ bctrl -lbl_807F1ABC: -/* 807F1ABC 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 807F1AC0 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 807F1AC4 80 01 00 44 */ lwz r0, 0x44(r1) -/* 807F1AC8 7C 08 03 A6 */ mtlr r0 -/* 807F1ACC 38 21 00 40 */ addi r1, r1, 0x40 -/* 807F1AD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 76edd3629d7..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,207 +0,0 @@ -lbl_807F239C: -/* 807F239C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 807F23A0 7C 08 02 A6 */ mflr r0 -/* 807F23A4 90 01 00 44 */ stw r0, 0x44(r1) -/* 807F23A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 807F23AC 4B B6 FE 21 */ bl _savegpr_25 -/* 807F23B0 7C 7B 1B 78 */ mr r27, r3 -/* 807F23B4 3C 80 80 7F */ lis r4, lit_3715@ha /* 0x807F2864@ha */ -/* 807F23B8 3B E4 28 64 */ addi r31, r4, lit_3715@l /* 0x807F2864@l */ -/* 807F23BC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 807F23C0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 807F23C4 40 82 01 3C */ bne lbl_807F2500 -/* 807F23C8 7F 60 DB 79 */ or. r0, r27, r27 -/* 807F23CC 41 82 01 28 */ beq lbl_807F24F4 -/* 807F23D0 7C 1A 03 78 */ mr r26, r0 -/* 807F23D4 4B 82 67 91 */ bl __ct__10fopAc_ac_cFv -/* 807F23D8 38 7A 05 BC */ addi r3, r26, 0x5bc -/* 807F23DC 4B AC EB 89 */ bl __ct__15Z2CreatureEnemyFv -/* 807F23E0 38 7A 06 B4 */ addi r3, r26, 0x6b4 -/* 807F23E4 4B 88 3A C9 */ bl __ct__12dBgS_AcchCirFv -/* 807F23E8 3B 3A 06 F4 */ addi r25, r26, 0x6f4 -/* 807F23EC 7F 23 CB 78 */ mr r3, r25 -/* 807F23F0 4B 88 3C B1 */ bl __ct__9dBgS_AcchFv -/* 807F23F4 3C 60 80 7F */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x807F2AD0@ha */ -/* 807F23F8 38 63 2A D0 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x807F2AD0@l */ -/* 807F23FC 90 79 00 10 */ stw r3, 0x10(r25) -/* 807F2400 38 03 00 0C */ addi r0, r3, 0xc -/* 807F2404 90 19 00 14 */ stw r0, 0x14(r25) -/* 807F2408 38 03 00 18 */ addi r0, r3, 0x18 -/* 807F240C 90 19 00 24 */ stw r0, 0x24(r25) -/* 807F2410 38 79 00 14 */ addi r3, r25, 0x14 -/* 807F2414 4B 88 6A 55 */ bl SetObj__16dBgS_PolyPassChkFv -/* 807F2418 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 807F241C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 807F2420 90 1A 08 E4 */ stw r0, 0x8e4(r26) -/* 807F2424 38 7A 08 E8 */ addi r3, r26, 0x8e8 -/* 807F2428 4B 89 13 39 */ bl __ct__10dCcD_GSttsFv -/* 807F242C 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 807F2430 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 807F2434 90 7A 08 E4 */ stw r3, 0x8e4(r26) -/* 807F2438 38 03 00 20 */ addi r0, r3, 0x20 -/* 807F243C 90 1A 08 E8 */ stw r0, 0x8e8(r26) -/* 807F2440 3B 3A 09 08 */ addi r25, r26, 0x908 -/* 807F2444 7F 23 CB 78 */ mr r3, r25 -/* 807F2448 4B 89 15 E1 */ bl __ct__12dCcD_GObjInfFv -/* 807F244C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 807F2450 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 807F2454 90 19 01 20 */ stw r0, 0x120(r25) -/* 807F2458 3C 60 80 7F */ lis r3, __vt__8cM3dGAab@ha /* 0x807F2AC4@ha */ -/* 807F245C 38 03 2A C4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x807F2AC4@l */ -/* 807F2460 90 19 01 1C */ stw r0, 0x11c(r25) -/* 807F2464 3C 60 80 7F */ lis r3, __vt__8cM3dGSph@ha /* 0x807F2AB8@ha */ -/* 807F2468 38 03 2A B8 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x807F2AB8@l */ -/* 807F246C 90 19 01 34 */ stw r0, 0x134(r25) -/* 807F2470 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 807F2474 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 807F2478 90 79 01 20 */ stw r3, 0x120(r25) -/* 807F247C 3B C3 00 58 */ addi r30, r3, 0x58 -/* 807F2480 93 D9 01 34 */ stw r30, 0x134(r25) -/* 807F2484 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 807F2488 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 807F248C 90 79 00 3C */ stw r3, 0x3c(r25) -/* 807F2490 3B A3 00 2C */ addi r29, r3, 0x2c -/* 807F2494 93 B9 01 20 */ stw r29, 0x120(r25) -/* 807F2498 3B 83 00 84 */ addi r28, r3, 0x84 -/* 807F249C 93 99 01 34 */ stw r28, 0x134(r25) -/* 807F24A0 3B 3A 0A 40 */ addi r25, r26, 0xa40 -/* 807F24A4 7F 23 CB 78 */ mr r3, r25 -/* 807F24A8 4B 89 15 81 */ bl __ct__12dCcD_GObjInfFv -/* 807F24AC 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 807F24B0 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 807F24B4 90 19 01 20 */ stw r0, 0x120(r25) -/* 807F24B8 3C 60 80 7F */ lis r3, __vt__8cM3dGAab@ha /* 0x807F2AC4@ha */ -/* 807F24BC 38 03 2A C4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x807F2AC4@l */ -/* 807F24C0 90 19 01 1C */ stw r0, 0x11c(r25) -/* 807F24C4 3C 60 80 7F */ lis r3, __vt__8cM3dGSph@ha /* 0x807F2AB8@ha */ -/* 807F24C8 38 03 2A B8 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x807F2AB8@l */ -/* 807F24CC 90 19 01 34 */ stw r0, 0x134(r25) -/* 807F24D0 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 807F24D4 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 807F24D8 90 19 01 20 */ stw r0, 0x120(r25) -/* 807F24DC 93 D9 01 34 */ stw r30, 0x134(r25) -/* 807F24E0 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 807F24E4 38 03 BF C0 */ addi r0, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 807F24E8 90 19 00 3C */ stw r0, 0x3c(r25) -/* 807F24EC 93 B9 01 20 */ stw r29, 0x120(r25) -/* 807F24F0 93 99 01 34 */ stw r28, 0x134(r25) -lbl_807F24F4: -/* 807F24F4 80 1B 04 A0 */ lwz r0, 0x4a0(r27) -/* 807F24F8 60 00 00 08 */ ori r0, r0, 8 -/* 807F24FC 90 1B 04 A0 */ stw r0, 0x4a0(r27) -lbl_807F2500: -/* 807F2500 38 7B 05 AC */ addi r3, r27, 0x5ac -/* 807F2504 3C 80 80 7F */ lis r4, d_a_e_yc__stringBase0@ha /* 0x807F294C@ha */ -/* 807F2508 38 84 29 4C */ addi r4, r4, d_a_e_yc__stringBase0@l /* 0x807F294C@l */ -/* 807F250C 4B 83 A9 B1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 807F2510 7C 7C 1B 78 */ mr r28, r3 -/* 807F2514 2C 1C 00 04 */ cmpwi r28, 4 -/* 807F2518 40 82 01 88 */ bne lbl_807F26A0 -/* 807F251C 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 807F2520 98 1B 05 B4 */ stb r0, 0x5b4(r27) -/* 807F2524 7F 63 DB 78 */ mr r3, r27 -/* 807F2528 3C 80 80 7F */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x807F22A4@ha */ -/* 807F252C 38 84 22 A4 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x807F22A4@l */ -/* 807F2530 38 A0 23 A0 */ li r5, 0x23a0 -/* 807F2534 4B 82 7F 7D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 807F2538 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807F253C 40 82 00 0C */ bne lbl_807F2548 -/* 807F2540 38 60 00 05 */ li r3, 5 -/* 807F2544 48 00 01 60 */ b lbl_807F26A4 -lbl_807F2548: -/* 807F2548 3C 60 80 7F */ lis r3, data_807F2B0C@ha /* 0x807F2B0C@ha */ -/* 807F254C 8C 03 2B 0C */ lbzu r0, data_807F2B0C@l(r3) /* 0x807F2B0C@l */ -/* 807F2550 28 00 00 00 */ cmplwi r0, 0 -/* 807F2554 40 82 00 20 */ bne lbl_807F2574 -/* 807F2558 38 00 00 01 */ li r0, 1 -/* 807F255C 98 1B 0B A4 */ stb r0, 0xba4(r27) -/* 807F2560 98 03 00 00 */ stb r0, 0(r3) -/* 807F2564 38 00 FF FF */ li r0, -1 -/* 807F2568 3C 60 80 7F */ lis r3, l_HIO@ha /* 0x807F2B1C@ha */ -/* 807F256C 38 63 2B 1C */ addi r3, r3, l_HIO@l /* 0x807F2B1C@l */ -/* 807F2570 98 03 00 04 */ stb r0, 4(r3) -lbl_807F2574: -/* 807F2574 80 7B 05 B8 */ lwz r3, 0x5b8(r27) -/* 807F2578 80 63 00 04 */ lwz r3, 4(r3) -/* 807F257C 38 03 00 24 */ addi r0, r3, 0x24 -/* 807F2580 90 1B 05 04 */ stw r0, 0x504(r27) -/* 807F2584 7F 63 DB 78 */ mr r3, r27 -/* 807F2588 C0 3F 00 DC */ lfs f1, 0xdc(r31) -/* 807F258C C0 5F 00 E0 */ lfs f2, 0xe0(r31) -/* 807F2590 FC 60 08 90 */ fmr f3, f1 -/* 807F2594 4B 82 7F 95 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 807F2598 7F 63 DB 78 */ mr r3, r27 -/* 807F259C C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 807F25A0 C0 5F 00 30 */ lfs f2, 0x30(r31) -/* 807F25A4 FC 60 08 90 */ fmr f3, f1 -/* 807F25A8 4B 82 7F 91 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 807F25AC 38 00 00 3C */ li r0, 0x3c -/* 807F25B0 B0 1B 05 62 */ sth r0, 0x562(r27) -/* 807F25B4 B0 1B 05 60 */ sth r0, 0x560(r27) -/* 807F25B8 38 7B 08 CC */ addi r3, r27, 0x8cc -/* 807F25BC 38 80 00 64 */ li r4, 0x64 -/* 807F25C0 38 A0 00 00 */ li r5, 0 -/* 807F25C4 7F 66 DB 78 */ mr r6, r27 -/* 807F25C8 4B 89 12 99 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 807F25CC 38 7B 09 08 */ addi r3, r27, 0x908 -/* 807F25D0 3C 80 80 7F */ lis r4, cc_sph_src@ha /* 0x807F29E8@ha */ -/* 807F25D4 38 84 29 E8 */ addi r4, r4, cc_sph_src@l /* 0x807F29E8@l */ -/* 807F25D8 4B 89 24 5D */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 807F25DC 38 1B 08 CC */ addi r0, r27, 0x8cc -/* 807F25E0 90 1B 09 4C */ stw r0, 0x94c(r27) -/* 807F25E4 38 7B 0A 40 */ addi r3, r27, 0xa40 -/* 807F25E8 3C 80 80 7F */ lis r4, at_sph_src@ha /* 0x807F2A28@ha */ -/* 807F25EC 38 84 2A 28 */ addi r4, r4, at_sph_src@l /* 0x807F2A28@l */ -/* 807F25F0 4B 89 24 45 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 807F25F4 38 1B 08 CC */ addi r0, r27, 0x8cc -/* 807F25F8 90 1B 0A 84 */ stw r0, 0xa84(r27) -/* 807F25FC 38 00 00 00 */ li r0, 0 -/* 807F2600 90 01 00 08 */ stw r0, 8(r1) -/* 807F2604 38 7B 06 F4 */ addi r3, r27, 0x6f4 -/* 807F2608 38 9B 04 D0 */ addi r4, r27, 0x4d0 -/* 807F260C 38 BB 04 BC */ addi r5, r27, 0x4bc -/* 807F2610 7F 66 DB 78 */ mr r6, r27 -/* 807F2614 38 E0 00 01 */ li r7, 1 -/* 807F2618 39 1B 06 B4 */ addi r8, r27, 0x6b4 -/* 807F261C 39 3B 04 F8 */ addi r9, r27, 0x4f8 -/* 807F2620 39 40 00 00 */ li r10, 0 -/* 807F2624 4B 88 3C 25 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 807F2628 38 7B 06 B4 */ addi r3, r27, 0x6b4 -/* 807F262C C0 3F 00 74 */ lfs f1, 0x74(r31) -/* 807F2630 FC 40 08 90 */ fmr f2, f1 -/* 807F2634 4B 88 39 25 */ bl SetWall__12dBgS_AcchCirFff -/* 807F2638 38 7B 05 BC */ addi r3, r27, 0x5bc -/* 807F263C 38 9B 04 D0 */ addi r4, r27, 0x4d0 -/* 807F2640 38 BB 05 38 */ addi r5, r27, 0x538 -/* 807F2644 38 C0 00 03 */ li r6, 3 -/* 807F2648 38 E0 00 01 */ li r7, 1 -/* 807F264C 4B AC EA 49 */ bl init__15Z2CreatureEnemyFP3VecP3VecUcUc -/* 807F2650 38 7B 05 BC */ addi r3, r27, 0x5bc -/* 807F2654 3C 80 80 7F */ lis r4, d_a_e_yc__stringBase0@ha /* 0x807F294C@ha */ -/* 807F2658 38 84 29 4C */ addi r4, r4, d_a_e_yc__stringBase0@l /* 0x807F294C@l */ -/* 807F265C 4B AC F5 35 */ bl setEnemyName__15Z2CreatureEnemyFPCc -/* 807F2660 38 1B 05 BC */ addi r0, r27, 0x5bc -/* 807F2664 90 1B 0B 80 */ stw r0, 0xb80(r27) -/* 807F2668 C0 3F 00 E4 */ lfs f1, 0xe4(r31) -/* 807F266C 4B A7 52 E9 */ bl cM_rndF__Ff -/* 807F2670 FC 00 08 1E */ fctiwz f0, f1 -/* 807F2674 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F2678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F267C B0 1B 06 6C */ sth r0, 0x66c(r27) -/* 807F2680 38 00 00 00 */ li r0, 0 -/* 807F2684 B0 1B 06 6E */ sth r0, 0x66e(r27) -/* 807F2688 38 00 00 04 */ li r0, 4 -/* 807F268C 90 1B 05 5C */ stw r0, 0x55c(r27) -/* 807F2690 38 00 00 1A */ li r0, 0x1a -/* 807F2694 98 1B 05 46 */ stb r0, 0x546(r27) -/* 807F2698 7F 63 DB 78 */ mr r3, r27 -/* 807F269C 4B FF F6 49 */ bl daE_YC_Execute__FP10e_yc_class -lbl_807F26A0: -/* 807F26A0 7F 83 E3 78 */ mr r3, r28 -lbl_807F26A4: -/* 807F26A4 39 61 00 40 */ addi r11, r1, 0x40 -/* 807F26A8 4B B6 FB 71 */ bl _restgpr_25 -/* 807F26AC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 807F26B0 7C 08 03 A6 */ mtlr r0 -/* 807F26B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 807F26B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Delete__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Delete__FP10e_yc_class.s deleted file mode 100644 index 1a645d97d88..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Delete__FP10e_yc_class.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_807F223C: -/* 807F223C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F2240 7C 08 02 A6 */ mflr r0 -/* 807F2244 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F2248 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F224C 7C 7F 1B 78 */ mr r31, r3 -/* 807F2250 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 807F2254 3C 80 80 7F */ lis r4, d_a_e_yc__stringBase0@ha /* 0x807F294C@ha */ -/* 807F2258 38 84 29 4C */ addi r4, r4, d_a_e_yc__stringBase0@l /* 0x807F294C@l */ -/* 807F225C 4B 83 AD AD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 807F2260 88 1F 0B A4 */ lbz r0, 0xba4(r31) -/* 807F2264 28 00 00 00 */ cmplwi r0, 0 -/* 807F2268 41 82 00 10 */ beq lbl_807F2278 -/* 807F226C 38 00 00 00 */ li r0, 0 -/* 807F2270 3C 60 80 7F */ lis r3, data_807F2B0C@ha /* 0x807F2B0C@ha */ -/* 807F2274 98 03 2B 0C */ stb r0, data_807F2B0C@l(r3) /* 0x807F2B0C@l */ -lbl_807F2278: -/* 807F2278 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 807F227C 28 00 00 00 */ cmplwi r0, 0 -/* 807F2280 41 82 00 0C */ beq lbl_807F228C -/* 807F2284 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 807F2288 4B 81 F0 89 */ bl stopZelAnime__16mDoExt_McaMorfSOFv -lbl_807F228C: -/* 807F228C 38 60 00 01 */ li r3, 1 -/* 807F2290 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F2294 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F2298 7C 08 03 A6 */ mtlr r0 -/* 807F229C 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F22A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Draw__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Draw__FP10e_yc_class.s deleted file mode 100644 index 317e6adda6c..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Draw__FP10e_yc_class.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_807EFF9C: -/* 807EFF9C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 807EFFA0 7C 08 02 A6 */ mflr r0 -/* 807EFFA4 90 01 00 34 */ stw r0, 0x34(r1) -/* 807EFFA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 807EFFAC 4B B7 22 2D */ bl _savegpr_28 -/* 807EFFB0 7C 7E 1B 78 */ mr r30, r3 -/* 807EFFB4 3C 60 80 7F */ lis r3, lit_3715@ha /* 0x807F2864@ha */ -/* 807EFFB8 3B E3 28 64 */ addi r31, r3, lit_3715@l /* 0x807F2864@l */ -/* 807EFFBC 88 1E 06 B2 */ lbz r0, 0x6b2(r30) -/* 807EFFC0 7C 00 07 75 */ extsb. r0, r0 -/* 807EFFC4 41 82 00 0C */ beq lbl_807EFFD0 -/* 807EFFC8 38 60 00 01 */ li r3, 1 -/* 807EFFCC 48 00 00 D8 */ b lbl_807F00A4 -lbl_807EFFD0: -/* 807EFFD0 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807EFFD4 83 83 00 04 */ lwz r28, 4(r3) -/* 807EFFD8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807EFFDC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807EFFE0 38 80 00 02 */ li r4, 2 -/* 807EFFE4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 807EFFE8 38 DE 01 0C */ addi r6, r30, 0x10c -/* 807EFFEC 4B 9B 37 D9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 807EFFF0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 807EFFF4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 807EFFF8 80 9C 00 04 */ lwz r4, 4(r28) -/* 807EFFFC 38 BE 01 0C */ addi r5, r30, 0x10c -/* 807F0000 4B 9B 4D A1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 807F0004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F0008 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F000C 80 04 5F 88 */ lwz r0, 0x5f88(r4) -/* 807F0010 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 807F0014 3B A3 4A C8 */ addi r29, r3, j3dSys@l /* 0x80434AC8@l */ -/* 807F0018 90 1D 00 48 */ stw r0, 0x48(r29) -/* 807F001C 80 04 5F 8C */ lwz r0, 0x5f8c(r4) -/* 807F0020 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 807F0024 80 7E 05 B8 */ lwz r3, 0x5b8(r30) -/* 807F0028 4B 82 11 99 */ bl entryDL__16mDoExt_McaMorfSOFv -/* 807F002C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F0030 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F0034 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 807F0038 90 1D 00 48 */ stw r0, 0x48(r29) -/* 807F003C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 807F0040 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 807F0044 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 807F0048 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 807F004C C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 807F0050 EC 20 18 2A */ fadds f1, f0, f3 -/* 807F0054 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 807F0058 D0 01 00 08 */ stfs f0, 8(r1) -/* 807F005C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 807F0060 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 807F0064 80 7E 06 68 */ lwz r3, 0x668(r30) -/* 807F0068 38 80 00 01 */ li r4, 1 -/* 807F006C 7F 85 E3 78 */ mr r5, r28 -/* 807F0070 38 C1 00 08 */ addi r6, r1, 8 -/* 807F0074 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 807F0078 C0 5F 00 04 */ lfs f2, 4(r31) -/* 807F007C C0 9E 07 8C */ lfs f4, 0x78c(r30) -/* 807F0080 38 FE 07 E4 */ addi r7, r30, 0x7e4 -/* 807F0084 39 1E 01 0C */ addi r8, r30, 0x10c -/* 807F0088 39 20 00 00 */ li r9, 0 -/* 807F008C C0 BF 00 00 */ lfs f5, 0(r31) -/* 807F0090 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 807F0094 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 807F0098 4B 83 E8 79 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 807F009C 90 7E 06 68 */ stw r3, 0x668(r30) -/* 807F00A0 38 60 00 01 */ li r3, 1 -lbl_807F00A4: -/* 807F00A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F00A8 4B B7 21 7D */ bl _restgpr_28 -/* 807F00AC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 807F00B0 7C 08 03 A6 */ mtlr r0 -/* 807F00B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 807F00B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Execute__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Execute__FP10e_yc_class.s deleted file mode 100644 index e4c442bb698..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Execute__FP10e_yc_class.s +++ /dev/null @@ -1,357 +0,0 @@ -lbl_807F1CE4: -/* 807F1CE4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 807F1CE8 7C 08 02 A6 */ mflr r0 -/* 807F1CEC 90 01 00 64 */ stw r0, 0x64(r1) -/* 807F1CF0 39 61 00 60 */ addi r11, r1, 0x60 -/* 807F1CF4 4B B7 04 D5 */ bl _savegpr_24 -/* 807F1CF8 7C 7F 1B 78 */ mr r31, r3 -/* 807F1CFC 3C 60 80 7F */ lis r3, lit_3715@ha /* 0x807F2864@ha */ -/* 807F1D00 3B C3 28 64 */ addi r30, r3, lit_3715@l /* 0x807F2864@l */ -/* 807F1D04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F1D08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F1D0C 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 807F1D10 C0 3E 00 C8 */ lfs f1, 0xc8(r30) -/* 807F1D14 C0 5E 00 CC */ lfs f2, 0xcc(r30) -/* 807F1D18 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 807F1D1C EC 21 00 28 */ fsubs f1, f1, f0 -/* 807F1D20 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 807F1D24 EC 42 00 28 */ fsubs f2, f2, f0 -/* 807F1D28 EC 21 00 72 */ fmuls f1, f1, f1 -/* 807F1D2C EC 02 00 B2 */ fmuls f0, f2, f2 -/* 807F1D30 EC 21 00 2A */ fadds f1, f1, f0 -/* 807F1D34 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F1D38 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F1D3C 40 81 00 0C */ ble lbl_807F1D48 -/* 807F1D40 FC 00 08 34 */ frsqrte f0, f1 -/* 807F1D44 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_807F1D48: -/* 807F1D48 3C 60 80 7F */ lis r3, S_area_dis@ha /* 0x807F2B08@ha */ -/* 807F1D4C D0 23 2B 08 */ stfs f1, S_area_dis@l(r3) /* 0x807F2B08@l */ -/* 807F1D50 A0 1F 05 8E */ lhz r0, 0x58e(r31) -/* 807F1D54 60 00 02 00 */ ori r0, r0, 0x200 -/* 807F1D58 B0 1F 05 8E */ sth r0, 0x58e(r31) -/* 807F1D5C A8 7F 06 6C */ lha r3, 0x66c(r31) -/* 807F1D60 38 03 00 01 */ addi r0, r3, 1 -/* 807F1D64 B0 1F 06 6C */ sth r0, 0x66c(r31) -/* 807F1D68 38 60 00 00 */ li r3, 0 -/* 807F1D6C 38 00 00 04 */ li r0, 4 -/* 807F1D70 7C 09 03 A6 */ mtctr r0 -lbl_807F1D74: -/* 807F1D74 38 A3 06 A2 */ addi r5, r3, 0x6a2 -/* 807F1D78 7C 9F 2A AE */ lhax r4, r31, r5 -/* 807F1D7C 2C 04 00 00 */ cmpwi r4, 0 -/* 807F1D80 41 82 00 0C */ beq lbl_807F1D8C -/* 807F1D84 38 04 FF FF */ addi r0, r4, -1 -/* 807F1D88 7C 1F 2B 2E */ sthx r0, r31, r5 -lbl_807F1D8C: -/* 807F1D8C 38 63 00 02 */ addi r3, r3, 2 -/* 807F1D90 42 00 FF E4 */ bdnz lbl_807F1D74 -/* 807F1D94 A8 7F 06 AA */ lha r3, 0x6aa(r31) -/* 807F1D98 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1D9C 41 82 00 0C */ beq lbl_807F1DA8 -/* 807F1DA0 38 03 FF FF */ addi r0, r3, -1 -/* 807F1DA4 B0 1F 06 AA */ sth r0, 0x6aa(r31) -lbl_807F1DA8: -/* 807F1DA8 7F E3 FB 78 */ mr r3, r31 -/* 807F1DAC 4B FF FD 29 */ bl action__FP10e_yc_class -/* 807F1DB0 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 807F1DB4 83 A3 00 04 */ lwz r29, 4(r3) -/* 807F1DB8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 807F1DBC 7C 03 07 74 */ extsb r3, r0 -/* 807F1DC0 4B 83 B2 AD */ bl dComIfGp_getReverb__Fi -/* 807F1DC4 7C 65 1B 78 */ mr r5, r3 -/* 807F1DC8 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 807F1DCC 38 80 00 00 */ li r4, 0 -/* 807F1DD0 4B 81 F2 E1 */ bl play__16mDoExt_McaMorfSOFUlSc -/* 807F1DD4 7F E3 FB 78 */ mr r3, r31 -/* 807F1DD8 4B FF F8 85 */ bl anm_se_set__FP10e_yc_class -/* 807F1DDC 80 1F 06 60 */ lwz r0, 0x660(r31) -/* 807F1DE0 2C 00 00 0C */ cmpwi r0, 0xc -/* 807F1DE4 41 82 00 34 */ beq lbl_807F1E18 -/* 807F1DE8 2C 00 00 15 */ cmpwi r0, 0x15 -/* 807F1DEC 41 82 00 2C */ beq lbl_807F1E18 -/* 807F1DF0 2C 00 00 0A */ cmpwi r0, 0xa -/* 807F1DF4 41 82 00 24 */ beq lbl_807F1E18 -/* 807F1DF8 2C 00 00 06 */ cmpwi r0, 6 -/* 807F1DFC 41 82 00 1C */ beq lbl_807F1E18 -/* 807F1E00 2C 00 00 05 */ cmpwi r0, 5 -/* 807F1E04 41 82 00 14 */ beq lbl_807F1E18 -/* 807F1E08 2C 00 00 04 */ cmpwi r0, 4 -/* 807F1E0C 41 82 00 0C */ beq lbl_807F1E18 -/* 807F1E10 2C 00 00 09 */ cmpwi r0, 9 -/* 807F1E14 40 82 00 C0 */ bne lbl_807F1ED4 -lbl_807F1E18: -/* 807F1E18 3B 60 00 00 */ li r27, 0 -/* 807F1E1C 3B 40 00 00 */ li r26, 0 -/* 807F1E20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F1E24 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F1E28 3F 20 00 01 */ lis r25, 0x0001 /* 0x00008607@ha */ -lbl_807F1E2C: -/* 807F1E2C 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 807F1E30 38 00 00 FF */ li r0, 0xff -/* 807F1E34 90 01 00 08 */ stw r0, 8(r1) -/* 807F1E38 38 80 00 00 */ li r4, 0 -/* 807F1E3C 90 81 00 0C */ stw r4, 0xc(r1) -/* 807F1E40 38 00 FF FF */ li r0, -1 -/* 807F1E44 90 01 00 10 */ stw r0, 0x10(r1) -/* 807F1E48 90 81 00 14 */ stw r4, 0x14(r1) -/* 807F1E4C 90 81 00 18 */ stw r4, 0x18(r1) -/* 807F1E50 90 81 00 1C */ stw r4, 0x1c(r1) -/* 807F1E54 3B 1A 0B 9C */ addi r24, r26, 0xb9c -/* 807F1E58 7C 9F C0 2E */ lwzx r4, r31, r24 -/* 807F1E5C 38 A0 00 00 */ li r5, 0 -/* 807F1E60 38 D9 86 07 */ addi r6, r25, 0x8607 /* 0x00008607@l */ -/* 807F1E64 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 807F1E68 39 00 00 00 */ li r8, 0 -/* 807F1E6C 39 20 00 00 */ li r9, 0 -/* 807F1E70 39 40 00 00 */ li r10, 0 -/* 807F1E74 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F1E78 4B 85 B6 55 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807F1E7C 7C 7F C1 2E */ stwx r3, r31, r24 -/* 807F1E80 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 807F1E84 38 63 02 10 */ addi r3, r3, 0x210 -/* 807F1E88 7C 9F C0 2E */ lwzx r4, r31, r24 -/* 807F1E8C 4B 85 9A 8D */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 807F1E90 7C 65 1B 79 */ or. r5, r3, r3 -/* 807F1E94 41 82 00 30 */ beq lbl_807F1EC4 -/* 807F1E98 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807F1E9C 80 83 00 0C */ lwz r4, 0xc(r3) -/* 807F1EA0 3C 60 80 7F */ lis r3, wing_j@ha /* 0x807F29E0@ha */ -/* 807F1EA4 38 63 29 E0 */ addi r3, r3, wing_j@l /* 0x807F29E0@l */ -/* 807F1EA8 7C 63 D0 2E */ lwzx r3, r3, r26 -/* 807F1EAC 38 03 00 01 */ addi r0, r3, 1 -/* 807F1EB0 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 807F1EB4 7C 64 02 14 */ add r3, r4, r0 -/* 807F1EB8 38 85 00 68 */ addi r4, r5, 0x68 -/* 807F1EBC 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 807F1EC0 4B A8 E9 21 */ bl func_802807E0 -lbl_807F1EC4: -/* 807F1EC4 3B 7B 00 01 */ addi r27, r27, 1 -/* 807F1EC8 2C 1B 00 02 */ cmpwi r27, 2 -/* 807F1ECC 3B 5A 00 04 */ addi r26, r26, 4 -/* 807F1ED0 41 80 FF 5C */ blt lbl_807F1E2C -lbl_807F1ED4: -/* 807F1ED4 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 807F1ED8 38 63 00 0C */ addi r3, r3, 0xc -/* 807F1EDC C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F1EE0 4B B3 65 4D */ bl checkPass__12J3DFrameCtrlFf -/* 807F1EE4 2C 03 00 00 */ cmpwi r3, 0 -/* 807F1EE8 41 82 01 38 */ beq lbl_807F2020 -/* 807F1EEC 80 1F 06 60 */ lwz r0, 0x660(r31) -/* 807F1EF0 2C 00 00 13 */ cmpwi r0, 0x13 -/* 807F1EF4 41 82 00 14 */ beq lbl_807F1F08 -/* 807F1EF8 2C 00 00 11 */ cmpwi r0, 0x11 -/* 807F1EFC 41 82 00 0C */ beq lbl_807F1F08 -/* 807F1F00 2C 00 00 12 */ cmpwi r0, 0x12 -/* 807F1F04 40 82 00 A0 */ bne lbl_807F1FA4 -lbl_807F1F08: -/* 807F1F08 3B 60 00 00 */ li r27, 0 -/* 807F1F0C 3B 40 00 00 */ li r26, 0 -/* 807F1F10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F1F14 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F1F18 3F 20 00 01 */ lis r25, 0x0001 /* 0x00008603@ha */ -lbl_807F1F1C: -/* 807F1F1C 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 807F1F20 38 80 00 00 */ li r4, 0 -/* 807F1F24 90 81 00 08 */ stw r4, 8(r1) -/* 807F1F28 38 00 FF FF */ li r0, -1 -/* 807F1F2C 90 01 00 0C */ stw r0, 0xc(r1) -/* 807F1F30 90 81 00 10 */ stw r4, 0x10(r1) -/* 807F1F34 90 81 00 14 */ stw r4, 0x14(r1) -/* 807F1F38 90 81 00 18 */ stw r4, 0x18(r1) -/* 807F1F3C 38 80 00 00 */ li r4, 0 -/* 807F1F40 38 B9 86 03 */ addi r5, r25, 0x8603 /* 0x00008603@l */ -/* 807F1F44 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 807F1F48 38 E0 00 00 */ li r7, 0 -/* 807F1F4C 39 00 00 00 */ li r8, 0 -/* 807F1F50 39 20 00 00 */ li r9, 0 -/* 807F1F54 39 40 00 FF */ li r10, 0xff -/* 807F1F58 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F1F5C 4B 85 AB 35 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807F1F60 7C 65 1B 79 */ or. r5, r3, r3 -/* 807F1F64 41 82 00 30 */ beq lbl_807F1F94 -/* 807F1F68 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807F1F6C 80 83 00 0C */ lwz r4, 0xc(r3) -/* 807F1F70 3C 60 80 7F */ lis r3, wing_j@ha /* 0x807F29E0@ha */ -/* 807F1F74 38 63 29 E0 */ addi r3, r3, wing_j@l /* 0x807F29E0@l */ -/* 807F1F78 7C 63 D0 2E */ lwzx r3, r3, r26 -/* 807F1F7C 38 03 00 01 */ addi r0, r3, 1 -/* 807F1F80 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 807F1F84 7C 64 02 14 */ add r3, r4, r0 -/* 807F1F88 38 85 00 68 */ addi r4, r5, 0x68 -/* 807F1F8C 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 807F1F90 4B A8 E8 51 */ bl func_802807E0 -lbl_807F1F94: -/* 807F1F94 3B 7B 00 01 */ addi r27, r27, 1 -/* 807F1F98 2C 1B 00 02 */ cmpwi r27, 2 -/* 807F1F9C 3B 5A 00 04 */ addi r26, r26, 4 -/* 807F1FA0 41 80 FF 7C */ blt lbl_807F1F1C -lbl_807F1FA4: -/* 807F1FA4 80 1F 06 60 */ lwz r0, 0x660(r31) -/* 807F1FA8 2C 00 00 10 */ cmpwi r0, 0x10 -/* 807F1FAC 40 82 00 74 */ bne lbl_807F2020 -/* 807F1FB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F1FB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F1FB8 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 807F1FBC 38 80 00 00 */ li r4, 0 -/* 807F1FC0 90 81 00 08 */ stw r4, 8(r1) -/* 807F1FC4 38 00 FF FF */ li r0, -1 -/* 807F1FC8 90 01 00 0C */ stw r0, 0xc(r1) -/* 807F1FCC 90 81 00 10 */ stw r4, 0x10(r1) -/* 807F1FD0 90 81 00 14 */ stw r4, 0x14(r1) -/* 807F1FD4 90 81 00 18 */ stw r4, 0x18(r1) -/* 807F1FD8 38 80 00 00 */ li r4, 0 -/* 807F1FDC 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008604@ha */ -/* 807F1FE0 38 A5 86 04 */ addi r5, r5, 0x8604 /* 0x00008604@l */ -/* 807F1FE4 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 807F1FE8 38 E0 00 00 */ li r7, 0 -/* 807F1FEC 39 00 00 00 */ li r8, 0 -/* 807F1FF0 39 20 00 00 */ li r9, 0 -/* 807F1FF4 39 40 00 FF */ li r10, 0xff -/* 807F1FF8 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F1FFC 4B 85 AA 95 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 807F2000 7C 65 1B 79 */ or. r5, r3, r3 -/* 807F2004 41 82 00 1C */ beq lbl_807F2020 -/* 807F2008 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807F200C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 807F2010 38 63 00 30 */ addi r3, r3, 0x30 -/* 807F2014 38 85 00 68 */ addi r4, r5, 0x68 -/* 807F2018 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 807F201C 4B A8 E7 C5 */ bl func_802807E0 -lbl_807F2020: -/* 807F2020 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F2024 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F2028 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 807F202C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 807F2030 C0 1F 06 94 */ lfs f0, 0x694(r31) -/* 807F2034 EC 42 00 2A */ fadds f2, f2, f0 -/* 807F2038 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 807F203C 4B B5 48 AD */ bl PSMTXTrans -/* 807F2040 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F2044 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F2048 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 807F204C 4B 81 A3 E9 */ bl mDoMtx_YrotM__FPA4_fs -/* 807F2050 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F2054 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F2058 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 807F205C 4B 81 A3 41 */ bl mDoMtx_XrotM__FPA4_fs -/* 807F2060 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F2064 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F2068 A8 9F 04 E8 */ lha r4, 0x4e8(r31) -/* 807F206C 4B 81 A4 61 */ bl mDoMtx_ZrotM__FPA4_fs -/* 807F2070 3C 60 80 7F */ lis r3, l_HIO@ha /* 0x807F2B1C@ha */ -/* 807F2074 3B 83 2B 1C */ addi r28, r3, l_HIO@l /* 0x807F2B1C@l */ -/* 807F2078 C0 3C 00 08 */ lfs f1, 8(r28) -/* 807F207C FC 40 08 90 */ fmr f2, f1 -/* 807F2080 FC 60 08 90 */ fmr f3, f1 -/* 807F2084 4B 81 AD B5 */ bl scaleM__14mDoMtx_stack_cFfff -/* 807F2088 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F208C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F2090 38 9D 00 24 */ addi r4, r29, 0x24 -/* 807F2094 4B B5 44 1D */ bl PSMTXCopy -/* 807F2098 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 807F209C 4B 81 F1 51 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 807F20A0 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807F20A4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 807F20A8 38 63 01 20 */ addi r3, r3, 0x120 -/* 807F20AC 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */ -/* 807F20B0 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */ -/* 807F20B4 80 84 00 00 */ lwz r4, 0(r4) -/* 807F20B8 4B B5 43 F9 */ bl PSMTXCopy -/* 807F20BC C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F20C0 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 807F20C4 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 807F20C8 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 807F20CC 38 61 00 2C */ addi r3, r1, 0x2c -/* 807F20D0 38 9F 05 38 */ addi r4, r31, 0x538 -/* 807F20D4 4B A7 EE 19 */ bl MtxPosition__FP4cXyzP4cXyz -/* 807F20D8 A8 1F 06 6E */ lha r0, 0x66e(r31) -/* 807F20DC 2C 00 00 14 */ cmpwi r0, 0x14 -/* 807F20E0 40 82 00 30 */ bne lbl_807F2110 -/* 807F20E4 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 807F20E8 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 807F20EC C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 807F20F0 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 807F20F4 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 807F20F8 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 807F20FC C0 3F 05 54 */ lfs f1, 0x554(r31) -/* 807F2100 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 807F2104 EC 01 00 2A */ fadds f0, f1, f0 -/* 807F2108 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 807F210C 48 00 00 2C */ b lbl_807F2138 -lbl_807F2110: -/* 807F2110 C0 1F 05 38 */ lfs f0, 0x538(r31) -/* 807F2114 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 807F2118 C0 1F 05 3C */ lfs f0, 0x53c(r31) -/* 807F211C D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 807F2120 C0 1F 05 40 */ lfs f0, 0x540(r31) -/* 807F2124 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 807F2128 C0 3F 05 54 */ lfs f1, 0x554(r31) -/* 807F212C C0 1E 00 74 */ lfs f0, 0x74(r30) -/* 807F2130 EC 01 00 2A */ fadds f0, f1, f0 -/* 807F2134 D0 1F 05 54 */ stfs f0, 0x554(r31) -lbl_807F2138: -/* 807F2138 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807F213C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 807F2140 38 63 00 30 */ addi r3, r3, 0x30 -/* 807F2144 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */ -/* 807F2148 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */ -/* 807F214C 80 84 00 00 */ lwz r4, 0(r4) -/* 807F2150 4B B5 43 61 */ bl PSMTXCopy -/* 807F2154 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F2158 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 807F215C D0 01 00 30 */ stfs f0, 0x30(r1) -/* 807F2160 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 807F2164 38 61 00 2C */ addi r3, r1, 0x2c -/* 807F2168 38 81 00 20 */ addi r4, r1, 0x20 -/* 807F216C 4B A7 ED 81 */ bl MtxPosition__FP4cXyzP4cXyz -/* 807F2170 A8 1F 06 AA */ lha r0, 0x6aa(r31) -/* 807F2174 2C 00 00 00 */ cmpwi r0, 0 -/* 807F2178 41 82 00 14 */ beq lbl_807F218C -/* 807F217C C0 21 00 28 */ lfs f1, 0x28(r1) -/* 807F2180 C0 1E 00 D0 */ lfs f0, 0xd0(r30) -/* 807F2184 EC 01 00 28 */ fsubs f0, f1, f0 -/* 807F2188 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_807F218C: -/* 807F218C 38 7F 0A 2C */ addi r3, r31, 0xa2c -/* 807F2190 38 81 00 20 */ addi r4, r1, 0x20 -/* 807F2194 4B A7 D4 B5 */ bl SetC__8cM3dGSphFRC4cXyz -/* 807F2198 38 7F 0A 2C */ addi r3, r31, 0xa2c -/* 807F219C C0 3E 00 D4 */ lfs f1, 0xd4(r30) -/* 807F21A0 C0 1C 00 08 */ lfs f0, 8(r28) -/* 807F21A4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 807F21A8 4B A7 D5 61 */ bl SetR__8cM3dGSphFf -/* 807F21AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F21B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F21B4 38 63 23 3C */ addi r3, r3, 0x233c -/* 807F21B8 38 9F 09 08 */ addi r4, r31, 0x908 -/* 807F21BC 4B A7 29 ED */ bl Set__4cCcSFP8cCcD_Obj -/* 807F21C0 80 7D 00 84 */ lwz r3, 0x84(r29) -/* 807F21C4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 807F21C8 38 63 00 60 */ addi r3, r3, 0x60 -/* 807F21CC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F21D0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F21D4 4B B5 42 DD */ bl PSMTXCopy -/* 807F21D8 C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F21DC D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 807F21E0 C0 1E 00 D8 */ lfs f0, 0xd8(r30) -/* 807F21E4 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 807F21E8 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 807F21EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 807F21F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 807F21F4 38 81 00 2C */ addi r4, r1, 0x2c -/* 807F21F8 38 A1 00 20 */ addi r5, r1, 0x20 -/* 807F21FC 4B B5 4B 71 */ bl PSMTXMultVec -/* 807F2200 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 807F2204 D0 1F 05 68 */ stfs f0, 0x568(r31) -/* 807F2208 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 807F220C D0 1F 05 6C */ stfs f0, 0x56c(r31) -/* 807F2210 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 807F2214 D0 1F 05 70 */ stfs f0, 0x570(r31) -/* 807F2218 38 60 00 01 */ li r3, 1 -/* 807F221C 39 61 00 60 */ addi r11, r1, 0x60 -/* 807F2220 4B B6 FF F5 */ bl _restgpr_24 -/* 807F2224 80 01 00 64 */ lwz r0, 0x64(r1) -/* 807F2228 7C 08 03 A6 */ mtlr r0 -/* 807F222C 38 21 00 60 */ addi r1, r1, 0x60 -/* 807F2230 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/damage_check__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/damage_check__FP10e_yc_class.s deleted file mode 100644 index 440f32dd077..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/damage_check__FP10e_yc_class.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_807F00BC: -/* 807F00BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807F00C0 7C 08 02 A6 */ mflr r0 -/* 807F00C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F00C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807F00CC 93 C1 00 08 */ stw r30, 8(r1) -/* 807F00D0 7C 7E 1B 78 */ mr r30, r3 -/* 807F00D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F00D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F00DC 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 807F00E0 38 7E 08 E8 */ addi r3, r30, 0x8e8 -/* 807F00E4 4B 89 37 4D */ bl Move__10dCcD_GSttsFv -/* 807F00E8 A8 1E 06 AA */ lha r0, 0x6aa(r30) -/* 807F00EC 2C 00 00 00 */ cmpwi r0, 0 -/* 807F00F0 40 82 00 A4 */ bne lbl_807F0194 -/* 807F00F4 38 7E 09 08 */ addi r3, r30, 0x908 -/* 807F00F8 4B 89 43 69 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 807F00FC 28 03 00 00 */ cmplwi r3, 0 -/* 807F0100 41 82 00 94 */ beq lbl_807F0194 -/* 807F0104 38 7E 09 08 */ addi r3, r30, 0x908 -/* 807F0108 4B 89 43 F1 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 807F010C 90 7E 0B 78 */ stw r3, 0xb78(r30) -/* 807F0110 88 1F 05 68 */ lbz r0, 0x568(r31) -/* 807F0114 28 00 00 2C */ cmplwi r0, 0x2c -/* 807F0118 41 82 00 7C */ beq lbl_807F0194 -/* 807F011C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 807F0120 28 00 00 2D */ cmplwi r0, 0x2d -/* 807F0124 41 82 00 70 */ beq lbl_807F0194 -/* 807F0128 80 7E 0B 78 */ lwz r3, 0xb78(r30) -/* 807F012C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 807F0130 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 -/* 807F0134 41 82 00 60 */ beq lbl_807F0194 -/* 807F0138 7F E3 FB 78 */ mr r3, r31 -/* 807F013C 7F C4 F3 78 */ mr r4, r30 -/* 807F0140 38 A0 00 40 */ li r5, 0x40 -/* 807F0144 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 807F0148 81 8C 01 DC */ lwz r12, 0x1dc(r12) -/* 807F014C 7D 89 03 A6 */ mtctr r12 -/* 807F0150 4E 80 04 21 */ bctrl -/* 807F0154 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807F0158 41 82 00 3C */ beq lbl_807F0194 -/* 807F015C 38 00 00 14 */ li r0, 0x14 -/* 807F0160 B0 1E 06 6E */ sth r0, 0x66e(r30) -/* 807F0164 38 00 00 00 */ li r0, 0 -/* 807F0168 B0 1E 06 70 */ sth r0, 0x670(r30) -/* 807F016C 38 00 03 E8 */ li r0, 0x3e8 -/* 807F0170 B0 1E 06 AA */ sth r0, 0x6aa(r30) -/* 807F0174 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 807F0178 3C 80 00 04 */ lis r4, 0x0004 /* 0x00040003@ha */ -/* 807F017C 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00040003@l */ -/* 807F0180 38 A0 00 1F */ li r5, 0x1f -/* 807F0184 81 9E 05 BC */ lwz r12, 0x5bc(r30) -/* 807F0188 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 807F018C 7D 89 03 A6 */ mtctr r12 -/* 807F0190 4E 80 04 21 */ bctrl -lbl_807F0194: -/* 807F0194 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807F0198 83 C1 00 08 */ lwz r30, 8(r1) -/* 807F019C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F01A0 7C 08 03 A6 */ mtlr r0 -/* 807F01A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 807F01A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_attack__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_attack__FP10e_yc_class.s deleted file mode 100644 index a8fe7f71b5f..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_attack__FP10e_yc_class.s +++ /dev/null @@ -1,404 +0,0 @@ -lbl_807F0C40: -/* 807F0C40 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 807F0C44 7C 08 02 A6 */ mflr r0 -/* 807F0C48 90 01 00 74 */ stw r0, 0x74(r1) -/* 807F0C4C DB E1 00 60 */ stfd f31, 0x60(r1) -/* 807F0C50 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 807F0C54 39 61 00 60 */ addi r11, r1, 0x60 -/* 807F0C58 4B B7 15 7D */ bl _savegpr_27 -/* 807F0C5C 7C 7D 1B 78 */ mr r29, r3 -/* 807F0C60 3C 60 80 7F */ lis r3, lit_3715@ha /* 0x807F2864@ha */ -/* 807F0C64 3B C3 28 64 */ addi r30, r3, lit_3715@l /* 0x807F2864@l */ -/* 807F0C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F0C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F0C70 83 83 5D AC */ lwz r28, 0x5dac(r3) -/* 807F0C74 80 1D 06 AC */ lwz r0, 0x6ac(r29) -/* 807F0C78 90 01 00 0C */ stw r0, 0xc(r1) -/* 807F0C7C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 807F0C80 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 807F0C84 38 81 00 0C */ addi r4, r1, 0xc -/* 807F0C88 4B 82 8B 71 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 807F0C8C 7C 7F 1B 78 */ mr r31, r3 -/* 807F0C90 C3 FE 00 04 */ lfs f31, 4(r30) -/* 807F0C94 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F0C98 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 807F0C9C FC 00 00 1E */ fctiwz f0, f0 -/* 807F0CA0 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 807F0CA4 83 61 00 34 */ lwz r27, 0x34(r1) -/* 807F0CA8 A8 1D 06 70 */ lha r0, 0x670(r29) -/* 807F0CAC 2C 00 00 04 */ cmpwi r0, 4 -/* 807F0CB0 40 80 00 2C */ bge lbl_807F0CDC -/* 807F0CB4 C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 807F0CB8 D0 1D 06 74 */ stfs f0, 0x674(r29) -/* 807F0CBC C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 807F0CC0 D0 1D 06 78 */ stfs f0, 0x678(r29) -/* 807F0CC4 C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 807F0CC8 D0 1D 06 7C */ stfs f0, 0x67c(r29) -/* 807F0CCC C0 3D 06 78 */ lfs f1, 0x678(r29) -/* 807F0CD0 C0 1E 00 74 */ lfs f0, 0x74(r30) -/* 807F0CD4 EC 01 00 2A */ fadds f0, f1, f0 -/* 807F0CD8 D0 1D 06 78 */ stfs f0, 0x678(r29) -lbl_807F0CDC: -/* 807F0CDC 38 61 00 18 */ addi r3, r1, 0x18 -/* 807F0CE0 38 9D 06 74 */ addi r4, r29, 0x674 -/* 807F0CE4 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 807F0CE8 4B A7 5E 4D */ bl __mi__4cXyzCFRC3Vec -/* 807F0CEC C0 01 00 18 */ lfs f0, 0x18(r1) -/* 807F0CF0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 807F0CF4 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 807F0CF8 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 807F0CFC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 807F0D00 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 807F0D04 A8 1D 06 70 */ lha r0, 0x670(r29) -/* 807F0D08 28 00 00 06 */ cmplwi r0, 6 -/* 807F0D0C 41 81 03 98 */ bgt lbl_807F10A4 -/* 807F0D10 3C 60 80 7F */ lis r3, lit_4087@ha /* 0x807F2970@ha */ -/* 807F0D14 38 63 29 70 */ addi r3, r3, lit_4087@l /* 0x807F2970@l */ -/* 807F0D18 54 00 10 3A */ slwi r0, r0, 2 -/* 807F0D1C 7C 03 00 2E */ lwzx r0, r3, r0 -/* 807F0D20 7C 09 03 A6 */ mtctr r0 -/* 807F0D24 4E 80 04 20 */ bctr -lbl_807F0D28: -/* 807F0D28 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F0D2C D0 1D 06 88 */ stfs f0, 0x688(r29) -/* 807F0D30 C0 1E 00 78 */ lfs f0, 0x78(r30) -/* 807F0D34 D0 1D 06 90 */ stfs f0, 0x690(r29) -/* 807F0D38 38 00 00 01 */ li r0, 1 -/* 807F0D3C B0 1D 06 70 */ sth r0, 0x670(r29) -lbl_807F0D40: -/* 807F0D40 C3 FE 00 7C */ lfs f31, 0x7c(r30) -/* 807F0D44 38 61 00 24 */ addi r3, r1, 0x24 -/* 807F0D48 4B B5 63 F1 */ bl PSVECSquareMag -/* 807F0D4C C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F0D50 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0D54 40 81 00 58 */ ble lbl_807F0DAC -/* 807F0D58 FC 00 08 34 */ frsqrte f0, f1 -/* 807F0D5C C8 9E 00 80 */ lfd f4, 0x80(r30) -/* 807F0D60 FC 44 00 32 */ fmul f2, f4, f0 -/* 807F0D64 C8 7E 00 88 */ lfd f3, 0x88(r30) -/* 807F0D68 FC 00 00 32 */ fmul f0, f0, f0 -/* 807F0D6C FC 01 00 32 */ fmul f0, f1, f0 -/* 807F0D70 FC 03 00 28 */ fsub f0, f3, f0 -/* 807F0D74 FC 02 00 32 */ fmul f0, f2, f0 -/* 807F0D78 FC 44 00 32 */ fmul f2, f4, f0 -/* 807F0D7C FC 00 00 32 */ fmul f0, f0, f0 -/* 807F0D80 FC 01 00 32 */ fmul f0, f1, f0 -/* 807F0D84 FC 03 00 28 */ fsub f0, f3, f0 -/* 807F0D88 FC 02 00 32 */ fmul f0, f2, f0 -/* 807F0D8C FC 44 00 32 */ fmul f2, f4, f0 -/* 807F0D90 FC 00 00 32 */ fmul f0, f0, f0 -/* 807F0D94 FC 01 00 32 */ fmul f0, f1, f0 -/* 807F0D98 FC 03 00 28 */ fsub f0, f3, f0 -/* 807F0D9C FC 02 00 32 */ fmul f0, f2, f0 -/* 807F0DA0 FC 21 00 32 */ fmul f1, f1, f0 -/* 807F0DA4 FC 20 08 18 */ frsp f1, f1 -/* 807F0DA8 48 00 00 88 */ b lbl_807F0E30 -lbl_807F0DAC: -/* 807F0DAC C8 1E 00 90 */ lfd f0, 0x90(r30) -/* 807F0DB0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0DB4 40 80 00 10 */ bge lbl_807F0DC4 -/* 807F0DB8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 807F0DBC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 807F0DC0 48 00 00 70 */ b lbl_807F0E30 -lbl_807F0DC4: -/* 807F0DC4 D0 21 00 08 */ stfs f1, 8(r1) -/* 807F0DC8 80 81 00 08 */ lwz r4, 8(r1) -/* 807F0DCC 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 807F0DD0 3C 00 7F 80 */ lis r0, 0x7f80 -/* 807F0DD4 7C 03 00 00 */ cmpw r3, r0 -/* 807F0DD8 41 82 00 14 */ beq lbl_807F0DEC -/* 807F0DDC 40 80 00 40 */ bge lbl_807F0E1C -/* 807F0DE0 2C 03 00 00 */ cmpwi r3, 0 -/* 807F0DE4 41 82 00 20 */ beq lbl_807F0E04 -/* 807F0DE8 48 00 00 34 */ b lbl_807F0E1C -lbl_807F0DEC: -/* 807F0DEC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 807F0DF0 41 82 00 0C */ beq lbl_807F0DFC -/* 807F0DF4 38 00 00 01 */ li r0, 1 -/* 807F0DF8 48 00 00 28 */ b lbl_807F0E20 -lbl_807F0DFC: -/* 807F0DFC 38 00 00 02 */ li r0, 2 -/* 807F0E00 48 00 00 20 */ b lbl_807F0E20 -lbl_807F0E04: -/* 807F0E04 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 807F0E08 41 82 00 0C */ beq lbl_807F0E14 -/* 807F0E0C 38 00 00 05 */ li r0, 5 -/* 807F0E10 48 00 00 10 */ b lbl_807F0E20 -lbl_807F0E14: -/* 807F0E14 38 00 00 03 */ li r0, 3 -/* 807F0E18 48 00 00 08 */ b lbl_807F0E20 -lbl_807F0E1C: -/* 807F0E1C 38 00 00 04 */ li r0, 4 -lbl_807F0E20: -/* 807F0E20 2C 00 00 01 */ cmpwi r0, 1 -/* 807F0E24 40 82 00 0C */ bne lbl_807F0E30 -/* 807F0E28 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 807F0E2C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_807F0E30: -/* 807F0E30 C0 1E 00 5C */ lfs f0, 0x5c(r30) -/* 807F0E34 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0E38 40 80 02 6C */ bge lbl_807F10A4 -/* 807F0E3C 38 00 00 02 */ li r0, 2 -/* 807F0E40 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F0E44 7F A3 EB 78 */ mr r3, r29 -/* 807F0E48 38 80 00 0A */ li r4, 0xa -/* 807F0E4C C0 3E 00 1C */ lfs f1, 0x1c(r30) -/* 807F0E50 38 A0 00 02 */ li r5, 2 -/* 807F0E54 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0E58 4B FF F0 99 */ bl anm_init__FP10e_yc_classifUcf -/* 807F0E5C C0 1E 00 5C */ lfs f0, 0x5c(r30) -/* 807F0E60 D0 1D 06 90 */ stfs f0, 0x690(r29) -/* 807F0E64 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070494@ha */ -/* 807F0E68 38 03 04 94 */ addi r0, r3, 0x0494 /* 0x00070494@l */ -/* 807F0E6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 807F0E70 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 807F0E74 38 81 00 14 */ addi r4, r1, 0x14 -/* 807F0E78 38 A0 FF FF */ li r5, -1 -/* 807F0E7C 81 9D 05 BC */ lwz r12, 0x5bc(r29) -/* 807F0E80 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 807F0E84 7D 89 03 A6 */ mtctr r12 -/* 807F0E88 4E 80 04 21 */ bctrl -/* 807F0E8C 48 00 02 18 */ b lbl_807F10A4 -lbl_807F0E90: -/* 807F0E90 C0 3D 05 2C */ lfs f1, 0x52c(r29) -/* 807F0E94 C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 807F0E98 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0E9C 40 80 02 08 */ bge lbl_807F10A4 -/* 807F0EA0 38 00 00 03 */ li r0, 3 -/* 807F0EA4 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F0EA8 38 00 00 0F */ li r0, 0xf -/* 807F0EAC B0 1D 06 A2 */ sth r0, 0x6a2(r29) -/* 807F0EB0 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F0EB4 D0 1D 06 90 */ stfs f0, 0x690(r29) -/* 807F0EB8 48 00 01 EC */ b lbl_807F10A4 -lbl_807F0EBC: -/* 807F0EBC A8 1D 06 A2 */ lha r0, 0x6a2(r29) -/* 807F0EC0 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0EC4 40 82 01 E0 */ bne lbl_807F10A4 -/* 807F0EC8 7F A3 EB 78 */ mr r3, r29 -/* 807F0ECC 38 80 00 06 */ li r4, 6 -/* 807F0ED0 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807F0ED4 38 A0 00 00 */ li r5, 0 -/* 807F0ED8 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0EDC 4B FF F0 15 */ bl anm_init__FP10e_yc_classifUcf -/* 807F0EE0 38 00 00 04 */ li r0, 4 -/* 807F0EE4 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F0EE8 48 00 01 BC */ b lbl_807F10A4 -lbl_807F0EEC: -/* 807F0EEC 2C 1B 00 0B */ cmpwi r27, 0xb -/* 807F0EF0 40 82 00 60 */ bne lbl_807F0F50 -/* 807F0EF4 A8 1F 13 70 */ lha r0, 0x1370(r31) -/* 807F0EF8 7C 00 00 34 */ cntlzw r0, r0 -/* 807F0EFC 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 807F0F00 C0 3D 06 84 */ lfs f1, 0x684(r29) -/* 807F0F04 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 807F0F08 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0F0C 7C 00 00 26 */ mfcr r0 -/* 807F0F10 54 00 0F FE */ srwi r0, r0, 0x1f -/* 807F0F14 7C 60 00 39 */ and. r0, r3, r0 -/* 807F0F18 41 82 00 38 */ beq lbl_807F0F50 -/* 807F0F1C 38 00 00 01 */ li r0, 1 -/* 807F0F20 B0 1F 13 70 */ sth r0, 0x1370(r31) -/* 807F0F24 3C 60 00 07 */ lis r3, 0x0007 /* 0x000704B3@ha */ -/* 807F0F28 38 03 04 B3 */ addi r0, r3, 0x04B3 /* 0x000704B3@l */ -/* 807F0F2C 90 01 00 10 */ stw r0, 0x10(r1) -/* 807F0F30 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 807F0F34 38 81 00 10 */ addi r4, r1, 0x10 -/* 807F0F38 38 A0 00 00 */ li r5, 0 -/* 807F0F3C 38 C0 FF FF */ li r6, -1 -/* 807F0F40 81 9D 05 BC */ lwz r12, 0x5bc(r29) -/* 807F0F44 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807F0F48 7D 89 03 A6 */ mtctr r12 -/* 807F0F4C 4E 80 04 21 */ bctrl -lbl_807F0F50: -/* 807F0F50 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 807F0F54 C0 3D 06 74 */ lfs f1, 0x674(r29) -/* 807F0F58 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0F5C C0 7E 00 7C */ lfs f3, 0x7c(r30) -/* 807F0F60 4B A7 EA DD */ bl cLib_addCalc2__FPffff -/* 807F0F64 38 7D 04 D4 */ addi r3, r29, 0x4d4 -/* 807F0F68 C0 3E 00 98 */ lfs f1, 0x98(r30) -/* 807F0F6C C0 1D 06 78 */ lfs f0, 0x678(r29) -/* 807F0F70 EC 21 00 2A */ fadds f1, f1, f0 -/* 807F0F74 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0F78 C0 7E 00 7C */ lfs f3, 0x7c(r30) -/* 807F0F7C 4B A7 EA C1 */ bl cLib_addCalc2__FPffff -/* 807F0F80 38 7D 04 D8 */ addi r3, r29, 0x4d8 -/* 807F0F84 C0 3D 06 7C */ lfs f1, 0x67c(r29) -/* 807F0F88 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0F8C C0 7E 00 7C */ lfs f3, 0x7c(r30) -/* 807F0F90 4B A7 EA AD */ bl cLib_addCalc2__FPffff -/* 807F0F94 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F0F98 38 80 00 01 */ li r4, 1 -/* 807F0F9C 88 03 00 11 */ lbz r0, 0x11(r3) -/* 807F0FA0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 807F0FA4 40 82 00 18 */ bne lbl_807F0FBC -/* 807F0FA8 C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F0FAC C0 03 00 18 */ lfs f0, 0x18(r3) -/* 807F0FB0 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 807F0FB4 41 82 00 08 */ beq lbl_807F0FBC -/* 807F0FB8 38 80 00 00 */ li r4, 0 -lbl_807F0FBC: -/* 807F0FBC 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 807F0FC0 41 82 00 E4 */ beq lbl_807F10A4 -/* 807F0FC4 A8 1F 13 70 */ lha r0, 0x1370(r31) -/* 807F0FC8 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0FCC 40 82 00 18 */ bne lbl_807F0FE4 -/* 807F0FD0 38 00 00 0B */ li r0, 0xb -/* 807F0FD4 B0 1D 06 6E */ sth r0, 0x66e(r29) -/* 807F0FD8 38 00 00 00 */ li r0, 0 -/* 807F0FDC B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F0FE0 48 00 00 C4 */ b lbl_807F10A4 -lbl_807F0FE4: -/* 807F0FE4 7F A3 EB 78 */ mr r3, r29 -/* 807F0FE8 38 80 00 05 */ li r4, 5 -/* 807F0FEC C0 3E 00 64 */ lfs f1, 0x64(r30) -/* 807F0FF0 38 A0 00 02 */ li r5, 2 -/* 807F0FF4 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0FF8 4B FF EE F9 */ bl anm_init__FP10e_yc_classifUcf -/* 807F0FFC 38 00 00 05 */ li r0, 5 -/* 807F1000 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F1004 38 00 00 50 */ li r0, 0x50 -/* 807F1008 B0 1D 06 A2 */ sth r0, 0x6a2(r29) -/* 807F100C 48 00 00 98 */ b lbl_807F10A4 -lbl_807F1010: -/* 807F1010 A8 1D 06 A2 */ lha r0, 0x6a2(r29) -/* 807F1014 2C 00 00 00 */ cmpwi r0, 0 -/* 807F1018 40 82 00 28 */ bne lbl_807F1040 -/* 807F101C 7F A3 EB 78 */ mr r3, r29 -/* 807F1020 38 80 00 04 */ li r4, 4 -/* 807F1024 C0 3E 00 64 */ lfs f1, 0x64(r30) -/* 807F1028 38 A0 00 00 */ li r5, 0 -/* 807F102C C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F1030 4B FF EE C1 */ bl anm_init__FP10e_yc_classifUcf -/* 807F1034 38 00 00 06 */ li r0, 6 -/* 807F1038 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F103C 48 00 00 68 */ b lbl_807F10A4 -lbl_807F1040: -/* 807F1040 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 807F1044 C0 1E 00 64 */ lfs f0, 0x64(r30) -/* 807F1048 EC 01 00 2A */ fadds f0, f1, f0 -/* 807F104C D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 807F1050 48 00 00 54 */ b lbl_807F10A4 -lbl_807F1054: -/* 807F1054 2C 1B 00 1E */ cmpwi r27, 0x1e -/* 807F1058 40 82 00 0C */ bne lbl_807F1064 -/* 807F105C 38 00 00 03 */ li r0, 3 -/* 807F1060 B0 1F 13 70 */ sth r0, 0x1370(r31) -lbl_807F1064: -/* 807F1064 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F1068 38 80 00 01 */ li r4, 1 -/* 807F106C 88 03 00 11 */ lbz r0, 0x11(r3) -/* 807F1070 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 807F1074 40 82 00 18 */ bne lbl_807F108C -/* 807F1078 C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F107C C0 03 00 18 */ lfs f0, 0x18(r3) -/* 807F1080 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 807F1084 41 82 00 08 */ beq lbl_807F108C -/* 807F1088 38 80 00 00 */ li r4, 0 -lbl_807F108C: -/* 807F108C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 807F1090 41 82 00 14 */ beq lbl_807F10A4 -/* 807F1094 38 00 00 0B */ li r0, 0xb -/* 807F1098 B0 1D 06 6E */ sth r0, 0x66e(r29) -/* 807F109C 38 00 00 00 */ li r0, 0 -/* 807F10A0 B0 1D 06 70 */ sth r0, 0x670(r29) -lbl_807F10A4: -/* 807F10A4 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 807F10A8 C0 41 00 2C */ lfs f2, 0x2c(r1) -/* 807F10AC 4B A7 65 C9 */ bl cM_atan2s__Fff -/* 807F10B0 7C 7B 1B 78 */ mr r27, r3 -/* 807F10B4 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 807F10B8 EC 20 00 32 */ fmuls f1, f0, f0 -/* 807F10BC C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 807F10C0 EC 00 00 32 */ fmuls f0, f0, f0 -/* 807F10C4 EC 41 00 2A */ fadds f2, f1, f0 -/* 807F10C8 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F10CC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 807F10D0 40 81 00 0C */ ble lbl_807F10DC -/* 807F10D4 FC 00 10 34 */ frsqrte f0, f2 -/* 807F10D8 EC 40 00 B2 */ fmuls f2, f0, f2 -lbl_807F10DC: -/* 807F10DC C0 21 00 28 */ lfs f1, 0x28(r1) -/* 807F10E0 4B A7 65 95 */ bl cM_atan2s__Fff -/* 807F10E4 7C 03 00 D0 */ neg r0, r3 -/* 807F10E8 7C 1C 07 34 */ extsh r28, r0 -/* 807F10EC AB FD 04 DE */ lha r31, 0x4de(r29) -/* 807F10F0 38 7D 04 DE */ addi r3, r29, 0x4de -/* 807F10F4 7F 64 DB 78 */ mr r4, r27 -/* 807F10F8 38 A0 00 0A */ li r5, 0xa -/* 807F10FC C0 3D 06 90 */ lfs f1, 0x690(r29) -/* 807F1100 C0 1D 06 88 */ lfs f0, 0x688(r29) -/* 807F1104 EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F1108 FC 00 00 1E */ fctiwz f0, f0 -/* 807F110C D8 01 00 30 */ stfd f0, 0x30(r1) -/* 807F1110 80 C1 00 34 */ lwz r6, 0x34(r1) -/* 807F1114 4B A7 F4 F5 */ bl cLib_addCalcAngleS2__FPssss -/* 807F1118 A8 1D 06 70 */ lha r0, 0x670(r29) -/* 807F111C 2C 00 00 02 */ cmpwi r0, 2 -/* 807F1120 40 80 00 34 */ bge lbl_807F1154 -/* 807F1124 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 807F1128 7C 00 F8 50 */ subf r0, r0, r31 -/* 807F112C 54 00 28 34 */ slwi r0, r0, 5 -/* 807F1130 7C 04 07 34 */ extsh r4, r0 -/* 807F1134 2C 04 15 7C */ cmpwi r4, 0x157c -/* 807F1138 40 81 00 0C */ ble lbl_807F1144 -/* 807F113C 38 80 15 7C */ li r4, 0x157c -/* 807F1140 48 00 00 18 */ b lbl_807F1158 -lbl_807F1144: -/* 807F1144 2C 04 EA 84 */ cmpwi r4, -5500 -/* 807F1148 40 80 00 10 */ bge lbl_807F1158 -/* 807F114C 38 80 EA 84 */ li r4, -5500 -/* 807F1150 48 00 00 08 */ b lbl_807F1158 -lbl_807F1154: -/* 807F1154 38 80 00 00 */ li r4, 0 -lbl_807F1158: -/* 807F1158 38 7D 04 E0 */ addi r3, r29, 0x4e0 -/* 807F115C 38 A0 00 0A */ li r5, 0xa -/* 807F1160 C0 5E 00 50 */ lfs f2, 0x50(r30) -/* 807F1164 C0 3D 06 90 */ lfs f1, 0x690(r29) -/* 807F1168 C0 1D 06 88 */ lfs f0, 0x688(r29) -/* 807F116C EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F1170 EC 02 00 32 */ fmuls f0, f2, f0 -/* 807F1174 FC 00 00 1E */ fctiwz f0, f0 -/* 807F1178 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 807F117C 80 C1 00 34 */ lwz r6, 0x34(r1) -/* 807F1180 4B A7 F4 89 */ bl cLib_addCalcAngleS2__FPssss -/* 807F1184 38 7D 04 DC */ addi r3, r29, 0x4dc -/* 807F1188 7F 84 E3 78 */ mr r4, r28 -/* 807F118C 38 A0 00 0A */ li r5, 0xa -/* 807F1190 C0 3D 06 90 */ lfs f1, 0x690(r29) -/* 807F1194 C0 1D 06 88 */ lfs f0, 0x688(r29) -/* 807F1198 EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F119C FC 00 00 1E */ fctiwz f0, f0 -/* 807F11A0 D8 01 00 38 */ stfd f0, 0x38(r1) -/* 807F11A4 80 C1 00 3C */ lwz r6, 0x3c(r1) -/* 807F11A8 4B A7 F4 61 */ bl cLib_addCalcAngleS2__FPssss -/* 807F11AC 38 7D 06 88 */ addi r3, r29, 0x688 -/* 807F11B0 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F11B4 FC 40 08 90 */ fmr f2, f1 -/* 807F11B8 C0 7E 00 54 */ lfs f3, 0x54(r30) -/* 807F11BC 4B A7 E8 81 */ bl cLib_addCalc2__FPffff -/* 807F11C0 38 7D 05 2C */ addi r3, r29, 0x52c -/* 807F11C4 FC 20 F8 90 */ fmr f1, f31 -/* 807F11C8 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F11CC C0 7E 00 9C */ lfs f3, 0x9c(r30) -/* 807F11D0 4B A7 E8 6D */ bl cLib_addCalc2__FPffff -/* 807F11D4 3C 60 80 7F */ lis r3, S_area_dis@ha /* 0x807F2B08@ha */ -/* 807F11D8 C0 23 2B 08 */ lfs f1, S_area_dis@l(r3) /* 0x807F2B08@l */ -/* 807F11DC C0 1E 00 70 */ lfs f0, 0x70(r30) -/* 807F11E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F11E4 40 81 00 14 */ ble lbl_807F11F8 -/* 807F11E8 38 00 00 0A */ li r0, 0xa -/* 807F11EC B0 1D 06 6E */ sth r0, 0x66e(r29) -/* 807F11F0 38 00 00 00 */ li r0, 0 -/* 807F11F4 B0 1D 06 70 */ sth r0, 0x670(r29) -lbl_807F11F8: -/* 807F11F8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 807F11FC CB E1 00 60 */ lfd f31, 0x60(r1) -/* 807F1200 39 61 00 60 */ addi r11, r1, 0x60 -/* 807F1204 4B B7 10 1D */ bl _restgpr_27 -/* 807F1208 80 01 00 74 */ lwz r0, 0x74(r1) -/* 807F120C 7C 08 03 A6 */ mtlr r0 -/* 807F1210 38 21 00 70 */ addi r1, r1, 0x70 -/* 807F1214 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_f_fly__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_f_fly__FP10e_yc_class.s deleted file mode 100644 index e054e8e293e..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_f_fly__FP10e_yc_class.s +++ /dev/null @@ -1,267 +0,0 @@ -lbl_807F06AC: -/* 807F06AC 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 807F06B0 7C 08 02 A6 */ mflr r0 -/* 807F06B4 90 01 00 64 */ stw r0, 0x64(r1) -/* 807F06B8 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 807F06BC F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 807F06C0 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 807F06C4 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 807F06C8 DB A1 00 30 */ stfd f29, 0x30(r1) -/* 807F06CC F3 A1 00 38 */ psq_st f29, 56(r1), 0, 0 /* qr0 */ -/* 807F06D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F06D4 4B B7 1B 01 */ bl _savegpr_27 -/* 807F06D8 7C 7E 1B 78 */ mr r30, r3 -/* 807F06DC 3C 80 80 7F */ lis r4, lit_3715@ha /* 0x807F2864@ha */ -/* 807F06E0 3B E4 28 64 */ addi r31, r4, lit_3715@l /* 0x807F2864@l */ -/* 807F06E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F06E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F06EC 83 A4 5D AC */ lwz r29, 0x5dac(r4) -/* 807F06F0 80 83 05 B8 */ lwz r4, 0x5b8(r3) -/* 807F06F4 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 807F06F8 FC 00 00 1E */ fctiwz f0, f0 -/* 807F06FC D8 01 00 08 */ stfd f0, 8(r1) -/* 807F0700 80 81 00 0C */ lwz r4, 0xc(r1) -/* 807F0704 80 03 06 64 */ lwz r0, 0x664(r3) -/* 807F0708 2C 00 00 01 */ cmpwi r0, 1 -/* 807F070C 41 82 00 68 */ beq lbl_807F0774 -/* 807F0710 40 80 00 AC */ bge lbl_807F07BC -/* 807F0714 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0718 40 80 00 08 */ bge lbl_807F0720 -/* 807F071C 48 00 00 A0 */ b lbl_807F07BC -lbl_807F0720: -/* 807F0720 A8 1E 06 A2 */ lha r0, 0x6a2(r30) -/* 807F0724 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0728 40 82 00 94 */ bne lbl_807F07BC -/* 807F072C 2C 04 00 0E */ cmpwi r4, 0xe -/* 807F0730 40 82 00 8C */ bne lbl_807F07BC -/* 807F0734 38 00 00 01 */ li r0, 1 -/* 807F0738 90 1E 06 64 */ stw r0, 0x664(r30) -/* 807F073C 38 80 00 0C */ li r4, 0xc -/* 807F0740 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 807F0744 38 A0 00 02 */ li r5, 2 -/* 807F0748 C0 5F 00 00 */ lfs f2, 0(r31) -/* 807F074C 4B FF F7 A5 */ bl anm_init__FP10e_yc_classifUcf -/* 807F0750 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 807F0754 4B A7 72 01 */ bl cM_rndF__Ff -/* 807F0758 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 807F075C EC 00 08 2A */ fadds f0, f0, f1 -/* 807F0760 FC 00 00 1E */ fctiwz f0, f0 -/* 807F0764 D8 01 00 08 */ stfd f0, 8(r1) -/* 807F0768 80 01 00 0C */ lwz r0, 0xc(r1) -/* 807F076C B0 1E 06 A2 */ sth r0, 0x6a2(r30) -/* 807F0770 48 00 00 4C */ b lbl_807F07BC -lbl_807F0774: -/* 807F0774 A8 1E 06 A2 */ lha r0, 0x6a2(r30) -/* 807F0778 2C 00 00 00 */ cmpwi r0, 0 -/* 807F077C 40 82 00 40 */ bne lbl_807F07BC -/* 807F0780 38 00 00 00 */ li r0, 0 -/* 807F0784 90 1E 06 64 */ stw r0, 0x664(r30) -/* 807F0788 38 80 00 09 */ li r4, 9 -/* 807F078C C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 807F0790 38 A0 00 02 */ li r5, 2 -/* 807F0794 C0 5F 00 00 */ lfs f2, 0(r31) -/* 807F0798 4B FF F7 59 */ bl anm_init__FP10e_yc_classifUcf -/* 807F079C C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 807F07A0 4B A7 71 B5 */ bl cM_rndF__Ff -/* 807F07A4 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 807F07A8 EC 00 08 2A */ fadds f0, f0, f1 -/* 807F07AC FC 00 00 1E */ fctiwz f0, f0 -/* 807F07B0 D8 01 00 08 */ stfd f0, 8(r1) -/* 807F07B4 80 01 00 0C */ lwz r0, 0xc(r1) -/* 807F07B8 B0 1E 06 A2 */ sth r0, 0x6a2(r30) -lbl_807F07BC: -/* 807F07BC 3B 80 00 00 */ li r28, 0 -/* 807F07C0 A8 1E 06 70 */ lha r0, 0x670(r30) -/* 807F07C4 2C 00 00 01 */ cmpwi r0, 1 -/* 807F07C8 41 82 00 3C */ beq lbl_807F0804 -/* 807F07CC 40 80 01 6C */ bge lbl_807F0938 -/* 807F07D0 2C 00 00 00 */ cmpwi r0, 0 -/* 807F07D4 40 80 00 08 */ bge lbl_807F07DC -/* 807F07D8 48 00 01 60 */ b lbl_807F0938 -lbl_807F07DC: -/* 807F07DC C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 807F07E0 4B A7 71 75 */ bl cM_rndF__Ff -/* 807F07E4 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 807F07E8 EC 00 08 2A */ fadds f0, f0, f1 -/* 807F07EC FC 00 00 1E */ fctiwz f0, f0 -/* 807F07F0 D8 01 00 08 */ stfd f0, 8(r1) -/* 807F07F4 80 01 00 0C */ lwz r0, 0xc(r1) -/* 807F07F8 B0 1E 06 A6 */ sth r0, 0x6a6(r30) -/* 807F07FC 38 00 00 01 */ li r0, 1 -/* 807F0800 B0 1E 06 70 */ sth r0, 0x670(r30) -lbl_807F0804: -/* 807F0804 A8 1E 06 A4 */ lha r0, 0x6a4(r30) -/* 807F0808 2C 00 00 00 */ cmpwi r0, 0 -/* 807F080C 40 82 00 D0 */ bne lbl_807F08DC -/* 807F0810 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 807F0814 4B A7 71 79 */ bl cM_rndFX__Ff -/* 807F0818 C0 1E 04 A8 */ lfs f0, 0x4a8(r30) -/* 807F081C EC 20 08 2A */ fadds f1, f0, f1 -/* 807F0820 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 807F0824 EF C1 00 28 */ fsubs f30, f1, f0 -/* 807F0828 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 807F082C 4B A7 71 61 */ bl cM_rndFX__Ff -/* 807F0830 C0 1E 04 B0 */ lfs f0, 0x4b0(r30) -/* 807F0834 EC 20 08 2A */ fadds f1, f0, f1 -/* 807F0838 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 807F083C EF E1 00 28 */ fsubs f31, f1, f0 -/* 807F0840 EC 3E 07 B2 */ fmuls f1, f30, f30 -/* 807F0844 EC 1F 07 F2 */ fmuls f0, f31, f31 -/* 807F0848 EC 21 00 2A */ fadds f1, f1, f0 -/* 807F084C C0 1F 00 04 */ lfs f0, 4(r31) -/* 807F0850 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0854 40 81 00 0C */ ble lbl_807F0860 -/* 807F0858 FC 00 08 34 */ frsqrte f0, f1 -/* 807F085C EC 20 00 72 */ fmuls f1, f0, f1 -lbl_807F0860: -/* 807F0860 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 807F0864 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0868 40 81 00 74 */ ble lbl_807F08DC -/* 807F086C C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 807F0870 4B A7 70 E5 */ bl cM_rndF__Ff -/* 807F0874 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 807F0878 EC 00 08 2A */ fadds f0, f0, f1 -/* 807F087C FC 00 00 1E */ fctiwz f0, f0 -/* 807F0880 D8 01 00 08 */ stfd f0, 8(r1) -/* 807F0884 80 01 00 0C */ lwz r0, 0xc(r1) -/* 807F0888 B0 1E 06 A4 */ sth r0, 0x6a4(r30) -/* 807F088C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 807F0890 EC 1E 00 2A */ fadds f0, f30, f0 -/* 807F0894 D0 1E 06 74 */ stfs f0, 0x674(r30) -/* 807F0898 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 807F089C 4B A7 70 B9 */ bl cM_rndF__Ff -/* 807F08A0 C0 5F 00 5C */ lfs f2, 0x5c(r31) -/* 807F08A4 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 807F08A8 EC 02 00 2A */ fadds f0, f2, f0 -/* 807F08AC EC 00 08 2A */ fadds f0, f0, f1 -/* 807F08B0 D0 1E 06 78 */ stfs f0, 0x678(r30) -/* 807F08B4 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 807F08B8 EC 1F 00 2A */ fadds f0, f31, f0 -/* 807F08BC D0 1E 06 7C */ stfs f0, 0x67c(r30) -/* 807F08C0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 807F08C4 D0 1E 06 88 */ stfs f0, 0x688(r30) -/* 807F08C8 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 807F08CC 4B A7 70 89 */ bl cM_rndF__Ff -/* 807F08D0 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 807F08D4 EC 00 08 2A */ fadds f0, f0, f1 -/* 807F08D8 D0 1E 06 90 */ stfs f0, 0x690(r30) -lbl_807F08DC: -/* 807F08DC A8 1E 06 A6 */ lha r0, 0x6a6(r30) -/* 807F08E0 2C 00 00 00 */ cmpwi r0, 0 -/* 807F08E4 40 82 00 1C */ bne lbl_807F0900 -/* 807F08E8 3C 60 80 7F */ lis r3, S_area_dis@ha /* 0x807F2B08@ha */ -/* 807F08EC C0 23 2B 08 */ lfs f1, S_area_dis@l(r3) /* 0x807F2B08@l */ -/* 807F08F0 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 807F08F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F08F8 40 80 00 08 */ bge lbl_807F0900 -/* 807F08FC 3B 80 00 01 */ li r28, 1 -lbl_807F0900: -/* 807F0900 7F 80 07 74 */ extsb r0, r28 -/* 807F0904 2C 00 00 01 */ cmpwi r0, 1 -/* 807F0908 40 82 00 18 */ bne lbl_807F0920 -/* 807F090C 38 00 00 0C */ li r0, 0xc -/* 807F0910 B0 1E 06 6E */ sth r0, 0x66e(r30) -/* 807F0914 38 00 00 00 */ li r0, 0 -/* 807F0918 B0 1E 06 70 */ sth r0, 0x670(r30) -/* 807F091C 48 00 00 1C */ b lbl_807F0938 -lbl_807F0920: -/* 807F0920 2C 00 00 02 */ cmpwi r0, 2 -/* 807F0924 40 82 00 14 */ bne lbl_807F0938 -/* 807F0928 38 00 00 0C */ li r0, 0xc -/* 807F092C B0 1E 06 6E */ sth r0, 0x66e(r30) -/* 807F0930 38 00 00 00 */ li r0, 0 -/* 807F0934 B0 1E 06 70 */ sth r0, 0x670(r30) -lbl_807F0938: -/* 807F0938 C0 3E 06 74 */ lfs f1, 0x674(r30) -/* 807F093C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 807F0940 EF E1 00 28 */ fsubs f31, f1, f0 -/* 807F0944 C0 3E 06 78 */ lfs f1, 0x678(r30) -/* 807F0948 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 807F094C EF A1 00 28 */ fsubs f29, f1, f0 -/* 807F0950 C0 3E 06 7C */ lfs f1, 0x67c(r30) -/* 807F0954 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 807F0958 EF C1 00 28 */ fsubs f30, f1, f0 -/* 807F095C FC 20 F8 90 */ fmr f1, f31 -/* 807F0960 FC 40 F0 90 */ fmr f2, f30 -/* 807F0964 4B A7 6D 11 */ bl cM_atan2s__Fff -/* 807F0968 7C 7C 1B 78 */ mr r28, r3 -/* 807F096C EC 3F 07 F2 */ fmuls f1, f31, f31 -/* 807F0970 EC 1E 07 B2 */ fmuls f0, f30, f30 -/* 807F0974 EC 41 00 2A */ fadds f2, f1, f0 -/* 807F0978 C0 1F 00 04 */ lfs f0, 4(r31) -/* 807F097C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 807F0980 40 81 00 0C */ ble lbl_807F098C -/* 807F0984 FC 00 10 34 */ frsqrte f0, f2 -/* 807F0988 EC 40 00 B2 */ fmuls f2, f0, f2 -lbl_807F098C: -/* 807F098C FC 20 E8 90 */ fmr f1, f29 -/* 807F0990 4B A7 6C E5 */ bl cM_atan2s__Fff -/* 807F0994 7C 03 00 D0 */ neg r0, r3 -/* 807F0998 7C 1D 07 34 */ extsh r29, r0 -/* 807F099C AB 7E 04 DE */ lha r27, 0x4de(r30) -/* 807F09A0 38 7E 04 DE */ addi r3, r30, 0x4de -/* 807F09A4 7F 84 E3 78 */ mr r4, r28 -/* 807F09A8 38 A0 00 0A */ li r5, 0xa -/* 807F09AC C0 3E 06 90 */ lfs f1, 0x690(r30) -/* 807F09B0 C0 1E 06 88 */ lfs f0, 0x688(r30) -/* 807F09B4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F09B8 FC 00 00 1E */ fctiwz f0, f0 -/* 807F09BC D8 01 00 08 */ stfd f0, 8(r1) -/* 807F09C0 80 C1 00 0C */ lwz r6, 0xc(r1) -/* 807F09C4 4B A7 FC 45 */ bl cLib_addCalcAngleS2__FPssss -/* 807F09C8 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 807F09CC 7C 00 D8 50 */ subf r0, r0, r27 -/* 807F09D0 54 00 28 34 */ slwi r0, r0, 5 -/* 807F09D4 7C 04 07 34 */ extsh r4, r0 -/* 807F09D8 2C 04 15 7C */ cmpwi r4, 0x157c -/* 807F09DC 40 81 00 0C */ ble lbl_807F09E8 -/* 807F09E0 38 80 15 7C */ li r4, 0x157c -/* 807F09E4 48 00 00 10 */ b lbl_807F09F4 -lbl_807F09E8: -/* 807F09E8 2C 04 EA 84 */ cmpwi r4, -5500 -/* 807F09EC 40 80 00 08 */ bge lbl_807F09F4 -/* 807F09F0 38 80 EA 84 */ li r4, -5500 -lbl_807F09F4: -/* 807F09F4 38 7E 04 E0 */ addi r3, r30, 0x4e0 -/* 807F09F8 38 A0 00 0A */ li r5, 0xa -/* 807F09FC C0 5F 00 50 */ lfs f2, 0x50(r31) -/* 807F0A00 C0 3E 06 90 */ lfs f1, 0x690(r30) -/* 807F0A04 C0 1E 06 88 */ lfs f0, 0x688(r30) -/* 807F0A08 EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F0A0C EC 02 00 32 */ fmuls f0, f2, f0 -/* 807F0A10 FC 00 00 1E */ fctiwz f0, f0 -/* 807F0A14 D8 01 00 08 */ stfd f0, 8(r1) -/* 807F0A18 80 C1 00 0C */ lwz r6, 0xc(r1) -/* 807F0A1C 4B A7 FB ED */ bl cLib_addCalcAngleS2__FPssss -/* 807F0A20 38 7E 04 DC */ addi r3, r30, 0x4dc -/* 807F0A24 7F A4 EB 78 */ mr r4, r29 -/* 807F0A28 38 A0 00 0A */ li r5, 0xa -/* 807F0A2C C0 3E 06 90 */ lfs f1, 0x690(r30) -/* 807F0A30 C0 1E 06 88 */ lfs f0, 0x688(r30) -/* 807F0A34 EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F0A38 FC 00 00 1E */ fctiwz f0, f0 -/* 807F0A3C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F0A40 80 C1 00 14 */ lwz r6, 0x14(r1) -/* 807F0A44 4B A7 FB C5 */ bl cLib_addCalcAngleS2__FPssss -/* 807F0A48 38 7E 06 88 */ addi r3, r30, 0x688 -/* 807F0A4C C0 3F 00 00 */ lfs f1, 0(r31) -/* 807F0A50 FC 40 08 90 */ fmr f2, f1 -/* 807F0A54 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 807F0A58 4B A7 EF E5 */ bl cLib_addCalc2__FPffff -/* 807F0A5C 38 7E 05 2C */ addi r3, r30, 0x52c -/* 807F0A60 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 807F0A64 C0 5F 00 00 */ lfs f2, 0(r31) -/* 807F0A68 FC 60 10 90 */ fmr f3, f2 -/* 807F0A6C 4B A7 EF D1 */ bl cLib_addCalc2__FPffff -/* 807F0A70 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 807F0A74 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 807F0A78 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 807F0A7C CB C1 00 40 */ lfd f30, 0x40(r1) -/* 807F0A80 E3 A1 00 38 */ psq_l f29, 56(r1), 0, 0 /* qr0 */ -/* 807F0A84 CB A1 00 30 */ lfd f29, 0x30(r1) -/* 807F0A88 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F0A8C 4B B7 17 95 */ bl _restgpr_27 -/* 807F0A90 80 01 00 64 */ lwz r0, 0x64(r1) -/* 807F0A94 7C 08 03 A6 */ mtlr r0 -/* 807F0A98 38 21 00 60 */ addi r1, r1, 0x60 -/* 807F0A9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_fly__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_fly__FP10e_yc_class.s deleted file mode 100644 index a15b63302b1..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_fly__FP10e_yc_class.s +++ /dev/null @@ -1,339 +0,0 @@ -lbl_807F01AC: -/* 807F01AC 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 807F01B0 7C 08 02 A6 */ mflr r0 -/* 807F01B4 90 01 00 94 */ stw r0, 0x94(r1) -/* 807F01B8 DB E1 00 80 */ stfd f31, 0x80(r1) -/* 807F01BC F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* qr0 */ -/* 807F01C0 DB C1 00 70 */ stfd f30, 0x70(r1) -/* 807F01C4 F3 C1 00 78 */ psq_st f30, 120(r1), 0, 0 /* qr0 */ -/* 807F01C8 DB A1 00 60 */ stfd f29, 0x60(r1) -/* 807F01CC F3 A1 00 68 */ psq_st f29, 104(r1), 0, 0 /* qr0 */ -/* 807F01D0 DB 81 00 50 */ stfd f28, 0x50(r1) -/* 807F01D4 F3 81 00 58 */ psq_st f28, 88(r1), 0, 0 /* qr0 */ -/* 807F01D8 DB 61 00 40 */ stfd f27, 0x40(r1) -/* 807F01DC F3 61 00 48 */ psq_st f27, 72(r1), 0, 0 /* qr0 */ -/* 807F01E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 807F01E4 4B B7 1F F1 */ bl _savegpr_27 -/* 807F01E8 7C 7D 1B 78 */ mr r29, r3 -/* 807F01EC 3C 60 80 7F */ lis r3, lit_3715@ha /* 0x807F2864@ha */ -/* 807F01F0 3B C3 28 64 */ addi r30, r3, lit_3715@l /* 0x807F2864@l */ -/* 807F01F4 80 1D 06 AC */ lwz r0, 0x6ac(r29) -/* 807F01F8 90 01 00 08 */ stw r0, 8(r1) -/* 807F01FC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 807F0200 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 807F0204 38 81 00 08 */ addi r4, r1, 8 -/* 807F0208 4B 82 95 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 807F020C 7C 7F 1B 78 */ mr r31, r3 -/* 807F0210 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F0214 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 807F0218 FC 00 00 1E */ fctiwz f0, f0 -/* 807F021C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F0220 80 61 00 14 */ lwz r3, 0x14(r1) -/* 807F0224 C3 FE 00 04 */ lfs f31, 4(r30) -/* 807F0228 C3 DE 00 00 */ lfs f30, 0(r30) -/* 807F022C 80 1D 06 64 */ lwz r0, 0x664(r29) -/* 807F0230 2C 00 00 01 */ cmpwi r0, 1 -/* 807F0234 41 82 00 70 */ beq lbl_807F02A4 -/* 807F0238 40 80 00 B8 */ bge lbl_807F02F0 -/* 807F023C 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0240 40 80 00 0C */ bge lbl_807F024C -/* 807F0244 48 00 00 AC */ b lbl_807F02F0 -/* 807F0248 48 00 00 A8 */ b lbl_807F02F0 -lbl_807F024C: -/* 807F024C A8 1D 06 A2 */ lha r0, 0x6a2(r29) -/* 807F0250 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0254 40 82 00 9C */ bne lbl_807F02F0 -/* 807F0258 2C 03 00 0E */ cmpwi r3, 0xe -/* 807F025C 40 82 00 94 */ bne lbl_807F02F0 -/* 807F0260 38 00 00 01 */ li r0, 1 -/* 807F0264 90 1D 06 64 */ stw r0, 0x664(r29) -/* 807F0268 7F A3 EB 78 */ mr r3, r29 -/* 807F026C 38 80 00 0C */ li r4, 0xc -/* 807F0270 C0 3E 00 14 */ lfs f1, 0x14(r30) -/* 807F0274 38 A0 00 02 */ li r5, 2 -/* 807F0278 FC 40 F0 90 */ fmr f2, f30 -/* 807F027C 4B FF FC 75 */ bl anm_init__FP10e_yc_classifUcf -/* 807F0280 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 807F0284 4B A7 76 D1 */ bl cM_rndF__Ff -/* 807F0288 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 807F028C EC 00 08 2A */ fadds f0, f0, f1 -/* 807F0290 FC 00 00 1E */ fctiwz f0, f0 -/* 807F0294 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F0298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F029C B0 1D 06 A2 */ sth r0, 0x6a2(r29) -/* 807F02A0 48 00 00 50 */ b lbl_807F02F0 -lbl_807F02A4: -/* 807F02A4 A8 1D 06 A2 */ lha r0, 0x6a2(r29) -/* 807F02A8 2C 00 00 00 */ cmpwi r0, 0 -/* 807F02AC 40 82 00 44 */ bne lbl_807F02F0 -/* 807F02B0 38 00 00 00 */ li r0, 0 -/* 807F02B4 90 1D 06 64 */ stw r0, 0x664(r29) -/* 807F02B8 7F A3 EB 78 */ mr r3, r29 -/* 807F02BC 38 80 00 09 */ li r4, 9 -/* 807F02C0 C0 3E 00 1C */ lfs f1, 0x1c(r30) -/* 807F02C4 38 A0 00 02 */ li r5, 2 -/* 807F02C8 FC 40 F0 90 */ fmr f2, f30 -/* 807F02CC 4B FF FC 25 */ bl anm_init__FP10e_yc_classifUcf -/* 807F02D0 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 807F02D4 4B A7 76 81 */ bl cM_rndF__Ff -/* 807F02D8 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 807F02DC EC 00 08 2A */ fadds f0, f0, f1 -/* 807F02E0 FC 00 00 1E */ fctiwz f0, f0 -/* 807F02E4 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F02E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F02EC B0 1D 06 A2 */ sth r0, 0x6a2(r29) -lbl_807F02F0: -/* 807F02F0 A8 1D 06 70 */ lha r0, 0x670(r29) -/* 807F02F4 28 00 00 06 */ cmplwi r0, 6 -/* 807F02F8 41 81 02 28 */ bgt lbl_807F0520 -/* 807F02FC 3C 60 80 7F */ lis r3, lit_3878@ha /* 0x807F2954@ha */ -/* 807F0300 38 63 29 54 */ addi r3, r3, lit_3878@l /* 0x807F2954@l */ -/* 807F0304 54 00 10 3A */ slwi r0, r0, 2 -/* 807F0308 7C 03 00 2E */ lwzx r0, r3, r0 -/* 807F030C 7C 09 03 A6 */ mtctr r0 -/* 807F0310 4E 80 04 20 */ bctr -lbl_807F0314: -/* 807F0314 38 00 00 01 */ li r0, 1 -/* 807F0318 B0 1D 06 70 */ sth r0, 0x670(r29) -lbl_807F031C: -/* 807F031C C3 FE 00 20 */ lfs f31, 0x20(r30) -/* 807F0320 A8 1D 06 A4 */ lha r0, 0x6a4(r29) -/* 807F0324 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0328 40 82 01 F8 */ bne lbl_807F0520 -/* 807F032C C0 3E 00 24 */ lfs f1, 0x24(r30) -/* 807F0330 4B A7 76 5D */ bl cM_rndFX__Ff -/* 807F0334 C0 1D 04 A8 */ lfs f0, 0x4a8(r29) -/* 807F0338 EC 20 08 2A */ fadds f1, f0, f1 -/* 807F033C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 807F0340 EF 81 00 28 */ fsubs f28, f1, f0 -/* 807F0344 C0 3E 00 24 */ lfs f1, 0x24(r30) -/* 807F0348 4B A7 76 45 */ bl cM_rndFX__Ff -/* 807F034C C0 1D 04 B0 */ lfs f0, 0x4b0(r29) -/* 807F0350 EC 20 08 2A */ fadds f1, f0, f1 -/* 807F0354 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 807F0358 EF 61 00 28 */ fsubs f27, f1, f0 -/* 807F035C EC 3C 07 32 */ fmuls f1, f28, f28 -/* 807F0360 EC 1B 06 F2 */ fmuls f0, f27, f27 -/* 807F0364 EC 21 00 2A */ fadds f1, f1, f0 -/* 807F0368 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F036C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0370 40 81 00 0C */ ble lbl_807F037C -/* 807F0374 FC 00 08 34 */ frsqrte f0, f1 -/* 807F0378 EC 20 00 72 */ fmuls f1, f0, f1 -lbl_807F037C: -/* 807F037C C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 807F0380 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0384 40 81 01 9C */ ble lbl_807F0520 -/* 807F0388 C0 3E 00 2C */ lfs f1, 0x2c(r30) -/* 807F038C 4B A7 75 C9 */ bl cM_rndF__Ff -/* 807F0390 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 807F0394 EC 00 08 2A */ fadds f0, f0, f1 -/* 807F0398 FC 00 00 1E */ fctiwz f0, f0 -/* 807F039C D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F03A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807F03A4 B0 1D 06 A4 */ sth r0, 0x6a4(r29) -/* 807F03A8 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 807F03AC EC 1C 00 2A */ fadds f0, f28, f0 -/* 807F03B0 D0 1D 06 74 */ stfs f0, 0x674(r29) -/* 807F03B4 C0 1D 04 AC */ lfs f0, 0x4ac(r29) -/* 807F03B8 D0 1D 06 78 */ stfs f0, 0x678(r29) -/* 807F03BC C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 807F03C0 EC 1B 00 2A */ fadds f0, f27, f0 -/* 807F03C4 D0 1D 06 7C */ stfs f0, 0x67c(r29) -/* 807F03C8 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F03CC D0 1D 06 88 */ stfs f0, 0x688(r29) -/* 807F03D0 C0 3E 00 30 */ lfs f1, 0x30(r30) -/* 807F03D4 4B A7 75 81 */ bl cM_rndF__Ff -/* 807F03D8 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 807F03DC EC 00 08 2A */ fadds f0, f0, f1 -/* 807F03E0 D0 1D 06 90 */ stfs f0, 0x690(r29) -/* 807F03E4 48 00 01 3C */ b lbl_807F0520 -lbl_807F03E8: -/* 807F03E8 C3 FE 00 20 */ lfs f31, 0x20(r30) -/* 807F03EC C0 1D 04 A8 */ lfs f0, 0x4a8(r29) -/* 807F03F0 D0 1D 06 74 */ stfs f0, 0x674(r29) -/* 807F03F4 C0 1D 04 AC */ lfs f0, 0x4ac(r29) -/* 807F03F8 D0 1D 06 78 */ stfs f0, 0x678(r29) -/* 807F03FC C0 1D 04 B0 */ lfs f0, 0x4b0(r29) -/* 807F0400 D0 1D 06 7C */ stfs f0, 0x67c(r29) -/* 807F0404 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 807F0408 D0 1D 06 90 */ stfs f0, 0x690(r29) -/* 807F040C C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F0410 D0 3D 06 8C */ stfs f1, 0x68c(r29) -/* 807F0414 7F A3 EB 78 */ mr r3, r29 -/* 807F0418 38 80 00 0C */ li r4, 0xc -/* 807F041C 38 A0 00 02 */ li r5, 2 -/* 807F0420 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0424 4B FF FA CD */ bl anm_init__FP10e_yc_classifUcf -/* 807F0428 38 00 00 02 */ li r0, 2 -/* 807F042C 90 1D 06 64 */ stw r0, 0x664(r29) -/* 807F0430 48 00 00 F0 */ b lbl_807F0520 -lbl_807F0434: -/* 807F0434 C3 FE 00 20 */ lfs f31, 0x20(r30) -/* 807F0438 A8 1F 13 72 */ lha r0, 0x1372(r31) -/* 807F043C 2C 00 00 C8 */ cmpwi r0, 0xc8 -/* 807F0440 40 81 00 0C */ ble lbl_807F044C -/* 807F0444 C3 FE 00 34 */ lfs f31, 0x34(r30) -/* 807F0448 C3 DE 00 38 */ lfs f30, 0x38(r30) -lbl_807F044C: -/* 807F044C C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 807F0450 D0 1D 06 74 */ stfs f0, 0x674(r29) -/* 807F0454 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 807F0458 D0 1D 06 78 */ stfs f0, 0x678(r29) -/* 807F045C C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 807F0460 D0 1D 06 7C */ stfs f0, 0x67c(r29) -/* 807F0464 C0 3D 06 78 */ lfs f1, 0x678(r29) -/* 807F0468 C0 1E 00 2C */ lfs f0, 0x2c(r30) -/* 807F046C EC 01 00 2A */ fadds f0, f1, f0 -/* 807F0470 D0 1D 06 78 */ stfs f0, 0x678(r29) -/* 807F0474 48 00 00 AC */ b lbl_807F0520 -lbl_807F0478: -/* 807F0478 C3 DE 00 3C */ lfs f30, 0x3c(r30) -/* 807F047C A8 1F 13 72 */ lha r0, 0x1372(r31) -/* 807F0480 2C 00 00 1E */ cmpwi r0, 0x1e -/* 807F0484 40 82 00 1C */ bne lbl_807F04A0 -/* 807F0488 7F A3 EB 78 */ mr r3, r29 -/* 807F048C 38 80 00 0A */ li r4, 0xa -/* 807F0490 C0 3E 00 1C */ lfs f1, 0x1c(r30) -/* 807F0494 38 A0 00 02 */ li r5, 2 -/* 807F0498 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F049C 4B FF FA 55 */ bl anm_init__FP10e_yc_classifUcf -lbl_807F04A0: -/* 807F04A0 A8 1F 13 72 */ lha r0, 0x1372(r31) -/* 807F04A4 2C 00 00 3C */ cmpwi r0, 0x3c -/* 807F04A8 40 82 00 1C */ bne lbl_807F04C4 -/* 807F04AC 7F A3 EB 78 */ mr r3, r29 -/* 807F04B0 38 80 00 15 */ li r4, 0x15 -/* 807F04B4 C0 3E 00 1C */ lfs f1, 0x1c(r30) -/* 807F04B8 38 A0 00 02 */ li r5, 2 -/* 807F04BC C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F04C0 4B FF FA 31 */ bl anm_init__FP10e_yc_classifUcf -lbl_807F04C4: -/* 807F04C4 C0 1E 00 30 */ lfs f0, 0x30(r30) -/* 807F04C8 D0 1D 06 90 */ stfs f0, 0x690(r29) -/* 807F04CC 48 00 00 54 */ b lbl_807F0520 -lbl_807F04D0: -/* 807F04D0 C0 3D 06 94 */ lfs f1, 0x694(r29) -/* 807F04D4 C0 1D 06 98 */ lfs f0, 0x698(r29) -/* 807F04D8 EC 01 00 2A */ fadds f0, f1, f0 -/* 807F04DC D0 1D 06 94 */ stfs f0, 0x694(r29) -/* 807F04E0 38 7D 06 98 */ addi r3, r29, 0x698 -/* 807F04E4 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F04E8 C0 5E 00 40 */ lfs f2, 0x40(r30) -/* 807F04EC 4B A7 F5 95 */ bl cLib_addCalc0__FPfff -/* 807F04F0 48 00 00 30 */ b lbl_807F0520 -lbl_807F04F4: -/* 807F04F4 38 7D 06 94 */ addi r3, r29, 0x694 -/* 807F04F8 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F04FC FC 40 08 90 */ fmr f2, f1 -/* 807F0500 4B A7 F5 81 */ bl cLib_addCalc0__FPfff -/* 807F0504 38 7D 04 D4 */ addi r3, r29, 0x4d4 -/* 807F0508 C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 807F050C C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 807F0510 EC 21 00 2A */ fadds f1, f1, f0 -/* 807F0514 C0 5E 00 48 */ lfs f2, 0x48(r30) -/* 807F0518 C0 7E 00 4C */ lfs f3, 0x4c(r30) -/* 807F051C 4B A7 F5 21 */ bl cLib_addCalc2__FPffff -lbl_807F0520: -/* 807F0520 C0 3D 06 74 */ lfs f1, 0x674(r29) -/* 807F0524 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 807F0528 EF A1 00 28 */ fsubs f29, f1, f0 -/* 807F052C C0 3D 06 78 */ lfs f1, 0x678(r29) -/* 807F0530 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 807F0534 EF 61 00 28 */ fsubs f27, f1, f0 -/* 807F0538 C0 3D 06 7C */ lfs f1, 0x67c(r29) -/* 807F053C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 807F0540 EF 81 00 28 */ fsubs f28, f1, f0 -/* 807F0544 FC 20 E8 90 */ fmr f1, f29 -/* 807F0548 FC 40 E0 90 */ fmr f2, f28 -/* 807F054C 4B A7 71 29 */ bl cM_atan2s__Fff -/* 807F0550 7C 7F 1B 78 */ mr r31, r3 -/* 807F0554 EC 3D 07 72 */ fmuls f1, f29, f29 -/* 807F0558 EC 1C 07 32 */ fmuls f0, f28, f28 -/* 807F055C EC 41 00 2A */ fadds f2, f1, f0 -/* 807F0560 C0 1E 00 04 */ lfs f0, 4(r30) -/* 807F0564 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 807F0568 40 81 00 0C */ ble lbl_807F0574 -/* 807F056C FC 00 10 34 */ frsqrte f0, f2 -/* 807F0570 EC 40 00 B2 */ fmuls f2, f0, f2 -lbl_807F0574: -/* 807F0574 FC 20 D8 90 */ fmr f1, f27 -/* 807F0578 4B A7 70 FD */ bl cM_atan2s__Fff -/* 807F057C 7C 03 00 D0 */ neg r0, r3 -/* 807F0580 7C 1C 07 34 */ extsh r28, r0 -/* 807F0584 AB 7D 04 DE */ lha r27, 0x4de(r29) -/* 807F0588 38 7D 04 DE */ addi r3, r29, 0x4de -/* 807F058C 7F E4 FB 78 */ mr r4, r31 -/* 807F0590 38 A0 00 20 */ li r5, 0x20 -/* 807F0594 C0 3D 06 90 */ lfs f1, 0x690(r29) -/* 807F0598 C0 1D 06 88 */ lfs f0, 0x688(r29) -/* 807F059C EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F05A0 FC 00 00 1E */ fctiwz f0, f0 -/* 807F05A4 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F05A8 80 C1 00 14 */ lwz r6, 0x14(r1) -/* 807F05AC 4B A8 00 5D */ bl cLib_addCalcAngleS2__FPssss -/* 807F05B0 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 807F05B4 7C 00 D8 50 */ subf r0, r0, r27 -/* 807F05B8 54 00 28 34 */ slwi r0, r0, 5 -/* 807F05BC 7C 04 07 34 */ extsh r4, r0 -/* 807F05C0 2C 04 15 7C */ cmpwi r4, 0x157c -/* 807F05C4 40 81 00 0C */ ble lbl_807F05D0 -/* 807F05C8 38 80 15 7C */ li r4, 0x157c -/* 807F05CC 48 00 00 10 */ b lbl_807F05DC -lbl_807F05D0: -/* 807F05D0 2C 04 EA 84 */ cmpwi r4, -5500 -/* 807F05D4 40 80 00 08 */ bge lbl_807F05DC -/* 807F05D8 38 80 EA 84 */ li r4, -5500 -lbl_807F05DC: -/* 807F05DC 38 7D 04 E0 */ addi r3, r29, 0x4e0 -/* 807F05E0 38 A0 00 0A */ li r5, 0xa -/* 807F05E4 C0 5E 00 50 */ lfs f2, 0x50(r30) -/* 807F05E8 C0 3D 06 90 */ lfs f1, 0x690(r29) -/* 807F05EC C0 1D 06 88 */ lfs f0, 0x688(r29) -/* 807F05F0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F05F4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 807F05F8 FC 00 00 1E */ fctiwz f0, f0 -/* 807F05FC D8 01 00 10 */ stfd f0, 0x10(r1) -/* 807F0600 80 C1 00 14 */ lwz r6, 0x14(r1) -/* 807F0604 4B A8 00 05 */ bl cLib_addCalcAngleS2__FPssss -/* 807F0608 38 7D 04 DC */ addi r3, r29, 0x4dc -/* 807F060C 7F 84 E3 78 */ mr r4, r28 -/* 807F0610 38 A0 00 20 */ li r5, 0x20 -/* 807F0614 C0 3D 06 90 */ lfs f1, 0x690(r29) -/* 807F0618 C0 1D 06 8C */ lfs f0, 0x68c(r29) -/* 807F061C EC 01 00 32 */ fmuls f0, f1, f0 -/* 807F0620 FC 00 00 1E */ fctiwz f0, f0 -/* 807F0624 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 807F0628 80 C1 00 1C */ lwz r6, 0x1c(r1) -/* 807F062C 4B A7 FF DD */ bl cLib_addCalcAngleS2__FPssss -/* 807F0630 38 7D 06 88 */ addi r3, r29, 0x688 -/* 807F0634 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F0638 FC 40 08 90 */ fmr f2, f1 -/* 807F063C C0 7E 00 54 */ lfs f3, 0x54(r30) -/* 807F0640 4B A7 F3 FD */ bl cLib_addCalc2__FPffff -/* 807F0644 38 7D 06 8C */ addi r3, r29, 0x68c -/* 807F0648 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 807F064C C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0650 C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 807F0654 4B A7 F3 E9 */ bl cLib_addCalc2__FPffff -/* 807F0658 38 7D 05 2C */ addi r3, r29, 0x52c -/* 807F065C FC 20 F8 90 */ fmr f1, f31 -/* 807F0660 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F0664 FC 60 F0 90 */ fmr f3, f30 -/* 807F0668 4B A7 F3 D5 */ bl cLib_addCalc2__FPffff -/* 807F066C E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* qr0 */ -/* 807F0670 CB E1 00 80 */ lfd f31, 0x80(r1) -/* 807F0674 E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 /* qr0 */ -/* 807F0678 CB C1 00 70 */ lfd f30, 0x70(r1) -/* 807F067C E3 A1 00 68 */ psq_l f29, 104(r1), 0, 0 /* qr0 */ -/* 807F0680 CB A1 00 60 */ lfd f29, 0x60(r1) -/* 807F0684 E3 81 00 58 */ psq_l f28, 88(r1), 0, 0 /* qr0 */ -/* 807F0688 CB 81 00 50 */ lfd f28, 0x50(r1) -/* 807F068C E3 61 00 48 */ psq_l f27, 72(r1), 0, 0 /* qr0 */ -/* 807F0690 CB 61 00 40 */ lfd f27, 0x40(r1) -/* 807F0694 39 61 00 40 */ addi r11, r1, 0x40 -/* 807F0698 4B B7 1B 89 */ bl _restgpr_27 -/* 807F069C 80 01 00 94 */ lwz r0, 0x94(r1) -/* 807F06A0 7C 08 03 A6 */ mtlr r0 -/* 807F06A4 38 21 00 90 */ addi r1, r1, 0x90 -/* 807F06A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_hovering__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_hovering__FP10e_yc_class.s deleted file mode 100644 index 3f142dbe6c5..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_hovering__FP10e_yc_class.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_807F0AA0: -/* 807F0AA0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 807F0AA4 7C 08 02 A6 */ mflr r0 -/* 807F0AA8 90 01 00 34 */ stw r0, 0x34(r1) -/* 807F0AAC DB E1 00 20 */ stfd f31, 0x20(r1) -/* 807F0AB0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 807F0AB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 807F0AB8 4B B7 17 25 */ bl _savegpr_29 -/* 807F0ABC 7C 7D 1B 78 */ mr r29, r3 -/* 807F0AC0 3C 80 80 7F */ lis r4, lit_3715@ha /* 0x807F2864@ha */ -/* 807F0AC4 3B E4 28 64 */ addi r31, r4, lit_3715@l /* 0x807F2864@l */ -/* 807F0AC8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F0ACC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F0AD0 83 C4 5D AC */ lwz r30, 0x5dac(r4) -/* 807F0AD4 C3 FF 00 04 */ lfs f31, 4(r31) -/* 807F0AD8 A8 03 06 70 */ lha r0, 0x670(r3) -/* 807F0ADC 2C 00 00 01 */ cmpwi r0, 1 -/* 807F0AE0 41 82 00 54 */ beq lbl_807F0B34 -/* 807F0AE4 40 80 01 00 */ bge lbl_807F0BE4 -/* 807F0AE8 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0AEC 40 80 00 08 */ bge lbl_807F0AF4 -/* 807F0AF0 48 00 00 F4 */ b lbl_807F0BE4 -lbl_807F0AF4: -/* 807F0AF4 38 80 00 15 */ li r4, 0x15 -/* 807F0AF8 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 807F0AFC 38 A0 00 02 */ li r5, 2 -/* 807F0B00 C0 5F 00 00 */ lfs f2, 0(r31) -/* 807F0B04 4B FF F3 ED */ bl anm_init__FP10e_yc_classifUcf -/* 807F0B08 38 00 00 01 */ li r0, 1 -/* 807F0B0C B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F0B10 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 807F0B14 4B A7 6E 41 */ bl cM_rndF__Ff -/* 807F0B18 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 807F0B1C EC 00 08 2A */ fadds f0, f0, f1 -/* 807F0B20 FC 00 00 1E */ fctiwz f0, f0 -/* 807F0B24 D8 01 00 08 */ stfd f0, 8(r1) -/* 807F0B28 80 01 00 0C */ lwz r0, 0xc(r1) -/* 807F0B2C B0 1D 06 A2 */ sth r0, 0x6a2(r29) -/* 807F0B30 48 00 00 B4 */ b lbl_807F0BE4 -lbl_807F0B34: -/* 807F0B34 C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 807F0B38 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 807F0B3C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 807F0B40 EC 21 00 2A */ fadds f1, f1, f0 -/* 807F0B44 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 807F0B48 40 80 00 14 */ bge lbl_807F0B5C -/* 807F0B4C 38 7D 04 D4 */ addi r3, r29, 0x4d4 -/* 807F0B50 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 807F0B54 C0 7F 00 64 */ lfs f3, 0x64(r31) -/* 807F0B58 4B A7 EE E5 */ bl cLib_addCalc2__FPffff -lbl_807F0B5C: -/* 807F0B5C C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 807F0B60 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 807F0B64 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 807F0B68 EC 21 00 2A */ fadds f1, f1, f0 -/* 807F0B6C FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 807F0B70 40 81 00 14 */ ble lbl_807F0B84 -/* 807F0B74 38 7D 04 D4 */ addi r3, r29, 0x4d4 -/* 807F0B78 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 807F0B7C C0 7F 00 64 */ lfs f3, 0x64(r31) -/* 807F0B80 4B A7 EE BD */ bl cLib_addCalc2__FPffff -lbl_807F0B84: -/* 807F0B84 C0 3D 06 84 */ lfs f1, 0x684(r29) -/* 807F0B88 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 807F0B8C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0B90 40 80 00 0C */ bge lbl_807F0B9C -/* 807F0B94 C3 FF 00 68 */ lfs f31, 0x68(r31) -/* 807F0B98 48 00 00 14 */ b lbl_807F0BAC -lbl_807F0B9C: -/* 807F0B9C C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 807F0BA0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0BA4 40 81 00 08 */ ble lbl_807F0BAC -/* 807F0BA8 C3 FF 00 64 */ lfs f31, 0x64(r31) -lbl_807F0BAC: -/* 807F0BAC A8 1D 06 A2 */ lha r0, 0x6a2(r29) -/* 807F0BB0 2C 00 00 00 */ cmpwi r0, 0 -/* 807F0BB4 41 82 00 18 */ beq lbl_807F0BCC -/* 807F0BB8 3C 60 80 7F */ lis r3, S_area_dis@ha /* 0x807F2B08@ha */ -/* 807F0BBC C0 23 2B 08 */ lfs f1, S_area_dis@l(r3) /* 0x807F2B08@l */ -/* 807F0BC0 C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 807F0BC4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 807F0BC8 40 81 00 1C */ ble lbl_807F0BE4 -lbl_807F0BCC: -/* 807F0BCC 38 00 00 0A */ li r0, 0xa -/* 807F0BD0 B0 1D 06 6E */ sth r0, 0x66e(r29) -/* 807F0BD4 38 00 00 00 */ li r0, 0 -/* 807F0BD8 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F0BDC 38 00 00 01 */ li r0, 1 -/* 807F0BE0 90 1D 06 64 */ stw r0, 0x664(r29) -lbl_807F0BE4: -/* 807F0BE4 38 7D 05 2C */ addi r3, r29, 0x52c -/* 807F0BE8 FC 20 F8 90 */ fmr f1, f31 -/* 807F0BEC C0 5F 00 00 */ lfs f2, 0(r31) -/* 807F0BF0 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 807F0BF4 4B A7 EE 49 */ bl cLib_addCalc2__FPffff -/* 807F0BF8 38 7D 04 DE */ addi r3, r29, 0x4de -/* 807F0BFC A8 9D 06 80 */ lha r4, 0x680(r29) -/* 807F0C00 38 A0 00 08 */ li r5, 8 -/* 807F0C04 38 C0 02 00 */ li r6, 0x200 -/* 807F0C08 4B A7 FA 01 */ bl cLib_addCalcAngleS2__FPssss -/* 807F0C0C 38 7D 04 E0 */ addi r3, r29, 0x4e0 -/* 807F0C10 38 80 00 00 */ li r4, 0 -/* 807F0C14 38 A0 00 04 */ li r5, 4 -/* 807F0C18 38 C0 08 00 */ li r6, 0x800 -/* 807F0C1C 4B A7 F9 ED */ bl cLib_addCalcAngleS2__FPssss -/* 807F0C20 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 807F0C24 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 807F0C28 39 61 00 20 */ addi r11, r1, 0x20 -/* 807F0C2C 4B B7 15 FD */ bl _restgpr_29 -/* 807F0C30 80 01 00 34 */ lwz r0, 0x34(r1) -/* 807F0C34 7C 08 03 A6 */ mtlr r0 -/* 807F0C38 38 21 00 30 */ addi r1, r1, 0x30 -/* 807F0C3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s deleted file mode 100644 index 58a4db8aece..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s +++ /dev/null @@ -1,291 +0,0 @@ -lbl_807F1218: -/* 807F1218 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 807F121C 7C 08 02 A6 */ mflr r0 -/* 807F1220 90 01 00 44 */ stw r0, 0x44(r1) -/* 807F1224 39 61 00 40 */ addi r11, r1, 0x40 -/* 807F1228 4B B7 0F AD */ bl _savegpr_27 -/* 807F122C 7C 7D 1B 78 */ mr r29, r3 -/* 807F1230 3C 60 80 7F */ lis r3, lit_3715@ha /* 0x807F2864@ha */ -/* 807F1234 3B C3 28 64 */ addi r30, r3, lit_3715@l /* 0x807F2864@l */ -/* 807F1238 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F123C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F1240 83 83 5D AC */ lwz r28, 0x5dac(r3) -/* 807F1244 80 1D 06 AC */ lwz r0, 0x6ac(r29) -/* 807F1248 90 01 00 08 */ stw r0, 8(r1) -/* 807F124C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 807F1250 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 807F1254 38 81 00 08 */ addi r4, r1, 8 -/* 807F1258 4B 82 85 A1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 807F125C 7C 7F 1B 78 */ mr r31, r3 -/* 807F1260 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F1264 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 807F1268 FC 00 00 1E */ fctiwz f0, f0 -/* 807F126C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 807F1270 83 61 00 24 */ lwz r27, 0x24(r1) -/* 807F1274 38 00 00 0A */ li r0, 0xa -/* 807F1278 B0 1D 06 AA */ sth r0, 0x6aa(r29) -/* 807F127C 38 7D 05 2C */ addi r3, r29, 0x52c -/* 807F1280 C0 3E 00 00 */ lfs f1, 0(r30) -/* 807F1284 C0 5E 00 A0 */ lfs f2, 0xa0(r30) -/* 807F1288 4B A7 E7 F9 */ bl cLib_addCalc0__FPfff -/* 807F128C A8 1D 06 70 */ lha r0, 0x670(r29) -/* 807F1290 2C 00 00 02 */ cmpwi r0, 2 -/* 807F1294 41 82 00 D8 */ beq lbl_807F136C -/* 807F1298 40 80 00 14 */ bge lbl_807F12AC -/* 807F129C 2C 00 00 00 */ cmpwi r0, 0 -/* 807F12A0 41 82 00 18 */ beq lbl_807F12B8 -/* 807F12A4 40 80 00 74 */ bge lbl_807F1318 -/* 807F12A8 48 00 03 7C */ b lbl_807F1624 -lbl_807F12AC: -/* 807F12AC 2C 00 00 04 */ cmpwi r0, 4 -/* 807F12B0 40 80 03 74 */ bge lbl_807F1624 -/* 807F12B4 48 00 02 C8 */ b lbl_807F157C -lbl_807F12B8: -/* 807F12B8 7F A3 EB 78 */ mr r3, r29 -/* 807F12BC 38 80 00 10 */ li r4, 0x10 -/* 807F12C0 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807F12C4 38 A0 00 00 */ li r5, 0 -/* 807F12C8 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F12CC 4B FF EC 25 */ bl anm_init__FP10e_yc_classifUcf -/* 807F12D0 38 00 00 01 */ li r0, 1 -/* 807F12D4 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F12D8 3C 60 00 07 */ lis r3, 0x0007 /* 0x0007004A@ha */ -/* 807F12DC 38 03 00 4A */ addi r0, r3, 0x004A /* 0x0007004A@l */ -/* 807F12E0 90 01 00 0C */ stw r0, 0xc(r1) -/* 807F12E4 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 807F12E8 38 81 00 0C */ addi r4, r1, 0xc -/* 807F12EC 38 A0 FF FF */ li r5, -1 -/* 807F12F0 81 9D 05 BC */ lwz r12, 0x5bc(r29) -/* 807F12F4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 807F12F8 7D 89 03 A6 */ mtctr r12 -/* 807F12FC 4E 80 04 21 */ bctrl -/* 807F1300 A8 7D 05 62 */ lha r3, 0x562(r29) -/* 807F1304 38 03 FF FB */ addi r0, r3, -5 -/* 807F1308 B0 1D 05 62 */ sth r0, 0x562(r29) -/* 807F130C 38 00 00 00 */ li r0, 0 -/* 807F1310 98 1D 06 B3 */ stb r0, 0x6b3(r29) -/* 807F1314 48 00 03 10 */ b lbl_807F1624 -lbl_807F1318: -/* 807F1318 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F131C 38 80 00 01 */ li r4, 1 -/* 807F1320 88 03 00 11 */ lbz r0, 0x11(r3) -/* 807F1324 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 807F1328 40 82 00 18 */ bne lbl_807F1340 -/* 807F132C C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F1330 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 807F1334 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 807F1338 41 82 00 08 */ beq lbl_807F1340 -/* 807F133C 38 80 00 00 */ li r4, 0 -lbl_807F1340: -/* 807F1340 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 807F1344 41 82 02 E0 */ beq lbl_807F1624 -/* 807F1348 7F A3 EB 78 */ mr r3, r29 -/* 807F134C 38 80 00 14 */ li r4, 0x14 -/* 807F1350 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807F1354 38 A0 00 02 */ li r5, 2 -/* 807F1358 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F135C 4B FF EB 95 */ bl anm_init__FP10e_yc_classifUcf -/* 807F1360 38 00 00 02 */ li r0, 2 -/* 807F1364 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F1368 48 00 02 BC */ b lbl_807F1624 -lbl_807F136C: -/* 807F136C 80 1D 06 60 */ lwz r0, 0x660(r29) -/* 807F1370 2C 00 00 13 */ cmpwi r0, 0x13 -/* 807F1374 40 82 00 4C */ bne lbl_807F13C0 -/* 807F1378 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F137C 38 80 00 01 */ li r4, 1 -/* 807F1380 88 03 00 11 */ lbz r0, 0x11(r3) -/* 807F1384 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 807F1388 40 82 00 18 */ bne lbl_807F13A0 -/* 807F138C C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F1390 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 807F1394 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 807F1398 41 82 00 08 */ beq lbl_807F13A0 -/* 807F139C 38 80 00 00 */ li r4, 0 -lbl_807F13A0: -/* 807F13A0 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 807F13A4 41 82 00 1C */ beq lbl_807F13C0 -/* 807F13A8 7F A3 EB 78 */ mr r3, r29 -/* 807F13AC 38 80 00 14 */ li r4, 0x14 -/* 807F13B0 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807F13B4 38 A0 00 02 */ li r5, 2 -/* 807F13B8 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F13BC 4B FF EB 35 */ bl anm_init__FP10e_yc_classifUcf -lbl_807F13C0: -/* 807F13C0 A8 1D 05 62 */ lha r0, 0x562(r29) -/* 807F13C4 2C 00 00 00 */ cmpwi r0, 0 -/* 807F13C8 40 81 00 10 */ ble lbl_807F13D8 -/* 807F13CC A0 1D 05 8E */ lhz r0, 0x58e(r29) -/* 807F13D0 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 807F13D4 41 82 01 64 */ beq lbl_807F1538 -lbl_807F13D8: -/* 807F13D8 A0 1D 05 8E */ lhz r0, 0x58e(r29) -/* 807F13DC 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 807F13E0 B0 1D 05 8E */ sth r0, 0x58e(r29) -/* 807F13E4 7F A3 EB 78 */ mr r3, r29 -/* 807F13E8 38 80 00 13 */ li r4, 0x13 -/* 807F13EC C0 3E 00 A0 */ lfs f1, 0xa0(r30) -/* 807F13F0 38 A0 00 00 */ li r5, 0 -/* 807F13F4 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F13F8 4B FF EA F9 */ bl anm_init__FP10e_yc_classifUcf -/* 807F13FC A8 7D 05 62 */ lha r3, 0x562(r29) -/* 807F1400 38 03 FF FB */ addi r0, r3, -5 -/* 807F1404 B0 1D 05 62 */ sth r0, 0x562(r29) -/* 807F1408 A8 1D 05 62 */ lha r0, 0x562(r29) -/* 807F140C 2C 00 00 00 */ cmpwi r0, 0 -/* 807F1410 41 81 00 C0 */ bgt lbl_807F14D0 -/* 807F1414 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 807F1418 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 807F141C 90 1C 05 78 */ stw r0, 0x578(r28) -/* 807F1420 7F A3 EB 78 */ mr r3, r29 -/* 807F1424 38 80 00 12 */ li r4, 0x12 -/* 807F1428 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807F142C 38 A0 00 00 */ li r5, 0 -/* 807F1430 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F1434 4B FF EA BD */ bl anm_init__FP10e_yc_classifUcf -/* 807F1438 38 00 00 03 */ li r0, 3 -/* 807F143C B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F1440 38 00 00 05 */ li r0, 5 -/* 807F1444 B0 1F 13 70 */ sth r0, 0x1370(r31) -/* 807F1448 38 00 00 07 */ li r0, 7 -/* 807F144C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ -/* 807F1450 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ -/* 807F1454 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 807F1458 3C 80 00 04 */ lis r4, 0x0004 /* 0x00040003@ha */ -/* 807F145C 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00040003@l */ -/* 807F1460 38 A0 00 20 */ li r5, 0x20 -/* 807F1464 81 9D 05 BC */ lwz r12, 0x5bc(r29) -/* 807F1468 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 807F146C 7D 89 03 A6 */ mtctr r12 -/* 807F1470 4E 80 04 21 */ bctrl -/* 807F1474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F1478 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F147C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 807F1480 38 80 00 03 */ li r4, 3 -/* 807F1484 7F A5 EB 78 */ mr r5, r29 -/* 807F1488 38 DC 05 38 */ addi r6, r28, 0x538 -/* 807F148C 38 FC 04 E4 */ addi r7, r28, 0x4e4 -/* 807F1490 39 00 00 00 */ li r8, 0 -/* 807F1494 39 20 00 00 */ li r9, 0 -/* 807F1498 4B 85 AD 81 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl -/* 807F149C C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F14A0 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 807F14A4 C0 1E 00 00 */ lfs f0, 0(r30) -/* 807F14A8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 807F14AC D0 21 00 18 */ stfs f1, 0x18(r1) -/* 807F14B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F14B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F14B8 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 807F14BC 38 80 00 05 */ li r4, 5 -/* 807F14C0 38 A0 00 4F */ li r5, 0x4f -/* 807F14C4 38 C1 00 10 */ addi r6, r1, 0x10 -/* 807F14C8 4B 87 E5 5D */ bl StartShock__12dVibration_cFii4cXyz -/* 807F14CC 48 00 01 78 */ b lbl_807F1644 -lbl_807F14D0: -/* 807F14D0 88 7D 06 B3 */ lbz r3, 0x6b3(r29) -/* 807F14D4 38 03 00 01 */ addi r0, r3, 1 -/* 807F14D8 98 1D 06 B3 */ stb r0, 0x6b3(r29) -/* 807F14DC 88 1D 06 B3 */ lbz r0, 0x6b3(r29) -/* 807F14E0 7C 00 07 74 */ extsb r0, r0 -/* 807F14E4 2C 00 00 05 */ cmpwi r0, 5 -/* 807F14E8 41 80 00 30 */ blt lbl_807F1518 -/* 807F14EC 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 807F14F0 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 807F14F4 90 1C 05 78 */ stw r0, 0x578(r28) -/* 807F14F8 7F A3 EB 78 */ mr r3, r29 -/* 807F14FC 38 80 00 11 */ li r4, 0x11 -/* 807F1500 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807F1504 38 A0 00 00 */ li r5, 0 -/* 807F1508 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F150C 4B FF E9 E5 */ bl anm_init__FP10e_yc_classifUcf -/* 807F1510 38 00 00 03 */ li r0, 3 -/* 807F1514 B0 1D 06 70 */ sth r0, 0x670(r29) -lbl_807F1518: -/* 807F1518 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 807F151C 3C 80 00 04 */ lis r4, 0x0004 /* 0x00040003@ha */ -/* 807F1520 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00040003@l */ -/* 807F1524 38 A0 00 1E */ li r5, 0x1e -/* 807F1528 81 9D 05 BC */ lwz r12, 0x5bc(r29) -/* 807F152C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 807F1530 7D 89 03 A6 */ mtctr r12 -/* 807F1534 4E 80 04 21 */ bctrl -lbl_807F1538: -/* 807F1538 7F 83 E3 78 */ mr r3, r28 -/* 807F153C 7F A4 EB 78 */ mr r4, r29 -/* 807F1540 81 9C 06 28 */ lwz r12, 0x628(r28) -/* 807F1544 81 8C 01 E0 */ lwz r12, 0x1e0(r12) -/* 807F1548 7D 89 03 A6 */ mtctr r12 -/* 807F154C 4E 80 04 21 */ bctrl -/* 807F1550 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807F1554 40 82 00 D0 */ bne lbl_807F1624 -/* 807F1558 7F A3 EB 78 */ mr r3, r29 -/* 807F155C 38 80 00 11 */ li r4, 0x11 -/* 807F1560 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 807F1564 38 A0 00 00 */ li r5, 0 -/* 807F1568 C0 5E 00 00 */ lfs f2, 0(r30) -/* 807F156C 4B FF E9 85 */ bl anm_init__FP10e_yc_classifUcf -/* 807F1570 38 00 00 03 */ li r0, 3 -/* 807F1574 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F1578 48 00 00 AC */ b lbl_807F1624 -lbl_807F157C: -/* 807F157C C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 807F1580 C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 807F1584 EC 01 00 2A */ fadds f0, f1, f0 -/* 807F1588 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 807F158C 80 1D 06 60 */ lwz r0, 0x660(r29) -/* 807F1590 2C 00 00 12 */ cmpwi r0, 0x12 -/* 807F1594 40 82 00 14 */ bne lbl_807F15A8 -/* 807F1598 2C 1B 00 18 */ cmpwi r27, 0x18 -/* 807F159C 40 82 00 0C */ bne lbl_807F15A8 -/* 807F15A0 38 00 00 01 */ li r0, 1 -/* 807F15A4 98 1F 0A 8F */ stb r0, 0xa8f(r31) -lbl_807F15A8: -/* 807F15A8 80 7D 05 B8 */ lwz r3, 0x5b8(r29) -/* 807F15AC 38 80 00 01 */ li r4, 1 -/* 807F15B0 88 03 00 11 */ lbz r0, 0x11(r3) -/* 807F15B4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 807F15B8 40 82 00 18 */ bne lbl_807F15D0 -/* 807F15BC C0 3E 00 04 */ lfs f1, 4(r30) -/* 807F15C0 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 807F15C4 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 807F15C8 41 82 00 08 */ beq lbl_807F15D0 -/* 807F15CC 38 80 00 00 */ li r4, 0 -lbl_807F15D0: -/* 807F15D0 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 807F15D4 41 82 00 50 */ beq lbl_807F1624 -/* 807F15D8 80 1D 06 60 */ lwz r0, 0x660(r29) -/* 807F15DC 2C 00 00 12 */ cmpwi r0, 0x12 -/* 807F15E0 40 82 00 2C */ bne lbl_807F160C -/* 807F15E4 38 00 00 00 */ li r0, 0 -/* 807F15E8 B0 1D 06 6E */ sth r0, 0x66e(r29) -/* 807F15EC B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F15F0 38 00 00 01 */ li r0, 1 -/* 807F15F4 90 1D 06 64 */ stw r0, 0x664(r29) -/* 807F15F8 C0 3D 04 AC */ lfs f1, 0x4ac(r29) -/* 807F15FC C0 1E 00 70 */ lfs f0, 0x70(r30) -/* 807F1600 EC 01 00 2A */ fadds f0, f1, f0 -/* 807F1604 D0 1D 04 AC */ stfs f0, 0x4ac(r29) -/* 807F1608 48 00 00 1C */ b lbl_807F1624 -lbl_807F160C: -/* 807F160C 38 00 00 0A */ li r0, 0xa -/* 807F1610 B0 1D 06 6E */ sth r0, 0x66e(r29) -/* 807F1614 38 00 00 00 */ li r0, 0 -/* 807F1618 B0 1D 06 70 */ sth r0, 0x670(r29) -/* 807F161C 38 00 00 01 */ li r0, 1 -/* 807F1620 90 1D 06 64 */ stw r0, 0x664(r29) -lbl_807F1624: -/* 807F1624 38 7D 04 DE */ addi r3, r29, 0x4de -/* 807F1628 A8 9C 04 E6 */ lha r4, 0x4e6(r28) -/* 807F162C 3C 84 00 01 */ addis r4, r4, 1 -/* 807F1630 38 04 80 00 */ addi r0, r4, -32768 -/* 807F1634 7C 04 07 34 */ extsh r4, r0 -/* 807F1638 38 A0 00 02 */ li r5, 2 -/* 807F163C 38 C0 10 00 */ li r6, 0x1000 -/* 807F1640 4B A7 EF C9 */ bl cLib_addCalcAngleS2__FPssss -lbl_807F1644: -/* 807F1644 39 61 00 40 */ addi r11, r1, 0x40 -/* 807F1648 4B B7 0B D9 */ bl _restgpr_27 -/* 807F164C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 807F1650 7C 08 03 A6 */ mtlr r0 -/* 807F1654 38 21 00 40 */ addi r1, r1, 0x40 -/* 807F1658 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2840.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2840.s deleted file mode 100644 index 0a27a0eae9f..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2840.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_807F2840: -/* 807F2840 38 63 FF DC */ addi r3, r3, -36 -/* 807F2844 4B FF FF 08 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2848.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2848.s deleted file mode 100644 index b3af19974f9..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2848.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_807F2848: -/* 807F2848 38 63 FF EC */ addi r3, r3, -20 -/* 807F284C 4B FF FF 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 59c9c711ae4..00000000000 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_807F22A4: -/* 807F22A4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 807F22A8 7C 08 02 A6 */ mflr r0 -/* 807F22AC 90 01 00 34 */ stw r0, 0x34(r1) -/* 807F22B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F22B4 4B B6 FF 25 */ bl _savegpr_28 -/* 807F22B8 7C 7F 1B 78 */ mr r31, r3 -/* 807F22BC 38 60 00 58 */ li r3, 0x58 -/* 807F22C0 4B AD C9 8D */ bl __nw__FUl -/* 807F22C4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 807F22C8 41 82 00 94 */ beq lbl_807F235C -/* 807F22CC 3C 60 80 7F */ lis r3, d_a_e_yc__stringBase0@ha /* 0x807F294C@ha */ -/* 807F22D0 38 63 29 4C */ addi r3, r3, d_a_e_yc__stringBase0@l /* 0x807F294C@l */ -/* 807F22D4 38 80 00 15 */ li r4, 0x15 -/* 807F22D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 807F22DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 807F22E0 3F 85 00 02 */ addis r28, r5, 2 -/* 807F22E4 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 807F22E8 7F 85 E3 78 */ mr r5, r28 -/* 807F22EC 38 C0 00 80 */ li r6, 0x80 -/* 807F22F0 4B 84 9F FD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 807F22F4 7C 7D 1B 78 */ mr r29, r3 -/* 807F22F8 3C 60 80 7F */ lis r3, d_a_e_yc__stringBase0@ha /* 0x807F294C@ha */ -/* 807F22FC 38 63 29 4C */ addi r3, r3, d_a_e_yc__stringBase0@l /* 0x807F294C@l */ -/* 807F2300 38 80 00 18 */ li r4, 0x18 -/* 807F2304 7F 85 E3 78 */ mr r5, r28 -/* 807F2308 38 C0 00 80 */ li r6, 0x80 -/* 807F230C 4B 84 9F E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 807F2310 7C 64 1B 78 */ mr r4, r3 -/* 807F2314 38 1F 05 BC */ addi r0, r31, 0x5bc -/* 807F2318 90 01 00 08 */ stw r0, 8(r1) -/* 807F231C 3C 00 00 08 */ lis r0, 8 -/* 807F2320 90 01 00 0C */ stw r0, 0xc(r1) -/* 807F2324 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 807F2328 38 03 00 84 */ addi r0, r3, 0x0084 /* 0x11000084@l */ -/* 807F232C 90 01 00 10 */ stw r0, 0x10(r1) -/* 807F2330 7F C3 F3 78 */ mr r3, r30 -/* 807F2334 38 A0 00 00 */ li r5, 0 -/* 807F2338 38 C0 00 00 */ li r6, 0 -/* 807F233C 7F A7 EB 78 */ mr r7, r29 -/* 807F2340 39 00 00 02 */ li r8, 2 -/* 807F2344 3D 20 80 7F */ lis r9, lit_3715@ha /* 0x807F2864@ha */ -/* 807F2348 C0 29 28 64 */ lfs f1, lit_3715@l(r9) /* 0x807F2864@l */ -/* 807F234C 39 20 00 00 */ li r9, 0 -/* 807F2350 39 40 FF FF */ li r10, -1 -/* 807F2354 4B 81 E4 7D */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 807F2358 7C 7E 1B 78 */ mr r30, r3 -lbl_807F235C: -/* 807F235C 93 DF 05 B8 */ stw r30, 0x5b8(r31) -/* 807F2360 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 807F2364 28 03 00 00 */ cmplwi r3, 0 -/* 807F2368 41 82 00 10 */ beq lbl_807F2378 -/* 807F236C 80 03 00 04 */ lwz r0, 4(r3) -/* 807F2370 28 00 00 00 */ cmplwi r0, 0 -/* 807F2374 40 82 00 0C */ bne lbl_807F2380 -lbl_807F2378: -/* 807F2378 38 60 00 00 */ li r3, 0 -/* 807F237C 48 00 00 08 */ b lbl_807F2384 -lbl_807F2380: -/* 807F2380 38 60 00 01 */ li r3, 1 -lbl_807F2384: -/* 807F2384 39 61 00 30 */ addi r11, r1, 0x30 -/* 807F2388 4B B6 FE 9D */ bl _restgpr_28 -/* 807F238C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 807F2390 7C 08 03 A6 */ mtlr r0 -/* 807F2394 38 21 00 30 */ addi r1, r1, 0x30 -/* 807F2398 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 3a622326a25..f3179a955cb 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -303,14 +303,14 @@ public: FLG2_PLAYER_SHADOW = 0x400, FLG2_UNK_200 = 0x200, FLG2_UNK_80 = 0x80, - FLG2_UNK_40 = 0x40, + FLG2_WOLF_ENEMY_HANG_BITE = 0x40, FLG2_WOLF_ENEMY_LEFT_THROW = 0x20, FLG2_UNK_10 = 0x10, FLG2_UNK_8 = 8, FLG2_UNK_2 = 2, FLG2_UNK_1 = 1, - FLG2_UNK_58 = FLG2_UNK_40 | FLG2_UNK_10 | FLG2_UNK_8, + FLG2_UNK_58 = FLG2_WOLF_ENEMY_HANG_BITE | FLG2_UNK_10 | FLG2_UNK_8, FLG2_UNK_10000001 = FLG2_UNK_10000000 | FLG2_UNK_1, }; @@ -753,6 +753,8 @@ public: void onFogFade() { onNoResetFlg2(FLG2_UNK_4000); } BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); } + void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); } + void setCanoeSlider() { mSpecialMode = 0x2D; } void offCanoeSlider() { diff --git a/include/d/cc/d_cc_uty.h b/include/d/cc/d_cc_uty.h index d66e39ad862..cc90c79f68b 100644 --- a/include/d/cc/d_cc_uty.h +++ b/include/d/cc/d_cc_uty.h @@ -1,9 +1,11 @@ #ifndef D_CC_D_CC_UTY_H #define D_CC_D_CC_UTY_H -#include "d/com/d_com_inf_game.h" +#include "dolphin/types.h" +class cCcD_Obj; class fopAc_ac_c; +class Z2Creature; enum dCcU_AtType { /* 0x01 */ HIT_TYPE_LINK_NORMAL_ATTACK = 1, diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index c006560d122..654426d2b77 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -241,6 +241,7 @@ public: bool checkWolfNoLock() const { return mFlags & 0x200; } bool checkHeadLockFlg() const { return mFlags & 0x80; } + bool checkWolfBiteDamage() const { return mFlags & 0x40; } bool checkDownFlg() const { return mFlags & 0x1; } bool checkCutDownHitFlg() const { return mFlags & 0x2; } bool checkDeadFlg() const { return mFlags & 0x8; } @@ -257,6 +258,7 @@ public: void onWolfNoLock() { mFlags |= 0x200; } void onDownFlg() { mFlags |= 1; } + void offWolfBiteDamage() { mFlags &= ~0x40; } void offCutDownHitFlg() { mFlags &= ~0x2; } void offDownFlg() { mFlags &= ~0x17; } diff --git a/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h b/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h index e7066588c97..8abfa55951f 100644 --- a/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h +++ b/include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h @@ -1,7 +1,11 @@ #ifndef D_A_B_DS_H #define D_A_B_DS_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" #include "d/msg/d_msg_flow.h" #include "m_Do/m_Do_ext.h" diff --git a/include/rel/d/a/b/d_a_b_go/d_a_b_go.h b/include/rel/d/a/b/d_a_b_go/d_a_b_go.h index 84e33420b58..9fad60394f1 100644 --- a/include/rel/d/a/b/d_a_b_go/d_a_b_go.h +++ b/include/rel/d/a/b/d_a_b_go/d_a_b_go.h @@ -1,7 +1,11 @@ #ifndef D_A_B_GO_H #define D_A_B_GO_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" #define GORON_CHILD_MAX 31 diff --git a/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h b/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h index f7821c02820..86ccfa8a4cf 100644 --- a/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h +++ b/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h @@ -1,7 +1,10 @@ #ifndef D_A_B_GOS_H #define D_A_B_GOS_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h index fd3d20ae9ee..430497a5977 100644 --- a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h +++ b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h @@ -1,7 +1,11 @@ #ifndef D_A_B_OB_H #define D_A_B_OB_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" struct ob_part_s { diff --git a/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h b/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h index 81ae182ea7f..b790e213dc7 100644 --- a/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h +++ b/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h @@ -1,6 +1,9 @@ #ifndef D_A_B_OH_H #define D_A_B_OH_H +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" class daB_OH_HIO_c { diff --git a/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h b/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h index 55e72d0e834..16f4538ac2e 100644 --- a/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h +++ b/include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h @@ -9,10 +9,13 @@ #ifndef D_A_E_FZ_H #define D_A_E_FZ_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" #include "m_Do/m_Do_hostIO.h" -#include "rel/d/a/b/d_a_b_yo/d_a_b_yo.h" /** * @enum daE_FZ_Action 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 62834464e1a..7d222c98810 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,9 @@ #ifndef D_A_E_NEST_H #define D_A_E_NEST_H +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor.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" diff --git a/include/rel/d/a/e/d_a_e_ph/d_a_e_ph.h b/include/rel/d/a/e/d_a_e_ph/d_a_e_ph.h index d7084de8cfc..2ae42f061fe 100644 --- a/include/rel/d/a/e/d_a_e_ph/d_a_e_ph.h +++ b/include/rel/d/a/e/d_a_e_ph/d_a_e_ph.h @@ -1,7 +1,11 @@ #ifndef D_A_E_PH_H #define D_A_E_PH_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" #include "d/d_path.h" diff --git a/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h b/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h index bda98453163..aacfea48e1f 100644 --- a/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h +++ b/include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h @@ -1,4 +1,20 @@ #ifndef D_A_E_RDY_H #define D_A_E_RDY_H +#include "f_op/f_op_actor.h" + +class e_rdy_class : public fopEn_enemy_c { +public: + /* 80779340 */ e_rdy_class(); + + /* 0x05AC */ u8 field_0x5ac[0xa8f - 0x5ac]; + /* 0x0A8F */ u8 field_0xa8f; + /* 0x0A90 */ u8 field_0xa90[0x1370 - 0xa90]; + /* 0x1370 */ s16 field_0x1370; + /* 0x1372 */ s16 field_0x1372; + /* 0x1374 */ u8 field_0x1374[0x142c - 0x1374]; +}; + +STATIC_ASSERT(sizeof(e_rdy_class) == 0x142C); + #endif /* D_A_E_RDY_H */ diff --git a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h index d3ac5522fb8..ff2a36b8534 100644 --- a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h +++ b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h @@ -2,6 +2,7 @@ #define D_A_E_WB_H #include "rel/d/a/d_a_horse/d_a_horse.h" +#include "SSystem/SComponent/c_phase.h" #include "d/cc/d_cc_uty.h" enum daE_wb_ACT { diff --git a/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h b/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h index 738dbc1f78a..ed3d8ed2a7a 100644 --- a/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h +++ b/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h @@ -1,6 +1,13 @@ #ifndef D_A_E_YC_H #define D_A_E_YC_H +#include "SSystem/SComponent/c_phase.h" +#include "Z2AudioLib/Z2Creature.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" +#include "d/cc/d_cc_uty.h" +#include "f_op/f_op_actor.h" + /** * @ingroup actors-enemies * @brief Twilit Kargorok @@ -8,42 +15,83 @@ */ class e_yc_class : public fopEn_enemy_c { public: - MtxP getLegR3Mtx() { return field_0x5B8->getModel()->getAnmMtx(28); } + MtxP getLegR3Mtx() { return mpMorf->getModel()->getAnmMtx(28); } - /* 0x5AC */ u8 field_0x5ac[0x5B8 - 0x5AC]; - /* 0x5B8 */ mDoExt_McaMorfSO* field_0x5B8; - /* 0x5BC */ Z2CreatureEnemy mEnemy; + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ u8 mParam; + /* 0x5B8 */ mDoExt_McaMorfSO* mpMorf; + /* 0x5BC */ Z2CreatureEnemy mCreatureSound; /* 0x660 */ int mAnm; - /* 0x664 */ int field_0x664; - /* 0x668 */ u8 field_0x668[6]; - /* 0x66E */ s16 mCurrentAction; - /* 0x670 */ s16 field_0x670; - /* 0x672 */ u8 field_0x672[2]; - /* 0x674 */ f32 field_0x674; - /* 0x678 */ f32 field_0x678; - /* 0x67C */ f32 field_0x67C; - /* 0x680 */ s16 field_0x680; - /* 0x682 */ u8 field_0x682[2]; - /* 0x684 */ f32 field_0x684; - /* 0x688 */ u32 field_0x688; - /* 0x68C */ u8 field_0x68C[4]; - /* 0x690 */ f32 field_0x690; - /* 0x694 */ u8 field_0x694[28]; - /* 0x69C */ f32 field_0x69C; - /* 0x6A0 */ s16 field_0x6A0; - /* 0x6A2 */ s16 field_0x6A2; - /* 0x6A4 */ s16 field_0x6A4; - /* 0x6A6 */ s16 field_0x6A6; - /* 0x6A8 */ s16 field_0x6A8; - /* 0x6AA */ s16 field_0x6AA; - /* 0x6AC */ void* field_0x6AC; - /* 0x6B0 */ u8 field_0x6B0[72]; - /* 0x6F4 */ dBgS_Acch mBgS_Acch; - /* 0x8CC */ u8 field_0x8CC[28]; - /* 0x8E8 */ dCcD_GStts mCcD_GStts; - /* 0x908 */ dCcD_GObjInf mCcD_GObjInf; - /* 0xA0C */ u8 field_0xA0C[364]; - /* 0xB78 */ cCcD_Obj* mpTgHitObj; + /* 0x664 */ int mFlyAnmMode; + /* 0x668 */ u32 mShadowKey; + /* 0x66C */ s16 mCounter; + /* 0x66E */ s16 mAction; + /* 0x670 */ s16 mMode; + /* 0x674 */ cXyz mTargetPos; + /* 0x680 */ s16 mAngleToPlayer; + /* 0x684 */ f32 mDistToPlayer; + /* 0x688 */ f32 mAngleSpeedRatio; + /* 0x68C */ f32 mAngleXSpeedRatio; + /* 0x690 */ f32 mMaxAngleSpeed; + /* 0x694 */ f32 field_0x694; + /* 0x698 */ f32 field_0x698; + /* 0x69C */ f32 field_0x69c; + /* 0x6A0 */ s16 field_0x6a0; + /* 0x6A2 */ s16 mTimer[4]; + /* 0x6AA */ s16 mCcDisableTimer; + /* 0x6AC */ u32 mRiderID; + /* 0x6B0 */ u8 field_0x6b0[2]; + /* 0x6B2 */ s8 mNoDrawFlag; + /* 0x6B3 */ s8 mWolfBiteDamageCount; + /* 0x6B4 */ dBgS_AcchCir mAcchCir; + /* 0x6F4 */ dBgS_ObjAcch mAcch; + /* 0x8CC */ dCcD_Stts mCcStts; + /* 0x908 */ dCcD_Sph mCcSph; + /* 0xA40 */ dCcD_Sph mAtSph; + /* 0xB78 */ dCcU_AtInfo mAtInfo; + /* 0xB9C */ u32 mParticleKey[2]; + /* 0xBA4 */ bool mHIOInit; + + enum Action { + /* 0x00 */ ACT_FLY, + /* 0x0A */ ACT_F_FLY = 10, + /* 0x0B */ ACT_HOVERING, + /* 0x0C */ ACT_ATTACK, + /* 0x14 */ ACT_WOLFBITE = 20, + }; + + enum Animation { + /* 0x04 */ ANM_CATCH_END = 4, + /* 0x05 */ ANM_CATCH_MIDDLE, + /* 0x06 */ ANM_CATCH_START, + /* 0x07 */ ANM_CRASH, + /* 0x08 */ ANM_CRASH2, + /* 0x09 */ ANM_FLY, + /* 0x0A */ ANM_FLY_BRAKE, + /* 0x0B */ ANM_FLY_DASH_WL, + /* 0x0C */ ANM_FLY_GLIDE, + /* 0x0D */ ANM_FLY_GLIDE_WL, + /* 0x0E */ ANM_FLY_LIMIT_WL, + /* 0x0F */ ANM_FLY_WL, + /* 0x10 */ ANM_HANGED, + /* 0x11 */ ANM_HANGED_BRUSH, + /* 0x12 */ ANM_HANGED_BRUSH2, + /* 0x13 */ ANM_HANGED_DAMAGE, + /* 0x14 */ ANM_HANGED_WAIT, + /* 0x15 */ ANM_HOVERING, + }; }; +STATIC_ASSERT(sizeof(e_yc_class) == 0xBA8); + +struct daE_YC_HIO_c { + /* 807EFECC */ daE_YC_HIO_c(); + /* 807F27BC */ virtual ~daE_YC_HIO_c() {} + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mScale; +}; + +STATIC_ASSERT(sizeof(daE_YC_HIO_c) == 0xC); + #endif /* D_A_E_YC_H */ diff --git a/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h b/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h index 933bd79f8a7..f55b2e9247a 100644 --- a/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h +++ b/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h @@ -8,7 +8,11 @@ #ifndef D_A_E_YK_H #define D_A_E_YK_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" #include "d/d_path.h" diff --git a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h index e09a02c7f92..19deafedfb5 100644 --- a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h +++ b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h @@ -1,8 +1,13 @@ #ifndef D_A_E_YM_H #define D_A_E_YM_H +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" +#include "d/d_path.h" class daE_YM_HIO_c { public: diff --git a/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h b/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h index efe593f20a5..7c864ae0469 100644 --- a/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h +++ b/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h @@ -1,6 +1,7 @@ #ifndef D_A_NPC_TK_H #define D_A_NPC_TK_H +#include "f_op/f_op_actor_mng.h" #include "d/d_path.h" struct cXyz; diff --git a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp index 1ee05d23e37..ef70ac3fffb 100644 --- a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp +++ b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp @@ -4,10 +4,13 @@ // #include "rel/d/a/b/d_a_b_bq/d_a_b_bq.h" +#include "SSystem/SComponent/c_phase.h" #include "Z2AudioLib/Z2Creature.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_uty.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "cmath.h" // // Types: diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 798fe8c0328..ffbbbba8b8f 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -5,6 +5,8 @@ #include "rel/d/a/b/d_a_b_go/d_a_b_go.h" #include "SSystem/SComponent/c_math.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" #define RES_IS_MODEL 0x13 diff --git a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp index 6a94918952d..3e8cebbca7b 100644 --- a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp +++ b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp @@ -5,6 +5,7 @@ #include "rel/d/a/b/d_a_b_gos/d_a_b_gos.h" #include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" #include "rel/d/a/b/d_a_b_go/d_a_b_go.h" class daB_GOS_HIO_c { diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp index ffdc7afe9ed..a120001a10c 100644 --- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp +++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp @@ -4,6 +4,7 @@ // #include "rel/d/a/b/d_a_b_ob/d_a_b_ob.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "m_Do/m_Do_graphic.h" diff --git a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp index 72dbc11662c..b675bd83867 100644 --- a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp +++ b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp @@ -5,6 +5,7 @@ #include "rel/d/a/b/d_a_b_oh/d_a_b_oh.h" #include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "rel/d/a/b/d_a_b_ob/d_a_b_ob.h" diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index dc8fd54cf4c..35bc3aa374a 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -6,6 +6,7 @@ #include "rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" +#include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" diff --git a/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp b/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp index 4fa1a2199e0..7719563d54a 100644 --- a/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp +++ b/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp @@ -12,7 +12,6 @@ #include "d/a/d_a_player.h" #include "rel/d/a/d_a_midna/d_a_midna.h" #include "SSystem/SComponent/c_math.h" -#include "SSystem/SComponent/c_xyz.h" #include "dol2asm.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 ee15405aca7..edadc448150 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 @@ -6,6 +6,7 @@ #include "rel/d/a/e/d_a_e_nest/d_a_e_nest.h" #include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h" #include "SSystem/SComponent/c_math.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" diff --git a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp index 7b68f3ac15d..07f4d8efa74 100644 --- a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp @@ -27,6 +27,7 @@ static u32 lit_1787[1 + 4 /* padding */] = { #include "c/c_damagereaction.h" #include "d/particle/d_particle.h" #include "d/cc/d_cc_uty.h" +#include "d/com/d_com_inf_game.h" #include "d/d_drawlist.h" #include "d/d_resorce.h" #include "d/d_bomb.h" diff --git a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp index 96a1dc18fad..924164b5f04 100644 --- a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp +++ b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp @@ -5,6 +5,7 @@ #include "rel/d/a/e/d_a_e_ph/d_a_e_ph.h" #include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" #include "d/a/d_a_player.h" #include "d/s/d_s_play.h" diff --git a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp index eff730902ee..f0af6c770eb 100644 --- a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp +++ b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp @@ -13,49 +13,12 @@ struct request_of_phase_process_class {}; -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct _GXColor {}; - struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - struct Z2Creature {}; -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopEn_enemy_c {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct e_rdy_class { - /* 80779340 */ e_rdy_class(); -}; - struct daPy_py_c { /* 80779DD4 */ void changeDemoMode(u32, int, int, s16); @@ -89,13 +52,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - struct dRes_info_c {}; struct dRes_control_c { @@ -104,12 +60,6 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 807797FC */ csXyz(); - /* 80779D5C */ ~csXyz(); -}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -135,8 +85,6 @@ struct dMsgFlow_c { /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); }; -struct J3DModel {}; - struct dJntColData_c {}; struct dJntCol_c { @@ -237,14 +185,6 @@ struct cBgS { /* 800744A0 */ void GroundCross(cBgS_GndChk*); }; -struct _GXTexObj {}; - -struct Z2SeqMgr { - /* 802AF010 */ void bgmStart(u32, u32, s32); - /* 802AF408 */ void bgmStop(u32, s32); - /* 802B4164 */ void setBattleBgmOff(bool); -}; - struct Z2CreatureEnemy { /* 802C0F64 */ Z2CreatureEnemy(); /* 802C1094 */ void init(Vec*, Vec*, u8, u8); @@ -252,28 +192,6 @@ struct Z2CreatureEnemy { /* 802C1B90 */ void setEnemyName(char const*); }; -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DLightObj { - /* 80779800 */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 8032842C */ void checkPass(f32); -}; - // // Forward References: // @@ -515,9 +433,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void _savegpr_19(); extern "C" void _savegpr_21(); @@ -540,9 +455,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 const j3dDefaultLightInfo[52]; -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__9dCcD_Stts[11]; @@ -552,8 +464,6 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_blackColor; @@ -3214,7 +3124,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma pop /* 807797FC-80779800 00DB1C 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { +// csXyz::csXyz() { +extern "C" asm void __ct__5csXyzFv() { /* empty function */ } @@ -3222,7 +3133,8 @@ csXyz::csXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DLightObj::J3DLightObj() { +// asm J3DLightObj::J3DLightObj() { +extern "C" asm void __ct__11J3DLightObjFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_rdy/d_a_e_rdy/__ct__11J3DLightObjFv.s" } @@ -3330,7 +3242,8 @@ static asm void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm csXyz::~csXyz() { +// asm csXyz::~csXyz() { +extern "C" asm void __dt__5csXyzFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_rdy/d_a_e_rdy/__dt__5csXyzFv.s" } diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp index 0949124cbef..d05070b2bf0 100644 --- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp +++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp @@ -5,6 +5,7 @@ #include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "m_Do/m_Do_graphic.h" diff --git a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp index 1efcd180fb0..951eb898a6e 100644 --- a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp +++ b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp @@ -1,1069 +1,869 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_e_yc -// +/** + * d_a_e_yc.cpp + * Twilit Carrier Kargarok + */ -// #include "rel/d/a/e/d_a_e_yc/d_a_e_yc.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" +#include "rel/d/a/e/d_a_e_yc/d_a_e_yc.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "f_op/f_op_actor_mng.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" +#include "d/d_procname.h" +#include "rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h" -// -// Types: -// +/* 807F2B08-807F2B0C 000008 0004+00 4/4 0/0 0/0 .bss S_area_dis */ +static f32 S_area_dis; -struct request_of_phase_process_class {}; +/* 807F2B0C-807F2B10 00000C 0004+00 2/2 0/0 0/0 .bss None */ +static bool hioInit; -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature {}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct e_yc_class {}; - -struct daE_YC_HIO_c { - /* 807EFECC */ daE_YC_HIO_c(); - /* 807F27BC */ ~daE_YC_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 807F274C */ ~dBgS_ObjAcch(); -}; - -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 cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct _GXTexObj {}; - -struct Z2CreatureEnemy { - /* 802C0F64 */ Z2CreatureEnemy(); - /* 802C1094 */ void init(Vec*, Vec*, u8, u8); - /* 802C1B7C */ void setLinkSearch(bool); - /* 802C1B90 */ void setEnemyName(char const*); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 8032842C */ void checkPass(f32); -}; - -// -// Forward References: -// - -extern "C" void __ct__12daE_YC_HIO_cFv(); -extern "C" static void anm_init__FP10e_yc_classifUcf(); -extern "C" static void daE_YC_Draw__FP10e_yc_class(); -extern "C" static void damage_check__FP10e_yc_class(); -extern "C" static void e_yc_fly__FP10e_yc_class(); -extern "C" static void e_yc_f_fly__FP10e_yc_class(); -extern "C" static void e_yc_hovering__FP10e_yc_class(); -extern "C" static void e_yc_attack__FP10e_yc_class(); -extern "C" static void e_yc_wolfbite__FP10e_yc_class(); -extern "C" static void anm_se_set__FP10e_yc_class(); -extern "C" static void action__FP10e_yc_class(); -extern "C" static void daE_YC_Execute__FP10e_yc_class(); -extern "C" static bool daE_YC_IsDelete__FP10e_yc_class(); -extern "C" static void daE_YC_Delete__FP10e_yc_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_YC_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12daE_YC_HIO_cFv(); -extern "C" void __sinit_d_a_e_yc_cpp(); -extern "C" static void func_807F2840(); -extern "C" static void func_807F2848(); -extern "C" extern char const* const d_a_e_yc__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 scaleM__14mDoMtx_stack_cFfff(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void entryDL__16mDoExt_McaMorfSOFv(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -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_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(); -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 getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl(); -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 StartShock__12dVibration_cFii4cXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -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 MtxPosition__FP4cXyzP4cXyz(); -extern "C" void func_802807E0(); -extern "C" void __ct__15Z2CreatureEnemyFv(); -extern "C" void init__15Z2CreatureEnemyFP3VecP3VecUcUc(); -extern "C" void setLinkSearch__15Z2CreatureEnemyFb(); -extern "C" void setEnemyName__15Z2CreatureEnemyFPCc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -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_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" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 pauseTimer__9dScnPly_c[4]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 807F2864-807F2868 000000 0004+00 12/12 0/0 0/0 .rodata @3715 */ -SECTION_RODATA static f32 const lit_3715 = 1.0f; -COMPILER_STRIP_GATE(0x807F2864, &lit_3715); - -/* 807F2954-807F2970 -00001 001C+00 1/1 0/0 0/0 .data @3878 */ -SECTION_DATA static void* lit_3878[7] = { - (void*)(((char*)e_yc_fly__FP10e_yc_class) + 0x168), - (void*)(((char*)e_yc_fly__FP10e_yc_class) + 0x170), - (void*)(((char*)e_yc_fly__FP10e_yc_class) + 0x23C), - (void*)(((char*)e_yc_fly__FP10e_yc_class) + 0x288), - (void*)(((char*)e_yc_fly__FP10e_yc_class) + 0x2CC), - (void*)(((char*)e_yc_fly__FP10e_yc_class) + 0x324), - (void*)(((char*)e_yc_fly__FP10e_yc_class) + 0x348), -}; - -/* 807F2970-807F298C -00001 001C+00 1/1 0/0 0/0 .data @4087 */ -SECTION_DATA static void* lit_4087[7] = { - (void*)(((char*)e_yc_attack__FP10e_yc_class) + 0xE8), - (void*)(((char*)e_yc_attack__FP10e_yc_class) + 0x100), - (void*)(((char*)e_yc_attack__FP10e_yc_class) + 0x250), - (void*)(((char*)e_yc_attack__FP10e_yc_class) + 0x27C), - (void*)(((char*)e_yc_attack__FP10e_yc_class) + 0x2AC), - (void*)(((char*)e_yc_attack__FP10e_yc_class) + 0x3D0), - (void*)(((char*)e_yc_attack__FP10e_yc_class) + 0x414), -}; - -/* 807F298C-807F29E0 -00001 0054+00 1/1 0/0 0/0 .data @4315 */ -SECTION_DATA static void* lit_4315[21] = { - (void*)(((char*)action__FP10e_yc_class) + 0x70), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0x7C), - (void*)(((char*)action__FP10e_yc_class) + 0x88), - (void*)(((char*)action__FP10e_yc_class) + 0x94), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA8), - (void*)(((char*)action__FP10e_yc_class) + 0xA0), -}; - -/* 807F29E0-807F29E8 00008C 0008+00 1/1 0/0 0/0 .data wing_j$4328 */ -SECTION_DATA static u8 wing_j[8] = { - 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x11, -}; - -/* 807F29E8-807F2A28 000094 0040+00 1/1 0/0 0/0 .data cc_sph_src$4529 */ -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj - {dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -/* 807F2A28-807F2A68 0000D4 0040+00 1/1 0/0 0/0 .data at_sph_src$4530 */ -static dCcD_SrcSph at_sph_src = { - { - {0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xd}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -/* 807F2A68-807F2A88 -00001 0020+00 1/0 0/0 0/0 .data l_daE_YC_Method */ -SECTION_DATA static void* l_daE_YC_Method[8] = { - (void*)daE_YC_Create__FP10fopAc_ac_c, - (void*)daE_YC_Delete__FP10e_yc_class, - (void*)daE_YC_Execute__FP10e_yc_class, - (void*)daE_YC_IsDelete__FP10e_yc_class, - (void*)daE_YC_Draw__FP10e_yc_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 807F2A88-807F2AB8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_YC */ -SECTION_DATA extern void* g_profile_E_YC[12] = { - (void*)0xFFFFFFFD, (void*)0x0004FFFD, - (void*)0x00F50000, (void*)&g_fpcLf_Method, - (void*)0x00000BA8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00BB0000, (void*)&l_daE_YC_Method, - (void*)0x00040100, (void*)0x020E0000, -}; - -/* 807F2AB8-807F2AC4 000164 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, -}; - -/* 807F2AC4-807F2AD0 000170 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, -}; - -/* 807F2AD0-807F2AF4 00017C 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_807F2848, - (void*)NULL, - (void*)NULL, - (void*)func_807F2840, -}; - -/* 807F2AF4-807F2B00 0001A0 000C+00 2/2 0/0 0/0 .data __vt__12daE_YC_HIO_c */ -SECTION_DATA extern void* __vt__12daE_YC_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12daE_YC_HIO_cFv, -}; +/* 807F2B1C-807F2B28 00001C 000C+00 3/3 0/0 0/0 .bss l_HIO */ +static daE_YC_HIO_c l_HIO; /* 807EFECC-807EFEF0 0000EC 0024+00 1/1 0/0 0/0 .text __ct__12daE_YC_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daE_YC_HIO_c::daE_YC_HIO_c() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__ct__12daE_YC_HIO_cFv.s" +daE_YC_HIO_c::daE_YC_HIO_c() { + field_0x4 = -1; + mScale = 1.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 807F2868-807F286C 000004 0004+00 1/9 0/0 0/0 .rodata @3729 */ -SECTION_RODATA static u8 const lit_3729[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x807F2868, &lit_3729); - -/* 807F286C-807F2870 000008 0004+00 1/1 0/0 0/0 .rodata @3730 */ -SECTION_RODATA static f32 const lit_3730 = -1.0f; -COMPILER_STRIP_GATE(0x807F286C, &lit_3730); - -/* 807F294C-807F294C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_807F294C = "E_yc"; -#pragma pop /* 807EFEF0-807EFF9C 000110 00AC+00 5/5 0/0 0/0 .text anm_init__FP10e_yc_classifUcf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void anm_init(e_yc_class* param_0, int param_1, f32 param_2, u8 param_3, f32 param_4) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_init__FP10e_yc_classifUcf.s" +static void anm_init(e_yc_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_rate) { + J3DAnmTransform* anm = static_cast(dComIfG_getObjectRes("E_yc", i_anmID)); + i_this->mpMorf->setAnm(anm, i_attr, i_morf, i_rate, 0.0f, -1.0f); + i_this->mAnm = i_anmID; } -#pragma pop - -/* ############################################################################################## */ -/* 807F2870-807F2874 00000C 0004+00 0/3 0/0 0/0 .rodata @3771 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3771 = 100.0f; -COMPILER_STRIP_GATE(0x807F2870, &lit_3771); -#pragma pop - -/* 807F2874-807F2878 000010 0004+00 0/1 0/0 0/0 .rodata @3772 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3772 = 1700.0f; -COMPILER_STRIP_GATE(0x807F2874, &lit_3772); -#pragma pop /* 807EFF9C-807F00BC 0001BC 0120+00 1/0 0/0 0/0 .text daE_YC_Draw__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YC_Draw(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Draw__FP10e_yc_class.s" +static int daE_YC_Draw(e_yc_class* i_this) { + if (i_this->mNoDrawFlag) { + return 1; + } + + J3DModel* model = i_this->mpMorf->getModel(); + g_env_light.settingTevStruct(2, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr); + dComIfGd_setListDark(); + i_this->mpMorf->entryDL(); + dComIfGd_setList(); + + cXyz pos; + pos.set(i_this->current.pos.x, i_this->current.pos.y + 100.0f, i_this->current.pos.z); + i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &pos, 1700.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 /* 807F00BC-807F01AC 0002DC 00F0+00 1/1 0/0 0/0 .text damage_check__FP10e_yc_class */ -#ifdef NONMATCHING -static void damage_check(e_yc_class* param_0) { - param_0->mCcD_GStts.Move(); - fopAc_ac_c* player = dComIfGp_getPlayer(0); - if (param_0->field_0x6AA == 0 && !param_0->mCcD_GObjInf.ChkTgHit()) { - param_0->mpTgHitObj = param_0->mCcD_GObjInf.GetTgHitObj(); - - if (((daAlink_c*)player)->getCutType() != 0x2c) { - return; +static void damage_check(e_yc_class* i_this) { + daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); + i_this->mCcStts.Move(); + if (i_this->mCcDisableTimer == 0 && i_this->mCcSph.ChkTgHit()) { + i_this->mAtInfo.mpCollider = i_this->mCcSph.GetTgHitObj(); + if (player->getCutType() != daPy_py_c::CUT_TYPE_WOLF_B_LEFT + && player->getCutType() != daPy_py_c::CUT_TYPE_WOLF_B_RIGHT + && i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_WOLF_ATTACK) + && player->onWolfEnemyBiteAll(i_this, daPy_py_c::FLG2_WOLF_ENEMY_HANG_BITE)) + { + i_this->mAction = e_yc_class::ACT_WOLFBITE; + i_this->mMode = 0; + i_this->mCcDisableTimer = 1000; + i_this->mCreatureSound.startCollisionSE(Z2SE_HIT_WOLFBITE, 0x1f); } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void damage_check(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/damage_check__FP10e_yc_class.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 807F2878-807F287C 000014 0004+00 0/2 0/0 0/0 .rodata @3859 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3859 = 12.0f; -COMPILER_STRIP_GATE(0x807F2878, &lit_3859); -#pragma pop - -/* 807F287C-807F2880 000018 0004+00 0/2 0/0 0/0 .rodata @3860 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3860 = 70.0f; -COMPILER_STRIP_GATE(0x807F287C, &lit_3860); -#pragma pop - -/* 807F2880-807F2884 00001C 0004+00 0/5 0/0 0/0 .rodata @3861 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3861 = 10.0f; -COMPILER_STRIP_GATE(0x807F2880, &lit_3861); -#pragma pop /* 807F01AC-807F06AC 0003CC 0500+00 2/1 0/0 0/0 .text e_yc_fly__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_yc_fly(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_fly__FP10e_yc_class.s" +static void e_yc_fly(e_yc_class* i_this) { + e_rdy_class* rider = static_cast(fopAcM_SearchByID(i_this->mRiderID)); + int frame = i_this->mpMorf->getFrame(); + f32 target_speed = 0.0f; + f32 accel = 1.0f; + f32 delta_x, delta_y, delta_z; + + switch (i_this->mFlyAnmMode) { + case 0: + if (i_this->mTimer[0] == 0 && frame == 14) { + i_this->mFlyAnmMode = 1; + anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f; + } + break; + + case 1: + if (i_this->mTimer[0] == 0) { + i_this->mFlyAnmMode = 0; + anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f; + } + break; + + case 2: + break; + } + + s8 cvar6 = 0; + + switch (i_this->mMode) { + case 0: + i_this->mMode = 1; + // fallthrough + + case 1: + target_speed = 25.0f; + if (i_this->mTimer[1] == 0) { + delta_x = i_this->home.pos.x + cM_rndFX(2000.0f) - i_this->current.pos.x; + delta_z = i_this->home.pos.z + cM_rndFX(2000.0f) - i_this->current.pos.z; + if (JMAFastSqrt(delta_x * delta_x + delta_z * delta_z) > 200.0f) { + i_this->mTimer[1] = cM_rndF(150.0f) + 100.0f; + i_this->mTargetPos.x = delta_x + i_this->current.pos.x; + i_this->mTargetPos.y = i_this->home.pos.y; + i_this->mTargetPos.z = delta_z + i_this->current.pos.z; + i_this->mAngleSpeedRatio = 0.0f; + i_this->mMaxAngleSpeed = cM_rndF(300.0f) + 200.0f; + } + } + break; + + case 2: + target_speed = 25.0f; + i_this->mTargetPos = i_this->home.pos; + i_this->mMaxAngleSpeed = 200.0f; + i_this->mAngleXSpeedRatio = 0.0f; + anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mFlyAnmMode = 2; + break; + + case 3: + target_speed = 25.0f; + if (rider->field_0x1372 > 200) { + target_speed = 35.0f; + accel = 0.25f; + } + i_this->mTargetPos = rider->current.pos; + i_this->mTargetPos.y += 150.0f; + break; + + case 4: + accel = 0.3f; + if (rider->field_0x1372 == 30) { + anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + } + if (rider->field_0x1372 == 60) { + anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + } + i_this->mMaxAngleSpeed = 300.0f; + break; + + case 5: + i_this->field_0x694 += i_this->field_0x698; + cLib_addCalc0(&i_this->field_0x698, 1.0f, 4.0f); + break; + + case 6: + cLib_addCalc0(&i_this->field_0x694, 1.0f, 1.0f); + cLib_addCalc2(&i_this->current.pos.y, rider->home.pos.y + 400.0f, 0.05f, 3.0f); + break; + } + + delta_x = i_this->mTargetPos.x - i_this->current.pos.x; + delta_y = i_this->mTargetPos.y - i_this->current.pos.y; + delta_z = i_this->mTargetPos.z - i_this->current.pos.z; + s16 target_angle_y = cM_atan2s(delta_x, delta_z); + s16 target_angle_x = -cM_atan2s(delta_y, JMAFastSqrt(delta_x * delta_x + delta_z * delta_z)); + s16 prev_angle_y = i_this->current.angle.y; + cLib_addCalcAngleS2(&i_this->current.angle.y, target_angle_y, 0x20, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio); + s16 target_angle_z = (prev_angle_y - i_this->current.angle.y) * 0x20; + if (target_angle_z > 5500) { + target_angle_z = 5500; + } else if (target_angle_z < -5500) { + target_angle_z = -5500; + } + cLib_addCalcAngleS2(&i_this->current.angle.z, target_angle_z, 10, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio * 0.5f); + cLib_addCalcAngleS2(&i_this->current.angle.x, target_angle_x, 0x20, + i_this->mMaxAngleSpeed * i_this->mAngleXSpeedRatio); + cLib_addCalc2(&i_this->mAngleSpeedRatio, 1.0f, 1.0f, 0.04f); + cLib_addCalc2(&i_this->mAngleXSpeedRatio, 0.5f, 1.0f, 0.01f); + cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, accel); } -#pragma pop - -/* ############################################################################################## */ -/* 807F2884-807F2888 000020 0004+00 0/1 0/0 0/0 .rodata @3862 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3862 = 25.0f; -COMPILER_STRIP_GATE(0x807F2884, &lit_3862); -#pragma pop - -/* 807F2888-807F288C 000024 0004+00 0/1 0/0 0/0 .rodata @3863 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3863 = 2000.0f; -COMPILER_STRIP_GATE(0x807F2888, &lit_3863); -#pragma pop - -/* 807F288C-807F2890 000028 0004+00 0/3 0/0 0/0 .rodata @3864 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3864 = 200.0f; -COMPILER_STRIP_GATE(0x807F288C, &lit_3864); -#pragma pop - -/* 807F2890-807F2894 00002C 0004+00 0/1 0/0 0/0 .rodata @3865 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3865 = 150.0f; -COMPILER_STRIP_GATE(0x807F2890, &lit_3865); -#pragma pop - -/* 807F2894-807F2898 000030 0004+00 0/2 0/0 0/0 .rodata @3866 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3866 = 300.0f; -COMPILER_STRIP_GATE(0x807F2894, &lit_3866); -#pragma pop - -/* 807F2898-807F289C 000034 0004+00 0/0 0/0 0/0 .rodata @3867 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3867 = 35.0f; -COMPILER_STRIP_GATE(0x807F2898, &lit_3867); -#pragma pop - -/* 807F289C-807F28A0 000038 0004+00 0/0 0/0 0/0 .rodata @3868 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3868 = 0.25f; -COMPILER_STRIP_GATE(0x807F289C, &lit_3868); -#pragma pop - -/* 807F28A0-807F28A4 00003C 0004+00 0/0 0/0 0/0 .rodata @3869 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3869 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x807F28A0, &lit_3869); -#pragma pop - -/* 807F28A4-807F28A8 000040 0004+00 0/0 0/0 0/0 .rodata @3870 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3870 = 4.0f; -COMPILER_STRIP_GATE(0x807F28A4, &lit_3870); -#pragma pop - -/* 807F28A8-807F28AC 000044 0004+00 0/1 0/0 0/0 .rodata @3871 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3871 = 400.0f; -COMPILER_STRIP_GATE(0x807F28A8, &lit_3871); -#pragma pop - -/* 807F28AC-807F28B0 000048 0004+00 0/1 0/0 0/0 .rodata @3872 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3872 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x807F28AC, &lit_3872); -#pragma pop - -/* 807F28B0-807F28B4 00004C 0004+00 0/1 0/0 0/0 .rodata @3873 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3873 = 3.0f; -COMPILER_STRIP_GATE(0x807F28B0, &lit_3873); -#pragma pop - -/* 807F28B4-807F28B8 000050 0004+00 0/2 0/0 0/0 .rodata @3874 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3874 = 0.5f; -COMPILER_STRIP_GATE(0x807F28B4, &lit_3874); -#pragma pop - -/* 807F28B8-807F28BC 000054 0004+00 0/1 0/0 0/0 .rodata @3875 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3875 = 1.0f / 25.0f; -COMPILER_STRIP_GATE(0x807F28B8, &lit_3875); -#pragma pop - -/* 807F28BC-807F28C0 000058 0004+00 0/0 0/0 0/0 .rodata @3876 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3876 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x807F28BC, &lit_3876); -#pragma pop - -/* 807F28C0-807F28C4 00005C 0004+00 0/3 0/0 0/0 .rodata @3932 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3932 = 1000.0f; -COMPILER_STRIP_GATE(0x807F28C0, &lit_3932); -#pragma pop - -/* 807F28C4-807F28C8 000060 0004+00 0/1 0/0 0/0 .rodata @3933 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3933 = 4000.0f; -COMPILER_STRIP_GATE(0x807F28C4, &lit_3933); -#pragma pop - -/* 807F2B08-807F2B0C 000008 0004+00 4/4 0/0 0/0 .bss S_area_dis */ -static u8 S_area_dis[4]; /* 807F06AC-807F0AA0 0008CC 03F4+00 1/1 0/0 0/0 .text e_yc_f_fly__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_yc_f_fly(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_f_fly__FP10e_yc_class.s" +static void e_yc_f_fly(e_yc_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + int frame = i_this->mpMorf->getFrame(); + f32 delta_x, delta_y, delta_z; + + switch (i_this->mFlyAnmMode) { + case 0: + if (i_this->mTimer[0] == 0 && frame == 14) { + i_this->mFlyAnmMode = 1; + anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f; + } + break; + + case 1: + if (i_this->mTimer[0] == 0) { + i_this->mFlyAnmMode = 0; + anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f; + } + break; + } + + s8 cvar6 = 0; + + switch (i_this->mMode) { + case 0: + i_this->mTimer[2] = cM_rndF(150.0f) + 150.0f; + i_this->mMode = 1; + // fallthrough + + case 1: + if (i_this->mTimer[1] == 0) { + delta_x = i_this->home.pos.x + cM_rndFX(2000.0f) - i_this->current.pos.x; + delta_z = i_this->home.pos.z + cM_rndFX(2000.0f) - i_this->current.pos.z; + if (JMAFastSqrt(delta_x * delta_x + delta_z * delta_z) > 200.0f) { + i_this->mTimer[1] = cM_rndF(150.0f) + 100.0f; + i_this->mTargetPos.x = delta_x + i_this->current.pos.x; + i_this->mTargetPos.y = player->current.pos.y + 1000.0f + cM_rndF(1000.0f); + i_this->mTargetPos.z = delta_z + i_this->current.pos.z; + i_this->mAngleSpeedRatio = 0.0f; + i_this->mMaxAngleSpeed = cM_rndF(300.0f) + 200.0f; + } + } + + if (i_this->mTimer[2] == 0 && S_area_dis < 4000.0f) { + cvar6 = 1; + } + + if (cvar6 == 1) { + i_this->mAction = e_yc_class::ACT_ATTACK; + i_this->mMode = 0; + } else if (cvar6 == 2) { + i_this->mAction = e_yc_class::ACT_ATTACK; + i_this->mMode = 0; + } + break; + } + + delta_x = i_this->mTargetPos.x - i_this->current.pos.x; + delta_y = i_this->mTargetPos.y - i_this->current.pos.y; + delta_z = i_this->mTargetPos.z - i_this->current.pos.z; + s16 target_angle_y = cM_atan2s(delta_x, delta_z); + s16 target_angle_x = -cM_atan2s(delta_y, JMAFastSqrt(delta_x * delta_x + delta_z * delta_z)); + s16 prev_angle_y = i_this->current.angle.y; + cLib_addCalcAngleS2(&i_this->current.angle.y, target_angle_y, 10, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio); + s16 target_angle_z = (prev_angle_y - i_this->current.angle.y) * 0x20; + if (target_angle_z > 5500) { + target_angle_z = 5500; + } else if (target_angle_z < -5500) { + target_angle_z = -5500; + } + cLib_addCalcAngleS2(&i_this->current.angle.z, target_angle_z, 10, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio * 0.5f); + cLib_addCalcAngleS2(&i_this->current.angle.x, target_angle_x, 10, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio); + cLib_addCalc2(&i_this->mAngleSpeedRatio, 1.0f, 1.0f, 0.04f); + cLib_addCalc2(&i_this->speedF, 25.0f, 1.0f, 1.0f); } -#pragma pop - -/* ############################################################################################## */ -/* 807F28C8-807F28CC 000064 0004+00 0/1 0/0 0/0 .rodata @3959 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3959 = 5.0f; -COMPILER_STRIP_GATE(0x807F28C8, &lit_3959); -#pragma pop - -/* 807F28CC-807F28D0 000068 0004+00 0/1 0/0 0/0 .rodata @3960 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3960 = -5.0f; -COMPILER_STRIP_GATE(0x807F28CC, &lit_3960); -#pragma pop - -/* 807F28D0-807F28D4 00006C 0004+00 0/1 0/0 0/0 .rodata @3961 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3961 = 3000.0f; -COMPILER_STRIP_GATE(0x807F28D0, &lit_3961); -#pragma pop - -/* 807F28D4-807F28D8 000070 0004+00 0/2 0/0 0/0 .rodata @3962 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3962 = 5000.0f; -COMPILER_STRIP_GATE(0x807F28D4, &lit_3962); -#pragma pop /* 807F0AA0-807F0C40 000CC0 01A0+00 1/1 0/0 0/0 .text e_yc_hovering__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_yc_hovering(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_hovering__FP10e_yc_class.s" +static void e_yc_hovering(e_yc_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + f32 target_speed = 0.0f; + + switch (i_this->mMode) { + case 0: + anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mMode = 1; + i_this->mTimer[0] = cM_rndF(100.0f) + 200.0f; + break; + + case 1: + if (i_this->current.pos.y < player->current.pos.y + 400.0f) { + cLib_addCalc2(&i_this->current.pos.y, player->current.pos.y + 400.0f, 0.05f, 5.0f); + } + if (i_this->current.pos.y > player->current.pos.y + 1000.0f) { + cLib_addCalc2(&i_this->current.pos.y, player->current.pos.y + 1000.0f, 0.05f, 5.0f); + } + + if (i_this->mDistToPlayer < 1000.0f) { + target_speed = -5.0f; + } else if (i_this->mDistToPlayer > 3000.0f) { + target_speed = 5.0f; + } + + if (i_this->mTimer[0] == 0 || S_area_dis > 5000.0f) { + i_this->mAction = e_yc_class::ACT_F_FLY; + i_this->mMode = 0; + i_this->mFlyAnmMode = 1; + } + break; + } + + cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 0.5f); + cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleToPlayer, 8, 0x200); + cLib_addCalcAngleS2(&i_this->current.angle.z, 0, 4, 0x800); } -#pragma pop - -/* ############################################################################################## */ -/* 807F28D8-807F28DC 000074 0004+00 0/3 0/0 0/0 .rodata @4078 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4078 = 50.0f; -COMPILER_STRIP_GATE(0x807F28D8, &lit_4078); -#pragma pop - -/* 807F28DC-807F28E0 000078 0004+00 0/2 0/0 0/0 .rodata @4079 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4079 = 500.0f; -COMPILER_STRIP_GATE(0x807F28DC, &lit_4079); -#pragma pop - -/* 807F28E0-807F28E4 00007C 0004+00 0/1 0/0 0/0 .rodata @4080 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4080 = 30.0f; -COMPILER_STRIP_GATE(0x807F28E0, &lit_4080); -#pragma pop - -/* 807F28E4-807F28EC 000080 0008+00 0/1 0/0 0/0 .rodata @4081 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4081[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x807F28E4, &lit_4081); -#pragma pop - -/* 807F28EC-807F28F4 000088 0008+00 0/1 0/0 0/0 .rodata @4082 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4082[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x807F28EC, &lit_4082); -#pragma pop - -/* 807F28F4-807F28FC 000090 0008+00 0/1 0/0 0/0 .rodata @4083 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4083[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x807F28F4, &lit_4083); -#pragma pop /* 807F0C40-807F1218 000E60 05D8+00 2/1 0/0 0/0 .text e_yc_attack__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_yc_attack(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_attack__FP10e_yc_class.s" +static void e_yc_attack(e_yc_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz delta; + e_rdy_class* rider = static_cast(fopAcM_SearchByID(i_this->mRiderID)); + f32 target_speed = 0.0f; + int frame = i_this->mpMorf->getFrame(); + + if (i_this->mMode < 4) { + i_this->mTargetPos = player->current.pos; + i_this->mTargetPos.y += 50.0f; + } + delta = i_this->mTargetPos - i_this->current.pos; + + switch (i_this->mMode) { + case 0: + i_this->mAngleSpeedRatio = 0; + i_this->mMaxAngleSpeed = 500.0f; + i_this->mMode = 1; + // fallthrough + + case 1: + target_speed = 30.0f; + if (delta.abs() < 1000.0f) { + i_this->mMode = 2; + anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mMaxAngleSpeed = 1000.0f; + i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_YC_V_ATTACK, -1); + } + break; + + case 2: + if (i_this->speedF < 10.0f) { + i_this->mMode = 3; + i_this->mTimer[0] = 15; + i_this->mMaxAngleSpeed = 0.0f; + } + break; + + case 3: + if (i_this->mTimer[0] == 0) { + anm_init(i_this, e_yc_class::ANM_CATCH_START, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f); + i_this->mMode = 4; + } + break; + + case 4: + if (frame == 11 && rider->field_0x1370 == 0 & i_this->mDistToPlayer < 200.0f) { + rider->field_0x1370 = 1; + i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_HIT_SIDE, 0, -1); + } + + cLib_addCalc2(&i_this->current.pos.x, i_this->mTargetPos.x, 1.0f, 30.0f); + cLib_addCalc2(&i_this->current.pos.y, i_this->mTargetPos.y + 350.0f, 1.0f, 30.0f); + cLib_addCalc2(&i_this->current.pos.z, i_this->mTargetPos.z, 1.0f, 30.0f); + + if (i_this->mpMorf->isStop()) { + if (rider->field_0x1370 == 0) { + i_this->mAction = e_yc_class::ACT_HOVERING; + i_this->mMode = 0; + } else { + anm_init(i_this, e_yc_class::ANM_CATCH_MIDDLE, 5.0f, + J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mMode = 5; + i_this->mTimer[0] = 80; + } + } + break; + + case 5: + if (i_this->mTimer[0] == 0) { + anm_init(i_this, e_yc_class::ANM_CATCH_END, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f); + i_this->mMode = 6; + } else { + i_this->current.pos.y += 5.0f; + } + break; + + case 6: + if (frame == 30) { + rider->field_0x1370 = 3; + } + + if (i_this->mpMorf->isStop()) { + i_this->mAction = e_yc_class::ACT_HOVERING; + i_this->mMode = 0; + } + break; + } + + s16 target_angle_y = cM_atan2s(delta.x, delta.z); + s16 target_angle_x = -cM_atan2s(delta.y, JMAFastSqrt(delta.x * delta.x + delta.z * delta.z)); + s16 prev_ang_y = i_this->current.angle.y; + cLib_addCalcAngleS2(&i_this->current.angle.y, target_angle_y, 10, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio); + s16 target_angle_z; + if (i_this->mMode < 2) { + target_angle_z = (prev_ang_y - i_this->current.angle.y) * 0x20; + if (target_angle_z > 5500) { + target_angle_z = 5500; + } else if (target_angle_z < -5500) { + target_angle_z = -5500; + } + } else { + target_angle_z = 0; + } + cLib_addCalcAngleS2(&i_this->current.angle.z, target_angle_z, 10, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio * 0.5f); + cLib_addCalcAngleS2(&i_this->current.angle.x, target_angle_x, 10, + i_this->mMaxAngleSpeed * i_this->mAngleSpeedRatio); + cLib_addCalc2(&i_this->mAngleSpeedRatio, 1.0f, 1.0f, 0.04f); + cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 0.75f); + + if (S_area_dis > 5000.0f) { + i_this->mAction = e_yc_class::ACT_F_FLY; + i_this->mMode = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 807F28FC-807F2900 000098 0004+00 0/0 0/0 0/0 .rodata @4084 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4084 = 350.0f; -COMPILER_STRIP_GATE(0x807F28FC, &lit_4084); -#pragma pop - -/* 807F2900-807F2904 00009C 0004+00 0/0 0/0 0/0 .rodata @4085 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4085 = 0.75f; -COMPILER_STRIP_GATE(0x807F2900, &lit_4085); -#pragma pop - -/* 807F2904-807F2908 0000A0 0004+00 0/1 0/0 0/0 .rodata @4167 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4167 = 2.0f; -COMPILER_STRIP_GATE(0x807F2904, &lit_4167); -#pragma pop /* 807F1218-807F165C 001438 0444+00 1/1 0/0 0/0 .text e_yc_wolfbite__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void e_yc_wolfbite(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s" +static void e_yc_wolfbite(e_yc_class* i_this) { + fopAc_ac_c* _this = static_cast(i_this); + daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); + e_rdy_class* rider = static_cast(fopAcM_SearchByID(i_this->mRiderID)); + + int frame = i_this->mpMorf->getFrame(); + i_this->mCcDisableTimer = 10; + cLib_addCalc0(&_this->speedF, 1.0f, 2.0f); + + switch (i_this->mMode) { + case 0: + anm_init(i_this, e_yc_class::ANM_HANGED, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f); + i_this->mMode = 1; + i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_DN_V_DRAWBACK, -1); + _this->health -= 5; + i_this->mWolfBiteDamageCount = 0; + break; + + case 1: + if (i_this->mpMorf->isStop()) { + anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + i_this->mMode = 2; + } + break; + + case 2: + if (i_this->mAnm == e_yc_class::ANM_HANGED_DAMAGE && i_this->mpMorf->isStop()) { + anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f); + } + + if (i_this->health <= 0 || i_this->checkWolfBiteDamage()) { + i_this->offWolfBiteDamage(); + anm_init(i_this, e_yc_class::ANM_HANGED_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f); + i_this->health -= 5; + + if (_this->health <= 0) { + player->offWolfEnemyHangBite(); + anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH2, 3.0f, + J3DFrameCtrl::LOOP_ONCE_e, 1.0f); + i_this->mMode = 3; + rider->field_0x1370 = 5; + dScnPly_c::setPauseTimer(7); + i_this->mCreatureSound.startCollisionSE(Z2SE_HIT_WOLFBITE, 0x20); + dComIfGp_setHitMark(3, i_this, &player->eyePos, &player->shape_angle, NULL, 0); + dComIfGp_getVibration().StartShock(5, 0x4f, cXyz(0.0f, 1.0f, 0.0f)); + return; + } + + i_this->mWolfBiteDamageCount++; + if (i_this->mWolfBiteDamageCount >= 5) { + player->offWolfEnemyHangBite(); + anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f, + J3DFrameCtrl::LOOP_ONCE_e, 1.0f); + i_this->mMode = 3; + } + + i_this->mCreatureSound.startCollisionSE(Z2SE_HIT_WOLFBITE, 0x1e); + } + + if (!player->checkWolfEnemyBiteAllOwn(_this)) { + anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f); + i_this->mMode = 3; + } + + break; + + case 3: + _this->current.pos.y += 10.0f; + if (i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH2 && frame == 24) { + rider->field_0xa8f = 1; + } + + if (i_this->mpMorf->isStop()) { + if (i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH2) { + i_this->mAction = e_yc_class::ACT_FLY; + i_this->mMode = 0; + i_this->mFlyAnmMode = 1; + _this->home.pos.y += 5000.0f; + } else { + i_this->mAction = e_yc_class::ACT_F_FLY; + i_this->mMode = 0; + i_this->mFlyAnmMode = 1; + } + } + + break; + } + + cLib_addCalcAngleS2(&_this->current.angle.y, player->shape_angle.y + 0x8000, 2, 0x1000); } -#pragma pop - -/* ############################################################################################## */ -/* 807F2908-807F290C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4267 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4267 = 28.0f; -COMPILER_STRIP_GATE(0x807F2908, &lit_4267); -#pragma pop - -/* 807F290C-807F2910 0000A8 0004+00 0/1 0/0 0/0 .rodata @4268 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4268 = 27.0f; -COMPILER_STRIP_GATE(0x807F290C, &lit_4268); -#pragma pop - -/* 807F2910-807F2914 0000AC 0004+00 0/1 0/0 0/0 .rodata @4269 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4269 = 11.0f; -COMPILER_STRIP_GATE(0x807F2910, &lit_4269); -#pragma pop - -/* 807F2914-807F2918 0000B0 0004+00 0/1 0/0 0/0 .rodata @4270 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4270 = 36.0f; -COMPILER_STRIP_GATE(0x807F2914, &lit_4270); -#pragma pop - -/* 807F2918-807F291C 0000B4 0004+00 0/1 0/0 0/0 .rodata @4271 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4271 = 7.0f; -COMPILER_STRIP_GATE(0x807F2918, &lit_4271); -#pragma pop - -/* 807F291C-807F2920 0000B8 0004+00 0/1 0/0 0/0 .rodata @4272 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4272 = 6.0f; -COMPILER_STRIP_GATE(0x807F291C, &lit_4272); -#pragma pop - -/* 807F2920-807F2924 0000BC 0004+00 0/1 0/0 0/0 .rodata @4273 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4273 = 14.0f; -COMPILER_STRIP_GATE(0x807F2920, &lit_4273); -#pragma pop - -/* 807F2924-807F2928 0000C0 0004+00 0/1 0/0 0/0 .rodata @4274 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4274 = 15.0f; -COMPILER_STRIP_GATE(0x807F2924, &lit_4274); -#pragma pop /* 807F165C-807F1AD4 00187C 0478+00 1/1 0/0 0/0 .text anm_se_set__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void anm_se_set(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/anm_se_set__FP10e_yc_class.s" +static void anm_se_set(e_yc_class* i_this) { + if ((i_this->mAnm == e_yc_class::ANM_FLY && i_this->mpMorf->checkFrame(28.0f)) + || (i_this->mAnm == e_yc_class::ANM_CATCH_START && i_this->mpMorf->checkFrame(27.0f)) + || (i_this->mAnm == e_yc_class::ANM_CATCH_MIDDLE && i_this->mpMorf->checkFrame(11.0f)) + || (i_this->mAnm == e_yc_class::ANM_CATCH_END + && (i_this->mpMorf->checkFrame(11.0f) || i_this->mpMorf->checkFrame(36.0f)))) + { + i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); + } else if (i_this->mAnm == e_yc_class::ANM_FLY_GLIDE) { + i_this->mCreatureSound.startCreatureSoundLevel(Z2SE_EN_YC_GLIDE, 0, -1); + } else if (i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH && i_this->mpMorf->checkFrame(1.0f)) { + i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_YC_V_BRUSH, -1); + } else if (i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH2 && i_this->mpMorf->checkFrame(1.0f)) { + i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_YC_V_BRUSH2, -1); + } else if (i_this->mAnm == e_yc_class::ANM_HANGED && i_this->mpMorf->checkFrame(1.0f)) { + i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_YC_V_HANGED, -1); + i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); + } else if (i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH && i_this->mpMorf->checkFrame(7.0f)) { + i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); + } else if (i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH2 + && (i_this->mpMorf->checkFrame(1.0f) || i_this->mpMorf->checkFrame(6.0f) + || i_this->mpMorf->checkFrame(14.0f) || i_this->mpMorf->checkFrame(36.0f))) + { + i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); + } else if (i_this->mAnm == e_yc_class::ANM_HANGED_DAMAGE) { + if (i_this->mpMorf->checkFrame(1.0f)) { + i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_YC_V_DAMAGE, -1); + } else if (i_this->mpMorf->checkFrame(7.0f) || i_this->mpMorf->checkFrame(15.0f)) { + i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); + } + } else if (i_this->mAnm == e_yc_class::ANM_HOVERING) { + i_this->mCreatureSound.startCreatureVoiceLevel(Z2SE_EN_YC_V_HOVERING, -1); + if (i_this->mpMorf->checkFrame(11.0f)) { + i_this->mCreatureSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 807F2928-807F292C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4314 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4314 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x807F2928, &lit_4314); -#pragma pop /* 807F1AD4-807F1CE4 001CF4 0210+00 2/1 0/0 0/0 .text action__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/action__FP10e_yc_class.s" +static void action(e_yc_class* i_this) { + cXyz vec1, vec2; + fopAc_ac_c* _this = static_cast(i_this); + + i_this->mAngleToPlayer = fopAcM_searchPlayerAngleY(_this); + i_this->mDistToPlayer = fopAcM_searchPlayerDistanceXZ(_this); + damage_check(i_this); + + switch (i_this->mAction) { + case e_yc_class::ACT_FLY: + e_yc_fly(i_this); + break; + case e_yc_class::ACT_F_FLY: + e_yc_f_fly(i_this); + break; + case e_yc_class::ACT_HOVERING: + e_yc_hovering(i_this); + break; + case e_yc_class::ACT_ATTACK: + e_yc_attack(i_this); + break; + case e_yc_class::ACT_WOLFBITE: + e_yc_wolfbite(i_this); + break; + } + + i_this->mCreatureSound.setLinkSearch(false); + + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = _this->speedF; + cMtx_YrotS(*calc_mtx, _this->current.angle.y); + cMtx_XrotM(*calc_mtx, _this->current.angle.x); + MtxPosition(&vec1, &_this->speed); + _this->current.pos += _this->speed; + + if (i_this->field_0x69c > 0.1f) { + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = -i_this->field_0x69c; + cMtx_YrotS(*calc_mtx, i_this->field_0x6a0); + MtxPosition(&vec1, &vec2); + _this->current.pos += vec2; + cLib_addCalc0(&i_this->field_0x69c, 1.0f, 5.0f); + } + + cLib_addCalcAngleS2(&_this->shape_angle.y, _this->current.angle.y, 4, 0x2000); + cLib_addCalcAngleS2(&_this->shape_angle.x, 0, 4, 0x2000); + cLib_addCalcAngleS2(&_this->shape_angle.z, _this->current.angle.z, 4, 0x2000); + + _this->current.pos.y -= 200.0f; + _this->old.pos.y -= 200.0f; + i_this->mAcch.CrrPos(dComIfG_Bgsp()); + _this->current.pos.y += 200.0f; + _this->old.pos.y += 200.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 807F292C-807F2930 0000C8 0004+00 0/1 0/0 0/0 .rodata @4480 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4480 = -103171.0f; -COMPILER_STRIP_GATE(0x807F292C, &lit_4480); -#pragma pop - -/* 807F2930-807F2934 0000CC 0004+00 0/1 0/0 0/0 .rodata @4481 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4481 = 38369.0f; -COMPILER_STRIP_GATE(0x807F2930, &lit_4481); -#pragma pop - -/* 807F2934-807F2938 0000D0 0004+00 0/1 0/0 0/0 .rodata @4482 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4482 = 21000.0f; -COMPILER_STRIP_GATE(0x807F2934, &lit_4482); -#pragma pop - -/* 807F2938-807F293C 0000D4 0004+00 0/1 0/0 0/0 .rodata @4483 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4483 = 80.0f; -COMPILER_STRIP_GATE(0x807F2938, &lit_4483); -#pragma pop - -/* 807F293C-807F2940 0000D8 0004+00 0/1 0/0 0/0 .rodata @4484 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4484 = -30.0f; -COMPILER_STRIP_GATE(0x807F293C, &lit_4484); -#pragma pop - -/* 807F2B0C-807F2B10 00000C 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_807F2B0C[4]; - -/* 807F2B10-807F2B1C 000010 000C+00 1/1 0/0 0/0 .bss @3710 */ -static u8 lit_3710[12]; - -/* 807F2B1C-807F2B28 00001C 000C+00 3/3 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[12]; /* 807F1CE4-807F2234 001F04 0550+00 2/1 0/0 0/0 .text daE_YC_Execute__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YC_Execute(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Execute__FP10e_yc_class.s" +static int daE_YC_Execute(e_yc_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz vec1, vec2; + + f32 dist_x = -103171.0f; + f32 dist_z = 38369.0f; + dist_x -= player->current.pos.x; + dist_z -= player->current.pos.z; + S_area_dis = JMAFastSqrt(dist_x * dist_x + dist_z * dist_z); + + i_this->onWolfNoLock(); + + i_this->mCounter++; + for (int i = 0; i < 4; i++) { + if (i_this->mTimer[i] != 0) { + i_this->mTimer[i]--; + } + } + if (i_this->mCcDisableTimer != 0) { + i_this->mCcDisableTimer--; + } + + action(i_this); + + J3DModel* model = i_this->mpMorf->getModel(); + i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); + anm_se_set(i_this); + + static int wing_j[2] = {12, 17}; + + if (i_this->mAnm == e_yc_class::ANM_FLY_GLIDE || i_this->mAnm == e_yc_class::ANM_HOVERING + || i_this->mAnm == e_yc_class::ANM_FLY_BRAKE || i_this->mAnm == e_yc_class::ANM_CATCH_START + || i_this->mAnm == e_yc_class::ANM_CATCH_MIDDLE || i_this->mAnm == e_yc_class::ANM_CATCH_END + || i_this->mAnm == e_yc_class::ANM_FLY) + { + for (int i = 0; i < 2; i++) { + i_this->mParticleKey[i] = dComIfGp_particle_set(i_this->mParticleKey[i], 0x8607, + &i_this->current.pos, NULL, NULL); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->mParticleKey[i]); + if (emitter != NULL) { + emitter->setGlobalRTMatrix(model->getAnmMtx(wing_j[i] + 1)); + } + } + } + + if (i_this->mpMorf->checkFrame(1.0f)) { + if (i_this->mAnm == e_yc_class::ANM_HANGED_DAMAGE + || i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH + || i_this->mAnm == e_yc_class::ANM_HANGED_BRUSH2) + { + for (int i = 0; i < 2; i++) { + JPABaseEmitter* emitter = dComIfGp_particle_set(0x8603, &i_this->current.pos, + NULL, NULL); + if (emitter != NULL) { + emitter->setGlobalRTMatrix(model->getAnmMtx(wing_j[i] + 1)); + } + } + } + + if (i_this->mAnm == e_yc_class::ANM_HANGED) { + JPABaseEmitter* emitter = dComIfGp_particle_set(0x8604, &i_this->current.pos, + NULL, NULL); + if (emitter != NULL) { + emitter->setGlobalRTMatrix(model->getAnmMtx(1)); + } + } + } + + mDoMtx_stack_c::transS(i_this->current.pos.x, + i_this->current.pos.y + i_this->field_0x694, + i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::XrotM(i_this->shape_angle.x); + mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); + mDoMtx_stack_c::scaleM(l_HIO.mScale, l_HIO.mScale, l_HIO.mScale); + model->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpMorf->modelCalc(); + + MTXCopy(model->getAnmMtx(6), *calc_mtx); + vec1.set(0.0f, 0.0f, 0.0f); + MtxPosition(&vec1, &i_this->eyePos); + + if (i_this->mAction == e_yc_class::ACT_WOLFBITE) { + i_this->attention_info.position = i_this->current.pos; + i_this->attention_info.position.y += 200.0f; + } else { + i_this->attention_info.position = i_this->eyePos; + i_this->attention_info.position.y += 50.0f; + } + + MTXCopy(model->getAnmMtx(1), *calc_mtx); + vec1.set(0.0f, 0.0f, 0.0f); + MtxPosition(&vec1, &vec2); + if (i_this->mCcDisableTimer != 0) { + vec2.z -= 21000.0f; + } + i_this->mCcSph.SetC(vec2); + i_this->mCcSph.SetR(80.0f * l_HIO.mScale); + dComIfG_Ccsp()->Set(&i_this->mCcSph); + + mDoMtx_stack_c::copy(model->getAnmMtx(2)); + vec1.set(0.0f, -30.0f, 0.0f); + mDoMtx_stack_c::multVec(&vec1, &vec2); + i_this->setDownPos(&vec2); + + return 1; } -#pragma pop /* 807F2234-807F223C 002454 0008+00 1/0 0/0 0/0 .text daE_YC_IsDelete__FP10e_yc_class */ -static bool daE_YC_IsDelete(e_yc_class* param_0) { - return true; +static int daE_YC_IsDelete(e_yc_class* i_this) { + return 1; } /* 807F223C-807F22A4 00245C 0068+00 1/0 0/0 0/0 .text daE_YC_Delete__FP10e_yc_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YC_Delete(e_yc_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Delete__FP10e_yc_class.s" +static int daE_YC_Delete(e_yc_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "E_yc"); + + if (i_this->mHIOInit) { + hioInit = false; + } + + if (i_this->heap != NULL) { + i_this->mpMorf->stopZelAnime(); + } + + return 1; } -#pragma pop /* 807F22A4-807F239C 0024C4 00F8+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_yc/d_a_e_yc/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + e_yc_class* _this = static_cast(i_this); + + _this->mpMorf = + new mDoExt_McaMorfSO(static_cast(dComIfG_getObjectRes("E_yc", 24)), NULL, + NULL, static_cast(dComIfG_getObjectRes("E_yc", 21)), + 2, 1.0f, 0, -1, &_this->mCreatureSound, 0x80000, 0x11000084); + if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { + return 0; + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 807F2940-807F2944 0000DC 0004+00 0/1 0/0 0/0 .rodata @4622 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4622 = -500.0f; -COMPILER_STRIP_GATE(0x807F2940, &lit_4622); -#pragma pop - -/* 807F2944-807F2948 0000E0 0004+00 0/1 0/0 0/0 .rodata @4623 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4623 = -300.0f; -COMPILER_STRIP_GATE(0x807F2944, &lit_4623); -#pragma pop - -/* 807F2948-807F294C 0000E4 0004+00 0/1 0/0 0/0 .rodata @4624 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4624 = 65535.0f; -COMPILER_STRIP_GATE(0x807F2948, &lit_4624); -#pragma pop /* 807F239C-807F26BC 0025BC 0320+00 1/0 0/0 0/0 .text daE_YC_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_YC_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/daE_YC_Create__FP10fopAc_ac_c.s" +static cPhs__Step daE_YC_Create(fopAc_ac_c* i_this) { + e_yc_class* _this = static_cast(i_this); + fopAcM_SetupActor(i_this, e_yc_class); + + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_yc"); + if (step == cPhs_COMPLEATE_e) { + _this->mParam = (u8)fopAcM_GetParam(_this); + + if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x23a0)) { + return cPhs_ERROR_e; + } + + if (!hioInit) { + _this->mHIOInit = true; + hioInit = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_SetMtx(_this, _this->mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMin(_this, -500.0f, -300.0f, -500.0f); + fopAcM_SetMax(_this, 500.0f, 300.0f, 500.0f); + + _this->health = 60; + _this->field_0x560 = 60; + + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + + static dCcD_SrcSph at_sph_src = { + { + {0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xd}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + + _this->mCcStts.Init(100, 0, _this); + _this->mCcSph.Set(cc_sph_src); + _this->mCcSph.SetStts(&_this->mCcStts); + _this->mAtSph.Set(at_sph_src); + _this->mAtSph.SetStts(&_this->mCcStts); + _this->mAcch.Set(fopAcM_GetPosition_p(_this), fopAcM_GetOldPosition_p(_this), _this, 1, + &_this->mAcchCir, fopAcM_GetSpeed_p(_this), NULL, NULL); + _this->mAcchCir.SetWall(50.0f, 50.0f); + + _this->mCreatureSound.init(&_this->current.pos, &_this->eyePos, 3, 1); + _this->mCreatureSound.setEnemyName("E_yc"); + _this->mAtInfo.mpSound = &_this->mCreatureSound; + + _this->mCounter = cM_rndF(0xffff); + _this->mAction = e_yc_class::ACT_FLY; + + _this->attention_info.flags = 4; + _this->attention_info.field_0x0[2] = 26; + + daE_YC_Execute(_this); + } + + return step; } -#pragma pop -/* 807F26BC-807F2704 0028DC 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_yc/d_a_e_yc/__dt__8cM3dGSphFv.s" -} -#pragma pop +/* 807F2A68-807F2A88 -00001 0020+00 1/0 0/0 0/0 .data l_daE_YC_Method */ +static actor_method_class l_daE_YC_Method = { + (process_method_func)daE_YC_Create, + (process_method_func)daE_YC_Delete, + (process_method_func)daE_YC_Execute, + (process_method_func)daE_YC_IsDelete, + (process_method_func)daE_YC_Draw, +}; -/* 807F2704-807F274C 002924 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_yc/d_a_e_yc/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 807F274C-807F27BC 00296C 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_yc/d_a_e_yc/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 807F27BC-807F2804 0029DC 0048+00 2/1 0/0 0/0 .text __dt__12daE_YC_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daE_YC_HIO_c::~daE_YC_HIO_c() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__dt__12daE_YC_HIO_cFv.s" -} -#pragma pop - -/* 807F2804-807F2840 002A24 003C+00 0/0 1/0 0/0 .text __sinit_d_a_e_yc_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_e_yc_cpp() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/__sinit_d_a_e_yc_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x807F2804, __sinit_d_a_e_yc_cpp); -#pragma pop - -/* 807F2840-807F2848 002A60 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_807F2840() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2840.s" -} -#pragma pop - -/* 807F2848-807F2850 002A68 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_807F2848() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/func_807F2848.s" -} -#pragma pop - -/* 807F294C-807F294C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807F2A88-807F2AB8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_YC */ +extern actor_process_profile_definition g_profile_E_YC = { + fpcLy_CURRENT_e, + 4, + fpcPi_CURRENT_e, + PROC_E_YC, + &g_fpcLf_Method.mBase, + sizeof(e_yc_class), + 0, + 0, + &g_fopAc_Method.base, + 0xBB, + &l_daE_YC_Method, + 0x40100, + fopAc_ENEMY_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index 74af59d5781..9256ca725fb 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -6,10 +6,10 @@ */ #include "rel/d/a/e/d_a_e_yk/d_a_e_yk.h" +#include "d/com/d_com_inf_game.h" #include "d/a/d_a_player.h" #include "d/s/d_s_play.h" #include "dol2asm.h" -#include "dolphin/types.h" // // Forward References: diff --git a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp index 89f2dfe32c1..7faef93f09c 100644 --- a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp +++ b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp @@ -5,8 +5,8 @@ #include "rel/d/a/e/d_a_e_ym/d_a_e_ym.h" #include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" -#include "global.h" // // Types: diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 64651e9c8dd..3f004b4466e 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -19358,7 +19358,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { setBgCheckParam(); - if ((checkNoResetFlg2(FLG2_UNK_40) && mProcID != PROC_WOLF_ENEMY_HANG_BITE) || + if ((checkNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE) && mProcID != PROC_WOLF_ENEMY_HANG_BITE) || (checkNoResetFlg2(FLG2_UNK_8) && mProcID != PROC_WOLF_ENEMY_THROW && !i_checkWolfEnemyThrowAnime())) { resetWolfEnemyBiteAll(); } diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc index c0aa7afc959..7cf3fc43610 100644 --- a/src/d/a/d_a_alink_wolf.inc +++ b/src/d/a/d_a_alink_wolf.inc @@ -6042,7 +6042,7 @@ int daAlink_c::procWolfJumpAttack() { return 1; } - if (checkNoResetFlg2(FLG2_UNK_40)) { + if (checkNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE)) { return procWolfEnemyHangBiteInit(); } diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp index 226f5284af7..fbce81995ae 100644 --- a/src/d/cc/d_cc_uty.cpp +++ b/src/d/cc/d_cc_uty.cpp @@ -6,8 +6,10 @@ #include "d/cc/d_cc_uty.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Creature.h" +#include "d/cc/d_cc_d.h" #include "d/a/d_a_player.h" #include "d/s/d_s_play.h" +#include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" bool daPy_py_c::checkWoodSwordEquip() {