diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-04-09 12:47:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-09 19:47:50 +0300 |
| commit | 197282b084326deac5d8488e3ef39d3d671a1d5a (patch) | |
| tree | 05c6136f68ef1ba3563355a4f6e22b8e29563b35 | |
| parent | 4d614bdf5bd373090559a839fb703ca9982713d2 (diff) | |
d_a_sq and d_a_npc_sq OK (#2123)
48 files changed, 1084 insertions, 4774 deletions
diff --git a/Progress.md b/Progress.md index 49dd0afa73..2a5a941167 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 53.888305% | 2166672 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 53.888305% | 2166672 | 4020672 -RELs | 37.186674% | 4276588 | 11500324 -Total | 41.513186% | 6443260 | 15520996 +RELs | 37.290880% | 4288572 | 11500324 +Total | 41.590398% | 6455244 | 15520996 ## RELs @@ -311,7 +311,7 @@ d_a_npc_shop_maro | 53.691275% | 2880 | 5364 d_a_npc_sola | 39.560155% | 6116 | 15460 d_a_npc_soldierA | 34.996894% | 6760 | 19316 d_a_npc_soldierB | 35.587267% | 6484 | 18220 -d_a_npc_sq | 39.651108% | 3364 | 8484 +d_a_npc_sq | 100.000000% | 8484 | 8484 d_a_npc_taro | 38.152632% | 28996 | 76000 d_a_npc_the | 42.167812% | 11780 | 27936 d_a_npc_theB | 34.129794% | 9256 | 27120 @@ -695,7 +695,7 @@ d_a_set_bgobj | 100.000000% | 1108 | 1108 d_a_shop_item | 100.000000% | 4688 | 4688 d_a_skip_2D | 100.000000% | 1332 | 1332 d_a_spinner | 34.295011% | 6324 | 18440 -d_a_sq | 35.488722% | 3776 | 10640 +d_a_sq | 100.000000% | 10640 | 10640 d_a_startAndGoal | 100.000000% | 3044 | 3044 d_a_suspend | 100.000000% | 896 | 896 d_a_swBall | 33.297414% | 1236 | 3712 @@ -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.186674% | 4276588 | 11500324 +Total | 37.290880% | 4288572 | 11500324 diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/__ct__10daSq_HIO_cFv.s b/asm/rel/d/a/d_a_sq/d_a_sq/__ct__10daSq_HIO_cFv.s deleted file mode 100644 index bdfaef7a56..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/__ct__10daSq_HIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8059F66C: -/* 8059F66C 3C 80 80 5A */ lis r4, lit_3769@ha /* 0x805A1158@ha */ -/* 8059F670 38 A4 11 58 */ addi r5, r4, lit_3769@l /* 0x805A1158@l */ -/* 8059F674 3C 80 80 5A */ lis r4, __vt__10daSq_HIO_c@ha /* 0x805A131C@ha */ -/* 8059F678 38 04 13 1C */ addi r0, r4, __vt__10daSq_HIO_c@l /* 0x805A131C@l */ -/* 8059F67C 90 03 00 00 */ stw r0, 0(r3) -/* 8059F680 38 00 FF FF */ li r0, -1 -/* 8059F684 98 03 00 04 */ stb r0, 4(r3) -/* 8059F688 C0 05 00 00 */ lfs f0, 0(r5) -/* 8059F68C D0 03 00 08 */ stfs f0, 8(r3) -/* 8059F690 C0 05 00 04 */ lfs f0, 4(r5) -/* 8059F694 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8059F698 C0 05 00 08 */ lfs f0, 8(r5) -/* 8059F69C D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8059F6A0 38 00 00 01 */ li r0, 1 -/* 8059F6A4 98 03 00 14 */ stb r0, 0x14(r3) -/* 8059F6A8 C0 05 00 0C */ lfs f0, 0xc(r5) -/* 8059F6AC D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8059F6B0 C0 05 00 10 */ lfs f0, 0x10(r5) -/* 8059F6B4 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 8059F6B8 C0 05 00 14 */ lfs f0, 0x14(r5) -/* 8059F6BC D0 03 00 20 */ stfs f0, 0x20(r3) -/* 8059F6C0 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 8059F6C4 C0 05 00 18 */ lfs f0, 0x18(r5) -/* 8059F6C8 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 8059F6CC C0 05 00 1C */ lfs f0, 0x1c(r5) -/* 8059F6D0 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 8059F6D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__10daSq_HIO_cFv.s b/asm/rel/d/a/d_a_sq/d_a_sq/__dt__10daSq_HIO_cFv.s deleted file mode 100644 index 14e6d3b084..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__10daSq_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_805A10B0: -/* 805A10B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A10B4 7C 08 02 A6 */ mflr r0 -/* 805A10B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A10BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A10C0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 805A10C4 41 82 00 1C */ beq lbl_805A10E0 -/* 805A10C8 3C A0 80 5A */ lis r5, __vt__10daSq_HIO_c@ha /* 0x805A131C@ha */ -/* 805A10CC 38 05 13 1C */ addi r0, r5, __vt__10daSq_HIO_c@l /* 0x805A131C@l */ -/* 805A10D0 90 1F 00 00 */ stw r0, 0(r31) -/* 805A10D4 7C 80 07 35 */ extsh. r0, r4 -/* 805A10D8 40 81 00 08 */ ble lbl_805A10E0 -/* 805A10DC 4B D2 DC 61 */ bl __dl__FPv -lbl_805A10E0: -/* 805A10E0 7F E3 FB 78 */ mr r3, r31 -/* 805A10E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A10E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A10EC 7C 08 03 A6 */ mtlr r0 -/* 805A10F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A10F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/d_a_sq/d_a_sq/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 9bd892890d..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_805A0BE8: -/* 805A0BE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A0BEC 7C 08 02 A6 */ mflr r0 -/* 805A0BF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A0BF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A0BF8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 805A0BFC 41 82 00 1C */ beq lbl_805A0C18 -/* 805A0C00 3C A0 80 5A */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x805A1310@ha */ -/* 805A0C04 38 05 13 10 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x805A1310@l */ -/* 805A0C08 90 1F 00 00 */ stw r0, 0(r31) -/* 805A0C0C 7C 80 07 35 */ extsh. r0, r4 -/* 805A0C10 40 81 00 08 */ ble lbl_805A0C18 -/* 805A0C14 4B D2 E1 29 */ bl __dl__FPv -lbl_805A0C18: -/* 805A0C18 7F E3 FB 78 */ mr r3, r31 -/* 805A0C1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A0C20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A0C24 7C 08 03 A6 */ mtlr r0 -/* 805A0C28 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A0C2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/d_a_sq/d_a_sq/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index bd9c63902f..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_805A1040: -/* 805A1040 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A1044 7C 08 02 A6 */ mflr r0 -/* 805A1048 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A104C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A1050 93 C1 00 08 */ stw r30, 8(r1) -/* 805A1054 7C 7E 1B 79 */ or. r30, r3, r3 -/* 805A1058 7C 9F 23 78 */ mr r31, r4 -/* 805A105C 41 82 00 38 */ beq lbl_805A1094 -/* 805A1060 3C 80 80 5A */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x805A12EC@ha */ -/* 805A1064 38 84 12 EC */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x805A12EC@l */ -/* 805A1068 90 9E 00 10 */ stw r4, 0x10(r30) -/* 805A106C 38 04 00 0C */ addi r0, r4, 0xc -/* 805A1070 90 1E 00 14 */ stw r0, 0x14(r30) -/* 805A1074 38 04 00 18 */ addi r0, r4, 0x18 -/* 805A1078 90 1E 00 24 */ stw r0, 0x24(r30) -/* 805A107C 38 80 00 00 */ li r4, 0 -/* 805A1080 4B AD 4F 15 */ bl __dt__9dBgS_AcchFv -/* 805A1084 7F E0 07 35 */ extsh. r0, r31 -/* 805A1088 40 81 00 0C */ ble lbl_805A1094 -/* 805A108C 7F C3 F3 78 */ mr r3, r30 -/* 805A1090 4B D2 DC AD */ bl __dl__FPv -lbl_805A1094: -/* 805A1094 7F C3 F3 78 */ mr r3, r30 -/* 805A1098 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A109C 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A10A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A10A4 7C 08 03 A6 */ mtlr r0 -/* 805A10A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A10AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__8cM3dGAabFv.s b/asm/rel/d/a/d_a_sq/d_a_sq/__dt__8cM3dGAabFv.s deleted file mode 100644 index 09b093775f..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_805A0FF8: -/* 805A0FF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A0FFC 7C 08 02 A6 */ mflr r0 -/* 805A1000 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A1004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A1008 7C 7F 1B 79 */ or. r31, r3, r3 -/* 805A100C 41 82 00 1C */ beq lbl_805A1028 -/* 805A1010 3C A0 80 5A */ lis r5, __vt__8cM3dGAab@ha /* 0x805A12E0@ha */ -/* 805A1014 38 05 12 E0 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x805A12E0@l */ -/* 805A1018 90 1F 00 18 */ stw r0, 0x18(r31) -/* 805A101C 7C 80 07 35 */ extsh. r0, r4 -/* 805A1020 40 81 00 08 */ ble lbl_805A1028 -/* 805A1024 4B D2 DD 19 */ bl __dl__FPv -lbl_805A1028: -/* 805A1028 7F E3 FB 78 */ mr r3, r31 -/* 805A102C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A1030 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A1034 7C 08 03 A6 */ mtlr r0 -/* 805A1038 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A103C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__8cM3dGSphFv.s b/asm/rel/d/a/d_a_sq/d_a_sq/__dt__8cM3dGSphFv.s deleted file mode 100644 index c4866397ec..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_805A0FB0: -/* 805A0FB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A0FB4 7C 08 02 A6 */ mflr r0 -/* 805A0FB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A0FBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A0FC0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 805A0FC4 41 82 00 1C */ beq lbl_805A0FE0 -/* 805A0FC8 3C A0 80 5A */ lis r5, __vt__8cM3dGSph@ha /* 0x805A12D4@ha */ -/* 805A0FCC 38 05 12 D4 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x805A12D4@l */ -/* 805A0FD0 90 1F 00 10 */ stw r0, 0x10(r31) -/* 805A0FD4 7C 80 07 35 */ extsh. r0, r4 -/* 805A0FD8 40 81 00 08 */ ble lbl_805A0FE0 -/* 805A0FDC 4B D2 DD 61 */ bl __dl__FPv -lbl_805A0FE0: -/* 805A0FE0 7F E3 FB 78 */ mr r3, r31 -/* 805A0FE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A0FE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A0FEC 7C 08 03 A6 */ mtlr r0 -/* 805A0FF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A0FF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/__sinit_d_a_sq_cpp.s b/asm/rel/d/a/d_a_sq/d_a_sq/__sinit_d_a_sq_cpp.s deleted file mode 100644 index 710195211c..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/__sinit_d_a_sq_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_805A10F8: -/* 805A10F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A10FC 7C 08 02 A6 */ mflr r0 -/* 805A1100 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A1104 3C 60 80 5A */ lis r3, l_HIO@ha /* 0x805A1340@ha */ -/* 805A1108 38 63 13 40 */ addi r3, r3, l_HIO@l /* 0x805A1340@l */ -/* 805A110C 4B FF E5 61 */ bl __ct__10daSq_HIO_cFv -/* 805A1110 3C 80 80 5A */ lis r4, __dt__10daSq_HIO_cFv@ha /* 0x805A10B0@ha */ -/* 805A1114 38 84 10 B0 */ addi r4, r4, __dt__10daSq_HIO_cFv@l /* 0x805A10B0@l */ -/* 805A1118 3C A0 80 5A */ lis r5, lit_3764@ha /* 0x805A1334@ha */ -/* 805A111C 38 A5 13 34 */ addi r5, r5, lit_3764@l /* 0x805A1334@l */ -/* 805A1120 4B FF E4 D9 */ bl __register_global_object -/* 805A1124 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A1128 7C 08 03 A6 */ mtlr r0 -/* 805A112C 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A1130 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/action__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/action__FP8sq_class.s deleted file mode 100644 index 8e5e5504ef..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/action__FP8sq_class.s +++ /dev/null @@ -1,216 +0,0 @@ -lbl_805A037C: -/* 805A037C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 805A0380 7C 08 02 A6 */ mflr r0 -/* 805A0384 90 01 00 34 */ stw r0, 0x34(r1) -/* 805A0388 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 805A038C 93 C1 00 28 */ stw r30, 0x28(r1) -/* 805A0390 7C 7E 1B 78 */ mr r30, r3 -/* 805A0394 3C 80 80 5A */ lis r4, lit_3769@ha /* 0x805A1158@ha */ -/* 805A0398 3B E4 11 58 */ addi r31, r4, lit_3769@l /* 0x805A1158@l */ -/* 805A039C C0 1F 00 78 */ lfs f0, 0x78(r31) -/* 805A03A0 D0 03 05 30 */ stfs f0, 0x530(r3) -/* 805A03A4 38 00 00 00 */ li r0, 0 -/* 805A03A8 98 03 05 E4 */ stb r0, 0x5e4(r3) -/* 805A03AC 80 03 08 F0 */ lwz r0, 0x8f0(r3) -/* 805A03B0 60 00 00 01 */ ori r0, r0, 1 -/* 805A03B4 90 03 08 F0 */ stw r0, 0x8f0(r3) -/* 805A03B8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A03BC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A03C0 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 805A03C4 4B A7 A4 1D */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 805A03C8 D0 3E 05 D4 */ stfs f1, 0x5d4(r30) -/* 805A03CC 38 7E 04 DC */ addi r3, r30, 0x4dc -/* 805A03D0 38 80 00 00 */ li r4, 0 -/* 805A03D4 38 A0 00 02 */ li r5, 2 -/* 805A03D8 38 C0 20 00 */ li r6, 0x2000 -/* 805A03DC 4B CD 02 2D */ bl cLib_addCalcAngleS2__FPssss -/* 805A03E0 38 00 00 00 */ li r0, 0 -/* 805A03E4 B0 1E 04 E0 */ sth r0, 0x4e0(r30) -/* 805A03E8 98 1E 06 1E */ stb r0, 0x61e(r30) -/* 805A03EC C0 3E 06 0C */ lfs f1, 0x60c(r30) -/* 805A03F0 C0 1F 00 08 */ lfs f0, 8(r31) -/* 805A03F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A03F8 40 80 00 CC */ bge lbl_805A04C4 -/* 805A03FC A8 1E 05 F8 */ lha r0, 0x5f8(r30) -/* 805A0400 2C 00 00 03 */ cmpwi r0, 3 -/* 805A0404 41 82 00 60 */ beq lbl_805A0464 -/* 805A0408 40 80 00 1C */ bge lbl_805A0424 -/* 805A040C 2C 00 00 01 */ cmpwi r0, 1 -/* 805A0410 41 82 00 34 */ beq lbl_805A0444 -/* 805A0414 40 80 00 44 */ bge lbl_805A0458 -/* 805A0418 2C 00 00 00 */ cmpwi r0, 0 -/* 805A041C 40 80 00 14 */ bge lbl_805A0430 -/* 805A0420 48 00 00 60 */ b lbl_805A0480 -lbl_805A0424: -/* 805A0424 2C 00 00 07 */ cmpwi r0, 7 -/* 805A0428 41 82 00 48 */ beq lbl_805A0470 -/* 805A042C 48 00 00 54 */ b lbl_805A0480 -lbl_805A0430: -/* 805A0430 7F C3 F3 78 */ mr r3, r30 -/* 805A0434 4B FF F6 35 */ bl sq_normal__FP8sq_class -/* 805A0438 38 00 00 01 */ li r0, 1 -/* 805A043C 98 1E 06 1E */ stb r0, 0x61e(r30) -/* 805A0440 48 00 00 40 */ b lbl_805A0480 -lbl_805A0444: -/* 805A0444 7F C3 F3 78 */ mr r3, r30 -/* 805A0448 4B FF FA 09 */ bl sq_away__FP8sq_class -/* 805A044C 38 00 00 01 */ li r0, 1 -/* 805A0450 98 1E 06 1E */ stb r0, 0x61e(r30) -/* 805A0454 48 00 00 2C */ b lbl_805A0480 -lbl_805A0458: -/* 805A0458 7F C3 F3 78 */ mr r3, r30 -/* 805A045C 4B FF FB C9 */ bl sq_carry__FP8sq_class -/* 805A0460 48 00 00 20 */ b lbl_805A0480 -lbl_805A0464: -/* 805A0464 7F C3 F3 78 */ mr r3, r30 -/* 805A0468 4B FF FC F9 */ bl sq_fly__FP8sq_class -/* 805A046C 48 00 00 14 */ b lbl_805A0480 -lbl_805A0470: -/* 805A0470 7F C3 F3 78 */ mr r3, r30 -/* 805A0474 4B FF FD A9 */ bl sq_message__FP8sq_class -/* 805A0478 38 00 00 02 */ li r0, 2 -/* 805A047C 98 1E 06 1E */ stb r0, 0x61e(r30) -lbl_805A0480: -/* 805A0480 88 1E 06 1E */ lbz r0, 0x61e(r30) -/* 805A0484 2C 00 00 01 */ cmpwi r0, 1 -/* 805A0488 40 82 00 3C */ bne lbl_805A04C4 -/* 805A048C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A0490 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A0494 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 805A0498 80 03 05 74 */ lwz r0, 0x574(r3) -/* 805A049C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 805A04A0 41 82 00 24 */ beq lbl_805A04C4 -/* 805A04A4 C0 3E 05 D4 */ lfs f1, 0x5d4(r30) -/* 805A04A8 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 805A04AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A04B0 40 80 00 14 */ bge lbl_805A04C4 -/* 805A04B4 38 00 00 07 */ li r0, 7 -/* 805A04B8 B0 1E 05 F8 */ sth r0, 0x5f8(r30) -/* 805A04BC 38 00 00 00 */ li r0, 0 -/* 805A04C0 B0 1E 05 FA */ sth r0, 0x5fa(r30) -lbl_805A04C4: -/* 805A04C4 88 1E 05 E4 */ lbz r0, 0x5e4(r30) -/* 805A04C8 7C 00 07 75 */ extsb. r0, r0 -/* 805A04CC 41 82 00 60 */ beq lbl_805A052C -/* 805A04D0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805A04D4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805A04D8 80 63 00 00 */ lwz r3, 0(r3) -/* 805A04DC A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 805A04E0 4B A6 BE FD */ bl mDoMtx_YrotS__FPA4_fs -/* 805A04E4 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805A04E8 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805A04EC 80 63 00 00 */ lwz r3, 0(r3) -/* 805A04F0 A8 9E 04 DC */ lha r4, 0x4dc(r30) -/* 805A04F4 4B A6 BE A9 */ bl mDoMtx_XrotM__FPA4_fs -/* 805A04F8 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 805A04FC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 805A0500 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 805A0504 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 805A0508 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805A050C 38 61 00 14 */ addi r3, r1, 0x14 -/* 805A0510 38 9E 04 F8 */ addi r4, r30, 0x4f8 -/* 805A0514 4B CD 09 D9 */ bl MtxPosition__FP4cXyzP4cXyz -/* 805A0518 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 805A051C 38 9E 04 F8 */ addi r4, r30, 0x4f8 -/* 805A0520 7C 65 1B 78 */ mr r5, r3 -/* 805A0524 4B DA 6B 6D */ bl PSVECAdd -/* 805A0528 48 00 00 C8 */ b lbl_805A05F0 -lbl_805A052C: -/* 805A052C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805A0530 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805A0534 80 63 00 00 */ lwz r3, 0(r3) -/* 805A0538 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 805A053C 4B A6 BE A1 */ bl mDoMtx_YrotS__FPA4_fs -/* 805A0540 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 805A0544 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 805A0548 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 805A054C C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 805A0550 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805A0554 38 61 00 14 */ addi r3, r1, 0x14 -/* 805A0558 38 81 00 08 */ addi r4, r1, 8 -/* 805A055C 4B CD 09 91 */ bl MtxPosition__FP4cXyzP4cXyz -/* 805A0560 C0 01 00 08 */ lfs f0, 8(r1) -/* 805A0564 D0 1E 04 F8 */ stfs f0, 0x4f8(r30) -/* 805A0568 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 805A056C D0 1E 05 00 */ stfs f0, 0x500(r30) -/* 805A0570 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 805A0574 C0 1E 05 30 */ lfs f0, 0x530(r30) -/* 805A0578 EC 01 00 2A */ fadds f0, f1, f0 -/* 805A057C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 805A0580 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 805A0584 38 9E 04 F8 */ addi r4, r30, 0x4f8 -/* 805A0588 7C 65 1B 78 */ mr r5, r3 -/* 805A058C 4B DA 6B 05 */ bl PSVECAdd -/* 805A0590 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 805A0594 C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 805A0598 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A059C 40 80 00 08 */ bge lbl_805A05A4 -/* 805A05A0 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -lbl_805A05A4: -/* 805A05A4 34 7E 08 88 */ addic. r3, r30, 0x888 -/* 805A05A8 41 82 00 34 */ beq lbl_805A05DC -/* 805A05AC C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 805A05B0 C0 03 00 00 */ lfs f0, 0(r3) -/* 805A05B4 EC 01 00 2A */ fadds f0, f1, f0 -/* 805A05B8 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 805A05BC C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 805A05C0 C0 03 00 04 */ lfs f0, 4(r3) -/* 805A05C4 EC 01 00 2A */ fadds f0, f1, f0 -/* 805A05C8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 805A05CC C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 805A05D0 C0 03 00 08 */ lfs f0, 8(r3) -/* 805A05D4 EC 01 00 2A */ fadds f0, f1, f0 -/* 805A05D8 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -lbl_805A05DC: -/* 805A05DC 38 7E 06 B0 */ addi r3, r30, 0x6b0 -/* 805A05E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A05E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A05E8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 805A05EC 4B AD 64 C1 */ bl CrrPos__9dBgS_AcchFR4dBgS -lbl_805A05F0: -/* 805A05F0 C0 3E 06 0C */ lfs f1, 0x60c(r30) -/* 805A05F4 C0 1F 00 08 */ lfs f0, 8(r31) -/* 805A05F8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A05FC 40 81 00 60 */ ble lbl_805A065C -/* 805A0600 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 805A0604 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 805A0608 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 805A060C FC 00 08 50 */ fneg f0, f1 -/* 805A0610 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 805A0614 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 805A0618 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 805A061C 80 63 00 00 */ lwz r3, 0(r3) -/* 805A0620 A8 9E 06 10 */ lha r4, 0x610(r30) -/* 805A0624 4B A6 BD B9 */ bl mDoMtx_YrotS__FPA4_fs -/* 805A0628 38 61 00 14 */ addi r3, r1, 0x14 -/* 805A062C 38 81 00 08 */ addi r4, r1, 8 -/* 805A0630 4B CD 08 BD */ bl MtxPosition__FP4cXyzP4cXyz -/* 805A0634 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 805A0638 38 81 00 08 */ addi r4, r1, 8 -/* 805A063C 7C 65 1B 78 */ mr r5, r3 -/* 805A0640 4B DA 6A 51 */ bl PSVECAdd -/* 805A0644 38 7E 06 0C */ addi r3, r30, 0x60c -/* 805A0648 C0 3F 00 08 */ lfs f1, 8(r31) -/* 805A064C C0 5F 00 50 */ lfs f2, 0x50(r31) -/* 805A0650 4B CC F4 31 */ bl cLib_addCalc0__FPfff -/* 805A0654 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 805A0658 D0 1E 05 2C */ stfs f0, 0x52c(r30) -lbl_805A065C: -/* 805A065C 38 7E 04 E6 */ addi r3, r30, 0x4e6 -/* 805A0660 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 805A0664 38 A0 00 02 */ li r5, 2 -/* 805A0668 38 C0 40 00 */ li r6, 0x4000 -/* 805A066C 4B CC FF 9D */ bl cLib_addCalcAngleS2__FPssss -/* 805A0670 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 805A0674 A8 9E 04 DC */ lha r4, 0x4dc(r30) -/* 805A0678 38 A0 00 02 */ li r5, 2 -/* 805A067C 38 C0 40 00 */ li r6, 0x4000 -/* 805A0680 4B CC FF 89 */ bl cLib_addCalcAngleS2__FPssss -/* 805A0684 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 805A0688 B0 1E 04 E8 */ sth r0, 0x4e8(r30) -/* 805A068C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 805A0690 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 805A0694 80 01 00 34 */ lwz r0, 0x34(r1) -/* 805A0698 7C 08 03 A6 */ mtlr r0 -/* 805A069C 38 21 00 30 */ addi r1, r1, 0x30 -/* 805A06A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/anm_init__FP8sq_classifUcfi.s b/asm/rel/d/a/d_a_sq/d_a_sq/anm_init__FP8sq_classifUcfi.s deleted file mode 100644 index 33b4ceac1b..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/anm_init__FP8sq_classifUcfi.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_8059F6D8: -/* 8059F6D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8059F6DC 7C 08 02 A6 */ mflr r0 -/* 8059F6E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8059F6E4 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8059F6E8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8059F6EC DB C1 00 20 */ stfd f30, 0x20(r1) -/* 8059F6F0 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 8059F6F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059F6F8 4B DC 2A D9 */ bl _savegpr_26 -/* 8059F6FC 7C 7D 1B 78 */ mr r29, r3 -/* 8059F700 7C 9A 23 78 */ mr r26, r4 -/* 8059F704 FF C0 08 90 */ fmr f30, f1 -/* 8059F708 7C BE 2B 78 */ mr r30, r5 -/* 8059F70C FF E0 10 90 */ fmr f31, f2 -/* 8059F710 3C 60 80 5A */ lis r3, lit_3769@ha /* 0x805A1158@ha */ -/* 8059F714 3B E3 11 58 */ addi r31, r3, lit_3769@l /* 0x805A1158@l */ -/* 8059F718 C0 3D 06 0C */ lfs f1, 0x60c(r29) -/* 8059F71C C0 1F 00 08 */ lfs f0, 8(r31) -/* 8059F720 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059F724 41 81 00 BC */ bgt lbl_8059F7E0 -/* 8059F728 2C 06 00 00 */ cmpwi r6, 0 -/* 8059F72C 41 80 00 70 */ blt lbl_8059F79C -/* 8059F730 3C 60 80 5A */ lis r3, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 8059F734 38 63 11 E4 */ addi r3, r3, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 8059F738 7C C4 33 78 */ mr r4, r6 -/* 8059F73C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059F740 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059F744 3F 65 00 02 */ addis r27, r5, 2 -/* 8059F748 3B 7B C2 F8 */ addi r27, r27, -15624 -/* 8059F74C 7F 65 DB 78 */ mr r5, r27 -/* 8059F750 38 C0 00 80 */ li r6, 0x80 -/* 8059F754 4B A9 CB 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8059F758 7C 7C 1B 78 */ mr r28, r3 -/* 8059F75C 3C 60 80 5A */ lis r3, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 8059F760 38 63 11 E4 */ addi r3, r3, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 8059F764 7F 44 D3 78 */ mr r4, r26 -/* 8059F768 7F 65 DB 78 */ mr r5, r27 -/* 8059F76C 38 C0 00 80 */ li r6, 0x80 -/* 8059F770 4B A9 CB 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8059F774 7C 64 1B 78 */ mr r4, r3 -/* 8059F778 80 7D 05 EC */ lwz r3, 0x5ec(r29) -/* 8059F77C 57 C5 06 3E */ clrlwi r5, r30, 0x18 -/* 8059F780 FC 20 F0 90 */ fmr f1, f30 -/* 8059F784 FC 40 F8 90 */ fmr f2, f31 -/* 8059F788 C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 8059F78C C0 9F 00 24 */ lfs f4, 0x24(r31) -/* 8059F790 7F 86 E3 78 */ mr r6, r28 -/* 8059F794 4B A7 0B E9 */ bl setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv -/* 8059F798 48 00 00 48 */ b lbl_8059F7E0 -lbl_8059F79C: -/* 8059F79C 3C 60 80 5A */ lis r3, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 8059F7A0 38 63 11 E4 */ addi r3, r3, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 8059F7A4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059F7A8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059F7AC 3C A5 00 02 */ addis r5, r5, 2 -/* 8059F7B0 38 C0 00 80 */ li r6, 0x80 -/* 8059F7B4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8059F7B8 4B A9 CB 35 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8059F7BC 7C 64 1B 78 */ mr r4, r3 -/* 8059F7C0 80 7D 05 EC */ lwz r3, 0x5ec(r29) -/* 8059F7C4 57 C5 06 3E */ clrlwi r5, r30, 0x18 -/* 8059F7C8 FC 20 F0 90 */ fmr f1, f30 -/* 8059F7CC FC 40 F8 90 */ fmr f2, f31 -/* 8059F7D0 C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 8059F7D4 C0 9F 00 24 */ lfs f4, 0x24(r31) -/* 8059F7D8 38 C0 00 00 */ li r6, 0 -/* 8059F7DC 4B A7 0B A1 */ bl setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv -lbl_8059F7E0: -/* 8059F7E0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 8059F7E4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8059F7E8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 8059F7EC CB C1 00 20 */ lfd f30, 0x20(r1) -/* 8059F7F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059F7F4 4B DC 2A 29 */ bl _restgpr_26 -/* 8059F7F8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8059F7FC 7C 08 03 A6 */ mtlr r0 -/* 8059F800 38 21 00 40 */ addi r1, r1, 0x40 -/* 8059F804 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 0301cc44da..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,234 +0,0 @@ -lbl_805A0C30: -/* 805A0C30 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 805A0C34 7C 08 02 A6 */ mflr r0 -/* 805A0C38 90 01 00 44 */ stw r0, 0x44(r1) -/* 805A0C3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 805A0C40 4B DC 15 8D */ bl _savegpr_25 -/* 805A0C44 7C 7B 1B 78 */ mr r27, r3 -/* 805A0C48 3C 80 80 5A */ lis r4, lit_3769@ha /* 0x805A1158@ha */ -/* 805A0C4C 3B E4 11 58 */ addi r31, r4, lit_3769@l /* 0x805A1158@l */ -/* 805A0C50 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 805A0C54 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 805A0C58 40 82 01 3C */ bne lbl_805A0D94 -/* 805A0C5C 7F 60 DB 79 */ or. r0, r27, r27 -/* 805A0C60 41 82 01 28 */ beq lbl_805A0D88 -/* 805A0C64 7C 1A 03 78 */ mr r26, r0 -/* 805A0C68 4B A7 7E FD */ bl __ct__10fopAc_ac_cFv -/* 805A0C6C 38 7A 06 24 */ addi r3, r26, 0x624 -/* 805A0C70 4B CA 92 91 */ bl __ct__10dMsgFlow_cFv -/* 805A0C74 38 7A 06 70 */ addi r3, r26, 0x670 -/* 805A0C78 4B AD 52 35 */ bl __ct__12dBgS_AcchCirFv -/* 805A0C7C 3B 3A 06 B0 */ addi r25, r26, 0x6b0 -/* 805A0C80 7F 23 CB 78 */ mr r3, r25 -/* 805A0C84 4B AD 54 1D */ bl __ct__9dBgS_AcchFv -/* 805A0C88 3C 60 80 5A */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x805A12EC@ha */ -/* 805A0C8C 38 63 12 EC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x805A12EC@l */ -/* 805A0C90 90 79 00 10 */ stw r3, 0x10(r25) -/* 805A0C94 38 03 00 0C */ addi r0, r3, 0xc -/* 805A0C98 90 19 00 14 */ stw r0, 0x14(r25) -/* 805A0C9C 38 03 00 18 */ addi r0, r3, 0x18 -/* 805A0CA0 90 19 00 24 */ stw r0, 0x24(r25) -/* 805A0CA4 38 79 00 14 */ addi r3, r25, 0x14 -/* 805A0CA8 4B AD 81 C1 */ bl SetObj__16dBgS_PolyPassChkFv -/* 805A0CAC 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 805A0CB0 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 805A0CB4 90 1A 08 A0 */ stw r0, 0x8a0(r26) -/* 805A0CB8 38 7A 08 A4 */ addi r3, r26, 0x8a4 -/* 805A0CBC 4B AE 2A A5 */ bl __ct__10dCcD_GSttsFv -/* 805A0CC0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 805A0CC4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 805A0CC8 90 7A 08 A0 */ stw r3, 0x8a0(r26) -/* 805A0CCC 38 03 00 20 */ addi r0, r3, 0x20 -/* 805A0CD0 90 1A 08 A4 */ stw r0, 0x8a4(r26) -/* 805A0CD4 3B 3A 08 C4 */ addi r25, r26, 0x8c4 -/* 805A0CD8 7F 23 CB 78 */ mr r3, r25 -/* 805A0CDC 4B AE 2D 4D */ bl __ct__12dCcD_GObjInfFv -/* 805A0CE0 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 805A0CE4 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 805A0CE8 90 19 01 20 */ stw r0, 0x120(r25) -/* 805A0CEC 3C 60 80 5A */ lis r3, __vt__8cM3dGAab@ha /* 0x805A12E0@ha */ -/* 805A0CF0 38 03 12 E0 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x805A12E0@l */ -/* 805A0CF4 90 19 01 1C */ stw r0, 0x11c(r25) -/* 805A0CF8 3C 60 80 5A */ lis r3, __vt__8cM3dGSph@ha /* 0x805A12D4@ha */ -/* 805A0CFC 38 03 12 D4 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x805A12D4@l */ -/* 805A0D00 90 19 01 34 */ stw r0, 0x134(r25) -/* 805A0D04 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 805A0D08 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 805A0D0C 90 79 01 20 */ stw r3, 0x120(r25) -/* 805A0D10 3B C3 00 58 */ addi r30, r3, 0x58 -/* 805A0D14 93 D9 01 34 */ stw r30, 0x134(r25) -/* 805A0D18 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 805A0D1C 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 805A0D20 90 79 00 3C */ stw r3, 0x3c(r25) -/* 805A0D24 3B A3 00 2C */ addi r29, r3, 0x2c -/* 805A0D28 93 B9 01 20 */ stw r29, 0x120(r25) -/* 805A0D2C 3B 83 00 84 */ addi r28, r3, 0x84 -/* 805A0D30 93 99 01 34 */ stw r28, 0x134(r25) -/* 805A0D34 3B 3A 09 FC */ addi r25, r26, 0x9fc -/* 805A0D38 7F 23 CB 78 */ mr r3, r25 -/* 805A0D3C 4B AE 2C ED */ bl __ct__12dCcD_GObjInfFv -/* 805A0D40 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 805A0D44 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 805A0D48 90 19 01 20 */ stw r0, 0x120(r25) -/* 805A0D4C 3C 60 80 5A */ lis r3, __vt__8cM3dGAab@ha /* 0x805A12E0@ha */ -/* 805A0D50 38 03 12 E0 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x805A12E0@l */ -/* 805A0D54 90 19 01 1C */ stw r0, 0x11c(r25) -/* 805A0D58 3C 60 80 5A */ lis r3, __vt__8cM3dGSph@ha /* 0x805A12D4@ha */ -/* 805A0D5C 38 03 12 D4 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x805A12D4@l */ -/* 805A0D60 90 19 01 34 */ stw r0, 0x134(r25) -/* 805A0D64 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 805A0D68 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 805A0D6C 90 19 01 20 */ stw r0, 0x120(r25) -/* 805A0D70 93 D9 01 34 */ stw r30, 0x134(r25) -/* 805A0D74 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 805A0D78 38 03 BF C0 */ addi r0, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 805A0D7C 90 19 00 3C */ stw r0, 0x3c(r25) -/* 805A0D80 93 B9 01 20 */ stw r29, 0x120(r25) -/* 805A0D84 93 99 01 34 */ stw r28, 0x134(r25) -lbl_805A0D88: -/* 805A0D88 80 1B 04 A0 */ lwz r0, 0x4a0(r27) -/* 805A0D8C 60 00 00 08 */ ori r0, r0, 8 -/* 805A0D90 90 1B 04 A0 */ stw r0, 0x4a0(r27) -lbl_805A0D94: -/* 805A0D94 38 7B 05 AC */ addi r3, r27, 0x5ac -/* 805A0D98 3C 80 80 5A */ lis r4, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 805A0D9C 38 84 11 E4 */ addi r4, r4, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 805A0DA0 4B A8 C1 1D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 805A0DA4 7C 7C 1B 78 */ mr r28, r3 -/* 805A0DA8 2C 1C 00 04 */ cmpwi r28, 4 -/* 805A0DAC 40 82 01 E8 */ bne lbl_805A0F94 -/* 805A0DB0 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 805A0DB4 98 1B 05 B4 */ stb r0, 0x5b4(r27) -/* 805A0DB8 88 1B 05 B4 */ lbz r0, 0x5b4(r27) -/* 805A0DBC 28 00 00 01 */ cmplwi r0, 1 -/* 805A0DC0 40 82 00 30 */ bne lbl_805A0DF0 -/* 805A0DC4 38 60 01 0B */ li r3, 0x10b -/* 805A0DC8 80 9B 00 B0 */ lwz r4, 0xb0(r27) -/* 805A0DCC 38 BB 04 A8 */ addi r5, r27, 0x4a8 -/* 805A0DD0 88 1B 04 E2 */ lbz r0, 0x4e2(r27) -/* 805A0DD4 7C 06 07 74 */ extsb r6, r0 -/* 805A0DD8 38 FB 04 B4 */ addi r7, r27, 0x4b4 -/* 805A0DDC 39 00 00 00 */ li r8, 0 -/* 805A0DE0 39 20 FF FF */ li r9, -1 -/* 805A0DE4 4B A7 8F B5 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 805A0DE8 38 60 00 05 */ li r3, 5 -/* 805A0DEC 48 00 01 AC */ b lbl_805A0F98 -lbl_805A0DF0: -/* 805A0DF0 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 805A0DF4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 805A0DF8 98 1B 05 B5 */ stb r0, 0x5b5(r27) -/* 805A0DFC 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 805A0E00 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 805A0E04 98 1B 05 B6 */ stb r0, 0x5b6(r27) -/* 805A0E08 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 805A0E0C 54 00 46 3E */ srwi r0, r0, 0x18 -/* 805A0E10 98 1B 05 B7 */ stb r0, 0x5b7(r27) -/* 805A0E14 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 805A0E18 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 805A0E1C 98 1B 05 B9 */ stb r0, 0x5b9(r27) -/* 805A0E20 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 805A0E24 54 00 46 3E */ srwi r0, r0, 0x18 -/* 805A0E28 98 1B 05 B8 */ stb r0, 0x5b8(r27) -/* 805A0E2C A8 1B 04 E0 */ lha r0, 0x4e0(r27) -/* 805A0E30 B0 1B 06 22 */ sth r0, 0x622(r27) -/* 805A0E34 38 00 00 00 */ li r0, 0 -/* 805A0E38 B0 1B 04 E8 */ sth r0, 0x4e8(r27) -/* 805A0E3C B0 1B 04 E0 */ sth r0, 0x4e0(r27) -/* 805A0E40 7F 63 DB 78 */ mr r3, r27 -/* 805A0E44 3C 80 80 5A */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x805A0A48@ha */ -/* 805A0E48 38 84 0A 48 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x805A0A48@l */ -/* 805A0E4C 38 A0 17 C0 */ li r5, 0x17c0 -/* 805A0E50 4B A7 96 61 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 805A0E54 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 805A0E58 40 82 00 0C */ bne lbl_805A0E64 -/* 805A0E5C 38 60 00 05 */ li r3, 5 -/* 805A0E60 48 00 01 38 */ b lbl_805A0F98 -lbl_805A0E64: -/* 805A0E64 3C 60 80 5A */ lis r3, data_805A1330@ha /* 0x805A1330@ha */ -/* 805A0E68 8C 03 13 30 */ lbzu r0, data_805A1330@l(r3) /* 0x805A1330@l */ -/* 805A0E6C 28 00 00 00 */ cmplwi r0, 0 -/* 805A0E70 40 82 00 20 */ bne lbl_805A0E90 -/* 805A0E74 38 00 00 01 */ li r0, 1 -/* 805A0E78 98 1B 0B 58 */ stb r0, 0xb58(r27) -/* 805A0E7C 98 03 00 00 */ stb r0, 0(r3) -/* 805A0E80 38 00 FF FF */ li r0, -1 -/* 805A0E84 3C 60 80 5A */ lis r3, l_HIO@ha /* 0x805A1340@ha */ -/* 805A0E88 38 63 13 40 */ addi r3, r3, l_HIO@l /* 0x805A1340@l */ -/* 805A0E8C 98 03 00 04 */ stb r0, 4(r3) -lbl_805A0E90: -/* 805A0E90 80 1B 04 9C */ lwz r0, 0x49c(r27) -/* 805A0E94 60 00 01 00 */ ori r0, r0, 0x100 -/* 805A0E98 90 1B 04 9C */ stw r0, 0x49c(r27) -/* 805A0E9C 38 00 00 00 */ li r0, 0 -/* 805A0EA0 90 1B 05 5C */ stw r0, 0x55c(r27) -/* 805A0EA4 B0 1B 05 F8 */ sth r0, 0x5f8(r27) -/* 805A0EA8 80 7B 05 EC */ lwz r3, 0x5ec(r27) -/* 805A0EAC 80 63 00 04 */ lwz r3, 4(r3) -/* 805A0EB0 38 63 00 24 */ addi r3, r3, 0x24 -/* 805A0EB4 90 7B 05 04 */ stw r3, 0x504(r27) -/* 805A0EB8 90 01 00 08 */ stw r0, 8(r1) -/* 805A0EBC 38 7B 06 B0 */ addi r3, r27, 0x6b0 -/* 805A0EC0 38 9B 04 D0 */ addi r4, r27, 0x4d0 -/* 805A0EC4 38 BB 04 BC */ addi r5, r27, 0x4bc -/* 805A0EC8 7F 66 DB 78 */ mr r6, r27 -/* 805A0ECC 38 E0 00 01 */ li r7, 1 -/* 805A0ED0 39 1B 06 70 */ addi r8, r27, 0x670 -/* 805A0ED4 39 3B 04 F8 */ addi r9, r27, 0x4f8 -/* 805A0ED8 39 40 00 00 */ li r10, 0 -/* 805A0EDC 4B AD 53 6D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 805A0EE0 38 7B 06 70 */ addi r3, r27, 0x670 -/* 805A0EE4 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 805A0EE8 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 805A0EEC 4B AD 50 6D */ bl SetWall__12dBgS_AcchCirFff -/* 805A0EF0 38 00 00 01 */ li r0, 1 -/* 805A0EF4 B0 1B 05 62 */ sth r0, 0x562(r27) -/* 805A0EF8 B0 1B 05 60 */ sth r0, 0x560(r27) -/* 805A0EFC 38 7B 08 88 */ addi r3, r27, 0x888 -/* 805A0F00 38 80 00 64 */ li r4, 0x64 -/* 805A0F04 38 A0 00 00 */ li r5, 0 -/* 805A0F08 7F 66 DB 78 */ mr r6, r27 -/* 805A0F0C 4B AE 29 55 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 805A0F10 38 7B 08 C4 */ addi r3, r27, 0x8c4 -/* 805A0F14 3C 80 80 5A */ lis r4, cc_sph_src@ha /* 0x805A1204@ha */ -/* 805A0F18 38 84 12 04 */ addi r4, r4, cc_sph_src@l /* 0x805A1204@l */ -/* 805A0F1C 4B AE 3B 19 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 805A0F20 38 1B 08 88 */ addi r0, r27, 0x888 -/* 805A0F24 90 1B 09 08 */ stw r0, 0x908(r27) -/* 805A0F28 38 7B 09 FC */ addi r3, r27, 0x9fc -/* 805A0F2C 3C 80 80 5A */ lis r4, at_sph_src@ha /* 0x805A1244@ha */ -/* 805A0F30 38 84 12 44 */ addi r4, r4, at_sph_src@l /* 0x805A1244@l */ -/* 805A0F34 4B AE 3B 01 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 805A0F38 38 1B 08 88 */ addi r0, r27, 0x888 -/* 805A0F3C 90 1B 0A 40 */ stw r0, 0xa40(r27) -/* 805A0F40 38 00 00 07 */ li r0, 7 -/* 805A0F44 98 1B 05 48 */ stb r0, 0x548(r27) -/* 805A0F48 88 1B 05 B5 */ lbz r0, 0x5b5(r27) -/* 805A0F4C 28 00 00 FF */ cmplwi r0, 0xff -/* 805A0F50 40 82 00 20 */ bne lbl_805A0F70 -/* 805A0F54 C0 3F 00 88 */ lfs f1, 0x88(r31) -/* 805A0F58 4B CC 69 FD */ bl cM_rndF__Ff -/* 805A0F5C FC 00 08 1E */ fctiwz f0, f1 -/* 805A0F60 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 805A0F64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A0F68 98 1B 05 F4 */ stb r0, 0x5f4(r27) -/* 805A0F6C 48 00 00 20 */ b lbl_805A0F8C -lbl_805A0F70: -/* 805A0F70 98 1B 05 F4 */ stb r0, 0x5f4(r27) -/* 805A0F74 88 1B 05 F4 */ lbz r0, 0x5f4(r27) -/* 805A0F78 7C 00 07 74 */ extsb r0, r0 -/* 805A0F7C 2C 00 00 03 */ cmpwi r0, 3 -/* 805A0F80 40 81 00 0C */ ble lbl_805A0F8C -/* 805A0F84 38 00 00 03 */ li r0, 3 -/* 805A0F88 98 1B 05 F4 */ stb r0, 0x5f4(r27) -lbl_805A0F8C: -/* 805A0F8C 7F 63 DB 78 */ mr r3, r27 -/* 805A0F90 4B FF F8 39 */ bl daSq_Execute__FP8sq_class -lbl_805A0F94: -/* 805A0F94 7F 83 E3 78 */ mr r3, r28 -lbl_805A0F98: -/* 805A0F98 39 61 00 40 */ addi r11, r1, 0x40 -/* 805A0F9C 4B DC 12 7D */ bl _restgpr_25 -/* 805A0FA0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 805A0FA4 7C 08 03 A6 */ mtlr r0 -/* 805A0FA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 805A0FAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Delete__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Delete__FP8sq_class.s deleted file mode 100644 index eda0f481af..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Delete__FP8sq_class.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_805A09F4: -/* 805A09F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A09F8 7C 08 02 A6 */ mflr r0 -/* 805A09FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A0A00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A0A04 7C 7F 1B 78 */ mr r31, r3 -/* 805A0A08 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 805A0A0C 3C 80 80 5A */ lis r4, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 805A0A10 38 84 11 E4 */ addi r4, r4, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 805A0A14 4B A8 C5 F5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 805A0A18 88 1F 0B 58 */ lbz r0, 0xb58(r31) -/* 805A0A1C 28 00 00 00 */ cmplwi r0, 0 -/* 805A0A20 41 82 00 10 */ beq lbl_805A0A30 -/* 805A0A24 38 00 00 00 */ li r0, 0 -/* 805A0A28 3C 60 80 5A */ lis r3, data_805A1330@ha /* 0x805A1330@ha */ -/* 805A0A2C 98 03 13 30 */ stb r0, data_805A1330@l(r3) /* 0x805A1330@l */ -lbl_805A0A30: -/* 805A0A30 38 60 00 01 */ li r3, 1 -/* 805A0A34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A0A38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A0A3C 7C 08 03 A6 */ mtlr r0 -/* 805A0A40 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A0A44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Draw__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Draw__FP8sq_class.s deleted file mode 100644 index fa07a84032..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Draw__FP8sq_class.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_8059F808: -/* 8059F808 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8059F80C 7C 08 02 A6 */ mflr r0 -/* 8059F810 90 01 00 34 */ stw r0, 0x34(r1) -/* 8059F814 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059F818 4B DC 29 C5 */ bl _savegpr_29 -/* 8059F81C 7C 7D 1B 78 */ mr r29, r3 -/* 8059F820 3C 60 80 5A */ lis r3, lit_3769@ha /* 0x805A1158@ha */ -/* 8059F824 3B E3 11 58 */ addi r31, r3, lit_3769@l /* 0x805A1158@l */ -/* 8059F828 80 7D 05 EC */ lwz r3, 0x5ec(r29) -/* 8059F82C 83 C3 00 04 */ lwz r30, 4(r3) -/* 8059F830 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8059F834 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8059F838 38 80 00 00 */ li r4, 0 -/* 8059F83C 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 8059F840 38 DD 01 0C */ addi r6, r29, 0x10c -/* 8059F844 4B C0 3F 81 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8059F848 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8059F84C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8059F850 80 9E 00 04 */ lwz r4, 4(r30) -/* 8059F854 38 BD 01 0C */ addi r5, r29, 0x10c -/* 8059F858 4B C0 55 49 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8059F85C 80 9E 00 04 */ lwz r4, 4(r30) -/* 8059F860 80 7D 05 F0 */ lwz r3, 0x5f0(r29) -/* 8059F864 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8059F868 38 84 00 58 */ addi r4, r4, 0x58 -/* 8059F86C 4B A6 DE 6D */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 8059F870 80 7D 05 EC */ lwz r3, 0x5ec(r29) -/* 8059F874 4B A7 0E 0D */ bl entryDL__14mDoExt_McaMorfFv -/* 8059F878 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 8059F87C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8059F880 C0 7D 04 D4 */ lfs f3, 0x4d4(r29) -/* 8059F884 EC 20 18 2A */ fadds f1, f0, f3 -/* 8059F888 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8059F88C D0 01 00 08 */ stfs f0, 8(r1) -/* 8059F890 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 8059F894 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 8059F898 80 7D 05 FC */ lwz r3, 0x5fc(r29) -/* 8059F89C 38 80 00 01 */ li r4, 1 -/* 8059F8A0 7F C5 F3 78 */ mr r5, r30 -/* 8059F8A4 38 C1 00 08 */ addi r6, r1, 8 -/* 8059F8A8 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 8059F8AC C0 5F 00 2C */ lfs f2, 0x2c(r31) -/* 8059F8B0 3C E0 80 5A */ lis r7, l_HIO@ha /* 0x805A1340@ha */ -/* 8059F8B4 38 E7 13 40 */ addi r7, r7, l_HIO@l /* 0x805A1340@l */ -/* 8059F8B8 C0 07 00 08 */ lfs f0, 8(r7) -/* 8059F8BC EC 42 00 32 */ fmuls f2, f2, f0 -/* 8059F8C0 C0 9D 07 48 */ lfs f4, 0x748(r29) -/* 8059F8C4 38 FD 07 A0 */ addi r7, r29, 0x7a0 -/* 8059F8C8 39 1D 01 0C */ addi r8, r29, 0x10c -/* 8059F8CC 39 20 00 00 */ li r9, 0 -/* 8059F8D0 C0 BF 00 08 */ lfs f5, 8(r31) -/* 8059F8D4 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 8059F8D8 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 8059F8DC 4B A8 F0 35 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 8059F8E0 90 7D 05 FC */ stw r3, 0x5fc(r29) -/* 8059F8E4 38 60 00 01 */ li r3, 1 -/* 8059F8E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059F8EC 4B DC 29 3D */ bl _restgpr_29 -/* 8059F8F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8059F8F4 7C 08 03 A6 */ mtlr r0 -/* 8059F8F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8059F8FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Execute__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Execute__FP8sq_class.s deleted file mode 100644 index 2f84b86a02..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/daSq_Execute__FP8sq_class.s +++ /dev/null @@ -1,142 +0,0 @@ -lbl_805A07C8: -/* 805A07C8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 805A07CC 7C 08 02 A6 */ mflr r0 -/* 805A07D0 90 01 00 34 */ stw r0, 0x34(r1) -/* 805A07D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 805A07D8 4B DC 1A 01 */ bl _savegpr_28 -/* 805A07DC 7C 7E 1B 78 */ mr r30, r3 -/* 805A07E0 3C 60 80 5A */ lis r3, lit_3769@ha /* 0x805A1158@ha */ -/* 805A07E4 3B E3 11 58 */ addi r31, r3, lit_3769@l /* 0x805A1158@l */ -/* 805A07E8 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 805A07EC D0 01 00 08 */ stfs f0, 8(r1) -/* 805A07F0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 805A07F4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 805A07F8 38 7E 04 EC */ addi r3, r30, 0x4ec -/* 805A07FC C0 3F 00 08 */ lfs f1, 8(r31) -/* 805A0800 FC 40 08 90 */ fmr f2, f1 -/* 805A0804 C0 7F 00 84 */ lfs f3, 0x84(r31) -/* 805A0808 4B CC F2 35 */ bl cLib_addCalc2__FPffff -/* 805A080C A8 7E 05 F6 */ lha r3, 0x5f6(r30) -/* 805A0810 38 03 00 01 */ addi r0, r3, 1 -/* 805A0814 B0 1E 05 F6 */ sth r0, 0x5f6(r30) -/* 805A0818 38 60 00 00 */ li r3, 0 -/* 805A081C 38 00 00 04 */ li r0, 4 -/* 805A0820 7C 09 03 A6 */ mtctr r0 -lbl_805A0824: -/* 805A0824 38 A3 06 00 */ addi r5, r3, 0x600 -/* 805A0828 7C 9E 2A AE */ lhax r4, r30, r5 -/* 805A082C 2C 04 00 00 */ cmpwi r4, 0 -/* 805A0830 41 82 00 0C */ beq lbl_805A083C -/* 805A0834 38 04 FF FF */ addi r0, r4, -1 -/* 805A0838 7C 1E 2B 2E */ sthx r0, r30, r5 -lbl_805A083C: -/* 805A083C 38 63 00 02 */ addi r3, r3, 2 -/* 805A0840 42 00 FF E4 */ bdnz lbl_805A0824 -/* 805A0844 A8 7E 06 08 */ lha r3, 0x608(r30) -/* 805A0848 2C 03 00 00 */ cmpwi r3, 0 -/* 805A084C 41 82 00 0C */ beq lbl_805A0858 -/* 805A0850 38 03 FF FF */ addi r0, r3, -1 -/* 805A0854 B0 1E 06 08 */ sth r0, 0x608(r30) -lbl_805A0858: -/* 805A0858 A8 7E 06 0A */ lha r3, 0x60a(r30) -/* 805A085C 2C 03 00 00 */ cmpwi r3, 0 -/* 805A0860 41 82 00 0C */ beq lbl_805A086C -/* 805A0864 38 03 FF FF */ addi r0, r3, -1 -/* 805A0868 B0 1E 06 0A */ sth r0, 0x60a(r30) -lbl_805A086C: -/* 805A086C 7F C3 F3 78 */ mr r3, r30 -/* 805A0870 4B FF FB 0D */ bl action__FP8sq_class -/* 805A0874 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805A0878 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805A087C C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 805A0880 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 805A0884 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 805A0888 4B DA 60 61 */ bl PSMTXTrans -/* 805A088C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805A0890 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805A0894 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 805A0898 4B A6 BB 9D */ bl mDoMtx_YrotM__FPA4_fs -/* 805A089C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805A08A0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805A08A4 A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 805A08A8 4B A6 BA F5 */ bl mDoMtx_XrotM__FPA4_fs -/* 805A08AC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805A08B0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805A08B4 A8 9E 04 E8 */ lha r4, 0x4e8(r30) -/* 805A08B8 4B A6 BC 15 */ bl mDoMtx_ZrotM__FPA4_fs -/* 805A08BC C0 3E 04 EC */ lfs f1, 0x4ec(r30) -/* 805A08C0 3C 60 80 5A */ lis r3, l_HIO@ha /* 0x805A1340@ha */ -/* 805A08C4 3B A3 13 40 */ addi r29, r3, l_HIO@l /* 0x805A1340@l */ -/* 805A08C8 C0 1D 00 08 */ lfs f0, 8(r29) -/* 805A08CC EC 21 00 32 */ fmuls f1, f1, f0 -/* 805A08D0 FC 40 08 90 */ fmr f2, f1 -/* 805A08D4 FC 60 08 90 */ fmr f3, f1 -/* 805A08D8 4B A6 C5 61 */ bl scaleM__14mDoMtx_stack_cFfff -/* 805A08DC 80 7E 05 EC */ lwz r3, 0x5ec(r30) -/* 805A08E0 83 83 00 04 */ lwz r28, 4(r3) -/* 805A08E4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 805A08E8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 805A08EC 38 9C 00 24 */ addi r4, r28, 0x24 -/* 805A08F0 4B DA 5B C1 */ bl PSMTXCopy -/* 805A08F4 80 7E 05 EC */ lwz r3, 0x5ec(r30) -/* 805A08F8 38 9E 05 38 */ addi r4, r30, 0x538 -/* 805A08FC 38 A0 00 00 */ li r5, 0 -/* 805A0900 38 C0 00 00 */ li r6, 0 -/* 805A0904 4B A6 FC C5 */ bl play__14mDoExt_McaMorfFP3VecUlSc -/* 805A0908 88 1E 05 F4 */ lbz r0, 0x5f4(r30) -/* 805A090C 7C 00 07 74 */ extsb r0, r0 -/* 805A0910 C8 3F 00 60 */ lfd f1, 0x60(r31) -/* 805A0914 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 805A0918 90 01 00 1C */ stw r0, 0x1c(r1) -/* 805A091C 3C 00 43 30 */ lis r0, 0x4330 -/* 805A0920 90 01 00 18 */ stw r0, 0x18(r1) -/* 805A0924 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 805A0928 EC 00 08 28 */ fsubs f0, f0, f1 -/* 805A092C 80 7E 05 F0 */ lwz r3, 0x5f0(r30) -/* 805A0930 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 805A0934 80 7E 05 EC */ lwz r3, 0x5ec(r30) -/* 805A0938 4B A6 FD 75 */ bl modelCalc__14mDoExt_McaMorfFv -/* 805A093C 80 7C 00 84 */ lwz r3, 0x84(r28) -/* 805A0940 80 63 00 0C */ lwz r3, 0xc(r3) -/* 805A0944 38 63 00 60 */ addi r3, r3, 0x60 -/* 805A0948 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */ -/* 805A094C 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */ -/* 805A0950 80 84 00 00 */ lwz r4, 0(r4) -/* 805A0954 4B DA 5B 5D */ bl PSMTXCopy -/* 805A0958 38 61 00 08 */ addi r3, r1, 8 -/* 805A095C 38 9E 05 38 */ addi r4, r30, 0x538 -/* 805A0960 4B CD 05 8D */ bl MtxPosition__FP4cXyzP4cXyz -/* 805A0964 C0 1E 05 38 */ lfs f0, 0x538(r30) -/* 805A0968 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 805A096C C0 1E 05 3C */ lfs f0, 0x53c(r30) -/* 805A0970 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 805A0974 C0 1E 05 40 */ lfs f0, 0x540(r30) -/* 805A0978 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 805A097C C0 5E 05 54 */ lfs f2, 0x554(r30) -/* 805A0980 C0 3F 00 04 */ lfs f1, 4(r31) -/* 805A0984 C0 1D 00 08 */ lfs f0, 8(r29) -/* 805A0988 EC 01 00 32 */ fmuls f0, f1, f0 -/* 805A098C EC 02 00 2A */ fadds f0, f2, f0 -/* 805A0990 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 805A0994 38 7E 09 E8 */ addi r3, r30, 0x9e8 -/* 805A0998 38 9E 05 38 */ addi r4, r30, 0x538 -/* 805A099C 4B CC EC AD */ bl SetC__8cM3dGSphFRC4cXyz -/* 805A09A0 38 7E 09 E8 */ addi r3, r30, 0x9e8 -/* 805A09A4 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 805A09A8 C0 1D 00 08 */ lfs f0, 8(r29) -/* 805A09AC EC 21 00 32 */ fmuls f1, f1, f0 -/* 805A09B0 4B CC ED 59 */ bl SetR__8cM3dGSphFf -/* 805A09B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A09B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A09BC 38 63 23 3C */ addi r3, r3, 0x233c -/* 805A09C0 38 9E 08 C4 */ addi r4, r30, 0x8c4 -/* 805A09C4 4B CC 41 E5 */ bl Set__4cCcSFP8cCcD_Obj -/* 805A09C8 7F C3 F3 78 */ mr r3, r30 -/* 805A09CC 4B FF FC D9 */ bl message__FP8sq_class -/* 805A09D0 38 60 00 01 */ li r3, 1 -/* 805A09D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 805A09D8 4B DC 18 4D */ bl _restgpr_28 -/* 805A09DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 805A09E0 7C 08 03 A6 */ mtlr r0 -/* 805A09E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 805A09E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/func_805A1134.s b/asm/rel/d/a/d_a_sq/d_a_sq/func_805A1134.s deleted file mode 100644 index 1e792068a9..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/func_805A1134.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_805A1134: -/* 805A1134 38 63 FF DC */ addi r3, r3, -36 -/* 805A1138 4B FF FF 08 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/func_805A113C.s b/asm/rel/d/a/d_a_sq/d_a_sq/func_805A113C.s deleted file mode 100644 index bff3c46369..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/func_805A113C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_805A113C: -/* 805A113C 38 63 FF EC */ addi r3, r3, -20 -/* 805A1140 4B FF FF 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/message__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/message__FP8sq_class.s deleted file mode 100644 index 3a9ed017b3..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/message__FP8sq_class.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_805A06A4: -/* 805A06A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A06A8 7C 08 02 A6 */ mflr r0 -/* 805A06AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A06B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A06B4 7C 7F 1B 78 */ mr r31, r3 -/* 805A06B8 A8 03 06 20 */ lha r0, 0x620(r3) -/* 805A06BC 2C 00 00 00 */ cmpwi r0, 0 -/* 805A06C0 41 82 00 48 */ beq lbl_805A0708 -/* 805A06C4 38 00 00 0A */ li r0, 0xa -/* 805A06C8 B0 1F 06 08 */ sth r0, 0x608(r31) -/* 805A06CC 38 7F 06 24 */ addi r3, r31, 0x624 -/* 805A06D0 7F E4 FB 78 */ mr r4, r31 -/* 805A06D4 38 A0 00 00 */ li r5, 0 -/* 805A06D8 38 C0 00 00 */ li r6, 0 -/* 805A06DC 4B CA 9B FD */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 805A06E0 2C 03 00 00 */ cmpwi r3, 0 -/* 805A06E4 41 82 00 1C */ beq lbl_805A0700 -/* 805A06E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A06EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A06F0 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 805A06F4 4B AA 1D 75 */ bl reset__14dEvt_control_cFv -/* 805A06F8 38 00 00 00 */ li r0, 0 -/* 805A06FC B0 1F 06 20 */ sth r0, 0x620(r31) -lbl_805A0700: -/* 805A0700 38 60 00 01 */ li r3, 1 -/* 805A0704 48 00 00 B0 */ b lbl_805A07B4 -lbl_805A0708: -/* 805A0708 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A070C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A0710 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 805A0714 28 00 00 00 */ cmplwi r0, 0 -/* 805A0718 41 82 00 30 */ beq lbl_805A0748 -/* 805A071C A0 1F 00 F8 */ lhz r0, 0xf8(r31) -/* 805A0720 28 00 00 01 */ cmplwi r0, 1 -/* 805A0724 40 82 00 24 */ bne lbl_805A0748 -/* 805A0728 38 7F 06 24 */ addi r3, r31, 0x624 -/* 805A072C 7F E4 FB 78 */ mr r4, r31 -/* 805A0730 A8 BF 06 22 */ lha r5, 0x622(r31) -/* 805A0734 38 C0 00 00 */ li r6, 0 -/* 805A0738 38 E0 00 00 */ li r7, 0 -/* 805A073C 4B CA 98 55 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 805A0740 38 00 00 01 */ li r0, 1 -/* 805A0744 B0 1F 06 20 */ sth r0, 0x620(r31) -lbl_805A0748: -/* 805A0748 88 1F 06 1E */ lbz r0, 0x61e(r31) -/* 805A074C 2C 00 00 02 */ cmpwi r0, 2 -/* 805A0750 40 82 00 44 */ bne lbl_805A0794 -/* 805A0754 A8 1F 06 22 */ lha r0, 0x622(r31) -/* 805A0758 2C 00 FF FF */ cmpwi r0, -1 -/* 805A075C 41 82 00 38 */ beq lbl_805A0794 -/* 805A0760 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A0764 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A0768 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 805A076C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 805A0770 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 805A0774 41 82 00 20 */ beq lbl_805A0794 -/* 805A0778 80 1F 05 5C */ lwz r0, 0x55c(r31) -/* 805A077C 60 00 00 0A */ ori r0, r0, 0xa -/* 805A0780 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 805A0784 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 805A0788 60 00 00 01 */ ori r0, r0, 1 -/* 805A078C B0 1F 00 FA */ sth r0, 0xfa(r31) -/* 805A0790 48 00 00 20 */ b lbl_805A07B0 -lbl_805A0794: -/* 805A0794 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 805A0798 54 00 00 3E */ slwi r0, r0, 0 -/* 805A079C 90 1F 04 9C */ stw r0, 0x49c(r31) -/* 805A07A0 80 7F 05 5C */ lwz r3, 0x55c(r31) -/* 805A07A4 38 00 FF F5 */ li r0, -11 -/* 805A07A8 7C 60 00 38 */ and r0, r3, r0 -/* 805A07AC 90 1F 05 5C */ stw r0, 0x55c(r31) -lbl_805A07B0: -/* 805A07B0 38 60 00 00 */ li r3, 0 -lbl_805A07B4: -/* 805A07B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A07B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A07BC 7C 08 03 A6 */ mtlr r0 -/* 805A07C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A07C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/sq_away__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/sq_away__FP8sq_class.s deleted file mode 100644 index 923189417e..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/sq_away__FP8sq_class.s +++ /dev/null @@ -1,124 +0,0 @@ -lbl_8059FE50: -/* 8059FE50 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8059FE54 7C 08 02 A6 */ mflr r0 -/* 8059FE58 90 01 00 54 */ stw r0, 0x54(r1) -/* 8059FE5C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8059FE60 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8059FE64 39 61 00 40 */ addi r11, r1, 0x40 -/* 8059FE68 4B DC 23 75 */ bl _savegpr_29 -/* 8059FE6C 7C 7E 1B 78 */ mr r30, r3 -/* 8059FE70 3C 60 80 5A */ lis r3, lit_3769@ha /* 0x805A1158@ha */ -/* 8059FE74 3B E3 11 58 */ addi r31, r3, lit_3769@l /* 0x805A1158@l */ -/* 8059FE78 C3 FF 00 20 */ lfs f31, 0x20(r31) -/* 8059FE7C 38 61 00 08 */ addi r3, r1, 8 -/* 8059FE80 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8059FE84 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059FE88 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059FE8C 80 A5 5D AC */ lwz r5, 0x5dac(r5) -/* 8059FE90 38 A5 04 D0 */ addi r5, r5, 0x4d0 -/* 8059FE94 4B CC 6C A1 */ bl __mi__4cXyzCFRC3Vec -/* 8059FE98 C0 01 00 08 */ lfs f0, 8(r1) -/* 8059FE9C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8059FEA0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8059FEA4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8059FEA8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8059FEAC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8059FEB0 A8 1E 05 FA */ lha r0, 0x5fa(r30) -/* 8059FEB4 2C 00 00 01 */ cmpwi r0, 1 -/* 8059FEB8 41 82 00 54 */ beq lbl_8059FF0C -/* 8059FEBC 40 80 01 20 */ bge lbl_8059FFDC -/* 8059FEC0 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FEC4 40 80 00 08 */ bge lbl_8059FECC -/* 8059FEC8 48 00 01 14 */ b lbl_8059FFDC -lbl_8059FECC: -/* 8059FECC 7F C3 F3 78 */ mr r3, r30 -/* 8059FED0 38 80 00 07 */ li r4, 7 -/* 8059FED4 C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 8059FED8 38 A0 00 02 */ li r5, 2 -/* 8059FEDC C0 5F 00 68 */ lfs f2, 0x68(r31) -/* 8059FEE0 3C C0 80 5A */ lis r6, l_HIO@ha /* 0x805A1340@ha */ -/* 8059FEE4 38 C6 13 40 */ addi r6, r6, l_HIO@l /* 0x805A1340@l */ -/* 8059FEE8 C0 06 00 10 */ lfs f0, 0x10(r6) -/* 8059FEEC EC 42 00 32 */ fmuls f2, f2, f0 -/* 8059FEF0 38 C0 FF FF */ li r6, -1 -/* 8059FEF4 4B FF F7 E5 */ bl anm_init__FP8sq_classifUcfi -/* 8059FEF8 A8 7E 05 FA */ lha r3, 0x5fa(r30) -/* 8059FEFC 38 03 00 01 */ addi r0, r3, 1 -/* 8059FF00 B0 1E 05 FA */ sth r0, 0x5fa(r30) -/* 8059FF04 38 00 00 00 */ li r0, 0 -/* 8059FF08 B0 1E 06 00 */ sth r0, 0x600(r30) -lbl_8059FF0C: -/* 8059FF0C 3C 60 80 5A */ lis r3, l_HIO@ha /* 0x805A1340@ha */ -/* 8059FF10 38 63 13 40 */ addi r3, r3, l_HIO@l /* 0x805A1340@l */ -/* 8059FF14 C3 E3 00 1C */ lfs f31, 0x1c(r3) -/* 8059FF18 A8 1E 06 00 */ lha r0, 0x600(r30) -/* 8059FF1C 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FF20 40 82 00 94 */ bne lbl_8059FFB4 -/* 8059FF24 C0 5E 05 D4 */ lfs f2, 0x5d4(r30) -/* 8059FF28 C0 3F 00 6C */ lfs f1, 0x6c(r31) -/* 8059FF2C C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8059FF30 EC 01 00 2A */ fadds f0, f1, f0 -/* 8059FF34 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8059FF38 40 81 00 14 */ ble lbl_8059FF4C -/* 8059FF3C 38 00 00 00 */ li r0, 0 -/* 8059FF40 B0 1E 05 F8 */ sth r0, 0x5f8(r30) -/* 8059FF44 B0 1E 05 FA */ sth r0, 0x5fa(r30) -/* 8059FF48 48 00 00 94 */ b lbl_8059FFDC -lbl_8059FF4C: -/* 8059FF4C C0 3F 00 04 */ lfs f1, 4(r31) -/* 8059FF50 4B CC 7A 05 */ bl cM_rndF__Ff -/* 8059FF54 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 8059FF58 EC 00 08 2A */ fadds f0, f0, f1 -/* 8059FF5C FC 00 00 1E */ fctiwz f0, f0 -/* 8059FF60 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8059FF64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059FF68 B0 1E 06 00 */ sth r0, 0x600(r30) -/* 8059FF6C 7F C3 F3 78 */ mr r3, r30 -/* 8059FF70 4B FF F9 91 */ bl way_bg_check__FP8sq_class -/* 8059FF74 2C 03 00 00 */ cmpwi r3, 0 -/* 8059FF78 41 82 00 10 */ beq lbl_8059FF88 -/* 8059FF7C 7F C3 F3 78 */ mr r3, r30 -/* 8059FF80 4B FF FA 7D */ bl turn_set__FP8sq_class -/* 8059FF84 48 00 00 58 */ b lbl_8059FFDC -lbl_8059FF88: -/* 8059FF88 C0 3F 00 70 */ lfs f1, 0x70(r31) -/* 8059FF8C 4B CC 7A 01 */ bl cM_rndFX__Ff -/* 8059FF90 FC 00 08 1E */ fctiwz f0, f1 -/* 8059FF94 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8059FF98 83 A1 00 24 */ lwz r29, 0x24(r1) -/* 8059FF9C C0 21 00 14 */ lfs f1, 0x14(r1) -/* 8059FFA0 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 8059FFA4 4B CC 76 D1 */ bl cM_atan2s__Fff -/* 8059FFA8 7C 03 EA 14 */ add r0, r3, r29 -/* 8059FFAC B0 1E 05 D0 */ sth r0, 0x5d0(r30) -/* 8059FFB0 48 00 00 2C */ b lbl_8059FFDC -lbl_8059FFB4: -/* 8059FFB4 A8 1E 06 04 */ lha r0, 0x604(r30) -/* 8059FFB8 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FFBC 40 82 00 20 */ bne lbl_8059FFDC -/* 8059FFC0 80 1E 06 DC */ lwz r0, 0x6dc(r30) -/* 8059FFC4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8059FFC8 41 82 00 14 */ beq lbl_8059FFDC -/* 8059FFCC 7F C3 F3 78 */ mr r3, r30 -/* 8059FFD0 4B FF FA 2D */ bl turn_set__FP8sq_class -/* 8059FFD4 38 00 00 14 */ li r0, 0x14 -/* 8059FFD8 B0 1E 06 04 */ sth r0, 0x604(r30) -lbl_8059FFDC: -/* 8059FFDC 38 7E 05 2C */ addi r3, r30, 0x52c -/* 8059FFE0 FC 20 F8 90 */ fmr f1, f31 -/* 8059FFE4 C0 5F 00 08 */ lfs f2, 8(r31) -/* 8059FFE8 C0 7F 00 5C */ lfs f3, 0x5c(r31) -/* 8059FFEC 4B CC FA 51 */ bl cLib_addCalc2__FPffff -/* 8059FFF0 38 7E 04 DE */ addi r3, r30, 0x4de -/* 8059FFF4 A8 9E 05 D0 */ lha r4, 0x5d0(r30) -/* 8059FFF8 38 A0 00 02 */ li r5, 2 -/* 8059FFFC 38 C0 30 00 */ li r6, 0x3000 -/* 805A0000 4B CD 06 09 */ bl cLib_addCalcAngleS2__FPssss -/* 805A0004 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 805A0008 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 805A000C 39 61 00 40 */ addi r11, r1, 0x40 -/* 805A0010 4B DC 22 19 */ bl _restgpr_29 -/* 805A0014 80 01 00 54 */ lwz r0, 0x54(r1) -/* 805A0018 7C 08 03 A6 */ mtlr r0 -/* 805A001C 38 21 00 50 */ addi r1, r1, 0x50 -/* 805A0020 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/sq_carry__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/sq_carry__FP8sq_class.s deleted file mode 100644 index d215dd7333..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/sq_carry__FP8sq_class.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_805A0024: -/* 805A0024 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A0028 7C 08 02 A6 */ mflr r0 -/* 805A002C 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A0030 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 805A0034 93 C1 00 18 */ stw r30, 0x18(r1) -/* 805A0038 7C 7F 1B 78 */ mr r31, r3 -/* 805A003C 3C 60 80 5A */ lis r3, lit_3769@ha /* 0x805A1158@ha */ -/* 805A0040 3B C3 11 58 */ addi r30, r3, lit_3769@l /* 0x805A1158@l */ -/* 805A0044 80 1F 08 F0 */ lwz r0, 0x8f0(r31) -/* 805A0048 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 805A004C 90 1F 08 F0 */ stw r0, 0x8f0(r31) -/* 805A0050 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 805A0054 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 805A0058 A8 7F 05 FA */ lha r3, 0x5fa(r31) -/* 805A005C 2C 03 00 01 */ cmpwi r3, 1 -/* 805A0060 41 82 00 24 */ beq lbl_805A0084 -/* 805A0064 40 80 00 88 */ bge lbl_805A00EC -/* 805A0068 2C 03 00 00 */ cmpwi r3, 0 -/* 805A006C 40 80 00 08 */ bge lbl_805A0074 -/* 805A0070 48 00 00 7C */ b lbl_805A00EC -lbl_805A0074: -/* 805A0074 38 03 00 01 */ addi r0, r3, 1 -/* 805A0078 B0 1F 05 FA */ sth r0, 0x5fa(r31) -/* 805A007C 38 00 00 00 */ li r0, 0 -/* 805A0080 B0 1F 06 02 */ sth r0, 0x602(r31) -lbl_805A0084: -/* 805A0084 A8 1F 06 02 */ lha r0, 0x602(r31) -/* 805A0088 2C 00 00 00 */ cmpwi r0, 0 -/* 805A008C 40 82 00 60 */ bne lbl_805A00EC -/* 805A0090 C0 3E 00 14 */ lfs f1, 0x14(r30) -/* 805A0094 4B CC 78 C1 */ bl cM_rndF__Ff -/* 805A0098 C0 1E 00 44 */ lfs f0, 0x44(r30) -/* 805A009C EC 00 08 2A */ fadds f0, f0, f1 -/* 805A00A0 FC 00 00 1E */ fctiwz f0, f0 -/* 805A00A4 D8 01 00 08 */ stfd f0, 8(r1) -/* 805A00A8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 805A00AC B0 1F 06 02 */ sth r0, 0x602(r31) -/* 805A00B0 C0 3E 00 74 */ lfs f1, 0x74(r30) -/* 805A00B4 4B CC 78 A1 */ bl cM_rndF__Ff -/* 805A00B8 FC 00 08 1E */ fctiwz f0, f1 -/* 805A00BC D8 01 00 10 */ stfd f0, 0x10(r1) -/* 805A00C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A00C4 54 00 10 3A */ slwi r0, r0, 2 -/* 805A00C8 3C 60 80 5A */ lis r3, carry_wait_bck@ha /* 0x805A11F8@ha */ -/* 805A00CC 38 83 11 F8 */ addi r4, r3, carry_wait_bck@l /* 0x805A11F8@l */ -/* 805A00D0 7F E3 FB 78 */ mr r3, r31 -/* 805A00D4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 805A00D8 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 805A00DC 38 A0 00 02 */ li r5, 2 -/* 805A00E0 C0 5E 00 08 */ lfs f2, 8(r30) -/* 805A00E4 38 C0 FF FF */ li r6, -1 -/* 805A00E8 4B FF F5 F1 */ bl anm_init__FP8sq_classifUcfi -lbl_805A00EC: -/* 805A00EC 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 805A00F0 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 805A00F4 40 82 00 54 */ bne lbl_805A0148 -/* 805A00F8 C0 3F 05 2C */ lfs f1, 0x52c(r31) -/* 805A00FC C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 805A0100 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A0104 40 81 00 34 */ ble lbl_805A0138 -/* 805A0108 38 80 00 00 */ li r4, 0 -/* 805A010C B0 9F 05 FA */ sth r4, 0x5fa(r31) -/* 805A0110 3C 60 80 5A */ lis r3, l_HIO@ha /* 0x805A1340@ha */ -/* 805A0114 38 63 13 40 */ addi r3, r3, l_HIO@l /* 0x805A1340@l */ -/* 805A0118 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 805A011C D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 805A0120 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 805A0124 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 805A0128 38 00 00 03 */ li r0, 3 -/* 805A012C B0 1F 05 F8 */ sth r0, 0x5f8(r31) -/* 805A0130 B0 9F 05 FA */ sth r4, 0x5fa(r31) -/* 805A0134 48 00 00 14 */ b lbl_805A0148 -lbl_805A0138: -/* 805A0138 38 00 00 00 */ li r0, 0 -/* 805A013C B0 1F 05 F8 */ sth r0, 0x5f8(r31) -/* 805A0140 38 00 FF FF */ li r0, -1 -/* 805A0144 B0 1F 05 FA */ sth r0, 0x5fa(r31) -lbl_805A0148: -/* 805A0148 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 805A014C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 805A0150 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A0154 7C 08 03 A6 */ mtlr r0 -/* 805A0158 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A015C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/sq_fly__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/sq_fly__FP8sq_class.s deleted file mode 100644 index e94e19d596..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/sq_fly__FP8sq_class.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_805A0160: -/* 805A0160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A0164 7C 08 02 A6 */ mflr r0 -/* 805A0168 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A016C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A0170 93 C1 00 08 */ stw r30, 8(r1) -/* 805A0174 7C 7E 1B 78 */ mr r30, r3 -/* 805A0178 3C 80 80 5A */ lis r4, lit_3769@ha /* 0x805A1158@ha */ -/* 805A017C 3B E4 11 58 */ addi r31, r4, lit_3769@l /* 0x805A1158@l */ -/* 805A0180 A8 03 05 FA */ lha r0, 0x5fa(r3) -/* 805A0184 2C 00 00 01 */ cmpwi r0, 1 -/* 805A0188 41 82 00 44 */ beq lbl_805A01CC -/* 805A018C 40 80 00 40 */ bge lbl_805A01CC -/* 805A0190 2C 00 00 00 */ cmpwi r0, 0 -/* 805A0194 40 80 00 08 */ bge lbl_805A019C -/* 805A0198 48 00 00 34 */ b lbl_805A01CC -lbl_805A019C: -/* 805A019C 38 80 00 07 */ li r4, 7 -/* 805A01A0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 805A01A4 38 A0 00 00 */ li r5, 0 -/* 805A01A8 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 805A01AC 38 C0 FF FF */ li r6, -1 -/* 805A01B0 4B FF F5 29 */ bl anm_init__FP8sq_classifUcfi -/* 805A01B4 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 805A01B8 80 7E 05 EC */ lwz r3, 0x5ec(r30) -/* 805A01BC D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 805A01C0 A8 7E 05 FA */ lha r3, 0x5fa(r30) -/* 805A01C4 38 03 00 01 */ addi r0, r3, 1 -/* 805A01C8 B0 1E 05 FA */ sth r0, 0x5fa(r30) -lbl_805A01CC: -/* 805A01CC 38 7E 05 2C */ addi r3, r30, 0x52c -/* 805A01D0 3C 80 80 5A */ lis r4, l_HIO@ha /* 0x805A1340@ha */ -/* 805A01D4 38 84 13 40 */ addi r4, r4, l_HIO@l /* 0x805A1340@l */ -/* 805A01D8 C0 24 00 20 */ lfs f1, 0x20(r4) -/* 805A01DC C0 5F 00 08 */ lfs f2, 8(r31) -/* 805A01E0 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 805A01E4 4B CC F8 59 */ bl cLib_addCalc2__FPffff -/* 805A01E8 80 1E 06 DC */ lwz r0, 0x6dc(r30) -/* 805A01EC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 805A01F0 41 82 00 14 */ beq lbl_805A0204 -/* 805A01F4 38 00 00 00 */ li r0, 0 -/* 805A01F8 B0 1E 05 F8 */ sth r0, 0x5f8(r30) -/* 805A01FC 38 00 FF FF */ li r0, -1 -/* 805A0200 B0 1E 05 FA */ sth r0, 0x5fa(r30) -lbl_805A0204: -/* 805A0204 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A0208 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A020C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A0210 7C 08 03 A6 */ mtlr r0 -/* 805A0214 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A0218 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/sq_message__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/sq_message__FP8sq_class.s deleted file mode 100644 index 3280913233..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/sq_message__FP8sq_class.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_805A021C: -/* 805A021C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A0220 7C 08 02 A6 */ mflr r0 -/* 805A0224 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A0228 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 805A022C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 805A0230 7C 7E 1B 78 */ mr r30, r3 -/* 805A0234 3C 60 80 5A */ lis r3, lit_3769@ha /* 0x805A1158@ha */ -/* 805A0238 3B E3 11 58 */ addi r31, r3, lit_3769@l /* 0x805A1158@l */ -/* 805A023C A8 1E 05 FA */ lha r0, 0x5fa(r30) -/* 805A0240 2C 00 00 01 */ cmpwi r0, 1 -/* 805A0244 41 82 00 B8 */ beq lbl_805A02FC -/* 805A0248 40 80 00 B4 */ bge lbl_805A02FC -/* 805A024C 2C 00 00 00 */ cmpwi r0, 0 -/* 805A0250 40 80 00 08 */ bge lbl_805A0258 -/* 805A0254 48 00 00 A8 */ b lbl_805A02FC -lbl_805A0258: -/* 805A0258 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 805A025C 4B CC 76 F9 */ bl cM_rndF__Ff -/* 805A0260 FC 00 08 1E */ fctiwz f0, f1 -/* 805A0264 D8 01 00 08 */ stfd f0, 8(r1) -/* 805A0268 80 01 00 0C */ lwz r0, 0xc(r1) -/* 805A026C C8 3F 00 60 */ lfd f1, 0x60(r31) -/* 805A0270 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 805A0274 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A0278 3C 00 43 30 */ lis r0, 0x4330 -/* 805A027C 90 01 00 10 */ stw r0, 0x10(r1) -/* 805A0280 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 805A0284 EC 20 08 28 */ fsubs f1, f0, f1 -/* 805A0288 C0 1F 00 00 */ lfs f0, 0(r31) -/* 805A028C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A0290 40 80 00 0C */ bge lbl_805A029C -/* 805A0294 38 00 00 00 */ li r0, 0 -/* 805A0298 48 00 00 30 */ b lbl_805A02C8 -lbl_805A029C: -/* 805A029C C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 805A02A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A02A4 40 80 00 0C */ bge lbl_805A02B0 -/* 805A02A8 38 00 00 01 */ li r0, 1 -/* 805A02AC 48 00 00 1C */ b lbl_805A02C8 -lbl_805A02B0: -/* 805A02B0 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 805A02B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A02B8 40 80 00 0C */ bge lbl_805A02C4 -/* 805A02BC 38 00 00 02 */ li r0, 2 -/* 805A02C0 48 00 00 08 */ b lbl_805A02C8 -lbl_805A02C4: -/* 805A02C4 38 00 00 03 */ li r0, 3 -lbl_805A02C8: -/* 805A02C8 7F C3 F3 78 */ mr r3, r30 -/* 805A02CC 54 00 10 3A */ slwi r0, r0, 2 -/* 805A02D0 3C 80 80 5A */ lis r4, wait_bck@ha /* 0x805A11E8@ha */ -/* 805A02D4 38 84 11 E8 */ addi r4, r4, wait_bck@l /* 0x805A11E8@l */ -/* 805A02D8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 805A02DC C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 805A02E0 38 A0 00 02 */ li r5, 2 -/* 805A02E4 C0 5F 00 08 */ lfs f2, 8(r31) -/* 805A02E8 38 C0 FF FF */ li r6, -1 -/* 805A02EC 4B FF F3 ED */ bl anm_init__FP8sq_classifUcfi -/* 805A02F0 A8 7E 05 FA */ lha r3, 0x5fa(r30) -/* 805A02F4 38 03 00 01 */ addi r0, r3, 1 -/* 805A02F8 B0 1E 05 FA */ sth r0, 0x5fa(r30) -lbl_805A02FC: -/* 805A02FC 38 7E 05 2C */ addi r3, r30, 0x52c -/* 805A0300 C0 3F 00 08 */ lfs f1, 8(r31) -/* 805A0304 C0 5F 00 00 */ lfs f2, 0(r31) -/* 805A0308 4B CC F7 79 */ bl cLib_addCalc0__FPfff -/* 805A030C 7F C3 F3 78 */ mr r3, r30 -/* 805A0310 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A0314 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A0318 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 805A031C 4B A7 A3 F5 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 805A0320 7C 64 1B 78 */ mr r4, r3 -/* 805A0324 38 7E 04 DE */ addi r3, r30, 0x4de -/* 805A0328 38 A0 00 02 */ li r5, 2 -/* 805A032C 38 C0 10 00 */ li r6, 0x1000 -/* 805A0330 4B CD 02 D9 */ bl cLib_addCalcAngleS2__FPssss -/* 805A0334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A0338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A033C 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 805A0340 28 00 00 00 */ cmplwi r0, 0 -/* 805A0344 40 82 00 20 */ bne lbl_805A0364 -/* 805A0348 C0 3E 05 D4 */ lfs f1, 0x5d4(r30) -/* 805A034C C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 805A0350 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 805A0354 40 81 00 10 */ ble lbl_805A0364 -/* 805A0358 38 00 00 00 */ li r0, 0 -/* 805A035C B0 1E 05 F8 */ sth r0, 0x5f8(r30) -/* 805A0360 B0 1E 05 FA */ sth r0, 0x5fa(r30) -lbl_805A0364: -/* 805A0364 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 805A0368 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 805A036C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A0370 7C 08 03 A6 */ mtlr r0 -/* 805A0374 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A0378 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/sq_normal__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/sq_normal__FP8sq_class.s deleted file mode 100644 index 80fc721eab..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/sq_normal__FP8sq_class.s +++ /dev/null @@ -1,273 +0,0 @@ -lbl_8059FA68: -/* 8059FA68 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8059FA6C 7C 08 02 A6 */ mflr r0 -/* 8059FA70 90 01 00 54 */ stw r0, 0x54(r1) -/* 8059FA74 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8059FA78 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 8059FA7C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8059FA80 4B DC 27 5D */ bl _savegpr_29 -/* 8059FA84 7C 7D 1B 78 */ mr r29, r3 -/* 8059FA88 3C 60 80 5A */ lis r3, lit_3769@ha /* 0x805A1158@ha */ -/* 8059FA8C 3B E3 11 58 */ addi r31, r3, lit_3769@l /* 0x805A1158@l */ -/* 8059FA90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059FA94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059FA98 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 8059FA9C C3 FF 00 20 */ lfs f31, 0x20(r31) -/* 8059FAA0 A8 1D 05 FA */ lha r0, 0x5fa(r29) -/* 8059FAA4 2C 00 00 02 */ cmpwi r0, 2 -/* 8059FAA8 41 82 01 70 */ beq lbl_8059FC18 -/* 8059FAAC 40 80 00 18 */ bge lbl_8059FAC4 -/* 8059FAB0 2C 00 00 01 */ cmpwi r0, 1 -/* 8059FAB4 40 80 00 48 */ bge lbl_8059FAFC -/* 8059FAB8 2C 00 FF FF */ cmpwi r0, -1 -/* 8059FABC 40 80 00 20 */ bge lbl_8059FADC -/* 8059FAC0 48 00 02 84 */ b lbl_8059FD44 -lbl_8059FAC4: -/* 8059FAC4 2C 00 00 0B */ cmpwi r0, 0xb -/* 8059FAC8 41 82 02 1C */ beq lbl_8059FCE4 -/* 8059FACC 40 80 02 78 */ bge lbl_8059FD44 -/* 8059FAD0 2C 00 00 0A */ cmpwi r0, 0xa -/* 8059FAD4 40 80 01 C0 */ bge lbl_8059FC94 -/* 8059FAD8 48 00 02 6C */ b lbl_8059FD44 -lbl_8059FADC: -/* 8059FADC C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8059FAE0 4B CC 7E 75 */ bl cM_rndF__Ff -/* 8059FAE4 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 8059FAE8 EC 00 08 2A */ fadds f0, f0, f1 -/* 8059FAEC FC 00 00 1E */ fctiwz f0, f0 -/* 8059FAF0 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8059FAF4 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8059FAF8 B0 1D 06 00 */ sth r0, 0x600(r29) -lbl_8059FAFC: -/* 8059FAFC C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 8059FB00 4B CC 7E 55 */ bl cM_rndF__Ff -/* 8059FB04 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 8059FB08 EC 00 08 2A */ fadds f0, f0, f1 -/* 8059FB0C FC 00 00 1E */ fctiwz f0, f0 -/* 8059FB10 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8059FB14 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8059FB18 B0 1D 06 02 */ sth r0, 0x602(r29) -/* 8059FB1C C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 8059FB20 4B CC 7E 35 */ bl cM_rndF__Ff -/* 8059FB24 FC 00 08 1E */ fctiwz f0, f1 -/* 8059FB28 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8059FB2C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059FB30 C8 5F 00 60 */ lfd f2, 0x60(r31) -/* 8059FB34 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8059FB38 90 61 00 2C */ stw r3, 0x2c(r1) -/* 8059FB3C 3C 00 43 30 */ lis r0, 0x4330 -/* 8059FB40 90 01 00 28 */ stw r0, 0x28(r1) -/* 8059FB44 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8059FB48 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8059FB4C C0 1F 00 00 */ lfs f0, 0(r31) -/* 8059FB50 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059FB54 40 80 00 0C */ bge lbl_8059FB60 -/* 8059FB58 38 80 00 00 */ li r4, 0 -/* 8059FB5C 48 00 00 50 */ b lbl_8059FBAC -lbl_8059FB60: -/* 8059FB60 90 61 00 2C */ stw r3, 0x2c(r1) -/* 8059FB64 90 01 00 28 */ stw r0, 0x28(r1) -/* 8059FB68 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8059FB6C EC 20 10 28 */ fsubs f1, f0, f2 -/* 8059FB70 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 8059FB74 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059FB78 40 80 00 0C */ bge lbl_8059FB84 -/* 8059FB7C 38 80 00 01 */ li r4, 1 -/* 8059FB80 48 00 00 2C */ b lbl_8059FBAC -lbl_8059FB84: -/* 8059FB84 90 61 00 2C */ stw r3, 0x2c(r1) -/* 8059FB88 90 01 00 28 */ stw r0, 0x28(r1) -/* 8059FB8C C8 01 00 28 */ lfd f0, 0x28(r1) -/* 8059FB90 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8059FB94 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 8059FB98 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059FB9C 40 80 00 0C */ bge lbl_8059FBA8 -/* 8059FBA0 38 80 00 02 */ li r4, 2 -/* 8059FBA4 48 00 00 08 */ b lbl_8059FBAC -lbl_8059FBA8: -/* 8059FBA8 38 80 00 03 */ li r4, 3 -lbl_8059FBAC: -/* 8059FBAC A8 1D 05 FA */ lha r0, 0x5fa(r29) -/* 8059FBB0 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FBB4 40 82 00 30 */ bne lbl_8059FBE4 -/* 8059FBB8 7F A3 EB 78 */ mr r3, r29 -/* 8059FBBC 54 80 10 3A */ slwi r0, r4, 2 -/* 8059FBC0 3C 80 80 5A */ lis r4, wait_bck@ha /* 0x805A11E8@ha */ -/* 8059FBC4 38 84 11 E8 */ addi r4, r4, wait_bck@l /* 0x805A11E8@l */ -/* 8059FBC8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8059FBCC C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 8059FBD0 38 A0 00 02 */ li r5, 2 -/* 8059FBD4 C0 5F 00 08 */ lfs f2, 8(r31) -/* 8059FBD8 38 C0 FF FF */ li r6, -1 -/* 8059FBDC 4B FF FA FD */ bl anm_init__FP8sq_classifUcfi -/* 8059FBE0 48 00 00 2C */ b lbl_8059FC0C -lbl_8059FBE4: -/* 8059FBE4 7F A3 EB 78 */ mr r3, r29 -/* 8059FBE8 54 80 10 3A */ slwi r0, r4, 2 -/* 8059FBEC 3C 80 80 5A */ lis r4, wait_bck@ha /* 0x805A11E8@ha */ -/* 8059FBF0 38 84 11 E8 */ addi r4, r4, wait_bck@l /* 0x805A11E8@l */ -/* 8059FBF4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8059FBF8 C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 8059FBFC 38 A0 00 02 */ li r5, 2 -/* 8059FC00 C0 5F 00 08 */ lfs f2, 8(r31) -/* 8059FC04 38 C0 FF FF */ li r6, -1 -/* 8059FC08 4B FF FA D1 */ bl anm_init__FP8sq_classifUcfi -lbl_8059FC0C: -/* 8059FC0C 38 00 00 02 */ li r0, 2 -/* 8059FC10 B0 1D 05 FA */ sth r0, 0x5fa(r29) -/* 8059FC14 48 00 01 30 */ b lbl_8059FD44 -lbl_8059FC18: -/* 8059FC18 A8 1D 06 02 */ lha r0, 0x602(r29) -/* 8059FC1C 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FC20 41 82 00 10 */ beq lbl_8059FC30 -/* 8059FC24 A8 1D 06 00 */ lha r0, 0x600(r29) -/* 8059FC28 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FC2C 40 82 01 18 */ bne lbl_8059FD44 -lbl_8059FC30: -/* 8059FC30 A8 1D 06 00 */ lha r0, 0x600(r29) -/* 8059FC34 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FC38 41 82 00 14 */ beq lbl_8059FC4C -/* 8059FC3C A8 7D 05 FA */ lha r3, 0x5fa(r29) -/* 8059FC40 38 03 FF FF */ addi r0, r3, -1 -/* 8059FC44 B0 1D 05 FA */ sth r0, 0x5fa(r29) -/* 8059FC48 48 00 00 FC */ b lbl_8059FD44 -lbl_8059FC4C: -/* 8059FC4C 38 00 00 0A */ li r0, 0xa -/* 8059FC50 B0 1D 05 FA */ sth r0, 0x5fa(r29) -/* 8059FC54 7F A3 EB 78 */ mr r3, r29 -/* 8059FC58 4B FF FC A9 */ bl way_bg_check__FP8sq_class -/* 8059FC5C 2C 03 00 00 */ cmpwi r3, 0 -/* 8059FC60 41 82 00 10 */ beq lbl_8059FC70 -/* 8059FC64 7F A3 EB 78 */ mr r3, r29 -/* 8059FC68 4B FF FD 95 */ bl turn_set__FP8sq_class -/* 8059FC6C 48 00 00 D8 */ b lbl_8059FD44 -lbl_8059FC70: -/* 8059FC70 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 8059FC74 4B CC 7D 19 */ bl cM_rndFX__Ff -/* 8059FC78 FC 00 08 1E */ fctiwz f0, f1 -/* 8059FC7C D8 01 00 28 */ stfd f0, 0x28(r1) -/* 8059FC80 80 61 00 2C */ lwz r3, 0x2c(r1) -/* 8059FC84 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 8059FC88 7C 00 1A 14 */ add r0, r0, r3 -/* 8059FC8C B0 1D 05 D0 */ sth r0, 0x5d0(r29) -/* 8059FC90 48 00 00 B4 */ b lbl_8059FD44 -lbl_8059FC94: -/* 8059FC94 C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 8059FC98 4B CC 7C BD */ bl cM_rndF__Ff -/* 8059FC9C C0 1F 00 04 */ lfs f0, 4(r31) -/* 8059FCA0 EC 00 08 2A */ fadds f0, f0, f1 -/* 8059FCA4 FC 00 00 1E */ fctiwz f0, f0 -/* 8059FCA8 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 8059FCAC 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8059FCB0 B0 1D 06 00 */ sth r0, 0x600(r29) -/* 8059FCB4 7F A3 EB 78 */ mr r3, r29 -/* 8059FCB8 38 80 00 07 */ li r4, 7 -/* 8059FCBC C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 8059FCC0 38 A0 00 02 */ li r5, 2 -/* 8059FCC4 3C C0 80 5A */ lis r6, l_HIO@ha /* 0x805A1340@ha */ -/* 8059FCC8 38 C6 13 40 */ addi r6, r6, l_HIO@l /* 0x805A1340@l */ -/* 8059FCCC C0 46 00 10 */ lfs f2, 0x10(r6) -/* 8059FCD0 38 C0 FF FF */ li r6, -1 -/* 8059FCD4 4B FF FA 05 */ bl anm_init__FP8sq_classifUcfi -/* 8059FCD8 A8 7D 05 FA */ lha r3, 0x5fa(r29) -/* 8059FCDC 38 03 00 01 */ addi r0, r3, 1 -/* 8059FCE0 B0 1D 05 FA */ sth r0, 0x5fa(r29) -lbl_8059FCE4: -/* 8059FCE4 3C 60 80 5A */ lis r3, l_HIO@ha /* 0x805A1340@ha */ -/* 8059FCE8 38 63 13 40 */ addi r3, r3, l_HIO@l /* 0x805A1340@l */ -/* 8059FCEC C3 E3 00 0C */ lfs f31, 0xc(r3) -/* 8059FCF0 38 7D 04 DE */ addi r3, r29, 0x4de -/* 8059FCF4 A8 9D 05 D0 */ lha r4, 0x5d0(r29) -/* 8059FCF8 38 A0 00 04 */ li r5, 4 -/* 8059FCFC 38 C0 20 00 */ li r6, 0x2000 -/* 8059FD00 4B CD 09 09 */ bl cLib_addCalcAngleS2__FPssss -/* 8059FD04 A8 1D 06 00 */ lha r0, 0x600(r29) -/* 8059FD08 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FD0C 40 82 00 10 */ bne lbl_8059FD1C -/* 8059FD10 38 00 00 00 */ li r0, 0 -/* 8059FD14 B0 1D 05 FA */ sth r0, 0x5fa(r29) -/* 8059FD18 48 00 00 2C */ b lbl_8059FD44 -lbl_8059FD1C: -/* 8059FD1C A8 1D 06 04 */ lha r0, 0x604(r29) -/* 8059FD20 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FD24 40 82 00 20 */ bne lbl_8059FD44 -/* 8059FD28 80 1D 06 DC */ lwz r0, 0x6dc(r29) -/* 8059FD2C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8059FD30 41 82 00 14 */ beq lbl_8059FD44 -/* 8059FD34 7F A3 EB 78 */ mr r3, r29 -/* 8059FD38 4B FF FC C5 */ bl turn_set__FP8sq_class -/* 8059FD3C 38 00 00 14 */ li r0, 0x14 -/* 8059FD40 B0 1D 06 04 */ sth r0, 0x604(r29) -lbl_8059FD44: -/* 8059FD44 38 7D 05 2C */ addi r3, r29, 0x52c -/* 8059FD48 FC 20 F8 90 */ fmr f1, f31 -/* 8059FD4C C0 5F 00 08 */ lfs f2, 8(r31) -/* 8059FD50 C0 7F 00 5C */ lfs f3, 0x5c(r31) -/* 8059FD54 4B CC FC E9 */ bl cLib_addCalc2__FPffff -/* 8059FD58 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 8059FD5C FC 00 02 10 */ fabs f0, f0 -/* 8059FD60 FC 20 00 18 */ frsp f1, f0 -/* 8059FD64 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 8059FD68 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059FD6C 40 80 00 18 */ bge lbl_8059FD84 -/* 8059FD70 A8 1D 06 0A */ lha r0, 0x60a(r29) -/* 8059FD74 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FD78 40 82 00 0C */ bne lbl_8059FD84 -/* 8059FD7C 38 00 00 01 */ li r0, 1 -/* 8059FD80 B0 1D 06 0A */ sth r0, 0x60a(r29) -lbl_8059FD84: -/* 8059FD84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059FD88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059FD8C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 8059FD90 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 -/* 8059FD94 41 82 00 0C */ beq lbl_8059FDA0 -/* 8059FD98 38 00 00 1E */ li r0, 0x1e -/* 8059FD9C B0 1D 06 0A */ sth r0, 0x60a(r29) -lbl_8059FDA0: -/* 8059FDA0 C0 3E 05 38 */ lfs f1, 0x538(r30) -/* 8059FDA4 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 8059FDA8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8059FDAC D0 21 00 08 */ stfs f1, 8(r1) -/* 8059FDB0 C0 5E 05 40 */ lfs f2, 0x540(r30) -/* 8059FDB4 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 8059FDB8 EC 42 00 28 */ fsubs f2, f2, f0 -/* 8059FDBC D0 41 00 10 */ stfs f2, 0x10(r1) -/* 8059FDC0 4B CC 78 B5 */ bl cM_atan2s__Fff -/* 8059FDC4 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 8059FDC8 7C 03 00 50 */ subf r0, r3, r0 -/* 8059FDCC 7C 00 07 35 */ extsh. r0, r0 -/* 8059FDD0 40 80 00 0C */ bge lbl_8059FDDC -/* 8059FDD4 7C 00 00 D0 */ neg r0, r0 -/* 8059FDD8 7C 00 07 34 */ extsh r0, r0 -lbl_8059FDDC: -/* 8059FDDC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8059FDE0 28 00 40 00 */ cmplwi r0, 0x4000 -/* 8059FDE4 40 80 00 0C */ bge lbl_8059FDF0 -/* 8059FDE8 38 00 00 00 */ li r0, 0 -/* 8059FDEC B0 1D 06 0A */ sth r0, 0x60a(r29) -lbl_8059FDF0: -/* 8059FDF0 3C 60 80 5A */ lis r3, l_HIO@ha /* 0x805A1340@ha */ -/* 8059FDF4 38 63 13 40 */ addi r3, r3, l_HIO@l /* 0x805A1340@l */ -/* 8059FDF8 88 03 00 14 */ lbz r0, 0x14(r3) -/* 8059FDFC 28 00 00 00 */ cmplwi r0, 0 -/* 8059FE00 41 82 00 30 */ beq lbl_8059FE30 -/* 8059FE04 A8 1D 06 0A */ lha r0, 0x60a(r29) -/* 8059FE08 2C 00 00 00 */ cmpwi r0, 0 -/* 8059FE0C 40 82 00 24 */ bne lbl_8059FE30 -/* 8059FE10 C0 3D 05 D4 */ lfs f1, 0x5d4(r29) -/* 8059FE14 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 8059FE18 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059FE1C 40 80 00 14 */ bge lbl_8059FE30 -/* 8059FE20 38 00 00 01 */ li r0, 1 -/* 8059FE24 B0 1D 05 F8 */ sth r0, 0x5f8(r29) -/* 8059FE28 38 00 00 00 */ li r0, 0 -/* 8059FE2C B0 1D 05 FA */ sth r0, 0x5fa(r29) -lbl_8059FE30: -/* 8059FE30 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 8059FE34 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8059FE38 39 61 00 40 */ addi r11, r1, 0x40 -/* 8059FE3C 4B DC 23 ED */ bl _restgpr_29 -/* 8059FE40 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8059FE44 7C 08 03 A6 */ mtlr r0 -/* 8059FE48 38 21 00 50 */ addi r1, r1, 0x50 -/* 8059FE4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/turn_set__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/turn_set__FP8sq_class.s deleted file mode 100644 index ebfbffed60..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/turn_set__FP8sq_class.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8059F9FC: -/* 8059F9FC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059FA00 7C 08 02 A6 */ mflr r0 -/* 8059FA04 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059FA08 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8059FA0C 7C 7F 1B 78 */ mr r31, r3 -/* 8059FA10 3C 60 80 5A */ lis r3, lit_3884@ha /* 0x805A1188@ha */ -/* 8059FA14 84 03 11 88 */ lwzu r0, lit_3884@l(r3) /* 0x805A1188@l */ -/* 8059FA18 90 01 00 08 */ stw r0, 8(r1) -/* 8059FA1C A0 03 00 04 */ lhz r0, 4(r3) -/* 8059FA20 B0 01 00 0C */ sth r0, 0xc(r1) -/* 8059FA24 3C 60 80 5A */ lis r3, lit_3886@ha /* 0x805A1190@ha */ -/* 8059FA28 C0 23 11 90 */ lfs f1, lit_3886@l(r3) /* 0x805A1190@l */ -/* 8059FA2C 4B CC 7F 29 */ bl cM_rndF__Ff -/* 8059FA30 FC 00 08 1E */ fctiwz f0, f1 -/* 8059FA34 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8059FA38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059FA3C 54 00 08 3C */ slwi r0, r0, 1 -/* 8059FA40 38 61 00 08 */ addi r3, r1, 8 -/* 8059FA44 7C 63 02 AE */ lhax r3, r3, r0 -/* 8059FA48 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 8059FA4C 7C 00 1A 14 */ add r0, r0, r3 -/* 8059FA50 B0 1F 05 D0 */ sth r0, 0x5d0(r31) -/* 8059FA54 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8059FA58 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059FA5C 7C 08 03 A6 */ mtlr r0 -/* 8059FA60 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059FA64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_sq/d_a_sq/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 0dd6a7ef63..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_805A0A48: -/* 805A0A48 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 805A0A4C 7C 08 02 A6 */ mflr r0 -/* 805A0A50 90 01 00 34 */ stw r0, 0x34(r1) -/* 805A0A54 39 61 00 30 */ addi r11, r1, 0x30 -/* 805A0A58 4B DC 17 81 */ bl _savegpr_28 -/* 805A0A5C 7C 7F 1B 78 */ mr r31, r3 -/* 805A0A60 38 60 00 54 */ li r3, 0x54 -/* 805A0A64 4B D2 E1 E9 */ bl __nw__FUl -/* 805A0A68 7C 7E 1B 79 */ or. r30, r3, r3 -/* 805A0A6C 41 82 00 9C */ beq lbl_805A0B08 -/* 805A0A70 3C 60 80 5A */ lis r3, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 805A0A74 38 63 11 E4 */ addi r3, r3, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 805A0A78 38 80 00 09 */ li r4, 9 -/* 805A0A7C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A0A80 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A0A84 3F 85 00 02 */ addis r28, r5, 2 -/* 805A0A88 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 805A0A8C 7F 85 E3 78 */ mr r5, r28 -/* 805A0A90 38 C0 00 80 */ li r6, 0x80 -/* 805A0A94 4B A9 B8 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 805A0A98 7C 7D 1B 78 */ mr r29, r3 -/* 805A0A9C 3C 60 80 5A */ lis r3, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 805A0AA0 38 63 11 E4 */ addi r3, r3, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 805A0AA4 38 80 00 11 */ li r4, 0x11 -/* 805A0AA8 7F 85 E3 78 */ mr r5, r28 -/* 805A0AAC 38 C0 00 80 */ li r6, 0x80 -/* 805A0AB0 4B A9 B8 3D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 805A0AB4 7C 64 1B 78 */ mr r4, r3 -/* 805A0AB8 38 00 00 01 */ li r0, 1 -/* 805A0ABC 90 01 00 08 */ stw r0, 8(r1) -/* 805A0AC0 38 00 00 00 */ li r0, 0 -/* 805A0AC4 90 01 00 0C */ stw r0, 0xc(r1) -/* 805A0AC8 3C 00 00 08 */ lis r0, 8 -/* 805A0ACC 90 01 00 10 */ stw r0, 0x10(r1) -/* 805A0AD0 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000284@ha */ -/* 805A0AD4 38 03 02 84 */ addi r0, r3, 0x0284 /* 0x11000284@l */ -/* 805A0AD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A0ADC 7F C3 F3 78 */ mr r3, r30 -/* 805A0AE0 38 A0 00 00 */ li r5, 0 -/* 805A0AE4 38 C0 00 00 */ li r6, 0 -/* 805A0AE8 7F A7 EB 78 */ mr r7, r29 -/* 805A0AEC 39 00 00 00 */ li r8, 0 -/* 805A0AF0 3D 20 80 5A */ lis r9, lit_3771@ha /* 0x805A1160@ha */ -/* 805A0AF4 C0 29 11 60 */ lfs f1, lit_3771@l(r9) /* 0x805A1160@l */ -/* 805A0AF8 39 20 00 00 */ li r9, 0 -/* 805A0AFC 39 40 FF FF */ li r10, -1 -/* 805A0B00 4B A6 F1 4D */ bl __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl -/* 805A0B04 7C 7E 1B 78 */ mr r30, r3 -lbl_805A0B08: -/* 805A0B08 93 DF 05 EC */ stw r30, 0x5ec(r31) -/* 805A0B0C 80 7F 05 EC */ lwz r3, 0x5ec(r31) -/* 805A0B10 28 03 00 00 */ cmplwi r3, 0 -/* 805A0B14 41 82 00 10 */ beq lbl_805A0B24 -/* 805A0B18 80 03 00 04 */ lwz r0, 4(r3) -/* 805A0B1C 28 00 00 00 */ cmplwi r0, 0 -/* 805A0B20 40 82 00 0C */ bne lbl_805A0B2C -lbl_805A0B24: -/* 805A0B24 38 60 00 00 */ li r3, 0 -/* 805A0B28 48 00 00 A8 */ b lbl_805A0BD0 -lbl_805A0B2C: -/* 805A0B2C 38 60 00 18 */ li r3, 0x18 -/* 805A0B30 4B D2 E1 1D */ bl __nw__FUl -/* 805A0B34 7C 7E 1B 79 */ or. r30, r3, r3 -/* 805A0B38 41 82 00 20 */ beq lbl_805A0B58 -/* 805A0B3C 3C 80 80 5A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x805A1310@ha */ -/* 805A0B40 38 04 13 10 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x805A1310@l */ -/* 805A0B44 90 1E 00 00 */ stw r0, 0(r30) -/* 805A0B48 38 80 00 00 */ li r4, 0 -/* 805A0B4C 4B D8 78 B1 */ bl init__12J3DFrameCtrlFs -/* 805A0B50 38 00 00 00 */ li r0, 0 -/* 805A0B54 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_805A0B58: -/* 805A0B58 93 DF 05 F0 */ stw r30, 0x5f0(r31) -/* 805A0B5C 80 1F 05 F0 */ lwz r0, 0x5f0(r31) -/* 805A0B60 28 00 00 00 */ cmplwi r0, 0 -/* 805A0B64 40 82 00 0C */ bne lbl_805A0B70 -/* 805A0B68 38 60 00 00 */ li r3, 0 -/* 805A0B6C 48 00 00 64 */ b lbl_805A0BD0 -lbl_805A0B70: -/* 805A0B70 3C 60 80 5A */ lis r3, d_a_sq__stringBase0@ha /* 0x805A11E4@ha */ -/* 805A0B74 38 63 11 E4 */ addi r3, r3, d_a_sq__stringBase0@l /* 0x805A11E4@l */ -/* 805A0B78 38 80 00 14 */ li r4, 0x14 -/* 805A0B7C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A0B80 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A0B84 3C A5 00 02 */ addis r5, r5, 2 -/* 805A0B88 38 C0 00 80 */ li r6, 0x80 -/* 805A0B8C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 805A0B90 4B A9 B7 5D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 805A0B94 7C 65 1B 78 */ mr r5, r3 -/* 805A0B98 80 7F 05 EC */ lwz r3, 0x5ec(r31) -/* 805A0B9C 80 63 00 04 */ lwz r3, 4(r3) -/* 805A0BA0 80 83 00 04 */ lwz r4, 4(r3) -/* 805A0BA4 80 7F 05 F0 */ lwz r3, 0x5f0(r31) -/* 805A0BA8 38 84 00 58 */ addi r4, r4, 0x58 -/* 805A0BAC 38 C0 00 01 */ li r6, 1 -/* 805A0BB0 38 E0 00 00 */ li r7, 0 -/* 805A0BB4 3D 00 80 5A */ lis r8, lit_3771@ha /* 0x805A1160@ha */ -/* 805A0BB8 C0 28 11 60 */ lfs f1, lit_3771@l(r8) /* 0x805A1160@l */ -/* 805A0BBC 39 00 00 00 */ li r8, 0 -/* 805A0BC0 39 20 FF FF */ li r9, -1 -/* 805A0BC4 4B A6 CA 79 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 805A0BC8 30 03 FF FF */ addic r0, r3, -1 -/* 805A0BCC 7C 60 19 10 */ subfe r3, r0, r3 -lbl_805A0BD0: -/* 805A0BD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 805A0BD4 4B DC 16 51 */ bl _restgpr_28 -/* 805A0BD8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 805A0BDC 7C 08 03 A6 */ mtlr r0 -/* 805A0BE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 805A0BE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_sq/d_a_sq/way_bg_check__FP8sq_class.s b/asm/rel/d/a/d_a_sq/d_a_sq/way_bg_check__FP8sq_class.s deleted file mode 100644 index faf40cb290..0000000000 --- a/asm/rel/d/a/d_a_sq/d_a_sq/way_bg_check__FP8sq_class.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_8059F900: -/* 8059F900 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 8059F904 7C 08 02 A6 */ mflr r0 -/* 8059F908 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 8059F90C 93 E1 00 AC */ stw r31, 0xac(r1) -/* 8059F910 93 C1 00 A8 */ stw r30, 0xa8(r1) -/* 8059F914 3C 80 80 5A */ lis r4, lit_3769@ha /* 0x805A1158@ha */ -/* 8059F918 3B E4 11 58 */ addi r31, r4, lit_3769@l /* 0x805A1158@l */ -/* 8059F91C 7C 7E 1B 78 */ mr r30, r3 -/* 8059F920 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 8059F924 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8059F928 C0 23 04 D4 */ lfs f1, 0x4d4(r3) -/* 8059F92C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 8059F930 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 8059F934 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8059F938 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 8059F93C EC 01 00 2A */ fadds f0, f1, f0 -/* 8059F940 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8059F944 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 8059F948 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 8059F94C 80 63 00 00 */ lwz r3, 0(r3) -/* 8059F950 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 8059F954 4B A6 CA 89 */ bl mDoMtx_YrotS__FPA4_fs -/* 8059F958 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8059F95C D0 01 00 08 */ stfs f0, 8(r1) -/* 8059F960 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8059F964 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8059F968 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8059F96C 38 61 00 08 */ addi r3, r1, 8 -/* 8059F970 38 81 00 14 */ addi r4, r1, 0x14 -/* 8059F974 4B CD 15 79 */ bl MtxPosition__FP4cXyzP4cXyz -/* 8059F978 38 61 00 14 */ addi r3, r1, 0x14 -/* 8059F97C 38 81 00 20 */ addi r4, r1, 0x20 -/* 8059F980 7C 65 1B 78 */ mr r5, r3 -/* 8059F984 4B DA 77 0D */ bl PSVECAdd -/* 8059F988 38 61 00 2C */ addi r3, r1, 0x2c -/* 8059F98C 4B AD 82 DD */ bl __ct__11dBgS_LinChkFv -/* 8059F990 38 61 00 2C */ addi r3, r1, 0x2c -/* 8059F994 38 81 00 20 */ addi r4, r1, 0x20 -/* 8059F998 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8059F99C 7F C6 F3 78 */ mr r6, r30 -/* 8059F9A0 4B AD 83 C5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 8059F9A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059F9A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059F9AC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8059F9B0 38 81 00 2C */ addi r4, r1, 0x2c -/* 8059F9B4 4B AD 4A 01 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 8059F9B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8059F9BC 41 82 00 18 */ beq lbl_8059F9D4 -/* 8059F9C0 38 61 00 2C */ addi r3, r1, 0x2c -/* 8059F9C4 38 80 FF FF */ li r4, -1 -/* 8059F9C8 4B AD 83 15 */ bl __dt__11dBgS_LinChkFv -/* 8059F9CC 38 60 00 01 */ li r3, 1 -/* 8059F9D0 48 00 00 14 */ b lbl_8059F9E4 -lbl_8059F9D4: -/* 8059F9D4 38 61 00 2C */ addi r3, r1, 0x2c -/* 8059F9D8 38 80 FF FF */ li r4, -1 -/* 8059F9DC 4B AD 83 01 */ bl __dt__11dBgS_LinChkFv -/* 8059F9E0 38 60 00 00 */ li r3, 0 -lbl_8059F9E4: -/* 8059F9E4 83 E1 00 AC */ lwz r31, 0xac(r1) -/* 8059F9E8 83 C1 00 A8 */ lwz r30, 0xa8(r1) -/* 8059F9EC 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 8059F9F0 7C 08 03 A6 */ mtlr r0 -/* 8059F9F4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8059F9F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__ct__14daNpc_Sq_HIO_cFv.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__ct__14daNpc_Sq_HIO_cFv.s deleted file mode 100644 index 02b508fb6c..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__ct__14daNpc_Sq_HIO_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80AF5FEC: -/* 80AF5FEC 3C 80 80 AF */ lis r4, __vt__14daNpc_Sq_HIO_c@ha /* 0x80AF75A8@ha */ -/* 80AF5FF0 38 04 75 A8 */ addi r0, r4, __vt__14daNpc_Sq_HIO_c@l /* 0x80AF75A8@l */ -/* 80AF5FF4 90 03 00 00 */ stw r0, 0(r3) -/* 80AF5FF8 38 00 FF FF */ li r0, -1 -/* 80AF5FFC 98 03 00 04 */ stb r0, 4(r3) -/* 80AF6000 3C 80 80 AF */ lis r4, lit_3768@ha /* 0x80AF7408@ha */ -/* 80AF6004 C0 04 74 08 */ lfs f0, lit_3768@l(r4) /* 0x80AF7408@l */ -/* 80AF6008 D0 03 00 08 */ stfs f0, 8(r3) -/* 80AF600C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index a3a04dc96c..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80AF6F50: -/* 80AF6F50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80AF6F54 7C 08 02 A6 */ mflr r0 -/* 80AF6F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF6F5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF6F60 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80AF6F64 41 82 00 1C */ beq lbl_80AF6F80 -/* 80AF6F68 3C A0 80 AF */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80AF759C@ha */ -/* 80AF6F6C 38 05 75 9C */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80AF759C@l */ -/* 80AF6F70 90 1F 00 00 */ stw r0, 0(r31) -/* 80AF6F74 7C 80 07 35 */ extsh. r0, r4 -/* 80AF6F78 40 81 00 08 */ ble lbl_80AF6F80 -/* 80AF6F7C 4B 7D 7D C1 */ bl __dl__FPv -lbl_80AF6F80: -/* 80AF6F80 7F E3 FB 78 */ mr r3, r31 -/* 80AF6F84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF6F88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF6F8C 7C 08 03 A6 */ mtlr r0 -/* 80AF6F90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80AF6F94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index b233e02278..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80AF72F0: -/* 80AF72F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80AF72F4 7C 08 02 A6 */ mflr r0 -/* 80AF72F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF72FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF7300 93 C1 00 08 */ stw r30, 8(r1) -/* 80AF7304 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80AF7308 7C 9F 23 78 */ mr r31, r4 -/* 80AF730C 41 82 00 38 */ beq lbl_80AF7344 -/* 80AF7310 3C 80 80 AF */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80AF7578@ha */ -/* 80AF7314 38 84 75 78 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80AF7578@l */ -/* 80AF7318 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80AF731C 38 04 00 0C */ addi r0, r4, 0xc -/* 80AF7320 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80AF7324 38 04 00 18 */ addi r0, r4, 0x18 -/* 80AF7328 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80AF732C 38 80 00 00 */ li r4, 0 -/* 80AF7330 4B 57 EC 65 */ bl __dt__9dBgS_AcchFv -/* 80AF7334 7F E0 07 35 */ extsh. r0, r31 -/* 80AF7338 40 81 00 0C */ ble lbl_80AF7344 -/* 80AF733C 7F C3 F3 78 */ mr r3, r30 -/* 80AF7340 4B 7D 79 FD */ bl __dl__FPv -lbl_80AF7344: -/* 80AF7344 7F C3 F3 78 */ mr r3, r30 -/* 80AF7348 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF734C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80AF7350 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF7354 7C 08 03 A6 */ mtlr r0 -/* 80AF7358 38 21 00 10 */ addi r1, r1, 0x10 -/* 80AF735C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__14daNpc_Sq_HIO_cFv.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__14daNpc_Sq_HIO_cFv.s deleted file mode 100644 index 550e6ce2b2..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__14daNpc_Sq_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80AF7360: -/* 80AF7360 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80AF7364 7C 08 02 A6 */ mflr r0 -/* 80AF7368 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF736C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF7370 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80AF7374 41 82 00 1C */ beq lbl_80AF7390 -/* 80AF7378 3C A0 80 AF */ lis r5, __vt__14daNpc_Sq_HIO_c@ha /* 0x80AF75A8@ha */ -/* 80AF737C 38 05 75 A8 */ addi r0, r5, __vt__14daNpc_Sq_HIO_c@l /* 0x80AF75A8@l */ -/* 80AF7380 90 1F 00 00 */ stw r0, 0(r31) -/* 80AF7384 7C 80 07 35 */ extsh. r0, r4 -/* 80AF7388 40 81 00 08 */ ble lbl_80AF7390 -/* 80AF738C 4B 7D 79 B1 */ bl __dl__FPv -lbl_80AF7390: -/* 80AF7390 7F E3 FB 78 */ mr r3, r31 -/* 80AF7394 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF7398 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF739C 7C 08 03 A6 */ mtlr r0 -/* 80AF73A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80AF73A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGAabFv.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGAabFv.s deleted file mode 100644 index 1c0b6f75e8..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80AF72A8: -/* 80AF72A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80AF72AC 7C 08 02 A6 */ mflr r0 -/* 80AF72B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF72B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF72B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80AF72BC 41 82 00 1C */ beq lbl_80AF72D8 -/* 80AF72C0 3C A0 80 AF */ lis r5, __vt__8cM3dGAab@ha /* 0x80AF756C@ha */ -/* 80AF72C4 38 05 75 6C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80AF756C@l */ -/* 80AF72C8 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80AF72CC 7C 80 07 35 */ extsh. r0, r4 -/* 80AF72D0 40 81 00 08 */ ble lbl_80AF72D8 -/* 80AF72D4 4B 7D 7A 69 */ bl __dl__FPv -lbl_80AF72D8: -/* 80AF72D8 7F E3 FB 78 */ mr r3, r31 -/* 80AF72DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF72E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF72E4 7C 08 03 A6 */ mtlr r0 -/* 80AF72E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80AF72EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGSphFv.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGSphFv.s deleted file mode 100644 index 551fb174c6..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80AF7260: -/* 80AF7260 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80AF7264 7C 08 02 A6 */ mflr r0 -/* 80AF7268 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF726C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF7270 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80AF7274 41 82 00 1C */ beq lbl_80AF7290 -/* 80AF7278 3C A0 80 AF */ lis r5, __vt__8cM3dGSph@ha /* 0x80AF7560@ha */ -/* 80AF727C 38 05 75 60 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80AF7560@l */ -/* 80AF7280 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80AF7284 7C 80 07 35 */ extsh. r0, r4 -/* 80AF7288 40 81 00 08 */ ble lbl_80AF7290 -/* 80AF728C 4B 7D 7A B1 */ bl __dl__FPv -lbl_80AF7290: -/* 80AF7290 7F E3 FB 78 */ mr r3, r31 -/* 80AF7294 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF7298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF729C 7C 08 03 A6 */ mtlr r0 -/* 80AF72A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80AF72A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__sinit_d_a_npc_sq_cpp.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__sinit_d_a_npc_sq_cpp.s deleted file mode 100644 index 7684bac807..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__sinit_d_a_npc_sq_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80AF73A8: -/* 80AF73A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80AF73AC 7C 08 02 A6 */ mflr r0 -/* 80AF73B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF73B4 3C 60 80 AF */ lis r3, l_HIO@ha /* 0x80AF75D0@ha */ -/* 80AF73B8 38 63 75 D0 */ addi r3, r3, l_HIO@l /* 0x80AF75D0@l */ -/* 80AF73BC 4B FF EC 31 */ bl __ct__14daNpc_Sq_HIO_cFv -/* 80AF73C0 3C 80 80 AF */ lis r4, __dt__14daNpc_Sq_HIO_cFv@ha /* 0x80AF7360@ha */ -/* 80AF73C4 38 84 73 60 */ addi r4, r4, __dt__14daNpc_Sq_HIO_cFv@l /* 0x80AF7360@l */ -/* 80AF73C8 3C A0 80 AF */ lis r5, lit_3763@ha /* 0x80AF75C4@ha */ -/* 80AF73CC 38 A5 75 C4 */ addi r5, r5, lit_3763@l /* 0x80AF75C4@l */ -/* 80AF73D0 4B FF EB A9 */ bl __register_global_object -/* 80AF73D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF73D8 7C 08 03 A6 */ mtlr r0 -/* 80AF73DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80AF73E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/action__FP12npc_sq_class.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/action__FP12npc_sq_class.s deleted file mode 100644 index 586e9a9da6..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/action__FP12npc_sq_class.s +++ /dev/null @@ -1,91 +0,0 @@ -lbl_80AF63C0: -/* 80AF63C0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80AF63C4 7C 08 02 A6 */ mflr r0 -/* 80AF63C8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80AF63CC 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80AF63D0 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80AF63D4 7C 7E 1B 78 */ mr r30, r3 -/* 80AF63D8 3C 80 80 AF */ lis r4, lit_3768@ha /* 0x80AF7408@ha */ -/* 80AF63DC 3B E4 74 08 */ addi r31, r4, lit_3768@l /* 0x80AF7408@l */ -/* 80AF63E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF63E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF63E8 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 80AF63EC 4B 52 43 F5 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80AF63F0 D0 3E 06 18 */ stfs f1, 0x618(r30) -/* 80AF63F4 A8 1E 06 28 */ lha r0, 0x628(r30) -/* 80AF63F8 2C 00 00 00 */ cmpwi r0, 0 -/* 80AF63FC 41 82 00 08 */ beq lbl_80AF6404 -/* 80AF6400 48 00 00 0C */ b lbl_80AF640C -lbl_80AF6404: -/* 80AF6404 7F C3 F3 78 */ mr r3, r30 -/* 80AF6408 4B FF FD A9 */ bl npc_sq_normal__FP12npc_sq_class -lbl_80AF640C: -/* 80AF640C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ -/* 80AF6410 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ -/* 80AF6414 80 63 00 00 */ lwz r3, 0(r3) -/* 80AF6418 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80AF641C 4B 51 5F C1 */ bl mDoMtx_YrotS__FPA4_fs -/* 80AF6420 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80AF6424 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80AF6428 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80AF642C C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 80AF6430 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80AF6434 38 61 00 14 */ addi r3, r1, 0x14 -/* 80AF6438 38 81 00 08 */ addi r4, r1, 8 -/* 80AF643C 4B 77 AA B1 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80AF6440 C0 01 00 08 */ lfs f0, 8(r1) -/* 80AF6444 D0 1E 04 F8 */ stfs f0, 0x4f8(r30) -/* 80AF6448 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80AF644C D0 1E 05 00 */ stfs f0, 0x500(r30) -/* 80AF6450 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 80AF6454 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80AF6458 EC 01 00 2A */ fadds f0, f1, f0 -/* 80AF645C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80AF6460 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80AF6464 38 9E 04 F8 */ addi r4, r30, 0x4f8 -/* 80AF6468 7C 65 1B 78 */ mr r5, r3 -/* 80AF646C 4B 85 0C 25 */ bl PSVECAdd -/* 80AF6470 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 80AF6474 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80AF6478 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80AF647C 40 80 00 08 */ bge lbl_80AF6484 -/* 80AF6480 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -lbl_80AF6484: -/* 80AF6484 34 7E 08 54 */ addic. r3, r30, 0x854 -/* 80AF6488 41 82 00 34 */ beq lbl_80AF64BC -/* 80AF648C C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80AF6490 C0 03 00 00 */ lfs f0, 0(r3) -/* 80AF6494 EC 01 00 2A */ fadds f0, f1, f0 -/* 80AF6498 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80AF649C C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80AF64A0 C0 03 00 04 */ lfs f0, 4(r3) -/* 80AF64A4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80AF64A8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80AF64AC C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 80AF64B0 C0 03 00 08 */ lfs f0, 8(r3) -/* 80AF64B4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80AF64B8 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -lbl_80AF64BC: -/* 80AF64BC 38 7E 06 7C */ addi r3, r30, 0x67c -/* 80AF64C0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF64C4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF64C8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80AF64CC 4B 58 05 E1 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80AF64D0 38 7E 04 E6 */ addi r3, r30, 0x4e6 -/* 80AF64D4 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80AF64D8 38 A0 00 02 */ li r5, 2 -/* 80AF64DC 38 C0 40 00 */ li r6, 0x4000 -/* 80AF64E0 4B 77 A1 29 */ bl cLib_addCalcAngleS2__FPssss -/* 80AF64E4 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80AF64E8 A8 9E 04 DC */ lha r4, 0x4dc(r30) -/* 80AF64EC 38 A0 00 02 */ li r5, 2 -/* 80AF64F0 38 C0 40 00 */ li r6, 0x4000 -/* 80AF64F4 4B 77 A1 15 */ bl cLib_addCalcAngleS2__FPssss -/* 80AF64F8 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80AF64FC B0 1E 04 E8 */ sth r0, 0x4e8(r30) -/* 80AF6500 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80AF6504 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80AF6508 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80AF650C 7C 08 03 A6 */ mtlr r0 -/* 80AF6510 38 21 00 30 */ addi r1, r1, 0x30 -/* 80AF6514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/anm_init__FP12npc_sq_classifUcf.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/anm_init__FP12npc_sq_classifUcf.s deleted file mode 100644 index 3976fbc17e..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/anm_init__FP12npc_sq_classifUcf.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80AF6010: -/* 80AF6010 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80AF6014 7C 08 02 A6 */ mflr r0 -/* 80AF6018 90 01 00 34 */ stw r0, 0x34(r1) -/* 80AF601C DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80AF6020 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80AF6024 DB C1 00 10 */ stfd f30, 0x10(r1) -/* 80AF6028 F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ -/* 80AF602C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF6030 93 C1 00 08 */ stw r30, 8(r1) -/* 80AF6034 7C 7E 1B 78 */ mr r30, r3 -/* 80AF6038 FF C0 08 90 */ fmr f30, f1 -/* 80AF603C 7C BF 2B 78 */ mr r31, r5 -/* 80AF6040 FF E0 10 90 */ fmr f31, f2 -/* 80AF6044 3C 60 80 AF */ lis r3, d_a_npc_sq__stringBase0@ha /* 0x80AF74A4@ha */ -/* 80AF6048 38 63 74 A4 */ addi r3, r3, d_a_npc_sq__stringBase0@l /* 0x80AF74A4@l */ -/* 80AF604C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6050 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6054 3C A5 00 02 */ addis r5, r5, 2 -/* 80AF6058 38 C0 00 80 */ li r6, 0x80 -/* 80AF605C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80AF6060 4B 54 62 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80AF6064 7C 64 1B 78 */ mr r4, r3 -/* 80AF6068 80 7E 06 1C */ lwz r3, 0x61c(r30) -/* 80AF606C 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80AF6070 FC 20 F0 90 */ fmr f1, f30 -/* 80AF6074 FC 40 F8 90 */ fmr f2, f31 -/* 80AF6078 3C C0 80 AF */ lis r6, lit_3782@ha /* 0x80AF740C@ha */ -/* 80AF607C C0 66 74 0C */ lfs f3, lit_3782@l(r6) /* 0x80AF740C@l */ -/* 80AF6080 3C C0 80 AF */ lis r6, lit_3783@ha /* 0x80AF7410@ha */ -/* 80AF6084 C0 86 74 10 */ lfs f4, lit_3783@l(r6) /* 0x80AF7410@l */ -/* 80AF6088 38 C0 00 00 */ li r6, 0 -/* 80AF608C 4B 51 A2 F1 */ bl setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv -/* 80AF6090 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80AF6094 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80AF6098 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */ -/* 80AF609C CB C1 00 10 */ lfd f30, 0x10(r1) -/* 80AF60A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF60A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80AF60A8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80AF60AC 7C 08 03 A6 */ mtlr r0 -/* 80AF60B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80AF60B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/cam_3d_morf__FP12npc_sq_classf.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/cam_3d_morf__FP12npc_sq_classf.s deleted file mode 100644 index 14bffafc65..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/cam_3d_morf__FP12npc_sq_classf.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80AF6518: -/* 80AF6518 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80AF651C 7C 08 02 A6 */ mflr r0 -/* 80AF6520 90 01 00 24 */ stw r0, 0x24(r1) -/* 80AF6524 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80AF6528 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80AF652C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF6530 7C 7F 1B 78 */ mr r31, r3 -/* 80AF6534 FF E0 08 90 */ fmr f31, f1 -/* 80AF6538 38 7F 09 FC */ addi r3, r31, 0x9fc -/* 80AF653C C0 3F 0A 14 */ lfs f1, 0xa14(r31) -/* 80AF6540 FC 40 F8 90 */ fmr f2, f31 -/* 80AF6544 C0 7F 0A 2C */ lfs f3, 0xa2c(r31) -/* 80AF6548 C0 1F 0A 3C */ lfs f0, 0xa3c(r31) -/* 80AF654C EC 63 00 32 */ fmuls f3, f3, f0 -/* 80AF6550 4B 77 94 ED */ bl cLib_addCalc2__FPffff -/* 80AF6554 38 7F 0A 00 */ addi r3, r31, 0xa00 -/* 80AF6558 C0 3F 0A 18 */ lfs f1, 0xa18(r31) -/* 80AF655C FC 40 F8 90 */ fmr f2, f31 -/* 80AF6560 C0 7F 0A 30 */ lfs f3, 0xa30(r31) -/* 80AF6564 C0 1F 0A 3C */ lfs f0, 0xa3c(r31) -/* 80AF6568 EC 63 00 32 */ fmuls f3, f3, f0 -/* 80AF656C 4B 77 94 D1 */ bl cLib_addCalc2__FPffff -/* 80AF6570 38 7F 0A 04 */ addi r3, r31, 0xa04 -/* 80AF6574 C0 3F 0A 1C */ lfs f1, 0xa1c(r31) -/* 80AF6578 FC 40 F8 90 */ fmr f2, f31 -/* 80AF657C C0 7F 0A 34 */ lfs f3, 0xa34(r31) -/* 80AF6580 C0 1F 0A 3C */ lfs f0, 0xa3c(r31) -/* 80AF6584 EC 63 00 32 */ fmuls f3, f3, f0 -/* 80AF6588 4B 77 94 B5 */ bl cLib_addCalc2__FPffff -/* 80AF658C 38 7F 09 F0 */ addi r3, r31, 0x9f0 -/* 80AF6590 C0 3F 0A 08 */ lfs f1, 0xa08(r31) -/* 80AF6594 FC 40 F8 90 */ fmr f2, f31 -/* 80AF6598 C0 7F 0A 20 */ lfs f3, 0xa20(r31) -/* 80AF659C C0 1F 0A 3C */ lfs f0, 0xa3c(r31) -/* 80AF65A0 EC 63 00 32 */ fmuls f3, f3, f0 -/* 80AF65A4 4B 77 94 99 */ bl cLib_addCalc2__FPffff -/* 80AF65A8 38 7F 09 F4 */ addi r3, r31, 0x9f4 -/* 80AF65AC C0 3F 0A 0C */ lfs f1, 0xa0c(r31) -/* 80AF65B0 FC 40 F8 90 */ fmr f2, f31 -/* 80AF65B4 C0 7F 0A 24 */ lfs f3, 0xa24(r31) -/* 80AF65B8 C0 1F 0A 3C */ lfs f0, 0xa3c(r31) -/* 80AF65BC EC 63 00 32 */ fmuls f3, f3, f0 -/* 80AF65C0 4B 77 94 7D */ bl cLib_addCalc2__FPffff -/* 80AF65C4 38 7F 09 F8 */ addi r3, r31, 0x9f8 -/* 80AF65C8 C0 3F 0A 10 */ lfs f1, 0xa10(r31) -/* 80AF65CC FC 40 F8 90 */ fmr f2, f31 -/* 80AF65D0 C0 7F 0A 28 */ lfs f3, 0xa28(r31) -/* 80AF65D4 C0 1F 0A 3C */ lfs f0, 0xa3c(r31) -/* 80AF65D8 EC 63 00 32 */ fmuls f3, f3, f0 -/* 80AF65DC 4B 77 94 61 */ bl cLib_addCalc2__FPffff -/* 80AF65E0 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80AF65E4 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80AF65E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF65EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80AF65F0 7C 08 03 A6 */ mtlr r0 -/* 80AF65F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80AF65F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 0b49b62c8b..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,188 +0,0 @@ -lbl_80AF6F98: -/* 80AF6F98 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80AF6F9C 7C 08 02 A6 */ mflr r0 -/* 80AF6FA0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80AF6FA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF6FA8 4B 86 B2 31 */ bl _savegpr_28 -/* 80AF6FAC 7C 7E 1B 78 */ mr r30, r3 -/* 80AF6FB0 3C 80 80 AF */ lis r4, lit_3768@ha /* 0x80AF7408@ha */ -/* 80AF6FB4 3B E4 74 08 */ addi r31, r4, lit_3768@l /* 0x80AF7408@l */ -/* 80AF6FB8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80AF6FBC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80AF6FC0 40 82 00 E8 */ bne lbl_80AF70A8 -/* 80AF6FC4 7F C0 F3 79 */ or. r0, r30, r30 -/* 80AF6FC8 41 82 00 D4 */ beq lbl_80AF709C -/* 80AF6FCC 7C 1D 03 78 */ mr r29, r0 -/* 80AF6FD0 4B 52 1B 95 */ bl __ct__10fopAc_ac_cFv -/* 80AF6FD4 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF6FD8 4B 75 2F 29 */ bl __ct__10dMsgFlow_cFv -/* 80AF6FDC 38 7D 06 3C */ addi r3, r29, 0x63c -/* 80AF6FE0 4B 57 EE CD */ bl __ct__12dBgS_AcchCirFv -/* 80AF6FE4 3B 9D 06 7C */ addi r28, r29, 0x67c -/* 80AF6FE8 7F 83 E3 78 */ mr r3, r28 -/* 80AF6FEC 4B 57 F0 B5 */ bl __ct__9dBgS_AcchFv -/* 80AF6FF0 3C 60 80 AF */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80AF7578@ha */ -/* 80AF6FF4 38 63 75 78 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80AF7578@l */ -/* 80AF6FF8 90 7C 00 10 */ stw r3, 0x10(r28) -/* 80AF6FFC 38 03 00 0C */ addi r0, r3, 0xc -/* 80AF7000 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80AF7004 38 03 00 18 */ addi r0, r3, 0x18 -/* 80AF7008 90 1C 00 24 */ stw r0, 0x24(r28) -/* 80AF700C 38 7C 00 14 */ addi r3, r28, 0x14 -/* 80AF7010 4B 58 1E 59 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80AF7014 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80AF7018 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80AF701C 90 1D 08 6C */ stw r0, 0x86c(r29) -/* 80AF7020 38 7D 08 70 */ addi r3, r29, 0x870 -/* 80AF7024 4B 58 C7 3D */ bl __ct__10dCcD_GSttsFv -/* 80AF7028 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80AF702C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80AF7030 90 7D 08 6C */ stw r3, 0x86c(r29) -/* 80AF7034 38 03 00 20 */ addi r0, r3, 0x20 -/* 80AF7038 90 1D 08 70 */ stw r0, 0x870(r29) -/* 80AF703C 3B 9D 08 90 */ addi r28, r29, 0x890 -/* 80AF7040 7F 83 E3 78 */ mr r3, r28 -/* 80AF7044 4B 58 C9 E5 */ bl __ct__12dCcD_GObjInfFv -/* 80AF7048 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80AF704C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80AF7050 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80AF7054 3C 60 80 AF */ lis r3, __vt__8cM3dGAab@ha /* 0x80AF756C@ha */ -/* 80AF7058 38 03 75 6C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80AF756C@l */ -/* 80AF705C 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 80AF7060 3C 60 80 AF */ lis r3, __vt__8cM3dGSph@ha /* 0x80AF7560@ha */ -/* 80AF7064 38 03 75 60 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80AF7560@l */ -/* 80AF7068 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80AF706C 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80AF7070 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80AF7074 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80AF7078 38 03 00 58 */ addi r0, r3, 0x58 -/* 80AF707C 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80AF7080 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80AF7084 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80AF7088 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 80AF708C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80AF7090 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80AF7094 38 03 00 84 */ addi r0, r3, 0x84 -/* 80AF7098 90 1C 01 34 */ stw r0, 0x134(r28) -lbl_80AF709C: -/* 80AF709C 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80AF70A0 60 00 00 08 */ ori r0, r0, 8 -/* 80AF70A4 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80AF70A8: -/* 80AF70A8 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80AF70AC 3C 80 80 AF */ lis r4, d_a_npc_sq__stringBase0@ha /* 0x80AF74A4@ha */ -/* 80AF70B0 38 84 74 A4 */ addi r4, r4, d_a_npc_sq__stringBase0@l /* 0x80AF74A4@l */ -/* 80AF70B4 4B 53 5E 09 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80AF70B8 7C 7D 1B 78 */ mr r29, r3 -/* 80AF70BC 2C 1D 00 04 */ cmpwi r29, 4 -/* 80AF70C0 40 82 01 84 */ bne lbl_80AF7244 -/* 80AF70C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF70C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF70CC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80AF70D0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80AF70D4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80AF70D8 A0 84 00 32 */ lhz r4, 0x32(r4) -/* 80AF70DC 4B 53 D8 E1 */ bl isEventBit__11dSv_event_cCFUs -/* 80AF70E0 2C 03 00 00 */ cmpwi r3, 0 -/* 80AF70E4 41 82 00 0C */ beq lbl_80AF70F0 -/* 80AF70E8 38 60 00 05 */ li r3, 5 -/* 80AF70EC 48 00 01 5C */ b lbl_80AF7248 -lbl_80AF70F0: -/* 80AF70F0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80AF70F4 98 1E 05 B4 */ stb r0, 0x5b4(r30) -/* 80AF70F8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80AF70FC 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80AF7100 98 1E 05 B5 */ stb r0, 0x5b5(r30) -/* 80AF7104 38 00 00 DB */ li r0, 0xdb -/* 80AF7108 B0 1E 05 B8 */ sth r0, 0x5b8(r30) -/* 80AF710C 38 00 00 00 */ li r0, 0 -/* 80AF7110 B0 1E 04 E8 */ sth r0, 0x4e8(r30) -/* 80AF7114 B0 1E 04 E0 */ sth r0, 0x4e0(r30) -/* 80AF7118 7F C3 F3 78 */ mr r3, r30 -/* 80AF711C 3C 80 80 AF */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80AF6DB0@ha */ -/* 80AF7120 38 84 6D B0 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80AF6DB0@l */ -/* 80AF7124 3C A0 00 05 */ lis r5, 0x0005 /* 0x0004B000@ha */ -/* 80AF7128 38 A5 B0 00 */ addi r5, r5, 0xB000 /* 0x0004B000@l */ -/* 80AF712C 4B 52 33 85 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80AF7130 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80AF7134 40 82 00 0C */ bne lbl_80AF7140 -/* 80AF7138 38 60 00 05 */ li r3, 5 -/* 80AF713C 48 00 01 0C */ b lbl_80AF7248 -lbl_80AF7140: -/* 80AF7140 3C 60 80 AF */ lis r3, data_80AF75C0@ha /* 0x80AF75C0@ha */ -/* 80AF7144 8C 03 75 C0 */ lbzu r0, data_80AF75C0@l(r3) /* 0x80AF75C0@l */ -/* 80AF7148 28 00 00 00 */ cmplwi r0, 0 -/* 80AF714C 40 82 00 20 */ bne lbl_80AF716C -/* 80AF7150 38 00 00 01 */ li r0, 1 -/* 80AF7154 98 1E 0A 40 */ stb r0, 0xa40(r30) -/* 80AF7158 98 03 00 00 */ stb r0, 0(r3) -/* 80AF715C 38 00 FF FF */ li r0, -1 -/* 80AF7160 3C 60 80 AF */ lis r3, l_HIO@ha /* 0x80AF75D0@ha */ -/* 80AF7164 38 63 75 D0 */ addi r3, r3, l_HIO@l /* 0x80AF75D0@l */ -/* 80AF7168 98 03 00 04 */ stb r0, 4(r3) -lbl_80AF716C: -/* 80AF716C 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80AF7170 60 00 01 00 */ ori r0, r0, 0x100 -/* 80AF7174 90 1E 04 9C */ stw r0, 0x49c(r30) -/* 80AF7178 38 00 00 00 */ li r0, 0 -/* 80AF717C 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80AF7180 B0 1E 06 28 */ sth r0, 0x628(r30) -/* 80AF7184 80 7E 06 1C */ lwz r3, 0x61c(r30) -/* 80AF7188 80 63 00 04 */ lwz r3, 4(r3) -/* 80AF718C 38 63 00 24 */ addi r3, r3, 0x24 -/* 80AF7190 90 7E 05 04 */ stw r3, 0x504(r30) -/* 80AF7194 90 01 00 08 */ stw r0, 8(r1) -/* 80AF7198 38 7E 06 7C */ addi r3, r30, 0x67c -/* 80AF719C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80AF71A0 38 BE 04 BC */ addi r5, r30, 0x4bc -/* 80AF71A4 7F C6 F3 78 */ mr r6, r30 -/* 80AF71A8 38 E0 00 01 */ li r7, 1 -/* 80AF71AC 39 1E 06 3C */ addi r8, r30, 0x63c -/* 80AF71B0 39 3E 04 F8 */ addi r9, r30, 0x4f8 -/* 80AF71B4 39 40 00 00 */ li r10, 0 -/* 80AF71B8 4B 57 F0 91 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80AF71BC 38 7E 06 3C */ addi r3, r30, 0x63c -/* 80AF71C0 C0 3F 00 90 */ lfs f1, 0x90(r31) -/* 80AF71C4 C0 5F 00 94 */ lfs f2, 0x94(r31) -/* 80AF71C8 4B 57 ED 91 */ bl SetWall__12dBgS_AcchCirFff -/* 80AF71CC 38 7E 08 54 */ addi r3, r30, 0x854 -/* 80AF71D0 38 80 00 64 */ li r4, 0x64 -/* 80AF71D4 38 A0 00 00 */ li r5, 0 -/* 80AF71D8 7F C6 F3 78 */ mr r6, r30 -/* 80AF71DC 4B 58 C6 85 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80AF71E0 38 7E 08 90 */ addi r3, r30, 0x890 -/* 80AF71E4 3C 80 80 AF */ lis r4, cc_sph_src@ha /* 0x80AF74D0@ha */ -/* 80AF71E8 38 84 74 D0 */ addi r4, r4, cc_sph_src@l /* 0x80AF74D0@l */ -/* 80AF71EC 4B 58 D8 49 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80AF71F0 38 1E 08 54 */ addi r0, r30, 0x854 -/* 80AF71F4 90 1E 08 D4 */ stw r0, 0x8d4(r30) -/* 80AF71F8 88 1E 05 B5 */ lbz r0, 0x5b5(r30) -/* 80AF71FC 28 00 00 FF */ cmplwi r0, 0xff -/* 80AF7200 40 82 00 20 */ bne lbl_80AF7220 -/* 80AF7204 C0 3F 00 98 */ lfs f1, 0x98(r31) -/* 80AF7208 4B 77 07 4D */ bl cM_rndF__Ff -/* 80AF720C FC 00 08 1E */ fctiwz f0, f1 -/* 80AF7210 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80AF7214 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF7218 98 1E 06 24 */ stb r0, 0x624(r30) -/* 80AF721C 48 00 00 20 */ b lbl_80AF723C -lbl_80AF7220: -/* 80AF7220 98 1E 06 24 */ stb r0, 0x624(r30) -/* 80AF7224 88 1E 06 24 */ lbz r0, 0x624(r30) -/* 80AF7228 7C 00 07 74 */ extsb r0, r0 -/* 80AF722C 2C 00 00 03 */ cmpwi r0, 3 -/* 80AF7230 40 81 00 0C */ ble lbl_80AF723C -/* 80AF7234 38 00 00 03 */ li r0, 3 -/* 80AF7238 98 1E 06 24 */ stb r0, 0x624(r30) -lbl_80AF723C: -/* 80AF723C 7F C3 F3 78 */ mr r3, r30 -/* 80AF7240 4B FF F9 35 */ bl daNpc_Sq_Execute__FP12npc_sq_class -lbl_80AF7244: -/* 80AF7244 7F A3 EB 78 */ mr r3, r29 -lbl_80AF7248: -/* 80AF7248 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF724C 4B 86 AF D9 */ bl _restgpr_28 -/* 80AF7250 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80AF7254 7C 08 03 A6 */ mtlr r0 -/* 80AF7258 38 21 00 30 */ addi r1, r1, 0x30 -/* 80AF725C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Delete__FP12npc_sq_class.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Delete__FP12npc_sq_class.s deleted file mode 100644 index 084820cbd2..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Delete__FP12npc_sq_class.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80AF6D5C: -/* 80AF6D5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80AF6D60 7C 08 02 A6 */ mflr r0 -/* 80AF6D64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF6D68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80AF6D6C 7C 7F 1B 78 */ mr r31, r3 -/* 80AF6D70 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80AF6D74 3C 80 80 AF */ lis r4, d_a_npc_sq__stringBase0@ha /* 0x80AF74A4@ha */ -/* 80AF6D78 38 84 74 A4 */ addi r4, r4, d_a_npc_sq__stringBase0@l /* 0x80AF74A4@l */ -/* 80AF6D7C 4B 53 62 8D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80AF6D80 88 1F 0A 40 */ lbz r0, 0xa40(r31) -/* 80AF6D84 28 00 00 00 */ cmplwi r0, 0 -/* 80AF6D88 41 82 00 10 */ beq lbl_80AF6D98 -/* 80AF6D8C 38 00 00 00 */ li r0, 0 -/* 80AF6D90 3C 60 80 AF */ lis r3, data_80AF75C0@ha /* 0x80AF75C0@ha */ -/* 80AF6D94 98 03 75 C0 */ stb r0, data_80AF75C0@l(r3) /* 0x80AF75C0@l */ -lbl_80AF6D98: -/* 80AF6D98 38 60 00 01 */ li r3, 1 -/* 80AF6D9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80AF6DA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80AF6DA4 7C 08 03 A6 */ mtlr r0 -/* 80AF6DA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80AF6DAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Draw__FP12npc_sq_class.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Draw__FP12npc_sq_class.s deleted file mode 100644 index b9f8a7aa68..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Draw__FP12npc_sq_class.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80AF60B8: -/* 80AF60B8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80AF60BC 7C 08 02 A6 */ mflr r0 -/* 80AF60C0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80AF60C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF60C8 4B 86 C1 15 */ bl _savegpr_29 -/* 80AF60CC 7C 7D 1B 78 */ mr r29, r3 -/* 80AF60D0 3C 60 80 AF */ lis r3, lit_3768@ha /* 0x80AF7408@ha */ -/* 80AF60D4 3B E3 74 08 */ addi r31, r3, lit_3768@l /* 0x80AF7408@l */ -/* 80AF60D8 80 7D 06 1C */ lwz r3, 0x61c(r29) -/* 80AF60DC 83 C3 00 04 */ lwz r30, 4(r3) -/* 80AF60E0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80AF60E4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80AF60E8 38 80 00 00 */ li r4, 0 -/* 80AF60EC 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80AF60F0 38 DD 01 0C */ addi r6, r29, 0x10c -/* 80AF60F4 4B 6A D6 D1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80AF60F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80AF60FC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80AF6100 80 9E 00 04 */ lwz r4, 4(r30) -/* 80AF6104 38 BD 01 0C */ addi r5, r29, 0x10c -/* 80AF6108 4B 6A EC 99 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80AF610C 80 9E 00 04 */ lwz r4, 4(r30) -/* 80AF6110 80 7D 06 20 */ lwz r3, 0x620(r29) -/* 80AF6114 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80AF6118 38 84 00 58 */ addi r4, r4, 0x58 -/* 80AF611C 4B 51 75 BD */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80AF6120 80 7D 06 1C */ lwz r3, 0x61c(r29) -/* 80AF6124 4B 51 A5 5D */ bl entryDL__14mDoExt_McaMorfFv -/* 80AF6128 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 80AF612C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80AF6130 C0 7D 04 D4 */ lfs f3, 0x4d4(r29) -/* 80AF6134 EC 20 18 2A */ fadds f1, f0, f3 -/* 80AF6138 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80AF613C D0 01 00 08 */ stfs f0, 8(r1) -/* 80AF6140 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80AF6144 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80AF6148 80 7D 06 2C */ lwz r3, 0x62c(r29) -/* 80AF614C 38 80 00 01 */ li r4, 1 -/* 80AF6150 7F C5 F3 78 */ mr r5, r30 -/* 80AF6154 38 C1 00 08 */ addi r6, r1, 8 -/* 80AF6158 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80AF615C C0 5F 00 14 */ lfs f2, 0x14(r31) -/* 80AF6160 3C E0 80 AF */ lis r7, l_HIO@ha /* 0x80AF75D0@ha */ -/* 80AF6164 38 E7 75 D0 */ addi r7, r7, l_HIO@l /* 0x80AF75D0@l */ -/* 80AF6168 C0 07 00 08 */ lfs f0, 8(r7) -/* 80AF616C EC 42 00 32 */ fmuls f2, f2, f0 -/* 80AF6170 C0 9D 07 14 */ lfs f4, 0x714(r29) -/* 80AF6174 38 FD 07 6C */ addi r7, r29, 0x76c -/* 80AF6178 39 1D 01 0C */ addi r8, r29, 0x10c -/* 80AF617C 39 20 00 00 */ li r9, 0 -/* 80AF6180 C0 BF 00 18 */ lfs f5, 0x18(r31) -/* 80AF6184 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80AF6188 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80AF618C 4B 53 87 85 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80AF6190 90 7D 06 2C */ stw r3, 0x62c(r29) -/* 80AF6194 38 60 00 01 */ li r3, 1 -/* 80AF6198 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF619C 4B 86 C0 8D */ bl _restgpr_29 -/* 80AF61A0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80AF61A4 7C 08 03 A6 */ mtlr r0 -/* 80AF61A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80AF61AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Execute__FP12npc_sq_class.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Execute__FP12npc_sq_class.s deleted file mode 100644 index 645e1f3bc2..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Execute__FP12npc_sq_class.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_80AF6B74: -/* 80AF6B74 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80AF6B78 7C 08 02 A6 */ mflr r0 -/* 80AF6B7C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80AF6B80 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF6B84 4B 86 B6 55 */ bl _savegpr_28 -/* 80AF6B88 7C 7E 1B 78 */ mr r30, r3 -/* 80AF6B8C 3C 60 80 AF */ lis r3, lit_3768@ha /* 0x80AF7408@ha */ -/* 80AF6B90 3B E3 74 08 */ addi r31, r3, lit_3768@l /* 0x80AF7408@l */ -/* 80AF6B94 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80AF6B98 D0 01 00 08 */ stfs f0, 8(r1) -/* 80AF6B9C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80AF6BA0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80AF6BA4 A8 7E 06 26 */ lha r3, 0x626(r30) -/* 80AF6BA8 38 03 00 01 */ addi r0, r3, 1 -/* 80AF6BAC B0 1E 06 26 */ sth r0, 0x626(r30) -/* 80AF6BB0 38 60 00 00 */ li r3, 0 -/* 80AF6BB4 38 00 00 04 */ li r0, 4 -/* 80AF6BB8 7C 09 03 A6 */ mtctr r0 -lbl_80AF6BBC: -/* 80AF6BBC 38 A3 06 30 */ addi r5, r3, 0x630 -/* 80AF6BC0 7C 9E 2A AE */ lhax r4, r30, r5 -/* 80AF6BC4 2C 04 00 00 */ cmpwi r4, 0 -/* 80AF6BC8 41 82 00 0C */ beq lbl_80AF6BD4 -/* 80AF6BCC 38 04 FF FF */ addi r0, r4, -1 -/* 80AF6BD0 7C 1E 2B 2E */ sthx r0, r30, r5 -lbl_80AF6BD4: -/* 80AF6BD4 38 63 00 02 */ addi r3, r3, 2 -/* 80AF6BD8 42 00 FF E4 */ bdnz lbl_80AF6BBC -/* 80AF6BDC 7F C3 F3 78 */ mr r3, r30 -/* 80AF6BE0 4B FF F7 E1 */ bl action__FP12npc_sq_class -/* 80AF6BE4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6BE8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6BEC C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80AF6BF0 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80AF6BF4 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80AF6BF8 4B 84 FC F1 */ bl PSMTXTrans -/* 80AF6BFC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6C00 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6C04 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80AF6C08 4B 51 58 2D */ bl mDoMtx_YrotM__FPA4_fs -/* 80AF6C0C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6C10 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6C14 A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 80AF6C18 4B 51 57 85 */ bl mDoMtx_XrotM__FPA4_fs -/* 80AF6C1C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6C20 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6C24 A8 9E 04 E8 */ lha r4, 0x4e8(r30) -/* 80AF6C28 4B 51 58 A5 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80AF6C2C 3C 60 80 AF */ lis r3, l_HIO@ha /* 0x80AF75D0@ha */ -/* 80AF6C30 3B A3 75 D0 */ addi r29, r3, l_HIO@l /* 0x80AF75D0@l */ -/* 80AF6C34 C0 3D 00 08 */ lfs f1, 8(r29) -/* 80AF6C38 FC 40 08 90 */ fmr f2, f1 -/* 80AF6C3C FC 60 08 90 */ fmr f3, f1 -/* 80AF6C40 4B 51 61 F9 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80AF6C44 80 7E 06 1C */ lwz r3, 0x61c(r30) -/* 80AF6C48 83 83 00 04 */ lwz r28, 4(r3) -/* 80AF6C4C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6C50 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6C54 38 9C 00 24 */ addi r4, r28, 0x24 -/* 80AF6C58 4B 84 F8 59 */ bl PSMTXCopy -/* 80AF6C5C 80 7E 06 1C */ lwz r3, 0x61c(r30) -/* 80AF6C60 38 9E 05 38 */ addi r4, r30, 0x538 -/* 80AF6C64 38 A0 00 00 */ li r5, 0 -/* 80AF6C68 38 C0 00 00 */ li r6, 0 -/* 80AF6C6C 4B 51 99 5D */ bl play__14mDoExt_McaMorfFP3VecUlSc -/* 80AF6C70 88 1E 06 24 */ lbz r0, 0x624(r30) -/* 80AF6C74 7C 00 07 74 */ extsb r0, r0 -/* 80AF6C78 C8 3F 00 88 */ lfd f1, 0x88(r31) -/* 80AF6C7C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80AF6C80 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80AF6C84 3C 00 43 30 */ lis r0, 0x4330 -/* 80AF6C88 90 01 00 18 */ stw r0, 0x18(r1) -/* 80AF6C8C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80AF6C90 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80AF6C94 80 7E 06 20 */ lwz r3, 0x620(r30) -/* 80AF6C98 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80AF6C9C 80 7E 06 1C */ lwz r3, 0x61c(r30) -/* 80AF6CA0 4B 51 9A 0D */ bl modelCalc__14mDoExt_McaMorfFv -/* 80AF6CA4 80 7C 00 84 */ lwz r3, 0x84(r28) -/* 80AF6CA8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80AF6CAC 38 63 00 60 */ addi r3, r3, 0x60 -/* 80AF6CB0 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */ -/* 80AF6CB4 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */ -/* 80AF6CB8 80 84 00 00 */ lwz r4, 0(r4) -/* 80AF6CBC 4B 84 F7 F5 */ bl PSMTXCopy -/* 80AF6CC0 38 61 00 08 */ addi r3, r1, 8 -/* 80AF6CC4 38 9E 05 38 */ addi r4, r30, 0x538 -/* 80AF6CC8 4B 77 A2 25 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80AF6CCC C0 1E 05 38 */ lfs f0, 0x538(r30) -/* 80AF6CD0 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80AF6CD4 C0 1E 05 3C */ lfs f0, 0x53c(r30) -/* 80AF6CD8 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80AF6CDC C0 1E 05 40 */ lfs f0, 0x540(r30) -/* 80AF6CE0 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80AF6CE4 C0 5E 05 54 */ lfs f2, 0x554(r30) -/* 80AF6CE8 C0 3F 00 74 */ lfs f1, 0x74(r31) -/* 80AF6CEC C0 1D 00 08 */ lfs f0, 8(r29) -/* 80AF6CF0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80AF6CF4 EC 02 00 2A */ fadds f0, f2, f0 -/* 80AF6CF8 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80AF6CFC 38 7E 09 B4 */ addi r3, r30, 0x9b4 -/* 80AF6D00 38 9E 05 38 */ addi r4, r30, 0x538 -/* 80AF6D04 4B 77 89 45 */ bl SetC__8cM3dGSphFRC4cXyz -/* 80AF6D08 38 7E 09 B4 */ addi r3, r30, 0x9b4 -/* 80AF6D0C C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80AF6D10 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80AF6D14 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80AF6D18 4B 77 89 F1 */ bl SetR__8cM3dGSphFf -/* 80AF6D1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6D20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6D24 38 63 23 3C */ addi r3, r3, 0x233c -/* 80AF6D28 38 9E 08 90 */ addi r4, r30, 0x890 -/* 80AF6D2C 4B 76 DE 7D */ bl Set__4cCcSFP8cCcD_Obj -/* 80AF6D30 7F C3 F3 78 */ mr r3, r30 -/* 80AF6D34 4B FF F8 C9 */ bl demo_camera__FP12npc_sq_class -/* 80AF6D38 38 60 00 01 */ li r3, 1 -/* 80AF6D3C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF6D40 4B 86 B4 E5 */ bl _restgpr_28 -/* 80AF6D44 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80AF6D48 7C 08 03 A6 */ mtlr r0 -/* 80AF6D4C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80AF6D50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/demo_camera__FP12npc_sq_class.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/demo_camera__FP12npc_sq_class.s deleted file mode 100644 index 2b667798d1..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/demo_camera__FP12npc_sq_class.s +++ /dev/null @@ -1,365 +0,0 @@ -lbl_80AF65FC: -/* 80AF65FC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80AF6600 7C 08 02 A6 */ mflr r0 -/* 80AF6604 90 01 00 54 */ stw r0, 0x54(r1) -/* 80AF6608 39 61 00 50 */ addi r11, r1, 0x50 -/* 80AF660C 4B 86 BB C9 */ bl _savegpr_27 -/* 80AF6610 7C 7D 1B 78 */ mr r29, r3 -/* 80AF6614 3C 80 80 AF */ lis r4, lit_3768@ha /* 0x80AF7408@ha */ -/* 80AF6618 3B E4 74 08 */ addi r31, r4, lit_3768@l /* 0x80AF7408@l */ -/* 80AF661C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6620 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6624 88 04 5D B0 */ lbz r0, 0x5db0(r4) -/* 80AF6628 7C 00 07 74 */ extsb r0, r0 -/* 80AF662C 38 84 5D 74 */ addi r4, r4, 0x5d74 -/* 80AF6630 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 80AF6634 7F C4 00 2E */ lwzx r30, r4, r0 -/* 80AF6638 83 64 00 00 */ lwz r27, 0(r4) -/* 80AF663C 3B 80 00 00 */ li r28, 0 -/* 80AF6640 A8 03 09 EC */ lha r0, 0x9ec(r3) -/* 80AF6644 28 00 00 09 */ cmplwi r0, 9 -/* 80AF6648 41 81 04 64 */ bgt lbl_80AF6AAC -/* 80AF664C 3C 80 80 AF */ lis r4, lit_4052@ha /* 0x80AF74A8@ha */ -/* 80AF6650 38 84 74 A8 */ addi r4, r4, lit_4052@l /* 0x80AF74A8@l */ -/* 80AF6654 54 00 10 3A */ slwi r0, r0, 2 -/* 80AF6658 7C 04 00 2E */ lwzx r0, r4, r0 -/* 80AF665C 7C 09 03 A6 */ mtctr r0 -/* 80AF6660 4E 80 04 20 */ bctr -lbl_80AF6664: -/* 80AF6664 A0 1D 00 F8 */ lhz r0, 0xf8(r29) -/* 80AF6668 28 00 00 02 */ cmplwi r0, 2 -/* 80AF666C 41 82 00 28 */ beq lbl_80AF6694 -/* 80AF6670 38 80 00 02 */ li r4, 2 -/* 80AF6674 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 80AF6678 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 80AF667C 38 C0 00 00 */ li r6, 0 -/* 80AF6680 4B 52 52 89 */ bl fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs -/* 80AF6684 A0 1D 00 FA */ lhz r0, 0xfa(r29) -/* 80AF6688 60 00 00 02 */ ori r0, r0, 2 -/* 80AF668C B0 1D 00 FA */ sth r0, 0xfa(r29) -/* 80AF6690 48 00 04 CC */ b lbl_80AF6B5C -lbl_80AF6694: -/* 80AF6694 38 7E 02 48 */ addi r3, r30, 0x248 -/* 80AF6698 4B 66 AE 39 */ bl Stop__9dCamera_cFv -/* 80AF669C 38 00 00 02 */ li r0, 2 -/* 80AF66A0 B0 1D 09 EC */ sth r0, 0x9ec(r29) -/* 80AF66A4 38 00 00 00 */ li r0, 0 -/* 80AF66A8 B0 1D 09 EE */ sth r0, 0x9ee(r29) -/* 80AF66AC C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80AF66B0 D0 1D 0A 38 */ stfs f0, 0xa38(r29) -/* 80AF66B4 38 7E 02 48 */ addi r3, r30, 0x248 -/* 80AF66B8 38 80 00 03 */ li r4, 3 -/* 80AF66BC 4B 66 C9 51 */ bl SetTrimSize__9dCamera_cFl -/* 80AF66C0 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF66C4 7F A4 EB 78 */ mr r4, r29 -/* 80AF66C8 A8 BD 05 B8 */ lha r5, 0x5b8(r29) -/* 80AF66CC 38 C0 00 00 */ li r6, 0 -/* 80AF66D0 38 E0 00 00 */ li r7, 0 -/* 80AF66D4 4B 75 38 BD */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80AF66D8 C0 1B 00 D8 */ lfs f0, 0xd8(r27) -/* 80AF66DC D0 1D 09 F0 */ stfs f0, 0x9f0(r29) -/* 80AF66E0 C0 1B 00 DC */ lfs f0, 0xdc(r27) -/* 80AF66E4 D0 1D 09 F4 */ stfs f0, 0x9f4(r29) -/* 80AF66E8 C0 1B 00 E0 */ lfs f0, 0xe0(r27) -/* 80AF66EC D0 1D 09 F8 */ stfs f0, 0x9f8(r29) -/* 80AF66F0 C0 1B 00 E4 */ lfs f0, 0xe4(r27) -/* 80AF66F4 D0 1D 09 FC */ stfs f0, 0x9fc(r29) -/* 80AF66F8 C0 1B 00 E8 */ lfs f0, 0xe8(r27) -/* 80AF66FC D0 1D 0A 00 */ stfs f0, 0xa00(r29) -/* 80AF6700 C0 1B 00 EC */ lfs f0, 0xec(r27) -/* 80AF6704 D0 1D 0A 04 */ stfs f0, 0xa04(r29) -/* 80AF6708 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF670C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6710 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80AF6714 38 00 00 03 */ li r0, 3 -/* 80AF6718 B0 03 06 04 */ sth r0, 0x604(r3) -/* 80AF671C 38 00 00 00 */ li r0, 0 -/* 80AF6720 90 03 06 0C */ stw r0, 0x60c(r3) -lbl_80AF6724: -/* 80AF6724 A8 1D 09 EE */ lha r0, 0x9ee(r29) -/* 80AF6728 2C 00 00 0A */ cmpwi r0, 0xa -/* 80AF672C 40 82 00 28 */ bne lbl_80AF6754 -/* 80AF6730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6738 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80AF673C 38 00 00 17 */ li r0, 0x17 -/* 80AF6740 90 03 06 14 */ stw r0, 0x614(r3) -/* 80AF6744 38 00 00 00 */ li r0, 0 -/* 80AF6748 90 03 06 0C */ stw r0, 0x60c(r3) -/* 80AF674C 90 03 06 10 */ stw r0, 0x610(r3) -/* 80AF6750 B0 03 06 0A */ sth r0, 0x60a(r3) -lbl_80AF6754: -/* 80AF6754 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF6758 7F A4 EB 78 */ mr r4, r29 -/* 80AF675C 38 A0 00 00 */ li r5, 0 -/* 80AF6760 38 C0 00 00 */ li r6, 0 -/* 80AF6764 4B 75 3B 75 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80AF6768 2C 03 00 00 */ cmpwi r3, 0 -/* 80AF676C 41 82 03 40 */ beq lbl_80AF6AAC -/* 80AF6770 38 00 00 03 */ li r0, 3 -/* 80AF6774 B0 1D 09 EC */ sth r0, 0x9ec(r29) -/* 80AF6778 38 00 00 00 */ li r0, 0 -/* 80AF677C B0 1D 09 EE */ sth r0, 0x9ee(r29) -/* 80AF6780 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6784 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6788 A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 80AF678C 4B 51 5C 51 */ bl mDoMtx_YrotS__FPA4_fs -/* 80AF6790 C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 80AF6794 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80AF6798 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80AF679C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80AF67A0 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 80AF67A4 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80AF67A8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF67AC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF67B0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80AF67B4 38 BD 0A 08 */ addi r5, r29, 0xa08 -/* 80AF67B8 4B 85 05 B5 */ bl PSMTXMultVec -/* 80AF67BC 38 7D 0A 08 */ addi r3, r29, 0xa08 -/* 80AF67C0 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80AF67C4 7C 65 1B 78 */ mr r5, r3 -/* 80AF67C8 4B 85 08 C9 */ bl PSVECAdd -/* 80AF67CC C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80AF67D0 D0 1D 0A 14 */ stfs f0, 0xa14(r29) -/* 80AF67D4 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80AF67D8 D0 1D 0A 18 */ stfs f0, 0xa18(r29) -/* 80AF67DC C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80AF67E0 D0 1D 0A 1C */ stfs f0, 0xa1c(r29) -/* 80AF67E4 C0 3D 0A 18 */ lfs f1, 0xa18(r29) -/* 80AF67E8 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80AF67EC EC 01 00 2A */ fadds f0, f1, f0 -/* 80AF67F0 D0 1D 0A 18 */ stfs f0, 0xa18(r29) -/* 80AF67F4 C0 3D 0A 08 */ lfs f1, 0xa08(r29) -/* 80AF67F8 C0 1D 09 F0 */ lfs f0, 0x9f0(r29) -/* 80AF67FC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80AF6800 FC 00 02 10 */ fabs f0, f0 -/* 80AF6804 FC 00 00 18 */ frsp f0, f0 -/* 80AF6808 D0 1D 0A 20 */ stfs f0, 0xa20(r29) -/* 80AF680C C0 3D 0A 0C */ lfs f1, 0xa0c(r29) -/* 80AF6810 C0 1D 09 F4 */ lfs f0, 0x9f4(r29) -/* 80AF6814 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80AF6818 FC 00 02 10 */ fabs f0, f0 -/* 80AF681C FC 00 00 18 */ frsp f0, f0 -/* 80AF6820 D0 1D 0A 24 */ stfs f0, 0xa24(r29) -/* 80AF6824 C0 3D 0A 10 */ lfs f1, 0xa10(r29) -/* 80AF6828 C0 1D 09 F8 */ lfs f0, 0x9f8(r29) -/* 80AF682C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80AF6830 FC 00 02 10 */ fabs f0, f0 -/* 80AF6834 FC 00 00 18 */ frsp f0, f0 -/* 80AF6838 D0 1D 0A 28 */ stfs f0, 0xa28(r29) -/* 80AF683C C0 3D 0A 14 */ lfs f1, 0xa14(r29) -/* 80AF6840 C0 1D 09 FC */ lfs f0, 0x9fc(r29) -/* 80AF6844 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80AF6848 FC 00 02 10 */ fabs f0, f0 -/* 80AF684C FC 00 00 18 */ frsp f0, f0 -/* 80AF6850 D0 1D 0A 2C */ stfs f0, 0xa2c(r29) -/* 80AF6854 C0 3D 0A 18 */ lfs f1, 0xa18(r29) -/* 80AF6858 C0 1D 0A 00 */ lfs f0, 0xa00(r29) -/* 80AF685C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80AF6860 FC 00 02 10 */ fabs f0, f0 -/* 80AF6864 FC 00 00 18 */ frsp f0, f0 -/* 80AF6868 D0 1D 0A 30 */ stfs f0, 0xa30(r29) -/* 80AF686C C0 3D 0A 1C */ lfs f1, 0xa1c(r29) -/* 80AF6870 C0 1D 0A 04 */ lfs f0, 0xa04(r29) -/* 80AF6874 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80AF6878 FC 00 02 10 */ fabs f0, f0 -/* 80AF687C FC 00 00 18 */ frsp f0, f0 -/* 80AF6880 D0 1D 0A 34 */ stfs f0, 0xa34(r29) -/* 80AF6884 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80AF6888 D0 1D 0A 3C */ stfs f0, 0xa3c(r29) -/* 80AF688C 48 00 02 20 */ b lbl_80AF6AAC -lbl_80AF6890: -/* 80AF6890 C0 3F 00 64 */ lfs f1, 0x64(r31) -/* 80AF6894 4B FF FC 85 */ bl cam_3d_morf__FP12npc_sq_classf -/* 80AF6898 38 7D 0A 3C */ addi r3, r29, 0xa3c -/* 80AF689C C0 3F 00 68 */ lfs f1, 0x68(r31) -/* 80AF68A0 C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80AF68A4 C0 7F 00 6C */ lfs f3, 0x6c(r31) -/* 80AF68A8 4B 77 91 95 */ bl cLib_addCalc2__FPffff -/* 80AF68AC A8 1D 09 EE */ lha r0, 0x9ee(r29) -/* 80AF68B0 2C 00 00 50 */ cmpwi r0, 0x50 -/* 80AF68B4 40 82 01 F8 */ bne lbl_80AF6AAC -/* 80AF68B8 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF68BC 7F A4 EB 78 */ mr r4, r29 -/* 80AF68C0 A8 BD 05 B8 */ lha r5, 0x5b8(r29) -/* 80AF68C4 38 C0 00 00 */ li r6, 0 -/* 80AF68C8 38 E0 00 00 */ li r7, 0 -/* 80AF68CC 4B 75 36 C5 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80AF68D0 38 00 00 04 */ li r0, 4 -/* 80AF68D4 B0 1D 09 EC */ sth r0, 0x9ec(r29) -/* 80AF68D8 48 00 01 D4 */ b lbl_80AF6AAC -lbl_80AF68DC: -/* 80AF68DC 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF68E0 7F A4 EB 78 */ mr r4, r29 -/* 80AF68E4 38 A0 00 00 */ li r5, 0 -/* 80AF68E8 38 C0 00 00 */ li r6, 0 -/* 80AF68EC 4B 75 39 ED */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80AF68F0 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF68F4 4B 75 3C 4D */ bl getNowMsgNo__10dMsgFlow_cFv -/* 80AF68F8 28 03 27 47 */ cmplwi r3, 0x2747 -/* 80AF68FC 41 82 00 14 */ beq lbl_80AF6910 -/* 80AF6900 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF6904 4B 75 3C 3D */ bl getNowMsgNo__10dMsgFlow_cFv -/* 80AF6908 28 03 27 3E */ cmplwi r3, 0x273e -/* 80AF690C 40 82 01 A0 */ bne lbl_80AF6AAC -lbl_80AF6910: -/* 80AF6910 38 00 00 05 */ li r0, 5 -/* 80AF6914 B0 1D 09 EC */ sth r0, 0x9ec(r29) -/* 80AF6918 7F A3 EB 78 */ mr r3, r29 -/* 80AF691C 38 80 00 05 */ li r4, 5 -/* 80AF6920 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80AF6924 38 A0 00 02 */ li r5, 2 -/* 80AF6928 C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80AF692C 4B FF F6 E5 */ bl anm_init__FP12npc_sq_classifUcf -/* 80AF6930 48 00 01 7C */ b lbl_80AF6AAC -lbl_80AF6934: -/* 80AF6934 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6938 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF693C A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 80AF6940 4B 51 5A 9D */ bl mDoMtx_YrotS__FPA4_fs -/* 80AF6944 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80AF6948 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80AF694C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80AF6950 C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 80AF6954 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80AF6958 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF695C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6960 38 81 00 20 */ addi r4, r1, 0x20 -/* 80AF6964 38 BD 09 F0 */ addi r5, r29, 0x9f0 -/* 80AF6968 4B 85 04 05 */ bl PSMTXMultVec -/* 80AF696C 38 7D 09 F0 */ addi r3, r29, 0x9f0 -/* 80AF6970 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80AF6974 7C 65 1B 78 */ mr r5, r3 -/* 80AF6978 4B 85 07 19 */ bl PSVECAdd -/* 80AF697C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80AF6980 D0 1D 09 FC */ stfs f0, 0x9fc(r29) -/* 80AF6984 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80AF6988 D0 1D 0A 00 */ stfs f0, 0xa00(r29) -/* 80AF698C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80AF6990 D0 1D 0A 04 */ stfs f0, 0xa04(r29) -/* 80AF6994 C0 3D 0A 00 */ lfs f1, 0xa00(r29) -/* 80AF6998 C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80AF699C EC 01 00 2A */ fadds f0, f1, f0 -/* 80AF69A0 D0 1D 0A 00 */ stfs f0, 0xa00(r29) -/* 80AF69A4 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF69A8 7F A4 EB 78 */ mr r4, r29 -/* 80AF69AC 38 A0 00 00 */ li r5, 0 -/* 80AF69B0 38 C0 00 00 */ li r6, 0 -/* 80AF69B4 4B 75 39 25 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80AF69B8 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF69BC 4B 75 3B 85 */ bl getNowMsgNo__10dMsgFlow_cFv -/* 80AF69C0 28 03 27 49 */ cmplwi r3, 0x2749 -/* 80AF69C4 41 82 00 14 */ beq lbl_80AF69D8 -/* 80AF69C8 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF69CC 4B 75 3B 75 */ bl getNowMsgNo__10dMsgFlow_cFv -/* 80AF69D0 28 03 27 40 */ cmplwi r3, 0x2740 -/* 80AF69D4 40 82 00 D8 */ bne lbl_80AF6AAC -lbl_80AF69D8: -/* 80AF69D8 38 00 00 06 */ li r0, 6 -/* 80AF69DC B0 1D 09 EC */ sth r0, 0x9ec(r29) -/* 80AF69E0 48 00 00 CC */ b lbl_80AF6AAC -lbl_80AF69E4: -/* 80AF69E4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF69E8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF69EC A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 80AF69F0 4B 51 59 ED */ bl mDoMtx_YrotS__FPA4_fs -/* 80AF69F4 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80AF69F8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80AF69FC C0 1F 00 78 */ lfs f0, 0x78(r31) -/* 80AF6A00 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80AF6A04 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80AF6A08 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80AF6A0C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80AF6A10 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80AF6A14 38 81 00 20 */ addi r4, r1, 0x20 -/* 80AF6A18 38 BD 09 F0 */ addi r5, r29, 0x9f0 -/* 80AF6A1C 4B 85 03 51 */ bl PSMTXMultVec -/* 80AF6A20 38 7D 09 F0 */ addi r3, r29, 0x9f0 -/* 80AF6A24 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80AF6A28 7C 65 1B 78 */ mr r5, r3 -/* 80AF6A2C 4B 85 06 65 */ bl PSVECAdd -/* 80AF6A30 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80AF6A34 D0 1D 09 FC */ stfs f0, 0x9fc(r29) -/* 80AF6A38 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80AF6A3C D0 1D 0A 00 */ stfs f0, 0xa00(r29) -/* 80AF6A40 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80AF6A44 D0 1D 0A 04 */ stfs f0, 0xa04(r29) -/* 80AF6A48 C0 3D 0A 00 */ lfs f1, 0xa00(r29) -/* 80AF6A4C C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80AF6A50 EC 01 00 2A */ fadds f0, f1, f0 -/* 80AF6A54 D0 1D 0A 00 */ stfs f0, 0xa00(r29) -/* 80AF6A58 38 7D 05 BC */ addi r3, r29, 0x5bc -/* 80AF6A5C 7F A4 EB 78 */ mr r4, r29 -/* 80AF6A60 38 A0 00 00 */ li r5, 0 -/* 80AF6A64 38 C0 00 00 */ li r6, 0 -/* 80AF6A68 4B 75 38 71 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80AF6A6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80AF6A70 41 82 00 3C */ beq lbl_80AF6AAC -/* 80AF6A74 38 00 00 02 */ li r0, 2 -/* 80AF6A78 B0 1D 06 2A */ sth r0, 0x62a(r29) -/* 80AF6A7C 38 00 00 05 */ li r0, 5 -/* 80AF6A80 B0 1D 06 30 */ sth r0, 0x630(r29) -/* 80AF6A84 38 00 00 00 */ li r0, 0 -/* 80AF6A88 B0 1D 09 EE */ sth r0, 0x9ee(r29) -/* 80AF6A8C 38 00 00 09 */ li r0, 9 -/* 80AF6A90 B0 1D 09 EC */ sth r0, 0x9ec(r29) -/* 80AF6A94 48 00 00 18 */ b lbl_80AF6AAC -lbl_80AF6A98: -/* 80AF6A98 A8 1D 09 EE */ lha r0, 0x9ee(r29) -/* 80AF6A9C 2C 00 00 1E */ cmpwi r0, 0x1e -/* 80AF6AA0 41 80 00 0C */ blt lbl_80AF6AAC -/* 80AF6AA4 3B 80 00 01 */ li r28, 1 -/* 80AF6AA8 4B 52 31 D5 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80AF6AAC: -/* 80AF6AAC 7F 80 07 75 */ extsb. r0, r28 -/* 80AF6AB0 41 82 00 4C */ beq lbl_80AF6AFC -/* 80AF6AB4 38 7E 02 48 */ addi r3, r30, 0x248 -/* 80AF6AB8 4B 66 A9 F5 */ bl Start__9dCamera_cFv -/* 80AF6ABC 38 7E 02 48 */ addi r3, r30, 0x248 -/* 80AF6AC0 38 80 00 00 */ li r4, 0 -/* 80AF6AC4 4B 66 C5 49 */ bl SetTrimSize__9dCamera_cFl -/* 80AF6AC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6ACC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6AD0 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80AF6AD4 4B 54 B9 95 */ bl reset__14dEvt_control_cFv -/* 80AF6AD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6ADC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6AE0 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80AF6AE4 38 00 00 02 */ li r0, 2 -/* 80AF6AE8 B0 03 06 04 */ sth r0, 0x604(r3) -/* 80AF6AEC 38 00 00 01 */ li r0, 1 -/* 80AF6AF0 90 03 06 14 */ stw r0, 0x614(r3) -/* 80AF6AF4 38 00 00 00 */ li r0, 0 -/* 80AF6AF8 B0 1D 09 EC */ sth r0, 0x9ec(r29) -lbl_80AF6AFC: -/* 80AF6AFC A8 1D 09 EC */ lha r0, 0x9ec(r29) -/* 80AF6B00 2C 00 00 00 */ cmpwi r0, 0 -/* 80AF6B04 41 82 00 58 */ beq lbl_80AF6B5C -/* 80AF6B08 C0 1D 09 FC */ lfs f0, 0x9fc(r29) -/* 80AF6B0C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80AF6B10 C0 1D 0A 00 */ lfs f0, 0xa00(r29) -/* 80AF6B14 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80AF6B18 C0 1D 0A 04 */ lfs f0, 0xa04(r29) -/* 80AF6B1C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80AF6B20 C0 1D 09 F0 */ lfs f0, 0x9f0(r29) -/* 80AF6B24 D0 01 00 08 */ stfs f0, 8(r1) -/* 80AF6B28 C0 1D 09 F4 */ lfs f0, 0x9f4(r29) -/* 80AF6B2C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80AF6B30 C0 1D 09 F8 */ lfs f0, 0x9f8(r29) -/* 80AF6B34 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80AF6B38 38 7E 02 48 */ addi r3, r30, 0x248 -/* 80AF6B3C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80AF6B40 38 A1 00 08 */ addi r5, r1, 8 -/* 80AF6B44 C0 3D 0A 38 */ lfs f1, 0xa38(r29) -/* 80AF6B48 38 C0 00 00 */ li r6, 0 -/* 80AF6B4C 4B 68 9F 95 */ bl Set__9dCamera_cF4cXyz4cXyzfs -/* 80AF6B50 A8 7D 09 EE */ lha r3, 0x9ee(r29) -/* 80AF6B54 38 03 00 01 */ addi r0, r3, 1 -/* 80AF6B58 B0 1D 09 EE */ sth r0, 0x9ee(r29) -lbl_80AF6B5C: -/* 80AF6B5C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80AF6B60 4B 86 B6 C1 */ bl _restgpr_27 -/* 80AF6B64 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80AF6B68 7C 08 03 A6 */ mtlr r0 -/* 80AF6B6C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80AF6B70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73E4.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73E4.s deleted file mode 100644 index e0a98cc02c..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73E4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80AF73E4: -/* 80AF73E4 38 63 FF DC */ addi r3, r3, -36 -/* 80AF73E8 4B FF FF 08 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73EC.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73EC.s deleted file mode 100644 index 3c41aa992a..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73EC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80AF73EC: -/* 80AF73EC 38 63 FF EC */ addi r3, r3, -20 -/* 80AF73F0 4B FF FF 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/npc_sq_normal__FP12npc_sq_class.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/npc_sq_normal__FP12npc_sq_class.s deleted file mode 100644 index 0f43b208ad..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/npc_sq_normal__FP12npc_sq_class.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_80AF61B0: -/* 80AF61B0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80AF61B4 7C 08 02 A6 */ mflr r0 -/* 80AF61B8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80AF61BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF61C0 4B 86 C0 1D */ bl _savegpr_29 -/* 80AF61C4 7C 7E 1B 78 */ mr r30, r3 -/* 80AF61C8 3C 80 80 AF */ lis r4, lit_3768@ha /* 0x80AF7408@ha */ -/* 80AF61CC 3B E4 74 08 */ addi r31, r4, lit_3768@l /* 0x80AF7408@l */ -/* 80AF61D0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF61D4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF61D8 83 A4 5D AC */ lwz r29, 0x5dac(r4) -/* 80AF61DC A8 03 06 2A */ lha r0, 0x62a(r3) -/* 80AF61E0 2C 00 00 01 */ cmpwi r0, 1 -/* 80AF61E4 41 82 00 88 */ beq lbl_80AF626C -/* 80AF61E8 40 80 00 10 */ bge lbl_80AF61F8 -/* 80AF61EC 2C 00 00 00 */ cmpwi r0, 0 -/* 80AF61F0 40 80 00 14 */ bge lbl_80AF6204 -/* 80AF61F4 48 00 00 78 */ b lbl_80AF626C -lbl_80AF61F8: -/* 80AF61F8 2C 00 00 03 */ cmpwi r0, 3 -/* 80AF61FC 40 80 00 70 */ bge lbl_80AF626C -/* 80AF6200 48 00 00 24 */ b lbl_80AF6224 -lbl_80AF6204: -/* 80AF6204 38 80 00 09 */ li r4, 9 -/* 80AF6208 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80AF620C 38 A0 00 02 */ li r5, 2 -/* 80AF6210 C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80AF6214 4B FF FD FD */ bl anm_init__FP12npc_sq_classifUcf -/* 80AF6218 38 00 00 01 */ li r0, 1 -/* 80AF621C B0 1E 06 2A */ sth r0, 0x62a(r30) -/* 80AF6220 48 00 00 4C */ b lbl_80AF626C -lbl_80AF6224: -/* 80AF6224 38 7E 04 DE */ addi r3, r30, 0x4de -/* 80AF6228 A8 9E 04 B6 */ lha r4, 0x4b6(r30) -/* 80AF622C 38 04 40 00 */ addi r0, r4, 0x4000 -/* 80AF6230 7C 04 07 34 */ extsh r4, r0 -/* 80AF6234 38 A0 00 02 */ li r5, 2 -/* 80AF6238 38 C0 30 00 */ li r6, 0x3000 -/* 80AF623C 4B 77 A3 CD */ bl cLib_addCalcAngleS2__FPssss -/* 80AF6240 A8 1E 06 30 */ lha r0, 0x630(r30) -/* 80AF6244 2C 00 00 01 */ cmpwi r0, 1 -/* 80AF6248 40 82 00 24 */ bne lbl_80AF626C -/* 80AF624C 7F C3 F3 78 */ mr r3, r30 -/* 80AF6250 38 80 00 07 */ li r4, 7 -/* 80AF6254 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80AF6258 38 A0 00 02 */ li r5, 2 -/* 80AF625C C0 5F 00 18 */ lfs f2, 0x18(r31) -/* 80AF6260 4B FF FD B1 */ bl anm_init__FP12npc_sq_classifUcf -/* 80AF6264 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80AF6268 D0 1E 05 2C */ stfs f0, 0x52c(r30) -lbl_80AF626C: -/* 80AF626C C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80AF6270 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80AF6274 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80AF6278 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80AF627C C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80AF6280 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80AF6284 38 61 00 0C */ addi r3, r1, 0xc -/* 80AF6288 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80AF628C 7C 65 1B 78 */ mr r5, r3 -/* 80AF6290 4B 85 0E 25 */ bl PSVECSubtract -/* 80AF6294 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80AF6298 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80AF629C A8 1E 09 EC */ lha r0, 0x9ec(r30) -/* 80AF62A0 2C 00 00 00 */ cmpwi r0, 0 -/* 80AF62A4 40 82 01 04 */ bne lbl_80AF63A8 -/* 80AF62A8 38 61 00 0C */ addi r3, r1, 0xc -/* 80AF62AC 4B 85 0E 8D */ bl PSVECSquareMag -/* 80AF62B0 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80AF62B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80AF62B8 40 81 00 58 */ ble lbl_80AF6310 -/* 80AF62BC FC 00 08 34 */ frsqrte f0, f1 -/* 80AF62C0 C8 9F 00 30 */ lfd f4, 0x30(r31) -/* 80AF62C4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80AF62C8 C8 7F 00 38 */ lfd f3, 0x38(r31) -/* 80AF62CC FC 00 00 32 */ fmul f0, f0, f0 -/* 80AF62D0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80AF62D4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80AF62D8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80AF62DC FC 44 00 32 */ fmul f2, f4, f0 -/* 80AF62E0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80AF62E4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80AF62E8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80AF62EC FC 02 00 32 */ fmul f0, f2, f0 -/* 80AF62F0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80AF62F4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80AF62F8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80AF62FC FC 03 00 28 */ fsub f0, f3, f0 -/* 80AF6300 FC 02 00 32 */ fmul f0, f2, f0 -/* 80AF6304 FC 21 00 32 */ fmul f1, f1, f0 -/* 80AF6308 FC 20 08 18 */ frsp f1, f1 -/* 80AF630C 48 00 00 88 */ b lbl_80AF6394 -lbl_80AF6310: -/* 80AF6310 C8 1F 00 40 */ lfd f0, 0x40(r31) -/* 80AF6314 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80AF6318 40 80 00 10 */ bge lbl_80AF6328 -/* 80AF631C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80AF6320 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80AF6324 48 00 00 70 */ b lbl_80AF6394 -lbl_80AF6328: -/* 80AF6328 D0 21 00 08 */ stfs f1, 8(r1) -/* 80AF632C 80 81 00 08 */ lwz r4, 8(r1) -/* 80AF6330 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80AF6334 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80AF6338 7C 03 00 00 */ cmpw r3, r0 -/* 80AF633C 41 82 00 14 */ beq lbl_80AF6350 -/* 80AF6340 40 80 00 40 */ bge lbl_80AF6380 -/* 80AF6344 2C 03 00 00 */ cmpwi r3, 0 -/* 80AF6348 41 82 00 20 */ beq lbl_80AF6368 -/* 80AF634C 48 00 00 34 */ b lbl_80AF6380 -lbl_80AF6350: -/* 80AF6350 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80AF6354 41 82 00 0C */ beq lbl_80AF6360 -/* 80AF6358 38 00 00 01 */ li r0, 1 -/* 80AF635C 48 00 00 28 */ b lbl_80AF6384 -lbl_80AF6360: -/* 80AF6360 38 00 00 02 */ li r0, 2 -/* 80AF6364 48 00 00 20 */ b lbl_80AF6384 -lbl_80AF6368: -/* 80AF6368 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80AF636C 41 82 00 0C */ beq lbl_80AF6378 -/* 80AF6370 38 00 00 05 */ li r0, 5 -/* 80AF6374 48 00 00 10 */ b lbl_80AF6384 -lbl_80AF6378: -/* 80AF6378 38 00 00 03 */ li r0, 3 -/* 80AF637C 48 00 00 08 */ b lbl_80AF6384 -lbl_80AF6380: -/* 80AF6380 38 00 00 04 */ li r0, 4 -lbl_80AF6384: -/* 80AF6384 2C 00 00 01 */ cmpwi r0, 1 -/* 80AF6388 40 82 00 0C */ bne lbl_80AF6394 -/* 80AF638C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80AF6390 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80AF6394: -/* 80AF6394 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 80AF6398 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80AF639C 40 80 00 0C */ bge lbl_80AF63A8 -/* 80AF63A0 38 00 00 01 */ li r0, 1 -/* 80AF63A4 B0 1E 09 EC */ sth r0, 0x9ec(r30) -lbl_80AF63A8: -/* 80AF63A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF63AC 4B 86 BE 7D */ bl _restgpr_29 -/* 80AF63B0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80AF63B4 7C 08 03 A6 */ mtlr r0 -/* 80AF63B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80AF63BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 249cecbddb..0000000000 --- a/asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_80AF6DB0: -/* 80AF6DB0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80AF6DB4 7C 08 02 A6 */ mflr r0 -/* 80AF6DB8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80AF6DBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF6DC0 4B 86 B4 19 */ bl _savegpr_28 -/* 80AF6DC4 7C 7F 1B 78 */ mr r31, r3 -/* 80AF6DC8 38 60 00 54 */ li r3, 0x54 -/* 80AF6DCC 4B 7D 7E 81 */ bl __nw__FUl -/* 80AF6DD0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80AF6DD4 41 82 00 9C */ beq lbl_80AF6E70 -/* 80AF6DD8 3C 60 80 AF */ lis r3, d_a_npc_sq__stringBase0@ha /* 0x80AF74A4@ha */ -/* 80AF6DDC 38 63 74 A4 */ addi r3, r3, d_a_npc_sq__stringBase0@l /* 0x80AF74A4@l */ -/* 80AF6DE0 38 80 00 09 */ li r4, 9 -/* 80AF6DE4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6DE8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6DEC 3F 85 00 02 */ addis r28, r5, 2 -/* 80AF6DF0 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 80AF6DF4 7F 85 E3 78 */ mr r5, r28 -/* 80AF6DF8 38 C0 00 80 */ li r6, 0x80 -/* 80AF6DFC 4B 54 54 F1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80AF6E00 7C 7D 1B 78 */ mr r29, r3 -/* 80AF6E04 3C 60 80 AF */ lis r3, d_a_npc_sq__stringBase0@ha /* 0x80AF74A4@ha */ -/* 80AF6E08 38 63 74 A4 */ addi r3, r3, d_a_npc_sq__stringBase0@l /* 0x80AF74A4@l */ -/* 80AF6E0C 38 80 00 11 */ li r4, 0x11 -/* 80AF6E10 7F 85 E3 78 */ mr r5, r28 -/* 80AF6E14 38 C0 00 80 */ li r6, 0x80 -/* 80AF6E18 4B 54 54 D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80AF6E1C 7C 64 1B 78 */ mr r4, r3 -/* 80AF6E20 38 00 00 01 */ li r0, 1 -/* 80AF6E24 90 01 00 08 */ stw r0, 8(r1) -/* 80AF6E28 38 00 00 00 */ li r0, 0 -/* 80AF6E2C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80AF6E30 3C 00 00 08 */ lis r0, 8 -/* 80AF6E34 90 01 00 10 */ stw r0, 0x10(r1) -/* 80AF6E38 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000284@ha */ -/* 80AF6E3C 38 03 02 84 */ addi r0, r3, 0x0284 /* 0x11000284@l */ -/* 80AF6E40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80AF6E44 7F C3 F3 78 */ mr r3, r30 -/* 80AF6E48 38 A0 00 00 */ li r5, 0 -/* 80AF6E4C 38 C0 00 00 */ li r6, 0 -/* 80AF6E50 7F A7 EB 78 */ mr r7, r29 -/* 80AF6E54 39 00 00 00 */ li r8, 0 -/* 80AF6E58 3D 20 80 AF */ lis r9, lit_3813@ha /* 0x80AF7420@ha */ -/* 80AF6E5C C0 29 74 20 */ lfs f1, lit_3813@l(r9) /* 0x80AF7420@l */ -/* 80AF6E60 39 20 00 00 */ li r9, 0 -/* 80AF6E64 39 40 FF FF */ li r10, -1 -/* 80AF6E68 4B 51 8D E5 */ bl __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl -/* 80AF6E6C 7C 7E 1B 78 */ mr r30, r3 -lbl_80AF6E70: -/* 80AF6E70 93 DF 06 1C */ stw r30, 0x61c(r31) -/* 80AF6E74 80 7F 06 1C */ lwz r3, 0x61c(r31) -/* 80AF6E78 28 03 00 00 */ cmplwi r3, 0 -/* 80AF6E7C 41 82 00 10 */ beq lbl_80AF6E8C -/* 80AF6E80 80 03 00 04 */ lwz r0, 4(r3) -/* 80AF6E84 28 00 00 00 */ cmplwi r0, 0 -/* 80AF6E88 40 82 00 0C */ bne lbl_80AF6E94 -lbl_80AF6E8C: -/* 80AF6E8C 38 60 00 00 */ li r3, 0 -/* 80AF6E90 48 00 00 A8 */ b lbl_80AF6F38 -lbl_80AF6E94: -/* 80AF6E94 38 60 00 18 */ li r3, 0x18 -/* 80AF6E98 4B 7D 7D B5 */ bl __nw__FUl -/* 80AF6E9C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80AF6EA0 41 82 00 20 */ beq lbl_80AF6EC0 -/* 80AF6EA4 3C 80 80 AF */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80AF759C@ha */ -/* 80AF6EA8 38 04 75 9C */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80AF759C@l */ -/* 80AF6EAC 90 1E 00 00 */ stw r0, 0(r30) -/* 80AF6EB0 38 80 00 00 */ li r4, 0 -/* 80AF6EB4 4B 83 15 49 */ bl init__12J3DFrameCtrlFs -/* 80AF6EB8 38 00 00 00 */ li r0, 0 -/* 80AF6EBC 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_80AF6EC0: -/* 80AF6EC0 93 DF 06 20 */ stw r30, 0x620(r31) -/* 80AF6EC4 80 1F 06 20 */ lwz r0, 0x620(r31) -/* 80AF6EC8 28 00 00 00 */ cmplwi r0, 0 -/* 80AF6ECC 40 82 00 0C */ bne lbl_80AF6ED8 -/* 80AF6ED0 38 60 00 00 */ li r3, 0 -/* 80AF6ED4 48 00 00 64 */ b lbl_80AF6F38 -lbl_80AF6ED8: -/* 80AF6ED8 3C 60 80 AF */ lis r3, d_a_npc_sq__stringBase0@ha /* 0x80AF74A4@ha */ -/* 80AF6EDC 38 63 74 A4 */ addi r3, r3, d_a_npc_sq__stringBase0@l /* 0x80AF74A4@l */ -/* 80AF6EE0 38 80 00 14 */ li r4, 0x14 -/* 80AF6EE4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80AF6EE8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80AF6EEC 3C A5 00 02 */ addis r5, r5, 2 -/* 80AF6EF0 38 C0 00 80 */ li r6, 0x80 -/* 80AF6EF4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80AF6EF8 4B 54 53 F5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80AF6EFC 7C 65 1B 78 */ mr r5, r3 -/* 80AF6F00 80 7F 06 1C */ lwz r3, 0x61c(r31) -/* 80AF6F04 80 63 00 04 */ lwz r3, 4(r3) -/* 80AF6F08 80 83 00 04 */ lwz r4, 4(r3) -/* 80AF6F0C 80 7F 06 20 */ lwz r3, 0x620(r31) -/* 80AF6F10 38 84 00 58 */ addi r4, r4, 0x58 -/* 80AF6F14 38 C0 00 01 */ li r6, 1 -/* 80AF6F18 38 E0 00 00 */ li r7, 0 -/* 80AF6F1C 3D 00 80 AF */ lis r8, lit_3813@ha /* 0x80AF7420@ha */ -/* 80AF6F20 C0 28 74 20 */ lfs f1, lit_3813@l(r8) /* 0x80AF7420@l */ -/* 80AF6F24 39 00 00 00 */ li r8, 0 -/* 80AF6F28 39 20 FF FF */ li r9, -1 -/* 80AF6F2C 4B 51 67 11 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80AF6F30 30 03 FF FF */ addic r0, r3, -1 -/* 80AF6F34 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80AF6F38: -/* 80AF6F38 39 61 00 30 */ addi r11, r1, 0x30 -/* 80AF6F3C 4B 86 B2 E9 */ bl _restgpr_28 -/* 80AF6F40 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80AF6F44 7C 08 03 A6 */ mtlr r0 -/* 80AF6F48 38 21 00 30 */ addi r1, r1, 0x30 -/* 80AF6F4C 4E 80 00 20 */ blr diff --git a/include/rel/d/a/d_a_sq/d_a_sq.h b/include/rel/d/a/d_a_sq/d_a_sq.h index f7e6bedb56..f1e2b6f5be 100644 --- a/include/rel/d/a/d_a_sq/d_a_sq.h +++ b/include/rel/d/a/d_a_sq/d_a_sq.h @@ -1,6 +1,84 @@ #ifndef D_A_SQ_H #define D_A_SQ_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.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" + +class sq_class : public fopEn_enemy_c { +public: + enum Action { + /* 0 */ ACT_NORMAL, + /* 1 */ ACT_AWAY, + /* 2 */ ACT_CARRY, + /* 3 */ ACT_FLY, + /* 7 */ ACT_MESSAGE = 7, + }; + + /* 0x5AC */ request_of_phase_process_class mPhaseReq; + /* 0x5B4 */ u8 mParam0; + /* 0x5B5 */ u8 mParam1; + /* 0x5B6 */ u8 mParam2; + /* 0x5B7 */ u8 mParam3; + /* 0x5B8 */ u8 field_0x5b8; + /* 0x5B9 */ u8 field_0x5b9; + /* 0x5BA */ u8 field_0x5ba[0xa]; + /* 0x5C4 */ cXyz field_0x5c4; + /* 0x5D0 */ s16 mTargetAngleY; + /* 0x5D4 */ f32 mPlayerDist; + /* 0x5D8 */ u8 field_0x5d8[0xc]; + /* 0x5E4 */ s8 field_0x5e4; + /* 0x5E5 */ u8 field_0x5e5[7]; + /* 0x5EC */ mDoExt_McaMorf* mpMorf; + /* 0x5F0 */ mDoExt_btkAnm* mpBtkAnm; + /* 0x5F4 */ s8 mBtkFrame; + /* 0x5F6 */ s16 mCounter; + /* 0x5F8 */ s16 mAction; + /* 0x5FA */ s16 mMode; + /* 0x5FC */ u32 mShadowKey; + /* 0x600 */ s16 mTimer[4]; + /* 0x608 */ s16 mMessageTimer; + /* 0x60A */ s16 mRunCheckTimer; + /* 0x60C */ f32 field_0x60c; + /* 0x610 */ s16 field_0x610; + /* 0x612 */ csXyz field_0x612; + /* 0x618 */ csXyz field_0x618; + /* 0x61E */ s8 mMessageState; + /* 0x620 */ s16 mIsTalking; + /* 0x622 */ s16 mFlowID; + /* 0x624 */ dMsgFlow_c mMsgFlow; + /* 0x670 */ dBgS_AcchCir mAcchCir; + /* 0x6B0 */ dBgS_ObjAcch mAcch; + /* 0x888 */ dCcD_Stts mCcStts; + /* 0x8C4 */ dCcD_Sph mCcSph; + /* 0x9FC */ dCcD_Sph mAtSph; + /* 0xB34 */ dCcU_AtInfo mAtInfo; + /* 0xB58 */ bool mHIOInit; +}; + +STATIC_ASSERT(sizeof(sq_class) == 0xB5C); + +class daSq_HIO_c { +public: + /* 8059F66C */ daSq_HIO_c(); + /* 805A10B0 */ virtual ~daSq_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 mRunAnmSpeed; + /* 0x14 */ bool mRunAway; + /* 0x18 */ f32 mRunDistance; + /* 0x1C */ f32 mRunSpeed; + /* 0x20 */ f32 mFallSpeedXZ; + /* 0x24 */ f32 mFallSpeedY; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; +}; + +STATIC_ASSERT(sizeof(daSq_HIO_c) == 0x30); #endif /* D_A_SQ_H */ diff --git a/include/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.h b/include/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.h index 5d75b83f34..a2a09a3f1b 100644 --- a/include/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.h +++ b/include/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.h @@ -1,6 +1,65 @@ #ifndef D_A_NPC_SQ_H #define D_A_NPC_SQ_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.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 "f_op/f_op_actor.h" + +class npc_sq_class : public fopEn_enemy_c { +public: + enum Action { + /* 0 */ ACT_NORMAL, + }; + + /* 0x5AC */ request_of_phase_process_class mPhaseReq; + /* 0x5B4 */ u8 mParam0; + /* 0x5B5 */ u8 mParam1; + /* 0x5B6 */ u8 field_0x5b6[2]; + /* 0x5B8 */ s16 mFlowID; + /* 0x5BC */ dMsgFlow_c mMsgFlow; + /* 0x608 */ cXyz field_0x608; + /* 0x614 */ u8 field_0x614[4]; + /* 0x618 */ f32 mPlayerDist; + /* 0x61C */ mDoExt_McaMorf* mpMorf; + /* 0x620 */ mDoExt_btkAnm* mpBtkAnm; + /* 0x624 */ s8 mBtkFrame; + /* 0x626 */ s16 mCounter; + /* 0x628 */ s16 mAction; + /* 0x62A */ s16 mMode; + /* 0x62C */ u32 mShadowKey; + /* 0x630 */ s16 mTimer[4]; + /* 0x638 */ u8 field_0x638[4]; + /* 0x63C */ dBgS_AcchCir mAcchCir; + /* 0x67C */ dBgS_ObjAcch mAcch; + /* 0x854 */ dCcD_Stts mCcStts; + /* 0x890 */ dCcD_Sph mCcSph; + /* 0x9C8 */ dCcU_AtInfo mAtInfo; + /* 0x9EC */ s16 mDemoMode; + /* 0x9EE */ s16 mDemoTimer; + /* 0x9F0 */ cXyz mCameraEye; + /* 0x9FC */ cXyz mCameraCenter; + /* 0xA08 */ cXyz mCameraTargetEye; + /* 0xA14 */ cXyz mCameraTargetCenter; + /* 0xA20 */ cXyz mCameraEyeDist; + /* 0xA2C */ cXyz mCameraCenterDist; + /* 0xA38 */ f32 mCameraFovY; + /* 0xA3C */ f32 mCameraSpeed; + /* 0xA40 */ bool mHIOInit; +}; + +STATIC_ASSERT(sizeof(npc_sq_class) == 0xA44); + +struct daNpc_Sq_HIO_c { + /* 80AF5FEC */ daNpc_Sq_HIO_c(); + /* 80AF7360 */ virtual ~daNpc_Sq_HIO_c() {} + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mScale; +}; + +STATIC_ASSERT(sizeof(daNpc_Sq_HIO_c) == 0xC); #endif /* D_A_NPC_SQ_H */ diff --git a/rel/d/a/d_a_sq/d_a_sq.cpp b/rel/d/a/d_a_sq/d_a_sq.cpp index cb664ddc81..e3e4c9b3fa 100644 --- a/rel/d/a/d_a_sq/d_a_sq.cpp +++ b/rel/d/a/d_a_sq/d_a_sq.cpp @@ -1,869 +1,622 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_sq -// +/** + * d_a_sq.cpp + * Squirrel + */ #include "rel/d/a/d_a_sq/d_a_sq.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" -// -// Types: -// - -struct sq_class {}; - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorf { - /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); - /* 800105C8 */ void play(Vec*, u32, s8); - /* 80010680 */ void entryDL(); - /* 800106AC */ void modelCalc(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daSq_HIO_c { - /* 8059F66C */ daSq_HIO_c(); - /* 805A10B0 */ ~daSq_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 805A1040 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct csXyz {}; - -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 cBgS_LinChk {}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); -}; - -struct _GXTexObj {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 805A0BE8 */ ~J3DFrameCtrl(); -}; +/* 805A1330-805A1334 000008 0004+00 2/2 0/0 0/0 .bss None */ +static bool hioInit; -// -// Forward References: -// - -extern "C" void __ct__10daSq_HIO_cFv(); -extern "C" static void anm_init__FP8sq_classifUcfi(); -extern "C" static void daSq_Draw__FP8sq_class(); -extern "C" static void way_bg_check__FP8sq_class(); -extern "C" static void turn_set__FP8sq_class(); -extern "C" static void sq_normal__FP8sq_class(); -extern "C" static void sq_away__FP8sq_class(); -extern "C" static void sq_carry__FP8sq_class(); -extern "C" static void sq_fly__FP8sq_class(); -extern "C" static void sq_message__FP8sq_class(); -extern "C" static void action__FP8sq_class(); -extern "C" static void message__FP8sq_class(); -extern "C" static void daSq_Execute__FP8sq_class(); -extern "C" static bool daSq_IsDelete__FP8sq_class(); -extern "C" static void daSq_Delete__FP8sq_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daSq_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__10daSq_HIO_cFv(); -extern "C" void __sinit_d_a_sq_cpp(); -extern "C" static void func_805A1134(); -extern "C" static void func_805A113C(); -extern "C" extern char const* const d_a_sq__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 init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void -__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl(); -extern "C" void setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv(); -extern "C" void play__14mDoExt_McaMorfFP3VecUlSc(); -extern "C" void entryDL__14mDoExt_McaMorfFv(); -extern "C" void modelCalc__14mDoExt_McaMorfFv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__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 __ct__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -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* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -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 void* calc_mtx[1 + 1 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 805A1158-805A115C 000000 0004+00 12/12 0/0 0/0 .rodata @3769 */ -SECTION_RODATA static f32 const lit_3769 = 2.0f; -COMPILER_STRIP_GATE(0x805A1158, &lit_3769); - -/* 805A115C-805A1160 000004 0004+00 0/4 0/0 0/0 .rodata @3770 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3770 = 20.0f; -COMPILER_STRIP_GATE(0x805A115C, &lit_3770); -#pragma pop - -/* 805A1160-805A1164 000008 0004+00 1/11 0/0 0/0 .rodata @3771 */ -SECTION_RODATA static f32 const lit_3771 = 1.0f; -COMPILER_STRIP_GATE(0x805A1160, &lit_3771); - -/* 805A1164-805A1168 00000C 0004+00 0/3 0/0 0/0 .rodata @3772 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3772 = 100.0f; -COMPILER_STRIP_GATE(0x805A1164, &lit_3772); -#pragma pop - -/* 805A1168-805A116C 000010 0004+00 0/1 0/0 0/0 .rodata @3773 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3773 = 25.0f; -COMPILER_STRIP_GATE(0x805A1168, &lit_3773); -#pragma pop - -/* 805A116C-805A1170 000014 0004+00 0/5 0/0 0/0 .rodata @3774 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3774 = 30.0f; -COMPILER_STRIP_GATE(0x805A116C, &lit_3774); -#pragma pop - -/* 805A1170-805A1174 000018 0004+00 0/1 0/0 0/0 .rodata @3775 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3775 = 1000.0f; -COMPILER_STRIP_GATE(0x805A1170, &lit_3775); -#pragma pop - -/* 805A1174-805A1178 00001C 0004+00 0/1 0/0 0/0 .rodata @3776 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3776 = 17.0f; -COMPILER_STRIP_GATE(0x805A1174, &lit_3776); -#pragma pop +/* 805A1340-805A1370 000018 0030+00 8/8 0/0 0/0 .bss l_HIO */ +static daSq_HIO_c l_HIO; /* 805A11E8-805A11F8 000000 0010+00 2/2 0/0 0/0 .data wait_bck */ -SECTION_DATA static u8 wait_bck[16] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0C, -}; +static u32 wait_bck[4] = {9, 10, 11, 12}; /* 805A11F8-805A1204 000010 000C+00 1/1 0/0 0/0 .data carry_wait_bck */ -SECTION_DATA static u8 carry_wait_bck[12] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, -}; - -/* 805A1204-805A1244 00001C 0040+00 1/1 0/0 0/0 .data cc_sph_src$4278 */ -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 20.0f} // mSph - } // mSphAttr -}; - -/* 805A1244-805A1284 00005C 0040+00 1/1 0/0 0/0 .data at_sph_src$4279 */ -static dCcD_SrcSph at_sph_src = { - { - {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 15.0f} // mSph - } // mSphAttr -}; - -/* 805A1284-805A12A4 -00001 0020+00 1/0 0/0 0/0 .data l_daSq_Method */ -SECTION_DATA static void* l_daSq_Method[8] = { - (void*)daSq_Create__FP10fopAc_ac_c, - (void*)daSq_Delete__FP8sq_class, - (void*)daSq_Execute__FP8sq_class, - (void*)daSq_IsDelete__FP8sq_class, - (void*)daSq_Draw__FP8sq_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 805A12A4-805A12D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_SQ */ -SECTION_DATA extern void* g_profile_SQ[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, (void*)0x010A0000, (void*)&g_fpcLf_Method, - (void*)0x00000B5C, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02B90000, (void*)&l_daSq_Method, (void*)0x000C0000, (void*)NULL, -}; - -/* 805A12D4-805A12E0 0000EC 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, -}; - -/* 805A12E0-805A12EC 0000F8 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, -}; - -/* 805A12EC-805A1310 000104 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_805A113C, - (void*)NULL, - (void*)NULL, - (void*)func_805A1134, -}; - -/* 805A1310-805A131C 000128 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 805A131C-805A1328 000134 000C+00 2/2 0/0 0/0 .data __vt__10daSq_HIO_c */ -SECTION_DATA extern void* __vt__10daSq_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10daSq_HIO_cFv, -}; +static u32 carry_wait_bck[3] = {9, 9, 9}; /* 8059F66C-8059F6D8 0000EC 006C+00 1/1 0/0 0/0 .text __ct__10daSq_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daSq_HIO_c::daSq_HIO_c() { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/__ct__10daSq_HIO_cFv.s" +daSq_HIO_c::daSq_HIO_c() { + field_0x4 = -1; + mScale = 2.0f; + field_0xc = 20.0f; + mRunAnmSpeed = 1.0f; + mRunAway = true; + mRunDistance = 100.0f; + mRunSpeed = 25.0f; + mFallSpeedXZ = 30.0f; + mFallSpeedY = 30.0f; + field_0x28 = 1000.0f; + field_0x2c = 17.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 805A1178-805A117C 000020 0004+00 0/8 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3798[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x805A1178, &lit_3798); -#pragma pop - -/* 805A117C-805A1180 000024 0004+00 0/1 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3799 = -1.0f; -COMPILER_STRIP_GATE(0x805A117C, &lit_3799); -#pragma pop - -/* 805A11E4-805A11E4 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_805A11E4 = "Sq"; -#pragma pop /* 8059F6D8-8059F808 000158 0130+00 5/5 0/0 0/0 .text anm_init__FP8sq_classifUcfi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void anm_init(sq_class* param_0, int param_1, f32 param_2, u8 param_3, f32 param_4, - int param_5) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/anm_init__FP8sq_classifUcfi.s" +static void anm_init(sq_class* i_this, int i_bck, f32 i_morf, u8 i_mode, f32 i_speed, int i_bas) { + if (i_this->field_0x60c > 1.0f) { + return; + } + + if (i_bas >= 0) { + i_this->mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Sq", i_bck)), + i_mode, i_morf, i_speed, 0.0f, -1.0f, + dComIfG_getObjectRes("Sq", i_bas)); + } else { + i_this->mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Sq", i_bck)), + i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL); + } } -#pragma pop - -/* ############################################################################################## */ -/* 805A1180-805A1184 000028 0004+00 0/2 0/0 0/0 .rodata @3826 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3826 = 400.0f; -COMPILER_STRIP_GATE(0x805A1180, &lit_3826); -#pragma pop - -/* 805A1184-805A1188 00002C 0004+00 0/4 0/0 0/0 .rodata @3827 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3827 = 10.0f; -COMPILER_STRIP_GATE(0x805A1184, &lit_3827); -#pragma pop - -/* 805A1330-805A1334 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_805A1330[4]; - -/* 805A1334-805A1340 00000C 000C+00 1/1 0/0 0/0 .bss @3764 */ -static u8 lit_3764[12]; - -/* 805A1340-805A1370 000018 0030+00 8/8 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[48]; /* 8059F808-8059F900 000288 00F8+00 1/0 0/0 0/0 .text daSq_Draw__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSq_Draw(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/daSq_Draw__FP8sq_class.s" +static int daSq_Draw(sq_class* i_this) { + J3DModel* model = i_this->mpMorf->getModel(); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr); + i_this->mpBtkAnm->entry(model->getModelData()); + i_this->mpMorf->entryDL(); + cXyz shadow_pos; + shadow_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, &shadow_pos, 400.0f, 10.0f * l_HIO.mScale, + 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 /* 8059F900-8059F9FC 000380 00FC+00 2/2 0/0 0/0 .text way_bg_check__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void way_bg_check(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/way_bg_check__FP8sq_class.s" +static BOOL way_bg_check(sq_class* i_this) { + fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this); + cXyz vec1, vec2, vec3; + vec1 = _this->current.pos; + vec1.y += 30.0f; + cMtx_YrotS(*calc_mtx, _this->shape_angle.y); + vec3.x = 0.0f; + vec3.y = 0.0f; + vec3.z = 100.0f; + MtxPosition(&vec3, &vec2); + vec2 += vec1; + dBgS_LinChk lin_chk; + lin_chk.Set(&vec1, &vec2, _this); + if (dComIfG_Bgsp().LineCross(&lin_chk)) { + return true; + } else { + return false; + } } -#pragma pop - -/* ############################################################################################## */ -/* 805A1188-805A1190 000030 0006+02 1/1 0/0 0/0 .rodata @3884 */ -SECTION_RODATA static u8 const lit_3884[6 + 2 /* padding */] = { - 0x80, - 0x00, - 0x40, - 0x00, - 0xC0, - 0x00, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x805A1188, &lit_3884); - -/* 805A1190-805A1194 000038 0004+00 1/1 0/0 0/0 .rodata @3886 */ -SECTION_RODATA static u32 const lit_3886 = 0x403F5C29; -COMPILER_STRIP_GATE(0x805A1190, &lit_3886); /* 8059F9FC-8059FA68 00047C 006C+00 2/2 0/0 0/0 .text turn_set__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void turn_set(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/turn_set__FP8sq_class.s" +static void turn_set(sq_class* i_this) { + s16 angle_table[3] = {-0x8000, 0x4000, -0x4000}; + s16 angle = angle_table[(int)cM_rndF(2.99f)]; + i_this->mTargetAngleY = i_this->current.angle.y + angle; } -#pragma pop - -/* ############################################################################################## */ -/* 805A1194-805A1198 00003C 0004+00 0/1 0/0 0/0 .rodata @3953 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3953 = 60.0f; -COMPILER_STRIP_GATE(0x805A1194, &lit_3953); -#pragma pop - -/* 805A1198-805A119C 000040 0004+00 0/1 0/0 0/0 .rodata @3954 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3954 = 120.0f; -COMPILER_STRIP_GATE(0x805A1198, &lit_3954); -#pragma pop - -/* 805A119C-805A11A0 000044 0004+00 0/2 0/0 0/0 .rodata @3955 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3955 = 15.0f; -COMPILER_STRIP_GATE(0x805A119C, &lit_3955); -#pragma pop - -/* 805A11A0-805A11A4 000048 0004+00 0/2 0/0 0/0 .rodata @3956 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3956 = 8.0f; -COMPILER_STRIP_GATE(0x805A11A0, &lit_3956); -#pragma pop - -/* 805A11A4-805A11A8 00004C 0004+00 0/4 0/0 0/0 .rodata @3957 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3957 = 4.0f; -COMPILER_STRIP_GATE(0x805A11A4, &lit_3957); -#pragma pop - -/* 805A11A8-805A11AC 000050 0004+00 0/4 0/0 0/0 .rodata @3958 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3958 = 6.0f; -COMPILER_STRIP_GATE(0x805A11A8, &lit_3958); -#pragma pop - -/* 805A11AC-805A11B0 000054 0004+00 0/1 0/0 0/0 .rodata @3959 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3959 = 16000.0f; -COMPILER_STRIP_GATE(0x805A11AC, &lit_3959); -#pragma pop - -/* 805A11B0-805A11B4 000058 0004+00 0/2 0/0 0/0 .rodata @3960 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3960 = 40.0f; -COMPILER_STRIP_GATE(0x805A11B0, &lit_3960); -#pragma pop - -/* 805A11B4-805A11B8 00005C 0004+00 0/2 0/0 0/0 .rodata @3961 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3961 = 5.0f; -COMPILER_STRIP_GATE(0x805A11B4, &lit_3961); -#pragma pop - -/* 805A11B8-805A11C0 000060 0008+00 0/3 0/0 0/0 .rodata @3965 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3965[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x805A11B8, &lit_3965); -#pragma pop /* 8059FA68-8059FE50 0004E8 03E8+00 1/1 0/0 0/0 .text sq_normal__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void sq_normal(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/sq_normal__FP8sq_class.s" +static void sq_normal(sq_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + f32 target_speed = 0.0f; + int rnd, anm; + + switch (i_this->mMode) { + case -1: + case 0: + i_this->mTimer[0] = cM_rndF(120.0f) + 60.0f; + // no break + + case 1: + i_this->mTimer[1] = cM_rndF(30.0f) + 15.0f; + rnd = cM_rndF(8.0f); + if (rnd < 2.0f) { + anm = 0; + } else if (rnd < 4.0f) { + anm = 1; + } else if (rnd < 6.0f) { + anm = 2; + } else { + anm = 3; + } + if (i_this->mMode == 0) { + anm_init(i_this, wait_bck[anm], 10.0f, 2, 1.0f, -1); + } else { + anm_init(i_this, wait_bck[anm], 4.0f, 2, 1.0f, -1); + } + i_this->mMode = 2; + break; + + case 2: + if (i_this->mTimer[1] == 0 || i_this->mTimer[0] == 0) { + if (i_this->mTimer[0] != 0) { + i_this->mMode--; + } else { + i_this->mMode = 10; + if (way_bg_check(i_this)) { + turn_set(i_this); + } else { + i_this->mTargetAngleY = i_this->current.angle.y + (s16)cM_rndFX(16000.0f); + } + } + } + break; + + case 10: + i_this->mTimer[0] = cM_rndF(40.0f) + 20.0f; + anm_init(i_this, 7, 4.0f, 2, l_HIO.mRunAnmSpeed, -1); + i_this->mMode++; + // no break + + case 11: + target_speed = l_HIO.field_0xc; + cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mTargetAngleY, 4, 0x2000); + if (i_this->mTimer[0] == 0) { + i_this->mMode = 0; + } else if (i_this->mTimer[2] == 0 && i_this->mAcch.ChkWallHit()) { + turn_set(i_this); + i_this->mTimer[2] = 20; + } + } + + cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 5.0f); + if (fabsf(player->speedF) < 8.0f && i_this->mRunCheckTimer == 0) { + i_this->mRunCheckTimer = 1; + } + if (dComIfGp_checkPlayerStatus0(0, 0x8000000)) { + i_this->mRunCheckTimer = 30; + } + cXyz player_delta; + player_delta.x = player->eyePos.x - i_this->current.pos.x; + player_delta.z = player->eyePos.z - i_this->current.pos.z; + s16 player_angle = i_this->shape_angle.y - cM_atan2s(player_delta.x, player_delta.z); + if (player_angle < 0) { + player_angle = -player_angle; + } + if ((u16)player_angle < 0x4000) { + i_this->mRunCheckTimer = 0; + } + if (l_HIO.mRunAway && i_this->mRunCheckTimer == 0 + && i_this->mPlayerDist < l_HIO.mRunDistance) { + i_this->mAction = sq_class::ACT_AWAY; + i_this->mMode = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 805A11C0-805A11C4 000068 0004+00 0/1 0/0 0/0 .rodata @3998 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3998 = 1.5f; -COMPILER_STRIP_GATE(0x805A11C0, &lit_3998); -#pragma pop - -/* 805A11C4-805A11C8 00006C 0004+00 0/1 0/0 0/0 .rodata @3999 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3999 = 50.0f; -COMPILER_STRIP_GATE(0x805A11C4, &lit_3999); -#pragma pop - -/* 805A11C8-805A11CC 000070 0004+00 0/1 0/0 0/0 .rodata @4000 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4000 = 8000.0f; -COMPILER_STRIP_GATE(0x805A11C8, &lit_4000); -#pragma pop /* 8059FE50-805A0024 0008D0 01D4+00 1/1 0/0 0/0 .text sq_away__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void sq_away(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/sq_away__FP8sq_class.s" +static void sq_away(sq_class* i_this) { + f32 target_speed = 0.0f; + cXyz player_delta = i_this->current.pos - dComIfGp_getPlayer(0)->current.pos; + + switch (i_this->mMode) { + case 0: + anm_init(i_this, 7, 4.0f, 2, l_HIO.mRunAnmSpeed * 1.5f, -1); + i_this->mMode++; + i_this->mTimer[0] = 0; + // no break + + case 1: + target_speed = l_HIO.mRunSpeed; + if (i_this->mTimer[0] == 0) { + if (i_this->mPlayerDist > l_HIO.mRunDistance + 50.0f) { + i_this->mAction = sq_class::ACT_NORMAL; + i_this->mMode = 0; + } else { + i_this->mTimer[0] = cM_rndF(20.0f) + 5.0f; + if (way_bg_check(i_this)) { + turn_set(i_this); + } else { + int rnd = cM_rndFX(8000.0f); + s16 player_angle = cM_atan2s(player_delta.x, player_delta.z); + i_this->mTargetAngleY = player_angle + rnd; + } + } + } else if (i_this->mTimer[2] == 0 && i_this->mAcch.ChkWallHit()) { + turn_set(i_this); + i_this->mTimer[2] = 20; + } + break; + } + + cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 5.0f); + cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mTargetAngleY, 2, 0x3000); } -#pragma pop - -/* ############################################################################################## */ -/* 805A11CC-805A11D0 000074 0004+00 0/1 0/0 0/0 .rodata @4026 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4026 = 0x403FEF9E; -COMPILER_STRIP_GATE(0x805A11CC, &lit_4026); -#pragma pop /* 805A0024-805A0160 000AA4 013C+00 1/1 0/0 0/0 .text sq_carry__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void sq_carry(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/sq_carry__FP8sq_class.s" +static void sq_carry(sq_class* i_this) { + i_this->mCcSph.OffCoSetBit(); + i_this->speed.y = 0.0f; + + switch (i_this->mMode) { + case 0: + i_this->mMode++; + i_this->mTimer[1] = 0; + // no break + + case 1: + if (i_this->mTimer[1] == 0) { + i_this->mTimer[1] = cM_rndF(30.0f) + 15.0f; + anm_init(i_this, carry_wait_bck[(int)cM_rndF(2.999f)], 4.0f, 2, 1.0f, -1); + } + break; + } + + if (!fopAcM_checkCarryNow(i_this)) { + if (fopAcM_GetSpeedF(i_this) > 0.0f) { + i_this->mMode = 0; + i_this->speedF = l_HIO.mFallSpeedXZ; + i_this->speed.y = l_HIO.mFallSpeedY; + i_this->mAction = sq_class::ACT_FLY; + i_this->mMode = 0; + } else { + i_this->mAction = sq_class::ACT_NORMAL; + i_this->mMode = -1; + } + } } -#pragma pop /* 805A0160-805A021C 000BE0 00BC+00 1/1 0/0 0/0 .text sq_fly__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void sq_fly(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/sq_fly__FP8sq_class.s" +static void sq_fly(sq_class* i_this) { + switch (i_this->mMode) { + case 0: + anm_init(i_this, 7, 2.0f, 0, 0.0f, -1); + i_this->mpMorf->setFrame(6.0f); + i_this->mMode++; + break; + + case 1: + break; + } + + cLib_addCalc2(&i_this->speedF, l_HIO.mFallSpeedXZ, 1.0f, 10.0f); + if (i_this->mAcch.i_ChkGroundHit()) { + i_this->mAction = sq_class::ACT_NORMAL; + i_this->mMode = -1; + } } -#pragma pop /* 805A021C-805A037C 000C9C 0160+00 1/1 0/0 0/0 .text sq_message__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void sq_message(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/sq_message__FP8sq_class.s" +static void sq_message(sq_class* i_this) { + int anm; + f32 rnd; + + switch (i_this->mMode) { + case 0: + rnd = (int)cM_rndF(8.0f); + if (rnd < 2.0f) { + anm = 0; + } else if (rnd < 4.0f) { + anm = 1; + } else if (rnd < 6.0f) { + anm = 2; + } else { + anm = 3; + } + anm_init(i_this, wait_bck[anm], 4.0f, 2, 1.0f, -1); + i_this->mMode++; + break; + + case 1: + break; + } + + cLib_addCalc0(&i_this->speedF, 1.0f, 2.0f); + cLib_addCalcAngleS2(&i_this->current.angle.y, fopAcM_searchPlayerAngleY(i_this), 2, 0x1000); + if (!dComIfGp_event_runCheck() && i_this->mPlayerDist > 400.0f) { + i_this->mAction = sq_class::ACT_NORMAL; + i_this->mMode = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 805A11D0-805A11D4 000078 0004+00 0/1 0/0 0/0 .rodata @4119 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4119 = -7.0f; -COMPILER_STRIP_GATE(0x805A11D0, &lit_4119); -#pragma pop - -/* 805A11D4-805A11D8 00007C 0004+00 0/1 0/0 0/0 .rodata @4120 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4120 = 300.0f; -COMPILER_STRIP_GATE(0x805A11D4, &lit_4120); -#pragma pop - -/* 805A11D8-805A11DC 000080 0004+00 0/1 0/0 0/0 .rodata @4121 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4121 = -120.0f; -COMPILER_STRIP_GATE(0x805A11D8, &lit_4121); -#pragma pop /* 805A037C-805A06A4 000DFC 0328+00 1/1 0/0 0/0 .text action__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/action__FP8sq_class.s" +static void action(sq_class* i_this) { + cXyz vec1, vec2; + i_this->gravity = -7.0f; + i_this->field_0x5e4 = 0; + i_this->mCcSph.OnCoSetBit(); + i_this->mPlayerDist = fopAcM_searchPlayerDistance(i_this); + cLib_addCalcAngleS2(&i_this->current.angle.x, 0, 2, 0x2000); + i_this->current.angle.z = 0; + i_this->mMessageState = 0; + + if (i_this->field_0x60c < 1.0f) { + switch (i_this->mAction) { + case sq_class::ACT_NORMAL: + sq_normal(i_this); + i_this->mMessageState = 1; + break; + case sq_class::ACT_AWAY: + sq_away(i_this); + i_this->mMessageState = 1; + break; + case sq_class::ACT_CARRY: + sq_carry(i_this); + break; + case sq_class::ACT_FLY: + sq_fly(i_this); + break; + case sq_class::ACT_MESSAGE: + sq_message(i_this); + i_this->mMessageState = 2; + break; + } + + if (i_this->mMessageState == 1 && daPy_py_c::i_checkNowWolf() + && i_this->mPlayerDist < 300.0f) { + i_this->mAction = sq_class::ACT_MESSAGE; + i_this->mMode = 0; + } + } + + if (i_this->field_0x5e4 != 0) { + cMtx_YrotS(*calc_mtx, i_this->current.angle.y); + cMtx_XrotM(*calc_mtx, i_this->current.angle.x); + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = i_this->speedF; + MtxPosition(&vec1, &i_this->speed); + i_this->current.pos += i_this->speed; + } else { + cMtx_YrotS(*calc_mtx, i_this->current.angle.y); + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = i_this->speedF; + MtxPosition(&vec1, &vec2); + i_this->speed.x = vec2.x; + i_this->speed.z = vec2.z; + i_this->speed.y += i_this->gravity; + i_this->current.pos += i_this->speed; + if (i_this->speed.y < -120.0f) { + i_this->speed.y = -120.0f; + } + cXyz* move_p = i_this->mCcStts.GetCCMoveP(); + if (move_p != NULL) { + i_this->current.pos.x += move_p->x; + i_this->current.pos.y += move_p->y; + i_this->current.pos.z += move_p->z; + } + i_this->mAcch.CrrPos(dComIfG_Bgsp()); + } + + if (i_this->field_0x60c > 1.0f) { + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = -i_this->field_0x60c; + cMtx_YrotS(*calc_mtx, i_this->field_0x610); + MtxPosition(&vec1, &vec2); + i_this->current.pos += vec2; + cLib_addCalc0(&i_this->field_0x60c, 1.0f, 6.0f); + i_this->speedF = 0.0f; + } + + cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->current.angle.y, 2, 0x4000); + cLib_addCalcAngleS2(&i_this->shape_angle.x, i_this->current.angle.x, 2, 0x4000); + i_this->shape_angle.z = i_this->current.angle.z; } -#pragma pop /* 805A06A4-805A07C8 001124 0124+00 1/1 0/0 0/0 .text message__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void message(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/message__FP8sq_class.s" +static int message(sq_class* i_this) { + if (i_this->mIsTalking != 0) { + i_this->mMessageTimer = 10; + if (i_this->mMsgFlow.doFlow(i_this, NULL, 0)) { + dComIfGp_event_reset(); + i_this->mIsTalking = 0; + } + return 1; + } + + if (dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { + i_this->mMsgFlow.init(i_this, i_this->mFlowID, 0, NULL); + i_this->mIsTalking = 1; + } + + if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::i_checkNowWolf()) { + fopAcM_OnStatus(i_this, 0); + cLib_onBit<u32>(i_this->attention_info.flags, 0xa); + i_this->eventInfo.i_onCondition(1); + } else { + fopAcM_OffStatus(i_this, 0); + cLib_offBit<u32>(i_this->attention_info.flags, 0xa); + } + + return 0; } -#pragma pop - -/* ############################################################################################## */ -/* 805A11DC-805A11E0 000084 0004+00 0/1 0/0 0/0 .rodata @4198 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4198 = 0.25f; -COMPILER_STRIP_GATE(0x805A11DC, &lit_4198); -#pragma pop /* 805A07C8-805A09EC 001248 0224+00 2/1 0/0 0/0 .text daSq_Execute__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSq_Execute(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/daSq_Execute__FP8sq_class.s" +static int daSq_Execute(sq_class* i_this) { + cXyz vec(0.0f, 0.0f, 0.0f); + cLib_addCalc2(&i_this->scale.x, 1.0f, 1.0f, 0.25f); + + i_this->mCounter++; + for (int i = 0; i < 4; i++) { + if (i_this->mTimer[i] != 0) { + i_this->mTimer[i]--; + } + } + if (i_this->mMessageTimer != 0) { + i_this->mMessageTimer--; + } + if (i_this->mRunCheckTimer != 0) { + i_this->mRunCheckTimer--; + } + + action(i_this); + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::XrotM(i_this->shape_angle.x); + mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); + f32 scale = i_this->scale.x * l_HIO.mScale; + mDoMtx_stack_c::scaleM(scale, scale, scale); + J3DModel* model = i_this->mpMorf->getModel(); + model->setBaseTRMtx(mDoMtx_stack_c::get()); + + i_this->mpMorf->play(&i_this->eyePos, 0, 0); + i_this->mpBtkAnm->setFrame(i_this->mBtkFrame); + i_this->mpMorf->modelCalc(); + + MTXCopy(model->getAnmMtx(2), *calc_mtx); + MtxPosition(&vec, &i_this->eyePos); + i_this->attention_info.position = i_this->eyePos; + i_this->attention_info.position.y += 20.0f * l_HIO.mScale; + + i_this->mCcSph.SetC(i_this->eyePos); + i_this->mCcSph.SetR(10.0f * l_HIO.mScale); + dComIfG_Ccsp()->Set(&i_this->mCcSph); + + message(i_this); + return 1; } -#pragma pop /* 805A09EC-805A09F4 00146C 0008+00 1/0 0/0 0/0 .text daSq_IsDelete__FP8sq_class */ -static bool daSq_IsDelete(sq_class* param_0) { - return true; +static int daSq_IsDelete(sq_class* i_this) { + return 1; } /* 805A09F4-805A0A48 001474 0054+00 1/0 0/0 0/0 .text daSq_Delete__FP8sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSq_Delete(sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/daSq_Delete__FP8sq_class.s" +static int daSq_Delete(sq_class* i_this) { + dComIfG_resDelete(&i_this->mPhaseReq, "Sq"); + if (i_this->mHIOInit) { + hioInit = false; + } + return 1; } -#pragma pop /* 805A0A48-805A0BE8 0014C8 01A0+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/d_a_sq/d_a_sq/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 805A0BE8-805A0C30 001668 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/__dt__12J3DFrameCtrlFv.s" +static int useHeapInit(fopAc_ac_c* i_this) { + sq_class* _this = static_cast<sq_class*>(i_this); + + _this->mpMorf = + new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("Sq", 17)), NULL, NULL, + static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Sq", 9)), + 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); + if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { + return 0; + } + + _this->mpBtkAnm = new mDoExt_btkAnm(); + if (_this->mpBtkAnm == NULL) { + return 0; + } + return _this->mpBtkAnm->init(_this->mpMorf->getModel()->getModelData(), + static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Sq", 20)), + 1, 0, 1.0f, 0, -1) ? 1 : 0; } -#pragma pop - -/* ############################################################################################## */ -/* 805A11E0-805A11E4 000088 0004+00 0/1 0/0 0/0 .rodata @4385 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4385 = 0x407FEF9E; -COMPILER_STRIP_GATE(0x805A11E0, &lit_4385); -#pragma pop /* 805A0C30-805A0FB0 0016B0 0380+00 1/0 0/0 0/0 .text daSq_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSq_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/daSq_Create__FP10fopAc_ac_c.s" +static cPhs__Step daSq_Create(fopAc_ac_c* i_this) { + sq_class* _this = static_cast<sq_class*>(i_this); + fopAcM_SetupActor(i_this, sq_class); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhaseReq, "Sq"); + + if (step == cPhs_COMPLEATE_e) { + _this->mParam0 = fopAcM_GetParam(_this) & 0xff; + if (_this->mParam0 == 1) { + fopAcM_create(PROC_NPC_SQ, fopAcM_GetParam(_this), &_this->home.pos, + fopAcM_GetRoomNo(_this), &_this->home.angle, NULL, 0xff); + return cPhs_ERROR_e; + } + + _this->mParam1 = (fopAcM_GetParam(_this) >> 8) & 0xff; + _this->mParam2 = (fopAcM_GetParam(_this) >> 0x10) & 0xff; + _this->mParam3 = (fopAcM_GetParam(_this) >> 0x18) & 0xff; + _this->field_0x5b9 = (fopAcM_GetParam(_this) >> 0x10) & 0xff; + _this->field_0x5b8 = (fopAcM_GetParam(_this) >> 0x18) & 0xff; + _this->mFlowID = _this->current.angle.z; + _this->shape_angle.z = 0; + _this->current.angle.z = 0; + + if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x17c0)) { + return cPhs_ERROR_e; + } + + if (!hioInit) { + _this->mHIOInit = true; + hioInit = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_OnStatus(_this, 0x100); + _this->attention_info.flags = 0; + _this->mAction = sq_class::ACT_NORMAL; + fopAcM_SetMtx(_this, _this->mpMorf->getModel()->getBaseTRMtx()); + _this->mAcch.Set(fopAcM_GetPosition_p(_this), fopAcM_GetOldPosition_p(_this), _this, 1, + &_this->mAcchCir, fopAcM_GetSpeed_p(_this), NULL, NULL); + _this->mAcchCir.SetWall(30.0f, 40.0f); + _this->health = 1; + _this->field_0x560 = 1; + _this->mCcStts.Init(100, 0, _this); + + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 20.0f} // mSph + } // mSphAttr + }; + _this->mCcSph.Set(cc_sph_src); + _this->mCcSph.SetStts(&_this->mCcStts); + + static dCcD_SrcSph at_sph_src = { + { + {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 15.0f} // mSph + } // mSphAttr + }; + _this->mAtSph.Set(at_sph_src); + _this->mAtSph.SetStts(&_this->mCcStts); + + _this->attention_info.field_0x0[4] = 7; + + if (_this->mParam1 == 0xff) { + _this->mBtkFrame = cM_rndF(3.999f); + } else { + _this->mBtkFrame = _this->mParam1; + if (_this->mBtkFrame > 3) { + _this->mBtkFrame = 3; + } + } + + daSq_Execute(_this); + } + return step; } -#pragma pop - -/* 805A0FB0-805A0FF8 001A30 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/d_a_sq/d_a_sq/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 805A0FF8-805A1040 001A78 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/d_a_sq/d_a_sq/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 805A1040-805A10B0 001AC0 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/d_a_sq/d_a_sq/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 805A10B0-805A10F8 001B30 0048+00 2/1 0/0 0/0 .text __dt__10daSq_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daSq_HIO_c::~daSq_HIO_c() { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/__dt__10daSq_HIO_cFv.s" -} -#pragma pop - -/* 805A10F8-805A1134 001B78 003C+00 0/0 1/0 0/0 .text __sinit_d_a_sq_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_sq_cpp() { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/__sinit_d_a_sq_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x805A10F8, __sinit_d_a_sq_cpp); -#pragma pop - -/* 805A1134-805A113C 001BB4 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_805A1134() { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/func_805A1134.s" -} -#pragma pop - -/* 805A113C-805A1144 001BBC 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_805A113C() { - nofralloc -#include "asm/rel/d/a/d_a_sq/d_a_sq/func_805A113C.s" -} -#pragma pop -/* 805A11E4-805A11E4 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 805A1284-805A12A4 -00001 0020+00 1/0 0/0 0/0 .data l_daSq_Method */ +static actor_method_class l_daSq_Method = { + (process_method_func)daSq_Create, + (process_method_func)daSq_Delete, + (process_method_func)daSq_Execute, + (process_method_func)daSq_IsDelete, + (process_method_func)daSq_Draw, +}; + +/* 805A12A4-805A12D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_SQ */ +extern actor_process_profile_definition g_profile_SQ = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_SQ, + &g_fpcLf_Method.mBase, + sizeof(sq_class), + 0, + 0, + &g_fopAc_Method.base, + 0x2B9, + &l_daSq_Method, + 0xC0000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, +}; diff --git a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp index 7a796649ce..c373189e14 100644 --- a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp +++ b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp @@ -1,817 +1,422 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_npc_sq -// +/** + * d_a_npc_sq.cpp + * NPC - Squirrel + */ #include "rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct npc_sq_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorf { - /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); - /* 800105C8 */ void play(Vec*, u32, s8); - /* 80010680 */ void entryDL(); - /* 800106AC */ void modelCalc(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daNpc_Sq_HIO_c { - /* 80AF5FEC */ daNpc_Sq_HIO_c(); - /* 80AF7360 */ ~daNpc_Sq_HIO_c(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -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 { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A540 */ void getNowMsgNo(); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCamera_c { - /* 801614AC */ void Start(); - /* 801614D0 */ void Stop(); - /* 8016300C */ void SetTrimSize(s32); - /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80AF72F0 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct csXyz {}; - -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 {}; +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" -struct _GXTexObj {}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80AF6F50 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void __ct__14daNpc_Sq_HIO_cFv(); -extern "C" static void anm_init__FP12npc_sq_classifUcf(); -extern "C" static void daNpc_Sq_Draw__FP12npc_sq_class(); -extern "C" static void npc_sq_normal__FP12npc_sq_class(); -extern "C" static void action__FP12npc_sq_class(); -extern "C" static void cam_3d_morf__FP12npc_sq_classf(); -extern "C" static void demo_camera__FP12npc_sq_class(); -extern "C" static void daNpc_Sq_Execute__FP12npc_sq_class(); -extern "C" static bool daNpc_Sq_IsDelete__FP12npc_sq_class(); -extern "C" static void daNpc_Sq_Delete__FP12npc_sq_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daNpc_Sq_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__14daNpc_Sq_HIO_cFv(); -extern "C" void __sinit_d_a_npc_sq_cpp(); -extern "C" static void func_80AF73E4(); -extern "C" static void func_80AF73EC(); -extern "C" extern char const* const d_a_npc_sq__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 init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void -__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl(); -extern "C" void setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv(); -extern "C" void play__14mDoExt_McaMorfFP3VecUlSc(); -extern "C" void entryDL__14mDoExt_McaMorfFv(); -extern "C" void modelCalc__14mDoExt_McaMorfFv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -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 Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void Start__9dCamera_cFv(); -extern "C" void Stop__9dCamera_cFv(); -extern "C" void SetTrimSize__9dCamera_cFl(); -extern "C" void Set__9dCamera_cF4cXyz4cXyzfs(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -extern "C" void getNowMsgNo__10dMsgFlow_cFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void cM_rndF__Ff(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void MtxPosition__FP4cXyzP4cXyz(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__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 void* calc_mtx[1 + 1 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80AF7408-80AF740C 000000 0004+00 7/7 0/0 0/0 .rodata @3768 */ -SECTION_RODATA static f32 const lit_3768 = 2.0f; -COMPILER_STRIP_GATE(0x80AF7408, &lit_3768); - -/* 80AF74A8-80AF74D0 -00001 0028+00 1/1 0/0 0/0 .data @4052 */ -SECTION_DATA static void* lit_4052[10] = { - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x4B0), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x68), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x128), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x294), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x2E0), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x338), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x3E8), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x4B0), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x4B0), - (void*)(((char*)demo_camera__FP12npc_sq_class) + 0x49C), -}; - -/* 80AF74D0-80AF7510 000028 0040+00 1/1 0/0 0/0 .data cc_sph_src$4176 */ -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 20.0f} // mSph - } // mSphAttr -}; - -/* 80AF7510-80AF7530 -00001 0020+00 1/0 0/0 0/0 .data l_daNpc_Sq_Method */ -SECTION_DATA static void* l_daNpc_Sq_Method[8] = { - (void*)daNpc_Sq_Create__FP10fopAc_ac_c, - (void*)daNpc_Sq_Delete__FP12npc_sq_class, - (void*)daNpc_Sq_Execute__FP12npc_sq_class, - (void*)daNpc_Sq_IsDelete__FP12npc_sq_class, - (void*)daNpc_Sq_Draw__FP12npc_sq_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80AF7530-80AF7560 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_SQ */ -SECTION_DATA extern void* g_profile_NPC_SQ[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x010B0000, (void*)&g_fpcLf_Method, - (void*)0x00000A44, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02BA0000, (void*)&l_daNpc_Sq_Method, - (void*)0x000C0000, (void*)NULL, -}; - -/* 80AF7560-80AF756C 0000B8 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, -}; - -/* 80AF756C-80AF7578 0000C4 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, -}; - -/* 80AF7578-80AF759C 0000D0 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_80AF73EC, - (void*)NULL, - (void*)NULL, - (void*)func_80AF73E4, -}; - -/* 80AF759C-80AF75A8 0000F4 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; +/* 80AF75C0-80AF75C4 000008 0004+00 2/2 0/0 0/0 .bss None */ +static bool hioInit; -/* 80AF75A8-80AF75B4 000100 000C+00 2/2 0/0 0/0 .data __vt__14daNpc_Sq_HIO_c */ -SECTION_DATA extern void* __vt__14daNpc_Sq_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daNpc_Sq_HIO_cFv, -}; +/* 80AF75D0-80AF75DC 000018 000C+00 4/4 0/0 0/0 .bss l_HIO */ +static daNpc_Sq_HIO_c l_HIO; /* 80AF5FEC-80AF6010 0000EC 0024+00 1/1 0/0 0/0 .text __ct__14daNpc_Sq_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daNpc_Sq_HIO_c::daNpc_Sq_HIO_c() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__ct__14daNpc_Sq_HIO_cFv.s" +daNpc_Sq_HIO_c::daNpc_Sq_HIO_c() { + field_0x4 = -1; + mScale = 2.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 80AF740C-80AF7410 000004 0004+00 1/5 0/0 0/0 .rodata @3782 */ -SECTION_RODATA static u8 const lit_3782[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AF740C, &lit_3782); - -/* 80AF7410-80AF7414 000008 0004+00 1/1 0/0 0/0 .rodata @3783 */ -SECTION_RODATA static f32 const lit_3783 = -1.0f; -COMPILER_STRIP_GATE(0x80AF7410, &lit_3783); - -/* 80AF74A4-80AF74A4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AF74A4 = "Sq"; -#pragma pop /* 80AF6010-80AF60B8 000110 00A8+00 2/2 0/0 0/0 .text anm_init__FP12npc_sq_classifUcf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void anm_init(npc_sq_class* param_0, int param_1, f32 param_2, u8 param_3, f32 param_4) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/anm_init__FP12npc_sq_classifUcf.s" +static void anm_init(npc_sq_class* i_this, int i_bck, f32 i_morf, u8 i_mode, f32 i_speed) { + i_this->mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Sq", i_bck)), + i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL); } -#pragma pop - -/* ############################################################################################## */ -/* 80AF7414-80AF7418 00000C 0004+00 0/2 0/0 0/0 .rodata @3810 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3810 = 100.0f; -COMPILER_STRIP_GATE(0x80AF7414, &lit_3810); -#pragma pop - -/* 80AF7418-80AF741C 000010 0004+00 0/1 0/0 0/0 .rodata @3811 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3811 = 600.0f; -COMPILER_STRIP_GATE(0x80AF7418, &lit_3811); -#pragma pop - -/* 80AF741C-80AF7420 000014 0004+00 0/2 0/0 0/0 .rodata @3812 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3812 = 10.0f; -COMPILER_STRIP_GATE(0x80AF741C, &lit_3812); -#pragma pop - -/* 80AF7420-80AF7424 000018 0004+00 1/3 0/0 0/0 .rodata @3813 */ -SECTION_RODATA static f32 const lit_3813 = 1.0f; -COMPILER_STRIP_GATE(0x80AF7420, &lit_3813); - -/* 80AF75C0-80AF75C4 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80AF75C0[4]; - -/* 80AF75C4-80AF75D0 00000C 000C+00 1/1 0/0 0/0 .bss @3763 */ -static u8 lit_3763[12]; - -/* 80AF75D0-80AF75DC 000018 000C+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[12]; /* 80AF60B8-80AF61B0 0001B8 00F8+00 1/0 0/0 0/0 .text daNpc_Sq_Draw__FP12npc_sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpc_Sq_Draw(npc_sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Draw__FP12npc_sq_class.s" +static int daNpc_Sq_Draw(npc_sq_class* i_this) { + J3DModel* model = i_this->mpMorf->getModel(); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr); + i_this->mpBtkAnm->entry(model->getModelData()); + i_this->mpMorf->entryDL(); + cXyz shadow_pos; + shadow_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, &shadow_pos, 600.0f, 10.0f * l_HIO.mScale, + 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 - -/* ############################################################################################## */ -/* 80AF7424-80AF7428 00001C 0004+00 0/1 0/0 0/0 .rodata @3861 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3861 = 3.0f; -COMPILER_STRIP_GATE(0x80AF7424, &lit_3861); -#pragma pop - -/* 80AF7428-80AF742C 000020 0004+00 0/1 0/0 0/0 .rodata @3862 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3862 = 15.0f; -COMPILER_STRIP_GATE(0x80AF7428, &lit_3862); -#pragma pop - -/* 80AF742C-80AF7430 000024 0004+00 0/1 0/0 0/0 .rodata @3863 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3863 = 210.0f; -COMPILER_STRIP_GATE(0x80AF742C, &lit_3863); -#pragma pop - -/* 80AF7430-80AF7434 000028 0004+00 0/1 0/0 0/0 .rodata @3864 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3864 = 800.0f; -COMPILER_STRIP_GATE(0x80AF7430, &lit_3864); -#pragma pop - -/* 80AF7434-80AF7438 00002C 0004+00 0/1 0/0 0/0 .rodata @3865 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3865 = -375.0f; -COMPILER_STRIP_GATE(0x80AF7434, &lit_3865); -#pragma pop - -/* 80AF7438-80AF7440 000030 0008+00 0/1 0/0 0/0 .rodata @3866 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3866[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF7438, &lit_3866); -#pragma pop - -/* 80AF7440-80AF7448 000038 0008+00 0/1 0/0 0/0 .rodata @3867 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3867[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF7440, &lit_3867); -#pragma pop - -/* 80AF7448-80AF7450 000040 0008+00 0/1 0/0 0/0 .rodata @3868 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3868[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF7448, &lit_3868); -#pragma pop - -/* 80AF7450-80AF7454 000048 0004+00 0/1 0/0 0/0 .rodata @3869 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3869 = 250.0f; -COMPILER_STRIP_GATE(0x80AF7450, &lit_3869); -#pragma pop /* 80AF61B0-80AF63C0 0002B0 0210+00 1/1 0/0 0/0 .text npc_sq_normal__FP12npc_sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void npc_sq_normal(npc_sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/npc_sq_normal__FP12npc_sq_class.s" +static void npc_sq_normal(npc_sq_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + + switch (i_this->mMode) { + case 0: + anm_init(i_this, 9, 3.0f, 2, 1.0f); + i_this->mMode = 1; + break; + + case 1: + break; + + case 2: + cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->home.angle.y + 0x4000, 2, 0x3000); + if (i_this->mTimer[0] == 1) { + anm_init(i_this, 7, 2.0f, 2, 1.0f); + i_this->speedF = 15.0f; + } + } + + cXyz vec; + vec.x = 210.0f; + vec.y = 800.0f; + vec.z = -375.0f; + vec -= player->current.pos; + vec.y = 0.0f; + if (i_this->mDemoMode == 0 && vec.abs() < 250.0f) { + i_this->mDemoMode = 1; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80AF7454-80AF7458 00004C 0004+00 0/1 0/0 0/0 .rodata @3893 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3893 = -5.0f; -COMPILER_STRIP_GATE(0x80AF7454, &lit_3893); -#pragma pop - -/* 80AF7458-80AF745C 000050 0004+00 0/1 0/0 0/0 .rodata @3894 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3894 = -80.0f; -COMPILER_STRIP_GATE(0x80AF7458, &lit_3894); -#pragma pop /* 80AF63C0-80AF6518 0004C0 0158+00 1/1 0/0 0/0 .text action__FP12npc_sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(npc_sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/action__FP12npc_sq_class.s" +static void action(npc_sq_class* i_this) { + i_this->mPlayerDist = fopAcM_searchPlayerDistance(i_this); + + switch (i_this->mAction) { + case npc_sq_class::ACT_NORMAL: + npc_sq_normal(i_this); + } + + cXyz vec1, vec2; + cMtx_YrotS(*calc_mtx, i_this->current.angle.y); + vec1.x = 0.0f; + vec1.y = 0.0f; + vec1.z = i_this->speedF; + MtxPosition(&vec1, &vec2); + i_this->speed.x = vec2.x; + i_this->speed.z = vec2.z; + i_this->speed.y += -5.0f; + i_this->current.pos += i_this->speed; + if (i_this->speed.y < -80.0f) { + i_this->speed.y = -80.0f; + } + + cXyz* move_p = i_this->mCcStts.GetCCMoveP(); + if (move_p != NULL) { + i_this->current.pos.x += move_p->x; + i_this->current.pos.y += move_p->y; + i_this->current.pos.z += move_p->z; + } + i_this->mAcch.CrrPos(dComIfG_Bgsp()); + + cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->current.angle.y, 2, 0x4000); + cLib_addCalcAngleS2(&i_this->shape_angle.x, i_this->current.angle.x, 2, 0x4000); + i_this->shape_angle.z = i_this->current.angle.z; } -#pragma pop /* 80AF6518-80AF65FC 000618 00E4+00 1/1 0/0 0/0 .text cam_3d_morf__FP12npc_sq_classf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void cam_3d_morf(npc_sq_class* param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/cam_3d_morf__FP12npc_sq_classf.s" +static void cam_3d_morf(npc_sq_class* i_this, f32 i_scale) { + cLib_addCalc2(&i_this->mCameraCenter.x, i_this->mCameraTargetCenter.x, i_scale, + i_this->mCameraCenterDist.x * i_this->mCameraSpeed); + cLib_addCalc2(&i_this->mCameraCenter.y, i_this->mCameraTargetCenter.y, i_scale, + i_this->mCameraCenterDist.y * i_this->mCameraSpeed); + cLib_addCalc2(&i_this->mCameraCenter.z, i_this->mCameraTargetCenter.z, i_scale, + i_this->mCameraCenterDist.z * i_this->mCameraSpeed); + cLib_addCalc2(&i_this->mCameraEye.x, i_this->mCameraTargetEye.x, i_scale, + i_this->mCameraEyeDist.x * i_this->mCameraSpeed); + cLib_addCalc2(&i_this->mCameraEye.y, i_this->mCameraTargetEye.y, i_scale, + i_this->mCameraEyeDist.y * i_this->mCameraSpeed); + cLib_addCalc2(&i_this->mCameraEye.z, i_this->mCameraTargetEye.z, i_scale, + i_this->mCameraEyeDist.z * i_this->mCameraSpeed); } -#pragma pop - -/* ############################################################################################## */ -/* 80AF745C-80AF7460 000054 0004+00 0/1 0/0 0/0 .rodata @4040 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4040 = 55.0f; -COMPILER_STRIP_GATE(0x80AF745C, &lit_4040); -#pragma pop - -/* 80AF7460-80AF7464 000058 0004+00 0/1 0/0 0/0 .rodata @4041 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4041 = -30.0f; -COMPILER_STRIP_GATE(0x80AF7460, &lit_4041); -#pragma pop - -/* 80AF7464-80AF7468 00005C 0004+00 0/1 0/0 0/0 .rodata @4042 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4042 = -150.0f; -COMPILER_STRIP_GATE(0x80AF7464, &lit_4042); -#pragma pop - -/* 80AF7468-80AF746C 000060 0004+00 0/1 0/0 0/0 .rodata @4043 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4043 = 63.0f; -COMPILER_STRIP_GATE(0x80AF7468, &lit_4043); -#pragma pop /* 80AF65FC-80AF6B74 0006FC 0578+00 2/1 0/0 0/0 .text demo_camera__FP12npc_sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void demo_camera(npc_sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/demo_camera__FP12npc_sq_class.s" +static void demo_camera(npc_sq_class* i_this) { + fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this); + camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_class* camera = dComIfGp_getCamera(0); + cXyz vec; + s8 end = 0; + + switch (i_this->mDemoMode) { + case 1: + if (!_this->eventInfo.i_checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(_this, 2, 0xffff, 0); + _this->eventInfo.i_onCondition(2); + return; + } + player_camera->mCamera.Stop(); + i_this->mDemoMode = 2; + i_this->mDemoTimer = 0; + i_this->mCameraFovY = 55.0f; + player_camera->mCamera.SetTrimSize(3); + i_this->mMsgFlow.init(_this, i_this->mFlowID, 0, NULL); + i_this->mCameraEye = camera->mLookat.mEye; + i_this->mCameraCenter = camera->mLookat.mCenter; + daPy_getPlayerActorClass()->changeOriginalDemo(); + // no break + + case 2: + if (i_this->mDemoTimer == 10) { + daPy_getPlayerActorClass()->changeDemoMode(23, 0, 0, 0); + } + if (i_this->mMsgFlow.doFlow(_this, NULL, 0)) { + i_this->mDemoMode = 3; + i_this->mDemoTimer = 0; + mDoMtx_stack_c::YrotS(_this->shape_angle.y); + vec.x = -30.0f; + vec.y = 100.0f; + vec.z = -150.0f; + mDoMtx_stack_c::multVec(&vec, &i_this->mCameraTargetEye); + i_this->mCameraTargetEye += _this->current.pos; + i_this->mCameraTargetCenter = _this->current.pos; + i_this->mCameraTargetCenter.y += 63.0f; + i_this->mCameraEyeDist.x = fabsf(i_this->mCameraTargetEye.x - i_this->mCameraEye.x); + i_this->mCameraEyeDist.y = fabsf(i_this->mCameraTargetEye.y - i_this->mCameraEye.y); + i_this->mCameraEyeDist.z = fabsf(i_this->mCameraTargetEye.z - i_this->mCameraEye.z); + i_this->mCameraCenterDist.x = + fabsf(i_this->mCameraTargetCenter.x - i_this->mCameraCenter.x); + i_this->mCameraCenterDist.y = + fabsf(i_this->mCameraTargetCenter.y - i_this->mCameraCenter.y); + i_this->mCameraCenterDist.z = + fabsf(i_this->mCameraTargetCenter.z - i_this->mCameraCenter.z); + i_this->mCameraSpeed = 0.0f; + } + break; + + case 3: + cam_3d_morf(i_this, 0.2f); + cLib_addCalc2(&i_this->mCameraSpeed, 0.1f, 1.0f, 0.01f); + if (i_this->mDemoTimer == 80) { + i_this->mMsgFlow.init(_this, i_this->mFlowID, 0, NULL); + i_this->mDemoMode = 4; + } + break; + + case 4: + i_this->mMsgFlow.doFlow(_this, NULL, 0); + if (i_this->mMsgFlow.getNowMsgNo() == 0x2747 || i_this->mMsgFlow.getNowMsgNo() == 0x273E) { + i_this->mDemoMode = 5; + anm_init(i_this, 5, 0.0f, 2, 1.0f); + } + break; + + case 5: + mDoMtx_stack_c::YrotS(_this->shape_angle.y); + vec.x = 0.0f; + vec.y = 0.0f; + vec.z = 150.0f; + mDoMtx_stack_c::multVec(&vec, &i_this->mCameraEye); + i_this->mCameraEye += _this->current.pos; + i_this->mCameraCenter = _this->current.pos; + i_this->mCameraCenter.y += 20.0f; + i_this->mMsgFlow.doFlow(_this, NULL, 0); + if (i_this->mMsgFlow.getNowMsgNo() == 0x2749 || i_this->mMsgFlow.getNowMsgNo() == 0x2740) { + i_this->mDemoMode = 6; + } + break; + + case 6: + mDoMtx_stack_c::YrotS(_this->shape_angle.y); + vec.x = 100.0f; + vec.y = 50.0f; + vec.z = 35.0f; + mDoMtx_stack_c::multVec(&vec, &i_this->mCameraEye); + i_this->mCameraEye += _this->current.pos; + i_this->mCameraCenter = _this->current.pos; + i_this->mCameraCenter.y += 13.0f; + if (i_this->mMsgFlow.doFlow(_this, NULL, 0)) { + i_this->mMode = 2; + i_this->mTimer[0] = 5; + i_this->mDemoTimer = 0; + i_this->mDemoMode = 9; + } + break; + + case 9: + if (i_this->mDemoTimer >= 30) { + end = 1; + fopAcM_delete(_this); + } + } + + if (end) { + player_camera->mCamera.Start(); + player_camera->mCamera.SetTrimSize(0); + dComIfGp_event_reset(); + daPy_getPlayerActorClass()->cancelOriginalDemo(); + i_this->mDemoMode = 0; + } + + if (i_this->mDemoMode != 0) { + player_camera->mCamera.Set(i_this->mCameraCenter, i_this->mCameraEye, + i_this->mCameraFovY, 0); + i_this->mDemoTimer++; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80AF746C-80AF7470 000064 0004+00 0/0 0/0 0/0 .rodata @4044 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4044 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80AF746C, &lit_4044); -#pragma pop - -/* 80AF7470-80AF7474 000068 0004+00 0/0 0/0 0/0 .rodata @4045 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4045 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80AF7470, &lit_4045); -#pragma pop - -/* 80AF7474-80AF7478 00006C 0004+00 0/0 0/0 0/0 .rodata @4046 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4046 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80AF7474, &lit_4046); -#pragma pop - -/* 80AF7478-80AF747C 000070 0004+00 0/0 0/0 0/0 .rodata @4047 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4047 = 150.0f; -COMPILER_STRIP_GATE(0x80AF7478, &lit_4047); -#pragma pop - -/* 80AF747C-80AF7480 000074 0004+00 0/1 0/0 0/0 .rodata @4048 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4048 = 20.0f; -COMPILER_STRIP_GATE(0x80AF747C, &lit_4048); -#pragma pop - -/* 80AF7480-80AF7484 000078 0004+00 0/0 0/0 0/0 .rodata @4049 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4049 = 50.0f; -COMPILER_STRIP_GATE(0x80AF7480, &lit_4049); -#pragma pop - -/* 80AF7484-80AF7488 00007C 0004+00 0/0 0/0 0/0 .rodata @4050 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4050 = 35.0f; -COMPILER_STRIP_GATE(0x80AF7484, &lit_4050); -#pragma pop - -/* 80AF7488-80AF7490 000080 0004+04 0/0 0/0 0/0 .rodata @4051 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4051[1 + 1 /* padding */] = { - 13.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80AF7488, &lit_4051); -#pragma pop - -/* 80AF7490-80AF7498 000088 0008+00 0/1 0/0 0/0 .rodata @4097 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4097[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF7490, &lit_4097); -#pragma pop /* 80AF6B74-80AF6D54 000C74 01E0+00 2/1 0/0 0/0 .text daNpc_Sq_Execute__FP12npc_sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpc_Sq_Execute(npc_sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Execute__FP12npc_sq_class.s" +static int daNpc_Sq_Execute(npc_sq_class* i_this) { + cXyz vec(0.0f, 0.0f, 0.0f); + i_this->mCounter++; + for (int i = 0; i < 4; i++) { + if (i_this->mTimer[i] != 0) { + i_this->mTimer[i]--; + } + } + + action(i_this); + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->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); + J3DModel* model = i_this->mpMorf->getModel(); + model->setBaseTRMtx(mDoMtx_stack_c::get()); + + i_this->mpMorf->play(&i_this->eyePos, 0, 0); + i_this->mpBtkAnm->setFrame(i_this->mBtkFrame); + i_this->mpMorf->modelCalc(); + + MTXCopy(model->getAnmMtx(2), *calc_mtx); + MtxPosition(&vec, &i_this->eyePos); + i_this->attention_info.position = i_this->eyePos; + i_this->attention_info.position.y += 20.0f * l_HIO.mScale; + + i_this->mCcSph.SetC(i_this->eyePos); + i_this->mCcSph.SetR(10.0f * l_HIO.mScale); + dComIfG_Ccsp()->Set(&i_this->mCcSph); + + demo_camera(i_this); + return 1; } -#pragma pop /* 80AF6D54-80AF6D5C 000E54 0008+00 1/0 0/0 0/0 .text daNpc_Sq_IsDelete__FP12npc_sq_class */ -static bool daNpc_Sq_IsDelete(npc_sq_class* param_0) { - return true; +static int daNpc_Sq_IsDelete(npc_sq_class* i_this) { + return 1; } /* 80AF6D5C-80AF6DB0 000E5C 0054+00 1/0 0/0 0/0 .text daNpc_Sq_Delete__FP12npc_sq_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpc_Sq_Delete(npc_sq_class* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Delete__FP12npc_sq_class.s" +static int daNpc_Sq_Delete(npc_sq_class* i_this) { + dComIfG_resDelete(&i_this->mPhaseReq, "Sq"); + if (i_this->mHIOInit) { + hioInit = false; + } + return 1; } -#pragma pop /* 80AF6DB0-80AF6F50 000EB0 01A0+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/npc/d_a_npc_sq/d_a_npc_sq/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80AF6F50-80AF6F98 001050 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__12J3DFrameCtrlFv.s" +static int useHeapInit(fopAc_ac_c* i_this) { + npc_sq_class* _this = static_cast<npc_sq_class*>(i_this); + + _this->mpMorf = + new mDoExt_McaMorf(static_cast<J3DModelData*>(dComIfG_getObjectRes("Sq", 17)), NULL, NULL, + static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Sq", 9)), + 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); + if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { + return 0; + } + + _this->mpBtkAnm = new mDoExt_btkAnm(); + if (_this->mpBtkAnm == NULL) { + return 0; + } + return _this->mpBtkAnm->init(_this->mpMorf->getModel()->getModelData(), + static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Sq", 20)), + 1, 0, 1.0f, 0, -1) ? 1 : 0; } -#pragma pop - -/* ############################################################################################## */ -/* 80AF7498-80AF749C 000090 0004+00 0/1 0/0 0/0 .rodata @4266 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4266 = 30.0f; -COMPILER_STRIP_GATE(0x80AF7498, &lit_4266); -#pragma pop - -/* 80AF749C-80AF74A0 000094 0004+00 0/1 0/0 0/0 .rodata @4267 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4267 = 40.0f; -COMPILER_STRIP_GATE(0x80AF749C, &lit_4267); -#pragma pop - -/* 80AF74A0-80AF74A4 000098 0004+00 0/1 0/0 0/0 .rodata @4268 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4268 = 0x407FEF9E; -COMPILER_STRIP_GATE(0x80AF74A0, &lit_4268); -#pragma pop /* 80AF6F98-80AF7260 001098 02C8+00 1/0 0/0 0/0 .text daNpc_Sq_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNpc_Sq_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/daNpc_Sq_Create__FP10fopAc_ac_c.s" +static cPhs__Step daNpc_Sq_Create(fopAc_ac_c* i_this) { + fopAcM_SetupActor(i_this, npc_sq_class); + npc_sq_class* _this = static_cast<npc_sq_class*>(i_this); + + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhaseReq, "Sq"); + if (step == cPhs_COMPLEATE_e) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[25])) { + return cPhs_ERROR_e; + } + + _this->mParam0 = (u8)fopAcM_GetParam(_this); + _this->mParam1 = (u8)(fopAcM_GetParam(_this) >> 8); + _this->mFlowID = 0xDB; + _this->shape_angle.z = 0; + _this->current.angle.z = 0; + + if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x4b000)) { + return cPhs_ERROR_e; + } + + if (!hioInit) { + _this->mHIOInit = true; + hioInit = true; + l_HIO.field_0x4 = -1; + } + + fopAcM_OnStatus(_this, 0x100); + _this->attention_info.flags = 0; + _this->mAction = npc_sq_class::ACT_NORMAL; + fopAcM_SetMtx(_this, _this->mpMorf->getModel()->getBaseTRMtx()); + _this->mAcch.Set(fopAcM_GetPosition_p(_this), fopAcM_GetOldPosition_p(_this), _this, 1, + &_this->mAcchCir, fopAcM_GetSpeed_p(_this), NULL, NULL); + _this->mAcchCir.SetWall(30.0f, 40.0f); + + _this->mCcStts.Init(100, 0, _this); + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 20.0f} // mSph + } // mSphAttr + }; + _this->mCcSph.Set(cc_sph_src); + _this->mCcSph.SetStts(&_this->mCcStts); + + if (_this->mParam1 == 0xff) { + _this->mBtkFrame = cM_rndF(3.999f); + } else { + _this->mBtkFrame = _this->mParam1; + if (_this->mBtkFrame > 3) { + _this->mBtkFrame = 3; + } + } + + daNpc_Sq_Execute(_this); + } + + return step; } -#pragma pop - -/* 80AF7260-80AF72A8 001360 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/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 80AF72A8-80AF72F0 0013A8 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/npc/d_a_npc_sq/d_a_npc_sq/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80AF72F0-80AF7360 0013F0 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/npc/d_a_npc_sq/d_a_npc_sq/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80AF7360-80AF73A8 001460 0048+00 2/1 0/0 0/0 .text __dt__14daNpc_Sq_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daNpc_Sq_HIO_c::~daNpc_Sq_HIO_c() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__dt__14daNpc_Sq_HIO_cFv.s" -} -#pragma pop - -/* 80AF73A8-80AF73E4 0014A8 003C+00 0/0 1/0 0/0 .text __sinit_d_a_npc_sq_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_npc_sq_cpp() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/__sinit_d_a_npc_sq_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80AF73A8, __sinit_d_a_npc_sq_cpp); -#pragma pop - -/* 80AF73E4-80AF73EC 0014E4 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_80AF73E4() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73E4.s" -} -#pragma pop - -/* 80AF73EC-80AF73F4 0014EC 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_80AF73EC() { - nofralloc -#include "asm/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq/func_80AF73EC.s" -} -#pragma pop -/* 80AF74A4-80AF74A4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80AF7510-80AF7530 -00001 0020+00 1/0 0/0 0/0 .data l_daNpc_Sq_Method */ +static actor_method_class l_daNpc_Sq_Method = { + (process_method_func)daNpc_Sq_Create, + (process_method_func)daNpc_Sq_Delete, + (process_method_func)daNpc_Sq_Execute, + (process_method_func)daNpc_Sq_IsDelete, + (process_method_func)daNpc_Sq_Draw, +}; + +/* 80AF7530-80AF7560 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_SQ */ +extern actor_process_profile_definition g_profile_NPC_SQ = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_NPC_SQ, + &g_fpcLf_Method.mBase, + sizeof(npc_sq_class), + 0, + 0, + &g_fopAc_Method.base, + 0x2BA, + &l_daNpc_Sq_Method, + 0xC0000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, +}; |