diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/_delete__11daObjTrnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/_delete__11daObjTrnd_cFv.s deleted file mode 100644 index 15de646aa4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/_delete__11daObjTrnd_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D1C298: -/* 80D1C298 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C29C 7C 08 02 A6 */ mflr r0 -/* 80D1C2A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C2A4 38 00 00 00 */ li r0, 0 -/* 80D1C2A8 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D1C2AC 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 80D1C2B0 98 04 0E 6D */ stb r0, 0xe6d(r4) -/* 80D1C2B4 4B FF F7 59 */ bl cutPntWind__11daObjTrnd_cFv -/* 80D1C2B8 38 60 00 01 */ li r3, 1 -/* 80D1C2BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C2C0 7C 08 03 A6 */ mtlr r0 -/* 80D1C2C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C2C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/cutPntWind__11daObjTrnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/cutPntWind__11daObjTrnd_cFv.s deleted file mode 100644 index 3b7070e0e1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/cutPntWind__11daObjTrnd_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80D1BA0C: -/* 80D1BA0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1BA10 7C 08 02 A6 */ mflr r0 -/* 80D1BA14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1BA18 38 63 07 40 */ addi r3, r3, 0x740 -/* 80D1BA1C 4B 33 F4 3D */ bl dKyw_pntwind_cut__FP14WIND_INFLUENCE -/* 80D1BA20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1BA24 7C 08 03 A6 */ mtlr r0 -/* 80D1BA28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1BA2C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Create__FP11daObjTrnd_c.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Create__FP11daObjTrnd_c.s deleted file mode 100644 index e88d1a3415..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Create__FP11daObjTrnd_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1C32C: -/* 80D1C32C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C330 7C 08 02 A6 */ mflr r0 -/* 80D1C334 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C338 4B FF FC 79 */ bl create__11daObjTrnd_cFv -/* 80D1C33C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C340 7C 08 03 A6 */ mtlr r0 -/* 80D1C344 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C348 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Delete__FP11daObjTrnd_c.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Delete__FP11daObjTrnd_c.s deleted file mode 100644 index 062f19ef5f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Delete__FP11daObjTrnd_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1C30C: -/* 80D1C30C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C310 7C 08 02 A6 */ mflr r0 -/* 80D1C314 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C318 4B FF FF 81 */ bl _delete__11daObjTrnd_cFv -/* 80D1C31C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C320 7C 08 03 A6 */ mtlr r0 -/* 80D1C324 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C328 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Draw__FP11daObjTrnd_c.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Draw__FP11daObjTrnd_c.s deleted file mode 100644 index 4cd487253c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Draw__FP11daObjTrnd_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1C2CC: -/* 80D1C2CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C2D0 7C 08 02 A6 */ mflr r0 -/* 80D1C2D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C2D8 4B FF FF B9 */ bl draw__11daObjTrnd_cFv -/* 80D1C2DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C2E0 7C 08 03 A6 */ mtlr r0 -/* 80D1C2E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C2E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Execute__FP11daObjTrnd_c.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Execute__FP11daObjTrnd_c.s deleted file mode 100644 index b43049b043..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Execute__FP11daObjTrnd_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1C2EC: -/* 80D1C2EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C2F0 7C 08 02 A6 */ mflr r0 -/* 80D1C2F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C2F8 4B FF FD F9 */ bl execute__11daObjTrnd_cFv -/* 80D1C2FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C300 7C 08 03 A6 */ mtlr r0 -/* 80D1C304 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C308 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/func_80D1BFB0.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/func_80D1BFB0.s deleted file mode 100644 index 4028836f41..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/func_80D1BFB0.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_80D1BFB0: -/* 80D1BFB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1BFB4 7C 08 02 A6 */ mflr r0 -/* 80D1BFB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1BFBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D1BFC0 93 C1 00 08 */ stw r30, 8(r1) -/* 80D1BFC4 7C 7F 1B 78 */ mr r31, r3 -/* 80D1BFC8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D1BFCC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D1BFD0 40 82 00 A4 */ bne lbl_80D1C074 -/* 80D1BFD4 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D1BFD8 41 82 00 90 */ beq lbl_80D1C068 -/* 80D1BFDC 7C 1E 03 78 */ mr r30, r0 -/* 80D1BFE0 4B 2F CB 85 */ bl __ct__10fopAc_ac_cFv -/* 80D1BFE4 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80D1BFE8 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80D1BFEC 90 1E 05 80 */ stw r0, 0x580(r30) -/* 80D1BFF0 38 7E 05 84 */ addi r3, r30, 0x584 -/* 80D1BFF4 4B 36 77 6D */ bl __ct__10dCcD_GSttsFv -/* 80D1BFF8 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80D1BFFC 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80D1C000 90 7E 05 80 */ stw r3, 0x580(r30) -/* 80D1C004 38 03 00 20 */ addi r0, r3, 0x20 -/* 80D1C008 90 1E 05 84 */ stw r0, 0x584(r30) -/* 80D1C00C 3B DE 05 A4 */ addi r30, r30, 0x5a4 -/* 80D1C010 7F C3 F3 78 */ mr r3, r30 -/* 80D1C014 4B 36 7A 15 */ bl __ct__12dCcD_GObjInfFv -/* 80D1C018 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80D1C01C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80D1C020 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D1C024 3C 60 80 D2 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D1C450@ha */ -/* 80D1C028 38 03 C4 50 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D1C450@l */ -/* 80D1C02C 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80D1C030 38 7E 01 24 */ addi r3, r30, 0x124 -/* 80D1C034 4B 55 2F 55 */ bl __ct__8cM3dGCpsFv -/* 80D1C038 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80D1C03C 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80D1C040 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80D1C044 38 03 00 58 */ addi r0, r3, 0x58 -/* 80D1C048 90 1E 01 3C */ stw r0, 0x13c(r30) -/* 80D1C04C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cps@ha /* 0x803AC170@ha */ -/* 80D1C050 38 63 C1 70 */ addi r3, r3, __vt__8dCcD_Cps@l /* 0x803AC170@l */ -/* 80D1C054 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80D1C058 38 03 00 2C */ addi r0, r3, 0x2c -/* 80D1C05C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D1C060 38 03 00 84 */ addi r0, r3, 0x84 -/* 80D1C064 90 1E 01 3C */ stw r0, 0x13c(r30) -lbl_80D1C068: -/* 80D1C068 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D1C06C 60 00 00 08 */ ori r0, r0, 8 -/* 80D1C070 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D1C074: -/* 80D1C074 7F E3 FB 78 */ mr r3, r31 -/* 80D1C078 4B FF FD F5 */ bl Create__11daObjTrnd_cFv -/* 80D1C07C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1C080 40 82 00 0C */ bne lbl_80D1C08C -/* 80D1C084 38 60 00 05 */ li r3, 5 -/* 80D1C088 48 00 00 08 */ b lbl_80D1C090 -lbl_80D1C08C: -/* 80D1C08C 38 60 00 04 */ li r3, 4 -lbl_80D1C090: -/* 80D1C090 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D1C094 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D1C098 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C09C 7C 08 03 A6 */ mtlr r0 -/* 80D1C0A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C0A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/initBaseMtx__11daObjTrnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/initBaseMtx__11daObjTrnd_cFv.s deleted file mode 100644 index 9469990fd9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/initBaseMtx__11daObjTrnd_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1BE04: -/* 80D1BE04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1BE08 7C 08 02 A6 */ mflr r0 -/* 80D1BE0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1BE10 48 00 00 15 */ bl setBaseMtx__11daObjTrnd_cFv -/* 80D1BE14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1BE18 7C 08 03 A6 */ mtlr r0 -/* 80D1BE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1BE20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/setBaseMtx__11daObjTrnd_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/setBaseMtx__11daObjTrnd_cFv.s deleted file mode 100644 index e7658f7ebb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/setBaseMtx__11daObjTrnd_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80D1BE24: -/* 80D1BE24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1BE28 7C 08 02 A6 */ mflr r0 -/* 80D1BE2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1BE30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D1BE34 7C 7F 1B 78 */ mr r31, r3 -/* 80D1BE38 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80D1BE3C 4B 2F 0F 29 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80D1BE40 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80D1BE44 4B 2F 11 01 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80D1BE48 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D1BE4C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D1BE50 38 9F 07 08 */ addi r4, r31, 0x708 -/* 80D1BE54 4B 62 A6 5D */ bl PSMTXCopy -/* 80D1BE58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D1BE5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1BE60 7C 08 03 A6 */ mtlr r0 -/* 80D1BE64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1BE68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/Create__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/Create__12daObjTrnd2_cFv.s deleted file mode 100644 index a7cd5ce08e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/Create__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,206 +0,0 @@ -lbl_80D1C98C: -/* 80D1C98C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80D1C990 7C 08 02 A6 */ mflr r0 -/* 80D1C994 90 01 00 34 */ stw r0, 0x34(r1) -/* 80D1C998 39 61 00 30 */ addi r11, r1, 0x30 -/* 80D1C99C 4B 64 58 41 */ bl _savegpr_29 -/* 80D1C9A0 7C 7E 1B 78 */ mr r30, r3 -/* 80D1C9A4 3C 60 80 D2 */ lis r3, l_R02_eff_id@ha /* 0x80D1D3D4@ha */ -/* 80D1C9A8 3B E3 D3 D4 */ addi r31, r3, l_R02_eff_id@l /* 0x80D1D3D4@l */ -/* 80D1C9AC C0 1F 00 70 */ lfs f0, 0x70(r31) -/* 80D1C9B0 D0 1E 07 68 */ stfs f0, 0x768(r30) -/* 80D1C9B4 C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80D1C9B8 D0 1E 07 6C */ stfs f0, 0x76c(r30) -/* 80D1C9BC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1C9C0 54 00 27 FE */ rlwinm r0, r0, 4, 0x1f, 0x1f -/* 80D1C9C4 28 00 00 01 */ cmplwi r0, 1 -/* 80D1C9C8 40 82 00 20 */ bne lbl_80D1C9E8 -/* 80D1C9CC C0 1E 07 68 */ lfs f0, 0x768(r30) -/* 80D1C9D0 C0 3F 00 64 */ lfs f1, 0x64(r31) -/* 80D1C9D4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D1C9D8 D0 1E 07 68 */ stfs f0, 0x768(r30) -/* 80D1C9DC C0 1E 07 6C */ lfs f0, 0x76c(r30) -/* 80D1C9E0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D1C9E4 D0 1E 07 6C */ stfs f0, 0x76c(r30) -lbl_80D1C9E8: -/* 80D1C9E8 7F C3 F3 78 */ mr r3, r30 -/* 80D1C9EC 4B FF FF 39 */ bl initBaseMtx__12daObjTrnd2_cFv -/* 80D1C9F0 38 1E 07 08 */ addi r0, r30, 0x708 -/* 80D1C9F4 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80D1C9F8 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80D1C9FC 38 80 00 FF */ li r4, 0xff -/* 80D1CA00 38 A0 00 FF */ li r5, 0xff -/* 80D1CA04 7F C6 F3 78 */ mr r6, r30 -/* 80D1CA08 4B 36 6E 59 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80D1CA0C 38 7E 05 A4 */ addi r3, r30, 0x5a4 -/* 80D1CA10 3C 80 80 D2 */ lis r4, l_cps_src@ha /* 0x80D1D458@ha */ -/* 80D1CA14 38 84 D4 58 */ addi r4, r4, l_cps_src@l /* 0x80D1D458@l */ -/* 80D1CA18 4B 36 7D B9 */ bl Set__8dCcD_CpsFRC11dCcD_SrcCps -/* 80D1CA1C 38 1E 05 68 */ addi r0, r30, 0x568 -/* 80D1CA20 90 1E 05 E8 */ stw r0, 0x5e8(r30) -/* 80D1CA24 C0 7E 07 68 */ lfs f3, 0x768(r30) -/* 80D1CA28 FC 20 18 50 */ fneg f1, f3 -/* 80D1CA2C C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80D1CA30 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80D1CA34 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80D1CA38 C0 5F 00 30 */ lfs f2, 0x30(r31) -/* 80D1CA3C D0 41 00 18 */ stfs f2, 0x18(r1) -/* 80D1CA40 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80D1CA44 EC 83 00 32 */ fmuls f4, f3, f0 -/* 80D1CA48 D0 81 00 08 */ stfs f4, 8(r1) -/* 80D1CA4C C0 7E 07 6C */ lfs f3, 0x76c(r30) -/* 80D1CA50 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80D1CA54 EC A3 00 32 */ fmuls f5, f3, f0 -/* 80D1CA58 D0 A1 00 0C */ stfs f5, 0xc(r1) -/* 80D1CA5C D0 81 00 10 */ stfs f4, 0x10(r1) -/* 80D1CA60 7F C3 F3 78 */ mr r3, r30 -/* 80D1CA64 FC 60 08 90 */ fmr f3, f1 -/* 80D1CA68 FC C0 20 90 */ fmr f6, f4 -/* 80D1CA6C 4B 2F DA DD */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80D1CA70 C0 3E 07 68 */ lfs f1, 0x768(r30) -/* 80D1CA74 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80D1CA78 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D1CA7C D0 1E 07 00 */ stfs f0, 0x700(r30) -/* 80D1CA80 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80D1CA84 D0 1E 06 E8 */ stfs f0, 0x6e8(r30) -/* 80D1CA88 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80D1CA8C D0 1E 06 EC */ stfs f0, 0x6ec(r30) -/* 80D1CA90 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80D1CA94 D0 1E 06 F0 */ stfs f0, 0x6f0(r30) -/* 80D1CA98 7F C3 F3 78 */ mr r3, r30 -/* 80D1CA9C 48 00 06 11 */ bl setParticle__12daObjTrnd2_cFv -/* 80D1CAA0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1CAA4 54 1D 06 3E */ clrlwi r29, r0, 0x18 -/* 80D1CAA8 54 00 87 3E */ rlwinm r0, r0, 0x10, 0x1c, 0x1f -/* 80D1CAAC 2C 00 00 03 */ cmpwi r0, 3 -/* 80D1CAB0 41 82 01 58 */ beq lbl_80D1CC08 -/* 80D1CAB4 40 80 00 1C */ bge lbl_80D1CAD0 -/* 80D1CAB8 2C 00 00 01 */ cmpwi r0, 1 -/* 80D1CABC 41 82 00 A0 */ beq lbl_80D1CB5C -/* 80D1CAC0 40 80 01 2C */ bge lbl_80D1CBEC -/* 80D1CAC4 2C 00 00 00 */ cmpwi r0, 0 -/* 80D1CAC8 40 80 00 5C */ bge lbl_80D1CB24 -/* 80D1CACC 48 00 01 54 */ b lbl_80D1CC20 -lbl_80D1CAD0: -/* 80D1CAD0 2C 00 00 0F */ cmpwi r0, 0xf -/* 80D1CAD4 41 82 00 08 */ beq lbl_80D1CADC -/* 80D1CAD8 48 00 01 48 */ b lbl_80D1CC20 -lbl_80D1CADC: -/* 80D1CADC 28 1D 00 FF */ cmplwi r29, 0xff -/* 80D1CAE0 41 82 00 24 */ beq lbl_80D1CB04 -/* 80D1CAE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CAE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CAEC 7F A4 EB 78 */ mr r4, r29 -/* 80D1CAF0 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80D1CAF4 7C 05 07 74 */ extsb r5, r0 -/* 80D1CAF8 4B 31 88 69 */ bl isSwitch__10dSv_info_cCFii -/* 80D1CAFC 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CB00 40 82 00 0C */ bne lbl_80D1CB0C -lbl_80D1CB04: -/* 80D1CB04 28 1D 00 FF */ cmplwi r29, 0xff -/* 80D1CB08 40 82 00 10 */ bne lbl_80D1CB18 -lbl_80D1CB0C: -/* 80D1CB0C 38 00 00 01 */ li r0, 1 -/* 80D1CB10 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CB14 48 00 01 0C */ b lbl_80D1CC20 -lbl_80D1CB18: -/* 80D1CB18 38 00 00 00 */ li r0, 0 -/* 80D1CB1C 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CB20 48 00 01 00 */ b lbl_80D1CC20 -lbl_80D1CB24: -/* 80D1CB24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CB28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CB2C 7F A4 EB 78 */ mr r4, r29 -/* 80D1CB30 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80D1CB34 7C 05 07 74 */ extsb r5, r0 -/* 80D1CB38 4B 31 88 29 */ bl isSwitch__10dSv_info_cCFii -/* 80D1CB3C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CB40 41 82 00 10 */ beq lbl_80D1CB50 -/* 80D1CB44 38 00 00 00 */ li r0, 0 -/* 80D1CB48 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CB4C 48 00 00 D4 */ b lbl_80D1CC20 -lbl_80D1CB50: -/* 80D1CB50 38 00 00 01 */ li r0, 1 -/* 80D1CB54 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CB58 48 00 00 C8 */ b lbl_80D1CC20 -lbl_80D1CB5C: -/* 80D1CB5C 28 1D 00 FF */ cmplwi r29, 0xff -/* 80D1CB60 41 82 00 40 */ beq lbl_80D1CBA0 -/* 80D1CB64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CB68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CB6C 7F A4 EB 78 */ mr r4, r29 -/* 80D1CB70 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80D1CB74 7C 05 07 74 */ extsb r5, r0 -/* 80D1CB78 4B 31 87 E9 */ bl isSwitch__10dSv_info_cCFii -/* 80D1CB7C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CB80 40 82 00 20 */ bne lbl_80D1CBA0 -/* 80D1CB84 38 00 00 00 */ li r0, 0 -/* 80D1CB88 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CB8C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1CB90 54 00 67 3E */ rlwinm r0, r0, 0xc, 0x1c, 0x1f -/* 80D1CB94 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80D1CB98 90 1E 07 70 */ stw r0, 0x770(r30) -/* 80D1CB9C 48 00 00 84 */ b lbl_80D1CC20 -lbl_80D1CBA0: -/* 80D1CBA0 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80D1CBA4 4B 54 AD B1 */ bl cM_rndF__Ff -/* 80D1CBA8 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80D1CBAC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D1CBB0 40 81 00 20 */ ble lbl_80D1CBD0 -/* 80D1CBB4 38 00 00 01 */ li r0, 1 -/* 80D1CBB8 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CBBC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1CBC0 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f -/* 80D1CBC4 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80D1CBC8 90 1E 07 70 */ stw r0, 0x770(r30) -/* 80D1CBCC 48 00 00 54 */ b lbl_80D1CC20 -lbl_80D1CBD0: -/* 80D1CBD0 38 00 00 00 */ li r0, 0 -/* 80D1CBD4 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CBD8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1CBDC 54 00 67 3E */ rlwinm r0, r0, 0xc, 0x1c, 0x1f -/* 80D1CBE0 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80D1CBE4 90 1E 07 70 */ stw r0, 0x770(r30) -/* 80D1CBE8 48 00 00 38 */ b lbl_80D1CC20 -lbl_80D1CBEC: -/* 80D1CBEC 38 00 00 01 */ li r0, 1 -/* 80D1CBF0 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CBF4 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1CBF8 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f -/* 80D1CBFC 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80D1CC00 90 1E 07 70 */ stw r0, 0x770(r30) -/* 80D1CC04 48 00 00 1C */ b lbl_80D1CC20 -lbl_80D1CC08: -/* 80D1CC08 38 00 00 00 */ li r0, 0 -/* 80D1CC0C 98 1E 07 78 */ stb r0, 0x778(r30) -/* 80D1CC10 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1CC14 54 00 67 3E */ rlwinm r0, r0, 0xc, 0x1c, 0x1f -/* 80D1CC18 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80D1CC1C 90 1E 07 70 */ stw r0, 0x770(r30) -lbl_80D1CC20: -/* 80D1CC20 88 1E 07 78 */ lbz r0, 0x778(r30) -/* 80D1CC24 28 00 00 01 */ cmplwi r0, 1 -/* 80D1CC28 40 82 00 28 */ bne lbl_80D1CC50 -/* 80D1CC2C C0 3E 07 6C */ lfs f1, 0x76c(r30) -/* 80D1CC30 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80D1CC34 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D1CC38 D0 1E 07 38 */ stfs f0, 0x738(r30) -/* 80D1CC3C C0 1E 07 38 */ lfs f0, 0x738(r30) -/* 80D1CC40 D0 1E 07 04 */ stfs f0, 0x704(r30) -/* 80D1CC44 7F C3 F3 78 */ mr r3, r30 -/* 80D1CC48 48 00 06 31 */ bl startParticle__12daObjTrnd2_cFv -/* 80D1CC4C 48 00 00 10 */ b lbl_80D1CC5C -lbl_80D1CC50: -/* 80D1CC50 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80D1CC54 D0 1E 07 38 */ stfs f0, 0x738(r30) -/* 80D1CC58 D0 1E 07 04 */ stfs f0, 0x704(r30) -lbl_80D1CC5C: -/* 80D1CC5C 7F C3 F3 78 */ mr r3, r30 -/* 80D1CC60 4B FF F8 79 */ bl setPntWind__12daObjTrnd2_cFv -/* 80D1CC64 38 60 00 01 */ li r3, 1 -/* 80D1CC68 39 61 00 30 */ addi r11, r1, 0x30 -/* 80D1CC6C 4B 64 55 BD */ bl _restgpr_29 -/* 80D1CC70 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80D1CC74 7C 08 03 A6 */ mtlr r0 -/* 80D1CC78 38 21 00 30 */ addi r1, r1, 0x30 -/* 80D1CC7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/__dt__8cM3dGAabFv.s deleted file mode 100644 index d3f65d2731..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D1CD78: -/* 80D1CD78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1CD7C 7C 08 02 A6 */ mflr r0 -/* 80D1CD80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1CD84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D1CD88 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D1CD8C 41 82 00 1C */ beq lbl_80D1CDA8 -/* 80D1CD90 3C A0 80 D2 */ lis r5, __vt__8cM3dGAab@ha /* 0x80D1D4F4@ha */ -/* 80D1CD94 38 05 D4 F4 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80D1D4F4@l */ -/* 80D1CD98 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80D1CD9C 7C 80 07 35 */ extsh. r0, r4 -/* 80D1CDA0 40 81 00 08 */ ble lbl_80D1CDA8 -/* 80D1CDA4 4B 5B 1F 99 */ bl __dl__FPv -lbl_80D1CDA8: -/* 80D1CDA8 7F E3 FB 78 */ mr r3, r31 -/* 80D1CDAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D1CDB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1CDB4 7C 08 03 A6 */ mtlr r0 -/* 80D1CDB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1CDBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/_delete__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/_delete__12daObjTrnd2_cFv.s deleted file mode 100644 index 0930fc725d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/_delete__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80D1D2E8: -/* 80D1D2E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1D2EC 7C 08 02 A6 */ mflr r0 -/* 80D1D2F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1D2F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D1D2F8 7C 7F 1B 78 */ mr r31, r3 -/* 80D1D2FC 38 00 00 00 */ li r0, 0 -/* 80D1D300 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D1D304 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 80D1D308 98 04 0E 6D */ stb r0, 0xe6d(r4) -/* 80D1D30C 4B FF F2 41 */ bl cutPntWind__12daObjTrnd2_cFv -/* 80D1D310 7F E3 FB 78 */ mr r3, r31 -/* 80D1D314 4B FF FF 01 */ bl endParticle__12daObjTrnd2_cFv -/* 80D1D318 38 60 00 01 */ li r3, 1 -/* 80D1D31C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D1D320 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1D324 7C 08 03 A6 */ mtlr r0 -/* 80D1D328 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1D32C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/cutPntWind__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/cutPntWind__12daObjTrnd2_cFv.s deleted file mode 100644 index e16223a68a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/cutPntWind__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80D1C54C: -/* 80D1C54C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C550 7C 08 02 A6 */ mflr r0 -/* 80D1C554 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C558 38 63 07 3C */ addi r3, r3, 0x73c -/* 80D1C55C 4B 33 E8 FD */ bl dKyw_pntwind_cut__FP14WIND_INFLUENCE -/* 80D1C560 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C564 7C 08 03 A6 */ mtlr r0 -/* 80D1C568 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C56C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Create__FP12daObjTrnd2_c.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Create__FP12daObjTrnd2_c.s deleted file mode 100644 index 591dd03ce0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Create__FP12daObjTrnd2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1D390: -/* 80D1D390 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1D394 7C 08 02 A6 */ mflr r0 -/* 80D1D398 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1D39C 4B FF F8 E5 */ bl create__12daObjTrnd2_cFv -/* 80D1D3A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1D3A4 7C 08 03 A6 */ mtlr r0 -/* 80D1D3A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1D3AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Delete__FP12daObjTrnd2_c.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Delete__FP12daObjTrnd2_c.s deleted file mode 100644 index 0f338b5d72..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Delete__FP12daObjTrnd2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1D370: -/* 80D1D370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1D374 7C 08 02 A6 */ mflr r0 -/* 80D1D378 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1D37C 4B FF FF 6D */ bl _delete__12daObjTrnd2_cFv -/* 80D1D380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1D384 7C 08 03 A6 */ mtlr r0 -/* 80D1D388 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1D38C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Draw__FP12daObjTrnd2_c.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Draw__FP12daObjTrnd2_c.s deleted file mode 100644 index 139b0ef719..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Draw__FP12daObjTrnd2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1D330: -/* 80D1D330 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1D334 7C 08 02 A6 */ mflr r0 -/* 80D1D338 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1D33C 4B FF FF A5 */ bl draw__12daObjTrnd2_cFv -/* 80D1D340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1D344 7C 08 03 A6 */ mtlr r0 -/* 80D1D348 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1D34C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Execute__FP12daObjTrnd2_c.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Execute__FP12daObjTrnd2_c.s deleted file mode 100644 index cc11f8bfc9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Execute__FP12daObjTrnd2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1D350: -/* 80D1D350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1D354 7C 08 02 A6 */ mflr r0 -/* 80D1D358 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1D35C 4B FF FA 65 */ bl execute__12daObjTrnd2_cFv -/* 80D1D360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1D364 7C 08 03 A6 */ mtlr r0 -/* 80D1D368 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1D36C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/endParticle__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/endParticle__12daObjTrnd2_cFv.s deleted file mode 100644 index 274b3c8475..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/endParticle__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80D1D214: -/* 80D1D214 38 80 00 00 */ li r4, 0 -/* 80D1D218 38 C0 00 01 */ li r6, 1 -/* 80D1D21C 7C 85 23 78 */ mr r5, r4 -/* 80D1D220 38 00 00 03 */ li r0, 3 -/* 80D1D224 7C 09 03 A6 */ mtctr r0 -lbl_80D1D228: -/* 80D1D228 39 04 07 7C */ addi r8, r4, 0x77c -/* 80D1D22C 7C E3 40 2E */ lwzx r7, r3, r8 -/* 80D1D230 28 07 00 00 */ cmplwi r7, 0 -/* 80D1D234 41 82 00 38 */ beq lbl_80D1D26C -/* 80D1D238 80 07 00 F4 */ lwz r0, 0xf4(r7) -/* 80D1D23C 60 00 00 01 */ ori r0, r0, 1 -/* 80D1D240 90 07 00 F4 */ stw r0, 0xf4(r7) -/* 80D1D244 7C E3 40 2E */ lwzx r7, r3, r8 -/* 80D1D248 80 07 00 F4 */ lwz r0, 0xf4(r7) -/* 80D1D24C 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 80D1D250 90 07 00 F4 */ stw r0, 0xf4(r7) -/* 80D1D254 7C E3 40 2E */ lwzx r7, r3, r8 -/* 80D1D258 80 07 00 F4 */ lwz r0, 0xf4(r7) -/* 80D1D25C 60 00 00 01 */ ori r0, r0, 1 -/* 80D1D260 90 07 00 F4 */ stw r0, 0xf4(r7) -/* 80D1D264 90 C7 00 24 */ stw r6, 0x24(r7) -/* 80D1D268 7C A3 41 2E */ stwx r5, r3, r8 -lbl_80D1D26C: -/* 80D1D26C 38 84 00 04 */ addi r4, r4, 4 -/* 80D1D270 42 00 FF B8 */ bdnz lbl_80D1D228 -/* 80D1D274 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/execute__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/execute__12daObjTrnd2_cFv.s deleted file mode 100644 index 92dc5fd4a8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/execute__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,206 +0,0 @@ -lbl_80D1CDC0: -/* 80D1CDC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D1CDC4 7C 08 02 A6 */ mflr r0 -/* 80D1CDC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D1CDCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D1CDD0 4B 64 54 09 */ bl _savegpr_28 -/* 80D1CDD4 7C 7D 1B 78 */ mr r29, r3 -/* 80D1CDD8 3C 60 80 D2 */ lis r3, l_R02_eff_id@ha /* 0x80D1D3D4@ha */ -/* 80D1CDDC 3B E3 D3 D4 */ addi r31, r3, l_R02_eff_id@l /* 0x80D1D3D4@l */ -/* 80D1CDE0 88 1D 07 78 */ lbz r0, 0x778(r29) -/* 80D1CDE4 28 00 00 01 */ cmplwi r0, 1 -/* 80D1CDE8 40 82 01 00 */ bne lbl_80D1CEE8 -/* 80D1CDEC 3B C0 00 00 */ li r30, 0 -/* 80D1CDF0 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80D1CDF4 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 80D1CDF8 54 00 87 3E */ rlwinm r0, r0, 0x10, 0x1c, 0x1f -/* 80D1CDFC 2C 00 00 04 */ cmpwi r0, 4 -/* 80D1CE00 40 80 00 14 */ bge lbl_80D1CE14 -/* 80D1CE04 2C 00 00 00 */ cmpwi r0, 0 -/* 80D1CE08 41 82 00 48 */ beq lbl_80D1CE50 -/* 80D1CE0C 40 80 00 6C */ bge lbl_80D1CE78 -/* 80D1CE10 48 00 00 B4 */ b lbl_80D1CEC4 -lbl_80D1CE14: -/* 80D1CE14 2C 00 00 0F */ cmpwi r0, 0xf -/* 80D1CE18 41 82 00 08 */ beq lbl_80D1CE20 -/* 80D1CE1C 48 00 00 A8 */ b lbl_80D1CEC4 -lbl_80D1CE20: -/* 80D1CE20 28 1C 00 FF */ cmplwi r28, 0xff -/* 80D1CE24 41 82 00 A0 */ beq lbl_80D1CEC4 -/* 80D1CE28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CE2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CE30 7F 84 E3 78 */ mr r4, r28 -/* 80D1CE34 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80D1CE38 7C 05 07 74 */ extsb r5, r0 -/* 80D1CE3C 4B 31 85 25 */ bl isSwitch__10dSv_info_cCFii -/* 80D1CE40 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CE44 40 82 00 80 */ bne lbl_80D1CEC4 -/* 80D1CE48 3B C0 00 01 */ li r30, 1 -/* 80D1CE4C 48 00 00 78 */ b lbl_80D1CEC4 -lbl_80D1CE50: -/* 80D1CE50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CE54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CE58 7F 84 E3 78 */ mr r4, r28 -/* 80D1CE5C 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80D1CE60 7C 05 07 74 */ extsb r5, r0 -/* 80D1CE64 4B 31 84 FD */ bl isSwitch__10dSv_info_cCFii -/* 80D1CE68 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CE6C 41 82 00 58 */ beq lbl_80D1CEC4 -/* 80D1CE70 3B C0 00 01 */ li r30, 1 -/* 80D1CE74 48 00 00 50 */ b lbl_80D1CEC4 -lbl_80D1CE78: -/* 80D1CE78 38 7D 07 70 */ addi r3, r29, 0x770 -/* 80D1CE7C 48 00 05 35 */ bl func_80D1D3B0 -/* 80D1CE80 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CE84 41 82 00 2C */ beq lbl_80D1CEB0 -/* 80D1CE88 28 1C 00 FF */ cmplwi r28, 0xff -/* 80D1CE8C 41 82 00 38 */ beq lbl_80D1CEC4 -/* 80D1CE90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CE94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CE98 7F 84 E3 78 */ mr r4, r28 -/* 80D1CE9C 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80D1CEA0 7C 05 07 74 */ extsb r5, r0 -/* 80D1CEA4 4B 31 84 BD */ bl isSwitch__10dSv_info_cCFii -/* 80D1CEA8 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CEAC 40 82 00 18 */ bne lbl_80D1CEC4 -lbl_80D1CEB0: -/* 80D1CEB0 3B C0 00 01 */ li r30, 1 -/* 80D1CEB4 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80D1CEB8 54 00 67 3E */ rlwinm r0, r0, 0xc, 0x1c, 0x1f -/* 80D1CEBC 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80D1CEC0 90 1D 07 70 */ stw r0, 0x770(r29) -lbl_80D1CEC4: -/* 80D1CEC4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80D1CEC8 41 82 01 30 */ beq lbl_80D1CFF8 -/* 80D1CECC C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80D1CED0 D0 1D 07 38 */ stfs f0, 0x738(r29) -/* 80D1CED4 38 00 00 00 */ li r0, 0 -/* 80D1CED8 98 1D 07 78 */ stb r0, 0x778(r29) -/* 80D1CEDC 7F A3 EB 78 */ mr r3, r29 -/* 80D1CEE0 48 00 03 CD */ bl stopParticle__12daObjTrnd2_cFv -/* 80D1CEE4 48 00 01 14 */ b lbl_80D1CFF8 -lbl_80D1CEE8: -/* 80D1CEE8 28 00 00 00 */ cmplwi r0, 0 -/* 80D1CEEC 40 82 01 0C */ bne lbl_80D1CFF8 -/* 80D1CEF0 3B C0 00 00 */ li r30, 0 -/* 80D1CEF4 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80D1CEF8 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 80D1CEFC 54 00 87 3E */ rlwinm r0, r0, 0x10, 0x1c, 0x1f -/* 80D1CF00 2C 00 00 04 */ cmpwi r0, 4 -/* 80D1CF04 40 80 00 14 */ bge lbl_80D1CF18 -/* 80D1CF08 2C 00 00 00 */ cmpwi r0, 0 -/* 80D1CF0C 41 82 00 40 */ beq lbl_80D1CF4C -/* 80D1CF10 40 80 00 6C */ bge lbl_80D1CF7C -/* 80D1CF14 48 00 00 BC */ b lbl_80D1CFD0 -lbl_80D1CF18: -/* 80D1CF18 2C 00 00 0F */ cmpwi r0, 0xf -/* 80D1CF1C 41 82 00 08 */ beq lbl_80D1CF24 -/* 80D1CF20 48 00 00 B0 */ b lbl_80D1CFD0 -lbl_80D1CF24: -/* 80D1CF24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CF28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CF2C 7F 84 E3 78 */ mr r4, r28 -/* 80D1CF30 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80D1CF34 7C 05 07 74 */ extsb r5, r0 -/* 80D1CF38 4B 31 84 29 */ bl isSwitch__10dSv_info_cCFii -/* 80D1CF3C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CF40 41 82 00 90 */ beq lbl_80D1CFD0 -/* 80D1CF44 3B C0 00 01 */ li r30, 1 -/* 80D1CF48 48 00 00 88 */ b lbl_80D1CFD0 -lbl_80D1CF4C: -/* 80D1CF4C 28 1C 00 FF */ cmplwi r28, 0xff -/* 80D1CF50 41 82 00 80 */ beq lbl_80D1CFD0 -/* 80D1CF54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CF58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CF5C 7F 84 E3 78 */ mr r4, r28 -/* 80D1CF60 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80D1CF64 7C 05 07 74 */ extsb r5, r0 -/* 80D1CF68 4B 31 83 F9 */ bl isSwitch__10dSv_info_cCFii -/* 80D1CF6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CF70 40 82 00 60 */ bne lbl_80D1CFD0 -/* 80D1CF74 3B C0 00 01 */ li r30, 1 -/* 80D1CF78 48 00 00 58 */ b lbl_80D1CFD0 -lbl_80D1CF7C: -/* 80D1CF7C 38 7D 07 70 */ addi r3, r29, 0x770 -/* 80D1CF80 48 00 04 31 */ bl func_80D1D3B0 -/* 80D1CF84 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CF88 40 82 00 48 */ bne lbl_80D1CFD0 -/* 80D1CF8C 28 1C 00 FF */ cmplwi r28, 0xff -/* 80D1CF90 41 82 00 24 */ beq lbl_80D1CFB4 -/* 80D1CF94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1CF98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1CF9C 7F 84 E3 78 */ mr r4, r28 -/* 80D1CFA0 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80D1CFA4 7C 05 07 74 */ extsb r5, r0 -/* 80D1CFA8 4B 31 83 B9 */ bl isSwitch__10dSv_info_cCFii -/* 80D1CFAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CFB0 40 82 00 0C */ bne lbl_80D1CFBC -lbl_80D1CFB4: -/* 80D1CFB4 28 1C 00 FF */ cmplwi r28, 0xff -/* 80D1CFB8 40 82 00 18 */ bne lbl_80D1CFD0 -lbl_80D1CFBC: -/* 80D1CFBC 3B C0 00 01 */ li r30, 1 -/* 80D1CFC0 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80D1CFC4 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f -/* 80D1CFC8 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 80D1CFCC 90 1D 07 70 */ stw r0, 0x770(r29) -lbl_80D1CFD0: -/* 80D1CFD0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80D1CFD4 41 82 00 24 */ beq lbl_80D1CFF8 -/* 80D1CFD8 C0 3D 07 6C */ lfs f1, 0x76c(r29) -/* 80D1CFDC C0 1D 04 F0 */ lfs f0, 0x4f0(r29) -/* 80D1CFE0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D1CFE4 D0 1D 07 38 */ stfs f0, 0x738(r29) -/* 80D1CFE8 38 00 00 01 */ li r0, 1 -/* 80D1CFEC 98 1D 07 78 */ stb r0, 0x778(r29) -/* 80D1CFF0 7F A3 EB 78 */ mr r3, r29 -/* 80D1CFF4 48 00 02 85 */ bl startParticle__12daObjTrnd2_cFv -lbl_80D1CFF8: -/* 80D1CFF8 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80D1CFFC C0 1D 07 38 */ lfs f0, 0x738(r29) -/* 80D1D000 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80D1D004 40 82 00 20 */ bne lbl_80D1D024 -/* 80D1D008 38 7D 07 74 */ addi r3, r29, 0x774 -/* 80D1D00C C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 80D1D010 C0 5F 00 38 */ lfs f2, 0x38(r31) -/* 80D1D014 C0 7F 00 40 */ lfs f3, 0x40(r31) -/* 80D1D018 C0 9F 00 7C */ lfs f4, 0x7c(r31) -/* 80D1D01C 4B 55 29 61 */ bl cLib_addCalc__FPfffff -/* 80D1D020 48 00 00 1C */ b lbl_80D1D03C -lbl_80D1D024: -/* 80D1D024 38 7D 07 74 */ addi r3, r29, 0x774 -/* 80D1D028 C0 3F 00 80 */ lfs f1, 0x80(r31) -/* 80D1D02C C0 5F 00 44 */ lfs f2, 0x44(r31) -/* 80D1D030 C0 7F 00 40 */ lfs f3, 0x40(r31) -/* 80D1D034 C0 9F 00 7C */ lfs f4, 0x7c(r31) -/* 80D1D038 4B 55 29 45 */ bl cLib_addCalc__FPfffff -lbl_80D1D03C: -/* 80D1D03C 38 60 00 00 */ li r3, 0 -/* 80D1D040 A8 9D 04 B6 */ lha r4, 0x4b6(r29) -/* 80D1D044 4B 33 E5 D9 */ bl dKyw_evt_wind_set__Fss -/* 80D1D048 C0 3D 07 74 */ lfs f1, 0x774(r29) -/* 80D1D04C 4B 33 E5 C1 */ bl dKyw_custom_windpower__Ff -/* 80D1D050 7F A3 EB 78 */ mr r3, r29 -/* 80D1D054 4B FF F7 2D */ bl setCpsInfo__12daObjTrnd2_cFv -/* 80D1D058 7F A3 EB 78 */ mr r3, r29 -/* 80D1D05C 4B FF F8 E9 */ bl setBaseMtx__12daObjTrnd2_cFv -/* 80D1D060 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80D1D064 C0 1D 07 04 */ lfs f0, 0x704(r29) -/* 80D1D068 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80D1D06C 41 82 00 24 */ beq lbl_80D1D090 -/* 80D1D070 38 7D 06 C8 */ addi r3, r29, 0x6c8 -/* 80D1D074 38 9D 06 E8 */ addi r4, r29, 0x6e8 -/* 80D1D078 4B 55 1F C5 */ bl Set__8cM3dGCpsFRC9cM3dGCpsS -/* 80D1D07C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1D080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D1D084 38 63 23 3C */ addi r3, r3, 0x233c -/* 80D1D088 38 9D 05 A4 */ addi r4, r29, 0x5a4 -/* 80D1D08C 4B 54 7B 1D */ bl Set__4cCcSFP8cCcD_Obj -lbl_80D1D090: -/* 80D1D090 38 60 00 01 */ li r3, 1 -/* 80D1D094 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D1D098 4B 64 51 8D */ bl _restgpr_28 -/* 80D1D09C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D1D0A0 7C 08 03 A6 */ mtlr r0 -/* 80D1D0A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D1D0A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1CC80.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1CC80.s deleted file mode 100644 index 6a03e69429..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1CC80.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_80D1CC80: -/* 80D1CC80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1CC84 7C 08 02 A6 */ mflr r0 -/* 80D1CC88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1CC8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D1CC90 93 C1 00 08 */ stw r30, 8(r1) -/* 80D1CC94 7C 7F 1B 78 */ mr r31, r3 -/* 80D1CC98 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D1CC9C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D1CCA0 40 82 00 A4 */ bne lbl_80D1CD44 -/* 80D1CCA4 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D1CCA8 41 82 00 90 */ beq lbl_80D1CD38 -/* 80D1CCAC 7C 1E 03 78 */ mr r30, r0 -/* 80D1CCB0 4B 2F BE B5 */ bl __ct__10fopAc_ac_cFv -/* 80D1CCB4 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80D1CCB8 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80D1CCBC 90 1E 05 80 */ stw r0, 0x580(r30) -/* 80D1CCC0 38 7E 05 84 */ addi r3, r30, 0x584 -/* 80D1CCC4 4B 36 6A 9D */ bl __ct__10dCcD_GSttsFv -/* 80D1CCC8 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80D1CCCC 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80D1CCD0 90 7E 05 80 */ stw r3, 0x580(r30) -/* 80D1CCD4 38 03 00 20 */ addi r0, r3, 0x20 -/* 80D1CCD8 90 1E 05 84 */ stw r0, 0x584(r30) -/* 80D1CCDC 3B DE 05 A4 */ addi r30, r30, 0x5a4 -/* 80D1CCE0 7F C3 F3 78 */ mr r3, r30 -/* 80D1CCE4 4B 36 6D 45 */ bl __ct__12dCcD_GObjInfFv -/* 80D1CCE8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80D1CCEC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80D1CCF0 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D1CCF4 3C 60 80 D2 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D1D4F4@ha */ -/* 80D1CCF8 38 03 D4 F4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D1D4F4@l */ -/* 80D1CCFC 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80D1CD00 38 7E 01 24 */ addi r3, r30, 0x124 -/* 80D1CD04 4B 55 22 85 */ bl __ct__8cM3dGCpsFv -/* 80D1CD08 3C 60 80 3C */ lis r3, __vt__12cCcD_CpsAttr@ha /* 0x803C3608@ha */ -/* 80D1CD0C 38 63 36 08 */ addi r3, r3, __vt__12cCcD_CpsAttr@l /* 0x803C3608@l */ -/* 80D1CD10 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80D1CD14 38 03 00 58 */ addi r0, r3, 0x58 -/* 80D1CD18 90 1E 01 3C */ stw r0, 0x13c(r30) -/* 80D1CD1C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cps@ha /* 0x803AC170@ha */ -/* 80D1CD20 38 63 C1 70 */ addi r3, r3, __vt__8dCcD_Cps@l /* 0x803AC170@l */ -/* 80D1CD24 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80D1CD28 38 03 00 2C */ addi r0, r3, 0x2c -/* 80D1CD2C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80D1CD30 38 03 00 84 */ addi r0, r3, 0x84 -/* 80D1CD34 90 1E 01 3C */ stw r0, 0x13c(r30) -lbl_80D1CD38: -/* 80D1CD38 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D1CD3C 60 00 00 08 */ ori r0, r0, 8 -/* 80D1CD40 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D1CD44: -/* 80D1CD44 7F E3 FB 78 */ mr r3, r31 -/* 80D1CD48 4B FF FC 45 */ bl Create__12daObjTrnd2_cFv -/* 80D1CD4C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1CD50 40 82 00 0C */ bne lbl_80D1CD5C -/* 80D1CD54 38 60 00 05 */ li r3, 5 -/* 80D1CD58 48 00 00 08 */ b lbl_80D1CD60 -lbl_80D1CD5C: -/* 80D1CD5C 38 60 00 04 */ li r3, 4 -lbl_80D1CD60: -/* 80D1CD60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D1CD64 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D1CD68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1CD6C 7C 08 03 A6 */ mtlr r0 -/* 80D1CD70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1CD74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1D3B0.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1D3B0.s deleted file mode 100644 index 85993f3da8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1D3B0.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1D3B0: -/* 80D1D3B0 80 83 00 00 */ lwz r4, 0(r3) -/* 80D1D3B4 2C 04 00 00 */ cmpwi r4, 0 -/* 80D1D3B8 41 82 00 0C */ beq lbl_80D1D3C4 -/* 80D1D3BC 38 04 FF FF */ addi r0, r4, -1 -/* 80D1D3C0 90 03 00 00 */ stw r0, 0(r3) -lbl_80D1D3C4: -/* 80D1D3C4 80 63 00 00 */ lwz r3, 0(r3) -/* 80D1D3C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/initBaseMtx__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/initBaseMtx__12daObjTrnd2_cFv.s deleted file mode 100644 index 6253df47c1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/initBaseMtx__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D1C924: -/* 80D1C924 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C928 7C 08 02 A6 */ mflr r0 -/* 80D1C92C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C930 48 00 00 15 */ bl setBaseMtx__12daObjTrnd2_cFv -/* 80D1C934 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C938 7C 08 03 A6 */ mtlr r0 -/* 80D1C93C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C940 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/movePntWind__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/movePntWind__12daObjTrnd2_cFv.s deleted file mode 100644 index b4da755a28..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/movePntWind__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,143 +0,0 @@ -lbl_80D1C570: -/* 80D1C570 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80D1C574 7C 08 02 A6 */ mflr r0 -/* 80D1C578 90 01 00 44 */ stw r0, 0x44(r1) -/* 80D1C57C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80D1C580 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80D1C584 7C 7E 1B 78 */ mr r30, r3 -/* 80D1C588 3C 60 80 D2 */ lis r3, l_R02_eff_id@ha /* 0x80D1D3D4@ha */ -/* 80D1C58C 3B E3 D3 D4 */ addi r31, r3, l_R02_eff_id@l /* 0x80D1D3D4@l */ -/* 80D1C590 C0 1E 06 E8 */ lfs f0, 0x6e8(r30) -/* 80D1C594 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D1C598 C0 1E 06 EC */ lfs f0, 0x6ec(r30) -/* 80D1C59C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80D1C5A0 C0 1E 06 F0 */ lfs f0, 0x6f0(r30) -/* 80D1C5A4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80D1C5A8 C0 1E 06 F4 */ lfs f0, 0x6f4(r30) -/* 80D1C5AC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80D1C5B0 C0 1E 06 F8 */ lfs f0, 0x6f8(r30) -/* 80D1C5B4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80D1C5B8 C0 1E 06 FC */ lfs f0, 0x6fc(r30) -/* 80D1C5BC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D1C5C0 38 61 00 24 */ addi r3, r1, 0x24 -/* 80D1C5C4 38 81 00 18 */ addi r4, r1, 0x18 -/* 80D1C5C8 38 A1 00 0C */ addi r5, r1, 0xc -/* 80D1C5CC 4B 33 F1 95 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz -/* 80D1C5D0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80D1C5D4 D0 1E 07 48 */ stfs f0, 0x748(r30) -/* 80D1C5D8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80D1C5DC D0 1E 07 4C */ stfs f0, 0x74c(r30) -/* 80D1C5E0 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80D1C5E4 D0 1E 07 50 */ stfs f0, 0x750(r30) -/* 80D1C5E8 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80D1C5EC C0 1E 07 00 */ lfs f0, 0x700(r30) -/* 80D1C5F0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D1C5F4 D0 1E 07 54 */ stfs f0, 0x754(r30) -/* 80D1C5F8 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80D1C5FC D0 1E 07 5C */ stfs f0, 0x75c(r30) -/* 80D1C600 C0 7E 07 54 */ lfs f3, 0x754(r30) -/* 80D1C604 38 7E 07 3C */ addi r3, r30, 0x73c -/* 80D1C608 C0 3E 06 F4 */ lfs f1, 0x6f4(r30) -/* 80D1C60C C0 5F 00 40 */ lfs f2, 0x40(r31) -/* 80D1C610 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80D1C614 EC 80 00 F2 */ fmuls f4, f0, f3 -/* 80D1C618 4B 55 33 65 */ bl cLib_addCalc__FPfffff -/* 80D1C61C C0 7E 07 54 */ lfs f3, 0x754(r30) -/* 80D1C620 38 7E 07 40 */ addi r3, r30, 0x740 -/* 80D1C624 C0 3E 06 F8 */ lfs f1, 0x6f8(r30) -/* 80D1C628 C0 5F 00 40 */ lfs f2, 0x40(r31) -/* 80D1C62C C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80D1C630 EC 80 00 F2 */ fmuls f4, f0, f3 -/* 80D1C634 4B 55 33 49 */ bl cLib_addCalc__FPfffff -/* 80D1C638 C0 7E 07 54 */ lfs f3, 0x754(r30) -/* 80D1C63C 38 7E 07 44 */ addi r3, r30, 0x744 -/* 80D1C640 C0 3E 06 FC */ lfs f1, 0x6fc(r30) -/* 80D1C644 C0 5F 00 40 */ lfs f2, 0x40(r31) -/* 80D1C648 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80D1C64C EC 80 00 F2 */ fmuls f4, f0, f3 -/* 80D1C650 4B 55 33 2D */ bl cLib_addCalc__FPfffff -/* 80D1C654 38 7E 07 3C */ addi r3, r30, 0x73c -/* 80D1C658 38 9E 06 F4 */ addi r4, r30, 0x6f4 -/* 80D1C65C 4B 62 AD 41 */ bl PSVECSquareDistance -/* 80D1C660 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80D1C664 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D1C668 40 81 00 58 */ ble lbl_80D1C6C0 -/* 80D1C66C FC 00 08 34 */ frsqrte f0, f1 -/* 80D1C670 C8 9F 00 48 */ lfd f4, 0x48(r31) -/* 80D1C674 FC 44 00 32 */ fmul f2, f4, f0 -/* 80D1C678 C8 7F 00 50 */ lfd f3, 0x50(r31) -/* 80D1C67C FC 00 00 32 */ fmul f0, f0, f0 -/* 80D1C680 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D1C684 FC 03 00 28 */ fsub f0, f3, f0 -/* 80D1C688 FC 02 00 32 */ fmul f0, f2, f0 -/* 80D1C68C FC 44 00 32 */ fmul f2, f4, f0 -/* 80D1C690 FC 00 00 32 */ fmul f0, f0, f0 -/* 80D1C694 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D1C698 FC 03 00 28 */ fsub f0, f3, f0 -/* 80D1C69C FC 02 00 32 */ fmul f0, f2, f0 -/* 80D1C6A0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80D1C6A4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80D1C6A8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D1C6AC FC 03 00 28 */ fsub f0, f3, f0 -/* 80D1C6B0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80D1C6B4 FC 21 00 32 */ fmul f1, f1, f0 -/* 80D1C6B8 FC 20 08 18 */ frsp f1, f1 -/* 80D1C6BC 48 00 00 88 */ b lbl_80D1C744 -lbl_80D1C6C0: -/* 80D1C6C0 C8 1F 00 58 */ lfd f0, 0x58(r31) -/* 80D1C6C4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D1C6C8 40 80 00 10 */ bge lbl_80D1C6D8 -/* 80D1C6CC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80D1C6D0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80D1C6D4 48 00 00 70 */ b lbl_80D1C744 -lbl_80D1C6D8: -/* 80D1C6D8 D0 21 00 08 */ stfs f1, 8(r1) -/* 80D1C6DC 80 81 00 08 */ lwz r4, 8(r1) -/* 80D1C6E0 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80D1C6E4 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80D1C6E8 7C 03 00 00 */ cmpw r3, r0 -/* 80D1C6EC 41 82 00 14 */ beq lbl_80D1C700 -/* 80D1C6F0 40 80 00 40 */ bge lbl_80D1C730 -/* 80D1C6F4 2C 03 00 00 */ cmpwi r3, 0 -/* 80D1C6F8 41 82 00 20 */ beq lbl_80D1C718 -/* 80D1C6FC 48 00 00 34 */ b lbl_80D1C730 -lbl_80D1C700: -/* 80D1C700 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80D1C704 41 82 00 0C */ beq lbl_80D1C710 -/* 80D1C708 38 00 00 01 */ li r0, 1 -/* 80D1C70C 48 00 00 28 */ b lbl_80D1C734 -lbl_80D1C710: -/* 80D1C710 38 00 00 02 */ li r0, 2 -/* 80D1C714 48 00 00 20 */ b lbl_80D1C734 -lbl_80D1C718: -/* 80D1C718 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80D1C71C 41 82 00 0C */ beq lbl_80D1C728 -/* 80D1C720 38 00 00 05 */ li r0, 5 -/* 80D1C724 48 00 00 10 */ b lbl_80D1C734 -lbl_80D1C728: -/* 80D1C728 38 00 00 03 */ li r0, 3 -/* 80D1C72C 48 00 00 08 */ b lbl_80D1C734 -lbl_80D1C730: -/* 80D1C730 38 00 00 04 */ li r0, 4 -lbl_80D1C734: -/* 80D1C734 2C 00 00 01 */ cmpwi r0, 1 -/* 80D1C738 40 82 00 0C */ bne lbl_80D1C744 -/* 80D1C73C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80D1C740 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80D1C744: -/* 80D1C744 C0 1E 07 54 */ lfs f0, 0x754(r30) -/* 80D1C748 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D1C74C 40 80 00 1C */ bge lbl_80D1C768 -/* 80D1C750 C0 1E 06 E8 */ lfs f0, 0x6e8(r30) -/* 80D1C754 D0 1E 07 3C */ stfs f0, 0x73c(r30) -/* 80D1C758 C0 1E 06 EC */ lfs f0, 0x6ec(r30) -/* 80D1C75C D0 1E 07 40 */ stfs f0, 0x740(r30) -/* 80D1C760 C0 1E 06 F0 */ lfs f0, 0x6f0(r30) -/* 80D1C764 D0 1E 07 44 */ stfs f0, 0x744(r30) -lbl_80D1C768: -/* 80D1C768 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80D1C76C 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80D1C770 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80D1C774 7C 08 03 A6 */ mtlr r0 -/* 80D1C778 38 21 00 40 */ addi r1, r1, 0x40 -/* 80D1C77C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setBaseMtx__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setBaseMtx__12daObjTrnd2_cFv.s deleted file mode 100644 index 66f007c039..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setBaseMtx__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80D1C944: -/* 80D1C944 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C948 7C 08 02 A6 */ mflr r0 -/* 80D1C94C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C950 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D1C954 7C 7F 1B 78 */ mr r31, r3 -/* 80D1C958 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80D1C95C 4B 2F 04 09 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80D1C960 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80D1C964 4B 2F 05 E1 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80D1C968 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D1C96C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D1C970 38 9F 07 08 */ addi r4, r31, 0x708 -/* 80D1C974 4B 62 9B 3D */ bl PSMTXCopy -/* 80D1C978 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D1C97C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C980 7C 08 03 A6 */ mtlr r0 -/* 80D1C984 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C988 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setCpsInfo__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setCpsInfo__12daObjTrnd2_cFv.s deleted file mode 100644 index 0116c6dcaf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setCpsInfo__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_80D1C780: -/* 80D1C780 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80D1C784 7C 08 02 A6 */ mflr r0 -/* 80D1C788 90 01 00 64 */ stw r0, 0x64(r1) -/* 80D1C78C DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80D1C790 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80D1C794 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80D1C798 93 C1 00 48 */ stw r30, 0x48(r1) -/* 80D1C79C 7C 7E 1B 78 */ mr r30, r3 -/* 80D1C7A0 3C 60 80 D2 */ lis r3, l_R02_eff_id@ha /* 0x80D1D3D4@ha */ -/* 80D1C7A4 3B E3 D3 D4 */ addi r31, r3, l_R02_eff_id@l /* 0x80D1D3D4@l */ -/* 80D1C7A8 38 7E 07 04 */ addi r3, r30, 0x704 -/* 80D1C7AC C0 3E 07 38 */ lfs f1, 0x738(r30) -/* 80D1C7B0 C0 7F 00 60 */ lfs f3, 0x60(r31) -/* 80D1C7B4 C0 5E 07 6C */ lfs f2, 0x76c(r30) -/* 80D1C7B8 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80D1C7BC EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D1C7C0 EC 43 00 32 */ fmuls f2, f3, f0 -/* 80D1C7C4 4B 55 3F 7D */ bl cLib_chaseF__FPfff -/* 80D1C7C8 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80D1C7CC D0 3E 06 F4 */ stfs f1, 0x6f4(r30) -/* 80D1C7D0 C0 1E 07 04 */ lfs f0, 0x704(r30) -/* 80D1C7D4 D0 1E 06 F8 */ stfs f0, 0x6f8(r30) -/* 80D1C7D8 D0 3E 06 FC */ stfs f1, 0x6fc(r30) -/* 80D1C7DC C0 1E 06 E8 */ lfs f0, 0x6e8(r30) -/* 80D1C7E0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80D1C7E4 C0 1E 06 EC */ lfs f0, 0x6ec(r30) -/* 80D1C7E8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80D1C7EC C0 1E 06 F0 */ lfs f0, 0x6f0(r30) -/* 80D1C7F0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80D1C7F4 38 61 00 14 */ addi r3, r1, 0x14 -/* 80D1C7F8 4B 2F 05 6D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80D1C7FC 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80D1C800 4B 2F 07 45 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80D1C804 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D1C808 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D1C80C 38 9E 06 F4 */ addi r4, r30, 0x6f4 -/* 80D1C810 7C 85 23 78 */ mr r5, r4 -/* 80D1C814 4B 62 A5 59 */ bl PSMTXMultVec -/* 80D1C818 38 7E 06 C8 */ addi r3, r30, 0x6c8 -/* 80D1C81C 38 9E 06 E8 */ addi r4, r30, 0x6e8 -/* 80D1C820 4B 55 28 1D */ bl Set__8cM3dGCpsFRC9cM3dGCpsS -/* 80D1C824 C3 FF 00 64 */ lfs f31, 0x64(r31) -/* 80D1C828 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80D1C82C 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80D1C830 28 00 00 FF */ cmplwi r0, 0xff -/* 80D1C834 41 82 00 1C */ beq lbl_80D1C850 -/* 80D1C838 C8 3F 00 68 */ lfd f1, 0x68(r31) -/* 80D1C83C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 80D1C840 3C 00 43 30 */ lis r0, 0x4330 -/* 80D1C844 90 01 00 38 */ stw r0, 0x38(r1) -/* 80D1C848 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 80D1C84C EF E0 08 28 */ fsubs f31, f0, f1 -lbl_80D1C850: -/* 80D1C850 C0 3E 06 F4 */ lfs f1, 0x6f4(r30) -/* 80D1C854 C0 1E 06 E8 */ lfs f0, 0x6e8(r30) -/* 80D1C858 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D1C85C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80D1C860 C0 3E 06 F8 */ lfs f1, 0x6f8(r30) -/* 80D1C864 C0 1E 06 EC */ lfs f0, 0x6ec(r30) -/* 80D1C868 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D1C86C D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80D1C870 C0 3E 06 FC */ lfs f1, 0x6fc(r30) -/* 80D1C874 C0 1E 06 F0 */ lfs f0, 0x6f0(r30) -/* 80D1C878 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80D1C87C D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80D1C880 38 61 00 2C */ addi r3, r1, 0x2c -/* 80D1C884 4B 54 A8 29 */ bl isZero__4cXyzCFv -/* 80D1C888 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D1C88C 40 82 00 14 */ bne lbl_80D1C8A0 -/* 80D1C890 38 61 00 08 */ addi r3, r1, 8 -/* 80D1C894 38 81 00 2C */ addi r4, r1, 0x2c -/* 80D1C898 4B 54 A6 5D */ bl normalize__4cXyzFv -/* 80D1C89C 48 00 00 20 */ b lbl_80D1C8BC -lbl_80D1C8A0: -/* 80D1C8A0 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80D1C8A4 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 80D1C8A8 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80D1C8AC C0 03 00 04 */ lfs f0, 4(r3) -/* 80D1C8B0 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80D1C8B4 C0 03 00 08 */ lfs f0, 8(r3) -/* 80D1C8B8 D0 01 00 34 */ stfs f0, 0x34(r1) -lbl_80D1C8BC: -/* 80D1C8BC C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80D1C8C0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D1C8C4 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80D1C8C8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D1C8CC C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80D1C8D0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80D1C8D4 38 61 00 2C */ addi r3, r1, 0x2c -/* 80D1C8D8 7C 64 1B 78 */ mr r4, r3 -/* 80D1C8DC FC 20 F8 90 */ fmr f1, f31 -/* 80D1C8E0 4B 62 A7 F9 */ bl PSVECScale -/* 80D1C8E4 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80D1C8E8 D0 1E 06 28 */ stfs f0, 0x628(r30) -/* 80D1C8EC C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80D1C8F0 D0 1E 06 2C */ stfs f0, 0x62c(r30) -/* 80D1C8F4 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80D1C8F8 D0 1E 06 30 */ stfs f0, 0x630(r30) -/* 80D1C8FC 7F C3 F3 78 */ mr r3, r30 -/* 80D1C900 4B FF FC 71 */ bl movePntWind__12daObjTrnd2_cFv -/* 80D1C904 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80D1C908 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80D1C90C 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 80D1C910 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 80D1C914 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80D1C918 7C 08 03 A6 */ mtlr r0 -/* 80D1C91C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80D1C920 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setParticle__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setParticle__12daObjTrnd2_cFv.s deleted file mode 100644 index 2c750f629e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setParticle__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_80D1D0AC: -/* 80D1D0AC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80D1D0B0 7C 08 02 A6 */ mflr r0 -/* 80D1D0B4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80D1D0B8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80D1D0BC 4B 64 51 15 */ bl _savegpr_26 -/* 80D1D0C0 7C 7A 1B 78 */ mr r26, r3 -/* 80D1D0C4 3C 60 80 D2 */ lis r3, l_R02_eff_id@ha /* 0x80D1D3D4@ha */ -/* 80D1D0C8 3B A3 D3 D4 */ addi r29, r3, l_R02_eff_id@l /* 0x80D1D3D4@l */ -/* 80D1D0CC 3B 80 00 00 */ li r28, 0 -/* 80D1D0D0 88 1A 04 E2 */ lbz r0, 0x4e2(r26) -/* 80D1D0D4 7C 00 07 74 */ extsb r0, r0 -/* 80D1D0D8 2C 00 00 06 */ cmpwi r0, 6 -/* 80D1D0DC 41 82 01 20 */ beq lbl_80D1D1FC -/* 80D1D0E0 40 80 00 2C */ bge lbl_80D1D10C -/* 80D1D0E4 2C 00 00 02 */ cmpwi r0, 2 -/* 80D1D0E8 41 82 00 50 */ beq lbl_80D1D138 -/* 80D1D0EC 40 80 00 10 */ bge lbl_80D1D0FC -/* 80D1D0F0 2C 00 00 00 */ cmpwi r0, 0 -/* 80D1D0F4 41 82 01 08 */ beq lbl_80D1D1FC -/* 80D1D0F8 48 00 00 74 */ b lbl_80D1D16C -lbl_80D1D0FC: -/* 80D1D0FC 2C 00 00 04 */ cmpwi r0, 4 -/* 80D1D100 41 82 00 40 */ beq lbl_80D1D140 -/* 80D1D104 40 80 00 44 */ bge lbl_80D1D148 -/* 80D1D108 48 00 00 F4 */ b lbl_80D1D1FC -lbl_80D1D10C: -/* 80D1D10C 2C 00 00 0E */ cmpwi r0, 0xe -/* 80D1D110 41 82 00 48 */ beq lbl_80D1D158 -/* 80D1D114 40 80 00 18 */ bge lbl_80D1D12C -/* 80D1D118 2C 00 00 0D */ cmpwi r0, 0xd -/* 80D1D11C 40 80 00 E0 */ bge lbl_80D1D1FC -/* 80D1D120 2C 00 00 09 */ cmpwi r0, 9 -/* 80D1D124 40 80 00 48 */ bge lbl_80D1D16C -/* 80D1D128 48 00 00 28 */ b lbl_80D1D150 -lbl_80D1D12C: -/* 80D1D12C 2C 00 00 33 */ cmpwi r0, 0x33 -/* 80D1D130 41 82 00 30 */ beq lbl_80D1D160 -/* 80D1D134 48 00 00 38 */ b lbl_80D1D16C -lbl_80D1D138: -/* 80D1D138 3B 9D 00 00 */ addi r28, r29, 0 -/* 80D1D13C 48 00 00 30 */ b lbl_80D1D16C -lbl_80D1D140: -/* 80D1D140 3B 9D 00 08 */ addi r28, r29, 8 -/* 80D1D144 48 00 00 28 */ b lbl_80D1D16C -lbl_80D1D148: -/* 80D1D148 3B 9D 00 10 */ addi r28, r29, 0x10 -/* 80D1D14C 48 00 00 20 */ b lbl_80D1D16C -lbl_80D1D150: -/* 80D1D150 3B 9D 00 18 */ addi r28, r29, 0x18 -/* 80D1D154 48 00 00 18 */ b lbl_80D1D16C -lbl_80D1D158: -/* 80D1D158 3B 9D 00 20 */ addi r28, r29, 0x20 -/* 80D1D15C 48 00 00 10 */ b lbl_80D1D16C -lbl_80D1D160: -/* 80D1D160 3B 9D 00 28 */ addi r28, r29, 0x28 -/* 80D1D164 48 00 00 08 */ b lbl_80D1D16C -/* 80D1D168 48 00 00 94 */ b lbl_80D1D1FC -lbl_80D1D16C: -/* 80D1D16C 3B 60 00 00 */ li r27, 0 -/* 80D1D170 3B E0 00 00 */ li r31, 0 -/* 80D1D174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D1D178 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_80D1D17C: -/* 80D1D17C A0 BC 00 00 */ lhz r5, 0(r28) -/* 80D1D180 28 05 FF FF */ cmplwi r5, 0xffff -/* 80D1D184 41 82 00 50 */ beq lbl_80D1D1D4 -/* 80D1D188 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80D1D18C 38 80 00 00 */ li r4, 0 -/* 80D1D190 90 81 00 08 */ stw r4, 8(r1) -/* 80D1D194 38 00 FF FF */ li r0, -1 -/* 80D1D198 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D1D19C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80D1D1A0 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D1D1A4 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D1D1A8 38 80 00 00 */ li r4, 0 -/* 80D1D1AC 38 DA 04 D0 */ addi r6, r26, 0x4d0 -/* 80D1D1B0 38 E0 00 00 */ li r7, 0 -/* 80D1D1B4 39 1A 04 B4 */ addi r8, r26, 0x4b4 -/* 80D1D1B8 39 20 00 00 */ li r9, 0 -/* 80D1D1BC 39 40 00 FF */ li r10, 0xff -/* 80D1D1C0 C0 3D 00 34 */ lfs f1, 0x34(r29) -/* 80D1D1C4 4B 32 F8 CD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D1D1C8 38 1F 07 7C */ addi r0, r31, 0x77c -/* 80D1D1CC 7C 7A 01 2E */ stwx r3, r26, r0 -/* 80D1D1D0 48 00 00 10 */ b lbl_80D1D1E0 -lbl_80D1D1D4: -/* 80D1D1D4 38 60 00 00 */ li r3, 0 -/* 80D1D1D8 38 1F 07 7C */ addi r0, r31, 0x77c -/* 80D1D1DC 7C 7A 01 2E */ stwx r3, r26, r0 -lbl_80D1D1E0: -/* 80D1D1E0 3B 7B 00 01 */ addi r27, r27, 1 -/* 80D1D1E4 2C 1B 00 03 */ cmpwi r27, 3 -/* 80D1D1E8 3B 9C 00 02 */ addi r28, r28, 2 -/* 80D1D1EC 3B FF 00 04 */ addi r31, r31, 4 -/* 80D1D1F0 41 80 FF 8C */ blt lbl_80D1D17C -/* 80D1D1F4 7F 43 D3 78 */ mr r3, r26 -/* 80D1D1F8 48 00 00 B5 */ bl stopParticle__12daObjTrnd2_cFv -lbl_80D1D1FC: -/* 80D1D1FC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80D1D200 4B 64 50 1D */ bl _restgpr_26 -/* 80D1D204 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80D1D208 7C 08 03 A6 */ mtlr r0 -/* 80D1D20C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80D1D210 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setPntWind__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setPntWind__12daObjTrnd2_cFv.s deleted file mode 100644 index 057df70465..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setPntWind__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80D1C4D8: -/* 80D1C4D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D1C4DC 7C 08 02 A6 */ mflr r0 -/* 80D1C4E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D1C4E4 3C 80 80 D2 */ lis r4, l_R02_eff_id@ha /* 0x80D1D3D4@ha */ -/* 80D1C4E8 38 84 D3 D4 */ addi r4, r4, l_R02_eff_id@l /* 0x80D1D3D4@l */ -/* 80D1C4EC C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80D1C4F0 D0 03 07 3C */ stfs f0, 0x73c(r3) -/* 80D1C4F4 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80D1C4F8 D0 03 07 40 */ stfs f0, 0x740(r3) -/* 80D1C4FC C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80D1C500 D0 03 07 44 */ stfs f0, 0x744(r3) -/* 80D1C504 C0 44 00 30 */ lfs f2, 0x30(r4) -/* 80D1C508 D0 43 07 48 */ stfs f2, 0x748(r3) -/* 80D1C50C C0 04 00 34 */ lfs f0, 0x34(r4) -/* 80D1C510 D0 03 07 4C */ stfs f0, 0x74c(r3) -/* 80D1C514 D0 43 07 50 */ stfs f2, 0x750(r3) -/* 80D1C518 C0 23 07 68 */ lfs f1, 0x768(r3) -/* 80D1C51C C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80D1C520 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D1C524 D0 03 07 54 */ stfs f0, 0x754(r3) -/* 80D1C528 D0 43 07 5C */ stfs f2, 0x75c(r3) -/* 80D1C52C C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80D1C530 D0 03 07 58 */ stfs f0, 0x758(r3) -/* 80D1C534 38 63 07 3C */ addi r3, r3, 0x73c -/* 80D1C538 4B 33 E8 C5 */ bl dKyw_pntwind_set__FP14WIND_INFLUENCE -/* 80D1C53C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D1C540 7C 08 03 A6 */ mtlr r0 -/* 80D1C544 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D1C548 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/startParticle__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/startParticle__12daObjTrnd2_cFv.s deleted file mode 100644 index a9bcf0e272..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/startParticle__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D1D278: -/* 80D1D278 38 80 00 00 */ li r4, 0 -/* 80D1D27C 38 00 00 03 */ li r0, 3 -/* 80D1D280 7C 09 03 A6 */ mtctr r0 -lbl_80D1D284: -/* 80D1D284 38 04 07 7C */ addi r0, r4, 0x77c -/* 80D1D288 7C A3 00 2E */ lwzx r5, r3, r0 -/* 80D1D28C 28 05 00 00 */ cmplwi r5, 0 -/* 80D1D290 41 82 00 10 */ beq lbl_80D1D2A0 -/* 80D1D294 80 05 00 F4 */ lwz r0, 0xf4(r5) -/* 80D1D298 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 80D1D29C 90 05 00 F4 */ stw r0, 0xf4(r5) -lbl_80D1D2A0: -/* 80D1D2A0 38 84 00 04 */ addi r4, r4, 4 -/* 80D1D2A4 42 00 FF E0 */ bdnz lbl_80D1D284 -/* 80D1D2A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/stopParticle__12daObjTrnd2_cFv.s b/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/stopParticle__12daObjTrnd2_cFv.s deleted file mode 100644 index f38cdd6d6c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/stopParticle__12daObjTrnd2_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80D1D2AC: -/* 80D1D2AC 38 80 00 00 */ li r4, 0 -/* 80D1D2B0 38 00 00 03 */ li r0, 3 -/* 80D1D2B4 7C 09 03 A6 */ mtctr r0 -lbl_80D1D2B8: -/* 80D1D2B8 38 04 07 7C */ addi r0, r4, 0x77c -/* 80D1D2BC 7C A3 00 2E */ lwzx r5, r3, r0 -/* 80D1D2C0 28 05 00 00 */ cmplwi r5, 0 -/* 80D1D2C4 41 82 00 10 */ beq lbl_80D1D2D4 -/* 80D1D2C8 80 05 00 F4 */ lwz r0, 0xf4(r5) -/* 80D1D2CC 60 00 00 01 */ ori r0, r0, 1 -/* 80D1D2D0 90 05 00 F4 */ stw r0, 0xf4(r5) -lbl_80D1D2D4: -/* 80D1D2D4 38 84 00 04 */ addi r4, r4, 4 -/* 80D1D2D8 42 00 FF E0 */ bdnz lbl_80D1D2B8 -/* 80D1D2DC 4E 80 00 20 */ blr diff --git a/include/d/kankyo/d_kankyo_wether.h b/include/d/kankyo/d_kankyo_wether.h index 6fc28997a9..db05ee731e 100644 --- a/include/d/kankyo/d_kankyo_wether.h +++ b/include/d/kankyo/d_kankyo_wether.h @@ -31,6 +31,7 @@ void dKyw_wether_proc(); 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); +void dKyw_pntwind_set(WIND_INFLUENCE* i_pntwind); class dKankyo_sun_Packet : public J3DPacket { public: diff --git a/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h b/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h index f9a1a386db..484564096c 100644 --- a/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h +++ b/include/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.h @@ -5,4 +5,33 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +class daObjTrnd_c : public fopAc_ac_c { +public: + /* 80D1B998 */ void setPntWind(); + /* 80D1BA0C */ void cutPntWind(); + /* 80D1BA30 */ void movePntWind(); + /* 80D1BC40 */ void setCpsInfo(); + /* 80D1BE04 */ void initBaseMtx(); + /* 80D1BE24 */ void setBaseMtx(); + /* 80D1BE6C */ int Create(); + /* 80D1BFB0 */ int create(); + /* 80D1C0F0 */ int execute(); + /* 80D1C290 */ int draw(); + /* 80D1C298 */ int _delete(); + + u32 checkSE() { return fopAcM_GetParamBit(this, 8, 1); } + u32 getTimer() { return fopAcM_GetParamBit(this, 0, 8); } + u32 getSwbit() { return fopAcM_GetParamBit(this, 0x18, 8); } + + /* 0x568 */ dCcD_Stts mStts; + /* 0x5A4 */ dCcD_Cps mCps; + /* 0x6E8 */ cM3dGCpsS field_0x6e8; + /* 0x704 */ f32 field_0x704; + /* 0x708 */ Mtx field_0x708; + /* 0x738 */ s16 field_0x738; + /* 0x73C */ f32 field_0x73c; + /* 0x740 */ WIND_INFLUENCE mWindInfluence; + /* 0x76C */ f32 mWindPower; +}; // Size: 0x770 + #endif /* D_A_OBJ_TORNADO_H */ diff --git a/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h b/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h index 54b6ecb322..5c8136998f 100644 --- a/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h +++ b/include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h @@ -2,7 +2,8 @@ #define D_A_OBJ_TORNADO2_H #include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" struct daObjTrnd2_c : public fopAc_ac_c { /* 80D1C4D8 */ void setPntWind(); @@ -11,27 +12,39 @@ struct daObjTrnd2_c : public fopAc_ac_c { /* 80D1C780 */ void setCpsInfo(); /* 80D1C924 */ void initBaseMtx(); /* 80D1C944 */ void setBaseMtx(); - /* 80D1C98C */ void Create(); - /* 80D1CC80 */ void create(); - /* 80D1CDC0 */ void execute(); + /* 80D1C98C */ int Create(); + /* 80D1CC80 */ int create(); + /* 80D1CDC0 */ int execute(); /* 80D1D0AC */ void setParticle(); /* 80D1D214 */ void endParticle(); /* 80D1D278 */ void startParticle(); /* 80D1D2AC */ void stopParticle(); - /* 80D1D2E0 */ bool draw(); - /* 80D1D2E8 */ void _delete(); + /* 80D1D2E0 */ int draw(); + /* 80D1D2E8 */ int _delete(); f32 getTargetLength() { return field_0x738; } f32 getNowLength() { return field_0x704; } - cXyz& getWindEndPos() { return field_0x6f4; } + Vec& getWindEndPos() { return field_0x6e8.mEnd; } + u32 getPower() { return fopAcM_GetParamBit(this, 8, 8); } + u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + u32 getSwType() { return fopAcM_GetParamBit(this, 16, 4); } + u32 getOffTime() { return fopAcM_GetParamBit(this, 20, 4); } + u32 getOnTime() { return fopAcM_GetParamBit(this, 24, 4); } + u32 getScale() { return fopAcM_GetParamBit(this, 28, 1); } - - u8 field_0x568[0x6f4-0x568]; - cXyz field_0x6f4; - u32 field_0x700; - f32 field_0x704; - u8 field_0x708[0x738-0x708]; - f32 field_0x738; + /* 0x568 */ dCcD_Stts mStts; + /* 0x5A4 */ dCcD_Cps mCps; + /* 0x6E8 */ cM3dGCpsS field_0x6e8; + /* 0x704 */ f32 field_0x704; + /* 0x708 */ Mtx field_0x708; + /* 0x738 */ f32 field_0x738; + /* 0x73C */ WIND_INFLUENCE mWindInfluence; + /* 0x768 */ f32 field_0x768; + /* 0x76C */ f32 field_0x76c; + /* 0x770 */ int mTimer; + /* 0x774 */ f32 mWindPower; + /* 0x778 */ bool field_0x778; + /* 0x778 */ JPABaseEmitter* mParticles[3]; }; #endif /* D_A_OBJ_TORNADO2_H */ diff --git a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp index 95b17356df..6192cc5f6c 100644 --- a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp +++ b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp @@ -7,39 +7,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" #include "dol2asm.h" - -class daObjTrnd_c : public fopAc_ac_c { -public: - /* 80D1B998 */ void setPntWind(); - /* 80D1BA0C */ void cutPntWind(); - /* 80D1BA30 */ void movePntWind(); - /* 80D1BC40 */ void setCpsInfo(); - /* 80D1BE04 */ void initBaseMtx(); - /* 80D1BE24 */ void setBaseMtx(); - /* 80D1BE6C */ int Create(); - /* 80D1BFB0 */ int create(); - /* 80D1C0F0 */ int execute(); - /* 80D1C290 */ int draw(); - /* 80D1C298 */ int _delete(); - - u32 checkSE() { return fopAcM_GetParamBit(this, 8, 1); } - u32 getTimer() { return fopAcM_GetParamBit(this, 0, 8); } - u32 getSwbit() { return fopAcM_GetParamBit(this, 0x18, 8); } - - /* 0x568 */ dCcD_Stts mStts; - /* 0x5A4 */ dCcD_Cps mCps; - /* 0x6E8 */ Vec field_0x6e8; - /* 0x6F4 */ f32 field_0x6f4; - /* 0x6F8 */ f32 field_0x6f8; - /* 0x6FC */ f32 field_0x6fc; - /* 0x700 */ f32 field_0x700; - /* 0x704 */ f32 field_0x704; - /* 0x708 */ Mtx field_0x708; - /* 0x738 */ s16 field_0x738; - /* 0x73C */ f32 field_0x73c; - /* 0x740 */ WIND_INFLUENCE mWindInfluence; - /* 0x76C */ f32 field_0x76c; -}; // Size: 0x770 +#include "d/kankyo/d_kankyo_rain.h" // // Forward References: @@ -136,6 +104,19 @@ COMPILER_STRIP_GATE(0x80D1C360, &lit_3631); #pragma pop /* 80D1B998-80D1BA0C 000078 0074+00 2/2 0/0 0/0 .text setPntWind__11daObjTrnd_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daObjTrnd_c::setPntWind() { + mWindInfluence.position = current.pos; + mWindInfluence.mDirection.x = 0.0f; + mWindInfluence.mDirection.y = 1.0f; + mWindInfluence.mDirection.z = 0.0f; + mWindInfluence.mRadius = 300.0f * scale.x; + mWindInfluence.field_0x20 = 0.0f; + mWindInfluence.mStrength = 0.2f; + dKyw_pntwind_set(&mWindInfluence); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -144,16 +125,12 @@ asm void daObjTrnd_c::setPntWind() { #include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/setPntWind__11daObjTrnd_cFv.s" } #pragma pop +#endif /* 80D1BA0C-80D1BA30 0000EC 0024+00 2/2 0/0 0/0 .text cutPntWind__11daObjTrnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd_c::cutPntWind() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/cutPntWind__11daObjTrnd_cFv.s" +void daObjTrnd_c::cutPntWind() { + dKyw_pntwind_cut(&mWindInfluence); } -#pragma pop /* ############################################################################################## */ /* 80D1C364-80D1C368 000010 0004+00 0/1 0/0 0/0 .rodata @3679 */ @@ -209,6 +186,33 @@ COMPILER_STRIP_GATE(0x80D1C384, &lit_3684); #pragma pop /* 80D1BA30-80D1BC40 000110 0210+00 1/1 0/0 0/0 .text movePntWind__11daObjTrnd_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daObjTrnd_c::movePntWind() { + cXyz local_20; + cXyz local_2c; + cXyz cStack_38; + local_20.x = field_0x6e8.mStart.x; + local_20.y = field_0x6e8.mStart.y; + local_20.z = field_0x6e8.mStart.z; + local_2c.x = field_0x6e8.mEnd.x; + local_2c.y = field_0x6e8.mEnd.y; + local_2c.z = field_0x6e8.mEnd.z; + dKyr_get_vectle_calc(&local_20, &local_2c, &cStack_38); + mWindInfluence.mDirection = cStack_38; + mWindInfluence.mRadius = field_0x6e8.mRadius * 2.0f; + mWindInfluence.field_0x20 = 0.0f; + cLib_addCalc(&mWindInfluence.position.x, field_0x6e8.mEnd.x, 0.1f, mWindInfluence.mRadius, + mWindInfluence.mRadius * 0.5f); + cLib_addCalc(&mWindInfluence.position.y, field_0x6e8.mEnd.y, 0.1f, mWindInfluence.mRadius, + mWindInfluence.mRadius * 0.5f); + cLib_addCalc(&mWindInfluence.position.z, field_0x6e8.mEnd.z, 0.1f, mWindInfluence.mRadius, + mWindInfluence.mRadius * 0.5f); + if (mWindInfluence.position.abs(field_0x6e8.mEnd) < mWindInfluence.mRadius) { + mWindInfluence.position = field_0x6e8.mStart; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -217,6 +221,7 @@ asm void daObjTrnd_c::movePntWind() { #include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/movePntWind__11daObjTrnd_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80D1C38C-80D1C390 000038 0004+00 0/1 0/0 0/0 .rodata @3724 */ @@ -255,6 +260,34 @@ COMPILER_STRIP_GATE(0x80D1C39C, &lit_3728); #pragma pop /* 80D1BC40-80D1BE04 000320 01C4+00 1/1 0/0 0/0 .text setCpsInfo__11daObjTrnd_cFv */ +// Matches with literals +#ifdef NONMATCHING +void daObjTrnd_c::setCpsInfo() { + cLib_chaseF(&field_0x704, field_0x73c, scale.y * 3000.0f * 0.05f); + field_0x6e8.mEnd.x = 0; + field_0x6e8.mEnd.y = field_0x704; + field_0x6e8.mEnd.z = 0; + mDoMtx_stack_c::transS(field_0x6e8.mStart); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::multVec(&field_0x6e8.mEnd, &field_0x6e8.mEnd); + mCps.cM3dGCps::Set(field_0x6e8); + cXyz local_20; + local_20.x = field_0x6e8.mEnd.x - field_0x6e8.mStart.x; + local_20.y = field_0x6e8.mEnd.y - field_0x6e8.mStart.y; + local_20.z = field_0x6e8.mEnd.z - field_0x6e8.mStart.z; + if (!local_20.isZero()) { + local_20.normalize(); + } else { + local_20 = cXyz::Zero; + } + local_20 *= scale.z * 30.0f; + mCps.SetAtVec(local_20); + movePntWind(); + if (!checkSE()) { + mDoAud_seStartLevel(Z2SE_ENV_WIND_SARUDAN, 0, (field_0x704 / (scale.y * 3000.0f)) * 127.0f, 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -263,26 +296,19 @@ asm void daObjTrnd_c::setCpsInfo() { #include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/setCpsInfo__11daObjTrnd_cFv.s" } #pragma pop +#endif /* 80D1BE04-80D1BE24 0004E4 0020+00 1/1 0/0 0/0 .text initBaseMtx__11daObjTrnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/initBaseMtx__11daObjTrnd_cFv.s" +void daObjTrnd_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 80D1BE24-80D1BE6C 000504 0048+00 2/2 0/0 0/0 .text setBaseMtx__11daObjTrnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/setBaseMtx__11daObjTrnd_cFv.s" +void daObjTrnd_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + MTXCopy(mDoMtx_stack_c::get(), field_0x708); } -#pragma pop /* ############################################################################################## */ /* 80D1C3A0-80D1C3A4 00004C 0004+00 0/1 0/0 0/0 .rodata @3762 */ @@ -306,6 +332,42 @@ static dCcD_SrcCps l_cps_src = { }; /* 80D1BE6C-80D1BFB0 00054C 0144+00 1/1 0/0 0/0 .text Create__11daObjTrnd_cFv */ +// Matches with literals +#ifdef NONMATCHING +int daObjTrnd_c::Create() { + current.angle.z = 0; + shape_angle.z = 0; + home.angle.z = 0; + initBaseMtx(); + fopAcM_SetMtx(this, field_0x708); + mStts.Init(0xff, 0xff, this); + mCps.Set(l_cps_src); + mCps.SetStts(&mStts); + cXyz local_1c; + cXyz local_28; + local_1c.x = scale.x * -300.0f; + local_1c.y = 0.0; + local_1c.z = scale.x * -300.0f; + local_28.x = scale.x * 300.0f; + local_28.y = scale.y * 3000.0f; + local_28.z = scale.x * 300.0f; + fopAcM_setCullSizeBox(this, local_1c.x, 0, local_1c.z, + local_28.x, local_28.y, + local_28.z); + u32 timer = getTimer(); + if (timer == 0xff || timer == 0) { + field_0x738 = 0xffff; + } else { + field_0x738 = timer * 15; + } + field_0x6e8.mRadius = scale.x * 300.0f; + field_0x6e8.mStart = current.pos; + field_0x73c = scale.y * 3000.0f; + field_0x704 = field_0x73c; + setPntWind(); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -314,6 +376,7 @@ asm int daObjTrnd_c::Create() { #include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/Create__11daObjTrnd_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80D1C400-80D1C420 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTrnd_Method */ @@ -346,14 +409,13 @@ SECTION_DATA extern void* __vt__8cM3dGAab[3] = { }; /* 80D1BFB0-80D1C0A8 000690 00F8+00 1/1 0/0 0/0 .text create__11daObjTrnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjTrnd_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/func_80D1BFB0.s" +int daObjTrnd_c::create() { + fopAcM_SetupActor(this, daObjTrnd_c); + if (Create() == 0) { + return cPhs_ERROR_e; + } + return cPhs_COMPLEATE_e; } -#pragma pop /* 80D1C0A8-80D1C0F0 000788 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ #pragma push @@ -389,6 +451,43 @@ COMPILER_STRIP_GATE(0x80D1C3AC, &lit_3910); #pragma pop /* 80D1C0F0-80D1C290 0007D0 01A0+00 1/1 0/0 0/0 .text execute__11daObjTrnd_cFv */ +// regalloc +#ifdef NONMATCHING +int daObjTrnd_c::execute() { + if (getSwbit() != 0xff && !fopAcM_isSwitch(this, getSwbit())) { + if (field_0x73c != 0.0f) { + field_0x73c = 0; + cutPntWind(); + } + cLib_addCalc(&mWindPower, 0.3f, 0.2f, 0.1f, 0.001f); + } else if (field_0x738 > 0) { + field_0x738--; + if (field_0x73c == 0.0f) { + cLib_addCalc(&mWindPower, 0.3f, 0.2f, 0.1f, 0.001f); + } else { + cLib_addCalc(&mWindPower, 0.9f, 0.5f, 0.1f, 0.001f); + } + } else if (field_0x738 == 0) { + field_0x738 = 15 * getTimer(); + if (field_0x73c == 0.0f) { + field_0x73c = scale.y * 3000.0f; + setPntWind(); + } else { + field_0x73c = 0.0f; + cutPntWind(); + } + } + dKyw_evt_wind_set(0, home.angle.y); + dKyw_custom_windpower(mWindPower); + setCpsInfo(); + setBaseMtx(); + if (field_0x704 != 0.0f) { + mCps.cM3dGCps::Set(field_0x6e8); + dComIfG_Ccsp()->Set(&mCps); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -397,6 +496,7 @@ asm int daObjTrnd_c::execute() { #include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/execute__11daObjTrnd_cFv.s" } #pragma pop +#endif /* 80D1C290-80D1C298 000970 0008+00 1/1 0/0 0/0 .text draw__11daObjTrnd_cFv */ int daObjTrnd_c::draw() { @@ -404,57 +504,34 @@ int daObjTrnd_c::draw() { } /* 80D1C298-80D1C2CC 000978 0034+00 1/1 0/0 0/0 .text _delete__11daObjTrnd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjTrnd_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/_delete__11daObjTrnd_cFv.s" +int daObjTrnd_c::_delete() { + dKy_getEnvlight()->mEvtWindSet = 0; + cutPntWind(); + return 1; } -#pragma pop /* 80D1C2CC-80D1C2EC 0009AC 0020+00 1/0 0/0 0/0 .text daObjTrnd_Draw__FP11daObjTrnd_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjTrnd_Draw(daObjTrnd_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Draw__FP11daObjTrnd_c.s" +static int daObjTrnd_Draw(daObjTrnd_c* i_this) { + return i_this->draw(); } -#pragma pop /* 80D1C2EC-80D1C30C 0009CC 0020+00 1/0 0/0 0/0 .text daObjTrnd_Execute__FP11daObjTrnd_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjTrnd_Execute(daObjTrnd_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Execute__FP11daObjTrnd_c.s" +static int daObjTrnd_Execute(daObjTrnd_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80D1C30C-80D1C32C 0009EC 0020+00 1/0 0/0 0/0 .text daObjTrnd_Delete__FP11daObjTrnd_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjTrnd_Delete(daObjTrnd_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Delete__FP11daObjTrnd_c.s" +static int daObjTrnd_Delete(daObjTrnd_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80D1C32C-80D1C34C 000A0C 0020+00 1/0 0/0 0/0 .text daObjTrnd_Create__FP11daObjTrnd_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjTrnd_Create(daObjTrnd_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado/daObjTrnd_Create__FP11daObjTrnd_c.s" +static int daObjTrnd_Create(daObjTrnd_c* i_this) { + return i_this->create(); } -#pragma pop /* ############################################################################################## */ /* 80D1C3B0-80D1C3B1 00005C 0001+00 0/0 0/0 0/0 .rodata None */ diff --git a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp index 91389de89e..9973c0c98d 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp +++ b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp @@ -1,379 +1,138 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_tornado2 +// Tornado 2 // #include "rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" +#include "d/com/d_com_inf_game.h" +#include "d/kankyo/d_kankyo_rain.h" +#include "SSystem/SComponent/c_math.h" -// -// Types: -// - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dPa_levelEcallBack {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -// -// Forward References: -// - -extern "C" void setPntWind__12daObjTrnd2_cFv(); -extern "C" void cutPntWind__12daObjTrnd2_cFv(); -extern "C" void movePntWind__12daObjTrnd2_cFv(); -extern "C" void setCpsInfo__12daObjTrnd2_cFv(); -extern "C" void initBaseMtx__12daObjTrnd2_cFv(); -extern "C" void setBaseMtx__12daObjTrnd2_cFv(); -extern "C" void Create__12daObjTrnd2_cFv(); -extern "C" void create__12daObjTrnd2_cFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void execute__12daObjTrnd2_cFv(); -extern "C" void setParticle__12daObjTrnd2_cFv(); -extern "C" void endParticle__12daObjTrnd2_cFv(); -extern "C" void startParticle__12daObjTrnd2_cFv(); -extern "C" void stopParticle__12daObjTrnd2_cFv(); -extern "C" bool draw__12daObjTrnd2_cFv(); -extern "C" void _delete__12daObjTrnd2_cFv(); -extern "C" static void daObjTrnd2_Draw__FP12daObjTrnd2_c(); -extern "C" static void daObjTrnd2_Execute__FP12daObjTrnd2_c(); -extern "C" static void daObjTrnd2_Delete__FP12daObjTrnd2_c(); -extern "C" static void daObjTrnd2_Create__FP12daObjTrnd2_c(); -extern "C" void func_80D1D3B0(void* _this, s32*); - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dKyw_pntwind_set__FP14WIND_INFLUENCE(); -extern "C" void dKyw_pntwind_cut__FP14WIND_INFLUENCE(); -extern "C" void dKyw_custom_windpower__Ff(); -extern "C" void dKyw_evt_wind_set__Fss(); -extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CpsFRC11dCcD_SrcCps(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void normalize__4cXyzFv(); -extern "C" void isZero__4cXyzCFv(); -extern "C" void cM_rndF__Ff(); -extern "C" void __ct__8cM3dGCpsFv(); -extern "C" void Set__8cM3dGCpsFRC9cM3dGCpsS(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" f32 Zero__4cXyz[3]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80D1D3D4-80D1D3DC 000000 0006+02 6/6 0/0 0/0 .rodata l_R02_eff_id */ -SECTION_RODATA static u8 const l_R02_eff_id[6 + 2 /* padding */] = { - 0x8B, - 0x5E, - 0x8B, - 0x5F, - 0xFF, - 0xFF, - /* padding */ - 0x00, - 0x00, +static u16 const l_R02_eff_id[3] = { + 0x8B5E, + 0x8B5F, + 0xFFFF, }; -COMPILER_STRIP_GATE(0x80D1D3D4, &l_R02_eff_id); /* 80D1D3DC-80D1D3E4 000008 0006+02 0/1 0/0 0/0 .rodata l_R04_eff_id */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_R04_eff_id[6 + 2 /* padding */] = { - 0x8B, - 0x60, - 0x8B, - 0x61, - 0xFF, - 0xFF, - /* padding */ - 0x00, - 0x00, +static u16 const l_R04_eff_id[3] = { + 0x8B60, + 0x8B61, + 0xFFFF, }; -COMPILER_STRIP_GATE(0x80D1D3DC, &l_R04_eff_id); -#pragma pop /* 80D1D3E4-80D1D3EC 000010 0006+02 0/1 0/0 0/0 .rodata l_R05_eff_id */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_R05_eff_id[6 + 2 /* padding */] = { - 0x8B, - 0x6B, - 0x8B, - 0x6C, - 0xFF, - 0xFF, - /* padding */ - 0x00, - 0x00, +static u16 const l_R05_eff_id[3] = { + 0x8B6B, + 0x8B6C, + 0xFFFF, }; -COMPILER_STRIP_GATE(0x80D1D3E4, &l_R05_eff_id); -#pragma pop /* 80D1D3EC-80D1D3F4 000018 0006+02 0/1 0/0 0/0 .rodata l_R07_eff_id */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_R07_eff_id[6 + 2 /* padding */] = { - 0x8B, - 0x6D, - 0x8B, - 0x6E, - 0xFF, - 0xFF, - /* padding */ - 0x00, - 0x00, +static u16 const l_R07_eff_id[3] = { + 0x8B6D, + 0x8B6E, + 0xFFFF, }; -COMPILER_STRIP_GATE(0x80D1D3EC, &l_R07_eff_id); -#pragma pop /* 80D1D3F4-80D1D3FC 000020 0006+02 0/1 0/0 0/0 .rodata l_R14_eff_id */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_R14_eff_id[6 + 2 /* padding */] = { - 0x8B, - 0x66, - 0x8B, - 0x67, - 0x8B, - 0x68, - /* padding */ - 0x00, - 0x00, +static u16 const l_R14_eff_id[3] = { + 0x8B66, + 0x8B67, + 0x8B68, }; -COMPILER_STRIP_GATE(0x80D1D3F4, &l_R14_eff_id); -#pragma pop /* 80D1D3FC-80D1D404 000028 0006+02 0/1 0/0 0/0 .rodata l_R51_eff_id */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_R51_eff_id[6 + 2 /* padding */] = { - 0x8B, - 0x69, - 0x8B, - 0x6A, - 0xFF, - 0xFF, - /* padding */ - 0x00, - 0x00, +static u16 const l_R51_eff_id[3] = { + 0x8B69, + 0x8B6A, + 0xFFFF, }; -COMPILER_STRIP_GATE(0x80D1D3FC, &l_R51_eff_id); -#pragma pop - -/* 80D1D404-80D1D408 000030 0004+00 0/5 0/0 0/0 .rodata @3631 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3631[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D1D404, &lit_3631); -#pragma pop - -/* 80D1D408-80D1D40C 000034 0004+00 0/3 0/0 0/0 .rodata @3632 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3632 = 1.0f; -COMPILER_STRIP_GATE(0x80D1D408, &lit_3632); -#pragma pop - -/* 80D1D40C-80D1D410 000038 0004+00 0/2 0/0 0/0 .rodata @3633 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3633 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80D1D40C, &lit_3633); -#pragma pop /* 80D1C4D8-80D1C54C 000078 0074+00 1/1 0/0 0/0 .text setPntWind__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::setPntWind() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setPntWind__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::setPntWind() { + mWindInfluence.position = current.pos; + mWindInfluence.mDirection.x = 0.0f; + mWindInfluence.mDirection.y = 1.0f; + mWindInfluence.mDirection.z = 0.0f; + mWindInfluence.mRadius = field_0x768 * scale.x; + mWindInfluence.field_0x20 = 0.0f; + mWindInfluence.mStrength = 0.2f; + dKyw_pntwind_set(&mWindInfluence); } -#pragma pop /* 80D1C54C-80D1C570 0000EC 0024+00 1/1 0/0 0/0 .text cutPntWind__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::cutPntWind() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/cutPntWind__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::cutPntWind() { + dKyw_pntwind_cut(&mWindInfluence); } -#pragma pop - -/* ############################################################################################## */ -/* 80D1D410-80D1D414 00003C 0004+00 0/1 0/0 0/0 .rodata @3681 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3681 = 2.0f; -COMPILER_STRIP_GATE(0x80D1D410, &lit_3681); -#pragma pop - -/* 80D1D414-80D1D418 000040 0004+00 0/2 0/0 0/0 .rodata @3682 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3682 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D1D414, &lit_3682); -#pragma pop - -/* 80D1D418-80D1D41C 000044 0004+00 0/3 0/0 0/0 .rodata @3683 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3683 = 0.5f; -COMPILER_STRIP_GATE(0x80D1D418, &lit_3683); -#pragma pop - -/* 80D1D41C-80D1D424 000048 0008+00 0/1 0/0 0/0 .rodata @3684 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3684[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D1D41C, &lit_3684); -#pragma pop - -/* 80D1D424-80D1D42C 000050 0008+00 0/1 0/0 0/0 .rodata @3685 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3685[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D1D424, &lit_3685); -#pragma pop - -/* 80D1D42C-80D1D434 000058 0008+00 0/1 0/0 0/0 .rodata @3686 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3686[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D1D42C, &lit_3686); -#pragma pop /* 80D1C570-80D1C780 000110 0210+00 1/1 0/0 0/0 .text movePntWind__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::movePntWind() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/movePntWind__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::movePntWind() { + cXyz local_20; + cXyz local_2c; + cXyz cStack_38; + local_20.x = field_0x6e8.mStart.x; + local_20.y = field_0x6e8.mStart.y; + local_20.z = field_0x6e8.mStart.z; + local_2c.x = field_0x6e8.mEnd.x; + local_2c.y = field_0x6e8.mEnd.y; + local_2c.z = field_0x6e8.mEnd.z; + dKyr_get_vectle_calc(&local_20, &local_2c, &cStack_38); + mWindInfluence.mDirection = cStack_38; + mWindInfluence.mRadius = field_0x6e8.mRadius * 2.0f; + mWindInfluence.field_0x20 = 0.0f; + cLib_addCalc(&mWindInfluence.position.x, field_0x6e8.mEnd.x, 0.1f, mWindInfluence.mRadius, + mWindInfluence.mRadius * 0.5f); + cLib_addCalc(&mWindInfluence.position.y, field_0x6e8.mEnd.y, 0.1f, mWindInfluence.mRadius, + mWindInfluence.mRadius * 0.5f); + cLib_addCalc(&mWindInfluence.position.z, field_0x6e8.mEnd.z, 0.1f, mWindInfluence.mRadius, + mWindInfluence.mRadius * 0.5f); + if (mWindInfluence.position.abs(field_0x6e8.mEnd) < mWindInfluence.mRadius) { + mWindInfluence.position = field_0x6e8.mStart; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80D1D434-80D1D438 000060 0004+00 0/1 0/0 0/0 .rodata @3730 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3730 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80D1D434, &lit_3730); -#pragma pop - -/* 80D1D438-80D1D43C 000064 0004+00 0/2 0/0 0/0 .rodata @3731 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3731 = 10.0f; -COMPILER_STRIP_GATE(0x80D1D438, &lit_3731); -#pragma pop - -/* 80D1D43C-80D1D444 000068 0008+00 0/1 0/0 0/0 .rodata @3733 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3733[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D1D43C, &lit_3733); -#pragma pop /* 80D1C780-80D1C924 000320 01A4+00 1/1 0/0 0/0 .text setCpsInfo__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::setCpsInfo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setCpsInfo__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::setCpsInfo() { + cLib_chaseF(&field_0x704, field_0x738, field_0x76c * scale.y * 0.05f); + field_0x6e8.mEnd.x = 0; + field_0x6e8.mEnd.y = field_0x704; + field_0x6e8.mEnd.z = 0; + mDoMtx_stack_c::transS(field_0x6e8.mStart); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::multVec(&field_0x6e8.mEnd, &field_0x6e8.mEnd); + mCps.cM3dGCps::Set(field_0x6e8); + f32 dVar6 = 10.0f; + if (getPower() != 0xff) { + dVar6 = getPower(); + } + cXyz local_20; + cXyz cStack_40; + local_20.x = field_0x6e8.mEnd.x - field_0x6e8.mStart.x; + local_20.y = field_0x6e8.mEnd.y - field_0x6e8.mStart.y; + local_20.z = field_0x6e8.mEnd.z - field_0x6e8.mStart.z; + if (!local_20.isZero()) { + local_20.normalize(); + } else { + local_20 = cXyz::Zero; + } + cStack_40 = local_20; + local_20 *= dVar6; + mCps.SetAtVec(local_20); + movePntWind(); } -#pragma pop /* 80D1C924-80D1C944 0004C4 0020+00 1/1 0/0 0/0 .text initBaseMtx__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/initBaseMtx__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::initBaseMtx() { + setBaseMtx(); } -#pragma pop /* 80D1C944-80D1C98C 0004E4 0048+00 2/2 0/0 0/0 .text setBaseMtx__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setBaseMtx__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + MTXCopy(mDoMtx_stack_c::get(), field_0x708); } -#pragma pop - -/* ############################################################################################## */ -/* 80D1D444-80D1D448 000070 0004+00 0/1 0/0 0/0 .rodata @3819 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3819 = 150.0f; -COMPILER_STRIP_GATE(0x80D1D444, &lit_3819); -#pragma pop - -/* 80D1D448-80D1D44C 000074 0004+00 0/1 0/0 0/0 .rodata @3820 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3820 = 1000.0f; -COMPILER_STRIP_GATE(0x80D1D448, &lit_3820); -#pragma pop /* 80D1D458-80D1D4A4 000000 004C+00 1/1 0/0 0/0 .data l_cps_src */ static dCcD_SrcCps l_cps_src = { @@ -389,202 +148,300 @@ static dCcD_SrcCps l_cps_src = { }; /* 80D1C98C-80D1CC80 00052C 02F4+00 1/1 0/0 0/0 .text Create__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/Create__12daObjTrnd2_cFv.s" +int daObjTrnd2_c::Create() { + field_0x768 = 150.0f; + field_0x76c = 1000.0f; + if (getScale() == 1) { + field_0x768 *= 10.0f; + field_0x76c *= 10.0f; + } + initBaseMtx(); + fopAcM_SetMtx(this, field_0x708); + mStts.Init(0xff, 0xff, this); + mCps.Set(l_cps_src); + mCps.SetStts(&mStts); + cXyz local_1c; + cXyz local_28; + local_1c.x = -field_0x768 * scale.x; + local_1c.y = 0.0; + local_1c.z = -field_0x768 * scale.x; + local_28.x = field_0x768 * scale.x; + local_28.y = field_0x76c * scale.y; + local_28.z = field_0x768 * scale.x; + fopAcM_setCullSizeBox(this, local_1c.x, 0, local_1c.z, + local_28.x, local_28.y, + local_28.z); + field_0x6e8.mRadius = field_0x768 * scale.x; + field_0x6e8.mStart = current.pos; + setParticle(); + u32 swBit = getSwbit(); + switch(getSwType()) { + case 15: + if ((swBit != 0xff && fopAcM_isSwitch(this, swBit)) || swBit == 0xff) { + field_0x778 = true; + } else { + field_0x778 = false; + } + break; + case 0: + if (fopAcM_isSwitch(this, swBit)) { + field_0x778 = false; + } else { + field_0x778 = true; + } + break; + case 1: + if (swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + field_0x778 = false; + mTimer = getOffTime() * 30; + } else if (cM_rndF(1.0f) > 0.5f) { + field_0x778 = true; + mTimer = getOnTime() * 30; + } else { + field_0x778 = false; + mTimer = getOffTime() * 30; + } + break; + case 2: + field_0x778 = true; + mTimer = getOnTime() * 30; + break; + case 3: + field_0x778 = false; + mTimer = getOffTime() * 30; + break; + } + + if (field_0x778 == true) { + field_0x738 = field_0x76c * scale.y; + field_0x704 = field_0x738; + startParticle(); + } else { + field_0x738 = 0; + field_0x704 = 0; + } + setPntWind(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80D1D4A4-80D1D4C4 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTrnd2_Method */ -SECTION_DATA static void* l_daObjTrnd2_Method[8] = { - (void*)daObjTrnd2_Create__FP12daObjTrnd2_c, - (void*)daObjTrnd2_Delete__FP12daObjTrnd2_c, - (void*)daObjTrnd2_Execute__FP12daObjTrnd2_c, - (void*)NULL, - (void*)daObjTrnd2_Draw__FP12daObjTrnd2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D1D4C4-80D1D4F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Tornado2 */ -SECTION_DATA extern void* g_profile_Obj_Tornado2[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x015C0000, (void*)&g_fpcLf_Method, - (void*)0x00000788, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01BD0000, (void*)&l_daObjTrnd2_Method, - (void*)0x00040000, (void*)0x000E0000, -}; - -/* 80D1D4F4-80D1D500 00009C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; /* 80D1CC80-80D1CD78 000820 00F8+00 1/1 0/0 0/0 .text create__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1CC80.s" +int daObjTrnd2_c::create() { + fopAcM_SetupActor(this, daObjTrnd2_c); + if (Create() == 0) { + return cPhs_ERROR_e; + } + return cPhs_COMPLEATE_e; } -#pragma pop - -/* 80D1CD78-80D1CDC0 000918 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_tornado2/d_a_obj_tornado2/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D1D44C-80D1D450 000078 0004+00 0/1 0/0 0/0 .rodata @4012 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4012 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D1D44C, &lit_4012); -#pragma pop - -/* 80D1D450-80D1D454 00007C 0004+00 0/1 0/0 0/0 .rodata @4013 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4013 = 0x3A83126F; -COMPILER_STRIP_GATE(0x80D1D450, &lit_4013); -#pragma pop - -/* 80D1D454-80D1D458 000080 0004+00 0/1 0/0 0/0 .rodata @4014 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4014 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D1D454, &lit_4014); -#pragma pop /* 80D1CDC0-80D1D0AC 000960 02EC+00 1/1 0/0 0/0 .text execute__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/execute__12daObjTrnd2_cFv.s" +int daObjTrnd2_c::execute() { + bool bVar1; + u32 swBit; + if (field_0x778 == true) { + bVar1 = false; + swBit = getSwbit(); + switch (getSwType()) { + case 15: + if (swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + bVar1 = true; + } + break; + case 0: + if (fopAcM_isSwitch(this, swBit)) { + bVar1 = true; + } + break; + case 1: + case 2: + case 3: + if (cLib_calcTimer(&mTimer) == 0 || (swBit != 0xff && !fopAcM_isSwitch(this, swBit))) { + bVar1 = true; + mTimer = getOffTime() * 30; + } + break; + } + + if (bVar1) { + field_0x738 = 0.0f; + field_0x778 = false; + stopParticle(); + } + } else if (field_0x778 == false) { + bVar1 = false; + swBit = getSwbit(); + switch(getSwType()) { + case 15: + if (fopAcM_isSwitch(this, swBit)) { + bVar1 = true; + } + break; + case 0: + if (swBit != 0xff && !fopAcM_isSwitch(this, swBit)) { + bVar1 = true; + } + break; + case 1: + case 2: + case 3: + if (cLib_calcTimer(&mTimer) == 0 && ((swBit != 0xff && fopAcM_isSwitch(this, swBit)) || swBit == 0xff)) { + bVar1 = true; + mTimer = getOnTime() * 30; + } + break; + } + if (bVar1) { + field_0x738 = field_0x76c * scale.y; + field_0x778 = true; + startParticle(); + } + } + if (field_0x738 == 0.0f) { + cLib_addCalc(&mWindPower, 0.3f, 0.2f, 0.1f, 0.001f); + } else { + cLib_addCalc(&mWindPower, 0.9f, 0.5f, 0.1f, 0.001f); + } + dKyw_evt_wind_set(0, home.angle.y); + dKyw_custom_windpower(mWindPower); + setCpsInfo(); + setBaseMtx(); + if (field_0x704 != 0.0f) { + mCps.cM3dGCps::Set(field_0x6e8); + dComIfG_Ccsp()->Set(&mCps); + } + return 1; } -#pragma pop /* 80D1D0AC-80D1D214 000C4C 0168+00 1/1 0/0 0/0 .text setParticle__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::setParticle() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/setParticle__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::setParticle() { + const u16* pEffId = NULL; + switch (fopAcM_GetRoomNo(this)) { + case 2: + pEffId = l_R02_eff_id; + break; + case 4: + pEffId = l_R04_eff_id; + break; + case 5: + pEffId = l_R05_eff_id; + break; + case 7: + case 8: + pEffId = l_R07_eff_id; + break; + case 14: + pEffId = l_R14_eff_id; + break; + case 51: + pEffId = l_R51_eff_id; + break; + case 0: + case 3: + case 6: + case 13: + return; + default: + break; + } + + for (int i = 0; i < 3; pEffId++, i++) { + if (*pEffId != 0xffff) { + mParticles[i] = dComIfGp_particle_set(*pEffId, ¤t.pos, &home.angle, NULL, + 0xff, NULL, -1, NULL, NULL, NULL); + } else { + mParticles[i] = NULL; + } + } + stopParticle(); } -#pragma pop /* 80D1D214-80D1D278 000DB4 0064+00 1/1 0/0 0/0 .text endParticle__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::endParticle() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/endParticle__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::endParticle() { + for (int i = 0; i < 3; i++) { + if (mParticles[i] != NULL) { + mParticles[i]->stopCreateParticle(); + mParticles[i]->quitImmortalEmitter(); + mParticles[i]->becomeInvalidEmitter(); + mParticles[i] = NULL; + } + } } -#pragma pop /* 80D1D278-80D1D2AC 000E18 0034+00 2/2 0/0 0/0 .text startParticle__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::startParticle() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/startParticle__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::startParticle() { + for (int i = 0; i < 3; i++) { + if (mParticles[i] != NULL) { + mParticles[i]->playCreateParticle(); + } + } } -#pragma pop /* 80D1D2AC-80D1D2E0 000E4C 0034+00 2/2 0/0 0/0 .text stopParticle__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::stopParticle() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/stopParticle__12daObjTrnd2_cFv.s" +void daObjTrnd2_c::stopParticle() { + for (int i = 0; i < 3; i++) { + if (mParticles[i] != NULL) { + mParticles[i]->stopCreateParticle(); + } + } } -#pragma pop /* 80D1D2E0-80D1D2E8 000E80 0008+00 1/1 0/0 0/0 .text draw__12daObjTrnd2_cFv */ -bool daObjTrnd2_c::draw() { - return true; +int daObjTrnd2_c::draw() { + return 1; } /* 80D1D2E8-80D1D330 000E88 0048+00 1/1 0/0 0/0 .text _delete__12daObjTrnd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjTrnd2_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/_delete__12daObjTrnd2_cFv.s" +int daObjTrnd2_c::_delete() { + dKy_getEnvlight()->mEvtWindSet = 0; + cutPntWind(); + endParticle(); + return 1; } -#pragma pop /* 80D1D330-80D1D350 000ED0 0020+00 1/0 0/0 0/0 .text daObjTrnd2_Draw__FP12daObjTrnd2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTrnd2_Draw(daObjTrnd2_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Draw__FP12daObjTrnd2_c.s" +static int daObjTrnd2_Draw(daObjTrnd2_c* i_this) { + return i_this->draw(); } -#pragma pop /* 80D1D350-80D1D370 000EF0 0020+00 1/0 0/0 0/0 .text daObjTrnd2_Execute__FP12daObjTrnd2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTrnd2_Execute(daObjTrnd2_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Execute__FP12daObjTrnd2_c.s" +static int daObjTrnd2_Execute(daObjTrnd2_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80D1D370-80D1D390 000F10 0020+00 1/0 0/0 0/0 .text daObjTrnd2_Delete__FP12daObjTrnd2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTrnd2_Delete(daObjTrnd2_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Delete__FP12daObjTrnd2_c.s" +static int daObjTrnd2_Delete(daObjTrnd2_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80D1D390-80D1D3B0 000F30 0020+00 1/0 0/0 0/0 .text daObjTrnd2_Create__FP12daObjTrnd2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjTrnd2_Create(daObjTrnd2_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/daObjTrnd2_Create__FP12daObjTrnd2_c.s" +static int daObjTrnd2_Create(daObjTrnd2_c* i_this) { + return i_this->create(); } -#pragma pop -/* 80D1D3B0-80D1D3CC 000F50 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80D1D3B0(void* _this, s32* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2/func_80D1D3B0.s" -} -#pragma pop +/* 80D1D4A4-80D1D4C4 -00001 0020+00 1/0 0/0 0/0 .data l_daObjTrnd2_Method */ +static actor_method_class l_daObjTrnd2_Method = { + (process_method_func)daObjTrnd2_Create, + (process_method_func)daObjTrnd2_Delete, + (process_method_func)daObjTrnd2_Execute, + (process_method_func)NULL, + (process_method_func)daObjTrnd2_Draw, +}; + +extern actor_process_profile_definition g_profile_Obj_Tornado2 = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Tornado2, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjTrnd2_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 0x1BD, // mPriority + &l_daObjTrnd2_Method, // sub_method + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +};