From a9d182d6cf0d4d49d4dd937294c858377128d5e0 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Wed, 27 Mar 2024 02:57:51 +0200 Subject: [PATCH] d_a_obj_fan OK (#2109) * Change daTag_EvtArea_c::chkPointInArea to inline * d_a_obj_fan OK --- .../d_a_obj_fan/CreateHeap__10daObjFan_cFv.s | 76 -- .../d_a_obj_fan/Create__10daObjFan_cFv.s | 53 -- .../d_a_obj_fan/Delete__10daObjFan_cFv.s | 31 - .../d_a_obj_fan/Draw__10daObjFan_cFv.s | 42 - .../Execute__10daObjFan_cFPPA3_A4_f.s | 131 --- .../d_a_obj_fan/__ct__8dCcD_SphFv.s | 34 - .../d_a_obj_fan/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_fan/__dt__8cM3dGSphFv.s | 20 - .../d_a_obj_fan/__dt__8dCcD_SphFv.s | 55 -- .../d_a_obj_fan/action__10daObjFan_cFv.s | 320 ------- .../d_a_obj_fan/create1st__10daObjFan_cFv.s | 47 - .../daObjFan_MoveBGDelete__FP10daObjFan_c.s | 9 - .../daObjFan_MoveBGDraw__FP10daObjFan_c.s | 12 - .../daObjFan_MoveBGExecute__FP10daObjFan_c.s | 9 - .../daObjFan_create1st__FP10daObjFan_c.s | 48 - .../d_a_obj_fan/initBaseMtx__10daObjFan_cFv.s | 16 - .../d_a_obj_fan/searchTornado2__FPvPv.s | 100 --- .../search_tornado__10daObjFan_cFv.s | 32 - .../d_a_obj_fan/setBaseMtx__10daObjFan_cFv.s | 53 -- .../setCollision__10daObjFan_cFv.s | 78 -- include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h | 31 + .../a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h | 31 + .../d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h | 8 +- rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp | 843 ++++++------------ .../obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp | 42 - rel/d/a/tag/d_a_tag_evtarea/Makefile | 1 + .../a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp | 25 +- 27 files changed, 355 insertions(+), 1812 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/CreateHeap__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Create__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Delete__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Draw__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Execute__10daObjFan_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__ct__8dCcD_SphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8dCcD_SphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/action__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/create1st__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDelete__FP10daObjFan_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDraw__FP10daObjFan_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGExecute__FP10daObjFan_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_create1st__FP10daObjFan_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/initBaseMtx__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/searchTornado2__FPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/search_tornado__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setBaseMtx__10daObjFan_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setCollision__10daObjFan_cFv.s diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/CreateHeap__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/CreateHeap__10daObjFan_cFv.s deleted file mode 100644 index 27882c5a20f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/CreateHeap__10daObjFan_cFv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_80BE4FD4: -/* 80BE4FD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE4FD8 7C 08 02 A6 */ mflr r0 -/* 80BE4FDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE4FE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE4FE4 93 C1 00 08 */ stw r30, 8(r1) -/* 80BE4FE8 7C 7F 1B 78 */ mr r31, r3 -/* 80BE4FEC 88 03 0A D4 */ lbz r0, 0xad4(r3) -/* 80BE4FF0 54 00 10 3A */ slwi r0, r0, 2 -/* 80BE4FF4 3C 60 80 BE */ lis r3, l_arcName@ha /* 0x80BE5E78@ha */ -/* 80BE4FF8 38 63 5E 78 */ addi r3, r3, l_arcName@l /* 0x80BE5E78@l */ -/* 80BE4FFC 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80BE5000 3C 80 80 BE */ lis r4, l_bmd@ha /* 0x80BE5D80@ha */ -/* 80BE5004 38 84 5D 80 */ addi r4, r4, l_bmd@l /* 0x80BE5D80@l */ -/* 80BE5008 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80BE500C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE5010 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE5014 3F C5 00 02 */ addis r30, r5, 2 -/* 80BE5018 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80BE501C 7F C5 F3 78 */ mr r5, r30 -/* 80BE5020 38 C0 00 80 */ li r6, 0x80 -/* 80BE5024 4B 45 72 C9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BE5028 3C 80 00 08 */ lis r4, 8 -/* 80BE502C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80BE5030 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80BE5034 4B 42 FC 21 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BE5038 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80BE503C 80 1F 05 A8 */ lwz r0, 0x5a8(r31) -/* 80BE5040 28 00 00 00 */ cmplwi r0, 0 -/* 80BE5044 40 82 00 0C */ bne lbl_80BE5050 -/* 80BE5048 38 60 00 00 */ li r3, 0 -/* 80BE504C 48 00 00 88 */ b lbl_80BE50D4 -lbl_80BE5050: -/* 80BE5050 38 60 00 C0 */ li r3, 0xc0 -/* 80BE5054 4B 6E 9B F9 */ bl __nw__FUl -/* 80BE5058 7C 60 1B 79 */ or. r0, r3, r3 -/* 80BE505C 41 82 00 0C */ beq lbl_80BE5068 -/* 80BE5060 4B 49 69 11 */ bl __ct__4dBgWFv -/* 80BE5064 7C 60 1B 78 */ mr r0, r3 -lbl_80BE5068: -/* 80BE5068 90 1F 05 AC */ stw r0, 0x5ac(r31) -/* 80BE506C 80 1F 05 AC */ lwz r0, 0x5ac(r31) -/* 80BE5070 28 00 00 00 */ cmplwi r0, 0 -/* 80BE5074 41 82 00 4C */ beq lbl_80BE50C0 -/* 80BE5078 88 1F 0A D4 */ lbz r0, 0xad4(r31) -/* 80BE507C 54 00 10 3A */ slwi r0, r0, 2 -/* 80BE5080 3C 60 80 BE */ lis r3, l_arcName@ha /* 0x80BE5E78@ha */ -/* 80BE5084 38 63 5E 78 */ addi r3, r3, l_arcName@l /* 0x80BE5E78@l */ -/* 80BE5088 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80BE508C 3C 80 80 BE */ lis r4, l_dzb3@ha /* 0x80BE5D98@ha */ -/* 80BE5090 38 84 5D 98 */ addi r4, r4, l_dzb3@l /* 0x80BE5D98@l */ -/* 80BE5094 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80BE5098 7F C5 F3 78 */ mr r5, r30 -/* 80BE509C 38 C0 00 80 */ li r6, 0x80 -/* 80BE50A0 4B 45 72 4D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BE50A4 7C 64 1B 78 */ mr r4, r3 -/* 80BE50A8 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80BE50AC 38 A0 00 01 */ li r5, 1 -/* 80BE50B0 38 DF 05 6C */ addi r6, r31, 0x56c -/* 80BE50B4 4B 49 4E 85 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80BE50B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BE50BC 41 82 00 14 */ beq lbl_80BE50D0 -lbl_80BE50C0: -/* 80BE50C0 38 00 00 00 */ li r0, 0 -/* 80BE50C4 90 1F 05 AC */ stw r0, 0x5ac(r31) -/* 80BE50C8 38 60 00 00 */ li r3, 0 -/* 80BE50CC 48 00 00 08 */ b lbl_80BE50D4 -lbl_80BE50D0: -/* 80BE50D0 38 60 00 01 */ li r3, 1 -lbl_80BE50D4: -/* 80BE50D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE50D8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BE50DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE50E0 7C 08 03 A6 */ mtlr r0 -/* 80BE50E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE50E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Create__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Create__10daObjFan_cFv.s deleted file mode 100644 index cef516b5777..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Create__10daObjFan_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80BE4F08: -/* 80BE4F08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BE4F0C 7C 08 02 A6 */ mflr r0 -/* 80BE4F10 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BE4F14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BE4F18 4B 77 D2 B9 */ bl _savegpr_26 -/* 80BE4F1C 7C 7A 1B 78 */ mr r26, r3 -/* 80BE4F20 38 00 20 00 */ li r0, 0x2000 -/* 80BE4F24 B0 03 0A CE */ sth r0, 0xace(r3) -/* 80BE4F28 A8 83 04 B4 */ lha r4, 0x4b4(r3) -/* 80BE4F2C 38 04 C0 00 */ addi r0, r4, -16384 -/* 80BE4F30 B0 03 04 B4 */ sth r0, 0x4b4(r3) -/* 80BE4F34 A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 80BE4F38 B0 03 04 DC */ sth r0, 0x4dc(r3) -/* 80BE4F3C A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 80BE4F40 B0 03 04 E4 */ sth r0, 0x4e4(r3) -/* 80BE4F44 4B FF FE C5 */ bl initBaseMtx__10daObjFan_cFv -/* 80BE4F48 80 7A 05 A8 */ lwz r3, 0x5a8(r26) -/* 80BE4F4C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BE4F50 90 1A 05 04 */ stw r0, 0x504(r26) -/* 80BE4F54 80 7A 05 A8 */ lwz r3, 0x5a8(r26) -/* 80BE4F58 80 83 00 04 */ lwz r4, 4(r3) -/* 80BE4F5C 7F 43 D3 78 */ mr r3, r26 -/* 80BE4F60 4B 43 56 19 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80BE4F64 38 7A 05 B0 */ addi r3, r26, 0x5b0 -/* 80BE4F68 38 80 00 FF */ li r4, 0xff -/* 80BE4F6C 38 A0 00 FF */ li r5, 0xff -/* 80BE4F70 7F 46 D3 78 */ mr r6, r26 -/* 80BE4F74 4B 49 E8 ED */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80BE4F78 3B 60 00 00 */ li r27, 0 -/* 80BE4F7C 3B E0 00 00 */ li r31, 0 -/* 80BE4F80 3C 60 80 BE */ lis r3, l_sph_src@ha /* 0x80BE5DD0@ha */ -/* 80BE4F84 3B A3 5D D0 */ addi r29, r3, l_sph_src@l /* 0x80BE5DD0@l */ -/* 80BE4F88 3B DA 05 B0 */ addi r30, r26, 0x5b0 -lbl_80BE4F8C: -/* 80BE4F8C 7F 9A FA 14 */ add r28, r26, r31 -/* 80BE4F90 38 7C 05 EC */ addi r3, r28, 0x5ec -/* 80BE4F94 7F A4 EB 78 */ mr r4, r29 -/* 80BE4F98 4B 49 FA 9D */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80BE4F9C 93 DC 06 30 */ stw r30, 0x630(r28) -/* 80BE4FA0 3B 7B 00 01 */ addi r27, r27, 1 -/* 80BE4FA4 2C 1B 00 04 */ cmpwi r27, 4 -/* 80BE4FA8 3B FF 01 38 */ addi r31, r31, 0x138 -/* 80BE4FAC 41 80 FF E0 */ blt lbl_80BE4F8C -/* 80BE4FB0 7F 43 D3 78 */ mr r3, r26 -/* 80BE4FB4 4B 49 39 9D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BE4FB8 38 60 00 01 */ li r3, 1 -/* 80BE4FBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BE4FC0 4B 77 D2 5D */ bl _restgpr_26 -/* 80BE4FC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BE4FC8 7C 08 03 A6 */ mtlr r0 -/* 80BE4FCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BE4FD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Delete__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Delete__10daObjFan_cFv.s deleted file mode 100644 index 4ae5d205a4b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Delete__10daObjFan_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80BE5A04: -/* 80BE5A04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5A08 7C 08 02 A6 */ mflr r0 -/* 80BE5A0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5A10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE5A14 7C 7F 1B 78 */ mr r31, r3 -/* 80BE5A18 80 63 05 AC */ lwz r3, 0x5ac(r3) -/* 80BE5A1C 28 03 00 00 */ cmplwi r3, 0 -/* 80BE5A20 41 82 00 24 */ beq lbl_80BE5A44 -/* 80BE5A24 4B 68 27 B1 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BE5A28 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BE5A2C 41 82 00 18 */ beq lbl_80BE5A44 -/* 80BE5A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE5A34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE5A38 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BE5A3C 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80BE5A40 4B 48 E8 11 */ bl Release__4cBgSFP9dBgW_Base -lbl_80BE5A44: -/* 80BE5A44 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80BE5A48 88 1F 0A D4 */ lbz r0, 0xad4(r31) -/* 80BE5A4C 54 00 10 3A */ slwi r0, r0, 2 -/* 80BE5A50 3C 80 80 BE */ lis r4, l_arcName@ha /* 0x80BE5E78@ha */ -/* 80BE5A54 38 84 5E 78 */ addi r4, r4, l_arcName@l /* 0x80BE5E78@l */ -/* 80BE5A58 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80BE5A5C 4B 44 75 AD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BE5A60 38 60 00 01 */ li r3, 1 -/* 80BE5A64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE5A68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5A6C 7C 08 03 A6 */ mtlr r0 -/* 80BE5A70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5A74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Draw__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Draw__10daObjFan_cFv.s deleted file mode 100644 index 0cd63b2f0eb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Draw__10daObjFan_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80BE5960: -/* 80BE5960 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5964 7C 08 02 A6 */ mflr r0 -/* 80BE5968 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE596C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE5970 93 C1 00 08 */ stw r30, 8(r1) -/* 80BE5974 7C 7E 1B 78 */ mr r30, r3 -/* 80BE5978 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BE597C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BE5980 38 80 00 10 */ li r4, 0x10 -/* 80BE5984 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BE5988 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BE598C 4B 5B DE 39 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BE5990 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BE5994 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BE5998 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80BE599C 80 84 00 04 */ lwz r4, 4(r4) -/* 80BE59A0 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BE59A4 4B 5B F3 FD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BE59A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE59AC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE59B0 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80BE59B4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80BE59B8 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80BE59BC 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BE59C0 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80BE59C4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BE59C8 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80BE59CC 4B 42 82 F9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BE59D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE59D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE59D8 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80BE59DC 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80BE59E0 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80BE59E4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80BE59E8 38 60 00 01 */ li r3, 1 -/* 80BE59EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE59F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BE59F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE59F8 7C 08 03 A6 */ mtlr r0 -/* 80BE59FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5A00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Execute__10daObjFan_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Execute__10daObjFan_cFPPA3_A4_f.s deleted file mode 100644 index b21316d15a6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Execute__10daObjFan_cFPPA3_A4_f.s +++ /dev/null @@ -1,131 +0,0 @@ -lbl_80BE519C: -/* 80BE519C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BE51A0 7C 08 02 A6 */ mflr r0 -/* 80BE51A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BE51A8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BE51AC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80BE51B0 7C 7E 1B 78 */ mr r30, r3 -/* 80BE51B4 7C 9F 23 78 */ mr r31, r4 -/* 80BE51B8 4B FF FB E1 */ bl search_tornado__10daObjFan_cFv -/* 80BE51BC 88 BE 0A D4 */ lbz r5, 0xad4(r30) -/* 80BE51C0 28 05 00 00 */ cmplwi r5, 0 -/* 80BE51C4 41 82 01 1C */ beq lbl_80BE52E0 -/* 80BE51C8 A8 1E 0A CC */ lha r0, 0xacc(r30) -/* 80BE51CC 3C 60 80 BE */ lis r3, lit_3815@ha /* 0x80BE5E38@ha */ -/* 80BE51D0 C8 63 5E 38 */ lfd f3, lit_3815@l(r3) /* 0x80BE5E38@l */ -/* 80BE51D4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE51D8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BE51DC 3C 80 43 30 */ lis r4, 0x4330 -/* 80BE51E0 90 81 00 08 */ stw r4, 8(r1) -/* 80BE51E4 C8 01 00 08 */ lfd f0, 8(r1) -/* 80BE51E8 EC 40 18 28 */ fsubs f2, f0, f3 -/* 80BE51EC 3C 60 80 BE */ lis r3, lit_3813@ha /* 0x80BE5E34@ha */ -/* 80BE51F0 C0 23 5E 34 */ lfs f1, lit_3813@l(r3) /* 0x80BE5E34@l */ -/* 80BE51F4 54 A0 0D FC */ rlwinm r0, r5, 1, 0x17, 0x1e -/* 80BE51F8 3C 60 80 BE */ lis r3, l_max_rotspeed@ha /* 0x80BE5DBC@ha */ -/* 80BE51FC 38 63 5D BC */ addi r3, r3, l_max_rotspeed@l /* 0x80BE5DBC@l */ -/* 80BE5200 7C 03 02 AE */ lhax r0, r3, r0 -/* 80BE5204 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE5208 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE520C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80BE5210 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80BE5214 EC 00 18 28 */ fsubs f0, f0, f3 -/* 80BE5218 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BE521C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BE5220 40 81 00 64 */ ble lbl_80BE5284 -/* 80BE5224 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80BE5228 28 03 00 00 */ cmplwi r3, 0 -/* 80BE522C 41 82 00 28 */ beq lbl_80BE5254 -/* 80BE5230 4B 68 2F A5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BE5234 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BE5238 40 82 00 1C */ bne lbl_80BE5254 -/* 80BE523C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE5240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE5244 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BE5248 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80BE524C 7F C5 F3 78 */ mr r5, r30 -/* 80BE5250 4B 48 F7 B9 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80BE5254: -/* 80BE5254 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80BE5258 28 03 00 00 */ cmplwi r3, 0 -/* 80BE525C 41 82 00 84 */ beq lbl_80BE52E0 -/* 80BE5260 4B 68 2F 75 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BE5264 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BE5268 41 82 00 78 */ beq lbl_80BE52E0 -/* 80BE526C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE5270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE5274 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BE5278 80 9E 05 AC */ lwz r4, 0x5ac(r30) -/* 80BE527C 4B 48 EF D5 */ bl Release__4cBgSFP9dBgW_Base -/* 80BE5280 48 00 00 60 */ b lbl_80BE52E0 -lbl_80BE5284: -/* 80BE5284 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80BE5288 28 03 00 00 */ cmplwi r3, 0 -/* 80BE528C 41 82 00 28 */ beq lbl_80BE52B4 -/* 80BE5290 4B 68 2F 45 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BE5294 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BE5298 40 82 00 1C */ bne lbl_80BE52B4 -/* 80BE529C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE52A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE52A4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BE52A8 80 9E 05 AC */ lwz r4, 0x5ac(r30) -/* 80BE52AC 7F C5 F3 78 */ mr r5, r30 -/* 80BE52B0 4B 48 F7 59 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80BE52B4: -/* 80BE52B4 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 80BE52B8 28 03 00 00 */ cmplwi r3, 0 -/* 80BE52BC 41 82 00 24 */ beq lbl_80BE52E0 -/* 80BE52C0 4B 68 2F 15 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BE52C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BE52C8 41 82 00 18 */ beq lbl_80BE52E0 -/* 80BE52CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE52D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE52D4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BE52D8 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80BE52DC 4B 48 EF 75 */ bl Release__4cBgSFP9dBgW_Base -lbl_80BE52E0: -/* 80BE52E0 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80BE52E4 28 03 00 00 */ cmplwi r3, 0 -/* 80BE52E8 41 82 00 08 */ beq lbl_80BE52F0 -/* 80BE52EC 4B 49 66 D5 */ bl Move__4dBgWFv -lbl_80BE52F0: -/* 80BE52F0 A8 1E 0A CC */ lha r0, 0xacc(r30) -/* 80BE52F4 3C 60 80 BE */ lis r3, lit_3815@ha /* 0x80BE5E38@ha */ -/* 80BE52F8 C8 63 5E 38 */ lfd f3, lit_3815@l(r3) /* 0x80BE5E38@l */ -/* 80BE52FC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE5300 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5304 3C 80 43 30 */ lis r4, 0x4330 -/* 80BE5308 90 81 00 10 */ stw r4, 0x10(r1) -/* 80BE530C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80BE5310 EC 40 18 28 */ fsubs f2, f0, f3 -/* 80BE5314 3C 60 80 BE */ lis r3, lit_3813@ha /* 0x80BE5E34@ha */ -/* 80BE5318 C0 23 5E 34 */ lfs f1, lit_3813@l(r3) /* 0x80BE5E34@l */ -/* 80BE531C 88 1E 0A D4 */ lbz r0, 0xad4(r30) -/* 80BE5320 54 00 08 3C */ slwi r0, r0, 1 -/* 80BE5324 3C 60 80 BE */ lis r3, l_max_rotspeed@ha /* 0x80BE5DBC@ha */ -/* 80BE5328 38 63 5D BC */ addi r3, r3, l_max_rotspeed@l /* 0x80BE5DBC@l */ -/* 80BE532C 7C 03 02 AE */ lhax r0, r3, r0 -/* 80BE5330 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE5334 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BE5338 90 81 00 08 */ stw r4, 8(r1) -/* 80BE533C C8 01 00 08 */ lfd f0, 8(r1) -/* 80BE5340 EC 00 18 28 */ fsubs f0, f0, f3 -/* 80BE5344 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BE5348 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BE534C 40 81 00 0C */ ble lbl_80BE5358 -/* 80BE5350 7F C3 F3 78 */ mr r3, r30 -/* 80BE5354 48 00 04 E9 */ bl setCollision__10daObjFan_cFv -lbl_80BE5358: -/* 80BE5358 7F C3 F3 78 */ mr r3, r30 -/* 80BE535C 48 00 00 31 */ bl action__10daObjFan_cFv -/* 80BE5360 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80BE5364 90 1F 00 00 */ stw r0, 0(r31) -/* 80BE5368 7F C3 F3 78 */ mr r3, r30 -/* 80BE536C 4B FF FA D9 */ bl setBaseMtx__10daObjFan_cFv -/* 80BE5370 38 60 00 01 */ li r3, 1 -/* 80BE5374 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BE5378 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80BE537C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BE5380 7C 08 03 A6 */ mtlr r0 -/* 80BE5384 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BE5388 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__ct__8dCcD_SphFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__ct__8dCcD_SphFv.s deleted file mode 100644 index e9698f7caa4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__ct__8dCcD_SphFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80BE5BF8: -/* 80BE5BF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5BFC 7C 08 02 A6 */ mflr r0 -/* 80BE5C00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5C04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE5C08 7C 7F 1B 78 */ mr r31, r3 -/* 80BE5C0C 4B 49 DE 1D */ bl __ct__12dCcD_GObjInfFv -/* 80BE5C10 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BE5C14 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BE5C18 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80BE5C1C 3C 60 80 BE */ lis r3, __vt__8cM3dGAab@ha /* 0x80BE5F34@ha */ -/* 80BE5C20 38 03 5F 34 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BE5F34@l */ -/* 80BE5C24 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80BE5C28 3C 60 80 BE */ lis r3, __vt__8cM3dGSph@ha /* 0x80BE5F40@ha */ -/* 80BE5C2C 38 03 5F 40 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80BE5F40@l */ -/* 80BE5C30 90 1F 01 34 */ stw r0, 0x134(r31) -/* 80BE5C34 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80BE5C38 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80BE5C3C 90 7F 01 20 */ stw r3, 0x120(r31) -/* 80BE5C40 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BE5C44 90 1F 01 34 */ stw r0, 0x134(r31) -/* 80BE5C48 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80BE5C4C 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80BE5C50 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 80BE5C54 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BE5C58 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80BE5C5C 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BE5C60 90 1F 01 34 */ stw r0, 0x134(r31) -/* 80BE5C64 7F E3 FB 78 */ mr r3, r31 -/* 80BE5C68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE5C6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5C70 7C 08 03 A6 */ mtlr r0 -/* 80BE5C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5C78 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGAabFv.s deleted file mode 100644 index 5ecb89f17c9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BE5CC4: -/* 80BE5CC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5CC8 7C 08 02 A6 */ mflr r0 -/* 80BE5CCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5CD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE5CD4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BE5CD8 41 82 00 1C */ beq lbl_80BE5CF4 -/* 80BE5CDC 3C A0 80 BE */ lis r5, __vt__8cM3dGAab@ha /* 0x80BE5F34@ha */ -/* 80BE5CE0 38 05 5F 34 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80BE5F34@l */ -/* 80BE5CE4 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80BE5CE8 7C 80 07 35 */ extsh. r0, r4 -/* 80BE5CEC 40 81 00 08 */ ble lbl_80BE5CF4 -/* 80BE5CF0 4B 6E 90 4D */ bl __dl__FPv -lbl_80BE5CF4: -/* 80BE5CF4 7F E3 FB 78 */ mr r3, r31 -/* 80BE5CF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE5CFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5D00 7C 08 03 A6 */ mtlr r0 -/* 80BE5D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5D08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGSphFv.s deleted file mode 100644 index bd6b34b066b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BE5C7C: -/* 80BE5C7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5C80 7C 08 02 A6 */ mflr r0 -/* 80BE5C84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5C88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE5C8C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BE5C90 41 82 00 1C */ beq lbl_80BE5CAC -/* 80BE5C94 3C A0 80 BE */ lis r5, __vt__8cM3dGSph@ha /* 0x80BE5F40@ha */ -/* 80BE5C98 38 05 5F 40 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80BE5F40@l */ -/* 80BE5C9C 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80BE5CA0 7C 80 07 35 */ extsh. r0, r4 -/* 80BE5CA4 40 81 00 08 */ ble lbl_80BE5CAC -/* 80BE5CA8 4B 6E 90 95 */ bl __dl__FPv -lbl_80BE5CAC: -/* 80BE5CAC 7F E3 FB 78 */ mr r3, r31 -/* 80BE5CB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE5CB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5CB8 7C 08 03 A6 */ mtlr r0 -/* 80BE5CBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5CC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8dCcD_SphFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8dCcD_SphFv.s deleted file mode 100644 index b3ee3ccd06e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8dCcD_SphFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80BE5B2C: -/* 80BE5B2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5B30 7C 08 02 A6 */ mflr r0 -/* 80BE5B34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5B38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE5B3C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BE5B40 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BE5B44 7C 9F 23 78 */ mr r31, r4 -/* 80BE5B48 41 82 00 94 */ beq lbl_80BE5BDC -/* 80BE5B4C 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80BE5B50 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80BE5B54 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80BE5B58 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BE5B5C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80BE5B60 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BE5B64 90 1E 01 34 */ stw r0, 0x134(r30) -/* 80BE5B68 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BE5B6C 41 82 00 54 */ beq lbl_80BE5BC0 -/* 80BE5B70 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80BE5B74 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80BE5B78 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80BE5B7C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BE5B80 90 1E 01 34 */ stw r0, 0x134(r30) -/* 80BE5B84 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 80BE5B88 41 82 00 10 */ beq lbl_80BE5B98 -/* 80BE5B8C 3C 60 80 BE */ lis r3, __vt__8cM3dGSph@ha /* 0x80BE5F40@ha */ -/* 80BE5B90 38 03 5F 40 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80BE5F40@l */ -/* 80BE5B94 90 1E 01 34 */ stw r0, 0x134(r30) -lbl_80BE5B98: -/* 80BE5B98 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BE5B9C 41 82 00 24 */ beq lbl_80BE5BC0 -/* 80BE5BA0 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BE5BA4 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BE5BA8 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80BE5BAC 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80BE5BB0 41 82 00 10 */ beq lbl_80BE5BC0 -/* 80BE5BB4 3C 60 80 BE */ lis r3, __vt__8cM3dGAab@ha /* 0x80BE5F34@ha */ -/* 80BE5BB8 38 03 5F 34 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BE5F34@l */ -/* 80BE5BBC 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_80BE5BC0: -/* 80BE5BC0 7F C3 F3 78 */ mr r3, r30 -/* 80BE5BC4 38 80 00 00 */ li r4, 0 -/* 80BE5BC8 4B 49 E5 1D */ bl __dt__12dCcD_GObjInfFv -/* 80BE5BCC 7F E0 07 35 */ extsh. r0, r31 -/* 80BE5BD0 40 81 00 0C */ ble lbl_80BE5BDC -/* 80BE5BD4 7F C3 F3 78 */ mr r3, r30 -/* 80BE5BD8 4B 6E 91 65 */ bl __dl__FPv -lbl_80BE5BDC: -/* 80BE5BDC 7F C3 F3 78 */ mr r3, r30 -/* 80BE5BE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE5BE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BE5BE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5BEC 7C 08 03 A6 */ mtlr r0 -/* 80BE5BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5BF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/action__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/action__10daObjFan_cFv.s deleted file mode 100644 index c29e54199f6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/action__10daObjFan_cFv.s +++ /dev/null @@ -1,320 +0,0 @@ -lbl_80BE538C: -/* 80BE538C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80BE5390 7C 08 02 A6 */ mflr r0 -/* 80BE5394 90 01 00 64 */ stw r0, 0x64(r1) -/* 80BE5398 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80BE539C F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80BE53A0 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80BE53A4 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 80BE53A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BE53AC 4B 77 CE 2D */ bl _savegpr_28 -/* 80BE53B0 7C 7D 1B 78 */ mr r29, r3 -/* 80BE53B4 3C 60 80 BE */ lis r3, l_bmd@ha /* 0x80BE5D80@ha */ -/* 80BE53B8 3B E3 5D 80 */ addi r31, r3, l_bmd@l /* 0x80BE5D80@l */ -/* 80BE53BC C3 DF 00 90 */ lfs f30, 0x90(r31) -/* 80BE53C0 FF E0 F0 90 */ fmr f31, f30 -/* 80BE53C4 38 00 00 00 */ li r0, 0 -/* 80BE53C8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80BE53CC 80 7D 04 A4 */ lwz r3, 0x4a4(r29) -/* 80BE53D0 3C 03 00 01 */ addis r0, r3, 1 -/* 80BE53D4 28 00 FF FF */ cmplwi r0, 0xffff -/* 80BE53D8 41 82 00 28 */ beq lbl_80BE5400 -/* 80BE53DC 38 81 00 1C */ addi r4, r1, 0x1c -/* 80BE53E0 4B 43 45 DD */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 80BE53E4 2C 03 00 00 */ cmpwi r3, 0 -/* 80BE53E8 41 82 00 18 */ beq lbl_80BE5400 -/* 80BE53EC 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 80BE53F0 28 03 00 00 */ cmplwi r3, 0 -/* 80BE53F4 41 82 00 0C */ beq lbl_80BE5400 -/* 80BE53F8 C3 C3 07 38 */ lfs f30, 0x738(r3) -/* 80BE53FC C3 E3 07 04 */ lfs f31, 0x704(r3) -lbl_80BE5400: -/* 80BE5400 C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 80BE5404 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80BE5408 40 82 00 0C */ bne lbl_80BE5414 -/* 80BE540C 38 80 00 00 */ li r4, 0 -/* 80BE5410 48 00 00 14 */ b lbl_80BE5424 -lbl_80BE5414: -/* 80BE5414 88 1D 0A D4 */ lbz r0, 0xad4(r29) -/* 80BE5418 54 00 08 3C */ slwi r0, r0, 1 -/* 80BE541C 38 7F 00 3C */ addi r3, r31, 0x3c -/* 80BE5420 7C 83 02 AE */ lhax r4, r3, r0 -lbl_80BE5424: -/* 80BE5424 80 7D 0A D0 */ lwz r3, 0xad0(r29) -/* 80BE5428 3C 03 00 01 */ addis r0, r3, 1 -/* 80BE542C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80BE5430 40 82 00 1C */ bne lbl_80BE544C -/* 80BE5434 80 7D 04 A4 */ lwz r3, 0x4a4(r29) -/* 80BE5438 3C 03 00 01 */ addis r0, r3, 1 -/* 80BE543C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80BE5440 41 82 00 0C */ beq lbl_80BE544C -/* 80BE5444 B0 9D 0A CC */ sth r4, 0xacc(r29) -/* 80BE5448 48 00 01 74 */ b lbl_80BE55BC -lbl_80BE544C: -/* 80BE544C 7C 80 07 35 */ extsh. r0, r4 -/* 80BE5450 41 82 00 58 */ beq lbl_80BE54A8 -/* 80BE5454 38 7D 0A CC */ addi r3, r29, 0xacc -/* 80BE5458 38 A0 00 32 */ li r5, 0x32 -/* 80BE545C C0 5F 00 C0 */ lfs f2, 0xc0(r31) -/* 80BE5460 88 1D 0A D4 */ lbz r0, 0xad4(r29) -/* 80BE5464 54 00 08 3C */ slwi r0, r0, 1 -/* 80BE5468 38 DF 00 3C */ addi r6, r31, 0x3c -/* 80BE546C 7C 06 02 AE */ lhax r0, r6, r0 -/* 80BE5470 C8 3F 00 B8 */ lfd f1, 0xb8(r31) -/* 80BE5474 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE5478 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BE547C 3C 00 43 30 */ lis r0, 0x4330 -/* 80BE5480 90 01 00 20 */ stw r0, 0x20(r1) -/* 80BE5484 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80BE5488 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BE548C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80BE5490 FC 00 00 1E */ fctiwz f0, f0 -/* 80BE5494 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BE5498 80 C1 00 2C */ lwz r6, 0x2c(r1) -/* 80BE549C 38 E0 00 0A */ li r7, 0xa -/* 80BE54A0 4B 68 B0 A1 */ bl cLib_addCalcAngleS__FPsssss -/* 80BE54A4 48 00 01 18 */ b lbl_80BE55BC -lbl_80BE54A8: -/* 80BE54A8 38 7D 0A CC */ addi r3, r29, 0xacc -/* 80BE54AC 38 A0 00 32 */ li r5, 0x32 -/* 80BE54B0 C0 5F 00 C0 */ lfs f2, 0xc0(r31) -/* 80BE54B4 88 1D 0A D4 */ lbz r0, 0xad4(r29) -/* 80BE54B8 54 00 08 3C */ slwi r0, r0, 1 -/* 80BE54BC 38 DF 00 3C */ addi r6, r31, 0x3c -/* 80BE54C0 7C 06 02 AE */ lhax r0, r6, r0 -/* 80BE54C4 C8 3F 00 B8 */ lfd f1, 0xb8(r31) -/* 80BE54C8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE54CC 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80BE54D0 3C 00 43 30 */ lis r0, 0x4330 -/* 80BE54D4 90 01 00 28 */ stw r0, 0x28(r1) -/* 80BE54D8 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80BE54DC EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BE54E0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80BE54E4 FC 00 00 1E */ fctiwz f0, f0 -/* 80BE54E8 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80BE54EC 80 C1 00 24 */ lwz r6, 0x24(r1) -/* 80BE54F0 38 E0 00 0A */ li r7, 0xa -/* 80BE54F4 4B 68 B0 4D */ bl cLib_addCalcAngleS__FPsssss -/* 80BE54F8 A8 1D 0A CE */ lha r0, 0xace(r29) -/* 80BE54FC 2C 00 E0 00 */ cmpwi r0, -8192 -/* 80BE5500 40 81 00 14 */ ble lbl_80BE5514 -/* 80BE5504 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 80BE5508 41 81 00 0C */ bgt lbl_80BE5514 -/* 80BE550C 3B C0 20 00 */ li r30, 0x2000 -/* 80BE5510 48 00 00 58 */ b lbl_80BE5568 -lbl_80BE5514: -/* 80BE5514 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 80BE5518 40 81 00 14 */ ble lbl_80BE552C -/* 80BE551C 2C 00 60 00 */ cmpwi r0, 0x6000 -/* 80BE5520 41 81 00 0C */ bgt lbl_80BE552C -/* 80BE5524 3B C0 60 00 */ li r30, 0x6000 -/* 80BE5528 48 00 00 40 */ b lbl_80BE5568 -lbl_80BE552C: -/* 80BE552C 2C 00 60 00 */ cmpwi r0, 0x6000 -/* 80BE5530 40 81 00 0C */ ble lbl_80BE553C -/* 80BE5534 2C 00 7F FF */ cmpwi r0, 0x7fff -/* 80BE5538 40 81 00 14 */ ble lbl_80BE554C -lbl_80BE553C: -/* 80BE553C 2C 00 A0 00 */ cmpwi r0, -24576 -/* 80BE5540 40 80 00 14 */ bge lbl_80BE5554 -/* 80BE5544 2C 00 80 01 */ cmpwi r0, -32767 -/* 80BE5548 40 81 00 0C */ ble lbl_80BE5554 -lbl_80BE554C: -/* 80BE554C 3B C0 A0 00 */ li r30, -24576 -/* 80BE5550 48 00 00 18 */ b lbl_80BE5568 -lbl_80BE5554: -/* 80BE5554 2C 00 A0 00 */ cmpwi r0, -24576 -/* 80BE5558 40 81 00 10 */ ble lbl_80BE5568 -/* 80BE555C 2C 00 E0 00 */ cmpwi r0, -8192 -/* 80BE5560 41 81 00 08 */ bgt lbl_80BE5568 -/* 80BE5564 3B C0 E0 00 */ li r30, -8192 -lbl_80BE5568: -/* 80BE5568 38 7D 0A CE */ addi r3, r29, 0xace -/* 80BE556C 7F C4 F3 78 */ mr r4, r30 -/* 80BE5570 38 A0 00 32 */ li r5, 0x32 -/* 80BE5574 C0 5F 00 C0 */ lfs f2, 0xc0(r31) -/* 80BE5578 88 1D 0A D4 */ lbz r0, 0xad4(r29) -/* 80BE557C 54 00 08 3C */ slwi r0, r0, 1 -/* 80BE5580 38 DF 00 3C */ addi r6, r31, 0x3c -/* 80BE5584 7C 06 02 AE */ lhax r0, r6, r0 -/* 80BE5588 C8 3F 00 B8 */ lfd f1, 0xb8(r31) -/* 80BE558C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE5590 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80BE5594 3C 00 43 30 */ lis r0, 0x4330 -/* 80BE5598 90 01 00 28 */ stw r0, 0x28(r1) -/* 80BE559C C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80BE55A0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BE55A4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80BE55A8 FC 00 00 1E */ fctiwz f0, f0 -/* 80BE55AC D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80BE55B0 80 C1 00 24 */ lwz r6, 0x24(r1) -/* 80BE55B4 38 E0 00 0A */ li r7, 0xa -/* 80BE55B8 4B 68 AF 89 */ bl cLib_addCalcAngleS__FPsssss -lbl_80BE55BC: -/* 80BE55BC A8 7D 0A CE */ lha r3, 0xace(r29) -/* 80BE55C0 A8 1D 0A CC */ lha r0, 0xacc(r29) -/* 80BE55C4 7C 03 02 14 */ add r0, r3, r0 -/* 80BE55C8 B0 1D 0A CE */ sth r0, 0xace(r29) -/* 80BE55CC A8 7D 0A CC */ lha r3, 0xacc(r29) -/* 80BE55D0 7C 60 07 35 */ extsh. r0, r3 -/* 80BE55D4 41 82 00 F8 */ beq lbl_80BE56CC -/* 80BE55D8 C0 3F 00 C4 */ lfs f1, 0xc4(r31) -/* 80BE55DC C8 5F 00 B8 */ lfd f2, 0xb8(r31) -/* 80BE55E0 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 80BE55E4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80BE55E8 3C 80 43 30 */ lis r4, 0x4330 -/* 80BE55EC 90 81 00 28 */ stw r4, 0x28(r1) -/* 80BE55F0 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80BE55F4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80BE55F8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80BE55FC 8B 9D 0A D4 */ lbz r28, 0xad4(r29) -/* 80BE5600 57 80 08 3C */ slwi r0, r28, 1 -/* 80BE5604 38 7F 00 3C */ addi r3, r31, 0x3c -/* 80BE5608 7C 03 02 AE */ lhax r0, r3, r0 -/* 80BE560C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80BE5610 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BE5614 90 81 00 20 */ stw r4, 0x20(r1) -/* 80BE5618 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80BE561C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80BE5620 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80BE5624 4B 77 CA 89 */ bl __cvt_fp2unsigned -/* 80BE5628 7C 7E 1B 78 */ mr r30, r3 -/* 80BE562C 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80BE5630 7C 03 07 74 */ extsb r3, r0 -/* 80BE5634 2C 03 00 04 */ cmpwi r3, 4 -/* 80BE5638 40 82 00 4C */ bne lbl_80BE5684 -/* 80BE563C 4B 44 7A 31 */ bl dComIfGp_getReverb__Fi -/* 80BE5640 7C 67 1B 78 */ mr r7, r3 -/* 80BE5644 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080262@ha */ -/* 80BE5648 38 03 02 62 */ addi r0, r3, 0x0262 /* 0x00080262@l */ -/* 80BE564C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5650 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BE5654 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BE5658 80 63 00 00 */ lwz r3, 0(r3) -/* 80BE565C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BE5660 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BE5664 7F C6 F3 78 */ mr r6, r30 -/* 80BE5668 C0 3F 00 C8 */ lfs f1, 0xc8(r31) -/* 80BE566C FC 40 08 90 */ fmr f2, f1 -/* 80BE5670 C0 7F 00 CC */ lfs f3, 0xcc(r31) -/* 80BE5674 FC 80 18 90 */ fmr f4, f3 -/* 80BE5678 39 00 00 00 */ li r8, 0 -/* 80BE567C 4B 6C 6E 91 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BE5680 48 00 00 4C */ b lbl_80BE56CC -lbl_80BE5684: -/* 80BE5684 57 80 10 3A */ slwi r0, r28, 2 -/* 80BE5688 38 9F 00 24 */ addi r4, r31, 0x24 -/* 80BE568C 7F 84 00 2E */ lwzx r28, r4, r0 -/* 80BE5690 4B 44 79 DD */ bl dComIfGp_getReverb__Fi -/* 80BE5694 7C 67 1B 78 */ mr r7, r3 -/* 80BE5698 93 81 00 10 */ stw r28, 0x10(r1) -/* 80BE569C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BE56A0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BE56A4 80 63 00 00 */ lwz r3, 0(r3) -/* 80BE56A8 38 81 00 10 */ addi r4, r1, 0x10 -/* 80BE56AC 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BE56B0 7F C6 F3 78 */ mr r6, r30 -/* 80BE56B4 C0 3F 00 C8 */ lfs f1, 0xc8(r31) -/* 80BE56B8 FC 40 08 90 */ fmr f2, f1 -/* 80BE56BC C0 7F 00 CC */ lfs f3, 0xcc(r31) -/* 80BE56C0 FC 80 18 90 */ fmr f4, f3 -/* 80BE56C4 39 00 00 00 */ li r8, 0 -/* 80BE56C8 4B 6C 6E 45 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80BE56CC: -/* 80BE56CC C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 80BE56D0 FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 80BE56D4 41 82 01 40 */ beq lbl_80BE5814 -/* 80BE56D8 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80BE56DC 7C 03 07 74 */ extsb r3, r0 -/* 80BE56E0 2C 03 00 04 */ cmpwi r3, 4 -/* 80BE56E4 40 82 00 4C */ bne lbl_80BE5730 -/* 80BE56E8 4B 44 79 85 */ bl dComIfGp_getReverb__Fi -/* 80BE56EC 7C 67 1B 78 */ mr r7, r3 -/* 80BE56F0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080265@ha */ -/* 80BE56F4 38 03 02 65 */ addi r0, r3, 0x0265 /* 0x00080265@l */ -/* 80BE56F8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BE56FC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BE5700 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BE5704 80 63 00 00 */ lwz r3, 0(r3) -/* 80BE5708 38 81 00 0C */ addi r4, r1, 0xc -/* 80BE570C 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BE5710 38 C0 00 00 */ li r6, 0 -/* 80BE5714 C0 3F 00 C8 */ lfs f1, 0xc8(r31) -/* 80BE5718 FC 40 08 90 */ fmr f2, f1 -/* 80BE571C C0 7F 00 CC */ lfs f3, 0xcc(r31) -/* 80BE5720 FC 80 18 90 */ fmr f4, f3 -/* 80BE5724 39 00 00 00 */ li r8, 0 -/* 80BE5728 4B 6C 6D E5 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BE572C 48 00 00 E8 */ b lbl_80BE5814 -lbl_80BE5730: -/* 80BE5730 88 1D 0A D4 */ lbz r0, 0xad4(r29) -/* 80BE5734 54 00 10 3A */ slwi r0, r0, 2 -/* 80BE5738 38 9F 00 30 */ addi r4, r31, 0x30 -/* 80BE573C 7F 84 00 2E */ lwzx r28, r4, r0 -/* 80BE5740 3C 1C FF F8 */ addis r0, r28, 0xfff8 -/* 80BE5744 28 00 02 64 */ cmplwi r0, 0x264 -/* 80BE5748 40 82 00 90 */ bne lbl_80BE57D8 -/* 80BE574C 80 61 00 1C */ lwz r3, 0x1c(r1) -/* 80BE5750 28 03 00 00 */ cmplwi r3, 0 -/* 80BE5754 41 82 00 20 */ beq lbl_80BE5774 -/* 80BE5758 C0 03 06 F4 */ lfs f0, 0x6f4(r3) -/* 80BE575C D0 1D 0A D8 */ stfs f0, 0xad8(r29) -/* 80BE5760 C0 03 06 F8 */ lfs f0, 0x6f8(r3) -/* 80BE5764 D0 1D 0A DC */ stfs f0, 0xadc(r29) -/* 80BE5768 C0 03 06 FC */ lfs f0, 0x6fc(r3) -/* 80BE576C D0 1D 0A E0 */ stfs f0, 0xae0(r29) -/* 80BE5770 48 00 00 1C */ b lbl_80BE578C -lbl_80BE5774: -/* 80BE5774 C0 1D 05 38 */ lfs f0, 0x538(r29) -/* 80BE5778 D0 1D 0A D8 */ stfs f0, 0xad8(r29) -/* 80BE577C C0 1D 05 3C */ lfs f0, 0x53c(r29) -/* 80BE5780 D0 1D 0A DC */ stfs f0, 0xadc(r29) -/* 80BE5784 C0 1D 05 40 */ lfs f0, 0x540(r29) -/* 80BE5788 D0 1D 0A E0 */ stfs f0, 0xae0(r29) -lbl_80BE578C: -/* 80BE578C 88 1D 0A D4 */ lbz r0, 0xad4(r29) -/* 80BE5790 54 00 10 3A */ slwi r0, r0, 2 -/* 80BE5794 38 7F 00 30 */ addi r3, r31, 0x30 -/* 80BE5798 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80BE579C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80BE57A0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BE57A4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BE57A8 80 63 00 00 */ lwz r3, 0(r3) -/* 80BE57AC 38 81 00 18 */ addi r4, r1, 0x18 -/* 80BE57B0 38 BD 0A D8 */ addi r5, r29, 0xad8 -/* 80BE57B4 38 C0 00 00 */ li r6, 0 -/* 80BE57B8 38 E0 00 00 */ li r7, 0 -/* 80BE57BC C0 3F 00 C8 */ lfs f1, 0xc8(r31) -/* 80BE57C0 FC 40 08 90 */ fmr f2, f1 -/* 80BE57C4 C0 7F 00 CC */ lfs f3, 0xcc(r31) -/* 80BE57C8 FC 80 18 90 */ fmr f4, f3 -/* 80BE57CC 39 00 00 00 */ li r8, 0 -/* 80BE57D0 4B 6C 6D 3D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80BE57D4 48 00 00 40 */ b lbl_80BE5814 -lbl_80BE57D8: -/* 80BE57D8 4B 44 78 95 */ bl dComIfGp_getReverb__Fi -/* 80BE57DC 7C 67 1B 78 */ mr r7, r3 -/* 80BE57E0 93 81 00 08 */ stw r28, 8(r1) -/* 80BE57E4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80BE57E8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80BE57EC 80 63 00 00 */ lwz r3, 0(r3) -/* 80BE57F0 38 81 00 08 */ addi r4, r1, 8 -/* 80BE57F4 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BE57F8 38 C0 00 00 */ li r6, 0 -/* 80BE57FC C0 3F 00 C8 */ lfs f1, 0xc8(r31) -/* 80BE5800 FC 40 08 90 */ fmr f2, f1 -/* 80BE5804 C0 7F 00 CC */ lfs f3, 0xcc(r31) -/* 80BE5808 FC 80 18 90 */ fmr f4, f3 -/* 80BE580C 39 00 00 00 */ li r8, 0 -/* 80BE5810 4B 6C 6C FD */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80BE5814: -/* 80BE5814 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80BE5818 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80BE581C E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 80BE5820 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 80BE5824 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BE5828 4B 77 C9 FD */ bl _restgpr_28 -/* 80BE582C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80BE5830 7C 08 03 A6 */ mtlr r0 -/* 80BE5834 38 21 00 60 */ addi r1, r1, 0x60 -/* 80BE5838 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/create1st__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/create1st__10daObjFan_cFv.s deleted file mode 100644 index 121cd576644..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/create1st__10daObjFan_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80BE50EC: -/* 80BE50EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE50F0 7C 08 02 A6 */ mflr r0 -/* 80BE50F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE50F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE50FC 7C 7F 1B 78 */ mr r31, r3 -/* 80BE5100 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80BE5104 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 80BE5108 98 03 0A D4 */ stb r0, 0xad4(r3) -/* 80BE510C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80BE5110 88 1F 0A D4 */ lbz r0, 0xad4(r31) -/* 80BE5114 54 00 10 3A */ slwi r0, r0, 2 -/* 80BE5118 3C 80 80 BE */ lis r4, l_arcName@ha /* 0x80BE5E78@ha */ -/* 80BE511C 38 84 5E 78 */ addi r4, r4, l_arcName@l /* 0x80BE5E78@l */ -/* 80BE5120 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80BE5124 4B 44 7D 99 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BE5128 2C 03 00 04 */ cmpwi r3, 4 -/* 80BE512C 41 82 00 08 */ beq lbl_80BE5134 -/* 80BE5130 48 00 00 58 */ b lbl_80BE5188 -lbl_80BE5134: -/* 80BE5134 38 00 FF FF */ li r0, -1 -/* 80BE5138 90 1F 04 A4 */ stw r0, 0x4a4(r31) -/* 80BE513C 80 1F 04 A4 */ lwz r0, 0x4a4(r31) -/* 80BE5140 90 1F 0A D0 */ stw r0, 0xad0(r31) -/* 80BE5144 88 1F 0A D4 */ lbz r0, 0xad4(r31) -/* 80BE5148 54 00 10 3A */ slwi r0, r0, 2 -/* 80BE514C 7F E3 FB 78 */ mr r3, r31 -/* 80BE5150 3C 80 80 BE */ lis r4, l_arcName@ha /* 0x80BE5E78@ha */ -/* 80BE5154 38 84 5E 78 */ addi r4, r4, l_arcName@l /* 0x80BE5E78@l */ -/* 80BE5158 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80BE515C 3C A0 80 BE */ lis r5, l_dzb2@ha /* 0x80BE5D8C@ha */ -/* 80BE5160 38 A5 5D 8C */ addi r5, r5, l_dzb2@l /* 0x80BE5D8C@l */ -/* 80BE5164 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80BE5168 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80BE516C 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80BE5170 3C E0 80 BE */ lis r7, l_heap_size@ha /* 0x80BE5DC4@ha */ -/* 80BE5174 38 E7 5D C4 */ addi r7, r7, l_heap_size@l /* 0x80BE5DC4@l */ -/* 80BE5178 7C E7 00 2E */ lwzx r7, r7, r0 -/* 80BE517C 39 00 00 00 */ li r8, 0 -/* 80BE5180 4B 49 36 3D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80BE5184 2C 03 00 05 */ cmpwi r3, 5 -lbl_80BE5188: -/* 80BE5188 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE518C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5190 7C 08 03 A6 */ mtlr r0 -/* 80BE5194 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5198 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDelete__FP10daObjFan_c.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDelete__FP10daObjFan_c.s deleted file mode 100644 index e3ded8ca886..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDelete__FP10daObjFan_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BE5D0C: -/* 80BE5D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5D10 7C 08 02 A6 */ mflr r0 -/* 80BE5D14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5D18 4B 49 2B C5 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80BE5D1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5D20 7C 08 03 A6 */ mtlr r0 -/* 80BE5D24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5D28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDraw__FP10daObjFan_c.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDraw__FP10daObjFan_c.s deleted file mode 100644 index 9853fa0e273..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDraw__FP10daObjFan_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80BE5D4C: -/* 80BE5D4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5D50 7C 08 02 A6 */ mflr r0 -/* 80BE5D54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5D58 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80BE5D5C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80BE5D60 7D 89 03 A6 */ mtctr r12 -/* 80BE5D64 4E 80 04 21 */ bctrl -/* 80BE5D68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5D6C 7C 08 03 A6 */ mtlr r0 -/* 80BE5D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5D74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGExecute__FP10daObjFan_c.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGExecute__FP10daObjFan_c.s deleted file mode 100644 index 8822089be5b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGExecute__FP10daObjFan_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BE5D2C: -/* 80BE5D2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5D30 7C 08 02 A6 */ mflr r0 -/* 80BE5D34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5D38 4B 49 2C 19 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80BE5D3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5D40 7C 08 03 A6 */ mtlr r0 -/* 80BE5D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5D48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_create1st__FP10daObjFan_c.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_create1st__FP10daObjFan_c.s deleted file mode 100644 index 47d1885eed5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_create1st__FP10daObjFan_c.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80BE5A78: -/* 80BE5A78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE5A7C 7C 08 02 A6 */ mflr r0 -/* 80BE5A80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE5A84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE5A88 93 C1 00 08 */ stw r30, 8(r1) -/* 80BE5A8C 7C 7F 1B 78 */ mr r31, r3 -/* 80BE5A90 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BE5A94 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BE5A98 40 82 00 74 */ bne lbl_80BE5B0C -/* 80BE5A9C 7F E0 FB 79 */ or. r0, r31, r31 -/* 80BE5AA0 41 82 00 60 */ beq lbl_80BE5B00 -/* 80BE5AA4 7C 1E 03 78 */ mr r30, r0 -/* 80BE5AA8 4B 49 2B 7D */ bl __ct__16dBgS_MoveBgActorFv -/* 80BE5AAC 3C 60 80 BE */ lis r3, __vt__10daObjFan_c@ha /* 0x80BE5F4C@ha */ -/* 80BE5AB0 38 03 5F 4C */ addi r0, r3, __vt__10daObjFan_c@l /* 0x80BE5F4C@l */ -/* 80BE5AB4 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80BE5AB8 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80BE5ABC 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80BE5AC0 90 1E 05 C8 */ stw r0, 0x5c8(r30) -/* 80BE5AC4 38 7E 05 CC */ addi r3, r30, 0x5cc -/* 80BE5AC8 4B 49 DC 99 */ bl __ct__10dCcD_GSttsFv -/* 80BE5ACC 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80BE5AD0 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80BE5AD4 90 7E 05 C8 */ stw r3, 0x5c8(r30) -/* 80BE5AD8 38 03 00 20 */ addi r0, r3, 0x20 -/* 80BE5ADC 90 1E 05 CC */ stw r0, 0x5cc(r30) -/* 80BE5AE0 38 7E 05 EC */ addi r3, r30, 0x5ec -/* 80BE5AE4 3C 80 80 BE */ lis r4, __ct__8dCcD_SphFv@ha /* 0x80BE5BF8@ha */ -/* 80BE5AE8 38 84 5B F8 */ addi r4, r4, __ct__8dCcD_SphFv@l /* 0x80BE5BF8@l */ -/* 80BE5AEC 3C A0 80 BE */ lis r5, __dt__8dCcD_SphFv@ha /* 0x80BE5B2C@ha */ -/* 80BE5AF0 38 A5 5B 2C */ addi r5, r5, __dt__8dCcD_SphFv@l /* 0x80BE5B2C@l */ -/* 80BE5AF4 38 C0 01 38 */ li r6, 0x138 -/* 80BE5AF8 38 E0 00 04 */ li r7, 4 -/* 80BE5AFC 4B 77 C2 65 */ bl __construct_array -lbl_80BE5B00: -/* 80BE5B00 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80BE5B04 60 00 00 08 */ ori r0, r0, 8 -/* 80BE5B08 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80BE5B0C: -/* 80BE5B0C 7F E3 FB 78 */ mr r3, r31 -/* 80BE5B10 4B FF F5 DD */ bl create1st__10daObjFan_cFv -/* 80BE5B14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE5B18 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BE5B1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE5B20 7C 08 03 A6 */ mtlr r0 -/* 80BE5B24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE5B28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/initBaseMtx__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/initBaseMtx__10daObjFan_cFv.s deleted file mode 100644 index 80de72769e2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/initBaseMtx__10daObjFan_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BE4E08: -/* 80BE4E08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE4E0C 7C 08 02 A6 */ mflr r0 -/* 80BE4E10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE4E14 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80BE4E18 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80BE4E1C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80BE4E20 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80BE4E24 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80BE4E28 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80BE4E2C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80BE4E30 48 00 00 15 */ bl setBaseMtx__10daObjFan_cFv -/* 80BE4E34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE4E38 7C 08 03 A6 */ mtlr r0 -/* 80BE4E3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE4E40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/searchTornado2__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/searchTornado2__FPvPv.s deleted file mode 100644 index 1acad894844..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/searchTornado2__FPvPv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80BE4C38: -/* 80BE4C38 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BE4C3C 7C 08 02 A6 */ mflr r0 -/* 80BE4C40 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BE4C44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BE4C48 4B 77 D5 95 */ bl _savegpr_29 -/* 80BE4C4C 7C 9D 23 78 */ mr r29, r4 -/* 80BE4C50 3C 80 80 BE */ lis r4, l_bmd@ha /* 0x80BE5D80@ha */ -/* 80BE4C54 3B E4 5D 80 */ addi r31, r4, l_bmd@l /* 0x80BE5D80@l */ -/* 80BE4C58 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BE4C5C 41 82 01 20 */ beq lbl_80BE4D7C -/* 80BE4C60 4B 43 40 81 */ bl fopAc_IsActor__FPv -/* 80BE4C64 2C 03 00 00 */ cmpwi r3, 0 -/* 80BE4C68 41 82 01 14 */ beq lbl_80BE4D7C -/* 80BE4C6C A8 1E 00 0E */ lha r0, 0xe(r30) -/* 80BE4C70 2C 00 01 5C */ cmpwi r0, 0x15c -/* 80BE4C74 40 82 01 08 */ bne lbl_80BE4D7C -/* 80BE4C78 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80BE4C7C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80BE4C80 4B 76 27 1D */ bl PSVECSquareDistance -/* 80BE4C84 C0 1F 00 90 */ lfs f0, 0x90(r31) -/* 80BE4C88 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BE4C8C 40 81 00 58 */ ble lbl_80BE4CE4 -/* 80BE4C90 FC 00 08 34 */ frsqrte f0, f1 -/* 80BE4C94 C8 9F 00 98 */ lfd f4, 0x98(r31) -/* 80BE4C98 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BE4C9C C8 7F 00 A0 */ lfd f3, 0xa0(r31) -/* 80BE4CA0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BE4CA4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BE4CA8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BE4CAC FC 02 00 32 */ fmul f0, f2, f0 -/* 80BE4CB0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BE4CB4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BE4CB8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BE4CBC FC 03 00 28 */ fsub f0, f3, f0 -/* 80BE4CC0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BE4CC4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BE4CC8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BE4CCC FC 01 00 32 */ fmul f0, f1, f0 -/* 80BE4CD0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BE4CD4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BE4CD8 FC 21 00 32 */ fmul f1, f1, f0 -/* 80BE4CDC FC 20 08 18 */ frsp f1, f1 -/* 80BE4CE0 48 00 00 88 */ b lbl_80BE4D68 -lbl_80BE4CE4: -/* 80BE4CE4 C8 1F 00 A8 */ lfd f0, 0xa8(r31) -/* 80BE4CE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BE4CEC 40 80 00 10 */ bge lbl_80BE4CFC -/* 80BE4CF0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BE4CF4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80BE4CF8 48 00 00 70 */ b lbl_80BE4D68 -lbl_80BE4CFC: -/* 80BE4CFC D0 21 00 08 */ stfs f1, 8(r1) -/* 80BE4D00 80 81 00 08 */ lwz r4, 8(r1) -/* 80BE4D04 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80BE4D08 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80BE4D0C 7C 03 00 00 */ cmpw r3, r0 -/* 80BE4D10 41 82 00 14 */ beq lbl_80BE4D24 -/* 80BE4D14 40 80 00 40 */ bge lbl_80BE4D54 -/* 80BE4D18 2C 03 00 00 */ cmpwi r3, 0 -/* 80BE4D1C 41 82 00 20 */ beq lbl_80BE4D3C -/* 80BE4D20 48 00 00 34 */ b lbl_80BE4D54 -lbl_80BE4D24: -/* 80BE4D24 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BE4D28 41 82 00 0C */ beq lbl_80BE4D34 -/* 80BE4D2C 38 00 00 01 */ li r0, 1 -/* 80BE4D30 48 00 00 28 */ b lbl_80BE4D58 -lbl_80BE4D34: -/* 80BE4D34 38 00 00 02 */ li r0, 2 -/* 80BE4D38 48 00 00 20 */ b lbl_80BE4D58 -lbl_80BE4D3C: -/* 80BE4D3C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BE4D40 41 82 00 0C */ beq lbl_80BE4D4C -/* 80BE4D44 38 00 00 05 */ li r0, 5 -/* 80BE4D48 48 00 00 10 */ b lbl_80BE4D58 -lbl_80BE4D4C: -/* 80BE4D4C 38 00 00 03 */ li r0, 3 -/* 80BE4D50 48 00 00 08 */ b lbl_80BE4D58 -lbl_80BE4D54: -/* 80BE4D54 38 00 00 04 */ li r0, 4 -lbl_80BE4D58: -/* 80BE4D58 2C 00 00 01 */ cmpwi r0, 1 -/* 80BE4D5C 40 82 00 0C */ bne lbl_80BE4D68 -/* 80BE4D60 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BE4D64 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80BE4D68: -/* 80BE4D68 C0 1F 00 B0 */ lfs f0, 0xb0(r31) -/* 80BE4D6C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BE4D70 40 80 00 0C */ bge lbl_80BE4D7C -/* 80BE4D74 7F C3 F3 78 */ mr r3, r30 -/* 80BE4D78 48 00 00 08 */ b lbl_80BE4D80 -lbl_80BE4D7C: -/* 80BE4D7C 38 60 00 00 */ li r3, 0 -lbl_80BE4D80: -/* 80BE4D80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BE4D84 4B 77 D4 A5 */ bl _restgpr_29 -/* 80BE4D88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BE4D8C 7C 08 03 A6 */ mtlr r0 -/* 80BE4D90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BE4D94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/search_tornado__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/search_tornado__10daObjFan_cFv.s deleted file mode 100644 index 525361d1200..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/search_tornado__10daObjFan_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80BE4D98: -/* 80BE4D98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE4D9C 7C 08 02 A6 */ mflr r0 -/* 80BE4DA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE4DA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE4DA8 7C 7F 1B 78 */ mr r31, r3 -/* 80BE4DAC 38 60 00 00 */ li r3, 0 -/* 80BE4DB0 80 1F 04 A4 */ lwz r0, 0x4a4(r31) -/* 80BE4DB4 90 1F 0A D0 */ stw r0, 0xad0(r31) -/* 80BE4DB8 80 9F 04 A4 */ lwz r4, 0x4a4(r31) -/* 80BE4DBC 3C 04 00 01 */ addis r0, r4, 1 -/* 80BE4DC0 28 00 FF FF */ cmplwi r0, 0xffff -/* 80BE4DC4 40 82 00 30 */ bne lbl_80BE4DF4 -/* 80BE4DC8 3C 60 80 BE */ lis r3, searchTornado2__FPvPv@ha /* 0x80BE4C38@ha */ -/* 80BE4DCC 38 63 4C 38 */ addi r3, r3, searchTornado2__FPvPv@l /* 0x80BE4C38@l */ -/* 80BE4DD0 7F E4 FB 78 */ mr r4, r31 -/* 80BE4DD4 4B 43 C5 65 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80BE4DD8 28 03 00 00 */ cmplwi r3, 0 -/* 80BE4DDC 41 82 00 18 */ beq lbl_80BE4DF4 -/* 80BE4DE0 41 82 00 0C */ beq lbl_80BE4DEC -/* 80BE4DE4 80 03 00 04 */ lwz r0, 4(r3) -/* 80BE4DE8 48 00 00 08 */ b lbl_80BE4DF0 -lbl_80BE4DEC: -/* 80BE4DEC 38 00 FF FF */ li r0, -1 -lbl_80BE4DF0: -/* 80BE4DF0 90 1F 04 A4 */ stw r0, 0x4a4(r31) -lbl_80BE4DF4: -/* 80BE4DF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE4DF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE4DFC 7C 08 03 A6 */ mtlr r0 -/* 80BE4E00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE4E04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setBaseMtx__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setBaseMtx__10daObjFan_cFv.s deleted file mode 100644 index ad360437dae..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setBaseMtx__10daObjFan_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80BE4E44: -/* 80BE4E44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BE4E48 7C 08 02 A6 */ mflr r0 -/* 80BE4E4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BE4E50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BE4E54 7C 7F 1B 78 */ mr r31, r3 -/* 80BE4E58 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BE4E5C 4B 42 7F 09 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BE4E60 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80BE4E64 4B 42 80 E1 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BE4E68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BE4E6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BE4E70 A8 9F 0A CE */ lha r4, 0xace(r31) -/* 80BE4E74 4B 42 76 59 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80BE4E78 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BE4E7C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BE4E80 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80BE4E84 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BE4E88 4B 76 16 29 */ bl PSMTXCopy -/* 80BE4E8C 88 1F 0A D4 */ lbz r0, 0xad4(r31) -/* 80BE4E90 28 00 00 00 */ cmplwi r0, 0 -/* 80BE4E94 41 82 00 1C */ beq lbl_80BE4EB0 -/* 80BE4E98 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80BE4E9C 28 03 00 00 */ cmplwi r3, 0 -/* 80BE4EA0 41 82 00 24 */ beq lbl_80BE4EC4 -/* 80BE4EA4 4B 68 33 31 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80BE4EA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BE4EAC 41 82 00 18 */ beq lbl_80BE4EC4 -lbl_80BE4EB0: -/* 80BE4EB0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BE4EB4 4B 42 7E B1 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BE4EB8 38 7F 04 B4 */ addi r3, r31, 0x4b4 -/* 80BE4EBC 4B 42 80 89 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BE4EC0 48 00 00 24 */ b lbl_80BE4EE4 -lbl_80BE4EC4: -/* 80BE4EC4 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BE4EC8 4B 42 7E 9D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BE4ECC 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80BE4ED0 4B 42 80 75 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BE4ED4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BE4ED8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BE4EDC A8 9F 0A CE */ lha r4, 0xace(r31) -/* 80BE4EE0 4B 42 75 ED */ bl mDoMtx_ZrotM__FPA4_fs -lbl_80BE4EE4: -/* 80BE4EE4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BE4EE8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BE4EEC 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80BE4EF0 4B 76 15 C1 */ bl PSMTXCopy -/* 80BE4EF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BE4EF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BE4EFC 7C 08 03 A6 */ mtlr r0 -/* 80BE4F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BE4F04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setCollision__10daObjFan_cFv.s b/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setCollision__10daObjFan_cFv.s deleted file mode 100644 index bbc4625c68c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setCollision__10daObjFan_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80BE583C: -/* 80BE583C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BE5840 7C 08 02 A6 */ mflr r0 -/* 80BE5844 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BE5848 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BE584C 4B 77 C9 85 */ bl _savegpr_26 -/* 80BE5850 7C 7E 1B 78 */ mr r30, r3 -/* 80BE5854 88 03 0A D4 */ lbz r0, 0xad4(r3) -/* 80BE5858 28 00 00 00 */ cmplwi r0, 0 -/* 80BE585C 41 82 00 EC */ beq lbl_80BE5948 -/* 80BE5860 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80BE5864 4B 42 76 A9 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz -/* 80BE5868 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BE586C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BE5870 A8 9E 0A CE */ lha r4, 0xace(r30) -/* 80BE5874 4B 42 6C 59 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80BE5878 3B E0 00 00 */ li r31, 0 -/* 80BE587C 3B A0 00 00 */ li r29, 0 -/* 80BE5880 3B 80 00 00 */ li r28, 0 -/* 80BE5884 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BE5888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BE588C 3B 63 23 3C */ addi r27, r3, 0x233c -lbl_80BE5890: -/* 80BE5890 88 1E 0A D4 */ lbz r0, 0xad4(r30) -/* 80BE5894 28 00 00 01 */ cmplwi r0, 1 -/* 80BE5898 40 82 00 38 */ bne lbl_80BE58D0 -/* 80BE589C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BE58A0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BE58A4 3C 80 80 BE */ lis r4, l_offset_posM@ha /* 0x80BE5E84@ha */ -/* 80BE58A8 38 04 5E 84 */ addi r0, r4, l_offset_posM@l /* 0x80BE5E84@l */ -/* 80BE58AC 7C 80 E2 14 */ add r4, r0, r28 -/* 80BE58B0 38 A1 00 08 */ addi r5, r1, 8 -/* 80BE58B4 4B 76 14 B9 */ bl PSMTXMultVec -/* 80BE58B8 38 7D 07 10 */ addi r3, r29, 0x710 -/* 80BE58BC 7C 7E 1A 14 */ add r3, r30, r3 -/* 80BE58C0 3C 80 80 BE */ lis r4, lit_3964@ha /* 0x80BE5E50@ha */ -/* 80BE58C4 C0 24 5E 50 */ lfs f1, lit_3964@l(r4) /* 0x80BE5E50@l */ -/* 80BE58C8 4B 68 9E 41 */ bl SetR__8cM3dGSphFf -/* 80BE58CC 48 00 00 3C */ b lbl_80BE5908 -lbl_80BE58D0: -/* 80BE58D0 28 00 00 02 */ cmplwi r0, 2 -/* 80BE58D4 40 82 00 34 */ bne lbl_80BE5908 -/* 80BE58D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BE58DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BE58E0 3C 80 80 BE */ lis r4, l_offset_posL@ha /* 0x80BE5EB4@ha */ -/* 80BE58E4 38 04 5E B4 */ addi r0, r4, l_offset_posL@l /* 0x80BE5EB4@l */ -/* 80BE58E8 7C 80 E2 14 */ add r4, r0, r28 -/* 80BE58EC 38 A1 00 08 */ addi r5, r1, 8 -/* 80BE58F0 4B 76 14 7D */ bl PSMTXMultVec -/* 80BE58F4 38 7D 07 10 */ addi r3, r29, 0x710 -/* 80BE58F8 7C 7E 1A 14 */ add r3, r30, r3 -/* 80BE58FC 3C 80 80 BE */ lis r4, lit_3965@ha /* 0x80BE5E54@ha */ -/* 80BE5900 C0 24 5E 54 */ lfs f1, lit_3965@l(r4) /* 0x80BE5E54@l */ -/* 80BE5904 4B 68 9E 05 */ bl SetR__8cM3dGSphFf -lbl_80BE5908: -/* 80BE5908 38 61 00 08 */ addi r3, r1, 8 -/* 80BE590C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80BE5910 7C 65 1B 78 */ mr r5, r3 -/* 80BE5914 4B 76 17 7D */ bl PSVECAdd -/* 80BE5918 7F 5E EA 14 */ add r26, r30, r29 -/* 80BE591C 38 7A 07 10 */ addi r3, r26, 0x710 -/* 80BE5920 38 81 00 08 */ addi r4, r1, 8 -/* 80BE5924 4B 68 9D 25 */ bl SetC__8cM3dGSphFRC4cXyz -/* 80BE5928 7F 63 DB 78 */ mr r3, r27 -/* 80BE592C 38 9A 05 EC */ addi r4, r26, 0x5ec -/* 80BE5930 4B 67 F2 79 */ bl Set__4cCcSFP8cCcD_Obj -/* 80BE5934 3B FF 00 01 */ addi r31, r31, 1 -/* 80BE5938 2C 1F 00 04 */ cmpwi r31, 4 -/* 80BE593C 3B BD 01 38 */ addi r29, r29, 0x138 -/* 80BE5940 3B 9C 00 0C */ addi r28, r28, 0xc -/* 80BE5944 41 80 FF 4C */ blt lbl_80BE5890 -lbl_80BE5948: -/* 80BE5948 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BE594C 4B 77 C8 D1 */ bl _restgpr_26 -/* 80BE5950 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BE5954 7C 08 03 A6 */ mtlr r0 -/* 80BE5958 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BE595C 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h b/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h index 852d848f111..6e560046723 100644 --- a/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h +++ b/include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h @@ -2,5 +2,36 @@ #define D_A_OBJ_FAN_H #include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor_mng.h" + +struct daObjFan_c : public dBgS_MoveBgActor { + /* 80BE4D98 */ fopAc_ac_c* search_tornado(); + /* 80BE4E08 */ void initBaseMtx(); + /* 80BE4E44 */ void setBaseMtx(); + /* 80BE4F08 */ int Create(); + /* 80BE4FD4 */ int CreateHeap(); + /* 80BE50EC */ int create1st(); + /* 80BE519C */ int Execute(f32 (**)[3][4]); + /* 80BE538C */ void action(); + /* 80BE583C */ void setCollision(); + /* 80BE5960 */ int Draw(); + /* 80BE5A04 */ int Delete(); + + u8 getType() { return fopAcM_GetParamBit(this,0,4); } + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ dBgW* field_0x5ac; + /* 0x5B0 */ dCcD_Stts field_0x5b0; + /* 0x5EC */ dCcD_Sph field_0x5ec[4]; + /* 0xACC */ s16 field_0xacc; + /* 0xACE */ s16 field_0xace; + /* 0xAD0 */ u32 field_0xad0; + /* 0xAD4 */ u8 field_0xad4; + /* 0xAD8 */ cXyz field_0xad8; +}; #endif /* D_A_OBJ_FAN_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 c9edf52a417..54b6ecb3224 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,5 +2,36 @@ #define D_A_OBJ_TORNADO2_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +struct daObjTrnd2_c : public fopAc_ac_c { + /* 80D1C4D8 */ void setPntWind(); + /* 80D1C54C */ void cutPntWind(); + /* 80D1C570 */ void movePntWind(); + /* 80D1C780 */ void setCpsInfo(); + /* 80D1C924 */ void initBaseMtx(); + /* 80D1C944 */ void setBaseMtx(); + /* 80D1C98C */ void Create(); + /* 80D1CC80 */ void create(); + /* 80D1CDC0 */ void execute(); + /* 80D1D0AC */ void setParticle(); + /* 80D1D214 */ void endParticle(); + /* 80D1D278 */ void startParticle(); + /* 80D1D2AC */ void stopParticle(); + /* 80D1D2E0 */ bool draw(); + /* 80D1D2E8 */ void _delete(); + + f32 getTargetLength() { return field_0x738; } + f32 getNowLength() { return field_0x704; } + cXyz& getWindEndPos() { return field_0x6f4; } + + + u8 field_0x568[0x6f4-0x568]; + cXyz field_0x6f4; + u32 field_0x700; + f32 field_0x704; + u8 field_0x708[0x738-0x708]; + f32 field_0x738; +}; #endif /* D_A_OBJ_TORNADO2_H */ diff --git a/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h b/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h index 61dc4fbec24..b153faf768a 100644 --- a/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h +++ b/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h @@ -11,8 +11,12 @@ public: /* 8048C894 */ bool Draw(); /* 8048C89C */ BOOL isDelete(); /* 8048C94C */ BOOL chkPointInArea(cXyz, cXyz); - /* 8048CD08 */ BOOL chkPointInArea(cXyz); - /* 8048CD68 */ virtual ~daTag_EvtArea_c(); + /* 8048CD08 */ BOOL chkPointInArea(cXyz param_0) { + cXyz local_28; + local_28.set(0.0f, 0.0f, 0.0f); + return chkPointInArea(param_0, local_28); + } + /* 8048CD68 */ virtual ~daTag_EvtArea_c() {} inline s32 getType(); inline u32 getOnEvtBit(); diff --git a/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp b/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp index 7e9e9fad4b5..8b06cf9a700 100644 --- a/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp +++ b/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp @@ -1,261 +1,49 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_fan +// Fan // #include "rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF0C */ void ZXYrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObjFan_c { - /* 80BE4D98 */ void search_tornado(); - /* 80BE4E08 */ void initBaseMtx(); - /* 80BE4E44 */ void setBaseMtx(); - /* 80BE4F08 */ void Create(); - /* 80BE4FD4 */ void CreateHeap(); - /* 80BE50EC */ void create1st(); - /* 80BE519C */ void Execute(f32 (**)[3][4]); - /* 80BE538C */ void action(); - /* 80BE583C */ void setCollision(); - /* 80BE5960 */ void Draw(); - /* 80BE5A04 */ void Delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void searchTornado2__FPvPv(); -extern "C" void search_tornado__10daObjFan_cFv(); -extern "C" void initBaseMtx__10daObjFan_cFv(); -extern "C" void setBaseMtx__10daObjFan_cFv(); -extern "C" void Create__10daObjFan_cFv(); -extern "C" void CreateHeap__10daObjFan_cFv(); -extern "C" void create1st__10daObjFan_cFv(); -extern "C" void Execute__10daObjFan_cFPPA3_A4_f(); -extern "C" void action__10daObjFan_cFv(); -extern "C" void setCollision__10daObjFan_cFv(); -extern "C" void Draw__10daObjFan_cFv(); -extern "C" void Delete__10daObjFan_cFv(); -extern "C" static void daObjFan_create1st__FP10daObjFan_c(); -extern "C" void __dt__8dCcD_SphFv(); -extern "C" void __ct__8dCcD_SphFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" static void daObjFan_MoveBGDelete__FP10daObjFan_c(); -extern "C" static void daObjFan_MoveBGExecute__FP10daObjFan_c(); -extern "C" static void daObjFan_MoveBGDraw__FP10daObjFan_c(); -extern "C" extern char const* const d_a_obj_fan__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalcAngleS__FPsssss(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void __construct_array(); -extern "C" void __cvt_fp2unsigned(); -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* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// +#include "rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h" +#include "d/com/d_com_inf_game.h" +#include "d/bg/d_bg_w.h" /* ############################################################################################## */ /* 80BE5D80-80BE5D8C 000000 000C+00 3/3 0/0 0/0 .rodata l_bmd */ -SECTION_RODATA static u8 const l_bmd[12] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, +static int const l_bmd[3] = { + 4,4,4, }; -COMPILER_STRIP_GATE(0x80BE5D80, &l_bmd); /* 80BE5D8C-80BE5D98 00000C 000C+00 1/1 0/0 0/0 .rodata l_dzb2 */ -SECTION_RODATA static u8 const l_dzb2[12] = { - 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, +static int const l_dzb2[3] = { + 7,8,8, }; -COMPILER_STRIP_GATE(0x80BE5D8C, &l_dzb2); /* 80BE5D98-80BE5DA4 000018 000C+00 1/1 0/0 0/0 .rodata l_dzb3 */ -SECTION_RODATA static u8 const l_dzb3[12] = { - 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, +static int const l_dzb3[3] = { + 7,9,9, }; -COMPILER_STRIP_GATE(0x80BE5D98, &l_dzb3); /* 80BE5DA4-80BE5DB0 000024 000C+00 0/1 0/0 0/0 .rodata l_se */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_se[12] = { - 0x00, 0x08, 0x02, 0x61, 0x00, 0x08, 0x02, 0x62, 0x00, 0x08, 0x02, 0x63, +static int const l_se[3] = { + Z2SE_OBJ_FAN_ROLL_S, Z2SE_OBJ_FAN_ROLL_M, Z2SE_OBJ_FAN_ROLL_L, }; -COMPILER_STRIP_GATE(0x80BE5DA4, &l_se); -#pragma pop /* 80BE5DB0-80BE5DBC 000030 000C+00 0/1 0/0 0/0 .rodata l_wind_se */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_wind_se[12] = { - 0x00, 0x08, 0x02, 0x64, 0x00, 0x08, 0x02, 0x65, 0x00, 0x08, 0x02, 0x66, +static int const l_wind_se[3] = { + Z2SE_OBJ_FAN_WIND_S, Z2SE_OBJ_FAN_WIND_M, Z2SE_OBJ_FAN_WIND_L, }; -COMPILER_STRIP_GATE(0x80BE5DB0, &l_wind_se); -#pragma pop /* 80BE5DBC-80BE5DC4 00003C 0006+02 1/2 0/0 0/0 .rodata l_max_rotspeed */ -SECTION_RODATA static u8 const l_max_rotspeed[6 + 2 /* padding */] = { - 0x20, - 0x00, - 0x20, - 0x00, - 0x0B, - 0xB8, - /* padding */ - 0x00, - 0x00, +static s16 const l_max_rotspeed[3] = { + 0x2000, + 0x2000, + 0x0BB8, }; -COMPILER_STRIP_GATE(0x80BE5DBC, &l_max_rotspeed); /* 80BE5DC4-80BE5DD0 000044 000C+00 1/1 0/0 0/0 .rodata l_heap_size */ -SECTION_RODATA static u8 const l_heap_size[12] = { - 0x00, 0x00, 0x16, 0x80, 0x00, 0x00, 0x9A, 0xA0, 0x00, 0x00, 0x7E, 0x80, +static u32 const l_heap_size[3] = { + 0x1680, 0x9AA0, 0x7E80, }; -COMPILER_STRIP_GATE(0x80BE5DC4, &l_heap_size); /* 80BE5DD0-80BE5E10 000050 0040+00 1/1 0/0 0/0 .rodata l_sph_src */ const static dCcD_SrcSph l_sph_src = { @@ -270,391 +58,328 @@ const static dCcD_SrcSph l_sph_src = { } // mSphAttr }; -/* 80BE5E10-80BE5E18 000090 0004+04 0/2 0/0 0/0 .rodata @3682 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3682[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BE5E10, &lit_3682); -#pragma pop - -/* 80BE5E18-80BE5E20 000098 0008+00 0/1 0/0 0/0 .rodata @3683 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3683[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE5E18, &lit_3683); -#pragma pop - -/* 80BE5E20-80BE5E28 0000A0 0008+00 0/1 0/0 0/0 .rodata @3684 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3684[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE5E20, &lit_3684); -#pragma pop - -/* 80BE5E28-80BE5E30 0000A8 0008+00 0/1 0/0 0/0 .rodata @3685 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3685[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE5E28, &lit_3685); -#pragma pop - -/* 80BE5E30-80BE5E34 0000B0 0004+00 0/1 0/0 0/0 .rodata @3686 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3686 = 100.0f; -COMPILER_STRIP_GATE(0x80BE5E30, &lit_3686); -#pragma pop - /* 80BE4C38-80BE4D98 000078 0160+00 1/1 0/0 0/0 .text searchTornado2__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void searchTornado2(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/searchTornado2__FPvPv.s" +static void* searchTornado2(void* param_1, void* param_2) { + fopAc_ac_c* actor = (fopAc_ac_c*)param_1; + if (actor != NULL && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == 0x15c && + ((fopAc_ac_c*)param_2)->current.pos.abs(actor->current.pos) < 100.0f) + { + return actor; + } + return NULL; } -#pragma pop /* 80BE4D98-80BE4E08 0001D8 0070+00 1/1 0/0 0/0 .text search_tornado__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::search_tornado() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/search_tornado__10daObjFan_cFv.s" +fopAc_ac_c* daObjFan_c::search_tornado() { + fopAc_ac_c* rv = NULL; + field_0xad0 = parentActorID; + if (parentActorID == -1) { + rv = (fopAc_ac_c*)fpcM_Search(searchTornado2, this); + if (rv != NULL) { + parentActorID = fopAcM_GetID(rv); + } + } + return rv; } -#pragma pop /* 80BE4E08-80BE4E44 000248 003C+00 1/1 0/0 0/0 .text initBaseMtx__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/initBaseMtx__10daObjFan_cFv.s" +void daObjFan_c::initBaseMtx() { + mModel->setBaseScale(scale); + setBaseMtx(); } -#pragma pop /* 80BE4E44-80BE4F08 000284 00C4+00 2/2 0/0 0/0 .text setBaseMtx__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setBaseMtx__10daObjFan_cFv.s" +void daObjFan_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::ZrotM(field_0xace); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); + if (field_0xad4 == 0 || (mpBgW != NULL && mpBgW->ChkUsed())) { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(home.angle); + } else { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::ZrotM(field_0xace); + } + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop /* 80BE4F08-80BE4FD4 000348 00CC+00 1/0 0/0 0/0 .text Create__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Create__10daObjFan_cFv.s" +int daObjFan_c::Create() { + field_0xace = 0x2000; + home.angle.x -= 0x4000; + current.angle.x = home.angle.x; + shape_angle.x = home.angle.x; + initBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mModel->getModelData()); + field_0x5b0.Init(0xff, 0xff, this); + for (int i = 0; i < 4; i++) { + field_0x5ec[i].Set(l_sph_src); + field_0x5ec[i].SetStts(&field_0x5b0); + } + MoveBGExecute(); + return 1; } -#pragma pop /* ############################################################################################## */ -/* 80BE5E58-80BE5E58 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BE5E58 = "Obj_prop1"; -SECTION_DEAD static char const* const stringBase_80BE5E62 = "Obj_prop0"; -SECTION_DEAD static char const* const stringBase_80BE5E6C = "Obj_prop2"; -#pragma pop - /* 80BE5E78-80BE5E84 -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName[3] = { - (void*)&d_a_obj_fan__stringBase0, - (void*)(((char*)&d_a_obj_fan__stringBase0) + 0xA), - (void*)(((char*)&d_a_obj_fan__stringBase0) + 0x14), +static char* l_arcName[3] = { + "Obj_prop1", + "Obj_prop0", + "Obj_prop2", }; /* 80BE4FD4-80BE50EC 000414 0118+00 1/0 0/0 0/0 .text CreateHeap__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/CreateHeap__10daObjFan_cFv.s" +int daObjFan_c::CreateHeap() { + void* modelData = dComIfG_getObjectRes(l_arcName[field_0xad4], l_bmd[field_0xad4]); + JUT_ASSERT(352, modelData != 0); + mModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); + if (mModel == NULL) { + return 0; + } + field_0x5ac = new dBgW(); + if (field_0x5ac == NULL || + field_0x5ac->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName[field_0xad4], l_dzb3[field_0xad4]), + 1, &mBgMtx)) + { + field_0x5ac = NULL; + return 0; + } + return 1; } -#pragma pop /* 80BE50EC-80BE519C 00052C 00B0+00 1/1 0/0 0/0 .text create1st__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/create1st__10daObjFan_cFv.s" +int daObjFan_c::create1st() { + field_0xad4 = getType(); + int rv = dComIfG_resLoad(&mPhase, l_arcName[field_0xad4]); + switch (rv) { + case 4: + parentActorID = 0xffffffff; + field_0xad0 = parentActorID; + rv = MoveBGCreate(l_arcName[field_0xad4], l_dzb2[field_0xad4], dBgS_MoveBGProc_TypicalRotY, + l_heap_size[field_0xad4], NULL); + switch (rv) { + case 5: + break; + } + break; + } + return rv; } -#pragma pop - -/* ############################################################################################## */ -/* 80BE5E34-80BE5E38 0000B4 0004+00 1/1 0/0 0/0 .rodata @3813 */ -SECTION_RODATA static f32 const lit_3813 = 0.5f; -COMPILER_STRIP_GATE(0x80BE5E34, &lit_3813); - -/* 80BE5E38-80BE5E40 0000B8 0008+00 1/2 0/0 0/0 .rodata @3815 */ -SECTION_RODATA static u8 const lit_3815[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE5E38, &lit_3815); /* 80BE519C-80BE538C 0005DC 01F0+00 1/0 0/0 0/0 .text Execute__10daObjFan_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Execute__10daObjFan_cFPPA3_A4_f.s" +int daObjFan_c::Execute(f32 (**param_1)[3][4]) { + search_tornado(); + if (field_0xad4 != 0) { + if (field_0xacc > l_max_rotspeed[field_0xad4] * 0.5f) { + if (mpBgW != 0 && !mpBgW->ChkUsed()) { + dComIfG_Bgsp().Regist(mpBgW, this); + } + if (field_0x5ac != NULL && field_0x5ac->ChkUsed()) + { + dComIfG_Bgsp().Release(field_0x5ac); + } + } else { + if (field_0x5ac != NULL && !field_0x5ac->ChkUsed()) + { + dComIfG_Bgsp().Regist(field_0x5ac, this); + } + if (mpBgW != NULL && mpBgW->ChkUsed()) + { + dComIfG_Bgsp().Release(mpBgW); + } + } + } + if (field_0x5ac != NULL) { + field_0x5ac->Move(); + } + if (field_0xacc > l_max_rotspeed[field_0xad4] * 0.5f) + { + setCollision(); + } + action(); + *param_1 = &mBgMtx; + setBaseMtx(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BE5E40-80BE5E44 0000C0 0004+00 0/1 0/0 0/0 .rodata @3929 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3929 = 1.0f / 50.0f; -COMPILER_STRIP_GATE(0x80BE5E40, &lit_3929); -#pragma pop - -/* 80BE5E44-80BE5E48 0000C4 0004+00 0/1 0/0 0/0 .rodata @3930 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3930 = 127.0f; -COMPILER_STRIP_GATE(0x80BE5E44, &lit_3930); -#pragma pop - -/* 80BE5E48-80BE5E4C 0000C8 0004+00 0/1 0/0 0/0 .rodata @3931 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3931 = 1.0f; -COMPILER_STRIP_GATE(0x80BE5E48, &lit_3931); -#pragma pop - -/* 80BE5E4C-80BE5E50 0000CC 0004+00 0/1 0/0 0/0 .rodata @3932 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3932 = -1.0f; -COMPILER_STRIP_GATE(0x80BE5E4C, &lit_3932); -#pragma pop /* 80BE538C-80BE583C 0007CC 04B0+00 1/1 0/0 0/0 .text action__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/action__10daObjFan_cFv.s" +void daObjFan_c::action() { + f32 dVar11 = 0.0f; + f32 dVar10 = 0.0f; + fopAc_ac_c* local_58 = NULL; + if (parentActorID != -1 && fopAcM_SearchByID(parentActorID, &local_58) != 0 && local_58 != NULL) + { + dVar11 = ((daObjTrnd2_c*)local_58)->getTargetLength(); + dVar10 = ((daObjTrnd2_c*)local_58)->getNowLength(); + } + + s16 sVar8; + if (dVar11 == 0.0f) { + sVar8 = 0; + } else { + sVar8 = l_max_rotspeed[field_0xad4]; + } + + if (field_0xad0 == -1 && parentActorID != -1) { + field_0xacc = sVar8; + } else if (sVar8 != 0) { + cLib_addCalcAngleS(&field_0xacc, sVar8, 50, l_max_rotspeed[field_0xad4] * 0.02f, 10); + } else { + s16 unaff_r27; + cLib_addCalcAngleS(&field_0xacc, sVar8, 50, l_max_rotspeed[field_0xad4] * 0.02f, 10); + if (field_0xace > -0x2000 && 0x2000 >= field_0xace) { + unaff_r27 = 0x2000; + } else { + if (field_0xace > 0x2000 && 0x6000 >= field_0xace) { + unaff_r27 = 0x6000; + } else { + if ((field_0xace > 0x6000 && field_0xace <= 0x7fff) || + (-0x6000 > field_0xace && field_0xace > -0x7fff)) + { + unaff_r27 = -0x6000; + } else if (-0x6000 < field_0xace && field_0xace <= -0x2000) { + unaff_r27 = -0x2000; + } + } + } + cLib_addCalcAngleS(&field_0xace, unaff_r27, 50, l_max_rotspeed[field_0xad4] * 0.02f, 10); + + } + field_0xace += field_0xacc; + if (field_0xacc != 0) { + u32 uVar5 = (field_0xacc * 127.0f) / l_max_rotspeed[field_0xad4]; + if (fopAcM_GetRoomNo(this) == 4) { + fopAcM_seStartLevel(this, Z2SE_OBJ_FAN_ROLL_M, uVar5); + } else { + fopAcM_seStartLevel(this, l_se[field_0xad4], uVar5); + } + } + if (dVar10 != 0.0f) { + if (fopAcM_GetRoomNo(this) == 4) { + fopAcM_seStartLevel(this, Z2SE_OBJ_FAN_WIND_M, 0); + } else if (l_wind_se[field_0xad4] == Z2SE_OBJ_FAN_WIND_S) { + if (local_58 != NULL) { + field_0xad8 = ((daObjTrnd2_c*)local_58)->getWindEndPos(); + } else { + field_0xad8 = eyePos; + } + mDoAud_seStartLevel(l_wind_se[field_0xad4], &field_0xad8, 0, 0); + } else { + fopAcM_seStartLevel(this, l_wind_se[field_0xad4], 0); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80BE5E50-80BE5E54 0000D0 0004+00 1/1 0/0 0/0 .rodata @3964 */ -SECTION_RODATA static f32 const lit_3964 = 150.0f; -COMPILER_STRIP_GATE(0x80BE5E50, &lit_3964); - -/* 80BE5E54-80BE5E58 0000D4 0004+00 1/1 0/0 0/0 .rodata @3965 */ -SECTION_RODATA static f32 const lit_3965 = 300.0f; -COMPILER_STRIP_GATE(0x80BE5E54, &lit_3965); /* 80BE5E84-80BE5EB4 00000C 0030+00 1/1 0/0 0/0 .data l_offset_posM$3940 */ -SECTION_DATA static u8 l_offset_posM[48] = { - 0xC3, 0x16, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, - 0xC3, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static Vec l_offset_posM[4] = { + {-150.0f, 150.0f, 0.0f}, + {-150.0f, -150.0f, 0.0f}, + {150.0f, 150.0f, 0.0f}, + {150.0f, -150.0f, 0.0f}, }; /* 80BE5EB4-80BE5EE4 00003C 0030+00 1/1 0/0 0/0 .data l_offset_posL$3941 */ -SECTION_DATA static u8 l_offset_posL[48] = { - 0xC3, 0x96, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static Vec l_offset_posL[4] = { + {-300.0f, 300.0f, 0.0f}, + {-300.0f, -300.0f, 0.0f}, + {300.0f, 300.0f, 0.0f}, + {300.0f, -300.0f, 0.0f}, }; /* 80BE583C-80BE5960 000C7C 0124+00 1/1 0/0 0/0 .text setCollision__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::setCollision() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/setCollision__10daObjFan_cFv.s" +void daObjFan_c::setCollision() { + if (field_0xad4 == 0) { + return; + } + mDoMtx_stack_c::ZXYrotS(shape_angle); + mDoMtx_stack_c::ZrotM(field_0xace); + for (int i = 0; i < 4; i++) { + cXyz acStack_28; + if (field_0xad4 == 1) { + mDoMtx_stack_c::multVec( + &l_offset_posM[i], + &acStack_28); + field_0x5ec[i].SetR(150.0f); + } else if (field_0xad4 == 2) { + mDoMtx_stack_c::multVec(&l_offset_posL[i], + &acStack_28); + field_0x5ec[i].SetR(300.0f); + } + acStack_28 += current.pos; + field_0x5ec[i].SetC(acStack_28); + dComIfG_Ccsp()->Set(&field_0x5ec[i]); + } } -#pragma pop /* 80BE5960-80BE5A04 000DA0 00A4+00 1/0 0/0 0/0 .text Draw__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Draw__10daObjFan_cFv.s" +int daObjFan_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80BE5A04-80BE5A78 000E44 0074+00 1/0 0/0 0/0 .text Delete__10daObjFan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjFan_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/Delete__10daObjFan_cFv.s" +int daObjFan_c::Delete() { + if (field_0x5ac != NULL && field_0x5ac->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x5ac); + } + dComIfG_resDelete(&mPhase, l_arcName[field_0xad4]); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BE5EE4-80BE5F04 -00001 0020+00 1/0 0/0 0/0 .data daObjFan_METHODS */ -SECTION_DATA static void* daObjFan_METHODS[8] = { - (void*)daObjFan_create1st__FP10daObjFan_c, - (void*)daObjFan_MoveBGDelete__FP10daObjFan_c, - (void*)daObjFan_MoveBGExecute__FP10daObjFan_c, - (void*)NULL, - (void*)daObjFan_MoveBGDraw__FP10daObjFan_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BE5F04-80BE5F34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Fan */ -SECTION_DATA extern void* g_profile_Obj_Fan[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01860000, (void*)&g_fpcLf_Method, - (void*)0x00000AE4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02350000, (void*)&daObjFan_METHODS, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80BE5F34-80BE5F40 0000BC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80BE5F40-80BE5F4C 0000C8 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80BE5F4C-80BE5F74 0000D4 0028+00 1/1 0/0 0/0 .data __vt__10daObjFan_c */ -SECTION_DATA extern void* __vt__10daObjFan_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__10daObjFan_cFv, - (void*)Create__10daObjFan_cFv, - (void*)Execute__10daObjFan_cFPPA3_A4_f, - (void*)Draw__10daObjFan_cFv, - (void*)Delete__10daObjFan_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80BE5A78-80BE5B2C 000EB8 00B4+00 1/0 0/0 0/0 .text daObjFan_create1st__FP10daObjFan_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFan_create1st(daObjFan_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_create1st__FP10daObjFan_c.s" +static void daObjFan_create1st(daObjFan_c* param_0) { + fopAcM_SetupActor(param_0, daObjFan_c); + param_0->create1st(); } -#pragma pop - -/* 80BE5B2C-80BE5BF8 000F6C 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_SphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Sph::~dCcD_Sph() { -extern "C" asm void __dt__8dCcD_SphFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8dCcD_SphFv.s" -} -#pragma pop - -/* 80BE5BF8-80BE5C7C 001038 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_SphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Sph::dCcD_Sph() { -extern "C" asm void __ct__8dCcD_SphFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__ct__8dCcD_SphFv.s" -} -#pragma pop - -/* 80BE5C7C-80BE5CC4 0010BC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGSph::~cM3dGSph() { -extern "C" asm void __dt__8cM3dGSphFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 80BE5CC4-80BE5D0C 001104 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_fan/d_a_obj_fan/__dt__8cM3dGAabFv.s" -} -#pragma pop /* 80BE5D0C-80BE5D2C 00114C 0020+00 1/0 0/0 0/0 .text daObjFan_MoveBGDelete__FP10daObjFan_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFan_MoveBGDelete(daObjFan_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDelete__FP10daObjFan_c.s" +static int daObjFan_MoveBGDelete(daObjFan_c* param_0) { + return param_0->MoveBGDelete(); } -#pragma pop /* 80BE5D2C-80BE5D4C 00116C 0020+00 1/0 0/0 0/0 .text daObjFan_MoveBGExecute__FP10daObjFan_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFan_MoveBGExecute(daObjFan_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGExecute__FP10daObjFan_c.s" +static int daObjFan_MoveBGExecute(daObjFan_c* param_0) { + return param_0->MoveBGExecute(); } -#pragma pop /* 80BE5D4C-80BE5D78 00118C 002C+00 1/0 0/0 0/0 .text daObjFan_MoveBGDraw__FP10daObjFan_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjFan_MoveBGDraw(daObjFan_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan/daObjFan_MoveBGDraw__FP10daObjFan_c.s" +static int daObjFan_MoveBGDraw(daObjFan_c* param_0) { + return param_0->MoveBGDraw(); } -#pragma pop + +/* 80BE5EE4-80BE5F04 -00001 0020+00 1/0 0/0 0/0 .data daObjFan_METHODS */ +static actor_method_class daObjFan_METHODS = { + (process_method_func)daObjFan_create1st, + (process_method_func)daObjFan_MoveBGDelete, + (process_method_func)daObjFan_MoveBGExecute, + (process_method_func)NULL, + (process_method_func)daObjFan_MoveBGDraw, +}; + +extern actor_process_profile_definition g_profile_Obj_Fan = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Fan, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjFan_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 0x235, // mPriority + &daObjFan_METHODS, // sub_method + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; /* 80BE5E58-80BE5E58 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ 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 eda762cbd9e..91389de89e1 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 @@ -11,47 +11,12 @@ // Types: // -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjTrnd2_c { - /* 80D1C4D8 */ void setPntWind(); - /* 80D1C54C */ void cutPntWind(); - /* 80D1C570 */ void movePntWind(); - /* 80D1C780 */ void setCpsInfo(); - /* 80D1C924 */ void initBaseMtx(); - /* 80D1C944 */ void setBaseMtx(); - /* 80D1C98C */ void Create(); - /* 80D1CC80 */ void create(); - /* 80D1CDC0 */ void execute(); - /* 80D1D0AC */ void setParticle(); - /* 80D1D214 */ void endParticle(); - /* 80D1D278 */ void startParticle(); - /* 80D1D2AC */ void stopParticle(); - /* 80D1D2E0 */ bool draw(); - /* 80D1D2E8 */ void _delete(); -}; - struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - 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*, @@ -62,8 +27,6 @@ struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct WIND_INFLUENCE {}; - // // Forward References: // @@ -119,16 +82,12 @@ 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 PSMTXCopy(); -extern "C" void PSMTXMultVec(); 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* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Cps[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_CpsAttr[25]; @@ -136,7 +95,6 @@ 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" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; // diff --git a/rel/d/a/tag/d_a_tag_evtarea/Makefile b/rel/d/a/tag/d_a_tag_evtarea/Makefile index c4ab0e97719..1faf47aef0b 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/Makefile +++ b/rel/d/a/tag/d_a_tag_evtarea/Makefile @@ -19,6 +19,7 @@ M32_LIBS := \ M32_CFLAGS := \ -sdata 0 \ -sdata2 0 \ + -sym on \ M32_LDFLAGS := \ -nodefaults \ diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index 5fd78924114..dc14ce5f00d 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -1,13 +1,11 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_tag_evtarea +// Tag: Event Area // #include "rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h" #include "JSystem/JKernel/JKRHeap.h" #include "d/a/d_a_npc.h" #include "d/d_procname.h" -#include "dol2asm.h" s32 daTag_EvtArea_c::getType() { u8 type = (u8)shape_angle.z; @@ -157,14 +155,6 @@ BOOL daTag_EvtArea_c::isDelete() { return ret; } -/* 8048CDE0-8048CDE4 000010 0004+00 1/1 0/0 0/0 .rodata @3922 */ -SECTION_RODATA static f32 const lit_3922 = 0.0f; -COMPILER_STRIP_GATE(0x8048CDE0, &lit_3922); - -/* 8048CDE4-8048CDE8 000014 0004+00 1/1 0/0 0/0 .rodata @4146 */ -SECTION_RODATA static f32 const lit_4146 = 10.0f; -COMPILER_STRIP_GATE(0x8048CDE4, &lit_4146); - /* 8048C94C-8048CC80 0004CC 0334+00 1/1 0/0 16/16 .text * chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz */ BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) { @@ -195,7 +185,7 @@ BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) { } } else { local_cc = current.pos; - local_cc.y -= FLOAT_LABEL(lit_4146); + local_cc.y -= 10.0f; if (getType() == 21) { return daNpcT_chkPointInArea(param_0, local_cc, local_84, shape_angle.y, 0); } @@ -231,17 +221,6 @@ static bool daTag_EvtArea_IsDelete(void* i_this) { return true; } -/* 8048CD08-8048CD68 000888 0060+00 1/1 0/0 0/0 .text chkPointInArea__15daTag_EvtArea_cF4cXyz */ -BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0) { - cXyz local_28; - local_28.set(FLOAT_LABEL(lit_3922), FLOAT_LABEL(lit_3922), FLOAT_LABEL(lit_3922)); - return chkPointInArea(param_0, local_28); -} - -/* 8048CD68-8048CDC8 0008E8 0060+00 1/0 0/0 0/0 .text __dt__15daTag_EvtArea_cFv */ -daTag_EvtArea_c::~daTag_EvtArea_c() { -} - /* 8048CE48-8048CE68 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtArea_MethodTable */ static actor_method_class daTag_EvtArea_MethodTable = { (process_method_func)daTag_EvtArea_Create,