From 28fb711606c72bacbf625a97e7046d4ea72a7c44 Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Sun, 3 Dec 2023 07:01:37 -0500 Subject: [PATCH] d_a_obj_grave_stone OK (#1999) --- Progress.md | 8 +- .../CreateHeap__14daGraveStone_cFv.s | 31 - .../Create__14daGraveStone_cFv.s | 117 --- .../Delete__14daGraveStone_cFv.s | 29 - .../Draw__14daGraveStone_cFv.s | 42 - .../Execute__14daGraveStone_cFPPA3_A4_f.s | 19 - .../__dt__12dBgS_ObjAcchFv.s | 30 - .../d_a_obj_grave_stone/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_grave_stone/__dt__8cM3dGCylFv.s | 20 - ...GraveStone_c24daObj_GrvStn_prtclMngr_cFv.s | 17 - .../daGraveStone_Delete__FP14daGraveStone_c.s | 9 - .../daGraveStone_Draw__FP14daGraveStone_c.s | 12 - ...daGraveStone_Execute__FP14daGraveStone_c.s | 9 - .../daGraveStone_create__FP10fopAc_ac_c.s | 9 - .../d_a_obj_grave_stone/func_80C12D1C.s | 122 --- .../d_a_obj_grave_stone/func_80C1321C.s | 9 - .../d_a_obj_grave_stone/func_80C13238.s | 3 - .../d_a_obj_grave_stone/func_80C13240.s | 3 - .../moveCalc__14daGraveStone_cFv.s | 176 ---- .../setBaseMtx__14daGraveStone_cFv.s | 30 - .../setEnvTevColor__14daGraveStone_cFv.s | 24 - .../setPrtcl__14daGraveStone_cFv.s | 79 -- .../setRoomNo__14daGraveStone_cFv.s | 18 - include/d/particle/d_particle_copoly.h | 37 +- .../d_a_obj_grave_stone/d_a_obj_grave_stone.h | 48 +- .../d_a_obj_grave_stone.cpp | 815 +++++------------- src/d/particle/d_particle_copoly.cpp | 52 -- 27 files changed, 282 insertions(+), 1506 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/CreateHeap__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Create__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Delete__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Draw__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Execute__14daGraveStone_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Delete__FP14daGraveStone_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Draw__FP14daGraveStone_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Execute__FP14daGraveStone_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C12D1C.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C1321C.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13238.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13240.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/moveCalc__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setBaseMtx__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setEnvTevColor__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setPrtcl__14daGraveStone_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setRoomNo__14daGraveStone_cFv.s diff --git a/Progress.md b/Progress.md index 2218cfbdf9d..6cf0f7b523c 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 42.343170% | 1702480 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 42.343170% | 1702480 | 4020672 -RELs | 35.018666% | 4027260 | 11500324 -Total | 36.916059% | 5729740 | 15520996 +RELs | 35.045969% | 4030400 | 11500324 +Total | 36.936289% | 5732880 | 15520996 ## RELs @@ -423,7 +423,7 @@ d_a_obj_gpTaru | 33.238231% | 4660 | 14020 d_a_obj_gra2 | 24.809250% | 21200 | 85452 d_a_obj_graWall | 55.725191% | 1168 | 2096 d_a_obj_gra_rock | 37.947123% | 2928 | 7716 -d_a_obj_grave_stone | 42.700730% | 2340 | 5480 +d_a_obj_grave_stone | 100.000000% | 5480 | 5480 d_a_obj_groundwater | 40.823478% | 3728 | 9132 d_a_obj_grz_rock | 45.558087% | 1600 | 3512 d_a_obj_h_saku | 37.610063% | 2392 | 6360 @@ -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.018666% | 4027260 | 11500324 +Total | 35.045969% | 4030400 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/CreateHeap__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/CreateHeap__14daGraveStone_cFv.s deleted file mode 100644 index f88530da710..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/CreateHeap__14daGraveStone_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80C12CA4: -/* 80C12CA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C12CA8 7C 08 02 A6 */ mflr r0 -/* 80C12CAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12CB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12CB4 7C 7F 1B 78 */ mr r31, r3 -/* 80C12CB8 3C 60 80 C1 */ lis r3, l_arcName@ha /* 0x80C13304@ha */ -/* 80C12CBC 38 63 33 04 */ addi r3, r3, l_arcName@l /* 0x80C13304@l */ -/* 80C12CC0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C12CC4 3C 80 80 C1 */ lis r4, d_a_obj_grave_stone__stringBase0@ha /* 0x80C132E4@ha */ -/* 80C12CC8 38 84 32 E4 */ addi r4, r4, d_a_obj_grave_stone__stringBase0@l /* 0x80C132E4@l */ -/* 80C12CCC 38 84 00 07 */ addi r4, r4, 7 -/* 80C12CD0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C12CD4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C12CD8 3C A5 00 02 */ addis r5, r5, 2 -/* 80C12CDC 38 C0 00 80 */ li r6, 0x80 -/* 80C12CE0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C12CE4 4B 42 96 99 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80C12CE8 3C 80 00 08 */ lis r4, 8 -/* 80C12CEC 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C12CF0 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C12CF4 4B 40 1F 61 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C12CF8 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C12CFC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C12D00 30 03 FF FF */ addic r0, r3, -1 -/* 80C12D04 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C12D08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C12D0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C12D10 7C 08 03 A6 */ mtlr r0 -/* 80C12D14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C12D18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Create__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Create__14daGraveStone_cFv.s deleted file mode 100644 index 519d97b9ee5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Create__14daGraveStone_cFv.s +++ /dev/null @@ -1,117 +0,0 @@ -lbl_80C12AD8: -/* 80C12AD8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C12ADC 7C 08 02 A6 */ mflr r0 -/* 80C12AE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C12AE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C12AE8 4B 74 F6 F1 */ bl _savegpr_28 -/* 80C12AEC 7C 7F 1B 78 */ mr r31, r3 -/* 80C12AF0 4B FF FB 09 */ bl setBaseMtx__14daGraveStone_cFv -/* 80C12AF4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C12AF8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C12AFC 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C12B00 38 7F 07 C0 */ addi r3, r31, 0x7c0 -/* 80C12B04 3C 80 80 C1 */ lis r4, lit_3717@ha /* 0x80C132C4@ha */ -/* 80C12B08 C0 24 32 C4 */ lfs f1, lit_3717@l(r4) /* 0x80C132C4@l */ -/* 80C12B0C FC 40 08 90 */ fmr f2, f1 -/* 80C12B10 4B 46 34 49 */ bl SetWall__12dBgS_AcchCirFff -/* 80C12B14 38 1F 04 E4 */ addi r0, r31, 0x4e4 -/* 80C12B18 90 01 00 08 */ stw r0, 8(r1) -/* 80C12B1C 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80C12B20 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C12B24 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 80C12B28 7F E6 FB 78 */ mr r6, r31 -/* 80C12B2C 38 E0 00 01 */ li r7, 1 -/* 80C12B30 39 1F 07 C0 */ addi r8, r31, 0x7c0 -/* 80C12B34 39 3F 04 F8 */ addi r9, r31, 0x4f8 -/* 80C12B38 39 5F 04 DC */ addi r10, r31, 0x4dc -/* 80C12B3C 4B 46 37 0D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80C12B40 38 7F 07 84 */ addi r3, r31, 0x784 -/* 80C12B44 38 80 00 FF */ li r4, 0xff -/* 80C12B48 38 A0 00 00 */ li r5, 0 -/* 80C12B4C 7F E6 FB 78 */ mr r6, r31 -/* 80C12B50 4B 47 0D 11 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C12B54 38 7F 08 00 */ addi r3, r31, 0x800 -/* 80C12B58 3C 80 80 C1 */ lis r4, mCcDCyl__14daGraveStone_c@ha /* 0x80C13280@ha */ -/* 80C12B5C 38 84 32 80 */ addi r4, r4, mCcDCyl__14daGraveStone_c@l /* 0x80C13280@l */ -/* 80C12B60 4B 47 1D 55 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C12B64 38 1F 07 84 */ addi r0, r31, 0x784 -/* 80C12B68 90 1F 08 44 */ stw r0, 0x844(r31) -/* 80C12B6C 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 80C12B70 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C12B74 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C12B78 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80C12B7C 4B 46 3F 31 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80C12B80 80 1F 06 88 */ lwz r0, 0x688(r31) -/* 80C12B84 90 1F 09 3C */ stw r0, 0x93c(r31) -/* 80C12B88 80 1F 06 8C */ lwz r0, 0x68c(r31) -/* 80C12B8C 90 1F 09 40 */ stw r0, 0x940(r31) -/* 80C12B90 80 1F 06 90 */ lwz r0, 0x690(r31) -/* 80C12B94 90 1F 09 44 */ stw r0, 0x944(r31) -/* 80C12B98 88 1F 06 94 */ lbz r0, 0x694(r31) -/* 80C12B9C 98 1F 09 48 */ stb r0, 0x948(r31) -/* 80C12BA0 A0 1F 06 9C */ lhz r0, 0x69c(r31) -/* 80C12BA4 B0 1F 09 50 */ sth r0, 0x950(r31) -/* 80C12BA8 A0 1F 06 9E */ lhz r0, 0x69e(r31) -/* 80C12BAC B0 1F 09 52 */ sth r0, 0x952(r31) -/* 80C12BB0 80 1F 06 A0 */ lwz r0, 0x6a0(r31) -/* 80C12BB4 90 1F 09 54 */ stw r0, 0x954(r31) -/* 80C12BB8 80 1F 06 A4 */ lwz r0, 0x6a4(r31) -/* 80C12BBC 90 1F 09 58 */ stw r0, 0x958(r31) -/* 80C12BC0 C0 1F 06 AC */ lfs f0, 0x6ac(r31) -/* 80C12BC4 D0 1F 09 60 */ stfs f0, 0x960(r31) -/* 80C12BC8 C0 1F 06 B0 */ lfs f0, 0x6b0(r31) -/* 80C12BCC D0 1F 09 64 */ stfs f0, 0x964(r31) -/* 80C12BD0 C0 1F 06 B4 */ lfs f0, 0x6b4(r31) -/* 80C12BD4 D0 1F 09 68 */ stfs f0, 0x968(r31) -/* 80C12BD8 80 1F 06 B8 */ lwz r0, 0x6b8(r31) -/* 80C12BDC 90 1F 09 6C */ stw r0, 0x96c(r31) -/* 80C12BE0 C0 1F 06 BC */ lfs f0, 0x6bc(r31) -/* 80C12BE4 D0 1F 09 70 */ stfs f0, 0x970(r31) -/* 80C12BE8 80 1F 06 C0 */ lwz r0, 0x6c0(r31) -/* 80C12BEC 90 1F 09 74 */ stw r0, 0x974(r31) -/* 80C12BF0 7F E3 FB 78 */ mr r3, r31 -/* 80C12BF4 4B FF FE 45 */ bl setEnvTevColor__14daGraveStone_cFv -/* 80C12BF8 7F E3 FB 78 */ mr r3, r31 -/* 80C12BFC 4B FF FE 99 */ bl setRoomNo__14daGraveStone_cFv -/* 80C12C00 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80C12C04 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 80C12C08 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80C12C0C D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80C12C10 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80C12C14 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 80C12C18 3B 80 00 00 */ li r28, 0 -/* 80C12C1C 3B C0 00 00 */ li r30, 0 -/* 80C12C20 3C 60 80 C1 */ lis r3, lit_3717@ha /* 0x80C132C4@ha */ -/* 80C12C24 3B A3 32 C4 */ addi r29, r3, lit_3717@l /* 0x80C132C4@l */ -lbl_80C12C28: -/* 80C12C28 38 7E 09 9C */ addi r3, r30, 0x99c -/* 80C12C2C 7C 7F 1A 14 */ add r3, r31, r3 -/* 80C12C30 38 9F 05 AC */ addi r4, r31, 0x5ac -/* 80C12C34 C0 3D 00 00 */ lfs f1, 0(r29) -/* 80C12C38 FC 40 08 90 */ fmr f2, f1 -/* 80C12C3C 4B 43 E0 61 */ bl init__7dPaPo_cFP9dBgS_Acchff -/* 80C12C40 3B 9C 00 01 */ addi r28, r28, 1 -/* 80C12C44 2C 1C 00 04 */ cmpwi r28, 4 -/* 80C12C48 3B DE 00 5C */ addi r30, r30, 0x5c -/* 80C12C4C 41 80 FF DC */ blt lbl_80C12C28 -/* 80C12C50 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C12C54 80 63 00 04 */ lwz r3, 4(r3) -/* 80C12C58 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80C12C5C 80 83 00 00 */ lwz r4, 0(r3) -/* 80C12C60 7F E3 FB 78 */ mr r3, r31 -/* 80C12C64 C0 24 00 3C */ lfs f1, 0x3c(r4) -/* 80C12C68 C0 44 00 40 */ lfs f2, 0x40(r4) -/* 80C12C6C C0 64 00 44 */ lfs f3, 0x44(r4) -/* 80C12C70 C0 84 00 48 */ lfs f4, 0x48(r4) -/* 80C12C74 C0 A4 00 4C */ lfs f5, 0x4c(r4) -/* 80C12C78 C0 C4 00 50 */ lfs f6, 0x50(r4) -/* 80C12C7C 4B 40 78 CD */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80C12C80 38 00 00 00 */ li r0, 0 -/* 80C12C84 B0 1F 0A E8 */ sth r0, 0xae8(r31) -/* 80C12C88 38 60 00 01 */ li r3, 1 -/* 80C12C8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C12C90 4B 74 F5 95 */ bl _restgpr_28 -/* 80C12C94 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C12C98 7C 08 03 A6 */ mtlr r0 -/* 80C12C9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C12CA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Delete__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Delete__14daGraveStone_cFv.s deleted file mode 100644 index 313323690f0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Delete__14daGraveStone_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80C1311C: -/* 80C1311C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C13120 7C 08 02 A6 */ mflr r0 -/* 80C13124 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C13128 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1312C 7C 7F 1B 78 */ mr r31, r3 -/* 80C13130 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C13134 3C 80 80 C1 */ lis r4, l_arcName@ha /* 0x80C13304@ha */ -/* 80C13138 38 84 33 04 */ addi r4, r4, l_arcName@l /* 0x80C13304@l */ -/* 80C1313C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C13140 4B 41 9E C9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C13144 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C13148 28 03 00 00 */ cmplwi r3, 0 -/* 80C1314C 41 82 00 24 */ beq lbl_80C13170 -/* 80C13150 4B 65 50 85 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C13154 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C13158 41 82 00 18 */ beq lbl_80C13170 -/* 80C1315C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C13160 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C13164 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C13168 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C1316C 4B 46 10 E5 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C13170: -/* 80C13170 38 60 00 01 */ li r3, 1 -/* 80C13174 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C13178 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1317C 7C 08 03 A6 */ mtlr r0 -/* 80C13180 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C13184 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Draw__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Draw__14daGraveStone_cFv.s deleted file mode 100644 index 6e8a34d2d32..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Draw__14daGraveStone_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C13078: -/* 80C13078 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1307C 7C 08 02 A6 */ mflr r0 -/* 80C13080 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C13084 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C13088 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1308C 7C 7E 1B 78 */ mr r30, r3 -/* 80C13090 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C13094 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C13098 38 80 00 10 */ li r4, 0x10 -/* 80C1309C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C130A0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C130A4 4B 59 07 21 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C130A8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C130AC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C130B0 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80C130B4 80 84 00 04 */ lwz r4, 4(r4) -/* 80C130B8 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C130BC 4B 59 1C E5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C130C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C130C4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C130C8 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C130CC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C130D0 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C130D4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C130D8 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C130DC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C130E0 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C130E4 4B 3F AB E1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C130E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C130EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C130F0 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C130F4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C130F8 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C130FC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C13100 38 60 00 01 */ li r3, 1 -/* 80C13104 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C13108 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1310C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C13110 7C 08 03 A6 */ mtlr r0 -/* 80C13114 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C13118 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Execute__14daGraveStone_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Execute__14daGraveStone_cFPPA3_A4_f.s deleted file mode 100644 index 0abfa187c9c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Execute__14daGraveStone_cFPPA3_A4_f.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80C13030: -/* 80C13030 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C13034 7C 08 02 A6 */ mflr r0 -/* 80C13038 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1303C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C13040 7C 7F 1B 78 */ mr r31, r3 -/* 80C13044 38 1F 05 6C */ addi r0, r31, 0x56c -/* 80C13048 90 04 00 00 */ stw r0, 0(r4) -/* 80C1304C 4B FF F6 21 */ bl moveCalc__14daGraveStone_cFv -/* 80C13050 7F E3 FB 78 */ mr r3, r31 -/* 80C13054 4B FF F5 A5 */ bl setBaseMtx__14daGraveStone_cFv -/* 80C13058 7F E3 FB 78 */ mr r3, r31 -/* 80C1305C 4B FF F8 BD */ bl setPrtcl__14daGraveStone_cFv -/* 80C13060 38 60 00 01 */ li r3, 1 -/* 80C13064 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C13068 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1306C 7C 08 03 A6 */ mtlr r0 -/* 80C13070 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C13074 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index e999281a166..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C12FC0: -/* 80C12FC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C12FC4 7C 08 02 A6 */ mflr r0 -/* 80C12FC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12FCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12FD0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C12FD4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C12FD8 7C 9F 23 78 */ mr r31, r4 -/* 80C12FDC 41 82 00 38 */ beq lbl_80C13014 -/* 80C12FE0 3C 80 80 C1 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80C13370@ha */ -/* 80C12FE4 38 84 33 70 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80C13370@l */ -/* 80C12FE8 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80C12FEC 38 04 00 0C */ addi r0, r4, 0xc -/* 80C12FF0 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80C12FF4 38 04 00 18 */ addi r0, r4, 0x18 -/* 80C12FF8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80C12FFC 38 80 00 00 */ li r4, 0 -/* 80C13000 4B 46 2F 95 */ bl __dt__9dBgS_AcchFv -/* 80C13004 7F E0 07 35 */ extsh. r0, r31 -/* 80C13008 40 81 00 0C */ ble lbl_80C13014 -/* 80C1300C 7F C3 F3 78 */ mr r3, r30 -/* 80C13010 4B 6B BD 2D */ bl __dl__FPv -lbl_80C13014: -/* 80C13014 7F C3 F3 78 */ mr r3, r30 -/* 80C13018 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1301C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C13020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C13024 7C 08 03 A6 */ mtlr r0 -/* 80C13028 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1302C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGAabFv.s deleted file mode 100644 index 16a6046bc02..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C12F78: -/* 80C12F78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C12F7C 7C 08 02 A6 */ mflr r0 -/* 80C12F80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12F84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12F88 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C12F8C 41 82 00 1C */ beq lbl_80C12FA8 -/* 80C12F90 3C A0 80 C1 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C13364@ha */ -/* 80C12F94 38 05 33 64 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C13364@l */ -/* 80C12F98 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C12F9C 7C 80 07 35 */ extsh. r0, r4 -/* 80C12FA0 40 81 00 08 */ ble lbl_80C12FA8 -/* 80C12FA4 4B 6B BD 99 */ bl __dl__FPv -lbl_80C12FA8: -/* 80C12FA8 7F E3 FB 78 */ mr r3, r31 -/* 80C12FAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C12FB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C12FB4 7C 08 03 A6 */ mtlr r0 -/* 80C12FB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C12FBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGCylFv.s deleted file mode 100644 index dbf08258a44..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C12F30: -/* 80C12F30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C12F34 7C 08 02 A6 */ mflr r0 -/* 80C12F38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12F3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12F40 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C12F44 41 82 00 1C */ beq lbl_80C12F60 -/* 80C12F48 3C A0 80 C1 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C13358@ha */ -/* 80C12F4C 38 05 33 58 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C13358@l */ -/* 80C12F50 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C12F54 7C 80 07 35 */ extsh. r0, r4 -/* 80C12F58 40 81 00 08 */ ble lbl_80C12F60 -/* 80C12F5C 4B 6B BD E1 */ bl __dl__FPv -lbl_80C12F60: -/* 80C12F60 7F E3 FB 78 */ mr r3, r31 -/* 80C12F64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C12F68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C12F6C 7C 08 03 A6 */ mtlr r0 -/* 80C12F70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C12F74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv.s deleted file mode 100644 index 8398d1d7561..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C12EF0: -/* 80C12EF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C12EF4 7C 08 02 A6 */ mflr r0 -/* 80C12EF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12EFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12F00 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C12F04 41 82 00 10 */ beq lbl_80C12F14 -/* 80C12F08 7C 80 07 35 */ extsh. r0, r4 -/* 80C12F0C 40 81 00 08 */ ble lbl_80C12F14 -/* 80C12F10 4B 6B BE 2D */ bl __dl__FPv -lbl_80C12F14: -/* 80C12F14 7F E3 FB 78 */ mr r3, r31 -/* 80C12F18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C12F1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C12F20 7C 08 03 A6 */ mtlr r0 -/* 80C12F24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C12F28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Delete__FP14daGraveStone_c.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Delete__FP14daGraveStone_c.s deleted file mode 100644 index 0bd4d130e52..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Delete__FP14daGraveStone_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C131DC: -/* 80C131DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C131E0 7C 08 02 A6 */ mflr r0 -/* 80C131E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C131E8 4B 46 56 F5 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C131EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C131F0 7C 08 03 A6 */ mtlr r0 -/* 80C131F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C131F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Draw__FP14daGraveStone_c.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Draw__FP14daGraveStone_c.s deleted file mode 100644 index 91bf74d82de..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Draw__FP14daGraveStone_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C13188: -/* 80C13188 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1318C 7C 08 02 A6 */ mflr r0 -/* 80C13190 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C13194 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C13198 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C1319C 7D 89 03 A6 */ mtctr r12 -/* 80C131A0 4E 80 04 21 */ bctrl -/* 80C131A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C131A8 7C 08 03 A6 */ mtlr r0 -/* 80C131AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C131B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Execute__FP14daGraveStone_c.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Execute__FP14daGraveStone_c.s deleted file mode 100644 index 42caaa83ccb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Execute__FP14daGraveStone_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C131B4: -/* 80C131B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C131B8 7C 08 02 A6 */ mflr r0 -/* 80C131BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C131C0 4B 46 57 91 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C131C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C131C8 7C 08 03 A6 */ mtlr r0 -/* 80C131CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C131D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_create__FP10fopAc_ac_c.s deleted file mode 100644 index 5ad92f4e751..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C131FC: -/* 80C131FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C13200 7C 08 02 A6 */ mflr r0 -/* 80C13204 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C13208 4B FF FB 15 */ bl create__14daGraveStone_cFv -/* 80C1320C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C13210 7C 08 03 A6 */ mtlr r0 -/* 80C13214 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C13218 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C12D1C.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C12D1C.s deleted file mode 100644 index f55ae557e8b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C12D1C.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_80C12D1C: -/* 80C12D1C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C12D20 7C 08 02 A6 */ mflr r0 -/* 80C12D24 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C12D28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C12D2C 4B 74 F4 B1 */ bl _savegpr_29 -/* 80C12D30 7C 7F 1B 78 */ mr r31, r3 -/* 80C12D34 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C12D38 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C12D3C 40 82 01 14 */ bne lbl_80C12E50 -/* 80C12D40 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C12D44 41 82 01 00 */ beq lbl_80C12E44 -/* 80C12D48 7C 1E 03 78 */ mr r30, r0 -/* 80C12D4C 4B 46 58 D9 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C12D50 3C 60 80 C1 */ lis r3, __vt__14daGraveStone_c@ha /* 0x80C13394@ha */ -/* 80C12D54 38 03 33 94 */ addi r0, r3, __vt__14daGraveStone_c@l /* 0x80C13394@l */ -/* 80C12D58 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C12D5C 3B BE 05 AC */ addi r29, r30, 0x5ac -/* 80C12D60 7F A3 EB 78 */ mr r3, r29 -/* 80C12D64 4B 46 33 3D */ bl __ct__9dBgS_AcchFv -/* 80C12D68 3C 60 80 C1 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80C13370@ha */ -/* 80C12D6C 38 63 33 70 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80C13370@l */ -/* 80C12D70 90 7D 00 10 */ stw r3, 0x10(r29) -/* 80C12D74 38 03 00 0C */ addi r0, r3, 0xc -/* 80C12D78 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80C12D7C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80C12D80 90 1D 00 24 */ stw r0, 0x24(r29) -/* 80C12D84 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80C12D88 4B 46 60 E1 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80C12D8C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C12D90 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C12D94 90 1E 07 9C */ stw r0, 0x79c(r30) -/* 80C12D98 38 7E 07 A0 */ addi r3, r30, 0x7a0 -/* 80C12D9C 4B 47 09 C5 */ bl __ct__10dCcD_GSttsFv -/* 80C12DA0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C12DA4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C12DA8 90 7E 07 9C */ stw r3, 0x79c(r30) -/* 80C12DAC 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C12DB0 90 1E 07 A0 */ stw r0, 0x7a0(r30) -/* 80C12DB4 38 7E 07 C0 */ addi r3, r30, 0x7c0 -/* 80C12DB8 4B 46 30 F5 */ bl __ct__12dBgS_AcchCirFv -/* 80C12DBC 3B BE 08 00 */ addi r29, r30, 0x800 -/* 80C12DC0 7F A3 EB 78 */ mr r3, r29 -/* 80C12DC4 4B 47 0C 65 */ bl __ct__12dCcD_GObjInfFv -/* 80C12DC8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C12DCC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C12DD0 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C12DD4 3C 60 80 C1 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C13364@ha */ -/* 80C12DD8 38 03 33 64 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C13364@l */ -/* 80C12DDC 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80C12DE0 3C 60 80 C1 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C13358@ha */ -/* 80C12DE4 38 03 33 58 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C13358@l */ -/* 80C12DE8 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C12DEC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C12DF0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C12DF4 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80C12DF8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C12DFC 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C12E00 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C12E04 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C12E08 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80C12E0C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C12E10 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C12E14 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C12E18 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C12E1C 38 7E 09 3C */ addi r3, r30, 0x93c -/* 80C12E20 4B 65 4D FD */ bl __ct__11cBgS_GndChkFv -/* 80C12E24 38 7E 09 78 */ addi r3, r30, 0x978 -/* 80C12E28 3C 80 80 C1 */ lis r4, __ct__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv@ha /* 0x80C12F2C@ha */ -/* 80C12E2C 38 84 2F 2C */ addi r4, r4, __ct__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv@l /* 0x80C12F2C@l */ -/* 80C12E30 3C A0 80 C1 */ lis r5, __dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv@ha /* 0x80C12EF0@ha */ -/* 80C12E34 38 A5 2E F0 */ addi r5, r5, __dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv@l /* 0x80C12EF0@l */ -/* 80C12E38 38 C0 00 5C */ li r6, 0x5c -/* 80C12E3C 38 E0 00 04 */ li r7, 4 -/* 80C12E40 4B 74 EF 21 */ bl __construct_array -lbl_80C12E44: -/* 80C12E44 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C12E48 60 00 00 08 */ ori r0, r0, 8 -/* 80C12E4C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C12E50: -/* 80C12E50 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C12E54 3C 80 80 C1 */ lis r4, l_arcName@ha /* 0x80C13304@ha */ -/* 80C12E58 38 84 33 04 */ addi r4, r4, l_arcName@l /* 0x80C13304@l */ -/* 80C12E5C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C12E60 4B 41 A0 5D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C12E64 7C 60 1B 78 */ mr r0, r3 -/* 80C12E68 2C 00 00 04 */ cmpwi r0, 4 -/* 80C12E6C 40 82 00 68 */ bne lbl_80C12ED4 -/* 80C12E70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C12E74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C12E78 3C 63 00 02 */ addis r3, r3, 2 -/* 80C12E7C 3C 80 80 C1 */ lis r4, l_arcName@ha /* 0x80C13304@ha */ -/* 80C12E80 38 84 33 04 */ addi r4, r4, l_arcName@l /* 0x80C13304@l */ -/* 80C12E84 80 84 00 00 */ lwz r4, 0(r4) -/* 80C12E88 3C A0 80 C1 */ lis r5, d_a_obj_grave_stone__stringBase0@ha /* 0x80C132E4@ha */ -/* 80C12E8C 38 A5 32 E4 */ addi r5, r5, d_a_obj_grave_stone__stringBase0@l /* 0x80C132E4@l */ -/* 80C12E90 38 A5 00 12 */ addi r5, r5, 0x12 -/* 80C12E94 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80C12E98 4B 42 98 21 */ bl getObjectResName2Index__14dRes_control_cFPCcPCc -/* 80C12E9C 7C 65 1B 78 */ mr r5, r3 -/* 80C12EA0 7F E3 FB 78 */ mr r3, r31 -/* 80C12EA4 3C 80 80 C1 */ lis r4, l_arcName@ha /* 0x80C13304@ha */ -/* 80C12EA8 38 84 33 04 */ addi r4, r4, l_arcName@l /* 0x80C13304@l */ -/* 80C12EAC 80 84 00 00 */ lwz r4, 0(r4) -/* 80C12EB0 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C12EB4 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C12EB8 38 E0 29 A0 */ li r7, 0x29a0 -/* 80C12EBC 39 00 00 00 */ li r8, 0 -/* 80C12EC0 4B 46 58 FD */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C12EC4 7C 60 1B 78 */ mr r0, r3 -/* 80C12EC8 2C 00 00 05 */ cmpwi r0, 5 -/* 80C12ECC 40 82 00 08 */ bne lbl_80C12ED4 -/* 80C12ED0 48 00 00 08 */ b lbl_80C12ED8 -lbl_80C12ED4: -/* 80C12ED4 7C 03 03 78 */ mr r3, r0 -lbl_80C12ED8: -/* 80C12ED8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C12EDC 4B 74 F3 4D */ bl _restgpr_29 -/* 80C12EE0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C12EE4 7C 08 03 A6 */ mtlr r0 -/* 80C12EE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C12EEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C1321C.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C1321C.s deleted file mode 100644 index 02b8e2f6cc7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C1321C.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1321C: -/* 80C1321C A8 83 00 00 */ lha r4, 0(r3) -/* 80C13220 2C 04 00 00 */ cmpwi r4, 0 -/* 80C13224 41 82 00 0C */ beq lbl_80C13230 -/* 80C13228 38 04 FF FF */ addi r0, r4, -1 -/* 80C1322C B0 03 00 00 */ sth r0, 0(r3) -lbl_80C13230: -/* 80C13230 A8 63 00 00 */ lha r3, 0(r3) -/* 80C13234 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13238.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13238.s deleted file mode 100644 index 49222699f04..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13238.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C13238: -/* 80C13238 38 63 FF DC */ addi r3, r3, -36 -/* 80C1323C 4B FF FD 84 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13240.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13240.s deleted file mode 100644 index d430d2b944e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13240.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C13240: -/* 80C13240 38 63 FF EC */ addi r3, r3, -20 -/* 80C13244 4B FF FD 7C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/moveCalc__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/moveCalc__14daGraveStone_cFv.s deleted file mode 100644 index c8cadb69374..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/moveCalc__14daGraveStone_cFv.s +++ /dev/null @@ -1,176 +0,0 @@ -lbl_80C1266C: -/* 80C1266C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C12670 7C 08 02 A6 */ mflr r0 -/* 80C12674 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C12678 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C1267C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C12680 7C 7E 1B 78 */ mr r30, r3 -/* 80C12684 3C 60 80 C1 */ lis r3, mCcDObjInfo__14daGraveStone_c@ha /* 0x80C13250@ha */ -/* 80C12688 3B E3 32 50 */ addi r31, r3, mCcDObjInfo__14daGraveStone_c@l /* 0x80C13250@l */ -/* 80C1268C 38 7E 0A E8 */ addi r3, r30, 0xae8 -/* 80C12690 48 00 0B 8D */ bl func_80C1321C -/* 80C12694 7C 60 07 35 */ extsh. r0, r3 -/* 80C12698 41 82 02 68 */ beq lbl_80C12900 -/* 80C1269C 7F C3 F3 78 */ mr r3, r30 -/* 80C126A0 38 9E 07 84 */ addi r4, r30, 0x784 -/* 80C126A4 4B 40 80 29 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80C126A8 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80C126AC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C126B0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C126B4 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80C126B8 4B 46 43 F5 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80C126BC 80 1E 06 88 */ lwz r0, 0x688(r30) -/* 80C126C0 90 1E 09 3C */ stw r0, 0x93c(r30) -/* 80C126C4 80 1E 06 8C */ lwz r0, 0x68c(r30) -/* 80C126C8 90 1E 09 40 */ stw r0, 0x940(r30) -/* 80C126CC 80 1E 06 90 */ lwz r0, 0x690(r30) -/* 80C126D0 90 1E 09 44 */ stw r0, 0x944(r30) -/* 80C126D4 88 1E 06 94 */ lbz r0, 0x694(r30) -/* 80C126D8 98 1E 09 48 */ stb r0, 0x948(r30) -/* 80C126DC A0 1E 06 9C */ lhz r0, 0x69c(r30) -/* 80C126E0 B0 1E 09 50 */ sth r0, 0x950(r30) -/* 80C126E4 A0 1E 06 9E */ lhz r0, 0x69e(r30) -/* 80C126E8 B0 1E 09 52 */ sth r0, 0x952(r30) -/* 80C126EC 80 1E 06 A0 */ lwz r0, 0x6a0(r30) -/* 80C126F0 90 1E 09 54 */ stw r0, 0x954(r30) -/* 80C126F4 80 1E 06 A4 */ lwz r0, 0x6a4(r30) -/* 80C126F8 90 1E 09 58 */ stw r0, 0x958(r30) -/* 80C126FC C0 1E 06 AC */ lfs f0, 0x6ac(r30) -/* 80C12700 D0 1E 09 60 */ stfs f0, 0x960(r30) -/* 80C12704 C0 1E 06 B0 */ lfs f0, 0x6b0(r30) -/* 80C12708 D0 1E 09 64 */ stfs f0, 0x964(r30) -/* 80C1270C C0 1E 06 B4 */ lfs f0, 0x6b4(r30) -/* 80C12710 D0 1E 09 68 */ stfs f0, 0x968(r30) -/* 80C12714 80 1E 06 B8 */ lwz r0, 0x6b8(r30) -/* 80C12718 90 1E 09 6C */ stw r0, 0x96c(r30) -/* 80C1271C C0 1E 06 BC */ lfs f0, 0x6bc(r30) -/* 80C12720 D0 1E 09 70 */ stfs f0, 0x970(r30) -/* 80C12724 80 1E 06 C0 */ lwz r0, 0x6c0(r30) -/* 80C12728 90 1E 09 74 */ stw r0, 0x974(r30) -/* 80C1272C C0 1E 06 44 */ lfs f0, 0x644(r30) -/* 80C12730 FC 20 00 50 */ fneg f1, f0 -/* 80C12734 C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80C12738 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80C1273C 41 82 00 14 */ beq lbl_80C12750 -/* 80C12740 7F C3 F3 78 */ mr r3, r30 -/* 80C12744 48 00 02 F5 */ bl setEnvTevColor__14daGraveStone_cFv -/* 80C12748 7F C3 F3 78 */ mr r3, r30 -/* 80C1274C 48 00 03 49 */ bl setRoomNo__14daGraveStone_cFv -lbl_80C12750: -/* 80C12750 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C12754 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80C12758 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C1275C D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80C12760 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C12764 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80C12768 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C1276C 38 63 00 24 */ addi r3, r3, 0x24 -/* 80C12770 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C12774 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C12778 4B 73 3D 39 */ bl PSMTXCopy -/* 80C1277C C0 1F 00 74 */ lfs f0, 0x74(r31) -/* 80C12780 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C12784 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C12788 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C1278C C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80C12790 C0 1F 00 78 */ lfs f0, 0x78(r31) -/* 80C12794 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C12798 40 81 00 10 */ ble lbl_80C127A8 -/* 80C1279C C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80C127A0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C127A4 48 00 00 0C */ b lbl_80C127B0 -lbl_80C127A8: -/* 80C127A8 C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80C127AC D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_80C127B0: -/* 80C127B0 4B 3F A5 19 */ bl push__14mDoMtx_stack_cFv -/* 80C127B4 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80C127B8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C127BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C127C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C127C4 38 81 00 0C */ addi r4, r1, 0xc -/* 80C127C8 38 BE 09 7C */ addi r5, r30, 0x97c -/* 80C127CC 4B 73 45 A1 */ bl PSMTXMultVec -/* 80C127D0 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 80C127D4 B0 1E 09 88 */ sth r0, 0x988(r30) -/* 80C127D8 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80C127DC B0 1E 09 8A */ sth r0, 0x98a(r30) -/* 80C127E0 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80C127E4 B0 1E 09 8C */ sth r0, 0x98c(r30) -/* 80C127E8 38 00 00 01 */ li r0, 1 -/* 80C127EC 98 1E 09 78 */ stb r0, 0x978(r30) -/* 80C127F0 4B 3F A5 25 */ bl pop__14mDoMtx_stack_cFv -/* 80C127F4 C0 1F 00 88 */ lfs f0, 0x88(r31) -/* 80C127F8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C127FC 4B 3F A4 CD */ bl push__14mDoMtx_stack_cFv -/* 80C12800 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C12804 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C12808 38 81 00 0C */ addi r4, r1, 0xc -/* 80C1280C 38 BE 09 D8 */ addi r5, r30, 0x9d8 -/* 80C12810 4B 73 45 5D */ bl PSMTXMultVec -/* 80C12814 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 80C12818 B0 1E 09 E4 */ sth r0, 0x9e4(r30) -/* 80C1281C A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80C12820 B0 1E 09 E6 */ sth r0, 0x9e6(r30) -/* 80C12824 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80C12828 B0 1E 09 E8 */ sth r0, 0x9e8(r30) -/* 80C1282C 38 00 00 01 */ li r0, 1 -/* 80C12830 98 1E 09 D4 */ stb r0, 0x9d4(r30) -/* 80C12834 4B 3F A4 E1 */ bl pop__14mDoMtx_stack_cFv -/* 80C12838 C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80C1283C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C12840 4B 3F A4 89 */ bl push__14mDoMtx_stack_cFv -/* 80C12844 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C12848 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1284C 38 81 00 0C */ addi r4, r1, 0xc -/* 80C12850 38 BE 0A 34 */ addi r5, r30, 0xa34 -/* 80C12854 4B 73 45 19 */ bl PSMTXMultVec -/* 80C12858 A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 80C1285C B0 1E 0A 40 */ sth r0, 0xa40(r30) -/* 80C12860 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80C12864 B0 1E 0A 42 */ sth r0, 0xa42(r30) -/* 80C12868 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80C1286C B0 1E 0A 44 */ sth r0, 0xa44(r30) -/* 80C12870 38 00 00 01 */ li r0, 1 -/* 80C12874 98 1E 0A 30 */ stb r0, 0xa30(r30) -/* 80C12878 4B 3F A4 9D */ bl pop__14mDoMtx_stack_cFv -/* 80C1287C C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80C12880 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C12884 4B 3F A4 45 */ bl push__14mDoMtx_stack_cFv -/* 80C12888 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1288C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C12890 38 81 00 0C */ addi r4, r1, 0xc -/* 80C12894 38 BE 0A 90 */ addi r5, r30, 0xa90 -/* 80C12898 4B 73 44 D5 */ bl PSMTXMultVec -/* 80C1289C A8 1E 04 DC */ lha r0, 0x4dc(r30) -/* 80C128A0 B0 1E 0A 9C */ sth r0, 0xa9c(r30) -/* 80C128A4 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80C128A8 B0 1E 0A 9E */ sth r0, 0xa9e(r30) -/* 80C128AC A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80C128B0 B0 1E 0A A0 */ sth r0, 0xaa0(r30) -/* 80C128B4 38 00 00 01 */ li r0, 1 -/* 80C128B8 98 1E 0A 8C */ stb r0, 0xa8c(r30) -/* 80C128BC 4B 3F A4 59 */ bl pop__14mDoMtx_stack_cFv -/* 80C128C0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080231@ha */ -/* 80C128C4 38 03 02 31 */ addi r0, r3, 0x0231 /* 0x00080231@l */ -/* 80C128C8 90 01 00 08 */ stw r0, 8(r1) -/* 80C128CC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C128D0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C128D4 80 63 00 00 */ lwz r3, 0(r3) -/* 80C128D8 38 81 00 08 */ addi r4, r1, 8 -/* 80C128DC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C128E0 38 C0 00 00 */ li r6, 0 -/* 80C128E4 38 E0 00 00 */ li r7, 0 -/* 80C128E8 C0 3F 00 78 */ lfs f1, 0x78(r31) -/* 80C128EC FC 40 08 90 */ fmr f2, f1 -/* 80C128F0 C0 7F 00 8C */ lfs f3, 0x8c(r31) -/* 80C128F4 FC 80 18 90 */ fmr f4, f3 -/* 80C128F8 39 00 00 00 */ li r8, 0 -/* 80C128FC 4B 69 9C 11 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C12900: -/* 80C12900 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C12904 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C12908 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C1290C 7C 08 03 A6 */ mtlr r0 -/* 80C12910 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C12914 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setBaseMtx__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setBaseMtx__14daGraveStone_cFv.s deleted file mode 100644 index 163ae92b8e3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setBaseMtx__14daGraveStone_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C125F8: -/* 80C125F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C125FC 7C 08 02 A6 */ mflr r0 -/* 80C12600 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12608 7C 7F 1B 78 */ mr r31, r3 -/* 80C1260C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C12610 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C12614 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C12618 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C1261C C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C12620 4B 73 42 C9 */ bl PSMTXTrans -/* 80C12624 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C12628 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1262C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80C12630 4B 3F 9E 05 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C12634 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C12638 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1263C 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C12640 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C12644 4B 73 3E 6D */ bl PSMTXCopy -/* 80C12648 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1264C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C12650 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80C12654 4B 73 3E 5D */ bl PSMTXCopy -/* 80C12658 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1265C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C12660 7C 08 03 A6 */ mtlr r0 -/* 80C12664 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C12668 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setEnvTevColor__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setEnvTevColor__14daGraveStone_cFv.s deleted file mode 100644 index d9ed5c0a08e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setEnvTevColor__14daGraveStone_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80C12A38: -/* 80C12A38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C12A3C 7C 08 02 A6 */ mflr r0 -/* 80C12A40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12A44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12A48 93 C1 00 08 */ stw r30, 8(r1) -/* 80C12A4C 7C 7E 1B 78 */ mr r30, r3 -/* 80C12A50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C12A54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C12A58 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80C12A5C 7F E3 FB 78 */ mr r3, r31 -/* 80C12A60 38 9E 09 50 */ addi r4, r30, 0x950 -/* 80C12A64 4B 46 21 85 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80C12A68 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 80C12A6C 7F E3 FB 78 */ mr r3, r31 -/* 80C12A70 38 9E 09 50 */ addi r4, r30, 0x950 -/* 80C12A74 4B 46 26 8D */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80C12A78 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 80C12A7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C12A80 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C12A84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C12A88 7C 08 03 A6 */ mtlr r0 -/* 80C12A8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C12A90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setPrtcl__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setPrtcl__14daGraveStone_cFv.s deleted file mode 100644 index 3c2216cc80d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setPrtcl__14daGraveStone_cFv.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_80C12918: -/* 80C12918 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C1291C 7C 08 02 A6 */ mflr r0 -/* 80C12920 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C12924 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C12928 4B 74 F8 A9 */ bl _savegpr_26 -/* 80C1292C 7C 7E 1B 78 */ mr r30, r3 -/* 80C12930 3B E0 00 00 */ li r31, 0 -/* 80C12934 3B A0 00 00 */ li r29, 0 -/* 80C12938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1293C 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C12940 3C 60 80 C1 */ lis r3, lit_3717@ha /* 0x80C132C4@ha */ -/* 80C12944 3B 83 32 C4 */ addi r28, r3, lit_3717@l /* 0x80C132C4@l */ -lbl_80C12948: -/* 80C12948 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C1294C 7C 00 07 74 */ extsb r0, r0 -/* 80C12950 7F 5E EA 14 */ add r26, r30, r29 -/* 80C12954 89 1A 09 78 */ lbz r8, 0x978(r26) -/* 80C12958 28 08 00 01 */ cmplwi r8, 1 -/* 80C1295C 40 82 00 0C */ bne lbl_80C12968 -/* 80C12960 39 3A 09 88 */ addi r9, r26, 0x988 -/* 80C12964 48 00 00 08 */ b lbl_80C1296C -lbl_80C12968: -/* 80C12968 39 20 00 00 */ li r9, 0 -lbl_80C1296C: -/* 80C1296C 90 01 00 08 */ stw r0, 8(r1) -/* 80C12970 38 7A 09 9C */ addi r3, r26, 0x99c -/* 80C12974 38 9E 01 0C */ addi r4, r30, 0x10c -/* 80C12978 38 BA 09 7C */ addi r5, r26, 0x97c -/* 80C1297C 38 C0 00 00 */ li r6, 0 -/* 80C12980 38 E0 00 00 */ li r7, 0 -/* 80C12984 28 08 00 01 */ cmplwi r8, 1 -/* 80C12988 40 82 00 0C */ bne lbl_80C12994 -/* 80C1298C 7C A8 2B 78 */ mr r8, r5 -/* 80C12990 48 00 00 08 */ b lbl_80C12998 -lbl_80C12994: -/* 80C12994 39 00 00 00 */ li r8, 0 -lbl_80C12998: -/* 80C12998 39 40 00 00 */ li r10, 0 -/* 80C1299C C0 3C 00 00 */ lfs f1, 0(r28) -/* 80C129A0 C0 5E 05 2C */ lfs f2, 0x52c(r30) -/* 80C129A4 4B 43 E6 65 */ bl setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff -/* 80C129A8 88 1A 09 78 */ lbz r0, 0x978(r26) -/* 80C129AC 28 00 00 00 */ cmplwi r0, 0 -/* 80C129B0 41 82 00 54 */ beq lbl_80C12A04 -/* 80C129B4 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 80C129B8 38 63 02 10 */ addi r3, r3, 0x210 -/* 80C129BC 80 9A 09 A4 */ lwz r4, 0x9a4(r26) -/* 80C129C0 4B 43 8F 59 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80C129C4 28 03 00 00 */ cmplwi r3, 0 -/* 80C129C8 41 82 00 3C */ beq lbl_80C12A04 -/* 80C129CC 3C 80 80 C1 */ lis r4, lit_3771@ha /* 0x80C132E0@ha */ -/* 80C129D0 C0 04 32 E0 */ lfs f0, lit_3771@l(r4) /* 0x80C132E0@l */ -/* 80C129D4 D0 1A 09 90 */ stfs f0, 0x990(r26) -/* 80C129D8 D0 1A 09 94 */ stfs f0, 0x994(r26) -/* 80C129DC D0 1A 09 98 */ stfs f0, 0x998(r26) -/* 80C129E0 38 9A 09 90 */ addi r4, r26, 0x990 -/* 80C129E4 E0 24 00 00 */ psq_l f1, 0(r4), 0, 0 /* qr0 */ -/* 80C129E8 C0 1A 09 98 */ lfs f0, 0x998(r26) -/* 80C129EC F0 21 00 10 */ psq_st f1, 16(r1), 0, 0 /* qr0 */ -/* 80C129F0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80C129F4 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 80C129F8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80C129FC D0 03 00 B0 */ stfs f0, 0xb0(r3) -/* 80C12A00 D0 23 00 B4 */ stfs f1, 0xb4(r3) -lbl_80C12A04: -/* 80C12A04 38 00 00 00 */ li r0, 0 -/* 80C12A08 98 1A 09 78 */ stb r0, 0x978(r26) -/* 80C12A0C 3B FF 00 01 */ addi r31, r31, 1 -/* 80C12A10 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C12A14 3B BD 00 5C */ addi r29, r29, 0x5c -/* 80C12A18 41 80 FF 30 */ blt lbl_80C12948 -/* 80C12A1C 38 60 00 01 */ li r3, 1 -/* 80C12A20 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C12A24 4B 74 F7 F9 */ bl _restgpr_26 -/* 80C12A28 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C12A2C 7C 08 03 A6 */ mtlr r0 -/* 80C12A30 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C12A34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setRoomNo__14daGraveStone_cFv.s b/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setRoomNo__14daGraveStone_cFv.s deleted file mode 100644 index d1430fae176..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setRoomNo__14daGraveStone_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80C12A94: -/* 80C12A94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C12A98 7C 08 02 A6 */ mflr r0 -/* 80C12A9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C12AA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C12AA4 7C 7F 1B 78 */ mr r31, r3 -/* 80C12AA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C12AAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C12AB0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C12AB4 38 9F 09 50 */ addi r4, r31, 0x950 -/* 80C12AB8 4B 46 26 49 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80C12ABC 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80C12AC0 98 7F 07 A6 */ stb r3, 0x7a6(r31) -/* 80C12AC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C12AC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C12ACC 7C 08 03 A6 */ mtlr r0 -/* 80C12AD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C12AD4 4E 80 00 20 */ blr diff --git a/include/d/particle/d_particle_copoly.h b/include/d/particle/d_particle_copoly.h index 8422fce5f2e..c4a224462ad 100644 --- a/include/d/particle/d_particle_copoly.h +++ b/include/d/particle/d_particle_copoly.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" +#include "d/com/d_com_inf_game.h" class dBgS_Acch; class dKy_tevstr_c; @@ -17,12 +18,16 @@ public: /* 80051008 */ int setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, csXyz const*, cXyz const*, s8, f32, f32); /* 8005113C */ void clearID(u32*, u8*); - /* 80051488 */ u8 getCenterEffType(int) const; - /* 80051524 */ JPABaseEmitter* getCenterEmitter(int, int); void clearCenterID() { clearID(field_0x8[0], &field_0x36); } void changeWaterOffset(f32 i_offset) { mWaterOffset = i_offset; } void changeRippleOffset(f32 i_offset) { mRippleOffset = i_offset; } + u8 getCenterEffType(int i_idx) const { + return mCenterEffType[i_idx]; + } + JPABaseEmitter* getCenterEmitter(int param_0, int param_1) { + return dComIfGp_particle_getEmitter(field_0x8[param_0][param_1]); + } /* 0x00 */ u32 field_0x0[2]; /* 0x08 */ u32 field_0x8[2][4]; @@ -40,13 +45,17 @@ public: cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32, f32); /* 80051294 */ void clearTwoAllID(); - /* 80051470 */ u8 getRightEffType(int) const; - /* 8005147C */ u8 getLeftEffType(int) const; - /* 80051494 */ JPABaseEmitter* getRightEmitter(int, int); - /* 800514DC */ JPABaseEmitter* getLeftEmitter(int, int); void clearLeftID() { clearID(mLeftEmitter[0], &field_0x7c); } void clearRightID() { clearID(mRightEmitter[0], &field_0x7d); } + u8 getRightEffType(int i_idx) const { return mRightEffType[i_idx]; } + u8 getLeftEffType(int i_idx) const { return mLeftEffType[i_idx]; } + JPABaseEmitter* getRightEmitter(int param_0, int param_1) { + return dComIfGp_particle_getEmitter(mRightEmitter[param_0][param_1]); + } + JPABaseEmitter* getLeftEmitter(int param_0, int param_1) { + return dComIfGp_particle_getEmitter(mLeftEmitter[param_0][param_1]); + } typedef u8 (dPaPoT_c::*effTypeFunc)(int) const; typedef JPABaseEmitter* (dPaPoT_c::*emitterFunc)(int, int); @@ -68,13 +77,21 @@ public: cXyz const*, cXyz const*, cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32, f32); /* 80051424 */ void clearFourAllID(); - /* 8005156C */ u8 getBackRightEffType(int) const; - /* 80051578 */ u8 getBackLeftEffType(int) const; - /* 80051584 */ JPABaseEmitter* getBackRightEmitter(int, int); - /* 800515CC */ JPABaseEmitter* getBackLeftEmitter(int, int); void clearBLeftID() { clearID(mBackLeftEmitter[0], &field_0xc4); } void clearBRightID() { clearID(mBackRightEmitter[0], &field_0xc5); } + u8 getBackRightEffType(int i_idx) const { + return mBackRightEffType[i_idx]; + } + u8 getBackLeftEffType(int i_idx) const { + return mBackLeftEffType[i_idx]; + } + JPABaseEmitter* getBackRightEmitter(int param_0, int param_1) { + return dComIfGp_particle_getEmitter(mBackRightEmitter[param_0][param_1]); + } + JPABaseEmitter* getBackLeftEmitter(int param_0, int param_1) { + return dComIfGp_particle_getEmitter(mBackLeftEmitter[param_0][param_1]); + } typedef u8 (dPaPoF_c::*effTypeFunc)(int) const; typedef JPABaseEmitter* (dPaPoF_c::*emitterFunc)(int, int); diff --git a/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h b/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h index 5e2b4df2f56..b917c6479f9 100644 --- a/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h +++ b/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h @@ -1,6 +1,52 @@ #ifndef D_A_OBJ_GRAVE_STONE_H #define D_A_OBJ_GRAVE_STONE_H -#include "dolphin/types.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/cc/d_cc_d.h" +#include "d/particle/d_particle_copoly.h" + +class daGraveStone_c : public dBgS_MoveBgActor { +public: + class daObj_GrvStn_prtclMngr_c { + public: + /* 80C12EF0 */ ~daObj_GrvStn_prtclMngr_c() {} + /* 80C12F2C */ daObj_GrvStn_prtclMngr_c() {} + + /* 0x00 */ bool field_0x00; + /* 0x04 */ cXyz mPos; + /* 0x10 */ csXyz mAngle; + /* 0x18 */ cXyz mScale; + /* 0x24 */ dPaPo_c field_0x24; + }; // Size: 0x5C + + /* 80C125F8 */ void setBaseMtx(); + /* 80C1266C */ void moveCalc(); + /* 80C12918 */ int setPrtcl(); + /* 80C12A38 */ void setEnvTevColor(); + /* 80C12A94 */ void setRoomNo(); + /* 80C12AD8 */ int Create(); + /* 80C12CA4 */ int CreateHeap(); + /* 80C12D1C */ cPhs__Step create(); + /* 80C13030 */ int Execute(Mtx**); + /* 80C13078 */ int Draw(); + /* 80C1311C */ int Delete(); + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ dBgS_ObjAcch mAcch; + /* 0x784 */ dCcD_Stts mColStatus; + /* 0x7C0 */ dBgS_AcchCir mAcchCir; + /* 0x800 */ dCcD_Cyl mColCyl; + /* 0x93C */ cBgS_GndChk mGndChk; + /* 0x978 */ daObj_GrvStn_prtclMngr_c mPrtclMngr[4]; + /* 0xAE8 */ s16 mTimer; + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl const mCcDCyl; +}; + +STATIC_ASSERT(sizeof(daGraveStone_c) == 0xAEC); #endif /* D_A_OBJ_GRAVE_STONE_H */ diff --git a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp index ccf0557b743..57880ba0d52 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp @@ -1,671 +1,264 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_grave_stone -// +/** + * d_a_obj_grave_stone.cpp + * Object - Zora Gravestone + */ #include "rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h" -#include "dol2asm.h" +#include "JSystem/JGeometry.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_procname.h" +#include "d/com/d_com_inf_game.h" +#include "d/bg/d_bg_w.h" -// -// Types: -// +/* 80C13304-80C13308 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ +static char const* l_arcName = "H_Haka"; -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CCC8 */ void push(); - /* 8000CD14 */ void pop(); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daGraveStone_c { - struct daObj_GrvStn_prtclMngr_c { - /* 80C12EF0 */ ~daObj_GrvStn_prtclMngr_c(); - /* 80C12F2C */ daObj_GrvStn_prtclMngr_c(); - }; - - /* 80C125F8 */ void setBaseMtx(); - /* 80C1266C */ void moveCalc(); - /* 80C12918 */ void setPrtcl(); - /* 80C12A38 */ void setEnvTevColor(); - /* 80C12A94 */ void setRoomNo(); - /* 80C12AD8 */ void Create(); - /* 80C12CA4 */ void CreateHeap(); - /* 80C12D1C */ void create(); - /* 80C13030 */ void Execute(f32 (**)[3][4]); - /* 80C13078 */ void Draw(); - /* 80C1311C */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 const mCcDCyl[68]; -}; - -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 { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C6B8 */ void getObjectResName2Index(char const*, char const*); -}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; -}; - -struct csXyz {}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -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 dPaPo_c { - /* 80050C9C */ void init(dBgS_Acch*, f32, f32); - /* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - csXyz const*, cXyz const*, s8, f32, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW_Base {}; - -struct dBgW {}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C12FC0 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 80C12F30 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C12F78 */ ~cM3dGAab(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(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 setBaseMtx__14daGraveStone_cFv(); -extern "C" void moveCalc__14daGraveStone_cFv(); -extern "C" void setPrtcl__14daGraveStone_cFv(); -extern "C" void setEnvTevColor__14daGraveStone_cFv(); -extern "C" void setRoomNo__14daGraveStone_cFv(); -extern "C" void Create__14daGraveStone_cFv(); -extern "C" void CreateHeap__14daGraveStone_cFv(); -extern "C" void create__14daGraveStone_cFv(); -extern "C" void __dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv(); -extern "C" void __ct__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void Execute__14daGraveStone_cFPPA3_A4_f(); -extern "C" void Draw__14daGraveStone_cFv(); -extern "C" void Delete__14daGraveStone_cFv(); -extern "C" static void daGraveStone_Draw__FP14daGraveStone_c(); -extern "C" static void daGraveStone_Execute__FP14daGraveStone_c(); -extern "C" static bool daGraveStone_IsDelete__FP14daGraveStone_c(); -extern "C" static void daGraveStone_Delete__FP14daGraveStone_c(); -extern "C" static void daGraveStone_create__FP10fopAc_ac_c(); -extern "C" void func_80C1321C(void* _this, s16*); -extern "C" static void func_80C13238(); -extern "C" static void func_80C13240(); -extern "C" u8 const mCcDObjInfo__14daGraveStone_c[48]; -extern "C" u8 const mCcDCyl__14daGraveStone_c[68]; -extern "C" extern char const* const d_a_obj_grave_stone__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void push__14mDoMtx_stack_cFv(); -extern "C" void pop__14mDoMtx_stack_cFv(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -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 getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void init__7dPaPo_cFP9dBgS_Acchff(); -extern "C" void setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__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 __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__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 __ct__11cBgS_GndChkFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void __construct_array(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_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 */]; - -// -// Declarations: -// - -/* 80C125F8-80C1266C 000078 0074+00 2/2 0/0 0/0 .text setBaseMtx__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setBaseMtx__14daGraveStone_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ /* 80C13250-80C13280 000000 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__14daGraveStone_c */ -SECTION_RODATA u8 const daGraveStone_c::mCcDObjInfo[48] = { - 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, 0x79, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +dCcD_SrcGObjInf const daGraveStone_c::mCcDObjInfo = { + {0, {{0, 0, 0}, {0, 0}, {0x79}}}, + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0}, + {0}, }; -COMPILER_STRIP_GATE(0x80C13250, &daGraveStone_c::mCcDObjInfo); /* 80C13280-80C132C4 000030 0044+00 1/1 0/0 0/0 .rodata mCcDCyl__14daGraveStone_c */ -SECTION_RODATA u8 const daGraveStone_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, 0x79, - 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, +dCcD_SrcCyl const daGraveStone_c::mCcDCyl = { + { + {0, {{0, 0, 0}, {0, 0}, {0x79}}}, + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0}, + {0}, + }, + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, }; -COMPILER_STRIP_GATE(0x80C13280, &daGraveStone_c::mCcDCyl); -/* 80C132C4-80C132C8 000074 0004+00 2/3 0/0 0/0 .rodata @3717 */ -SECTION_RODATA static u8 const lit_3717[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C132C4, &lit_3717); - -/* 80C132C8-80C132CC 000078 0004+00 0/1 0/0 0/0 .rodata @3718 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3718 = 1.0f; -COMPILER_STRIP_GATE(0x80C132C8, &lit_3718); -#pragma pop - -/* 80C132CC-80C132D0 00007C 0004+00 0/1 0/0 0/0 .rodata @3719 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3719 = -30.0f; -COMPILER_STRIP_GATE(0x80C132CC, &lit_3719); -#pragma pop - -/* 80C132D0-80C132D4 000080 0004+00 0/1 0/0 0/0 .rodata @3720 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3720 = 30.0f; -COMPILER_STRIP_GATE(0x80C132D0, &lit_3720); -#pragma pop - -/* 80C132D4-80C132D8 000084 0004+00 0/1 0/0 0/0 .rodata @3721 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3721 = 90.0f; -COMPILER_STRIP_GATE(0x80C132D4, &lit_3721); -#pragma pop - -/* 80C132D8-80C132DC 000088 0004+00 0/1 0/0 0/0 .rodata @3722 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3722 = -90.0f; -COMPILER_STRIP_GATE(0x80C132D8, &lit_3722); -#pragma pop - -/* 80C132DC-80C132E0 00008C 0004+00 0/1 0/0 0/0 .rodata @3723 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3723 = -1.0f; -COMPILER_STRIP_GATE(0x80C132DC, &lit_3723); -#pragma pop +/* 80C125F8-80C1266C 000078 0074+00 2/2 0/0 0/0 .text setBaseMtx__14daGraveStone_cFv */ +void daGraveStone_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx); +} /* 80C1266C-80C12918 0000EC 02AC+00 1/1 0/0 0/0 .text moveCalc__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::moveCalc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/moveCalc__14daGraveStone_cFv.s" -} -#pragma pop +void daGraveStone_c::moveCalc() { + if (cLib_calcTimer(&mTimer) != 0) { + fopAcM_posMoveF(this, mColStatus.GetCCMoveP()); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + if (-mAcch.GetGroundH()) { + setEnvTevColor(); + setRoomNo(); + } + mAttentionInfo.mPosition = current.pos; + PSMTXCopy(mpModel->getBaseTRMtx(), mDoMtx_stack_c::get()); + + cXyz vec(0.0f, 0.0f, 0.0f); + if (speedF > 1.0f) { + vec.z = -30.0f; + } else { + vec.z = 30.0f; + } -/* ############################################################################################## */ -/* 80C132E0-80C132E4 000090 0004+00 1/1 0/0 0/0 .rodata @3771 */ -SECTION_RODATA static f32 const lit_3771 = 2.5f; -COMPILER_STRIP_GATE(0x80C132E0, &lit_3771); + mDoMtx_stack_c::push(); + vec.x = 90.0f; + mDoMtx_stack_c::multVec(&vec, &mPrtclMngr[0].mPos); + mPrtclMngr[0].mAngle = current.angle; + mPrtclMngr[0].field_0x00 = true; + mDoMtx_stack_c::pop(); + + vec.x = -90.0f; + mDoMtx_stack_c::push(); + mDoMtx_stack_c::multVec(&vec, &mPrtclMngr[1].mPos); + mPrtclMngr[1].mAngle = current.angle; + mPrtclMngr[1].field_0x00 = true; + mDoMtx_stack_c::pop(); + + vec.x = 30.0f; + mDoMtx_stack_c::push(); + mDoMtx_stack_c::multVec(&vec, &mPrtclMngr[2].mPos); + mPrtclMngr[2].mAngle = current.angle; + mPrtclMngr[2].field_0x00 = true; + mDoMtx_stack_c::pop(); + + vec.x = -30.0f; + mDoMtx_stack_c::push(); + mDoMtx_stack_c::multVec(&vec, &mPrtclMngr[3].mPos); + mPrtclMngr[3].mAngle = current.angle; + mPrtclMngr[3].field_0x00 = true; + mDoMtx_stack_c::pop(); + + Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_ZORA_BOSEKI_MV, ¤t.pos, + 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } +} /* 80C12918-80C12A38 000398 0120+00 1/1 0/0 0/0 .text setPrtcl__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::setPrtcl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setPrtcl__14daGraveStone_cFv.s" +int daGraveStone_c::setPrtcl() { + for (int i = 0; i < 4; i++) { + mPrtclMngr[i].field_0x24.setEffectCenter( + &mTevStr, &mPrtclMngr[i].mPos, 0, 0, + mPrtclMngr[i].field_0x00 == true ? &mPrtclMngr[i].mPos : NULL, + mPrtclMngr[i].field_0x00 == true ? &mPrtclMngr[i].mAngle : NULL, + NULL, fopAcM_GetRoomNo(this), 0.0f, speedF + ); + if (mPrtclMngr[i].field_0x00) { + JPABaseEmitter* emitter = mPrtclMngr[i].field_0x24.getCenterEmitter(0, 0); + if (emitter != NULL) { + mPrtclMngr[i].mScale.set(2.5f, 2.5f, 2.5f); + // JGeometry::TVec3 scale(mPrtclMngr[i].mScale); + JGeometry::TVec3 scale; + JGeometry::setTVec3f(&mPrtclMngr[i].mScale.x, &scale.x); + emitter->setGlobalParticleScale(scale); + } + } + mPrtclMngr[i].field_0x00 = 0; + } + return 1; } -#pragma pop /* 80C12A38-80C12A94 0004B8 005C+00 2/2 0/0 0/0 .text setEnvTevColor__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::setEnvTevColor() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setEnvTevColor__14daGraveStone_cFv.s" +void daGraveStone_c::setEnvTevColor() { + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } -#pragma pop /* 80C12A94-80C12AD8 000514 0044+00 2/2 0/0 0/0 .text setRoomNo__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::setRoomNo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/setRoomNo__14daGraveStone_cFv.s" +void daGraveStone_c::setRoomNo() { + s8 room_no = dComIfG_Bgsp().GetRoomId(mGndChk); + fopAcM_SetRoomNo(this, room_no); + mColStatus.SetRoomId(room_no); } -#pragma pop /* 80C12AD8-80C12CA4 000558 01CC+00 1/0 0/0 0/0 .text Create__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Create__14daGraveStone_cFv.s" +int daGraveStone_c::Create() { + setBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + mAcchCir.SetWall(0.0f, 0.0f); + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); + mColStatus.Init(0xff, 0, this); + mColCyl.Set(mCcDCyl); + mColCyl.SetStts(&mColStatus); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + setEnvTevColor(); + setRoomNo(); + mAttentionInfo.mPosition = current.pos; + for (int i = 0; i < 4; i++) { + mPrtclMngr[i].field_0x24.init(&mAcch, 0.0f, 0.0f); + } + 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); + mTimer = 0; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C132E4-80C132E4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C132E4 = "H_Haka"; -SECTION_DEAD static char const* const stringBase_80C132EB = "H_Haka.bmd"; -#pragma pop - -/* 80C13304-80C13308 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_grave_stone__stringBase0; /* 80C12CA4-80C12D1C 000724 0078+00 1/0 0/0 0/0 .text CreateHeap__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/CreateHeap__14daGraveStone_cFv.s" +int daGraveStone_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "H_Haka.bmd"); + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C132E4-80C132E4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C132F6 = "H_Haka.dzb"; -#pragma pop - -/* 80C13308-80C13328 -00001 0020+00 1/0 0/0 0/0 .data l_daGraveStone_Method */ -SECTION_DATA static void* l_daGraveStone_Method[8] = { - (void*)daGraveStone_create__FP10fopAc_ac_c, - (void*)daGraveStone_Delete__FP14daGraveStone_c, - (void*)daGraveStone_Execute__FP14daGraveStone_c, - (void*)daGraveStone_IsDelete__FP14daGraveStone_c, - (void*)daGraveStone_Draw__FP14daGraveStone_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C13328-80C13358 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GraveStone */ -SECTION_DATA extern void* g_profile_Obj_GraveStone[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00870000, (void*)&g_fpcLf_Method, - (void*)0x00000AEC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x025F0000, (void*)&l_daGraveStone_Method, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 80C13358-80C13364 000054 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, -}; - -/* 80C13364-80C13370 000060 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, -}; - -/* 80C13370-80C13394 00006C 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_80C13240, - (void*)NULL, - (void*)NULL, - (void*)func_80C13238, -}; - -/* 80C13394-80C133BC 000090 0028+00 1/1 0/0 0/0 .data __vt__14daGraveStone_c */ -SECTION_DATA extern void* __vt__14daGraveStone_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daGraveStone_cFv, - (void*)Create__14daGraveStone_cFv, - (void*)Execute__14daGraveStone_cFPPA3_A4_f, - (void*)Draw__14daGraveStone_cFv, - (void*)Delete__14daGraveStone_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80C12D1C-80C12EF0 00079C 01D4+00 1/1 0/0 0/0 .text create__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C12D1C.s" +cPhs__Step daGraveStone_c::create() { + fopAcM_SetupActor(this, daGraveStone_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName); + if (step == cPhs_COMPLEATE_e) { + int dzb_id = dComIfG_getObjctResName2Index(l_arcName, "H_Haka.dzb"); + step = (cPhs__Step)MoveBGCreate(l_arcName, dzb_id, + dBgS_MoveBGProc_TypicalRotY, 0x29A0, NULL); + if (step == cPhs_ERROR_e) { + return step; + } + } + return step; } -#pragma pop - -/* 80C12EF0-80C12F2C 000970 003C+00 1/1 0/0 0/0 .text - * __dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daGraveStone_c::daObj_GrvStn_prtclMngr_c::~daObj_GrvStn_prtclMngr_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/__dt__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv.s" -} -#pragma pop - -/* 80C12F2C-80C12F30 0009AC 0004+00 1/1 0/0 0/0 .text - * __ct__Q214daGraveStone_c24daObj_GrvStn_prtclMngr_cFv */ -daGraveStone_c::daObj_GrvStn_prtclMngr_c::daObj_GrvStn_prtclMngr_c() { - /* empty function */ -} - -/* 80C12F30-80C12F78 0009B0 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_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C12F78-80C12FC0 0009F8 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_grave_stone/d_a_obj_grave_stone/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80C12FC0-80C13030 000A40 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_grave_stone/d_a_obj_grave_stone/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 80C13030-80C13078 000AB0 0048+00 1/0 0/0 0/0 .text Execute__14daGraveStone_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Execute__14daGraveStone_cFPPA3_A4_f.s" +int daGraveStone_c::Execute(Mtx** i_mtxP) { + *i_mtxP = &mBgMtx; + moveCalc(); + setBaseMtx(); + setPrtcl(); + return 1; } -#pragma pop /* 80C13078-80C1311C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Draw__14daGraveStone_cFv.s" +int daGraveStone_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80C1311C-80C13188 000B9C 006C+00 1/0 0/0 0/0 .text Delete__14daGraveStone_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daGraveStone_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/Delete__14daGraveStone_cFv.s" +int daGraveStone_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + return 1; } -#pragma pop /* 80C13188-80C131B4 000C08 002C+00 1/0 0/0 0/0 .text daGraveStone_Draw__FP14daGraveStone_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daGraveStone_Draw(daGraveStone_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Draw__FP14daGraveStone_c.s" +static int daGraveStone_Draw(daGraveStone_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80C131B4-80C131D4 000C34 0020+00 1/0 0/0 0/0 .text daGraveStone_Execute__FP14daGraveStone_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daGraveStone_Execute(daGraveStone_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Execute__FP14daGraveStone_c.s" +static int daGraveStone_Execute(daGraveStone_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80C131D4-80C131DC 000C54 0008+00 1/0 0/0 0/0 .text daGraveStone_IsDelete__FP14daGraveStone_c */ -static bool daGraveStone_IsDelete(daGraveStone_c* param_0) { - return true; +static int daGraveStone_IsDelete(daGraveStone_c* i_this) { + return 1; } /* 80C131DC-80C131FC 000C5C 0020+00 1/0 0/0 0/0 .text daGraveStone_Delete__FP14daGraveStone_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daGraveStone_Delete(daGraveStone_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_Delete__FP14daGraveStone_c.s" +static int daGraveStone_Delete(daGraveStone_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80C131FC-80C1321C 000C7C 0020+00 1/0 0/0 0/0 .text daGraveStone_create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daGraveStone_create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/daGraveStone_create__FP10fopAc_ac_c.s" +static cPhs__Step daGraveStone_create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80C1321C-80C13238 000C9C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_80C1321C(void* _this, s16* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C1321C.s" -} -#pragma pop +/* 80C13308-80C13328 -00001 0020+00 1/0 0/0 0/0 .data l_daGraveStone_Method */ +static actor_method_class l_daGraveStone_Method = { + (process_method_func)daGraveStone_create, + (process_method_func)daGraveStone_Delete, + (process_method_func)daGraveStone_Execute, + (process_method_func)daGraveStone_IsDelete, + (process_method_func)daGraveStone_Draw, +}; -/* 80C13238-80C13240 000CB8 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_80C13238() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13238.s" -} -#pragma pop - -/* 80C13240-80C13248 000CC0 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_80C13240() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone/func_80C13240.s" -} -#pragma pop - -/* 80C132E4-80C132E4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C13328-80C13358 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GraveStone */ +extern actor_process_profile_definition g_profile_Obj_GraveStone = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_Obj_GraveStone, + &g_fpcLf_Method.mBase, + sizeof(daGraveStone_c), + 0, + 0, + &g_fopAc_Method.base, + 0x25F, + &l_daGraveStone_Method, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp index 9915f800854..eddfc0bc749 100644 --- a/src/d/particle/d_particle_copoly.cpp +++ b/src/d/particle/d_particle_copoly.cpp @@ -229,58 +229,6 @@ void dPaPoF_c::clearFourAllID() { clearTwoAllID(); } -/* 80051470-8005147C 04BDB0 000C+00 2/0 0/0 0/0 .text getRightEffType__8dPaPoT_cCFi */ -u8 dPaPoT_c::getRightEffType(int i_idx) const { - return mRightEffType[i_idx]; -} - -/* 8005147C-80051488 04BDBC 000C+00 2/0 0/0 0/0 .text getLeftEffType__8dPaPoT_cCFi */ -u8 dPaPoT_c::getLeftEffType(int i_idx) const { - return mLeftEffType[i_idx]; -} - -/* 80051488-80051494 04BDC8 000C+00 2/0 0/0 0/0 .text getCenterEffType__7dPaPo_cCFi */ -u8 dPaPo_c::getCenterEffType(int i_idx) const { - return mCenterEffType[i_idx]; -} - -/* 80051494-800514DC 04BDD4 0048+00 2/0 0/0 0/0 .text getRightEmitter__8dPaPoT_cFii */ -JPABaseEmitter* dPaPoT_c::getRightEmitter(int param_0, int param_1) { - return dComIfGp_particle_getEmitter(mRightEmitter[param_0][param_1]); -} - -/* 800514DC-80051524 04BE1C 0048+00 2/0 0/0 0/0 .text getLeftEmitter__8dPaPoT_cFii */ -JPABaseEmitter* dPaPoT_c::getLeftEmitter(int param_0, int param_1) { - return dComIfGp_particle_getEmitter(mLeftEmitter[param_0][param_1]); -} - -/* 80051524-8005156C 04BE64 0048+00 2/0 0/0 0/0 .text getCenterEmitter__7dPaPo_cFii */ -JPABaseEmitter* dPaPo_c::getCenterEmitter(int param_0, int param_1) { - return dComIfGp_particle_getEmitter(field_0x8[param_0][param_1]); -} - -/* 8005156C-80051578 04BEAC 000C+00 1/0 0/0 0/0 .text getBackRightEffType__8dPaPoF_cCFi - */ -u8 dPaPoF_c::getBackRightEffType(int i_idx) const { - return mBackRightEffType[i_idx]; -} - -/* 80051578-80051584 04BEB8 000C+00 1/0 0/0 0/0 .text getBackLeftEffType__8dPaPoF_cCFi */ -u8 dPaPoF_c::getBackLeftEffType(int i_idx) const { - return mBackLeftEffType[i_idx]; -} - -/* 80051584-800515CC 04BEC4 0048+00 1/0 0/0 0/0 .text getBackRightEmitter__8dPaPoF_cFii - */ -JPABaseEmitter* dPaPoF_c::getBackRightEmitter(int param_0, int param_1) { - return dComIfGp_particle_getEmitter(mBackRightEmitter[param_0][param_1]); -} - -/* 800515CC-80051614 04BF0C 0048+00 1/0 0/0 0/0 .text getBackLeftEmitter__8dPaPoF_cFii */ -JPABaseEmitter* dPaPoF_c::getBackLeftEmitter(int param_0, int param_1) { - return dComIfGp_particle_getEmitter(mBackLeftEmitter[param_0][param_1]); -} - /* ############################################################################################## */ /* 803A85F8-803A8604 005718 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ static u8 cNullVec__6Z2Calc[12] = {