From db80914e40fe1197b1cead88b37b66c891e3970f Mon Sep 17 00:00:00 2001 From: Jeff Padgham Date: Sun, 31 Mar 2024 02:33:18 -0700 Subject: [PATCH] d_a_obj_yobikusa OK (#2116) * Decomp OK * Initial cleanup pass * Light documenting and formatting pass * Updating progress --------- Co-authored-by: GinNoOokami --- Progress.md | 14 +- .../d_a_obj_yobikusa/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_obj_yobikusa/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_obj_yobikusa/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_obj_yobikusa/__dt__12dBgS_ObjAcchFv.s | 30 - .../d_a_obj_yobikusa/__dt__5csXyzFv.s | 17 - .../d_a_obj_yobikusa/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_yobikusa/__dt__8cM3dGCylFv.s | 20 - .../__sinit_d_a_obj_yobikusa_cpp.s | 41 - .../callExecute__15daObjYobikusa_cFv.s | 12 - .../callInit__15daObjYobikusa_cFv.s | 11 - .../createSolidHeap__FP10fopAc_ac_c.s | 95 -- .../create_init__15daObjYobikusa_cFv.s | 114 -- .../daObjYobikusa_Create__FP10fopAc_ac_c.s | 109 -- ...aObjYobikusa_Delete__FP15daObjYobikusa_c.s | 90 -- .../daObjYobikusa_Draw__FP15daObjYobikusa_c.s | 42 - ...ObjYobikusa_Execute__FP15daObjYobikusa_c.s | 9 - .../executePickLeaf__15daObjYobikusa_cFv.s | 66 -- .../executePushDown__15daObjYobikusa_cFv.s | 60 - .../executeSwingWind__15daObjYobikusa_cFv.s | 118 -- .../execute__15daObjYobikusa_cFv.s | 164 --- .../d_a_obj_yobikusa/func_8059DE60.s | 3 - .../d_a_obj_yobikusa/func_8059DE68.s | 3 - ...etJointAngle__15daObjYobikusa_cFP5csXyzi.s | 10 - .../getJointScale__15daObjYobikusa_cFi.s | 3 - .../initBaseMtx__15daObjYobikusa_cFv.s | 31 - .../initCcCylinder__15daObjYobikusa_cFv.s | 25 - .../initPickLeaf__15daObjYobikusa_cFv.s | 16 - .../initPushDown__15daObjYobikusa_cFv.s | 4 - .../initSwingWind__15daObjYobikusa_cFv.s | 4 - .../nodeCallBack__FP8J3DJointi.s | 79 -- ...ObjYobikusa_cFQ215daObjYobikusa_c6Mode_e.s | 14 - .../setCcCylinder__15daObjYobikusa_cFv.s | 14 - .../setNewLeaf__15daObjYobikusa_cFv.s | 54 - .../toPickLeaf__15daObjYobikusa_cFv.s | 43 - include/d/kankyo/d_kankyo_wether.h | 2 +- .../a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h | 93 +- .../obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp | 1002 ++++++----------- src/d/kankyo/d_kankyo_wether.cpp | 2 +- 39 files changed, 442 insertions(+), 2068 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__5csXyzFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__sinit_d_a_obj_yobikusa_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callExecute__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callInit__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/createSolidHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/create_init__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Delete__FP15daObjYobikusa_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Draw__FP15daObjYobikusa_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Execute__FP15daObjYobikusa_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePickLeaf__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePushDown__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executeSwingWind__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/execute__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE60.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE68.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointAngle__15daObjYobikusa_cFP5csXyzi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointScale__15daObjYobikusa_cFi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initBaseMtx__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initCcCylinder__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPickLeaf__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPushDown__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initSwingWind__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/nodeCallBack__FP8J3DJointi.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setCcCylinder__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setNewLeaf__15daObjYobikusa_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/toPickLeaf__15daObjYobikusa_cFv.s diff --git a/Progress.md b/Progress.md index e87372924b..da7e09512d 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 47.553652% | 1710288 | 3596544 +.text | 48.104069% | 1730084 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 53.081276% | 2134224 | 4020672 +Total | 53.573631% | 2154020 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 53.081276% | 2134224 | 4020672 -RELs | 37.015931% | 4256952 | 11500324 -Total | 41.177615% | 6391176 | 15520996 +main.dol | 53.573631% | 2154020 | 4020672 +RELs | 37.061391% | 4262180 | 11500324 +Total | 41.338842% | 6416200 | 15520996 ## RELs @@ -675,7 +675,7 @@ d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932 d_a_obj_wood_statue | 36.601579% | 3524 | 9628 d_a_obj_wsword | 100.000000% | 2820 | 2820 d_a_obj_yel_bag | 33.773087% | 3584 | 10612 -d_a_obj_yobikusa | 39.095993% | 3356 | 8584 +d_a_obj_yobikusa | 100.000000% | 8584 | 8584 d_a_obj_yousei | 27.926623% | 4628 | 16572 d_a_obj_ystone | 100.000000% | 5324 | 5324 d_a_obj_zcloth | 100.000000% | 2528 | 2528 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 37.015931% | 4256952 | 11500324 +Total | 37.061391% | 4262180 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 7adfdcaaf5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8059DD78: -/* 8059DD78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059DD7C 7C 08 02 A6 */ mflr r0 -/* 8059DD80 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059DD84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059DD88 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059DD8C 41 82 00 1C */ beq lbl_8059DDA8 -/* 8059DD90 3C A0 80 5A */ lis r5, __vt__10cCcD_GStts@ha /* 0x8059E070@ha */ -/* 8059DD94 38 05 E0 70 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x8059E070@l */ -/* 8059DD98 90 1F 00 00 */ stw r0, 0(r31) -/* 8059DD9C 7C 80 07 35 */ extsh. r0, r4 -/* 8059DDA0 40 81 00 08 */ ble lbl_8059DDA8 -/* 8059DDA4 4B D3 0F 99 */ bl __dl__FPv -lbl_8059DDA8: -/* 8059DDA8 7F E3 FB 78 */ mr r3, r31 -/* 8059DDAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059DDB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059DDB4 7C 08 03 A6 */ mtlr r0 -/* 8059DDB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059DDBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 306f98f0e8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8059DD1C: -/* 8059DD1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059DD20 7C 08 02 A6 */ mflr r0 -/* 8059DD24 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059DD28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059DD2C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059DD30 41 82 00 30 */ beq lbl_8059DD60 -/* 8059DD34 3C 60 80 5A */ lis r3, __vt__10dCcD_GStts@ha /* 0x8059E07C@ha */ -/* 8059DD38 38 03 E0 7C */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x8059E07C@l */ -/* 8059DD3C 90 1F 00 00 */ stw r0, 0(r31) -/* 8059DD40 41 82 00 10 */ beq lbl_8059DD50 -/* 8059DD44 3C 60 80 5A */ lis r3, __vt__10cCcD_GStts@ha /* 0x8059E070@ha */ -/* 8059DD48 38 03 E0 70 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x8059E070@l */ -/* 8059DD4C 90 1F 00 00 */ stw r0, 0(r31) -lbl_8059DD50: -/* 8059DD50 7C 80 07 35 */ extsh. r0, r4 -/* 8059DD54 40 81 00 0C */ ble lbl_8059DD60 -/* 8059DD58 7F E3 FB 78 */ mr r3, r31 -/* 8059DD5C 4B D3 0F E1 */ bl __dl__FPv -lbl_8059DD60: -/* 8059DD60 7F E3 FB 78 */ mr r3, r31 -/* 8059DD64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059DD68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059DD6C 7C 08 03 A6 */ mtlr r0 -/* 8059DD70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059DD74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 16dd99fd39..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8059D0B0: -/* 8059D0B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D0B4 7C 08 02 A6 */ mflr r0 -/* 8059D0B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D0BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D0C0 93 C1 00 08 */ stw r30, 8(r1) -/* 8059D0C4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8059D0C8 7C 9F 23 78 */ mr r31, r4 -/* 8059D0CC 41 82 00 38 */ beq lbl_8059D104 -/* 8059D0D0 3C 60 80 5A */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x8059E0A0@ha */ -/* 8059D0D4 38 03 E0 A0 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x8059E0A0@l */ -/* 8059D0D8 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8059D0DC 38 7E 00 14 */ addi r3, r30, 0x14 -/* 8059D0E0 38 80 FF FF */ li r4, -1 -/* 8059D0E4 4B CD 1E 35 */ bl __dt__8cM3dGCirFv -/* 8059D0E8 7F C3 F3 78 */ mr r3, r30 -/* 8059D0EC 38 80 00 00 */ li r4, 0 -/* 8059D0F0 4B CC AF C1 */ bl __dt__13cBgS_PolyInfoFv -/* 8059D0F4 7F E0 07 35 */ extsh. r0, r31 -/* 8059D0F8 40 81 00 0C */ ble lbl_8059D104 -/* 8059D0FC 7F C3 F3 78 */ mr r3, r30 -/* 8059D100 4B D3 1C 3D */ bl __dl__FPv -lbl_8059D104: -/* 8059D104 7F C3 F3 78 */ mr r3, r30 -/* 8059D108 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059D10C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8059D110 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D114 7C 08 03 A6 */ mtlr r0 -/* 8059D118 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D11C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index c2e6018695..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8059D040: -/* 8059D040 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D044 7C 08 02 A6 */ mflr r0 -/* 8059D048 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D04C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D050 93 C1 00 08 */ stw r30, 8(r1) -/* 8059D054 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8059D058 7C 9F 23 78 */ mr r31, r4 -/* 8059D05C 41 82 00 38 */ beq lbl_8059D094 -/* 8059D060 3C 80 80 5A */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x8059E0AC@ha */ -/* 8059D064 38 84 E0 AC */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x8059E0AC@l */ -/* 8059D068 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8059D06C 38 04 00 0C */ addi r0, r4, 0xc -/* 8059D070 90 1E 00 14 */ stw r0, 0x14(r30) -/* 8059D074 38 04 00 18 */ addi r0, r4, 0x18 -/* 8059D078 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8059D07C 38 80 00 00 */ li r4, 0 -/* 8059D080 4B AD 8F 15 */ bl __dt__9dBgS_AcchFv -/* 8059D084 7F E0 07 35 */ extsh. r0, r31 -/* 8059D088 40 81 00 0C */ ble lbl_8059D094 -/* 8059D08C 7F C3 F3 78 */ mr r3, r30 -/* 8059D090 4B D3 1C AD */ bl __dl__FPv -lbl_8059D094: -/* 8059D094 7F C3 F3 78 */ mr r3, r30 -/* 8059D098 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059D09C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8059D0A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D0A4 7C 08 03 A6 */ mtlr r0 -/* 8059D0A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D0AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__5csXyzFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__5csXyzFv.s deleted file mode 100644 index a5f07524e4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__5csXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8059D2E4: -/* 8059D2E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D2E8 7C 08 02 A6 */ mflr r0 -/* 8059D2EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D2F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D2F4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059D2F8 41 82 00 10 */ beq lbl_8059D308 -/* 8059D2FC 7C 80 07 35 */ extsh. r0, r4 -/* 8059D300 40 81 00 08 */ ble lbl_8059D308 -/* 8059D304 4B D3 1A 39 */ bl __dl__FPv -lbl_8059D308: -/* 8059D308 7F E3 FB 78 */ mr r3, r31 -/* 8059D30C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059D310 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D314 7C 08 03 A6 */ mtlr r0 -/* 8059D318 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D31C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGAabFv.s deleted file mode 100644 index 3acf152dd5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8059DCD4: -/* 8059DCD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059DCD8 7C 08 02 A6 */ mflr r0 -/* 8059DCDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059DCE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059DCE4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059DCE8 41 82 00 1C */ beq lbl_8059DD04 -/* 8059DCEC 3C A0 80 5A */ lis r5, __vt__8cM3dGAab@ha /* 0x8059E088@ha */ -/* 8059DCF0 38 05 E0 88 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8059E088@l */ -/* 8059DCF4 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8059DCF8 7C 80 07 35 */ extsh. r0, r4 -/* 8059DCFC 40 81 00 08 */ ble lbl_8059DD04 -/* 8059DD00 4B D3 10 3D */ bl __dl__FPv -lbl_8059DD04: -/* 8059DD04 7F E3 FB 78 */ mr r3, r31 -/* 8059DD08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059DD0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059DD10 7C 08 03 A6 */ mtlr r0 -/* 8059DD14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059DD18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGCylFv.s deleted file mode 100644 index 5b0919bbf9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8059DC8C: -/* 8059DC8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059DC90 7C 08 02 A6 */ mflr r0 -/* 8059DC94 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059DC98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059DC9C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059DCA0 41 82 00 1C */ beq lbl_8059DCBC -/* 8059DCA4 3C A0 80 5A */ lis r5, __vt__8cM3dGCyl@ha /* 0x8059E094@ha */ -/* 8059DCA8 38 05 E0 94 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x8059E094@l */ -/* 8059DCAC 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8059DCB0 7C 80 07 35 */ extsh. r0, r4 -/* 8059DCB4 40 81 00 08 */ ble lbl_8059DCBC -/* 8059DCB8 4B D3 10 85 */ bl __dl__FPv -lbl_8059DCBC: -/* 8059DCBC 7F E3 FB 78 */ mr r3, r31 -/* 8059DCC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059DCC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059DCC8 7C 08 03 A6 */ mtlr r0 -/* 8059DCCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059DCD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__sinit_d_a_obj_yobikusa_cpp.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__sinit_d_a_obj_yobikusa_cpp.s deleted file mode 100644 index 8503d4f407..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__sinit_d_a_obj_yobikusa_cpp.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8059DDC0: -/* 8059DDC0 3C 60 80 5A */ lis r3, cNullVec__6Z2Calc@ha /* 0x8059DF68@ha */ -/* 8059DDC4 38 A3 DF 68 */ addi r5, r3, cNullVec__6Z2Calc@l /* 0x8059DF68@l */ -/* 8059DDC8 80 65 00 28 */ lwz r3, 0x28(r5) -/* 8059DDCC 80 05 00 2C */ lwz r0, 0x2c(r5) -/* 8059DDD0 90 65 00 70 */ stw r3, 0x70(r5) -/* 8059DDD4 90 05 00 74 */ stw r0, 0x74(r5) -/* 8059DDD8 80 05 00 30 */ lwz r0, 0x30(r5) -/* 8059DDDC 90 05 00 78 */ stw r0, 0x78(r5) -/* 8059DDE0 38 85 00 70 */ addi r4, r5, 0x70 -/* 8059DDE4 80 65 00 34 */ lwz r3, 0x34(r5) -/* 8059DDE8 80 05 00 38 */ lwz r0, 0x38(r5) -/* 8059DDEC 90 64 00 0C */ stw r3, 0xc(r4) -/* 8059DDF0 90 04 00 10 */ stw r0, 0x10(r4) -/* 8059DDF4 80 05 00 3C */ lwz r0, 0x3c(r5) -/* 8059DDF8 90 04 00 14 */ stw r0, 0x14(r4) -/* 8059DDFC 80 65 00 40 */ lwz r3, 0x40(r5) -/* 8059DE00 80 05 00 44 */ lwz r0, 0x44(r5) -/* 8059DE04 90 64 00 18 */ stw r3, 0x18(r4) -/* 8059DE08 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8059DE0C 80 05 00 48 */ lwz r0, 0x48(r5) -/* 8059DE10 90 04 00 20 */ stw r0, 0x20(r4) -/* 8059DE14 80 65 00 4C */ lwz r3, 0x4c(r5) -/* 8059DE18 80 05 00 50 */ lwz r0, 0x50(r5) -/* 8059DE1C 90 64 00 24 */ stw r3, 0x24(r4) -/* 8059DE20 90 04 00 28 */ stw r0, 0x28(r4) -/* 8059DE24 80 05 00 54 */ lwz r0, 0x54(r5) -/* 8059DE28 90 04 00 2C */ stw r0, 0x2c(r4) -/* 8059DE2C 80 65 00 58 */ lwz r3, 0x58(r5) -/* 8059DE30 80 05 00 5C */ lwz r0, 0x5c(r5) -/* 8059DE34 90 64 00 30 */ stw r3, 0x30(r4) -/* 8059DE38 90 04 00 34 */ stw r0, 0x34(r4) -/* 8059DE3C 80 05 00 60 */ lwz r0, 0x60(r5) -/* 8059DE40 90 04 00 38 */ stw r0, 0x38(r4) -/* 8059DE44 80 65 00 64 */ lwz r3, 0x64(r5) -/* 8059DE48 80 05 00 68 */ lwz r0, 0x68(r5) -/* 8059DE4C 90 64 00 3C */ stw r3, 0x3c(r4) -/* 8059DE50 90 04 00 40 */ stw r0, 0x40(r4) -/* 8059DE54 80 05 00 6C */ lwz r0, 0x6c(r5) -/* 8059DE58 90 04 00 44 */ stw r0, 0x44(r4) -/* 8059DE5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callExecute__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callExecute__15daObjYobikusa_cFv.s deleted file mode 100644 index 451e484be1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callExecute__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8059CA54: -/* 8059CA54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059CA58 7C 08 02 A6 */ mflr r0 -/* 8059CA5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059CA60 80 83 05 AC */ lwz r4, 0x5ac(r3) -/* 8059CA64 39 84 00 0C */ addi r12, r4, 0xc -/* 8059CA68 4B DC 56 1D */ bl __ptmf_scall -/* 8059CA6C 60 00 00 00 */ nop -/* 8059CA70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059CA74 7C 08 03 A6 */ mtlr r0 -/* 8059CA78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059CA7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callInit__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callInit__15daObjYobikusa_cFv.s deleted file mode 100644 index f5bd032bdf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callInit__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8059CA2C: -/* 8059CA2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059CA30 7C 08 02 A6 */ mflr r0 -/* 8059CA34 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059CA38 81 83 05 AC */ lwz r12, 0x5ac(r3) -/* 8059CA3C 4B DC 56 49 */ bl __ptmf_scall -/* 8059CA40 60 00 00 00 */ nop -/* 8059CA44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059CA48 7C 08 03 A6 */ mtlr r0 -/* 8059CA4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059CA50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/createSolidHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/createSolidHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 5b5f229687..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/createSolidHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_8059D520: -/* 8059D520 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059D524 7C 08 02 A6 */ mflr r0 -/* 8059D528 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059D52C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059D530 4B DC 4C A9 */ bl _savegpr_28 -/* 8059D534 7C 7F 1B 78 */ mr r31, r3 -/* 8059D538 88 03 04 99 */ lbz r0, 0x499(r3) -/* 8059D53C 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 8059D540 2C 00 00 01 */ cmpwi r0, 1 -/* 8059D544 41 82 00 28 */ beq lbl_8059D56C -/* 8059D548 40 80 00 34 */ bge lbl_8059D57C -/* 8059D54C 2C 00 00 00 */ cmpwi r0, 0 -/* 8059D550 40 80 00 08 */ bge lbl_8059D558 -/* 8059D554 48 00 00 28 */ b lbl_8059D57C -lbl_8059D558: -/* 8059D558 3C 60 80 5A */ lis r3, d_a_obj_yobikusa__stringBase0@ha /* 0x8059DF24@ha */ -/* 8059D55C 38 63 DF 24 */ addi r3, r3, d_a_obj_yobikusa__stringBase0@l /* 0x8059DF24@l */ -/* 8059D560 38 83 00 0E */ addi r4, r3, 0xe -/* 8059D564 3B C3 00 19 */ addi r30, r3, 0x19 -/* 8059D568 48 00 00 14 */ b lbl_8059D57C -lbl_8059D56C: -/* 8059D56C 3C 60 80 5A */ lis r3, d_a_obj_yobikusa__stringBase0@ha /* 0x8059DF24@ha */ -/* 8059D570 38 63 DF 24 */ addi r3, r3, d_a_obj_yobikusa__stringBase0@l /* 0x8059DF24@l */ -/* 8059D574 38 83 00 26 */ addi r4, r3, 0x26 -/* 8059D578 3B C3 00 34 */ addi r30, r3, 0x34 -lbl_8059D57C: -/* 8059D57C 80 7F 07 60 */ lwz r3, 0x760(r31) -/* 8059D580 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D584 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D588 3F 85 00 02 */ addis r28, r5, 2 -/* 8059D58C 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 8059D590 7F 85 E3 78 */ mr r5, r28 -/* 8059D594 38 C0 00 80 */ li r6, 0x80 -/* 8059D598 4B A9 ED E5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8059D59C 7C 7D 1B 78 */ mr r29, r3 -/* 8059D5A0 80 7F 07 60 */ lwz r3, 0x760(r31) -/* 8059D5A4 7F C4 F3 78 */ mr r4, r30 -/* 8059D5A8 7F 85 E3 78 */ mr r5, r28 -/* 8059D5AC 38 C0 00 80 */ li r6, 0x80 -/* 8059D5B0 4B A9 ED CD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8059D5B4 7C 7E 1B 78 */ mr r30, r3 -/* 8059D5B8 7F A3 EB 78 */ mr r3, r29 -/* 8059D5BC 3C 80 00 08 */ lis r4, 8 -/* 8059D5C0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8059D5C4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8059D5C8 4B A7 76 8D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8059D5CC 90 7F 05 6C */ stw r3, 0x56c(r31) -/* 8059D5D0 7F C3 F3 78 */ mr r3, r30 -/* 8059D5D4 3C 80 00 08 */ lis r4, 8 -/* 8059D5D8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8059D5DC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8059D5E0 4B A7 76 75 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8059D5E4 90 7F 05 70 */ stw r3, 0x570(r31) -/* 8059D5E8 80 1F 05 6C */ lwz r0, 0x56c(r31) -/* 8059D5EC 28 00 00 00 */ cmplwi r0, 0 -/* 8059D5F0 41 82 00 10 */ beq lbl_8059D600 -/* 8059D5F4 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 8059D5F8 28 00 00 00 */ cmplwi r0, 0 -/* 8059D5FC 40 82 00 0C */ bne lbl_8059D608 -lbl_8059D600: -/* 8059D600 38 60 00 00 */ li r3, 0 -/* 8059D604 48 00 00 58 */ b lbl_8059D65C -lbl_8059D608: -/* 8059D608 38 A0 00 00 */ li r5, 0 -/* 8059D60C 3C 60 80 5A */ lis r3, nodeCallBack__FP8J3DJointi@ha /* 0x8059D1C4@ha */ -/* 8059D610 38 83 D1 C4 */ addi r4, r3, nodeCallBack__FP8J3DJointi@l /* 0x8059D1C4@l */ -/* 8059D614 48 00 00 30 */ b lbl_8059D644 -lbl_8059D618: -/* 8059D618 80 7F 05 6C */ lwz r3, 0x56c(r31) -/* 8059D61C 80 63 00 04 */ lwz r3, 4(r3) -/* 8059D620 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8059D624 54 A0 13 BA */ rlwinm r0, r5, 2, 0xe, 0x1d -/* 8059D628 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8059D62C 28 03 00 00 */ cmplwi r3, 0 -/* 8059D630 41 82 00 10 */ beq lbl_8059D640 -/* 8059D634 90 83 00 04 */ stw r4, 4(r3) -/* 8059D638 80 7F 05 6C */ lwz r3, 0x56c(r31) -/* 8059D63C 93 E3 00 14 */ stw r31, 0x14(r3) -lbl_8059D640: -/* 8059D640 38 A5 00 01 */ addi r5, r5, 1 -lbl_8059D644: -/* 8059D644 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 8059D648 28 00 00 03 */ cmplwi r0, 3 -/* 8059D64C 41 80 FF CC */ blt lbl_8059D618 -/* 8059D650 80 1F 05 6C */ lwz r0, 0x56c(r31) -/* 8059D654 90 1F 05 68 */ stw r0, 0x568(r31) -/* 8059D658 38 60 00 01 */ li r3, 1 -lbl_8059D65C: -/* 8059D65C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059D660 4B DC 4B C5 */ bl _restgpr_28 -/* 8059D664 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059D668 7C 08 03 A6 */ mtlr r0 -/* 8059D66C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059D670 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/create_init__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/create_init__15daObjYobikusa_cFv.s deleted file mode 100644 index 5c55dd2537..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/create_init__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_8059CE7C: -/* 8059CE7C 94 21 FD B0 */ stwu r1, -0x250(r1) -/* 8059CE80 7C 08 02 A6 */ mflr r0 -/* 8059CE84 90 01 02 54 */ stw r0, 0x254(r1) -/* 8059CE88 39 61 02 50 */ addi r11, r1, 0x250 -/* 8059CE8C 4B DC 53 49 */ bl _savegpr_27 -/* 8059CE90 7C 7C 1B 78 */ mr r28, r3 -/* 8059CE94 3C 80 80 5A */ lis r4, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059CE98 3B E4 DE 7C */ addi r31, r4, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059CE9C 48 00 02 85 */ bl initBaseMtx__15daObjYobikusa_cFv -/* 8059CEA0 7F 83 E3 78 */ mr r3, r28 -/* 8059CEA4 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 8059CEA8 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 8059CEAC FC 60 08 90 */ fmr f3, f1 -/* 8059CEB0 C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 8059CEB4 C0 BF 00 54 */ lfs f5, 0x54(r31) -/* 8059CEB8 FC C0 20 90 */ fmr f6, f4 -/* 8059CEBC 4B A7 D6 8D */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 8059CEC0 38 61 00 10 */ addi r3, r1, 0x10 -/* 8059CEC4 4B AD 8F E9 */ bl __ct__12dBgS_AcchCirFv -/* 8059CEC8 3B 61 00 50 */ addi r27, r1, 0x50 -/* 8059CECC 7F 63 DB 78 */ mr r3, r27 -/* 8059CED0 4B AD 91 D1 */ bl __ct__9dBgS_AcchFv -/* 8059CED4 3C 60 80 5A */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x8059E0AC@ha */ -/* 8059CED8 38 63 E0 AC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x8059E0AC@l */ -/* 8059CEDC 90 61 00 60 */ stw r3, 0x60(r1) -/* 8059CEE0 3B C3 00 0C */ addi r30, r3, 0xc -/* 8059CEE4 93 C1 00 64 */ stw r30, 0x64(r1) -/* 8059CEE8 3B A3 00 18 */ addi r29, r3, 0x18 -/* 8059CEEC 93 A1 00 74 */ stw r29, 0x74(r1) -/* 8059CEF0 38 7B 00 14 */ addi r3, r27, 0x14 -/* 8059CEF4 4B AD BF 75 */ bl SetObj__16dBgS_PolyPassChkFv -/* 8059CEF8 38 61 00 10 */ addi r3, r1, 0x10 -/* 8059CEFC C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8059CF00 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 8059CF04 4B AD 90 55 */ bl SetWall__12dBgS_AcchCirFff -/* 8059CF08 38 00 00 00 */ li r0, 0 -/* 8059CF0C 90 01 00 08 */ stw r0, 8(r1) -/* 8059CF10 7F 63 DB 78 */ mr r3, r27 -/* 8059CF14 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 8059CF18 38 BC 04 BC */ addi r5, r28, 0x4bc -/* 8059CF1C 7F 86 E3 78 */ mr r6, r28 -/* 8059CF20 38 E0 00 01 */ li r7, 1 -/* 8059CF24 39 01 00 10 */ addi r8, r1, 0x10 -/* 8059CF28 39 3C 04 F8 */ addi r9, r28, 0x4f8 -/* 8059CF2C 39 40 00 00 */ li r10, 0 -/* 8059CF30 4B AD 93 19 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 8059CF34 7F 63 DB 78 */ mr r3, r27 -/* 8059CF38 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059CF3C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059CF40 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8059CF44 4B AD 9B 69 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 8059CF48 C0 01 00 E8 */ lfs f0, 0xe8(r1) -/* 8059CF4C D0 1C 07 3C */ stfs f0, 0x73c(r28) -/* 8059CF50 A0 01 01 40 */ lhz r0, 0x140(r1) -/* 8059CF54 B0 1C 07 2C */ sth r0, 0x72c(r28) -/* 8059CF58 A0 01 01 42 */ lhz r0, 0x142(r1) -/* 8059CF5C B0 1C 07 2E */ sth r0, 0x72e(r28) -/* 8059CF60 80 01 01 44 */ lwz r0, 0x144(r1) -/* 8059CF64 90 1C 07 30 */ stw r0, 0x730(r28) -/* 8059CF68 80 01 01 48 */ lwz r0, 0x148(r1) -/* 8059CF6C 90 1C 07 34 */ stw r0, 0x734(r28) -/* 8059CF70 88 1C 04 9A */ lbz r0, 0x49a(r28) -/* 8059CF74 60 00 00 10 */ ori r0, r0, 0x10 -/* 8059CF78 98 1C 04 9A */ stb r0, 0x49a(r28) -/* 8059CF7C 80 1C 05 5C */ lwz r0, 0x55c(r28) -/* 8059CF80 60 00 00 10 */ ori r0, r0, 0x10 -/* 8059CF84 90 1C 05 5C */ stw r0, 0x55c(r28) -/* 8059CF88 38 00 00 2A */ li r0, 0x2a -/* 8059CF8C 98 1C 05 48 */ stb r0, 0x548(r28) -/* 8059CF90 7F 83 E3 78 */ mr r3, r28 -/* 8059CF94 48 00 03 8D */ bl initCcCylinder__15daObjYobikusa_cFv -/* 8059CF98 7F 83 E3 78 */ mr r3, r28 -/* 8059CF9C 38 80 00 00 */ li r4, 0 -/* 8059CFA0 4B FF FA 59 */ bl setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e -/* 8059CFA4 C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 8059CFA8 D0 1C 07 40 */ stfs f0, 0x740(r28) -/* 8059CFAC 4B CC A8 C1 */ bl cM_rnd__Fv -/* 8059CFB0 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 8059CFB4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8059CFB8 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CFBC D8 01 02 28 */ stfd f0, 0x228(r1) -/* 8059CFC0 80 01 02 2C */ lwz r0, 0x22c(r1) -/* 8059CFC4 B0 1C 07 64 */ sth r0, 0x764(r28) -/* 8059CFC8 4B CC A8 A5 */ bl cM_rnd__Fv -/* 8059CFCC C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 8059CFD0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8059CFD4 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CFD8 D8 01 02 30 */ stfd f0, 0x230(r1) -/* 8059CFDC 80 01 02 34 */ lwz r0, 0x234(r1) -/* 8059CFE0 B0 1C 07 66 */ sth r0, 0x766(r28) -/* 8059CFE4 3C 60 80 5A */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x8059E0AC@ha */ -/* 8059CFE8 38 03 E0 AC */ addi r0, r3, __vt__12dBgS_ObjAcch@l /* 0x8059E0AC@l */ -/* 8059CFEC 90 01 00 60 */ stw r0, 0x60(r1) -/* 8059CFF0 93 C1 00 64 */ stw r30, 0x64(r1) -/* 8059CFF4 93 A1 00 74 */ stw r29, 0x74(r1) -/* 8059CFF8 7F 63 DB 78 */ mr r3, r27 -/* 8059CFFC 38 80 00 00 */ li r4, 0 -/* 8059D000 4B AD 8F 95 */ bl __dt__9dBgS_AcchFv -/* 8059D004 3C 60 80 5A */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x8059E0A0@ha */ -/* 8059D008 38 03 E0 A0 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x8059E0A0@l */ -/* 8059D00C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8059D010 38 61 00 24 */ addi r3, r1, 0x24 -/* 8059D014 38 80 FF FF */ li r4, -1 -/* 8059D018 4B CD 1F 01 */ bl __dt__8cM3dGCirFv -/* 8059D01C 38 61 00 10 */ addi r3, r1, 0x10 -/* 8059D020 38 80 00 00 */ li r4, 0 -/* 8059D024 4B CC B0 8D */ bl __dt__13cBgS_PolyInfoFv -/* 8059D028 39 61 02 50 */ addi r11, r1, 0x250 -/* 8059D02C 4B DC 51 F5 */ bl _restgpr_27 -/* 8059D030 80 01 02 54 */ lwz r0, 0x254(r1) -/* 8059D034 7C 08 03 A6 */ mtlr r0 -/* 8059D038 38 21 02 50 */ addi r1, r1, 0x250 -/* 8059D03C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 947300c2ca..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_8059DAF4: -/* 8059DAF4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059DAF8 7C 08 02 A6 */ mflr r0 -/* 8059DAFC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059DB00 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059DB04 4B DC 46 D9 */ bl _savegpr_29 -/* 8059DB08 7C 7F 1B 78 */ mr r31, r3 -/* 8059DB0C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8059DB10 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8059DB14 40 82 00 D0 */ bne lbl_8059DBE4 -/* 8059DB18 7F E0 FB 79 */ or. r0, r31, r31 -/* 8059DB1C 41 82 00 BC */ beq lbl_8059DBD8 -/* 8059DB20 7C 1E 03 78 */ mr r30, r0 -/* 8059DB24 4B A7 B0 41 */ bl __ct__10fopAc_ac_cFv -/* 8059DB28 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 8059DB2C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 8059DB30 90 1E 05 CC */ stw r0, 0x5cc(r30) -/* 8059DB34 38 7E 05 D0 */ addi r3, r30, 0x5d0 -/* 8059DB38 4B AE 5C 29 */ bl __ct__10dCcD_GSttsFv -/* 8059DB3C 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 8059DB40 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 8059DB44 90 7E 05 CC */ stw r3, 0x5cc(r30) -/* 8059DB48 38 03 00 20 */ addi r0, r3, 0x20 -/* 8059DB4C 90 1E 05 D0 */ stw r0, 0x5d0(r30) -/* 8059DB50 3B BE 05 F0 */ addi r29, r30, 0x5f0 -/* 8059DB54 7F A3 EB 78 */ mr r3, r29 -/* 8059DB58 4B AE 5E D1 */ bl __ct__12dCcD_GObjInfFv -/* 8059DB5C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8059DB60 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8059DB64 90 1D 01 20 */ stw r0, 0x120(r29) -/* 8059DB68 3C 60 80 5A */ lis r3, __vt__8cM3dGAab@ha /* 0x8059E088@ha */ -/* 8059DB6C 38 03 E0 88 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8059E088@l */ -/* 8059DB70 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 8059DB74 3C 60 80 5A */ lis r3, __vt__8cM3dGCyl@ha /* 0x8059E094@ha */ -/* 8059DB78 38 03 E0 94 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x8059E094@l */ -/* 8059DB7C 90 1D 01 38 */ stw r0, 0x138(r29) -/* 8059DB80 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 8059DB84 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 8059DB88 90 7D 01 20 */ stw r3, 0x120(r29) -/* 8059DB8C 38 03 00 58 */ addi r0, r3, 0x58 -/* 8059DB90 90 1D 01 38 */ stw r0, 0x138(r29) -/* 8059DB94 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 8059DB98 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 8059DB9C 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 8059DBA0 38 03 00 2C */ addi r0, r3, 0x2c -/* 8059DBA4 90 1D 01 20 */ stw r0, 0x120(r29) -/* 8059DBA8 38 03 00 84 */ addi r0, r3, 0x84 -/* 8059DBAC 90 1D 01 38 */ stw r0, 0x138(r29) -/* 8059DBB0 38 7E 07 2C */ addi r3, r30, 0x72c -/* 8059DBB4 4B CC A4 C1 */ bl __ct__13cBgS_PolyInfoFv -/* 8059DBB8 38 7E 07 4C */ addi r3, r30, 0x74c -/* 8059DBBC 3C 80 80 5A */ lis r4, __ct__5csXyzFv@ha /* 0x8059DC88@ha */ -/* 8059DBC0 38 84 DC 88 */ addi r4, r4, __ct__5csXyzFv@l /* 0x8059DC88@l */ -/* 8059DBC4 3C A0 80 5A */ lis r5, __dt__5csXyzFv@ha /* 0x8059D2E4@ha */ -/* 8059DBC8 38 A5 D2 E4 */ addi r5, r5, __dt__5csXyzFv@l /* 0x8059D2E4@l */ -/* 8059DBCC 38 C0 00 06 */ li r6, 6 -/* 8059DBD0 38 E0 00 03 */ li r7, 3 -/* 8059DBD4 4B DC 41 8D */ bl __construct_array -lbl_8059DBD8: -/* 8059DBD8 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8059DBDC 60 00 00 08 */ ori r0, r0, 8 -/* 8059DBE0 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8059DBE4: -/* 8059DBE4 88 1F 04 99 */ lbz r0, 0x499(r31) -/* 8059DBE8 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 8059DBEC 2C 00 00 01 */ cmpwi r0, 1 -/* 8059DBF0 41 82 00 24 */ beq lbl_8059DC14 -/* 8059DBF4 40 80 00 2C */ bge lbl_8059DC20 -/* 8059DBF8 2C 00 00 00 */ cmpwi r0, 0 -/* 8059DBFC 40 80 00 08 */ bge lbl_8059DC04 -/* 8059DC00 48 00 00 20 */ b lbl_8059DC20 -lbl_8059DC04: -/* 8059DC04 3C 60 80 5A */ lis r3, l_arcName1@ha /* 0x8059DF88@ha */ -/* 8059DC08 80 03 DF 88 */ lwz r0, l_arcName1@l(r3) /* 0x8059DF88@l */ -/* 8059DC0C 90 1F 07 60 */ stw r0, 0x760(r31) -/* 8059DC10 48 00 00 10 */ b lbl_8059DC20 -lbl_8059DC14: -/* 8059DC14 3C 60 80 5A */ lis r3, l_arcName2@ha /* 0x8059DF8C@ha */ -/* 8059DC18 80 03 DF 8C */ lwz r0, l_arcName2@l(r3) /* 0x8059DF8C@l */ -/* 8059DC1C 90 1F 07 60 */ stw r0, 0x760(r31) -lbl_8059DC20: -/* 8059DC20 38 7F 05 A4 */ addi r3, r31, 0x5a4 -/* 8059DC24 80 9F 07 60 */ lwz r4, 0x760(r31) -/* 8059DC28 4B A8 F2 95 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8059DC2C 7C 7E 1B 78 */ mr r30, r3 -/* 8059DC30 2C 1E 00 04 */ cmpwi r30, 4 -/* 8059DC34 40 82 00 38 */ bne lbl_8059DC6C -/* 8059DC38 7F E3 FB 78 */ mr r3, r31 -/* 8059DC3C 3C 80 80 5A */ lis r4, createSolidHeap__FP10fopAc_ac_c@ha /* 0x8059D520@ha */ -/* 8059DC40 38 84 D5 20 */ addi r4, r4, createSolidHeap__FP10fopAc_ac_c@l /* 0x8059D520@l */ -/* 8059DC44 38 A0 10 80 */ li r5, 0x1080 -/* 8059DC48 4B A7 C8 69 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8059DC4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8059DC50 40 82 00 0C */ bne lbl_8059DC5C -/* 8059DC54 3B C0 00 05 */ li r30, 5 -/* 8059DC58 48 00 00 14 */ b lbl_8059DC6C -lbl_8059DC5C: -/* 8059DC5C 7F E3 FB 78 */ mr r3, r31 -/* 8059DC60 4B FF F2 1D */ bl create_init__15daObjYobikusa_cFv -/* 8059DC64 38 1F 05 74 */ addi r0, r31, 0x574 -/* 8059DC68 90 1F 05 04 */ stw r0, 0x504(r31) -lbl_8059DC6C: -/* 8059DC6C 7F C3 F3 78 */ mr r3, r30 -/* 8059DC70 39 61 00 20 */ addi r11, r1, 0x20 -/* 8059DC74 4B DC 45 B5 */ bl _restgpr_29 -/* 8059DC78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059DC7C 7C 08 03 A6 */ mtlr r0 -/* 8059DC80 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059DC84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Delete__FP15daObjYobikusa_c.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Delete__FP15daObjYobikusa_c.s deleted file mode 100644 index 3a7b8b34bc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Delete__FP15daObjYobikusa_c.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_8059D9A8: -/* 8059D9A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D9AC 7C 08 02 A6 */ mflr r0 -/* 8059D9B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D9B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D9B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8059D9BC 41 82 01 20 */ beq lbl_8059DADC -/* 8059D9C0 38 7F 05 A4 */ addi r3, r31, 0x5a4 -/* 8059D9C4 80 9F 07 60 */ lwz r4, 0x760(r31) -/* 8059D9C8 4B A8 F6 41 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8059D9CC 38 7F 07 4C */ addi r3, r31, 0x74c -/* 8059D9D0 3C 80 80 5A */ lis r4, __dt__5csXyzFv@ha /* 0x8059D2E4@ha */ -/* 8059D9D4 38 84 D2 E4 */ addi r4, r4, __dt__5csXyzFv@l /* 0x8059D2E4@l */ -/* 8059D9D8 38 A0 00 06 */ li r5, 6 -/* 8059D9DC 38 C0 00 03 */ li r6, 3 -/* 8059D9E0 4B DC 43 09 */ bl __destroy_arr -/* 8059D9E4 38 7F 07 2C */ addi r3, r31, 0x72c -/* 8059D9E8 38 80 FF FF */ li r4, -1 -/* 8059D9EC 4B CC A6 C5 */ bl __dt__13cBgS_PolyInfoFv -/* 8059D9F0 34 1F 05 F0 */ addic. r0, r31, 0x5f0 -/* 8059D9F4 41 82 00 84 */ beq lbl_8059DA78 -/* 8059D9F8 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 8059D9FC 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 8059DA00 90 7F 06 2C */ stw r3, 0x62c(r31) -/* 8059DA04 38 03 00 2C */ addi r0, r3, 0x2c -/* 8059DA08 90 1F 07 10 */ stw r0, 0x710(r31) -/* 8059DA0C 38 03 00 84 */ addi r0, r3, 0x84 -/* 8059DA10 90 1F 07 28 */ stw r0, 0x728(r31) -/* 8059DA14 34 1F 06 F4 */ addic. r0, r31, 0x6f4 -/* 8059DA18 41 82 00 54 */ beq lbl_8059DA6C -/* 8059DA1C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 8059DA20 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 8059DA24 90 7F 07 10 */ stw r3, 0x710(r31) -/* 8059DA28 38 03 00 58 */ addi r0, r3, 0x58 -/* 8059DA2C 90 1F 07 28 */ stw r0, 0x728(r31) -/* 8059DA30 34 1F 07 14 */ addic. r0, r31, 0x714 -/* 8059DA34 41 82 00 10 */ beq lbl_8059DA44 -/* 8059DA38 3C 60 80 5A */ lis r3, __vt__8cM3dGCyl@ha /* 0x8059E094@ha */ -/* 8059DA3C 38 03 E0 94 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x8059E094@l */ -/* 8059DA40 90 1F 07 28 */ stw r0, 0x728(r31) -lbl_8059DA44: -/* 8059DA44 34 1F 06 F4 */ addic. r0, r31, 0x6f4 -/* 8059DA48 41 82 00 24 */ beq lbl_8059DA6C -/* 8059DA4C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8059DA50 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8059DA54 90 1F 07 10 */ stw r0, 0x710(r31) -/* 8059DA58 34 1F 06 F4 */ addic. r0, r31, 0x6f4 -/* 8059DA5C 41 82 00 10 */ beq lbl_8059DA6C -/* 8059DA60 3C 60 80 5A */ lis r3, __vt__8cM3dGAab@ha /* 0x8059E088@ha */ -/* 8059DA64 38 03 E0 88 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8059E088@l */ -/* 8059DA68 90 1F 07 0C */ stw r0, 0x70c(r31) -lbl_8059DA6C: -/* 8059DA6C 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/* 8059DA70 38 80 00 00 */ li r4, 0 -/* 8059DA74 4B AE 66 71 */ bl __dt__12dCcD_GObjInfFv -lbl_8059DA78: -/* 8059DA78 34 1F 05 B4 */ addic. r0, r31, 0x5b4 -/* 8059DA7C 41 82 00 54 */ beq lbl_8059DAD0 -/* 8059DA80 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 8059DA84 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 8059DA88 90 7F 05 CC */ stw r3, 0x5cc(r31) -/* 8059DA8C 38 03 00 20 */ addi r0, r3, 0x20 -/* 8059DA90 90 1F 05 D0 */ stw r0, 0x5d0(r31) -/* 8059DA94 34 1F 05 D0 */ addic. r0, r31, 0x5d0 -/* 8059DA98 41 82 00 24 */ beq lbl_8059DABC -/* 8059DA9C 3C 60 80 5A */ lis r3, __vt__10dCcD_GStts@ha /* 0x8059E07C@ha */ -/* 8059DAA0 38 03 E0 7C */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x8059E07C@l */ -/* 8059DAA4 90 1F 05 D0 */ stw r0, 0x5d0(r31) -/* 8059DAA8 34 1F 05 D0 */ addic. r0, r31, 0x5d0 -/* 8059DAAC 41 82 00 10 */ beq lbl_8059DABC -/* 8059DAB0 3C 60 80 5A */ lis r3, __vt__10cCcD_GStts@ha /* 0x8059E070@ha */ -/* 8059DAB4 38 03 E0 70 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x8059E070@l */ -/* 8059DAB8 90 1F 05 D0 */ stw r0, 0x5d0(r31) -lbl_8059DABC: -/* 8059DABC 34 1F 05 B4 */ addic. r0, r31, 0x5b4 -/* 8059DAC0 41 82 00 10 */ beq lbl_8059DAD0 -/* 8059DAC4 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 8059DAC8 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 8059DACC 90 1F 05 CC */ stw r0, 0x5cc(r31) -lbl_8059DAD0: -/* 8059DAD0 7F E3 FB 78 */ mr r3, r31 -/* 8059DAD4 38 80 00 00 */ li r4, 0 -/* 8059DAD8 4B A7 B1 B5 */ bl __dt__10fopAc_ac_cFv -lbl_8059DADC: -/* 8059DADC 38 60 00 01 */ li r3, 1 -/* 8059DAE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059DAE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059DAE8 7C 08 03 A6 */ mtlr r0 -/* 8059DAEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059DAF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Draw__FP15daObjYobikusa_c.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Draw__FP15daObjYobikusa_c.s deleted file mode 100644 index bb7f9538f7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Draw__FP15daObjYobikusa_c.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8059D674: -/* 8059D674 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D678 7C 08 02 A6 */ mflr r0 -/* 8059D67C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D680 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D684 93 C1 00 08 */ stw r30, 8(r1) -/* 8059D688 7C 7E 1B 78 */ mr r30, r3 -/* 8059D68C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8059D690 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8059D694 38 80 00 10 */ li r4, 0x10 -/* 8059D698 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8059D69C 38 DE 01 0C */ addi r6, r30, 0x10c -/* 8059D6A0 4B C0 61 25 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8059D6A4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8059D6A8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8059D6AC 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 8059D6B0 80 84 00 04 */ lwz r4, 4(r4) -/* 8059D6B4 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8059D6B8 4B C0 76 E9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8059D6BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D6C0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D6C4 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 8059D6C8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8059D6CC 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8059D6D0 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8059D6D4 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8059D6D8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8059D6DC 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 8059D6E0 4B A7 05 E5 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8059D6E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D6E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D6EC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 8059D6F0 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8059D6F4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 8059D6F8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8059D6FC 38 60 00 01 */ li r3, 1 -/* 8059D700 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059D704 83 C1 00 08 */ lwz r30, 8(r1) -/* 8059D708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D70C 7C 08 03 A6 */ mtlr r0 -/* 8059D710 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D714 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Execute__FP15daObjYobikusa_c.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Execute__FP15daObjYobikusa_c.s deleted file mode 100644 index 4641dda42a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Execute__FP15daObjYobikusa_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8059D718: -/* 8059D718 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D71C 7C 08 02 A6 */ mflr r0 -/* 8059D720 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D724 48 00 00 15 */ bl execute__15daObjYobikusa_cFv -/* 8059D728 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D72C 7C 08 03 A6 */ mtlr r0 -/* 8059D730 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D734 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePickLeaf__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePickLeaf__15daObjYobikusa_cFv.s deleted file mode 100644 index 76e808c51a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePickLeaf__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_8059CD80: -/* 8059CD80 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059CD84 7C 08 02 A6 */ mflr r0 -/* 8059CD88 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059CD8C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8059CD90 7C 7F 1B 78 */ mr r31, r3 -/* 8059CD94 A8 03 07 6A */ lha r0, 0x76a(r3) -/* 8059CD98 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059CD9C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8059CDA0 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8059CDA4 7C 24 04 2E */ lfsx f1, r4, r0 -/* 8059CDA8 C0 1F 07 48 */ lfs f0, 0x748(r31) -/* 8059CDAC EC 20 00 72 */ fmuls f1, f0, f1 -/* 8059CDB0 A8 1F 07 6C */ lha r0, 0x76c(r31) -/* 8059CDB4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059CDB8 7C 64 02 14 */ add r3, r4, r0 -/* 8059CDBC C0 03 00 04 */ lfs f0, 4(r3) -/* 8059CDC0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CDC4 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CDC8 D8 01 00 08 */ stfd f0, 8(r1) -/* 8059CDCC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8059CDD0 B0 1F 07 54 */ sth r0, 0x754(r31) -/* 8059CDD4 A8 1F 07 6C */ lha r0, 0x76c(r31) -/* 8059CDD8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059CDDC 7C 04 04 2E */ lfsx f0, r4, r0 -/* 8059CDE0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CDE4 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CDE8 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8059CDEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059CDF0 B0 1F 07 56 */ sth r0, 0x756(r31) -/* 8059CDF4 38 7F 07 48 */ addi r3, r31, 0x748 -/* 8059CDF8 3C 80 80 5A */ lis r4, lit_3699@ha /* 0x8059DEBC@ha */ -/* 8059CDFC C0 24 DE BC */ lfs f1, lit_3699@l(r4) /* 0x8059DEBC@l */ -/* 8059CE00 3C 80 80 5A */ lis r4, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059CE04 38 84 DE 7C */ addi r4, r4, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059CE08 C0 44 00 34 */ lfs f2, 0x34(r4) -/* 8059CE0C 4B CD 39 35 */ bl cLib_chaseF__FPfff -/* 8059CE10 A8 9F 07 6A */ lha r4, 0x76a(r31) -/* 8059CE14 3C 60 80 5A */ lis r3, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059CE18 38 63 DE 7C */ addi r3, r3, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059CE1C A8 03 00 3E */ lha r0, 0x3e(r3) -/* 8059CE20 7C 04 02 14 */ add r0, r4, r0 -/* 8059CE24 B0 1F 07 6A */ sth r0, 0x76a(r31) -/* 8059CE28 3C 60 80 5A */ lis r3, lit_3699@ha /* 0x8059DEBC@ha */ -/* 8059CE2C C0 23 DE BC */ lfs f1, lit_3699@l(r3) /* 0x8059DEBC@l */ -/* 8059CE30 C0 1F 07 48 */ lfs f0, 0x748(r31) -/* 8059CE34 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8059CE38 40 82 00 30 */ bne lbl_8059CE68 -/* 8059CE3C 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/* 8059CE40 4B AE 78 19 */ bl ChkCoHit__12dCcD_GObjInfFv -/* 8059CE44 28 03 00 00 */ cmplwi r3, 0 -/* 8059CE48 41 82 00 14 */ beq lbl_8059CE5C -/* 8059CE4C 7F E3 FB 78 */ mr r3, r31 -/* 8059CE50 38 80 00 01 */ li r4, 1 -/* 8059CE54 4B FF FB A5 */ bl setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e -/* 8059CE58 48 00 00 10 */ b lbl_8059CE68 -lbl_8059CE5C: -/* 8059CE5C 7F E3 FB 78 */ mr r3, r31 -/* 8059CE60 38 80 00 00 */ li r4, 0 -/* 8059CE64 4B FF FB 95 */ bl setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e -lbl_8059CE68: -/* 8059CE68 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8059CE6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059CE70 7C 08 03 A6 */ mtlr r0 -/* 8059CE74 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059CE78 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePushDown__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePushDown__15daObjYobikusa_cFv.s deleted file mode 100644 index 883ccdd37b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePushDown__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8059CC60: -/* 8059CC60 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8059CC64 7C 08 02 A6 */ mflr r0 -/* 8059CC68 90 01 00 34 */ stw r0, 0x34(r1) -/* 8059CC6C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059CC70 4B DC 55 6D */ bl _savegpr_29 -/* 8059CC74 7C 7D 1B 78 */ mr r29, r3 -/* 8059CC78 38 7D 05 F0 */ addi r3, r29, 0x5f0 -/* 8059CC7C 4B AE 79 DD */ bl ChkCoHit__12dCcD_GObjInfFv -/* 8059CC80 28 03 00 00 */ cmplwi r3, 0 -/* 8059CC84 40 82 00 14 */ bne lbl_8059CC98 -/* 8059CC88 7F A3 EB 78 */ mr r3, r29 -/* 8059CC8C 38 80 00 00 */ li r4, 0 -/* 8059CC90 4B FF FD 69 */ bl setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e -/* 8059CC94 48 00 00 98 */ b lbl_8059CD2C -lbl_8059CC98: -/* 8059CC98 38 7D 06 D8 */ addi r3, r29, 0x6d8 -/* 8059CC9C 4B AE 69 ED */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 8059CCA0 7C 7E 1B 78 */ mr r30, r3 -/* 8059CCA4 7F A3 EB 78 */ mr r3, r29 -/* 8059CCA8 7F C4 F3 78 */ mr r4, r30 -/* 8059CCAC 4B A7 DA 65 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8059CCB0 7C 7F 1B 78 */ mr r31, r3 -/* 8059CCB4 7F A3 EB 78 */ mr r3, r29 -/* 8059CCB8 7F C4 F3 78 */ mr r4, r30 -/* 8059CCBC 4B A7 DC A9 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8059CCC0 3C 60 80 5A */ lis r3, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059CCC4 38 63 DE 7C */ addi r3, r3, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059CCC8 C0 43 00 04 */ lfs f2, 4(r3) -/* 8059CCCC 3C 60 80 5A */ lis r3, lit_3724@ha /* 0x8059DEC0@ha */ -/* 8059CCD0 C0 03 DE C0 */ lfs f0, lit_3724@l(r3) /* 0x8059DEC0@l */ -/* 8059CCD4 EC 02 00 24 */ fdivs f0, f2, f0 -/* 8059CCD8 FC 00 00 50 */ fneg f0, f0 -/* 8059CCDC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CCE0 EC 20 10 2A */ fadds f1, f0, f2 -/* 8059CCE4 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8059CCE8 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8059CCEC 57 E5 04 38 */ rlwinm r5, r31, 0, 0x10, 0x1c -/* 8059CCF0 7C 64 2A 14 */ add r3, r4, r5 -/* 8059CCF4 C0 03 00 04 */ lfs f0, 4(r3) -/* 8059CCF8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CCFC FC 00 00 1E */ fctiwz f0, f0 -/* 8059CD00 D8 01 00 08 */ stfd f0, 8(r1) -/* 8059CD04 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8059CD08 B0 1D 07 4E */ sth r0, 0x74e(r29) -/* 8059CD0C 7C 04 2C 2E */ lfsx f0, r4, r5 -/* 8059CD10 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CD14 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CD18 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8059CD1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059CD20 B0 1D 07 50 */ sth r0, 0x750(r29) -/* 8059CD24 7F A3 EB 78 */ mr r3, r29 -/* 8059CD28 48 00 07 2D */ bl setNewLeaf__15daObjYobikusa_cFv -lbl_8059CD2C: -/* 8059CD2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059CD30 4B DC 54 F9 */ bl _restgpr_29 -/* 8059CD34 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8059CD38 7C 08 03 A6 */ mtlr r0 -/* 8059CD3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8059CD40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executeSwingWind__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executeSwingWind__15daObjYobikusa_cFv.s deleted file mode 100644 index a48a0d0150..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executeSwingWind__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,118 +0,0 @@ -lbl_8059CA8C: -/* 8059CA8C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8059CA90 7C 08 02 A6 */ mflr r0 -/* 8059CA94 90 01 00 54 */ stw r0, 0x54(r1) -/* 8059CA98 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 8059CA9C 7C 7F 1B 78 */ mr r31, r3 -/* 8059CAA0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8059CAA4 38 81 00 0C */ addi r4, r1, 0xc -/* 8059CAA8 38 A1 00 08 */ addi r5, r1, 8 -/* 8059CAAC 4B AB E8 4D */ bl dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf -/* 8059CAB0 A8 1F 07 66 */ lha r0, 0x766(r31) -/* 8059CAB4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059CAB8 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8059CABC 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8059CAC0 7C 23 04 2E */ lfsx f1, r3, r0 -/* 8059CAC4 3C 60 80 5A */ lis r3, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059CAC8 38 63 DE 7C */ addi r3, r3, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059CACC C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 8059CAD0 EC 40 00 72 */ fmuls f2, f0, f1 -/* 8059CAD4 C0 21 00 08 */ lfs f1, 8(r1) -/* 8059CAD8 C0 03 00 00 */ lfs f0, 0(r3) -/* 8059CADC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CAE0 EC 22 00 2A */ fadds f1, f2, f0 -/* 8059CAE4 3C 60 80 5A */ lis r3, lit_3699@ha /* 0x8059DEBC@ha */ -/* 8059CAE8 C0 03 DE BC */ lfs f0, lit_3699@l(r3) /* 0x8059DEBC@l */ -/* 8059CAEC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059CAF0 40 80 00 08 */ bge lbl_8059CAF8 -/* 8059CAF4 FC 20 00 90 */ fmr f1, f0 -lbl_8059CAF8: -/* 8059CAF8 A8 1F 07 64 */ lha r0, 0x764(r31) -/* 8059CAFC 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059CB00 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8059CB04 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8059CB08 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8059CB0C EC 21 00 32 */ fmuls f1, f1, f0 -/* 8059CB10 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8059CB14 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CB18 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CB1C D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8059CB20 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8059CB24 B0 1F 07 4E */ sth r0, 0x74e(r31) -/* 8059CB28 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8059CB2C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CB30 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CB34 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 8059CB38 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059CB3C B0 1F 07 50 */ sth r0, 0x750(r31) -/* 8059CB40 A8 1F 07 66 */ lha r0, 0x766(r31) -/* 8059CB44 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059CB48 7C 23 04 2E */ lfsx f1, r3, r0 -/* 8059CB4C 3C 60 80 5A */ lis r3, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059CB50 38 63 DE 7C */ addi r3, r3, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059CB54 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 8059CB58 EC 40 00 72 */ fmuls f2, f0, f1 -/* 8059CB5C C0 63 00 10 */ lfs f3, 0x10(r3) -/* 8059CB60 C0 21 00 08 */ lfs f1, 8(r1) -/* 8059CB64 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8059CB68 EC 00 18 28 */ fsubs f0, f0, f3 -/* 8059CB6C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CB70 EC 03 00 2A */ fadds f0, f3, f0 -/* 8059CB74 EC 22 00 2A */ fadds f1, f2, f0 -/* 8059CB78 3C 60 80 5A */ lis r3, lit_3699@ha /* 0x8059DEBC@ha */ -/* 8059CB7C C0 03 DE BC */ lfs f0, lit_3699@l(r3) /* 0x8059DEBC@l */ -/* 8059CB80 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8059CB84 40 80 00 08 */ bge lbl_8059CB8C -/* 8059CB88 FC 20 00 90 */ fmr f1, f0 -lbl_8059CB8C: -/* 8059CB8C A8 1F 07 64 */ lha r0, 0x764(r31) -/* 8059CB90 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059CB94 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8059CB98 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8059CB9C 7C 03 04 2E */ lfsx f0, r3, r0 -/* 8059CBA0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8059CBA4 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8059CBA8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CBAC FC 00 00 1E */ fctiwz f0, f0 -/* 8059CBB0 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 8059CBB4 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8059CBB8 B0 1F 07 54 */ sth r0, 0x754(r31) -/* 8059CBBC C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8059CBC0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CBC4 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CBC8 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8059CBCC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8059CBD0 B0 1F 07 56 */ sth r0, 0x756(r31) -/* 8059CBD4 A8 BF 07 64 */ lha r5, 0x764(r31) -/* 8059CBD8 3C 60 80 5A */ lis r3, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059CBDC 38 83 DE 7C */ addi r4, r3, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059CBE0 C0 44 00 18 */ lfs f2, 0x18(r4) -/* 8059CBE4 C0 21 00 08 */ lfs f1, 8(r1) -/* 8059CBE8 C0 04 00 14 */ lfs f0, 0x14(r4) -/* 8059CBEC EC 00 10 28 */ fsubs f0, f0, f2 -/* 8059CBF0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8059CBF4 EC 02 00 2A */ fadds f0, f2, f0 -/* 8059CBF8 FC 00 00 1E */ fctiwz f0, f0 -/* 8059CBFC D8 01 00 38 */ stfd f0, 0x38(r1) -/* 8059CC00 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 8059CC04 7C 05 02 14 */ add r0, r5, r0 -/* 8059CC08 B0 1F 07 64 */ sth r0, 0x764(r31) -/* 8059CC0C A8 7F 07 66 */ lha r3, 0x766(r31) -/* 8059CC10 A8 04 00 3A */ lha r0, 0x3a(r4) -/* 8059CC14 7C 03 02 14 */ add r0, r3, r0 -/* 8059CC18 B0 1F 07 66 */ sth r0, 0x766(r31) -/* 8059CC1C 7F E3 FB 78 */ mr r3, r31 -/* 8059CC20 48 00 08 35 */ bl setNewLeaf__15daObjYobikusa_cFv -/* 8059CC24 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/* 8059CC28 4B AE 7A 31 */ bl ChkCoHit__12dCcD_GObjInfFv -/* 8059CC2C 28 03 00 00 */ cmplwi r3, 0 -/* 8059CC30 41 82 00 10 */ beq lbl_8059CC40 -/* 8059CC34 7F E3 FB 78 */ mr r3, r31 -/* 8059CC38 38 80 00 01 */ li r4, 1 -/* 8059CC3C 4B FF FD BD */ bl setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e -lbl_8059CC40: -/* 8059CC40 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 8059CC44 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8059CC48 7C 08 03 A6 */ mtlr r0 -/* 8059CC4C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8059CC50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/execute__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/execute__15daObjYobikusa_cFv.s deleted file mode 100644 index 6307bbff3b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/execute__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,164 +0,0 @@ -lbl_8059D738: -/* 8059D738 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8059D73C 7C 08 02 A6 */ mflr r0 -/* 8059D740 90 01 00 34 */ stw r0, 0x34(r1) -/* 8059D744 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8059D748 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8059D74C 7C 7F 1B 78 */ mr r31, r3 -/* 8059D750 80 63 05 68 */ lwz r3, 0x568(r3) -/* 8059D754 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 8059D758 7C 03 00 40 */ cmplw r3, r0 -/* 8059D75C 40 82 00 50 */ bne lbl_8059D7AC -/* 8059D760 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8059D764 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8059D768 40 82 00 24 */ bne lbl_8059D78C -/* 8059D76C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D770 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D774 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8059D778 28 00 00 00 */ cmplwi r0, 0 -/* 8059D77C 41 82 00 28 */ beq lbl_8059D7A4 -/* 8059D780 A0 1F 00 F8 */ lhz r0, 0xf8(r31) -/* 8059D784 28 00 00 01 */ cmplwi r0, 1 -/* 8059D788 41 82 00 1C */ beq lbl_8059D7A4 -lbl_8059D78C: -/* 8059D78C 80 1F 05 6C */ lwz r0, 0x56c(r31) -/* 8059D790 90 1F 05 68 */ stw r0, 0x568(r31) -/* 8059D794 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 8059D798 60 00 00 80 */ ori r0, r0, 0x80 -/* 8059D79C 90 1F 04 9C */ stw r0, 0x49c(r31) -/* 8059D7A0 48 00 00 0C */ b lbl_8059D7AC -lbl_8059D7A4: -/* 8059D7A4 38 60 00 01 */ li r3, 1 -/* 8059D7A8 48 00 01 E0 */ b lbl_8059D988 -lbl_8059D7AC: -/* 8059D7AC 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/* 8059D7B0 4B AE 6C B1 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 8059D7B4 28 03 00 00 */ cmplwi r3, 0 -/* 8059D7B8 41 82 01 80 */ beq lbl_8059D938 -/* 8059D7BC 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 8059D7C0 90 1F 05 68 */ stw r0, 0x568(r31) -/* 8059D7C4 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 8059D7C8 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 8059D7CC 90 1F 04 9C */ stw r0, 0x49c(r31) -/* 8059D7D0 80 1F 05 5C */ lwz r0, 0x55c(r31) -/* 8059D7D4 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 8059D7D8 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 8059D7DC 88 1F 04 99 */ lbz r0, 0x499(r31) -/* 8059D7E0 54 00 06 7F */ clrlwi. r0, r0, 0x19 -/* 8059D7E4 40 82 00 A8 */ bne lbl_8059D88C -/* 8059D7E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D7EC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D7F0 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 8059D7F4 38 80 00 00 */ li r4, 0 -/* 8059D7F8 90 81 00 08 */ stw r4, 8(r1) -/* 8059D7FC 38 00 FF FF */ li r0, -1 -/* 8059D800 90 01 00 0C */ stw r0, 0xc(r1) -/* 8059D804 90 81 00 10 */ stw r4, 0x10(r1) -/* 8059D808 90 81 00 14 */ stw r4, 0x14(r1) -/* 8059D80C 90 81 00 18 */ stw r4, 0x18(r1) -/* 8059D810 38 80 00 00 */ li r4, 0 -/* 8059D814 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008347@ha */ -/* 8059D818 38 A5 83 47 */ addi r5, r5, 0x8347 /* 0x00008347@l */ -/* 8059D81C 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 8059D820 38 E0 00 00 */ li r7, 0 -/* 8059D824 39 00 00 00 */ li r8, 0 -/* 8059D828 39 20 00 00 */ li r9, 0 -/* 8059D82C 39 40 00 FF */ li r10, 0xff -/* 8059D830 3D 60 80 5A */ lis r11, lit_3778@ha /* 0x8059DED8@ha */ -/* 8059D834 C0 2B DE D8 */ lfs f1, lit_3778@l(r11) /* 0x8059DED8@l */ -/* 8059D838 4B AA F2 59 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8059D83C 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 8059D840 38 80 00 00 */ li r4, 0 -/* 8059D844 90 81 00 08 */ stw r4, 8(r1) -/* 8059D848 38 00 FF FF */ li r0, -1 -/* 8059D84C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8059D850 90 81 00 10 */ stw r4, 0x10(r1) -/* 8059D854 90 81 00 14 */ stw r4, 0x14(r1) -/* 8059D858 90 81 00 18 */ stw r4, 0x18(r1) -/* 8059D85C 38 80 00 00 */ li r4, 0 -/* 8059D860 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008348@ha */ -/* 8059D864 38 A5 83 48 */ addi r5, r5, 0x8348 /* 0x00008348@l */ -/* 8059D868 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 8059D86C 38 E0 00 00 */ li r7, 0 -/* 8059D870 39 00 00 00 */ li r8, 0 -/* 8059D874 39 20 00 00 */ li r9, 0 -/* 8059D878 39 40 00 FF */ li r10, 0xff -/* 8059D87C 3D 60 80 5A */ lis r11, lit_3778@ha /* 0x8059DED8@ha */ -/* 8059D880 C0 2B DE D8 */ lfs f1, lit_3778@l(r11) /* 0x8059DED8@l */ -/* 8059D884 4B AA F2 0D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8059D888 48 00 00 F4 */ b lbl_8059D97C -lbl_8059D88C: -/* 8059D88C 2C 00 00 01 */ cmpwi r0, 1 -/* 8059D890 40 82 00 EC */ bne lbl_8059D97C -/* 8059D894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D898 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D89C 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 8059D8A0 38 80 00 00 */ li r4, 0 -/* 8059D8A4 90 81 00 08 */ stw r4, 8(r1) -/* 8059D8A8 38 00 FF FF */ li r0, -1 -/* 8059D8AC 90 01 00 0C */ stw r0, 0xc(r1) -/* 8059D8B0 90 81 00 10 */ stw r4, 0x10(r1) -/* 8059D8B4 90 81 00 14 */ stw r4, 0x14(r1) -/* 8059D8B8 90 81 00 18 */ stw r4, 0x18(r1) -/* 8059D8BC 38 80 00 00 */ li r4, 0 -/* 8059D8C0 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008349@ha */ -/* 8059D8C4 38 A5 83 49 */ addi r5, r5, 0x8349 /* 0x00008349@l */ -/* 8059D8C8 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 8059D8CC 38 E0 00 00 */ li r7, 0 -/* 8059D8D0 39 00 00 00 */ li r8, 0 -/* 8059D8D4 39 20 00 00 */ li r9, 0 -/* 8059D8D8 39 40 00 FF */ li r10, 0xff -/* 8059D8DC 3D 60 80 5A */ lis r11, lit_3778@ha /* 0x8059DED8@ha */ -/* 8059D8E0 C0 2B DE D8 */ lfs f1, lit_3778@l(r11) /* 0x8059DED8@l */ -/* 8059D8E4 4B AA F1 AD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8059D8E8 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 8059D8EC 38 80 00 00 */ li r4, 0 -/* 8059D8F0 90 81 00 08 */ stw r4, 8(r1) -/* 8059D8F4 38 00 FF FF */ li r0, -1 -/* 8059D8F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8059D8FC 90 81 00 10 */ stw r4, 0x10(r1) -/* 8059D900 90 81 00 14 */ stw r4, 0x14(r1) -/* 8059D904 90 81 00 18 */ stw r4, 0x18(r1) -/* 8059D908 38 80 00 00 */ li r4, 0 -/* 8059D90C 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000834A@ha */ -/* 8059D910 38 A5 83 4A */ addi r5, r5, 0x834A /* 0x0000834A@l */ -/* 8059D914 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 8059D918 38 E0 00 00 */ li r7, 0 -/* 8059D91C 39 00 00 00 */ li r8, 0 -/* 8059D920 39 20 00 00 */ li r9, 0 -/* 8059D924 39 40 00 FF */ li r10, 0xff -/* 8059D928 3D 60 80 5A */ lis r11, lit_3778@ha /* 0x8059DED8@ha */ -/* 8059D92C C0 2B DE D8 */ lfs f1, lit_3778@l(r11) /* 0x8059DED8@l */ -/* 8059D930 4B AA F1 61 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 8059D934 48 00 00 48 */ b lbl_8059D97C -lbl_8059D938: -/* 8059D938 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 8059D93C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 8059D940 41 82 00 10 */ beq lbl_8059D950 -/* 8059D944 7F E3 FB 78 */ mr r3, r31 -/* 8059D948 38 80 00 02 */ li r4, 2 -/* 8059D94C 4B FF F0 AD */ bl setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e -lbl_8059D950: -/* 8059D950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D958 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8059D95C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8059D960 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8059D964 38 00 00 2A */ li r0, 0x2a -/* 8059D968 41 82 00 08 */ beq lbl_8059D970 -/* 8059D96C 38 00 00 49 */ li r0, 0x49 -lbl_8059D970: -/* 8059D970 98 1F 05 48 */ stb r0, 0x548(r31) -/* 8059D974 7F E3 FB 78 */ mr r3, r31 -/* 8059D978 4B FF F0 DD */ bl callExecute__15daObjYobikusa_cFv -lbl_8059D97C: -/* 8059D97C 7F E3 FB 78 */ mr r3, r31 -/* 8059D980 4B FF FA 01 */ bl setCcCylinder__15daObjYobikusa_cFv -/* 8059D984 38 60 00 01 */ li r3, 1 -lbl_8059D988: -/* 8059D988 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8059D98C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8059D990 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8059D994 7C 08 03 A6 */ mtlr r0 -/* 8059D998 38 21 00 30 */ addi r1, r1, 0x30 -/* 8059D99C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE60.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE60.s deleted file mode 100644 index 660f482150..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE60.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8059DE60: -/* 8059DE60 38 63 FF DC */ addi r3, r3, -36 -/* 8059DE64 4B FF F1 DC */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE68.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE68.s deleted file mode 100644 index 3161191517..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE68.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8059DE68: -/* 8059DE68 38 63 FF EC */ addi r3, r3, -20 -/* 8059DE6C 4B FF F1 D4 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointAngle__15daObjYobikusa_cFP5csXyzi.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointAngle__15daObjYobikusa_cFP5csXyzi.s deleted file mode 100644 index 1f7cf17e4c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointAngle__15daObjYobikusa_cFP5csXyzi.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8059D198: -/* 8059D198 1C 05 00 06 */ mulli r0, r5, 6 -/* 8059D19C 7C 63 02 14 */ add r3, r3, r0 -/* 8059D1A0 A8 03 07 4C */ lha r0, 0x74c(r3) -/* 8059D1A4 B0 04 00 00 */ sth r0, 0(r4) -/* 8059D1A8 A8 03 07 4E */ lha r0, 0x74e(r3) -/* 8059D1AC B0 04 00 02 */ sth r0, 2(r4) -/* 8059D1B0 A8 03 07 50 */ lha r0, 0x750(r3) -/* 8059D1B4 B0 04 00 04 */ sth r0, 4(r4) -/* 8059D1B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointScale__15daObjYobikusa_cFi.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointScale__15daObjYobikusa_cFi.s deleted file mode 100644 index a45977bc01..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointScale__15daObjYobikusa_cFi.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8059D1BC: -/* 8059D1BC C0 23 07 40 */ lfs f1, 0x740(r3) -/* 8059D1C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initBaseMtx__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initBaseMtx__15daObjYobikusa_cFv.s deleted file mode 100644 index 65caf870cd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initBaseMtx__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8059D120: -/* 8059D120 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D124 7C 08 02 A6 */ mflr r0 -/* 8059D128 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D12C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D130 7C 7F 1B 78 */ mr r31, r3 -/* 8059D134 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8059D138 4B A6 FC 2D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 8059D13C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D140 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D144 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8059D148 4B A6 F2 ED */ bl mDoMtx_YrotM__FPA4_fs -/* 8059D14C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D150 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D154 80 9F 05 6C */ lwz r4, 0x56c(r31) -/* 8059D158 38 84 00 24 */ addi r4, r4, 0x24 -/* 8059D15C 4B DA 93 55 */ bl PSMTXCopy -/* 8059D160 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D164 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D168 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 8059D16C 38 84 00 24 */ addi r4, r4, 0x24 -/* 8059D170 4B DA 93 41 */ bl PSMTXCopy -/* 8059D174 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D178 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D17C 38 9F 05 74 */ addi r4, r31, 0x574 -/* 8059D180 4B DA 93 31 */ bl PSMTXCopy -/* 8059D184 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059D188 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D18C 7C 08 03 A6 */ mtlr r0 -/* 8059D190 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D194 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initCcCylinder__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initCcCylinder__15daObjYobikusa_cFv.s deleted file mode 100644 index 303e923f1b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initCcCylinder__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8059D320: -/* 8059D320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D324 7C 08 02 A6 */ mflr r0 -/* 8059D328 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D32C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D330 7C 7F 1B 78 */ mr r31, r3 -/* 8059D334 38 7F 05 B4 */ addi r3, r31, 0x5b4 -/* 8059D338 38 80 00 FF */ li r4, 0xff -/* 8059D33C 38 A0 00 FF */ li r5, 0xff -/* 8059D340 7F E6 FB 78 */ mr r6, r31 -/* 8059D344 4B AE 65 1D */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 8059D348 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/* 8059D34C 3C 80 80 5A */ lis r4, ccCylSrc@ha /* 0x8059DEE0@ha */ -/* 8059D350 38 84 DE E0 */ addi r4, r4, ccCylSrc@l /* 0x8059DEE0@l */ -/* 8059D354 4B AE 75 61 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 8059D358 38 1F 05 B4 */ addi r0, r31, 0x5b4 -/* 8059D35C 90 1F 06 34 */ stw r0, 0x634(r31) -/* 8059D360 38 7F 07 14 */ addi r3, r31, 0x714 -/* 8059D364 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8059D368 4B CD 1E 75 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8059D36C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059D370 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D374 7C 08 03 A6 */ mtlr r0 -/* 8059D378 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D37C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPickLeaf__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPickLeaf__15daObjYobikusa_cFv.s deleted file mode 100644 index 8e9a5e84b2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPickLeaf__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8059CD44: -/* 8059CD44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059CD48 7C 08 02 A6 */ mflr r0 -/* 8059CD4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059CD50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059CD54 7C 7F 1B 78 */ mr r31, r3 -/* 8059CD58 38 00 00 02 */ li r0, 2 -/* 8059CD5C 90 03 05 B0 */ stw r0, 0x5b0(r3) -/* 8059CD60 4B A7 FE 41 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c -/* 8059CD64 7F E3 FB 78 */ mr r3, r31 -/* 8059CD68 48 00 06 4D */ bl toPickLeaf__15daObjYobikusa_cFv -/* 8059CD6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059CD70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059CD74 7C 08 03 A6 */ mtlr r0 -/* 8059CD78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059CD7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPushDown__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPushDown__15daObjYobikusa_cFv.s deleted file mode 100644 index 4166e8acde..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPushDown__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8059CC54: -/* 8059CC54 38 00 00 01 */ li r0, 1 -/* 8059CC58 90 03 05 B0 */ stw r0, 0x5b0(r3) -/* 8059CC5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initSwingWind__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initSwingWind__15daObjYobikusa_cFv.s deleted file mode 100644 index 957e7dd1a0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initSwingWind__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8059CA80: -/* 8059CA80 38 00 00 00 */ li r0, 0 -/* 8059CA84 90 03 05 B0 */ stw r0, 0x5b0(r3) -/* 8059CA88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/nodeCallBack__FP8J3DJointi.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/nodeCallBack__FP8J3DJointi.s deleted file mode 100644 index bedcff8f10..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/nodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_8059D1C4: -/* 8059D1C4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8059D1C8 7C 08 02 A6 */ mflr r0 -/* 8059D1CC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8059D1D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059D1D4 4B DC 50 05 */ bl _savegpr_28 -/* 8059D1D8 2C 04 00 00 */ cmpwi r4, 0 -/* 8059D1DC 41 82 00 0C */ beq lbl_8059D1E8 -/* 8059D1E0 38 60 00 01 */ li r3, 1 -/* 8059D1E4 48 00 00 E8 */ b lbl_8059D2CC -lbl_8059D1E8: -/* 8059D1E8 A0 83 00 14 */ lhz r4, 0x14(r3) -/* 8059D1EC 7C 9D 23 78 */ mr r29, r4 -/* 8059D1F0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8059D1F4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8059D1F8 83 E3 00 38 */ lwz r31, 0x38(r3) -/* 8059D1FC 83 9F 00 14 */ lwz r28, 0x14(r31) -/* 8059D200 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 8059D204 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8059D208 1F C4 00 30 */ mulli r30, r4, 0x30 -/* 8059D20C 7C 60 F2 14 */ add r3, r0, r30 -/* 8059D210 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D214 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D218 4B DA 92 99 */ bl PSMTXCopy -/* 8059D21C 7F 83 E3 78 */ mr r3, r28 -/* 8059D220 38 81 00 08 */ addi r4, r1, 8 -/* 8059D224 7F A5 EB 78 */ mr r5, r29 -/* 8059D228 4B FF FF 71 */ bl getJointAngle__15daObjYobikusa_cFP5csXyzi -/* 8059D22C A8 81 00 08 */ lha r4, 8(r1) -/* 8059D230 7C 80 07 35 */ extsh. r0, r4 -/* 8059D234 41 82 00 10 */ beq lbl_8059D244 -/* 8059D238 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D23C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D240 4B A6 F1 5D */ bl mDoMtx_XrotM__FPA4_fs -lbl_8059D244: -/* 8059D244 A8 81 00 0C */ lha r4, 0xc(r1) -/* 8059D248 7C 80 07 35 */ extsh. r0, r4 -/* 8059D24C 41 82 00 10 */ beq lbl_8059D25C -/* 8059D250 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D254 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D258 4B A6 F2 75 */ bl mDoMtx_ZrotM__FPA4_fs -lbl_8059D25C: -/* 8059D25C A8 81 00 0A */ lha r4, 0xa(r1) -/* 8059D260 7C 80 07 35 */ extsh. r0, r4 -/* 8059D264 41 82 00 10 */ beq lbl_8059D274 -/* 8059D268 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D26C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D270 4B A6 F1 C5 */ bl mDoMtx_YrotM__FPA4_fs -lbl_8059D274: -/* 8059D274 2C 1D 00 02 */ cmpwi r29, 2 -/* 8059D278 40 82 00 24 */ bne lbl_8059D29C -/* 8059D27C 7F 83 E3 78 */ mr r3, r28 -/* 8059D280 7F A4 EB 78 */ mr r4, r29 -/* 8059D284 4B FF FF 39 */ bl getJointScale__15daObjYobikusa_cFi -/* 8059D288 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8059D28C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8059D290 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 8059D294 38 61 00 10 */ addi r3, r1, 0x10 -/* 8059D298 4B A6 FB D9 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -lbl_8059D29C: -/* 8059D29C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D2A0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D2A4 80 9F 00 84 */ lwz r4, 0x84(r31) -/* 8059D2A8 80 04 00 0C */ lwz r0, 0xc(r4) -/* 8059D2AC 7C 80 F2 14 */ add r4, r0, r30 -/* 8059D2B0 4B DA 92 01 */ bl PSMTXCopy -/* 8059D2B4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8059D2B8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8059D2BC 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 8059D2C0 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 8059D2C4 4B DA 91 ED */ bl PSMTXCopy -/* 8059D2C8 38 60 00 01 */ li r3, 1 -lbl_8059D2CC: -/* 8059D2CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8059D2D0 4B DC 4F 55 */ bl _restgpr_28 -/* 8059D2D4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8059D2D8 7C 08 03 A6 */ mtlr r0 -/* 8059D2DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8059D2E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e.s deleted file mode 100644 index 6172f4f517..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8059C9F8: -/* 8059C9F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059C9FC 7C 08 02 A6 */ mflr r0 -/* 8059CA00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059CA04 1C A4 00 18 */ mulli r5, r4, 0x18 -/* 8059CA08 3C 80 80 5A */ lis r4, ActionTable__15daObjYobikusa_c@ha /* 0x8059DFD8@ha */ -/* 8059CA0C 38 04 DF D8 */ addi r0, r4, ActionTable__15daObjYobikusa_c@l /* 0x8059DFD8@l */ -/* 8059CA10 7C 00 2A 14 */ add r0, r0, r5 -/* 8059CA14 90 03 05 AC */ stw r0, 0x5ac(r3) -/* 8059CA18 48 00 00 15 */ bl callInit__15daObjYobikusa_cFv -/* 8059CA1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059CA20 7C 08 03 A6 */ mtlr r0 -/* 8059CA24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059CA28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setCcCylinder__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setCcCylinder__15daObjYobikusa_cFv.s deleted file mode 100644 index 0c7b579b7d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setCcCylinder__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8059D380: -/* 8059D380 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D384 7C 08 02 A6 */ mflr r0 -/* 8059D388 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D38C 7C 64 1B 78 */ mr r4, r3 -/* 8059D390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D398 38 63 23 3C */ addi r3, r3, 0x233c -/* 8059D39C 38 84 05 F0 */ addi r4, r4, 0x5f0 -/* 8059D3A0 4B CC 78 09 */ bl Set__4cCcSFP8cCcD_Obj -/* 8059D3A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D3A8 7C 08 03 A6 */ mtlr r0 -/* 8059D3AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D3B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setNewLeaf__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setNewLeaf__15daObjYobikusa_cFv.s deleted file mode 100644 index 89a683a416..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setNewLeaf__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8059D454: -/* 8059D454 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8059D458 7C 08 02 A6 */ mflr r0 -/* 8059D45C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8059D460 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8059D464 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8059D468 7C 7E 1B 78 */ mr r30, r3 -/* 8059D46C 3C 60 80 5A */ lis r3, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059D470 3B E3 DE 7C */ addi r31, r3, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059D474 38 7E 07 40 */ addi r3, r30, 0x740 -/* 8059D478 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 8059D47C 38 9F 00 00 */ addi r4, r31, 0 -/* 8059D480 C0 44 00 24 */ lfs f2, 0x24(r4) -/* 8059D484 4B CD 32 BD */ bl cLib_chaseF__FPfff -/* 8059D488 38 9F 00 00 */ addi r4, r31, 0 -/* 8059D48C C0 04 00 28 */ lfs f0, 0x28(r4) -/* 8059D490 D0 1E 07 44 */ stfs f0, 0x744(r30) -/* 8059D494 A8 1E 07 68 */ lha r0, 0x768(r30) -/* 8059D498 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 8059D49C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 8059D4A0 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8059D4A4 7C 23 04 2E */ lfsx f1, r3, r0 -/* 8059D4A8 C0 1E 07 44 */ lfs f0, 0x744(r30) -/* 8059D4AC EC 00 00 72 */ fmuls f0, f0, f1 -/* 8059D4B0 FC 00 00 1E */ fctiwz f0, f0 -/* 8059D4B4 D8 01 00 08 */ stfd f0, 8(r1) -/* 8059D4B8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8059D4BC B0 1E 07 58 */ sth r0, 0x758(r30) -/* 8059D4C0 A8 7E 07 68 */ lha r3, 0x768(r30) -/* 8059D4C4 A8 04 00 3C */ lha r0, 0x3c(r4) -/* 8059D4C8 7C 03 02 14 */ add r0, r3, r0 -/* 8059D4CC B0 1E 07 68 */ sth r0, 0x768(r30) -/* 8059D4D0 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 8059D4D4 C0 1E 07 40 */ lfs f0, 0x740(r30) -/* 8059D4D8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8059D4DC 40 82 00 28 */ bne lbl_8059D504 -/* 8059D4E0 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 8059D4E4 C0 1E 07 44 */ lfs f0, 0x744(r30) -/* 8059D4E8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8059D4EC 40 82 00 18 */ bne lbl_8059D504 -/* 8059D4F0 80 1E 05 5C */ lwz r0, 0x55c(r30) -/* 8059D4F4 60 00 00 10 */ ori r0, r0, 0x10 -/* 8059D4F8 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 8059D4FC 38 60 00 01 */ li r3, 1 -/* 8059D500 48 00 00 08 */ b lbl_8059D508 -lbl_8059D504: -/* 8059D504 38 60 00 00 */ li r3, 0 -lbl_8059D508: -/* 8059D508 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8059D50C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8059D510 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8059D514 7C 08 03 A6 */ mtlr r0 -/* 8059D518 38 21 00 20 */ addi r1, r1, 0x20 -/* 8059D51C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/toPickLeaf__15daObjYobikusa_cFv.s b/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/toPickLeaf__15daObjYobikusa_cFv.s deleted file mode 100644 index 8db63c6af1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/toPickLeaf__15daObjYobikusa_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8059D3B4: -/* 8059D3B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8059D3B8 7C 08 02 A6 */ mflr r0 -/* 8059D3BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8059D3C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8059D3C4 7C 7F 1B 78 */ mr r31, r3 -/* 8059D3C8 3C 80 80 5A */ lis r4, M_attr__15daObjYobikusa_c@ha /* 0x8059DE7C@ha */ -/* 8059D3CC 38 84 DE 7C */ addi r4, r4, M_attr__15daObjYobikusa_c@l /* 0x8059DE7C@l */ -/* 8059D3D0 C0 24 00 5C */ lfs f1, 0x5c(r4) -/* 8059D3D4 C0 03 07 40 */ lfs f0, 0x740(r3) -/* 8059D3D8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8059D3DC 40 82 00 60 */ bne lbl_8059D43C -/* 8059D3E0 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 8059D3E4 D0 1F 07 40 */ stfs f0, 0x740(r31) -/* 8059D3E8 38 84 00 00 */ addi r4, r4, 0 -/* 8059D3EC C0 04 00 28 */ lfs f0, 0x28(r4) -/* 8059D3F0 D0 1F 07 44 */ stfs f0, 0x744(r31) -/* 8059D3F4 38 00 00 00 */ li r0, 0 -/* 8059D3F8 B0 1F 07 68 */ sth r0, 0x768(r31) -/* 8059D3FC C0 04 00 30 */ lfs f0, 0x30(r4) -/* 8059D400 D0 1F 07 48 */ stfs f0, 0x748(r31) -/* 8059D404 B0 1F 07 6A */ sth r0, 0x76a(r31) -/* 8059D408 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8059D40C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8059D410 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 8059D414 4B A7 D2 FD */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8059D418 B0 7F 07 6C */ sth r3, 0x76c(r31) -/* 8059D41C A8 7F 07 6C */ lha r3, 0x76c(r31) -/* 8059D420 38 03 E0 00 */ addi r0, r3, -8192 -/* 8059D424 B0 1F 07 6C */ sth r0, 0x76c(r31) -/* 8059D428 80 1F 05 5C */ lwz r0, 0x55c(r31) -/* 8059D42C 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 8059D430 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 8059D434 38 60 00 01 */ li r3, 1 -/* 8059D438 48 00 00 08 */ b lbl_8059D440 -lbl_8059D43C: -/* 8059D43C 38 60 00 00 */ li r3, 0 -lbl_8059D440: -/* 8059D440 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8059D444 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8059D448 7C 08 03 A6 */ mtlr r0 -/* 8059D44C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8059D450 4E 80 00 20 */ blr diff --git a/include/d/kankyo/d_kankyo_wether.h b/include/d/kankyo/d_kankyo_wether.h index bf4dabd49a..6fc28997a9 100644 --- a/include/d/kankyo/d_kankyo_wether.h +++ b/include/d/kankyo/d_kankyo_wether.h @@ -28,7 +28,7 @@ void dKyw_evt_wind_set(s16 angleX, s16 angleY); void dKyw_custom_windpower(f32 pow); void dKyw_evt_wind_set_go(); void dKyw_wether_proc(); -void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* param_1, f32* param_2); +void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power); void dKyw_pntwind_cut(WIND_INFLUENCE* i_pntwind); cXyz dKyw_pntwind_get_vecpow(cXyz* param_0); diff --git a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h index d1e5259065..4a4159a352 100644 --- a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h +++ b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h @@ -1,15 +1,48 @@ #ifndef D_A_OBJ_YOBIKUSA_H #define D_A_OBJ_YOBIKUSA_H -#include "d/com/d_com_inf_game.h" +#include "d/cc/d_cc_d.h" #include "f_op/f_op_actor_mng.h" -class daObjYobikusa_c; -typedef void (daObjYobikusa_c::*actionFunc)(); - class daObjYobikusa_c : public fopAc_ac_c { public: - enum Mode_e {}; + enum Mode_e { + /* 0 */ MODE_SWING_WIND, + /* 1 */ MODE_PUSH_DOWN, + /* 2 */ MODE_PICK_LEAF, + }; + + enum CallType_e { + /* 0 */ CALL_TYPE_FLY, + /* 1 */ CALL_TYPE_HORSE, + }; + + typedef void (daObjYobikusa_c::*actionFunc)(); + typedef struct actionFuncEntry { + actionFunc initFn; + actionFunc execFn; + }; + + typedef struct attributes { + /* 0x00 */ f32 field_0x00; + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 mJointScaleStep; + /* 0x28 */ f32 mNewLeafInitialAmplitude; + /* 0x2C */ f32 field_0x2c; // Unused? + /* 0x30 */ f32 mPickLeafInitialAmplitude; + /* 0x34 */ f32 mPickLeafAmplitudeDecay; + /* 0x38 */ s16 field_0x38; // Unused? + /* 0x3A */ s16 field_0x3a; + /* 0x3C */ s16 mNewLeafTickSpeed; + /* 0x3E */ s16 mPickLeafTickSpeed; + }; /* 8059C9F8 */ void setAction(daObjYobikusa_c::Mode_e); /* 8059CA2C */ void callInit(); @@ -23,42 +56,50 @@ public: /* 8059CE7C */ void create_init(); /* 8059D120 */ void initBaseMtx(); /* 8059D198 */ void getJointAngle(csXyz*, int); - /* 8059D1BC */ void getJointScale(int); + /* 8059D1BC */ f32 getJointScale(int); /* 8059D320 */ void initCcCylinder(); /* 8059D380 */ void setCcCylinder(); - /* 8059D3B4 */ void toPickLeaf(); - /* 8059D454 */ void setNewLeaf(); - /* 8059D738 */ void execute(); + /* 8059D3B4 */ bool toPickLeaf(); + /* 8059D454 */ bool setNewLeaf(); + /* 8059D738 */ int execute(); - static u8 const M_attr[64]; - static u8 ActionTable[72]; + inline int createHeap(); + inline int draw(); + inline cPhs__Step create(); + inline ~daObjYobikusa_c(); + static attributes const M_attr; + static actionFuncEntry ActionTable[3]; + + const attributes* attr() const { return &M_attr; } int getType() { return subtype & 0x7F; } u8 getPathID() { return fopAcM_GetParam(this); } bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; } private: - /* 0x568 */ J3DModel* field_0x568; - /* 0x56C */ J3DModel* field_0x56c; - /* 0x570 */ J3DModel* field_0x570; - /* 0x574 */ Mtx field_0x574; + /* 0x568 */ J3DModel* mpActiveModel; + /* 0x56C */ J3DModel* mpModelTypeA; + /* 0x570 */ J3DModel* mpModelTypeB; + /* 0x574 */ Mtx mMtx; /* 0x5A4 */ request_of_phase_process_class mPhase; - /* 0x5AC */ void* field_0x5ac; - /* 0x5B0 */ int field_0x5b0; + /* 0x5AC */ actionFuncEntry* mActionEntry; + /* 0x5B0 */ int mMode; /* 0x5B4 */ dCcD_Stts mStts; /* 0x5F0 */ dCcD_Cyl mCcCyl; - /* 0x72C */ cBgS_PolyInfo field_0x72c; - /* 0x73C */ f32 field_0x73c; + /* 0x72C */ cBgS_PolyInfo mPolyInfo; + /* 0x73C */ f32 mGroundH; /* 0x740 */ f32 mJointScale; - /* 0x744 */ f32 field_0x744; - /* 0x748 */ f32 field_0x748; - /* 0x74C */ csXyz field_0x74c[3]; + /* 0x744 */ f32 mNewLeafAmplitude; + /* 0x748 */ f32 mPickLeafAmplitude; + /* 0x74C */ csXyz mLeafAngles[3]; /* 0x760 */ char* mResName; /* 0x764 */ s16 field_0x764; /* 0x766 */ s16 field_0x766; - /* 0x768 */ s16 field_0x768; - /* 0x76A */ s16 field_0x76a; - /* 0x76C */ s16 field_0x76c; -}; + /* 0x768 */ s16 mNewLeafTick; + /* 0x76A */ s16 mPickLeafTick; + /* 0x76C */ s16 mPlayerDeltaAngle; +}; // Size: 0x770 + +STATIC_ASSERT(sizeof(daObjYobikusa_c) == 0x770); #endif /* D_A_OBJ_YOBIKUSA_H */ diff --git a/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp b/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp index 85a4f6c5c6..6bd43079b4 100644 --- a/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp +++ b/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp @@ -1,135 +1,28 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_yobikusa +// d_a_obj_yobikusa.cpp +// Obj - Call grass // #include "rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h" -#include "dol2asm.h" -// -// Forward References: -// - -extern "C" void setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e(); -extern "C" void callInit__15daObjYobikusa_cFv(); -extern "C" void callExecute__15daObjYobikusa_cFv(); -extern "C" void initSwingWind__15daObjYobikusa_cFv(); -extern "C" void executeSwingWind__15daObjYobikusa_cFv(); -extern "C" void initPushDown__15daObjYobikusa_cFv(); -extern "C" void executePushDown__15daObjYobikusa_cFv(); -extern "C" void initPickLeaf__15daObjYobikusa_cFv(); -extern "C" void executePickLeaf__15daObjYobikusa_cFv(); -extern "C" void create_init__15daObjYobikusa_cFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void initBaseMtx__15daObjYobikusa_cFv(); -extern "C" void getJointAngle__15daObjYobikusa_cFP5csXyzi(); -extern "C" void getJointScale__15daObjYobikusa_cFi(); -extern "C" static void nodeCallBack__FP8J3DJointi(); -extern "C" void __dt__5csXyzFv(); -extern "C" void initCcCylinder__15daObjYobikusa_cFv(); -extern "C" void setCcCylinder__15daObjYobikusa_cFv(); -extern "C" void toPickLeaf__15daObjYobikusa_cFv(); -extern "C" void setNewLeaf__15daObjYobikusa_cFv(); -extern "C" static void createSolidHeap__FP10fopAc_ac_c(); -extern "C" static void daObjYobikusa_Draw__FP15daObjYobikusa_c(); -extern "C" static void daObjYobikusa_Execute__FP15daObjYobikusa_c(); -extern "C" void execute__15daObjYobikusa_cFv(); -extern "C" static bool daObjYobikusa_IsDelete__FP15daObjYobikusa_c(); -extern "C" static void daObjYobikusa_Delete__FP15daObjYobikusa_c(); -extern "C" static void daObjYobikusa_Create__FP10fopAc_ac_c(); -extern "C" void __ct__5csXyzFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __sinit_d_a_obj_yobikusa_cpp(); -extern "C" static void func_8059DE60(); -extern "C" static void func_8059DE68(); -extern "C" u8 const M_attr__15daObjYobikusa_c[64]; -extern "C" extern char const* const d_a_obj_yobikusa__stringBase0; -extern "C" u8 ActionTable__15daObjYobikusa_c[72]; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_cancelCarryNow__FP10fopAc_ac_c(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void ChkCoHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void cM_rnd__Fv(); -extern "C" void __ct__13cBgS_PolyInfoFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void __dl__FPv(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mCurrentMtx__6J3DSys[48]; -extern "C" u8 sincosTable___5JMath[65536]; +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" // // Declarations: // /* 8059DF68-8059DF74 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, }; /* 8059DF74-8059DF88 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, @@ -140,625 +33,462 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 8059DF88-8059DF8C -00001 0004+00 1/1 0/0 0/0 .data l_arcName1 */ -SECTION_DATA static const char* l_arcName1 = "J_Tobi"; +static const char* l_arcName1 = "J_Tobi"; /* 8059DF8C-8059DF90 -00001 0004+00 1/1 0/0 0/0 .data l_arcName2 */ -SECTION_DATA static const char* l_arcName2 = "J_Umak"; +static const char* l_arcName2 = "J_Umak"; -/* 8059DF90-8059DF9C -00001 000C+00 0/1 0/0 0/0 .data @3641 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3641[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initSwingWind__15daObjYobikusa_cFv, +daObjYobikusa_c::actionFuncEntry daObjYobikusa_c::ActionTable[] = { + {&daObjYobikusa_c::initSwingWind, &daObjYobikusa_c::executeSwingWind}, + {&daObjYobikusa_c::initPushDown, &daObjYobikusa_c::executePushDown}, + {&daObjYobikusa_c::initPickLeaf, &daObjYobikusa_c::executePickLeaf}, }; -#pragma pop - -/* 8059DF9C-8059DFA8 -00001 000C+00 0/1 0/0 0/0 .data @3642 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3642[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executeSwingWind__15daObjYobikusa_cFv, -}; -#pragma pop - -/* 8059DFA8-8059DFB4 -00001 000C+00 0/1 0/0 0/0 .data @3643 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3643[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initPushDown__15daObjYobikusa_cFv, -}; -#pragma pop - -/* 8059DFB4-8059DFC0 -00001 000C+00 0/1 0/0 0/0 .data @3644 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3644[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executePushDown__15daObjYobikusa_cFv, -}; -#pragma pop - -/* 8059DFC0-8059DFCC -00001 000C+00 0/1 0/0 0/0 .data @3645 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3645[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)initPickLeaf__15daObjYobikusa_cFv, -}; -#pragma pop - -/* 8059DFCC-8059DFD8 -00001 000C+00 0/1 0/0 0/0 .data @3646 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3646[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)executePickLeaf__15daObjYobikusa_cFv, -}; -#pragma pop - -/* 8059DFD8-8059E020 000070 0048+00 1/2 0/0 0/0 .data ActionTable__15daObjYobikusa_c */ -SECTION_DATA u8 daObjYobikusa_c::ActionTable[72] = { - 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, -}; - -/* SECTION_DATA actionFunc daObjYobikusa_c::ActionTable[72] = { - &daObjYobikusa_c::initSwingWind, - &daObjYobikusa_c::executeSwingWind, - &daObjYobikusa_c::initPushDown, - &daObjYobikusa_c::executePushDown, - &daObjYobikusa_c::initPickLeaf, - &daObjYobikusa_c::executePickLeaf, -}; */ /* 8059C9F8-8059CA2C 000078 0034+00 5/5 0/0 0/0 .text * setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::setAction(daObjYobikusa_c::Mode_e param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e.s" +void daObjYobikusa_c::setAction(daObjYobikusa_c::Mode_e i_mode) { + mActionEntry = &ActionTable[i_mode]; + callInit(); } -#pragma pop /* 8059CA2C-8059CA54 0000AC 0028+00 1/1 0/0 0/0 .text callInit__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::callInit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callInit__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::callInit() { + (this->*(mActionEntry->initFn))(); } -#pragma pop /* 8059CA54-8059CA80 0000D4 002C+00 1/1 0/0 0/0 .text callExecute__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::callExecute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/callExecute__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::callExecute() { + (this->*(mActionEntry->execFn))(); } -#pragma pop /* 8059CA80-8059CA8C 000100 000C+00 1/0 0/0 0/0 .text initSwingWind__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::initSwingWind() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initSwingWind__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::initSwingWind() { + mMode = MODE_SWING_WIND; } -#pragma pop -/* ############################################################################################## */ -/* 8059DE7C-8059DEBC 000000 0040+00 6/6 0/0 0/0 .rodata M_attr__15daObjYobikusa_c */ -SECTION_RODATA u8 const daObjYobikusa_c::M_attr[64] = { - 0x44, 0x7A, 0x00, 0x00, 0x45, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xBB, 0x80, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x44, 0x90, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, - 0x43, 0xC8, 0x00, 0x00, 0x3C, 0xA3, 0xD7, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x45, 0x9C, 0x40, 0x00, 0x43, 0x16, 0x00, 0x00, 0x04, 0x00, 0x00, 0x40, 0x27, 0x10, 0x19, 0xB6, -}; -COMPILER_STRIP_GATE(0x8059DE7C, &daObjYobikusa_c::M_attr); - -/* 8059DEBC-8059DEC0 000040 0004+00 2/5 0/0 0/0 .rodata @3699 */ -SECTION_RODATA static u8 const lit_3699[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8059DEBC, &lit_3699); +daObjYobikusa_c::attributes const daObjYobikusa_c::M_attr = { + 1000.0f, 4000.0f, 0.0f, 1500.0f, 500.0f, 1152.0f, 512.0f, 200.0f, 400.0f, + 0.02f, 0.0f, 0.0f, 5000.0f, 150.0f, 1024, 64, 10000, 6582}; /* 8059CA8C-8059CC54 00010C 01C8+00 1/0 0/0 0/0 .text executeSwingWind__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::executeSwingWind() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executeSwingWind__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::executeSwingWind() { + f32 wind_pow; + cXyz wind_dir; + + dKyw_get_AllWind_vec(¤t.pos, &wind_dir, &wind_pow); + + f32 fVar1 = cM_ssin(field_0x766) * M_attr.field_0x1c + wind_pow * attr()->field_0x00; + if (fVar1 < 0.0f) { + fVar1 = 0.0f; + } + + f32 fVar2 = fVar1 * cM_ssin(field_0x764); + mLeafAngles[0].y = fVar2 * wind_dir.z; + mLeafAngles[0].z = fVar2 * wind_dir.x; + + fVar1 = attr()->field_0x20 * cM_ssin(field_0x766) + + (attr()->field_0x10 + wind_pow * (attr()->field_0x0c - attr()->field_0x10)); + if (fVar1 < 0.0f) { + fVar1 = 0.0f; + } + + fVar2 = fVar1 * cM_ssin(field_0x764); + mLeafAngles[1].y = fVar2 * wind_dir.z; + mLeafAngles[1].z = fVar2 * wind_dir.x; + + field_0x764 += (int)(attr()->field_0x18 + wind_pow * (attr()->field_0x14 - attr()->field_0x18)); + field_0x766 += attr()->field_0x3a; + + setNewLeaf(); + if (mCcCyl.ChkCoHit()) { + setAction(MODE_PUSH_DOWN); + } } -#pragma pop /* 8059CC54-8059CC60 0002D4 000C+00 1/0 0/0 0/0 .text initPushDown__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::initPushDown() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPushDown__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::initPushDown() { + mMode = MODE_PUSH_DOWN; } -#pragma pop - -/* ############################################################################################## */ -/* 8059DEC0-8059DEC4 000044 0004+00 1/1 0/0 0/0 .rodata @3724 */ -SECTION_RODATA static f32 const lit_3724 = 65.0f; -COMPILER_STRIP_GATE(0x8059DEC0, &lit_3724); /* 8059CC60-8059CD44 0002E0 00E4+00 1/0 0/0 0/0 .text executePushDown__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::executePushDown() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePushDown__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::executePushDown() { + if (!mCcCyl.ChkCoHit()) { + setAction(MODE_SWING_WIND); + } else { + fopAc_ac_c* actor = mCcCyl.GetCoHitAc(); + s16 angle = fopAcM_searchActorAngleY(this, actor); + f32 distance = fopAcM_searchActorDistanceXZ(this, actor); + distance = (distance * -(attr()->field_0x04 / 65.0f)); + f32 val = distance + attr()->field_0x04; + + mLeafAngles[0].y = val * cM_scos(angle); + mLeafAngles[0].z = val * cM_ssin(angle); + + setNewLeaf(); + } } -#pragma pop /* 8059CD44-8059CD80 0003C4 003C+00 1/0 0/0 0/0 .text initPickLeaf__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::initPickLeaf() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initPickLeaf__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::initPickLeaf() { + mMode = MODE_PICK_LEAF; + fopAcM_cancelCarryNow(this); + toPickLeaf(); } -#pragma pop /* 8059CD80-8059CE7C 000400 00FC+00 1/0 0/0 0/0 .text executePickLeaf__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::executePickLeaf() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/executePickLeaf__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::executePickLeaf() { + f32 amplitude = mPickLeafAmplitude * cM_ssin(mPickLeafTick); + mLeafAngles[1].y = amplitude * cM_scos(mPlayerDeltaAngle); + mLeafAngles[1].z = amplitude * cM_ssin(mPlayerDeltaAngle); + + cLib_chaseF(&mPickLeafAmplitude, 0.0f, attr()->mPickLeafAmplitudeDecay); + + mPickLeafTick += attr()->mPickLeafTickSpeed; + + if (mPickLeafAmplitude == 0.0f) { + if (mCcCyl.ChkCoHit()) { + setAction(MODE_PUSH_DOWN); + } else { + setAction(MODE_SWING_WIND); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 8059DEC4-8059DEC8 000048 0004+00 0/1 0/0 0/0 .rodata @3773 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3773 = -50.0f; -COMPILER_STRIP_GATE(0x8059DEC4, &lit_3773); -#pragma pop - -/* 8059DEC8-8059DECC 00004C 0004+00 0/1 0/0 0/0 .rodata @3774 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3774 = -30.0f; -COMPILER_STRIP_GATE(0x8059DEC8, &lit_3774); -#pragma pop - -/* 8059DECC-8059DED0 000050 0004+00 0/1 0/0 0/0 .rodata @3775 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3775 = 50.0f; -COMPILER_STRIP_GATE(0x8059DECC, &lit_3775); -#pragma pop - -/* 8059DED0-8059DED4 000054 0004+00 0/1 0/0 0/0 .rodata @3776 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3776 = 120.0f; -COMPILER_STRIP_GATE(0x8059DED0, &lit_3776); -#pragma pop - -/* 8059DED4-8059DED8 000058 0004+00 0/1 0/0 0/0 .rodata @3777 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3777 = 30.0f; -COMPILER_STRIP_GATE(0x8059DED4, &lit_3777); -#pragma pop - -/* 8059DED8-8059DEDC 00005C 0004+00 1/4 0/0 0/0 .rodata @3778 */ -SECTION_RODATA static f32 const lit_3778 = 1.0f; -COMPILER_STRIP_GATE(0x8059DED8, &lit_3778); - -/* 8059DEDC-8059DEE0 000060 0004+00 0/1 0/0 0/0 .rodata @3779 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3779 = 65535.0f; -COMPILER_STRIP_GATE(0x8059DEDC, &lit_3779); -#pragma pop - -/* 8059E020-8059E040 -00001 0020+00 1/0 0/0 0/0 .data l_daObjYobikusa_Method */ -SECTION_DATA static void* l_daObjYobikusa_Method[8] = { - (void*)daObjYobikusa_Create__FP10fopAc_ac_c, - (void*)daObjYobikusa_Delete__FP15daObjYobikusa_c, - (void*)daObjYobikusa_Execute__FP15daObjYobikusa_c, - (void*)daObjYobikusa_IsDelete__FP15daObjYobikusa_c, - (void*)daObjYobikusa_Draw__FP15daObjYobikusa_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8059E040-8059E070 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Yobikusa */ -SECTION_DATA extern void* g_profile_Obj_Yobikusa[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x014D0000, (void*)&g_fpcLf_Method, - (void*)0x00000770, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x001D0000, (void*)&l_daObjYobikusa_Method, - (void*)0x00040180, (void*)0x000E0000, -}; - -/* 8059E070-8059E07C 000108 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 8059E07C-8059E088 000114 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 8059E088-8059E094 000120 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 8059E094-8059E0A0 00012C 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 8059E0A0-8059E0AC 000138 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 8059E0AC-8059E0D0 000144 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_8059DE68, - (void*)NULL, - (void*)NULL, - (void*)func_8059DE60, -}; /* 8059CE7C-8059D040 0004FC 01C4+00 1/1 0/0 0/0 .text create_init__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::create_init() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/create_init__15daObjYobikusa_cFv.s" -} -#pragma pop +void daObjYobikusa_c::create_init() { + initBaseMtx(); + fopAcM_setCullSizeBox(this, -50.0f, -30.0f, -50.0f, 50.0f, 120.0f, 50.0f); -/* 8059D040-8059D0B0 0006C0 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" asm void __dt__12dBgS_ObjAcchFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop + dBgS_AcchCir acch_cir; + dBgS_ObjAcch obj_acch; -/* 8059D0B0-8059D120 000730 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" asm void __dt__12dBgS_AcchCirFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__12dBgS_AcchCirFv.s" + acch_cir.SetWall(0.0f, 30.0f); + obj_acch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &acch_cir, + fopAcM_GetSpeed_p(this), NULL, NULL); + obj_acch.CrrPos(dComIfG_Bgsp()); + mGroundH = obj_acch.GetGroundH(); + + mPolyInfo = obj_acch.m_gnd; + + fopAcM_OnCarryType(this, fopAcM_CARRY_LIGHT); + + attention_info.flags |= 0x10; + attention_info.field_0x0[4] = 42; + + initCcCylinder(); + setAction(MODE_SWING_WIND); + + mJointScale = 1.0f; + + field_0x764 = cM_rnd() * 65535.0f; + field_0x766 = cM_rnd() * 65535.0f; } -#pragma pop /* 8059D120-8059D198 0007A0 0078+00 1/1 0/0 0/0 .text initBaseMtx__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initBaseMtx__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::initBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModelTypeA->setBaseTRMtx(mDoMtx_stack_c::get()); + mpModelTypeB->setBaseTRMtx(mDoMtx_stack_c::get()); + cMtx_copy(mDoMtx_stack_c::get(), mMtx); } -#pragma pop /* 8059D198-8059D1BC 000818 0024+00 1/1 0/0 0/0 .text getJointAngle__15daObjYobikusa_cFP5csXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::getJointAngle(csXyz* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointAngle__15daObjYobikusa_cFP5csXyzi.s" +void daObjYobikusa_c::getJointAngle(csXyz* i_angle, int i_index) { + *i_angle = mLeafAngles[i_index]; } -#pragma pop /* 8059D1BC-8059D1C4 00083C 0008+00 1/1 0/0 0/0 .text getJointScale__15daObjYobikusa_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::getJointScale(int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/getJointScale__15daObjYobikusa_cFi.s" +f32 daObjYobikusa_c::getJointScale(int _unused) { + return mJointScale; } -#pragma pop /* 8059D1C4-8059D2E4 000844 0120+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void nodeCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/nodeCallBack__FP8J3DJointi.s" -} -#pragma pop +static int nodeCallBack(J3DJoint* i_jnt, int i_param) { + if (i_param != 0) { + return 1; + } -/* 8059D2E4-8059D320 000964 003C+00 2/2 0/0 0/0 .text __dt__5csXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm csXyz::~csXyz() { -extern "C" asm void __dt__5csXyzFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__5csXyzFv.s" + int jnt_no = i_jnt->getJntNo(); + + J3DModel* model = j3dSys.getModel(); + daObjYobikusa_c* i_this = (daObjYobikusa_c*)model->getUserArea(); + + cMtx_copy(model->getAnmMtx(jnt_no), mDoMtx_stack_c::get()); + + csXyz angle; + i_this->getJointAngle(&angle, jnt_no); + + if (angle.x != 0) { + mDoMtx_stack_c::XrotM(angle.x); + } + if (angle.z != 0) { + mDoMtx_stack_c::ZrotM(angle.z); + } + if (angle.y != 0) { + mDoMtx_stack_c::YrotM(angle.y); + } + + if (jnt_no == 2) { + cXyz scale; + scale.setAll(i_this->getJointScale(jnt_no)); + mDoMtx_stack_c::scaleM(scale); + } + + model->setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + mDoMtx_copy(mDoMtx_stack_c::get(), j3dSys.mCurrentMtx); + + return 1; } -#pragma pop /* ############################################################################################## */ /* 8059DEE0-8059DF24 000064 0044+00 1/1 0/0 0/0 .rodata ccCylSrc$3880 */ const static dCcD_SrcCyl ccCylSrc = { { - {0x0, {{0x0, 0x0, 0x0}, {0xd8480422, 0x11}, 0x139}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg - {0x2}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x0}, {0xd8480422, 0x11}, 0x139}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg + {0x2}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 80.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 80.0f // mHeight + } // mCyl }; /* 8059D320-8059D380 0009A0 0060+00 1/1 0/0 0/0 .text initCcCylinder__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::initCcCylinder() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/initCcCylinder__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::initCcCylinder() { + mStts.Init(0xff, 0xff, this); + mCcCyl.Set(ccCylSrc); + mCcCyl.SetStts(&mStts); + mCcCyl.SetC(current.pos); } -#pragma pop /* 8059D380-8059D3B4 000A00 0034+00 1/1 0/0 0/0 .text setCcCylinder__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::setCcCylinder() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setCcCylinder__15daObjYobikusa_cFv.s" +void daObjYobikusa_c::setCcCylinder() { + dComIfG_Ccsp()->Set(&mCcCyl); } -#pragma pop /* 8059D3B4-8059D454 000A34 00A0+00 1/1 0/0 0/0 .text toPickLeaf__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::toPickLeaf() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/toPickLeaf__15daObjYobikusa_cFv.s" +bool daObjYobikusa_c::toPickLeaf() { + if (mJointScale == 1.0f) { + mJointScale = 0.0f; + mNewLeafAmplitude = attr()->mNewLeafInitialAmplitude; + mNewLeafTick = 0; + mPickLeafAmplitude = attr()->mPickLeafInitialAmplitude; + mPickLeafTick = 0; + mPlayerDeltaAngle = fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0)); + mPlayerDeltaAngle -= 0x2000; + + cLib_offBit(attention_info.flags, 0x10); + return true; + } + return false; } -#pragma pop /* 8059D454-8059D520 000AD4 00CC+00 2/2 0/0 0/0 .text setNewLeaf__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::setNewLeaf() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/setNewLeaf__15daObjYobikusa_cFv.s" -} -#pragma pop +bool daObjYobikusa_c::setNewLeaf() { + cLib_chaseF(&mJointScale, 1.0f, attr()->mJointScaleStep); -/* ############################################################################################## */ -/* 8059DF24-8059DF24 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8059DF32 = "J_Tobi.bmd"; -SECTION_DEAD static char const* const stringBase_8059DF3D = "J_Tobi_c.bmd"; -SECTION_DEAD static char const* const stringBase_8059DF4A = "J_Umakusa.bmd"; -SECTION_DEAD static char const* const stringBase_8059DF58 = "J_Umakusa_c.bmd"; -#pragma pop + mNewLeafAmplitude = attr()->mNewLeafInitialAmplitude; + + mLeafAngles[2].x = (int)(mNewLeafAmplitude * cM_ssin(mNewLeafTick)); + mNewLeafTick += attr()->mNewLeafTickSpeed; + + if (mJointScale == 1.0f && mNewLeafAmplitude == 0.0f) { + cLib_onBit(attention_info.flags, 0x10); + return true; + } + return false; +} + +int daObjYobikusa_c::createHeap() { + char* res_name1; + char* res_name2; + J3DModelData* model_data1; + J3DModelData* model_data2; + + switch (getType()) { + case CALL_TYPE_FLY: + res_name1 = "J_Tobi.bmd"; + res_name2 = "J_Tobi_c.bmd"; + break; + + case CALL_TYPE_HORSE: + res_name1 = "J_Umakusa.bmd"; + res_name2 = "J_Umakusa_c.bmd"; + break; + + default: + break; + } + + model_data1 = (J3DModelData*)dComIfG_getObjectRes(mResName, res_name1); + model_data2 = (J3DModelData*)dComIfG_getObjectRes(mResName, res_name2); + + mpModelTypeA = mDoExt_J3DModel__create(model_data1, 0x80000, 0x11000084); + mpModelTypeB = mDoExt_J3DModel__create(model_data2, 0x80000, 0x11000084); + + if (mpModelTypeA == NULL || mpModelTypeB == NULL) { + return FALSE; + } else { + for (u16 i = 0; i < 3; i++) { + J3DJoint* joint = mpModelTypeA->getModelData()->getJointNodePointer(i); + if (joint != NULL) { + joint->setCallBack(nodeCallBack); + mpModelTypeA->setUserArea((u32)this); + } + } + + mpActiveModel = mpModelTypeA; + } + + return TRUE; +} /* 8059D520-8059D674 000BA0 0154+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void createSolidHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/createSolidHeap__FP10fopAc_ac_c.s" +static int createSolidHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->createHeap(); +} + +int daObjYobikusa_c::draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpActiveModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpActiveModel); + dComIfGd_setList(); + + return TRUE; } -#pragma pop /* 8059D674-8059D718 000CF4 00A4+00 1/0 0/0 0/0 .text daObjYobikusa_Draw__FP15daObjYobikusa_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYobikusa_Draw(daObjYobikusa_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Draw__FP15daObjYobikusa_c.s" +static int daObjYobikusa_Draw(daObjYobikusa_c* i_this) { + return i_this->draw(); } -#pragma pop /* 8059D718-8059D738 000D98 0020+00 1/0 0/0 0/0 .text daObjYobikusa_Execute__FP15daObjYobikusa_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYobikusa_Execute(daObjYobikusa_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Execute__FP15daObjYobikusa_c.s" +static int daObjYobikusa_Execute(daObjYobikusa_c* i_this) { + return i_this->execute(); } -#pragma pop /* 8059D738-8059D9A0 000DB8 0268+00 1/1 0/0 0/0 .text execute__15daObjYobikusa_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYobikusa_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/execute__15daObjYobikusa_cFv.s" +int daObjYobikusa_c::execute() { + if (mpActiveModel == mpModelTypeB) { + if (!(!fopAcM_CheckCondition(this, 4) && + (!dComIfGp_event_runCheck() || eventInfo.checkCommandTalk()))) + { + mpActiveModel = mpModelTypeA; + fopAcM_OnStatus(this, 0x80); + } else { + return TRUE; + } + } + + if (mCcCyl.ChkTgHit()) { + mpActiveModel = mpModelTypeB; + + fopAcM_OffStatus(this, 0x80); + cLib_offBit(attention_info.flags, 0x10); + + if (getType() == CALL_TYPE_FLY) { + dComIfGp_particle_set(0x8347, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x8348, ¤t.pos, NULL, NULL); + } else if (getType() == CALL_TYPE_HORSE) { + dComIfGp_particle_set(0x8349, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x834a, ¤t.pos, NULL, NULL); + } + } else { + if (fopAcM_checkCarryNow(this)) { + setAction(MODE_PICK_LEAF); + } + + attention_info.field_0x0[4] = daPy_py_c::i_checkNowWolf() ? 73 : 42; + callExecute(); + } + + setCcCylinder(); + return TRUE; } -#pragma pop /* 8059D9A0-8059D9A8 001020 0008+00 1/0 0/0 0/0 .text daObjYobikusa_IsDelete__FP15daObjYobikusa_c */ -static bool daObjYobikusa_IsDelete(daObjYobikusa_c* param_0) { +static bool daObjYobikusa_IsDelete(daObjYobikusa_c* i_this) { return true; } -/* 8059D9A8-8059DAF4 001028 014C+00 1/0 0/0 0/0 .text daObjYobikusa_Delete__FP15daObjYobikusa_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYobikusa_Delete(daObjYobikusa_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Delete__FP15daObjYobikusa_c.s" +daObjYobikusa_c::~daObjYobikusa_c() { + dComIfG_resDelete(&mPhase, mResName); +} + +/* 8059D9A8-8059DAF4 001028 014C+00 1/0 0/0 0/0 .text daObjYobikusa_Delete__FP15daObjYobikusa_c */ +static int daObjYobikusa_Delete(daObjYobikusa_c* i_this) { + i_this->~daObjYobikusa_c(); + return TRUE; +} + +cPhs__Step daObjYobikusa_c::create() { + fopAcM_SetupActor(this, daObjYobikusa_c); + + switch (getType()) { + case CALL_TYPE_FLY: + mResName = (char*)l_arcName1; + break; + + case CALL_TYPE_HORSE: + mResName = (char*)l_arcName2; + break; + + default: + break; + } + + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, mResName); + if (step == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createSolidHeap, 0x1080)) { + step = cPhs_ERROR_e; + } else { + create_init(); + fopAcM_SetMtx(this, mMtx); + } + } + return step; } -#pragma pop /* 8059DAF4-8059DC88 001174 0194+00 1/0 0/0 0/0 .text daObjYobikusa_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYobikusa_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/daObjYobikusa_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 8059DC88-8059DC8C 001308 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -extern "C" void __ct__5csXyzFv() { - /* empty function */ +static int daObjYobikusa_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -/* 8059DC8C-8059DCD4 00130C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGCylFv.s" -} -#pragma pop +/* 8059E020-8059E040 -00001 0020+00 1/0 0/0 0/0 .data l_daObjYobikusa_Method */ +static actor_method_class l_daObjYobikusa_Method = { + (process_method_func)daObjYobikusa_Create, (process_method_func)daObjYobikusa_Delete, + (process_method_func)daObjYobikusa_Execute, (process_method_func)daObjYobikusa_IsDelete, + (process_method_func)daObjYobikusa_Draw, +}; -/* 8059DCD4-8059DD1C 001354 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 8059DD1C-8059DD78 00139C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 8059DD78-8059DDC0 0013F8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 8059DDC0-8059DE60 001440 00A0+00 0/0 1/0 0/0 .text __sinit_d_a_obj_yobikusa_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_yobikusa_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/__sinit_d_a_obj_yobikusa_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8059DDC0, __sinit_d_a_obj_yobikusa_cpp); -#pragma pop - -/* 8059DE60-8059DE68 0014E0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8059DE60() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE60.s" -} -#pragma pop - -/* 8059DE68-8059DE70 0014E8 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_8059DE68() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa/func_8059DE68.s" -} -#pragma pop - -/* 8059DF24-8059DF24 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8059E040-8059E070 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Yobikusa */ +extern actor_process_profile_definition g_profile_Obj_Yobikusa = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Yobikusa, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjYobikusa_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 29, // mPriority + &l_daObjYobikusa_Method, // sub_method + 0x40180, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index 143f76104d..39fea23638 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -2131,7 +2131,7 @@ SECTION_SDATA2 static f32 lit_5855[1 + 1 /* padding */] = { /* 8005B2F8-8005B530 055C38 0238+00 0/0 3/3 13/13 .text dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf */ // matches with literals #ifdef NONMATCHING -void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* i_direction, f32* i_power) { +void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power) { dScnKy_env_light_c* env_light = dKy_getEnvlight(); dKyw_pntwind_get_info(param_0, i_direction, i_power);