From 3e2b193c0f9ad566845ef9681e03b560b203a4f1 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sun, 24 Mar 2024 13:31:59 +0200 Subject: [PATCH] daFmtMng_c OK (#2106) --- .../d_a_formation_mng/__dt__11FmtMember_cFv.s | 17 - .../d_a_formation_mng/__dt__8FmtPos_cFv.s | 17 - .../__sinit_d_a_formation_mng_cpp.s | 65 -- .../checkPathEnd__15daFmtMng_Path_cF4cXyzf.s | 48 - .../checkPoint__15daFmtMng_Path_cF4cXyzf.s | 122 -- .../create__10daFmtMng_cFv.s | 25 - .../create_init__10daFmtMng_cFv.s | 176 --- .../daFmtMng_Create__FP10fopAc_ac_c.s | 9 - .../daFmtMng_Delete__FP10daFmtMng_c.s | 41 - .../daFmtMng_Execute__FP10daFmtMng_c.s | 97 -- .../executeFight__10daFmtMng_cFv.s | 130 --- .../executeMotion__10daFmtMng_cFv.s | 95 -- .../executeReverse__10daFmtMng_cFv.s | 251 ---- .../executeWait__10daFmtMng_cFv.s | 147 --- .../executeWalk__10daFmtMng_cFv.s | 294 ----- .../initFight__10daFmtMng_cFv.s | 68 -- .../initMemberPos__10daFmtMng_cFv.s | 347 ------ .../initMotion__10daFmtMng_cFv.s | 126 -- .../initReverse__10daFmtMng_cFv.s | 41 - .../initWait__10daFmtMng_cFv.s | 55 - .../initWalk__10daFmtMng_cFv.s | 53 - .../setMovePath__10daFmtMng_cFP8FmtPos_ci.s | 253 ---- include/d/kankyo/d_kankyo.h | 2 + .../d/a/d_a_formation_mng/d_a_formation_mng.h | 339 ++++++ .../d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h | 27 + .../a/d_a_formation_mng/d_a_formation_mng.cpp | 1016 ++++++----------- rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp | 4 +- 27 files changed, 727 insertions(+), 3138 deletions(-) delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__11FmtMember_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__8FmtPos_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__sinit_d_a_formation_mng_cpp.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPathEnd__15daFmtMng_Path_cF4cXyzf.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPoint__15daFmtMng_Path_cF4cXyzf.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create_init__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Delete__FP10daFmtMng_c.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Execute__FP10daFmtMng_c.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeFight__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeMotion__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeReverse__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWait__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWalk__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initFight__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMemberPos__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMotion__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initReverse__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWait__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWalk__10daFmtMng_cFv.s delete mode 100644 asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/setMovePath__10daFmtMng_cFP8FmtPos_ci.s diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__11FmtMember_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__11FmtMember_cFv.s deleted file mode 100644 index 579657f418f..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__11FmtMember_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80837458: -/* 80837458 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8083745C 7C 08 02 A6 */ mflr r0 -/* 80837460 90 01 00 14 */ stw r0, 0x14(r1) -/* 80837464 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80837468 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8083746C 41 82 00 10 */ beq lbl_8083747C -/* 80837470 7C 80 07 35 */ extsh. r0, r4 -/* 80837474 40 81 00 08 */ ble lbl_8083747C -/* 80837478 4B A9 78 C5 */ bl __dl__FPv -lbl_8083747C: -/* 8083747C 7F E3 FB 78 */ mr r3, r31 -/* 80837480 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80837484 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80837488 7C 08 03 A6 */ mtlr r0 -/* 8083748C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80837490 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__8FmtPos_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__8FmtPos_cFv.s deleted file mode 100644 index c93b37f95ec..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__8FmtPos_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80836C24: -/* 80836C24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80836C28 7C 08 02 A6 */ mflr r0 -/* 80836C2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80836C30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80836C34 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80836C38 41 82 00 10 */ beq lbl_80836C48 -/* 80836C3C 7C 80 07 35 */ extsh. r0, r4 -/* 80836C40 40 81 00 08 */ ble lbl_80836C48 -/* 80836C44 4B A9 80 F9 */ bl __dl__FPv -lbl_80836C48: -/* 80836C48 7F E3 FB 78 */ mr r3, r31 -/* 80836C4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80836C50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80836C54 7C 08 03 A6 */ mtlr r0 -/* 80836C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80836C5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__sinit_d_a_formation_mng_cpp.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__sinit_d_a_formation_mng_cpp.s deleted file mode 100644 index c0cebb07563..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__sinit_d_a_formation_mng_cpp.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8083779C: -/* 8083779C 3C 60 80 83 */ lis r3, cNullVec__6Z2Calc@ha /* 0x8083792C@ha */ -/* 808377A0 38 83 79 2C */ addi r4, r3, cNullVec__6Z2Calc@l /* 0x8083792C@l */ -/* 808377A4 80 64 00 20 */ lwz r3, 0x20(r4) -/* 808377A8 80 04 00 24 */ lwz r0, 0x24(r4) -/* 808377AC 90 64 00 98 */ stw r3, 0x98(r4) -/* 808377B0 90 04 00 9C */ stw r0, 0x9c(r4) -/* 808377B4 80 04 00 28 */ lwz r0, 0x28(r4) -/* 808377B8 90 04 00 A0 */ stw r0, 0xa0(r4) -/* 808377BC 38 64 00 98 */ addi r3, r4, 0x98 -/* 808377C0 80 A4 00 2C */ lwz r5, 0x2c(r4) -/* 808377C4 80 04 00 30 */ lwz r0, 0x30(r4) -/* 808377C8 90 A3 00 0C */ stw r5, 0xc(r3) -/* 808377CC 90 03 00 10 */ stw r0, 0x10(r3) -/* 808377D0 80 04 00 34 */ lwz r0, 0x34(r4) -/* 808377D4 90 03 00 14 */ stw r0, 0x14(r3) -/* 808377D8 80 A4 00 38 */ lwz r5, 0x38(r4) -/* 808377DC 80 04 00 3C */ lwz r0, 0x3c(r4) -/* 808377E0 90 A3 00 18 */ stw r5, 0x18(r3) -/* 808377E4 90 03 00 1C */ stw r0, 0x1c(r3) -/* 808377E8 80 04 00 40 */ lwz r0, 0x40(r4) -/* 808377EC 90 03 00 20 */ stw r0, 0x20(r3) -/* 808377F0 80 A4 00 44 */ lwz r5, 0x44(r4) -/* 808377F4 80 04 00 48 */ lwz r0, 0x48(r4) -/* 808377F8 90 A3 00 24 */ stw r5, 0x24(r3) -/* 808377FC 90 03 00 28 */ stw r0, 0x28(r3) -/* 80837800 80 04 00 4C */ lwz r0, 0x4c(r4) -/* 80837804 90 03 00 2C */ stw r0, 0x2c(r3) -/* 80837808 80 A4 00 50 */ lwz r5, 0x50(r4) -/* 8083780C 80 04 00 54 */ lwz r0, 0x54(r4) -/* 80837810 90 A3 00 30 */ stw r5, 0x30(r3) -/* 80837814 90 03 00 34 */ stw r0, 0x34(r3) -/* 80837818 80 04 00 58 */ lwz r0, 0x58(r4) -/* 8083781C 90 03 00 38 */ stw r0, 0x38(r3) -/* 80837820 80 A4 00 5C */ lwz r5, 0x5c(r4) -/* 80837824 80 04 00 60 */ lwz r0, 0x60(r4) -/* 80837828 90 A3 00 3C */ stw r5, 0x3c(r3) -/* 8083782C 90 03 00 40 */ stw r0, 0x40(r3) -/* 80837830 80 04 00 64 */ lwz r0, 0x64(r4) -/* 80837834 90 03 00 44 */ stw r0, 0x44(r3) -/* 80837838 80 A4 00 68 */ lwz r5, 0x68(r4) -/* 8083783C 80 04 00 6C */ lwz r0, 0x6c(r4) -/* 80837840 90 A3 00 48 */ stw r5, 0x48(r3) -/* 80837844 90 03 00 4C */ stw r0, 0x4c(r3) -/* 80837848 80 04 00 70 */ lwz r0, 0x70(r4) -/* 8083784C 90 03 00 50 */ stw r0, 0x50(r3) -/* 80837850 80 A4 00 74 */ lwz r5, 0x74(r4) -/* 80837854 80 04 00 78 */ lwz r0, 0x78(r4) -/* 80837858 90 A3 00 54 */ stw r5, 0x54(r3) -/* 8083785C 90 03 00 58 */ stw r0, 0x58(r3) -/* 80837860 80 04 00 7C */ lwz r0, 0x7c(r4) -/* 80837864 90 03 00 5C */ stw r0, 0x5c(r3) -/* 80837868 80 A4 00 80 */ lwz r5, 0x80(r4) -/* 8083786C 80 04 00 84 */ lwz r0, 0x84(r4) -/* 80837870 90 A3 00 60 */ stw r5, 0x60(r3) -/* 80837874 90 03 00 64 */ stw r0, 0x64(r3) -/* 80837878 80 04 00 88 */ lwz r0, 0x88(r4) -/* 8083787C 90 03 00 68 */ stw r0, 0x68(r3) -/* 80837880 80 A4 00 8C */ lwz r5, 0x8c(r4) -/* 80837884 80 04 00 90 */ lwz r0, 0x90(r4) -/* 80837888 90 A3 00 6C */ stw r5, 0x6c(r3) -/* 8083788C 90 03 00 70 */ stw r0, 0x70(r3) -/* 80837890 80 04 00 94 */ lwz r0, 0x94(r4) -/* 80837894 90 03 00 74 */ stw r0, 0x74(r3) -/* 80837898 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPathEnd__15daFmtMng_Path_cF4cXyzf.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPathEnd__15daFmtMng_Path_cF4cXyzf.s deleted file mode 100644 index 43b441002e0..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPathEnd__15daFmtMng_Path_cF4cXyzf.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_808365B0: -/* 808365B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 808365B4 7C 08 02 A6 */ mflr r0 -/* 808365B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 808365BC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 808365C0 7C 7F 1B 78 */ mr r31, r3 -/* 808365C4 80 A3 00 00 */ lwz r5, 0(r3) -/* 808365C8 88 05 00 05 */ lbz r0, 5(r5) -/* 808365CC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 808365D0 41 82 00 0C */ beq lbl_808365DC -/* 808365D4 38 60 00 00 */ li r3, 0 -/* 808365D8 48 00 00 70 */ b lbl_80836648 -lbl_808365DC: -/* 808365DC C0 04 00 00 */ lfs f0, 0(r4) -/* 808365E0 D0 01 00 08 */ stfs f0, 8(r1) -/* 808365E4 C0 04 00 04 */ lfs f0, 4(r4) -/* 808365E8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 808365EC C0 04 00 08 */ lfs f0, 8(r4) -/* 808365F0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 808365F4 38 81 00 08 */ addi r4, r1, 8 -/* 808365F8 48 00 00 65 */ bl checkPoint__15daFmtMng_Path_cF4cXyzf -/* 808365FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80836600 41 82 00 44 */ beq lbl_80836644 -/* 80836604 88 1F 00 0C */ lbz r0, 0xc(r31) -/* 80836608 7C 00 07 75 */ extsb. r0, r0 -/* 8083660C 40 81 00 24 */ ble lbl_80836630 -/* 80836610 80 9F 00 04 */ lwz r4, 4(r31) -/* 80836614 80 7F 00 00 */ lwz r3, 0(r31) -/* 80836618 A0 63 00 00 */ lhz r3, 0(r3) -/* 8083661C 38 03 FF FF */ addi r0, r3, -1 -/* 80836620 7C 04 00 00 */ cmpw r4, r0 -/* 80836624 41 80 00 20 */ blt lbl_80836644 -/* 80836628 38 60 00 01 */ li r3, 1 -/* 8083662C 48 00 00 1C */ b lbl_80836648 -lbl_80836630: -/* 80836630 80 1F 00 04 */ lwz r0, 4(r31) -/* 80836634 2C 00 00 00 */ cmpwi r0, 0 -/* 80836638 41 81 00 0C */ bgt lbl_80836644 -/* 8083663C 38 60 00 01 */ li r3, 1 -/* 80836640 48 00 00 08 */ b lbl_80836648 -lbl_80836644: -/* 80836644 38 60 00 00 */ li r3, 0 -lbl_80836648: -/* 80836648 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8083664C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80836650 7C 08 03 A6 */ mtlr r0 -/* 80836654 38 21 00 20 */ addi r1, r1, 0x20 -/* 80836658 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPoint__15daFmtMng_Path_cF4cXyzf.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPoint__15daFmtMng_Path_cF4cXyzf.s deleted file mode 100644 index fb14df53bdb..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPoint__15daFmtMng_Path_cF4cXyzf.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_8083665C: -/* 8083665C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80836660 7C 08 02 A6 */ mflr r0 -/* 80836664 90 01 00 54 */ stw r0, 0x54(r1) -/* 80836668 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8083666C F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80836670 39 61 00 40 */ addi r11, r1, 0x40 -/* 80836674 4B B2 BB 69 */ bl _savegpr_29 -/* 80836678 7C 7D 1B 78 */ mr r29, r3 -/* 8083667C 7C 9E 23 78 */ mr r30, r4 -/* 80836680 FF E0 08 90 */ fmr f31, f1 -/* 80836684 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80836688 3B E3 78 A8 */ addi r31, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 8083668C 80 7D 00 00 */ lwz r3, 0(r29) -/* 80836690 80 9D 00 04 */ lwz r4, 4(r29) -/* 80836694 4B 81 B1 1D */ bl dPath_GetPnt__FPC5dPathi -/* 80836698 C0 5E 00 08 */ lfs f2, 8(r30) -/* 8083669C C0 1E 00 00 */ lfs f0, 0(r30) -/* 808366A0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 808366A4 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 808366A8 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 808366AC D0 41 00 14 */ stfs f2, 0x14(r1) -/* 808366B0 C0 43 00 0C */ lfs f2, 0xc(r3) -/* 808366B4 C0 03 00 04 */ lfs f0, 4(r3) -/* 808366B8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 808366BC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 808366C0 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 808366C4 38 61 00 0C */ addi r3, r1, 0xc -/* 808366C8 38 81 00 18 */ addi r4, r1, 0x18 -/* 808366CC 4B B1 0C D1 */ bl PSVECSquareDistance -/* 808366D0 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 808366D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808366D8 40 81 00 58 */ ble lbl_80836730 -/* 808366DC FC 00 08 34 */ frsqrte f0, f1 -/* 808366E0 C8 9F 00 28 */ lfd f4, 0x28(r31) -/* 808366E4 FC 44 00 32 */ fmul f2, f4, f0 -/* 808366E8 C8 7F 00 30 */ lfd f3, 0x30(r31) -/* 808366EC FC 00 00 32 */ fmul f0, f0, f0 -/* 808366F0 FC 01 00 32 */ fmul f0, f1, f0 -/* 808366F4 FC 03 00 28 */ fsub f0, f3, f0 -/* 808366F8 FC 02 00 32 */ fmul f0, f2, f0 -/* 808366FC FC 44 00 32 */ fmul f2, f4, f0 -/* 80836700 FC 00 00 32 */ fmul f0, f0, f0 -/* 80836704 FC 01 00 32 */ fmul f0, f1, f0 -/* 80836708 FC 03 00 28 */ fsub f0, f3, f0 -/* 8083670C FC 02 00 32 */ fmul f0, f2, f0 -/* 80836710 FC 44 00 32 */ fmul f2, f4, f0 -/* 80836714 FC 00 00 32 */ fmul f0, f0, f0 -/* 80836718 FC 01 00 32 */ fmul f0, f1, f0 -/* 8083671C FC 03 00 28 */ fsub f0, f3, f0 -/* 80836720 FC 02 00 32 */ fmul f0, f2, f0 -/* 80836724 FC 21 00 32 */ fmul f1, f1, f0 -/* 80836728 FC 20 08 18 */ frsp f1, f1 -/* 8083672C 48 00 00 88 */ b lbl_808367B4 -lbl_80836730: -/* 80836730 C8 1F 00 38 */ lfd f0, 0x38(r31) -/* 80836734 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80836738 40 80 00 10 */ bge lbl_80836748 -/* 8083673C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80836740 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80836744 48 00 00 70 */ b lbl_808367B4 -lbl_80836748: -/* 80836748 D0 21 00 08 */ stfs f1, 8(r1) -/* 8083674C 80 81 00 08 */ lwz r4, 8(r1) -/* 80836750 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80836754 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80836758 7C 03 00 00 */ cmpw r3, r0 -/* 8083675C 41 82 00 14 */ beq lbl_80836770 -/* 80836760 40 80 00 40 */ bge lbl_808367A0 -/* 80836764 2C 03 00 00 */ cmpwi r3, 0 -/* 80836768 41 82 00 20 */ beq lbl_80836788 -/* 8083676C 48 00 00 34 */ b lbl_808367A0 -lbl_80836770: -/* 80836770 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80836774 41 82 00 0C */ beq lbl_80836780 -/* 80836778 38 00 00 01 */ li r0, 1 -/* 8083677C 48 00 00 28 */ b lbl_808367A4 -lbl_80836780: -/* 80836780 38 00 00 02 */ li r0, 2 -/* 80836784 48 00 00 20 */ b lbl_808367A4 -lbl_80836788: -/* 80836788 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8083678C 41 82 00 0C */ beq lbl_80836798 -/* 80836790 38 00 00 05 */ li r0, 5 -/* 80836794 48 00 00 10 */ b lbl_808367A4 -lbl_80836798: -/* 80836798 38 00 00 03 */ li r0, 3 -/* 8083679C 48 00 00 08 */ b lbl_808367A4 -lbl_808367A0: -/* 808367A0 38 00 00 04 */ li r0, 4 -lbl_808367A4: -/* 808367A4 2C 00 00 01 */ cmpwi r0, 1 -/* 808367A8 40 82 00 0C */ bne lbl_808367B4 -/* 808367AC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 808367B0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_808367B4: -/* 808367B4 C0 1D 00 08 */ lfs f0, 8(r29) -/* 808367B8 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 808367BC D0 1D 00 08 */ stfs f0, 8(r29) -/* 808367C0 C0 5D 00 08 */ lfs f2, 8(r29) -/* 808367C4 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 808367C8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 808367CC 41 80 00 18 */ blt lbl_808367E4 -/* 808367D0 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 808367D4 41 80 00 10 */ blt lbl_808367E4 -/* 808367D8 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 808367DC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808367E0 40 80 00 0C */ bge lbl_808367EC -lbl_808367E4: -/* 808367E4 38 60 00 01 */ li r3, 1 -/* 808367E8 48 00 00 08 */ b lbl_808367F0 -lbl_808367EC: -/* 808367EC 38 60 00 00 */ li r3, 0 -lbl_808367F0: -/* 808367F0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 808367F4 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 808367F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 808367FC 4B B2 BA 2D */ bl _restgpr_29 -/* 80836800 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80836804 7C 08 03 A6 */ mtlr r0 -/* 80836808 38 21 00 50 */ addi r1, r1, 0x50 -/* 8083680C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create__10daFmtMng_cFv.s deleted file mode 100644 index 07da03f4979..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create__10daFmtMng_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_808374B4: -/* 808374B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 808374B8 7C 08 02 A6 */ mflr r0 -/* 808374BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 808374C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 808374C4 7C 7F 1B 78 */ mr r31, r3 -/* 808374C8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 808374CC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 808374D0 40 82 00 1C */ bne lbl_808374EC -/* 808374D4 28 1F 00 00 */ cmplwi r31, 0 -/* 808374D8 41 82 00 08 */ beq lbl_808374E0 -/* 808374DC 4B 7E 16 89 */ bl __ct__10fopAc_ac_cFv -lbl_808374E0: -/* 808374E0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 808374E4 60 00 00 08 */ ori r0, r0, 8 -/* 808374E8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_808374EC: -/* 808374EC 7F E3 FB 78 */ mr r3, r31 -/* 808374F0 48 00 00 1D */ bl create_init__10daFmtMng_cFv -/* 808374F4 38 60 00 04 */ li r3, 4 -/* 808374F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 808374FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80837500 7C 08 03 A6 */ mtlr r0 -/* 80837504 38 21 00 10 */ addi r1, r1, 0x10 -/* 80837508 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create_init__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create_init__10daFmtMng_cFv.s deleted file mode 100644 index 6c607e9db67..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create_init__10daFmtMng_cFv.s +++ /dev/null @@ -1,176 +0,0 @@ -lbl_8083750C: -/* 8083750C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80837510 7C 08 02 A6 */ mflr r0 -/* 80837514 90 01 00 34 */ stw r0, 0x34(r1) -/* 80837518 39 61 00 30 */ addi r11, r1, 0x30 -/* 8083751C 4B B2 AC B9 */ bl _savegpr_27 -/* 80837520 7C 7E 1B 78 */ mr r30, r3 -/* 80837524 3C 80 80 83 */ lis r4, lit_4802@ha /* 0x80837928@ha */ -/* 80837528 C0 24 79 28 */ lfs f1, lit_4802@l(r4) /* 0x80837928@l */ -/* 8083752C FC 40 08 90 */ fmr f2, f1 -/* 80837530 FC 60 08 90 */ fmr f3, f1 -/* 80837534 3C 80 80 83 */ lis r4, lit_3979@ha /* 0x808378C0@ha */ -/* 80837538 C0 84 78 C0 */ lfs f4, lit_3979@l(r4) /* 0x808378C0@l */ -/* 8083753C FC A0 20 90 */ fmr f5, f4 -/* 80837540 FC C0 20 90 */ fmr f6, f4 -/* 80837544 4B 7E 30 05 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80837548 A8 1E 04 E4 */ lha r0, 0x4e4(r30) -/* 8083754C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80837550 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80837554 7C 04 07 74 */ extsb r4, r0 -/* 80837558 4B 81 A2 95 */ bl dPath_GetRoomPath__Fii -/* 8083755C 90 7E 05 70 */ stw r3, 0x570(r30) -/* 80837560 38 60 00 00 */ li r3, 0 -/* 80837564 90 7E 05 80 */ stw r3, 0x580(r30) -/* 80837568 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8083756C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80837570 90 1E 05 84 */ stw r0, 0x584(r30) -/* 80837574 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80837578 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8083757C 90 1E 05 88 */ stw r0, 0x588(r30) -/* 80837580 90 7E 05 68 */ stw r3, 0x568(r30) -/* 80837584 83 BE 05 88 */ lwz r29, 0x588(r30) -/* 80837588 57 A3 28 34 */ slwi r3, r29, 5 -/* 8083758C 38 63 00 10 */ addi r3, r3, 0x10 -/* 80837590 4B A9 77 35 */ bl __nwa__FUl -/* 80837594 3C 80 80 83 */ lis r4, __ct__8FmtPos_cFv@ha /* 0x80836C60@ha */ -/* 80837598 38 84 6C 60 */ addi r4, r4, __ct__8FmtPos_cFv@l /* 0x80836C60@l */ -/* 8083759C 3C A0 80 83 */ lis r5, __dt__8FmtPos_cFv@ha /* 0x80836C24@ha */ -/* 808375A0 38 A5 6C 24 */ addi r5, r5, __dt__8FmtPos_cFv@l /* 0x80836C24@l */ -/* 808375A4 38 C0 00 20 */ li r6, 0x20 -/* 808375A8 7F A7 EB 78 */ mr r7, r29 -/* 808375AC 4B B2 A9 69 */ bl __construct_new_array -/* 808375B0 90 7E 05 68 */ stw r3, 0x568(r30) -/* 808375B4 38 00 00 00 */ li r0, 0 -/* 808375B8 90 1E 05 6C */ stw r0, 0x56c(r30) -/* 808375BC 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 808375C0 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 808375C4 7F A3 01 D6 */ mullw r29, r3, r0 -/* 808375C8 57 A3 28 34 */ slwi r3, r29, 5 -/* 808375CC 38 63 00 10 */ addi r3, r3, 0x10 -/* 808375D0 4B A9 76 F5 */ bl __nwa__FUl -/* 808375D4 3C 80 80 83 */ lis r4, __ct__11FmtMember_cFv@ha /* 0x80837798@ha */ -/* 808375D8 38 84 77 98 */ addi r4, r4, __ct__11FmtMember_cFv@l /* 0x80837798@l */ -/* 808375DC 3C A0 80 83 */ lis r5, __dt__11FmtMember_cFv@ha /* 0x80837458@ha */ -/* 808375E0 38 A5 74 58 */ addi r5, r5, __dt__11FmtMember_cFv@l /* 0x80837458@l */ -/* 808375E4 38 C0 00 20 */ li r6, 0x20 -/* 808375E8 7F A7 EB 78 */ mr r7, r29 -/* 808375EC 4B B2 A9 29 */ bl __construct_new_array -/* 808375F0 90 7E 05 6C */ stw r3, 0x56c(r30) -/* 808375F4 80 BE 05 6C */ lwz r5, 0x56c(r30) -/* 808375F8 38 C0 00 00 */ li r6, 0 -/* 808375FC 38 80 FF FF */ li r4, -1 -/* 80837600 48 00 00 10 */ b lbl_80837610 -lbl_80837604: -/* 80837604 90 85 00 00 */ stw r4, 0(r5) -/* 80837608 38 C6 00 01 */ addi r6, r6, 1 -/* 8083760C 38 A5 00 20 */ addi r5, r5, 0x20 -lbl_80837610: -/* 80837610 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 80837614 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 80837618 7C 03 01 D6 */ mullw r0, r3, r0 -/* 8083761C 7C 06 00 00 */ cmpw r6, r0 -/* 80837620 41 80 FF E4 */ blt lbl_80837604 -/* 80837624 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80837628 54 05 86 3E */ rlwinm r5, r0, 0x10, 0x18, 0x1f -/* 8083762C 38 80 00 0A */ li r4, 0xa -/* 80837630 7C 05 23 D6 */ divw r0, r5, r4 -/* 80837634 1C 60 00 3C */ mulli r3, r0, 0x3c -/* 80837638 7C 00 21 D6 */ mullw r0, r0, r4 -/* 8083763C 7C 00 28 50 */ subf r0, r0, r5 -/* 80837640 1C 00 00 0A */ mulli r0, r0, 0xa -/* 80837644 7C 03 02 14 */ add r0, r3, r0 -/* 80837648 90 1E 05 8C */ stw r0, 0x58c(r30) -/* 8083764C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80837650 54 05 46 3E */ srwi r5, r0, 0x18 -/* 80837654 7C 05 23 D6 */ divw r0, r5, r4 -/* 80837658 1C 60 00 3C */ mulli r3, r0, 0x3c -/* 8083765C 7C 00 21 D6 */ mullw r0, r0, r4 -/* 80837660 7C 00 28 50 */ subf r0, r0, r5 -/* 80837664 1C 00 00 0A */ mulli r0, r0, 0xa -/* 80837668 7C 03 02 14 */ add r0, r3, r0 -/* 8083766C 90 1E 05 90 */ stw r0, 0x590(r30) -/* 80837670 7F C3 F3 78 */ mr r3, r30 -/* 80837674 4B FF DF B1 */ bl initMemberPos__10daFmtMng_cFv -/* 80837678 3B E0 00 00 */ li r31, 0 -/* 8083767C 4B 97 4F 01 */ bl dKy_darkworld_check__Fv -/* 80837680 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80837684 41 82 00 10 */ beq lbl_80837694 -/* 80837688 4B 96 84 A9 */ bl dKy_getDarktime_minute__Fv -/* 8083768C 7C 7D 1B 78 */ mr r29, r3 -/* 80837690 48 00 00 0C */ b lbl_8083769C -lbl_80837694: -/* 80837694 4B 96 83 A9 */ bl dKy_getdaytime_minute__Fv -/* 80837698 7C 7D 1B 78 */ mr r29, r3 -lbl_8083769C: -/* 8083769C 4B 97 4E E1 */ bl dKy_darkworld_check__Fv -/* 808376A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 808376A4 41 82 00 0C */ beq lbl_808376B0 -/* 808376A8 4B 96 84 4D */ bl dKy_getDarktime_hour__Fv -/* 808376AC 48 00 00 08 */ b lbl_808376B4 -lbl_808376B0: -/* 808376B0 4B 96 83 61 */ bl dKy_getdaytime_hour__Fv -lbl_808376B4: -/* 808376B4 1C 03 00 3C */ mulli r0, r3, 0x3c -/* 808376B8 7C 7D 02 14 */ add r3, r29, r0 -/* 808376BC 80 1E 05 8C */ lwz r0, 0x58c(r30) -/* 808376C0 7C 03 00 00 */ cmpw r3, r0 -/* 808376C4 40 81 00 20 */ ble lbl_808376E4 -/* 808376C8 80 1E 05 90 */ lwz r0, 0x590(r30) -/* 808376CC 7C 03 00 00 */ cmpw r3, r0 -/* 808376D0 40 80 00 14 */ bge lbl_808376E4 -/* 808376D4 38 00 00 01 */ li r0, 1 -/* 808376D8 90 1E 05 78 */ stw r0, 0x578(r30) -/* 808376DC 3B E0 00 01 */ li r31, 1 -/* 808376E0 48 00 00 0C */ b lbl_808376EC -lbl_808376E4: -/* 808376E4 38 00 00 00 */ li r0, 0 -/* 808376E8 90 1E 05 78 */ stw r0, 0x578(r30) -lbl_808376EC: -/* 808376EC 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 808376F0 90 1E 05 7C */ stw r0, 0x57c(r30) -/* 808376F4 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 808376F8 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 808376FC 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 80837700 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 80837704 7C 00 22 14 */ add r0, r0, r4 -/* 80837708 90 1E 05 74 */ stw r0, 0x574(r30) -/* 8083770C 83 9E 05 6C */ lwz r28, 0x56c(r30) -/* 80837710 3B 60 00 00 */ li r27, 0 -/* 80837714 57 E0 82 1E */ rlwinm r0, r31, 0x10, 8, 0xf -/* 80837718 60 1D 02 00 */ ori r29, r0, 0x200 -/* 8083771C 48 00 00 50 */ b lbl_8083776C -lbl_80837720: -/* 80837720 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80837724 7C 07 07 74 */ extsb r7, r0 -/* 80837728 38 00 00 00 */ li r0, 0 -/* 8083772C 90 01 00 08 */ stw r0, 8(r1) -/* 80837730 38 60 02 94 */ li r3, 0x294 -/* 80837734 28 1E 00 00 */ cmplwi r30, 0 -/* 80837738 41 82 00 0C */ beq lbl_80837744 -/* 8083773C 80 9E 00 04 */ lwz r4, 4(r30) -/* 80837740 48 00 00 08 */ b lbl_80837748 -lbl_80837744: -/* 80837744 38 80 FF FF */ li r4, -1 -lbl_80837748: -/* 80837748 7F A5 EB 78 */ mr r5, r29 -/* 8083774C 38 DC 00 04 */ addi r6, r28, 4 -/* 80837750 39 1E 04 B4 */ addi r8, r30, 0x4b4 -/* 80837754 39 20 00 00 */ li r9, 0 -/* 80837758 39 40 FF FF */ li r10, -1 -/* 8083775C 4B 7E 27 95 */ bl fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -/* 80837760 90 7C 00 00 */ stw r3, 0(r28) -/* 80837764 3B 7B 00 01 */ addi r27, r27, 1 -/* 80837768 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_8083776C: -/* 8083776C 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 80837770 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 80837774 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80837778 7C 1B 00 00 */ cmpw r27, r0 -/* 8083777C 41 80 FF A4 */ blt lbl_80837720 -/* 80837780 39 61 00 30 */ addi r11, r1, 0x30 -/* 80837784 4B B2 AA 9D */ bl _restgpr_27 -/* 80837788 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8083778C 7C 08 03 A6 */ mtlr r0 -/* 80837790 38 21 00 30 */ addi r1, r1, 0x30 -/* 80837794 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Create__FP10fopAc_ac_c.s deleted file mode 100644 index bc49ee4f9a2..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80837494: -/* 80837494 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80837498 7C 08 02 A6 */ mflr r0 -/* 8083749C 90 01 00 14 */ stw r0, 0x14(r1) -/* 808374A0 48 00 00 15 */ bl create__10daFmtMng_cFv -/* 808374A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 808374A8 7C 08 03 A6 */ mtlr r0 -/* 808374AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 808374B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Delete__FP10daFmtMng_c.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Delete__FP10daFmtMng_c.s deleted file mode 100644 index 0c7b3410067..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Delete__FP10daFmtMng_c.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_808373C4: -/* 808373C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 808373C8 7C 08 02 A6 */ mflr r0 -/* 808373CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 808373D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 808373D4 4B B2 AE 09 */ bl _savegpr_29 -/* 808373D8 7C 7D 1B 79 */ or. r29, r3, r3 -/* 808373DC 41 82 00 60 */ beq lbl_8083743C -/* 808373E0 83 DD 05 6C */ lwz r30, 0x56c(r29) -/* 808373E4 3B E0 00 00 */ li r31, 0 -/* 808373E8 48 00 00 14 */ b lbl_808373FC -lbl_808373EC: -/* 808373EC 80 7E 00 00 */ lwz r3, 0(r30) -/* 808373F0 4B 7E 28 C9 */ bl fopAcM_delete__FUi -/* 808373F4 3B FF 00 01 */ addi r31, r31, 1 -/* 808373F8 3B DE 00 20 */ addi r30, r30, 0x20 -lbl_808373FC: -/* 808373FC 80 7D 05 84 */ lwz r3, 0x584(r29) -/* 80837400 80 1D 05 88 */ lwz r0, 0x588(r29) -/* 80837404 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80837408 7C 1F 00 00 */ cmpw r31, r0 -/* 8083740C 41 80 FF E0 */ blt lbl_808373EC -/* 80837410 80 7D 05 68 */ lwz r3, 0x568(r29) -/* 80837414 3C 80 80 83 */ lis r4, __dt__8FmtPos_cFv@ha /* 0x80836C24@ha */ -/* 80837418 38 84 6C 24 */ addi r4, r4, __dt__8FmtPos_cFv@l /* 0x80836C24@l */ -/* 8083741C 4B B2 A8 51 */ bl __destroy_new_array -/* 80837420 80 7D 05 6C */ lwz r3, 0x56c(r29) -/* 80837424 3C 80 80 83 */ lis r4, __dt__11FmtMember_cFv@ha /* 0x80837458@ha */ -/* 80837428 38 84 74 58 */ addi r4, r4, __dt__11FmtMember_cFv@l /* 0x80837458@l */ -/* 8083742C 4B B2 A8 41 */ bl __destroy_new_array -/* 80837430 7F A3 EB 78 */ mr r3, r29 -/* 80837434 38 80 00 00 */ li r4, 0 -/* 80837438 4B 7E 18 55 */ bl __dt__10fopAc_ac_cFv -lbl_8083743C: -/* 8083743C 38 60 00 01 */ li r3, 1 -/* 80837440 39 61 00 20 */ addi r11, r1, 0x20 -/* 80837444 4B B2 AD E5 */ bl _restgpr_29 -/* 80837448 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8083744C 7C 08 03 A6 */ mtlr r0 -/* 80837450 38 21 00 20 */ addi r1, r1, 0x20 -/* 80837454 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Execute__FP10daFmtMng_c.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Execute__FP10daFmtMng_c.s deleted file mode 100644 index 561fa848f6c..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Execute__FP10daFmtMng_c.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_80837258: -/* 80837258 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8083725C 7C 08 02 A6 */ mflr r0 -/* 80837260 90 01 00 44 */ stw r0, 0x44(r1) -/* 80837264 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80837268 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 8083726C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80837270 4B B2 AF 65 */ bl _savegpr_27 -/* 80837274 7C 7F 1B 78 */ mr r31, r3 -/* 80837278 3C 80 80 83 */ lis r4, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 8083727C 3B A4 78 A8 */ addi r29, r4, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80837280 80 83 05 74 */ lwz r4, 0x574(r3) -/* 80837284 39 84 00 0C */ addi r12, r4, 0xc -/* 80837288 4B B2 AD FD */ bl __ptmf_scall -/* 8083728C 60 00 00 00 */ nop -/* 80837290 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80837294 2C 00 00 04 */ cmpwi r0, 4 -/* 80837298 41 82 01 00 */ beq lbl_80837398 -/* 8083729C 4B 97 52 E1 */ bl dKy_darkworld_check__Fv -/* 808372A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 808372A4 40 82 00 1C */ bne lbl_808372C0 -/* 808372A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808372AC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808372B0 80 7E 5D B4 */ lwz r3, 0x5db4(r30) -/* 808372B4 80 03 05 74 */ lwz r0, 0x574(r3) -/* 808372B8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 808372BC 40 82 00 0C */ bne lbl_808372C8 -lbl_808372C0: -/* 808372C0 38 00 00 00 */ li r0, 0 -/* 808372C4 48 00 00 94 */ b lbl_80837358 -lbl_808372C8: -/* 808372C8 83 7F 05 6C */ lwz r27, 0x56c(r31) -/* 808372CC 3B 80 00 00 */ li r28, 0 -/* 808372D0 93 81 00 08 */ stw r28, 8(r1) -/* 808372D4 48 00 00 6C */ b lbl_80837340 -lbl_808372D8: -/* 808372D8 80 7B 00 00 */ lwz r3, 0(r27) -/* 808372DC 38 81 00 08 */ addi r4, r1, 8 -/* 808372E0 4B 7E 26 DD */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 808372E4 80 81 00 08 */ lwz r4, 8(r1) -/* 808372E8 28 04 00 00 */ cmplwi r4, 0 -/* 808372EC 41 82 00 4C */ beq lbl_80837338 -/* 808372F0 80 7E 5D AC */ lwz r3, 0x5dac(r30) -/* 808372F4 C0 24 04 D4 */ lfs f1, 0x4d4(r4) -/* 808372F8 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 808372FC EC 21 00 28 */ fsubs f1, f1, f0 -/* 80837300 C0 1D 00 40 */ lfs f0, 0x40(r29) -/* 80837304 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80837308 40 80 00 30 */ bge lbl_80837338 -/* 8083730C C8 3D 00 70 */ lfd f1, 0x70(r29) -/* 80837310 C8 5D 00 78 */ lfd f2, 0x78(r29) -/* 80837314 4B B3 54 6D */ bl pow -/* 80837318 FF E0 08 18 */ frsp f31, f1 -/* 8083731C 80 61 00 08 */ lwz r3, 8(r1) -/* 80837320 80 9E 5D AC */ lwz r4, 0x5dac(r30) -/* 80837324 4B 7E 37 71 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80837328 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 8083732C 40 80 00 0C */ bge lbl_80837338 -/* 80837330 38 00 00 01 */ li r0, 1 -/* 80837334 48 00 00 24 */ b lbl_80837358 -lbl_80837338: -/* 80837338 3B 9C 00 01 */ addi r28, r28, 1 -/* 8083733C 3B 7B 00 20 */ addi r27, r27, 0x20 -lbl_80837340: -/* 80837340 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80837344 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 80837348 7C 03 01 D6 */ mullw r0, r3, r0 -/* 8083734C 7C 1C 00 00 */ cmpw r28, r0 -/* 80837350 41 80 FF 88 */ blt lbl_808372D8 -/* 80837354 38 00 00 00 */ li r0, 0 -lbl_80837358: -/* 80837358 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8083735C 41 82 00 3C */ beq lbl_80837398 -/* 80837360 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80837364 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 80837368 38 00 00 04 */ li r0, 4 -/* 8083736C 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80837370 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80837374 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80837378 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 8083737C 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 80837380 7C 00 22 14 */ add r0, r0, r4 -/* 80837384 90 1F 05 74 */ stw r0, 0x574(r31) -/* 80837388 7F E3 FB 78 */ mr r3, r31 -/* 8083738C 81 9F 05 74 */ lwz r12, 0x574(r31) -/* 80837390 4B B2 AC F5 */ bl __ptmf_scall -/* 80837394 60 00 00 00 */ nop -lbl_80837398: -/* 80837398 38 60 00 01 */ li r3, 1 -/* 8083739C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 808373A0 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 808373A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 808373A8 4B B2 AE 79 */ bl _restgpr_27 -/* 808373AC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 808373B0 7C 08 03 A6 */ mtlr r0 -/* 808373B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 808373B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeFight__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeFight__10daFmtMng_cFv.s deleted file mode 100644 index d5180da9b47..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeFight__10daFmtMng_cFv.s +++ /dev/null @@ -1,130 +0,0 @@ -lbl_80837078: -/* 80837078 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8083707C 7C 08 02 A6 */ mflr r0 -/* 80837080 90 01 00 44 */ stw r0, 0x44(r1) -/* 80837084 39 61 00 40 */ addi r11, r1, 0x40 -/* 80837088 4B B2 B1 3D */ bl _savegpr_23 -/* 8083708C 7C 7D 1B 78 */ mr r29, r3 -/* 80837090 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80837094 3B 23 78 A8 */ addi r25, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80837098 83 FD 05 6C */ lwz r31, 0x56c(r29) -/* 8083709C 38 00 00 00 */ li r0, 0 -/* 808370A0 90 01 00 0C */ stw r0, 0xc(r1) -/* 808370A4 3B C0 00 00 */ li r30, 0 -/* 808370A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 808370AC 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 808370B0 48 00 00 F4 */ b lbl_808371A4 -lbl_808370B4: -/* 808370B4 80 7F 00 00 */ lwz r3, 0(r31) -/* 808370B8 38 81 00 0C */ addi r4, r1, 0xc -/* 808370BC 4B 7E 29 01 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 808370C0 80 61 00 0C */ lwz r3, 0xc(r1) -/* 808370C4 28 03 00 00 */ cmplwi r3, 0 -/* 808370C8 41 82 00 D4 */ beq lbl_8083719C -/* 808370CC 80 9A 5D AC */ lwz r4, 0x5dac(r26) -/* 808370D0 4B 7E 36 41 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 808370D4 7C 60 1B 78 */ mr r0, r3 -/* 808370D8 83 61 00 0C */ lwz r27, 0xc(r1) -/* 808370DC A8 7B 04 E6 */ lha r3, 0x4e6(r27) -/* 808370E0 7C 17 07 34 */ extsh r23, r0 -/* 808370E4 7E E4 BB 78 */ mr r4, r23 -/* 808370E8 4B A3 9D 3D */ bl cLib_distanceAngleS__Fss -/* 808370EC 2C 03 06 00 */ cmpwi r3, 0x600 -/* 808370F0 40 81 00 50 */ ble lbl_80837140 -/* 808370F4 83 01 00 0C */ lwz r24, 0xc(r1) -/* 808370F8 C0 39 00 20 */ lfs f1, 0x20(r25) -/* 808370FC 4B A3 08 59 */ bl cM_rndF__Ff -/* 80837100 FC 00 08 1E */ fctiwz f0, f1 -/* 80837104 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80837108 83 81 00 14 */ lwz r28, 0x14(r1) -/* 8083710C 7F 03 C3 78 */ mr r3, r24 -/* 80837110 38 80 00 2C */ li r4, 0x2c -/* 80837114 80 B8 0A CC */ lwz r5, 0xacc(r24) -/* 80837118 4B 92 0F D9 */ bl getAnmP__10daNpcCd2_cFii -/* 8083711C 7C 64 1B 78 */ mr r4, r3 -/* 80837120 7F 03 C3 78 */ mr r3, r24 -/* 80837124 C0 39 00 18 */ lfs f1, 0x18(r25) -/* 80837128 C0 59 00 1C */ lfs f2, 0x1c(r25) -/* 8083712C 38 A0 00 02 */ li r5, 2 -/* 80837130 7F 86 E3 78 */ mr r6, r28 -/* 80837134 38 E0 FF FF */ li r7, -1 -/* 80837138 4B 92 1D C9 */ bl setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii -/* 8083713C 48 00 00 4C */ b lbl_80837188 -lbl_80837140: -/* 80837140 83 01 00 0C */ lwz r24, 0xc(r1) -/* 80837144 C0 39 00 20 */ lfs f1, 0x20(r25) -/* 80837148 4B A3 08 0D */ bl cM_rndF__Ff -/* 8083714C FC 00 08 1E */ fctiwz f0, f1 -/* 80837150 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80837154 83 81 00 14 */ lwz r28, 0x14(r1) -/* 80837158 7F 03 C3 78 */ mr r3, r24 -/* 8083715C 38 80 00 2A */ li r4, 0x2a -/* 80837160 80 B8 0A CC */ lwz r5, 0xacc(r24) -/* 80837164 4B 92 0F 8D */ bl getAnmP__10daNpcCd2_cFii -/* 80837168 7C 64 1B 78 */ mr r4, r3 -/* 8083716C 7F 03 C3 78 */ mr r3, r24 -/* 80837170 C0 39 00 18 */ lfs f1, 0x18(r25) -/* 80837174 C0 59 00 1C */ lfs f2, 0x1c(r25) -/* 80837178 38 A0 00 02 */ li r5, 2 -/* 8083717C 7F 86 E3 78 */ mr r6, r28 -/* 80837180 38 E0 FF FF */ li r7, -1 -/* 80837184 4B 92 1D 7D */ bl setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii -lbl_80837188: -/* 80837188 38 7B 04 E6 */ addi r3, r27, 0x4e6 -/* 8083718C 7E E4 BB 78 */ mr r4, r23 -/* 80837190 38 A0 00 03 */ li r5, 3 -/* 80837194 38 C0 06 00 */ li r6, 0x600 -/* 80837198 4B A3 94 71 */ bl cLib_addCalcAngleS2__FPssss -lbl_8083719C: -/* 8083719C 3B DE 00 01 */ addi r30, r30, 1 -/* 808371A0 3B FF 00 20 */ addi r31, r31, 0x20 -lbl_808371A4: -/* 808371A4 80 7D 05 88 */ lwz r3, 0x588(r29) -/* 808371A8 80 1D 05 84 */ lwz r0, 0x584(r29) -/* 808371AC 7C 03 01 D6 */ mullw r0, r3, r0 -/* 808371B0 7C 1E 00 00 */ cmpw r30, r0 -/* 808371B4 41 80 FF 00 */ blt lbl_808370B4 -/* 808371B8 83 5D 05 6C */ lwz r26, 0x56c(r29) -/* 808371BC 3B 00 00 00 */ li r24, 0 -/* 808371C0 93 01 00 08 */ stw r24, 8(r1) -/* 808371C4 48 00 00 4C */ b lbl_80837210 -lbl_808371C8: -/* 808371C8 3B 20 00 00 */ li r25, 0 -/* 808371CC 80 7A 00 00 */ lwz r3, 0(r26) -/* 808371D0 3C 03 00 01 */ addis r0, r3, 1 -/* 808371D4 28 00 FF FF */ cmplwi r0, 0xffff -/* 808371D8 41 82 00 30 */ beq lbl_80837208 -/* 808371DC 38 81 00 08 */ addi r4, r1, 8 -/* 808371E0 4B 7E 27 DD */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 808371E4 80 61 00 08 */ lwz r3, 8(r1) -/* 808371E8 28 03 00 00 */ cmplwi r3, 0 -/* 808371EC 41 82 00 0C */ beq lbl_808371F8 -/* 808371F0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 808371F4 54 19 F7 FE */ rlwinm r25, r0, 0x1e, 0x1f, 0x1f -lbl_808371F8: -/* 808371F8 57 20 06 3F */ clrlwi. r0, r25, 0x18 -/* 808371FC 40 82 00 0C */ bne lbl_80837208 -/* 80837200 38 00 00 00 */ li r0, 0 -/* 80837204 48 00 00 24 */ b lbl_80837228 -lbl_80837208: -/* 80837208 3B 18 00 01 */ addi r24, r24, 1 -/* 8083720C 3B 5A 00 20 */ addi r26, r26, 0x20 -lbl_80837210: -/* 80837210 80 7D 05 88 */ lwz r3, 0x588(r29) -/* 80837214 80 1D 05 84 */ lwz r0, 0x584(r29) -/* 80837218 7C 03 01 D6 */ mullw r0, r3, r0 -/* 8083721C 7C 18 00 00 */ cmpw r24, r0 -/* 80837220 41 80 FF A8 */ blt lbl_808371C8 -/* 80837224 38 00 00 01 */ li r0, 1 -lbl_80837228: -/* 80837228 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8083722C 41 82 00 0C */ beq lbl_80837238 -/* 80837230 7F A3 EB 78 */ mr r3, r29 -/* 80837234 4B 7E 2A 49 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80837238: -/* 80837238 39 61 00 40 */ addi r11, r1, 0x40 -/* 8083723C 4B B2 AF D5 */ bl _restgpr_23 -/* 80837240 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80837244 7C 08 03 A6 */ mtlr r0 -/* 80837248 38 21 00 40 */ addi r1, r1, 0x40 -/* 8083724C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeMotion__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeMotion__10daFmtMng_cFv.s deleted file mode 100644 index 4829ee6a8e7..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeMotion__10daFmtMng_cFv.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_80836E20: -/* 80836E20 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80836E24 7C 08 02 A6 */ mflr r0 -/* 80836E28 90 01 00 34 */ stw r0, 0x34(r1) -/* 80836E2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80836E30 4B B2 B3 A1 */ bl _savegpr_26 -/* 80836E34 7C 7E 1B 78 */ mr r30, r3 -/* 80836E38 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80836E3C 3B E3 78 A8 */ addi r31, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80836E40 4B 97 1C F9 */ bl dKy_get_dayofweek__Fv -/* 80836E44 80 1E 05 94 */ lwz r0, 0x594(r30) -/* 80836E48 7C 00 18 00 */ cmpw r0, r3 -/* 80836E4C 40 82 01 14 */ bne lbl_80836F60 -/* 80836E50 4B 97 57 2D */ bl dKy_darkworld_check__Fv -/* 80836E54 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80836E58 41 82 00 10 */ beq lbl_80836E68 -/* 80836E5C 4B 96 8C D5 */ bl dKy_getDarktime_minute__Fv -/* 80836E60 7C 7D 1B 78 */ mr r29, r3 -/* 80836E64 48 00 00 0C */ b lbl_80836E70 -lbl_80836E68: -/* 80836E68 4B 96 8B D5 */ bl dKy_getdaytime_minute__Fv -/* 80836E6C 7C 7D 1B 78 */ mr r29, r3 -lbl_80836E70: -/* 80836E70 4B 97 57 0D */ bl dKy_darkworld_check__Fv -/* 80836E74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80836E78 41 82 00 0C */ beq lbl_80836E84 -/* 80836E7C 4B 96 8C 79 */ bl dKy_getDarktime_hour__Fv -/* 80836E80 48 00 00 08 */ b lbl_80836E88 -lbl_80836E84: -/* 80836E84 4B 96 8B 8D */ bl dKy_getdaytime_hour__Fv -lbl_80836E88: -/* 80836E88 80 9E 05 9C */ lwz r4, 0x59c(r30) -/* 80836E8C 1C 03 00 3C */ mulli r0, r3, 0x3c -/* 80836E90 7C 1D 02 14 */ add r0, r29, r0 -/* 80836E94 7C 04 00 00 */ cmpw r4, r0 -/* 80836E98 40 80 00 C8 */ bge lbl_80836F60 -/* 80836E9C 83 7E 05 6C */ lwz r27, 0x56c(r30) -/* 80836EA0 38 00 00 00 */ li r0, 0 -/* 80836EA4 90 01 00 08 */ stw r0, 8(r1) -/* 80836EA8 3B 40 00 00 */ li r26, 0 -/* 80836EAC 48 00 00 68 */ b lbl_80836F14 -lbl_80836EB0: -/* 80836EB0 80 7B 00 00 */ lwz r3, 0(r27) -/* 80836EB4 38 81 00 08 */ addi r4, r1, 8 -/* 80836EB8 4B 7E 2B 05 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80836EBC 83 81 00 08 */ lwz r28, 8(r1) -/* 80836EC0 28 1C 00 00 */ cmplwi r28, 0 -/* 80836EC4 41 82 00 48 */ beq lbl_80836F0C -/* 80836EC8 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80836ECC 4B A3 0A 89 */ bl cM_rndF__Ff -/* 80836ED0 FC 00 08 1E */ fctiwz f0, f1 -/* 80836ED4 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80836ED8 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80836EDC 7F 83 E3 78 */ mr r3, r28 -/* 80836EE0 38 80 00 02 */ li r4, 2 -/* 80836EE4 80 BC 0A CC */ lwz r5, 0xacc(r28) -/* 80836EE8 4B 92 12 09 */ bl getAnmP__10daNpcCd2_cFii -/* 80836EEC 7C 64 1B 78 */ mr r4, r3 -/* 80836EF0 7F 83 E3 78 */ mr r3, r28 -/* 80836EF4 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80836EF8 C0 5F 00 1C */ lfs f2, 0x1c(r31) -/* 80836EFC 38 A0 00 02 */ li r5, 2 -/* 80836F00 7F A6 EB 78 */ mr r6, r29 -/* 80836F04 38 E0 FF FF */ li r7, -1 -/* 80836F08 4B 92 1F F9 */ bl setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii -lbl_80836F0C: -/* 80836F0C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80836F10 3B 7B 00 20 */ addi r27, r27, 0x20 -lbl_80836F14: -/* 80836F14 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 80836F18 80 1E 05 84 */ lwz r0, 0x584(r30) -/* 80836F1C 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80836F20 7C 1A 00 00 */ cmpw r26, r0 -/* 80836F24 41 80 FF 8C */ blt lbl_80836EB0 -/* 80836F28 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80836F2C 90 1E 05 7C */ stw r0, 0x57c(r30) -/* 80836F30 38 00 00 01 */ li r0, 1 -/* 80836F34 90 1E 05 78 */ stw r0, 0x578(r30) -/* 80836F38 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80836F3C 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80836F40 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 80836F44 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 80836F48 7C 00 22 14 */ add r0, r0, r4 -/* 80836F4C 90 1E 05 74 */ stw r0, 0x574(r30) -/* 80836F50 7F C3 F3 78 */ mr r3, r30 -/* 80836F54 81 9E 05 74 */ lwz r12, 0x574(r30) -/* 80836F58 4B B2 B1 2D */ bl __ptmf_scall -/* 80836F5C 60 00 00 00 */ nop -lbl_80836F60: -/* 80836F60 39 61 00 30 */ addi r11, r1, 0x30 -/* 80836F64 4B B2 B2 B9 */ bl _restgpr_26 -/* 80836F68 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80836F6C 7C 08 03 A6 */ mtlr r0 -/* 80836F70 38 21 00 30 */ addi r1, r1, 0x30 -/* 80836F74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeReverse__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeReverse__10daFmtMng_cFv.s deleted file mode 100644 index f4bbd4c643e..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeReverse__10daFmtMng_cFv.s +++ /dev/null @@ -1,251 +0,0 @@ -lbl_808368A4: -/* 808368A4 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 808368A8 7C 08 02 A6 */ mflr r0 -/* 808368AC 90 01 00 54 */ stw r0, 0x54(r1) -/* 808368B0 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 808368B4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 808368B8 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 808368BC F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 808368C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 808368C4 4B B2 B9 0D */ bl _savegpr_26 -/* 808368C8 7C 7B 1B 78 */ mr r27, r3 -/* 808368CC 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 808368D0 3B E3 78 A8 */ addi r31, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 808368D4 83 BB 05 6C */ lwz r29, 0x56c(r27) -/* 808368D8 3B C0 00 01 */ li r30, 1 -/* 808368DC 38 00 00 00 */ li r0, 0 -/* 808368E0 90 01 00 0C */ stw r0, 0xc(r1) -/* 808368E4 3B 40 00 00 */ li r26, 0 -/* 808368E8 48 00 00 5C */ b lbl_80836944 -lbl_808368EC: -/* 808368EC 80 7D 00 00 */ lwz r3, 0(r29) -/* 808368F0 38 81 00 0C */ addi r4, r1, 0xc -/* 808368F4 4B 7E 30 C9 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 808368F8 83 81 00 0C */ lwz r28, 0xc(r1) -/* 808368FC 28 1C 00 00 */ cmplwi r28, 0 -/* 80836900 41 82 00 38 */ beq lbl_80836938 -/* 80836904 A8 7C 04 E6 */ lha r3, 0x4e6(r28) -/* 80836908 A8 9D 00 1C */ lha r4, 0x1c(r29) -/* 8083690C 4B A3 A5 19 */ bl cLib_distanceAngleS__Fss -/* 80836910 2C 03 08 00 */ cmpwi r3, 0x800 -/* 80836914 41 81 00 10 */ bgt lbl_80836924 -/* 80836918 A8 1D 00 1C */ lha r0, 0x1c(r29) -/* 8083691C B0 1C 04 E6 */ sth r0, 0x4e6(r28) -/* 80836920 48 00 00 1C */ b lbl_8083693C -lbl_80836924: -/* 80836924 A8 7C 04 E6 */ lha r3, 0x4e6(r28) -/* 80836928 38 03 F8 00 */ addi r0, r3, -2048 -/* 8083692C B0 1C 04 E6 */ sth r0, 0x4e6(r28) -/* 80836930 3B C0 00 00 */ li r30, 0 -/* 80836934 48 00 00 08 */ b lbl_8083693C -lbl_80836938: -/* 80836938 3B C0 00 00 */ li r30, 0 -lbl_8083693C: -/* 8083693C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80836940 3B BD 00 20 */ addi r29, r29, 0x20 -lbl_80836944: -/* 80836944 83 9B 05 88 */ lwz r28, 0x588(r27) -/* 80836948 80 1B 05 84 */ lwz r0, 0x584(r27) -/* 8083694C 7C 1C 01 D6 */ mullw r0, r28, r0 -/* 80836950 7C 1A 00 00 */ cmpw r26, r0 -/* 80836954 41 80 FF 98 */ blt lbl_808368EC -/* 80836958 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8083695C 41 82 02 A0 */ beq lbl_80836BFC -/* 80836960 83 5B 05 68 */ lwz r26, 0x568(r27) -/* 80836964 57 83 28 34 */ slwi r3, r28, 5 -/* 80836968 38 63 00 10 */ addi r3, r3, 0x10 -/* 8083696C 4B A9 83 59 */ bl __nwa__FUl -/* 80836970 3C 80 80 83 */ lis r4, __ct__8FmtPos_cFv@ha /* 0x80836C60@ha */ -/* 80836974 38 84 6C 60 */ addi r4, r4, __ct__8FmtPos_cFv@l /* 0x80836C60@l */ -/* 80836978 3C A0 80 83 */ lis r5, __dt__8FmtPos_cFv@ha /* 0x80836C24@ha */ -/* 8083697C 38 A5 6C 24 */ addi r5, r5, __dt__8FmtPos_cFv@l /* 0x80836C24@l */ -/* 80836980 38 C0 00 20 */ li r6, 0x20 -/* 80836984 7F 87 E3 78 */ mr r7, r28 -/* 80836988 4B B2 B5 8D */ bl __construct_new_array -/* 8083698C 7C 7C 1B 78 */ mr r28, r3 -/* 80836990 38 60 00 00 */ li r3, 0 -/* 80836994 48 00 00 30 */ b lbl_808369C4 -lbl_80836998: -/* 80836998 C0 1A 00 10 */ lfs f0, 0x10(r26) -/* 8083699C D0 1C 00 10 */ stfs f0, 0x10(r28) -/* 808369A0 C0 1A 00 14 */ lfs f0, 0x14(r26) -/* 808369A4 D0 1C 00 14 */ stfs f0, 0x14(r28) -/* 808369A8 C0 1A 00 18 */ lfs f0, 0x18(r26) -/* 808369AC D0 1C 00 18 */ stfs f0, 0x18(r28) -/* 808369B0 A8 1A 00 1C */ lha r0, 0x1c(r26) -/* 808369B4 B0 1C 00 1C */ sth r0, 0x1c(r28) -/* 808369B8 38 63 00 01 */ addi r3, r3, 1 -/* 808369BC 3B 5A 00 20 */ addi r26, r26, 0x20 -/* 808369C0 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_808369C4: -/* 808369C4 80 1B 05 88 */ lwz r0, 0x588(r27) -/* 808369C8 7C 03 00 00 */ cmpw r3, r0 -/* 808369CC 41 80 FF CC */ blt lbl_80836998 -/* 808369D0 83 DB 05 68 */ lwz r30, 0x568(r27) -/* 808369D4 3B A0 00 00 */ li r29, 0 -/* 808369D8 C3 DF 00 50 */ lfs f30, 0x50(r31) -/* 808369DC C3 FF 00 24 */ lfs f31, 0x24(r31) -/* 808369E0 3B 9C FF E0 */ addi r28, r28, -32 -/* 808369E4 48 00 01 C4 */ b lbl_80836BA8 -lbl_808369E8: -/* 808369E8 C0 1C 00 10 */ lfs f0, 0x10(r28) -/* 808369EC D0 1E 00 10 */ stfs f0, 0x10(r30) -/* 808369F0 C0 1C 00 14 */ lfs f0, 0x14(r28) -/* 808369F4 D0 1E 00 14 */ stfs f0, 0x14(r30) -/* 808369F8 C0 1C 00 18 */ lfs f0, 0x18(r28) -/* 808369FC D0 1E 00 18 */ stfs f0, 0x18(r30) -/* 80836A00 A8 7C 00 1C */ lha r3, 0x1c(r28) -/* 80836A04 3C 63 00 01 */ addis r3, r3, 1 -/* 80836A08 38 03 80 00 */ addi r0, r3, -32768 -/* 80836A0C B0 1E 00 1C */ sth r0, 0x1c(r30) -/* 80836A10 88 1E 00 0C */ lbz r0, 0xc(r30) -/* 80836A14 7C 00 07 75 */ extsb. r0, r0 -/* 80836A18 38 00 00 01 */ li r0, 1 -/* 80836A1C 40 81 00 08 */ ble lbl_80836A24 -/* 80836A20 38 00 FF FF */ li r0, -1 -lbl_80836A24: -/* 80836A24 98 1E 00 0C */ stb r0, 0xc(r30) -/* 80836A28 88 1E 00 0C */ lbz r0, 0xc(r30) -/* 80836A2C 7C 00 07 75 */ extsb. r0, r0 -/* 80836A30 40 81 00 3C */ ble lbl_80836A6C -/* 80836A34 80 7E 00 04 */ lwz r3, 4(r30) -/* 80836A38 80 9E 00 00 */ lwz r4, 0(r30) -/* 80836A3C A0 04 00 00 */ lhz r0, 0(r4) -/* 80836A40 38 63 00 01 */ addi r3, r3, 1 -/* 80836A44 7C 03 00 00 */ cmpw r3, r0 -/* 80836A48 41 80 00 1C */ blt lbl_80836A64 -/* 80836A4C 88 04 00 05 */ lbz r0, 5(r4) -/* 80836A50 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80836A54 41 82 00 0C */ beq lbl_80836A60 -/* 80836A58 38 60 00 00 */ li r3, 0 -/* 80836A5C 48 00 00 08 */ b lbl_80836A64 -lbl_80836A60: -/* 80836A60 38 63 FF FF */ addi r3, r3, -1 -lbl_80836A64: -/* 80836A64 90 7E 00 04 */ stw r3, 4(r30) -/* 80836A68 48 00 00 34 */ b lbl_80836A9C -lbl_80836A6C: -/* 80836A6C 80 7E 00 04 */ lwz r3, 4(r30) -/* 80836A70 34 63 FF FF */ addic. r3, r3, -1 -/* 80836A74 40 80 00 24 */ bge lbl_80836A98 -/* 80836A78 80 7E 00 00 */ lwz r3, 0(r30) -/* 80836A7C 88 03 00 05 */ lbz r0, 5(r3) -/* 80836A80 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80836A84 41 82 00 10 */ beq lbl_80836A94 -/* 80836A88 A0 63 00 00 */ lhz r3, 0(r3) -/* 80836A8C 38 63 FF FF */ addi r3, r3, -1 -/* 80836A90 48 00 00 08 */ b lbl_80836A98 -lbl_80836A94: -/* 80836A94 38 60 00 00 */ li r3, 0 -lbl_80836A98: -/* 80836A98 90 7E 00 04 */ stw r3, 4(r30) -lbl_80836A9C: -/* 80836A9C D3 DE 00 08 */ stfs f30, 8(r30) -/* 80836AA0 80 7E 00 00 */ lwz r3, 0(r30) -/* 80836AA4 80 9E 00 04 */ lwz r4, 4(r30) -/* 80836AA8 4B 81 AD 09 */ bl dPath_GetPnt__FPC5dPathi -/* 80836AAC 38 83 00 04 */ addi r4, r3, 4 -/* 80836AB0 38 7E 00 10 */ addi r3, r30, 0x10 -/* 80836AB4 4B B1 08 E9 */ bl PSVECSquareDistance -/* 80836AB8 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 80836ABC 40 81 00 58 */ ble lbl_80836B14 -/* 80836AC0 FC 00 08 34 */ frsqrte f0, f1 -/* 80836AC4 C8 9F 00 28 */ lfd f4, 0x28(r31) -/* 80836AC8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80836ACC C8 7F 00 30 */ lfd f3, 0x30(r31) -/* 80836AD0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80836AD4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80836AD8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80836ADC FC 02 00 32 */ fmul f0, f2, f0 -/* 80836AE0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80836AE4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80836AE8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80836AEC FC 03 00 28 */ fsub f0, f3, f0 -/* 80836AF0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80836AF4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80836AF8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80836AFC FC 01 00 32 */ fmul f0, f1, f0 -/* 80836B00 FC 03 00 28 */ fsub f0, f3, f0 -/* 80836B04 FC 02 00 32 */ fmul f0, f2, f0 -/* 80836B08 FC 21 00 32 */ fmul f1, f1, f0 -/* 80836B0C FC 20 08 18 */ frsp f1, f1 -/* 80836B10 48 00 00 88 */ b lbl_80836B98 -lbl_80836B14: -/* 80836B14 C8 1F 00 38 */ lfd f0, 0x38(r31) -/* 80836B18 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80836B1C 40 80 00 10 */ bge lbl_80836B2C -/* 80836B20 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80836B24 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80836B28 48 00 00 70 */ b lbl_80836B98 -lbl_80836B2C: -/* 80836B2C D0 21 00 08 */ stfs f1, 8(r1) -/* 80836B30 80 81 00 08 */ lwz r4, 8(r1) -/* 80836B34 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80836B38 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80836B3C 7C 03 00 00 */ cmpw r3, r0 -/* 80836B40 41 82 00 14 */ beq lbl_80836B54 -/* 80836B44 40 80 00 40 */ bge lbl_80836B84 -/* 80836B48 2C 03 00 00 */ cmpwi r3, 0 -/* 80836B4C 41 82 00 20 */ beq lbl_80836B6C -/* 80836B50 48 00 00 34 */ b lbl_80836B84 -lbl_80836B54: -/* 80836B54 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80836B58 41 82 00 0C */ beq lbl_80836B64 -/* 80836B5C 38 00 00 01 */ li r0, 1 -/* 80836B60 48 00 00 28 */ b lbl_80836B88 -lbl_80836B64: -/* 80836B64 38 00 00 02 */ li r0, 2 -/* 80836B68 48 00 00 20 */ b lbl_80836B88 -lbl_80836B6C: -/* 80836B6C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80836B70 41 82 00 0C */ beq lbl_80836B7C -/* 80836B74 38 00 00 05 */ li r0, 5 -/* 80836B78 48 00 00 10 */ b lbl_80836B88 -lbl_80836B7C: -/* 80836B7C 38 00 00 03 */ li r0, 3 -/* 80836B80 48 00 00 08 */ b lbl_80836B88 -lbl_80836B84: -/* 80836B84 38 00 00 04 */ li r0, 4 -lbl_80836B88: -/* 80836B88 2C 00 00 01 */ cmpwi r0, 1 -/* 80836B8C 40 82 00 0C */ bne lbl_80836B98 -/* 80836B90 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80836B94 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80836B98: -/* 80836B98 D0 3E 00 08 */ stfs f1, 8(r30) -/* 80836B9C 3B BD 00 01 */ addi r29, r29, 1 -/* 80836BA0 3B DE 00 20 */ addi r30, r30, 0x20 -/* 80836BA4 3B 9C FF E0 */ addi r28, r28, -32 -lbl_80836BA8: -/* 80836BA8 80 1B 05 88 */ lwz r0, 0x588(r27) -/* 80836BAC 7C 1D 00 00 */ cmpw r29, r0 -/* 80836BB0 41 80 FE 38 */ blt lbl_808369E8 -/* 80836BB4 38 7C 00 20 */ addi r3, r28, 0x20 -/* 80836BB8 3C 80 80 83 */ lis r4, __dt__8FmtPos_cFv@ha /* 0x80836C24@ha */ -/* 80836BBC 38 84 6C 24 */ addi r4, r4, __dt__8FmtPos_cFv@l /* 0x80836C24@l */ -/* 80836BC0 4B B2 B0 AD */ bl __destroy_new_array -/* 80836BC4 80 1B 05 78 */ lwz r0, 0x578(r27) -/* 80836BC8 90 1B 05 7C */ stw r0, 0x57c(r27) -/* 80836BCC 38 00 00 01 */ li r0, 1 -/* 80836BD0 90 1B 05 78 */ stw r0, 0x578(r27) -/* 80836BD4 80 1B 05 78 */ lwz r0, 0x578(r27) -/* 80836BD8 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80836BDC 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 80836BE0 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 80836BE4 7C 00 22 14 */ add r0, r0, r4 -/* 80836BE8 90 1B 05 74 */ stw r0, 0x574(r27) -/* 80836BEC 7F 63 DB 78 */ mr r3, r27 -/* 80836BF0 81 9B 05 74 */ lwz r12, 0x574(r27) -/* 80836BF4 4B B2 B4 91 */ bl __ptmf_scall -/* 80836BF8 60 00 00 00 */ nop -lbl_80836BFC: -/* 80836BFC E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80836C00 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80836C04 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 80836C08 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 80836C0C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80836C10 4B B2 B6 0D */ bl _restgpr_26 -/* 80836C14 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80836C18 7C 08 03 A6 */ mtlr r0 -/* 80836C1C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80836C20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWait__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWait__10daFmtMng_cFv.s deleted file mode 100644 index 4d8e443ba58..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWait__10daFmtMng_cFv.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_80835B24: -/* 80835B24 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80835B28 7C 08 02 A6 */ mflr r0 -/* 80835B2C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80835B30 39 61 00 30 */ addi r11, r1, 0x30 -/* 80835B34 4B B2 C6 A1 */ bl _savegpr_27 -/* 80835B38 7C 7F 1B 78 */ mr r31, r3 -/* 80835B3C 4B 97 6A 41 */ bl dKy_darkworld_check__Fv -/* 80835B40 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80835B44 41 82 00 10 */ beq lbl_80835B54 -/* 80835B48 4B 96 9F E9 */ bl dKy_getDarktime_minute__Fv -/* 80835B4C 7C 7D 1B 78 */ mr r29, r3 -/* 80835B50 48 00 00 0C */ b lbl_80835B5C -lbl_80835B54: -/* 80835B54 4B 96 9E E9 */ bl dKy_getdaytime_minute__Fv -/* 80835B58 7C 7D 1B 78 */ mr r29, r3 -lbl_80835B5C: -/* 80835B5C 4B 97 6A 21 */ bl dKy_darkworld_check__Fv -/* 80835B60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80835B64 41 82 00 0C */ beq lbl_80835B70 -/* 80835B68 4B 96 9F 8D */ bl dKy_getDarktime_hour__Fv -/* 80835B6C 48 00 00 08 */ b lbl_80835B74 -lbl_80835B70: -/* 80835B70 4B 96 9E A1 */ bl dKy_getdaytime_hour__Fv -lbl_80835B74: -/* 80835B74 1C 03 00 3C */ mulli r0, r3, 0x3c -/* 80835B78 7C 7D 02 14 */ add r3, r29, r0 -/* 80835B7C 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 80835B80 7C 03 00 00 */ cmpw r3, r0 -/* 80835B84 41 80 01 14 */ blt lbl_80835C98 -/* 80835B88 80 1F 05 90 */ lwz r0, 0x590(r31) -/* 80835B8C 7C 03 00 00 */ cmpw r3, r0 -/* 80835B90 40 80 01 08 */ bge lbl_80835C98 -/* 80835B94 83 9F 05 6C */ lwz r28, 0x56c(r31) -/* 80835B98 3B A0 00 00 */ li r29, 0 -/* 80835B9C 93 A1 00 08 */ stw r29, 8(r1) -/* 80835BA0 48 00 00 4C */ b lbl_80835BEC -lbl_80835BA4: -/* 80835BA4 3B C0 00 00 */ li r30, 0 -/* 80835BA8 80 7C 00 00 */ lwz r3, 0(r28) -/* 80835BAC 3C 03 00 01 */ addis r0, r3, 1 -/* 80835BB0 28 00 FF FF */ cmplwi r0, 0xffff -/* 80835BB4 41 82 00 30 */ beq lbl_80835BE4 -/* 80835BB8 38 81 00 08 */ addi r4, r1, 8 -/* 80835BBC 4B 7E 3E 01 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80835BC0 80 61 00 08 */ lwz r3, 8(r1) -/* 80835BC4 28 03 00 00 */ cmplwi r3, 0 -/* 80835BC8 41 82 00 0C */ beq lbl_80835BD4 -/* 80835BCC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80835BD0 54 1E F7 FE */ rlwinm r30, r0, 0x1e, 0x1f, 0x1f -lbl_80835BD4: -/* 80835BD4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80835BD8 40 82 00 0C */ bne lbl_80835BE4 -/* 80835BDC 38 00 00 00 */ li r0, 0 -/* 80835BE0 48 00 00 24 */ b lbl_80835C04 -lbl_80835BE4: -/* 80835BE4 3B BD 00 01 */ addi r29, r29, 1 -/* 80835BE8 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_80835BEC: -/* 80835BEC 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80835BF0 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 80835BF4 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80835BF8 7C 1D 00 00 */ cmpw r29, r0 -/* 80835BFC 41 80 FF A8 */ blt lbl_80835BA4 -/* 80835C00 38 00 00 01 */ li r0, 1 -lbl_80835C04: -/* 80835C04 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80835C08 41 82 01 08 */ beq lbl_80835D10 -/* 80835C0C 83 9F 05 6C */ lwz r28, 0x56c(r31) -/* 80835C10 3B 60 00 00 */ li r27, 0 -/* 80835C14 3B A0 00 00 */ li r29, 0 -/* 80835C18 3B C0 00 01 */ li r30, 1 -/* 80835C1C 48 00 00 2C */ b lbl_80835C48 -lbl_80835C20: -/* 80835C20 93 A1 00 10 */ stw r29, 0x10(r1) -/* 80835C24 80 7C 00 00 */ lwz r3, 0(r28) -/* 80835C28 38 81 00 10 */ addi r4, r1, 0x10 -/* 80835C2C 4B 7E 3D 91 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80835C30 80 61 00 10 */ lwz r3, 0x10(r1) -/* 80835C34 28 03 00 00 */ cmplwi r3, 0 -/* 80835C38 41 82 00 08 */ beq lbl_80835C40 -/* 80835C3C 9B C3 0A D8 */ stb r30, 0xad8(r3) -lbl_80835C40: -/* 80835C40 3B 7B 00 01 */ addi r27, r27, 1 -/* 80835C44 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_80835C48: -/* 80835C48 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80835C4C 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 80835C50 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80835C54 7C 1B 00 00 */ cmpw r27, r0 -/* 80835C58 41 80 FF C8 */ blt lbl_80835C20 -/* 80835C5C 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80835C60 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 80835C64 38 00 00 01 */ li r0, 1 -/* 80835C68 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80835C6C 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80835C70 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80835C74 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 80835C78 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 80835C7C 7C 00 22 14 */ add r0, r0, r4 -/* 80835C80 90 1F 05 74 */ stw r0, 0x574(r31) -/* 80835C84 7F E3 FB 78 */ mr r3, r31 -/* 80835C88 81 9F 05 74 */ lwz r12, 0x574(r31) -/* 80835C8C 4B B2 C3 F9 */ bl __ptmf_scall -/* 80835C90 60 00 00 00 */ nop -/* 80835C94 48 00 00 7C */ b lbl_80835D10 -lbl_80835C98: -/* 80835C98 83 7F 05 6C */ lwz r27, 0x56c(r31) -/* 80835C9C 3B C0 00 00 */ li r30, 0 -/* 80835CA0 93 C1 00 0C */ stw r30, 0xc(r1) -/* 80835CA4 3B 80 00 00 */ li r28, 0 -/* 80835CA8 48 00 00 28 */ b lbl_80835CD0 -lbl_80835CAC: -/* 80835CAC 80 7B 00 00 */ lwz r3, 0(r27) -/* 80835CB0 38 81 00 0C */ addi r4, r1, 0xc -/* 80835CB4 4B 7E 3D 09 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80835CB8 80 61 00 0C */ lwz r3, 0xc(r1) -/* 80835CBC 28 03 00 00 */ cmplwi r3, 0 -/* 80835CC0 41 82 00 08 */ beq lbl_80835CC8 -/* 80835CC4 9B C3 0A D8 */ stb r30, 0xad8(r3) -lbl_80835CC8: -/* 80835CC8 3B 9C 00 01 */ addi r28, r28, 1 -/* 80835CCC 3B 7B 00 20 */ addi r27, r27, 0x20 -lbl_80835CD0: -/* 80835CD0 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 80835CD4 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 80835CD8 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80835CDC 7C 1C 00 00 */ cmpw r28, r0 -/* 80835CE0 41 80 FF CC */ blt lbl_80835CAC -/* 80835CE4 4B 97 68 99 */ bl dKy_darkworld_check__Fv -/* 80835CE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80835CEC 40 82 00 24 */ bne lbl_80835D10 -/* 80835CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80835CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80835CF8 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80835CFC 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80835D00 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80835D04 41 82 00 0C */ beq lbl_80835D10 -/* 80835D08 7F E3 FB 78 */ mr r3, r31 -/* 80835D0C 4B 7E 3F 71 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_80835D10: -/* 80835D10 39 61 00 30 */ addi r11, r1, 0x30 -/* 80835D14 4B B2 C5 0D */ bl _restgpr_27 -/* 80835D18 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80835D1C 7C 08 03 A6 */ mtlr r0 -/* 80835D20 38 21 00 30 */ addi r1, r1, 0x30 -/* 80835D24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWalk__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWalk__10daFmtMng_cFv.s deleted file mode 100644 index c92e00f0fb9..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWalk__10daFmtMng_cFv.s +++ /dev/null @@ -1,294 +0,0 @@ -lbl_80835DEC: -/* 80835DEC 94 21 FF 60 */ stwu r1, -0xa0(r1) -/* 80835DF0 7C 08 02 A6 */ mflr r0 -/* 80835DF4 90 01 00 A4 */ stw r0, 0xa4(r1) -/* 80835DF8 DB E1 00 90 */ stfd f31, 0x90(r1) -/* 80835DFC F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* qr0 */ -/* 80835E00 DB C1 00 80 */ stfd f30, 0x80(r1) -/* 80835E04 F3 C1 00 88 */ psq_st f30, 136(r1), 0, 0 /* qr0 */ -/* 80835E08 DB A1 00 70 */ stfd f29, 0x70(r1) -/* 80835E0C F3 A1 00 78 */ psq_st f29, 120(r1), 0, 0 /* qr0 */ -/* 80835E10 DB 81 00 60 */ stfd f28, 0x60(r1) -/* 80835E14 F3 81 00 68 */ psq_st f28, 104(r1), 0, 0 /* qr0 */ -/* 80835E18 DB 61 00 50 */ stfd f27, 0x50(r1) -/* 80835E1C F3 61 00 58 */ psq_st f27, 88(r1), 0, 0 /* qr0 */ -/* 80835E20 39 61 00 50 */ addi r11, r1, 0x50 -/* 80835E24 4B B2 C3 9D */ bl _savegpr_22 -/* 80835E28 7C 7E 1B 78 */ mr r30, r3 -/* 80835E2C 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80835E30 3B 63 78 A8 */ addi r27, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80835E34 C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80835E38 38 7B 00 00 */ addi r3, r27, 0 -/* 80835E3C C0 03 00 08 */ lfs f0, 8(r3) -/* 80835E40 EC 01 00 2A */ fadds f0, f1, f0 -/* 80835E44 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80835E48 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 80835E4C C0 23 00 04 */ lfs f1, 4(r3) -/* 80835E50 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80835E54 40 81 00 08 */ ble lbl_80835E5C -/* 80835E58 D0 3E 05 2C */ stfs f1, 0x52c(r30) -lbl_80835E5C: -/* 80835E5C 82 DE 05 68 */ lwz r22, 0x568(r30) -/* 80835E60 3B 00 00 00 */ li r24, 0 -/* 80835E64 3B FB 00 00 */ addi r31, r27, 0 -/* 80835E68 C3 7B 00 24 */ lfs f27, 0x24(r27) -/* 80835E6C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80835E70 3A E3 9A 20 */ addi r23, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80835E74 48 00 00 B4 */ b lbl_80835F28 -lbl_80835E78: -/* 80835E78 7F C3 F3 78 */ mr r3, r30 -/* 80835E7C 7E C4 B3 78 */ mr r4, r22 -/* 80835E80 7F 05 C3 78 */ mr r5, r24 -/* 80835E84 48 00 03 A9 */ bl setMovePath__10daFmtMng_cFP8FmtPos_ci -/* 80835E88 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 80835E8C FC 00 D8 40 */ fcmpo cr0, f0, f27 -/* 80835E90 4C 40 13 82 */ cror 2, 0, 2 -/* 80835E94 41 82 00 48 */ beq lbl_80835EDC -/* 80835E98 80 76 00 00 */ lwz r3, 0(r22) -/* 80835E9C 80 96 00 04 */ lwz r4, 4(r22) -/* 80835EA0 4B 81 B9 11 */ bl dPath_GetPnt__FPC5dPathi -/* 80835EA4 C0 03 00 04 */ lfs f0, 4(r3) -/* 80835EA8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80835EAC C0 03 00 08 */ lfs f0, 8(r3) -/* 80835EB0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80835EB4 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80835EB8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80835EBC 38 76 00 10 */ addi r3, r22, 0x10 -/* 80835EC0 38 81 00 10 */ addi r4, r1, 0x10 -/* 80835EC4 4B A3 AD 41 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80835EC8 7C 64 1B 78 */ mr r4, r3 -/* 80835ECC 38 76 00 1C */ addi r3, r22, 0x1c -/* 80835ED0 A8 BF 00 14 */ lha r5, 0x14(r31) -/* 80835ED4 A8 DF 00 16 */ lha r6, 0x16(r31) -/* 80835ED8 4B A3 A7 31 */ bl cLib_addCalcAngleS2__FPssss -lbl_80835EDC: -/* 80835EDC A8 16 00 1C */ lha r0, 0x1c(r22) -/* 80835EE0 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80835EE4 7C 57 04 2E */ lfsx f2, r23, r0 -/* 80835EE8 C0 36 00 10 */ lfs f1, 0x10(r22) -/* 80835EEC C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 80835EF0 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80835EF4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80835EF8 D0 16 00 10 */ stfs f0, 0x10(r22) -/* 80835EFC A8 16 00 1C */ lha r0, 0x1c(r22) -/* 80835F00 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80835F04 7C 77 02 14 */ add r3, r23, r0 -/* 80835F08 C0 43 00 04 */ lfs f2, 4(r3) -/* 80835F0C C0 36 00 18 */ lfs f1, 0x18(r22) -/* 80835F10 C0 1E 05 2C */ lfs f0, 0x52c(r30) -/* 80835F14 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80835F18 EC 01 00 2A */ fadds f0, f1, f0 -/* 80835F1C D0 16 00 18 */ stfs f0, 0x18(r22) -/* 80835F20 3B 18 00 01 */ addi r24, r24, 1 -/* 80835F24 3A D6 00 20 */ addi r22, r22, 0x20 -lbl_80835F28: -/* 80835F28 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 80835F2C 7C 18 00 00 */ cmpw r24, r0 -/* 80835F30 41 80 FF 48 */ blt lbl_80835E78 -/* 80835F34 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80835F38 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80835F3C D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80835F40 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80835F44 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80835F48 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80835F4C D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 80835F50 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80835F54 3B 23 00 20 */ addi r25, r3, 0x20 -/* 80835F58 3B 00 00 01 */ li r24, 1 -/* 80835F5C 3B 5B 00 00 */ addi r26, r27, 0 -/* 80835F60 82 FB 00 00 */ lwz r23, 0(r27) -/* 80835F64 48 00 00 64 */ b lbl_80835FC8 -lbl_80835F68: -/* 80835F68 A8 79 FF FC */ lha r3, -4(r25) -/* 80835F6C A8 99 00 1C */ lha r4, 0x1c(r25) -/* 80835F70 4B A3 AE B5 */ bl cLib_distanceAngleS__Fss -/* 80835F74 7C 03 B8 00 */ cmpw r3, r23 -/* 80835F78 41 81 00 48 */ bgt lbl_80835FC0 -/* 80835F7C C0 1A 00 10 */ lfs f0, 0x10(r26) -/* 80835F80 FC 20 00 50 */ fneg f1, f0 -/* 80835F84 C0 1B 00 24 */ lfs f0, 0x24(r27) -/* 80835F88 D0 19 00 10 */ stfs f0, 0x10(r25) -/* 80835F8C D0 19 00 14 */ stfs f0, 0x14(r25) -/* 80835F90 D0 39 00 18 */ stfs f1, 0x18(r25) -/* 80835F94 38 79 FF F0 */ addi r3, r25, -16 -/* 80835F98 4B 7D 6D CD */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80835F9C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80835FA0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80835FA4 A8 99 FF FC */ lha r4, -4(r25) -/* 80835FA8 4B 7D 64 8D */ bl mDoMtx_YrotM__FPA4_fs -/* 80835FAC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80835FB0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80835FB4 38 99 00 10 */ addi r4, r25, 0x10 -/* 80835FB8 7C 85 23 78 */ mr r5, r4 -/* 80835FBC 4B B1 0D B1 */ bl PSMTXMultVec -lbl_80835FC0: -/* 80835FC0 3B 18 00 01 */ addi r24, r24, 1 -/* 80835FC4 3B 39 00 20 */ addi r25, r25, 0x20 -lbl_80835FC8: -/* 80835FC8 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 80835FCC 7C 18 00 00 */ cmpw r24, r0 -/* 80835FD0 41 80 FF 98 */ blt lbl_80835F68 -/* 80835FD4 83 1E 05 68 */ lwz r24, 0x568(r30) -/* 80835FD8 83 3E 05 6C */ lwz r25, 0x56c(r30) -/* 80835FDC 3B 40 00 00 */ li r26, 0 -/* 80835FE0 38 9B 00 00 */ addi r4, r27, 0 -/* 80835FE4 C3 DB 00 24 */ lfs f30, 0x24(r27) -/* 80835FE8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80835FEC 3B A3 D4 70 */ addi r29, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80835FF0 C3 E4 00 0C */ lfs f31, 0xc(r4) -/* 80835FF4 C3 9B 00 44 */ lfs f28, 0x44(r27) -/* 80835FF8 CB BB 00 48 */ lfd f29, 0x48(r27) -/* 80835FFC 3F 80 43 30 */ lis r28, 0x4330 -/* 80836000 48 00 01 E0 */ b lbl_808361E0 -lbl_80836004: -/* 80836004 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 80836008 38 03 FF FF */ addi r0, r3, -1 -/* 8083600C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80836010 90 01 00 24 */ stw r0, 0x24(r1) -/* 80836014 93 81 00 20 */ stw r28, 0x20(r1) -/* 80836018 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8083601C EC 00 E8 28 */ fsubs f0, f0, f29 -/* 80836020 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80836024 EF 7C 00 32 */ fmuls f27, f28, f0 -/* 80836028 38 78 00 10 */ addi r3, r24, 0x10 -/* 8083602C 4B 7D 6D 39 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80836030 7F A3 EB 78 */ mr r3, r29 -/* 80836034 A8 98 00 1C */ lha r4, 0x1c(r24) -/* 80836038 4B 7D 63 FD */ bl mDoMtx_YrotM__FPA4_fs -/* 8083603C 3A E0 00 00 */ li r23, 0 -/* 80836040 48 00 01 8C */ b lbl_808361CC -lbl_80836044: -/* 80836044 38 99 00 04 */ addi r4, r25, 4 -/* 80836048 C0 19 00 04 */ lfs f0, 4(r25) -/* 8083604C D0 19 00 10 */ stfs f0, 0x10(r25) -/* 80836050 C0 19 00 08 */ lfs f0, 8(r25) -/* 80836054 D0 19 00 14 */ stfs f0, 0x14(r25) -/* 80836058 C0 19 00 0C */ lfs f0, 0xc(r25) -/* 8083605C D0 19 00 18 */ stfs f0, 0x18(r25) -/* 80836060 D3 79 00 04 */ stfs f27, 4(r25) -/* 80836064 D3 D9 00 08 */ stfs f30, 8(r25) -/* 80836068 D3 D9 00 0C */ stfs f30, 0xc(r25) -/* 8083606C 7F A3 EB 78 */ mr r3, r29 -/* 80836070 7C 85 23 78 */ mr r5, r4 -/* 80836074 4B B1 0C F9 */ bl PSMTXMultVec -/* 80836078 EF 7B F8 28 */ fsubs f27, f27, f31 -/* 8083607C 38 00 00 00 */ li r0, 0 -/* 80836080 90 01 00 0C */ stw r0, 0xc(r1) -/* 80836084 80 79 00 00 */ lwz r3, 0(r25) -/* 80836088 38 81 00 0C */ addi r4, r1, 0xc -/* 8083608C 4B 7E 39 31 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80836090 82 C1 00 0C */ lwz r22, 0xc(r1) -/* 80836094 28 16 00 00 */ cmplwi r22, 0 -/* 80836098 41 82 01 2C */ beq lbl_808361C4 -/* 8083609C C0 19 00 04 */ lfs f0, 4(r25) -/* 808360A0 D0 16 04 D0 */ stfs f0, 0x4d0(r22) -/* 808360A4 C0 19 00 0C */ lfs f0, 0xc(r25) -/* 808360A8 D0 16 04 D8 */ stfs f0, 0x4d8(r22) -/* 808360AC 38 79 00 10 */ addi r3, r25, 0x10 -/* 808360B0 38 99 00 04 */ addi r4, r25, 4 -/* 808360B4 4B A3 AB 51 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 808360B8 7C 64 1B 78 */ mr r4, r3 -/* 808360BC 38 76 04 E6 */ addi r3, r22, 0x4e6 -/* 808360C0 A8 BF 00 14 */ lha r5, 0x14(r31) -/* 808360C4 A8 DF 00 16 */ lha r6, 0x16(r31) -/* 808360C8 4B A3 A5 41 */ bl cLib_addCalcAngleS2__FPssss -/* 808360CC 38 79 00 10 */ addi r3, r25, 0x10 -/* 808360D0 38 99 00 04 */ addi r4, r25, 4 -/* 808360D4 4B B1 12 C9 */ bl PSVECSquareDistance -/* 808360D8 C0 1B 00 24 */ lfs f0, 0x24(r27) -/* 808360DC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808360E0 40 81 00 58 */ ble lbl_80836138 -/* 808360E4 FC 00 08 34 */ frsqrte f0, f1 -/* 808360E8 C8 9B 00 28 */ lfd f4, 0x28(r27) -/* 808360EC FC 44 00 32 */ fmul f2, f4, f0 -/* 808360F0 C8 7B 00 30 */ lfd f3, 0x30(r27) -/* 808360F4 FC 00 00 32 */ fmul f0, f0, f0 -/* 808360F8 FC 01 00 32 */ fmul f0, f1, f0 -/* 808360FC FC 03 00 28 */ fsub f0, f3, f0 -/* 80836100 FC 02 00 32 */ fmul f0, f2, f0 -/* 80836104 FC 44 00 32 */ fmul f2, f4, f0 -/* 80836108 FC 00 00 32 */ fmul f0, f0, f0 -/* 8083610C FC 01 00 32 */ fmul f0, f1, f0 -/* 80836110 FC 03 00 28 */ fsub f0, f3, f0 -/* 80836114 FC 02 00 32 */ fmul f0, f2, f0 -/* 80836118 FC 44 00 32 */ fmul f2, f4, f0 -/* 8083611C FC 00 00 32 */ fmul f0, f0, f0 -/* 80836120 FC 01 00 32 */ fmul f0, f1, f0 -/* 80836124 FC 03 00 28 */ fsub f0, f3, f0 -/* 80836128 FC 02 00 32 */ fmul f0, f2, f0 -/* 8083612C FC 21 00 32 */ fmul f1, f1, f0 -/* 80836130 FC 20 08 18 */ frsp f1, f1 -/* 80836134 48 00 00 88 */ b lbl_808361BC -lbl_80836138: -/* 80836138 C8 1B 00 38 */ lfd f0, 0x38(r27) -/* 8083613C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80836140 40 80 00 10 */ bge lbl_80836150 -/* 80836144 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80836148 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8083614C 48 00 00 70 */ b lbl_808361BC -lbl_80836150: -/* 80836150 D0 21 00 08 */ stfs f1, 8(r1) -/* 80836154 80 81 00 08 */ lwz r4, 8(r1) -/* 80836158 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8083615C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80836160 7C 03 00 00 */ cmpw r3, r0 -/* 80836164 41 82 00 14 */ beq lbl_80836178 -/* 80836168 40 80 00 40 */ bge lbl_808361A8 -/* 8083616C 2C 03 00 00 */ cmpwi r3, 0 -/* 80836170 41 82 00 20 */ beq lbl_80836190 -/* 80836174 48 00 00 34 */ b lbl_808361A8 -lbl_80836178: -/* 80836178 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8083617C 41 82 00 0C */ beq lbl_80836188 -/* 80836180 38 00 00 01 */ li r0, 1 -/* 80836184 48 00 00 28 */ b lbl_808361AC -lbl_80836188: -/* 80836188 38 00 00 02 */ li r0, 2 -/* 8083618C 48 00 00 20 */ b lbl_808361AC -lbl_80836190: -/* 80836190 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80836194 41 82 00 0C */ beq lbl_808361A0 -/* 80836198 38 00 00 05 */ li r0, 5 -/* 8083619C 48 00 00 10 */ b lbl_808361AC -lbl_808361A0: -/* 808361A0 38 00 00 03 */ li r0, 3 -/* 808361A4 48 00 00 08 */ b lbl_808361AC -lbl_808361A8: -/* 808361A8 38 00 00 04 */ li r0, 4 -lbl_808361AC: -/* 808361AC 2C 00 00 01 */ cmpwi r0, 1 -/* 808361B0 40 82 00 0C */ bne lbl_808361BC -/* 808361B4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 808361B8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_808361BC: -/* 808361BC 80 61 00 0C */ lwz r3, 0xc(r1) -/* 808361C0 D0 23 05 2C */ stfs f1, 0x52c(r3) -lbl_808361C4: -/* 808361C4 3A F7 00 01 */ addi r23, r23, 1 -/* 808361C8 3B 39 00 20 */ addi r25, r25, 0x20 -lbl_808361CC: -/* 808361CC 80 1E 05 84 */ lwz r0, 0x584(r30) -/* 808361D0 7C 17 00 00 */ cmpw r23, r0 -/* 808361D4 41 80 FE 70 */ blt lbl_80836044 -/* 808361D8 3B 5A 00 01 */ addi r26, r26, 1 -/* 808361DC 3B 18 00 20 */ addi r24, r24, 0x20 -lbl_808361E0: -/* 808361E0 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 808361E4 7C 1A 00 00 */ cmpw r26, r0 -/* 808361E8 41 80 FE 1C */ blt lbl_80836004 -/* 808361EC E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* qr0 */ -/* 808361F0 CB E1 00 90 */ lfd f31, 0x90(r1) -/* 808361F4 E3 C1 00 88 */ psq_l f30, 136(r1), 0, 0 /* qr0 */ -/* 808361F8 CB C1 00 80 */ lfd f30, 0x80(r1) -/* 808361FC E3 A1 00 78 */ psq_l f29, 120(r1), 0, 0 /* qr0 */ -/* 80836200 CB A1 00 70 */ lfd f29, 0x70(r1) -/* 80836204 E3 81 00 68 */ psq_l f28, 104(r1), 0, 0 /* qr0 */ -/* 80836208 CB 81 00 60 */ lfd f28, 0x60(r1) -/* 8083620C E3 61 00 58 */ psq_l f27, 88(r1), 0, 0 /* qr0 */ -/* 80836210 CB 61 00 50 */ lfd f27, 0x50(r1) -/* 80836214 39 61 00 50 */ addi r11, r1, 0x50 -/* 80836218 4B B2 BF F5 */ bl _restgpr_22 -/* 8083621C 80 01 00 A4 */ lwz r0, 0xa4(r1) -/* 80836220 7C 08 03 A6 */ mtlr r0 -/* 80836224 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80836228 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initFight__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initFight__10daFmtMng_cFv.s deleted file mode 100644 index 58be30d6630..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initFight__10daFmtMng_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80836F78: -/* 80836F78 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80836F7C 7C 08 02 A6 */ mflr r0 -/* 80836F80 90 01 00 34 */ stw r0, 0x34(r1) -/* 80836F84 39 61 00 30 */ addi r11, r1, 0x30 -/* 80836F88 4B B2 B2 49 */ bl _savegpr_26 -/* 80836F8C 7C 7A 1B 78 */ mr r26, r3 -/* 80836F90 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80836F94 3B C3 78 A8 */ addi r30, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80836F98 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 80836F9C D0 1A 05 2C */ stfs f0, 0x52c(r26) -/* 80836FA0 83 9A 05 6C */ lwz r28, 0x56c(r26) -/* 80836FA4 38 00 00 00 */ li r0, 0 -/* 80836FA8 90 01 00 08 */ stw r0, 8(r1) -/* 80836FAC 3B 60 00 00 */ li r27, 0 -/* 80836FB0 48 00 00 88 */ b lbl_80837038 -lbl_80836FB4: -/* 80836FB4 80 7C 00 00 */ lwz r3, 0(r28) -/* 80836FB8 38 81 00 08 */ addi r4, r1, 8 -/* 80836FBC 4B 7E 2A 01 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80836FC0 83 A1 00 08 */ lwz r29, 8(r1) -/* 80836FC4 28 1D 00 00 */ cmplwi r29, 0 -/* 80836FC8 41 82 00 68 */ beq lbl_80837030 -/* 80836FCC C0 3E 00 20 */ lfs f1, 0x20(r30) -/* 80836FD0 4B A3 09 85 */ bl cM_rndF__Ff -/* 80836FD4 FC 00 08 1E */ fctiwz f0, f1 -/* 80836FD8 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80836FDC 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80836FE0 7F A3 EB 78 */ mr r3, r29 -/* 80836FE4 38 80 00 2A */ li r4, 0x2a -/* 80836FE8 80 BD 0A CC */ lwz r5, 0xacc(r29) -/* 80836FEC 4B 92 11 05 */ bl getAnmP__10daNpcCd2_cFii -/* 80836FF0 7C 64 1B 78 */ mr r4, r3 -/* 80836FF4 7F A3 EB 78 */ mr r3, r29 -/* 80836FF8 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80836FFC C0 5E 00 1C */ lfs f2, 0x1c(r30) -/* 80837000 38 A0 00 02 */ li r5, 2 -/* 80837004 7F E6 FB 78 */ mr r6, r31 -/* 80837008 38 E0 FF FF */ li r7, -1 -/* 8083700C 4B 92 1E F5 */ bl setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii -/* 80837010 80 61 00 08 */ lwz r3, 8(r1) -/* 80837014 C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 80837018 C0 5E 00 5C */ lfs f2, 0x5c(r30) -/* 8083701C C0 7E 00 60 */ lfs f3, 0x60(r30) -/* 80837020 C0 9E 00 64 */ lfs f4, 0x64(r30) -/* 80837024 C0 BE 00 68 */ lfs f5, 0x68(r30) -/* 80837028 C0 DE 00 40 */ lfs f6, 0x40(r30) -/* 8083702C 4B 7E 35 1D */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -lbl_80837030: -/* 80837030 3B 7B 00 01 */ addi r27, r27, 1 -/* 80837034 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_80837038: -/* 80837038 80 7A 05 88 */ lwz r3, 0x588(r26) -/* 8083703C 80 1A 05 84 */ lwz r0, 0x584(r26) -/* 80837040 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80837044 7C 1B 00 00 */ cmpw r27, r0 -/* 80837048 41 80 FF 6C */ blt lbl_80836FB4 -/* 8083704C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80837050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80837054 38 63 09 78 */ addi r3, r3, 0x978 -/* 80837058 38 80 00 3C */ li r4, 0x3c -/* 8083705C 4B 7F DB 3D */ bl onSwitch__12dSv_danBit_cFi -/* 80837060 39 61 00 30 */ addi r11, r1, 0x30 -/* 80837064 4B B2 B1 B9 */ bl _restgpr_26 -/* 80837068 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8083706C 7C 08 03 A6 */ mtlr r0 -/* 80837070 38 21 00 30 */ addi r1, r1, 0x30 -/* 80837074 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMemberPos__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMemberPos__10daFmtMng_cFv.s deleted file mode 100644 index b48878e6794..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMemberPos__10daFmtMng_cFv.s +++ /dev/null @@ -1,347 +0,0 @@ -lbl_80835624: -/* 80835624 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 80835628 7C 08 02 A6 */ mflr r0 -/* 8083562C 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 80835630 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 80835634 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 80835638 DB C1 00 A0 */ stfd f30, 0xa0(r1) -/* 8083563C F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 /* qr0 */ -/* 80835640 DB A1 00 90 */ stfd f29, 0x90(r1) -/* 80835644 F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 /* qr0 */ -/* 80835648 DB 81 00 80 */ stfd f28, 0x80(r1) -/* 8083564C F3 81 00 88 */ psq_st f28, 136(r1), 0, 0 /* qr0 */ -/* 80835650 DB 61 00 70 */ stfd f27, 0x70(r1) -/* 80835654 F3 61 00 78 */ psq_st f27, 120(r1), 0, 0 /* qr0 */ -/* 80835658 DB 41 00 60 */ stfd f26, 0x60(r1) -/* 8083565C F3 41 00 68 */ psq_st f26, 104(r1), 0, 0 /* qr0 */ -/* 80835660 39 61 00 60 */ addi r11, r1, 0x60 -/* 80835664 4B B2 CB 69 */ bl _savegpr_25 -/* 80835668 7C 7A 1B 78 */ mr r26, r3 -/* 8083566C 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80835670 3B C3 78 A8 */ addi r30, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80835674 83 7A 05 68 */ lwz r27, 0x568(r26) -/* 80835678 A8 1A 04 E4 */ lha r0, 0x4e4(r26) -/* 8083567C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80835680 88 1A 04 E2 */ lbz r0, 0x4e2(r26) -/* 80835684 7C 04 07 74 */ extsb r4, r0 -/* 80835688 4B 81 C1 65 */ bl dPath_GetRoomPath__Fii -/* 8083568C 90 7B 00 00 */ stw r3, 0(r27) -/* 80835690 38 00 00 00 */ li r0, 0 -/* 80835694 90 1B 00 04 */ stw r0, 4(r27) -/* 80835698 38 00 00 01 */ li r0, 1 -/* 8083569C 98 1B 00 0C */ stb r0, 0xc(r27) -/* 808356A0 80 7B 00 00 */ lwz r3, 0(r27) -/* 808356A4 80 9B 00 04 */ lwz r4, 4(r27) -/* 808356A8 4B 81 C1 09 */ bl dPath_GetPnt__FPC5dPathi -/* 808356AC 38 83 00 04 */ addi r4, r3, 4 -/* 808356B0 38 7A 04 D0 */ addi r3, r26, 0x4d0 -/* 808356B4 4B B1 1C E9 */ bl PSVECSquareDistance -/* 808356B8 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 808356BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808356C0 40 81 00 58 */ ble lbl_80835718 -/* 808356C4 FC 00 08 34 */ frsqrte f0, f1 -/* 808356C8 C8 9E 00 28 */ lfd f4, 0x28(r30) -/* 808356CC FC 44 00 32 */ fmul f2, f4, f0 -/* 808356D0 C8 7E 00 30 */ lfd f3, 0x30(r30) -/* 808356D4 FC 00 00 32 */ fmul f0, f0, f0 -/* 808356D8 FC 01 00 32 */ fmul f0, f1, f0 -/* 808356DC FC 03 00 28 */ fsub f0, f3, f0 -/* 808356E0 FC 02 00 32 */ fmul f0, f2, f0 -/* 808356E4 FC 44 00 32 */ fmul f2, f4, f0 -/* 808356E8 FC 00 00 32 */ fmul f0, f0, f0 -/* 808356EC FC 01 00 32 */ fmul f0, f1, f0 -/* 808356F0 FC 03 00 28 */ fsub f0, f3, f0 -/* 808356F4 FC 02 00 32 */ fmul f0, f2, f0 -/* 808356F8 FC 44 00 32 */ fmul f2, f4, f0 -/* 808356FC FC 00 00 32 */ fmul f0, f0, f0 -/* 80835700 FC 01 00 32 */ fmul f0, f1, f0 -/* 80835704 FC 03 00 28 */ fsub f0, f3, f0 -/* 80835708 FC 02 00 32 */ fmul f0, f2, f0 -/* 8083570C FC 21 00 32 */ fmul f1, f1, f0 -/* 80835710 FC 20 08 18 */ frsp f1, f1 -/* 80835714 48 00 00 88 */ b lbl_8083579C -lbl_80835718: -/* 80835718 C8 1E 00 38 */ lfd f0, 0x38(r30) -/* 8083571C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80835720 40 80 00 10 */ bge lbl_80835730 -/* 80835724 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80835728 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8083572C 48 00 00 70 */ b lbl_8083579C -lbl_80835730: -/* 80835730 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80835734 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80835738 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8083573C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80835740 7C 03 00 00 */ cmpw r3, r0 -/* 80835744 41 82 00 14 */ beq lbl_80835758 -/* 80835748 40 80 00 40 */ bge lbl_80835788 -/* 8083574C 2C 03 00 00 */ cmpwi r3, 0 -/* 80835750 41 82 00 20 */ beq lbl_80835770 -/* 80835754 48 00 00 34 */ b lbl_80835788 -lbl_80835758: -/* 80835758 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8083575C 41 82 00 0C */ beq lbl_80835768 -/* 80835760 38 00 00 01 */ li r0, 1 -/* 80835764 48 00 00 28 */ b lbl_8083578C -lbl_80835768: -/* 80835768 38 00 00 02 */ li r0, 2 -/* 8083576C 48 00 00 20 */ b lbl_8083578C -lbl_80835770: -/* 80835770 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80835774 41 82 00 0C */ beq lbl_80835780 -/* 80835778 38 00 00 05 */ li r0, 5 -/* 8083577C 48 00 00 10 */ b lbl_8083578C -lbl_80835780: -/* 80835780 38 00 00 03 */ li r0, 3 -/* 80835784 48 00 00 08 */ b lbl_8083578C -lbl_80835788: -/* 80835788 38 00 00 04 */ li r0, 4 -lbl_8083578C: -/* 8083578C 2C 00 00 01 */ cmpwi r0, 1 -/* 80835790 40 82 00 0C */ bne lbl_8083579C -/* 80835794 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80835798 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8083579C: -/* 8083579C D0 3B 00 08 */ stfs f1, 8(r27) -/* 808357A0 80 7B 00 00 */ lwz r3, 0(r27) -/* 808357A4 38 80 00 00 */ li r4, 0 -/* 808357A8 4B 81 C0 09 */ bl dPath_GetPnt__FPC5dPathi -/* 808357AC C0 03 00 04 */ lfs f0, 4(r3) -/* 808357B0 D0 1A 04 A8 */ stfs f0, 0x4a8(r26) -/* 808357B4 C0 03 00 08 */ lfs f0, 8(r3) -/* 808357B8 D0 1A 04 AC */ stfs f0, 0x4ac(r26) -/* 808357BC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 808357C0 D0 1A 04 B0 */ stfs f0, 0x4b0(r26) -/* 808357C4 80 7B 00 00 */ lwz r3, 0(r27) -/* 808357C8 38 80 00 01 */ li r4, 1 -/* 808357CC 4B 81 BF E5 */ bl dPath_GetPnt__FPC5dPathi -/* 808357D0 80 83 00 04 */ lwz r4, 4(r3) -/* 808357D4 80 03 00 08 */ lwz r0, 8(r3) -/* 808357D8 90 81 00 14 */ stw r4, 0x14(r1) -/* 808357DC 90 01 00 18 */ stw r0, 0x18(r1) -/* 808357E0 80 03 00 0C */ lwz r0, 0xc(r3) -/* 808357E4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 808357E8 C0 5A 04 B0 */ lfs f2, 0x4b0(r26) -/* 808357EC C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 808357F0 C0 1A 04 AC */ lfs f0, 0x4ac(r26) -/* 808357F4 EC 21 00 2A */ fadds f1, f1, f0 -/* 808357F8 C0 1A 04 A8 */ lfs f0, 0x4a8(r26) -/* 808357FC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80835800 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 80835804 D0 41 00 28 */ stfs f2, 0x28(r1) -/* 80835808 38 61 00 20 */ addi r3, r1, 0x20 -/* 8083580C 4B 7E 84 B1 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80835810 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80835814 41 82 00 10 */ beq lbl_80835824 -/* 80835818 3C 60 80 45 */ lis r3, mGroundY__11fopAcM_gc_c@ha /* 0x80450CD0@ha */ -/* 8083581C C0 03 0C D0 */ lfs f0, mGroundY__11fopAcM_gc_c@l(r3) /* 0x80450CD0@l */ -/* 80835820 D0 1A 04 AC */ stfs f0, 0x4ac(r26) -lbl_80835824: -/* 80835824 38 00 00 00 */ li r0, 0 -/* 80835828 B0 1A 04 B4 */ sth r0, 0x4b4(r26) -/* 8083582C 38 7A 04 A8 */ addi r3, r26, 0x4a8 -/* 80835830 38 81 00 14 */ addi r4, r1, 0x14 -/* 80835834 4B A3 B3 D1 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80835838 B0 7A 04 B6 */ sth r3, 0x4b6(r26) -/* 8083583C 38 00 00 00 */ li r0, 0 -/* 80835840 B0 1A 04 B8 */ sth r0, 0x4b8(r26) -/* 80835844 38 7A 04 A8 */ addi r3, r26, 0x4a8 -/* 80835848 4B 7D 75 1D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 8083584C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80835850 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80835854 A8 9A 04 B6 */ lha r4, 0x4b6(r26) -/* 80835858 4B 7D 6B DD */ bl mDoMtx_YrotM__FPA4_fs -/* 8083585C 4B 7D 74 6D */ bl push__14mDoMtx_stack_cFv -/* 80835860 3B 80 00 00 */ li r28, 0 -/* 80835864 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80835868 3B E3 D4 70 */ addi r31, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8083586C 3B BE 00 00 */ addi r29, r30, 0 -/* 80835870 C3 DD 00 10 */ lfs f30, 0x10(r29) -/* 80835874 C3 FE 00 24 */ lfs f31, 0x24(r30) -/* 80835878 48 00 01 60 */ b lbl_808359D8 -lbl_8083587C: -/* 8083587C C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80835880 D0 1B 00 10 */ stfs f0, 0x10(r27) -/* 80835884 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80835888 D0 1B 00 14 */ stfs f0, 0x14(r27) -/* 8083588C C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80835890 D0 1B 00 18 */ stfs f0, 0x18(r27) -/* 80835894 C0 3E 00 24 */ lfs f1, 0x24(r30) -/* 80835898 FC 40 08 90 */ fmr f2, f1 -/* 8083589C FC 60 F0 50 */ fneg f3, f30 -/* 808358A0 4B 7D 74 FD */ bl transM__14mDoMtx_stack_cFfff -/* 808358A4 A8 1A 04 E4 */ lha r0, 0x4e4(r26) -/* 808358A8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 808358AC 88 1A 04 E2 */ lbz r0, 0x4e2(r26) -/* 808358B0 7C 04 07 74 */ extsb r4, r0 -/* 808358B4 4B 81 BF 39 */ bl dPath_GetRoomPath__Fii -/* 808358B8 90 7B 00 00 */ stw r3, 0(r27) -/* 808358BC 38 00 00 00 */ li r0, 0 -/* 808358C0 90 1B 00 04 */ stw r0, 4(r27) -/* 808358C4 38 00 00 01 */ li r0, 1 -/* 808358C8 98 1B 00 0C */ stb r0, 0xc(r27) -/* 808358CC 80 7B 00 00 */ lwz r3, 0(r27) -/* 808358D0 80 9B 00 04 */ lwz r4, 4(r27) -/* 808358D4 4B 81 BE DD */ bl dPath_GetPnt__FPC5dPathi -/* 808358D8 38 83 00 04 */ addi r4, r3, 4 -/* 808358DC 38 7B 00 10 */ addi r3, r27, 0x10 -/* 808358E0 4B B1 1A BD */ bl PSVECSquareDistance -/* 808358E4 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 808358E8 40 81 00 58 */ ble lbl_80835940 -/* 808358EC FC 00 08 34 */ frsqrte f0, f1 -/* 808358F0 C8 9E 00 28 */ lfd f4, 0x28(r30) -/* 808358F4 FC 44 00 32 */ fmul f2, f4, f0 -/* 808358F8 C8 7E 00 30 */ lfd f3, 0x30(r30) -/* 808358FC FC 00 00 32 */ fmul f0, f0, f0 -/* 80835900 FC 01 00 32 */ fmul f0, f1, f0 -/* 80835904 FC 03 00 28 */ fsub f0, f3, f0 -/* 80835908 FC 02 00 32 */ fmul f0, f2, f0 -/* 8083590C FC 44 00 32 */ fmul f2, f4, f0 -/* 80835910 FC 00 00 32 */ fmul f0, f0, f0 -/* 80835914 FC 01 00 32 */ fmul f0, f1, f0 -/* 80835918 FC 03 00 28 */ fsub f0, f3, f0 -/* 8083591C FC 02 00 32 */ fmul f0, f2, f0 -/* 80835920 FC 44 00 32 */ fmul f2, f4, f0 -/* 80835924 FC 00 00 32 */ fmul f0, f0, f0 -/* 80835928 FC 01 00 32 */ fmul f0, f1, f0 -/* 8083592C FC 03 00 28 */ fsub f0, f3, f0 -/* 80835930 FC 02 00 32 */ fmul f0, f2, f0 -/* 80835934 FC 21 00 32 */ fmul f1, f1, f0 -/* 80835938 FC 20 08 18 */ frsp f1, f1 -/* 8083593C 48 00 00 88 */ b lbl_808359C4 -lbl_80835940: -/* 80835940 C8 1E 00 38 */ lfd f0, 0x38(r30) -/* 80835944 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80835948 40 80 00 10 */ bge lbl_80835958 -/* 8083594C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80835950 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80835954 48 00 00 70 */ b lbl_808359C4 -lbl_80835958: -/* 80835958 D0 21 00 08 */ stfs f1, 8(r1) -/* 8083595C 80 81 00 08 */ lwz r4, 8(r1) -/* 80835960 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80835964 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80835968 7C 03 00 00 */ cmpw r3, r0 -/* 8083596C 41 82 00 14 */ beq lbl_80835980 -/* 80835970 40 80 00 40 */ bge lbl_808359B0 -/* 80835974 2C 03 00 00 */ cmpwi r3, 0 -/* 80835978 41 82 00 20 */ beq lbl_80835998 -/* 8083597C 48 00 00 34 */ b lbl_808359B0 -lbl_80835980: -/* 80835980 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80835984 41 82 00 0C */ beq lbl_80835990 -/* 80835988 38 00 00 01 */ li r0, 1 -/* 8083598C 48 00 00 28 */ b lbl_808359B4 -lbl_80835990: -/* 80835990 38 00 00 02 */ li r0, 2 -/* 80835994 48 00 00 20 */ b lbl_808359B4 -lbl_80835998: -/* 80835998 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8083599C 41 82 00 0C */ beq lbl_808359A8 -/* 808359A0 38 00 00 05 */ li r0, 5 -/* 808359A4 48 00 00 10 */ b lbl_808359B4 -lbl_808359A8: -/* 808359A8 38 00 00 03 */ li r0, 3 -/* 808359AC 48 00 00 08 */ b lbl_808359B4 -lbl_808359B0: -/* 808359B0 38 00 00 04 */ li r0, 4 -lbl_808359B4: -/* 808359B4 2C 00 00 01 */ cmpwi r0, 1 -/* 808359B8 40 82 00 0C */ bne lbl_808359C4 -/* 808359BC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 808359C0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_808359C4: -/* 808359C4 D0 3B 00 08 */ stfs f1, 8(r27) -/* 808359C8 A8 1A 04 B6 */ lha r0, 0x4b6(r26) -/* 808359CC B0 1B 00 1C */ sth r0, 0x1c(r27) -/* 808359D0 3B 9C 00 01 */ addi r28, r28, 1 -/* 808359D4 3B 7B 00 20 */ addi r27, r27, 0x20 -lbl_808359D8: -/* 808359D8 80 1A 05 88 */ lwz r0, 0x588(r26) -/* 808359DC 7C 1C 00 00 */ cmpw r28, r0 -/* 808359E0 41 80 FE 9C */ blt lbl_8083587C -/* 808359E4 83 3A 05 6C */ lwz r25, 0x56c(r26) -/* 808359E8 4B 7D 73 2D */ bl pop__14mDoMtx_stack_cFv -/* 808359EC 3B E0 00 00 */ li r31, 0 -/* 808359F0 38 9E 00 00 */ addi r4, r30, 0 -/* 808359F4 C3 BE 00 24 */ lfs f29, 0x24(r30) -/* 808359F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 808359FC 3B 63 D4 70 */ addi r27, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80835A00 C3 E4 00 0C */ lfs f31, 0xc(r4) -/* 80835A04 C3 7E 00 44 */ lfs f27, 0x44(r30) -/* 80835A08 CB 9E 00 48 */ lfd f28, 0x48(r30) -/* 80835A0C 3F 80 43 30 */ lis r28, 0x4330 -/* 80835A10 C3 DD 00 10 */ lfs f30, 0x10(r29) -/* 80835A14 48 00 00 BC */ b lbl_80835AD0 -lbl_80835A18: -/* 80835A18 80 7A 05 84 */ lwz r3, 0x584(r26) -/* 80835A1C 38 03 FF FF */ addi r0, r3, -1 -/* 80835A20 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80835A24 90 01 00 34 */ stw r0, 0x34(r1) -/* 80835A28 93 81 00 30 */ stw r28, 0x30(r1) -/* 80835A2C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80835A30 EC 00 E0 28 */ fsubs f0, f0, f28 -/* 80835A34 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80835A38 EF 5B 00 32 */ fmuls f26, f27, f0 -/* 80835A3C 3B A0 00 00 */ li r29, 0 -/* 80835A40 48 00 00 70 */ b lbl_80835AB0 -lbl_80835A44: -/* 80835A44 D3 59 00 04 */ stfs f26, 4(r25) -/* 80835A48 D3 B9 00 08 */ stfs f29, 8(r25) -/* 80835A4C D3 B9 00 0C */ stfs f29, 0xc(r25) -/* 80835A50 7F 63 DB 78 */ mr r3, r27 -/* 80835A54 38 99 00 04 */ addi r4, r25, 4 -/* 80835A58 7C 85 23 78 */ mr r5, r4 -/* 80835A5C 4B B1 13 11 */ bl PSMTXMultVec -/* 80835A60 C0 19 00 04 */ lfs f0, 4(r25) -/* 80835A64 D0 19 00 10 */ stfs f0, 0x10(r25) -/* 80835A68 C0 19 00 08 */ lfs f0, 8(r25) -/* 80835A6C D0 19 00 14 */ stfs f0, 0x14(r25) -/* 80835A70 C0 19 00 0C */ lfs f0, 0xc(r25) -/* 80835A74 D0 19 00 18 */ stfs f0, 0x18(r25) -/* 80835A78 EF 5A F8 28 */ fsubs f26, f26, f31 -/* 80835A7C 38 00 00 00 */ li r0, 0 -/* 80835A80 90 01 00 10 */ stw r0, 0x10(r1) -/* 80835A84 80 79 00 00 */ lwz r3, 0(r25) -/* 80835A88 38 81 00 10 */ addi r4, r1, 0x10 -/* 80835A8C 4B 7E 3F 31 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80835A90 80 61 00 10 */ lwz r3, 0x10(r1) -/* 80835A94 28 03 00 00 */ cmplwi r3, 0 -/* 80835A98 41 82 00 10 */ beq lbl_80835AA8 -/* 80835A9C 38 99 00 04 */ addi r4, r25, 4 -/* 80835AA0 A8 BA 04 B6 */ lha r5, 0x4b6(r26) -/* 80835AA4 48 18 4A 99 */ bl initPosAngle__10daNpcFgd_cFR3Vecs -lbl_80835AA8: -/* 80835AA8 3B BD 00 01 */ addi r29, r29, 1 -/* 80835AAC 3B 39 00 20 */ addi r25, r25, 0x20 -lbl_80835AB0: -/* 80835AB0 80 1A 05 84 */ lwz r0, 0x584(r26) -/* 80835AB4 7C 1D 00 00 */ cmpw r29, r0 -/* 80835AB8 41 80 FF 8C */ blt lbl_80835A44 -/* 80835ABC C0 3E 00 24 */ lfs f1, 0x24(r30) -/* 80835AC0 FC 40 08 90 */ fmr f2, f1 -/* 80835AC4 FC 60 F0 50 */ fneg f3, f30 -/* 80835AC8 4B 7D 72 D5 */ bl transM__14mDoMtx_stack_cFfff -/* 80835ACC 3B FF 00 01 */ addi r31, r31, 1 -lbl_80835AD0: -/* 80835AD0 80 1A 05 88 */ lwz r0, 0x588(r26) -/* 80835AD4 7C 1F 00 00 */ cmpw r31, r0 -/* 80835AD8 41 80 FF 40 */ blt lbl_80835A18 -/* 80835ADC E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 80835AE0 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 80835AE4 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 /* qr0 */ -/* 80835AE8 CB C1 00 A0 */ lfd f30, 0xa0(r1) -/* 80835AEC E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 /* qr0 */ -/* 80835AF0 CB A1 00 90 */ lfd f29, 0x90(r1) -/* 80835AF4 E3 81 00 88 */ psq_l f28, 136(r1), 0, 0 /* qr0 */ -/* 80835AF8 CB 81 00 80 */ lfd f28, 0x80(r1) -/* 80835AFC E3 61 00 78 */ psq_l f27, 120(r1), 0, 0 /* qr0 */ -/* 80835B00 CB 61 00 70 */ lfd f27, 0x70(r1) -/* 80835B04 E3 41 00 68 */ psq_l f26, 104(r1), 0, 0 /* qr0 */ -/* 80835B08 CB 41 00 60 */ lfd f26, 0x60(r1) -/* 80835B0C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80835B10 4B B2 C7 09 */ bl _restgpr_25 -/* 80835B14 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 80835B18 7C 08 03 A6 */ mtlr r0 -/* 80835B1C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80835B20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMotion__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMotion__10daFmtMng_cFv.s deleted file mode 100644 index 57b75fb036c..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMotion__10daFmtMng_cFv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_80836C64: -/* 80836C64 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80836C68 7C 08 02 A6 */ mflr r0 -/* 80836C6C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80836C70 39 61 00 40 */ addi r11, r1, 0x40 -/* 80836C74 4B B2 B5 59 */ bl _savegpr_25 -/* 80836C78 7C 7E 1B 78 */ mr r30, r3 -/* 80836C7C 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80836C80 3B E3 78 A8 */ addi r31, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80836C84 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80836C88 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80836C8C 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80836C90 80 64 00 00 */ lwz r3, 0(r4) -/* 80836C94 80 63 00 08 */ lwz r3, 8(r3) -/* 80836C98 80 04 00 04 */ lwz r0, 4(r4) -/* 80836C9C 54 00 20 36 */ slwi r0, r0, 4 -/* 80836CA0 7C 63 02 14 */ add r3, r3, r0 -/* 80836CA4 88 03 00 03 */ lbz r0, 3(r3) -/* 80836CA8 7C 1C 07 74 */ extsb r28, r0 -/* 80836CAC 4B 97 58 D1 */ bl dKy_darkworld_check__Fv -/* 80836CB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80836CB4 41 82 00 10 */ beq lbl_80836CC4 -/* 80836CB8 4B 96 8E 79 */ bl dKy_getDarktime_minute__Fv -/* 80836CBC 7C 7D 1B 78 */ mr r29, r3 -/* 80836CC0 48 00 00 0C */ b lbl_80836CCC -lbl_80836CC4: -/* 80836CC4 4B 96 8D 79 */ bl dKy_getdaytime_minute__Fv -/* 80836CC8 7C 7D 1B 78 */ mr r29, r3 -lbl_80836CCC: -/* 80836CCC 4B 97 58 B1 */ bl dKy_darkworld_check__Fv -/* 80836CD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80836CD4 41 82 00 0C */ beq lbl_80836CE0 -/* 80836CD8 4B 96 8E 1D */ bl dKy_getDarktime_hour__Fv -/* 80836CDC 48 00 00 08 */ b lbl_80836CE4 -lbl_80836CE0: -/* 80836CE0 4B 96 8D 31 */ bl dKy_getdaytime_hour__Fv -lbl_80836CE4: -/* 80836CE4 1C 63 00 3C */ mulli r3, r3, 0x3c -/* 80836CE8 1C 1C 00 0A */ mulli r0, r28, 0xa -/* 80836CEC 7C 03 02 14 */ add r0, r3, r0 -/* 80836CF0 7C 1D 02 14 */ add r0, r29, r0 -/* 80836CF4 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80836CF8 4B 97 1E 41 */ bl dKy_get_dayofweek__Fv -/* 80836CFC 90 7E 05 94 */ stw r3, 0x594(r30) -/* 80836D00 80 7E 05 9C */ lwz r3, 0x59c(r30) -/* 80836D04 2C 03 05 A0 */ cmpwi r3, 0x5a0 -/* 80836D08 40 81 00 28 */ ble lbl_80836D30 -/* 80836D0C 38 03 FA 60 */ addi r0, r3, -1440 -/* 80836D10 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80836D14 80 7E 05 94 */ lwz r3, 0x594(r30) -/* 80836D18 38 83 00 01 */ addi r4, r3, 1 -/* 80836D1C 38 60 00 07 */ li r3, 7 -/* 80836D20 7C 04 1B D6 */ divw r0, r4, r3 -/* 80836D24 7C 00 19 D6 */ mullw r0, r0, r3 -/* 80836D28 7C 00 20 50 */ subf r0, r0, r4 -/* 80836D2C 90 1E 05 94 */ stw r0, 0x594(r30) -lbl_80836D30: -/* 80836D30 3B 60 00 00 */ li r27, 0 -/* 80836D34 80 1E 05 98 */ lwz r0, 0x598(r30) -/* 80836D38 2C 00 00 02 */ cmpwi r0, 2 -/* 80836D3C 41 82 00 34 */ beq lbl_80836D70 -/* 80836D40 40 80 00 14 */ bge lbl_80836D54 -/* 80836D44 2C 00 00 00 */ cmpwi r0, 0 -/* 80836D48 41 82 00 18 */ beq lbl_80836D60 -/* 80836D4C 40 80 00 1C */ bge lbl_80836D68 -/* 80836D50 48 00 00 2C */ b lbl_80836D7C -lbl_80836D54: -/* 80836D54 2C 00 00 04 */ cmpwi r0, 4 -/* 80836D58 40 80 00 24 */ bge lbl_80836D7C -/* 80836D5C 48 00 00 1C */ b lbl_80836D78 -lbl_80836D60: -/* 80836D60 3B 60 00 00 */ li r27, 0 -/* 80836D64 48 00 00 18 */ b lbl_80836D7C -lbl_80836D68: -/* 80836D68 3B 60 00 01 */ li r27, 1 -/* 80836D6C 48 00 00 10 */ b lbl_80836D7C -lbl_80836D70: -/* 80836D70 3B 60 00 06 */ li r27, 6 -/* 80836D74 48 00 00 08 */ b lbl_80836D7C -lbl_80836D78: -/* 80836D78 3B 60 00 07 */ li r27, 7 -lbl_80836D7C: -/* 80836D7C 83 5E 05 6C */ lwz r26, 0x56c(r30) -/* 80836D80 38 00 00 00 */ li r0, 0 -/* 80836D84 90 01 00 08 */ stw r0, 8(r1) -/* 80836D88 3B 20 00 00 */ li r25, 0 -/* 80836D8C 48 00 00 68 */ b lbl_80836DF4 -lbl_80836D90: -/* 80836D90 80 7A 00 00 */ lwz r3, 0(r26) -/* 80836D94 38 81 00 08 */ addi r4, r1, 8 -/* 80836D98 4B 7E 2C 25 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80836D9C 83 81 00 08 */ lwz r28, 8(r1) -/* 80836DA0 28 1C 00 00 */ cmplwi r28, 0 -/* 80836DA4 41 82 00 48 */ beq lbl_80836DEC -/* 80836DA8 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80836DAC 4B A3 0B A9 */ bl cM_rndF__Ff -/* 80836DB0 FC 00 08 1E */ fctiwz f0, f1 -/* 80836DB4 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80836DB8 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80836DBC 7F 83 E3 78 */ mr r3, r28 -/* 80836DC0 7F 64 DB 78 */ mr r4, r27 -/* 80836DC4 80 BC 0A CC */ lwz r5, 0xacc(r28) -/* 80836DC8 4B 92 13 29 */ bl getAnmP__10daNpcCd2_cFii -/* 80836DCC 7C 64 1B 78 */ mr r4, r3 -/* 80836DD0 7F 83 E3 78 */ mr r3, r28 -/* 80836DD4 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80836DD8 C0 5F 00 1C */ lfs f2, 0x1c(r31) -/* 80836DDC 38 A0 00 02 */ li r5, 2 -/* 80836DE0 7F A6 EB 78 */ mr r6, r29 -/* 80836DE4 38 E0 FF FF */ li r7, -1 -/* 80836DE8 4B 92 21 19 */ bl setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii -lbl_80836DEC: -/* 80836DEC 3B 39 00 01 */ addi r25, r25, 1 -/* 80836DF0 3B 5A 00 20 */ addi r26, r26, 0x20 -lbl_80836DF4: -/* 80836DF4 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 80836DF8 80 1E 05 84 */ lwz r0, 0x584(r30) -/* 80836DFC 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80836E00 7C 19 00 00 */ cmpw r25, r0 -/* 80836E04 41 80 FF 8C */ blt lbl_80836D90 -/* 80836E08 39 61 00 40 */ addi r11, r1, 0x40 -/* 80836E0C 4B B2 B4 0D */ bl _restgpr_25 -/* 80836E10 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80836E14 7C 08 03 A6 */ mtlr r0 -/* 80836E18 38 21 00 40 */ addi r1, r1, 0x40 -/* 80836E1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initReverse__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initReverse__10daFmtMng_cFv.s deleted file mode 100644 index fcfa7fa18bd..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initReverse__10daFmtMng_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80836810: -/* 80836810 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80836814 7C 08 02 A6 */ mflr r0 -/* 80836818 90 01 00 24 */ stw r0, 0x24(r1) -/* 8083681C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80836820 4B B2 B9 BD */ bl _savegpr_29 -/* 80836824 7C 7D 1B 78 */ mr r29, r3 -/* 80836828 3C 60 80 83 */ lis r3, lit_4082@ha /* 0x808378CC@ha */ -/* 8083682C C0 03 78 CC */ lfs f0, lit_4082@l(r3) /* 0x808378CC@l */ -/* 80836830 D0 1D 05 2C */ stfs f0, 0x52c(r29) -/* 80836834 83 FD 05 6C */ lwz r31, 0x56c(r29) -/* 80836838 38 00 00 00 */ li r0, 0 -/* 8083683C 90 01 00 08 */ stw r0, 8(r1) -/* 80836840 3B C0 00 00 */ li r30, 0 -/* 80836844 48 00 00 34 */ b lbl_80836878 -lbl_80836848: -/* 80836848 80 7F 00 00 */ lwz r3, 0(r31) -/* 8083684C 38 81 00 08 */ addi r4, r1, 8 -/* 80836850 4B 7E 31 6D */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80836854 80 61 00 08 */ lwz r3, 8(r1) -/* 80836858 28 03 00 00 */ cmplwi r3, 0 -/* 8083685C 41 82 00 14 */ beq lbl_80836870 -/* 80836860 A8 63 04 E6 */ lha r3, 0x4e6(r3) -/* 80836864 3C 63 00 01 */ addis r3, r3, 1 -/* 80836868 38 03 80 00 */ addi r0, r3, -32768 -/* 8083686C B0 1F 00 1C */ sth r0, 0x1c(r31) -lbl_80836870: -/* 80836870 3B DE 00 01 */ addi r30, r30, 1 -/* 80836874 3B FF 00 20 */ addi r31, r31, 0x20 -lbl_80836878: -/* 80836878 80 7D 05 88 */ lwz r3, 0x588(r29) -/* 8083687C 80 1D 05 84 */ lwz r0, 0x584(r29) -/* 80836880 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80836884 7C 1E 00 00 */ cmpw r30, r0 -/* 80836888 41 80 FF C0 */ blt lbl_80836848 -/* 8083688C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80836890 4B B2 B9 99 */ bl _restgpr_29 -/* 80836894 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80836898 7C 08 03 A6 */ mtlr r0 -/* 8083689C 38 21 00 20 */ addi r1, r1, 0x20 -/* 808368A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWait__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWait__10daFmtMng_cFv.s deleted file mode 100644 index 7f690ef6d5e..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWait__10daFmtMng_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80835558: -/* 80835558 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8083555C 7C 08 02 A6 */ mflr r0 -/* 80835560 90 01 00 34 */ stw r0, 0x34(r1) -/* 80835564 39 61 00 30 */ addi r11, r1, 0x30 -/* 80835568 4B B2 CC 69 */ bl _savegpr_26 -/* 8083556C 7C 7A 1B 78 */ mr r26, r3 -/* 80835570 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80835574 3B C3 78 A8 */ addi r30, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80835578 83 9A 05 6C */ lwz r28, 0x56c(r26) -/* 8083557C 38 00 00 00 */ li r0, 0 -/* 80835580 90 01 00 08 */ stw r0, 8(r1) -/* 80835584 3B 60 00 00 */ li r27, 0 -/* 80835588 48 00 00 68 */ b lbl_808355F0 -lbl_8083558C: -/* 8083558C 80 7C 00 00 */ lwz r3, 0(r28) -/* 80835590 38 81 00 08 */ addi r4, r1, 8 -/* 80835594 4B 7E 44 29 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80835598 83 A1 00 08 */ lwz r29, 8(r1) -/* 8083559C 28 1D 00 00 */ cmplwi r29, 0 -/* 808355A0 41 82 00 48 */ beq lbl_808355E8 -/* 808355A4 C0 3E 00 20 */ lfs f1, 0x20(r30) -/* 808355A8 4B A3 23 AD */ bl cM_rndF__Ff -/* 808355AC FC 00 08 1E */ fctiwz f0, f1 -/* 808355B0 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 808355B4 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 808355B8 7F A3 EB 78 */ mr r3, r29 -/* 808355BC 38 80 00 00 */ li r4, 0 -/* 808355C0 80 BD 0A CC */ lwz r5, 0xacc(r29) -/* 808355C4 4B 92 2B 2D */ bl getAnmP__10daNpcCd2_cFii -/* 808355C8 7C 64 1B 78 */ mr r4, r3 -/* 808355CC 7F A3 EB 78 */ mr r3, r29 -/* 808355D0 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 808355D4 C0 5E 00 1C */ lfs f2, 0x1c(r30) -/* 808355D8 38 A0 00 02 */ li r5, 2 -/* 808355DC 7F E6 FB 78 */ mr r6, r31 -/* 808355E0 38 E0 FF FF */ li r7, -1 -/* 808355E4 4B 92 39 1D */ bl setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii -lbl_808355E8: -/* 808355E8 3B 7B 00 01 */ addi r27, r27, 1 -/* 808355EC 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_808355F0: -/* 808355F0 80 7A 05 88 */ lwz r3, 0x588(r26) -/* 808355F4 80 1A 05 84 */ lwz r0, 0x584(r26) -/* 808355F8 7C 03 01 D6 */ mullw r0, r3, r0 -/* 808355FC 7C 1B 00 00 */ cmpw r27, r0 -/* 80835600 41 80 FF 8C */ blt lbl_8083558C -/* 80835604 7F 43 D3 78 */ mr r3, r26 -/* 80835608 48 00 00 1D */ bl initMemberPos__10daFmtMng_cFv -/* 8083560C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80835610 4B B2 CC 0D */ bl _restgpr_26 -/* 80835614 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80835618 7C 08 03 A6 */ mtlr r0 -/* 8083561C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80835620 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWalk__10daFmtMng_cFv.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWalk__10daFmtMng_cFv.s deleted file mode 100644 index b1ee459f2d0..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWalk__10daFmtMng_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80835D28: -/* 80835D28 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80835D2C 7C 08 02 A6 */ mflr r0 -/* 80835D30 90 01 00 34 */ stw r0, 0x34(r1) -/* 80835D34 39 61 00 30 */ addi r11, r1, 0x30 -/* 80835D38 4B B2 C4 99 */ bl _savegpr_26 -/* 80835D3C 7C 7A 1B 78 */ mr r26, r3 -/* 80835D40 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80835D44 3B C3 78 A8 */ addi r30, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80835D48 83 9A 05 6C */ lwz r28, 0x56c(r26) -/* 80835D4C 38 00 00 00 */ li r0, 0 -/* 80835D50 90 01 00 08 */ stw r0, 8(r1) -/* 80835D54 3B 60 00 00 */ li r27, 0 -/* 80835D58 48 00 00 68 */ b lbl_80835DC0 -lbl_80835D5C: -/* 80835D5C 80 7C 00 00 */ lwz r3, 0(r28) -/* 80835D60 38 81 00 08 */ addi r4, r1, 8 -/* 80835D64 4B 7E 3C 59 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80835D68 83 A1 00 08 */ lwz r29, 8(r1) -/* 80835D6C 28 1D 00 00 */ cmplwi r29, 0 -/* 80835D70 41 82 00 48 */ beq lbl_80835DB8 -/* 80835D74 C0 3E 00 20 */ lfs f1, 0x20(r30) -/* 80835D78 4B A3 1B DD */ bl cM_rndF__Ff -/* 80835D7C FC 00 08 1E */ fctiwz f0, f1 -/* 80835D80 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80835D84 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80835D88 7F A3 EB 78 */ mr r3, r29 -/* 80835D8C 38 80 00 02 */ li r4, 2 -/* 80835D90 80 BD 0A CC */ lwz r5, 0xacc(r29) -/* 80835D94 4B 92 23 5D */ bl getAnmP__10daNpcCd2_cFii -/* 80835D98 7C 64 1B 78 */ mr r4, r3 -/* 80835D9C 7F A3 EB 78 */ mr r3, r29 -/* 80835DA0 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80835DA4 C0 5E 00 1C */ lfs f2, 0x1c(r30) -/* 80835DA8 38 A0 00 02 */ li r5, 2 -/* 80835DAC 7F E6 FB 78 */ mr r6, r31 -/* 80835DB0 38 E0 FF FF */ li r7, -1 -/* 80835DB4 4B 92 31 4D */ bl setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii -lbl_80835DB8: -/* 80835DB8 3B 7B 00 01 */ addi r27, r27, 1 -/* 80835DBC 3B 9C 00 20 */ addi r28, r28, 0x20 -lbl_80835DC0: -/* 80835DC0 80 7A 05 88 */ lwz r3, 0x588(r26) -/* 80835DC4 80 1A 05 84 */ lwz r0, 0x584(r26) -/* 80835DC8 7C 03 01 D6 */ mullw r0, r3, r0 -/* 80835DCC 7C 1B 00 00 */ cmpw r27, r0 -/* 80835DD0 41 80 FF 8C */ blt lbl_80835D5C -/* 80835DD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80835DD8 4B B2 C4 45 */ bl _restgpr_26 -/* 80835DDC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80835DE0 7C 08 03 A6 */ mtlr r0 -/* 80835DE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80835DE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/setMovePath__10daFmtMng_cFP8FmtPos_ci.s b/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/setMovePath__10daFmtMng_cFP8FmtPos_ci.s deleted file mode 100644 index 1508f6849d5..00000000000 --- a/asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/setMovePath__10daFmtMng_cFP8FmtPos_ci.s +++ /dev/null @@ -1,253 +0,0 @@ -lbl_8083622C: -/* 8083622C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80836230 7C 08 02 A6 */ mflr r0 -/* 80836234 90 01 00 44 */ stw r0, 0x44(r1) -/* 80836238 39 61 00 40 */ addi r11, r1, 0x40 -/* 8083623C 4B B2 BF 9D */ bl _savegpr_28 -/* 80836240 7C 7D 1B 78 */ mr r29, r3 -/* 80836244 7C 9E 23 78 */ mr r30, r4 -/* 80836248 7C BC 2B 78 */ mr r28, r5 -/* 8083624C 3C 60 80 83 */ lis r3, M_attr__10daFmtMng_c@ha /* 0x808378A8@ha */ -/* 80836250 3B E3 78 A8 */ addi r31, r3, M_attr__10daFmtMng_c@l /* 0x808378A8@l */ -/* 80836254 C0 04 00 10 */ lfs f0, 0x10(r4) -/* 80836258 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8083625C C0 04 00 14 */ lfs f0, 0x14(r4) -/* 80836260 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80836264 C0 04 00 18 */ lfs f0, 0x18(r4) -/* 80836268 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8083626C 7F C3 F3 78 */ mr r3, r30 -/* 80836270 38 81 00 18 */ addi r4, r1, 0x18 -/* 80836274 C0 3D 05 2C */ lfs f1, 0x52c(r29) -/* 80836278 48 00 03 E5 */ bl checkPoint__15daFmtMng_Path_cF4cXyzf -/* 8083627C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80836280 41 82 03 18 */ beq lbl_80836598 -/* 80836284 2C 1C 00 00 */ cmpwi r28, 0 -/* 80836288 40 82 00 24 */ bne lbl_808362AC -/* 8083628C 80 7E 00 00 */ lwz r3, 0(r30) -/* 80836290 80 63 00 08 */ lwz r3, 8(r3) -/* 80836294 80 1E 00 04 */ lwz r0, 4(r30) -/* 80836298 54 00 20 36 */ slwi r0, r0, 4 -/* 8083629C 7C 03 00 AE */ lbzx r0, r3, r0 -/* 808362A0 7C 00 07 74 */ extsb r0, r0 -/* 808362A4 90 1D 05 98 */ stw r0, 0x598(r29) -/* 808362A8 48 00 00 0C */ b lbl_808362B4 -lbl_808362AC: -/* 808362AC 38 00 FF FF */ li r0, -1 -/* 808362B0 90 1D 05 98 */ stw r0, 0x598(r29) -lbl_808362B4: -/* 808362B4 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 808362B8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 808362BC C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 808362C0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 808362C4 C0 1E 00 18 */ lfs f0, 0x18(r30) -/* 808362C8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 808362CC 7F C3 F3 78 */ mr r3, r30 -/* 808362D0 38 81 00 0C */ addi r4, r1, 0xc -/* 808362D4 C0 3D 05 2C */ lfs f1, 0x52c(r29) -/* 808362D8 48 00 02 D9 */ bl checkPathEnd__15daFmtMng_Path_cF4cXyzf -/* 808362DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 808362E0 41 82 00 F8 */ beq lbl_808363D8 -/* 808362E4 2C 1C 00 00 */ cmpwi r28, 0 -/* 808362E8 40 82 00 D4 */ bne lbl_808363BC -/* 808362EC 4B 97 62 91 */ bl dKy_darkworld_check__Fv -/* 808362F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 808362F4 41 82 00 10 */ beq lbl_80836304 -/* 808362F8 4B 96 98 39 */ bl dKy_getDarktime_minute__Fv -/* 808362FC 7C 7C 1B 78 */ mr r28, r3 -/* 80836300 48 00 00 0C */ b lbl_8083630C -lbl_80836304: -/* 80836304 4B 96 97 39 */ bl dKy_getdaytime_minute__Fv -/* 80836308 7C 7C 1B 78 */ mr r28, r3 -lbl_8083630C: -/* 8083630C 4B 97 62 71 */ bl dKy_darkworld_check__Fv -/* 80836310 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80836314 41 82 00 0C */ beq lbl_80836320 -/* 80836318 4B 96 97 DD */ bl dKy_getDarktime_hour__Fv -/* 8083631C 48 00 00 08 */ b lbl_80836324 -lbl_80836320: -/* 80836320 4B 96 96 F1 */ bl dKy_getdaytime_hour__Fv -lbl_80836324: -/* 80836324 1C 03 00 3C */ mulli r0, r3, 0x3c -/* 80836328 7C 7C 02 14 */ add r3, r28, r0 -/* 8083632C 80 1D 05 8C */ lwz r0, 0x58c(r29) -/* 80836330 7C 03 00 00 */ cmpw r3, r0 -/* 80836334 40 81 00 4C */ ble lbl_80836380 -/* 80836338 80 1D 05 90 */ lwz r0, 0x590(r29) -/* 8083633C 7C 03 00 00 */ cmpw r3, r0 -/* 80836340 40 80 00 40 */ bge lbl_80836380 -/* 80836344 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80836348 90 1D 05 7C */ stw r0, 0x57c(r29) -/* 8083634C 38 00 00 02 */ li r0, 2 -/* 80836350 90 1D 05 78 */ stw r0, 0x578(r29) -/* 80836354 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80836358 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 8083635C 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 80836360 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 80836364 7C 00 22 14 */ add r0, r0, r4 -/* 80836368 90 1D 05 74 */ stw r0, 0x574(r29) -/* 8083636C 7F A3 EB 78 */ mr r3, r29 -/* 80836370 81 9D 05 74 */ lwz r12, 0x574(r29) -/* 80836374 4B B2 BD 11 */ bl __ptmf_scall -/* 80836378 60 00 00 00 */ nop -/* 8083637C 48 00 00 A0 */ b lbl_8083641C -lbl_80836380: -/* 80836380 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80836384 90 1D 05 7C */ stw r0, 0x57c(r29) -/* 80836388 38 00 00 00 */ li r0, 0 -/* 8083638C 90 1D 05 78 */ stw r0, 0x578(r29) -/* 80836390 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 80836394 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 80836398 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 8083639C 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 808363A0 7C 00 22 14 */ add r0, r0, r4 -/* 808363A4 90 1D 05 74 */ stw r0, 0x574(r29) -/* 808363A8 7F A3 EB 78 */ mr r3, r29 -/* 808363AC 81 9D 05 74 */ lwz r12, 0x574(r29) -/* 808363B0 4B B2 BC D5 */ bl __ptmf_scall -/* 808363B4 60 00 00 00 */ nop -/* 808363B8 48 00 00 64 */ b lbl_8083641C -lbl_808363BC: -/* 808363BC 88 1E 00 0C */ lbz r0, 0xc(r30) -/* 808363C0 7C 00 07 75 */ extsb. r0, r0 -/* 808363C4 38 00 00 01 */ li r0, 1 -/* 808363C8 40 81 00 08 */ ble lbl_808363D0 -/* 808363CC 38 00 FF FF */ li r0, -1 -lbl_808363D0: -/* 808363D0 98 1E 00 0C */ stb r0, 0xc(r30) -/* 808363D4 48 00 00 48 */ b lbl_8083641C -lbl_808363D8: -/* 808363D8 80 1D 05 98 */ lwz r0, 0x598(r29) -/* 808363DC 2C 00 00 00 */ cmpwi r0, 0 -/* 808363E0 41 80 00 3C */ blt lbl_8083641C -/* 808363E4 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 808363E8 90 1D 05 7C */ stw r0, 0x57c(r29) -/* 808363EC 38 00 00 03 */ li r0, 3 -/* 808363F0 90 1D 05 78 */ stw r0, 0x578(r29) -/* 808363F4 80 1D 05 78 */ lwz r0, 0x578(r29) -/* 808363F8 1C 80 00 18 */ mulli r4, r0, 0x18 -/* 808363FC 3C 60 80 83 */ lis r3, ActionTable__10daFmtMng_c@ha /* 0x808379C4@ha */ -/* 80836400 38 03 79 C4 */ addi r0, r3, ActionTable__10daFmtMng_c@l /* 0x808379C4@l */ -/* 80836404 7C 00 22 14 */ add r0, r0, r4 -/* 80836408 90 1D 05 74 */ stw r0, 0x574(r29) -/* 8083640C 7F A3 EB 78 */ mr r3, r29 -/* 80836410 81 9D 05 74 */ lwz r12, 0x574(r29) -/* 80836414 4B B2 BC 71 */ bl __ptmf_scall -/* 80836418 60 00 00 00 */ nop -lbl_8083641C: -/* 8083641C 88 1E 00 0C */ lbz r0, 0xc(r30) -/* 80836420 7C 00 07 75 */ extsb. r0, r0 -/* 80836424 40 81 00 3C */ ble lbl_80836460 -/* 80836428 80 7E 00 04 */ lwz r3, 4(r30) -/* 8083642C 80 9E 00 00 */ lwz r4, 0(r30) -/* 80836430 A0 04 00 00 */ lhz r0, 0(r4) -/* 80836434 38 63 00 01 */ addi r3, r3, 1 -/* 80836438 7C 03 00 00 */ cmpw r3, r0 -/* 8083643C 41 80 00 1C */ blt lbl_80836458 -/* 80836440 88 04 00 05 */ lbz r0, 5(r4) -/* 80836444 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80836448 41 82 00 0C */ beq lbl_80836454 -/* 8083644C 38 60 00 00 */ li r3, 0 -/* 80836450 48 00 00 08 */ b lbl_80836458 -lbl_80836454: -/* 80836454 38 63 FF FF */ addi r3, r3, -1 -lbl_80836458: -/* 80836458 90 7E 00 04 */ stw r3, 4(r30) -/* 8083645C 48 00 00 34 */ b lbl_80836490 -lbl_80836460: -/* 80836460 80 7E 00 04 */ lwz r3, 4(r30) -/* 80836464 34 63 FF FF */ addic. r3, r3, -1 -/* 80836468 40 80 00 24 */ bge lbl_8083648C -/* 8083646C 80 7E 00 00 */ lwz r3, 0(r30) -/* 80836470 88 03 00 05 */ lbz r0, 5(r3) -/* 80836474 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80836478 41 82 00 10 */ beq lbl_80836488 -/* 8083647C A0 63 00 00 */ lhz r3, 0(r3) -/* 80836480 38 63 FF FF */ addi r3, r3, -1 -/* 80836484 48 00 00 08 */ b lbl_8083648C -lbl_80836488: -/* 80836488 38 60 00 00 */ li r3, 0 -lbl_8083648C: -/* 8083648C 90 7E 00 04 */ stw r3, 4(r30) -lbl_80836490: -/* 80836490 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80836494 D0 1E 00 08 */ stfs f0, 8(r30) -/* 80836498 80 7E 00 00 */ lwz r3, 0(r30) -/* 8083649C 80 9E 00 04 */ lwz r4, 4(r30) -/* 808364A0 4B 81 B3 11 */ bl dPath_GetPnt__FPC5dPathi -/* 808364A4 38 83 00 04 */ addi r4, r3, 4 -/* 808364A8 38 7E 00 10 */ addi r3, r30, 0x10 -/* 808364AC 4B B1 0E F1 */ bl PSVECSquareDistance -/* 808364B0 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 808364B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 808364B8 40 81 00 58 */ ble lbl_80836510 -/* 808364BC FC 00 08 34 */ frsqrte f0, f1 -/* 808364C0 C8 9F 00 28 */ lfd f4, 0x28(r31) -/* 808364C4 FC 44 00 32 */ fmul f2, f4, f0 -/* 808364C8 C8 7F 00 30 */ lfd f3, 0x30(r31) -/* 808364CC FC 00 00 32 */ fmul f0, f0, f0 -/* 808364D0 FC 01 00 32 */ fmul f0, f1, f0 -/* 808364D4 FC 03 00 28 */ fsub f0, f3, f0 -/* 808364D8 FC 02 00 32 */ fmul f0, f2, f0 -/* 808364DC FC 44 00 32 */ fmul f2, f4, f0 -/* 808364E0 FC 00 00 32 */ fmul f0, f0, f0 -/* 808364E4 FC 01 00 32 */ fmul f0, f1, f0 -/* 808364E8 FC 03 00 28 */ fsub f0, f3, f0 -/* 808364EC FC 02 00 32 */ fmul f0, f2, f0 -/* 808364F0 FC 44 00 32 */ fmul f2, f4, f0 -/* 808364F4 FC 00 00 32 */ fmul f0, f0, f0 -/* 808364F8 FC 01 00 32 */ fmul f0, f1, f0 -/* 808364FC FC 03 00 28 */ fsub f0, f3, f0 -/* 80836500 FC 02 00 32 */ fmul f0, f2, f0 -/* 80836504 FC 21 00 32 */ fmul f1, f1, f0 -/* 80836508 FC 20 08 18 */ frsp f1, f1 -/* 8083650C 48 00 00 88 */ b lbl_80836594 -lbl_80836510: -/* 80836510 C8 1F 00 38 */ lfd f0, 0x38(r31) -/* 80836514 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80836518 40 80 00 10 */ bge lbl_80836528 -/* 8083651C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80836520 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80836524 48 00 00 70 */ b lbl_80836594 -lbl_80836528: -/* 80836528 D0 21 00 08 */ stfs f1, 8(r1) -/* 8083652C 80 81 00 08 */ lwz r4, 8(r1) -/* 80836530 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80836534 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80836538 7C 03 00 00 */ cmpw r3, r0 -/* 8083653C 41 82 00 14 */ beq lbl_80836550 -/* 80836540 40 80 00 40 */ bge lbl_80836580 -/* 80836544 2C 03 00 00 */ cmpwi r3, 0 -/* 80836548 41 82 00 20 */ beq lbl_80836568 -/* 8083654C 48 00 00 34 */ b lbl_80836580 -lbl_80836550: -/* 80836550 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80836554 41 82 00 0C */ beq lbl_80836560 -/* 80836558 38 00 00 01 */ li r0, 1 -/* 8083655C 48 00 00 28 */ b lbl_80836584 -lbl_80836560: -/* 80836560 38 00 00 02 */ li r0, 2 -/* 80836564 48 00 00 20 */ b lbl_80836584 -lbl_80836568: -/* 80836568 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8083656C 41 82 00 0C */ beq lbl_80836578 -/* 80836570 38 00 00 05 */ li r0, 5 -/* 80836574 48 00 00 10 */ b lbl_80836584 -lbl_80836578: -/* 80836578 38 00 00 03 */ li r0, 3 -/* 8083657C 48 00 00 08 */ b lbl_80836584 -lbl_80836580: -/* 80836580 38 00 00 04 */ li r0, 4 -lbl_80836584: -/* 80836584 2C 00 00 01 */ cmpwi r0, 1 -/* 80836588 40 82 00 0C */ bne lbl_80836594 -/* 8083658C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80836590 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80836594: -/* 80836594 D0 3E 00 08 */ stfs f1, 8(r30) -lbl_80836598: -/* 80836598 39 61 00 40 */ addi r11, r1, 0x40 -/* 8083659C 4B B2 BC 89 */ bl _restgpr_28 -/* 808365A0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 808365A4 7C 08 03 A6 */ mtlr r0 -/* 808365A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 808365AC 4E 80 00 20 */ blr diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 30c90a72295..bca1d849512 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -556,6 +556,8 @@ static int dKy_Outdoor_check(); s32 dKy_getdaytime_hour(); s32 dKy_getdaytime_minute(); s32 dKy_get_dayofweek(); +s32 dKy_getDarktime_minute(); +s32 dKy_getDarktime_hour(); static void dKy_Sound_init(); void dKy_setLight_nowroom(char); void dKy_setLight_nowroom_actor(dKy_tevstr_c*); diff --git a/include/rel/d/a/d_a_formation_mng/d_a_formation_mng.h b/include/rel/d/a/d_a_formation_mng/d_a_formation_mng.h index 3394b08a9b2..5b09bec33e5 100644 --- a/include/rel/d/a/d_a_formation_mng/d_a_formation_mng.h +++ b/include/rel/d/a/d_a_formation_mng/d_a_formation_mng.h @@ -2,5 +2,344 @@ #define D_A_FORMATION_MNG_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_path.h" +#include "d/d_stage.h" +#include "d/a/d_a_player.h" +#include "d/kankyo/d_kankyo.h" +#include "SSystem/SComponent/c_math.h" + +struct daFmtMng_Path_c { + /* 808365B0 */ bool checkPathEnd(cXyz, f32); + /* 8083665C */ bool checkPoint(cXyz, f32); + + bool isPathClose() { return dPath_ChkClose(mPath); } + s8 getArg0() { return mPath->m_points[field_0x4].field_0x3; } + s8 getArg1() { return mPath->m_points[field_0x4].field_0x0; } + + void chgDir() { + int dir; + if (field_0xc > 0) { + dir = -1; + } else { + dir = 1; + } + field_0xc = dir; + } + + void setPath(int param_1, int param_2, cXyz* param_3) { + mPath = dPath_GetRoomPath(param_1, param_2); + field_0x4 = 0; + field_0xc = 1; + field_0x8 = param_3->abs(dPath_GetPnt(mPath, field_0x4)->m_position); + } + + void getStartPoint(Vec* param_1, SVec* param_2) { + *param_1 = dPath_GetPnt(mPath, 0)->m_position; + Vec local_2c = dPath_GetPnt(mPath, 1)->m_position; + cXyz cStack_38(param_1->x, param_1->y + 200.0f, param_1->z); + if (fopAcM_gc_c::gndCheck(&cStack_38)) { + param_1->y = fopAcM_gc_c::getGroundY(); + } + param_2->x = 0; + param_2->y = cLib_targetAngleY(param_1, &local_2c); + param_2->z = 0; + } + + void getTargetPoint(Vec* param_1) { + *param_1 = dPath_GetPnt(mPath, field_0x4)->m_position; + } + + int decIndex(int param_1) { + param_1--; + if (param_1 < 0) { + if (isPathClose()) { + param_1 = mPath->m_num - 1; + } else { + param_1 = 0; + } + } + return param_1; + } + + int incIndex(int param_1) { + param_1++; + if (param_1 >= mPath->m_num) { + if (isPathClose()) { + param_1 = 0; + } else { + param_1--; + } + } + return param_1; + } + + void setNextPoint() { + if (field_0xc > 0) { + field_0x4 = incIndex(field_0x4); + } else { + field_0x4 = decIndex(field_0x4); + } + field_0x8 = 1000000000.0f; + } + + void setNextPoint(cXyz *param_1) { + setNextPoint(); + field_0x8 = param_1->abs(dPath_GetPnt(mPath, field_0x4)->m_position); + } + + /* 0x0 */ dPath* mPath; + /* 0x4 */ int field_0x4; + /* 0x8 */ f32 field_0x8; + /* 0xC */ s8 field_0xc; +}; + +struct FmtPos_c : public daFmtMng_Path_c { + /* 80836C24 */ ~FmtPos_c() {} + /* 80836C60 */ FmtPos_c() {} + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ s16 field_0x1c; + /* 0x1E */ s16 field_0x1e; +}; + +struct FmtMember_c { + /* 80837458 */ ~FmtMember_c() {} + /* 80837798 */ FmtMember_c() {} + + /* 0x00 */ u32 mNpcId; + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ cXyz field_0x10; + /* 0x1C */ s16 field_0x1c; + /* 0x1E */ u16 field_0x1e; +}; + +enum FmtMngAction { + MODE_0_e, + MODE_1_e, + MODE_2_e, + MODE_3_e, + MODE_4_e, + MODE_MAX_e, +}; + +struct FmtMngAttributes { + /* 0x00 */ int field_0x00; + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; +}; + +struct daFmtMng_c : public fopAc_ac_c { + /* 80835558 */ void initWait(); + /* 80835624 */ void initMemberPos(); + /* 80835B24 */ void executeWait(); + /* 80835D28 */ void initWalk(); + /* 80835DEC */ void executeWalk(); + /* 8083622C */ void setMovePath(FmtPos_c*, int); + /* 80836810 */ void initReverse(); + /* 808368A4 */ void executeReverse(); + /* 80836C64 */ void initMotion(); + /* 80836E20 */ void executeMotion(); + /* 80836F78 */ void initFight(); + /* 80837078 */ void executeFight(); + /* 808374B4 */ int create(); + /* 8083750C */ void create_init(); + + ~daFmtMng_c() { + FmtMember_c* member = mMember; + for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) { + fopAcM_delete(member->mNpcId); + } + delete [] mPos; + delete [] mMember; + } + + int getTimeHour() { + if (dKy_darkworld_check()) { + return dKy_getDarktime_hour(); + } + return dKy_getdaytime_hour(); + } + + int getTimeMinute() { + if (dKy_darkworld_check()) { + return dKy_getDarktime_minute(); + } + return dKy_getdaytime_minute(); + } + + int getTime() { + return getTimeHour() * 60 + getTimeMinute(); + } + + u8 getPathID() { return shape_angle.x; } + u8 getFormationLine() { return fopAcM_GetParam(this) & 0xff; } + u8 getFormationRow() { return (fopAcM_GetParam(this) >> 8) & 0xff; } + int getStartTime() { return (fopAcM_GetParam(this) >> 16) & 0xff; } + int getEndTime() { return (fopAcM_GetParam(this) >> 24) & 0xff; } + + void callExecute() { + JUT_ASSERT(680, mAction != 0); + (this->*(mAction[1]))(); + } + + bool checkEmergency() { + if (dKy_darkworld_check() || !daPy_py_c::i_checkNowWolf()) { + return false; + } + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + cXyz* iVar6 = fopAcM_GetPosition_p(daPy_getPlayerActorClass()); + f32 dVar10 = iVar6->y; + cXyz* this_01 = fopAcM_GetPosition_p(npcFgd); + if (this_01->y - dVar10 < 200.0f) { + f32 maxDist = pow(500.0, 2.0); + if (fopAcM_searchPlayerDistanceXZ2(npcFgd) < maxDist) { + return true; + } + } + } + } + return false; + } + + void callInit() { + JUT_ASSERT(667, mAction != 0) + (this->*(*mAction))(); + } + + void setAction(int i_action) { + JUT_ASSERT(633, i_action < MODE_MAX_e); + mPrevAction = mCurrentAction; + mCurrentAction = i_action; + mAction = &((ActionFunc*)ActionTable)[mCurrentAction * 2]; + callInit(); + } + + int execute() { + callExecute(); + if (mCurrentAction != MODE_4_e && checkEmergency()) { + setAction(MODE_4_e); + } + return 1; + } + + bool isAllMemberCulling() { + FmtMember_c* member = mMember; + bool memberCulling; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + memberCulling = false; + if (member->mNpcId != -1) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + memberCulling = fopAcM_CheckCondition(npcFgd, 4); + } + if (!memberCulling) { + return false; + } + } + } + return true; + } + + void setMoveSpeed() { + speedF += attr().field_0x08; + if (speedF > attr().field_0x04) { + speedF = attr().field_0x04; + } + } + + void setMoveAngle(FmtPos_c* member) { + if (speedF <= 0.0f) { + return; + } + cXyz acStack_28; + member->getTargetPoint(&acStack_28); + cLib_addCalcAngleS2(&member->field_0x1c, + cLib_targetAngleY(&member->field_0x10, &acStack_28), + attr().field_0x14, attr().field_0x16); + } + + void setMovePos(cXyz* param_1, s16* param_2) { + param_1->x += speedF * cM_ssin(*param_2); + param_1->z += speedF * cM_scos(*param_2); + } + + void correctFormation() { + FmtPos_c* pos = mPos + 1; + for (int i = 1; i < mFormationRow; i++, pos++) { + if (cLib_distanceAngleS(pos[-1].field_0x1c, pos[0].field_0x1c) <= attr().field_0x00) { + pos[0].field_0x10.set(0.0f, 0.0f, -attr().field_0x10); + mDoMtx_stack_c::transS(pos[-1].field_0x10); + mDoMtx_stack_c::YrotM(pos[-1].field_0x1c); + mDoMtx_stack_c::multVec(&pos[0].field_0x10, &pos[0].field_0x10); + } + } + } + + void setMemberPos() { + int j; + FmtPos_c* pos; + fopAc_ac_c* npcFgd; + FmtMember_c* member; + int i; + pos = mPos; + member = mMember; + for (i = 0; i < mFormationRow; i++, pos++) { + f32 dVar13 = (mFormationLine - 1) * attr().field_0x0c * 0.5f; + mDoMtx_stack_c::transS(pos->field_0x10); + mDoMtx_stack_c::YrotM(pos->field_0x1c); + for (j = 0; j < mFormationLine; j++, member++) { + member->field_0x10.set(member->field_0x04); + member->field_0x04.set(dVar13, 0.0f, 0.0f); + mDoMtx_stack_c::multVec(&member->field_0x04, &member->field_0x04); + dVar13 -= attr().field_0x0c; + npcFgd = NULL; + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + cXyz* npcPos = fopAcM_GetPosition_p(npcFgd); + csXyz* npcAngle = fopAcM_GetShapeAngle_p(npcFgd); + npcPos->x = member->field_0x04.x; + npcPos->z = member->field_0x04.z; + cLib_addCalcAngleS2(&npcAngle->y, + cLib_targetAngleY(&member->field_0x10, &member->field_0x04), + attr().field_0x14, attr().field_0x16); + fopAcM_SetSpeedF(npcFgd, member->field_0x10.abs(member->field_0x04)); + } + } + } + } + + static FmtMngAttributes const& attr() { return M_attr; } + static FmtMngAttributes const M_attr; + + typedef void (daFmtMng_c::*ActionFunc)(); + static daFmtMng_c::ActionFunc ActionTable[10]; + + /* 0x568 */ FmtPos_c* mPos; + /* 0x56C */ FmtMember_c* mMember; + /* 0x570 */ dPath* mRoomPath; + /* 0x574 */ ActionFunc* mAction; + /* 0x578 */ int mCurrentAction; + /* 0x57C */ int mPrevAction; + /* 0x580 */ int field_0x580; + /* 0x584 */ int mFormationLine; + /* 0x588 */ int mFormationRow; + /* 0x58C */ int mStartTime; + /* 0x590 */ int mEndTime; + /* 0x594 */ int mDayOfWeek; + /* 0x598 */ int field_0x598; + /* 0x59C */ int field_0x59c; + /* 0x5A0 */ int field_0x5a0; +}; #endif /* D_A_FORMATION_MNG_H */ diff --git a/include/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h b/include/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h index b4d0925088a..ce7d1f28889 100644 --- a/include/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h +++ b/include/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h @@ -2,5 +2,32 @@ #define D_A_NPC_FGUARD_H #include "dolphin/types.h" +#include "d/a/d_a_npc_cd2.h" +#include "SSystem/SComponent/c_math.h" + +struct daNpcFgd_c : public daNpcCd2_c { + /* 809BA53C */ void initPosAngle(Vec&, s16); + /* 809BA584 */ void create(); + /* 809BA730 */ void create_init(); + /* 809BAA80 */ ~daNpcFgd_c(); + + void setAnime(int param_1) { + setAnm((J3DAnmTransformKey*)getAnmP(param_1, field_0xacc), 1.0f, 12.0f, 2, cM_rndF(5.0f), -1); + } + + void offDrawFlag() { + field_0xad8 = 0; + } + + void onDrawFlag() { + field_0xad8 = 1; + } + + /* 0xAC8 */ u32 field_0xac8; + /* 0xACC */ u32 field_0xacc; + /* 0xAD0 */ u32 field_0xad0; + /* 0xAD4 */ u32 field_0xad4; + /* 0xAD8 */ u8 field_0xad8; +}; #endif /* D_A_NPC_FGUARD_H */ diff --git a/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp b/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp index d80e160ea6b..557a9afaa47 100644 --- a/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp +++ b/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp @@ -1,316 +1,80 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_formation_mng +// Formation Manager // #include "rel/d/a/d_a_formation_mng/d_a_formation_mng.h" -#include "dol2asm.h" +#include "rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h" +#include "d/a/d_a_npc_cd2.h" +#include "d/d_path.h" +#include "d/save/d_save.h" +#include "f_op/f_op_actor_mng.h" -// -// Types: -// - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CD9C */ void transM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static f32 mGroundY; -}; - -struct Vec {}; - -struct daNpcFgd_c { - /* 809BA53C */ void initPosAngle(Vec&, s16); -}; - -struct J3DAnmTransformKey {}; - -struct daNpcCd2_c { - /* 801580F0 */ void getAnmP(int, int); - /* 80158F00 */ void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int); -}; - -struct FmtPos_c { - /* 80836C24 */ ~FmtPos_c(); - /* 80836C60 */ FmtPos_c(); -}; - -struct daFmtMng_c { - /* 80835558 */ void initWait(); - /* 80835624 */ void initMemberPos(); - /* 80835B24 */ void executeWait(); - /* 80835D28 */ void initWalk(); - /* 80835DEC */ void executeWalk(); - /* 8083622C */ void setMovePath(FmtPos_c*, int); - /* 80836810 */ void initReverse(); - /* 808368A4 */ void executeReverse(); - /* 80836C64 */ void initMotion(); - /* 80836E20 */ void executeMotion(); - /* 80836F78 */ void initFight(); - /* 80837078 */ void executeFight(); - /* 808374B4 */ void create(); - /* 8083750C */ void create_init(); - - static u8 const M_attr[24]; - static u8 ActionTable[120]; -}; - -struct daFmtMng_Path_c { - /* 808365B0 */ void checkPathEnd(cXyz, f32); - /* 8083665C */ void checkPoint(cXyz, f32); -}; - -struct dSv_danBit_c { - /* 80034B98 */ void onSwitch(int); -}; - -struct dPath {}; - -struct csXyz {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct FmtMember_c { - /* 80837458 */ ~FmtMember_c(); - /* 80837798 */ FmtMember_c(); -}; - -// -// Forward References: -// - -extern "C" void initWait__10daFmtMng_cFv(); -extern "C" void initMemberPos__10daFmtMng_cFv(); -extern "C" void executeWait__10daFmtMng_cFv(); -extern "C" void initWalk__10daFmtMng_cFv(); -extern "C" void executeWalk__10daFmtMng_cFv(); -extern "C" void setMovePath__10daFmtMng_cFP8FmtPos_ci(); -extern "C" void checkPathEnd__15daFmtMng_Path_cF4cXyzf(); -extern "C" void checkPoint__15daFmtMng_Path_cF4cXyzf(); -extern "C" void initReverse__10daFmtMng_cFv(); -extern "C" void executeReverse__10daFmtMng_cFv(); -extern "C" void __dt__8FmtPos_cFv(); -extern "C" void __ct__8FmtPos_cFv(); -extern "C" void initMotion__10daFmtMng_cFv(); -extern "C" void executeMotion__10daFmtMng_cFv(); -extern "C" void initFight__10daFmtMng_cFv(); -extern "C" void executeFight__10daFmtMng_cFv(); -extern "C" static bool daFmtMng_Draw__FP10daFmtMng_c(); -extern "C" static void daFmtMng_Execute__FP10daFmtMng_c(); -extern "C" static bool daFmtMng_IsDelete__FP10daFmtMng_c(); -extern "C" static void daFmtMng_Delete__FP10daFmtMng_c(); -extern "C" void __dt__11FmtMember_cFv(); -extern "C" static void daFmtMng_Create__FP10fopAc_ac_c(); -extern "C" void create__10daFmtMng_cFv(); -extern "C" void create_init__10daFmtMng_cFv(); -extern "C" void __ct__11FmtMember_cFv(); -extern "C" void __sinit_d_a_formation_mng_cpp(); -extern "C" u8 const M_attr__10daFmtMng_c[24]; -extern "C" u8 ActionTable__10daFmtMng_c[120]; -extern "C" extern void* g_profile_FORMATION_MNG[12]; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void push__14mDoMtx_stack_cFv(); -extern "C" void pop__14mDoMtx_stack_cFv(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_delete__FUi(); -extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void onSwitch__12dSv_danBit_cFi(); -extern "C" void dPath_GetPnt__FPC5dPathi(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void getAnmP__10daNpcCd2_cFii(); -extern "C" void setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii(); -extern "C" void dKy_getdaytime_hour__Fv(); -extern "C" void dKy_getdaytime_minute__Fv(); -extern "C" void dKy_getDarktime_hour__Fv(); -extern "C" void dKy_getDarktime_minute__Fv(); -extern "C" void dKy_get_dayofweek__Fv(); -extern "C" void dKy_darkworld_check__Fv(); -extern "C" void cM_rndF__Ff(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void cLib_distanceAngleS__Fss(); -extern "C" void* __nwa__FUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); -extern "C" void __destroy_new_array(); -extern "C" void __construct_new_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" void pow(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" void initPosAngle__10daNpcFgd_cFR3Vecs(); - -// -// Declarations: -// - -/* ############################################################################################## */ /* 808378A8-808378C0 000000 0018+00 12/12 0/0 0/0 .rodata M_attr__10daFmtMng_c */ -SECTION_RODATA u8 const daFmtMng_c::M_attr[24] = { - 0x00, 0x00, 0x00, 0x14, 0x40, 0xC0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, - 0x42, 0xF0, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x0A, 0x40, 0x00, +FmtMngAttributes const daFmtMng_c::M_attr = { + 0x14, 6.0f, 0.5f, + 120.0f, 150.0f, 10, 0x4000, }; -COMPILER_STRIP_GATE(0x808378A8, &daFmtMng_c::M_attr); - -/* 808378C0-808378C4 000018 0004+00 1/7 0/0 0/0 .rodata @3979 */ -SECTION_RODATA static f32 const lit_3979 = 1.0f; -COMPILER_STRIP_GATE(0x808378C0, &lit_3979); - -/* 808378C4-808378C8 00001C 0004+00 0/6 0/0 0/0 .rodata @3980 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3980 = 12.0f; -COMPILER_STRIP_GATE(0x808378C4, &lit_3980); -#pragma pop - -/* 808378C8-808378CC 000020 0004+00 0/6 0/0 0/0 .rodata @3981 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3981 = 5.0f; -COMPILER_STRIP_GATE(0x808378C8, &lit_3981); -#pragma pop /* 80835558-80835624 000078 00CC+00 1/0 0/0 0/0 .text initWait__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::initWait() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWait__10daFmtMng_cFv.s" +void daFmtMng_c::initWait() { + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->setAnime(0); + } + } + initMemberPos(); } -#pragma pop - -/* ############################################################################################## */ -/* 808378CC-808378D0 000024 0004+00 1/8 0/0 0/0 .rodata @4082 */ -SECTION_RODATA static u8 const lit_4082[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x808378CC, &lit_4082); - -/* 808378D0-808378D8 000028 0008+00 0/5 0/0 0/0 .rodata @4083 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4083[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x808378D0, &lit_4083); -#pragma pop - -/* 808378D8-808378E0 000030 0008+00 0/5 0/0 0/0 .rodata @4084 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4084[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x808378D8, &lit_4084); -#pragma pop - -/* 808378E0-808378E8 000038 0008+00 0/5 0/0 0/0 .rodata @4085 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4085[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x808378E0, &lit_4085); -#pragma pop - -/* 808378E8-808378EC 000040 0004+00 0/3 0/0 0/0 .rodata @4086 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4086 = 200.0f; -COMPILER_STRIP_GATE(0x808378E8, &lit_4086); -#pragma pop - -/* 808378EC-808378F0 000044 0004+00 0/2 0/0 0/0 .rodata @4087 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4087 = 0.5f; -COMPILER_STRIP_GATE(0x808378EC, &lit_4087); -#pragma pop - -/* 808378F0-808378F8 000048 0008+00 0/2 0/0 0/0 .rodata @4089 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4089[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x808378F0, &lit_4089); -#pragma pop /* 80835624-80835B24 000144 0500+00 2/2 0/0 0/0 .text initMemberPos__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::initMemberPos() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMemberPos__10daFmtMng_cFv.s" +void daFmtMng_c::initMemberPos() { + int i; + int j; + fopAc_ac_c* npcFgd; + FmtMember_c* member; + FmtPos_c* pos = mPos; + pos->setPath(getPathID(), fopAcM_GetRoomNo(this), ¤t.pos); + pos->getStartPoint(&home.pos, &home.angle); + mDoMtx_stack_c::transS(home.pos); + mDoMtx_stack_c::YrotM(home.angle.y); + mDoMtx_stack_c::push(); + for (i = 0; i < mFormationRow; i++, pos++) { + mDoMtx_stack_c::multVecZero(&pos->field_0x10); + mDoMtx_stack_c::transM(0.0f, 0.0f, -attr().field_0x10); + pos->setPath(getPathID(), fopAcM_GetRoomNo(this), &pos->field_0x10); + pos->field_0x1c = home.angle.y; + } + member = mMember; + mDoMtx_stack_c::pop(); + for (i = 0; i < mFormationRow; i++) { + f32 dVar8 = ((mFormationLine - 1) * attr().field_0x0c) * 0.5f; + for (j = 0; j < mFormationLine; j++, member++) { + member->field_0x04.set(dVar8, 0.0f, 0.0f); + mDoMtx_stack_c::multVec(&member->field_0x04, &member->field_0x04); + member->field_0x10.set(member->field_0x04); + dVar8 -= attr().field_0x0c; + npcFgd = NULL; + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->initPosAngle(member->field_0x04, home.angle.y); + } + } + mDoMtx_stack_c::transM(0.0f, 0.0f, -attr().field_0x10); + } } -#pragma pop /* ############################################################################################## */ /* 8083792C-80837938 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80837938-8083794C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -320,443 +84,375 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 8083794C-80837958 -00001 000C+00 0/1 0/0 0/0 .data @3861 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3861[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initWait__10daFmtMng_cFv, -}; -#pragma pop - -/* 80837958-80837964 -00001 000C+00 0/1 0/0 0/0 .data @3862 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3862[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executeWait__10daFmtMng_cFv, -}; -#pragma pop - -/* 80837964-80837970 -00001 000C+00 0/1 0/0 0/0 .data @3863 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3863[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initWalk__10daFmtMng_cFv, -}; -#pragma pop - -/* 80837970-8083797C -00001 000C+00 0/1 0/0 0/0 .data @3864 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3864[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executeWalk__10daFmtMng_cFv, -}; -#pragma pop - -/* 8083797C-80837988 -00001 000C+00 0/1 0/0 0/0 .data @3865 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3865[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initReverse__10daFmtMng_cFv, -}; -#pragma pop - -/* 80837988-80837994 -00001 000C+00 0/1 0/0 0/0 .data @3866 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3866[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executeReverse__10daFmtMng_cFv, -}; -#pragma pop - -/* 80837994-808379A0 -00001 000C+00 0/1 0/0 0/0 .data @3867 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3867[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initMotion__10daFmtMng_cFv, -}; -#pragma pop - -/* 808379A0-808379AC -00001 000C+00 0/1 0/0 0/0 .data @3868 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3868[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executeMotion__10daFmtMng_cFv, -}; -#pragma pop - -/* 808379AC-808379B8 -00001 000C+00 0/1 0/0 0/0 .data @3869 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3869[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initFight__10daFmtMng_cFv, -}; -#pragma pop - -/* 808379B8-808379C4 -00001 000C+00 0/1 0/0 0/0 .data @3870 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3870[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executeFight__10daFmtMng_cFv, -}; -#pragma pop - /* 808379C4-80837A3C 000098 0078+00 6/7 0/0 0/0 .data ActionTable__10daFmtMng_c */ -SECTION_DATA u8 daFmtMng_c::ActionTable[120] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +daFmtMng_c::ActionFunc daFmtMng_c::ActionTable[10] = { + &daFmtMng_c::initWait, &daFmtMng_c::executeWait, + &daFmtMng_c::initWalk, &daFmtMng_c::executeWalk, + &daFmtMng_c::initReverse, &daFmtMng_c::executeReverse, + &daFmtMng_c::initMotion, &daFmtMng_c::executeMotion, + &daFmtMng_c::initFight, &daFmtMng_c::executeFight, + }; /* 80835B24-80835D28 000644 0204+00 1/0 0/0 0/0 .text executeWait__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::executeWait() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWait__10daFmtMng_cFv.s" +void daFmtMng_c::executeWait() { + int time = getTime(); + if (time >= mStartTime && time < mEndTime) { + if (isAllMemberCulling()) { + FmtMember_c* member = mMember; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAc_ac_c* npcFgd = NULL; + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->onDrawFlag(); + } + } + setAction(MODE_1_e); + } + } else { + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->offDrawFlag(); + } + } + if (!dKy_darkworld_check() && daPy_py_c::i_checkNowWolf()) { + fopAcM_delete(this); + } + } } -#pragma pop /* 80835D28-80835DEC 000848 00C4+00 1/0 0/0 0/0 .text initWalk__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::initWalk() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initWalk__10daFmtMng_cFv.s" +void daFmtMng_c::initWalk() { + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->setAnime(2); + } + } } -#pragma pop /* 80835DEC-8083622C 00090C 0440+00 1/0 0/0 0/0 .text executeWalk__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::executeWalk() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeWalk__10daFmtMng_cFv.s" +void daFmtMng_c::executeWalk() { + setMoveSpeed(); + FmtPos_c* member = mPos; + for (int i = 0; i < mFormationRow; i++, member++) { + setMovePath(member, i); + setMoveAngle(member); + setMovePos(&member->field_0x10, &member->field_0x1c); + } + current.pos.set(mPos->field_0x10); + correctFormation(); + setMemberPos(); } -#pragma pop - -/* ############################################################################################## */ -/* 808378F8-808378FC 000050 0004+00 0/2 0/0 0/0 .rodata @4357 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4357 = 1000000000.0f; -COMPILER_STRIP_GATE(0x808378F8, &lit_4357); -#pragma pop /* 8083622C-808365B0 000D4C 0384+00 1/1 0/0 0/0 .text setMovePath__10daFmtMng_cFP8FmtPos_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::setMovePath(FmtPos_c* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/setMovePath__10daFmtMng_cFP8FmtPos_ci.s" +void daFmtMng_c::setMovePath(FmtPos_c* i_pos, int param_2) { + if (i_pos->checkPoint(i_pos->field_0x10, speedF)) { + if (param_2 == 0) { + field_0x598 = i_pos->getArg1(); + } else { + field_0x598 = -1; + } + if (i_pos->checkPathEnd(i_pos->field_0x10, speedF)) { + if (param_2 == 0) { + int time = getTime(); + if (time > mStartTime && time < mEndTime) { + setAction(MODE_2_e); + } else { + setAction(MODE_0_e); + } + } else { + i_pos->chgDir(); + } + } else if (field_0x598 >= 0) { + setAction(MODE_3_e); + } + i_pos->setNextPoint(&i_pos->field_0x10); + } } -#pragma pop /* 808365B0-8083665C 0010D0 00AC+00 1/1 0/0 0/0 .text checkPathEnd__15daFmtMng_Path_cF4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_Path_c::checkPathEnd(cXyz param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPathEnd__15daFmtMng_Path_cF4cXyzf.s" +bool daFmtMng_Path_c::checkPathEnd(cXyz param_1, f32 param_2) { + if (isPathClose()) { + return false; + } + if (checkPoint(param_1, param_2)) { + if (field_0xc > 0) { + if (field_0x4 >= mPath->m_num - 1) { + return true; + } + } else if (field_0x4 <= 0) { + return true; + } + } + return false; } -#pragma pop - -/* ############################################################################################## */ -/* 808378FC-80837900 000054 0004+00 0/1 0/0 0/0 .rodata @4408 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4408 = 10.0f; -COMPILER_STRIP_GATE(0x808378FC, &lit_4408); -#pragma pop /* 8083665C-80836810 00117C 01B4+00 2/2 0/0 0/0 .text checkPoint__15daFmtMng_Path_cF4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_Path_c::checkPoint(cXyz param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/checkPoint__15daFmtMng_Path_cF4cXyzf.s" +bool daFmtMng_Path_c::checkPoint(cXyz i_point, f32 param_2) { + f32 dVar8 = i_point.absXZ(dPath_GetPnt(mPath, field_0x4)->m_position); + field_0x8 -= param_2; + if (field_0x8 < 0.0f || dVar8 < param_2 || dVar8 < 10.0f) { + return true; + } + return false; } -#pragma pop /* 80836810-808368A4 001330 0094+00 1/0 0/0 0/0 .text initReverse__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::initReverse() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initReverse__10daFmtMng_cFv.s" +void daFmtMng_c::initReverse() { + speedF = 0.0f; + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + member->field_0x1c = fopAcM_GetShapeAngle_p(npcFgd)->y + 0x8000; + } + } } -#pragma pop /* 808368A4-80836C24 0013C4 0380+00 1/0 0/0 0/0 .text executeReverse__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::executeReverse() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeReverse__10daFmtMng_cFv.s" -} -#pragma pop - -/* 80836C24-80836C60 001744 003C+00 3/3 0/0 0/0 .text __dt__8FmtPos_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm FmtPos_c::~FmtPos_c() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__8FmtPos_cFv.s" -} -#pragma pop - -/* 80836C60-80836C64 001780 0004+00 2/2 0/0 0/0 .text __ct__8FmtPos_cFv */ -FmtPos_c::FmtPos_c() { - /* empty function */ +void daFmtMng_c::executeReverse() { + FmtMember_c* member; + bool bVar1; + FmtPos_c* tempPos; + fopAc_ac_c* npcFgd; + int i; + member = mMember; + bVar1 = true; + npcFgd = NULL; + for (i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + csXyz* npcAngle = fopAcM_GetShapeAngle_p(npcFgd); + if (cLib_distanceAngleS(npcAngle->y, member->field_0x1c) <= 0x800) { + npcAngle->y = member->field_0x1c; + } else { + npcAngle->y -= 0x800; + bVar1 = false; + } + } else { + bVar1 = false; + } + } + if (bVar1) { + int i; + FmtPos_c* currentPos; + currentPos = mPos; + tempPos = new FmtPos_c[mFormationRow]; + for (i = 0; i < mFormationRow; i++, currentPos++, tempPos++) { + tempPos->field_0x10.set(currentPos->field_0x10); + tempPos->field_0x1c = currentPos->field_0x1c; + } + currentPos = mPos; + tempPos--; + for (i = 0; i < mFormationRow; i++, currentPos++, tempPos--) { + currentPos->field_0x10.set(tempPos->field_0x10); + currentPos->field_0x1c = tempPos->field_0x1c + 0x8000; + currentPos->chgDir(); + currentPos->setNextPoint(¤tPos->field_0x10); + } + delete [] (tempPos + 1); + setAction(MODE_1_e); + } } /* 80836C64-80836E20 001784 01BC+00 1/0 0/0 0/0 .text initMotion__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::initMotion() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initMotion__10daFmtMng_cFv.s" +void daFmtMng_c::initMotion() { + speedF = 0.0f; + u32 arg0 = mPos->getArg0(); + u32 time = getTime(); + field_0x59c = time + arg0 * 10; + mDayOfWeek = dKy_get_dayofweek(); + if (field_0x59c > 24 * 60) { + field_0x59c -= 24 * 60; + mDayOfWeek = (mDayOfWeek + 1) % 7; + } + int npcAnime = 0; + switch(field_0x598) { + case 0: + npcAnime = 0; + break; + case 1: + npcAnime = 1; + break; + case 2: + npcAnime = 6; + break; + case 3: + npcAnime = 7; + break; + } + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->setAnime(npcAnime); + } + } } -#pragma pop /* 80836E20-80836F78 001940 0158+00 1/0 0/0 0/0 .text executeMotion__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::executeMotion() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeMotion__10daFmtMng_cFv.s" +void daFmtMng_c::executeMotion() { + if (mDayOfWeek == dKy_get_dayofweek() && field_0x59c < getTime()) { + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->setAnime(2); + } + } + mPrevAction = mCurrentAction; + mCurrentAction = MODE_1_e; + mAction = &((ActionFunc*)ActionTable)[mCurrentAction * 2]; + (this->*(*mAction))(); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80837900-80837904 000058 0004+00 0/1 0/0 0/0 .rodata @4595 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4595 = -40.0f; -COMPILER_STRIP_GATE(0x80837900, &lit_4595); -#pragma pop - -/* 80837904-80837908 00005C 0004+00 0/1 0/0 0/0 .rodata @4596 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4596 = -10.0f; -COMPILER_STRIP_GATE(0x80837904, &lit_4596); -#pragma pop - -/* 80837908-8083790C 000060 0004+00 0/1 0/0 0/0 .rodata @4597 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4597 = -80.0f; -COMPILER_STRIP_GATE(0x80837908, &lit_4597); -#pragma pop - -/* 8083790C-80837910 000064 0004+00 0/1 0/0 0/0 .rodata @4598 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4598 = 40.0f; -COMPILER_STRIP_GATE(0x8083790C, &lit_4598); -#pragma pop - -/* 80837910-80837918 000068 0004+04 0/1 0/0 0/0 .rodata @4599 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4599[1 + 1 /* padding */] = { - 190.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80837910, &lit_4599); -#pragma pop /* 80836F78-80837078 001A98 0100+00 1/0 0/0 0/0 .text initFight__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::initFight() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/initFight__10daFmtMng_cFv.s" +void daFmtMng_c::initFight() { + speedF = 0.0f; + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + ((daNpcFgd_c*)npcFgd)->setAnime(42); + fopAcM_setCullSizeBox(npcFgd, -40.0f, -10.0f, -80.0f, 40.0f, 190.0f, 200.0f); + } + } + + dComIfGs_onSaveDunSwitch(60); } -#pragma pop /* 80837078-80837250 001B98 01D8+00 1/0 0/0 0/0 .text executeFight__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::executeFight() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/executeFight__10daFmtMng_cFv.s" +void daFmtMng_c::executeFight() { + FmtMember_c* member = mMember; + fopAc_ac_c* npcFgd = NULL; + for (int i = 0; i < mFormationRow * mFormationLine; i++, member++) { + fopAcM_SearchByID(member->mNpcId, &npcFgd); + if (npcFgd != NULL) { + s16 playerAngle = fopAcM_searchPlayerAngleY(npcFgd); + csXyz* angle = fopAcM_GetShapeAngle_p(npcFgd); + if (cLib_distanceAngleS(angle->y, (int)playerAngle) > 0x600) { + ((daNpcFgd_c*)npcFgd)->setAnime(44); + } else { + ((daNpcFgd_c*)npcFgd)->setAnime(42); + } + cLib_addCalcAngleS2(&angle->y, (int)playerAngle, 3, 0x600); + } + } + + if (isAllMemberCulling()) { + fopAcM_delete(this); + } } -#pragma pop /* 80837250-80837258 001D70 0008+00 1/0 0/0 0/0 .text daFmtMng_Draw__FP10daFmtMng_c */ static bool daFmtMng_Draw(daFmtMng_c* param_0) { return true; } -/* ############################################################################################## */ -/* 80837918-80837920 000070 0008+00 0/1 0/0 0/0 .rodata @4714 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4714[8] = { - 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80837918, &lit_4714); -#pragma pop - -/* 80837920-80837928 000078 0008+00 0/1 0/0 0/0 .rodata @4715 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4715[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80837920, &lit_4715); -#pragma pop - /* 80837258-808373BC 001D78 0164+00 1/0 0/0 0/0 .text daFmtMng_Execute__FP10daFmtMng_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daFmtMng_Execute(daFmtMng_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Execute__FP10daFmtMng_c.s" +static int daFmtMng_Execute(daFmtMng_c* param_0) { + return param_0->execute(); } -#pragma pop /* 808373BC-808373C4 001EDC 0008+00 1/0 0/0 0/0 .text daFmtMng_IsDelete__FP10daFmtMng_c */ -static bool daFmtMng_IsDelete(daFmtMng_c* param_0) { - return true; +static int daFmtMng_IsDelete(daFmtMng_c* param_0) { + return 1; } /* 808373C4-80837458 001EE4 0094+00 1/0 0/0 0/0 .text daFmtMng_Delete__FP10daFmtMng_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daFmtMng_Delete(daFmtMng_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Delete__FP10daFmtMng_c.s" +static int daFmtMng_Delete(daFmtMng_c* param_1) { + param_1->~daFmtMng_c(); + return 1; } -#pragma pop - -/* 80837458-80837494 001F78 003C+00 2/2 0/0 0/0 .text __dt__11FmtMember_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm FmtMember_c::~FmtMember_c() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__dt__11FmtMember_cFv.s" -} -#pragma pop /* 80837494-808374B4 001FB4 0020+00 1/0 0/0 0/0 .text daFmtMng_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daFmtMng_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/daFmtMng_Create__FP10fopAc_ac_c.s" +static int daFmtMng_Create(fopAc_ac_c* param_0) { + return static_cast(param_0)->create(); } -#pragma pop /* 808374B4-8083750C 001FD4 0058+00 1/1 0/0 0/0 .text create__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::create() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create__10daFmtMng_cFv.s" +int daFmtMng_c::create() { + fopAcM_SetupActor(this, daFmtMng_c); + create_init(); + return 4; } -#pragma pop - -/* ############################################################################################## */ -/* 80837928-8083792C 000080 0004+00 1/1 0/0 0/0 .rodata @4802 */ -SECTION_RODATA static f32 const lit_4802 = -1.0f; -COMPILER_STRIP_GATE(0x80837928, &lit_4802); /* 8083750C-80837798 00202C 028C+00 1/1 0/0 0/0 .text create_init__10daFmtMng_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFmtMng_c::create_init() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/create_init__10daFmtMng_cFv.s" -} -#pragma pop +void daFmtMng_c::create_init() { + fopAcM_setCullSizeBox(this, -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f); + mRoomPath = dPath_GetRoomPath(getPathID(), fopAcM_GetRoomNo(this)); + field_0x580 = 0; + mFormationLine = getFormationLine(); + mFormationRow = getFormationRow(); + mPos = NULL; + mPos = new FmtPos_c[mFormationRow]; + JUT_ASSERT(357, mPos != 0); + mMember = NULL; + mMember = new FmtMember_c[mFormationLine * mFormationRow]; + JUT_ASSERT(361, mMember != 0); -/* 80837798-8083779C 0022B8 0004+00 1/1 0/0 0/0 .text __ct__11FmtMember_cFv */ -FmtMember_c::FmtMember_c() { - /* empty function */ -} + FmtMember_c* member = mMember; + for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) { + member->mNpcId = -1; + } -/* 8083779C-8083789C 0022BC 0100+00 0/0 1/0 0/0 .text __sinit_d_a_formation_mng_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_formation_mng_cpp() { - nofralloc -#include "asm/rel/d/a/d_a_formation_mng/d_a_formation_mng/__sinit_d_a_formation_mng_cpp.s" + mStartTime = (getStartTime() / 10) * 60 + (getStartTime() % 10) * 10; + mEndTime = (getEndTime() / 10) * 60 + (getEndTime() % 10) * 10; + initMemberPos(); + bool inTime = false; + int time = getTime(); + if (time > mStartTime && time < mEndTime) { + mCurrentAction = MODE_1_e; + inTime = true; + } else { + mCurrentAction = MODE_0_e; + } + mPrevAction = mCurrentAction; + mAction = &((ActionFunc*)ActionTable)[mCurrentAction * 2]; + member = mMember; + for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) { + member->mNpcId = fopAcM_createChild(0x294, fopAcM_GetID(this), (inTime << 0x10) | 0x200, + &member->field_0x04, fopAcM_GetRoomNo(this), + &home.angle, NULL, 0xffffffff, NULL); + } } -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8083779C, __sinit_d_a_formation_mng_cpp); -#pragma pop /* ############################################################################################## */ /* 80837A3C-80837A5C -00001 0020+00 1/0 0/0 0/0 .data l_daFmtMng_Method */ -SECTION_DATA static void* l_daFmtMng_Method[8] = { - (void*)daFmtMng_Create__FP10fopAc_ac_c, - (void*)daFmtMng_Delete__FP10daFmtMng_c, - (void*)daFmtMng_Execute__FP10daFmtMng_c, - (void*)daFmtMng_IsDelete__FP10daFmtMng_c, - (void*)daFmtMng_Draw__FP10daFmtMng_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daFmtMng_Method = { + (process_method_func)daFmtMng_Create, + (process_method_func)daFmtMng_Delete, + (process_method_func)daFmtMng_Execute, + (process_method_func)daFmtMng_IsDelete, + (process_method_func)daFmtMng_Draw, }; /* 80837A5C-80837A8C -00001 0030+00 0/0 0/0 1/0 .data g_profile_FORMATION_MNG */ -SECTION_DATA extern void* g_profile_FORMATION_MNG[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02930000, (void*)&g_fpcLf_Method, - (void*)0x000005A4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x019A0000, (void*)&l_daFmtMng_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_FORMATION_MNG = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_FORMATION_MNG, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daFmtMng_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 410, // mPriority + &l_daFmtMng_Method, // sub_method + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp index b2d98e218e9..95694333e47 100644 --- a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp +++ b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp @@ -3,7 +3,9 @@ // Translation Unit: d_a_npc_fguard // -#include "rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h" +// Causes vtable issues +//#include "rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.h" +#include "dolphin/types.h" #include "dol2asm.h" //