From a8dd0a196141b3655a3336a58cbaa09c7839649b Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Mon, 1 Apr 2024 20:15:39 +0200 Subject: [PATCH] d_a_obj_pleaf OK (#2118) --- Progress.md | 14 +- .../CreateHeap__13daObj_Pleaf_cFv.s | 33 - .../d_a_obj_pleaf/Delete__13daObj_Pleaf_cFv.s | 14 - .../d_a_obj_pleaf/Draw__13daObj_Pleaf_cFv.s | 51 -- .../Execute__13daObj_Pleaf_cFv.s | 57 -- .../d_a_obj_pleaf/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_obj_pleaf/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_obj_pleaf/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_obj_pleaf/__dt__12dBgS_ObjAcchFv.s | 30 - .../d_a_obj_pleaf/__dt__13daObj_Pleaf_cFv.s | 120 --- .../__dt__19daObj_Pleaf_Param_cFv.s | 20 - .../d_a_obj_pleaf/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_pleaf/__dt__8cM3dGSphFv.s | 20 - .../d_a_obj_pleaf/__sinit_d_a_obj_pleaf_cpp.s | 17 - ...pCallBack__13daObj_Pleaf_cFP10fopAc_ac_c.s | 9 - .../d_a_obj_pleaf/create__13daObj_Pleaf_cFv.s | 166 ---- .../d_a_obj_pleaf/daObj_Pleaf_Create__FPv.s | 9 - .../d_a_obj_pleaf/daObj_Pleaf_Delete__FPv.s | 9 - .../d_a_obj_pleaf/daObj_Pleaf_Draw__FPv.s | 9 - .../d_a_obj_pleaf/daObj_Pleaf_Execute__FPv.s | 9 - .../d_a_obj_pleaf/func_80CB1840.s | 3 - .../d_a_obj_pleaf/func_80CB1848.s | 3 - .../getResName__13daObj_Pleaf_cFv.s | 5 - .../isDelete__13daObj_Pleaf_cFv.s | 11 - .../setEnvTevColor__13daObj_Pleaf_cFv.s | 24 - .../d_a_obj_pleaf/setMtx__13daObj_Pleaf_cFv.s | 26 - .../setRoomNo__13daObj_Pleaf_cFv.s | 17 - .../rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h | 49 +- rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp | 724 ++++-------------- 29 files changed, 185 insertions(+), 1360 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/CreateHeap__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Delete__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Draw__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Execute__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__19daObj_Pleaf_Param_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGSphFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__sinit_d_a_obj_pleaf_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/create__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Create__FPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Delete__FPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Draw__FPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Execute__FPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1840.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1848.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/getResName__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/isDelete__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setEnvTevColor__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setMtx__13daObj_Pleaf_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setRoomNo__13daObj_Pleaf_cFv.s diff --git a/Progress.md b/Progress.md index da7e09512dd..af8f20294dd 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 53.573631% | 2154020 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 53.573631% | 2154020 | 4020672 -RELs | 37.061391% | 4262180 | 11500324 -Total | 41.338842% | 6416200 | 15520996 +RELs | 37.140484% | 4271276 | 11500324 +Total | 41.397446% | 6425296 | 15520996 ## RELs @@ -567,7 +567,7 @@ d_a_obj_pdtile | 31.467607% | 2856 | 9076 d_a_obj_pdwall | 40.192308% | 1672 | 4160 d_a_obj_picture | 35.041841% | 4020 | 11472 d_a_obj_pillar | 38.500852% | 3616 | 9392 -d_a_obj_pleaf | 44.689221% | 2272 | 5084 +d_a_obj_pleaf | 100.000000% | 5084 | 5084 d_a_obj_poCandle | 44.244604% | 2460 | 5560 d_a_obj_poFire | 36.999540% | 3216 | 8692 d_a_obj_poTbox | 44.731739% | 2768 | 6188 @@ -648,8 +648,8 @@ d_a_obj_toby | 32.460733% | 3720 | 11460 d_a_obj_tobyhouse | 34.586466% | 3864 | 11172 d_a_obj_togeTrap | 41.746183% | 3500 | 8384 d_a_obj_tombo | 33.688640% | 4804 | 14260 -d_a_obj_tornado | 36.577869% | 1428 | 3904 -d_a_obj_tornado2 | 30.997110% | 1716 | 5536 +d_a_obj_tornado | 51.127049% | 1996 | 3904 +d_a_obj_tornado2 | 100.000000% | 5536 | 5536 d_a_obj_tp | 35.262726% | 3436 | 9744 d_a_obj_treesh | 48.098664% | 1872 | 3892 d_a_obj_twGate | 57.395498% | 2856 | 4976 @@ -667,7 +667,7 @@ d_a_obj_wchain | 33.537332% | 3288 | 9804 d_a_obj_wdStick | 32.908234% | 4748 | 14428 d_a_obj_web0 | 75.286533% | 4204 | 5584 d_a_obj_web1 | 100.000000% | 5772 | 5772 -d_a_obj_well_cover | 45.704467% | 1596 | 3492 +d_a_obj_well_cover | 100.000000% | 3492 | 3492 d_a_obj_wflag | 41.214286% | 2308 | 5600 d_a_obj_wind_stone | 100.000000% | 4944 | 4944 d_a_obj_window | 100.000000% | 4820 | 4820 @@ -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 | 37.061391% | 4262180 | 11500324 +Total | 37.140484% | 4271276 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/CreateHeap__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/CreateHeap__13daObj_Pleaf_cFv.s deleted file mode 100644 index 80923669145..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/CreateHeap__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80CB134C: -/* 80CB134C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB1350 7C 08 02 A6 */ mflr r0 -/* 80CB1354 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB1358 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB135C 7C 7F 1B 78 */ mr r31, r3 -/* 80CB1360 48 00 02 59 */ bl getResName__13daObj_Pleaf_cFv -/* 80CB1364 38 80 00 03 */ li r4, 3 -/* 80CB1368 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB136C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB1370 3C A5 00 02 */ addis r5, r5, 2 -/* 80CB1374 38 C0 00 80 */ li r6, 0x80 -/* 80CB1378 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CB137C 4B 38 AF 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CB1380 28 03 00 00 */ cmplwi r3, 0 -/* 80CB1384 40 82 00 0C */ bne lbl_80CB1390 -/* 80CB1388 38 60 00 00 */ li r3, 0 -/* 80CB138C 48 00 00 24 */ b lbl_80CB13B0 -lbl_80CB1390: -/* 80CB1390 3C 80 00 08 */ lis r4, 8 -/* 80CB1394 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CB1398 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CB139C 4B 36 38 B9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CB13A0 90 7F 05 74 */ stw r3, 0x574(r31) -/* 80CB13A4 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80CB13A8 30 03 FF FF */ addic r0, r3, -1 -/* 80CB13AC 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80CB13B0: -/* 80CB13B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB13B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB13B8 7C 08 03 A6 */ mtlr r0 -/* 80CB13BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB13C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Delete__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Delete__13daObj_Pleaf_cFv.s deleted file mode 100644 index edb9d3c16b9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Delete__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CB13C4: -/* 80CB13C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB13C8 7C 08 02 A6 */ mflr r0 -/* 80CB13CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB13D0 38 80 FF FF */ li r4, -1 -/* 80CB13D4 81 83 09 4C */ lwz r12, 0x94c(r3) -/* 80CB13D8 81 8C 00 08 */ lwz r12, 8(r12) -/* 80CB13DC 7D 89 03 A6 */ mtctr r12 -/* 80CB13E0 4E 80 04 21 */ bctrl -/* 80CB13E4 38 60 00 01 */ li r3, 1 -/* 80CB13E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB13EC 7C 08 03 A6 */ mtlr r0 -/* 80CB13F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB13F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Draw__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Draw__13daObj_Pleaf_cFv.s deleted file mode 100644 index d8eb3179723..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Draw__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80CB14D4: -/* 80CB14D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB14D8 7C 08 02 A6 */ mflr r0 -/* 80CB14DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB14E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB14E4 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB14E8 7C 7E 1B 78 */ mr r30, r3 -/* 80CB14EC 3C 60 80 CB */ lis r3, m__19daObj_Pleaf_Param_c@ha /* 0x80CB1864@ha */ -/* 80CB14F0 3B E3 18 64 */ addi r31, r3, m__19daObj_Pleaf_Param_c@l /* 0x80CB1864@l */ -/* 80CB14F4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CB14F8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CB14FC 38 80 00 00 */ li r4, 0 -/* 80CB1500 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CB1504 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CB1508 4B 4F 22 BD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CB150C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CB1510 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CB1514 80 9E 05 74 */ lwz r4, 0x574(r30) -/* 80CB1518 80 84 00 04 */ lwz r4, 4(r4) -/* 80CB151C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CB1520 4B 4F 38 81 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CB1524 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80CB1528 4B 35 C7 9D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CB152C C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80CB1530 C0 9E 09 40 */ lfs f4, 0x940(r30) -/* 80CB1534 FC 00 20 00 */ fcmpu cr0, f0, f4 -/* 80CB1538 41 82 00 44 */ beq lbl_80CB157C -/* 80CB153C 80 7E 09 44 */ lwz r3, 0x944(r30) -/* 80CB1540 38 80 00 01 */ li r4, 1 -/* 80CB1544 80 BE 05 74 */ lwz r5, 0x574(r30) -/* 80CB1548 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80CB154C 38 FF 00 00 */ addi r7, r31, 0 -/* 80CB1550 C0 27 00 0C */ lfs f1, 0xc(r7) -/* 80CB1554 C0 5F 00 24 */ lfs f2, 0x24(r31) -/* 80CB1558 C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 80CB155C 38 FE 07 E0 */ addi r7, r30, 0x7e0 -/* 80CB1560 39 1E 01 0C */ addi r8, r30, 0x10c -/* 80CB1564 39 20 00 00 */ li r9, 0 -/* 80CB1568 C0 BF 00 28 */ lfs f5, 0x28(r31) -/* 80CB156C 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80CB1570 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80CB1574 4B 37 D3 9D */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80CB1578 90 7E 09 44 */ stw r3, 0x944(r30) -lbl_80CB157C: -/* 80CB157C 38 60 00 01 */ li r3, 1 -/* 80CB1580 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB1584 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB1588 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB158C 7C 08 03 A6 */ mtlr r0 -/* 80CB1590 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1594 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Execute__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Execute__13daObj_Pleaf_cFv.s deleted file mode 100644 index 19d8abb6a68..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Execute__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80CB13F8: -/* 80CB13F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CB13FC 7C 08 02 A6 */ mflr r0 -/* 80CB1400 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CB1404 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CB1408 7C 7F 1B 78 */ mr r31, r3 -/* 80CB140C C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80CB1410 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CB1414 C0 23 04 D4 */ lfs f1, 0x4d4(r3) -/* 80CB1418 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80CB141C C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80CB1420 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CB1424 3C 60 80 CB */ lis r3, lit_3908@ha /* 0x80CB1880@ha */ -/* 80CB1428 C0 03 18 80 */ lfs f0, lit_3908@l(r3) /* 0x80CB1880@l */ -/* 80CB142C EC 01 00 2A */ fadds f0, f1, f0 -/* 80CB1430 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CB1434 38 7F 07 CC */ addi r3, r31, 0x7cc -/* 80CB1438 38 81 00 08 */ addi r4, r1, 8 -/* 80CB143C 4B 5B 68 ED */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80CB1440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB1444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB1448 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CB144C 38 9F 07 CC */ addi r4, r31, 0x7cc -/* 80CB1450 4B 3C 30 51 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80CB1454 D0 3F 09 40 */ stfs f1, 0x940(r31) -/* 80CB1458 3C 60 80 CB */ lis r3, lit_3909@ha /* 0x80CB1884@ha */ -/* 80CB145C C0 23 18 84 */ lfs f1, lit_3909@l(r3) /* 0x80CB1884@l */ -/* 80CB1460 C0 1F 09 40 */ lfs f0, 0x940(r31) -/* 80CB1464 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CB1468 41 82 00 14 */ beq lbl_80CB147C -/* 80CB146C 7F E3 FB 78 */ mr r3, r31 -/* 80CB1470 48 00 01 79 */ bl setEnvTevColor__13daObj_Pleaf_cFv -/* 80CB1474 7F E3 FB 78 */ mr r3, r31 -/* 80CB1478 48 00 01 CD */ bl setRoomNo__13daObj_Pleaf_cFv -lbl_80CB147C: -/* 80CB147C 7F E3 FB 78 */ mr r3, r31 -/* 80CB1480 48 00 02 05 */ bl setMtx__13daObj_Pleaf_cFv -/* 80CB1484 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CB1488 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 80CB148C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80CB1490 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80CB1494 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80CB1498 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 80CB149C C0 1F 05 50 */ lfs f0, 0x550(r31) -/* 80CB14A0 D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 80CB14A4 C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 80CB14A8 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80CB14AC C0 1F 05 58 */ lfs f0, 0x558(r31) -/* 80CB14B0 D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 80CB14B4 38 00 00 00 */ li r0, 0 -/* 80CB14B8 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80CB14BC 38 60 00 01 */ li r3, 1 -/* 80CB14C0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CB14C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CB14C8 7C 08 03 A6 */ mtlr r0 -/* 80CB14CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CB14D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 6bfd35f0a81..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CB1770: -/* 80CB1770 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB1774 7C 08 02 A6 */ mflr r0 -/* 80CB1778 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB177C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB1780 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB1784 41 82 00 1C */ beq lbl_80CB17A0 -/* 80CB1788 3C A0 80 CB */ lis r5, __vt__10cCcD_GStts@ha /* 0x80CB1914@ha */ -/* 80CB178C 38 05 19 14 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80CB1914@l */ -/* 80CB1790 90 1F 00 00 */ stw r0, 0(r31) -/* 80CB1794 7C 80 07 35 */ extsh. r0, r4 -/* 80CB1798 40 81 00 08 */ ble lbl_80CB17A0 -/* 80CB179C 4B 61 D5 A1 */ bl __dl__FPv -lbl_80CB17A0: -/* 80CB17A0 7F E3 FB 78 */ mr r3, r31 -/* 80CB17A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB17A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB17AC 7C 08 03 A6 */ mtlr r0 -/* 80CB17B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB17B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index d105cc08bcd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CB1280: -/* 80CB1280 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB1284 7C 08 02 A6 */ mflr r0 -/* 80CB1288 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB128C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB1290 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB1294 41 82 00 30 */ beq lbl_80CB12C4 -/* 80CB1298 3C 60 80 CB */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CB1920@ha */ -/* 80CB129C 38 03 19 20 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CB1920@l */ -/* 80CB12A0 90 1F 00 00 */ stw r0, 0(r31) -/* 80CB12A4 41 82 00 10 */ beq lbl_80CB12B4 -/* 80CB12A8 3C 60 80 CB */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CB1914@ha */ -/* 80CB12AC 38 03 19 14 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CB1914@l */ -/* 80CB12B0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CB12B4: -/* 80CB12B4 7C 80 07 35 */ extsh. r0, r4 -/* 80CB12B8 40 81 00 0C */ ble lbl_80CB12C4 -/* 80CB12BC 7F E3 FB 78 */ mr r3, r31 -/* 80CB12C0 4B 61 DA 7D */ bl __dl__FPv -lbl_80CB12C4: -/* 80CB12C4 7F E3 FB 78 */ mr r3, r31 -/* 80CB12C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB12CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB12D0 7C 08 03 A6 */ mtlr r0 -/* 80CB12D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB12D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 58f6331994e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CB1210: -/* 80CB1210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB1214 7C 08 02 A6 */ mflr r0 -/* 80CB1218 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB121C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB1220 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB1224 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CB1228 7C 9F 23 78 */ mr r31, r4 -/* 80CB122C 41 82 00 38 */ beq lbl_80CB1264 -/* 80CB1230 3C 60 80 CB */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80CB192C@ha */ -/* 80CB1234 38 03 19 2C */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80CB192C@l */ -/* 80CB1238 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80CB123C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80CB1240 38 80 FF FF */ li r4, -1 -/* 80CB1244 4B 5B DC D5 */ bl __dt__8cM3dGCirFv -/* 80CB1248 7F C3 F3 78 */ mr r3, r30 -/* 80CB124C 38 80 00 00 */ li r4, 0 -/* 80CB1250 4B 5B 6E 61 */ bl __dt__13cBgS_PolyInfoFv -/* 80CB1254 7F E0 07 35 */ extsh. r0, r31 -/* 80CB1258 40 81 00 0C */ ble lbl_80CB1264 -/* 80CB125C 7F C3 F3 78 */ mr r3, r30 -/* 80CB1260 4B 61 DA DD */ bl __dl__FPv -lbl_80CB1264: -/* 80CB1264 7F C3 F3 78 */ mr r3, r30 -/* 80CB1268 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB126C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB1270 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB1274 7C 08 03 A6 */ mtlr r0 -/* 80CB1278 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB127C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 7e6e585b46f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CB12DC: -/* 80CB12DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB12E0 7C 08 02 A6 */ mflr r0 -/* 80CB12E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB12E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB12EC 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB12F0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CB12F4 7C 9F 23 78 */ mr r31, r4 -/* 80CB12F8 41 82 00 38 */ beq lbl_80CB1330 -/* 80CB12FC 3C 80 80 CB */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80CB18F0@ha */ -/* 80CB1300 38 84 18 F0 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80CB18F0@l */ -/* 80CB1304 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80CB1308 38 04 00 0C */ addi r0, r4, 0xc -/* 80CB130C 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80CB1310 38 04 00 18 */ addi r0, r4, 0x18 -/* 80CB1314 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80CB1318 38 80 00 00 */ li r4, 0 -/* 80CB131C 4B 3C 4C 79 */ bl __dt__9dBgS_AcchFv -/* 80CB1320 7F E0 07 35 */ extsh. r0, r31 -/* 80CB1324 40 81 00 0C */ ble lbl_80CB1330 -/* 80CB1328 7F C3 F3 78 */ mr r3, r30 -/* 80CB132C 4B 61 DA 11 */ bl __dl__FPv -lbl_80CB1330: -/* 80CB1330 7F C3 F3 78 */ mr r3, r30 -/* 80CB1334 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB1338 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB133C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB1340 7C 08 03 A6 */ mtlr r0 -/* 80CB1344 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1348 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__13daObj_Pleaf_cFv.s deleted file mode 100644 index 887a74a9ba4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,120 +0,0 @@ -lbl_80CB0D4C: -/* 80CB0D4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB0D50 7C 08 02 A6 */ mflr r0 -/* 80CB0D54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB0D58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB0D5C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB0D60 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CB0D64 7C 9F 23 78 */ mr r31, r4 -/* 80CB0D68 41 82 01 84 */ beq lbl_80CB0EEC -/* 80CB0D6C 3C 80 80 CB */ lis r4, __vt__13daObj_Pleaf_c@ha /* 0x80CB1950@ha */ -/* 80CB0D70 38 04 19 50 */ addi r0, r4, __vt__13daObj_Pleaf_c@l /* 0x80CB1950@l */ -/* 80CB0D74 90 1E 09 4C */ stw r0, 0x94c(r30) -/* 80CB0D78 48 00 08 41 */ bl getResName__13daObj_Pleaf_cFv -/* 80CB0D7C 7C 64 1B 78 */ mr r4, r3 -/* 80CB0D80 38 7E 05 6C */ addi r3, r30, 0x56c -/* 80CB0D84 4B 37 C2 85 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CB0D88 34 1E 08 08 */ addic. r0, r30, 0x808 -/* 80CB0D8C 41 82 00 84 */ beq lbl_80CB0E10 -/* 80CB0D90 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80CB0D94 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80CB0D98 90 7E 08 44 */ stw r3, 0x844(r30) -/* 80CB0D9C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CB0DA0 90 1E 09 28 */ stw r0, 0x928(r30) -/* 80CB0DA4 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CB0DA8 90 1E 09 3C */ stw r0, 0x93c(r30) -/* 80CB0DAC 34 1E 09 0C */ addic. r0, r30, 0x90c -/* 80CB0DB0 41 82 00 54 */ beq lbl_80CB0E04 -/* 80CB0DB4 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80CB0DB8 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80CB0DBC 90 7E 09 28 */ stw r3, 0x928(r30) -/* 80CB0DC0 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CB0DC4 90 1E 09 3C */ stw r0, 0x93c(r30) -/* 80CB0DC8 34 1E 09 2C */ addic. r0, r30, 0x92c -/* 80CB0DCC 41 82 00 10 */ beq lbl_80CB0DDC -/* 80CB0DD0 3C 60 80 CB */ lis r3, __vt__8cM3dGSph@ha /* 0x80CB1944@ha */ -/* 80CB0DD4 38 03 19 44 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80CB1944@l */ -/* 80CB0DD8 90 1E 09 3C */ stw r0, 0x93c(r30) -lbl_80CB0DDC: -/* 80CB0DDC 34 1E 09 0C */ addic. r0, r30, 0x90c -/* 80CB0DE0 41 82 00 24 */ beq lbl_80CB0E04 -/* 80CB0DE4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CB0DE8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CB0DEC 90 1E 09 28 */ stw r0, 0x928(r30) -/* 80CB0DF0 34 1E 09 0C */ addic. r0, r30, 0x90c -/* 80CB0DF4 41 82 00 10 */ beq lbl_80CB0E04 -/* 80CB0DF8 3C 60 80 CB */ lis r3, __vt__8cM3dGAab@ha /* 0x80CB1938@ha */ -/* 80CB0DFC 38 03 19 38 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CB1938@l */ -/* 80CB0E00 90 1E 09 24 */ stw r0, 0x924(r30) -lbl_80CB0E04: -/* 80CB0E04 38 7E 08 08 */ addi r3, r30, 0x808 -/* 80CB0E08 38 80 00 00 */ li r4, 0 -/* 80CB0E0C 4B 3D 32 D9 */ bl __dt__12dCcD_GObjInfFv -lbl_80CB0E10: -/* 80CB0E10 38 7E 07 CC */ addi r3, r30, 0x7cc -/* 80CB0E14 38 80 FF FF */ li r4, -1 -/* 80CB0E18 4B 5B 6E 7D */ bl __dt__11cBgS_GndChkFv -/* 80CB0E1C 34 1E 07 8C */ addic. r0, r30, 0x78c -/* 80CB0E20 41 82 00 28 */ beq lbl_80CB0E48 -/* 80CB0E24 3C 60 80 CB */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80CB192C@ha */ -/* 80CB0E28 38 03 19 2C */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80CB192C@l */ -/* 80CB0E2C 90 1E 07 98 */ stw r0, 0x798(r30) -/* 80CB0E30 38 7E 07 A0 */ addi r3, r30, 0x7a0 -/* 80CB0E34 38 80 FF FF */ li r4, -1 -/* 80CB0E38 4B 5B E0 E1 */ bl __dt__8cM3dGCirFv -/* 80CB0E3C 38 7E 07 8C */ addi r3, r30, 0x78c -/* 80CB0E40 38 80 00 00 */ li r4, 0 -/* 80CB0E44 4B 5B 72 6D */ bl __dt__13cBgS_PolyInfoFv -lbl_80CB0E48: -/* 80CB0E48 34 1E 07 50 */ addic. r0, r30, 0x750 -/* 80CB0E4C 41 82 00 54 */ beq lbl_80CB0EA0 -/* 80CB0E50 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CB0E54 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CB0E58 90 7E 07 68 */ stw r3, 0x768(r30) -/* 80CB0E5C 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CB0E60 90 1E 07 6C */ stw r0, 0x76c(r30) -/* 80CB0E64 34 1E 07 6C */ addic. r0, r30, 0x76c -/* 80CB0E68 41 82 00 24 */ beq lbl_80CB0E8C -/* 80CB0E6C 3C 60 80 CB */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CB1920@ha */ -/* 80CB0E70 38 03 19 20 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CB1920@l */ -/* 80CB0E74 90 1E 07 6C */ stw r0, 0x76c(r30) -/* 80CB0E78 34 1E 07 6C */ addic. r0, r30, 0x76c -/* 80CB0E7C 41 82 00 10 */ beq lbl_80CB0E8C -/* 80CB0E80 3C 60 80 CB */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CB1914@ha */ -/* 80CB0E84 38 03 19 14 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CB1914@l */ -/* 80CB0E88 90 1E 07 6C */ stw r0, 0x76c(r30) -lbl_80CB0E8C: -/* 80CB0E8C 34 1E 07 50 */ addic. r0, r30, 0x750 -/* 80CB0E90 41 82 00 10 */ beq lbl_80CB0EA0 -/* 80CB0E94 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CB0E98 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CB0E9C 90 1E 07 68 */ stw r0, 0x768(r30) -lbl_80CB0EA0: -/* 80CB0EA0 34 1E 05 78 */ addic. r0, r30, 0x578 -/* 80CB0EA4 41 82 00 2C */ beq lbl_80CB0ED0 -/* 80CB0EA8 3C 60 80 CB */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CB18F0@ha */ -/* 80CB0EAC 38 63 18 F0 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CB18F0@l */ -/* 80CB0EB0 90 7E 05 88 */ stw r3, 0x588(r30) -/* 80CB0EB4 38 03 00 0C */ addi r0, r3, 0xc -/* 80CB0EB8 90 1E 05 8C */ stw r0, 0x58c(r30) -/* 80CB0EBC 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CB0EC0 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80CB0EC4 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80CB0EC8 38 80 00 00 */ li r4, 0 -/* 80CB0ECC 4B 3C 50 C9 */ bl __dt__9dBgS_AcchFv -lbl_80CB0ED0: -/* 80CB0ED0 7F C3 F3 78 */ mr r3, r30 -/* 80CB0ED4 38 80 00 00 */ li r4, 0 -/* 80CB0ED8 4B 36 7D B5 */ bl __dt__10fopAc_ac_cFv -/* 80CB0EDC 7F E0 07 35 */ extsh. r0, r31 -/* 80CB0EE0 40 81 00 0C */ ble lbl_80CB0EEC -/* 80CB0EE4 7F C3 F3 78 */ mr r3, r30 -/* 80CB0EE8 4B 61 DE 55 */ bl __dl__FPv -lbl_80CB0EEC: -/* 80CB0EEC 7F C3 F3 78 */ mr r3, r30 -/* 80CB0EF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB0EF4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB0EF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB0EFC 7C 08 03 A6 */ mtlr r0 -/* 80CB0F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB0F04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__19daObj_Pleaf_Param_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__19daObj_Pleaf_Param_cFv.s deleted file mode 100644 index 4239d76cbe1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__19daObj_Pleaf_Param_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CB17F8: -/* 80CB17F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB17FC 7C 08 02 A6 */ mflr r0 -/* 80CB1800 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB1804 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB1808 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB180C 41 82 00 1C */ beq lbl_80CB1828 -/* 80CB1810 3C A0 80 CB */ lis r5, __vt__19daObj_Pleaf_Param_c@ha /* 0x80CB195C@ha */ -/* 80CB1814 38 05 19 5C */ addi r0, r5, __vt__19daObj_Pleaf_Param_c@l /* 0x80CB195C@l */ -/* 80CB1818 90 1F 00 00 */ stw r0, 0(r31) -/* 80CB181C 7C 80 07 35 */ extsh. r0, r4 -/* 80CB1820 40 81 00 08 */ ble lbl_80CB1828 -/* 80CB1824 4B 61 D5 19 */ bl __dl__FPv -lbl_80CB1828: -/* 80CB1828 7F E3 FB 78 */ mr r3, r31 -/* 80CB182C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB1830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB1834 7C 08 03 A6 */ mtlr r0 -/* 80CB1838 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB183C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGAabFv.s deleted file mode 100644 index d916c8b370e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CB11C8: -/* 80CB11C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB11CC 7C 08 02 A6 */ mflr r0 -/* 80CB11D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB11D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB11D8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB11DC 41 82 00 1C */ beq lbl_80CB11F8 -/* 80CB11E0 3C A0 80 CB */ lis r5, __vt__8cM3dGAab@ha /* 0x80CB1938@ha */ -/* 80CB11E4 38 05 19 38 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80CB1938@l */ -/* 80CB11E8 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80CB11EC 7C 80 07 35 */ extsh. r0, r4 -/* 80CB11F0 40 81 00 08 */ ble lbl_80CB11F8 -/* 80CB11F4 4B 61 DB 49 */ bl __dl__FPv -lbl_80CB11F8: -/* 80CB11F8 7F E3 FB 78 */ mr r3, r31 -/* 80CB11FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB1200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB1204 7C 08 03 A6 */ mtlr r0 -/* 80CB1208 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB120C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGSphFv.s deleted file mode 100644 index a881a07a3f9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CB1180: -/* 80CB1180 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB1184 7C 08 02 A6 */ mflr r0 -/* 80CB1188 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB118C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB1190 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB1194 41 82 00 1C */ beq lbl_80CB11B0 -/* 80CB1198 3C A0 80 CB */ lis r5, __vt__8cM3dGSph@ha /* 0x80CB1944@ha */ -/* 80CB119C 38 05 19 44 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80CB1944@l */ -/* 80CB11A0 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80CB11A4 7C 80 07 35 */ extsh. r0, r4 -/* 80CB11A8 40 81 00 08 */ ble lbl_80CB11B0 -/* 80CB11AC 4B 61 DB 91 */ bl __dl__FPv -lbl_80CB11B0: -/* 80CB11B0 7F E3 FB 78 */ mr r3, r31 -/* 80CB11B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB11B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB11BC 7C 08 03 A6 */ mtlr r0 -/* 80CB11C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB11C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__sinit_d_a_obj_pleaf_cpp.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__sinit_d_a_obj_pleaf_cpp.s deleted file mode 100644 index 1668375a82b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__sinit_d_a_obj_pleaf_cpp.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80CB17B8: -/* 80CB17B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB17BC 7C 08 02 A6 */ mflr r0 -/* 80CB17C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB17C4 3C 60 80 CB */ lis r3, __vt__19daObj_Pleaf_Param_c@ha /* 0x80CB195C@ha */ -/* 80CB17C8 38 03 19 5C */ addi r0, r3, __vt__19daObj_Pleaf_Param_c@l /* 0x80CB195C@l */ -/* 80CB17CC 3C 60 80 CB */ lis r3, l_HIO@ha /* 0x80CB197C@ha */ -/* 80CB17D0 94 03 19 7C */ stwu r0, l_HIO@l(r3) /* 0x80CB197C@l */ -/* 80CB17D4 3C 80 80 CB */ lis r4, __dt__19daObj_Pleaf_Param_cFv@ha /* 0x80CB17F8@ha */ -/* 80CB17D8 38 84 17 F8 */ addi r4, r4, __dt__19daObj_Pleaf_Param_cFv@l /* 0x80CB17F8@l */ -/* 80CB17DC 3C A0 80 CB */ lis r5, lit_3805@ha /* 0x80CB1970@ha */ -/* 80CB17E0 38 A5 19 70 */ addi r5, r5, lit_3805@l /* 0x80CB1970@l */ -/* 80CB17E4 4B FF F4 F5 */ bl __register_global_object -/* 80CB17E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB17EC 7C 08 03 A6 */ mtlr r0 -/* 80CB17F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB17F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c.s deleted file mode 100644 index 067fb59dafc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB1598: -/* 80CB1598 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB159C 7C 08 02 A6 */ mflr r0 -/* 80CB15A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB15A4 4B FF FD A9 */ bl CreateHeap__13daObj_Pleaf_cFv -/* 80CB15A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB15AC 7C 08 03 A6 */ mtlr r0 -/* 80CB15B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB15B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/create__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/create__13daObj_Pleaf_cFv.s deleted file mode 100644 index 9ce0891794a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/create__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,166 +0,0 @@ -lbl_80CB0F08: -/* 80CB0F08 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CB0F0C 7C 08 02 A6 */ mflr r0 -/* 80CB0F10 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CB0F14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CB0F18 4B 6B 12 C1 */ bl _savegpr_28 -/* 80CB0F1C 7C 7E 1B 78 */ mr r30, r3 -/* 80CB0F20 3C 80 80 CB */ lis r4, m__19daObj_Pleaf_Param_c@ha /* 0x80CB1864@ha */ -/* 80CB0F24 3B E4 18 64 */ addi r31, r4, m__19daObj_Pleaf_Param_c@l /* 0x80CB1864@l */ -/* 80CB0F28 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CB0F2C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CB0F30 40 82 00 F4 */ bne lbl_80CB1024 -/* 80CB0F34 7F C0 F3 79 */ or. r0, r30, r30 -/* 80CB0F38 41 82 00 E0 */ beq lbl_80CB1018 -/* 80CB0F3C 7C 1D 03 78 */ mr r29, r0 -/* 80CB0F40 4B 36 7C 25 */ bl __ct__10fopAc_ac_cFv -/* 80CB0F44 3C 60 80 CB */ lis r3, __vt__13daObj_Pleaf_c@ha /* 0x80CB1950@ha */ -/* 80CB0F48 38 03 19 50 */ addi r0, r3, __vt__13daObj_Pleaf_c@l /* 0x80CB1950@l */ -/* 80CB0F4C 90 1D 09 4C */ stw r0, 0x94c(r29) -/* 80CB0F50 3B 9D 05 78 */ addi r28, r29, 0x578 -/* 80CB0F54 7F 83 E3 78 */ mr r3, r28 -/* 80CB0F58 4B 3C 51 49 */ bl __ct__9dBgS_AcchFv -/* 80CB0F5C 3C 60 80 CB */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CB18F0@ha */ -/* 80CB0F60 38 63 18 F0 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CB18F0@l */ -/* 80CB0F64 90 7C 00 10 */ stw r3, 0x10(r28) -/* 80CB0F68 38 03 00 0C */ addi r0, r3, 0xc -/* 80CB0F6C 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80CB0F70 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CB0F74 90 1C 00 24 */ stw r0, 0x24(r28) -/* 80CB0F78 38 7C 00 14 */ addi r3, r28, 0x14 -/* 80CB0F7C 4B 3C 7E ED */ bl SetObj__16dBgS_PolyPassChkFv -/* 80CB0F80 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CB0F84 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CB0F88 90 1D 07 68 */ stw r0, 0x768(r29) -/* 80CB0F8C 38 7D 07 6C */ addi r3, r29, 0x76c -/* 80CB0F90 4B 3D 27 D1 */ bl __ct__10dCcD_GSttsFv -/* 80CB0F94 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CB0F98 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CB0F9C 90 7D 07 68 */ stw r3, 0x768(r29) -/* 80CB0FA0 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CB0FA4 90 1D 07 6C */ stw r0, 0x76c(r29) -/* 80CB0FA8 38 7D 07 8C */ addi r3, r29, 0x78c -/* 80CB0FAC 4B 3C 4F 01 */ bl __ct__12dBgS_AcchCirFv -/* 80CB0FB0 38 7D 07 CC */ addi r3, r29, 0x7cc -/* 80CB0FB4 4B 5B 6C 69 */ bl __ct__11cBgS_GndChkFv -/* 80CB0FB8 3B 9D 08 08 */ addi r28, r29, 0x808 -/* 80CB0FBC 7F 83 E3 78 */ mr r3, r28 -/* 80CB0FC0 4B 3D 2A 69 */ bl __ct__12dCcD_GObjInfFv -/* 80CB0FC4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CB0FC8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CB0FCC 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80CB0FD0 3C 60 80 CB */ lis r3, __vt__8cM3dGAab@ha /* 0x80CB1938@ha */ -/* 80CB0FD4 38 03 19 38 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CB1938@l */ -/* 80CB0FD8 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 80CB0FDC 3C 60 80 CB */ lis r3, __vt__8cM3dGSph@ha /* 0x80CB1944@ha */ -/* 80CB0FE0 38 03 19 44 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80CB1944@l */ -/* 80CB0FE4 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80CB0FE8 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80CB0FEC 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80CB0FF0 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80CB0FF4 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CB0FF8 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80CB0FFC 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80CB1000 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80CB1004 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 80CB1008 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CB100C 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80CB1010 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CB1014 90 1C 01 34 */ stw r0, 0x134(r28) -lbl_80CB1018: -/* 80CB1018 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80CB101C 60 00 00 08 */ ori r0, r0, 8 -/* 80CB1020 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80CB1024: -/* 80CB1024 38 00 00 00 */ li r0, 0 -/* 80CB1028 98 1E 09 48 */ stb r0, 0x948(r30) -/* 80CB102C 7F C3 F3 78 */ mr r3, r30 -/* 80CB1030 48 00 05 89 */ bl getResName__13daObj_Pleaf_cFv -/* 80CB1034 7C 64 1B 78 */ mr r4, r3 -/* 80CB1038 38 7E 05 6C */ addi r3, r30, 0x56c -/* 80CB103C 4B 37 BE 81 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CB1040 7C 7D 1B 78 */ mr r29, r3 -/* 80CB1044 2C 1D 00 04 */ cmpwi r29, 4 -/* 80CB1048 40 82 01 1C */ bne lbl_80CB1164 -/* 80CB104C 7F C3 F3 78 */ mr r3, r30 -/* 80CB1050 48 00 05 79 */ bl isDelete__13daObj_Pleaf_cFv -/* 80CB1054 2C 03 00 00 */ cmpwi r3, 0 -/* 80CB1058 41 82 00 0C */ beq lbl_80CB1064 -/* 80CB105C 38 60 00 05 */ li r3, 5 -/* 80CB1060 48 00 01 08 */ b lbl_80CB1168 -lbl_80CB1064: -/* 80CB1064 7F C3 F3 78 */ mr r3, r30 -/* 80CB1068 3C 80 80 CB */ lis r4, createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c@ha /* 0x80CB1598@ha */ -/* 80CB106C 38 84 15 98 */ addi r4, r4, createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c@l /* 0x80CB1598@l */ -/* 80CB1070 38 A0 08 10 */ li r5, 0x810 -/* 80CB1074 4B 36 94 3D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CB1078 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CB107C 40 82 00 0C */ bne lbl_80CB1088 -/* 80CB1080 38 60 00 05 */ li r3, 5 -/* 80CB1084 48 00 00 E4 */ b lbl_80CB1168 -lbl_80CB1088: -/* 80CB1088 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80CB108C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CB1090 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80CB1094 7F C3 F3 78 */ mr r3, r30 -/* 80CB1098 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80CB109C C0 5F 00 14 */ lfs f2, 0x14(r31) -/* 80CB10A0 FC 60 08 90 */ fmr f3, f1 -/* 80CB10A4 C0 9F 00 18 */ lfs f4, 0x18(r31) -/* 80CB10A8 C0 BF 00 1C */ lfs f5, 0x1c(r31) -/* 80CB10AC FC C0 20 90 */ fmr f6, f4 -/* 80CB10B0 4B 36 94 99 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80CB10B4 38 1E 04 E4 */ addi r0, r30, 0x4e4 -/* 80CB10B8 90 01 00 08 */ stw r0, 8(r1) -/* 80CB10BC 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80CB10C0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CB10C4 38 BE 04 BC */ addi r5, r30, 0x4bc -/* 80CB10C8 7F C6 F3 78 */ mr r6, r30 -/* 80CB10CC 38 E0 00 01 */ li r7, 1 -/* 80CB10D0 39 1E 07 8C */ addi r8, r30, 0x78c -/* 80CB10D4 39 3E 04 F8 */ addi r9, r30, 0x4f8 -/* 80CB10D8 39 5E 04 DC */ addi r10, r30, 0x4dc -/* 80CB10DC 4B 3C 51 6D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80CB10E0 38 7E 07 50 */ addi r3, r30, 0x750 -/* 80CB10E4 38 80 00 FF */ li r4, 0xff -/* 80CB10E8 38 A0 00 00 */ li r5, 0 -/* 80CB10EC 7F C6 F3 78 */ mr r6, r30 -/* 80CB10F0 4B 3D 27 71 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80CB10F4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CB10F8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CB10FC C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80CB1100 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80CB1104 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CB1108 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80CB110C C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80CB1110 EC 01 00 2A */ fadds f0, f1, f0 -/* 80CB1114 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80CB1118 38 7E 07 CC */ addi r3, r30, 0x7cc -/* 80CB111C 38 81 00 10 */ addi r4, r1, 0x10 -/* 80CB1120 4B 5B 6C 09 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80CB1124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB1128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB112C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CB1130 38 9E 07 CC */ addi r4, r30, 0x7cc -/* 80CB1134 4B 3C 33 6D */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80CB1138 D0 3E 09 40 */ stfs f1, 0x940(r30) -/* 80CB113C C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 80CB1140 C0 1E 09 40 */ lfs f0, 0x940(r30) -/* 80CB1144 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CB1148 41 82 00 14 */ beq lbl_80CB115C -/* 80CB114C 7F C3 F3 78 */ mr r3, r30 -/* 80CB1150 48 00 04 99 */ bl setEnvTevColor__13daObj_Pleaf_cFv -/* 80CB1154 7F C3 F3 78 */ mr r3, r30 -/* 80CB1158 48 00 04 ED */ bl setRoomNo__13daObj_Pleaf_cFv -lbl_80CB115C: -/* 80CB115C 7F C3 F3 78 */ mr r3, r30 -/* 80CB1160 48 00 02 99 */ bl Execute__13daObj_Pleaf_cFv -lbl_80CB1164: -/* 80CB1164 7F A3 EB 78 */ mr r3, r29 -lbl_80CB1168: -/* 80CB1168 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CB116C 4B 6B 10 B9 */ bl _restgpr_28 -/* 80CB1170 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CB1174 7C 08 03 A6 */ mtlr r0 -/* 80CB1178 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CB117C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Create__FPv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Create__FPv.s deleted file mode 100644 index 1ed8e8e3628..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB16E8: -/* 80CB16E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB16EC 7C 08 02 A6 */ mflr r0 -/* 80CB16F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB16F4 4B FF F8 15 */ bl create__13daObj_Pleaf_cFv -/* 80CB16F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB16FC 7C 08 03 A6 */ mtlr r0 -/* 80CB1700 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1704 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Delete__FPv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Delete__FPv.s deleted file mode 100644 index 06d3399af08..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB1708: -/* 80CB1708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB170C 7C 08 02 A6 */ mflr r0 -/* 80CB1710 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB1714 4B FF FC B1 */ bl Delete__13daObj_Pleaf_cFv -/* 80CB1718 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB171C 7C 08 03 A6 */ mtlr r0 -/* 80CB1720 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1724 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Draw__FPv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Draw__FPv.s deleted file mode 100644 index 37eb3ffa33c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB1748: -/* 80CB1748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB174C 7C 08 02 A6 */ mflr r0 -/* 80CB1750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB1754 4B FF FD 81 */ bl Draw__13daObj_Pleaf_cFv -/* 80CB1758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB175C 7C 08 03 A6 */ mtlr r0 -/* 80CB1760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1764 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Execute__FPv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Execute__FPv.s deleted file mode 100644 index a013db41583..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB1728: -/* 80CB1728 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB172C 7C 08 02 A6 */ mflr r0 -/* 80CB1730 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB1734 4B FF FC C5 */ bl Execute__13daObj_Pleaf_cFv -/* 80CB1738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB173C 7C 08 03 A6 */ mtlr r0 -/* 80CB1740 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1744 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1840.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1840.s deleted file mode 100644 index d781d221d3c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1840.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CB1840: -/* 80CB1840 38 63 FF DC */ addi r3, r3, -36 -/* 80CB1844 4B FF FA 98 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1848.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1848.s deleted file mode 100644 index 3c162add0ec..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1848.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CB1848: -/* 80CB1848 38 63 FF EC */ addi r3, r3, -20 -/* 80CB184C 4B FF FA 90 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/getResName__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/getResName__13daObj_Pleaf_cFv.s deleted file mode 100644 index d373f48f47b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/getResName__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80CB15B8: -/* 80CB15B8 3C 60 80 CB */ lis r3, l_resName@ha /* 0x80CB189C@ha */ -/* 80CB15BC 38 63 18 9C */ addi r3, r3, l_resName@l /* 0x80CB189C@l */ -/* 80CB15C0 80 63 00 00 */ lwz r3, 0(r3) -/* 80CB15C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/isDelete__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/isDelete__13daObj_Pleaf_cFv.s deleted file mode 100644 index eb808a55801..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/isDelete__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80CB15C8: -/* 80CB15C8 88 03 09 48 */ lbz r0, 0x948(r3) -/* 80CB15CC 2C 00 00 00 */ cmpwi r0, 0 -/* 80CB15D0 41 82 00 08 */ beq lbl_80CB15D8 -/* 80CB15D4 48 00 00 0C */ b lbl_80CB15E0 -lbl_80CB15D8: -/* 80CB15D8 38 60 00 00 */ li r3, 0 -/* 80CB15DC 4E 80 00 20 */ blr -lbl_80CB15E0: -/* 80CB15E0 38 60 00 00 */ li r3, 0 -/* 80CB15E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setEnvTevColor__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setEnvTevColor__13daObj_Pleaf_cFv.s deleted file mode 100644 index 0c56055a7ec..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setEnvTevColor__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80CB15E8: -/* 80CB15E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB15EC 7C 08 02 A6 */ mflr r0 -/* 80CB15F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB15F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB15F8 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB15FC 7C 7E 1B 78 */ mr r30, r3 -/* 80CB1600 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB1604 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB1608 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80CB160C 7F E3 FB 78 */ mr r3, r31 -/* 80CB1610 38 9E 07 E0 */ addi r4, r30, 0x7e0 -/* 80CB1614 4B 3C 35 D5 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80CB1618 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 80CB161C 7F E3 FB 78 */ mr r3, r31 -/* 80CB1620 38 9E 07 E0 */ addi r4, r30, 0x7e0 -/* 80CB1624 4B 3C 3A DD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80CB1628 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 80CB162C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB1630 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB1634 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB1638 7C 08 03 A6 */ mtlr r0 -/* 80CB163C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1640 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setMtx__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setMtx__13daObj_Pleaf_cFv.s deleted file mode 100644 index 35ee2723cb9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setMtx__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CB1684: -/* 80CB1684 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB1688 7C 08 02 A6 */ mflr r0 -/* 80CB168C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB1690 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB1694 7C 7F 1B 78 */ mr r31, r3 -/* 80CB1698 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB169C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB16A0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CB16A4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CB16A8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CB16AC 4B 69 52 3D */ bl PSMTXTrans -/* 80CB16B0 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80CB16B4 4B 35 B8 91 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80CB16B8 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80CB16BC 4B 35 B7 B5 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 80CB16C0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB16C4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB16C8 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80CB16CC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CB16D0 4B 69 4D E1 */ bl PSMTXCopy -/* 80CB16D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB16D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB16DC 7C 08 03 A6 */ mtlr r0 -/* 80CB16E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB16E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setRoomNo__13daObj_Pleaf_cFv.s b/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setRoomNo__13daObj_Pleaf_cFv.s deleted file mode 100644 index 5f6f9d249d0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setRoomNo__13daObj_Pleaf_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80CB1644: -/* 80CB1644 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB1648 7C 08 02 A6 */ mflr r0 -/* 80CB164C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB1650 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB1654 7C 7F 1B 78 */ mr r31, r3 -/* 80CB1658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB165C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB1660 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CB1664 38 9F 07 E0 */ addi r4, r31, 0x7e0 -/* 80CB1668 4B 3C 3A 99 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80CB166C 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80CB1670 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB1674 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB1678 7C 08 03 A6 */ mtlr r0 -/* 80CB167C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB1680 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h b/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h index b0d8f8168d8..4a3bc6e02e9 100644 --- a/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h +++ b/include/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h @@ -1,6 +1,53 @@ #ifndef D_A_OBJ_PLEAF_H #define D_A_OBJ_PLEAF_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s.h" +#include "d/cc/d_cc_d.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObj_Pleaf_c : public fopAc_ac_c { +public: + /* 0x568*/ u8 field_0x568[0x56C - 0x568]; + /* 0x56C */ request_of_phase_process_class mPhaseReq; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ dBgS_ObjAcch mObjAcch; + /* 0x750 */ dCcD_Stts mStts; + /* 0x78C */ dBgS_AcchCir mAcchCir; + /* 0x7CC */ cBgS_GndChk mGndChk; + /* 0x808 */ dCcD_Sph mSph; + /* 0x940 */ f32 mGroundDist; + /* 0x944 */ u32 mShadowKey; + /* 0x948 */ u8 mType; + + u32 getType() { return 0; } + + /* 80CB0D4C */ virtual ~daObj_Pleaf_c(); + /* 80CB0F08 */ int create(); + /* 80CB134C */ int CreateHeap(); + /* 80CB13C4 */ int Delete(); + /* 80CB13F8 */ int Execute(); + /* 80CB14D4 */ int Draw(); + /* 80CB1598 */ static int createHeapCallBack(fopAc_ac_c*); + /* 80CB15B8 */ char* getResName(); + /* 80CB15C8 */ int isDelete(); + /* 80CB15E8 */ void setEnvTevColor(); + /* 80CB1644 */ void setRoomNo(); + /* 80CB1684 */ void setMtx(); +}; + +class daObj_Pleaf_Param_c { +public: + /* 80CB17F8 */ virtual ~daObj_Pleaf_Param_c() {} + + struct params { + f32 field_0x0; + f32 field_0x4; + f32 field_0x8; + f32 field_0xc; + }; + + static daObj_Pleaf_Param_c::params const m; +}; #endif /* D_A_OBJ_PLEAF_H */ diff --git a/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp b/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp index 6f1119d3c46..3fc9f5b2016 100644 --- a/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp +++ b/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp @@ -1,659 +1,195 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_pleaf -// +/** + * d_a_obj_pleaf.cpp + * Object - Pumpkin Leaf + */ #include "rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Pleaf_c { - /* 80CB0D4C */ ~daObj_Pleaf_c(); - /* 80CB0F08 */ void create(); - /* 80CB134C */ void CreateHeap(); - /* 80CB13C4 */ void Delete(); - /* 80CB13F8 */ void Execute(); - /* 80CB14D4 */ void Draw(); - /* 80CB1598 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CB15B8 */ void getResName(); - /* 80CB15C8 */ void isDelete(); - /* 80CB15E8 */ void setEnvTevColor(); - /* 80CB1644 */ void setRoomNo(); - /* 80CB1684 */ void setMtx(); -}; - -struct daObj_Pleaf_Param_c { - /* 80CB17F8 */ ~daObj_Pleaf_Param_c(); - - static u8 const m[16]; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CB1280 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CB12DC */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80CB1210 */ ~dBgS_AcchCir(); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct cM3dGSph { - /* 80CB1180 */ ~cM3dGSph(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CB11C8 */ ~cM3dGAab(); -}; - -struct cCcD_GStts { - /* 80CB1770 */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800744A0 */ void GroundCross(cBgS_GndChk*); -}; - -struct _GXTexObj {}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __dt__13daObj_Pleaf_cFv(); -extern "C" void create__13daObj_Pleaf_cFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void CreateHeap__13daObj_Pleaf_cFv(); -extern "C" void Delete__13daObj_Pleaf_cFv(); -extern "C" void Execute__13daObj_Pleaf_cFv(); -extern "C" void Draw__13daObj_Pleaf_cFv(); -extern "C" void createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c(); -extern "C" void getResName__13daObj_Pleaf_cFv(); -extern "C" void isDelete__13daObj_Pleaf_cFv(); -extern "C" void setEnvTevColor__13daObj_Pleaf_cFv(); -extern "C" void setRoomNo__13daObj_Pleaf_cFv(); -extern "C" void setMtx__13daObj_Pleaf_cFv(); -extern "C" static void daObj_Pleaf_Create__FPv(); -extern "C" static void daObj_Pleaf_Delete__FPv(); -extern "C" static void daObj_Pleaf_Execute__FPv(); -extern "C" static void daObj_Pleaf_Draw__FPv(); -extern "C" static bool daObj_Pleaf_IsDelete__FPv(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __sinit_d_a_obj_pleaf_cpp(); -extern "C" void __dt__19daObj_Pleaf_Param_cFv(); -extern "C" static void func_80CB1840(); -extern "C" static void func_80CB1848(); -extern "C" u8 const m__19daObj_Pleaf_Param_c[16]; -extern "C" extern char const* const d_a_obj_pleaf__stringBase0; - -// -// External References: -// - -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -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 -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -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 __dt__12dCcD_GObjInfFv(); -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 __dt__11cBgS_GndChkFv(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CB1890-80CB1890 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CB1890 = "J_Hatake"; -#pragma pop - /* 80CB189C-80CB18A0 -00001 0004+00 1/1 0/0 0/0 .data l_resName */ -SECTION_DATA static void* l_resName = (void*)&d_a_obj_pleaf__stringBase0; - -/* 80CB18A0-80CB18C0 -00001 0020+00 1/0 0/0 0/0 .data daObj_Pleaf_MethodTable */ -SECTION_DATA static void* daObj_Pleaf_MethodTable[8] = { - (void*)daObj_Pleaf_Create__FPv, - (void*)daObj_Pleaf_Delete__FPv, - (void*)daObj_Pleaf_Execute__FPv, - (void*)daObj_Pleaf_IsDelete__FPv, - (void*)daObj_Pleaf_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CB18C0-80CB18F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_PLEAF */ -SECTION_DATA extern void* g_profile_OBJ_PLEAF[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02F50000, (void*)&g_fpcLf_Method, - (void*)0x00000950, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02C90000, (void*)&daObj_Pleaf_MethodTable, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 80CB18F0-80CB1914 000054 0024+00 3/3 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_80CB1848, - (void*)NULL, - (void*)NULL, - (void*)func_80CB1840, -}; - -/* 80CB1914-80CB1920 000078 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80CB1920-80CB192C 000084 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80CB192C-80CB1938 000090 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80CB1938-80CB1944 00009C 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80CB1944-80CB1950 0000A8 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80CB1950-80CB195C 0000B4 000C+00 2/2 0/0 0/0 .data __vt__13daObj_Pleaf_c */ -SECTION_DATA extern void* __vt__13daObj_Pleaf_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__13daObj_Pleaf_cFv, -}; +static char* l_resName = "J_Hatake"; /* 80CB0D4C-80CB0F08 0000EC 01BC+00 1/0 0/0 0/0 .text __dt__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Pleaf_c::~daObj_Pleaf_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__13daObj_Pleaf_cFv.s" +daObj_Pleaf_c::~daObj_Pleaf_c() { + dComIfG_resDelete(&mPhaseReq, getResName()); } -#pragma pop -/* ############################################################################################## */ /* 80CB1864-80CB1874 000000 0010+00 2/2 0/0 0/0 .rodata m__19daObj_Pleaf_Param_c */ -SECTION_RODATA u8 const daObj_Pleaf_Param_c::m[16] = { - 0x00, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0x61, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CB1864, &daObj_Pleaf_Param_c::m); - -/* 80CB1874-80CB1878 000010 0004+00 0/1 0/0 0/0 .rodata @3905 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3905 = -300.0f; -COMPILER_STRIP_GATE(0x80CB1874, &lit_3905); -#pragma pop - -/* 80CB1878-80CB187C 000014 0004+00 0/1 0/0 0/0 .rodata @3906 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3906 = -50.0f; -COMPILER_STRIP_GATE(0x80CB1878, &lit_3906); -#pragma pop - -/* 80CB187C-80CB1880 000018 0004+00 0/1 0/0 0/0 .rodata @3907 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3907 = 300.0f; -COMPILER_STRIP_GATE(0x80CB187C, &lit_3907); -#pragma pop - -/* 80CB1880-80CB1884 00001C 0004+00 1/2 0/0 0/0 .rodata @3908 */ -SECTION_RODATA static f32 const lit_3908 = 50.0f; -COMPILER_STRIP_GATE(0x80CB1880, &lit_3908); - -/* 80CB1884-80CB1888 000020 0004+00 1/3 0/0 0/0 .rodata @3909 */ -SECTION_RODATA static f32 const lit_3909 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80CB1884, &lit_3909); +daObj_Pleaf_Param_c::params const daObj_Pleaf_Param_c::m = {0, -3.0f, 1.0f, 900.0f}; /* 80CB0F08-80CB1180 0002A8 0278+00 1/1 0/0 0/0 .text create__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/create__13daObj_Pleaf_cFv.s" +int daObj_Pleaf_c::create() { + fopAcM_SetupActor(this, daObj_Pleaf_c); + mType = getType(); + int phase = dComIfG_resLoad(&mPhaseReq, getResName()); + if (phase == cPhs_COMPLEATE_e) { + if (isDelete()) { + return cPhs_ERROR_e; + } + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x810)) { + return cPhs_ERROR_e; + } + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 50.0f, 300.0f); + mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), + fopAcM_GetShapeAngle_p(this)); + mStts.Init(0xFF, 0, this); + cXyz new_pos = current.pos; + new_pos.y += 50.0f; + mGndChk.SetPos(&new_pos); + mGroundDist = dComIfG_Bgsp().GroundCross(&mGndChk); + if (mGroundDist != -1000000000.0f) { + setEnvTevColor(); + setRoomNo(); + } + Execute(); + } + return phase; } -#pragma pop - -/* 80CB1180-80CB11C8 000520 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__8cM3dGSphFv.s" -} -#pragma pop - -/* 80CB11C8-80CB1210 000568 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_pleaf/d_a_obj_pleaf/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80CB1210-80CB1280 0005B0 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80CB1280-80CB12DC 000620 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80CB12DC-80CB134C 00067C 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_pleaf/d_a_obj_pleaf/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 80CB134C-80CB13C4 0006EC 0078+00 1/1 0/0 0/0 .text CreateHeap__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/CreateHeap__13daObj_Pleaf_cFv.s" +int daObj_Pleaf_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getResName(), 3); + if (modelData == NULL) { + return 0; + } + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel != NULL) { + return 1; + } + return 0; } -#pragma pop /* 80CB13C4-80CB13F8 000764 0034+00 1/1 0/0 0/0 .text Delete__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Delete__13daObj_Pleaf_cFv.s" +int daObj_Pleaf_c::Delete() { + this->~daObj_Pleaf_c(); + return 1; } -#pragma pop /* 80CB13F8-80CB14D4 000798 00DC+00 2/2 0/0 0/0 .text Execute__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Execute__13daObj_Pleaf_cFv.s" +int daObj_Pleaf_c::Execute() { + cXyz new_pos = current.pos; + new_pos.y += 50.0f; + mGndChk.SetPos(&new_pos); + mGroundDist = dComIfG_Bgsp().GroundCross(&mGndChk); + if (mGroundDist != -1000000000.0f) { + setEnvTevColor(); + setRoomNo(); + } + setMtx(); + attention_info.position = current.pos; + eyePos = attention_info.position; + attention_info.flags = 0; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CB1888-80CB188C 000024 0004+00 0/1 0/0 0/0 .rodata @4025 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4025 = 20.0f; -COMPILER_STRIP_GATE(0x80CB1888, &lit_4025); -#pragma pop - -/* 80CB188C-80CB1890 000028 0004+00 0/1 0/0 0/0 .rodata @4026 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4026 = 1.0f; -COMPILER_STRIP_GATE(0x80CB188C, &lit_4026); -#pragma pop /* 80CB14D4-80CB1598 000874 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/Draw__13daObj_Pleaf_cFv.s" +int daObj_Pleaf_c::Draw() { + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + mDoExt_modelUpdateDL(mpModel); + if (mGroundDist != -1000000000.0f) { + mShadowKey = + dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos, + daObj_Pleaf_Param_c::m.field_0xc, 20.0f, current.pos.y, mGroundDist, + mGndChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + } + return 1; } -#pragma pop /* 80CB1598-80CB15B8 000938 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c.s" +int daObj_Pleaf_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80CB15B8-80CB15C8 000958 0010+00 3/3 0/0 0/0 .text getResName__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::getResName() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/getResName__13daObj_Pleaf_cFv.s" +char* daObj_Pleaf_c::getResName() { + return l_resName; } -#pragma pop /* 80CB15C8-80CB15E8 000968 0020+00 1/1 0/0 0/0 .text isDelete__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::isDelete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/isDelete__13daObj_Pleaf_cFv.s" +int daObj_Pleaf_c::isDelete() { + switch (mType) { + case 0: + return 0; + default: + return 0; + } } -#pragma pop /* 80CB15E8-80CB1644 000988 005C+00 2/2 0/0 0/0 .text setEnvTevColor__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::setEnvTevColor() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setEnvTevColor__13daObj_Pleaf_cFv.s" +void daObj_Pleaf_c::setEnvTevColor() { + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } -#pragma pop /* 80CB1644-80CB1684 0009E4 0040+00 2/2 0/0 0/0 .text setRoomNo__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::setRoomNo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setRoomNo__13daObj_Pleaf_cFv.s" +void daObj_Pleaf_c::setRoomNo() { + fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk)); } -#pragma pop /* 80CB1684-80CB16E8 000A24 0064+00 1/1 0/0 0/0 .text setMtx__13daObj_Pleaf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Pleaf_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/setMtx__13daObj_Pleaf_cFv.s" +void daObj_Pleaf_c::setMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* 80CB16E8-80CB1708 000A88 0020+00 1/0 0/0 0/0 .text daObj_Pleaf_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Pleaf_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Create__FPv.s" +static int daObj_Pleaf_Create(void* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80CB1708-80CB1728 000AA8 0020+00 1/0 0/0 0/0 .text daObj_Pleaf_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Pleaf_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Delete__FPv.s" +static int daObj_Pleaf_Delete(void* i_this) { + return static_cast(i_this)->Delete(); } -#pragma pop /* 80CB1728-80CB1748 000AC8 0020+00 1/0 0/0 0/0 .text daObj_Pleaf_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Pleaf_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Execute__FPv.s" +static int daObj_Pleaf_Execute(void* i_this) { + return static_cast(i_this)->Execute(); } -#pragma pop /* 80CB1748-80CB1768 000AE8 0020+00 1/0 0/0 0/0 .text daObj_Pleaf_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Pleaf_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/daObj_Pleaf_Draw__FPv.s" +static int daObj_Pleaf_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } -#pragma pop /* 80CB1768-80CB1770 000B08 0008+00 1/0 0/0 0/0 .text daObj_Pleaf_IsDelete__FPv */ -static bool daObj_Pleaf_IsDelete(void* param_0) { - return true; +static int daObj_Pleaf_IsDelete(void* i_this) { + return 1; } -/* 80CB1770-80CB17B8 000B10 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80CB195C-80CB1968 0000C0 000C+00 2/2 0/0 0/0 .data __vt__19daObj_Pleaf_Param_c */ -SECTION_DATA extern void* __vt__19daObj_Pleaf_Param_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19daObj_Pleaf_Param_cFv, +/* 80CB18A0-80CB18C0 -00001 0020+00 1/0 0/0 0/0 .data daObj_Pleaf_MethodTable */ +static actor_method_class daObj_Pleaf_MethodTable = { + (process_method_func)daObj_Pleaf_Create, (process_method_func)daObj_Pleaf_Delete, + (process_method_func)daObj_Pleaf_Execute, (process_method_func)daObj_Pleaf_IsDelete, + (process_method_func)daObj_Pleaf_Draw, }; -/* 80CB1970-80CB197C 000008 000C+00 1/1 0/0 0/0 .bss @3805 */ -static u8 lit_3805[12]; +/* 80CB18C0-80CB18F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_PLEAF */ +extern actor_process_profile_definition g_profile_OBJ_PLEAF = { + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_PLEAF, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObj_Pleaf_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 713, // mPriority + &daObj_Pleaf_MethodTable, // sub_method + 0x44100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; /* 80CB197C-80CB1980 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[4]; - -/* 80CB17B8-80CB17F8 000B58 0040+00 0/0 1/0 0/0 .text __sinit_d_a_obj_pleaf_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_pleaf_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__sinit_d_a_obj_pleaf_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CB17B8, __sinit_d_a_obj_pleaf_cpp); -#pragma pop - -/* 80CB17F8-80CB1840 000B98 0048+00 2/1 0/0 0/0 .text __dt__19daObj_Pleaf_Param_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Pleaf_Param_c::~daObj_Pleaf_Param_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/__dt__19daObj_Pleaf_Param_cFv.s" -} -#pragma pop - -/* 80CB1840-80CB1848 000BE0 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_80CB1840() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1840.s" -} -#pragma pop - -/* 80CB1848-80CB1850 000BE8 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_80CB1848() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf/func_80CB1848.s" -} -#pragma pop - -/* 80CB1890-80CB1890 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +static daObj_Pleaf_Param_c l_HIO;