diff --git a/Progress.md b/Progress.md index 89f734518ae..5bd5023fd22 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 46.158868% | 1660124 | 3596544 +.text | 46.432575% | 1669968 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 51.833624% | 2084060 | 4020672 +Total | 52.078459% | 2093904 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 51.833624% | 2084060 | 4020672 -RELs | 35.763653% | 4112936 | 11500324 -Total | 39.926536% | 6196996 | 15520996 +main.dol | 52.078459% | 2093904 | 4020672 +RELs | 35.988169% | 4138756 | 11500324 +Total | 40.156315% | 6232660 | 15520996 ## RELs @@ -138,7 +138,7 @@ d_a_e_nz | 32.041969% | 4764 | 14868 d_a_e_oc | 22.586920% | 11148 | 49356 d_a_e_oct_bg | 30.217151% | 6568 | 21736 d_a_e_ot | 32.497589% | 5392 | 16592 -d_a_e_ph | 23.274129% | 5556 | 23872 +d_a_e_ph | 100.000000% | 23872 | 23872 d_a_e_pm | 21.505129% | 11236 | 52248 d_a_e_po | 23.824220% | 14204 | 59620 d_a_e_pz | 27.469575% | 13904 | 50616 @@ -169,7 +169,7 @@ d_a_e_ws | 29.700483% | 6148 | 20700 d_a_e_ww | 23.418134% | 10052 | 42924 d_a_e_yc | 30.733107% | 4712 | 15332 d_a_e_yd | 27.879315% | 7688 | 27576 -d_a_e_yd_leaf | 54.022989% | 1128 | 2088 +d_a_e_yd_leaf | 100.000000% | 2088 | 2088 d_a_e_yg | 28.386013% | 7436 | 26196 d_a_e_yh | 26.277603% | 9996 | 38040 d_a_e_yk | 31.079076% | 5864 | 18868 @@ -487,7 +487,7 @@ d_a_obj_lv2Candle | 100.000000% | 6960 | 6960 d_a_obj_lv3Candle | 45.638126% | 2260 | 4952 d_a_obj_lv3Water | 44.263566% | 4568 | 10320 d_a_obj_lv3Water2 | 41.786571% | 2788 | 6672 -d_a_obj_lv3WaterB | 46.278317% | 1716 | 3708 +d_a_obj_lv3WaterB | 100.000000% | 3708 | 3708 d_a_obj_lv3saka00 | 100.000000% | 2776 | 2776 d_a_obj_lv3waterEff | 100.000000% | 1704 | 1704 d_a_obj_lv4CandleDemoTag | 80.688935% | 3092 | 3832 @@ -557,7 +557,7 @@ d_a_obj_nan | 33.293811% | 5616 | 16868 d_a_obj_ndoor | 51.957831% | 1380 | 2656 d_a_obj_nougu | 42.325581% | 2548 | 6020 d_a_obj_octhashi | 35.325420% | 3452 | 9772 -d_a_obj_oiltubo | 40.168244% | 3056 | 7608 +d_a_obj_oiltubo | 100.000000% | 7608 | 7608 d_a_obj_onsen | 100.000000% | 2892 | 2892 d_a_obj_onsenFire | 100.000000% | 1296 | 1296 d_a_obj_onsenTaru | 38.567616% | 3468 | 8992 @@ -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.763653% | 4112936 | 11500324 +Total | 35.988169% | 4138756 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 62afd6c3eb3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C5BB8C: -/* 80C5BB8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5BB90 7C 08 02 A6 */ mflr r0 -/* 80C5BB94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5BB98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5BB9C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5BBA0 41 82 00 1C */ beq lbl_80C5BBBC -/* 80C5BBA4 3C A0 80 C6 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80C5BDD4@ha */ -/* 80C5BBA8 38 05 BD D4 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80C5BDD4@l */ -/* 80C5BBAC 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5BBB0 7C 80 07 35 */ extsh. r0, r4 -/* 80C5BBB4 40 81 00 08 */ ble lbl_80C5BBBC -/* 80C5BBB8 4B 67 31 85 */ bl __dl__FPv -lbl_80C5BBBC: -/* 80C5BBBC 7F E3 FB 78 */ mr r3, r31 -/* 80C5BBC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5BBC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5BBC8 7C 08 03 A6 */ mtlr r0 -/* 80C5BBCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5BBD0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/action__FP19obj_lv3WaterB_class.s b/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/action__FP19obj_lv3WaterB_class.s deleted file mode 100644 index a3c7fa6f36b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/action__FP19obj_lv3WaterB_class.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_80C5B71C: -/* 80C5B71C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5B720 7C 08 02 A6 */ mflr r0 -/* 80C5B724 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5B728 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5B72C 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5B730 7C 7F 1B 78 */ mr r31, r3 -/* 80C5B734 3C 60 80 C6 */ lis r3, lit_3724@ha /* 0x80C5BD50@ha */ -/* 80C5B738 3B C3 BD 50 */ addi r30, r3, lit_3724@l /* 0x80C5BD50@l */ -/* 80C5B73C A8 1F 05 84 */ lha r0, 0x584(r31) -/* 80C5B740 2C 00 00 01 */ cmpwi r0, 1 -/* 80C5B744 41 82 00 18 */ beq lbl_80C5B75C -/* 80C5B748 40 80 00 08 */ bge lbl_80C5B750 -/* 80C5B74C 48 00 00 9C */ b lbl_80C5B7E8 -lbl_80C5B750: -/* 80C5B750 2C 00 00 03 */ cmpwi r0, 3 -/* 80C5B754 40 80 00 94 */ bge lbl_80C5B7E8 -/* 80C5B758 48 00 00 28 */ b lbl_80C5B780 -lbl_80C5B75C: -/* 80C5B75C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5B760 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5B764 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C5B768 80 9F 05 F4 */ lwz r4, 0x5f4(r31) -/* 80C5B76C 4B 41 8A E5 */ bl Release__4cBgSFP9dBgW_Base -/* 80C5B770 38 00 00 00 */ li r0, 0 -/* 80C5B774 90 1F 05 80 */ stw r0, 0x580(r31) -/* 80C5B778 B0 1F 05 84 */ sth r0, 0x584(r31) -/* 80C5B77C 48 00 00 6C */ b lbl_80C5B7E8 -lbl_80C5B780: -/* 80C5B780 38 60 00 04 */ li r3, 4 -/* 80C5B784 38 80 00 04 */ li r4, 4 -/* 80C5B788 C0 3E 00 08 */ lfs f1, 8(r30) -/* 80C5B78C 4B 54 D0 81 */ bl dKy_custom_colset__FUcUcf -/* 80C5B790 A8 1F 05 86 */ lha r0, 0x586(r31) -/* 80C5B794 2C 00 00 00 */ cmpwi r0, 0 -/* 80C5B798 40 82 00 2C */ bne lbl_80C5B7C4 -/* 80C5B79C C0 7E 00 0C */ lfs f3, 0xc(r30) -/* 80C5B7A0 C0 5E 00 10 */ lfs f2, 0x10(r30) -/* 80C5B7A4 C0 3F 04 AC */ lfs f1, 0x4ac(r31) -/* 80C5B7A8 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 80C5B7AC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C5B7B0 EC 02 00 2A */ fadds f0, f2, f0 -/* 80C5B7B4 EC 03 00 2A */ fadds f0, f3, f0 -/* 80C5B7B8 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80C5B7BC 38 00 00 01 */ li r0, 1 -/* 80C5B7C0 B0 1F 05 86 */ sth r0, 0x586(r31) -lbl_80C5B7C4: -/* 80C5B7C4 38 7F 04 D4 */ addi r3, r31, 0x4d4 -/* 80C5B7C8 C0 5E 00 10 */ lfs f2, 0x10(r30) -/* 80C5B7CC C0 3F 04 AC */ lfs f1, 0x4ac(r31) -/* 80C5B7D0 C0 1E 00 14 */ lfs f0, 0x14(r30) -/* 80C5B7D4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C5B7D8 EC 22 00 2A */ fadds f1, f2, f0 -/* 80C5B7DC C0 5E 00 18 */ lfs f2, 0x18(r30) -/* 80C5B7E0 C0 7E 00 1C */ lfs f3, 0x1c(r30) -/* 80C5B7E4 4B 61 42 59 */ bl cLib_addCalc2__FPffff -lbl_80C5B7E8: -/* 80C5B7E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5B7EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5B7F0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C5B7F4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C5B7F8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C5B7FC 4B 6E B0 ED */ bl PSMTXTrans -/* 80C5B800 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5B804 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5B808 80 9F 05 78 */ lwz r4, 0x578(r31) -/* 80C5B80C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C5B810 4B 6E AC A1 */ bl PSMTXCopy -/* 80C5B814 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5B818 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5B81C 38 9F 05 8C */ addi r4, r31, 0x58c -/* 80C5B820 4B 6E AC 91 */ bl PSMTXCopy -/* 80C5B824 80 7F 05 BC */ lwz r3, 0x5bc(r31) -/* 80C5B828 4B 42 01 99 */ bl Move__4dBgWFv -/* 80C5B82C 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80C5B830 4B 3B 1B F9 */ bl play__14mDoExt_baseAnmFv -/* 80C5B834 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 80C5B838 28 00 00 00 */ cmplwi r0, 0 -/* 80C5B83C 41 82 00 48 */ beq lbl_80C5B884 -/* 80C5B840 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5B844 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5B848 C0 3E 00 08 */ lfs f1, 8(r30) -/* 80C5B84C FC 40 08 90 */ fmr f2, f1 -/* 80C5B850 FC 60 08 90 */ fmr f3, f1 -/* 80C5B854 4B 6E B0 95 */ bl PSMTXTrans -/* 80C5B858 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5B85C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5B860 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 80C5B864 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C5B868 4B 6E AC 49 */ bl PSMTXCopy -/* 80C5B86C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5B870 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5B874 38 9F 05 C4 */ addi r4, r31, 0x5c4 -/* 80C5B878 4B 6E AC 39 */ bl PSMTXCopy -/* 80C5B87C 80 7F 05 F4 */ lwz r3, 0x5f4(r31) -/* 80C5B880 4B 42 01 41 */ bl Move__4dBgWFv -lbl_80C5B884: -/* 80C5B884 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5B888 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5B88C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5B890 7C 08 03 A6 */ mtlr r0 -/* 80C5B894 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5B898 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Create__FP10fopAc_ac_c.s deleted file mode 100644 index b330cc6d149..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_80C5BBD4: -/* 80C5BBD4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C5BBD8 7C 08 02 A6 */ mflr r0 -/* 80C5BBDC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C5BBE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C5BBE4 4B 70 65 F9 */ bl _savegpr_29 -/* 80C5BBE8 7C 7F 1B 78 */ mr r31, r3 -/* 80C5BBEC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C5BBF0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C5BBF4 40 82 00 1C */ bne lbl_80C5BC10 -/* 80C5BBF8 28 1F 00 00 */ cmplwi r31, 0 -/* 80C5BBFC 41 82 00 08 */ beq lbl_80C5BC04 -/* 80C5BC00 4B 3B CF 65 */ bl __ct__10fopAc_ac_cFv -lbl_80C5BC04: -/* 80C5BC04 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C5BC08 60 00 00 08 */ ori r0, r0, 8 -/* 80C5BC0C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C5BC10: -/* 80C5BC10 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80C5BC14 3C 80 80 C6 */ lis r4, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5BC18 38 84 BD 70 */ addi r4, r4, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5BC1C 4B 3D 12 A1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C5BC20 7C 7E 1B 78 */ mr r30, r3 -/* 80C5BC24 38 7F 05 70 */ addi r3, r31, 0x570 -/* 80C5BC28 3C 80 80 C6 */ lis r4, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5BC2C 38 84 BD 70 */ addi r4, r4, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5BC30 38 84 00 0A */ addi r4, r4, 0xa -/* 80C5BC34 4B 3D 12 89 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C5BC38 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C5BC3C 40 82 00 E4 */ bne lbl_80C5BD20 -/* 80C5BC40 2C 03 00 04 */ cmpwi r3, 4 -/* 80C5BC44 40 82 00 DC */ bne lbl_80C5BD20 -/* 80C5BC48 7F E3 FB 78 */ mr r3, r31 -/* 80C5BC4C 3C 80 80 C6 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80C5B94C@ha */ -/* 80C5BC50 38 84 B9 4C */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80C5B94C@l */ -/* 80C5BC54 3C A0 00 05 */ lis r5, 0x0005 /* 0x0004B000@ha */ -/* 80C5BC58 38 A5 B0 00 */ addi r5, r5, 0xB000 /* 0x0004B000@l */ -/* 80C5BC5C 4B 3B E8 55 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80C5BC60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5BC64 40 82 00 0C */ bne lbl_80C5BC70 -/* 80C5BC68 38 60 00 05 */ li r3, 5 -/* 80C5BC6C 48 00 00 C4 */ b lbl_80C5BD30 -lbl_80C5BC70: -/* 80C5BC70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5BC74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5BC78 3B A3 0F 38 */ addi r29, r3, 0xf38 -/* 80C5BC7C 7F A3 EB 78 */ mr r3, r29 -/* 80C5BC80 80 9F 05 BC */ lwz r4, 0x5bc(r31) -/* 80C5BC84 7F E5 FB 78 */ mr r5, r31 -/* 80C5BC88 4B 41 8D 81 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C5BC8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5BC90 41 82 00 0C */ beq lbl_80C5BC9C -/* 80C5BC94 38 60 00 05 */ li r3, 5 -/* 80C5BC98 48 00 00 98 */ b lbl_80C5BD30 -lbl_80C5BC9C: -/* 80C5BC9C 7F A3 EB 78 */ mr r3, r29 -/* 80C5BCA0 80 9F 05 F4 */ lwz r4, 0x5f4(r31) -/* 80C5BCA4 7F E5 FB 78 */ mr r5, r31 -/* 80C5BCA8 4B 41 8D 61 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C5BCAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C5BCB0 41 82 00 0C */ beq lbl_80C5BCBC -/* 80C5BCB4 38 60 00 05 */ li r3, 5 -/* 80C5BCB8 48 00 00 78 */ b lbl_80C5BD30 -lbl_80C5BCBC: -/* 80C5BCBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5BCC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5BCC4 38 63 09 58 */ addi r3, r3, 0x958 -/* 80C5BCC8 38 80 00 03 */ li r4, 3 -/* 80C5BCCC 4B 3D 8C 69 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80C5BCD0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5BCD4 41 82 00 3C */ beq lbl_80C5BD10 -/* 80C5BCD8 3C 60 80 C6 */ lis r3, lit_3752@ha /* 0x80C5BD60@ha */ -/* 80C5BCDC C0 43 BD 60 */ lfs f2, lit_3752@l(r3) /* 0x80C5BD60@l */ -/* 80C5BCE0 C0 3F 04 AC */ lfs f1, 0x4ac(r31) -/* 80C5BCE4 3C 60 80 C6 */ lis r3, lit_3753@ha /* 0x80C5BD64@ha */ -/* 80C5BCE8 C0 03 BD 64 */ lfs f0, lit_3753@l(r3) /* 0x80C5BD64@l */ -/* 80C5BCEC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C5BCF0 EC 02 00 2A */ fadds f0, f2, f0 -/* 80C5BCF4 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80C5BCF8 38 00 00 02 */ li r0, 2 -/* 80C5BCFC B0 1F 05 84 */ sth r0, 0x584(r31) -/* 80C5BD00 38 00 00 01 */ li r0, 1 -/* 80C5BD04 B0 1F 05 86 */ sth r0, 0x586(r31) -/* 80C5BD08 38 00 00 00 */ li r0, 0 -/* 80C5BD0C 90 1F 05 80 */ stw r0, 0x580(r31) -lbl_80C5BD10: -/* 80C5BD10 7F E3 FB 78 */ mr r3, r31 -/* 80C5BD14 4B FF FB 89 */ bl daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class -/* 80C5BD18 7F C3 F3 78 */ mr r3, r30 -/* 80C5BD1C 48 00 00 14 */ b lbl_80C5BD30 -lbl_80C5BD20: -/* 80C5BD20 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C5BD24 40 82 00 08 */ bne lbl_80C5BD2C -/* 80C5BD28 48 00 00 08 */ b lbl_80C5BD30 -lbl_80C5BD2C: -/* 80C5BD2C 7F C3 F3 78 */ mr r3, r30 -lbl_80C5BD30: -/* 80C5BD30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C5BD34 4B 70 64 F5 */ bl _restgpr_29 -/* 80C5BD38 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C5BD3C 7C 08 03 A6 */ mtlr r0 -/* 80C5BD40 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C5BD44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class.s b/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class.s deleted file mode 100644 index 7cba74e12d3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C5B8C8: -/* 80C5B8C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5B8CC 7C 08 02 A6 */ mflr r0 -/* 80C5B8D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5B8D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5B8D8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5B8DC 7C 7E 1B 78 */ mr r30, r3 -/* 80C5B8E0 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80C5B8E4 3C 80 80 C6 */ lis r4, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5B8E8 38 84 BD 70 */ addi r4, r4, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5B8EC 4B 3D 17 1D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C5B8F0 38 7E 05 70 */ addi r3, r30, 0x570 -/* 80C5B8F4 3C 80 80 C6 */ lis r4, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5B8F8 38 84 BD 70 */ addi r4, r4, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5B8FC 38 84 00 0A */ addi r4, r4, 0xa -/* 80C5B900 4B 3D 17 09 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C5B904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5B908 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5B90C 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80C5B910 7F E3 FB 78 */ mr r3, r31 -/* 80C5B914 80 9E 05 BC */ lwz r4, 0x5bc(r30) -/* 80C5B918 4B 41 89 39 */ bl Release__4cBgSFP9dBgW_Base -/* 80C5B91C 80 9E 05 F4 */ lwz r4, 0x5f4(r30) -/* 80C5B920 28 04 00 00 */ cmplwi r4, 0 -/* 80C5B924 41 82 00 0C */ beq lbl_80C5B930 -/* 80C5B928 7F E3 FB 78 */ mr r3, r31 -/* 80C5B92C 4B 41 89 25 */ bl Release__4cBgSFP9dBgW_Base -lbl_80C5B930: -/* 80C5B930 38 60 00 01 */ li r3, 1 -/* 80C5B934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5B938 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5B93C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5B940 7C 08 03 A6 */ mtlr r0 -/* 80C5B944 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5B948 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class.s b/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class.s deleted file mode 100644 index e245497796a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_80C5B578: -/* 80C5B578 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80C5B57C 7C 08 02 A6 */ mflr r0 -/* 80C5B580 90 01 00 54 */ stw r0, 0x54(r1) -/* 80C5B584 39 61 00 50 */ addi r11, r1, 0x50 -/* 80C5B588 4B 70 6C 51 */ bl _savegpr_28 -/* 80C5B58C 7C 7D 1B 78 */ mr r29, r3 -/* 80C5B590 3C 60 80 C6 */ lis r3, lit_3724@ha /* 0x80C5BD50@ha */ -/* 80C5B594 3B C3 BD 50 */ addi r30, r3, lit_3724@l /* 0x80C5BD50@l */ -/* 80C5B598 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C5B59C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5B5A0 38 80 00 10 */ li r4, 0x10 -/* 80C5B5A4 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80C5B5A8 38 DD 01 0C */ addi r6, r29, 0x10c -/* 80C5B5AC 4B 54 82 19 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C5B5B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C5B5B4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5B5B8 80 9D 05 78 */ lwz r4, 0x578(r29) -/* 80C5B5BC 80 84 00 04 */ lwz r4, 4(r4) -/* 80C5B5C0 38 BD 01 0C */ addi r5, r29, 0x10c -/* 80C5B5C4 4B 54 97 DD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C5B5C8 80 7D 05 78 */ lwz r3, 0x578(r29) -/* 80C5B5CC 80 83 00 04 */ lwz r4, 4(r3) -/* 80C5B5D0 80 7D 05 7C */ lwz r3, 0x57c(r29) -/* 80C5B5D4 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80C5B5D8 38 84 00 58 */ addi r4, r4, 0x58 -/* 80C5B5DC 4B 3B 20 FD */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80C5B5E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5B5E4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5B5E8 80 04 5F A0 */ lwz r0, 0x5fa0(r4) -/* 80C5B5EC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C5B5F0 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C5B5F4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C5B5F8 80 04 5F A4 */ lwz r0, 0x5fa4(r4) -/* 80C5B5FC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C5B600 80 7D 05 78 */ lwz r3, 0x578(r29) -/* 80C5B604 80 63 00 04 */ lwz r3, 4(r3) -/* 80C5B608 80 63 00 60 */ lwz r3, 0x60(r3) -/* 80C5B60C 83 83 00 00 */ lwz r28, 0(r3) -/* 80C5B610 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 80C5B614 38 80 00 00 */ li r4, 0 -/* 80C5B618 81 83 00 00 */ lwz r12, 0(r3) -/* 80C5B61C 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 80C5B620 7D 89 03 A6 */ mtctr r12 -/* 80C5B624 4E 80 04 21 */ bctrl -/* 80C5B628 28 03 00 00 */ cmplwi r3, 0 -/* 80C5B62C 41 82 00 74 */ beq lbl_80C5B6A0 -/* 80C5B630 80 7C 00 28 */ lwz r3, 0x28(r28) -/* 80C5B634 38 80 00 00 */ li r4, 0 -/* 80C5B638 81 83 00 00 */ lwz r12, 0(r3) -/* 80C5B63C 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 80C5B640 7D 89 03 A6 */ mtctr r12 -/* 80C5B644 4E 80 04 21 */ bctrl -/* 80C5B648 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80C5B64C 41 82 00 54 */ beq lbl_80C5B6A0 -/* 80C5B650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5B654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5B658 80 83 61 B0 */ lwz r4, 0x61b0(r3) -/* 80C5B65C 38 61 00 08 */ addi r3, r1, 8 -/* 80C5B660 C0 24 00 D0 */ lfs f1, 0xd0(r4) -/* 80C5B664 C0 44 00 D4 */ lfs f2, 0xd4(r4) -/* 80C5B668 C0 7E 00 00 */ lfs f3, 0(r30) -/* 80C5B66C FC 80 18 90 */ fmr f4, f3 -/* 80C5B670 C0 BE 00 04 */ lfs f5, 4(r30) -/* 80C5B674 C0 DE 00 08 */ lfs f6, 8(r30) -/* 80C5B678 4B 6E B5 A1 */ bl C_MTXLightPerspective -/* 80C5B67C 7F 83 E3 78 */ mr r3, r28 -/* 80C5B680 38 81 00 08 */ addi r4, r1, 8 -/* 80C5B684 4B 6C A1 11 */ bl setEffectMtx__13J3DTexMtxInfoFPA4_f -/* 80C5B688 80 7D 05 78 */ lwz r3, 0x578(r29) -/* 80C5B68C 80 63 00 04 */ lwz r3, 4(r3) -/* 80C5B690 38 80 00 00 */ li r4, 0 -/* 80C5B694 3C A0 80 3A */ lis r5, j3dDefaultMtx@ha /* 0x803A1E5C@ha */ -/* 80C5B698 38 A5 1E 5C */ addi r5, r5, j3dDefaultMtx@l /* 0x803A1E5C@l */ -/* 80C5B69C 4B 6C A9 71 */ bl simpleCalcMaterial__12J3DModelDataFUsPA4_f -lbl_80C5B6A0: -/* 80C5B6A0 80 7D 05 78 */ lwz r3, 0x578(r29) -/* 80C5B6A4 4B 3B 26 21 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C5B6A8 80 9D 05 80 */ lwz r4, 0x580(r29) -/* 80C5B6AC 28 04 00 00 */ cmplwi r4, 0 -/* 80C5B6B0 41 82 00 50 */ beq lbl_80C5B700 -/* 80C5B6B4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C5B6B8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5B6BC 80 84 00 04 */ lwz r4, 4(r4) -/* 80C5B6C0 38 BD 01 0C */ addi r5, r29, 0x10c -/* 80C5B6C4 4B 54 96 DD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C5B6C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5B6CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5B6D0 80 03 5F 70 */ lwz r0, 0x5f70(r3) -/* 80C5B6D4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C5B6D8 80 03 5F 74 */ lwz r0, 0x5f74(r3) -/* 80C5B6DC 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C5B6E0 80 7D 05 80 */ lwz r3, 0x580(r29) -/* 80C5B6E4 4B 3B 25 E1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C5B6E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5B6EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5B6F0 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C5B6F4 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C5B6F8 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C5B6FC 90 1F 00 4C */ stw r0, 0x4c(r31) -lbl_80C5B700: -/* 80C5B700 38 60 00 01 */ li r3, 1 -/* 80C5B704 39 61 00 50 */ addi r11, r1, 0x50 -/* 80C5B708 4B 70 6B 1D */ bl _restgpr_28 -/* 80C5B70C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80C5B710 7C 08 03 A6 */ mtlr r0 -/* 80C5B714 38 21 00 50 */ addi r1, r1, 0x50 -/* 80C5B718 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class.s b/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class.s deleted file mode 100644 index 0d58d983b44..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80C5B89C: -/* 80C5B89C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5B8A0 7C 08 02 A6 */ mflr r0 -/* 80C5B8A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5B8A8 4B FF FE 75 */ bl action__FP19obj_lv3WaterB_class -/* 80C5B8AC 38 60 00 01 */ li r3, 1 -/* 80C5B8B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5B8B4 7C 08 03 A6 */ mtlr r0 -/* 80C5B8B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5B8BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index ee1cfd2e072..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,156 +0,0 @@ -lbl_80C5B94C: -/* 80C5B94C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C5B950 7C 08 02 A6 */ mflr r0 -/* 80C5B954 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C5B958 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C5B95C 4B 70 68 81 */ bl _savegpr_29 -/* 80C5B960 7C 7E 1B 78 */ mr r30, r3 -/* 80C5B964 3C 60 80 C6 */ lis r3, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5B968 38 63 BD 70 */ addi r3, r3, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5B96C 38 80 00 05 */ li r4, 5 -/* 80C5B970 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5B974 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5B978 3F E5 00 02 */ addis r31, r5, 2 -/* 80C5B97C 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80C5B980 7F E5 FB 78 */ mr r5, r31 -/* 80C5B984 38 C0 00 80 */ li r6, 0x80 -/* 80C5B988 4B 3E 09 65 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C5B98C 3C 80 00 08 */ lis r4, 8 -/* 80C5B990 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80C5B994 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80C5B998 4B 3B 92 BD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C5B99C 90 7E 05 78 */ stw r3, 0x578(r30) -/* 80C5B9A0 80 1E 05 78 */ lwz r0, 0x578(r30) -/* 80C5B9A4 28 00 00 00 */ cmplwi r0, 0 -/* 80C5B9A8 40 82 00 0C */ bne lbl_80C5B9B4 -/* 80C5B9AC 38 60 00 00 */ li r3, 0 -/* 80C5B9B0 48 00 01 C4 */ b lbl_80C5BB74 -lbl_80C5B9B4: -/* 80C5B9B4 38 60 00 18 */ li r3, 0x18 -/* 80C5B9B8 4B 67 32 95 */ bl __nw__FUl -/* 80C5B9BC 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80C5B9C0 41 82 00 20 */ beq lbl_80C5B9E0 -/* 80C5B9C4 3C 80 80 C6 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80C5BDD4@ha */ -/* 80C5B9C8 38 04 BD D4 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80C5BDD4@l */ -/* 80C5B9CC 90 1D 00 00 */ stw r0, 0(r29) -/* 80C5B9D0 38 80 00 00 */ li r4, 0 -/* 80C5B9D4 4B 6C CA 29 */ bl init__12J3DFrameCtrlFs -/* 80C5B9D8 38 00 00 00 */ li r0, 0 -/* 80C5B9DC 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80C5B9E0: -/* 80C5B9E0 93 BE 05 7C */ stw r29, 0x57c(r30) -/* 80C5B9E4 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 80C5B9E8 28 00 00 00 */ cmplwi r0, 0 -/* 80C5B9EC 40 82 00 0C */ bne lbl_80C5B9F8 -/* 80C5B9F0 38 60 00 00 */ li r3, 0 -/* 80C5B9F4 48 00 01 80 */ b lbl_80C5BB74 -lbl_80C5B9F8: -/* 80C5B9F8 3C 60 80 C6 */ lis r3, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5B9FC 38 63 BD 70 */ addi r3, r3, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5BA00 38 80 00 08 */ li r4, 8 -/* 80C5BA04 7F E5 FB 78 */ mr r5, r31 -/* 80C5BA08 38 C0 00 80 */ li r6, 0x80 -/* 80C5BA0C 4B 3E 08 E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C5BA10 7C 65 1B 78 */ mr r5, r3 -/* 80C5BA14 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80C5BA18 80 83 00 04 */ lwz r4, 4(r3) -/* 80C5BA1C 80 7E 05 7C */ lwz r3, 0x57c(r30) -/* 80C5BA20 38 84 00 58 */ addi r4, r4, 0x58 -/* 80C5BA24 38 C0 00 01 */ li r6, 1 -/* 80C5BA28 38 E0 00 02 */ li r7, 2 -/* 80C5BA2C 3D 00 80 C6 */ lis r8, lit_3724@ha /* 0x80C5BD50@ha */ -/* 80C5BA30 C0 28 BD 50 */ lfs f1, lit_3724@l(r8) /* 0x80C5BD50@l */ -/* 80C5BA34 39 00 00 00 */ li r8, 0 -/* 80C5BA38 39 20 FF FF */ li r9, -1 -/* 80C5BA3C 4B 3B 1C 01 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80C5BA40 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5BA44 40 82 00 0C */ bne lbl_80C5BA50 -/* 80C5BA48 38 60 00 00 */ li r3, 0 -/* 80C5BA4C 48 00 01 28 */ b lbl_80C5BB74 -lbl_80C5BA50: -/* 80C5BA50 38 60 00 C0 */ li r3, 0xc0 -/* 80C5BA54 4B 67 31 F9 */ bl __nw__FUl -/* 80C5BA58 7C 60 1B 79 */ or. r0, r3, r3 -/* 80C5BA5C 41 82 00 0C */ beq lbl_80C5BA68 -/* 80C5BA60 4B 41 FF 11 */ bl __ct__4dBgWFv -/* 80C5BA64 7C 60 1B 78 */ mr r0, r3 -lbl_80C5BA68: -/* 80C5BA68 90 1E 05 BC */ stw r0, 0x5bc(r30) -/* 80C5BA6C 80 1E 05 BC */ lwz r0, 0x5bc(r30) -/* 80C5BA70 28 00 00 00 */ cmplwi r0, 0 -/* 80C5BA74 40 82 00 0C */ bne lbl_80C5BA80 -/* 80C5BA78 38 60 00 00 */ li r3, 0 -/* 80C5BA7C 48 00 00 F8 */ b lbl_80C5BB74 -lbl_80C5BA80: -/* 80C5BA80 3C 60 80 C6 */ lis r3, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5BA84 38 63 BD 70 */ addi r3, r3, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5BA88 38 80 00 0B */ li r4, 0xb -/* 80C5BA8C 7F E5 FB 78 */ mr r5, r31 -/* 80C5BA90 38 C0 00 80 */ li r6, 0x80 -/* 80C5BA94 4B 3E 08 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C5BA98 7C 64 1B 78 */ mr r4, r3 -/* 80C5BA9C 80 7E 05 BC */ lwz r3, 0x5bc(r30) -/* 80C5BAA0 38 A0 00 01 */ li r5, 1 -/* 80C5BAA4 38 DE 05 8C */ addi r6, r30, 0x58c -/* 80C5BAA8 4B 41 E4 91 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C5BAAC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80C5BAB0 28 00 00 01 */ cmplwi r0, 1 -/* 80C5BAB4 40 82 00 0C */ bne lbl_80C5BAC0 -/* 80C5BAB8 38 60 00 00 */ li r3, 0 -/* 80C5BABC 48 00 00 B8 */ b lbl_80C5BB74 -lbl_80C5BAC0: -/* 80C5BAC0 3C 60 80 C6 */ lis r3, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5BAC4 38 63 BD 70 */ addi r3, r3, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5BAC8 38 63 00 0A */ addi r3, r3, 0xa -/* 80C5BACC 38 80 00 04 */ li r4, 4 -/* 80C5BAD0 7F E5 FB 78 */ mr r5, r31 -/* 80C5BAD4 38 C0 00 80 */ li r6, 0x80 -/* 80C5BAD8 4B 3E 08 15 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C5BADC 3C 80 00 08 */ lis r4, 8 -/* 80C5BAE0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C5BAE4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C5BAE8 4B 3B 91 6D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C5BAEC 90 7E 05 80 */ stw r3, 0x580(r30) -/* 80C5BAF0 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 80C5BAF4 28 00 00 00 */ cmplwi r0, 0 -/* 80C5BAF8 40 82 00 0C */ bne lbl_80C5BB04 -/* 80C5BAFC 38 60 00 00 */ li r3, 0 -/* 80C5BB00 48 00 00 74 */ b lbl_80C5BB74 -lbl_80C5BB04: -/* 80C5BB04 38 60 00 C0 */ li r3, 0xc0 -/* 80C5BB08 4B 67 31 45 */ bl __nw__FUl -/* 80C5BB0C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80C5BB10 41 82 00 0C */ beq lbl_80C5BB1C -/* 80C5BB14 4B 41 FE 5D */ bl __ct__4dBgWFv -/* 80C5BB18 7C 60 1B 78 */ mr r0, r3 -lbl_80C5BB1C: -/* 80C5BB1C 90 1E 05 F4 */ stw r0, 0x5f4(r30) -/* 80C5BB20 80 1E 05 F4 */ lwz r0, 0x5f4(r30) -/* 80C5BB24 28 00 00 00 */ cmplwi r0, 0 -/* 80C5BB28 40 82 00 0C */ bne lbl_80C5BB34 -/* 80C5BB2C 38 60 00 00 */ li r3, 0 -/* 80C5BB30 48 00 00 44 */ b lbl_80C5BB74 -lbl_80C5BB34: -/* 80C5BB34 3C 60 80 C6 */ lis r3, d_a_obj_lv3WaterB__stringBase0@ha /* 0x80C5BD70@ha */ -/* 80C5BB38 38 63 BD 70 */ addi r3, r3, d_a_obj_lv3WaterB__stringBase0@l /* 0x80C5BD70@l */ -/* 80C5BB3C 38 63 00 0A */ addi r3, r3, 0xa -/* 80C5BB40 38 80 00 07 */ li r4, 7 -/* 80C5BB44 7F E5 FB 78 */ mr r5, r31 -/* 80C5BB48 38 C0 00 80 */ li r6, 0x80 -/* 80C5BB4C 4B 3E 07 A1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C5BB50 7C 64 1B 78 */ mr r4, r3 -/* 80C5BB54 80 7E 05 F4 */ lwz r3, 0x5f4(r30) -/* 80C5BB58 38 A0 00 01 */ li r5, 1 -/* 80C5BB5C 38 DE 05 C4 */ addi r6, r30, 0x5c4 -/* 80C5BB60 4B 41 E3 D9 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C5BB64 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80C5BB68 20 60 00 01 */ subfic r3, r0, 1 -/* 80C5BB6C 30 03 FF FF */ addic r0, r3, -1 -/* 80C5BB70 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80C5BB74: -/* 80C5BB74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C5BB78 4B 70 66 B1 */ bl _restgpr_29 -/* 80C5BB7C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C5BB80 7C 08 03 A6 */ mtlr r0 -/* 80C5BB84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C5BB88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/CreateHeap__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/CreateHeap__15daObj_Oiltubo_cFv.s deleted file mode 100644 index bda82e18f33..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/CreateHeap__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,81 +0,0 @@ -lbl_80CA6B28: -/* 80CA6B28 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA6B2C 7C 08 02 A6 */ mflr r0 -/* 80CA6B30 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA6B34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA6B38 4B 6B B6 A1 */ bl _savegpr_28 -/* 80CA6B3C 7C 7C 1B 78 */ mr r28, r3 -/* 80CA6B40 3C 80 80 CA */ lis r4, cNullVec__6Z2Calc@ha /* 0x80CA7988@ha */ -/* 80CA6B44 3B C4 79 88 */ addi r30, r4, cNullVec__6Z2Calc@l /* 0x80CA7988@l */ -/* 80CA6B48 83 FE 00 24 */ lwz r31, 0x24(r30) -/* 80CA6B4C 48 00 04 9D */ bl getResName__15daObj_Oiltubo_cFv -/* 80CA6B50 7F E4 FB 78 */ mr r4, r31 -/* 80CA6B54 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA6B58 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA6B5C 3F A5 00 02 */ addis r29, r5, 2 -/* 80CA6B60 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80CA6B64 7F A5 EB 78 */ mr r5, r29 -/* 80CA6B68 38 C0 00 80 */ li r6, 0x80 -/* 80CA6B6C 4B 39 58 11 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80CA6B70 3C 80 00 08 */ lis r4, 8 -/* 80CA6B74 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CA6B78 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CA6B7C 4B 36 E0 D9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CA6B80 90 7C 05 70 */ stw r3, 0x570(r28) -/* 80CA6B84 80 1C 05 70 */ lwz r0, 0x570(r28) -/* 80CA6B88 28 00 00 00 */ cmplwi r0, 0 -/* 80CA6B8C 40 82 00 0C */ bne lbl_80CA6B98 -/* 80CA6B90 38 60 00 00 */ li r3, 0 -/* 80CA6B94 48 00 00 B0 */ b lbl_80CA6C44 -lbl_80CA6B98: -/* 80CA6B98 83 FE 00 28 */ lwz r31, 0x28(r30) -/* 80CA6B9C 7F 83 E3 78 */ mr r3, r28 -/* 80CA6BA0 48 00 04 49 */ bl getResName__15daObj_Oiltubo_cFv -/* 80CA6BA4 7F E4 FB 78 */ mr r4, r31 -/* 80CA6BA8 7F A5 EB 78 */ mr r5, r29 -/* 80CA6BAC 38 C0 00 80 */ li r6, 0x80 -/* 80CA6BB0 4B 39 57 CD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80CA6BB4 7C 7F 1B 78 */ mr r31, r3 -/* 80CA6BB8 3C 80 00 08 */ lis r4, 8 -/* 80CA6BBC 3C A0 19 00 */ lis r5, 0x1900 /* 0x19000284@ha */ -/* 80CA6BC0 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x19000284@l */ -/* 80CA6BC4 4B 36 E0 91 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CA6BC8 90 7C 05 74 */ stw r3, 0x574(r28) -/* 80CA6BCC 80 1C 05 74 */ lwz r0, 0x574(r28) -/* 80CA6BD0 28 00 00 00 */ cmplwi r0, 0 -/* 80CA6BD4 40 82 00 0C */ bne lbl_80CA6BE0 -/* 80CA6BD8 38 60 00 00 */ li r3, 0 -/* 80CA6BDC 48 00 00 68 */ b lbl_80CA6C44 -lbl_80CA6BE0: -/* 80CA6BE0 83 DE 00 2C */ lwz r30, 0x2c(r30) -/* 80CA6BE4 7F 83 E3 78 */ mr r3, r28 -/* 80CA6BE8 48 00 04 01 */ bl getResName__15daObj_Oiltubo_cFv -/* 80CA6BEC 7F C4 F3 78 */ mr r4, r30 -/* 80CA6BF0 7F A5 EB 78 */ mr r5, r29 -/* 80CA6BF4 38 C0 00 80 */ li r6, 0x80 -/* 80CA6BF8 4B 39 57 85 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80CA6BFC 7C 65 1B 78 */ mr r5, r3 -/* 80CA6C00 38 7C 05 78 */ addi r3, r28, 0x578 -/* 80CA6C04 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80CA6C08 38 C0 00 01 */ li r6, 1 -/* 80CA6C0C 38 E0 00 02 */ li r7, 2 -/* 80CA6C10 3D 00 80 CA */ lis r8, lit_3815@ha /* 0x80CA7924@ha */ -/* 80CA6C14 C0 28 79 24 */ lfs f1, lit_3815@l(r8) /* 0x80CA7924@l */ -/* 80CA6C18 39 00 00 00 */ li r8, 0 -/* 80CA6C1C 39 20 FF FF */ li r9, -1 -/* 80CA6C20 4B 36 6A 1D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80CA6C24 38 7C 0A A4 */ addi r3, r28, 0xaa4 -/* 80CA6C28 38 9C 04 D0 */ addi r4, r28, 0x4d0 -/* 80CA6C2C 38 A0 00 01 */ li r5, 1 -/* 80CA6C30 81 9C 0A B4 */ lwz r12, 0xab4(r28) -/* 80CA6C34 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80CA6C38 7D 89 03 A6 */ mtctr r12 -/* 80CA6C3C 4E 80 04 21 */ bctrl -/* 80CA6C40 38 60 00 01 */ li r3, 1 -lbl_80CA6C44: -/* 80CA6C44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA6C48 4B 6B B5 DD */ bl _restgpr_28 -/* 80CA6C4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA6C50 7C 08 03 A6 */ mtlr r0 -/* 80CA6C54 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA6C58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Delete__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Delete__15daObj_Oiltubo_cFv.s deleted file mode 100644 index 9bae000b61d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Delete__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80CA6C5C: -/* 80CA6C5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6C60 7C 08 02 A6 */ mflr r0 -/* 80CA6C64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6C68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA6C6C 7C 7F 1B 78 */ mr r31, r3 -/* 80CA6C70 48 00 03 79 */ bl getResName__15daObj_Oiltubo_cFv -/* 80CA6C74 7C 64 1B 78 */ mr r4, r3 -/* 80CA6C78 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80CA6C7C 4B 38 63 8D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CA6C80 38 7F 0A A4 */ addi r3, r31, 0xaa4 -/* 80CA6C84 4B 61 73 75 */ bl deleteObject__14Z2SoundObjBaseFv -/* 80CA6C88 38 60 00 01 */ li r3, 1 -/* 80CA6C8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA6C90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6C94 7C 08 03 A6 */ mtlr r0 -/* 80CA6C98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6C9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Draw__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Draw__15daObj_Oiltubo_cFv.s deleted file mode 100644 index a90dcd93e0f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Draw__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80CA6EDC: -/* 80CA6EDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6EE0 7C 08 02 A6 */ mflr r0 -/* 80CA6EE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6EE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA6EEC 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA6EF0 7C 7E 1B 78 */ mr r30, r3 -/* 80CA6EF4 3C 60 80 CA */ lis r3, mCcDObjInfo__15daObj_Oiltubo_c@ha /* 0x80CA78F4@ha */ -/* 80CA6EF8 3B E3 78 F4 */ addi r31, r3, mCcDObjInfo__15daObj_Oiltubo_c@l /* 0x80CA78F4@l */ -/* 80CA6EFC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA6F00 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA6F04 38 80 00 08 */ li r4, 8 -/* 80CA6F08 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CA6F0C 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CA6F10 4B 4F C8 B5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CA6F14 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA6F18 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA6F1C 80 9E 05 74 */ lwz r4, 0x574(r30) -/* 80CA6F20 80 84 00 04 */ lwz r4, 4(r4) -/* 80CA6F24 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CA6F28 4B 4F DE 79 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CA6F2C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA6F30 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA6F34 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 80CA6F38 80 84 00 04 */ lwz r4, 4(r4) -/* 80CA6F3C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CA6F40 4B 4F DE 61 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CA6F44 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80CA6F48 4B 36 6D 7D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CA6F4C 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80CA6F50 80 83 00 04 */ lwz r4, 4(r3) -/* 80CA6F54 C0 3E 05 88 */ lfs f1, 0x588(r30) -/* 80CA6F58 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80CA6F5C 38 84 00 58 */ addi r4, r4, 0x58 -/* 80CA6F60 4B 36 67 79 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80CA6F64 80 7E 05 74 */ lwz r3, 0x574(r30) -/* 80CA6F68 4B 36 6D 5D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CA6F6C 80 7E 0A C8 */ lwz r3, 0xac8(r30) -/* 80CA6F70 38 80 00 01 */ li r4, 1 -/* 80CA6F74 80 BE 05 70 */ lwz r5, 0x570(r30) -/* 80CA6F78 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80CA6F7C C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 80CA6F80 C0 5F 00 44 */ lfs f2, 0x44(r31) -/* 80CA6F84 C0 7E 04 D4 */ lfs f3, 0x4d4(r30) -/* 80CA6F88 C0 9E 0A C4 */ lfs f4, 0xac4(r30) -/* 80CA6F8C 38 FE 0A 70 */ addi r7, r30, 0xa70 -/* 80CA6F90 39 1E 01 0C */ addi r8, r30, 0x10c -/* 80CA6F94 39 20 00 00 */ li r9, 0 -/* 80CA6F98 C0 BF 00 30 */ lfs f5, 0x30(r31) -/* 80CA6F9C 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80CA6FA0 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80CA6FA4 4B 38 79 6D */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -/* 80CA6FA8 90 7E 0A C8 */ stw r3, 0xac8(r30) -/* 80CA6FAC 38 60 00 01 */ li r3, 1 -/* 80CA6FB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA6FB4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA6FB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6FBC 7C 08 03 A6 */ mtlr r0 -/* 80CA6FC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6FC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Execute__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Execute__15daObj_Oiltubo_cFv.s deleted file mode 100644 index ec150289ae3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Execute__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,147 +0,0 @@ -lbl_80CA6CA0: -/* 80CA6CA0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA6CA4 7C 08 02 A6 */ mflr r0 -/* 80CA6CA8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA6CAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA6CB0 4B 6B B5 2D */ bl _savegpr_29 -/* 80CA6CB4 7C 7E 1B 78 */ mr r30, r3 -/* 80CA6CB8 3C 80 80 CA */ lis r4, mCcDObjInfo__15daObj_Oiltubo_c@ha /* 0x80CA78F4@ha */ -/* 80CA6CBC 3B E4 78 F4 */ addi r31, r4, mCcDObjInfo__15daObj_Oiltubo_c@l /* 0x80CA78F4@l */ -/* 80CA6CC0 48 00 07 B9 */ bl chkEvent__15daObj_Oiltubo_cFv -/* 80CA6CC4 7C 7D 1B 78 */ mr r29, r3 -/* 80CA6CC8 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80CA6CCC 4B 36 67 5D */ bl play__14mDoExt_baseAnmFv -/* 80CA6CD0 7F C3 F3 78 */ mr r3, r30 -/* 80CA6CD4 48 00 05 E9 */ bl setParam__15daObj_Oiltubo_cFv -/* 80CA6CD8 38 7E 05 90 */ addi r3, r30, 0x590 -/* 80CA6CDC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA6CE0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA6CE4 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80CA6CE8 4B 3C FD C5 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80CA6CEC 80 1E 06 6C */ lwz r0, 0x66c(r30) -/* 80CA6CF0 90 1E 0A 5C */ stw r0, 0xa5c(r30) -/* 80CA6CF4 80 1E 06 70 */ lwz r0, 0x670(r30) -/* 80CA6CF8 90 1E 0A 60 */ stw r0, 0xa60(r30) -/* 80CA6CFC 80 1E 06 74 */ lwz r0, 0x674(r30) -/* 80CA6D00 90 1E 0A 64 */ stw r0, 0xa64(r30) -/* 80CA6D04 88 1E 06 78 */ lbz r0, 0x678(r30) -/* 80CA6D08 98 1E 0A 68 */ stb r0, 0xa68(r30) -/* 80CA6D0C A0 1E 06 80 */ lhz r0, 0x680(r30) -/* 80CA6D10 B0 1E 0A 70 */ sth r0, 0xa70(r30) -/* 80CA6D14 A0 1E 06 82 */ lhz r0, 0x682(r30) -/* 80CA6D18 B0 1E 0A 72 */ sth r0, 0xa72(r30) -/* 80CA6D1C 80 1E 06 84 */ lwz r0, 0x684(r30) -/* 80CA6D20 90 1E 0A 74 */ stw r0, 0xa74(r30) -/* 80CA6D24 80 1E 06 88 */ lwz r0, 0x688(r30) -/* 80CA6D28 90 1E 0A 78 */ stw r0, 0xa78(r30) -/* 80CA6D2C C0 1E 06 90 */ lfs f0, 0x690(r30) -/* 80CA6D30 D0 1E 0A 80 */ stfs f0, 0xa80(r30) -/* 80CA6D34 C0 1E 06 94 */ lfs f0, 0x694(r30) -/* 80CA6D38 D0 1E 0A 84 */ stfs f0, 0xa84(r30) -/* 80CA6D3C C0 1E 06 98 */ lfs f0, 0x698(r30) -/* 80CA6D40 D0 1E 0A 88 */ stfs f0, 0xa88(r30) -/* 80CA6D44 80 1E 06 9C */ lwz r0, 0x69c(r30) -/* 80CA6D48 90 1E 0A 8C */ stw r0, 0xa8c(r30) -/* 80CA6D4C C0 1E 06 A0 */ lfs f0, 0x6a0(r30) -/* 80CA6D50 D0 1E 0A 90 */ stfs f0, 0xa90(r30) -/* 80CA6D54 80 1E 06 A4 */ lwz r0, 0x6a4(r30) -/* 80CA6D58 90 1E 0A 94 */ stw r0, 0xa94(r30) -/* 80CA6D5C C0 1E 06 28 */ lfs f0, 0x628(r30) -/* 80CA6D60 D0 1E 0A C4 */ stfs f0, 0xac4(r30) -/* 80CA6D64 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80CA6D68 C0 1E 0A C4 */ lfs f0, 0xac4(r30) -/* 80CA6D6C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CA6D70 41 82 00 14 */ beq lbl_80CA6D84 -/* 80CA6D74 7F C3 F3 78 */ mr r3, r30 -/* 80CA6D78 48 00 05 A1 */ bl setEnvTevColor__15daObj_Oiltubo_cFv -/* 80CA6D7C 7F C3 F3 78 */ mr r3, r30 -/* 80CA6D80 48 00 05 F5 */ bl setRoomNo__15daObj_Oiltubo_cFv -lbl_80CA6D84: -/* 80CA6D84 2C 1D 00 00 */ cmpwi r29, 0 -/* 80CA6D88 41 82 00 28 */ beq lbl_80CA6DB0 -/* 80CA6D8C 38 7E 0A 98 */ addi r3, r30, 0xa98 -/* 80CA6D90 4B 6B B2 89 */ bl __ptmf_test -/* 80CA6D94 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA6D98 41 82 00 18 */ beq lbl_80CA6DB0 -/* 80CA6D9C 7F C3 F3 78 */ mr r3, r30 -/* 80CA6DA0 38 80 00 00 */ li r4, 0 -/* 80CA6DA4 39 9E 0A 98 */ addi r12, r30, 0xa98 -/* 80CA6DA8 4B 6B B2 DD */ bl __ptmf_scall -/* 80CA6DAC 60 00 00 00 */ nop -lbl_80CA6DB0: -/* 80CA6DB0 7F C3 F3 78 */ mr r3, r30 -/* 80CA6DB4 48 00 06 05 */ bl setMtx__15daObj_Oiltubo_cFv -/* 80CA6DB8 38 00 00 00 */ li r0, 0 -/* 80CA6DBC 90 1E 09 4C */ stw r0, 0x94c(r30) -/* 80CA6DC0 3C 60 D8 FC */ lis r3, 0xD8FC /* 0xD8FBFDFF@ha */ -/* 80CA6DC4 38 03 FD FF */ addi r0, r3, 0xFDFF /* 0xD8FBFDFF@l */ -/* 80CA6DC8 90 1E 09 48 */ stw r0, 0x948(r30) -/* 80CA6DCC 38 00 00 1F */ li r0, 0x1f -/* 80CA6DD0 90 1E 09 38 */ stw r0, 0x938(r30) -/* 80CA6DD4 38 7E 0A 44 */ addi r3, r30, 0xa44 -/* 80CA6DD8 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80CA6DDC 4B 5C 84 25 */ bl SetR__8cM3dGCylFf -/* 80CA6DE0 38 7E 0A 44 */ addi r3, r30, 0xa44 -/* 80CA6DE4 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80CA6DE8 4B 5C 84 11 */ bl SetH__8cM3dGCylFf -/* 80CA6DEC 38 7E 0A 44 */ addi r3, r30, 0xa44 -/* 80CA6DF0 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CA6DF4 4B 5C 83 E9 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80CA6DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA6DFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA6E00 3B A3 23 3C */ addi r29, r3, 0x233c -/* 80CA6E04 7F A3 EB 78 */ mr r3, r29 -/* 80CA6E08 38 9E 09 20 */ addi r4, r30, 0x920 -/* 80CA6E0C 4B 5B DD 9D */ bl Set__4cCcSFP8cCcD_Obj -/* 80CA6E10 38 00 00 00 */ li r0, 0 -/* 80CA6E14 90 1E 07 F4 */ stw r0, 0x7f4(r30) -/* 80CA6E18 90 1E 07 E4 */ stw r0, 0x7e4(r30) -/* 80CA6E1C 38 7E 09 08 */ addi r3, r30, 0x908 -/* 80CA6E20 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80CA6E24 4B 5C 83 DD */ bl SetR__8cM3dGCylFf -/* 80CA6E28 38 7E 09 08 */ addi r3, r30, 0x908 -/* 80CA6E2C C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80CA6E30 4B 5C 83 C9 */ bl SetH__8cM3dGCylFf -/* 80CA6E34 38 7E 09 08 */ addi r3, r30, 0x908 -/* 80CA6E38 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CA6E3C 4B 5C 83 A1 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80CA6E40 7F A3 EB 78 */ mr r3, r29 -/* 80CA6E44 38 9E 07 E4 */ addi r4, r30, 0x7e4 -/* 80CA6E48 4B 5B DD 61 */ bl Set__4cCcSFP8cCcD_Obj -/* 80CA6E4C 7F C3 F3 78 */ mr r3, r30 -/* 80CA6E50 48 00 05 E1 */ bl setAttnPos__15daObj_Oiltubo_cFv -/* 80CA6E54 38 7E 07 E4 */ addi r3, r30, 0x7e4 -/* 80CA6E58 4B 3D D6 09 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80CA6E5C 28 03 00 00 */ cmplwi r3, 0 -/* 80CA6E60 41 82 00 38 */ beq lbl_80CA6E98 -/* 80CA6E64 38 7E 07 E4 */ addi r3, r30, 0x7e4 -/* 80CA6E68 4B 3D D6 91 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80CA6E6C 28 03 00 00 */ cmplwi r3, 0 -/* 80CA6E70 41 82 00 28 */ beq lbl_80CA6E98 -/* 80CA6E74 38 7E 07 E4 */ addi r3, r30, 0x7e4 -/* 80CA6E78 4B 3D D7 05 */ bl GetTgHitObjSe__12dCcD_GObjInfFv -/* 80CA6E7C 38 80 00 01 */ li r4, 1 -/* 80CA6E80 4B 3D D7 31 */ bl getHitSeID__12dCcD_GObjInfFUci -/* 80CA6E84 7C 64 1B 78 */ mr r4, r3 -/* 80CA6E88 38 7E 0A A4 */ addi r3, r30, 0xaa4 -/* 80CA6E8C 38 A0 00 02 */ li r5, 2 -/* 80CA6E90 38 C0 00 00 */ li r6, 0 -/* 80CA6E94 4B 61 76 11 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -lbl_80CA6E98: -/* 80CA6E98 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80CA6E9C 7C 03 07 74 */ extsb r3, r0 -/* 80CA6EA0 4B 38 61 CD */ bl dComIfGp_getReverb__Fi -/* 80CA6EA4 7C 65 1B 78 */ mr r5, r3 -/* 80CA6EA8 38 7E 0A A4 */ addi r3, r30, 0xaa4 -/* 80CA6EAC 38 80 00 00 */ li r4, 0 -/* 80CA6EB0 81 9E 0A B4 */ lwz r12, 0xab4(r30) -/* 80CA6EB4 81 8C 00 08 */ lwz r12, 8(r12) -/* 80CA6EB8 7D 89 03 A6 */ mtctr r12 -/* 80CA6EBC 4E 80 04 21 */ bctrl -/* 80CA6EC0 38 60 00 01 */ li r3, 1 -/* 80CA6EC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA6EC8 4B 6B B3 61 */ bl _restgpr_29 -/* 80CA6ECC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA6ED0 7C 08 03 A6 */ mtlr r0 -/* 80CA6ED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA6ED8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 0c82a866aca..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA75E0: -/* 80CA75E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA75E4 7C 08 02 A6 */ mflr r0 -/* 80CA75E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA75EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA75F0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA75F4 41 82 00 1C */ beq lbl_80CA7610 -/* 80CA75F8 3C A0 80 CA */ lis r5, __vt__10cCcD_GStts@ha /* 0x80CA7A58@ha */ -/* 80CA75FC 38 05 7A 58 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80CA7A58@l */ -/* 80CA7600 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA7604 7C 80 07 35 */ extsh. r0, r4 -/* 80CA7608 40 81 00 08 */ ble lbl_80CA7610 -/* 80CA760C 4B 62 77 31 */ bl __dl__FPv -lbl_80CA7610: -/* 80CA7610 7F E3 FB 78 */ mr r3, r31 -/* 80CA7614 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7618 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA761C 7C 08 03 A6 */ mtlr r0 -/* 80CA7620 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7624 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 0b7aec473d0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CA6A14: -/* 80CA6A14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6A18 7C 08 02 A6 */ mflr r0 -/* 80CA6A1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6A20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA6A24 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA6A28 41 82 00 30 */ beq lbl_80CA6A58 -/* 80CA6A2C 3C 60 80 CA */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CA7A64@ha */ -/* 80CA6A30 38 03 7A 64 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CA7A64@l */ -/* 80CA6A34 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA6A38 41 82 00 10 */ beq lbl_80CA6A48 -/* 80CA6A3C 3C 60 80 CA */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CA7A58@ha */ -/* 80CA6A40 38 03 7A 58 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CA7A58@l */ -/* 80CA6A44 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CA6A48: -/* 80CA6A48 7C 80 07 35 */ extsh. r0, r4 -/* 80CA6A4C 40 81 00 0C */ ble lbl_80CA6A58 -/* 80CA6A50 7F E3 FB 78 */ mr r3, r31 -/* 80CA6A54 4B 62 82 E9 */ bl __dl__FPv -lbl_80CA6A58: -/* 80CA6A58 7F E3 FB 78 */ mr r3, r31 -/* 80CA6A5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA6A60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6A64 7C 08 03 A6 */ mtlr r0 -/* 80CA6A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6A6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 876efdb519d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA6AE0: -/* 80CA6AE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6AE4 7C 08 02 A6 */ mflr r0 -/* 80CA6AE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6AEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA6AF0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA6AF4 41 82 00 1C */ beq lbl_80CA6B10 -/* 80CA6AF8 3C A0 80 CA */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80CA7AB8@ha */ -/* 80CA6AFC 38 05 7A B8 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80CA7AB8@l */ -/* 80CA6B00 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA6B04 7C 80 07 35 */ extsh. r0, r4 -/* 80CA6B08 40 81 00 08 */ ble lbl_80CA6B10 -/* 80CA6B0C 4B 62 82 31 */ bl __dl__FPv -lbl_80CA6B10: -/* 80CA6B10 7F E3 FB 78 */ mr r3, r31 -/* 80CA6B14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA6B18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6B1C 7C 08 03 A6 */ mtlr r0 -/* 80CA6B20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6B24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 36e9fe53058..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CA69A4: -/* 80CA69A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA69A8 7C 08 02 A6 */ mflr r0 -/* 80CA69AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA69B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA69B4 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA69B8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CA69BC 7C 9F 23 78 */ mr r31, r4 -/* 80CA69C0 41 82 00 38 */ beq lbl_80CA69F8 -/* 80CA69C4 3C 60 80 CA */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80CA7A70@ha */ -/* 80CA69C8 38 03 7A 70 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80CA7A70@l */ -/* 80CA69CC 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80CA69D0 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80CA69D4 38 80 FF FF */ li r4, -1 -/* 80CA69D8 4B 5C 85 41 */ bl __dt__8cM3dGCirFv -/* 80CA69DC 7F C3 F3 78 */ mr r3, r30 -/* 80CA69E0 38 80 00 00 */ li r4, 0 -/* 80CA69E4 4B 5C 16 CD */ bl __dt__13cBgS_PolyInfoFv -/* 80CA69E8 7F E0 07 35 */ extsh. r0, r31 -/* 80CA69EC 40 81 00 0C */ ble lbl_80CA69F8 -/* 80CA69F0 7F C3 F3 78 */ mr r3, r30 -/* 80CA69F4 4B 62 83 49 */ bl __dl__FPv -lbl_80CA69F8: -/* 80CA69F8 7F C3 F3 78 */ mr r3, r30 -/* 80CA69FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA6A00 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA6A04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6A08 7C 08 03 A6 */ mtlr r0 -/* 80CA6A0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6A10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 213a6bdb44a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CA6A70: -/* 80CA6A70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6A74 7C 08 02 A6 */ mflr r0 -/* 80CA6A78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6A7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA6A80 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA6A84 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CA6A88 7C 9F 23 78 */ mr r31, r4 -/* 80CA6A8C 41 82 00 38 */ beq lbl_80CA6AC4 -/* 80CA6A90 3C 80 80 CA */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80CA7A94@ha */ -/* 80CA6A94 38 84 7A 94 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80CA7A94@l */ -/* 80CA6A98 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80CA6A9C 38 04 00 0C */ addi r0, r4, 0xc -/* 80CA6AA0 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80CA6AA4 38 04 00 18 */ addi r0, r4, 0x18 -/* 80CA6AA8 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80CA6AAC 38 80 00 00 */ li r4, 0 -/* 80CA6AB0 4B 3C F4 E5 */ bl __dt__9dBgS_AcchFv -/* 80CA6AB4 7F E0 07 35 */ extsh. r0, r31 -/* 80CA6AB8 40 81 00 0C */ ble lbl_80CA6AC4 -/* 80CA6ABC 7F C3 F3 78 */ mr r3, r30 -/* 80CA6AC0 4B 62 82 7D */ bl __dl__FPv -lbl_80CA6AC4: -/* 80CA6AC4 7F C3 F3 78 */ mr r3, r30 -/* 80CA6AC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA6ACC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA6AD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6AD4 7C 08 03 A6 */ mtlr r0 -/* 80CA6AD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6ADC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__15daObj_Oiltubo_cFv.s deleted file mode 100644 index 865b8402778..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80CA7628: -/* 80CA7628 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA762C 7C 08 02 A6 */ mflr r0 -/* 80CA7630 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7634 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7638 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA763C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CA7640 7C 9F 23 78 */ mr r31, r4 -/* 80CA7644 41 82 02 40 */ beq lbl_80CA7884 -/* 80CA7648 3C 60 80 CA */ lis r3, __vt__15daObj_Oiltubo_c@ha /* 0x80CA7AC4@ha */ -/* 80CA764C 38 03 7A C4 */ addi r0, r3, __vt__15daObj_Oiltubo_c@l /* 0x80CA7AC4@l */ -/* 80CA7650 90 1E 0A D0 */ stw r0, 0xad0(r30) -/* 80CA7654 34 1E 0A A4 */ addic. r0, r30, 0xaa4 -/* 80CA7658 41 82 00 1C */ beq lbl_80CA7674 -/* 80CA765C 3C 60 80 3D */ lis r3, __vt__16Z2SoundObjSimple@ha /* 0x803CAD10@ha */ -/* 80CA7660 38 03 AD 10 */ addi r0, r3, __vt__16Z2SoundObjSimple@l /* 0x803CAD10@l */ -/* 80CA7664 90 1E 0A B4 */ stw r0, 0xab4(r30) -/* 80CA7668 38 7E 0A A4 */ addi r3, r30, 0xaa4 -/* 80CA766C 38 80 00 00 */ li r4, 0 -/* 80CA7670 4B 61 68 D9 */ bl __dt__14Z2SoundObjBaseFv -lbl_80CA7674: -/* 80CA7674 38 7E 0A 5C */ addi r3, r30, 0xa5c -/* 80CA7678 38 80 FF FF */ li r4, -1 -/* 80CA767C 4B 5C 06 19 */ bl __dt__11cBgS_GndChkFv -/* 80CA7680 34 1E 09 20 */ addic. r0, r30, 0x920 -/* 80CA7684 41 82 00 84 */ beq lbl_80CA7708 -/* 80CA7688 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CA768C 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CA7690 90 7E 09 5C */ stw r3, 0x95c(r30) -/* 80CA7694 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CA7698 90 1E 0A 40 */ stw r0, 0xa40(r30) -/* 80CA769C 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CA76A0 90 1E 0A 58 */ stw r0, 0xa58(r30) -/* 80CA76A4 34 1E 0A 24 */ addic. r0, r30, 0xa24 -/* 80CA76A8 41 82 00 54 */ beq lbl_80CA76FC -/* 80CA76AC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CA76B0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CA76B4 90 7E 0A 40 */ stw r3, 0xa40(r30) -/* 80CA76B8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CA76BC 90 1E 0A 58 */ stw r0, 0xa58(r30) -/* 80CA76C0 34 1E 0A 44 */ addic. r0, r30, 0xa44 -/* 80CA76C4 41 82 00 10 */ beq lbl_80CA76D4 -/* 80CA76C8 3C 60 80 CA */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CA7A7C@ha */ -/* 80CA76CC 38 03 7A 7C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CA7A7C@l */ -/* 80CA76D0 90 1E 0A 58 */ stw r0, 0xa58(r30) -lbl_80CA76D4: -/* 80CA76D4 34 1E 0A 24 */ addic. r0, r30, 0xa24 -/* 80CA76D8 41 82 00 24 */ beq lbl_80CA76FC -/* 80CA76DC 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CA76E0 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CA76E4 90 1E 0A 40 */ stw r0, 0xa40(r30) -/* 80CA76E8 34 1E 0A 24 */ addic. r0, r30, 0xa24 -/* 80CA76EC 41 82 00 10 */ beq lbl_80CA76FC -/* 80CA76F0 3C 60 80 CA */ lis r3, __vt__8cM3dGAab@ha /* 0x80CA7A88@ha */ -/* 80CA76F4 38 03 7A 88 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CA7A88@l */ -/* 80CA76F8 90 1E 0A 3C */ stw r0, 0xa3c(r30) -lbl_80CA76FC: -/* 80CA76FC 38 7E 09 20 */ addi r3, r30, 0x920 -/* 80CA7700 38 80 00 00 */ li r4, 0 -/* 80CA7704 4B 3D C9 E1 */ bl __dt__12dCcD_GObjInfFv -lbl_80CA7708: -/* 80CA7708 34 1E 07 E4 */ addic. r0, r30, 0x7e4 -/* 80CA770C 41 82 00 84 */ beq lbl_80CA7790 -/* 80CA7710 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CA7714 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CA7718 90 7E 08 20 */ stw r3, 0x820(r30) -/* 80CA771C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CA7720 90 1E 09 04 */ stw r0, 0x904(r30) -/* 80CA7724 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CA7728 90 1E 09 1C */ stw r0, 0x91c(r30) -/* 80CA772C 34 1E 08 E8 */ addic. r0, r30, 0x8e8 -/* 80CA7730 41 82 00 54 */ beq lbl_80CA7784 -/* 80CA7734 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CA7738 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CA773C 90 7E 09 04 */ stw r3, 0x904(r30) -/* 80CA7740 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CA7744 90 1E 09 1C */ stw r0, 0x91c(r30) -/* 80CA7748 34 1E 09 08 */ addic. r0, r30, 0x908 -/* 80CA774C 41 82 00 10 */ beq lbl_80CA775C -/* 80CA7750 3C 60 80 CA */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CA7A7C@ha */ -/* 80CA7754 38 03 7A 7C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CA7A7C@l */ -/* 80CA7758 90 1E 09 1C */ stw r0, 0x91c(r30) -lbl_80CA775C: -/* 80CA775C 34 1E 08 E8 */ addic. r0, r30, 0x8e8 -/* 80CA7760 41 82 00 24 */ beq lbl_80CA7784 -/* 80CA7764 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CA7768 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CA776C 90 1E 09 04 */ stw r0, 0x904(r30) -/* 80CA7770 34 1E 08 E8 */ addic. r0, r30, 0x8e8 -/* 80CA7774 41 82 00 10 */ beq lbl_80CA7784 -/* 80CA7778 3C 60 80 CA */ lis r3, __vt__8cM3dGAab@ha /* 0x80CA7A88@ha */ -/* 80CA777C 38 03 7A 88 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CA7A88@l */ -/* 80CA7780 90 1E 09 00 */ stw r0, 0x900(r30) -lbl_80CA7784: -/* 80CA7784 38 7E 07 E4 */ addi r3, r30, 0x7e4 -/* 80CA7788 38 80 00 00 */ li r4, 0 -/* 80CA778C 4B 3D C9 59 */ bl __dt__12dCcD_GObjInfFv -lbl_80CA7790: -/* 80CA7790 34 1E 07 A4 */ addic. r0, r30, 0x7a4 -/* 80CA7794 41 82 00 28 */ beq lbl_80CA77BC -/* 80CA7798 3C 60 80 CA */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80CA7A70@ha */ -/* 80CA779C 38 03 7A 70 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80CA7A70@l */ -/* 80CA77A0 90 1E 07 B0 */ stw r0, 0x7b0(r30) -/* 80CA77A4 38 7E 07 B8 */ addi r3, r30, 0x7b8 -/* 80CA77A8 38 80 FF FF */ li r4, -1 -/* 80CA77AC 4B 5C 77 6D */ bl __dt__8cM3dGCirFv -/* 80CA77B0 38 7E 07 A4 */ addi r3, r30, 0x7a4 -/* 80CA77B4 38 80 00 00 */ li r4, 0 -/* 80CA77B8 4B 5C 08 F9 */ bl __dt__13cBgS_PolyInfoFv -lbl_80CA77BC: -/* 80CA77BC 34 1E 07 68 */ addic. r0, r30, 0x768 -/* 80CA77C0 41 82 00 54 */ beq lbl_80CA7814 -/* 80CA77C4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CA77C8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CA77CC 90 7E 07 80 */ stw r3, 0x780(r30) -/* 80CA77D0 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CA77D4 90 1E 07 84 */ stw r0, 0x784(r30) -/* 80CA77D8 34 1E 07 84 */ addic. r0, r30, 0x784 -/* 80CA77DC 41 82 00 24 */ beq lbl_80CA7800 -/* 80CA77E0 3C 60 80 CA */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CA7A64@ha */ -/* 80CA77E4 38 03 7A 64 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CA7A64@l */ -/* 80CA77E8 90 1E 07 84 */ stw r0, 0x784(r30) -/* 80CA77EC 34 1E 07 84 */ addic. r0, r30, 0x784 -/* 80CA77F0 41 82 00 10 */ beq lbl_80CA7800 -/* 80CA77F4 3C 60 80 CA */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CA7A58@ha */ -/* 80CA77F8 38 03 7A 58 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CA7A58@l */ -/* 80CA77FC 90 1E 07 84 */ stw r0, 0x784(r30) -lbl_80CA7800: -/* 80CA7800 34 1E 07 68 */ addic. r0, r30, 0x768 -/* 80CA7804 41 82 00 10 */ beq lbl_80CA7814 -/* 80CA7808 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CA780C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CA7810 90 1E 07 80 */ stw r0, 0x780(r30) -lbl_80CA7814: -/* 80CA7814 34 1E 05 90 */ addic. r0, r30, 0x590 -/* 80CA7818 41 82 00 2C */ beq lbl_80CA7844 -/* 80CA781C 3C 60 80 CA */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CA7A94@ha */ -/* 80CA7820 38 63 7A 94 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CA7A94@l */ -/* 80CA7824 90 7E 05 A0 */ stw r3, 0x5a0(r30) -/* 80CA7828 38 03 00 0C */ addi r0, r3, 0xc -/* 80CA782C 90 1E 05 A4 */ stw r0, 0x5a4(r30) -/* 80CA7830 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CA7834 90 1E 05 B4 */ stw r0, 0x5b4(r30) -/* 80CA7838 38 7E 05 90 */ addi r3, r30, 0x590 -/* 80CA783C 38 80 00 00 */ li r4, 0 -/* 80CA7840 4B 3C E7 55 */ bl __dt__9dBgS_AcchFv -lbl_80CA7844: -/* 80CA7844 34 1E 05 78 */ addic. r0, r30, 0x578 -/* 80CA7848 41 82 00 20 */ beq lbl_80CA7868 -/* 80CA784C 34 1E 05 78 */ addic. r0, r30, 0x578 -/* 80CA7850 41 82 00 18 */ beq lbl_80CA7868 -/* 80CA7854 34 1E 05 78 */ addic. r0, r30, 0x578 -/* 80CA7858 41 82 00 10 */ beq lbl_80CA7868 -/* 80CA785C 3C 60 80 CA */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80CA7AB8@ha */ -/* 80CA7860 38 03 7A B8 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80CA7AB8@l */ -/* 80CA7864 90 1E 05 78 */ stw r0, 0x578(r30) -lbl_80CA7868: -/* 80CA7868 7F C3 F3 78 */ mr r3, r30 -/* 80CA786C 38 80 00 00 */ li r4, 0 -/* 80CA7870 4B 37 14 1D */ bl __dt__10fopAc_ac_cFv -/* 80CA7874 7F E0 07 35 */ extsh. r0, r31 -/* 80CA7878 40 81 00 0C */ ble lbl_80CA7884 -/* 80CA787C 7F C3 F3 78 */ mr r3, r30 -/* 80CA7880 4B 62 74 BD */ bl __dl__FPv -lbl_80CA7884: -/* 80CA7884 7F C3 F3 78 */ mr r3, r30 -/* 80CA7888 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA788C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA7890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7894 7C 08 03 A6 */ mtlr r0 -/* 80CA7898 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA789C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGAabFv.s deleted file mode 100644 index 76ca9cac4c4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA695C: -/* 80CA695C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6960 7C 08 02 A6 */ mflr r0 -/* 80CA6964 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6968 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA696C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA6970 41 82 00 1C */ beq lbl_80CA698C -/* 80CA6974 3C A0 80 CA */ lis r5, __vt__8cM3dGAab@ha /* 0x80CA7A88@ha */ -/* 80CA6978 38 05 7A 88 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80CA7A88@l */ -/* 80CA697C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80CA6980 7C 80 07 35 */ extsh. r0, r4 -/* 80CA6984 40 81 00 08 */ ble lbl_80CA698C -/* 80CA6988 4B 62 83 B5 */ bl __dl__FPv -lbl_80CA698C: -/* 80CA698C 7F E3 FB 78 */ mr r3, r31 -/* 80CA6990 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA6994 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6998 7C 08 03 A6 */ mtlr r0 -/* 80CA699C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA69A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGCylFv.s deleted file mode 100644 index 1e227ae44ca..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA6914: -/* 80CA6914 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6918 7C 08 02 A6 */ mflr r0 -/* 80CA691C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6920 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA6924 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA6928 41 82 00 1C */ beq lbl_80CA6944 -/* 80CA692C 3C A0 80 CA */ lis r5, __vt__8cM3dGCyl@ha /* 0x80CA7A7C@ha */ -/* 80CA6930 38 05 7A 7C */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80CA7A7C@l */ -/* 80CA6934 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80CA6938 7C 80 07 35 */ extsh. r0, r4 -/* 80CA693C 40 81 00 08 */ ble lbl_80CA6944 -/* 80CA6940 4B 62 83 FD */ bl __dl__FPv -lbl_80CA6944: -/* 80CA6944 7F E3 FB 78 */ mr r3, r31 -/* 80CA6948 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA694C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6950 7C 08 03 A6 */ mtlr r0 -/* 80CA6954 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6958 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__sinit_d_a_obj_oiltubo_cpp.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__sinit_d_a_obj_oiltubo_cpp.s deleted file mode 100644 index 778ad45136c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__sinit_d_a_obj_oiltubo_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80CA78A0: -/* 80CA78A0 3C 60 80 CA */ lis r3, mCcDCyl__15daObj_Oiltubo_c@ha /* 0x80CA79B8@ha */ -/* 80CA78A4 38 63 79 B8 */ addi r3, r3, mCcDCyl__15daObj_Oiltubo_c@l /* 0x80CA79B8@l */ -/* 80CA78A8 38 A3 FF FC */ addi r5, r3, -4 -/* 80CA78AC 3C 60 80 CA */ lis r3, mCcDObjInfo__15daObj_Oiltubo_c@ha /* 0x80CA78F4@ha */ -/* 80CA78B0 38 63 78 F4 */ addi r3, r3, mCcDObjInfo__15daObj_Oiltubo_c@l /* 0x80CA78F4@l */ -/* 80CA78B4 38 83 FF FC */ addi r4, r3, -4 -/* 80CA78B8 38 00 00 06 */ li r0, 6 -/* 80CA78BC 7C 09 03 A6 */ mtctr r0 -lbl_80CA78C0: -/* 80CA78C0 80 64 00 04 */ lwz r3, 4(r4) -/* 80CA78C4 84 04 00 08 */ lwzu r0, 8(r4) -/* 80CA78C8 90 65 00 04 */ stw r3, 4(r5) -/* 80CA78CC 94 05 00 08 */ stwu r0, 8(r5) -/* 80CA78D0 42 00 FF F0 */ bdnz lbl_80CA78C0 -/* 80CA78D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/chkEvent__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/chkEvent__15daObj_Oiltubo_cFv.s deleted file mode 100644 index 90f51882d74..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/chkEvent__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80CA7478: -/* 80CA7478 38 A0 00 01 */ li r5, 1 -/* 80CA747C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA7480 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7484 38 00 00 00 */ li r0, 0 -/* 80CA7488 88 84 4F AD */ lbz r4, 0x4fad(r4) -/* 80CA748C 28 04 00 00 */ cmplwi r4, 0 -/* 80CA7490 41 82 00 0C */ beq lbl_80CA749C -/* 80CA7494 28 04 00 02 */ cmplwi r4, 2 -/* 80CA7498 40 82 00 08 */ bne lbl_80CA74A0 -lbl_80CA749C: -/* 80CA749C 38 00 00 01 */ li r0, 1 -lbl_80CA74A0: -/* 80CA74A0 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80CA74A4 40 82 00 1C */ bne lbl_80CA74C0 -/* 80CA74A8 38 A0 00 00 */ li r5, 0 -/* 80CA74AC A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80CA74B0 28 00 00 06 */ cmplwi r0, 6 -/* 80CA74B4 40 82 00 0C */ bne lbl_80CA74C0 -/* 80CA74B8 38 60 00 00 */ li r3, 0 -/* 80CA74BC 4E 80 00 20 */ blr -lbl_80CA74C0: -/* 80CA74C0 7C A3 2B 78 */ mr r3, r5 -/* 80CA74C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c.s deleted file mode 100644 index a271c7917c0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA6FC8: -/* 80CA6FC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA6FCC 7C 08 02 A6 */ mflr r0 -/* 80CA6FD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA6FD4 4B FF FB 55 */ bl CreateHeap__15daObj_Oiltubo_cFv -/* 80CA6FD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA6FDC 7C 08 03 A6 */ mtlr r0 -/* 80CA6FE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA6FE4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/create__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/create__15daObj_Oiltubo_cFv.s deleted file mode 100644 index c85374a3cb8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/create__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,133 +0,0 @@ -lbl_80CA6718: -/* 80CA6718 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA671C 7C 08 02 A6 */ mflr r0 -/* 80CA6720 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA6724 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA6728 4B 6B BA A9 */ bl _savegpr_26 -/* 80CA672C 7C 7F 1B 78 */ mr r31, r3 -/* 80CA6730 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CA6734 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CA6738 40 82 01 74 */ bne lbl_80CA68AC -/* 80CA673C 7F E0 FB 79 */ or. r0, r31, r31 -/* 80CA6740 41 82 01 60 */ beq lbl_80CA68A0 -/* 80CA6744 7C 1E 03 78 */ mr r30, r0 -/* 80CA6748 4B 37 24 1D */ bl __ct__10fopAc_ac_cFv -/* 80CA674C 3C 60 80 CA */ lis r3, __vt__15daObj_Oiltubo_c@ha /* 0x80CA7AC4@ha */ -/* 80CA6750 38 03 7A C4 */ addi r0, r3, __vt__15daObj_Oiltubo_c@l /* 0x80CA7AC4@l */ -/* 80CA6754 90 1E 0A D0 */ stw r0, 0xad0(r30) -/* 80CA6758 3B 7E 05 78 */ addi r27, r30, 0x578 -/* 80CA675C 3C 60 80 CA */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80CA7AB8@ha */ -/* 80CA6760 38 03 7A B8 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80CA7AB8@l */ -/* 80CA6764 90 1E 05 78 */ stw r0, 0x578(r30) -/* 80CA6768 7F 63 DB 78 */ mr r3, r27 -/* 80CA676C 38 80 00 00 */ li r4, 0 -/* 80CA6770 4B 68 1C 8D */ bl init__12J3DFrameCtrlFs -/* 80CA6774 38 00 00 00 */ li r0, 0 -/* 80CA6778 90 1B 00 14 */ stw r0, 0x14(r27) -/* 80CA677C 3B 7E 05 90 */ addi r27, r30, 0x590 -/* 80CA6780 7F 63 DB 78 */ mr r3, r27 -/* 80CA6784 4B 3C F9 1D */ bl __ct__9dBgS_AcchFv -/* 80CA6788 3C 60 80 CA */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CA7A94@ha */ -/* 80CA678C 38 63 7A 94 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CA7A94@l */ -/* 80CA6790 90 7B 00 10 */ stw r3, 0x10(r27) -/* 80CA6794 38 03 00 0C */ addi r0, r3, 0xc -/* 80CA6798 90 1B 00 14 */ stw r0, 0x14(r27) -/* 80CA679C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CA67A0 90 1B 00 24 */ stw r0, 0x24(r27) -/* 80CA67A4 38 7B 00 14 */ addi r3, r27, 0x14 -/* 80CA67A8 4B 3D 26 C1 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80CA67AC 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CA67B0 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CA67B4 90 1E 07 80 */ stw r0, 0x780(r30) -/* 80CA67B8 38 7E 07 84 */ addi r3, r30, 0x784 -/* 80CA67BC 4B 3D CF A5 */ bl __ct__10dCcD_GSttsFv -/* 80CA67C0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CA67C4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CA67C8 90 7E 07 80 */ stw r3, 0x780(r30) -/* 80CA67CC 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CA67D0 90 1E 07 84 */ stw r0, 0x784(r30) -/* 80CA67D4 38 7E 07 A4 */ addi r3, r30, 0x7a4 -/* 80CA67D8 4B 3C F6 D5 */ bl __ct__12dBgS_AcchCirFv -/* 80CA67DC 3B 5E 07 E4 */ addi r26, r30, 0x7e4 -/* 80CA67E0 7F 43 D3 78 */ mr r3, r26 -/* 80CA67E4 4B 3D D2 45 */ bl __ct__12dCcD_GObjInfFv -/* 80CA67E8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CA67EC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CA67F0 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80CA67F4 3C 60 80 CA */ lis r3, __vt__8cM3dGAab@ha /* 0x80CA7A88@ha */ -/* 80CA67F8 38 03 7A 88 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CA7A88@l */ -/* 80CA67FC 90 1A 01 1C */ stw r0, 0x11c(r26) -/* 80CA6800 3C 60 80 CA */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CA7A7C@ha */ -/* 80CA6804 38 03 7A 7C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CA7A7C@l */ -/* 80CA6808 90 1A 01 38 */ stw r0, 0x138(r26) -/* 80CA680C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CA6810 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CA6814 90 7A 01 20 */ stw r3, 0x120(r26) -/* 80CA6818 3B A3 00 58 */ addi r29, r3, 0x58 -/* 80CA681C 93 BA 01 38 */ stw r29, 0x138(r26) -/* 80CA6820 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CA6824 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CA6828 90 7A 00 3C */ stw r3, 0x3c(r26) -/* 80CA682C 3B 83 00 2C */ addi r28, r3, 0x2c -/* 80CA6830 93 9A 01 20 */ stw r28, 0x120(r26) -/* 80CA6834 3B 63 00 84 */ addi r27, r3, 0x84 -/* 80CA6838 93 7A 01 38 */ stw r27, 0x138(r26) -/* 80CA683C 3B 5E 09 20 */ addi r26, r30, 0x920 -/* 80CA6840 7F 43 D3 78 */ mr r3, r26 -/* 80CA6844 4B 3D D1 E5 */ bl __ct__12dCcD_GObjInfFv -/* 80CA6848 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CA684C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CA6850 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80CA6854 3C 60 80 CA */ lis r3, __vt__8cM3dGAab@ha /* 0x80CA7A88@ha */ -/* 80CA6858 38 03 7A 88 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CA7A88@l */ -/* 80CA685C 90 1A 01 1C */ stw r0, 0x11c(r26) -/* 80CA6860 3C 60 80 CA */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CA7A7C@ha */ -/* 80CA6864 38 03 7A 7C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CA7A7C@l */ -/* 80CA6868 90 1A 01 38 */ stw r0, 0x138(r26) -/* 80CA686C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CA6870 38 03 35 A4 */ addi r0, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CA6874 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80CA6878 93 BA 01 38 */ stw r29, 0x138(r26) -/* 80CA687C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CA6880 38 03 C0 50 */ addi r0, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CA6884 90 1A 00 3C */ stw r0, 0x3c(r26) -/* 80CA6888 93 9A 01 20 */ stw r28, 0x120(r26) -/* 80CA688C 93 7A 01 38 */ stw r27, 0x138(r26) -/* 80CA6890 38 7E 0A 5C */ addi r3, r30, 0xa5c -/* 80CA6894 4B 5C 13 89 */ bl __ct__11cBgS_GndChkFv -/* 80CA6898 38 7E 0A A4 */ addi r3, r30, 0xaa4 -/* 80CA689C 4B 61 7F A9 */ bl __ct__16Z2SoundObjSimpleFv -lbl_80CA68A0: -/* 80CA68A0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CA68A4 60 00 00 08 */ ori r0, r0, 8 -/* 80CA68A8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CA68AC: -/* 80CA68AC 7F E3 FB 78 */ mr r3, r31 -/* 80CA68B0 48 00 07 39 */ bl getResName__15daObj_Oiltubo_cFv -/* 80CA68B4 7C 64 1B 78 */ mr r4, r3 -/* 80CA68B8 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80CA68BC 4B 38 66 01 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CA68C0 7C 7B 1B 78 */ mr r27, r3 -/* 80CA68C4 2C 1B 00 04 */ cmpwi r27, 4 -/* 80CA68C8 40 82 00 30 */ bne lbl_80CA68F8 -/* 80CA68CC 7F E3 FB 78 */ mr r3, r31 -/* 80CA68D0 3C 80 80 CA */ lis r4, createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c@ha /* 0x80CA6FC8@ha */ -/* 80CA68D4 38 84 6F C8 */ addi r4, r4, createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c@l /* 0x80CA6FC8@l */ -/* 80CA68D8 38 A0 20 00 */ li r5, 0x2000 -/* 80CA68DC 4B 37 3B D5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CA68E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CA68E4 40 82 00 0C */ bne lbl_80CA68F0 -/* 80CA68E8 38 60 00 05 */ li r3, 5 -/* 80CA68EC 48 00 00 10 */ b lbl_80CA68FC -lbl_80CA68F0: -/* 80CA68F0 7F E3 FB 78 */ mr r3, r31 -/* 80CA68F4 48 00 07 75 */ bl initialize__15daObj_Oiltubo_cFv -lbl_80CA68F8: -/* 80CA68F8 7F 63 DB 78 */ mr r3, r27 -lbl_80CA68FC: -/* 80CA68FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA6900 4B 6B B9 1D */ bl _restgpr_26 -/* 80CA6904 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA6908 7C 08 03 A6 */ mtlr r0 -/* 80CA690C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA6910 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Create__FPv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Create__FPv.s deleted file mode 100644 index a920fc43b10..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA7558: -/* 80CA7558 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA755C 7C 08 02 A6 */ mflr r0 -/* 80CA7560 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7564 4B FF F1 B5 */ bl create__15daObj_Oiltubo_cFv -/* 80CA7568 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA756C 7C 08 03 A6 */ mtlr r0 -/* 80CA7570 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7574 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Delete__FPv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Delete__FPv.s deleted file mode 100644 index 11280b58f7b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA7578: -/* 80CA7578 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA757C 7C 08 02 A6 */ mflr r0 -/* 80CA7580 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7584 4B FF F6 D9 */ bl Delete__15daObj_Oiltubo_cFv -/* 80CA7588 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA758C 7C 08 03 A6 */ mtlr r0 -/* 80CA7590 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7594 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Draw__FPv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Draw__FPv.s deleted file mode 100644 index 45516f80ed7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA75B8: -/* 80CA75B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA75BC 7C 08 02 A6 */ mflr r0 -/* 80CA75C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA75C4 4B FF F9 19 */ bl Draw__15daObj_Oiltubo_cFv -/* 80CA75C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA75CC 7C 08 03 A6 */ mtlr r0 -/* 80CA75D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA75D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Execute__FPv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Execute__FPv.s deleted file mode 100644 index 0471f8b9c18..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA7598: -/* 80CA7598 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA759C 7C 08 02 A6 */ mflr r0 -/* 80CA75A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA75A4 4B FF F6 FD */ bl Execute__15daObj_Oiltubo_cFv -/* 80CA75A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA75AC 7C 08 03 A6 */ mtlr r0 -/* 80CA75B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA75B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78D8.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78D8.s deleted file mode 100644 index c462a2d9806..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78D8.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CA78D8: -/* 80CA78D8 38 63 FF DC */ addi r3, r3, -36 -/* 80CA78DC 4B FF F1 94 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78E0.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78E0.s deleted file mode 100644 index cdac8e61aa7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78E0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CA78E0: -/* 80CA78E0 38 63 FF EC */ addi r3, r3, -20 -/* 80CA78E4 4B FF F1 8C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/getResName__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/getResName__15daObj_Oiltubo_cFv.s deleted file mode 100644 index b3d03fc6460..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/getResName__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80CA6FE8: -/* 80CA6FE8 3C 60 80 CA */ lis r3, l_resFileName@ha /* 0x80CA79A8@ha */ -/* 80CA6FEC 38 63 79 A8 */ addi r3, r3, l_resFileName@l /* 0x80CA79A8@l */ -/* 80CA6FF0 80 63 00 00 */ lwz r3, 0(r3) -/* 80CA6FF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/initialize__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/initialize__15daObj_Oiltubo_cFv.s deleted file mode 100644 index fd8809d99d3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/initialize__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_80CA7068: -/* 80CA7068 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA706C 7C 08 02 A6 */ mflr r0 -/* 80CA7070 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA7074 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CA7078 7C 7F 1B 78 */ mr r31, r3 -/* 80CA707C 80 83 05 70 */ lwz r4, 0x570(r3) -/* 80CA7080 38 04 00 24 */ addi r0, r4, 0x24 -/* 80CA7084 90 03 05 04 */ stw r0, 0x504(r3) -/* 80CA7088 80 83 05 74 */ lwz r4, 0x574(r3) -/* 80CA708C 38 04 00 24 */ addi r0, r4, 0x24 -/* 80CA7090 90 03 05 04 */ stw r0, 0x504(r3) -/* 80CA7094 80 83 05 70 */ lwz r4, 0x570(r3) -/* 80CA7098 80 84 00 04 */ lwz r4, 4(r4) -/* 80CA709C 4B 37 34 DD */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80CA70A0 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80CA70A4 80 83 00 04 */ lwz r4, 4(r3) -/* 80CA70A8 7F E3 FB 78 */ mr r3, r31 -/* 80CA70AC 4B 37 34 CD */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80CA70B0 7F E3 FB 78 */ mr r3, r31 -/* 80CA70B4 4B FF FF 35 */ bl getResName__15daObj_Oiltubo_cFv -/* 80CA70B8 90 7F 01 00 */ stw r3, 0x100(r31) -/* 80CA70BC 38 00 00 00 */ li r0, 0 -/* 80CA70C0 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80CA70C4 38 7F 07 A4 */ addi r3, r31, 0x7a4 -/* 80CA70C8 3C 80 80 CA */ lis r4, lit_3864@ha /* 0x80CA792C@ha */ -/* 80CA70CC C0 24 79 2C */ lfs f1, lit_3864@l(r4) /* 0x80CA792C@l */ -/* 80CA70D0 3C 80 80 CA */ lis r4, lit_3865@ha /* 0x80CA7930@ha */ -/* 80CA70D4 C0 44 79 30 */ lfs f2, lit_3865@l(r4) /* 0x80CA7930@l */ -/* 80CA70D8 4B 3C EE 81 */ bl SetWall__12dBgS_AcchCirFff -/* 80CA70DC 38 1F 04 E4 */ addi r0, r31, 0x4e4 -/* 80CA70E0 90 01 00 08 */ stw r0, 8(r1) -/* 80CA70E4 38 7F 05 90 */ addi r3, r31, 0x590 -/* 80CA70E8 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80CA70EC 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 80CA70F0 7F E6 FB 78 */ mr r6, r31 -/* 80CA70F4 38 E0 00 01 */ li r7, 1 -/* 80CA70F8 39 1F 07 A4 */ addi r8, r31, 0x7a4 -/* 80CA70FC 39 3F 04 F8 */ addi r9, r31, 0x4f8 -/* 80CA7100 39 5F 04 DC */ addi r10, r31, 0x4dc -/* 80CA7104 4B 3C F1 45 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80CA7108 38 7F 07 68 */ addi r3, r31, 0x768 -/* 80CA710C 38 80 00 FF */ li r4, 0xff -/* 80CA7110 38 A0 00 00 */ li r5, 0 -/* 80CA7114 7F E6 FB 78 */ mr r6, r31 -/* 80CA7118 4B 3D C7 49 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80CA711C 38 7F 07 E4 */ addi r3, r31, 0x7e4 -/* 80CA7120 3C 80 80 CA */ lis r4, mCcDCyl__15daObj_Oiltubo_c@ha /* 0x80CA79B8@ha */ -/* 80CA7124 38 84 79 B8 */ addi r4, r4, mCcDCyl__15daObj_Oiltubo_c@l /* 0x80CA79B8@l */ -/* 80CA7128 4B 3D D7 8D */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80CA712C 38 1F 07 68 */ addi r0, r31, 0x768 -/* 80CA7130 90 1F 08 28 */ stw r0, 0x828(r31) -/* 80CA7134 38 7F 09 20 */ addi r3, r31, 0x920 -/* 80CA7138 3C 80 80 CA */ lis r4, mCcDCyl__15daObj_Oiltubo_c@ha /* 0x80CA79B8@ha */ -/* 80CA713C 38 84 79 B8 */ addi r4, r4, mCcDCyl__15daObj_Oiltubo_c@l /* 0x80CA79B8@l */ -/* 80CA7140 4B 3D D7 75 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80CA7144 38 1F 07 68 */ addi r0, r31, 0x768 -/* 80CA7148 90 1F 09 64 */ stw r0, 0x964(r31) -/* 80CA714C 38 7F 05 90 */ addi r3, r31, 0x590 -/* 80CA7150 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA7154 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7158 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80CA715C 4B 3C F9 51 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80CA7160 80 1F 06 6C */ lwz r0, 0x66c(r31) -/* 80CA7164 90 1F 0A 5C */ stw r0, 0xa5c(r31) -/* 80CA7168 80 1F 06 70 */ lwz r0, 0x670(r31) -/* 80CA716C 90 1F 0A 60 */ stw r0, 0xa60(r31) -/* 80CA7170 80 1F 06 74 */ lwz r0, 0x674(r31) -/* 80CA7174 90 1F 0A 64 */ stw r0, 0xa64(r31) -/* 80CA7178 88 1F 06 78 */ lbz r0, 0x678(r31) -/* 80CA717C 98 1F 0A 68 */ stb r0, 0xa68(r31) -/* 80CA7180 A0 1F 06 80 */ lhz r0, 0x680(r31) -/* 80CA7184 B0 1F 0A 70 */ sth r0, 0xa70(r31) -/* 80CA7188 A0 1F 06 82 */ lhz r0, 0x682(r31) -/* 80CA718C B0 1F 0A 72 */ sth r0, 0xa72(r31) -/* 80CA7190 80 1F 06 84 */ lwz r0, 0x684(r31) -/* 80CA7194 90 1F 0A 74 */ stw r0, 0xa74(r31) -/* 80CA7198 80 1F 06 88 */ lwz r0, 0x688(r31) -/* 80CA719C 90 1F 0A 78 */ stw r0, 0xa78(r31) -/* 80CA71A0 C0 1F 06 90 */ lfs f0, 0x690(r31) -/* 80CA71A4 D0 1F 0A 80 */ stfs f0, 0xa80(r31) -/* 80CA71A8 C0 1F 06 94 */ lfs f0, 0x694(r31) -/* 80CA71AC D0 1F 0A 84 */ stfs f0, 0xa84(r31) -/* 80CA71B0 C0 1F 06 98 */ lfs f0, 0x698(r31) -/* 80CA71B4 D0 1F 0A 88 */ stfs f0, 0xa88(r31) -/* 80CA71B8 80 1F 06 9C */ lwz r0, 0x69c(r31) -/* 80CA71BC 90 1F 0A 8C */ stw r0, 0xa8c(r31) -/* 80CA71C0 C0 1F 06 A0 */ lfs f0, 0x6a0(r31) -/* 80CA71C4 D0 1F 0A 90 */ stfs f0, 0xa90(r31) -/* 80CA71C8 80 1F 06 A4 */ lwz r0, 0x6a4(r31) -/* 80CA71CC 90 1F 0A 94 */ stw r0, 0xa94(r31) -/* 80CA71D0 C0 1F 06 28 */ lfs f0, 0x628(r31) -/* 80CA71D4 D0 1F 0A C4 */ stfs f0, 0xac4(r31) -/* 80CA71D8 7F E3 FB 78 */ mr r3, r31 -/* 80CA71DC 48 00 01 3D */ bl setEnvTevColor__15daObj_Oiltubo_cFv -/* 80CA71E0 7F E3 FB 78 */ mr r3, r31 -/* 80CA71E4 48 00 01 91 */ bl setRoomNo__15daObj_Oiltubo_cFv -/* 80CA71E8 7F E3 FB 78 */ mr r3, r31 -/* 80CA71EC 4B FF FE 0D */ bl restart__15daObj_Oiltubo_cFv -/* 80CA71F0 7F E3 FB 78 */ mr r3, r31 -/* 80CA71F4 4B FF FA AD */ bl Execute__15daObj_Oiltubo_cFv -/* 80CA71F8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CA71FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA7200 7C 08 03 A6 */ mtlr r0 -/* 80CA7204 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA7208 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/restart__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/restart__15daObj_Oiltubo_cFv.s deleted file mode 100644 index 97e7c61db21..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/restart__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80CA6FF8: -/* 80CA6FF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA6FFC 7C 08 02 A6 */ mflr r0 -/* 80CA7000 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA7004 A8 83 04 B6 */ lha r4, 0x4b6(r3) -/* 80CA7008 38 00 00 00 */ li r0, 0 -/* 80CA700C B0 03 04 DC */ sth r0, 0x4dc(r3) -/* 80CA7010 B0 83 04 DE */ sth r4, 0x4de(r3) -/* 80CA7014 B0 03 04 E0 */ sth r0, 0x4e0(r3) -/* 80CA7018 A8 03 04 DC */ lha r0, 0x4dc(r3) -/* 80CA701C B0 03 04 E4 */ sth r0, 0x4e4(r3) -/* 80CA7020 A8 03 04 DE */ lha r0, 0x4de(r3) -/* 80CA7024 B0 03 04 E6 */ sth r0, 0x4e6(r3) -/* 80CA7028 A8 03 04 E0 */ lha r0, 0x4e0(r3) -/* 80CA702C B0 03 04 E8 */ sth r0, 0x4e8(r3) -/* 80CA7030 3C 80 80 CA */ lis r4, lit_3897@ha /* 0x80CA79FC@ha */ -/* 80CA7034 38 A4 79 FC */ addi r5, r4, lit_3897@l /* 0x80CA79FC@l */ -/* 80CA7038 80 85 00 00 */ lwz r4, 0(r5) -/* 80CA703C 80 05 00 04 */ lwz r0, 4(r5) -/* 80CA7040 90 81 00 08 */ stw r4, 8(r1) -/* 80CA7044 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CA7048 80 05 00 08 */ lwz r0, 8(r5) -/* 80CA704C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80CA7050 38 81 00 08 */ addi r4, r1, 8 -/* 80CA7054 48 00 01 B9 */ bl setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i -/* 80CA7058 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA705C 7C 08 03 A6 */ mtlr r0 -/* 80CA7060 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA7064 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setAttnPos__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setAttnPos__15daObj_Oiltubo_cFv.s deleted file mode 100644 index d15ec266cd6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setAttnPos__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80CA7430: -/* 80CA7430 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80CA7434 D0 03 05 50 */ stfs f0, 0x550(r3) -/* 80CA7438 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80CA743C D0 03 05 54 */ stfs f0, 0x554(r3) -/* 80CA7440 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80CA7444 D0 03 05 58 */ stfs f0, 0x558(r3) -/* 80CA7448 C0 23 05 54 */ lfs f1, 0x554(r3) -/* 80CA744C 3C 80 80 CA */ lis r4, lit_3999@ha /* 0x80CA793C@ha */ -/* 80CA7450 C0 04 79 3C */ lfs f0, lit_3999@l(r4) /* 0x80CA793C@l */ -/* 80CA7454 EC 01 00 2A */ fadds f0, f1, f0 -/* 80CA7458 D0 03 05 54 */ stfs f0, 0x554(r3) -/* 80CA745C C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80CA7460 D0 03 05 38 */ stfs f0, 0x538(r3) -/* 80CA7464 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80CA7468 D0 03 05 3C */ stfs f0, 0x53c(r3) -/* 80CA746C C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80CA7470 D0 03 05 40 */ stfs f0, 0x540(r3) -/* 80CA7474 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setEnvTevColor__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setEnvTevColor__15daObj_Oiltubo_cFv.s deleted file mode 100644 index 898a2f616ce..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setEnvTevColor__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80CA7318: -/* 80CA7318 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA731C 7C 08 02 A6 */ mflr r0 -/* 80CA7320 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7324 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7328 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA732C 7C 7E 1B 78 */ mr r30, r3 -/* 80CA7330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA7334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7338 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80CA733C 7F E3 FB 78 */ mr r3, r31 -/* 80CA7340 38 9E 0A 70 */ addi r4, r30, 0xa70 -/* 80CA7344 4B 3C D8 A5 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80CA7348 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 80CA734C 7F E3 FB 78 */ mr r3, r31 -/* 80CA7350 38 9E 0A 70 */ addi r4, r30, 0xa70 -/* 80CA7354 4B 3C DD AD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80CA7358 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 80CA735C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7360 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA7364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7368 7C 08 03 A6 */ mtlr r0 -/* 80CA736C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setMtx__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setMtx__15daObj_Oiltubo_cFv.s deleted file mode 100644 index 5450384272a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setMtx__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80CA73B8: -/* 80CA73B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA73BC 7C 08 02 A6 */ mflr r0 -/* 80CA73C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA73C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA73C8 7C 7F 1B 78 */ mr r31, r3 -/* 80CA73CC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA73D0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA73D4 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CA73D8 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CA73DC C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CA73E0 4B 69 F5 09 */ bl PSMTXTrans -/* 80CA73E4 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80CA73E8 4B 36 5B 5D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80CA73EC 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80CA73F0 4B 36 5A 81 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 80CA73F4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA73F8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA73FC 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80CA7400 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CA7404 4B 69 F0 AD */ bl PSMTXCopy -/* 80CA7408 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA740C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA7410 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80CA7414 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CA7418 4B 69 F0 99 */ bl PSMTXCopy -/* 80CA741C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7420 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7424 7C 08 03 A6 */ mtlr r0 -/* 80CA7428 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA742C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setParam__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setParam__15daObj_Oiltubo_cFv.s deleted file mode 100644 index 0fd8509b71a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setParam__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80CA72BC: -/* 80CA72BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA72C0 7C 08 02 A6 */ mflr r0 -/* 80CA72C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA72C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA72CC 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA72D0 7C 7E 1B 78 */ mr r30, r3 -/* 80CA72D4 3C 60 80 CA */ lis r3, mCcDObjInfo__15daObj_Oiltubo_c@ha /* 0x80CA78F4@ha */ -/* 80CA72D8 3B E3 78 F4 */ addi r31, r3, mCcDObjInfo__15daObj_Oiltubo_c@l /* 0x80CA78F4@l */ -/* 80CA72DC C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80CA72E0 D0 1E 04 EC */ stfs f0, 0x4ec(r30) -/* 80CA72E4 D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -/* 80CA72E8 D0 1E 04 F4 */ stfs f0, 0x4f4(r30) -/* 80CA72EC 38 7E 07 A4 */ addi r3, r30, 0x7a4 -/* 80CA72F0 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80CA72F4 4B 3C EC 4D */ bl SetWallR__12dBgS_AcchCirFf -/* 80CA72F8 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80CA72FC D0 1E 07 D4 */ stfs f0, 0x7d4(r30) -/* 80CA7300 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7304 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA7308 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA730C 7C 08 03 A6 */ mtlr r0 -/* 80CA7310 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7314 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i.s deleted file mode 100644 index 74eb6992e4c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80CA720C: -/* 80CA720C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7210 7C 08 02 A6 */ mflr r0 -/* 80CA7214 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7218 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA721C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA7220 7C 7E 1B 78 */ mr r30, r3 -/* 80CA7224 7C 9F 23 78 */ mr r31, r4 -/* 80CA7228 38 00 00 02 */ li r0, 2 -/* 80CA722C B0 03 0A CC */ sth r0, 0xacc(r3) -/* 80CA7230 38 7E 0A 98 */ addi r3, r30, 0xa98 -/* 80CA7234 4B 6B AD E5 */ bl __ptmf_test -/* 80CA7238 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA723C 41 82 00 18 */ beq lbl_80CA7254 -/* 80CA7240 7F C3 F3 78 */ mr r3, r30 -/* 80CA7244 38 80 00 00 */ li r4, 0 -/* 80CA7248 39 9E 0A 98 */ addi r12, r30, 0xa98 -/* 80CA724C 4B 6B AE 39 */ bl __ptmf_scall -/* 80CA7250 60 00 00 00 */ nop -lbl_80CA7254: -/* 80CA7254 38 00 00 00 */ li r0, 0 -/* 80CA7258 B0 1E 0A CC */ sth r0, 0xacc(r30) -/* 80CA725C 80 7F 00 00 */ lwz r3, 0(r31) -/* 80CA7260 80 1F 00 04 */ lwz r0, 4(r31) -/* 80CA7264 90 7E 0A 98 */ stw r3, 0xa98(r30) -/* 80CA7268 90 1E 0A 9C */ stw r0, 0xa9c(r30) -/* 80CA726C 80 1F 00 08 */ lwz r0, 8(r31) -/* 80CA7270 90 1E 0A A0 */ stw r0, 0xaa0(r30) -/* 80CA7274 38 7E 0A 98 */ addi r3, r30, 0xa98 -/* 80CA7278 4B 6B AD A1 */ bl __ptmf_test -/* 80CA727C 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA7280 41 82 00 18 */ beq lbl_80CA7298 -/* 80CA7284 7F C3 F3 78 */ mr r3, r30 -/* 80CA7288 38 80 00 00 */ li r4, 0 -/* 80CA728C 39 9E 0A 98 */ addi r12, r30, 0xa98 -/* 80CA7290 4B 6B AD F5 */ bl __ptmf_scall -/* 80CA7294 60 00 00 00 */ nop -lbl_80CA7298: -/* 80CA7298 38 00 00 01 */ li r0, 1 -/* 80CA729C B0 1E 0A CC */ sth r0, 0xacc(r30) -/* 80CA72A0 38 60 00 01 */ li r3, 1 -/* 80CA72A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA72A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA72AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA72B0 7C 08 03 A6 */ mtlr r0 -/* 80CA72B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA72B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setRoomNo__15daObj_Oiltubo_cFv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setRoomNo__15daObj_Oiltubo_cFv.s deleted file mode 100644 index f9c26f42538..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setRoomNo__15daObj_Oiltubo_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80CA7374: -/* 80CA7374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7378 7C 08 02 A6 */ mflr r0 -/* 80CA737C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7384 7C 7F 1B 78 */ mr r31, r3 -/* 80CA7388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA738C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7390 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CA7394 38 9F 0A 70 */ addi r4, r31, 0xa70 -/* 80CA7398 4B 3C DD 69 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80CA739C 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80CA73A0 98 7F 07 8A */ stb r3, 0x78a(r31) -/* 80CA73A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA73A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA73AC 7C 08 03 A6 */ mtlr r0 -/* 80CA73B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA73B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/wait__15daObj_Oiltubo_cFPv.s b/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/wait__15daObj_Oiltubo_cFPv.s deleted file mode 100644 index 0cf0729c323..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/wait__15daObj_Oiltubo_cFPv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80CA74C8: -/* 80CA74C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA74CC 7C 08 02 A6 */ mflr r0 -/* 80CA74D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA74D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA74D8 7C 7F 1B 78 */ mr r31, r3 -/* 80CA74DC 3C 60 80 CA */ lis r3, mCcDObjInfo__15daObj_Oiltubo_c@ha /* 0x80CA78F4@ha */ -/* 80CA74E0 38 C3 78 F4 */ addi r6, r3, mCcDObjInfo__15daObj_Oiltubo_c@l /* 0x80CA78F4@l */ -/* 80CA74E4 A0 1F 0A CC */ lhz r0, 0xacc(r31) -/* 80CA74E8 2C 00 00 01 */ cmpwi r0, 1 -/* 80CA74EC 41 82 00 10 */ beq lbl_80CA74FC -/* 80CA74F0 40 80 00 50 */ bge lbl_80CA7540 -/* 80CA74F4 48 00 00 4C */ b lbl_80CA7540 -/* 80CA74F8 48 00 00 48 */ b lbl_80CA7540 -lbl_80CA74FC: -/* 80CA74FC A0 1F 00 F8 */ lhz r0, 0xf8(r31) -/* 80CA7500 28 00 00 06 */ cmplwi r0, 6 -/* 80CA7504 41 82 00 3C */ beq lbl_80CA7540 -/* 80CA7508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA750C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7510 38 63 5B 54 */ addi r3, r3, 0x5b54 -/* 80CA7514 7F E4 FB 78 */ mr r4, r31 -/* 80CA7518 38 A0 00 68 */ li r5, 0x68 -/* 80CA751C C0 26 00 4C */ lfs f1, 0x4c(r6) -/* 80CA7520 C0 46 00 38 */ lfs f2, 0x38(r6) -/* 80CA7524 C0 66 00 50 */ lfs f3, 0x50(r6) -/* 80CA7528 38 C0 20 00 */ li r6, 0x2000 -/* 80CA752C 38 E0 00 01 */ li r7, 1 -/* 80CA7530 4B 3C C4 D9 */ bl request__11dAttCatch_cFP10fopAc_ac_cUcfffsi -/* 80CA7534 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80CA7538 60 00 00 40 */ ori r0, r0, 0x40 -/* 80CA753C B0 1F 00 FA */ sth r0, 0xfa(r31) -lbl_80CA7540: -/* 80CA7540 38 60 00 01 */ li r3, 1 -/* 80CA7544 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7548 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA754C 7C 08 03 A6 */ mtlr r0 -/* 80CA7550 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7554 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 085bea40732..ca9b60ff42f 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -498,7 +498,7 @@ public: void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); } void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); } void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); } - void SetAtSprm(u32 prm) { mObjAt.SetSPrm(prm); } + void SetAtSPrm(u32 prm) { mObjAt.SetSPrm(prm); } void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); } void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); } void ClrAtHit() { mObjAt.ClrHit(); } diff --git a/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h b/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h index 6b7b275a146..a33afc9acf1 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h +++ b/include/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h @@ -1,6 +1,23 @@ #ifndef D_A_OBJ_LV3WATERB_H #define D_A_OBJ_LV3WATERB_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class obj_lv3WaterB_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mBWaterPhase; + /* 0x570 */ request_of_phase_process_class mOcthibiPhase; + /* 0x578 */ J3DModel* mpBWaterModel; + /* 0x57C */ mDoExt_btkAnm* mpBWaterBtk; + /* 0x580 */ J3DModel* mpOctHibiModel; + /* 0x584 */ s16 mAction; + /* 0x586 */ s16 field_0x586; + /* 0x588 */ u8 field_0x588[0x58C - 0x588]; + /* 0x58C */ Mtx mpBWaterMtx; + /* 0x5BC */ dBgW* mpBWaterBgW; + /* 0x5C0 */ u8 field_0x5C0[0x5C4 - 0x5C0]; + /* 0x5C4 */ Mtx mpOctHibiMtx; + /* 0x5F4 */ dBgW* mpOctHibiBgW; +}; #endif /* D_A_OBJ_LV3WATERB_H */ diff --git a/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h b/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h index 8727331d31b..ad88723ca2c 100644 --- a/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h +++ b/include/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.h @@ -1,6 +1,51 @@ #ifndef D_A_OBJ_OILTUBO_H #define D_A_OBJ_OILTUBO_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" + +class daObj_Oiltubo_c : public fopAc_ac_c { +public: + typedef int (daObj_Oiltubo_c::*processFn)(void*); + + /* 80CA6718 */ int create(); + /* 80CA6B28 */ int CreateHeap(); + /* 80CA6C5C */ int Delete(); + /* 80CA6CA0 */ int Execute(); + /* 80CA6EDC */ int Draw(); + /* 80CA6FC8 */ static int createHeapCallBack(fopAc_ac_c*); + /* 80CA6FE8 */ const char* getResName(); + /* 80CA6FF8 */ void restart(); + /* 80CA7068 */ void initialize(); + /* 80CA720C */ int setProcess(processFn); + /* 80CA72BC */ void setParam(); + /* 80CA7318 */ void setEnvTevColor(); + /* 80CA7374 */ void setRoomNo(); + /* 80CA73B8 */ void setMtx(); + /* 80CA7430 */ void setAttnPos(); + /* 80CA7478 */ BOOL chkEvent(); + /* 80CA74C8 */ int wait(void*); + + static const dCcD_SrcGObjInf mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ J3DModel* mpBModel; + /* 0x578 */ mDoExt_btkAnm mBtk; + /* 0x590 */ dBgS_ObjAcch mAcch; + /* 0x768 */ dCcD_Stts mCcStts; + /* 0x7A4 */ dBgS_AcchCir mAcchCir; + /* 0x7E4 */ dCcD_Cyl mCcAtCyl; + /* 0x920 */ dCcD_Cyl mCcCoCyl; + /* 0xA5C */ cBgS_GndChk mGroundChk; + /* 0xA98 */ processFn mProcess; + /* 0xAA4 */ Z2SoundObjSimple mSound; + /* 0xAC4 */ f32 mGroundHeight; + /* 0xAC8 */ u32 mShadowKey; + /* 0xACC */ u16 mMode; + + /* 80CA7628 */ virtual ~daObj_Oiltubo_c() {} +}; #endif /* D_A_OBJ_OILTUBO_H */ diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp index ee4b90e9d35..5805837122e 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp @@ -1,326 +1,233 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv3WaterB -// +/** + * d_a_obj_lv3WaterB.cpp + * Morpheel Arena Water + */ #include "rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_lv3WaterB_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_memBit_c { - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct J3DTexMtxInfo { - /* 80325794 */ void setEffectMtx(f32 (*)[4]); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80C5BB8C */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class(); -extern "C" static void action__FP19obj_lv3WaterB_class(); -extern "C" static void daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class(); -extern "C" static bool daObj_Lv3waterB_IsDelete__FP19obj_lv3WaterB_class(); -extern "C" static void daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObj_Lv3waterB_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_obj_lv3WaterB__stringBase0; - -// -// External References: -// - -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_custom_colset__FUcUcf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); -extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void C_MTXLightPerspective(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -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]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C5BD50-80C5BD54 000000 0004+00 3/3 0/0 0/0 .rodata @3724 */ -SECTION_RODATA static f32 const lit_3724 = 1.0f; -COMPILER_STRIP_GATE(0x80C5BD50, &lit_3724); - -/* 80C5BD54-80C5BD58 000004 0004+00 0/1 0/0 0/0 .rodata @3725 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3725 = 0xBC75C28F; -COMPILER_STRIP_GATE(0x80C5BD54, &lit_3725); -#pragma pop - -/* 80C5BD58-80C5BD5C 000008 0004+00 0/2 0/0 0/0 .rodata @3726 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3726[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C5BD58, &lit_3726); -#pragma pop +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" /* 80C5B578-80C5B71C 000078 01A4+00 1/0 0/0 0/0 .text * daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lv3waterB_Draw(obj_lv3WaterB_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class.s" +static int daObj_Lv3waterB_Draw(obj_lv3WaterB_class* i_this) { + g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpBWaterModel, &i_this->mTevStr); + + i_this->mpBWaterBtk->entry(i_this->mpBWaterModel->getModelData()); + + dComIfGd_setListInvisisble(); + J3DMaterial* material_p = i_this->mpBWaterModel->getModelData()->getMaterialNodePointer(0); + if (material_p->getTexGenBlock()->getTexMtx(0) != NULL) { + J3DTexMtxInfo* tex_mtx_info = &material_p->getTexGenBlock()->getTexMtx(0)->getTexMtxInfo(); + if (tex_mtx_info != NULL) { + Mtx m; + C_MTXLightPerspective(m, dComIfGd_getView()->mFovy, dComIfGd_getView()->mAspect, 1.0f, + 1.0f, -0.015f, 0.0f); + tex_mtx_info->setEffectMtx(m); + i_this->mpBWaterModel->getModelData()->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx); + } + } + + mDoExt_modelUpdateDL(i_this->mpBWaterModel); + + if (i_this->mpOctHibiModel != NULL) { + g_env_light.setLightTevColorType_MAJI(i_this->mpOctHibiModel, &i_this->mTevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(i_this->mpOctHibiModel); + dComIfGd_setList(); + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C5BD5C-80C5BD60 00000C 0004+00 0/1 0/0 0/0 .rodata @3751 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3751 = 4000.0f; -COMPILER_STRIP_GATE(0x80C5BD5C, &lit_3751); -#pragma pop - -/* 80C5BD60-80C5BD64 000010 0004+00 1/2 0/0 0/0 .rodata @3752 */ -SECTION_RODATA static f32 const lit_3752 = 160.0f; -COMPILER_STRIP_GATE(0x80C5BD60, &lit_3752); - -/* 80C5BD64-80C5BD68 000014 0004+00 1/2 0/0 0/0 .rodata @3753 */ -SECTION_RODATA static f32 const lit_3753 = 14450.0f; -COMPILER_STRIP_GATE(0x80C5BD64, &lit_3753); - -/* 80C5BD68-80C5BD6C 000018 0004+00 0/1 0/0 0/0 .rodata @3754 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3754 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80C5BD68, &lit_3754); -#pragma pop - -/* 80C5BD6C-80C5BD70 00001C 0004+00 0/1 0/0 0/0 .rodata @3755 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3755 = 10.0f; -COMPILER_STRIP_GATE(0x80C5BD6C, &lit_3755); -#pragma pop /* 80C5B71C-80C5B89C 00021C 0180+00 1/1 0/0 0/0 .text action__FP19obj_lv3WaterB_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(obj_lv3WaterB_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/action__FP19obj_lv3WaterB_class.s" +static void action(obj_lv3WaterB_class* i_this) { + switch (i_this->mAction) { + case 0: + break; + case 1: + dComIfG_Bgsp().Release(i_this->mpOctHibiBgW); + i_this->mpOctHibiModel = NULL; + i_this->mAction = 0; + break; + case 2: + dKy_custom_colset(4, 4, 0.0f); + + if (i_this->field_0x586 == 0) { + i_this->current.pos.y = (i_this->orig.pos.y - 14450.0f) + 160.0f + 4000.0f; + i_this->field_0x586 = 1; + } + + cLib_addCalc2(&i_this->current.pos.y, (i_this->orig.pos.y - 14450.0f) + 160.0f, 0.05f, + 10.0f); + break; + } + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + i_this->mpBWaterModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), i_this->mpBWaterMtx); + + i_this->mpBWaterBgW->Move(); + i_this->mpBWaterBtk->play(); + + if (i_this->mpOctHibiModel != NULL) { + mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); + i_this->mpOctHibiModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), i_this->mpOctHibiMtx); + + i_this->mpOctHibiBgW->Move(); + } } -#pragma pop /* 80C5B89C-80C5B8C0 00039C 0024+00 2/1 0/0 0/0 .text * daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lv3waterB_Execute(obj_lv3WaterB_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class.s" +static int daObj_Lv3waterB_Execute(obj_lv3WaterB_class* i_this) { + action(i_this); + return 1; } -#pragma pop /* 80C5B8C0-80C5B8C8 0003C0 0008+00 1/0 0/0 0/0 .text * daObj_Lv3waterB_IsDelete__FP19obj_lv3WaterB_class */ -static bool daObj_Lv3waterB_IsDelete(obj_lv3WaterB_class* param_0) { - return true; +static int daObj_Lv3waterB_IsDelete(obj_lv3WaterB_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80C5BD70-80C5BD70 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C5BD70 = "L3_bwater"; -SECTION_DEAD static char const* const stringBase_80C5BD7A = "S_octhibi"; -#pragma pop - /* 80C5B8C8-80C5B94C 0003C8 0084+00 1/0 0/0 0/0 .text * daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lv3waterB_Delete(obj_lv3WaterB_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class.s" -} -#pragma pop +static int daObj_Lv3waterB_Delete(obj_lv3WaterB_class* i_this) { + fopAcM_GetID(i_this); + dComIfG_resDelete(&i_this->mBWaterPhase, "L3_bwater"); + dComIfG_resDelete(&i_this->mOcthibiPhase, "S_octhibi"); + + dComIfG_Bgsp().Release(i_this->mpBWaterBgW); + + if (i_this->mpOctHibiBgW != NULL) { + dComIfG_Bgsp().Release(i_this->mpOctHibiBgW); + } + + return 1; +} + +/* 80C5B94C-80C5BB8C 00044C 0240+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + obj_lv3WaterB_class* a_this = static_cast(i_this); + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L3_bwater", 5); + JUT_ASSERT(modelData != 0); + + a_this->mpBWaterModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (a_this->mpBWaterModel == NULL) { + return 0; + } + + a_this->mpBWaterBtk = new mDoExt_btkAnm(); + if (a_this->mpBWaterBtk == NULL) { + return 0; + } + + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("L3_bwater", 8); + if (!a_this->mpBWaterBtk->init(a_this->mpBWaterModel->getModelData(), btk, TRUE, + J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) + { + return 0; + } + + a_this->mpBWaterBgW = new dBgW(); + if (a_this->mpBWaterBgW == NULL) { + return 0; + } + + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("L3_bwater", 11); + if (a_this->mpBWaterBgW->Set(dzb, dBgW::MOVE_BG_e, &a_this->mpBWaterMtx) == true) { + return 0; + } + + modelData = (J3DModelData*)dComIfG_getObjectRes("S_octhibi", 4); + JUT_ASSERT(modelData != 0); + + a_this->mpOctHibiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (a_this->mpOctHibiModel == NULL) { + return 0; + } + + a_this->mpOctHibiBgW = new dBgW(); + if (a_this->mpOctHibiBgW == NULL) { + return 0; + } + + dzb = (cBgD_t*)dComIfG_getObjectRes("S_octhibi", 7); + if (a_this->mpOctHibiBgW->Set(dzb, dBgW::MOVE_BG_e, &a_this->mpOctHibiMtx) == true) { + return 0; + } + + return 1; +} + +/* 80C5BBD4-80C5BD48 0006D4 0174+00 1/0 0/0 0/0 .text daObj_Lv3waterB_Create__FP10fopAc_ac_c */ +static int daObj_Lv3waterB_Create(fopAc_ac_c* i_this) { + obj_lv3WaterB_class* a_this = static_cast(i_this); + fopAcM_SetupActor(a_this, obj_lv3WaterB_class); + + int phase_state = dComIfG_resLoad(&a_this->mBWaterPhase, "L3_bwater"); + int octhibi_phase_state = dComIfG_resLoad(&a_this->mOcthibiPhase, "S_octhibi"); + if (phase_state == cPhs_COMPLEATE_e && octhibi_phase_state == cPhs_COMPLEATE_e) { + OS_REPORT("OBJ_LV3WATERB PARAM %x\n", fopAcM_GetParam(a_this)); + OS_REPORT("OBJ_LV3WATERB//////////////OBJ_LV3WATERB SET 1 !!\n"); + + if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0x4B000)) { + OS_REPORT("//////////////OBJ_LV3WATERB SET NON !!\n"); + return cPhs_ERROR_e; + } + + OS_REPORT("//////////////OBJ_LV3WATERB SET 2 !!\n"); + + if (dComIfG_Bgsp().Regist(a_this->mpBWaterBgW, a_this)) { + return cPhs_ERROR_e; + } + + if (dComIfG_Bgsp().Regist(a_this->mpOctHibiBgW, a_this)) { + return cPhs_ERROR_e; + } + + if (dComIfGs_isStageBossEnemy()) { + a_this->current.pos.y = (a_this->orig.pos.y - 14450.0f) + 160.0f; + a_this->mAction = 2; + a_this->field_0x586 = 1; + a_this->mpOctHibiModel = NULL; + } + + daObj_Lv3waterB_Execute(a_this); + return phase_state; + } else if (phase_state == cPhs_COMPLEATE_e) { + return octhibi_phase_state; + } + + return phase_state; +} -/* ############################################################################################## */ /* 80C5BD84-80C5BDA4 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Lv3waterB_Method */ -SECTION_DATA static void* l_daObj_Lv3waterB_Method[8] = { - (void*)daObj_Lv3waterB_Create__FP10fopAc_ac_c, - (void*)daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class, - (void*)daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class, - (void*)daObj_Lv3waterB_IsDelete__FP19obj_lv3WaterB_class, - (void*)daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObj_Lv3waterB_Method = { + (process_method_func)daObj_Lv3waterB_Create, (process_method_func)daObj_Lv3waterB_Delete, + (process_method_func)daObj_Lv3waterB_Execute, (process_method_func)daObj_Lv3waterB_IsDelete, + (process_method_func)daObj_Lv3waterB_Draw, }; /* 80C5BDA4-80C5BDD4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_LV3WATERB */ -SECTION_DATA extern void* g_profile_OBJ_LV3WATERB[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00D70000, (void*)&g_fpcLf_Method, - (void*)0x000005F8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x026A0000, (void*)&l_daObj_Lv3waterB_Method, - (void*)0x00044000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_OBJ_LV3WATERB = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_OBJ_LV3WATERB, + &g_fpcLf_Method.mBase, + sizeof(obj_lv3WaterB_class), + 0, + 0, + &g_fopAc_Method.base, + 618, + &l_daObj_Lv3waterB_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; - -/* 80C5BDD4-80C5BDE0 000050 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80C5B94C-80C5BB8C 00044C 0240+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80C5BB8C-80C5BBD4 00068C 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* 80C5BBD4-80C5BD48 0006D4 0174+00 1/0 0/0 0/0 .text daObj_Lv3waterB_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lv3waterB_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB/daObj_Lv3waterB_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80C5BD70-80C5BD70 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp index bbd760a63e1..87c8bc0ffc1 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp +++ b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp @@ -1,341 +1,17 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_oiltubo -// +/** + * d_a_obj_oiltubo.cpp + * Lantern Oil Pot + */ #include "rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.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 J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObj_Oiltubo_c { - /* 80CA6718 */ void create(); - /* 80CA6B28 */ void CreateHeap(); - /* 80CA6C5C */ void Delete(); - /* 80CA6CA0 */ void Execute(); - /* 80CA6EDC */ void Draw(); - /* 80CA6FC8 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CA6FE8 */ void getResName(); - /* 80CA6FF8 */ void restart(); - /* 80CA7068 */ void initialize(); - /* 80CA720C */ void setProcess(int (daObj_Oiltubo_c::*)(void*)); - /* 80CA72BC */ void setParam(); - /* 80CA7318 */ void setEnvTevColor(); - /* 80CA7374 */ void setRoomNo(); - /* 80CA73B8 */ void setMtx(); - /* 80CA7430 */ void setAttnPos(); - /* 80CA7478 */ void chkEvent(); - /* 80CA74C8 */ void wait(void*); - /* 80CA7628 */ ~daObj_Oiltubo_c(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -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 { - /* 8003C37C */ void getRes(char const*, char const*, 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_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80CA6A14 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CA6A70 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CA69A4 */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~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 dAttCatch_c { - /* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80CA6914 */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CA695C */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CA75E0 */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct _GXTexObj {}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDF48 */ ~Z2SoundObjBase(); - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CA6AE0 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void create__15daObj_Oiltubo_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -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 __dt__12J3DFrameCtrlFv(); -extern "C" void CreateHeap__15daObj_Oiltubo_cFv(); -extern "C" void Delete__15daObj_Oiltubo_cFv(); -extern "C" void Execute__15daObj_Oiltubo_cFv(); -extern "C" void Draw__15daObj_Oiltubo_cFv(); -extern "C" void createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c(); -extern "C" void getResName__15daObj_Oiltubo_cFv(); -extern "C" void restart__15daObj_Oiltubo_cFv(); -extern "C" void initialize__15daObj_Oiltubo_cFv(); -extern "C" void setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i(); -extern "C" void setParam__15daObj_Oiltubo_cFv(); -extern "C" void setEnvTevColor__15daObj_Oiltubo_cFv(); -extern "C" void setRoomNo__15daObj_Oiltubo_cFv(); -extern "C" void setMtx__15daObj_Oiltubo_cFv(); -extern "C" void setAttnPos__15daObj_Oiltubo_cFv(); -extern "C" void chkEvent__15daObj_Oiltubo_cFv(); -extern "C" void wait__15daObj_Oiltubo_cFPv(); -extern "C" static void daObj_Oiltubo_Create__FPv(); -extern "C" static void daObj_Oiltubo_Delete__FPv(); -extern "C" static void daObj_Oiltubo_Execute__FPv(); -extern "C" static void daObj_Oiltubo_Draw__FPv(); -extern "C" static bool daObj_Oiltubo_IsDelete__FPv(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__15daObj_Oiltubo_cFv(); -extern "C" void __sinit_d_a_obj_oiltubo_cpp(); -extern "C" static void func_80CA78D8(); -extern "C" static void func_80CA78E0(); -extern "C" u8 const mCcDObjInfo__15daObj_Oiltubo_c[48]; -extern "C" extern char const* const d_a_obj_oiltubo__stringBase0; -extern "C" u8 mCcDCyl__15daObj_Oiltubo_c[68]; - -// -// External References: -// - -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -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_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void request__11dAttCatch_cFP10fopAc_ac_cUcfffsi(); -extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWallR__12dBgS_AcchCirFf(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObjSe__12dCcD_GObjInfFv(); -extern "C" void getHitSeID__12dCcD_GObjInfFUci(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void __dt__14Z2SoundObjBaseFv(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __ptmf_test(); -extern "C" void __ptmf_scall(); -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" extern void* __vt__16Z2SoundObjSimple[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]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CA7948-80CA7948 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CA7948 = "Obj_otubo"; -SECTION_DEAD static char const* const stringBase_80CA7952 = "x_oiltubo_00.bmd"; -SECTION_DEAD static char const* const stringBase_80CA7963 = "x_oiltubo_00b.bmd"; -SECTION_DEAD static char const* const stringBase_80CA7975 = "x_oiltubo_00b.btk"; -#pragma pop /* 80CA7988-80CA7994 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80CA7994-80CA79A8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -343,524 +19,334 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { 0x3FE00000, 0x00000000, }; -#pragma pop /* 80CA79A8-80CA79AC -00001 0004+00 1/1 0/0 0/0 .data l_resFileName */ -SECTION_DATA static void* l_resFileName = (void*)&d_a_obj_oiltubo__stringBase0; +static char* l_resFileName = "Obj_otubo"; /* 80CA79AC-80CA79B0 -00001 0004+00 0/1 0/0 0/0 .data l_bmdFileName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_bmdFileName = (void*)(((char*)&d_a_obj_oiltubo__stringBase0) + 0xA); -#pragma pop +static char* l_bmdFileName = "x_oiltubo_00.bmd"; /* 80CA79B0-80CA79B4 -00001 0004+00 0/1 0/0 0/0 .data l_bbmdFileName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_bbmdFileName = (void*)(((char*)&d_a_obj_oiltubo__stringBase0) + 0x1B); -#pragma pop +static char* l_bbmdFileName = "x_oiltubo_00b.bmd"; /* 80CA79B4-80CA79B8 -00001 0004+00 0/2 0/0 0/0 .data l_bbtkFileName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_bbtkFileName = (void*)(((char*)&d_a_obj_oiltubo__stringBase0) + 0x2D); -#pragma pop +static char* l_bbtkFileName = "x_oiltubo_00b.btk"; /* 80CA79B8-80CA79FC 000030 0044+00 2/2 0/0 0/0 .data mCcDCyl__15daObj_Oiltubo_c */ -SECTION_DATA u8 daObj_Oiltubo_c::mCcDCyl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CA79FC-80CA7A08 -00001 000C+00 1/1 0/0 0/0 .data @3897 */ -SECTION_DATA static void* lit_3897[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait__15daObj_Oiltubo_cFPv, -}; - -/* 80CA7A08-80CA7A28 -00001 0020+00 1/0 0/0 0/0 .data daObj_Oiltubo_MethodTable */ -SECTION_DATA static void* daObj_Oiltubo_MethodTable[8] = { - (void*)daObj_Oiltubo_Create__FPv, - (void*)daObj_Oiltubo_Delete__FPv, - (void*)daObj_Oiltubo_Execute__FPv, - (void*)daObj_Oiltubo_IsDelete__FPv, - (void*)daObj_Oiltubo_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CA7A28-80CA7A58 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_OILTUBO */ -SECTION_DATA extern void* g_profile_OBJ_OILTUBO[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x011E0000, (void*)&g_fpcLf_Method, - (void*)0x00000AD4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00420000, (void*)&daObj_Oiltubo_MethodTable, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 80CA7A58-80CA7A64 0000D0 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, -}; - -/* 80CA7A64-80CA7A70 0000DC 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, -}; - -/* 80CA7A70-80CA7A7C 0000E8 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, -}; - -/* 80CA7A7C-80CA7A88 0000F4 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80CA7A88-80CA7A94 000100 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, -}; - -/* 80CA7A94-80CA7AB8 00010C 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_80CA78E0, - (void*)NULL, - (void*)NULL, - (void*)func_80CA78D8, -}; - -/* 80CA7AB8-80CA7AC4 000130 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80CA7AC4-80CA7AD0 00013C 000C+00 2/2 0/0 0/0 .data __vt__15daObj_Oiltubo_c */ -SECTION_DATA extern void* __vt__15daObj_Oiltubo_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daObj_Oiltubo_cFv, +dCcD_SrcCyl daObj_Oiltubo_c::mCcDCyl = { + daObj_Oiltubo_c::mCcDObjInfo, + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl }; /* 80CA6718-80CA6914 000078 01FC+00 1/1 0/0 0/0 .text create__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/create__15daObj_Oiltubo_cFv.s" -} -#pragma pop +int daObj_Oiltubo_c::create() { + fopAcM_SetupActor(this, daObj_Oiltubo_c); -/* 80CA6914-80CA695C 000274 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_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGCylFv.s" -} -#pragma pop + int phase_state = dComIfG_resLoad(&mPhase, getResName()); + if (phase_state == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x2000)) { + return cPhs_ERROR_e; + } -/* 80CA695C-80CA69A4 0002BC 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_oiltubo/d_a_obj_oiltubo/__dt__8cM3dGAabFv.s" -} -#pragma pop + initialize(); + } -/* 80CA69A4-80CA6A14 000304 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_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_AcchCirFv.s" + return phase_state; } -#pragma pop -/* 80CA6A14-80CA6A70 000374 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_oiltubo/d_a_obj_oiltubo/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80CA6A70-80CA6AE0 0003D0 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_oiltubo/d_a_obj_oiltubo/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80CA6AE0-80CA6B28 000440 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* ############################################################################################## */ /* 80CA78F4-80CA7924 000000 0030+00 5/5 0/0 0/0 .rodata mCcDObjInfo__15daObj_Oiltubo_c */ -SECTION_RODATA u8 const daObj_Oiltubo_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, +const dCcD_SrcGObjInf daObj_Oiltubo_c::mCcDObjInfo = { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x1F}, 0x79}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x1}, // mGObjTg + {0x0}, // mGObjCo }; -COMPILER_STRIP_GATE(0x80CA78F4, &daObj_Oiltubo_c::mCcDObjInfo); - -/* 80CA7924-80CA7928 000030 0004+00 1/3 0/0 0/0 .rodata @3815 */ -SECTION_RODATA static f32 const lit_3815 = 1.0f; -COMPILER_STRIP_GATE(0x80CA7924, &lit_3815); /* 80CA6B28-80CA6C5C 000488 0134+00 1/1 0/0 0/0 .text CreateHeap__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/CreateHeap__15daObj_Oiltubo_cFv.s" +int daObj_Oiltubo_c::CreateHeap() { + J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileName); + JUT_ASSERT(mdlData_p != 0); + + mpModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + J3DModelData* mdlBData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bbmdFileName); + JUT_ASSERT(mdlBData_p != 0); + + mpBModel = mDoExt_J3DModel__create(mdlBData_p, 0x80000, 0x19000284); + if (mpBModel == NULL) { + return 0; + } + + mBtk.init(mdlBData_p, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getResName(), l_bbtkFileName), + TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1); + mSound.init(¤t.pos, 1); + return 1; } -#pragma pop /* 80CA6C5C-80CA6CA0 0005BC 0044+00 1/1 0/0 0/0 .text Delete__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Delete__15daObj_Oiltubo_cFv.s" +int daObj_Oiltubo_c::Delete() { + dComIfG_resDelete(&mPhase, getResName()); + mSound.deleteObject(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CA7928-80CA792C 000034 0004+00 0/1 0/0 0/0 .rodata @3863 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3863 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80CA7928, &lit_3863); -#pragma pop - -/* 80CA792C-80CA7930 000038 0004+00 1/4 0/0 0/0 .rodata @3864 */ -SECTION_RODATA static f32 const lit_3864 = 50.0f; -COMPILER_STRIP_GATE(0x80CA792C, &lit_3864); - -/* 80CA7930-80CA7934 00003C 0004+00 1/3 0/0 0/0 .rodata @3865 */ -SECTION_RODATA static f32 const lit_3865 = 70.0f; -COMPILER_STRIP_GATE(0x80CA7930, &lit_3865); /* 80CA6CA0-80CA6EDC 000600 023C+00 2/2 0/0 0/0 .text Execute__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Execute__15daObj_Oiltubo_cFv.s" +int daObj_Oiltubo_c::Execute() { + BOOL event_chk = chkEvent(); + + mBtk.play(); + setParam(); + + mAcch.CrrPos(dComIfG_Bgsp()); + mGroundChk = mAcch.m_gnd; + mGroundHeight = mAcch.GetGroundH(); + + if (mGroundHeight != -1000000000.0f) { + setEnvTevColor(); + setRoomNo(); + } + + if (event_chk && mProcess != NULL) { + (this->*mProcess)(NULL); + } + + setMtx(); + + mCcCoCyl.SetCoSPrm(0); + mCcCoCyl.SetTgType(0xD8FBFDFF); + mCcCoCyl.SetTgSPrm(0x1F); + mCcCoCyl.SetR(50.0f); + mCcCoCyl.SetH(70.0f); + mCcCoCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcCoCyl); + + mCcAtCyl.SetAtType(0); + mCcAtCyl.SetAtSPrm(0); + mCcAtCyl.SetR(50.0f); + mCcAtCyl.SetH(70.0f); + mCcAtCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcAtCyl); + + setAttnPos(); + + if (mCcAtCyl.ChkTgHit() && mCcAtCyl.GetTgHitObj() != NULL) { + mSound.startCollisionSE(mCcAtCyl.GetTgHitObjHitSeID(1), 2, NULL); + } + + mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CA7934-80CA7938 000040 0004+00 0/1 0/0 0/0 .rodata @3884 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3884 = 800.0f; -COMPILER_STRIP_GATE(0x80CA7934, &lit_3884); -#pragma pop - -/* 80CA7938-80CA793C 000044 0004+00 0/1 0/0 0/0 .rodata @3885 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3885 = 120.0f; -COMPILER_STRIP_GATE(0x80CA7938, &lit_3885); -#pragma pop /* 80CA6EDC-80CA6FC8 00083C 00EC+00 1/1 0/0 0/0 .text Draw__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/Draw__15daObj_Oiltubo_cFv.s" +int daObj_Oiltubo_c::Draw() { + g_env_light.settingTevStruct(8, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpBModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + + mDoExt_modelUpdateDL(mpModel); + mBtk.entry(mpBModel->getModelData()); + mDoExt_modelUpdateDL(mpBModel); + + mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos, 800.0f, 120.0f, + current.pos.y, mGroundHeight, mGroundChk, &mTevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); + return 1; } -#pragma pop /* 80CA6FC8-80CA6FE8 000928 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c.s" +int daObj_Oiltubo_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80CA6FE8-80CA6FF8 000948 0010+00 4/4 0/0 0/0 .text getResName__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::getResName() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/getResName__15daObj_Oiltubo_cFv.s" +const char* daObj_Oiltubo_c::getResName() { + return l_resFileName; } -#pragma pop /* 80CA6FF8-80CA7068 000958 0070+00 1/1 0/0 0/0 .text restart__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::restart() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/restart__15daObj_Oiltubo_cFv.s" +void daObj_Oiltubo_c::restart() { + current.angle.set(0, orig.angle.y, 0); + shape_angle = current.angle; + + setProcess(&wait); } -#pragma pop /* 80CA7068-80CA720C 0009C8 01A4+00 1/1 0/0 0/0 .text initialize__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::initialize() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/initialize__15daObj_Oiltubo_cFv.s" +void daObj_Oiltubo_c::initialize() { + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_SetMtx(this, mpBModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + fopAcM_setCullSizeBox2(this, mpBModel->getModelData()); + + mEvtInfo.setArchiveName((char*)getResName()); + mAttentionInfo.mFlags = 0; + + mAcchCir.SetWall(50.0f, 70.0f); + mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + &fopAcM_GetSpeed_p(this), &fopAcM_GetAngle_p(this), &fopAcM_GetShapeAngle_p(this)); + mCcStts.Init(0xFF, 0, this); + + mCcAtCyl.Set(mCcDCyl); + mCcAtCyl.SetStts(&mCcStts); + + mCcCoCyl.Set(mCcDCyl); + mCcCoCyl.SetStts(&mCcStts); + + mAcch.CrrPos(dComIfG_Bgsp()); + mGroundChk = mAcch.m_gnd; + mGroundHeight = mAcch.GetGroundH(); + + setEnvTevColor(); + setRoomNo(); + restart(); + Execute(); } -#pragma pop /* 80CA720C-80CA72BC 000B6C 00B0+00 1/1 0/0 0/0 .text * setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::setProcess(int (daObj_Oiltubo_c::*param_0)(void*)) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i.s" +int daObj_Oiltubo_c::setProcess(daObj_Oiltubo_c::processFn i_process) { + mMode = 2; + + if (mProcess != NULL) { + (this->*mProcess)(NULL); + } + + mMode = 0; + mProcess = i_process; + + if (mProcess != NULL) { + (this->*mProcess)(NULL); + } + + mMode = 1; + return 1; } -#pragma pop /* 80CA72BC-80CA7318 000C1C 005C+00 1/1 0/0 0/0 .text setParam__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::setParam() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setParam__15daObj_Oiltubo_cFv.s" +void daObj_Oiltubo_c::setParam() { + mScale.set(1.0f, 1.0f, 1.0f); + mAcchCir.SetWallR(50.0f); + mAcchCir.SetWallH(70.0f); } -#pragma pop /* 80CA7318-80CA7374 000C78 005C+00 2/2 0/0 0/0 .text setEnvTevColor__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::setEnvTevColor() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setEnvTevColor__15daObj_Oiltubo_cFv.s" +void daObj_Oiltubo_c::setEnvTevColor() { + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGroundChk); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGroundChk); } -#pragma pop /* 80CA7374-80CA73B8 000CD4 0044+00 2/2 0/0 0/0 .text setRoomNo__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::setRoomNo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setRoomNo__15daObj_Oiltubo_cFv.s" +void daObj_Oiltubo_c::setRoomNo() { + int roomId = dComIfG_Bgsp().GetRoomId(mGroundChk); + + fopAcM_SetRoomNo(this, roomId); + mCcStts.SetRoomId(roomId); } -#pragma pop /* 80CA73B8-80CA7430 000D18 0078+00 1/1 0/0 0/0 .text setMtx__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setMtx__15daObj_Oiltubo_cFv.s" -} -#pragma pop +void daObj_Oiltubo_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(mScale); -/* ############################################################################################## */ -/* 80CA793C-80CA7940 000048 0004+00 1/1 0/0 0/0 .rodata @3999 */ -SECTION_RODATA static f32 const lit_3999 = 150.0f; -COMPILER_STRIP_GATE(0x80CA793C, &lit_3999); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpBModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); +} /* 80CA7430-80CA7478 000D90 0048+00 1/1 0/0 0/0 .text setAttnPos__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::setAttnPos() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/setAttnPos__15daObj_Oiltubo_cFv.s" +void daObj_Oiltubo_c::setAttnPos() { + mAttentionInfo.mPosition = current.pos; + mAttentionInfo.mPosition.y += 150.0f; + mEyePos = current.pos; } -#pragma pop /* 80CA7478-80CA74C8 000DD8 0050+00 1/1 0/0 0/0 .text chkEvent__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::chkEvent() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/chkEvent__15daObj_Oiltubo_cFv.s" +BOOL daObj_Oiltubo_c::chkEvent() { + BOOL var_r5 = 1; + + if (!i_dComIfGp_getEvent().i_isOrderOK()) { + var_r5 = 0; + + if (mEvtInfo.i_checkCommandCatch()) { + return var_r5; + } + } + + return var_r5; } -#pragma pop - -/* ############################################################################################## */ -/* 80CA7940-80CA7944 00004C 0004+00 0/1 0/0 0/0 .rodata @4029 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4029 = 100.0f; -COMPILER_STRIP_GATE(0x80CA7940, &lit_4029); -#pragma pop - -/* 80CA7944-80CA7948 000050 0004+00 0/1 0/0 0/0 .rodata @4030 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4030 = -50.0f; -COMPILER_STRIP_GATE(0x80CA7944, &lit_4030); -#pragma pop /* 80CA74C8-80CA7558 000E28 0090+00 1/0 0/0 0/0 .text wait__15daObj_Oiltubo_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Oiltubo_c::wait(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/wait__15daObj_Oiltubo_cFPv.s" +int daObj_Oiltubo_c::wait(void* unused) { + switch (mMode) { + case 1: + if (!mEvtInfo.i_checkCommandCatch()) { + dComIfGp_att_CatchRequest(this, OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1); + mEvtInfo.i_onCondition(0x40); + } + break; + case 2: + case 0: + break; + } + + return 1; } -#pragma pop /* 80CA7558-80CA7578 000EB8 0020+00 1/0 0/0 0/0 .text daObj_Oiltubo_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Oiltubo_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Create__FPv.s" +static int daObj_Oiltubo_Create(void* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80CA7578-80CA7598 000ED8 0020+00 1/0 0/0 0/0 .text daObj_Oiltubo_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Oiltubo_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Delete__FPv.s" +static int daObj_Oiltubo_Delete(void* i_this) { + return static_cast(i_this)->Delete(); } -#pragma pop /* 80CA7598-80CA75B8 000EF8 0020+00 1/0 0/0 0/0 .text daObj_Oiltubo_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Oiltubo_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Execute__FPv.s" +static int daObj_Oiltubo_Execute(void* i_this) { + return static_cast(i_this)->Execute(); } -#pragma pop /* 80CA75B8-80CA75D8 000F18 0020+00 1/0 0/0 0/0 .text daObj_Oiltubo_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Oiltubo_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/daObj_Oiltubo_Draw__FPv.s" +static int daObj_Oiltubo_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } -#pragma pop /* 80CA75D8-80CA75E0 000F38 0008+00 1/0 0/0 0/0 .text daObj_Oiltubo_IsDelete__FPv */ -static bool daObj_Oiltubo_IsDelete(void* param_0) { - return true; +static int daObj_Oiltubo_IsDelete(void* i_this) { + return 1; } -/* 80CA75E0-80CA7628 000F40 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_oiltubo/d_a_obj_oiltubo/__dt__10cCcD_GSttsFv.s" -} -#pragma pop +/* 80CA7A08-80CA7A28 -00001 0020+00 1/0 0/0 0/0 .data daObj_Oiltubo_MethodTable */ +static actor_method_class daObj_Oiltubo_MethodTable = { + (process_method_func)daObj_Oiltubo_Create, (process_method_func)daObj_Oiltubo_Delete, + (process_method_func)daObj_Oiltubo_Execute, (process_method_func)daObj_Oiltubo_IsDelete, + (process_method_func)daObj_Oiltubo_Draw, +}; -/* 80CA7628-80CA78A0 000F88 0278+00 1/0 0/0 0/0 .text __dt__15daObj_Oiltubo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Oiltubo_c::~daObj_Oiltubo_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__dt__15daObj_Oiltubo_cFv.s" -} -#pragma pop - -/* 80CA78A0-80CA78D8 001200 0038+00 0/0 1/0 0/0 .text __sinit_d_a_obj_oiltubo_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_oiltubo_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/__sinit_d_a_obj_oiltubo_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CA78A0, __sinit_d_a_obj_oiltubo_cpp); -#pragma pop - -/* 80CA78D8-80CA78E0 001238 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_80CA78D8() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78D8.s" -} -#pragma pop - -/* 80CA78E0-80CA78E8 001240 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_80CA78E0() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo/func_80CA78E0.s" -} -#pragma pop - -/* 80CA7948-80CA7948 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CA7A28-80CA7A58 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_OILTUBO */ +extern actor_process_profile_definition g_profile_OBJ_OILTUBO = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_OBJ_OILTUBO, + &g_fpcLf_Method.mBase, + sizeof(daObj_Oiltubo_c), + 0, + 0, + &g_fopAc_Method.base, + 66, + &daObj_Oiltubo_MethodTable, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp index 3dd83f50574..fdc62c8679d 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp @@ -134,7 +134,7 @@ int daObj_SSItem_c::Execute() { mTgCyl.SetC(currentPos); dComIfG_Ccsp()->Set(&mTgCyl); mAtCyl.SetAtType(0); - mAtCyl.SetAtSprm(0); + mAtCyl.SetAtSPrm(0); mAtCyl.SetR(8.0f); mAtCyl.SetH(62.0f); mAtCyl.SetC(current.pos);