diff --git a/Progress.md b/Progress.md index f940da1f3f9..c482bbef672 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 42.776630% | 1719908 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 42.776630% | 1719908 | 4020672 -RELs | 35.091046% | 4035584 | 11500324 -Total | 37.081976% | 5755492 | 15520996 +RELs | 35.155357% | 4042980 | 11500324 +Total | 37.129628% | 5762888 | 15520996 ## RELs @@ -211,7 +211,7 @@ d_a_kytag16 | 100.000000% | 2296 | 2296 d_a_kytag17 | 100.000000% | 752 | 752 d_a_mant | 86.020312% | 40316 | 46868 d_a_mg_fish | 26.024167% | 17660 | 67860 -d_a_mg_fshop | 36.658897% | 9436 | 25740 +d_a_mg_fshop | 39.425019% | 10148 | 25740 d_a_mg_rod | 24.484345% | 23836 | 97352 d_a_midna | 22.953368% | 12404 | 54040 d_a_mirror | 48.001631% | 4708 | 9808 @@ -680,10 +680,10 @@ d_a_obj_yousei | 27.926623% | 4628 | 16572 d_a_obj_ystone | 42.824944% | 2280 | 5324 d_a_obj_zcloth | 72.784810% | 1840 | 2528 d_a_obj_zdoor | 45.037688% | 2868 | 6368 -d_a_obj_zrTurara | 43.437672% | 3164 | 7284 -d_a_obj_zrTuraraRock | 46.299094% | 2452 | 5296 +d_a_obj_zrTurara | 65.733114% | 4788 | 7284 +d_a_obj_zrTuraraRock | 100.000000% | 5296 | 5296 d_a_obj_zraMark | 34.016942% | 3052 | 8972 -d_a_obj_zra_freeze | 37.662338% | 1624 | 4312 +d_a_obj_zra_freeze | 89.053803% | 3840 | 4312 d_a_obj_zra_rock | 100.000000% | 4212 | 4212 d_a_passer_mng | 31.038027% | 2416 | 7784 d_a_path_line | 100.000000% | 508 | 508 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 35.091046% | 4035584 | 11500324 +Total | 35.155357% | 4042980 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/CreateHeap__12daZrTurara_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/CreateHeap__12daZrTurara_cFv.s deleted file mode 100644 index 78157a17ae5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/CreateHeap__12daZrTurara_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_80D40714: -/* 80D40714 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D40718 7C 08 02 A6 */ mflr r0 -/* 80D4071C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D40720 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D40724 93 C1 00 08 */ stw r30, 8(r1) -/* 80D40728 7C 7F 1B 78 */ mr r31, r3 -/* 80D4072C 3C 60 80 D4 */ lis r3, d_a_obj_zrTurara__stringBase0@ha /* 0x80D415FC@ha */ -/* 80D40730 38 63 15 FC */ addi r3, r3, d_a_obj_zrTurara__stringBase0@l /* 0x80D415FC@l */ -/* 80D40734 38 80 00 05 */ li r4, 5 -/* 80D40738 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D4073C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D40740 3F C5 00 02 */ addis r30, r5, 2 -/* 80D40744 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80D40748 7F C5 F3 78 */ mr r5, r30 -/* 80D4074C 38 C0 00 80 */ li r6, 0x80 -/* 80D40750 4B 2F BB 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D40754 3C 80 00 08 */ lis r4, 8 -/* 80D40758 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D4075C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D40760 4B 2D 44 F5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D40764 90 7F 07 20 */ stw r3, 0x720(r31) -/* 80D40768 80 1F 07 20 */ lwz r0, 0x720(r31) -/* 80D4076C 28 00 00 00 */ cmplwi r0, 0 -/* 80D40770 40 82 00 0C */ bne lbl_80D4077C -/* 80D40774 38 60 00 00 */ li r3, 0 -/* 80D40778 48 00 00 B4 */ b lbl_80D4082C -lbl_80D4077C: -/* 80D4077C 3C 60 80 D4 */ lis r3, d_a_obj_zrTurara__stringBase0@ha /* 0x80D415FC@ha */ -/* 80D40780 38 63 15 FC */ addi r3, r3, d_a_obj_zrTurara__stringBase0@l /* 0x80D415FC@l */ -/* 80D40784 38 80 00 04 */ li r4, 4 -/* 80D40788 7F C5 F3 78 */ mr r5, r30 -/* 80D4078C 38 C0 00 80 */ li r6, 0x80 -/* 80D40790 4B 2F BB 5D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D40794 3C 80 00 08 */ lis r4, 8 -/* 80D40798 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D4079C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D407A0 4B 2D 44 B5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D407A4 90 7F 07 24 */ stw r3, 0x724(r31) -/* 80D407A8 80 1F 07 24 */ lwz r0, 0x724(r31) -/* 80D407AC 28 00 00 00 */ cmplwi r0, 0 -/* 80D407B0 40 82 00 0C */ bne lbl_80D407BC -/* 80D407B4 38 60 00 00 */ li r3, 0 -/* 80D407B8 48 00 00 74 */ b lbl_80D4082C -lbl_80D407BC: -/* 80D407BC 38 60 00 C0 */ li r3, 0xc0 -/* 80D407C0 4B 58 E4 8D */ bl __nw__FUl -/* 80D407C4 7C 60 1B 79 */ or. r0, r3, r3 -/* 80D407C8 41 82 00 0C */ beq lbl_80D407D4 -/* 80D407CC 4B 33 B1 A5 */ bl __ct__4dBgWFv -/* 80D407D0 7C 60 1B 78 */ mr r0, r3 -lbl_80D407D4: -/* 80D407D4 90 1F 07 2C */ stw r0, 0x72c(r31) -/* 80D407D8 80 1F 07 2C */ lwz r0, 0x72c(r31) -/* 80D407DC 28 00 00 00 */ cmplwi r0, 0 -/* 80D407E0 41 82 00 38 */ beq lbl_80D40818 -/* 80D407E4 3C 60 80 D4 */ lis r3, d_a_obj_zrTurara__stringBase0@ha /* 0x80D415FC@ha */ -/* 80D407E8 38 63 15 FC */ addi r3, r3, d_a_obj_zrTurara__stringBase0@l /* 0x80D415FC@l */ -/* 80D407EC 38 80 00 08 */ li r4, 8 -/* 80D407F0 7F C5 F3 78 */ mr r5, r30 -/* 80D407F4 38 C0 00 80 */ li r6, 0x80 -/* 80D407F8 4B 2F BA F5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D407FC 7C 64 1B 78 */ mr r4, r3 -/* 80D40800 80 7F 07 2C */ lwz r3, 0x72c(r31) -/* 80D40804 38 A0 00 01 */ li r5, 1 -/* 80D40808 38 DF 07 30 */ addi r6, r31, 0x730 -/* 80D4080C 4B 33 97 2D */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80D40810 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D40814 41 82 00 14 */ beq lbl_80D40828 -lbl_80D40818: -/* 80D40818 38 00 00 00 */ li r0, 0 -/* 80D4081C 90 1F 07 2C */ stw r0, 0x72c(r31) -/* 80D40820 38 60 00 00 */ li r3, 0 -/* 80D40824 48 00 00 08 */ b lbl_80D4082C -lbl_80D40828: -/* 80D40828 38 60 00 01 */ li r3, 1 -lbl_80D4082C: -/* 80D4082C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D40830 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D40834 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D40838 7C 08 03 A6 */ mtlr r0 -/* 80D4083C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D40840 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Delete__12daZrTurara_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Delete__12daZrTurara_cFv.s deleted file mode 100644 index 7c95dd28a4b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Delete__12daZrTurara_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80D41380: -/* 80D41380 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41384 7C 08 02 A6 */ mflr r0 -/* 80D41388 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4138C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41390 7C 7F 1B 78 */ mr r31, r3 -/* 80D41394 38 7F 07 18 */ addi r3, r31, 0x718 -/* 80D41398 3C 80 80 D4 */ lis r4, d_a_obj_zrTurara__stringBase0@ha /* 0x80D415FC@ha */ -/* 80D4139C 38 84 15 FC */ addi r4, r4, d_a_obj_zrTurara__stringBase0@l /* 0x80D415FC@l */ -/* 80D413A0 4B 2E BC 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D413A4 80 7F 07 2C */ lwz r3, 0x72c(r31) -/* 80D413A8 28 03 00 00 */ cmplwi r3, 0 -/* 80D413AC 41 82 00 24 */ beq lbl_80D413D0 -/* 80D413B0 4B 52 6E 25 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80D413B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D413B8 41 82 00 18 */ beq lbl_80D413D0 -/* 80D413BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D413C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D413C4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D413C8 80 9F 07 2C */ lwz r4, 0x72c(r31) -/* 80D413CC 4B 33 2E 85 */ bl Release__4cBgSFP9dBgW_Base -lbl_80D413D0: -/* 80D413D0 38 60 00 01 */ li r3, 1 -/* 80D413D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D413D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D413DC 7C 08 03 A6 */ mtlr r0 -/* 80D413E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D413E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Draw__12daZrTurara_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Draw__12daZrTurara_cFv.s deleted file mode 100644 index 3ecd3863668..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Draw__12daZrTurara_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80D412B0: -/* 80D412B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D412B4 7C 08 02 A6 */ mflr r0 -/* 80D412B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D412BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D412C0 93 C1 00 08 */ stw r30, 8(r1) -/* 80D412C4 7C 7E 1B 78 */ mr r30, r3 -/* 80D412C8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D412CC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D412D0 38 80 00 10 */ li r4, 0x10 -/* 80D412D4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80D412D8 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80D412DC 4B 46 24 E9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D412E0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D412E4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D412E8 80 9E 07 20 */ lwz r4, 0x720(r30) -/* 80D412EC 80 84 00 04 */ lwz r4, 4(r4) -/* 80D412F0 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D412F4 4B 46 3A AD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D412F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D412FC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D41300 80 9E 07 24 */ lwz r4, 0x724(r30) -/* 80D41304 80 84 00 04 */ lwz r4, 4(r4) -/* 80D41308 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80D4130C 4B 46 3A 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D41310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D41314 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D41318 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80D4131C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80D41320 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80D41324 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D41328 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80D4132C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D41330 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80D41334 4B 2C C9 91 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D41338 88 1E 07 2A */ lbz r0, 0x72a(r30) -/* 80D4133C 28 00 00 00 */ cmplwi r0, 0 -/* 80D41340 41 82 00 0C */ beq lbl_80D4134C -/* 80D41344 80 7E 07 24 */ lwz r3, 0x724(r30) -/* 80D41348 4B 2C C9 7D */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80D4134C: -/* 80D4134C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D41350 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D41354 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80D41358 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80D4135C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80D41360 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80D41364 38 60 00 01 */ li r3, 1 -/* 80D41368 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4136C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D41370 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41374 7C 08 03 A6 */ mtlr r0 -/* 80D41378 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D4137C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Execute__12daZrTurara_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Execute__12daZrTurara_cFPPA3_A4_f.s deleted file mode 100644 index 7b7b323a515..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Execute__12daZrTurara_cFPPA3_A4_f.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D40C08: -/* 80D40C08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D40C0C 7C 08 02 A6 */ mflr r0 -/* 80D40C10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D40C14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D40C18 93 C1 00 08 */ stw r30, 8(r1) -/* 80D40C1C 7C 7E 1B 78 */ mr r30, r3 -/* 80D40C20 7C 9F 23 78 */ mr r31, r4 -/* 80D40C24 48 00 00 45 */ bl move__12daZrTurara_cFv -/* 80D40C28 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80D40C2C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D40C30 90 1F 00 00 */ stw r0, 0(r31) -/* 80D40C34 7F C3 F3 78 */ mr r3, r30 -/* 80D40C38 4B FF F9 AD */ bl setBaseMtx__12daZrTurara_cFv -/* 80D40C3C 80 7E 07 2C */ lwz r3, 0x72c(r30) -/* 80D40C40 28 03 00 00 */ cmplwi r3, 0 -/* 80D40C44 41 82 00 08 */ beq lbl_80D40C4C -/* 80D40C48 4B 33 AD 79 */ bl Move__4dBgWFv -lbl_80D40C4C: -/* 80D40C4C 38 60 00 01 */ li r3, 1 -/* 80D40C50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D40C54 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D40C58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D40C5C 7C 08 03 A6 */ mtlr r0 -/* 80D40C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D40C64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__ct__16daZrTurara_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__ct__16daZrTurara_HIO_cFv.s deleted file mode 100644 index 0a9553bfd8e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__ct__16daZrTurara_HIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80D4056C: -/* 80D4056C 3C 80 80 D4 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80D41768@ha */ -/* 80D40570 38 04 17 68 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80D41768@l */ -/* 80D40574 90 03 00 00 */ stw r0, 0(r3) -/* 80D40578 3C 80 80 D4 */ lis r4, __vt__16daZrTurara_HIO_c@ha /* 0x80D4175C@ha */ -/* 80D4057C 38 04 17 5C */ addi r0, r4, __vt__16daZrTurara_HIO_c@l /* 0x80D4175C@l */ -/* 80D40580 90 03 00 00 */ stw r0, 0(r3) -/* 80D40584 38 00 00 05 */ li r0, 5 -/* 80D40588 98 03 00 08 */ stb r0, 8(r3) -/* 80D4058C 3C 80 80 D4 */ lis r4, lit_3657@ha /* 0x80D4159C@ha */ -/* 80D40590 C0 04 15 9C */ lfs f0, lit_3657@l(r4) /* 0x80D4159C@l */ -/* 80D40594 D0 03 00 04 */ stfs f0, 4(r3) -/* 80D40598 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 05913871270..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D4059C: -/* 80D4059C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D405A0 7C 08 02 A6 */ mflr r0 -/* 80D405A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D405A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D405AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D405B0 41 82 00 1C */ beq lbl_80D405CC -/* 80D405B4 3C A0 80 D4 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80D41768@ha */ -/* 80D405B8 38 05 17 68 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80D41768@l */ -/* 80D405BC 90 1F 00 00 */ stw r0, 0(r31) -/* 80D405C0 7C 80 07 35 */ extsh. r0, r4 -/* 80D405C4 40 81 00 08 */ ble lbl_80D405CC -/* 80D405C8 4B 58 E7 75 */ bl __dl__FPv -lbl_80D405CC: -/* 80D405CC 7F E3 FB 78 */ mr r3, r31 -/* 80D405D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D405D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D405D8 7C 08 03 A6 */ mtlr r0 -/* 80D405DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D405E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__16daZrTurara_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__16daZrTurara_HIO_cFv.s deleted file mode 100644 index 2dbe0aeb6ce..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__16daZrTurara_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D414BC: -/* 80D414BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D414C0 7C 08 02 A6 */ mflr r0 -/* 80D414C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D414C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D414CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D414D0 41 82 00 30 */ beq lbl_80D41500 -/* 80D414D4 3C 60 80 D4 */ lis r3, __vt__16daZrTurara_HIO_c@ha /* 0x80D4175C@ha */ -/* 80D414D8 38 03 17 5C */ addi r0, r3, __vt__16daZrTurara_HIO_c@l /* 0x80D4175C@l */ -/* 80D414DC 90 1F 00 00 */ stw r0, 0(r31) -/* 80D414E0 41 82 00 10 */ beq lbl_80D414F0 -/* 80D414E4 3C 60 80 D4 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80D41768@ha */ -/* 80D414E8 38 03 17 68 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80D41768@l */ -/* 80D414EC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80D414F0: -/* 80D414F0 7C 80 07 35 */ extsh. r0, r4 -/* 80D414F4 40 81 00 0C */ ble lbl_80D41500 -/* 80D414F8 7F E3 FB 78 */ mr r3, r31 -/* 80D414FC 4B 58 D8 41 */ bl __dl__FPv -lbl_80D41500: -/* 80D41500 7F E3 FB 78 */ mr r3, r31 -/* 80D41504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4150C 7C 08 03 A6 */ mtlr r0 -/* 80D41510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__sinit_d_a_obj_zrTurara_cpp.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__sinit_d_a_obj_zrTurara_cpp.s deleted file mode 100644 index c31a1970c4f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__sinit_d_a_obj_zrTurara_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80D41518: -/* 80D41518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4151C 7C 08 02 A6 */ mflr r0 -/* 80D41520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41524 3C 60 80 D4 */ lis r3, l_HIO@ha /* 0x80D4178C@ha */ -/* 80D41528 38 63 17 8C */ addi r3, r3, l_HIO@l /* 0x80D4178C@l */ -/* 80D4152C 4B FF F0 41 */ bl __ct__16daZrTurara_HIO_cFv -/* 80D41530 3C 80 80 D4 */ lis r4, __dt__16daZrTurara_HIO_cFv@ha /* 0x80D414BC@ha */ -/* 80D41534 38 84 14 BC */ addi r4, r4, __dt__16daZrTurara_HIO_cFv@l /* 0x80D414BC@l */ -/* 80D41538 3C A0 80 D4 */ lis r5, lit_3651@ha /* 0x80D41780@ha */ -/* 80D4153C 38 A5 17 80 */ addi r5, r5, lit_3651@l /* 0x80D41780@l */ -/* 80D41540 4B FF EF B9 */ bl __register_global_object -/* 80D41544 3C 60 80 D4 */ lis r3, mCcDCyl__12daZrTurara_c@ha /* 0x80D41628@ha */ -/* 80D41548 38 63 16 28 */ addi r3, r3, mCcDCyl__12daZrTurara_c@l /* 0x80D41628@l */ -/* 80D4154C 38 A3 FF FC */ addi r5, r3, -4 -/* 80D41550 3C 60 80 D4 */ lis r3, mCcDObjInfo__12daZrTurara_c@ha /* 0x80D415A0@ha */ -/* 80D41554 38 63 15 A0 */ addi r3, r3, mCcDObjInfo__12daZrTurara_c@l /* 0x80D415A0@l */ -/* 80D41558 38 83 FF FC */ addi r4, r3, -4 -/* 80D4155C 38 00 00 06 */ li r0, 6 -/* 80D41560 7C 09 03 A6 */ mtctr r0 -lbl_80D41564: -/* 80D41564 80 64 00 04 */ lwz r3, 4(r4) -/* 80D41568 84 04 00 08 */ lwzu r0, 8(r4) -/* 80D4156C 90 65 00 04 */ stw r3, 4(r5) -/* 80D41570 94 05 00 08 */ stwu r0, 8(r5) -/* 80D41574 42 00 FF F0 */ bdnz lbl_80D41564 -/* 80D41578 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4157C 7C 08 03 A6 */ mtlr r0 -/* 80D41580 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41584 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Create__FP10fopAc_ac_c.s deleted file mode 100644 index d0efae2bcc6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D41454: -/* 80D41454 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41458 7C 08 02 A6 */ mflr r0 -/* 80D4145C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41460 4B FF F3 E5 */ bl create__12daZrTurara_cFv -/* 80D41464 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41468 7C 08 03 A6 */ mtlr r0 -/* 80D4146C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41470 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Delete__FP12daZrTurara_c.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Delete__FP12daZrTurara_c.s deleted file mode 100644 index 5df42db8c6d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Delete__FP12daZrTurara_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D41434: -/* 80D41434 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41438 7C 08 02 A6 */ mflr r0 -/* 80D4143C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41440 4B 33 74 9D */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80D41444 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41448 7C 08 03 A6 */ mtlr r0 -/* 80D4144C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41450 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Draw__FP12daZrTurara_c.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Draw__FP12daZrTurara_c.s deleted file mode 100644 index 66271e14aa3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Draw__FP12daZrTurara_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80D413E8: -/* 80D413E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D413EC 7C 08 02 A6 */ mflr r0 -/* 80D413F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D413F4 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80D413F8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80D413FC 7D 89 03 A6 */ mtctr r12 -/* 80D41400 4E 80 04 21 */ bctrl -/* 80D41404 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41408 7C 08 03 A6 */ mtlr r0 -/* 80D4140C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41410 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Execute__FP12daZrTurara_c.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Execute__FP12daZrTurara_c.s deleted file mode 100644 index d8c88db91eb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Execute__FP12daZrTurara_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D41414: -/* 80D41414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41418 7C 08 02 A6 */ mflr r0 -/* 80D4141C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41420 4B 33 75 31 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80D41424 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41428 7C 08 03 A6 */ mtlr r0 -/* 80D4142C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41430 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/init_modeEnd__12daZrTurara_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/init_modeEnd__12daZrTurara_cFv.s deleted file mode 100644 index 48952a0a589..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/init_modeEnd__12daZrTurara_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80D412A0: -/* 80D412A0 38 00 00 02 */ li r0, 2 -/* 80D412A4 98 03 07 28 */ stb r0, 0x728(r3) -/* 80D412A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/modeWait__12daZrTurara_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/modeWait__12daZrTurara_cFv.s deleted file mode 100644 index 8e2e8b105af..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/modeWait__12daZrTurara_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80D40D88: -/* 80D40D88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D40D8C 7C 08 02 A6 */ mflr r0 -/* 80D40D90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D40D94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D40D98 7C 7F 1B 78 */ mr r31, r3 -/* 80D40D9C 88 83 07 29 */ lbz r4, 0x729(r3) -/* 80D40DA0 28 04 00 FF */ cmplwi r4, 0xff -/* 80D40DA4 41 82 00 28 */ beq lbl_80D40DCC -/* 80D40DA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D40DAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D40DB0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80D40DB4 7C 05 07 74 */ extsb r5, r0 -/* 80D40DB8 4B 2F 45 A9 */ bl isSwitch__10dSv_info_cCFii -/* 80D40DBC 2C 03 00 00 */ cmpwi r3, 0 -/* 80D40DC0 41 82 00 0C */ beq lbl_80D40DCC -/* 80D40DC4 7F E3 FB 78 */ mr r3, r31 -/* 80D40DC8 48 00 00 45 */ bl init_modeBreak__12daZrTurara_cFv -lbl_80D40DCC: -/* 80D40DCC 38 7F 05 DC */ addi r3, r31, 0x5dc -/* 80D40DD0 4B 34 36 91 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80D40DD4 28 03 00 00 */ cmplwi r3, 0 -/* 80D40DD8 41 82 00 20 */ beq lbl_80D40DF8 -/* 80D40DDC 38 7F 05 DC */ addi r3, r31, 0x5dc -/* 80D40DE0 4B 34 37 69 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80D40DE4 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80D40DE8 28 00 00 20 */ cmplwi r0, 0x20 -/* 80D40DEC 40 82 00 0C */ bne lbl_80D40DF8 -/* 80D40DF0 7F E3 FB 78 */ mr r3, r31 -/* 80D40DF4 48 00 00 19 */ bl init_modeBreak__12daZrTurara_cFv -lbl_80D40DF8: -/* 80D40DF8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D40DFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D40E00 7C 08 03 A6 */ mtlr r0 -/* 80D40E04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D40E08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/setBaseMtx__12daZrTurara_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/setBaseMtx__12daZrTurara_cFv.s deleted file mode 100644 index 912313b1730..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/setBaseMtx__12daZrTurara_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80D405E4: -/* 80D405E4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D405E8 7C 08 02 A6 */ mflr r0 -/* 80D405EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D405F0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D405F4 7C 7F 1B 78 */ mr r31, r3 -/* 80D405F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D405FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D40600 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D40604 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D40608 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D4060C 4B 60 62 DD */ bl PSMTXTrans -/* 80D40610 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D40614 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D40618 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80D4061C A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80D40620 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80D40624 4B 2C BC 7D */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80D40628 C0 3F 07 60 */ lfs f1, 0x760(r31) -/* 80D4062C FC 40 08 90 */ fmr f2, f1 -/* 80D40630 FC 60 08 90 */ fmr f3, f1 -/* 80D40634 4B 2C C8 05 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D40638 3C 60 80 D4 */ lis r3, lit_3699@ha /* 0x80D415D0@ha */ -/* 80D4063C C0 03 15 D0 */ lfs f0, lit_3699@l(r3) /* 0x80D415D0@l */ -/* 80D40640 D0 01 00 08 */ stfs f0, 8(r1) -/* 80D40644 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80D40648 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80D4064C 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80D40650 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80D40654 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80D40658 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80D4065C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D40660 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D40664 80 9F 07 20 */ lwz r4, 0x720(r31) -/* 80D40668 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D4066C 4B 60 5E 45 */ bl PSMTXCopy -/* 80D40670 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D40674 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D40678 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80D4067C 4B 60 5E 35 */ bl PSMTXCopy -/* 80D40680 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D40684 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D40688 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D4068C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D40690 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D40694 4B 60 62 55 */ bl PSMTXTrans -/* 80D40698 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D4069C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D406A0 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80D406A4 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80D406A8 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80D406AC 4B 2C BB F5 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80D406B0 C0 3F 07 60 */ lfs f1, 0x760(r31) -/* 80D406B4 FC 40 08 90 */ fmr f2, f1 -/* 80D406B8 FC 60 08 90 */ fmr f3, f1 -/* 80D406BC 4B 2C C7 7D */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D406C0 80 7F 07 24 */ lwz r3, 0x724(r31) -/* 80D406C4 C0 01 00 08 */ lfs f0, 8(r1) -/* 80D406C8 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80D406CC C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80D406D0 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80D406D4 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80D406D8 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80D406DC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D406E0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D406E4 80 9F 07 24 */ lwz r4, 0x724(r31) -/* 80D406E8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D406EC 4B 60 5D C5 */ bl PSMTXCopy -/* 80D406F0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D406F4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D406F8 38 9F 07 30 */ addi r4, r31, 0x730 -/* 80D406FC 4B 60 5D B5 */ bl PSMTXCopy -/* 80D40700 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D40704 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D40708 7C 08 03 A6 */ mtlr r0 -/* 80D4070C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D40710 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/CreateHeap__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/CreateHeap__12daZrTuraRc_cFv.s deleted file mode 100644 index f2dfa10f9d6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/CreateHeap__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80D419D4: -/* 80D419D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D419D8 7C 08 02 A6 */ mflr r0 -/* 80D419DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D419E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D419E4 7C 7F 1B 78 */ mr r31, r3 -/* 80D419E8 3C 60 80 D4 */ lis r3, d_a_obj_zrTuraraRock__stringBase0@ha /* 0x80D42434@ha */ -/* 80D419EC 38 63 24 34 */ addi r3, r3, d_a_obj_zrTuraraRock__stringBase0@l /* 0x80D42434@l */ -/* 80D419F0 38 80 00 03 */ li r4, 3 -/* 80D419F4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D419F8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D419FC 3C A5 00 02 */ addis r5, r5, 2 -/* 80D41A00 38 C0 00 80 */ li r6, 0x80 -/* 80D41A04 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80D41A08 4B 2F A8 E5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D41A0C 3C 80 00 08 */ lis r4, 8 -/* 80D41A10 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D41A14 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D41A18 4B 2D 32 3D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D41A1C 90 7F 06 E4 */ stw r3, 0x6e4(r31) -/* 80D41A20 80 7F 06 E4 */ lwz r3, 0x6e4(r31) -/* 80D41A24 30 03 FF FF */ addic r0, r3, -1 -/* 80D41A28 7C 60 19 10 */ subfe r3, r0, r3 -/* 80D41A2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41A30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41A34 7C 08 03 A6 */ mtlr r0 -/* 80D41A38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41A3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Delete__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Delete__12daZrTuraRc_cFv.s deleted file mode 100644 index 649f5c1eea3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Delete__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80D421C4: -/* 80D421C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D421C8 7C 08 02 A6 */ mflr r0 -/* 80D421CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D421D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D421D4 7C 7F 1B 78 */ mr r31, r3 -/* 80D421D8 38 7F 06 DC */ addi r3, r31, 0x6dc -/* 80D421DC 3C 80 80 D4 */ lis r4, d_a_obj_zrTuraraRock__stringBase0@ha /* 0x80D42434@ha */ -/* 80D421E0 38 84 24 34 */ addi r4, r4, d_a_obj_zrTuraraRock__stringBase0@l /* 0x80D42434@l */ -/* 80D421E4 4B 2E AE 25 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D421E8 38 7F 09 18 */ addi r3, r31, 0x918 -/* 80D421EC 4B 57 BE 0D */ bl deleteObject__14Z2SoundObjBaseFv -/* 80D421F0 38 60 00 01 */ li r3, 1 -/* 80D421F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D421F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D421FC 7C 08 03 A6 */ mtlr r0 -/* 80D42200 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42204 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Draw__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Draw__12daZrTuraRc_cFv.s deleted file mode 100644 index f9e65e6c3a8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Draw__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D42160: -/* 80D42160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D42164 7C 08 02 A6 */ mflr r0 -/* 80D42168 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D4216C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D42170 7C 7F 1B 78 */ mr r31, r3 -/* 80D42174 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D42178 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D4217C 38 80 00 10 */ li r4, 0x10 -/* 80D42180 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D42184 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D42188 4B 46 16 3D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D4218C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D42190 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D42194 80 9F 06 E4 */ lwz r4, 0x6e4(r31) -/* 80D42198 80 84 00 04 */ lwz r4, 4(r4) -/* 80D4219C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D421A0 4B 46 2C 01 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D421A4 80 7F 06 E4 */ lwz r3, 0x6e4(r31) -/* 80D421A8 4B 2C BB 1D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D421AC 38 60 00 01 */ li r3, 1 -/* 80D421B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D421B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D421B8 7C 08 03 A6 */ mtlr r0 -/* 80D421BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D421C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Execute__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Execute__12daZrTuraRc_cFv.s deleted file mode 100644 index d409c280a86..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Execute__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80D41F10: -/* 80D41F10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41F14 7C 08 02 A6 */ mflr r0 -/* 80D41F18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41F1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41F20 7C 7F 1B 78 */ mr r31, r3 -/* 80D41F24 48 00 00 55 */ bl move__12daZrTuraRc_cFv -/* 80D41F28 7F E3 FB 78 */ mr r3, r31 -/* 80D41F2C 4B FF FA 09 */ bl setBaseMtx__12daZrTuraRc_cFv -/* 80D41F30 38 7F 05 84 */ addi r3, r31, 0x584 -/* 80D41F34 4B 34 18 FD */ bl Move__10dCcD_GSttsFv -/* 80D41F38 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D41F3C 7C 03 07 74 */ extsb r3, r0 -/* 80D41F40 4B 2E B1 2D */ bl dComIfGp_getReverb__Fi -/* 80D41F44 7C 65 1B 78 */ mr r5, r3 -/* 80D41F48 38 7F 09 18 */ addi r3, r31, 0x918 -/* 80D41F4C 38 80 00 00 */ li r4, 0 -/* 80D41F50 81 9F 09 28 */ lwz r12, 0x928(r31) -/* 80D41F54 81 8C 00 08 */ lwz r12, 8(r12) -/* 80D41F58 7D 89 03 A6 */ mtctr r12 -/* 80D41F5C 4E 80 04 21 */ bctrl -/* 80D41F60 38 60 00 01 */ li r3, 1 -/* 80D41F64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41F68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41F6C 7C 08 03 A6 */ mtlr r0 -/* 80D41F70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41F74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__ct__16daZrTuraRc_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__ct__16daZrTuraRc_HIO_cFv.s deleted file mode 100644 index 4d86aa53626..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__ct__16daZrTuraRc_HIO_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80D4188C: -/* 80D4188C 3C 80 80 D4 */ lis r4, lit_3653@ha /* 0x80D423C0@ha */ -/* 80D41890 38 A4 23 C0 */ addi r5, r4, lit_3653@l /* 0x80D423C0@l */ -/* 80D41894 3C 80 80 D4 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80D4258C@ha */ -/* 80D41898 38 04 25 8C */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80D4258C@l */ -/* 80D4189C 90 03 00 00 */ stw r0, 0(r3) -/* 80D418A0 3C 80 80 D4 */ lis r4, __vt__16daZrTuraRc_HIO_c@ha /* 0x80D42580@ha */ -/* 80D418A4 38 04 25 80 */ addi r0, r4, __vt__16daZrTuraRc_HIO_c@l /* 0x80D42580@l */ -/* 80D418A8 90 03 00 00 */ stw r0, 0(r3) -/* 80D418AC C0 05 00 00 */ lfs f0, 0(r5) -/* 80D418B0 D0 03 00 04 */ stfs f0, 4(r3) -/* 80D418B4 C0 05 00 04 */ lfs f0, 4(r5) -/* 80D418B8 D0 03 00 08 */ stfs f0, 8(r3) -/* 80D418BC C0 05 00 08 */ lfs f0, 8(r5) -/* 80D418C0 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80D418C4 38 00 00 1E */ li r0, 0x1e -/* 80D418C8 98 03 00 10 */ stb r0, 0x10(r3) -/* 80D418CC C0 25 00 0C */ lfs f1, 0xc(r5) -/* 80D418D0 D0 23 00 14 */ stfs f1, 0x14(r3) -/* 80D418D4 38 00 00 04 */ li r0, 4 -/* 80D418D8 98 03 00 11 */ stb r0, 0x11(r3) -/* 80D418DC C0 05 00 10 */ lfs f0, 0x10(r5) -/* 80D418E0 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80D418E4 D0 23 00 1C */ stfs f1, 0x1c(r3) -/* 80D418E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index a41fa29ec41..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D42288: -/* 80D42288 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4228C 7C 08 02 A6 */ mflr r0 -/* 80D42290 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42294 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D42298 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D4229C 41 82 00 1C */ beq lbl_80D422B8 -/* 80D422A0 3C A0 80 D4 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80D42520@ha */ -/* 80D422A4 38 05 25 20 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80D42520@l */ -/* 80D422A8 90 1F 00 00 */ stw r0, 0(r31) -/* 80D422AC 7C 80 07 35 */ extsh. r0, r4 -/* 80D422B0 40 81 00 08 */ ble lbl_80D422B8 -/* 80D422B4 4B 58 CA 89 */ bl __dl__FPv -lbl_80D422B8: -/* 80D422B8 7F E3 FB 78 */ mr r3, r31 -/* 80D422BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D422C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D422C4 7C 08 03 A6 */ mtlr r0 -/* 80D422C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D422CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 4ea0748e590..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D41E94: -/* 80D41E94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41E98 7C 08 02 A6 */ mflr r0 -/* 80D41E9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41EA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41EA4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D41EA8 41 82 00 30 */ beq lbl_80D41ED8 -/* 80D41EAC 3C 60 80 D4 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80D4252C@ha */ -/* 80D41EB0 38 03 25 2C */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80D4252C@l */ -/* 80D41EB4 90 1F 00 00 */ stw r0, 0(r31) -/* 80D41EB8 41 82 00 10 */ beq lbl_80D41EC8 -/* 80D41EBC 3C 60 80 D4 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80D42520@ha */ -/* 80D41EC0 38 03 25 20 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80D42520@l */ -/* 80D41EC4 90 1F 00 00 */ stw r0, 0(r31) -lbl_80D41EC8: -/* 80D41EC8 7C 80 07 35 */ extsh. r0, r4 -/* 80D41ECC 40 81 00 0C */ ble lbl_80D41ED8 -/* 80D41ED0 7F E3 FB 78 */ mr r3, r31 -/* 80D41ED4 4B 58 CE 69 */ bl __dl__FPv -lbl_80D41ED8: -/* 80D41ED8 7F E3 FB 78 */ mr r3, r31 -/* 80D41EDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41EE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41EE4 7C 08 03 A6 */ mtlr r0 -/* 80D41EE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41EEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 0c85ec41eec..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80D41D94: -/* 80D41D94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41D98 7C 08 02 A6 */ mflr r0 -/* 80D41D9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41DA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41DA4 93 C1 00 08 */ stw r30, 8(r1) -/* 80D41DA8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80D41DAC 7C 9F 23 78 */ mr r31, r4 -/* 80D41DB0 41 82 00 38 */ beq lbl_80D41DE8 -/* 80D41DB4 3C 60 80 D4 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80D42538@ha */ -/* 80D41DB8 38 03 25 38 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80D42538@l */ -/* 80D41DBC 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80D41DC0 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80D41DC4 38 80 FF FF */ li r4, -1 -/* 80D41DC8 4B 52 D1 51 */ bl __dt__8cM3dGCirFv -/* 80D41DCC 7F C3 F3 78 */ mr r3, r30 -/* 80D41DD0 38 80 00 00 */ li r4, 0 -/* 80D41DD4 4B 52 62 DD */ bl __dt__13cBgS_PolyInfoFv -/* 80D41DD8 7F E0 07 35 */ extsh. r0, r31 -/* 80D41DDC 40 81 00 0C */ ble lbl_80D41DE8 -/* 80D41DE0 7F C3 F3 78 */ mr r3, r30 -/* 80D41DE4 4B 58 CF 59 */ bl __dl__FPv -lbl_80D41DE8: -/* 80D41DE8 7F C3 F3 78 */ mr r3, r30 -/* 80D41DEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41DF0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D41DF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41DF8 7C 08 03 A6 */ mtlr r0 -/* 80D41DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41E00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index faa5e2ff42f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80D41D24: -/* 80D41D24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41D28 7C 08 02 A6 */ mflr r0 -/* 80D41D2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41D30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41D34 93 C1 00 08 */ stw r30, 8(r1) -/* 80D41D38 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80D41D3C 7C 9F 23 78 */ mr r31, r4 -/* 80D41D40 41 82 00 38 */ beq lbl_80D41D78 -/* 80D41D44 3C 80 80 D4 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80D42544@ha */ -/* 80D41D48 38 84 25 44 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80D42544@l */ -/* 80D41D4C 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80D41D50 38 04 00 0C */ addi r0, r4, 0xc -/* 80D41D54 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80D41D58 38 04 00 18 */ addi r0, r4, 0x18 -/* 80D41D5C 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80D41D60 38 80 00 00 */ li r4, 0 -/* 80D41D64 4B 33 42 31 */ bl __dt__9dBgS_AcchFv -/* 80D41D68 7F E0 07 35 */ extsh. r0, r31 -/* 80D41D6C 40 81 00 0C */ ble lbl_80D41D78 -/* 80D41D70 7F C3 F3 78 */ mr r3, r30 -/* 80D41D74 4B 58 CF C9 */ bl __dl__FPv -lbl_80D41D78: -/* 80D41D78 7F C3 F3 78 */ mr r3, r30 -/* 80D41D7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41D80 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D41D84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41D88 7C 08 03 A6 */ mtlr r0 -/* 80D41D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41D90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 5ef1eb71684..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D418EC: -/* 80D418EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D418F0 7C 08 02 A6 */ mflr r0 -/* 80D418F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D418F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D418FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D41900 41 82 00 1C */ beq lbl_80D4191C -/* 80D41904 3C A0 80 D4 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80D4258C@ha */ -/* 80D41908 38 05 25 8C */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80D4258C@l */ -/* 80D4190C 90 1F 00 00 */ stw r0, 0(r31) -/* 80D41910 7C 80 07 35 */ extsh. r0, r4 -/* 80D41914 40 81 00 08 */ ble lbl_80D4191C -/* 80D41918 4B 58 D4 25 */ bl __dl__FPv -lbl_80D4191C: -/* 80D4191C 7F E3 FB 78 */ mr r3, r31 -/* 80D41920 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41924 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41928 7C 08 03 A6 */ mtlr r0 -/* 80D4192C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41930 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__16daZrTuraRc_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__16daZrTuraRc_HIO_cFv.s deleted file mode 100644 index c9dbd134f3b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__16daZrTuraRc_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80D422D0: -/* 80D422D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D422D4 7C 08 02 A6 */ mflr r0 -/* 80D422D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D422DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D422E0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D422E4 41 82 00 30 */ beq lbl_80D42314 -/* 80D422E8 3C 60 80 D4 */ lis r3, __vt__16daZrTuraRc_HIO_c@ha /* 0x80D42580@ha */ -/* 80D422EC 38 03 25 80 */ addi r0, r3, __vt__16daZrTuraRc_HIO_c@l /* 0x80D42580@l */ -/* 80D422F0 90 1F 00 00 */ stw r0, 0(r31) -/* 80D422F4 41 82 00 10 */ beq lbl_80D42304 -/* 80D422F8 3C 60 80 D4 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80D4258C@ha */ -/* 80D422FC 38 03 25 8C */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80D4258C@l */ -/* 80D42300 90 1F 00 00 */ stw r0, 0(r31) -lbl_80D42304: -/* 80D42304 7C 80 07 35 */ extsh. r0, r4 -/* 80D42308 40 81 00 0C */ ble lbl_80D42314 -/* 80D4230C 7F E3 FB 78 */ mr r3, r31 -/* 80D42310 4B 58 CA 2D */ bl __dl__FPv -lbl_80D42314: -/* 80D42314 7F E3 FB 78 */ mr r3, r31 -/* 80D42318 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4231C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D42320 7C 08 03 A6 */ mtlr r0 -/* 80D42324 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42328 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGAabFv.s deleted file mode 100644 index b6401e06222..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D41E4C: -/* 80D41E4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41E50 7C 08 02 A6 */ mflr r0 -/* 80D41E54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41E58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41E5C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D41E60 41 82 00 1C */ beq lbl_80D41E7C -/* 80D41E64 3C A0 80 D4 */ lis r5, __vt__8cM3dGAab@ha /* 0x80D42574@ha */ -/* 80D41E68 38 05 25 74 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80D42574@l */ -/* 80D41E6C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80D41E70 7C 80 07 35 */ extsh. r0, r4 -/* 80D41E74 40 81 00 08 */ ble lbl_80D41E7C -/* 80D41E78 4B 58 CE C5 */ bl __dl__FPv -lbl_80D41E7C: -/* 80D41E7C 7F E3 FB 78 */ mr r3, r31 -/* 80D41E80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41E84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41E88 7C 08 03 A6 */ mtlr r0 -/* 80D41E8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41E90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGSphFv.s deleted file mode 100644 index f94d22da17e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D41E04: -/* 80D41E04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41E08 7C 08 02 A6 */ mflr r0 -/* 80D41E0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41E10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41E14 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D41E18 41 82 00 1C */ beq lbl_80D41E34 -/* 80D41E1C 3C A0 80 D4 */ lis r5, __vt__8cM3dGSph@ha /* 0x80D42568@ha */ -/* 80D41E20 38 05 25 68 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80D42568@l */ -/* 80D41E24 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80D41E28 7C 80 07 35 */ extsh. r0, r4 -/* 80D41E2C 40 81 00 08 */ ble lbl_80D41E34 -/* 80D41E30 4B 58 CF 0D */ bl __dl__FPv -lbl_80D41E34: -/* 80D41E34 7F E3 FB 78 */ mr r3, r31 -/* 80D41E38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D41E3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41E40 7C 08 03 A6 */ mtlr r0 -/* 80D41E44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41E48 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__sinit_d_a_obj_zrTuraraRock_cpp.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__sinit_d_a_obj_zrTuraraRock_cpp.s deleted file mode 100644 index aee5fcfeda7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__sinit_d_a_obj_zrTuraraRock_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80D4232C: -/* 80D4232C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D42330 7C 08 02 A6 */ mflr r0 -/* 80D42334 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42338 3C 60 80 D4 */ lis r3, l_HIO@ha /* 0x80D425AC@ha */ -/* 80D4233C 38 63 25 AC */ addi r3, r3, l_HIO@l /* 0x80D425AC@l */ -/* 80D42340 4B FF F5 4D */ bl __ct__16daZrTuraRc_HIO_cFv -/* 80D42344 3C 80 80 D4 */ lis r4, __dt__16daZrTuraRc_HIO_cFv@ha /* 0x80D422D0@ha */ -/* 80D42348 38 84 22 D0 */ addi r4, r4, __dt__16daZrTuraRc_HIO_cFv@l /* 0x80D422D0@l */ -/* 80D4234C 3C A0 80 D4 */ lis r5, lit_3647@ha /* 0x80D425A0@ha */ -/* 80D42350 38 A5 25 A0 */ addi r5, r5, lit_3647@l /* 0x80D425A0@l */ -/* 80D42354 4B FF F4 C5 */ bl __register_global_object -/* 80D42358 3C 60 80 D4 */ lis r3, mCcDSph__12daZrTuraRc_c@ha /* 0x80D42460@ha */ -/* 80D4235C 38 63 24 60 */ addi r3, r3, mCcDSph__12daZrTuraRc_c@l /* 0x80D42460@l */ -/* 80D42360 38 A3 FF FC */ addi r5, r3, -4 -/* 80D42364 3C 60 80 D4 */ lis r3, mCcDObjInfo__12daZrTuraRc_c@ha /* 0x80D423D4@ha */ -/* 80D42368 38 63 23 D4 */ addi r3, r3, mCcDObjInfo__12daZrTuraRc_c@l /* 0x80D423D4@l */ -/* 80D4236C 38 83 FF FC */ addi r4, r3, -4 -/* 80D42370 38 00 00 06 */ li r0, 6 -/* 80D42374 7C 09 03 A6 */ mtctr r0 -lbl_80D42378: -/* 80D42378 80 64 00 04 */ lwz r3, 4(r4) -/* 80D4237C 84 04 00 08 */ lwzu r0, 8(r4) -/* 80D42380 90 65 00 04 */ stw r3, 4(r5) -/* 80D42384 94 05 00 08 */ stwu r0, 8(r5) -/* 80D42388 42 00 FF F0 */ bdnz lbl_80D42378 -/* 80D4238C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D42390 7C 08 03 A6 */ mtlr r0 -/* 80D42394 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42398 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/bgCheck__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/bgCheck__12daZrTuraRc_cFv.s deleted file mode 100644 index ccffe1eb2c4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/bgCheck__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80D420FC: -/* 80D420FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D42100 7C 08 02 A6 */ mflr r0 -/* 80D42104 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42108 80 03 07 6C */ lwz r0, 0x76c(r3) -/* 80D4210C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f -/* 80D42110 41 82 00 08 */ beq lbl_80D42118 -/* 80D42114 48 00 00 15 */ bl init_modeDropEnd__12daZrTuraRc_cFv -lbl_80D42118: -/* 80D42118 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4211C 7C 08 03 A6 */ mtlr r0 -/* 80D42120 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42124 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c.s deleted file mode 100644 index 67a396b3615..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D41EF0: -/* 80D41EF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41EF4 7C 08 02 A6 */ mflr r0 -/* 80D41EF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41EFC 4B FF FA D9 */ bl CreateHeap__12daZrTuraRc_cFv -/* 80D41F00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D41F04 7C 08 03 A6 */ mtlr r0 -/* 80D41F08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D41F0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/create__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/create__12daZrTuraRc_cFv.s deleted file mode 100644 index cf5356b68ed..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/create__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,192 +0,0 @@ -lbl_80D41A40: -/* 80D41A40 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80D41A44 7C 08 02 A6 */ mflr r0 -/* 80D41A48 90 01 00 44 */ stw r0, 0x44(r1) -/* 80D41A4C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80D41A50 4B 62 07 89 */ bl _savegpr_28 -/* 80D41A54 7C 7D 1B 78 */ mr r29, r3 -/* 80D41A58 3C 80 80 D4 */ lis r4, lit_3653@ha /* 0x80D423C0@ha */ -/* 80D41A5C 3B E4 23 C0 */ addi r31, r4, lit_3653@l /* 0x80D423C0@l */ -/* 80D41A60 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D41A64 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D41A68 40 82 00 E8 */ bne lbl_80D41B50 -/* 80D41A6C 7F A0 EB 79 */ or. r0, r29, r29 -/* 80D41A70 41 82 00 D4 */ beq lbl_80D41B44 -/* 80D41A74 7C 1E 03 78 */ mr r30, r0 -/* 80D41A78 4B 2D 70 ED */ bl __ct__10fopAc_ac_cFv -/* 80D41A7C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80D41A80 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80D41A84 90 1E 05 80 */ stw r0, 0x580(r30) -/* 80D41A88 38 7E 05 84 */ addi r3, r30, 0x584 -/* 80D41A8C 4B 34 1C D5 */ bl __ct__10dCcD_GSttsFv -/* 80D41A90 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80D41A94 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80D41A98 90 7E 05 80 */ stw r3, 0x580(r30) -/* 80D41A9C 38 03 00 20 */ addi r0, r3, 0x20 -/* 80D41AA0 90 1E 05 84 */ stw r0, 0x584(r30) -/* 80D41AA4 3B 9E 05 A4 */ addi r28, r30, 0x5a4 -/* 80D41AA8 7F 83 E3 78 */ mr r3, r28 -/* 80D41AAC 4B 34 1F 7D */ bl __ct__12dCcD_GObjInfFv -/* 80D41AB0 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80D41AB4 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80D41AB8 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80D41ABC 3C 60 80 D4 */ lis r3, __vt__8cM3dGAab@ha /* 0x80D42574@ha */ -/* 80D41AC0 38 03 25 74 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80D42574@l */ -/* 80D41AC4 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 80D41AC8 3C 60 80 D4 */ lis r3, __vt__8cM3dGSph@ha /* 0x80D42568@ha */ -/* 80D41ACC 38 03 25 68 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80D42568@l */ -/* 80D41AD0 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80D41AD4 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80D41AD8 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80D41ADC 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80D41AE0 38 03 00 58 */ addi r0, r3, 0x58 -/* 80D41AE4 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80D41AE8 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80D41AEC 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80D41AF0 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 80D41AF4 38 03 00 2C */ addi r0, r3, 0x2c -/* 80D41AF8 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80D41AFC 38 03 00 84 */ addi r0, r3, 0x84 -/* 80D41B00 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80D41B04 38 7E 07 00 */ addi r3, r30, 0x700 -/* 80D41B08 4B 33 43 A5 */ bl __ct__12dBgS_AcchCirFv -/* 80D41B0C 3B 9E 07 40 */ addi r28, r30, 0x740 -/* 80D41B10 7F 83 E3 78 */ mr r3, r28 -/* 80D41B14 4B 33 45 8D */ bl __ct__9dBgS_AcchFv -/* 80D41B18 3C 60 80 D4 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80D42544@ha */ -/* 80D41B1C 38 63 25 44 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80D42544@l */ -/* 80D41B20 90 7C 00 10 */ stw r3, 0x10(r28) -/* 80D41B24 38 03 00 0C */ addi r0, r3, 0xc -/* 80D41B28 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80D41B2C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80D41B30 90 1C 00 24 */ stw r0, 0x24(r28) -/* 80D41B34 38 7C 00 14 */ addi r3, r28, 0x14 -/* 80D41B38 4B 33 73 31 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80D41B3C 38 7E 09 18 */ addi r3, r30, 0x918 -/* 80D41B40 4B 57 CD 05 */ bl __ct__16Z2SoundObjSimpleFv -lbl_80D41B44: -/* 80D41B44 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80D41B48 60 00 00 08 */ ori r0, r0, 8 -/* 80D41B4C 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80D41B50: -/* 80D41B50 38 7D 06 DC */ addi r3, r29, 0x6dc -/* 80D41B54 3C 80 80 D4 */ lis r4, d_a_obj_zrTuraraRock__stringBase0@ha /* 0x80D42434@ha */ -/* 80D41B58 38 84 24 34 */ addi r4, r4, d_a_obj_zrTuraraRock__stringBase0@l /* 0x80D42434@l */ -/* 80D41B5C 4B 2E B3 61 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D41B60 7C 7E 1B 78 */ mr r30, r3 -/* 80D41B64 2C 1E 00 04 */ cmpwi r30, 4 -/* 80D41B68 40 82 01 A0 */ bne lbl_80D41D08 -/* 80D41B6C 7F A3 EB 78 */ mr r3, r29 -/* 80D41B70 3C 80 80 D4 */ lis r4, createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c@ha /* 0x80D41EF0@ha */ -/* 80D41B74 38 84 1E F0 */ addi r4, r4, createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c@l /* 0x80D41EF0@l */ -/* 80D41B78 38 A0 08 40 */ li r5, 0x840 -/* 80D41B7C 4B 2D 89 35 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D41B80 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D41B84 40 82 00 0C */ bne lbl_80D41B90 -/* 80D41B88 38 60 00 05 */ li r3, 5 -/* 80D41B8C 48 00 01 80 */ b lbl_80D41D0C -lbl_80D41B90: -/* 80D41B90 38 7D 07 00 */ addi r3, r29, 0x700 -/* 80D41B94 C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 80D41B98 C0 5F 00 4C */ lfs f2, 0x4c(r31) -/* 80D41B9C 4B 33 43 BD */ bl SetWall__12dBgS_AcchCirFff -/* 80D41BA0 38 00 00 00 */ li r0, 0 -/* 80D41BA4 90 01 00 08 */ stw r0, 8(r1) -/* 80D41BA8 38 7D 07 40 */ addi r3, r29, 0x740 -/* 80D41BAC 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80D41BB0 38 BD 04 BC */ addi r5, r29, 0x4bc -/* 80D41BB4 7F A6 EB 78 */ mr r6, r29 -/* 80D41BB8 38 E0 00 01 */ li r7, 1 -/* 80D41BBC 39 1D 07 00 */ addi r8, r29, 0x700 -/* 80D41BC0 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 80D41BC4 39 40 00 00 */ li r10, 0 -/* 80D41BC8 4B 33 46 81 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80D41BCC C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80D41BD0 D0 1D 08 10 */ stfs f0, 0x810(r29) -/* 80D41BD4 38 7D 05 68 */ addi r3, r29, 0x568 -/* 80D41BD8 38 80 00 FF */ li r4, 0xff -/* 80D41BDC 38 A0 00 FF */ li r5, 0xff -/* 80D41BE0 7F A6 EB 78 */ mr r6, r29 -/* 80D41BE4 4B 34 1C 7D */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80D41BE8 38 7D 05 A4 */ addi r3, r29, 0x5a4 -/* 80D41BEC 3C 80 80 D4 */ lis r4, mCcDSph__12daZrTuraRc_c@ha /* 0x80D42460@ha */ -/* 80D41BF0 38 84 24 60 */ addi r4, r4, mCcDSph__12daZrTuraRc_c@l /* 0x80D42460@l */ -/* 80D41BF4 4B 34 2E 41 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80D41BF8 38 1D 05 68 */ addi r0, r29, 0x568 -/* 80D41BFC 90 1D 05 E8 */ stw r0, 0x5e8(r29) -/* 80D41C00 38 7D 09 18 */ addi r3, r29, 0x918 -/* 80D41C04 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80D41C08 38 A0 00 01 */ li r5, 1 -/* 80D41C0C 81 9D 09 28 */ lwz r12, 0x928(r29) -/* 80D41C10 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80D41C14 7D 89 03 A6 */ mtctr r12 -/* 80D41C18 4E 80 04 21 */ bctrl -/* 80D41C1C 80 7D 06 E4 */ lwz r3, 0x6e4(r29) -/* 80D41C20 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D41C24 90 1D 05 04 */ stw r0, 0x504(r29) -/* 80D41C28 80 7D 06 E4 */ lwz r3, 0x6e4(r29) -/* 80D41C2C 80 83 00 04 */ lwz r4, 4(r3) -/* 80D41C30 7F A3 EB 78 */ mr r3, r29 -/* 80D41C34 4B 2D 89 45 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80D41C38 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80D41C3C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80D41C40 7C 1C 03 78 */ mr r28, r0 -/* 80D41C44 28 00 00 FF */ cmplwi r0, 0xff -/* 80D41C48 40 82 00 08 */ bne lbl_80D41C50 -/* 80D41C4C 3B 80 00 00 */ li r28, 0 -lbl_80D41C50: -/* 80D41C50 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80D41C54 4B 52 5D 39 */ bl cM_rndFX__Ff -/* 80D41C58 FC 00 0A 10 */ fabs f0, f1 -/* 80D41C5C FC 80 00 18 */ frsp f4, f0 -/* 80D41C60 C0 7F 00 44 */ lfs f3, 0x44(r31) -/* 80D41C64 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 80D41C68 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80D41C6C C8 3F 00 68 */ lfd f1, 0x68(r31) -/* 80D41C70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41C74 3C 00 43 30 */ lis r0, 0x4330 -/* 80D41C78 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D41C7C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80D41C80 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80D41C84 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80D41C88 EC 23 00 2A */ fadds f1, f3, f0 -/* 80D41C8C EC 03 20 28 */ fsubs f0, f3, f4 -/* 80D41C90 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80D41C94 D0 1D 06 FC */ stfs f0, 0x6fc(r29) -/* 80D41C98 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80D41C9C 4B 52 5C F1 */ bl cM_rndFX__Ff -/* 80D41CA0 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80D41CA4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D41CA8 FC 00 00 1E */ fctiwz f0, f0 -/* 80D41CAC D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80D41CB0 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80D41CB4 B0 1D 04 E4 */ sth r0, 0x4e4(r29) -/* 80D41CB8 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80D41CBC 4B 52 5C D1 */ bl cM_rndFX__Ff -/* 80D41CC0 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80D41CC4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D41CC8 FC 00 00 1E */ fctiwz f0, f0 -/* 80D41CCC D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80D41CD0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D41CD4 B0 1D 04 E6 */ sth r0, 0x4e6(r29) -/* 80D41CD8 C0 3F 00 5C */ lfs f1, 0x5c(r31) -/* 80D41CDC 4B 52 5C B1 */ bl cM_rndFX__Ff -/* 80D41CE0 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80D41CE4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 80D41CE8 FC 00 00 1E */ fctiwz f0, f0 -/* 80D41CEC D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80D41CF0 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80D41CF4 B0 1D 04 E8 */ sth r0, 0x4e8(r29) -/* 80D41CF8 7F A3 EB 78 */ mr r3, r29 -/* 80D41CFC 4B FF FC 39 */ bl setBaseMtx__12daZrTuraRc_cFv -/* 80D41D00 7F A3 EB 78 */ mr r3, r29 -/* 80D41D04 48 00 03 49 */ bl init_modeDrop__12daZrTuraRc_cFv -lbl_80D41D08: -/* 80D41D08 7F C3 F3 78 */ mr r3, r30 -lbl_80D41D0C: -/* 80D41D0C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80D41D10 4B 62 05 15 */ bl _restgpr_28 -/* 80D41D14 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80D41D18 7C 08 03 A6 */ mtlr r0 -/* 80D41D1C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80D41D20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Create__FP10fopAc_ac_c.s deleted file mode 100644 index a8c76efda59..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D42268: -/* 80D42268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4226C 7C 08 02 A6 */ mflr r0 -/* 80D42270 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42274 4B FF F7 CD */ bl create__12daZrTuraRc_cFv -/* 80D42278 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4227C 7C 08 03 A6 */ mtlr r0 -/* 80D42280 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42284 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Delete__FP12daZrTuraRc_c.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Delete__FP12daZrTuraRc_c.s deleted file mode 100644 index 4d2d4b82b43..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Delete__FP12daZrTuraRc_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D42248: -/* 80D42248 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4224C 7C 08 02 A6 */ mflr r0 -/* 80D42250 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42254 4B FF FF 71 */ bl Delete__12daZrTuraRc_cFv -/* 80D42258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4225C 7C 08 03 A6 */ mtlr r0 -/* 80D42260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42264 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Draw__FP12daZrTuraRc_c.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Draw__FP12daZrTuraRc_c.s deleted file mode 100644 index a62ea9f9975..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Draw__FP12daZrTuraRc_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D42208: -/* 80D42208 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4220C 7C 08 02 A6 */ mflr r0 -/* 80D42210 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42214 4B FF FF 4D */ bl Draw__12daZrTuraRc_cFv -/* 80D42218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4221C 7C 08 03 A6 */ mtlr r0 -/* 80D42220 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42224 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Execute__FP12daZrTuraRc_c.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Execute__FP12daZrTuraRc_c.s deleted file mode 100644 index 75deebd57d7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Execute__FP12daZrTuraRc_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D42228: -/* 80D42228 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4222C 7C 08 02 A6 */ mflr r0 -/* 80D42230 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42234 4B FF FC DD */ bl Execute__12daZrTuraRc_cFv -/* 80D42238 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4223C 7C 08 03 A6 */ mtlr r0 -/* 80D42240 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42244 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D4239C.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D4239C.s deleted file mode 100644 index 3f5f238d2c0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D4239C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80D4239C: -/* 80D4239C 38 63 FF DC */ addi r3, r3, -36 -/* 80D423A0 4B FF F9 84 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D423A4.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D423A4.s deleted file mode 100644 index af48e83afdc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D423A4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80D423A4: -/* 80D423A4 38 63 FF EC */ addi r3, r3, -20 -/* 80D423A8 4B FF F9 7C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDropEnd__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDropEnd__12daZrTuraRc_cFv.s deleted file mode 100644 index d2d22b8df41..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDropEnd__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D42128: -/* 80D42128 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4212C 7C 08 02 A6 */ mflr r0 -/* 80D42130 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D42134 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D42138 7C 7F 1B 78 */ mr r31, r3 -/* 80D4213C 4B 2D 7B 41 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80D42140 38 00 00 01 */ li r0, 1 -/* 80D42144 98 1F 06 E8 */ stb r0, 0x6e8(r31) -/* 80D42148 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4214C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D42150 7C 08 03 A6 */ mtlr r0 -/* 80D42154 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42158 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDrop__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDrop__12daZrTuraRc_cFv.s deleted file mode 100644 index 0f886da2271..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDrop__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80D4204C: -/* 80D4204C 3C 80 80 D4 */ lis r4, l_HIO@ha /* 0x80D425AC@ha */ -/* 80D42050 38 84 25 AC */ addi r4, r4, l_HIO@l /* 0x80D425AC@l */ -/* 80D42054 C0 04 00 08 */ lfs f0, 8(r4) -/* 80D42058 FC 00 00 50 */ fneg f0, f0 -/* 80D4205C D0 03 05 30 */ stfs f0, 0x530(r3) -/* 80D42060 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 80D42064 FC 00 00 50 */ fneg f0, f0 -/* 80D42068 D0 03 05 34 */ stfs f0, 0x534(r3) -/* 80D4206C 3C 80 80 D4 */ lis r4, lit_3885@ha /* 0x80D42430@ha */ -/* 80D42070 C0 04 24 30 */ lfs f0, lit_3885@l(r4) /* 0x80D42430@l */ -/* 80D42074 D0 03 05 2C */ stfs f0, 0x52c(r3) -/* 80D42078 38 00 00 00 */ li r0, 0 -/* 80D4207C 98 03 06 E8 */ stb r0, 0x6e8(r3) -/* 80D42080 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/modeDrop__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/modeDrop__12daZrTuraRc_cFv.s deleted file mode 100644 index b791cf0cf38..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/modeDrop__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80D42084: -/* 80D42084 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D42088 7C 08 02 A6 */ mflr r0 -/* 80D4208C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D42090 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D42094 7C 7F 1B 78 */ mr r31, r3 -/* 80D42098 38 9F 05 68 */ addi r4, r31, 0x568 -/* 80D4209C 4B 2D 86 31 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80D420A0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080250@ha */ -/* 80D420A4 38 03 02 50 */ addi r0, r3, 0x0250 /* 0x00080250@l */ -/* 80D420A8 90 01 00 08 */ stw r0, 8(r1) -/* 80D420AC 38 7F 09 18 */ addi r3, r31, 0x918 -/* 80D420B0 38 81 00 08 */ addi r4, r1, 8 -/* 80D420B4 38 A0 00 00 */ li r5, 0 -/* 80D420B8 38 C0 FF FF */ li r6, -1 -/* 80D420BC 81 9F 09 28 */ lwz r12, 0x928(r31) -/* 80D420C0 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80D420C4 7D 89 03 A6 */ mtctr r12 -/* 80D420C8 4E 80 04 21 */ bctrl -/* 80D420CC 38 7F 07 40 */ addi r3, r31, 0x740 -/* 80D420D0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D420D4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D420D8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80D420DC 4B 33 49 D1 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80D420E0 7F E3 FB 78 */ mr r3, r31 -/* 80D420E4 48 00 00 19 */ bl bgCheck__12daZrTuraRc_cFv -/* 80D420E8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D420EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D420F0 7C 08 03 A6 */ mtlr r0 -/* 80D420F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D420F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/move__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/move__12daZrTuraRc_cFv.s deleted file mode 100644 index d903e40715b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/move__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80D41F78: -/* 80D41F78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D41F7C 7C 08 02 A6 */ mflr r0 -/* 80D41F80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D41F84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D41F88 7C 7F 1B 78 */ mr r31, r3 -/* 80D41F8C 3C 60 80 D4 */ lis r3, cNullVec__6Z2Calc@ha /* 0x80D42440@ha */ -/* 80D41F90 38 C3 24 40 */ addi r6, r3, cNullVec__6Z2Calc@l /* 0x80D42440@l */ -/* 80D41F94 3C 60 80 D4 */ lis r3, data_80D425CC@ha /* 0x80D425CC@ha */ -/* 80D41F98 38 A3 25 CC */ addi r5, r3, data_80D425CC@l /* 0x80D425CC@l */ -/* 80D41F9C 88 05 00 00 */ lbz r0, 0(r5) -/* 80D41FA0 7C 00 07 75 */ extsb. r0, r0 -/* 80D41FA4 40 82 00 40 */ bne lbl_80D41FE4 -/* 80D41FA8 80 66 00 60 */ lwz r3, 0x60(r6) -/* 80D41FAC 80 06 00 64 */ lwz r0, 0x64(r6) -/* 80D41FB0 90 66 00 78 */ stw r3, 0x78(r6) -/* 80D41FB4 90 06 00 7C */ stw r0, 0x7c(r6) -/* 80D41FB8 80 06 00 68 */ lwz r0, 0x68(r6) -/* 80D41FBC 90 06 00 80 */ stw r0, 0x80(r6) -/* 80D41FC0 38 86 00 78 */ addi r4, r6, 0x78 -/* 80D41FC4 80 66 00 6C */ lwz r3, 0x6c(r6) -/* 80D41FC8 80 06 00 70 */ lwz r0, 0x70(r6) -/* 80D41FCC 90 64 00 0C */ stw r3, 0xc(r4) -/* 80D41FD0 90 04 00 10 */ stw r0, 0x10(r4) -/* 80D41FD4 80 06 00 74 */ lwz r0, 0x74(r6) -/* 80D41FD8 90 04 00 14 */ stw r0, 0x14(r4) -/* 80D41FDC 38 00 00 01 */ li r0, 1 -/* 80D41FE0 98 05 00 00 */ stb r0, 0(r5) -lbl_80D41FE4: -/* 80D41FE4 7F E3 FB 78 */ mr r3, r31 -/* 80D41FE8 88 1F 06 E8 */ lbz r0, 0x6e8(r31) -/* 80D41FEC 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80D41FF0 39 86 00 78 */ addi r12, r6, 0x78 -/* 80D41FF4 7D 8C 02 14 */ add r12, r12, r0 -/* 80D41FF8 4B 62 00 8D */ bl __ptmf_scall -/* 80D41FFC 60 00 00 00 */ nop -/* 80D42000 38 7F 06 C8 */ addi r3, r31, 0x6c8 -/* 80D42004 3C 80 80 D4 */ lis r4, lit_3774@ha /* 0x80D42408@ha */ -/* 80D42008 C0 24 24 08 */ lfs f1, lit_3774@l(r4) /* 0x80D42408@l */ -/* 80D4200C C0 1F 06 FC */ lfs f0, 0x6fc(r31) -/* 80D42010 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80D42014 4B 52 D6 F5 */ bl SetR__8cM3dGSphFf -/* 80D42018 38 7F 06 C8 */ addi r3, r31, 0x6c8 -/* 80D4201C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80D42020 4B 52 D6 29 */ bl SetC__8cM3dGSphFRC4cXyz -/* 80D42024 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D42028 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D4202C 38 63 23 3C */ addi r3, r3, 0x233c -/* 80D42030 38 9F 05 A4 */ addi r4, r31, 0x5a4 -/* 80D42034 4B 52 2B 75 */ bl Set__4cCcSFP8cCcD_Obj -/* 80D42038 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4203C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D42040 7C 08 03 A6 */ mtlr r0 -/* 80D42044 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D42048 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/setBaseMtx__12daZrTuraRc_cFv.s b/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/setBaseMtx__12daZrTuraRc_cFv.s deleted file mode 100644 index b0a7b18bbdf..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/setBaseMtx__12daZrTuraRc_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80D41934: -/* 80D41934 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D41938 7C 08 02 A6 */ mflr r0 -/* 80D4193C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D41940 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D41944 7C 7F 1B 78 */ mr r31, r3 -/* 80D41948 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D4194C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D41950 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D41954 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D41958 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D4195C 4B 60 4F 8D */ bl PSMTXTrans -/* 80D41960 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D41964 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D41968 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80D4196C A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80D41970 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80D41974 4B 2C A9 2D */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80D41978 C0 3F 06 FC */ lfs f1, 0x6fc(r31) -/* 80D4197C FC 40 08 90 */ fmr f2, f1 -/* 80D41980 FC 60 08 90 */ fmr f3, f1 -/* 80D41984 4B 2C B4 B5 */ bl scaleM__14mDoMtx_stack_cFfff -/* 80D41988 3C 60 80 D4 */ lis r3, lit_3684@ha /* 0x80D42404@ha */ -/* 80D4198C C0 03 24 04 */ lfs f0, lit_3684@l(r3) /* 0x80D42404@l */ -/* 80D41990 D0 01 00 08 */ stfs f0, 8(r1) -/* 80D41994 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80D41998 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80D4199C 80 7F 06 E4 */ lwz r3, 0x6e4(r31) -/* 80D419A0 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80D419A4 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80D419A8 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80D419AC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D419B0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D419B4 80 9F 06 E4 */ lwz r4, 0x6e4(r31) -/* 80D419B8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D419BC 4B 60 4A F5 */ bl PSMTXCopy -/* 80D419C0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D419C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D419C8 7C 08 03 A6 */ mtlr r0 -/* 80D419CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D419D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/CreateHeap__13daZraFreeze_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/CreateHeap__13daZraFreeze_cFv.s deleted file mode 100644 index e155b4192df..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/CreateHeap__13daZraFreeze_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80D4443C: -/* 80D4443C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44440 7C 08 02 A6 */ mflr r0 -/* 80D44444 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44448 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D4444C 7C 7F 1B 78 */ mr r31, r3 -/* 80D44450 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D44BC4@ha */ -/* 80D44454 38 63 4B C4 */ addi r3, r3, l_arcName@l /* 0x80D44BC4@l */ -/* 80D44458 80 63 00 00 */ lwz r3, 0(r3) -/* 80D4445C 88 1F 04 99 */ lbz r0, 0x499(r31) -/* 80D44460 7C 00 07 74 */ extsb r0, r0 -/* 80D44464 54 00 10 3A */ slwi r0, r0, 2 -/* 80D44468 3C 80 80 D4 */ lis r4, l_bmdName@ha /* 0x80D44BC8@ha */ -/* 80D4446C 38 84 4B C8 */ addi r4, r4, l_bmdName@l /* 0x80D44BC8@l */ -/* 80D44470 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80D44474 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44478 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D4447C 3C A5 00 02 */ addis r5, r5, 2 -/* 80D44480 38 C0 00 80 */ li r6, 0x80 -/* 80D44484 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80D44488 4B 2F 7E F5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80D4448C 3C 80 00 08 */ lis r4, 8 -/* 80D44490 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D44494 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D44498 4B 2D 07 BD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D4449C 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80D444A0 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D444A4 30 03 FF FF */ addic r0, r3, -1 -/* 80D444A8 7C 60 19 10 */ subfe r3, r0, r3 -/* 80D444AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D444B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D444B4 7C 08 03 A6 */ mtlr r0 -/* 80D444B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D444BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Create__13daZraFreeze_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Create__13daZraFreeze_cFv.s deleted file mode 100644 index 7a511265d9a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Create__13daZraFreeze_cFv.s +++ /dev/null @@ -1,102 +0,0 @@ -lbl_80D442BC: -/* 80D442BC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D442C0 7C 08 02 A6 */ mflr r0 -/* 80D442C4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D442C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D442CC 4B 61 DF 11 */ bl _savegpr_29 -/* 80D442D0 7C 7F 1B 78 */ mr r31, r3 -/* 80D442D4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D442D8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D442DC 40 82 00 1C */ bne lbl_80D442F8 -/* 80D442E0 28 1F 00 00 */ cmplwi r31, 0 -/* 80D442E4 41 82 00 08 */ beq lbl_80D442EC -/* 80D442E8 4B 2D 48 7D */ bl __ct__10fopAc_ac_cFv -lbl_80D442EC: -/* 80D442EC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D442F0 60 00 00 08 */ ori r0, r0, 8 -/* 80D442F4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D442F8: -/* 80D442F8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D442FC 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80D44300 98 1F 05 B0 */ stb r0, 0x5b0(r31) -/* 80D44304 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D44308 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80D4430C 98 1F 05 B1 */ stb r0, 0x5b1(r31) -/* 80D44310 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D44314 54 00 46 3E */ srwi r0, r0, 0x18 -/* 80D44318 98 1F 05 B2 */ stb r0, 0x5b2(r31) -/* 80D4431C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D44320 98 1F 05 CE */ stb r0, 0x5ce(r31) -/* 80D44324 38 00 FF FF */ li r0, -1 -/* 80D44328 B0 1F 05 CC */ sth r0, 0x5cc(r31) -/* 80D4432C 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D44330 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D44BC4@ha */ -/* 80D44334 38 84 4B C4 */ addi r4, r4, l_arcName@l /* 0x80D44BC4@l */ -/* 80D44338 80 84 00 00 */ lwz r4, 0(r4) -/* 80D4433C 4B 2E 8B 81 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D44340 7C 7D 1B 78 */ mr r29, r3 -/* 80D44344 2C 1D 00 04 */ cmpwi r29, 4 -/* 80D44348 40 82 00 D8 */ bne lbl_80D44420 -/* 80D4434C 7F E3 FB 78 */ mr r3, r31 -/* 80D44350 3C 80 80 D4 */ lis r4, createSolidHeap__FP10fopAc_ac_c@ha /* 0x80D4429C@ha */ -/* 80D44354 38 84 42 9C */ addi r4, r4, createSolidHeap__FP10fopAc_ac_c@l /* 0x80D4429C@l */ -/* 80D44358 38 A0 15 40 */ li r5, 0x1540 -/* 80D4435C 4B 2D 61 55 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D44360 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D44364 40 82 00 0C */ bne lbl_80D44370 -/* 80D44368 38 60 00 05 */ li r3, 5 -/* 80D4436C 48 00 00 B8 */ b lbl_80D44424 -lbl_80D44370: -/* 80D44370 7F E3 FB 78 */ mr r3, r31 -/* 80D44374 4B FF FD 45 */ bl setBaseMtx__13daZraFreeze_cFv -/* 80D44378 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D4437C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D44380 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D44384 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D44388 80 63 00 04 */ lwz r3, 4(r3) -/* 80D4438C 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80D44390 83 C3 00 00 */ lwz r30, 0(r3) -/* 80D44394 7F E3 FB 78 */ mr r3, r31 -/* 80D44398 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80D4439C C0 5E 00 40 */ lfs f2, 0x40(r30) -/* 80D443A0 C0 7E 00 44 */ lfs f3, 0x44(r30) -/* 80D443A4 C0 9E 00 48 */ lfs f4, 0x48(r30) -/* 80D443A8 C0 BE 00 4C */ lfs f5, 0x4c(r30) -/* 80D443AC C0 DE 00 50 */ lfs f6, 0x50(r30) -/* 80D443B0 4B 2D 61 99 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80D443B4 C0 5E 00 44 */ lfs f2, 0x44(r30) -/* 80D443B8 C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 80D443BC C0 1E 00 3C */ lfs f0, 0x3c(r30) -/* 80D443C0 D0 1F 05 B4 */ stfs f0, 0x5b4(r31) -/* 80D443C4 D0 3F 05 B8 */ stfs f1, 0x5b8(r31) -/* 80D443C8 D0 5F 05 BC */ stfs f2, 0x5bc(r31) -/* 80D443CC C0 5E 00 50 */ lfs f2, 0x50(r30) -/* 80D443D0 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 80D443D4 C0 1E 00 48 */ lfs f0, 0x48(r30) -/* 80D443D8 D0 1F 05 C0 */ stfs f0, 0x5c0(r31) -/* 80D443DC D0 3F 05 C4 */ stfs f1, 0x5c4(r31) -/* 80D443E0 D0 5F 05 C8 */ stfs f2, 0x5c8(r31) -/* 80D443E4 4B 46 81 99 */ bl dKy_darkworld_check__Fv -/* 80D443E8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80D443EC 90 1F 05 A4 */ stw r0, 0x5a4(r31) -/* 80D443F0 38 00 FF FF */ li r0, -1 -/* 80D443F4 90 1F 05 A8 */ stw r0, 0x5a8(r31) -/* 80D443F8 90 1F 05 AC */ stw r0, 0x5ac(r31) -/* 80D443FC 38 00 00 00 */ li r0, 0 -/* 80D44400 98 1F 05 CF */ stb r0, 0x5cf(r31) -/* 80D44404 3C 60 80 D4 */ lis r3, lit_3840@ha /* 0x80D44B5C@ha */ -/* 80D44408 C0 23 4B 5C */ lfs f1, lit_3840@l(r3) /* 0x80D44B5C@l */ -/* 80D4440C 4B 52 35 49 */ bl cM_rndF__Ff -/* 80D44410 FC 00 08 1E */ fctiwz f0, f1 -/* 80D44414 D8 01 00 08 */ stfd f0, 8(r1) -/* 80D44418 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80D4441C B0 1F 05 DE */ sth r0, 0x5de(r31) -lbl_80D44420: -/* 80D44420 7F A3 EB 78 */ mr r3, r29 -lbl_80D44424: -/* 80D44424 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D44428 4B 61 DE 01 */ bl _restgpr_29 -/* 80D4442C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D44430 7C 08 03 A6 */ mtlr r0 -/* 80D44434 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D44438 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Delete__13daZraFreeze_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Delete__13daZraFreeze_cFv.s deleted file mode 100644 index 65e82de7b3c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Delete__13daZraFreeze_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80D44A84: -/* 80D44A84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44A88 7C 08 02 A6 */ mflr r0 -/* 80D44A8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44A90 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D44BC4@ha */ -/* 80D44A94 38 84 4B C4 */ addi r4, r4, l_arcName@l /* 0x80D44BC4@l */ -/* 80D44A98 80 84 00 00 */ lwz r4, 0(r4) -/* 80D44A9C 38 63 05 68 */ addi r3, r3, 0x568 -/* 80D44AA0 4B 2E 85 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D44AA4 38 60 00 01 */ li r3, 1 -/* 80D44AA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44AAC 7C 08 03 A6 */ mtlr r0 -/* 80D44AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44AB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Draw__13daZraFreeze_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Draw__13daZraFreeze_cFv.s deleted file mode 100644 index 1fca0611d25..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Draw__13daZraFreeze_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80D449E0: -/* 80D449E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D449E4 7C 08 02 A6 */ mflr r0 -/* 80D449E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D449EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D449F0 7C 7F 1B 78 */ mr r31, r3 -/* 80D449F4 88 83 05 B0 */ lbz r4, 0x5b0(r3) -/* 80D449F8 28 04 00 FF */ cmplwi r4, 0xff -/* 80D449FC 41 82 00 20 */ beq lbl_80D44A1C -/* 80D44A00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44A04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44A08 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D44A0C 7C 05 07 74 */ extsb r5, r0 -/* 80D44A10 4B 2F 09 51 */ bl isSwitch__10dSv_info_cCFii -/* 80D44A14 2C 03 00 00 */ cmpwi r3, 0 -/* 80D44A18 41 82 00 54 */ beq lbl_80D44A6C -lbl_80D44A1C: -/* 80D44A1C 80 1F 05 A4 */ lwz r0, 0x5a4(r31) -/* 80D44A20 2C 00 00 00 */ cmpwi r0, 0 -/* 80D44A24 41 82 00 48 */ beq lbl_80D44A6C -/* 80D44A28 4B 2E B0 2D */ bl dComIfGs_wolfeye_effect_check__Fv -/* 80D44A2C 2C 03 00 01 */ cmpwi r3, 1 -/* 80D44A30 40 82 00 3C */ bne lbl_80D44A6C -/* 80D44A34 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D44A38 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D44A3C 38 80 00 04 */ li r4, 4 -/* 80D44A40 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D44A44 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D44A48 4B 45 ED 7D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D44A4C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D44A50 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D44A54 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80D44A58 80 84 00 04 */ lwz r4, 4(r4) -/* 80D44A5C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D44A60 4B 46 03 41 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D44A64 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D44A68 4B 2C 92 5D */ bl mDoExt_modelUpdateDL__FP8J3DModel -lbl_80D44A6C: -/* 80D44A6C 38 60 00 01 */ li r3, 1 -/* 80D44A70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D44A74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44A78 7C 08 03 A6 */ mtlr r0 -/* 80D44A7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44A80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Execute__13daZraFreeze_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Execute__13daZraFreeze_cFv.s deleted file mode 100644 index 00db57bd0c0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Execute__13daZraFreeze_cFv.s +++ /dev/null @@ -1,225 +0,0 @@ -lbl_80D44698: -/* 80D44698 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80D4469C 7C 08 02 A6 */ mflr r0 -/* 80D446A0 90 01 00 54 */ stw r0, 0x54(r1) -/* 80D446A4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80D446A8 4B 61 DB 35 */ bl _savegpr_29 -/* 80D446AC 7C 7D 1B 78 */ mr r29, r3 -/* 80D446B0 3C 60 80 D4 */ lis r3, l_DATA@ha /* 0x80D44B48@ha */ -/* 80D446B4 3B C3 4B 48 */ addi r30, r3, l_DATA@l /* 0x80D44B48@l */ -/* 80D446B8 88 9D 05 B0 */ lbz r4, 0x5b0(r29) -/* 80D446BC 28 04 00 FF */ cmplwi r4, 0xff -/* 80D446C0 41 82 00 20 */ beq lbl_80D446E0 -/* 80D446C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D446C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D446CC 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80D446D0 7C 05 07 74 */ extsb r5, r0 -/* 80D446D4 4B 2F 0C 8D */ bl isSwitch__10dSv_info_cCFii -/* 80D446D8 2C 03 00 00 */ cmpwi r3, 0 -/* 80D446DC 41 82 02 E8 */ beq lbl_80D449C4 -lbl_80D446E0: -/* 80D446E0 7F A3 EB 78 */ mr r3, r29 -/* 80D446E4 4B FF F9 D5 */ bl setBaseMtx__13daZraFreeze_cFv -/* 80D446E8 80 1D 04 E4 */ lwz r0, 0x4e4(r29) -/* 80D446EC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D446F0 A0 1D 04 E8 */ lhz r0, 0x4e8(r29) -/* 80D446F4 B0 01 00 10 */ sth r0, 0x10(r1) -/* 80D446F8 38 00 00 00 */ li r0, 0 -/* 80D446FC B0 1D 04 E4 */ sth r0, 0x4e4(r29) -/* 80D44700 B0 1D 04 E8 */ sth r0, 0x4e8(r29) -/* 80D44704 7F A3 EB 78 */ mr r3, r29 -/* 80D44708 4B FF FD B9 */ bl setHitodamaPrtcl__13daZraFreeze_cFv -/* 80D4470C A8 01 00 0C */ lha r0, 0xc(r1) -/* 80D44710 B0 1D 04 E4 */ sth r0, 0x4e4(r29) -/* 80D44714 A8 01 00 0E */ lha r0, 0xe(r1) -/* 80D44718 B0 1D 04 E6 */ sth r0, 0x4e6(r29) -/* 80D4471C A8 01 00 10 */ lha r0, 0x10(r1) -/* 80D44720 B0 1D 04 E8 */ sth r0, 0x4e8(r29) -/* 80D44724 88 9D 05 B1 */ lbz r4, 0x5b1(r29) -/* 80D44728 28 04 00 FF */ cmplwi r4, 0xff -/* 80D4472C 41 82 02 98 */ beq lbl_80D449C4 -/* 80D44730 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44734 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44738 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80D4473C 7C 05 07 74 */ extsb r5, r0 -/* 80D44740 4B 2F 0C 21 */ bl isSwitch__10dSv_info_cCFii -/* 80D44744 2C 03 00 00 */ cmpwi r3, 0 -/* 80D44748 41 82 02 7C */ beq lbl_80D449C4 -/* 80D4474C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44754 88 9D 05 B2 */ lbz r4, 0x5b2(r29) -/* 80D44758 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80D4475C 7C 05 07 74 */ extsb r5, r0 -/* 80D44760 4B 2F 0C 01 */ bl isSwitch__10dSv_info_cCFii -/* 80D44764 2C 03 00 00 */ cmpwi r3, 0 -/* 80D44768 40 82 01 EC */ bne lbl_80D44954 -/* 80D4476C 80 1D 05 A4 */ lwz r0, 0x5a4(r29) -/* 80D44770 2C 00 00 00 */ cmpwi r0, 0 -/* 80D44774 41 82 02 50 */ beq lbl_80D449C4 -/* 80D44778 4B 41 AC AD */ bl checkNowWolfEyeUp__9daPy_py_cFv -/* 80D4477C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D44780 41 82 02 44 */ beq lbl_80D449C4 -/* 80D44784 38 61 00 20 */ addi r3, r1, 0x20 -/* 80D44788 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80D4478C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44790 3B E5 61 C0 */ addi r31, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44794 80 BF 5D AC */ lwz r5, 0x5dac(r31) -/* 80D44798 38 A5 04 D0 */ addi r5, r5, 0x4d0 -/* 80D4479C 4B 52 23 99 */ bl __mi__4cXyzCFRC3Vec -/* 80D447A0 C0 41 00 20 */ lfs f2, 0x20(r1) -/* 80D447A4 D0 41 00 2C */ stfs f2, 0x2c(r1) -/* 80D447A8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80D447AC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80D447B0 C0 21 00 28 */ lfs f1, 0x28(r1) -/* 80D447B4 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 80D447B8 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80D447BC C0 1E 00 08 */ lfs f0, 8(r30) -/* 80D447C0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80D447C4 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80D447C8 38 61 00 14 */ addi r3, r1, 0x14 -/* 80D447CC 4B 60 29 6D */ bl PSVECSquareMag -/* 80D447D0 C0 1E 00 08 */ lfs f0, 8(r30) -/* 80D447D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D447D8 40 81 00 58 */ ble lbl_80D44830 -/* 80D447DC FC 00 08 34 */ frsqrte f0, f1 -/* 80D447E0 C8 9E 00 28 */ lfd f4, 0x28(r30) -/* 80D447E4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80D447E8 C8 7E 00 30 */ lfd f3, 0x30(r30) -/* 80D447EC FC 00 00 32 */ fmul f0, f0, f0 -/* 80D447F0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D447F4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80D447F8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80D447FC FC 44 00 32 */ fmul f2, f4, f0 -/* 80D44800 FC 00 00 32 */ fmul f0, f0, f0 -/* 80D44804 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D44808 FC 03 00 28 */ fsub f0, f3, f0 -/* 80D4480C FC 02 00 32 */ fmul f0, f2, f0 -/* 80D44810 FC 44 00 32 */ fmul f2, f4, f0 -/* 80D44814 FC 00 00 32 */ fmul f0, f0, f0 -/* 80D44818 FC 01 00 32 */ fmul f0, f1, f0 -/* 80D4481C FC 03 00 28 */ fsub f0, f3, f0 -/* 80D44820 FC 02 00 32 */ fmul f0, f2, f0 -/* 80D44824 FC 21 00 32 */ fmul f1, f1, f0 -/* 80D44828 FC 20 08 18 */ frsp f1, f1 -/* 80D4482C 48 00 00 88 */ b lbl_80D448B4 -lbl_80D44830: -/* 80D44830 C8 1E 00 38 */ lfd f0, 0x38(r30) -/* 80D44834 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D44838 40 80 00 10 */ bge lbl_80D44848 -/* 80D4483C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80D44840 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80D44844 48 00 00 70 */ b lbl_80D448B4 -lbl_80D44848: -/* 80D44848 D0 21 00 08 */ stfs f1, 8(r1) -/* 80D4484C 80 81 00 08 */ lwz r4, 8(r1) -/* 80D44850 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80D44854 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80D44858 7C 03 00 00 */ cmpw r3, r0 -/* 80D4485C 41 82 00 14 */ beq lbl_80D44870 -/* 80D44860 40 80 00 40 */ bge lbl_80D448A0 -/* 80D44864 2C 03 00 00 */ cmpwi r3, 0 -/* 80D44868 41 82 00 20 */ beq lbl_80D44888 -/* 80D4486C 48 00 00 34 */ b lbl_80D448A0 -lbl_80D44870: -/* 80D44870 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80D44874 41 82 00 0C */ beq lbl_80D44880 -/* 80D44878 38 00 00 01 */ li r0, 1 -/* 80D4487C 48 00 00 28 */ b lbl_80D448A4 -lbl_80D44880: -/* 80D44880 38 00 00 02 */ li r0, 2 -/* 80D44884 48 00 00 20 */ b lbl_80D448A4 -lbl_80D44888: -/* 80D44888 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80D4488C 41 82 00 0C */ beq lbl_80D44898 -/* 80D44890 38 00 00 05 */ li r0, 5 -/* 80D44894 48 00 00 10 */ b lbl_80D448A4 -lbl_80D44898: -/* 80D44898 38 00 00 03 */ li r0, 3 -/* 80D4489C 48 00 00 08 */ b lbl_80D448A4 -lbl_80D448A0: -/* 80D448A0 38 00 00 04 */ li r0, 4 -lbl_80D448A4: -/* 80D448A4 2C 00 00 01 */ cmpwi r0, 1 -/* 80D448A8 40 82 00 0C */ bne lbl_80D448B4 -/* 80D448AC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80D448B0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80D448B4: -/* 80D448B4 C0 1E 00 00 */ lfs f0, 0(r30) -/* 80D448B8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80D448BC 40 80 01 08 */ bge lbl_80D449C4 -/* 80D448C0 7F A3 EB 78 */ mr r3, r29 -/* 80D448C4 4B FF F8 61 */ bl chkActorInScreen__13daZraFreeze_cFv -/* 80D448C8 2C 03 00 00 */ cmpwi r3, 0 -/* 80D448CC 41 82 00 F8 */ beq lbl_80D449C4 -/* 80D448D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D448D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D448D8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80D448DC 7F A4 EB 78 */ mr r4, r29 -/* 80D448E0 3C A0 80 D4 */ lis r5, d_a_obj_zra_freeze__stringBase0@ha /* 0x80D44B88@ha */ -/* 80D448E4 38 A5 4B 88 */ addi r5, r5, d_a_obj_zra_freeze__stringBase0@l /* 0x80D44B88@l */ -/* 80D448E8 38 A5 00 30 */ addi r5, r5, 0x30 -/* 80D448EC 38 C0 00 FF */ li r6, 0xff -/* 80D448F0 4B 30 2E 69 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80D448F4 B0 7D 05 CC */ sth r3, 0x5cc(r29) -/* 80D448F8 7F A3 EB 78 */ mr r3, r29 -/* 80D448FC A8 9D 05 CC */ lha r4, 0x5cc(r29) -/* 80D44900 88 BD 05 CE */ lbz r5, 0x5ce(r29) -/* 80D44904 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80D44908 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80D4490C 38 E0 00 04 */ li r7, 4 -/* 80D44910 39 00 00 01 */ li r8, 1 -/* 80D44914 4B 2D 6D 69 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 80D44918 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D4491C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44920 88 9D 05 B2 */ lbz r4, 0x5b2(r29) -/* 80D44924 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80D44928 7C 05 07 74 */ extsb r5, r0 -/* 80D4492C 4B 2F 08 D5 */ bl onSwitch__10dSv_info_cFii -/* 80D44930 80 7F 5D AC */ lwz r3, 0x5dac(r31) -/* 80D44934 80 03 05 8C */ lwz r0, 0x58c(r3) -/* 80D44938 60 00 02 00 */ ori r0, r0, 0x200 -/* 80D4493C 90 03 05 8C */ stw r0, 0x58c(r3) -/* 80D44940 38 60 00 01 */ li r3, 1 -/* 80D44944 4B 2E 8F E1 */ bl dComIfGs_sense_type_change_Set__FSc -/* 80D44948 38 00 00 01 */ li r0, 1 -/* 80D4494C 98 1D 05 CF */ stb r0, 0x5cf(r29) -/* 80D44950 48 00 00 74 */ b lbl_80D449C4 -lbl_80D44954: -/* 80D44954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D4495C 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80D44960 28 00 00 00 */ cmplwi r0, 0 -/* 80D44964 41 82 00 44 */ beq lbl_80D449A8 -/* 80D44968 A0 1D 00 F8 */ lhz r0, 0xf8(r29) -/* 80D4496C 28 00 00 02 */ cmplwi r0, 2 -/* 80D44970 40 82 00 18 */ bne lbl_80D44988 -/* 80D44974 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80D44978 80 03 05 8C */ lwz r0, 0x58c(r3) -/* 80D4497C 60 00 02 00 */ ori r0, r0, 0x200 -/* 80D44980 90 03 05 8C */ stw r0, 0x58c(r3) -/* 80D44984 48 00 00 40 */ b lbl_80D449C4 -lbl_80D44988: -/* 80D44988 88 1D 05 CF */ lbz r0, 0x5cf(r29) -/* 80D4498C 28 00 00 01 */ cmplwi r0, 1 -/* 80D44990 40 82 00 34 */ bne lbl_80D449C4 -/* 80D44994 38 60 FF FF */ li r3, -1 -/* 80D44998 4B 2E 8F 8D */ bl dComIfGs_sense_type_change_Set__FSc -/* 80D4499C 38 00 00 00 */ li r0, 0 -/* 80D449A0 98 1D 05 CF */ stb r0, 0x5cf(r29) -/* 80D449A4 48 00 00 20 */ b lbl_80D449C4 -lbl_80D449A8: -/* 80D449A8 88 1D 05 CF */ lbz r0, 0x5cf(r29) -/* 80D449AC 28 00 00 01 */ cmplwi r0, 1 -/* 80D449B0 40 82 00 14 */ bne lbl_80D449C4 -/* 80D449B4 38 60 FF FF */ li r3, -1 -/* 80D449B8 4B 2E 8F 6D */ bl dComIfGs_sense_type_change_Set__FSc -/* 80D449BC 38 00 00 00 */ li r0, 0 -/* 80D449C0 98 1D 05 CF */ stb r0, 0x5cf(r29) -lbl_80D449C4: -/* 80D449C4 38 60 00 01 */ li r3, 1 -/* 80D449C8 39 61 00 50 */ addi r11, r1, 0x50 -/* 80D449CC 4B 61 D8 5D */ bl _restgpr_29 -/* 80D449D0 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80D449D4 7C 08 03 A6 */ mtlr r0 -/* 80D449D8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80D449DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/chkActorInScreen__13daZraFreeze_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/chkActorInScreen__13daZraFreeze_cFv.s deleted file mode 100644 index 6b614f3bb38..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/chkActorInScreen__13daZraFreeze_cFv.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_80D44124: -/* 80D44124 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 80D44128 7C 08 02 A6 */ mflr r0 -/* 80D4412C 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 80D44130 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 80D44134 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 80D44138 DB C1 00 A0 */ stfd f30, 0xa0(r1) -/* 80D4413C F3 C1 00 A8 */ psq_st f30, 168(r1), 0, 0 /* qr0 */ -/* 80D44140 DB A1 00 90 */ stfd f29, 0x90(r1) -/* 80D44144 F3 A1 00 98 */ psq_st f29, 152(r1), 0, 0 /* qr0 */ -/* 80D44148 39 61 00 90 */ addi r11, r1, 0x90 -/* 80D4414C 4B 61 E0 91 */ bl _savegpr_29 -/* 80D44150 3C 80 80 D4 */ lis r4, l_DATA@ha /* 0x80D44B48@ha */ -/* 80D44154 3B C4 4B 48 */ addi r30, r4, l_DATA@l /* 0x80D44B48@l */ -/* 80D44158 C0 63 05 BC */ lfs f3, 0x5bc(r3) -/* 80D4415C C0 43 05 C4 */ lfs f2, 0x5c4(r3) -/* 80D44160 C0 23 05 B4 */ lfs f1, 0x5b4(r3) -/* 80D44164 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80D44168 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 80D4416C D0 61 00 1C */ stfs f3, 0x1c(r1) -/* 80D44170 C0 03 05 C0 */ lfs f0, 0x5c0(r3) -/* 80D44174 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D44178 D0 41 00 24 */ stfs f2, 0x24(r1) -/* 80D4417C D0 61 00 28 */ stfs f3, 0x28(r1) -/* 80D44180 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80D44184 D0 41 00 30 */ stfs f2, 0x30(r1) -/* 80D44188 D0 41 00 34 */ stfs f2, 0x34(r1) -/* 80D4418C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80D44190 D0 41 00 3C */ stfs f2, 0x3c(r1) -/* 80D44194 D0 41 00 40 */ stfs f2, 0x40(r1) -/* 80D44198 C0 83 05 B8 */ lfs f4, 0x5b8(r3) -/* 80D4419C D0 21 00 44 */ stfs f1, 0x44(r1) -/* 80D441A0 D0 81 00 48 */ stfs f4, 0x48(r1) -/* 80D441A4 D0 61 00 4C */ stfs f3, 0x4c(r1) -/* 80D441A8 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80D441AC D0 81 00 54 */ stfs f4, 0x54(r1) -/* 80D441B0 D0 61 00 58 */ stfs f3, 0x58(r1) -/* 80D441B4 D0 21 00 5C */ stfs f1, 0x5c(r1) -/* 80D441B8 D0 81 00 60 */ stfs f4, 0x60(r1) -/* 80D441BC D0 41 00 64 */ stfs f2, 0x64(r1) -/* 80D441C0 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 80D441C4 D0 81 00 6C */ stfs f4, 0x6c(r1) -/* 80D441C8 D0 41 00 70 */ stfs f2, 0x70(r1) -/* 80D441CC 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D441D0 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D441D4 38 63 05 74 */ addi r3, r3, 0x574 -/* 80D441D8 4B 60 22 D9 */ bl PSMTXCopy -/* 80D441DC C0 3E 00 08 */ lfs f1, 8(r30) -/* 80D441E0 FC 40 08 90 */ fmr f2, f1 -/* 80D441E4 FC 60 08 90 */ fmr f3, f1 -/* 80D441E8 4B 2C 8B B5 */ bl transM__14mDoMtx_stack_cFfff -/* 80D441EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D441F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D441F4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80D441F8 7C 85 23 78 */ mr r5, r4 -/* 80D441FC 38 C0 00 08 */ li r6, 8 -/* 80D44200 4B 60 2B C1 */ bl PSMTXMultVecArray -/* 80D44204 3B A0 00 00 */ li r29, 0 -/* 80D44208 3B E0 00 00 */ li r31, 0 -/* 80D4420C C3 BE 00 08 */ lfs f29, 8(r30) -/* 80D44210 C3 DE 00 0C */ lfs f30, 0xc(r30) -/* 80D44214 C3 FE 00 10 */ lfs f31, 0x10(r30) -lbl_80D44218: -/* 80D44218 38 61 00 14 */ addi r3, r1, 0x14 -/* 80D4421C 7C 63 FA 14 */ add r3, r3, r31 -/* 80D44220 38 81 00 08 */ addi r4, r1, 8 -/* 80D44224 4B 2D 10 ED */ bl mDoLib_project__FP3VecP3Vec -/* 80D44228 C0 01 00 08 */ lfs f0, 8(r1) -/* 80D4422C FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 80D44230 40 80 00 20 */ bge lbl_80D44250 -/* 80D44234 FC 00 F0 40 */ fcmpo cr0, f0, f30 -/* 80D44238 40 80 00 18 */ bge lbl_80D44250 -/* 80D4423C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80D44240 FC 1D 00 40 */ fcmpo cr0, f29, f0 -/* 80D44244 40 80 00 0C */ bge lbl_80D44250 -/* 80D44248 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 80D4424C 41 80 00 0C */ blt lbl_80D44258 -lbl_80D44250: -/* 80D44250 38 60 00 00 */ li r3, 0 -/* 80D44254 48 00 00 18 */ b lbl_80D4426C -lbl_80D44258: -/* 80D44258 3B BD 00 01 */ addi r29, r29, 1 -/* 80D4425C 2C 1D 00 08 */ cmpwi r29, 8 -/* 80D44260 3B FF 00 0C */ addi r31, r31, 0xc -/* 80D44264 41 80 FF B4 */ blt lbl_80D44218 -/* 80D44268 38 60 00 01 */ li r3, 1 -lbl_80D4426C: -/* 80D4426C E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 80D44270 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 80D44274 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, 0 /* qr0 */ -/* 80D44278 CB C1 00 A0 */ lfd f30, 0xa0(r1) -/* 80D4427C E3 A1 00 98 */ psq_l f29, 152(r1), 0, 0 /* qr0 */ -/* 80D44280 CB A1 00 90 */ lfd f29, 0x90(r1) -/* 80D44284 39 61 00 90 */ addi r11, r1, 0x90 -/* 80D44288 4B 61 DF A1 */ bl _restgpr_29 -/* 80D4428C 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 80D44290 7C 08 03 A6 */ mtlr r0 -/* 80D44294 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80D44298 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/createSolidHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/createSolidHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 43c86c7bdd0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/createSolidHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4429C: -/* 80D4429C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D442A0 7C 08 02 A6 */ mflr r0 -/* 80D442A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D442A8 48 00 01 95 */ bl CreateHeap__13daZraFreeze_cFv -/* 80D442AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D442B0 7C 08 03 A6 */ mtlr r0 -/* 80D442B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D442B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Delete__FP13daZraFreeze_c.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Delete__FP13daZraFreeze_c.s deleted file mode 100644 index da067b13e54..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Delete__FP13daZraFreeze_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D44B00: -/* 80D44B00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44B04 7C 08 02 A6 */ mflr r0 -/* 80D44B08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44B0C 4B FF FF 79 */ bl Delete__13daZraFreeze_cFv -/* 80D44B10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44B14 7C 08 03 A6 */ mtlr r0 -/* 80D44B18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44B1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Draw__FP13daZraFreeze_c.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Draw__FP13daZraFreeze_c.s deleted file mode 100644 index 84e782247a6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Draw__FP13daZraFreeze_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D44AB8: -/* 80D44AB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44ABC 7C 08 02 A6 */ mflr r0 -/* 80D44AC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44AC4 4B FF FF 1D */ bl Draw__13daZraFreeze_cFv -/* 80D44AC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44ACC 7C 08 03 A6 */ mtlr r0 -/* 80D44AD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44AD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Execute__FP13daZraFreeze_c.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Execute__FP13daZraFreeze_c.s deleted file mode 100644 index 23d4e5c86e7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Execute__FP13daZraFreeze_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D44AD8: -/* 80D44AD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44ADC 7C 08 02 A6 */ mflr r0 -/* 80D44AE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44AE4 4B FF FB B5 */ bl Execute__13daZraFreeze_cFv -/* 80D44AE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44AEC 7C 08 03 A6 */ mtlr r0 -/* 80D44AF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44AF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_create__FP10fopAc_ac_c.s deleted file mode 100644 index e2e7783005c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D44B20: -/* 80D44B20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44B24 7C 08 02 A6 */ mflr r0 -/* 80D44B28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44B2C 4B FF F7 91 */ bl Create__13daZraFreeze_cFv -/* 80D44B30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44B34 7C 08 03 A6 */ mtlr r0 -/* 80D44B38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44B3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/setBaseMtx__13daZraFreeze_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/setBaseMtx__13daZraFreeze_cFv.s deleted file mode 100644 index dfc27e0eee7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/setBaseMtx__13daZraFreeze_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80D440B8: -/* 80D440B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D440BC 7C 08 02 A6 */ mflr r0 -/* 80D440C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D440C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D440C8 7C 7F 1B 78 */ mr r31, r3 -/* 80D440CC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D440D0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D440D4 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D440D8 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D440DC C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D440E0 4B 60 28 09 */ bl PSMTXTrans -/* 80D440E4 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80D440E8 4B 2C 8D ED */ bl XYZrotM__14mDoMtx_stack_cFRC5csXyz -/* 80D440EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D440F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D440F4 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80D440F8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D440FC 4B 60 23 B5 */ bl PSMTXCopy -/* 80D44100 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44104 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44108 38 9F 05 74 */ addi r4, r31, 0x574 -/* 80D4410C 4B 60 23 A5 */ bl PSMTXCopy -/* 80D44110 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D44114 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44118 7C 08 03 A6 */ mtlr r0 -/* 80D4411C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44120 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 8ac65e113b1..71606c6c004 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -374,7 +374,7 @@ public: ERFLG1_UNK_2000 = 0x2000, ERFLG1_UNK_800 = 0x800, ERFLG1_UNK_400 = 0x400, - ERFLG1_UNK_200 = 0x200, + ERFLG1_WOLF_EYE_KEEP = 0x200, ERFLG1_UNK_100 = 0x100, ERFLG1_UNK_80 = 0x80, ERFLG1_UNK_40 = 0x40, @@ -763,6 +763,7 @@ public: void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); } void onShieldBackBone() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); } + void onWolfEyeKeep() { i_onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); } void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); } void offCargoCarry() { diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index dec4de83dce..55867887d5d 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -912,6 +912,7 @@ void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum); s32 dComIfGs_isDungeonItemWarp(int i_stageNo); void dComIfGs_BossLife_public_Set(s8); s8 dComIfGs_sense_type_change_Get(); +void dComIfGs_sense_type_change_Set(s8); cXyz& dComIfGs_getWarpPlayerPos(); const char* dComIfGs_getWarpStageName(); s16 dComIfGs_getWarpPlayerAngleY(); diff --git a/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h b/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h index 9a4837a8896..ffd1d45168a 100644 --- a/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h +++ b/include/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h @@ -1,6 +1,61 @@ #ifndef D_A_OBJ_ZRTURARA_H #define D_A_OBJ_ZRTURARA_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "m_Do/m_Do_hostIO.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" +#include "d/bg/d_bg_s_movebg_actor.h" + +class daZrTurara_c : public dBgS_MoveBgActor { +public: + /* 80D405E4 */ void setBaseMtx(); + /* 80D40714 */ int CreateHeap(); + /* 80D40844 */ cPhs__Step create(); + /* 80D40C08 */ int Execute(Mtx**); + /* 80D40C68 */ void move(); + /* 80D40D88 */ void modeWait(); + /* 80D40E0C */ void init_modeBreak(); + /* 80D410E0 */ void modeBreak(); + /* 80D412A0 */ void init_modeEnd(); + /* 80D412AC */ void modeEnd(); + /* 80D412B0 */ int Draw(); + /* 80D41380 */ int Delete(); + + /* 0x5A0 */ dCcD_Stts mCcStatus; + /* 0x5DC */ dCcD_Cyl mCcCyl; + /* 0x718 */ request_of_phase_process_class mPhaseReq; + /* 0x720 */ J3DModel* mpBaseModel; + /* 0x724 */ J3DModel* mpRockModel; + /* 0x728 */ u8 mMode; + /* 0x729 */ u8 mSw2; + /* 0x72A */ u8 mDrawRock; + /* 0x72B */ u8 mBreakTimer; + /* 0x72C */ dBgW* mpRockBgW; + /* 0x730 */ Mtx mRockBgMtx; + /* 0x760 */ f32 mScaleF; + /* 0x764 */ u32 mParticleKey; + /* 0x768 */ u8 mDebrisCount; + + u8 getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } + u8 getScale() { return fopAcM_GetParamBit(this, 0x10, 8); } + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; +}; + +STATIC_ASSERT(sizeof(daZrTurara_c) == 0x76C); + +class daZrTurara_HIO_c : public mDoHIO_entry_c { +public: + /* 80D4056C */ daZrTurara_HIO_c(); + /* 80D414BC */ ~daZrTurara_HIO_c() {} + + /* 0x4 */ f32 mDebrisRange; + /* 0x8 */ u8 mDebrisNum; +}; + +STATIC_ASSERT(sizeof(daZrTurara_HIO_c) == 0xC); #endif /* D_A_OBJ_ZRTURARA_H */ diff --git a/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h b/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h index ed195bbb0aa..782a2bf6294 100644 --- a/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h +++ b/include/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h @@ -1,6 +1,62 @@ #ifndef D_A_OBJ_ZRTURARAROCK_H #define D_A_OBJ_ZRTURARAROCK_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "m_Do/m_Do_hostIO.h" +#include "f_op/f_op_actor_mng.h" +#include "d/cc/d_cc_d.h" +#include "d/bg/d_bg_s_acch.h" + +class daZrTuraRc_c : public fopAc_ac_c { +public: + /* 80D41934 */ void setBaseMtx(); + /* 80D419D4 */ int CreateHeap(); + /* 80D41A40 */ cPhs__Step create(); + /* 80D41EF0 */ static int createHeapCallBack(fopAc_ac_c*); + /* 80D41F10 */ int Execute(); + /* 80D41F78 */ void move(); + /* 80D4204C */ void init_modeDrop(); + /* 80D42084 */ void modeDrop(); + /* 80D420FC */ void bgCheck(); + /* 80D42128 */ void init_modeDropEnd(); + /* 80D4215C */ void modeDropEnd(); + /* 80D42160 */ int Draw(); + /* 80D421C4 */ int Delete(); + + /* 0x568 */ dCcD_Stts mCcStatus; + /* 0x5A4 */ dCcD_Sph mCcSph; + /* 0x6DC */ request_of_phase_process_class mPhaseReq; + /* 0x6E4 */ J3DModel* mpModel; + /* 0x6E8 */ u8 mMode; + /* 0x6E9 */ u8 field_0x6e9[0x13]; + /* 0x6FC */ f32 mScaleF; + /* 0x700 */ dBgS_AcchCir mAcchCir; + /* 0x740 */ dBgS_ObjAcch mAcch; + /* 0x918 */ Z2SoundObjSimple mSound; + + u8 getScale() { return fopAcM_GetParamBit(this, 0, 8); } + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcSph mCcDSph; +}; + +STATIC_ASSERT(sizeof(daZrTuraRc_c) == 0x938); + +class daZrTuraRc_HIO_c : public mDoHIO_entry_c { +public: + /* 80D4188C */ daZrTuraRc_HIO_c(); + /* 80D422D0 */ ~daZrTuraRc_HIO_c() {} + + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 mGravity; + /* 0x0C */ f32 mMaxFallSpeed; + /* 0x10 */ u8 field_0x10; + /* 0x11 */ u8 field_0x11; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; +}; + +STATIC_ASSERT(sizeof(daZrTuraRc_HIO_c) == 0x20); #endif /* D_A_OBJ_ZRTURARAROCK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h b/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h index d4f0ee8c2d3..c8ddcede03e 100644 --- a/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h +++ b/include/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h @@ -1,7 +1,38 @@ #ifndef D_A_OBJ_ZRA_FREEZE_H #define D_A_OBJ_ZRA_FREEZE_H -#include "d/com/d_com_inf_game.h" -#include "f_op/f_op_actor_mng.h" +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor.h" + +class daZraFreeze_c : public fopAc_ac_c { +public: + /* 80D440B8 */ void setBaseMtx(); + /* 80D44124 */ BOOL chkActorInScreen(); + /* 80D442BC */ cPhs__Step Create(); + /* 80D4443C */ int CreateHeap(); + /* 80D444C0 */ void setHitodamaPrtcl(); + /* 80D44698 */ int Execute(); + /* 80D449E0 */ int Draw(); + /* 80D44A84 */ int Delete(); + + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ Mtx mMtx; + /* 0x5A4 */ s32 mTwilight; + /* 0x5A8 */ u32 mParticleKey[2]; + /* 0x5B0 */ u8 field_0x5b0; + /* 0x5B1 */ u8 field_0x5b1; + /* 0x5B2 */ u8 field_0x5b2; + /* 0x5B4 */ cXyz mMin; + /* 0x5C0 */ cXyz mMax; + /* 0x5CC */ s16 mEventId; + /* 0x5CE */ u8 mMapToolId; + /* 0x5CF */ u8 field_0x5cf; + /* 0x5D0 */ cXyz mParticleOffset; + /* 0x5DC */ s16 field_0x5dc; + /* 0x5DE */ s16 field_0x5de; +}; + +STATIC_ASSERT(sizeof(daZraFreeze_c) == 0x5E0); #endif /* D_A_OBJ_ZRA_FREEZE_H */ diff --git a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp index c11299f54f1..c087b31b421 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp +++ b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp @@ -1,777 +1,654 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_zrTurara -// - -#include "rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D4059C */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daZrTurara_c { - /* 80D405E4 */ void setBaseMtx(); - /* 80D40714 */ void CreateHeap(); - /* 80D40844 */ void create(); - /* 80D40C08 */ void Execute(f32 (**)[3][4]); - /* 80D40C68 */ void move(); - /* 80D40D88 */ void modeWait(); - /* 80D40E0C */ void init_modeBreak(); - /* 80D410E0 */ void modeBreak(); - /* 80D412A0 */ void init_modeEnd(); - /* 80D412AC */ void modeEnd(); - /* 80D412B0 */ void Draw(); - /* 80D41380 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daZrTurara_HIO_c { - /* 80D4056C */ daZrTurara_HIO_c(); - /* 80D414BC */ ~daZrTurara_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -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 dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80D40BAC */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 80084548 */ void GetTgHitGObj(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 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 cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80D40B1C */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80D40B64 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D41474 */ ~cCcD_GStts(); -}; - -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 JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__16daZrTurara_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daZrTurara_cFv(); -extern "C" void CreateHeap__12daZrTurara_cFv(); -extern "C" void create__12daZrTurara_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void Execute__12daZrTurara_cFPPA3_A4_f(); -extern "C" void move__12daZrTurara_cFv(); -extern "C" void modeWait__12daZrTurara_cFv(); -extern "C" void init_modeBreak__12daZrTurara_cFv(); -extern "C" void modeBreak__12daZrTurara_cFv(); -extern "C" void init_modeEnd__12daZrTurara_cFv(); -extern "C" void modeEnd__12daZrTurara_cFv(); -extern "C" void Draw__12daZrTurara_cFv(); -extern "C" void Delete__12daZrTurara_cFv(); -extern "C" static void daZrTurara_Draw__FP12daZrTurara_c(); -extern "C" static void daZrTurara_Execute__FP12daZrTurara_c(); -extern "C" static void daZrTurara_Delete__FP12daZrTurara_c(); -extern "C" static void daZrTurara_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__16daZrTurara_HIO_cFv(); -extern "C" void __sinit_d_a_obj_zrTurara_cpp(); -extern "C" u8 const mCcDObjInfo__12daZrTurara_c[48]; -extern "C" extern char const* const d_a_obj_zrTurara__stringBase0; -extern "C" u8 mCcDCyl__12daZrTurara_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -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 onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -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 Create__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 ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" 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 */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D4159C-80D415A0 000000 0004+00 3/4 0/0 0/0 .rodata @3657 */ -SECTION_RODATA static f32 const lit_3657 = 250.0f; -COMPILER_STRIP_GATE(0x80D4159C, &lit_3657); - -/* 80D41608-80D41614 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D41614-80D41628 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - -/* 80D41628-80D4166C 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daZrTurara_c */ -SECTION_DATA u8 daZrTurara_c::mCcDCyl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D4166C-80D41678 -00001 000C+00 0/1 0/0 0/0 .data @3916 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3916[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__12daZrTurara_cFv, -}; -#pragma pop - -/* 80D41678-80D41684 -00001 000C+00 0/1 0/0 0/0 .data @3917 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3917[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__12daZrTurara_cFv, -}; -#pragma pop - -/* 80D41684-80D41690 -00001 000C+00 0/1 0/0 0/0 .data @3918 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3918[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeEnd__12daZrTurara_cFv, -}; -#pragma pop - -/* 80D41690-80D416B4 000088 0024+00 0/1 0/0 0/0 .data mode_proc$3915 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80D416B4-80D416D4 -00001 0020+00 1/0 0/0 0/0 .data l_daZrTurara_Method */ -SECTION_DATA static void* l_daZrTurara_Method[8] = { - (void*)daZrTurara_Create__FP10fopAc_ac_c, - (void*)daZrTurara_Delete__FP12daZrTurara_c, - (void*)daZrTurara_Execute__FP12daZrTurara_c, - (void*)NULL, - (void*)daZrTurara_Draw__FP12daZrTurara_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D416D4-80D41704 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_zrTurara */ -SECTION_DATA extern void* g_profile_Obj_zrTurara[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00B60000, (void*)&g_fpcLf_Method, - (void*)0x0000076C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x028C0000, (void*)&l_daZrTurara_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D41704-80D41710 0000FC 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80D41710-80D4171C 000108 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80D4171C-80D41728 000114 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80D41728-80D41734 000120 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D41734-80D4175C 00012C 0028+00 1/1 0/0 0/0 .data __vt__12daZrTurara_c */ -SECTION_DATA extern void* __vt__12daZrTurara_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daZrTurara_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__12daZrTurara_cFPPA3_A4_f, - (void*)Draw__12daZrTurara_cFv, - (void*)Delete__12daZrTurara_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80D4175C-80D41768 000154 000C+00 2/2 0/0 0/0 .data __vt__16daZrTurara_HIO_c */ -SECTION_DATA extern void* __vt__16daZrTurara_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daZrTurara_HIO_cFv, -}; - -/* 80D41768-80D41774 000160 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - -/* 80D4056C-80D4059C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__16daZrTurara_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daZrTurara_HIO_c::daZrTurara_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__ct__16daZrTurara_HIO_cFv.s" -} -#pragma pop - -/* 80D4059C-80D405E4 00011C 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D415A0-80D415D0 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__12daZrTurara_c */ -SECTION_RODATA u8 const daZrTurara_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D415A0, &daZrTurara_c::mCcDObjInfo); - -/* 80D415D0-80D415D4 000034 0004+00 3/4 0/0 0/0 .rodata @3699 */ -SECTION_RODATA static f32 const lit_3699 = 1.0f; -COMPILER_STRIP_GATE(0x80D415D0, &lit_3699); - -/* 80D405E4-80D40714 000164 0130+00 2/2 0/0 0/0 .text setBaseMtx__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/setBaseMtx__12daZrTurara_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D415FC-80D415FC 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D415FC = "M_DrpRock"; -#pragma pop - -/* 80D40714-80D40844 000294 0130+00 1/0 0/0 0/0 .text CreateHeap__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/CreateHeap__12daZrTurara_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D415D4-80D415DC 000038 0004+04 1/1 0/0 0/0 .rodata @3831 */ -SECTION_RODATA static f32 const lit_3831[1 + 1 /* padding */] = { - 1.0f / 10.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80D415D4, &lit_3831); - -/* 80D415DC-80D415E4 000040 0008+00 1/1 0/0 0/0 .rodata @3833 */ -SECTION_RODATA static u8 const lit_3833[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D415DC, &lit_3833); - -/* 80D40844-80D40B1C 0003C4 02D8+00 1/1 0/0 0/0 .text create__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/create__12daZrTurara_cFv.s" -} -#pragma pop - -/* 80D40B1C-80D40B64 00069C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80D40B64-80D40BAC 0006E4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80D40BAC-80D40C08 00072C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80D40C08-80D40C68 000788 0060+00 1/0 0/0 0/0 .text Execute__12daZrTurara_cFPPA3_A4_f - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Execute__12daZrTurara_cFPPA3_A4_f.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D415E4-80D415E8 000048 0004+00 0/1 0/0 0/0 .rodata @3926 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3926 = 130.0f; -COMPILER_STRIP_GATE(0x80D415E4, &lit_3926); -#pragma pop - -/* 80D415E8-80D415EC 00004C 0004+00 0/1 0/0 0/0 .rodata @3927 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3927 = 450.0f; -COMPILER_STRIP_GATE(0x80D415E8, &lit_3927); -#pragma pop - -/* 80D415EC-80D415F0 000050 0004+00 0/1 0/0 0/0 .rodata @3928 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3928 = 500.0f; -COMPILER_STRIP_GATE(0x80D415EC, &lit_3928); -#pragma pop - -/* 80D41780-80D4178C 000008 000C+00 1/1 0/0 0/0 .bss @3651 */ -static u8 lit_3651[12]; - -/* 80D4178C-80D41798 000014 000C+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[12]; - -/* 80D41798-80D4179C 000020 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80D41798[4]; - -/* 80D40C68-80D40D88 0007E8 0120+00 1/1 0/0 0/0 .text move__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::move() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/move__12daZrTurara_cFv.s" -} -#pragma pop - -/* 80D40D88-80D40E0C 000908 0084+00 1/0 0/0 0/0 .text modeWait__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/modeWait__12daZrTurara_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D415F0-80D415F4 000054 0004+00 1/1 0/0 0/0 .rodata @4013 */ -SECTION_RODATA static f32 const lit_4013 = -1.0f; -COMPILER_STRIP_GATE(0x80D415F0, &lit_4013); - -/* 80D40E0C-80D410E0 00098C 02D4+00 1/1 0/0 0/0 .text init_modeBreak__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::init_modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/init_modeBreak__12daZrTurara_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D415F4-80D415F8 000058 0004+00 0/1 0/0 0/0 .rodata @4059 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4059 = 200.0f; -COMPILER_STRIP_GATE(0x80D415F4, &lit_4059); -#pragma pop - -/* 80D415F8-80D415FC 00005C 0004+00 0/1 0/0 0/0 .rodata @4060 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4060 = 20.0f; -COMPILER_STRIP_GATE(0x80D415F8, &lit_4060); -#pragma pop - -/* 80D410E0-80D412A0 000C60 01C0+00 1/0 0/0 0/0 .text modeBreak__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/modeBreak__12daZrTurara_cFv.s" -} -#pragma pop - -/* 80D412A0-80D412AC 000E20 000C+00 2/2 0/0 0/0 .text init_modeEnd__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::init_modeEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/init_modeEnd__12daZrTurara_cFv.s" -} -#pragma pop - -/* 80D412AC-80D412B0 000E2C 0004+00 1/0 0/0 0/0 .text modeEnd__12daZrTurara_cFv */ -void daZrTurara_c::modeEnd() { - /* empty function */ -} - -/* 80D412B0-80D41380 000E30 00D0+00 1/0 0/0 0/0 .text Draw__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Draw__12daZrTurara_cFv.s" -} -#pragma pop - -/* 80D41380-80D413E8 000F00 0068+00 1/0 0/0 0/0 .text Delete__12daZrTurara_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTurara_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/Delete__12daZrTurara_cFv.s" -} -#pragma pop - -/* 80D413E8-80D41414 000F68 002C+00 1/0 0/0 0/0 .text daZrTurara_Draw__FP12daZrTurara_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTurara_Draw(daZrTurara_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Draw__FP12daZrTurara_c.s" -} -#pragma pop - -/* 80D41414-80D41434 000F94 0020+00 1/0 0/0 0/0 .text daZrTurara_Execute__FP12daZrTurara_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTurara_Execute(daZrTurara_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Execute__FP12daZrTurara_c.s" -} -#pragma pop - -/* 80D41434-80D41454 000FB4 0020+00 1/0 0/0 0/0 .text daZrTurara_Delete__FP12daZrTurara_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTurara_Delete(daZrTurara_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Delete__FP12daZrTurara_c.s" -} -#pragma pop - -/* 80D41454-80D41474 000FD4 0020+00 1/0 0/0 0/0 .text daZrTurara_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTurara_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/daZrTurara_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80D41474-80D414BC 000FF4 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80D414BC-80D41518 00103C 005C+00 2/1 0/0 0/0 .text __dt__16daZrTurara_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daZrTurara_HIO_c::~daZrTurara_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__16daZrTurara_HIO_cFv.s" -} -#pragma pop - -/* 80D41518-80D41588 001098 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_zrTurara_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_zrTurara_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__sinit_d_a_obj_zrTurara_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D41518, __sinit_d_a_obj_zrTurara_cpp); -#pragma pop - -/* 80D415FC-80D415FC 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/** + * d_a_obj_zrTurara.cpp + * Object - Zora River Stalactite + */ + +#include "rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "dol2asm.h" + +// +// Forward References: +// + +extern "C" void __ct__16daZrTurara_HIO_cFv(); +extern "C" void __dt__14mDoHIO_entry_cFv(); +extern "C" void setBaseMtx__12daZrTurara_cFv(); +extern "C" void CreateHeap__12daZrTurara_cFv(); +extern "C" void create__12daZrTurara_cFv(); +extern "C" void __dt__8cM3dGCylFv(); +extern "C" void __dt__8cM3dGAabFv(); +extern "C" void __dt__10dCcD_GSttsFv(); +extern "C" void Execute__12daZrTurara_cFPPA3_A4_f(); +extern "C" void move__12daZrTurara_cFv(); +extern "C" void modeWait__12daZrTurara_cFv(); +extern "C" void init_modeBreak__12daZrTurara_cFv(); +extern "C" void modeBreak__12daZrTurara_cFv(); +extern "C" void init_modeEnd__12daZrTurara_cFv(); +extern "C" void modeEnd__12daZrTurara_cFv(); +extern "C" void Draw__12daZrTurara_cFv(); +extern "C" void Delete__12daZrTurara_cFv(); +extern "C" static void daZrTurara_Draw__FP12daZrTurara_c(); +extern "C" static void daZrTurara_Execute__FP12daZrTurara_c(); +extern "C" static void daZrTurara_Delete__FP12daZrTurara_c(); +extern "C" static void daZrTurara_Create__FP10fopAc_ac_c(); +extern "C" void __dt__10cCcD_GSttsFv(); +extern "C" void __dt__16daZrTurara_HIO_cFv(); +extern "C" void __sinit_d_a_obj_zrTurara_cpp(); +extern "C" u8 const mCcDObjInfo__12daZrTurara_c[48]; +extern "C" extern char const* const d_a_obj_zrTurara__stringBase0; +extern "C" u8 mCcDCyl__12daZrTurara_c[68]; + +// +// External References: +// + +extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); +extern "C" void scaleM__14mDoMtx_stack_cFfff(); +extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); +extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); +extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); +extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); +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 onSwitch__10dSv_info_cFii(); +extern "C" void isSwitch__10dSv_info_cCFii(); +extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); +extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); +extern "C" void +set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); +extern "C" void +set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); +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 Create__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 ChkTgHit__12dCcD_GObjInfFv(); +extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); +extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); +extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); +extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); +extern "C" void Set__4cCcSFP8cCcD_Obj(); +extern "C" void cM_rndF__Ff(); +extern "C" void cM_rndFX__Ff(); +extern "C" void ChkUsed__9cBgW_BgIdCFv(); +extern "C" void SetC__8cM3dGCylFRC4cXyz(); +extern "C" void SetH__8cM3dGCylFf(); +extern "C" void SetR__8cM3dGCylFf(); +extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); +extern "C" void* __nw__FUl(); +extern "C" void __dl__FPv(); +extern "C" void __ptmf_scall(); +extern "C" void _savegpr_28(); +extern "C" void _restgpr_28(); +extern "C" extern void* __vt__8dCcD_Cyl[36]; +extern "C" extern void* __vt__9dCcD_Stts[11]; +extern "C" extern void* __vt__12cCcD_CylAttr[25]; +extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; +extern "C" extern void* __vt__9cCcD_Stts[8]; +extern "C" u8 now__14mDoMtx_stack_c[48]; +extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +extern "C" void __register_global_object(); + +// +// Declarations: +// + +/* 80D41608-80D41614 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ +SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +/* 80D41614-80D41628 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ +#pragma push +#pragma force_active on +SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { + 0x02000201, + /* padding */ + 0x40080000, + 0x00000000, + 0x3FE00000, + 0x00000000, +}; +#pragma pop + +/* 80D4159C-80D415A0 000000 0004+00 3/4 0/0 0/0 .rodata @3657 */ +SECTION_RODATA static f32 const lit_3657 = 250.0f; +COMPILER_STRIP_GATE(0x80D4159C, &lit_3657); + +/* 80D4056C-80D4059C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__16daZrTurara_HIO_cFv */ +daZrTurara_HIO_c::daZrTurara_HIO_c() { + mDebrisNum = 5; + // mDebrisRange = 250.0f; + mDebrisRange = FLOAT_LABEL(lit_3657); +} + +/* 80D4178C-80D41798 000014 000C+00 2/2 0/0 0/0 .bss l_HIO */ +static daZrTurara_HIO_c l_HIO; + +/* 80D415A0-80D415D0 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__12daZrTurara_c */ +dCcD_SrcGObjInf const daZrTurara_c::mCcDObjInfo = { + {0, { + {0, 0, 0}, + {0x20, 0x11}, + {0} + }}, + {1, 0, 1, 0, 0}, + {0xA, 0, 0, 0, 2}, + {0} +}; + +/* 80D41628-80D4166C 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daZrTurara_c */ +dCcD_SrcCyl daZrTurara_c::mCcDCyl = { + mCcDObjInfo, + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} +}; + +/* 80D4166C-80D41678 -00001 000C+00 0/1 0/0 0/0 .data @3916 */ +#pragma push +#pragma force_active on +SECTION_DATA static void* lit_3916[3] = { + (void*)NULL, + (void*)0xFFFFFFFF, + (void*)modeWait__12daZrTurara_cFv, +}; +#pragma pop + +/* 80D41678-80D41684 -00001 000C+00 0/1 0/0 0/0 .data @3917 */ +#pragma push +#pragma force_active on +SECTION_DATA static void* lit_3917[3] = { + (void*)NULL, + (void*)0xFFFFFFFF, + (void*)modeBreak__12daZrTurara_cFv, +}; +#pragma pop + +/* 80D41684-80D41690 -00001 000C+00 0/1 0/0 0/0 .data @3918 */ +#pragma push +#pragma force_active on +SECTION_DATA static void* lit_3918[3] = { + (void*)NULL, + (void*)0xFFFFFFFF, + (void*)modeEnd__12daZrTurara_cFv, +}; +#pragma pop + +/* 80D41690-80D416B4 000088 0024+00 0/1 0/0 0/0 .data mode_proc$3915 */ +#pragma push +#pragma force_active on +SECTION_DATA static u8 mode_proc[36] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +#pragma pop + +/* 80D416B4-80D416D4 -00001 0020+00 1/0 0/0 0/0 .data l_daZrTurara_Method */ +static actor_method_class l_daZrTurara_Method = { + (process_method_func)daZrTurara_Create__FP10fopAc_ac_c, + (process_method_func)daZrTurara_Delete__FP12daZrTurara_c, + (process_method_func)daZrTurara_Execute__FP12daZrTurara_c, + (process_method_func)NULL, + (process_method_func)daZrTurara_Draw__FP12daZrTurara_c, +}; + +/* 80D416D4-80D41704 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_zrTurara */ +extern actor_process_profile_definition g_profile_Obj_zrTurara = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_Obj_zrTurara, + &g_fpcLf_Method.mBase, + sizeof(daZrTurara_c), + 0, + 0, + &g_fopAc_Method.base, + 0x28C, + &l_daZrTurara_Method, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; + +/* 80D41704-80D41710 0000FC 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ +SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__10cCcD_GSttsFv, +}; + +/* 80D41710-80D4171C 000108 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ +SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__10dCcD_GSttsFv, +}; + +/* 80D4171C-80D41728 000114 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ +SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__8cM3dGCylFv, +}; + +/* 80D41728-80D41734 000120 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ +SECTION_DATA extern void* __vt__8cM3dGAab[3] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__8cM3dGAabFv, +}; + +/* 80D41734-80D4175C 00012C 0028+00 1/1 0/0 0/0 .data __vt__12daZrTurara_c */ +extern "C" extern void* __vt__12daZrTurara_c[10]; + +/* 80D4175C-80D41768 000154 000C+00 2/2 0/0 0/0 .data __vt__16daZrTurara_HIO_c */ +extern "C" extern void* __vt__16daZrTurara_HIO_c[3]; + +/* 80D41768-80D41774 000160 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ +extern "C" extern void* __vt__14mDoHIO_entry_c[3]; + +/* 80D415D0-80D415D4 000034 0004+00 3/4 0/0 0/0 .rodata @3699 */ +SECTION_RODATA static f32 const lit_3699 = 1.0f; +COMPILER_STRIP_GATE(0x80D415D0, &lit_3699); + +/* 80D405E4-80D40714 000164 0130+00 2/2 0/0 0/0 .text setBaseMtx__12daZrTurara_cFv */ +void daZrTurara_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::scaleM(mScaleF, mScaleF, mScaleF); + // cXyz scale(1.0f, 1.0f, 1.0f); + cXyz scale(FLOAT_LABEL(lit_3699), FLOAT_LABEL(lit_3699), FLOAT_LABEL(lit_3699)); + mpBaseModel->setBaseScale(scale); + mpBaseModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::scaleM(mScaleF, mScaleF, mScaleF); + mpRockModel->setBaseScale(scale); + mpRockModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), mRockBgMtx); +} + +/* 80D40714-80D40844 000294 0130+00 1/0 0/0 0/0 .text CreateHeap__12daZrTurara_cFv */ +int daZrTurara_c::CreateHeap() { + J3DModelData* base_model_data = (J3DModelData*)dComIfG_getObjectRes("M_DrpRock", 5); + mpBaseModel = mDoExt_J3DModel__create(base_model_data, 0x80000, 0x11000084); + if (mpBaseModel == NULL) { + return 0; + } + J3DModelData* rock_model_data = (J3DModelData*)dComIfG_getObjectRes("M_DrpRock", 4); + mpRockModel = mDoExt_J3DModel__create(rock_model_data, 0x80000, 0x11000084); + if (mpRockModel == NULL) { + return 0; + } + mpRockBgW = new dBgW(); + if (mpRockBgW == NULL || + mpRockBgW->Set((cBgD_t*)dComIfG_getObjectRes("M_DrpRock", 8), 1, &mRockBgMtx)) + { + mpRockBgW = NULL; + return 0; + } + return 1; +} + +/* 80D415D4-80D415DC 000038 0004+04 1/1 0/0 0/0 .rodata @3831 */ +SECTION_RODATA static f32 const lit_3831[1 + 1 /* padding */] = { + 1.0f / 10.0f, + /* padding */ + 0.0f, +}; +COMPILER_STRIP_GATE(0x80D415D4, &lit_3831); + +/* 80D415DC-80D415E4 000040 0008+00 1/1 0/0 0/0 .rodata @3833 */ +SECTION_RODATA static u8 const lit_3833[8] = { + 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +COMPILER_STRIP_GATE(0x80D415DC, &lit_3833); + +/* 80D40844-80D40B1C 0003C4 02D8+00 1/1 0/0 0/0 .text create__12daZrTurara_cFv */ +#ifdef NONMATCHING +// matches with literals +cPhs__Step daZrTurara_c::create() { + fopAcM_SetupActor(this, daZrTurara_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "M_DrpRock"); + if (step == cPhs_COMPLEATE_e) { + cPhs__Step bg_step = (cPhs__Step)MoveBGCreate("M_DrpRock", 9, dBgS_MoveBGProc_TypicalRotY, + 0x2800, NULL); + if (bg_step == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + mSw2 = getSwBit2(); + mDrawRock = true; + mCcStatus.Init(0xff, 0xff, this); + mCcCyl.Set(mCcDCyl); + mCcCyl.SetStts(&mCcStatus); + u8 sw1 = getSwBit1(); + if (i_fopAcM_isSwitch(this, sw1)) { + if (mpRockBgW != NULL) { + dComIfG_Bgsp().Release(mpRockBgW); + mpRockBgW->Move(); + } + mCcCyl.OffTgSetBit(); + mDrawRock = false; + init_modeEnd(); + } else if (mpRockBgW != NULL) { + dComIfG_Bgsp().Regist(mpRockBgW, this); + mpRockBgW->Move(); + } + fopAcM_SetMtx(this, mpBaseModel->getBaseTRMtx()); + J3DJoint* base_joint = mpBaseModel->getModelData()->getJointNodePointer(0); + J3DJoint* rock_joint = mpRockModel->getModelData()->getJointNodePointer(0); + fopAcM_setCullSizeBox( + this, + mScale.x * rock_joint->getMin()->x, + mScale.y * rock_joint->getMin()->y, + mScale.z * rock_joint->getMin()->z, + mScale.x * base_joint->getMax()->x, + mScale.y * base_joint->getMax()->y, + mScale.z * base_joint->getMax()->z + ); + u8 scale = getScale(); + if (scale == 0xff) { + scale = 0; + } + mScaleF = scale * 0.1f + 1.0f; + setBaseMtx(); + } + return step; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm cPhs__Step daZrTurara_c::create() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/create__12daZrTurara_cFv.s" +} +#pragma pop +#endif + +/* 80D40B1C-80D40B64 00069C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__8cM3dGCylFv.s" +} +#pragma pop + +/* 80D40B64-80D40BAC 0006E4 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_zrTurara/d_a_obj_zrTurara/__dt__8cM3dGAabFv.s" +} +#pragma pop + +/* 80D40BAC-80D40C08 00072C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__10dCcD_GSttsFv.s" +} +#pragma pop + +/* 80D40C08-80D40C68 000788 0060+00 1/0 0/0 0/0 .text Execute__12daZrTurara_cFPPA3_A4_f + */ +int daZrTurara_c::Execute(Mtx** i_mtxP) { + move(); + *i_mtxP = &mpBaseModel->getBaseTRMtx(); + setBaseMtx(); + if (mpRockBgW != NULL) { + mpRockBgW->Move(); + } + return 1; +} + +/* 80D415E4-80D415E8 000048 0004+00 0/1 0/0 0/0 .rodata @3926 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_3926 = 130.0f; +COMPILER_STRIP_GATE(0x80D415E4, &lit_3926); +#pragma pop + +/* 80D415E8-80D415EC 00004C 0004+00 0/1 0/0 0/0 .rodata @3927 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_3927 = 450.0f; +COMPILER_STRIP_GATE(0x80D415E8, &lit_3927); +#pragma pop + +/* 80D415EC-80D415F0 000050 0004+00 0/1 0/0 0/0 .rodata @3928 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_3928 = 500.0f; +COMPILER_STRIP_GATE(0x80D415EC, &lit_3928); +#pragma pop + +/* 80D41798-80D4179C 000020 0004+00 1/1 0/0 0/0 .bss None */ +static u8 data_80D41798[4]; + +/* 80D40C68-80D40D88 0007E8 0120+00 1/1 0/0 0/0 .text move__12daZrTurara_cFv */ +#ifdef NONMATCHING +// matches with literals +void daZrTurara_c::move() { + typedef void (daZrTurara_c::*daZrTurara_modeFunc)(); + static daZrTurara_modeFunc mode_proc[3] = { + &modeWait, + &modeBreak, + &modeEnd, + }; + (this->*mode_proc[mMode])(); + mCcCyl.SetR(130.0f); + mCcCyl.SetH(450.0f); + cXyz pos = current.pos; + pos.y -= 500.0f; + mCcCyl.SetC(pos); + dComIfG_Ccsp()->Set(&mCcCyl); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daZrTurara_c::move() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/move__12daZrTurara_cFv.s" +} +#pragma pop +#endif + +/* 80D40D88-80D40E0C 000908 0084+00 1/0 0/0 0/0 .text modeWait__12daZrTurara_cFv */ +void daZrTurara_c::modeWait() { + if (mSw2 != 0xff && i_fopAcM_isSwitch(this, mSw2)) { + init_modeBreak(); + } + if (mCcCyl.ChkTgHit() && mCcCyl.GetTgHitGObj()->GetAtType() == AT_TYPE_BOMB) { + init_modeBreak(); + } +} + +/* 80D415F0-80D415F4 000054 0004+00 1/1 0/0 0/0 .rodata @4013 */ +SECTION_RODATA static f32 const lit_4013 = -1.0f; +COMPILER_STRIP_GATE(0x80D415F0, &lit_4013); + +/* 80D40E0C-80D410E0 00098C 02D4+00 1/1 0/0 0/0 .text init_modeBreak__12daZrTurara_cFv */ +#ifdef NONMATCHING +// matches with literals +void daZrTurara_c::init_modeBreak() { + mDoAud_seStart(Z2SE_OBJ_RG_ROCK_BREAK, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + if (mpRockBgW != NULL) { + dComIfG_Bgsp().Release(mpRockBgW); + mpRockBgW->Move(); + } + mDrawRock = false; + mCcCyl.OffTgSetBit(); + cXyz scale(mScaleF, mScaleF, mScaleF); + dComIfGp_particle_set(0x8a93, ¤t.pos, NULL, &scale); + dComIfGp_particle_set(0x8a94, ¤t.pos, NULL, &scale); + dComIfGp_particle_set(0x8a95, ¤t.pos, NULL, &scale); + dComIfGp_particle_set(0x8a96, ¤t.pos, NULL, &scale); + dComIfGp_particle_set(0x8a97, ¤t.pos, NULL, &scale); + mParticleKey = dComIfGp_particle_set(mParticleKey, 0x8a98, ¤t.pos, NULL, &scale); + u8 sw1 = getSwBit1(); + i_fopAcM_onSwitch(this, sw1); + mDebrisCount = 0; + mBreakTimer = 0; + mMode = 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daZrTurara_c::init_modeBreak() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/init_modeBreak__12daZrTurara_cFv.s" +} +#pragma pop +#endif + +/* 80D415F4-80D415F8 000058 0004+00 0/1 0/0 0/0 .rodata @4059 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_4059 = 200.0f; +COMPILER_STRIP_GATE(0x80D415F4, &lit_4059); +#pragma pop + +/* 80D415F8-80D415FC 00005C 0004+00 0/1 0/0 0/0 .rodata @4060 */ +#pragma push +#pragma force_active on +SECTION_RODATA static f32 const lit_4060 = 20.0f; +COMPILER_STRIP_GATE(0x80D415F8, &lit_4060); +#pragma pop + +/* 80D410E0-80D412A0 000C60 01C0+00 1/0 0/0 0/0 .text modeBreak__12daZrTurara_cFv */ +#ifdef NONMATCHING +// regalloc +void daZrTurara_c::modeBreak() { + cXyz scale(mScaleF, mScaleF, mScaleF); + mParticleKey = dComIfGp_particle_set(mParticleKey, 0x8a98, ¤t.pos, NULL, &scale); + if (mBreakTimer != 0) { + mBreakTimer--; + } else { + cXyz pos = current.pos; + pos.y -= 200.0f; + pos.x += l_HIO.mDebrisRange * cM_rndFX(1.0f); + pos.y += l_HIO.mDebrisRange * cM_rndFX(1.0f); + fopAcM_create(PROC_Obj_zrTuraraRc, getScale(), &pos, + fopAcM_GetRoomNo(this), NULL, NULL, 0xff); + mDebrisCount++; + mBreakTimer = cM_rndF(1.0f) * 20.0f; + if (mDebrisCount >= l_HIO.mDebrisNum) { + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKey); + if (emitter != NULL) { + emitter->becomeInvalidEmitter(); + } + init_modeEnd(); + } + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daZrTurara_c::modeBreak() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/modeBreak__12daZrTurara_cFv.s" +} +#pragma pop +#endif + +/* 80D412A0-80D412AC 000E20 000C+00 2/2 0/0 0/0 .text init_modeEnd__12daZrTurara_cFv */ +void daZrTurara_c::init_modeEnd() { + mMode = 2; +} + +/* 80D412AC-80D412B0 000E2C 0004+00 1/0 0/0 0/0 .text modeEnd__12daZrTurara_cFv */ +void daZrTurara_c::modeEnd() { + /* empty function */ +} + +/* 80D412B0-80D41380 000E30 00D0+00 1/0 0/0 0/0 .text Draw__12daZrTurara_cFv */ +int daZrTurara_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpBaseModel->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpRockModel->mModelData, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpBaseModel); + if (mDrawRock) { + mDoExt_modelUpdateDL(mpRockModel); + } + dComIfGd_setList(); + return 1; +} + +/* 80D41380-80D413E8 000F00 0068+00 1/0 0/0 0/0 .text Delete__12daZrTurara_cFv */ +int daZrTurara_c::Delete() { + dComIfG_resDelete(&mPhaseReq, "M_DrpRock"); + if (mpRockBgW != NULL && mpRockBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpRockBgW); + } + return 1; +} + +/* 80D413E8-80D41414 000F68 002C+00 1/0 0/0 0/0 .text daZrTurara_Draw__FP12daZrTurara_c + */ +static int daZrTurara_Draw(daZrTurara_c* i_this) { + return i_this->MoveBGDraw(); +} + +/* 80D41414-80D41434 000F94 0020+00 1/0 0/0 0/0 .text daZrTurara_Execute__FP12daZrTurara_c */ +static int daZrTurara_Execute(daZrTurara_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80D41434-80D41454 000FB4 0020+00 1/0 0/0 0/0 .text daZrTurara_Delete__FP12daZrTurara_c + */ +static int daZrTurara_Delete(daZrTurara_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80D41454-80D41474 000FD4 0020+00 1/0 0/0 0/0 .text daZrTurara_Create__FP10fopAc_ac_c + */ +static cPhs__Step daZrTurara_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); +} + +/* 80D41474-80D414BC 000FF4 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { + nofralloc +#include "asm/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara/__dt__10cCcD_GSttsFv.s" +} +#pragma pop diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp index 76ee12fa239..d9e4976d60d 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp @@ -1,818 +1,237 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_zrTuraraRock -// - -#include "rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80D418EC */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daZrTuraRc_c { - /* 80D41934 */ void setBaseMtx(); - /* 80D419D4 */ void CreateHeap(); - /* 80D41A40 */ void create(); - /* 80D41EF0 */ void createHeapCallBack(fopAc_ac_c*); - /* 80D41F10 */ void Execute(); - /* 80D41F78 */ void move(); - /* 80D4204C */ void init_modeDrop(); - /* 80D42084 */ void modeDrop(); - /* 80D420FC */ void bgCheck(); - /* 80D42128 */ void init_modeDropEnd(); - /* 80D4215C */ void modeDropEnd(); - /* 80D42160 */ void Draw(); - /* 80D421C4 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDSph[64]; -}; - -struct daZrTuraRc_HIO_c { - /* 80D4188C */ daZrTuraRc_HIO_c(); - /* 80D422D0 */ ~daZrTuraRc_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -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 dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80D41E94 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80D41D24 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80D41D94 */ ~dBgS_AcchCir(); -}; - -struct csXyz {}; - -struct dBgS {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8026F708 */ void SetR(f32); - /* 80D41E04 */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80D41E4C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80D42288 */ ~cCcD_GStts(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__16daZrTuraRc_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daZrTuraRc_cFv(); -extern "C" void CreateHeap__12daZrTuraRc_cFv(); -extern "C" void create__12daZrTuraRc_cFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c(); -extern "C" void Execute__12daZrTuraRc_cFv(); -extern "C" void move__12daZrTuraRc_cFv(); -extern "C" void init_modeDrop__12daZrTuraRc_cFv(); -extern "C" void modeDrop__12daZrTuraRc_cFv(); -extern "C" void bgCheck__12daZrTuraRc_cFv(); -extern "C" void init_modeDropEnd__12daZrTuraRc_cFv(); -extern "C" void modeDropEnd__12daZrTuraRc_cFv(); -extern "C" void Draw__12daZrTuraRc_cFv(); -extern "C" void Delete__12daZrTuraRc_cFv(); -extern "C" static void daZrTuraRc_Draw__FP12daZrTuraRc_c(); -extern "C" static void daZrTuraRc_Execute__FP12daZrTuraRc_c(); -extern "C" static void daZrTuraRc_Delete__FP12daZrTuraRc_c(); -extern "C" static void daZrTuraRc_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__16daZrTuraRc_HIO_cFv(); -extern "C" void __sinit_d_a_obj_zrTuraraRock_cpp(); -extern "C" static void func_80D4239C(); -extern "C" static void func_80D423A4(); -extern "C" u8 const mCcDObjInfo__12daZrTuraRc_c[48]; -extern "C" extern char const* const d_a_obj_zrTuraraRock__stringBase0; -extern "C" u8 mCcDSph__12daZrTuraRc_c[64]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -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 __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void cM_rndFX__Ff(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -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" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D423C0-80D423C4 000000 0004+00 2/2 0/0 0/0 .rodata @3653 */ -SECTION_RODATA static f32 const lit_3653 = 450.0f; -COMPILER_STRIP_GATE(0x80D423C0, &lit_3653); - -/* 80D423C4-80D423C8 000004 0004+00 0/1 0/0 0/0 .rodata @3654 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3654 = 10.0f; -COMPILER_STRIP_GATE(0x80D423C4, &lit_3654); -#pragma pop - -/* 80D423C8-80D423CC 000008 0004+00 0/1 0/0 0/0 .rodata @3655 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3655 = 200.0f; -COMPILER_STRIP_GATE(0x80D423C8, &lit_3655); -#pragma pop - -/* 80D423CC-80D423D0 00000C 0004+00 0/1 0/0 0/0 .rodata @3656 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3656 = 5.0f; -COMPILER_STRIP_GATE(0x80D423CC, &lit_3656); -#pragma pop - -/* 80D423D0-80D423D4 000010 0004+00 0/2 0/0 0/0 .rodata @3657 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3657 = 3.0f; -COMPILER_STRIP_GATE(0x80D423D0, &lit_3657); -#pragma pop - -/* 80D42440-80D4244C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D4244C-80D42460 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - -/* 80D42460-80D424A0 000020 0040+00 2/2 0/0 0/0 .data mCcDSph__12daZrTuraRc_c */ -SECTION_DATA u8 daZrTuraRc_c::mCcDSph[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D424A0-80D424AC -00001 000C+00 0/1 0/0 0/0 .data @3871 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3871[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeDrop__12daZrTuraRc_cFv, -}; -#pragma pop - -/* 80D424AC-80D424B8 -00001 000C+00 0/1 0/0 0/0 .data @3872 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3872[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeDropEnd__12daZrTuraRc_cFv, -}; -#pragma pop - -/* 80D424B8-80D424D0 000078 0018+00 0/1 0/0 0/0 .data mode_proc$3870 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80D424D0-80D424F0 -00001 0020+00 1/0 0/0 0/0 .data l_daZrTuraRc_Method */ -SECTION_DATA static void* l_daZrTuraRc_Method[8] = { - (void*)daZrTuraRc_Create__FP10fopAc_ac_c, - (void*)daZrTuraRc_Delete__FP12daZrTuraRc_c, - (void*)daZrTuraRc_Execute__FP12daZrTuraRc_c, - (void*)NULL, - (void*)daZrTuraRc_Draw__FP12daZrTuraRc_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D424F0-80D42520 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_zrTuraraRc */ -SECTION_DATA extern void* g_profile_Obj_zrTuraraRc[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01880000, (void*)&g_fpcLf_Method, - (void*)0x00000938, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x028D0000, (void*)&l_daZrTuraRc_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80D42520-80D4252C 0000E0 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80D4252C-80D42538 0000EC 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80D42538-80D42544 0000F8 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80D42544-80D42568 000104 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80D423A4, - (void*)NULL, - (void*)NULL, - (void*)func_80D4239C, -}; - -/* 80D42568-80D42574 000128 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80D42574-80D42580 000134 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D42580-80D4258C 000140 000C+00 2/2 0/0 0/0 .data __vt__16daZrTuraRc_HIO_c */ -SECTION_DATA extern void* __vt__16daZrTuraRc_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daZrTuraRc_HIO_cFv, -}; - -/* 80D4258C-80D42598 00014C 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - -/* 80D4188C-80D418EC 0000EC 0060+00 1/1 0/0 0/0 .text __ct__16daZrTuraRc_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daZrTuraRc_HIO_c::daZrTuraRc_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__ct__16daZrTuraRc_HIO_cFv.s" -} -#pragma pop - -/* 80D418EC-80D41934 00014C 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D423D4-80D42404 000014 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__12daZrTuraRc_c */ -SECTION_RODATA u8 const daZrTuraRc_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D423D4, &daZrTuraRc_c::mCcDObjInfo); - -/* 80D42404-80D42408 000044 0004+00 1/2 0/0 0/0 .rodata @3684 */ -SECTION_RODATA static f32 const lit_3684 = 1.0f; -COMPILER_STRIP_GATE(0x80D42404, &lit_3684); - -/* 80D41934-80D419D4 000194 00A0+00 2/2 0/0 0/0 .text setBaseMtx__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/setBaseMtx__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D42434-80D42434 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D42434 = "M_DRockHn"; -#pragma pop - -/* 80D419D4-80D41A40 000234 006C+00 1/1 0/0 0/0 .text CreateHeap__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/CreateHeap__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D42408-80D4240C 000048 0004+00 1/2 0/0 0/0 .rodata @3774 */ -SECTION_RODATA static f32 const lit_3774 = 130.0f; -COMPILER_STRIP_GATE(0x80D42408, &lit_3774); - -/* 80D4240C-80D42410 00004C 0004+00 0/1 0/0 0/0 .rodata @3775 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3775 = 65.0f; -COMPILER_STRIP_GATE(0x80D4240C, &lit_3775); -#pragma pop - -/* 80D42410-80D42414 000050 0004+00 0/1 0/0 0/0 .rodata @3776 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3776 = 10000.0f; -COMPILER_STRIP_GATE(0x80D42410, &lit_3776); -#pragma pop - -/* 80D42414-80D42418 000054 0004+00 0/1 0/0 0/0 .rodata @3777 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3777 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D42414, &lit_3777); -#pragma pop - -/* 80D42418-80D4241C 000058 0004+00 0/1 0/0 0/0 .rodata @3778 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3778 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80D42418, &lit_3778); -#pragma pop - -/* 80D4241C-80D42420 00005C 0004+00 0/1 0/0 0/0 .rodata @3779 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3779 = 180.0f; -COMPILER_STRIP_GATE(0x80D4241C, &lit_3779); -#pragma pop - -/* 80D42420-80D42428 000060 0004+04 0/1 0/0 0/0 .rodata @3780 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3780[1 + 1 /* padding */] = { - 0x43360B61, - /* padding */ - 0x00000000, -}; -COMPILER_STRIP_GATE(0x80D42420, &lit_3780); -#pragma pop - -/* 80D42428-80D42430 000068 0008+00 0/1 0/0 0/0 .rodata @3782 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3782[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D42428, &lit_3782); -#pragma pop - -/* 80D41A40-80D41D24 0002A0 02E4+00 1/1 0/0 0/0 .text create__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/create__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* 80D41D24-80D41D94 000584 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80D41D94-80D41E04 0005F4 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80D41E04-80D41E4C 000664 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 80D41E4C-80D41E94 0006AC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80D41E94-80D41EF0 0006F4 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80D41EF0-80D41F10 000750 0020+00 1/1 0/0 0/0 .text - * createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 80D41F10-80D41F78 000770 0068+00 1/1 0/0 0/0 .text Execute__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Execute__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D425A0-80D425AC 000008 000C+00 1/1 0/0 0/0 .bss @3647 */ -static u8 lit_3647[12]; - -/* 80D425AC-80D425CC 000014 0020+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[32]; - -/* 80D425CC-80D425D0 000034 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80D425CC[4]; - -/* 80D41F78-80D4204C 0007D8 00D4+00 1/1 0/0 0/0 .text move__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::move() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/move__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D42430-80D42434 000070 0004+00 1/1 0/0 0/0 .rodata @3885 */ -SECTION_RODATA static u8 const lit_3885[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D42430, &lit_3885); - -/* 80D4204C-80D42084 0008AC 0038+00 1/1 0/0 0/0 .text init_modeDrop__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::init_modeDrop() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDrop__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* 80D42084-80D420FC 0008E4 0078+00 1/0 0/0 0/0 .text modeDrop__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::modeDrop() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/modeDrop__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* 80D420FC-80D42128 00095C 002C+00 1/1 0/0 0/0 .text bgCheck__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::bgCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/bgCheck__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* 80D42128-80D4215C 000988 0034+00 1/1 0/0 0/0 .text init_modeDropEnd__12daZrTuraRc_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::init_modeDropEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/init_modeDropEnd__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* 80D4215C-80D42160 0009BC 0004+00 1/0 0/0 0/0 .text modeDropEnd__12daZrTuraRc_cFv */ -void daZrTuraRc_c::modeDropEnd() { - /* empty function */ -} - -/* 80D42160-80D421C4 0009C0 0064+00 1/1 0/0 0/0 .text Draw__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Draw__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* 80D421C4-80D42208 000A24 0044+00 1/1 0/0 0/0 .text Delete__12daZrTuraRc_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZrTuraRc_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/Delete__12daZrTuraRc_cFv.s" -} -#pragma pop - -/* 80D42208-80D42228 000A68 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Draw__FP12daZrTuraRc_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTuraRc_Draw(daZrTuraRc_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Draw__FP12daZrTuraRc_c.s" -} -#pragma pop - -/* 80D42228-80D42248 000A88 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Execute__FP12daZrTuraRc_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTuraRc_Execute(daZrTuraRc_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Execute__FP12daZrTuraRc_c.s" -} -#pragma pop - -/* 80D42248-80D42268 000AA8 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Delete__FP12daZrTuraRc_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTuraRc_Delete(daZrTuraRc_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Delete__FP12daZrTuraRc_c.s" -} -#pragma pop - -/* 80D42268-80D42288 000AC8 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daZrTuraRc_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/daZrTuraRc_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80D42288-80D422D0 000AE8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80D422D0-80D4232C 000B30 005C+00 2/1 0/0 0/0 .text __dt__16daZrTuraRc_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daZrTuraRc_HIO_c::~daZrTuraRc_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__dt__16daZrTuraRc_HIO_cFv.s" -} -#pragma pop - -/* 80D4232C-80D4239C 000B8C 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_zrTuraraRock_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_zrTuraraRock_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/__sinit_d_a_obj_zrTuraraRock_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D4232C, __sinit_d_a_obj_zrTuraraRock_cpp); -#pragma pop - -/* 80D4239C-80D423A4 000BFC 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80D4239C() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D4239C.s" -} -#pragma pop - -/* 80D423A4-80D423AC 000C04 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80D423A4() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock/func_80D423A4.s" -} -#pragma pop - -/* 80D42434-80D42434 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/** + * d_a_obj_zrTuraraRock.cpp + * Object - Zora River Stalactite Debris + */ + +#include "rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" + +/* 80D42440-80D4244C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ +static u8 cNullVec__6Z2Calc[12] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +/* 80D4244C-80D42460 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ +static u32 lit_1787[1 + 4 /* padding */] = { + 0x02000201, + /* padding */ + 0x40080000, + 0x00000000, + 0x3FE00000, + 0x00000000, +}; + +/* 80D425AC-80D425CC 000014 0020+00 2/2 0/0 0/0 .bss l_HIO */ +static daZrTuraRc_HIO_c l_HIO; + +/* 80D4188C-80D418EC 0000EC 0060+00 1/1 0/0 0/0 .text __ct__16daZrTuraRc_HIO_cFv */ +daZrTuraRc_HIO_c::daZrTuraRc_HIO_c() { + field_0x04 = 450.0f; + mGravity = 10.0f; + mMaxFallSpeed = 200.0f; + field_0x10 = 30; + field_0x14 = 5.0f; + field_0x11 = 4; + field_0x18 = 3.0f; + field_0x1c = 5.0f; +} + +/* 80D423D4-80D42404 000014 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__12daZrTuraRc_c */ +dCcD_SrcGObjInf const daZrTuraRc_c::mCcDObjInfo = { + {0, { + {0x20, 1, 0x1F}, + {0, 0}, + {0x79} + }}, + {1, 0, 1, 0, 0}, + {0xA, 0, 0, 0, 2}, + {0} +}; + +/* 80D42460-80D424A0 000020 0040+00 2/2 0/0 0/0 .data mCcDSph__12daZrTuraRc_c */ +dCcD_SrcSph daZrTuraRc_c::mCcDSph = { + mCcDObjInfo, + {{{0.0f, 0.0f, 0.0f}, 0.0f}} +}; + +/* 80D41934-80D419D4 000194 00A0+00 2/2 0/0 0/0 .text setBaseMtx__12daZrTuraRc_cFv */ +void daZrTuraRc_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::scaleM(mScaleF, mScaleF, mScaleF); + mpModel->setBaseScale(cXyz(1.0f, 1.0f, 1.0f)); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); +} + +/* 80D419D4-80D41A40 000234 006C+00 1/1 0/0 0/0 .text CreateHeap__12daZrTuraRc_cFv */ +int daZrTuraRc_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("M_DRockHn", 3); + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + return 1; +} + +/* 80D41A40-80D41D24 0002A0 02E4+00 1/1 0/0 0/0 .text create__12daZrTuraRc_cFv */ +cPhs__Step daZrTuraRc_c::create() { + fopAcM_SetupActor(this, daZrTuraRc_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "M_DRockHn"); + if (step == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x840)) { + return cPhs_ERROR_e; + } + mAcchCir.SetWall(130.0f, 65.0f); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.SetWaterCheckOffset(10000.0f); + mCcStatus.Init(0xff, 0xff, this); + mCcSph.Set(mCcDSph); + mCcSph.SetStts(&mCcStatus); + mSound.init(¤t.pos, 1); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + u8 scale = getScale(); + if (scale == 0xff) { + scale = 0; + } + mScaleF = (scale * 0.1f + 1.0f) * (1.0f - fabsf(cM_rndFX(0.9f))); + shape_angle.x = cM_deg2s(cM_rndFX(180.0f)); + shape_angle.y = cM_deg2s(cM_rndFX(180.0f)); + shape_angle.z = cM_deg2s(cM_rndFX(180.0f)); + setBaseMtx(); + init_modeDrop(); + } + return step; +} + +/* 80D41EF0-80D41F10 000750 0020+00 1/1 0/0 0/0 .text + * createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c */ +int daZrTuraRc_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); +} + +/* 80D41F10-80D41F78 000770 0068+00 1/1 0/0 0/0 .text Execute__12daZrTuraRc_cFv */ +int daZrTuraRc_c::Execute() { + move(); + setBaseMtx(); + mCcStatus.Move(); + mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + return 1; +} + +/* 80D41F78-80D4204C 0007D8 00D4+00 1/1 0/0 0/0 .text move__12daZrTuraRc_cFv */ +void daZrTuraRc_c::move() { + typedef void (daZrTuraRc_c::*daZrTuraRc_modeFunc)(); + static daZrTuraRc_modeFunc mode_proc[2] = { + &modeDrop, + &modeDropEnd, + }; + (this->*mode_proc[mMode])(); + mCcSph.SetR(mScaleF * 130.0f); + mCcSph.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcSph); +} + +/* 80D4204C-80D42084 0008AC 0038+00 1/1 0/0 0/0 .text init_modeDrop__12daZrTuraRc_cFv */ +void daZrTuraRc_c::init_modeDrop() { + fopAcM_SetGravity(this, -l_HIO.mGravity); + fopAcM_SetMaxFallSpeed(this, -l_HIO.mMaxFallSpeed); + fopAcM_SetSpeedF(this, 0.0f); + mMode = 0; +} + +/* 80D42084-80D420FC 0008E4 0078+00 1/0 0/0 0/0 .text modeDrop__12daZrTuraRc_cFv */ +void daZrTuraRc_c::modeDrop() { + fopAcM_posMoveF(this, mCcStatus.GetCCMoveP()); + mSound.startLevelSound(Z2SE_OBJ_RG_ROCK_FALL, 0, -1); + mAcch.CrrPos(dComIfG_Bgsp()); + bgCheck(); +} + +/* 80D420FC-80D42128 00095C 002C+00 1/1 0/0 0/0 .text bgCheck__12daZrTuraRc_cFv */ +void daZrTuraRc_c::bgCheck() { + // this should be ChkGroundHit but that doesn't match + if (mAcch.m_flags >> 5 & 1) { + init_modeDropEnd(); + } +} + +/* 80D42128-80D4215C 000988 0034+00 1/1 0/0 0/0 .text init_modeDropEnd__12daZrTuraRc_cFv + */ +void daZrTuraRc_c::init_modeDropEnd() { + fopAcM_delete(this); + mMode = 1; +} + +/* 80D4215C-80D42160 0009BC 0004+00 1/0 0/0 0/0 .text modeDropEnd__12daZrTuraRc_cFv */ +void daZrTuraRc_c::modeDropEnd() { + /* empty function */ +} + +/* 80D42160-80D421C4 0009C0 0064+00 1/1 0/0 0/0 .text Draw__12daZrTuraRc_cFv */ +int daZrTuraRc_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mDoExt_modelUpdateDL(mpModel); + return 1; +} + +/* 80D421C4-80D42208 000A24 0044+00 1/1 0/0 0/0 .text Delete__12daZrTuraRc_cFv */ +int daZrTuraRc_c::Delete() { + dComIfG_resDelete(&mPhaseReq, "M_DRockHn"); + mSound.deleteObject(); + return 1; +} + +/* 80D42208-80D42228 000A68 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Draw__FP12daZrTuraRc_c + */ +static int daZrTuraRc_Draw(daZrTuraRc_c* i_this) { + return i_this->Draw(); +} + +/* 80D42228-80D42248 000A88 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Execute__FP12daZrTuraRc_c */ +static int daZrTuraRc_Execute(daZrTuraRc_c* i_this) { + return i_this->Execute(); +} + +/* 80D42248-80D42268 000AA8 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Delete__FP12daZrTuraRc_c + */ +static int daZrTuraRc_Delete(daZrTuraRc_c* i_this) { + return i_this->Delete(); +} + +/* 80D42268-80D42288 000AC8 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Create__FP10fopAc_ac_c + */ +static cPhs__Step daZrTuraRc_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); +} + +/* 80D424D0-80D424F0 -00001 0020+00 1/0 0/0 0/0 .data l_daZrTuraRc_Method */ +static actor_method_class l_daZrTuraRc_Method = { + (process_method_func)daZrTuraRc_Create, + (process_method_func)daZrTuraRc_Delete, + (process_method_func)daZrTuraRc_Execute, + (process_method_func)NULL, + (process_method_func)daZrTuraRc_Draw, +}; + +/* 80D424F0-80D42520 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_zrTuraraRc */ +extern actor_process_profile_definition g_profile_Obj_zrTuraraRc = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_Obj_zrTuraraRc, + &g_fpcLf_Method.mBase, + sizeof(daZrTuraRc_c), + 0, + 0, + &g_fopAc_Method.base, + 0x28D, + &l_daZrTuraRc_Method, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp index c272c3172d3..fc02802eaf1 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp +++ b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp @@ -1,46 +1,18 @@ /** * d_a_obj_zra_freeze.cpp - * + * Object - Frozen Zora */ #include "rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.h" #include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" +#include "m_Do/m_Do_lib.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" #include "d/a/d_a_player.h" #include "d/d_procname.h" #include "dol2asm.h" -class daZraFreeze_c : public fopAc_ac_c { -public: - /* 80D440B8 */ void setBaseMtx(); - /* 80D44124 */ BOOL chkActorInScreen(); - /* 80D442BC */ int Create(); - /* 80D4443C */ int CreateHeap(); - /* 80D444C0 */ void setHitodamaPrtcl(); - /* 80D44698 */ int Execute(); - /* 80D449E0 */ int Draw(); - /* 80D44A84 */ int Delete(); - - /* 0x568 */ request_of_phase_process_class mPhaseReq; - /* 0x570 */ J3DModel* mpModel; - /* 0x574 */ Mtx mMtx; - /* 0x5A4 */ s32 field_0x5a4; - /* 0x5A8 */ s32 field_0x5a8; - /* 0x5AC */ s32 field_0x5ac; - /* 0x5B0 */ u8 field_0x5b0; - /* 0x5B1 */ u8 field_0x5b1; - /* 0x5B2 */ u8 field_0x5b2; - /* 0x5B3 */ u8 field_0x5B3[0x5B4 - 0x5B3]; - /* 0x5B4 */ cXyz field_0x5b4; - /* 0x5C0 */ cXyz field_0x5c0; - /* 0x5CC */ s16 field_0x5cc; - /* 0x5CE */ u8 field_0x5ce; - /* 0x5CF */ u8 field_0x5cf; - /* 0x5D0 */ cXyz field_0x5d0; - /* 0x5DC */ s16 field_0x5dc; - /* 0x5DE */ s16 field_0x5de; -}; - // // Forward References: // @@ -60,7 +32,6 @@ extern "C" static bool daZraFreeze_IsDelete__FP13daZraFreeze_c(); extern "C" static void daZraFreeze_Delete__FP13daZraFreeze_c(); extern "C" static void daZraFreeze_create__FP10fopAc_ac_c(); extern "C" extern char const* const d_a_obj_zra_freeze__stringBase0; -extern "C" extern void* g_profile_OBJ_ZRAFREEZE[12]; // // External References: @@ -103,106 +74,95 @@ extern "C" u8 sincosTable___5JMath[65536]; // Declarations: // -/* 80D440B8-80D44124 000078 006C+00 2/2 0/0 0/0 .text setBaseMtx__13daZraFreeze_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daZraFreeze_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/setBaseMtx__13daZraFreeze_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D44B48-80D44B50 000000 0008+00 3/3 0/0 0/0 .rodata l_DATA */ -SECTION_RODATA static u8 const l_DATA[8] = { - 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D44B48, &l_DATA); - -/* 80D44B50-80D44B54 000008 0004+00 0/2 0/0 0/0 .rodata @3763 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3763[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D44B50, &lit_3763); -#pragma pop - -/* 80D44B54-80D44B58 00000C 0004+00 0/1 0/0 0/0 .rodata @3764 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3764 = 608.0f; -COMPILER_STRIP_GATE(0x80D44B54, &lit_3764); -#pragma pop - -/* 80D44B58-80D44B5C 000010 0004+00 0/1 0/0 0/0 .rodata @3765 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3765 = 448.0f; -COMPILER_STRIP_GATE(0x80D44B58, &lit_3765); -#pragma pop - -/* 80D44124-80D4429C 0000E4 0178+00 1/1 0/0 0/0 .text chkActorInScreen__13daZraFreeze_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daZraFreeze_c::chkActorInScreen() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/chkActorInScreen__13daZraFreeze_cFv.s" -} -#pragma pop - -/* 80D4429C-80D442BC 00025C 0020+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int createSolidHeap(fopAc_ac_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/createSolidHeap__FP10fopAc_ac_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80D44B5C-80D44B60 000014 0004+00 1/1 0/0 0/0 .rodata @3840 */ -SECTION_RODATA static f32 const lit_3840 = 65536.0f; -COMPILER_STRIP_GATE(0x80D44B5C, &lit_3840); - /* 80D44BC4-80D44BC8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "zrF"; -/* 80D442BC-80D4443C 00027C 0180+00 1/1 0/0 0/0 .text Create__13daZraFreeze_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daZraFreeze_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Create__13daZraFreeze_cFv.s" -} -#pragma pop +/* 80D44B48-80D44B50 000000 0008+00 3/3 0/0 0/0 .rodata l_DATA */ +static f32 const l_DATA[2] = { 800.0f, 0.0f }; -/* 80D44BC8-80D44BD4 -00001 000C+00 1/1 0/0 0/0 .data l_bmdName$3845 */ -static char* l_bmdName[3] = { - "zrA_a_TW.bmd", - "zrA_pain_TW.bmd", - "zrA_sol_TW.bmd", -}; +/* 80D440B8-80D44124 000078 006C+00 2/2 0/0 0/0 .text setBaseMtx__13daZraFreeze_cFv */ +void daZraFreeze_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::XYZrotM(shape_angle); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), mMtx); +} + +/* 80D44124-80D4429C 0000E4 0178+00 1/1 0/0 0/0 .text chkActorInScreen__13daZraFreeze_cFv + */ +BOOL daZraFreeze_c::chkActorInScreen() { + cXyz proj; + cXyz vec[8]; + vec[0].set(mMin.x, mMax.y, mMin.z); + vec[1].set(mMax.x, mMax.y, mMin.z); + vec[2].set(mMin.x, mMax.y, mMax.y); + vec[3].set(mMax.x, mMax.y, mMax.y); + vec[4].set(mMin.x, mMin.y, mMin.z); + vec[5].set(mMax.x, mMin.y, mMin.z); + vec[6].set(mMin.x, mMin.y, mMax.y); + vec[7].set(mMax.x, mMin.y, mMax.y); + mDoMtx_stack_c::copy(mMtx); + mDoMtx_stack_c::transM(0.0f, 0.0f, 0.0f); + PSMTXMultVecArray(mDoMtx_stack_c::get(), vec, vec, 8); + for (int i = 0; i < 8; i++) { + mDoLib_project(&vec[i], &proj); + if (0.0f < proj.x && proj.x < 608.0f && 0.0f < proj.y && proj.y < 448.0f) { + continue; + } + return false; + } + return true; +} + +/* 80D4429C-80D442BC 00025C 0020+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ +static int createSolidHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); +} + +/* 80D442BC-80D4443C 00027C 0180+00 1/1 0/0 0/0 .text Create__13daZraFreeze_cFv */ +cPhs__Step daZraFreeze_c::Create() { + fopAcM_SetupActor(this, daZraFreeze_c); + field_0x5b0 = (fopAcM_GetParam(this) >> 8) & 0xff; + field_0x5b1 = (fopAcM_GetParam(this) >> 0x10) & 0xff; + field_0x5b2 = (fopAcM_GetParam(this) >> 0x18) & 0xff; + mMapToolId = fopAcM_GetParam(this) & 0xff; + mEventId = -1; + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName); + if (step == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createSolidHeap, 0x1540)) { + return cPhs_ERROR_e; + } + setBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + J3DJoint* joint = mpModel->getModelData()->getJointNodePointer(0); + fopAcM_setCullSizeBox(this, joint->getMin()->x, joint->getMin()->y, joint->getMin()->z, + joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); + mMin.set(joint->getMin()->x, joint->getMin()->y, joint->getMin()->z); + mMax.set(joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); + mTwilight = dKy_darkworld_check(); + mParticleKey[0] = -1; + mParticleKey[1] = -1; + field_0x5cf = 0; + field_0x5de = cM_rndF(65536.0f); + } + return step; +} /* 80D4443C-80D444C0 0003FC 0084+00 1/1 0/0 0/0 .text CreateHeap__13daZraFreeze_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daZraFreeze_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/CreateHeap__13daZraFreeze_cFv.s" +int daZraFreeze_c::CreateHeap() { + static char* l_bmdName[3] = { + "zrA_a_TW.bmd", + "zrA_pain_TW.bmd", + "zrA_sol_TW.bmd", + }; + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName[mSubtype]); + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + return 1; } -#pragma pop -/* ############################################################################################## */ /* 80D44B60-80D44B64 000018 0004+00 0/1 0/0 0/0 .rodata id$3856 */ #pragma push #pragma force_active on @@ -238,6 +198,30 @@ COMPILER_STRIP_GATE(0x80D44B6C, &lit_3919); /* 80D444C0-80D44698 000480 01D8+00 1/1 0/0 0/0 .text setHitodamaPrtcl__13daZraFreeze_cFv */ +#ifdef NONMATCHING +void daZraFreeze_c::setHitodamaPrtcl() { + cXyz pos = current.pos; + field_0x5dc = (u16)(field_0x5de << 1); + mParticleOffset.x = 8.0f * cM_ssin(field_0x5de); + mParticleOffset.y = 4.0f * cM_ssin(field_0x5dc); + mParticleOffset.z = mParticleOffset.x * -cM_ssin(shape_angle.y); + mParticleOffset.x *= cM_scos(shape_angle.y); + field_0x5de += 0x400; + pos.x = current.pos.x + mParticleOffset.x; + pos.y = current.pos.y + mParticleOffset.y; + pos.z = current.pos.z + mParticleOffset.z; + static u16 const id[2] = { 0x8497, 0x8498 }; + for (int i = 0; i < 2; i++) { + mParticleKey[i] = dComIfGp_particle_set(mParticleKey[i], id[i], &pos, &shape_angle, NULL); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKey[i]); + if (emitter != NULL) { + u8 alpha = dComIfGs_wolfeye_effect_check() == false ? 0xff : 0; + emitter->setGlobalTranslation(pos.x, pos.y, pos.z); + emitter->setGlobalAlpha(alpha); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -246,91 +230,76 @@ asm void daZraFreeze_c::setHitodamaPrtcl() { #include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/setHitodamaPrtcl__13daZraFreeze_cFv.s" } #pragma pop - -/* ############################################################################################## */ -/* 80D44B70-80D44B78 000028 0008+00 0/1 0/0 0/0 .rodata @4050 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4050[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D44B70, &lit_4050); -#pragma pop - -/* 80D44B78-80D44B80 000030 0008+00 0/1 0/0 0/0 .rodata @4051 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4051[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D44B78, &lit_4051); -#pragma pop - -/* 80D44B80-80D44B88 000038 0008+00 0/1 0/0 0/0 .rodata @4052 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4052[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D44B80, &lit_4052); -#pragma pop - -/* 80D44B88-80D44B88 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D44BB8 = "zora_koori"; -#pragma pop +#endif /* 80D44698-80D449E0 000658 0348+00 1/1 0/0 0/0 .text Execute__13daZraFreeze_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daZraFreeze_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Execute__13daZraFreeze_cFv.s" +int daZraFreeze_c::Execute() { + if (field_0x5b0 == 0xff || dComIfGs_isSwitch(field_0x5b0, fopAcM_GetRoomNo(this))) { + setBaseMtx(); + csXyz stored_shape_angle = shape_angle; + shape_angle.x = 0; + shape_angle.z = 0; + setHitodamaPrtcl(); + shape_angle = stored_shape_angle; + if (field_0x5b1 != 0xff && dComIfGs_isSwitch(field_0x5b1, fopAcM_GetRoomNo(this))) { + if (!dComIfGs_isSwitch(field_0x5b2, fopAcM_GetRoomNo(this))) { + if (mTwilight != 0 && daPy_py_c::checkNowWolfEyeUp()) { + cXyz delta = current.pos - daPy_getPlayerActorClass()->current.pos; + if (delta.absXZ() < l_DATA[0] && chkActorInScreen()) { + mEventId = i_dComIfGp_getEventManager().getEventIdx(this, "zora_koori", 0xff); + fopAcM_orderOtherEventId(this, mEventId, mMapToolId, 0xffff, 4, 1); + dComIfGs_onSwitch(field_0x5b2, fopAcM_GetRoomNo(this)); + daPy_getPlayerActorClass()->onWolfEyeKeep(); + dComIfGs_sense_type_change_Set(1); + field_0x5cf = 1; + } + } + } else { + if (i_dComIfGp_event_runCheck()) { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + daPy_getPlayerActorClass()->onWolfEyeKeep(); + } else if (field_0x5cf == 1) { + dComIfGs_sense_type_change_Set(-1); + field_0x5cf = 0; + } + } else if (field_0x5cf == 1) { + dComIfGs_sense_type_change_Set(-1); + field_0x5cf = 0; + } + } + } + } + return 1; } -#pragma pop /* 80D449E0-80D44A84 0009A0 00A4+00 1/1 0/0 0/0 .text Draw__13daZraFreeze_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daZraFreeze_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Draw__13daZraFreeze_cFv.s" +int daZraFreeze_c::Draw() { + if (field_0x5b0 == 0xff || dComIfGs_isSwitch(field_0x5b0, fopAcM_GetRoomNo(this))) { + if (mTwilight != 0 && dComIfGs_wolfeye_effect_check() == true) { + g_env_light.settingTevStruct(4, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mDoExt_modelUpdateDL(mpModel); + } + } + return 1; } -#pragma pop /* 80D44A84-80D44AB8 000A44 0034+00 1/1 0/0 0/0 .text Delete__13daZraFreeze_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daZraFreeze_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/Delete__13daZraFreeze_cFv.s" +int daZraFreeze_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + return 1; } -#pragma pop /* 80D44AB8-80D44AD8 000A78 0020+00 1/0 0/0 0/0 .text daZraFreeze_Draw__FP13daZraFreeze_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daZraFreeze_Draw(daZraFreeze_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Draw__FP13daZraFreeze_c.s" +static int daZraFreeze_Draw(daZraFreeze_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80D44AD8-80D44AF8 000A98 0020+00 1/0 0/0 0/0 .text daZraFreeze_Execute__FP13daZraFreeze_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daZraFreeze_Execute(daZraFreeze_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Execute__FP13daZraFreeze_c.s" +static int daZraFreeze_Execute(daZraFreeze_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 80D44AF8-80D44B00 000AB8 0008+00 1/0 0/0 0/0 .text daZraFreeze_IsDelete__FP13daZraFreeze_c */ static int daZraFreeze_IsDelete(daZraFreeze_c* i_this) { @@ -338,45 +307,40 @@ static int daZraFreeze_IsDelete(daZraFreeze_c* i_this) { } /* 80D44B00-80D44B20 000AC0 0020+00 1/0 0/0 0/0 .text daZraFreeze_Delete__FP13daZraFreeze_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daZraFreeze_Delete(daZraFreeze_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_Delete__FP13daZraFreeze_c.s" +static int daZraFreeze_Delete(daZraFreeze_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80D44B20-80D44B40 000AE0 0020+00 1/0 0/0 0/0 .text daZraFreeze_create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daZraFreeze_create(fopAc_ac_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze/daZraFreeze_create__FP10fopAc_ac_c.s" +static cPhs__Step daZraFreeze_create(fopAc_ac_c* i_this) { + return static_cast(i_this)->Create(); } -#pragma pop /* ############################################################################################## */ /* 80D44BD4-80D44BF4 -00001 0020+00 1/0 0/0 0/0 .data l_daZraFreeze_Method */ -SECTION_DATA static void* l_daZraFreeze_Method[8] = { - (void*)daZraFreeze_create__FP10fopAc_ac_c, - (void*)daZraFreeze_Delete__FP13daZraFreeze_c, - (void*)daZraFreeze_Execute__FP13daZraFreeze_c, - (void*)daZraFreeze_IsDelete__FP13daZraFreeze_c, - (void*)daZraFreeze_Draw__FP13daZraFreeze_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daZraFreeze_Method = { + (process_method_func)daZraFreeze_create, + (process_method_func)daZraFreeze_Delete, + (process_method_func)daZraFreeze_Execute, + (process_method_func)daZraFreeze_IsDelete, + (process_method_func)daZraFreeze_Draw, }; /* 80D44BF4-80D44C24 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_ZRAFREEZE */ -SECTION_DATA extern void* g_profile_OBJ_ZRAFREEZE[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02820000, (void*)&g_fpcLf_Method, - (void*)0x000005E0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01840000, (void*)&l_daZraFreeze_Method, - (void*)0x00044100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_OBJ_ZRAFREEZE, + &g_fpcLf_Method.mBase, + sizeof(daZraFreeze_c), + 0, + 0, + &g_fopAc_Method.base, + 0x184, + &l_daZraFreeze_Method, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, };