From 8293fb7c2293c773381b7aafe8acbb688a9f4112 Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Thu, 14 Dec 2023 18:19:19 -0500 Subject: [PATCH] d_a_obj_zra_rock OK (#2003) --- Progress.md | 8 +- .../CreateHeap__14daObjZraRock_cFv.s | 81 --- .../Create__14daObjZraRock_cFv.s | 83 ---- .../Delete__14daObjZraRock_cFv.s | 29 -- .../Draw__14daObjZraRock_cFv.s | 81 --- .../Execute__14daObjZraRock_cFPPA3_A4_f.s | 23 - .../d_a_obj_zra_rock/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_obj_zra_rock/__dt__12dBgS_ObjAcchFv.s | 30 -- .../daObjZraRock_Delete__FP14daObjZraRock_c.s | 9 - .../daObjZraRock_Draw__FP14daObjZraRock_c.s | 12 - ...daObjZraRock_Execute__FP14daObjZraRock_c.s | 9 - .../daObjZraRock_create__FP10fopAc_ac_c.s | 9 - .../d_a_obj_zra_rock/func_80D450E0.s | 104 ---- .../d_a_obj_zra_rock/func_80D455AC.s | 3 - .../d_a_obj_zra_rock/func_80D455B4.s | 3 - .../setAttnPos__14daObjZraRock_cFv.s | 34 -- .../setBaseMtx__14daObjZraRock_cFv.s | 37 -- .../setEnvTevColor__14daObjZraRock_cFv.s | 24 - .../setRoomNo__14daObjZraRock_cFv.s | 17 - include/d/bg/d_bg_s.h | 2 + .../a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h | 31 +- .../obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp | 461 +++++------------- 22 files changed, 162 insertions(+), 948 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/CreateHeap__14daObjZraRock_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Create__14daObjZraRock_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Delete__14daObjZraRock_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Draw__14daObjZraRock_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Execute__14daObjZraRock_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Delete__FP14daObjZraRock_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Draw__FP14daObjZraRock_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Execute__FP14daObjZraRock_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D450E0.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455AC.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455B4.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setAttnPos__14daObjZraRock_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setBaseMtx__14daObjZraRock_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setEnvTevColor__14daObjZraRock_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setRoomNo__14daObjZraRock_cFv.s diff --git a/Progress.md b/Progress.md index 06adc6ff15b..d300721dbd0 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 42.755539% | 1719060 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 42.755539% | 1719060 | 4020672 -RELs | 35.047152% | 4030536 | 11500324 -Total | 37.043989% | 5749596 | 15520996 +RELs | 35.067151% | 4032836 | 11500324 +Total | 37.058807% | 5751896 | 15520996 ## RELs @@ -684,7 +684,7 @@ d_a_obj_zrTurara | 43.437672% | 3164 | 7284 d_a_obj_zrTuraraRock | 46.299094% | 2452 | 5296 d_a_obj_zraMark | 34.016942% | 3052 | 8972 d_a_obj_zra_freeze | 37.662338% | 1624 | 4312 -d_a_obj_zra_rock | 45.394112% | 1912 | 4212 +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 d_a_peru | 33.139234% | 10244 | 30912 @@ -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.047152% | 4030536 | 11500324 +Total | 35.067151% | 4032836 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/CreateHeap__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/CreateHeap__14daObjZraRock_cFv.s deleted file mode 100644 index 4506a45a128..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/CreateHeap__14daObjZraRock_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80D44FB0: -/* 80D44FB0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D44FB4 7C 08 02 A6 */ mflr r0 -/* 80D44FB8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D44FBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D44FC0 4B 61 D2 1D */ bl _savegpr_29 -/* 80D44FC4 7C 7F 1B 78 */ mr r31, r3 -/* 80D44FC8 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D455F0@ha */ -/* 80D44FCC 38 63 55 F0 */ addi r3, r3, l_arcName@l /* 0x80D455F0@l */ -/* 80D44FD0 80 63 00 00 */ lwz r3, 0(r3) -/* 80D44FD4 38 80 00 06 */ li r4, 6 -/* 80D44FD8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44FDC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44FE0 3F A5 00 02 */ addis r29, r5, 2 -/* 80D44FE4 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80D44FE8 7F A5 EB 78 */ mr r5, r29 -/* 80D44FEC 38 C0 00 80 */ li r6, 0x80 -/* 80D44FF0 4B 2F 72 FD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D44FF4 3C 80 00 08 */ lis r4, 8 -/* 80D44FF8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D44FFC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D45000 4B 2C FC 55 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D45004 90 7F 05 AC */ stw r3, 0x5ac(r31) -/* 80D45008 80 1F 05 AC */ lwz r0, 0x5ac(r31) -/* 80D4500C 28 00 00 00 */ cmplwi r0, 0 -/* 80D45010 40 82 00 0C */ bne lbl_80D4501C -/* 80D45014 38 60 00 00 */ li r3, 0 -/* 80D45018 48 00 00 B0 */ b lbl_80D450C8 -lbl_80D4501C: -/* 80D4501C 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D455F0@ha */ -/* 80D45020 38 63 55 F0 */ addi r3, r3, l_arcName@l /* 0x80D455F0@l */ -/* 80D45024 80 63 00 00 */ lwz r3, 0(r3) -/* 80D45028 38 80 00 05 */ li r4, 5 -/* 80D4502C 7F A5 EB 78 */ mr r5, r29 -/* 80D45030 38 C0 00 80 */ li r6, 0x80 -/* 80D45034 4B 2F 72 B9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D45038 7C 7E 1B 78 */ mr r30, r3 -/* 80D4503C 3C 80 00 08 */ lis r4, 8 -/* 80D45040 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D45044 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D45048 4B 2C FC 0D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D4504C 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80D45050 80 1F 05 A8 */ lwz r0, 0x5a8(r31) -/* 80D45054 28 00 00 00 */ cmplwi r0, 0 -/* 80D45058 40 82 00 0C */ bne lbl_80D45064 -/* 80D4505C 38 60 00 00 */ li r3, 0 -/* 80D45060 48 00 00 68 */ b lbl_80D450C8 -lbl_80D45064: -/* 80D45064 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D455F0@ha */ -/* 80D45068 38 63 55 F0 */ addi r3, r3, l_arcName@l /* 0x80D455F0@l */ -/* 80D4506C 80 63 00 00 */ lwz r3, 0(r3) -/* 80D45070 38 80 00 09 */ li r4, 9 -/* 80D45074 7F A5 EB 78 */ mr r5, r29 -/* 80D45078 38 C0 00 80 */ li r6, 0x80 -/* 80D4507C 4B 2F 72 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D45080 7C 65 1B 78 */ mr r5, r3 -/* 80D45084 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80D45088 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80D4508C 38 C0 00 01 */ li r6, 1 -/* 80D45090 38 E0 00 00 */ li r7, 0 -/* 80D45094 3D 00 80 D4 */ lis r8, lit_3903@ha /* 0x80D455D0@ha */ -/* 80D45098 C0 28 55 D0 */ lfs f1, lit_3903@l(r8) /* 0x80D455D0@l */ -/* 80D4509C 39 00 00 00 */ li r8, 0 -/* 80D450A0 39 20 FF FF */ li r9, -1 -/* 80D450A4 4B 2C 86 69 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80D450A8 2C 03 00 00 */ cmpwi r3, 0 -/* 80D450AC 40 82 00 0C */ bne lbl_80D450B8 -/* 80D450B0 38 60 00 00 */ li r3, 0 -/* 80D450B4 48 00 00 14 */ b lbl_80D450C8 -lbl_80D450B8: -/* 80D450B8 3C 60 80 D4 */ lis r3, lit_3816@ha /* 0x80D455CC@ha */ -/* 80D450BC C0 03 55 CC */ lfs f0, lit_3816@l(r3) /* 0x80D455CC@l */ -/* 80D450C0 D0 1F 05 BC */ stfs f0, 0x5bc(r31) -/* 80D450C4 38 60 00 01 */ li r3, 1 -lbl_80D450C8: -/* 80D450C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D450CC 4B 61 D1 5D */ bl _restgpr_29 -/* 80D450D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D450D4 7C 08 03 A6 */ mtlr r0 -/* 80D450D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D450DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Create__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Create__14daObjZraRock_cFv.s deleted file mode 100644 index 9841600a3ba..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Create__14daObjZraRock_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_80D44E68: -/* 80D44E68 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D44E6C 7C 08 02 A6 */ mflr r0 -/* 80D44E70 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D44E74 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D44E78 7C 7F 1B 78 */ mr r31, r3 -/* 80D44E7C 4B FF FE C1 */ bl setBaseMtx__14daObjZraRock_cFv -/* 80D44E80 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80D44E84 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D44E88 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D44E8C 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80D44E90 80 63 00 04 */ lwz r3, 4(r3) -/* 80D44E94 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80D44E98 80 83 00 00 */ lwz r4, 0(r3) -/* 80D44E9C 7F E3 FB 78 */ mr r3, r31 -/* 80D44EA0 C0 24 00 3C */ lfs f1, 0x3c(r4) -/* 80D44EA4 C0 44 00 40 */ lfs f2, 0x40(r4) -/* 80D44EA8 C0 64 00 44 */ lfs f3, 0x44(r4) -/* 80D44EAC C0 84 00 48 */ lfs f4, 0x48(r4) -/* 80D44EB0 C0 A4 00 4C */ lfs f5, 0x4c(r4) -/* 80D44EB4 C0 C4 00 50 */ lfs f6, 0x50(r4) -/* 80D44EB8 4B 2D 56 91 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80D44EBC 38 7F 07 A0 */ addi r3, r31, 0x7a0 -/* 80D44EC0 3C 80 80 D4 */ lis r4, lit_3816@ha /* 0x80D455CC@ha */ -/* 80D44EC4 C0 24 55 CC */ lfs f1, lit_3816@l(r4) /* 0x80D455CC@l */ -/* 80D44EC8 FC 40 08 90 */ fmr f2, f1 -/* 80D44ECC 4B 33 10 8D */ bl SetWall__12dBgS_AcchCirFff -/* 80D44ED0 38 1F 04 E4 */ addi r0, r31, 0x4e4 -/* 80D44ED4 90 01 00 08 */ stw r0, 8(r1) -/* 80D44ED8 38 7F 05 C8 */ addi r3, r31, 0x5c8 -/* 80D44EDC 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80D44EE0 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 80D44EE4 7F E6 FB 78 */ mr r6, r31 -/* 80D44EE8 38 E0 00 01 */ li r7, 1 -/* 80D44EEC 39 1F 07 A0 */ addi r8, r31, 0x7a0 -/* 80D44EF0 39 3F 04 F8 */ addi r9, r31, 0x4f8 -/* 80D44EF4 39 5F 04 DC */ addi r10, r31, 0x4dc -/* 80D44EF8 4B 33 13 51 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80D44EFC 38 7F 05 C8 */ addi r3, r31, 0x5c8 -/* 80D44F00 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44F04 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44F08 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80D44F0C 4B 33 1B A1 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80D44F10 80 1F 06 A4 */ lwz r0, 0x6a4(r31) -/* 80D44F14 90 1F 07 E0 */ stw r0, 0x7e0(r31) -/* 80D44F18 80 1F 06 A8 */ lwz r0, 0x6a8(r31) -/* 80D44F1C 90 1F 07 E4 */ stw r0, 0x7e4(r31) -/* 80D44F20 80 1F 06 AC */ lwz r0, 0x6ac(r31) -/* 80D44F24 90 1F 07 E8 */ stw r0, 0x7e8(r31) -/* 80D44F28 88 1F 06 B0 */ lbz r0, 0x6b0(r31) -/* 80D44F2C 98 1F 07 EC */ stb r0, 0x7ec(r31) -/* 80D44F30 A0 1F 06 B8 */ lhz r0, 0x6b8(r31) -/* 80D44F34 B0 1F 07 F4 */ sth r0, 0x7f4(r31) -/* 80D44F38 A0 1F 06 BA */ lhz r0, 0x6ba(r31) -/* 80D44F3C B0 1F 07 F6 */ sth r0, 0x7f6(r31) -/* 80D44F40 80 1F 06 BC */ lwz r0, 0x6bc(r31) -/* 80D44F44 90 1F 07 F8 */ stw r0, 0x7f8(r31) -/* 80D44F48 80 1F 06 C0 */ lwz r0, 0x6c0(r31) -/* 80D44F4C 90 1F 07 FC */ stw r0, 0x7fc(r31) -/* 80D44F50 C0 1F 06 C8 */ lfs f0, 0x6c8(r31) -/* 80D44F54 D0 1F 08 04 */ stfs f0, 0x804(r31) -/* 80D44F58 C0 1F 06 CC */ lfs f0, 0x6cc(r31) -/* 80D44F5C D0 1F 08 08 */ stfs f0, 0x808(r31) -/* 80D44F60 C0 1F 06 D0 */ lfs f0, 0x6d0(r31) -/* 80D44F64 D0 1F 08 0C */ stfs f0, 0x80c(r31) -/* 80D44F68 80 1F 06 D4 */ lwz r0, 0x6d4(r31) -/* 80D44F6C 90 1F 08 10 */ stw r0, 0x810(r31) -/* 80D44F70 C0 1F 06 D8 */ lfs f0, 0x6d8(r31) -/* 80D44F74 D0 1F 08 14 */ stfs f0, 0x814(r31) -/* 80D44F78 80 1F 06 DC */ lwz r0, 0x6dc(r31) -/* 80D44F7C 90 1F 08 18 */ stw r0, 0x818(r31) -/* 80D44F80 7F E3 FB 78 */ mr r3, r31 -/* 80D44F84 4B FF FE 49 */ bl setEnvTevColor__14daObjZraRock_cFv -/* 80D44F88 7F E3 FB 78 */ mr r3, r31 -/* 80D44F8C 4B FF FE 9D */ bl setRoomNo__14daObjZraRock_cFv -/* 80D44F90 38 00 00 00 */ li r0, 0 -/* 80D44F94 98 1F 08 1C */ stb r0, 0x81c(r31) -/* 80D44F98 38 60 00 01 */ li r3, 1 -/* 80D44F9C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D44FA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D44FA4 7C 08 03 A6 */ mtlr r0 -/* 80D44FA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D44FAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Delete__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Delete__14daObjZraRock_cFv.s deleted file mode 100644 index 2d56f20f143..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Delete__14daObjZraRock_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80D454AC: -/* 80D454AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D454B0 7C 08 02 A6 */ mflr r0 -/* 80D454B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D454B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D454BC 7C 7F 1B 78 */ mr r31, r3 -/* 80D454C0 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80D454C4 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D455F0@ha */ -/* 80D454C8 38 84 55 F0 */ addi r4, r4, l_arcName@l /* 0x80D455F0@l */ -/* 80D454CC 80 84 00 00 */ lwz r4, 0(r4) -/* 80D454D0 4B 2E 7B 39 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80D454D4 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80D454D8 28 03 00 00 */ cmplwi r3, 0 -/* 80D454DC 41 82 00 24 */ beq lbl_80D45500 -/* 80D454E0 4B 52 2C F5 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80D454E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D454E8 41 82 00 18 */ beq lbl_80D45500 -/* 80D454EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D454F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D454F4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D454F8 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80D454FC 4B 32 ED 55 */ bl Release__4cBgSFP9dBgW_Base -lbl_80D45500: -/* 80D45500 38 60 00 01 */ li r3, 1 -/* 80D45504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D45508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D4550C 7C 08 03 A6 */ mtlr r0 -/* 80D45510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D45514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Draw__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Draw__14daObjZraRock_cFv.s deleted file mode 100644 index fce5b4379b1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Draw__14daObjZraRock_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80D45374: -/* 80D45374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D45378 7C 08 02 A6 */ mflr r0 -/* 80D4537C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D45380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D45384 93 C1 00 08 */ stw r30, 8(r1) -/* 80D45388 7C 7F 1B 78 */ mr r31, r3 -/* 80D4538C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D45390 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D45394 38 80 00 10 */ li r4, 0x10 -/* 80D45398 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D4539C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D453A0 4B 45 E4 25 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D453A4 88 1F 08 1C */ lbz r0, 0x81c(r31) -/* 80D453A8 28 00 00 00 */ cmplwi r0, 0 -/* 80D453AC 41 82 00 8C */ beq lbl_80D45438 -/* 80D453B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D453B4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D453B8 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80D453BC 80 84 00 04 */ lwz r4, 4(r4) -/* 80D453C0 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D453C4 4B 45 F9 DD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D453C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D453CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D453D0 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80D453D4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80D453D8 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80D453DC 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80D453E0 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80D453E4 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80D453E8 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80D453EC 80 83 00 04 */ lwz r4, 4(r3) -/* 80D453F0 C0 3F 05 C0 */ lfs f1, 0x5c0(r31) -/* 80D453F4 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80D453F8 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D453FC 4B 2C 83 AD */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80D45400 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80D45404 4B 2C 88 C1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D45408 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80D4540C 80 63 00 04 */ lwz r3, 4(r3) -/* 80D45410 38 63 00 58 */ addi r3, r3, 0x58 -/* 80D45414 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 80D45418 4B 5E A4 69 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey -/* 80D4541C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D45420 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D45424 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80D45428 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80D4542C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80D45430 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80D45434 48 00 00 5C */ b lbl_80D45490 -lbl_80D45438: -/* 80D45438 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D4543C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D45440 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80D45444 80 84 00 04 */ lwz r4, 4(r4) -/* 80D45448 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80D4544C 4B 45 F9 55 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80D45450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D45454 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D45458 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80D4545C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80D45460 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80D45464 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80D45468 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80D4546C 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80D45470 80 7F 05 AC */ lwz r3, 0x5ac(r31) -/* 80D45474 4B 2C 88 51 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80D45478 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D4547C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D45480 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80D45484 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80D45488 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80D4548C 90 1E 00 4C */ stw r0, 0x4c(r30) -lbl_80D45490: -/* 80D45490 38 60 00 01 */ li r3, 1 -/* 80D45494 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D45498 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D4549C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D454A0 7C 08 03 A6 */ mtlr r0 -/* 80D454A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D454A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Execute__14daObjZraRock_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Execute__14daObjZraRock_cFPPA3_A4_f.s deleted file mode 100644 index 2f52fc2b145..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Execute__14daObjZraRock_cFPPA3_A4_f.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80D4531C: -/* 80D4531C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D45320 7C 08 02 A6 */ mflr r0 -/* 80D45324 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D45328 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D4532C 93 C1 00 08 */ stw r30, 8(r1) -/* 80D45330 7C 7E 1B 78 */ mr r30, r3 -/* 80D45334 7C 9F 23 78 */ mr r31, r4 -/* 80D45338 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80D4533C 4B 2C 80 ED */ bl play__14mDoExt_baseAnmFv -/* 80D45340 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80D45344 90 1F 00 00 */ stw r0, 0(r31) -/* 80D45348 7F C3 F3 78 */ mr r3, r30 -/* 80D4534C 4B FF F9 6D */ bl setAttnPos__14daObjZraRock_cFv -/* 80D45350 7F C3 F3 78 */ mr r3, r30 -/* 80D45354 4B FF F9 E9 */ bl setBaseMtx__14daObjZraRock_cFv -/* 80D45358 38 60 00 01 */ li r3, 1 -/* 80D4535C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D45360 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D45364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D45368 7C 08 03 A6 */ mtlr r0 -/* 80D4536C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D45370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 2b2c81a047e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D452D4: -/* 80D452D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D452D8 7C 08 02 A6 */ mflr r0 -/* 80D452DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D452E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D452E4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D452E8 41 82 00 1C */ beq lbl_80D45304 -/* 80D452EC 3C A0 80 D4 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80D45668@ha */ -/* 80D452F0 38 05 56 68 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80D45668@l */ -/* 80D452F4 90 1F 00 00 */ stw r0, 0(r31) -/* 80D452F8 7C 80 07 35 */ extsh. r0, r4 -/* 80D452FC 40 81 00 08 */ ble lbl_80D45304 -/* 80D45300 4B 58 9A 3D */ bl __dl__FPv -lbl_80D45304: -/* 80D45304 7F E3 FB 78 */ mr r3, r31 -/* 80D45308 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D4530C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D45310 7C 08 03 A6 */ mtlr r0 -/* 80D45314 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D45318 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 600edf4b631..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80D45264: -/* 80D45264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D45268 7C 08 02 A6 */ mflr r0 -/* 80D4526C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D45270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D45274 93 C1 00 08 */ stw r30, 8(r1) -/* 80D45278 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80D4527C 7C 9F 23 78 */ mr r31, r4 -/* 80D45280 41 82 00 38 */ beq lbl_80D452B8 -/* 80D45284 3C 80 80 D4 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80D45644@ha */ -/* 80D45288 38 84 56 44 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80D45644@l */ -/* 80D4528C 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80D45290 38 04 00 0C */ addi r0, r4, 0xc -/* 80D45294 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80D45298 38 04 00 18 */ addi r0, r4, 0x18 -/* 80D4529C 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80D452A0 38 80 00 00 */ li r4, 0 -/* 80D452A4 4B 33 0C F1 */ bl __dt__9dBgS_AcchFv -/* 80D452A8 7F E0 07 35 */ extsh. r0, r31 -/* 80D452AC 40 81 00 0C */ ble lbl_80D452B8 -/* 80D452B0 7F C3 F3 78 */ mr r3, r30 -/* 80D452B4 4B 58 9A 89 */ bl __dl__FPv -lbl_80D452B8: -/* 80D452B8 7F C3 F3 78 */ mr r3, r30 -/* 80D452BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D452C0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D452C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D452C8 7C 08 03 A6 */ mtlr r0 -/* 80D452CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D452D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Delete__FP14daObjZraRock_c.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Delete__FP14daObjZraRock_c.s deleted file mode 100644 index 8225253ef7c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Delete__FP14daObjZraRock_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4556C: -/* 80D4556C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D45570 7C 08 02 A6 */ mflr r0 -/* 80D45574 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D45578 4B 33 33 65 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80D4557C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D45580 7C 08 03 A6 */ mtlr r0 -/* 80D45584 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D45588 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Draw__FP14daObjZraRock_c.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Draw__FP14daObjZraRock_c.s deleted file mode 100644 index d5e885d949d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Draw__FP14daObjZraRock_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80D45518: -/* 80D45518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D4551C 7C 08 02 A6 */ mflr r0 -/* 80D45520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D45524 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80D45528 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80D4552C 7D 89 03 A6 */ mtctr r12 -/* 80D45530 4E 80 04 21 */ bctrl -/* 80D45534 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D45538 7C 08 03 A6 */ mtlr r0 -/* 80D4553C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D45540 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Execute__FP14daObjZraRock_c.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Execute__FP14daObjZraRock_c.s deleted file mode 100644 index 35bede537b5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Execute__FP14daObjZraRock_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D45544: -/* 80D45544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D45548 7C 08 02 A6 */ mflr r0 -/* 80D4554C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D45550 4B 33 34 01 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80D45554 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D45558 7C 08 03 A6 */ mtlr r0 -/* 80D4555C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D45560 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_create__FP10fopAc_ac_c.s deleted file mode 100644 index d64c1fc459e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80D4558C: -/* 80D4558C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D45590 7C 08 02 A6 */ mflr r0 -/* 80D45594 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D45598 4B FF FB 49 */ bl create__14daObjZraRock_cFv -/* 80D4559C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D455A0 7C 08 03 A6 */ mtlr r0 -/* 80D455A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D455A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D450E0.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D450E0.s deleted file mode 100644 index 45e31ed5006..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D450E0.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_80D450E0: -/* 80D450E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D450E4 7C 08 02 A6 */ mflr r0 -/* 80D450E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D450EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D450F0 4B 61 D0 ED */ bl _savegpr_29 -/* 80D450F4 7C 7F 1B 78 */ mr r31, r3 -/* 80D450F8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D450FC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D45100 40 82 00 90 */ bne lbl_80D45190 -/* 80D45104 7F E0 FB 79 */ or. r0, r31, r31 -/* 80D45108 41 82 00 7C */ beq lbl_80D45184 -/* 80D4510C 7C 1E 03 78 */ mr r30, r0 -/* 80D45110 4B 33 35 15 */ bl __ct__16dBgS_MoveBgActorFv -/* 80D45114 3C 60 80 D4 */ lis r3, __vt__14daObjZraRock_c@ha /* 0x80D45674@ha */ -/* 80D45118 38 03 56 74 */ addi r0, r3, __vt__14daObjZraRock_c@l /* 0x80D45674@l */ -/* 80D4511C 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80D45120 3B BE 05 B0 */ addi r29, r30, 0x5b0 -/* 80D45124 3C 60 80 D4 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80D45668@ha */ -/* 80D45128 38 03 56 68 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80D45668@l */ -/* 80D4512C 90 1E 05 B0 */ stw r0, 0x5b0(r30) -/* 80D45130 7F A3 EB 78 */ mr r3, r29 -/* 80D45134 38 80 00 00 */ li r4, 0 -/* 80D45138 4B 5E 32 C5 */ bl init__12J3DFrameCtrlFs -/* 80D4513C 38 00 00 00 */ li r0, 0 -/* 80D45140 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80D45144 3B BE 05 C8 */ addi r29, r30, 0x5c8 -/* 80D45148 7F A3 EB 78 */ mr r3, r29 -/* 80D4514C 4B 33 0F 55 */ bl __ct__9dBgS_AcchFv -/* 80D45150 3C 60 80 D4 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80D45644@ha */ -/* 80D45154 38 63 56 44 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80D45644@l */ -/* 80D45158 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80D4515C 38 03 00 0C */ addi r0, r3, 0xc -/* 80D45160 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80D45164 38 03 00 18 */ addi r0, r3, 0x18 -/* 80D45168 90 1D 00 24 */ stw r0, 0x24(r29) -/* 80D4516C 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80D45170 4B 33 3C F9 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80D45174 38 7E 07 A0 */ addi r3, r30, 0x7a0 -/* 80D45178 4B 33 0D 35 */ bl __ct__12dBgS_AcchCirFv -/* 80D4517C 38 7E 07 E0 */ addi r3, r30, 0x7e0 -/* 80D45180 4B 52 2A 9D */ bl __ct__11cBgS_GndChkFv -lbl_80D45184: -/* 80D45184 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D45188 60 00 00 08 */ ori r0, r0, 8 -/* 80D4518C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D45190: -/* 80D45190 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80D45194 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D455F0@ha */ -/* 80D45198 38 84 55 F0 */ addi r4, r4, l_arcName@l /* 0x80D455F0@l */ -/* 80D4519C 80 84 00 00 */ lwz r4, 0(r4) -/* 80D451A0 4B 2E 7D 1D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D451A4 7C 7E 1B 78 */ mr r30, r3 -/* 80D451A8 2C 1E 00 05 */ cmpwi r30, 5 -/* 80D451AC 41 82 00 0C */ beq lbl_80D451B8 -/* 80D451B0 2C 1E 00 03 */ cmpwi r30, 3 -/* 80D451B4 40 82 00 0C */ bne lbl_80D451C0 -lbl_80D451B8: -/* 80D451B8 38 60 00 05 */ li r3, 5 -/* 80D451BC 48 00 00 90 */ b lbl_80D4524C -lbl_80D451C0: -/* 80D451C0 2C 1E 00 04 */ cmpwi r30, 4 -/* 80D451C4 40 82 00 84 */ bne lbl_80D45248 -/* 80D451C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D451CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D451D0 3C 63 00 02 */ addis r3, r3, 2 -/* 80D451D4 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D455F0@ha */ -/* 80D451D8 38 84 55 F0 */ addi r4, r4, l_arcName@l /* 0x80D455F0@l */ -/* 80D451DC 80 84 00 00 */ lwz r4, 0(r4) -/* 80D451E0 3C A0 80 D4 */ lis r5, d_a_obj_zra_rock__stringBase0@ha /* 0x80D455D4@ha */ -/* 80D451E4 38 A5 55 D4 */ addi r5, r5, d_a_obj_zra_rock__stringBase0@l /* 0x80D455D4@l */ -/* 80D451E8 38 A5 00 0A */ addi r5, r5, 0xa -/* 80D451EC 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80D451F0 4B 2F 74 C9 */ bl getObjectResName2Index__14dRes_control_cFPCcPCc -/* 80D451F4 7C 65 1B 78 */ mr r5, r3 -/* 80D451F8 7F E3 FB 78 */ mr r3, r31 -/* 80D451FC 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D455F0@ha */ -/* 80D45200 38 84 55 F0 */ addi r4, r4, l_arcName@l /* 0x80D455F0@l */ -/* 80D45204 80 84 00 00 */ lwz r4, 0(r4) -/* 80D45208 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075B44@ha */ -/* 80D4520C 38 C6 5B 44 */ addi r6, r6, dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075B44@l */ -/* 80D45210 38 E0 20 50 */ li r7, 0x2050 -/* 80D45214 39 00 00 00 */ li r8, 0 -/* 80D45218 4B 33 35 A5 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80D4521C 7C 7E 1B 78 */ mr r30, r3 -/* 80D45220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D45224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D45228 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D4522C 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 80D45230 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D45234 7C 05 07 74 */ extsb r5, r0 -/* 80D45238 4B 2F 01 29 */ bl isSwitch__10dSv_info_cCFii -/* 80D4523C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D45240 41 82 00 08 */ beq lbl_80D45248 -/* 80D45244 3B C0 00 05 */ li r30, 5 -lbl_80D45248: -/* 80D45248 7F C3 F3 78 */ mr r3, r30 -lbl_80D4524C: -/* 80D4524C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80D45250 4B 61 CF D9 */ bl _restgpr_29 -/* 80D45254 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D45258 7C 08 03 A6 */ mtlr r0 -/* 80D4525C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D45260 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455AC.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455AC.s deleted file mode 100644 index 6e9603977da..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455AC.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80D455AC: -/* 80D455AC 38 63 FF DC */ addi r3, r3, -36 -/* 80D455B0 4B FF FC B4 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455B4.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455B4.s deleted file mode 100644 index 87dd8a5b868..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455B4.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80D455B4: -/* 80D455B4 38 63 FF EC */ addi r3, r3, -20 -/* 80D455B8 4B FF FC AC */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setAttnPos__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setAttnPos__14daObjZraRock_cFv.s deleted file mode 100644 index 8a835369494..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setAttnPos__14daObjZraRock_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80D44CB8: -/* 80D44CB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80D44CBC 7C 08 02 A6 */ mflr r0 -/* 80D44CC0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80D44CC4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80D44CC8 7C 7F 1B 78 */ mr r31, r3 -/* 80D44CCC 3C 60 80 D4 */ lis r3, lit_3814@ha /* 0x80D455C4@ha */ -/* 80D44CD0 38 63 55 C4 */ addi r3, r3, lit_3814@l /* 0x80D455C4@l */ -/* 80D44CD4 C0 03 00 00 */ lfs f0, 0(r3) -/* 80D44CD8 D0 01 00 08 */ stfs f0, 8(r1) -/* 80D44CDC C0 03 00 04 */ lfs f0, 4(r3) -/* 80D44CE0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80D44CE4 C0 03 00 08 */ lfs f0, 8(r3) -/* 80D44CE8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80D44CEC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44CF0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44CF4 A8 9F 04 DC */ lha r4, 0x4dc(r31) -/* 80D44CF8 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80D44CFC A8 DF 04 E0 */ lha r6, 0x4e0(r31) -/* 80D44D00 4B 2C 75 09 */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80D44D04 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44D08 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44D0C 38 81 00 08 */ addi r4, r1, 8 -/* 80D44D10 38 BF 05 50 */ addi r5, r31, 0x550 -/* 80D44D14 4B 60 20 59 */ bl PSMTXMultVec -/* 80D44D18 38 7F 05 50 */ addi r3, r31, 0x550 -/* 80D44D1C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80D44D20 7C 65 1B 78 */ mr r5, r3 -/* 80D44D24 4B 60 23 6D */ bl PSVECAdd -/* 80D44D28 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80D44D2C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80D44D30 7C 08 03 A6 */ mtlr r0 -/* 80D44D34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80D44D38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setBaseMtx__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setBaseMtx__14daObjZraRock_cFv.s deleted file mode 100644 index 149495676c3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setBaseMtx__14daObjZraRock_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80D44D3C: -/* 80D44D3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44D40 7C 08 02 A6 */ mflr r0 -/* 80D44D44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44D48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D44D4C 7C 7F 1B 78 */ mr r31, r3 -/* 80D44D50 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44D54 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44D58 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80D44D5C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80D44D60 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80D44D64 4B 60 1B 85 */ bl PSMTXTrans -/* 80D44D68 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44D6C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44D70 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80D44D74 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80D44D78 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80D44D7C 4B 2C 75 25 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80D44D80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44D84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44D88 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80D44D8C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D44D90 4B 60 17 21 */ bl PSMTXCopy -/* 80D44D94 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44D98 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44D9C 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80D44DA0 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D44DA4 4B 60 17 0D */ bl PSMTXCopy -/* 80D44DA8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D44DAC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D44DB0 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80D44DB4 4B 60 16 FD */ bl PSMTXCopy -/* 80D44DB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D44DBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44DC0 7C 08 03 A6 */ mtlr r0 -/* 80D44DC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44DC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setEnvTevColor__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setEnvTevColor__14daObjZraRock_cFv.s deleted file mode 100644 index f25b8b291f2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setEnvTevColor__14daObjZraRock_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80D44DCC: -/* 80D44DCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44DD0 7C 08 02 A6 */ mflr r0 -/* 80D44DD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44DD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D44DDC 93 C1 00 08 */ stw r30, 8(r1) -/* 80D44DE0 7C 7E 1B 78 */ mr r30, r3 -/* 80D44DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44DEC 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80D44DF0 7F E3 FB 78 */ mr r3, r31 -/* 80D44DF4 38 9E 07 F4 */ addi r4, r30, 0x7f4 -/* 80D44DF8 4B 32 FD F1 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80D44DFC 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 80D44E00 7F E3 FB 78 */ mr r3, r31 -/* 80D44E04 38 9E 07 F4 */ addi r4, r30, 0x7f4 -/* 80D44E08 4B 33 02 F9 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80D44E0C 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 80D44E10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D44E14 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D44E18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44E1C 7C 08 03 A6 */ mtlr r0 -/* 80D44E20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44E24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setRoomNo__14daObjZraRock_cFv.s b/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setRoomNo__14daObjZraRock_cFv.s deleted file mode 100644 index c814ff8762b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setRoomNo__14daObjZraRock_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80D44E28: -/* 80D44E28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D44E2C 7C 08 02 A6 */ mflr r0 -/* 80D44E30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D44E34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D44E38 7C 7F 1B 78 */ mr r31, r3 -/* 80D44E3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D44E40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D44E44 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80D44E48 38 9F 07 F4 */ addi r4, r31, 0x7f4 -/* 80D44E4C 4B 33 02 B5 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80D44E50 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80D44E54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D44E58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D44E5C 7C 08 03 A6 */ mtlr r0 -/* 80D44E60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D44E64 4E 80 00 20 */ blr diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index 2d9e1ccbb98..f96cbe6451a 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -119,6 +119,8 @@ void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2, bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6); +void dBgS_MoveBGProc_Trans(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const& i_poly, + bool param_3, cXyz* i_pos, csXyz* i_angle, csXyz* i_shapeAngle); f32 dBgS_GetNY(cBgS_PolyInfo const& poly); #endif /* D_BG_D_BG_S_H */ diff --git a/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h b/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h index 9b87f7eb520..a601f3ad07a 100644 --- a/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h +++ b/include/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h @@ -1,8 +1,35 @@ #ifndef D_A_OBJ_ZRA_ROCK_H #define D_A_OBJ_ZRA_ROCK_H +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_s_acch.h" #include "d/bg/d_bg_s_movebg_actor.h" -#include "d/com/d_com_inf_game.h" -#include "f_op/f_op_actor_mng.h" + +class daObjZraRock_c : public dBgS_MoveBgActor { +public: + /* 80D44CB8 */ void setAttnPos(); + /* 80D44D3C */ void setBaseMtx(); + /* 80D44DCC */ void setEnvTevColor(); + /* 80D44E28 */ void setRoomNo(); + /* 80D44E68 */ int Create(); + /* 80D44FB0 */ int CreateHeap(); + /* 80D450E0 */ cPhs__Step create(); + /* 80D4531C */ int Execute(Mtx**); + /* 80D45374 */ int Draw(); + /* 80D454AC */ int Delete(); + + void setDemoStart() { mDemoStart = 1; } + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModelXlu; + /* 0x5AC */ J3DModel* mpModelOpa; + /* 0x5B0 */ mDoExt_brkAnm mBrkAnm; + /* 0x5C8 */ dBgS_ObjAcch mObjAcch; + /* 0x7A0 */ dBgS_AcchCir mAcchCir; + /* 0x7E0 */ cBgS_GndChk mGndChk; + /* 0x81C */ bool mDemoStart; +}; + +STATIC_ASSERT(sizeof(daObjZraRock_c) == 0x820); #endif /* D_A_OBJ_ZRA_ROCK_H */ diff --git a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp index 1eab0f36ca6..c687daf683b 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp +++ b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp @@ -1,395 +1,188 @@ /** * d_a_obj_zra_rock.cpp - * + * Zora Rock (Graveyard) */ #include "rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.h" #include "JSystem/JKernel/JKRHeap.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" #include "d/bg/d_bg_w.h" #include "d/d_procname.h" -#include "dol2asm.h" -class daObjZraRock_c : public dBgS_MoveBgActor { -public: - /* 80D44CB8 */ void setAttnPos(); - /* 80D44D3C */ void setBaseMtx(); - /* 80D44DCC */ void setEnvTevColor(); - /* 80D44E28 */ void setRoomNo(); - /* 80D44E68 */ int Create(); - /* 80D44FB0 */ int CreateHeap(); - /* 80D450E0 */ int create(); - /* 80D4531C */ int Execute(Mtx**); - /* 80D45374 */ int Draw(); - /* 80D454AC */ int Delete(); - - void setDemoStart() { mDemoStart = 1; } - - /* 0x5A0 */ request_of_phase_process_class mPhaseReq; - /* 0x5A8 */ J3DModel* mpModel; - /* 0x5AC */ J3DModel* mpModel2; - /* 0x5B0 */ mDoExt_brkAnm mBrkAnm; - /* 0x5C8 */ dBgS_ObjAcch mObjAcch; - /* 0x7A0 */ dBgS_AcchCir mAcchCir; - /* 0x7E0 */ cBgS_GndChk mGndChk; - /* 0x81C */ u8 mDemoStart; -}; // Size: 0x820 - -// -// Forward References: -// - -extern "C" void setAttnPos__14daObjZraRock_cFv(); -extern "C" void setBaseMtx__14daObjZraRock_cFv(); -extern "C" void setEnvTevColor__14daObjZraRock_cFv(); -extern "C" void setRoomNo__14daObjZraRock_cFv(); -extern "C" void Create__14daObjZraRock_cFv(); -extern "C" void CreateHeap__14daObjZraRock_cFv(); -extern "C" void create__14daObjZraRock_cFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void Execute__14daObjZraRock_cFPPA3_A4_f(); -extern "C" void Draw__14daObjZraRock_cFv(); -extern "C" void Delete__14daObjZraRock_cFv(); -extern "C" static void daObjZraRock_Draw__FP14daObjZraRock_c(); -extern "C" static void daObjZraRock_Execute__FP14daObjZraRock_c(); -extern "C" static bool daObjZraRock_IsDelete__FP14daObjZraRock_c(); -extern "C" static void daObjZraRock_Delete__FP14daObjZraRock_c(); -extern "C" static void daObjZraRock_create__FP10fopAc_ac_c(); -extern "C" static void func_80D455AC(); -extern "C" static void func_80D455B4(); -extern "C" extern char const* const d_a_obj_zra_rock__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -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 isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -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 __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D455C4-80D455C8 000000 0004+00 1/1 0/0 0/0 .rodata @3814 */ -SECTION_RODATA static f32 const lit_3814 = 10.0f; -COMPILER_STRIP_GATE(0x80D455C4, &lit_3814); - -/* 80D455C8-80D455CC 000004 0004+00 0/1 0/0 0/0 .rodata @3815 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3815 = 0x43184CCD; -COMPILER_STRIP_GATE(0x80D455C8, &lit_3815); -#pragma pop - -/* 80D455CC-80D455D0 000008 0004+00 2/3 0/0 0/0 .rodata @3816 */ -SECTION_RODATA static u8 const lit_3816[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D455CC, &lit_3816); +/* 80D455F0-80D455F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ +static char const* l_arcName = "H_ZraRock"; /* 80D44CB8-80D44D3C 000078 0084+00 1/1 0/0 0/0 .text setAttnPos__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjZraRock_c::setAttnPos() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setAttnPos__14daObjZraRock_cFv.s" +void daObjZraRock_c::setAttnPos() { + cXyz vec(10.0f, 152.3f, 0.0f); + mDoMtx_stack_c::ZXYrotS(current.angle.x, current.angle.y, current.angle.z); + mDoMtx_stack_c::multVec(&vec, &mAttentionInfo.mPosition); + mAttentionInfo.mPosition += current.pos; } -#pragma pop /* 80D44D3C-80D44DCC 0000FC 0090+00 2/2 0/0 0/0 .text setBaseMtx__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjZraRock_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setBaseMtx__14daObjZraRock_cFv.s" +void daObjZraRock_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); + mpModelOpa->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModelXlu->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop /* 80D44DCC-80D44E28 00018C 005C+00 1/1 0/0 0/0 .text setEnvTevColor__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjZraRock_c::setEnvTevColor() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setEnvTevColor__14daObjZraRock_cFv.s" +void daObjZraRock_c::setEnvTevColor() { + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } -#pragma pop /* 80D44E28-80D44E68 0001E8 0040+00 1/1 0/0 0/0 .text setRoomNo__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjZraRock_c::setRoomNo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/setRoomNo__14daObjZraRock_cFv.s" +void daObjZraRock_c::setRoomNo() { + fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk)); } -#pragma pop /* 80D44E68-80D44FB0 000228 0148+00 1/0 0/0 0/0 .text Create__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjZraRock_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Create__14daObjZraRock_cFv.s" +int daObjZraRock_c::Create() { + setBaseMtx(); + fopAcM_SetMtx(this, mpModelOpa->getBaseTRMtx()); + J3DJoint* joint = mpModelOpa->getModelData()->getJointNodePointer(0); + fopAcM_setCullSizeBox(this, joint->getMin()->x, joint->getMin()->y, joint->getMin()->z, + joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); + mAcchCir.SetWall(0.0f, 0.0f); + mObjAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); + mObjAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mObjAcch.m_gnd; + setEnvTevColor(); + setRoomNo(); + mDemoStart = false; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80D455D0-80D455D4 00000C 0004+00 1/1 0/0 0/0 .rodata @3903 */ -SECTION_RODATA static f32 const lit_3903 = 1.0f; -COMPILER_STRIP_GATE(0x80D455D0, &lit_3903); - -/* 80D455F0-80D455F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -static char* l_arcName = "H_ZraRock"; /* 80D44FB0-80D450E0 000370 0130+00 1/0 0/0 0/0 .text CreateHeap__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjZraRock_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/CreateHeap__14daObjZraRock_cFv.s" +int daObjZraRock_c::CreateHeap() { + J3DModelData* model_data_opa = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); + mpModelOpa = mDoExt_J3DModel__create(model_data_opa, 0x80000, 0x11000084); + if (mpModelOpa == NULL) { + return 0; + } + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + mpModelXlu = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpModelXlu == NULL) { + return 0; + } + J3DAnmTevRegKey* tev_reg_anm = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 9); + if (!mBrkAnm.init(model_data, tev_reg_anm, 1, 0, 1.0f, 0, -1)) { + return 0; + } + mBrkAnm.setPlaySpeed(0.0f); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80D455D4-80D455D4 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D455DE = "H_ZoraRock.dzb"; -#pragma pop - -/* 80D455F4-80D45614 -00001 0020+00 1/0 0/0 0/0 .data l_daObjZraRock_Method */ -SECTION_DATA static void* l_daObjZraRock_Method[8] = { - (void*)daObjZraRock_create__FP10fopAc_ac_c, - (void*)daObjZraRock_Delete__FP14daObjZraRock_c, - (void*)daObjZraRock_Execute__FP14daObjZraRock_c, - (void*)daObjZraRock_IsDelete__FP14daObjZraRock_c, - (void*)daObjZraRock_Draw__FP14daObjZraRock_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80D45614-80D45644 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ZraRock */ -SECTION_DATA extern void* g_profile_Obj_ZraRock[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00880000, (void*)&g_fpcLf_Method, - (void*)0x00000820, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02600000, (void*)&l_daObjZraRock_Method, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 80D45644-80D45668 000054 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_80D455B4, - (void*)NULL, - (void*)NULL, - (void*)func_80D455AC, -}; - -/* 80D45668-80D45674 000078 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80D45674-80D4569C 000084 0028+00 1/1 0/0 0/0 .data __vt__14daObjZraRock_c */ -SECTION_DATA extern void* __vt__14daObjZraRock_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daObjZraRock_cFv, - (void*)Create__14daObjZraRock_cFv, - (void*)Execute__14daObjZraRock_cFPPA3_A4_f, - (void*)Draw__14daObjZraRock_cFv, - (void*)Delete__14daObjZraRock_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80D450E0-80D45264 0004A0 0184+00 1/1 0/0 0/0 .text create__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjZraRock_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D450E0.s" +cPhs__Step daObjZraRock_c::create() { + fopAcM_SetupActor(this, daObjZraRock_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName); + if (step == cPhs_ERROR_e || step == cPhs_UNK3_e) { + return cPhs_ERROR_e; + } else if (step == cPhs_COMPLEATE_e) { + int dzb_id = dComIfG_getObjctResName2Index(l_arcName, "H_ZoraRock.dzb"); + step = (cPhs__Step)MoveBGCreate(l_arcName, dzb_id, dBgS_MoveBGProc_Trans, 0x2050, NULL); + if (dComIfGs_isSwitch((fopAcM_GetParam(this) >> 8) & 0xff, fopAcM_GetRoomNo(this))) { + step = cPhs_ERROR_e; + } + } + return step; } -#pragma pop - -/* 80D45264-80D452D4 000624 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// dBgS_ObjAcch::~dBgS_ObjAcch() -extern "C" asm void __dt__12dBgS_ObjAcchFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80D452D4-80D4531C 000694 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// J3DFrameCtrl::~J3DFrameCtrl() -extern "C" asm void __dt__12J3DFrameCtrlFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop /* 80D4531C-80D45374 0006DC 0058+00 1/0 0/0 0/0 .text Execute__14daObjZraRock_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjZraRock_c::Execute(Mtx** i_mtx) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Execute__14daObjZraRock_cFPPA3_A4_f.s" +int daObjZraRock_c::Execute(Mtx** i_mtx) { + mBrkAnm.play(); + *i_mtx = &mBgMtx; + setAttnPos(); + setBaseMtx(); + return 1; } -#pragma pop /* 80D45374-80D454AC 000734 0138+00 1/0 0/0 0/0 .text Draw__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjZraRock_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Draw__14daObjZraRock_cFv.s" +int daObjZraRock_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + if (mDemoStart) { + g_env_light.setLightTevColorType_MAJI(mpModelXlu->mModelData, &mTevStr); + dComIfGd_setListBG(); + mBrkAnm.entry(mpModelXlu->getModelData()); + mDoExt_modelUpdateDL(mpModelXlu); + mBrkAnm.remove(mpModelXlu->getModelData()); + dComIfGd_setList(); + } else { + g_env_light.setLightTevColorType_MAJI(mpModelOpa->mModelData, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModelOpa); + dComIfGd_setList(); + } + return 1; } -#pragma pop /* 80D454AC-80D45518 00086C 006C+00 1/0 0/0 0/0 .text Delete__14daObjZraRock_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjZraRock_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/Delete__14daObjZraRock_cFv.s" +int daObjZraRock_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName); + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + return 1; } -#pragma pop /* 80D45518-80D45544 0008D8 002C+00 1/0 0/0 0/0 .text daObjZraRock_Draw__FP14daObjZraRock_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjZraRock_Draw(daObjZraRock_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Draw__FP14daObjZraRock_c.s" +static int daObjZraRock_Draw(daObjZraRock_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80D45544-80D45564 000904 0020+00 1/0 0/0 0/0 .text daObjZraRock_Execute__FP14daObjZraRock_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjZraRock_Execute(daObjZraRock_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Execute__FP14daObjZraRock_c.s" +static int daObjZraRock_Execute(daObjZraRock_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80D45564-80D4556C 000924 0008+00 1/0 0/0 0/0 .text daObjZraRock_IsDelete__FP14daObjZraRock_c */ -static int daObjZraRock_IsDelete(daObjZraRock_c* i_this) { +static int daObjZraRock_IsDelete(daObjZraRock_c* param_0) { return 1; } /* 80D4556C-80D4558C 00092C 0020+00 1/0 0/0 0/0 .text daObjZraRock_Delete__FP14daObjZraRock_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjZraRock_Delete(daObjZraRock_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_Delete__FP14daObjZraRock_c.s" +static int daObjZraRock_Delete(daObjZraRock_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80D4558C-80D455AC 00094C 0020+00 1/0 0/0 0/0 .text daObjZraRock_create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjZraRock_create(fopAc_ac_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/daObjZraRock_create__FP10fopAc_ac_c.s" +static cPhs__Step daObjZraRock_create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80D455AC-80D455B4 00096C 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_80D455AC() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455AC.s" -} -#pragma pop +/* 80D455F4-80D45614 -00001 0020+00 1/0 0/0 0/0 .data l_daObjZraRock_Method */ +static actor_method_class l_daObjZraRock_Method = { + (process_method_func)daObjZraRock_create, + (process_method_func)daObjZraRock_Delete, + (process_method_func)daObjZraRock_Execute, + (process_method_func)daObjZraRock_IsDelete, + (process_method_func)daObjZraRock_Draw, -/* 80D455B4-80D455BC 000974 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_80D455B4() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock/func_80D455B4.s" -} -#pragma pop +}; -/* 80D455D4-80D455D4 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80D45614-80D45644 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_ZraRock */ +extern actor_process_profile_definition g_profile_Obj_ZraRock = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_Obj_ZraRock, + &g_fpcLf_Method.mBase, + sizeof(daObjZraRock_c), + 0, + 0, + &g_fopAc_Method.base, + 0x260, + &l_daObjZraRock_Method, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +};