From 18cb3aa72f90f81fb2ca7ba7201a835e81a6d6b6 Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Sun, 12 Nov 2023 00:12:21 -0500 Subject: [PATCH] d_a_obj_lv1Candle01, d_a_obj_lv2Candle OK (#1978) Co-authored-by: hatal175 --- Progress.md | 4 +- .../CreateHeap__12daLv1Cdl01_cFv.s | 28 - .../Delete__12daLv1Cdl01_cFv.s | 24 - .../Draw__12daLv1Cdl01_cFv.s | 42 - .../Execute__12daLv1Cdl01_cFPPA3_A4_f.s | 232 ---- .../__ct__16daLv1Cdl01_HIO_cFv.s | 12 - .../__dt__14mDoHIO_entry_cFv.s | 20 - .../__dt__16daLv1Cdl01_HIO_cFv.s | 26 - .../d_a_obj_lv1Candle01/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_lv1Candle01/__dt__8cM3dGCylFv.s | 20 - .../__sinit_d_a_obj_lv1Candle01_cpp.s | 30 - .../create__12daLv1Cdl01_cFv.s | 148 --- .../cutLight__12daLv1Cdl01_cFv.s | 14 - .../daLv1Cdl01_Create__FP10fopAc_ac_c.s | 9 - .../daLv1Cdl01_Delete__FP12daLv1Cdl01_c.s | 9 - .../daLv1Cdl01_Draw__FP12daLv1Cdl01_c.s | 12 - .../daLv1Cdl01_Execute__FP12daLv1Cdl01_c.s | 9 - .../lightInit__12daLv1Cdl01_cFv.s | 37 - .../pointLightProc__12daLv1Cdl01_cFv.s | 48 - .../setBaseMtx__12daLv1Cdl01_cFv.s | 35 - .../setLight__12daLv1Cdl01_cFv.s | 14 - .../CreateHeap__13daLv2Candle_cFv.s | 33 - .../Delete__13daLv2Candle_cFv.s | 27 - .../Draw__13daLv2Candle_cFv.s | 42 - .../Execute__13daLv2Candle_cFv.s | 351 ------- .../__ct__17daLv2Candle_HIO_cFv.s | 43 - .../__dt__14mDoHIO_entry_cFv.s | 20 - .../__dt__17daLv2Candle_HIO_cFv.s | 26 - .../d_a_obj_lv2Candle/__dt__8cM3dGAabFv.s | 20 - .../d_a_obj_lv2Candle/__dt__8cM3dGCylFv.s | 20 - .../__sinit_d_a_obj_lv2Candle_cpp.s | 30 - ...pCallBack__13daLv2Candle_cFP10fopAc_ac_c.s | 9 - .../create__13daLv2Candle_cFv.s | 197 ---- .../cutLight__13daLv2Candle_cFv.s | 14 - .../daLv2Candle_Create__FP10fopAc_ac_c.s | 9 - .../daLv2Candle_Delete__FP13daLv2Candle_c.s | 9 - .../daLv2Candle_Draw__FP13daLv2Candle_c.s | 9 - .../daLv2Candle_Execute__FP13daLv2Candle_c.s | 9 - .../isSwitch__13daLv2Candle_cFv.s | 20 - .../lightInit__13daLv2Candle_cFv.s | 44 - .../pointLightProc__13daLv2Candle_cFv.s | 145 --- .../searchDemoTagAct__13daLv2Candle_cFPvPv.s | 23 - .../setBaseMtx__13daLv2Candle_cFv.s | 35 - .../setLight__13daLv2Candle_cFv.s | 14 - include/SSystem/SComponent/c_cc_d.h | 1 + .../d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h | 13 +- .../d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h | 47 +- .../obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h | 75 +- .../d_a_obj_lv4CandleTag.h | 68 +- .../d_a_obj_lv1Candle00.cpp | 104 +- .../d_a_obj_lv1Candle01.cpp | 803 ++++---------- .../d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp | 989 +++++++----------- .../d_a_obj_lv4CandleTag.cpp | 92 +- 53 files changed, 833 insertions(+), 3301 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/CreateHeap__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Delete__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Draw__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Execute__12daLv1Cdl01_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__ct__16daLv1Cdl01_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__14mDoHIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__16daLv1Cdl01_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__sinit_d_a_obj_lv1Candle01_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/create__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/cutLight__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Delete__FP12daLv1Cdl01_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Draw__FP12daLv1Cdl01_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Execute__FP12daLv1Cdl01_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/lightInit__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/pointLightProc__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setBaseMtx__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setLight__12daLv1Cdl01_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/CreateHeap__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Delete__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Draw__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Execute__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__ct__17daLv2Candle_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__14mDoHIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__17daLv2Candle_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__sinit_d_a_obj_lv2Candle_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/create__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/cutLight__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Delete__FP13daLv2Candle_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Draw__FP13daLv2Candle_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Execute__FP13daLv2Candle_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/isSwitch__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/lightInit__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/pointLightProc__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/searchDemoTagAct__13daLv2Candle_cFPvPv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setBaseMtx__13daLv2Candle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setLight__13daLv2Candle_cFv.s diff --git a/Progress.md b/Progress.md index 2ab35ec289..1dbee74d83 100644 --- a/Progress.md +++ b/Progress.md @@ -482,8 +482,8 @@ d_a_obj_lbox | 47.423510% | 2356 | 4968 d_a_obj_life_container | 34.456243% | 3764 | 10924 d_a_obj_lp | 29.557762% | 2620 | 8864 d_a_obj_lv1Candle00 | 100.000000% | 5756 | 5756 -d_a_obj_lv1Candle01 | 44.344569% | 2368 | 5340 -d_a_obj_lv2Candle | 38.160920% | 2656 | 6960 +d_a_obj_lv1Candle01 | 100.000000% | 5340 | 5340 +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 diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/CreateHeap__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/CreateHeap__12daLv1Cdl01_cFv.s deleted file mode 100644 index 2debd1094b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/CreateHeap__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C56DA8: -/* 80C56DA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56DAC 7C 08 02 A6 */ mflr r0 -/* 80C56DB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C56DB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C56DB8 7C 7F 1B 78 */ mr r31, r3 -/* 80C56DBC 3C 60 80 C5 */ lis r3, d_a_obj_lv1Candle01__stringBase0@ha /* 0x80C578C0@ha */ -/* 80C56DC0 38 63 78 C0 */ addi r3, r3, d_a_obj_lv1Candle01__stringBase0@l /* 0x80C578C0@l */ -/* 80C56DC4 38 80 00 04 */ li r4, 4 -/* 80C56DC8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C56DCC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C56DD0 3C A5 00 02 */ addis r5, r5, 2 -/* 80C56DD4 38 C0 00 80 */ li r6, 0x80 -/* 80C56DD8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C56DDC 4B 3E 55 11 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C56DE0 3C 80 00 08 */ lis r4, 8 -/* 80C56DE4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C56DE8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C56DEC 4B 3B DE 69 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C56DF0 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C56DF4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C56DF8 30 03 FF FF */ addic r0, r3, -1 -/* 80C56DFC 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C56E00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C56E04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56E08 7C 08 03 A6 */ mtlr r0 -/* 80C56E0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C56E10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Delete__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Delete__12daLv1Cdl01_cFv.s deleted file mode 100644 index 2431a08255..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Delete__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80C57698: -/* 80C57698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5769C 7C 08 02 A6 */ mflr r0 -/* 80C576A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C576A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C576A8 7C 7F 1B 78 */ mr r31, r3 -/* 80C576AC 38 7F 07 6C */ addi r3, r31, 0x76c -/* 80C576B0 4B 66 69 49 */ bl deleteObject__14Z2SoundObjBaseFv -/* 80C576B4 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C576B8 3C 80 80 C5 */ lis r4, d_a_obj_lv1Candle01__stringBase0@ha /* 0x80C578C0@ha */ -/* 80C576BC 38 84 78 C0 */ addi r4, r4, d_a_obj_lv1Candle01__stringBase0@l /* 0x80C578C0@l */ -/* 80C576C0 4B 3D 59 49 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C576C4 88 1F 07 40 */ lbz r0, 0x740(r31) -/* 80C576C8 28 00 00 00 */ cmplwi r0, 0 -/* 80C576CC 41 82 00 0C */ beq lbl_80C576D8 -/* 80C576D0 38 7F 07 48 */ addi r3, r31, 0x748 -/* 80C576D4 4B 55 02 59 */ bl dKy_plight_cut__FP15LIGHT_INFLUENCE -lbl_80C576D8: -/* 80C576D8 38 60 00 01 */ li r3, 1 -/* 80C576DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C576E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C576E4 7C 08 03 A6 */ mtlr r0 -/* 80C576E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C576EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Draw__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Draw__12daLv1Cdl01_cFv.s deleted file mode 100644 index 1ed58b89d9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Draw__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C575F4: -/* 80C575F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C575F8 7C 08 02 A6 */ mflr r0 -/* 80C575FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C57600 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C57604 93 C1 00 08 */ stw r30, 8(r1) -/* 80C57608 7C 7E 1B 78 */ mr r30, r3 -/* 80C5760C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C57610 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C57614 38 80 00 40 */ li r4, 0x40 -/* 80C57618 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C5761C 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C57620 4B 54 C1 A5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C57624 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C57628 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5762C 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80C57630 80 84 00 04 */ lwz r4, 4(r4) -/* 80C57634 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C57638 4B 54 D7 69 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C5763C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C57640 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C57644 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C57648 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C5764C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C57650 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C57654 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C57658 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C5765C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C57660 4B 3B 66 65 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C57664 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C57668 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5766C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C57670 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C57674 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C57678 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C5767C 38 60 00 01 */ li r3, 1 -/* 80C57680 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C57684 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C57688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5768C 7C 08 03 A6 */ mtlr r0 -/* 80C57690 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C57694 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Execute__12daLv1Cdl01_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Execute__12daLv1Cdl01_cFPPA3_A4_f.s deleted file mode 100644 index 4f2ed0e93b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Execute__12daLv1Cdl01_cFPPA3_A4_f.s +++ /dev/null @@ -1,232 +0,0 @@ -lbl_80C57274: -/* 80C57274 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C57278 7C 08 02 A6 */ mflr r0 -/* 80C5727C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C57280 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C57284 4B 70 AF 59 */ bl _savegpr_29 -/* 80C57288 7C 7F 1B 78 */ mr r31, r3 -/* 80C5728C 3C A0 80 C5 */ lis r5, mCcDObjInfo__12daLv1Cdl01_c@ha /* 0x80C5785C@ha */ -/* 80C57290 3B C5 78 5C */ addi r30, r5, mCcDObjInfo__12daLv1Cdl01_c@l /* 0x80C5785C@l */ -/* 80C57294 80 A3 05 A8 */ lwz r5, 0x5a8(r3) -/* 80C57298 38 05 00 24 */ addi r0, r5, 0x24 -/* 80C5729C 90 04 00 00 */ stw r0, 0(r4) -/* 80C572A0 88 83 07 31 */ lbz r4, 0x731(r3) -/* 80C572A4 28 04 00 00 */ cmplwi r4, 0 -/* 80C572A8 41 82 00 24 */ beq lbl_80C572CC -/* 80C572AC 38 04 FF FF */ addi r0, r4, -1 -/* 80C572B0 98 1F 07 31 */ stb r0, 0x731(r31) -/* 80C572B4 88 1F 07 31 */ lbz r0, 0x731(r31) -/* 80C572B8 28 00 00 00 */ cmplwi r0, 0 -/* 80C572BC 40 82 00 10 */ bne lbl_80C572CC -/* 80C572C0 38 00 00 01 */ li r0, 1 -/* 80C572C4 98 1F 07 30 */ stb r0, 0x730(r31) -/* 80C572C8 4B FF FE 9D */ bl setLight__12daLv1Cdl01_cFv -lbl_80C572CC: -/* 80C572CC 88 1F 07 30 */ lbz r0, 0x730(r31) -/* 80C572D0 28 00 00 00 */ cmplwi r0, 0 -/* 80C572D4 41 82 00 E4 */ beq lbl_80C573B8 -/* 80C572D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C572DC 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C572E0 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C572E4 3C 80 00 01 */ lis r4, 0x0001 /* 0x000083A6@ha */ -/* 80C572E8 38 84 83 A6 */ addi r4, r4, 0x83A6 /* 0x000083A6@l */ -/* 80C572EC 38 BF 07 24 */ addi r5, r31, 0x724 -/* 80C572F0 38 C0 00 00 */ li r6, 0 -/* 80C572F4 38 E0 00 FF */ li r7, 0xff -/* 80C572F8 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80C572FC 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80C57300 7D 09 43 78 */ mr r9, r8 -/* 80C57304 39 40 00 00 */ li r10, 0 -/* 80C57308 C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 80C5730C 4B 3F 5E AD */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80C57310 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C57314 3C 80 00 01 */ lis r4, 0x0001 /* 0x000083A7@ha */ -/* 80C57318 38 84 83 A7 */ addi r4, r4, 0x83A7 /* 0x000083A7@l */ -/* 80C5731C 38 BF 07 24 */ addi r5, r31, 0x724 -/* 80C57320 38 C0 00 00 */ li r6, 0 -/* 80C57324 38 E0 00 FF */ li r7, 0xff -/* 80C57328 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80C5732C 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80C57330 7D 09 43 78 */ mr r9, r8 -/* 80C57334 39 40 00 00 */ li r10, 0 -/* 80C57338 C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 80C5733C 4B 3F 5E 7D */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80C57340 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C57344 38 80 01 03 */ li r4, 0x103 -/* 80C57348 38 BF 07 24 */ addi r5, r31, 0x724 -/* 80C5734C 38 C0 00 00 */ li r6, 0 -/* 80C57350 38 E0 00 FF */ li r7, 0xff -/* 80C57354 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80C57358 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80C5735C 7D 09 43 78 */ mr r9, r8 -/* 80C57360 39 40 00 00 */ li r10, 0 -/* 80C57364 C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 80C57368 4B 3F 5E 51 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80C5736C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C57370 7C 03 07 74 */ extsb r3, r0 -/* 80C57374 4B 3D 5C F9 */ bl dComIfGp_getReverb__Fi -/* 80C57378 7C 67 1B 78 */ mr r7, r3 -/* 80C5737C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080018@ha */ -/* 80C57380 38 03 00 18 */ addi r0, r3, 0x0018 /* 0x00080018@l */ -/* 80C57384 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C57388 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C5738C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C57390 80 63 00 00 */ lwz r3, 0(r3) -/* 80C57394 38 81 00 10 */ addi r4, r1, 0x10 -/* 80C57398 38 BF 07 24 */ addi r5, r31, 0x724 -/* 80C5739C 38 C0 00 00 */ li r6, 0 -/* 80C573A0 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80C573A4 FC 40 08 90 */ fmr f2, f1 -/* 80C573A8 C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 80C573AC FC 80 18 90 */ fmr f4, f3 -/* 80C573B0 39 00 00 00 */ li r8, 0 -/* 80C573B4 4B 65 51 59 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C573B8: -/* 80C573B8 7F E3 FB 78 */ mr r3, r31 -/* 80C573BC 4B FF F9 65 */ bl setBaseMtx__12daLv1Cdl01_cFv -/* 80C573C0 38 7F 05 E8 */ addi r3, r31, 0x5e8 -/* 80C573C4 4B 42 D0 9D */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C573C8 28 03 00 00 */ cmplwi r3, 0 -/* 80C573CC 41 82 01 9C */ beq lbl_80C57568 -/* 80C573D0 38 7F 05 E8 */ addi r3, r31, 0x5e8 -/* 80C573D4 4B 42 D1 75 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C573D8 7C 7D 1B 78 */ mr r29, r3 -/* 80C573DC 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C573E0 28 00 02 00 */ cmplwi r0, 0x200 -/* 80C573E4 40 82 00 78 */ bne lbl_80C5745C -/* 80C573E8 88 1D 00 75 */ lbz r0, 0x75(r29) -/* 80C573EC 28 00 00 01 */ cmplwi r0, 1 -/* 80C573F0 40 82 00 6C */ bne lbl_80C5745C -/* 80C573F4 88 1F 07 30 */ lbz r0, 0x730(r31) -/* 80C573F8 28 00 00 00 */ cmplwi r0, 0 -/* 80C573FC 40 82 00 60 */ bne lbl_80C5745C -/* 80C57400 38 00 00 01 */ li r0, 1 -/* 80C57404 98 1F 07 30 */ stb r0, 0x730(r31) -/* 80C57408 7F E3 FB 78 */ mr r3, r31 -/* 80C5740C 4B FF FD 59 */ bl setLight__12daLv1Cdl01_cFv -/* 80C57410 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C57414 7C 03 07 74 */ extsb r3, r0 -/* 80C57418 4B 3D 5C 55 */ bl dComIfGp_getReverb__Fi -/* 80C5741C 7C 67 1B 78 */ mr r7, r3 -/* 80C57420 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080017@ha */ -/* 80C57424 38 03 00 17 */ addi r0, r3, 0x0017 /* 0x00080017@l */ -/* 80C57428 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C5742C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C57430 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C57434 80 63 00 00 */ lwz r3, 0(r3) -/* 80C57438 38 81 00 0C */ addi r4, r1, 0xc -/* 80C5743C 38 BF 07 24 */ addi r5, r31, 0x724 -/* 80C57440 38 C0 00 00 */ li r6, 0 -/* 80C57444 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80C57448 FC 40 08 90 */ fmr f2, f1 -/* 80C5744C C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 80C57450 FC 80 18 90 */ fmr f4, f3 -/* 80C57454 39 00 00 00 */ li r8, 0 -/* 80C57458 4B 65 45 2D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C5745C: -/* 80C5745C 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 80C57460 3C 03 FF FF */ addis r0, r3, 0xffff -/* 80C57464 28 00 00 00 */ cmplwi r0, 0 -/* 80C57468 40 82 00 80 */ bne lbl_80C574E8 -/* 80C5746C 88 1D 00 75 */ lbz r0, 0x75(r29) -/* 80C57470 28 00 00 03 */ cmplwi r0, 3 -/* 80C57474 40 82 00 74 */ bne lbl_80C574E8 -/* 80C57478 88 1F 07 30 */ lbz r0, 0x730(r31) -/* 80C5747C 28 00 00 01 */ cmplwi r0, 1 -/* 80C57480 40 82 00 68 */ bne lbl_80C574E8 -/* 80C57484 38 00 00 1E */ li r0, 0x1e -/* 80C57488 98 1F 07 31 */ stb r0, 0x731(r31) -/* 80C5748C 38 00 00 00 */ li r0, 0 -/* 80C57490 98 1F 07 30 */ stb r0, 0x730(r31) -/* 80C57494 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C57498 7C 03 07 74 */ extsb r3, r0 -/* 80C5749C 4B 3D 5B D1 */ bl dComIfGp_getReverb__Fi -/* 80C574A0 7C 67 1B 78 */ mr r7, r3 -/* 80C574A4 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080019@ha */ -/* 80C574A8 38 03 00 19 */ addi r0, r3, 0x0019 /* 0x00080019@l */ -/* 80C574AC 90 01 00 08 */ stw r0, 8(r1) -/* 80C574B0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C574B4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C574B8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C574BC 38 81 00 08 */ addi r4, r1, 8 -/* 80C574C0 38 BF 07 24 */ addi r5, r31, 0x724 -/* 80C574C4 38 C0 00 00 */ li r6, 0 -/* 80C574C8 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80C574CC FC 40 08 90 */ fmr f2, f1 -/* 80C574D0 C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 80C574D4 FC 80 18 90 */ fmr f4, f3 -/* 80C574D8 39 00 00 00 */ li r8, 0 -/* 80C574DC 4B 65 44 A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C574E0 7F E3 FB 78 */ mr r3, r31 -/* 80C574E4 4B FF FC B1 */ bl cutLight__12daLv1Cdl01_cFv -lbl_80C574E8: -/* 80C574E8 38 7F 05 E8 */ addi r3, r31, 0x5e8 -/* 80C574EC 4B 42 D0 0D */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80C574F0 28 03 00 00 */ cmplwi r3, 0 -/* 80C574F4 41 82 00 7C */ beq lbl_80C57570 -/* 80C574F8 3B A0 00 01 */ li r29, 1 -/* 80C574FC 4B 60 C5 4D */ bl GetAc__8cCcD_ObjFv -/* 80C57500 A8 03 00 08 */ lha r0, 8(r3) -/* 80C57504 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80C57508 40 82 00 28 */ bne lbl_80C57530 -/* 80C5750C 38 7F 05 E8 */ addi r3, r31, 0x5e8 -/* 80C57510 4B 42 D0 39 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C57514 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C57518 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80C5751C 41 82 00 14 */ beq lbl_80C57530 -/* 80C57520 88 1F 07 68 */ lbz r0, 0x768(r31) -/* 80C57524 28 00 00 00 */ cmplwi r0, 0 -/* 80C57528 41 82 00 08 */ beq lbl_80C57530 -/* 80C5752C 3B A0 00 00 */ li r29, 0 -lbl_80C57530: -/* 80C57530 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80C57534 41 82 00 3C */ beq lbl_80C57570 -/* 80C57538 38 7F 05 E8 */ addi r3, r31, 0x5e8 -/* 80C5753C 4B 42 D0 41 */ bl GetTgHitObjSe__12dCcD_GObjInfFv -/* 80C57540 38 80 00 01 */ li r4, 1 -/* 80C57544 4B 42 D0 6D */ bl getHitSeID__12dCcD_GObjInfFUci -/* 80C57548 7C 64 1B 78 */ mr r4, r3 -/* 80C5754C 38 7F 07 6C */ addi r3, r31, 0x76c -/* 80C57550 38 A0 00 05 */ li r5, 5 -/* 80C57554 38 C0 00 00 */ li r6, 0 -/* 80C57558 4B 66 6F 4D */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 80C5755C 38 00 00 01 */ li r0, 1 -/* 80C57560 98 1F 07 68 */ stb r0, 0x768(r31) -/* 80C57564 48 00 00 0C */ b lbl_80C57570 -lbl_80C57568: -/* 80C57568 38 00 00 00 */ li r0, 0 -/* 80C5756C 98 1F 07 68 */ stb r0, 0x768(r31) -lbl_80C57570: -/* 80C57570 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C57574 7C 03 07 74 */ extsb r3, r0 -/* 80C57578 4B 3D 5A F5 */ bl dComIfGp_getReverb__Fi -/* 80C5757C 7C 65 1B 78 */ mr r5, r3 -/* 80C57580 38 7F 07 6C */ addi r3, r31, 0x76c -/* 80C57584 38 80 00 00 */ li r4, 0 -/* 80C57588 81 9F 07 7C */ lwz r12, 0x77c(r31) -/* 80C5758C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80C57590 7D 89 03 A6 */ mtctr r12 -/* 80C57594 4E 80 04 21 */ bctrl -/* 80C57598 38 7F 07 0C */ addi r3, r31, 0x70c -/* 80C5759C C0 3E 00 5C */ lfs f1, 0x5c(r30) -/* 80C575A0 4B 61 7C 61 */ bl SetR__8cM3dGCylFf -/* 80C575A4 38 7F 07 0C */ addi r3, r31, 0x70c -/* 80C575A8 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 80C575AC 4B 61 7C 4D */ bl SetH__8cM3dGCylFf -/* 80C575B0 38 7F 07 0C */ addi r3, r31, 0x70c -/* 80C575B4 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C575B8 4B 61 7C 25 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C575BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C575C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C575C4 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C575C8 38 9F 05 E8 */ addi r4, r31, 0x5e8 -/* 80C575CC 4B 60 D5 DD */ bl Set__4cCcSFP8cCcD_Obj -/* 80C575D0 7F E3 FB 78 */ mr r3, r31 -/* 80C575D4 4B FF FB F1 */ bl pointLightProc__12daLv1Cdl01_cFv -/* 80C575D8 38 60 00 01 */ li r3, 1 -/* 80C575DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C575E0 4B 70 AC 49 */ bl _restgpr_29 -/* 80C575E4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C575E8 7C 08 03 A6 */ mtlr r0 -/* 80C575EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C575F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__ct__16daLv1Cdl01_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__ct__16daLv1Cdl01_HIO_cFv.s deleted file mode 100644 index 77d893a9cf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__ct__16daLv1Cdl01_HIO_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C56CAC: -/* 80C56CAC 3C 80 80 C5 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C579AC@ha */ -/* 80C56CB0 38 04 79 AC */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C579AC@l */ -/* 80C56CB4 90 03 00 00 */ stw r0, 0(r3) -/* 80C56CB8 3C 80 80 C5 */ lis r4, __vt__16daLv1Cdl01_HIO_c@ha /* 0x80C579A0@ha */ -/* 80C56CBC 38 04 79 A0 */ addi r0, r4, __vt__16daLv1Cdl01_HIO_c@l /* 0x80C579A0@l */ -/* 80C56CC0 90 03 00 00 */ stw r0, 0(r3) -/* 80C56CC4 38 00 00 3C */ li r0, 0x3c -/* 80C56CC8 98 03 00 04 */ stb r0, 4(r3) -/* 80C56CCC 38 00 00 01 */ li r0, 1 -/* 80C56CD0 98 03 00 05 */ stb r0, 5(r3) -/* 80C56CD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index d28fa48533..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C56CD8: -/* 80C56CD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56CDC 7C 08 02 A6 */ mflr r0 -/* 80C56CE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C56CE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C56CE8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C56CEC 41 82 00 1C */ beq lbl_80C56D08 -/* 80C56CF0 3C A0 80 C5 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C579AC@ha */ -/* 80C56CF4 38 05 79 AC */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C579AC@l */ -/* 80C56CF8 90 1F 00 00 */ stw r0, 0(r31) -/* 80C56CFC 7C 80 07 35 */ extsh. r0, r4 -/* 80C56D00 40 81 00 08 */ ble lbl_80C56D08 -/* 80C56D04 4B 67 80 39 */ bl __dl__FPv -lbl_80C56D08: -/* 80C56D08 7F E3 FB 78 */ mr r3, r31 -/* 80C56D0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C56D10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56D14 7C 08 03 A6 */ mtlr r0 -/* 80C56D18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C56D1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__16daLv1Cdl01_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__16daLv1Cdl01_HIO_cFv.s deleted file mode 100644 index 360ee2a1c7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__16daLv1Cdl01_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C5777C: -/* 80C5777C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C57780 7C 08 02 A6 */ mflr r0 -/* 80C57784 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C57788 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5778C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C57790 41 82 00 30 */ beq lbl_80C577C0 -/* 80C57794 3C 60 80 C5 */ lis r3, __vt__16daLv1Cdl01_HIO_c@ha /* 0x80C579A0@ha */ -/* 80C57798 38 03 79 A0 */ addi r0, r3, __vt__16daLv1Cdl01_HIO_c@l /* 0x80C579A0@l */ -/* 80C5779C 90 1F 00 00 */ stw r0, 0(r31) -/* 80C577A0 41 82 00 10 */ beq lbl_80C577B0 -/* 80C577A4 3C 60 80 C5 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C579AC@ha */ -/* 80C577A8 38 03 79 AC */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C579AC@l */ -/* 80C577AC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C577B0: -/* 80C577B0 7C 80 07 35 */ extsh. r0, r4 -/* 80C577B4 40 81 00 0C */ ble lbl_80C577C0 -/* 80C577B8 7F E3 FB 78 */ mr r3, r31 -/* 80C577BC 4B 67 75 81 */ bl __dl__FPv -lbl_80C577C0: -/* 80C577C0 7F E3 FB 78 */ mr r3, r31 -/* 80C577C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C577C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C577CC 7C 08 03 A6 */ mtlr r0 -/* 80C577D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C577D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGAabFv.s deleted file mode 100644 index b186002dbf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C57090: -/* 80C57090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C57094 7C 08 02 A6 */ mflr r0 -/* 80C57098 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5709C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C570A0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C570A4 41 82 00 1C */ beq lbl_80C570C0 -/* 80C570A8 3C A0 80 C5 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C5796C@ha */ -/* 80C570AC 38 05 79 6C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C5796C@l */ -/* 80C570B0 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C570B4 7C 80 07 35 */ extsh. r0, r4 -/* 80C570B8 40 81 00 08 */ ble lbl_80C570C0 -/* 80C570BC 4B 67 7C 81 */ bl __dl__FPv -lbl_80C570C0: -/* 80C570C0 7F E3 FB 78 */ mr r3, r31 -/* 80C570C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C570C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C570CC 7C 08 03 A6 */ mtlr r0 -/* 80C570D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C570D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGCylFv.s deleted file mode 100644 index a3872f9697..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C57048: -/* 80C57048 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5704C 7C 08 02 A6 */ mflr r0 -/* 80C57050 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C57054 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C57058 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5705C 41 82 00 1C */ beq lbl_80C57078 -/* 80C57060 3C A0 80 C5 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C57960@ha */ -/* 80C57064 38 05 79 60 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C57960@l */ -/* 80C57068 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C5706C 7C 80 07 35 */ extsh. r0, r4 -/* 80C57070 40 81 00 08 */ ble lbl_80C57078 -/* 80C57074 4B 67 7C C9 */ bl __dl__FPv -lbl_80C57078: -/* 80C57078 7F E3 FB 78 */ mr r3, r31 -/* 80C5707C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C57080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C57084 7C 08 03 A6 */ mtlr r0 -/* 80C57088 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5708C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__sinit_d_a_obj_lv1Candle01_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__sinit_d_a_obj_lv1Candle01_cpp.s deleted file mode 100644 index feb613f7c7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__sinit_d_a_obj_lv1Candle01_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C577D8: -/* 80C577D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C577DC 7C 08 02 A6 */ mflr r0 -/* 80C577E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C577E4 3C 60 80 C5 */ lis r3, l_HIO@ha /* 0x80C579CC@ha */ -/* 80C577E8 38 63 79 CC */ addi r3, r3, l_HIO@l /* 0x80C579CC@l */ -/* 80C577EC 4B FF F4 C1 */ bl __ct__16daLv1Cdl01_HIO_cFv -/* 80C577F0 3C 80 80 C5 */ lis r4, __dt__16daLv1Cdl01_HIO_cFv@ha /* 0x80C5777C@ha */ -/* 80C577F4 38 84 77 7C */ addi r4, r4, __dt__16daLv1Cdl01_HIO_cFv@l /* 0x80C5777C@l */ -/* 80C577F8 3C A0 80 C5 */ lis r5, lit_3620@ha /* 0x80C579C0@ha */ -/* 80C577FC 38 A5 79 C0 */ addi r5, r5, lit_3620@l /* 0x80C579C0@l */ -/* 80C57800 4B FF F4 39 */ bl __register_global_object -/* 80C57804 3C 60 80 C5 */ lis r3, mCcDCyl__12daLv1Cdl01_c@ha /* 0x80C578CC@ha */ -/* 80C57808 38 63 78 CC */ addi r3, r3, mCcDCyl__12daLv1Cdl01_c@l /* 0x80C578CC@l */ -/* 80C5780C 38 A3 FF FC */ addi r5, r3, -4 -/* 80C57810 3C 60 80 C5 */ lis r3, mCcDObjInfo__12daLv1Cdl01_c@ha /* 0x80C5785C@ha */ -/* 80C57814 38 63 78 5C */ addi r3, r3, mCcDObjInfo__12daLv1Cdl01_c@l /* 0x80C5785C@l */ -/* 80C57818 38 83 FF FC */ addi r4, r3, -4 -/* 80C5781C 38 00 00 06 */ li r0, 6 -/* 80C57820 7C 09 03 A6 */ mtctr r0 -lbl_80C57824: -/* 80C57824 80 64 00 04 */ lwz r3, 4(r4) -/* 80C57828 84 04 00 08 */ lwzu r0, 8(r4) -/* 80C5782C 90 65 00 04 */ stw r3, 4(r5) -/* 80C57830 94 05 00 08 */ stwu r0, 8(r5) -/* 80C57834 42 00 FF F0 */ bdnz lbl_80C57824 -/* 80C57838 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5783C 7C 08 03 A6 */ mtlr r0 -/* 80C57840 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C57844 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/create__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/create__12daLv1Cdl01_cFv.s deleted file mode 100644 index 9ed3d47d87..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/create__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_80C56E14: -/* 80C56E14 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C56E18 7C 08 02 A6 */ mflr r0 -/* 80C56E1C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C56E20 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C56E24 4B 70 B3 B9 */ bl _savegpr_29 -/* 80C56E28 7C 7E 1B 78 */ mr r30, r3 -/* 80C56E2C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C56E30 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C56E34 40 82 00 BC */ bne lbl_80C56EF0 -/* 80C56E38 7F C0 F3 79 */ or. r0, r30, r30 -/* 80C56E3C 41 82 00 A8 */ beq lbl_80C56EE4 -/* 80C56E40 7C 1F 03 78 */ mr r31, r0 -/* 80C56E44 4B 42 17 E1 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C56E48 3C 60 80 C5 */ lis r3, __vt__12daLv1Cdl01_c@ha /* 0x80C57978@ha */ -/* 80C56E4C 38 03 79 78 */ addi r0, r3, __vt__12daLv1Cdl01_c@l /* 0x80C57978@l */ -/* 80C56E50 90 1F 05 9C */ stw r0, 0x59c(r31) -/* 80C56E54 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C56E58 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C56E5C 90 1F 05 C4 */ stw r0, 0x5c4(r31) -/* 80C56E60 38 7F 05 C8 */ addi r3, r31, 0x5c8 -/* 80C56E64 4B 42 C8 FD */ bl __ct__10dCcD_GSttsFv -/* 80C56E68 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C56E6C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C56E70 90 7F 05 C4 */ stw r3, 0x5c4(r31) -/* 80C56E74 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C56E78 90 1F 05 C8 */ stw r0, 0x5c8(r31) -/* 80C56E7C 3B BF 05 E8 */ addi r29, r31, 0x5e8 -/* 80C56E80 7F A3 EB 78 */ mr r3, r29 -/* 80C56E84 4B 42 CB A5 */ bl __ct__12dCcD_GObjInfFv -/* 80C56E88 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C56E8C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C56E90 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C56E94 3C 60 80 C5 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C5796C@ha */ -/* 80C56E98 38 03 79 6C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C5796C@l */ -/* 80C56E9C 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80C56EA0 3C 60 80 C5 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C57960@ha */ -/* 80C56EA4 38 03 79 60 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C57960@l */ -/* 80C56EA8 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C56EAC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C56EB0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C56EB4 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80C56EB8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C56EBC 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C56EC0 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C56EC4 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C56EC8 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80C56ECC 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C56ED0 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C56ED4 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C56ED8 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C56EDC 38 7F 07 6C */ addi r3, r31, 0x76c -/* 80C56EE0 4B 66 79 65 */ bl __ct__16Z2SoundObjSimpleFv -lbl_80C56EE4: -/* 80C56EE4 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80C56EE8 60 00 00 08 */ ori r0, r0, 8 -/* 80C56EEC 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80C56EF0: -/* 80C56EF0 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80C56EF4 3C 80 80 C5 */ lis r4, d_a_obj_lv1Candle01__stringBase0@ha /* 0x80C578C0@ha */ -/* 80C56EF8 38 84 78 C0 */ addi r4, r4, d_a_obj_lv1Candle01__stringBase0@l /* 0x80C578C0@l */ -/* 80C56EFC 4B 3D 5F C1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C56F00 7C 7F 1B 78 */ mr r31, r3 -/* 80C56F04 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C56F08 40 82 01 24 */ bne lbl_80C5702C -/* 80C56F0C 7F C3 F3 78 */ mr r3, r30 -/* 80C56F10 3C 80 80 C5 */ lis r4, d_a_obj_lv1Candle01__stringBase0@ha /* 0x80C578C0@ha */ -/* 80C56F14 38 84 78 C0 */ addi r4, r4, d_a_obj_lv1Candle01__stringBase0@l /* 0x80C578C0@l */ -/* 80C56F18 38 A0 FF FF */ li r5, -1 -/* 80C56F1C 38 C0 00 00 */ li r6, 0 -/* 80C56F20 38 E0 08 20 */ li r7, 0x820 -/* 80C56F24 39 00 00 00 */ li r8, 0 -/* 80C56F28 4B 42 18 95 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C56F2C 2C 03 00 05 */ cmpwi r3, 5 -/* 80C56F30 40 82 00 0C */ bne lbl_80C56F3C -/* 80C56F34 38 60 00 05 */ li r3, 5 -/* 80C56F38 48 00 00 F8 */ b lbl_80C57030 -lbl_80C56F3C: -/* 80C56F3C 7F C3 F3 78 */ mr r3, r30 -/* 80C56F40 4B FF FD E1 */ bl setBaseMtx__12daLv1Cdl01_cFv -/* 80C56F44 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C56F48 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C56F4C 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C56F50 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80C56F54 80 83 00 04 */ lwz r4, 4(r3) -/* 80C56F58 7F C3 F3 78 */ mr r3, r30 -/* 80C56F5C 4B 3C 36 1D */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C56F60 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C56F64 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80C56F68 98 1E 07 40 */ stb r0, 0x740(r30) -/* 80C56F6C 88 1E 07 40 */ lbz r0, 0x740(r30) -/* 80C56F70 28 00 00 FF */ cmplwi r0, 0xff -/* 80C56F74 40 82 00 0C */ bne lbl_80C56F80 -/* 80C56F78 38 00 00 01 */ li r0, 1 -/* 80C56F7C 98 1E 07 40 */ stb r0, 0x740(r30) -lbl_80C56F80: -/* 80C56F80 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C56F84 D0 1E 07 24 */ stfs f0, 0x724(r30) -/* 80C56F88 3C 60 80 C5 */ lis r3, lit_3723@ha /* 0x80C5788C@ha */ -/* 80C56F8C C0 23 78 8C */ lfs f1, lit_3723@l(r3) /* 0x80C5788C@l */ -/* 80C56F90 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C56F94 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C56F98 D0 1E 07 28 */ stfs f0, 0x728(r30) -/* 80C56F9C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C56FA0 D0 1E 07 2C */ stfs f0, 0x72c(r30) -/* 80C56FA4 7F C3 F3 78 */ mr r3, r30 -/* 80C56FA8 48 00 01 31 */ bl lightInit__12daLv1Cdl01_cFv -/* 80C56FAC 38 00 00 01 */ li r0, 1 -/* 80C56FB0 98 1E 07 30 */ stb r0, 0x730(r30) -/* 80C56FB4 38 00 00 00 */ li r0, 0 -/* 80C56FB8 98 1E 07 31 */ stb r0, 0x731(r30) -/* 80C56FBC 7F C3 F3 78 */ mr r3, r30 -/* 80C56FC0 48 00 01 A5 */ bl setLight__12daLv1Cdl01_cFv -/* 80C56FC4 C0 1E 07 24 */ lfs f0, 0x724(r30) -/* 80C56FC8 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80C56FCC C0 1E 07 28 */ lfs f0, 0x728(r30) -/* 80C56FD0 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80C56FD4 C0 1E 07 2C */ lfs f0, 0x72c(r30) -/* 80C56FD8 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80C56FDC 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80C56FE0 38 80 00 FF */ li r4, 0xff -/* 80C56FE4 38 A0 00 FF */ li r5, 0xff -/* 80C56FE8 7F C6 F3 78 */ mr r6, r30 -/* 80C56FEC 4B 42 C8 75 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C56FF0 38 7E 05 E8 */ addi r3, r30, 0x5e8 -/* 80C56FF4 3C 80 80 C5 */ lis r4, mCcDCyl__12daLv1Cdl01_c@ha /* 0x80C578CC@ha */ -/* 80C56FF8 38 84 78 CC */ addi r4, r4, mCcDCyl__12daLv1Cdl01_c@l /* 0x80C578CC@l */ -/* 80C56FFC 4B 42 D8 B9 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C57000 38 1E 05 AC */ addi r0, r30, 0x5ac -/* 80C57004 90 1E 06 2C */ stw r0, 0x62c(r30) -/* 80C57008 38 7E 07 6C */ addi r3, r30, 0x76c -/* 80C5700C 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80C57010 38 A0 00 01 */ li r5, 1 -/* 80C57014 81 9E 07 7C */ lwz r12, 0x77c(r30) -/* 80C57018 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C5701C 7D 89 03 A6 */ mtctr r12 -/* 80C57020 4E 80 04 21 */ bctrl -/* 80C57024 38 00 00 00 */ li r0, 0 -/* 80C57028 98 1E 07 68 */ stb r0, 0x768(r30) -lbl_80C5702C: -/* 80C5702C 7F E3 FB 78 */ mr r3, r31 -lbl_80C57030: -/* 80C57030 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C57034 4B 70 B1 F5 */ bl _restgpr_29 -/* 80C57038 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C5703C 7C 08 03 A6 */ mtlr r0 -/* 80C57040 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C57044 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/cutLight__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/cutLight__12daLv1Cdl01_cFv.s deleted file mode 100644 index 6935465fd2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/cutLight__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80C57194: -/* 80C57194 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C57198 7C 08 02 A6 */ mflr r0 -/* 80C5719C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C571A0 88 03 07 40 */ lbz r0, 0x740(r3) -/* 80C571A4 28 00 00 00 */ cmplwi r0, 0 -/* 80C571A8 41 82 00 0C */ beq lbl_80C571B4 -/* 80C571AC 38 63 07 48 */ addi r3, r3, 0x748 -/* 80C571B0 4B 55 07 7D */ bl dKy_plight_cut__FP15LIGHT_INFLUENCE -lbl_80C571B4: -/* 80C571B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C571B8 7C 08 03 A6 */ mtlr r0 -/* 80C571BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C571C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 9f9c44c995..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5775C: -/* 80C5775C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C57760 7C 08 02 A6 */ mflr r0 -/* 80C57764 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C57768 4B FF F6 AD */ bl create__12daLv1Cdl01_cFv -/* 80C5776C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C57770 7C 08 03 A6 */ mtlr r0 -/* 80C57774 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C57778 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Delete__FP12daLv1Cdl01_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Delete__FP12daLv1Cdl01_c.s deleted file mode 100644 index 59986e1ebb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Delete__FP12daLv1Cdl01_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5773C: -/* 80C5773C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C57740 7C 08 02 A6 */ mflr r0 -/* 80C57744 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C57748 4B 42 11 95 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C5774C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C57750 7C 08 03 A6 */ mtlr r0 -/* 80C57754 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C57758 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Draw__FP12daLv1Cdl01_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Draw__FP12daLv1Cdl01_c.s deleted file mode 100644 index e241ffd76d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Draw__FP12daLv1Cdl01_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C576F0: -/* 80C576F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C576F4 7C 08 02 A6 */ mflr r0 -/* 80C576F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C576FC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C57700 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C57704 7D 89 03 A6 */ mtctr r12 -/* 80C57708 4E 80 04 21 */ bctrl -/* 80C5770C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C57710 7C 08 03 A6 */ mtlr r0 -/* 80C57714 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C57718 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Execute__FP12daLv1Cdl01_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Execute__FP12daLv1Cdl01_c.s deleted file mode 100644 index 55d2a55402..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Execute__FP12daLv1Cdl01_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5771C: -/* 80C5771C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C57720 7C 08 02 A6 */ mflr r0 -/* 80C57724 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C57728 4B 42 12 29 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C5772C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C57730 7C 08 03 A6 */ mtlr r0 -/* 80C57734 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C57738 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/lightInit__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/lightInit__12daLv1Cdl01_cFv.s deleted file mode 100644 index 41af75c9a9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/lightInit__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80C570D8: -/* 80C570D8 3C 80 80 C5 */ lis r4, mCcDObjInfo__12daLv1Cdl01_c@ha /* 0x80C5785C@ha */ -/* 80C570DC 38 84 78 5C */ addi r4, r4, mCcDObjInfo__12daLv1Cdl01_c@l /* 0x80C5785C@l */ -/* 80C570E0 C0 03 07 24 */ lfs f0, 0x724(r3) -/* 80C570E4 D0 03 07 34 */ stfs f0, 0x734(r3) -/* 80C570E8 C0 03 07 28 */ lfs f0, 0x728(r3) -/* 80C570EC D0 03 07 38 */ stfs f0, 0x738(r3) -/* 80C570F0 C0 03 07 2C */ lfs f0, 0x72c(r3) -/* 80C570F4 D0 03 07 3C */ stfs f0, 0x73c(r3) -/* 80C570F8 C0 23 07 38 */ lfs f1, 0x738(r3) -/* 80C570FC C0 04 00 34 */ lfs f0, 0x34(r4) -/* 80C57100 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C57104 D0 03 07 38 */ stfs f0, 0x738(r3) -/* 80C57108 88 03 07 40 */ lbz r0, 0x740(r3) -/* 80C5710C 28 00 00 00 */ cmplwi r0, 0 -/* 80C57110 41 82 00 48 */ beq lbl_80C57158 -/* 80C57114 C0 03 07 34 */ lfs f0, 0x734(r3) -/* 80C57118 D0 03 07 48 */ stfs f0, 0x748(r3) -/* 80C5711C C0 03 07 38 */ lfs f0, 0x738(r3) -/* 80C57120 D0 03 07 4C */ stfs f0, 0x74c(r3) -/* 80C57124 C0 03 07 3C */ lfs f0, 0x73c(r3) -/* 80C57128 D0 03 07 50 */ stfs f0, 0x750(r3) -/* 80C5712C 38 00 00 BC */ li r0, 0xbc -/* 80C57130 B0 03 07 54 */ sth r0, 0x754(r3) -/* 80C57134 38 00 00 66 */ li r0, 0x66 -/* 80C57138 B0 03 07 56 */ sth r0, 0x756(r3) -/* 80C5713C 38 00 00 42 */ li r0, 0x42 -/* 80C57140 B0 03 07 58 */ sth r0, 0x758(r3) -/* 80C57144 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80C57148 D0 03 07 5C */ stfs f0, 0x75c(r3) -/* 80C5714C C0 04 00 3C */ lfs f0, 0x3c(r4) -/* 80C57150 D0 03 07 60 */ stfs f0, 0x760(r3) -/* 80C57154 4E 80 00 20 */ blr -lbl_80C57158: -/* 80C57158 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 80C5715C D0 03 07 44 */ stfs f0, 0x744(r3) -/* 80C57160 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/pointLightProc__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/pointLightProc__12daLv1Cdl01_cFv.s deleted file mode 100644 index 49352d5849..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/pointLightProc__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80C571C4: -/* 80C571C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C571C8 7C 08 02 A6 */ mflr r0 -/* 80C571CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C571D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C571D4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C571D8 7C 7E 1B 78 */ mr r30, r3 -/* 80C571DC 3C 60 80 C5 */ lis r3, mCcDObjInfo__12daLv1Cdl01_c@ha /* 0x80C5785C@ha */ -/* 80C571E0 3B E3 78 5C */ addi r31, r3, mCcDObjInfo__12daLv1Cdl01_c@l /* 0x80C5785C@l */ -/* 80C571E4 88 1E 07 40 */ lbz r0, 0x740(r30) -/* 80C571E8 28 00 00 00 */ cmplwi r0, 0 -/* 80C571EC 40 82 00 70 */ bne lbl_80C5725C -/* 80C571F0 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 80C571F4 90 01 00 08 */ stw r0, 8(r1) -/* 80C571F8 88 1E 07 30 */ lbz r0, 0x730(r30) -/* 80C571FC 28 00 00 00 */ cmplwi r0, 0 -/* 80C57200 41 82 00 20 */ beq lbl_80C57220 -/* 80C57204 38 7E 07 44 */ addi r3, r30, 0x744 -/* 80C57208 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80C5720C C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80C57210 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80C57214 C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 80C57218 4B 61 87 65 */ bl cLib_addCalc__FPfffff -/* 80C5721C 48 00 00 1C */ b lbl_80C57238 -lbl_80C57220: -/* 80C57220 38 7E 07 44 */ addi r3, r30, 0x744 -/* 80C57224 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 80C57228 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80C5722C C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80C57230 C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 80C57234 4B 61 87 49 */ bl cLib_addCalc__FPfffff -lbl_80C57238: -/* 80C57238 C0 3E 07 44 */ lfs f1, 0x744(r30) -/* 80C5723C C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80C57240 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C57244 4C 41 13 82 */ cror 2, 1, 2 -/* 80C57248 40 82 00 14 */ bne lbl_80C5725C -/* 80C5724C 38 7E 07 34 */ addi r3, r30, 0x734 -/* 80C57250 38 81 00 08 */ addi r4, r1, 8 -/* 80C57254 38 A0 00 00 */ li r5, 0 -/* 80C57258 4B 55 2B 09 */ bl dKy_BossLight_set__FP4cXyzP8_GXColorfUc -lbl_80C5725C: -/* 80C5725C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C57260 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C57264 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C57268 7C 08 03 A6 */ mtlr r0 -/* 80C5726C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C57270 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setBaseMtx__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setBaseMtx__12daLv1Cdl01_cFv.s deleted file mode 100644 index 79ec250ba4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setBaseMtx__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C56D20: -/* 80C56D20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56D24 7C 08 02 A6 */ mflr r0 -/* 80C56D28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C56D2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C56D30 7C 7F 1B 78 */ mr r31, r3 -/* 80C56D34 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C56D38 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C56D3C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C56D40 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C56D44 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C56D48 4B 6E FB A1 */ bl PSMTXTrans -/* 80C56D4C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C56D50 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C56D54 A8 9F 04 DC */ lha r4, 0x4dc(r31) -/* 80C56D58 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80C56D5C A8 DF 04 E0 */ lha r6, 0x4e0(r31) -/* 80C56D60 4B 3B 55 41 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C56D64 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C56D68 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C56D6C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C56D70 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C56D74 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C56D78 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C56D7C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C56D80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C56D84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C56D88 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C56D8C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C56D90 4B 6E F7 21 */ bl PSMTXCopy -/* 80C56D94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C56D98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56D9C 7C 08 03 A6 */ mtlr r0 -/* 80C56DA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C56DA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setLight__12daLv1Cdl01_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setLight__12daLv1Cdl01_cFv.s deleted file mode 100644 index fbad95ffe3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setLight__12daLv1Cdl01_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80C57164: -/* 80C57164 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C57168 7C 08 02 A6 */ mflr r0 -/* 80C5716C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C57170 88 03 07 40 */ lbz r0, 0x740(r3) -/* 80C57174 28 00 00 00 */ cmplwi r0, 0 -/* 80C57178 41 82 00 0C */ beq lbl_80C57184 -/* 80C5717C 38 63 07 48 */ addi r3, r3, 0x748 -/* 80C57180 4B 55 06 11 */ bl dKy_plight_set__FP15LIGHT_INFLUENCE -lbl_80C57184: -/* 80C57184 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C57188 7C 08 03 A6 */ mtlr r0 -/* 80C5718C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C57190 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/CreateHeap__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/CreateHeap__13daLv2Candle_cFv.s deleted file mode 100644 index 235970f660..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/CreateHeap__13daLv2Candle_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8058E1C4: -/* 8058E1C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E1C8 7C 08 02 A6 */ mflr r0 -/* 8058E1CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E1D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058E1D4 7C 7F 1B 78 */ mr r31, r3 -/* 8058E1D8 88 03 06 FD */ lbz r0, 0x6fd(r3) -/* 8058E1DC 54 00 10 3A */ slwi r0, r0, 2 -/* 8058E1E0 3C 60 80 59 */ lis r3, l_resNameIdx@ha /* 0x8058F20C@ha */ -/* 8058E1E4 38 63 F2 0C */ addi r3, r3, l_resNameIdx@l /* 0x8058F20C@l */ -/* 8058E1E8 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8058E1EC 3C 80 80 59 */ lis r4, l_bmdIdx@ha /* 0x8058F174@ha */ -/* 8058E1F0 38 84 F1 74 */ addi r4, r4, l_bmdIdx@l /* 0x8058F174@l */ -/* 8058E1F4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8058E1F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058E1FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058E200 3C A5 00 02 */ addis r5, r5, 2 -/* 8058E204 38 C0 00 80 */ li r6, 0x80 -/* 8058E208 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8058E20C 4B AA E0 E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8058E210 3C 80 00 08 */ lis r4, 8 -/* 8058E214 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8058E218 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8058E21C 4B A8 6A 39 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8058E220 90 7F 05 70 */ stw r3, 0x570(r31) -/* 8058E224 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8058E228 30 03 FF FF */ addic r0, r3, -1 -/* 8058E22C 7C 60 19 10 */ subfe r3, r0, r3 -/* 8058E230 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058E234 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E238 7C 08 03 A6 */ mtlr r0 -/* 8058E23C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E240 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Delete__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Delete__13daLv2Candle_cFv.s deleted file mode 100644 index d0c72c7d28..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Delete__13daLv2Candle_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8058EF6C: -/* 8058EF6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058EF70 7C 08 02 A6 */ mflr r0 -/* 8058EF74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058EF78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058EF7C 7C 7F 1B 78 */ mr r31, r3 -/* 8058EF80 38 7F 07 3C */ addi r3, r31, 0x73c -/* 8058EF84 4B D2 F0 75 */ bl deleteObject__14Z2SoundObjBaseFv -/* 8058EF88 38 7F 05 68 */ addi r3, r31, 0x568 -/* 8058EF8C 88 1F 06 FD */ lbz r0, 0x6fd(r31) -/* 8058EF90 54 00 10 3A */ slwi r0, r0, 2 -/* 8058EF94 3C 80 80 59 */ lis r4, l_resNameIdx@ha /* 0x8058F20C@ha */ -/* 8058EF98 38 84 F2 0C */ addi r4, r4, l_resNameIdx@l /* 0x8058F20C@l */ -/* 8058EF9C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8058EFA0 4B A9 E0 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8058EFA4 88 1F 07 0C */ lbz r0, 0x70c(r31) -/* 8058EFA8 28 00 00 00 */ cmplwi r0, 0 -/* 8058EFAC 41 82 00 0C */ beq lbl_8058EFB8 -/* 8058EFB0 38 7F 07 14 */ addi r3, r31, 0x714 -/* 8058EFB4 4B C1 89 79 */ bl dKy_plight_cut__FP15LIGHT_INFLUENCE -lbl_8058EFB8: -/* 8058EFB8 38 60 00 01 */ li r3, 1 -/* 8058EFBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058EFC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058EFC4 7C 08 03 A6 */ mtlr r0 -/* 8058EFC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058EFCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Draw__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Draw__13daLv2Candle_cFv.s deleted file mode 100644 index ea273cf80d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Draw__13daLv2Candle_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8058EEC8: -/* 8058EEC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058EECC 7C 08 02 A6 */ mflr r0 -/* 8058EED0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058EED4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058EED8 93 C1 00 08 */ stw r30, 8(r1) -/* 8058EEDC 7C 7E 1B 78 */ mr r30, r3 -/* 8058EEE0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8058EEE4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8058EEE8 38 80 00 10 */ li r4, 0x10 -/* 8058EEEC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8058EEF0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 8058EEF4 4B C1 48 D1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8058EEF8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8058EEFC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8058EF00 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 8058EF04 80 84 00 04 */ lwz r4, 4(r4) -/* 8058EF08 38 BE 01 0C */ addi r5, r30, 0x10c -/* 8058EF0C 4B C1 5E 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8058EF10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058EF14 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058EF18 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 8058EF1C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8058EF20 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8058EF24 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8058EF28 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 8058EF2C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8058EF30 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8058EF34 4B A7 ED 91 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8058EF38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058EF3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058EF40 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 8058EF44 90 1F 00 48 */ stw r0, 0x48(r31) -/* 8058EF48 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 8058EF4C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8058EF50 38 60 00 01 */ li r3, 1 -/* 8058EF54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058EF58 83 C1 00 08 */ lwz r30, 8(r1) -/* 8058EF5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058EF60 7C 08 03 A6 */ mtlr r0 -/* 8058EF64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058EF68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Execute__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Execute__13daLv2Candle_cFv.s deleted file mode 100644 index 06817be59c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Execute__13daLv2Candle_cFv.s +++ /dev/null @@ -1,351 +0,0 @@ -lbl_8058E99C: -/* 8058E99C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8058E9A0 7C 08 02 A6 */ mflr r0 -/* 8058E9A4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8058E9A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8058E9AC 4B DD 38 31 */ bl _savegpr_29 -/* 8058E9B0 7C 7F 1B 78 */ mr r31, r3 -/* 8058E9B4 3C 80 80 59 */ lis r4, lit_3637@ha /* 0x8058F130@ha */ -/* 8058E9B8 3B C4 F1 30 */ addi r30, r4, lit_3637@l /* 0x8058F130@l */ -/* 8058E9BC 88 03 06 F8 */ lbz r0, 0x6f8(r3) -/* 8058E9C0 28 00 00 FF */ cmplwi r0, 0xff -/* 8058E9C4 40 82 00 38 */ bne lbl_8058E9FC -/* 8058E9C8 88 9F 06 FB */ lbz r4, 0x6fb(r31) -/* 8058E9CC 28 04 00 00 */ cmplwi r4, 0 -/* 8058E9D0 41 82 00 84 */ beq lbl_8058EA54 -/* 8058E9D4 38 04 FF FF */ addi r0, r4, -1 -/* 8058E9D8 98 1F 06 FB */ stb r0, 0x6fb(r31) -/* 8058E9DC 88 1F 06 FB */ lbz r0, 0x6fb(r31) -/* 8058E9E0 28 00 00 00 */ cmplwi r0, 0 -/* 8058E9E4 40 82 00 70 */ bne lbl_8058EA54 -/* 8058E9E8 38 00 00 01 */ li r0, 1 -/* 8058E9EC 98 1F 06 F9 */ stb r0, 0x6f9(r31) -/* 8058E9F0 98 1F 06 25 */ stb r0, 0x625(r31) -/* 8058E9F4 4B FF FD 2D */ bl setLight__13daLv2Candle_cFv -/* 8058E9F8 48 00 00 5C */ b lbl_8058EA54 -lbl_8058E9FC: -/* 8058E9FC 4B FF FB C1 */ bl isSwitch__13daLv2Candle_cFv -/* 8058EA00 98 7F 06 FA */ stb r3, 0x6fa(r31) -/* 8058EA04 88 1F 06 FA */ lbz r0, 0x6fa(r31) -/* 8058EA08 28 00 00 00 */ cmplwi r0, 0 -/* 8058EA0C 41 82 00 28 */ beq lbl_8058EA34 -/* 8058EA10 88 1F 06 F9 */ lbz r0, 0x6f9(r31) -/* 8058EA14 28 00 00 00 */ cmplwi r0, 0 -/* 8058EA18 40 82 00 3C */ bne lbl_8058EA54 -/* 8058EA1C 38 00 00 01 */ li r0, 1 -/* 8058EA20 98 1F 06 F9 */ stb r0, 0x6f9(r31) -/* 8058EA24 98 1F 06 25 */ stb r0, 0x625(r31) -/* 8058EA28 7F E3 FB 78 */ mr r3, r31 -/* 8058EA2C 4B FF FC F5 */ bl setLight__13daLv2Candle_cFv -/* 8058EA30 48 00 00 24 */ b lbl_8058EA54 -lbl_8058EA34: -/* 8058EA34 88 1F 06 F9 */ lbz r0, 0x6f9(r31) -/* 8058EA38 28 00 00 01 */ cmplwi r0, 1 -/* 8058EA3C 40 82 00 18 */ bne lbl_8058EA54 -/* 8058EA40 38 00 00 00 */ li r0, 0 -/* 8058EA44 98 1F 06 F9 */ stb r0, 0x6f9(r31) -/* 8058EA48 98 1F 06 25 */ stb r0, 0x625(r31) -/* 8058EA4C 7F E3 FB 78 */ mr r3, r31 -/* 8058EA50 4B FF FD 01 */ bl cutLight__13daLv2Candle_cFv -lbl_8058EA54: -/* 8058EA54 88 1F 06 F9 */ lbz r0, 0x6f9(r31) -/* 8058EA58 28 00 00 00 */ cmplwi r0, 0 -/* 8058EA5C 41 82 00 DC */ beq lbl_8058EB38 -/* 8058EA60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058EA64 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058EA68 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 8058EA6C 38 80 01 00 */ li r4, 0x100 -/* 8058EA70 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 8058EA74 38 C0 00 00 */ li r6, 0 -/* 8058EA78 38 E0 00 FF */ li r7, 0xff -/* 8058EA7C 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 8058EA80 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 8058EA84 7D 09 43 78 */ mr r9, r8 -/* 8058EA88 39 40 00 00 */ li r10, 0 -/* 8058EA8C C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 8058EA90 4B AB E7 29 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 8058EA94 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 8058EA98 38 80 01 01 */ li r4, 0x101 -/* 8058EA9C 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 8058EAA0 38 C0 00 00 */ li r6, 0 -/* 8058EAA4 38 E0 00 FF */ li r7, 0xff -/* 8058EAA8 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 8058EAAC 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 8058EAB0 7D 09 43 78 */ mr r9, r8 -/* 8058EAB4 39 40 00 00 */ li r10, 0 -/* 8058EAB8 C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 8058EABC 4B AB E6 FD */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 8058EAC0 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 8058EAC4 38 80 01 03 */ li r4, 0x103 -/* 8058EAC8 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 8058EACC 38 C0 00 00 */ li r6, 0 -/* 8058EAD0 38 E0 00 FF */ li r7, 0xff -/* 8058EAD4 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 8058EAD8 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 8058EADC 7D 09 43 78 */ mr r9, r8 -/* 8058EAE0 39 40 00 00 */ li r10, 0 -/* 8058EAE4 C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 8058EAE8 4B AB E6 D1 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 8058EAEC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8058EAF0 7C 03 07 74 */ extsb r3, r0 -/* 8058EAF4 4B A9 E5 79 */ bl dComIfGp_getReverb__Fi -/* 8058EAF8 7C 67 1B 78 */ mr r7, r3 -/* 8058EAFC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080018@ha */ -/* 8058EB00 38 03 00 18 */ addi r0, r3, 0x0018 /* 0x00080018@l */ -/* 8058EB04 90 01 00 10 */ stw r0, 0x10(r1) -/* 8058EB08 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8058EB0C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8058EB10 80 63 00 00 */ lwz r3, 0(r3) -/* 8058EB14 38 81 00 10 */ addi r4, r1, 0x10 -/* 8058EB18 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 8058EB1C 38 C0 00 00 */ li r6, 0 -/* 8058EB20 C0 3E 00 08 */ lfs f1, 8(r30) -/* 8058EB24 FC 40 08 90 */ fmr f2, f1 -/* 8058EB28 C0 7E 00 70 */ lfs f3, 0x70(r30) -/* 8058EB2C FC 80 18 90 */ fmr f4, f3 -/* 8058EB30 39 00 00 00 */ li r8, 0 -/* 8058EB34 4B D1 D9 D9 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_8058EB38: -/* 8058EB38 80 BF 07 34 */ lwz r5, 0x734(r31) -/* 8058EB3C 28 05 00 00 */ cmplwi r5, 0 -/* 8058EB40 41 82 00 58 */ beq lbl_8058EB98 -/* 8058EB44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058EB48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058EB4C 88 85 05 87 */ lbz r4, 0x587(r5) -/* 8058EB50 88 05 04 BA */ lbz r0, 0x4ba(r5) -/* 8058EB54 7C 05 07 74 */ extsb r5, r0 -/* 8058EB58 4B AA 68 09 */ bl isSwitch__10dSv_info_cCFii -/* 8058EB5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8058EB60 41 82 00 20 */ beq lbl_8058EB80 -/* 8058EB64 80 1F 05 C8 */ lwz r0, 0x5c8(r31) -/* 8058EB68 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8058EB6C 41 82 00 2C */ beq lbl_8058EB98 -/* 8058EB70 80 1F 05 C8 */ lwz r0, 0x5c8(r31) -/* 8058EB74 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 8058EB78 90 1F 05 C8 */ stw r0, 0x5c8(r31) -/* 8058EB7C 48 00 00 1C */ b lbl_8058EB98 -lbl_8058EB80: -/* 8058EB80 80 1F 05 C8 */ lwz r0, 0x5c8(r31) -/* 8058EB84 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8058EB88 40 82 00 10 */ bne lbl_8058EB98 -/* 8058EB8C 80 1F 05 C8 */ lwz r0, 0x5c8(r31) -/* 8058EB90 60 00 00 01 */ ori r0, r0, 1 -/* 8058EB94 90 1F 05 C8 */ stw r0, 0x5c8(r31) -lbl_8058EB98: -/* 8058EB98 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 8058EB9C 4B AF 58 C5 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 8058EBA0 28 03 00 00 */ cmplwi r3, 0 -/* 8058EBA4 41 82 02 90 */ beq lbl_8058EE34 -/* 8058EBA8 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 8058EBAC 4B AF 59 9D */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8058EBB0 7C 7D 1B 78 */ mr r29, r3 -/* 8058EBB4 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8058EBB8 28 00 02 00 */ cmplwi r0, 0x200 -/* 8058EBBC 40 82 00 BC */ bne lbl_8058EC78 -/* 8058EBC0 88 1D 00 75 */ lbz r0, 0x75(r29) -/* 8058EBC4 28 00 00 01 */ cmplwi r0, 1 -/* 8058EBC8 40 82 00 B0 */ bne lbl_8058EC78 -/* 8058EBCC 88 1F 06 F9 */ lbz r0, 0x6f9(r31) -/* 8058EBD0 28 00 00 00 */ cmplwi r0, 0 -/* 8058EBD4 40 82 00 A4 */ bne lbl_8058EC78 -/* 8058EBD8 38 00 00 01 */ li r0, 1 -/* 8058EBDC 98 1F 06 F9 */ stb r0, 0x6f9(r31) -/* 8058EBE0 98 1F 06 25 */ stb r0, 0x625(r31) -/* 8058EBE4 88 1F 06 FC */ lbz r0, 0x6fc(r31) -/* 8058EBE8 28 00 00 00 */ cmplwi r0, 0 -/* 8058EBEC 40 82 00 20 */ bne lbl_8058EC0C -/* 8058EBF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058EBF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058EBF8 88 9F 06 F8 */ lbz r4, 0x6f8(r31) -/* 8058EBFC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8058EC00 7C 05 07 74 */ extsb r5, r0 -/* 8058EC04 4B AA 65 FD */ bl onSwitch__10dSv_info_cFii -/* 8058EC08 48 00 00 1C */ b lbl_8058EC24 -lbl_8058EC0C: -/* 8058EC0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058EC10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058EC14 88 9F 06 F8 */ lbz r4, 0x6f8(r31) -/* 8058EC18 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8058EC1C 7C 05 07 74 */ extsb r5, r0 -/* 8058EC20 4B AA 66 91 */ bl offSwitch__10dSv_info_cFii -lbl_8058EC24: -/* 8058EC24 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8058EC28 7C 03 07 74 */ extsb r3, r0 -/* 8058EC2C 4B A9 E4 41 */ bl dComIfGp_getReverb__Fi -/* 8058EC30 7C 67 1B 78 */ mr r7, r3 -/* 8058EC34 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080017@ha */ -/* 8058EC38 38 03 00 17 */ addi r0, r3, 0x0017 /* 0x00080017@l */ -/* 8058EC3C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8058EC40 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8058EC44 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8058EC48 80 63 00 00 */ lwz r3, 0(r3) -/* 8058EC4C 38 81 00 0C */ addi r4, r1, 0xc -/* 8058EC50 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 8058EC54 38 C0 00 00 */ li r6, 0 -/* 8058EC58 C0 3E 00 08 */ lfs f1, 8(r30) -/* 8058EC5C FC 40 08 90 */ fmr f2, f1 -/* 8058EC60 C0 7E 00 70 */ lfs f3, 0x70(r30) -/* 8058EC64 FC 80 18 90 */ fmr f4, f3 -/* 8058EC68 39 00 00 00 */ li r8, 0 -/* 8058EC6C 4B D1 CD 19 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8058EC70 7F E3 FB 78 */ mr r3, r31 -/* 8058EC74 4B FF FA AD */ bl setLight__13daLv2Candle_cFv -lbl_8058EC78: -/* 8058EC78 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 8058EC7C 3C 03 FF FF */ addis r0, r3, 0xffff -/* 8058EC80 28 00 00 00 */ cmplwi r0, 0 -/* 8058EC84 40 82 00 E4 */ bne lbl_8058ED68 -/* 8058EC88 88 1D 00 75 */ lbz r0, 0x75(r29) -/* 8058EC8C 28 00 00 03 */ cmplwi r0, 3 -/* 8058EC90 40 82 00 D8 */ bne lbl_8058ED68 -/* 8058EC94 88 1F 06 F9 */ lbz r0, 0x6f9(r31) -/* 8058EC98 28 00 00 01 */ cmplwi r0, 1 -/* 8058EC9C 40 82 00 CC */ bne lbl_8058ED68 -/* 8058ECA0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8058ECA4 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f -/* 8058ECA8 2C 00 00 01 */ cmpwi r0, 1 -/* 8058ECAC 40 82 00 BC */ bne lbl_8058ED68 -/* 8058ECB0 38 00 00 00 */ li r0, 0 -/* 8058ECB4 98 1F 06 F9 */ stb r0, 0x6f9(r31) -/* 8058ECB8 98 1F 06 25 */ stb r0, 0x625(r31) -/* 8058ECBC 7F E3 FB 78 */ mr r3, r31 -/* 8058ECC0 4B FF FA 91 */ bl cutLight__13daLv2Candle_cFv -/* 8058ECC4 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8058ECC8 7C 03 07 74 */ extsb r3, r0 -/* 8058ECCC 4B A9 E3 A1 */ bl dComIfGp_getReverb__Fi -/* 8058ECD0 7C 67 1B 78 */ mr r7, r3 -/* 8058ECD4 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080019@ha */ -/* 8058ECD8 38 03 00 19 */ addi r0, r3, 0x0019 /* 0x00080019@l */ -/* 8058ECDC 90 01 00 08 */ stw r0, 8(r1) -/* 8058ECE0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 8058ECE4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8058ECE8 80 63 00 00 */ lwz r3, 0(r3) -/* 8058ECEC 38 81 00 08 */ addi r4, r1, 8 -/* 8058ECF0 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 8058ECF4 38 C0 00 00 */ li r6, 0 -/* 8058ECF8 C0 3E 00 08 */ lfs f1, 8(r30) -/* 8058ECFC FC 40 08 90 */ fmr f2, f1 -/* 8058ED00 C0 7E 00 70 */ lfs f3, 0x70(r30) -/* 8058ED04 FC 80 18 90 */ fmr f4, f3 -/* 8058ED08 39 00 00 00 */ li r8, 0 -/* 8058ED0C 4B D1 CC 79 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8058ED10 88 9F 06 F8 */ lbz r4, 0x6f8(r31) -/* 8058ED14 28 04 00 FF */ cmplwi r4, 0xff -/* 8058ED18 40 82 00 18 */ bne lbl_8058ED30 -/* 8058ED1C 3C 60 80 59 */ lis r3, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058ED20 38 63 F2 AC */ addi r3, r3, l_HIO@l /* 0x8058F2AC@l */ -/* 8058ED24 88 03 00 04 */ lbz r0, 4(r3) -/* 8058ED28 98 1F 06 FB */ stb r0, 0x6fb(r31) -/* 8058ED2C 48 00 00 3C */ b lbl_8058ED68 -lbl_8058ED30: -/* 8058ED30 88 1F 06 FC */ lbz r0, 0x6fc(r31) -/* 8058ED34 28 00 00 00 */ cmplwi r0, 0 -/* 8058ED38 40 82 00 1C */ bne lbl_8058ED54 -/* 8058ED3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058ED40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058ED44 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8058ED48 7C 05 07 74 */ extsb r5, r0 -/* 8058ED4C 4B AA 65 65 */ bl offSwitch__10dSv_info_cFii -/* 8058ED50 48 00 00 18 */ b lbl_8058ED68 -lbl_8058ED54: -/* 8058ED54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058ED58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058ED5C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8058ED60 7C 05 07 74 */ extsb r5, r0 -/* 8058ED64 4B AA 64 9D */ bl onSwitch__10dSv_info_cFii -lbl_8058ED68: -/* 8058ED68 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 8058ED6C 4B AF 57 8D */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 8058ED70 28 03 00 00 */ cmplwi r3, 0 -/* 8058ED74 41 82 00 C8 */ beq lbl_8058EE3C -/* 8058ED78 4B CD 4C D1 */ bl GetAc__8cCcD_ObjFv -/* 8058ED7C 3B A0 00 01 */ li r29, 1 -/* 8058ED80 28 03 00 00 */ cmplwi r3, 0 -/* 8058ED84 41 82 00 B8 */ beq lbl_8058EE3C -/* 8058ED88 A8 63 00 08 */ lha r3, 8(r3) -/* 8058ED8C 2C 03 01 E1 */ cmpwi r3, 0x1e1 -/* 8058ED90 40 82 00 14 */ bne lbl_8058EDA4 -/* 8058ED94 88 1F 07 38 */ lbz r0, 0x738(r31) -/* 8058ED98 28 00 00 00 */ cmplwi r0, 0 -/* 8058ED9C 41 82 00 08 */ beq lbl_8058EDA4 -/* 8058EDA0 3B A0 00 00 */ li r29, 0 -lbl_8058EDA4: -/* 8058EDA4 2C 03 01 B2 */ cmpwi r3, 0x1b2 -/* 8058EDA8 40 82 00 08 */ bne lbl_8058EDB0 -/* 8058EDAC 3B A0 00 00 */ li r29, 0 -lbl_8058EDB0: -/* 8058EDB0 2C 03 00 FD */ cmpwi r3, 0xfd -/* 8058EDB4 40 82 00 28 */ bne lbl_8058EDDC -/* 8058EDB8 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 8058EDBC 4B AF 57 8D */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 8058EDC0 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8058EDC4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 8058EDC8 41 82 00 14 */ beq lbl_8058EDDC -/* 8058EDCC 88 1F 07 38 */ lbz r0, 0x738(r31) -/* 8058EDD0 28 00 00 00 */ cmplwi r0, 0 -/* 8058EDD4 41 82 00 08 */ beq lbl_8058EDDC -/* 8058EDD8 3B A0 00 00 */ li r29, 0 -lbl_8058EDDC: -/* 8058EDDC 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 8058EDE0 41 82 00 5C */ beq lbl_8058EE3C -/* 8058EDE4 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 8058EDE8 4B AF 57 95 */ bl GetTgHitObjSe__12dCcD_GObjInfFv -/* 8058EDEC 38 80 00 01 */ li r4, 1 -/* 8058EDF0 4B AF 57 C1 */ bl getHitSeID__12dCcD_GObjInfFUci -/* 8058EDF4 7C 64 1B 78 */ mr r4, r3 -/* 8058EDF8 88 1F 06 FD */ lbz r0, 0x6fd(r31) -/* 8058EDFC 28 00 00 00 */ cmplwi r0, 0 -/* 8058EE00 40 82 00 18 */ bne lbl_8058EE18 -/* 8058EE04 38 7F 07 3C */ addi r3, r31, 0x73c -/* 8058EE08 38 A0 00 02 */ li r5, 2 -/* 8058EE0C 38 C0 00 00 */ li r6, 0 -/* 8058EE10 4B D2 F6 95 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 8058EE14 48 00 00 14 */ b lbl_8058EE28 -lbl_8058EE18: -/* 8058EE18 38 7F 07 3C */ addi r3, r31, 0x73c -/* 8058EE1C 38 A0 00 09 */ li r5, 9 -/* 8058EE20 38 C0 00 00 */ li r6, 0 -/* 8058EE24 4B D2 F6 81 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -lbl_8058EE28: -/* 8058EE28 38 00 00 01 */ li r0, 1 -/* 8058EE2C 98 1F 07 38 */ stb r0, 0x738(r31) -/* 8058EE30 48 00 00 0C */ b lbl_8058EE3C -lbl_8058EE34: -/* 8058EE34 38 00 00 00 */ li r0, 0 -/* 8058EE38 98 1F 07 38 */ stb r0, 0x738(r31) -lbl_8058EE3C: -/* 8058EE3C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8058EE40 7C 03 07 74 */ extsb r3, r0 -/* 8058EE44 4B A9 E2 29 */ bl dComIfGp_getReverb__Fi -/* 8058EE48 7C 65 1B 78 */ mr r5, r3 -/* 8058EE4C 38 7F 07 3C */ addi r3, r31, 0x73c -/* 8058EE50 38 80 00 00 */ li r4, 0 -/* 8058EE54 81 9F 07 4C */ lwz r12, 0x74c(r31) -/* 8058EE58 81 8C 00 08 */ lwz r12, 8(r12) -/* 8058EE5C 7D 89 03 A6 */ mtctr r12 -/* 8058EE60 4E 80 04 21 */ bctrl -/* 8058EE64 38 7F 06 D4 */ addi r3, r31, 0x6d4 -/* 8058EE68 C0 3E 00 74 */ lfs f1, 0x74(r30) -/* 8058EE6C 4B CE 03 95 */ bl SetR__8cM3dGCylFf -/* 8058EE70 38 7F 06 D4 */ addi r3, r31, 0x6d4 -/* 8058EE74 C0 3E 00 78 */ lfs f1, 0x78(r30) -/* 8058EE78 4B CE 03 81 */ bl SetH__8cM3dGCylFf -/* 8058EE7C 38 7F 06 D4 */ addi r3, r31, 0x6d4 -/* 8058EE80 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8058EE84 4B CE 03 59 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8058EE88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058EE8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058EE90 38 63 23 3C */ addi r3, r3, 0x233c -/* 8058EE94 38 9F 05 B0 */ addi r4, r31, 0x5b0 -/* 8058EE98 4B CD 5D 11 */ bl Set__4cCcSFP8cCcD_Obj -/* 8058EE9C 7F E3 FB 78 */ mr r3, r31 -/* 8058EEA0 4B FF F8 E1 */ bl pointLightProc__13daLv2Candle_cFv -/* 8058EEA4 7F E3 FB 78 */ mr r3, r31 -/* 8058EEA8 4B FF F2 95 */ bl setBaseMtx__13daLv2Candle_cFv -/* 8058EEAC 38 60 00 01 */ li r3, 1 -/* 8058EEB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8058EEB4 4B DD 33 75 */ bl _restgpr_29 -/* 8058EEB8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8058EEBC 7C 08 03 A6 */ mtlr r0 -/* 8058EEC0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8058EEC4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__ct__17daLv2Candle_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__ct__17daLv2Candle_HIO_cFv.s deleted file mode 100644 index 3b829c010b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__ct__17daLv2Candle_HIO_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8058E04C: -/* 8058E04C 3C 80 80 59 */ lis r4, lit_3637@ha /* 0x8058F130@ha */ -/* 8058E050 38 A4 F1 30 */ addi r5, r4, lit_3637@l /* 0x8058F130@l */ -/* 8058E054 3C 80 80 59 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x8058F28C@ha */ -/* 8058E058 38 04 F2 8C */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x8058F28C@l */ -/* 8058E05C 90 03 00 00 */ stw r0, 0(r3) -/* 8058E060 3C 80 80 59 */ lis r4, __vt__17daLv2Candle_HIO_c@ha /* 0x8058F280@ha */ -/* 8058E064 38 04 F2 80 */ addi r0, r4, __vt__17daLv2Candle_HIO_c@l /* 0x8058F280@l */ -/* 8058E068 90 03 00 00 */ stw r0, 0(r3) -/* 8058E06C 38 00 00 1E */ li r0, 0x1e -/* 8058E070 98 03 00 04 */ stb r0, 4(r3) -/* 8058E074 C0 05 00 00 */ lfs f0, 0(r5) -/* 8058E078 D0 03 00 08 */ stfs f0, 8(r3) -/* 8058E07C C0 45 00 04 */ lfs f2, 4(r5) -/* 8058E080 D0 43 00 10 */ stfs f2, 0x10(r3) -/* 8058E084 C0 25 00 08 */ lfs f1, 8(r5) -/* 8058E088 D0 23 00 14 */ stfs f1, 0x14(r3) -/* 8058E08C C0 05 00 0C */ lfs f0, 0xc(r5) -/* 8058E090 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8058E094 D0 43 00 1C */ stfs f2, 0x1c(r3) -/* 8058E098 D0 23 00 20 */ stfs f1, 0x20(r3) -/* 8058E09C D0 23 00 24 */ stfs f1, 0x24(r3) -/* 8058E0A0 38 80 00 02 */ li r4, 2 -/* 8058E0A4 98 83 00 28 */ stb r4, 0x28(r3) -/* 8058E0A8 98 83 00 29 */ stb r4, 0x29(r3) -/* 8058E0AC 38 00 00 01 */ li r0, 1 -/* 8058E0B0 98 03 00 2A */ stb r0, 0x2a(r3) -/* 8058E0B4 98 83 00 2B */ stb r4, 0x2b(r3) -/* 8058E0B8 98 83 00 2C */ stb r4, 0x2c(r3) -/* 8058E0BC 38 00 00 03 */ li r0, 3 -/* 8058E0C0 98 03 00 2D */ stb r0, 0x2d(r3) -/* 8058E0C4 C0 05 00 10 */ lfs f0, 0x10(r5) -/* 8058E0C8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8058E0CC 38 A0 00 BC */ li r5, 0xbc -/* 8058E0D0 98 A3 00 2E */ stb r5, 0x2e(r3) -/* 8058E0D4 38 80 00 66 */ li r4, 0x66 -/* 8058E0D8 98 83 00 2F */ stb r4, 0x2f(r3) -/* 8058E0DC 38 00 00 42 */ li r0, 0x42 -/* 8058E0E0 98 03 00 30 */ stb r0, 0x30(r3) -/* 8058E0E4 98 A3 00 31 */ stb r5, 0x31(r3) -/* 8058E0E8 98 83 00 32 */ stb r4, 0x32(r3) -/* 8058E0EC 98 03 00 33 */ stb r0, 0x33(r3) -/* 8058E0F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 54e5f64642..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8058E0F4: -/* 8058E0F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E0F8 7C 08 02 A6 */ mflr r0 -/* 8058E0FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E100 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058E104 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8058E108 41 82 00 1C */ beq lbl_8058E124 -/* 8058E10C 3C A0 80 59 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x8058F28C@ha */ -/* 8058E110 38 05 F2 8C */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x8058F28C@l */ -/* 8058E114 90 1F 00 00 */ stw r0, 0(r31) -/* 8058E118 7C 80 07 35 */ extsh. r0, r4 -/* 8058E11C 40 81 00 08 */ ble lbl_8058E124 -/* 8058E120 4B D4 0C 1D */ bl __dl__FPv -lbl_8058E124: -/* 8058E124 7F E3 FB 78 */ mr r3, r31 -/* 8058E128 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058E12C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E130 7C 08 03 A6 */ mtlr r0 -/* 8058E134 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E138 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__17daLv2Candle_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__17daLv2Candle_HIO_cFv.s deleted file mode 100644 index c2d2c7740d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__17daLv2Candle_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8058F050: -/* 8058F050 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058F054 7C 08 02 A6 */ mflr r0 -/* 8058F058 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058F05C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058F060 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8058F064 41 82 00 30 */ beq lbl_8058F094 -/* 8058F068 3C 60 80 59 */ lis r3, __vt__17daLv2Candle_HIO_c@ha /* 0x8058F280@ha */ -/* 8058F06C 38 03 F2 80 */ addi r0, r3, __vt__17daLv2Candle_HIO_c@l /* 0x8058F280@l */ -/* 8058F070 90 1F 00 00 */ stw r0, 0(r31) -/* 8058F074 41 82 00 10 */ beq lbl_8058F084 -/* 8058F078 3C 60 80 59 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x8058F28C@ha */ -/* 8058F07C 38 03 F2 8C */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x8058F28C@l */ -/* 8058F080 90 1F 00 00 */ stw r0, 0(r31) -lbl_8058F084: -/* 8058F084 7C 80 07 35 */ extsh. r0, r4 -/* 8058F088 40 81 00 0C */ ble lbl_8058F094 -/* 8058F08C 7F E3 FB 78 */ mr r3, r31 -/* 8058F090 4B D3 FC AD */ bl __dl__FPv -lbl_8058F094: -/* 8058F094 7F E3 FB 78 */ mr r3, r31 -/* 8058F098 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058F09C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058F0A0 7C 08 03 A6 */ mtlr r0 -/* 8058F0A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058F0A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGAabFv.s deleted file mode 100644 index 9a40ede475..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8058E574: -/* 8058E574 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E578 7C 08 02 A6 */ mflr r0 -/* 8058E57C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E580 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058E584 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8058E588 41 82 00 1C */ beq lbl_8058E5A4 -/* 8058E58C 3C A0 80 59 */ lis r5, __vt__8cM3dGAab@ha /* 0x8058F274@ha */ -/* 8058E590 38 05 F2 74 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8058F274@l */ -/* 8058E594 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8058E598 7C 80 07 35 */ extsh. r0, r4 -/* 8058E59C 40 81 00 08 */ ble lbl_8058E5A4 -/* 8058E5A0 4B D4 07 9D */ bl __dl__FPv -lbl_8058E5A4: -/* 8058E5A4 7F E3 FB 78 */ mr r3, r31 -/* 8058E5A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058E5AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E5B0 7C 08 03 A6 */ mtlr r0 -/* 8058E5B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E5B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGCylFv.s deleted file mode 100644 index ac5f9d0e13..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8058E52C: -/* 8058E52C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E530 7C 08 02 A6 */ mflr r0 -/* 8058E534 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E538 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058E53C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8058E540 41 82 00 1C */ beq lbl_8058E55C -/* 8058E544 3C A0 80 59 */ lis r5, __vt__8cM3dGCyl@ha /* 0x8058F268@ha */ -/* 8058E548 38 05 F2 68 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x8058F268@l */ -/* 8058E54C 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8058E550 7C 80 07 35 */ extsh. r0, r4 -/* 8058E554 40 81 00 08 */ ble lbl_8058E55C -/* 8058E558 4B D4 07 E5 */ bl __dl__FPv -lbl_8058E55C: -/* 8058E55C 7F E3 FB 78 */ mr r3, r31 -/* 8058E560 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058E564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E568 7C 08 03 A6 */ mtlr r0 -/* 8058E56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E570 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__sinit_d_a_obj_lv2Candle_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__sinit_d_a_obj_lv2Candle_cpp.s deleted file mode 100644 index 380b6842d6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__sinit_d_a_obj_lv2Candle_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8058F0AC: -/* 8058F0AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058F0B0 7C 08 02 A6 */ mflr r0 -/* 8058F0B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058F0B8 3C 60 80 59 */ lis r3, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058F0BC 38 63 F2 AC */ addi r3, r3, l_HIO@l /* 0x8058F2AC@l */ -/* 8058F0C0 4B FF EF 8D */ bl __ct__17daLv2Candle_HIO_cFv -/* 8058F0C4 3C 80 80 59 */ lis r4, __dt__17daLv2Candle_HIO_cFv@ha /* 0x8058F050@ha */ -/* 8058F0C8 38 84 F0 50 */ addi r4, r4, __dt__17daLv2Candle_HIO_cFv@l /* 0x8058F050@l */ -/* 8058F0CC 3C A0 80 59 */ lis r5, lit_3631@ha /* 0x8058F2A0@ha */ -/* 8058F0D0 38 A5 F2 A0 */ addi r5, r5, lit_3631@l /* 0x8058F2A0@l */ -/* 8058F0D4 4B FF EF 05 */ bl __register_global_object -/* 8058F0D8 3C 60 80 59 */ lis r3, mCcDCyl__13daLv2Candle_c@ha /* 0x8058F1C8@ha */ -/* 8058F0DC 38 63 F1 C8 */ addi r3, r3, mCcDCyl__13daLv2Candle_c@l /* 0x8058F1C8@l */ -/* 8058F0E0 38 A3 FF FC */ addi r5, r3, -4 -/* 8058F0E4 3C 60 80 59 */ lis r3, mCcDObjInfo__13daLv2Candle_c@ha /* 0x8058F144@ha */ -/* 8058F0E8 38 63 F1 44 */ addi r3, r3, mCcDObjInfo__13daLv2Candle_c@l /* 0x8058F144@l */ -/* 8058F0EC 38 83 FF FC */ addi r4, r3, -4 -/* 8058F0F0 38 00 00 06 */ li r0, 6 -/* 8058F0F4 7C 09 03 A6 */ mtctr r0 -lbl_8058F0F8: -/* 8058F0F8 80 64 00 04 */ lwz r3, 4(r4) -/* 8058F0FC 84 04 00 08 */ lwzu r0, 8(r4) -/* 8058F100 90 65 00 04 */ stw r3, 4(r5) -/* 8058F104 94 05 00 08 */ stwu r0, 8(r5) -/* 8058F108 42 00 FF F0 */ bdnz lbl_8058F0F8 -/* 8058F10C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058F110 7C 08 03 A6 */ mtlr r0 -/* 8058F114 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058F118 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c.s deleted file mode 100644 index d0ba6dc667..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8058E608: -/* 8058E608 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E60C 7C 08 02 A6 */ mflr r0 -/* 8058E610 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E614 4B FF FB B1 */ bl CreateHeap__13daLv2Candle_cFv -/* 8058E618 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E61C 7C 08 03 A6 */ mtlr r0 -/* 8058E620 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E624 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/create__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/create__13daLv2Candle_cFv.s deleted file mode 100644 index 88bb22c931..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/create__13daLv2Candle_cFv.s +++ /dev/null @@ -1,197 +0,0 @@ -lbl_8058E244: -/* 8058E244 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8058E248 7C 08 02 A6 */ mflr r0 -/* 8058E24C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8058E250 39 61 00 20 */ addi r11, r1, 0x20 -/* 8058E254 4B DD 3F 89 */ bl _savegpr_29 -/* 8058E258 7C 7E 1B 78 */ mr r30, r3 -/* 8058E25C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8058E260 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8058E264 40 82 00 B0 */ bne lbl_8058E314 -/* 8058E268 7F C0 F3 79 */ or. r0, r30, r30 -/* 8058E26C 41 82 00 9C */ beq lbl_8058E308 -/* 8058E270 7C 1F 03 78 */ mr r31, r0 -/* 8058E274 4B A8 A8 F1 */ bl __ct__10fopAc_ac_cFv -/* 8058E278 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 8058E27C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 8058E280 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 8058E284 38 7F 05 90 */ addi r3, r31, 0x590 -/* 8058E288 4B AF 54 D9 */ bl __ct__10dCcD_GSttsFv -/* 8058E28C 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 8058E290 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 8058E294 90 7F 05 8C */ stw r3, 0x58c(r31) -/* 8058E298 38 03 00 20 */ addi r0, r3, 0x20 -/* 8058E29C 90 1F 05 90 */ stw r0, 0x590(r31) -/* 8058E2A0 3B BF 05 B0 */ addi r29, r31, 0x5b0 -/* 8058E2A4 7F A3 EB 78 */ mr r3, r29 -/* 8058E2A8 4B AF 57 81 */ bl __ct__12dCcD_GObjInfFv -/* 8058E2AC 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8058E2B0 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 8058E2B4 90 1D 01 20 */ stw r0, 0x120(r29) -/* 8058E2B8 3C 60 80 59 */ lis r3, __vt__8cM3dGAab@ha /* 0x8058F274@ha */ -/* 8058E2BC 38 03 F2 74 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8058F274@l */ -/* 8058E2C0 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 8058E2C4 3C 60 80 59 */ lis r3, __vt__8cM3dGCyl@ha /* 0x8058F268@ha */ -/* 8058E2C8 38 03 F2 68 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x8058F268@l */ -/* 8058E2CC 90 1D 01 38 */ stw r0, 0x138(r29) -/* 8058E2D0 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 8058E2D4 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 8058E2D8 90 7D 01 20 */ stw r3, 0x120(r29) -/* 8058E2DC 38 03 00 58 */ addi r0, r3, 0x58 -/* 8058E2E0 90 1D 01 38 */ stw r0, 0x138(r29) -/* 8058E2E4 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 8058E2E8 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 8058E2EC 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 8058E2F0 38 03 00 2C */ addi r0, r3, 0x2c -/* 8058E2F4 90 1D 01 20 */ stw r0, 0x120(r29) -/* 8058E2F8 38 03 00 84 */ addi r0, r3, 0x84 -/* 8058E2FC 90 1D 01 38 */ stw r0, 0x138(r29) -/* 8058E300 38 7F 07 3C */ addi r3, r31, 0x73c -/* 8058E304 4B D3 05 41 */ bl __ct__16Z2SoundObjSimpleFv -lbl_8058E308: -/* 8058E308 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8058E30C 60 00 00 08 */ ori r0, r0, 8 -/* 8058E310 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8058E314: -/* 8058E314 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8058E318 54 00 67 3E */ rlwinm r0, r0, 0xc, 0x1c, 0x1f -/* 8058E31C 98 1E 06 FD */ stb r0, 0x6fd(r30) -/* 8058E320 88 1E 06 FD */ lbz r0, 0x6fd(r30) -/* 8058E324 28 00 00 0F */ cmplwi r0, 0xf -/* 8058E328 40 82 00 0C */ bne lbl_8058E334 -/* 8058E32C 38 00 00 00 */ li r0, 0 -/* 8058E330 98 1E 06 FD */ stb r0, 0x6fd(r30) -lbl_8058E334: -/* 8058E334 38 7E 05 68 */ addi r3, r30, 0x568 -/* 8058E338 88 1E 06 FD */ lbz r0, 0x6fd(r30) -/* 8058E33C 54 00 10 3A */ slwi r0, r0, 2 -/* 8058E340 3C 80 80 59 */ lis r4, l_resNameIdx@ha /* 0x8058F20C@ha */ -/* 8058E344 38 84 F2 0C */ addi r4, r4, l_resNameIdx@l /* 0x8058F20C@l */ -/* 8058E348 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8058E34C 4B A9 EB 71 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8058E350 7C 7F 1B 78 */ mr r31, r3 -/* 8058E354 2C 1F 00 04 */ cmpwi r31, 4 -/* 8058E358 40 82 01 B8 */ bne lbl_8058E510 -/* 8058E35C 7F C3 F3 78 */ mr r3, r30 -/* 8058E360 3C 80 80 59 */ lis r4, createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c@ha /* 0x8058E608@ha */ -/* 8058E364 38 84 E6 08 */ addi r4, r4, createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c@l /* 0x8058E608@l */ -/* 8058E368 38 A0 10 00 */ li r5, 0x1000 -/* 8058E36C 4B A8 C1 45 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8058E370 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8058E374 40 82 00 0C */ bne lbl_8058E380 -/* 8058E378 38 60 00 05 */ li r3, 5 -/* 8058E37C 48 00 01 98 */ b lbl_8058E514 -lbl_8058E380: -/* 8058E380 7F C3 F3 78 */ mr r3, r30 -/* 8058E384 4B FF FD B9 */ bl setBaseMtx__13daLv2Candle_cFv -/* 8058E388 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8058E38C 38 03 00 24 */ addi r0, r3, 0x24 -/* 8058E390 90 1E 05 04 */ stw r0, 0x504(r30) -/* 8058E394 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 8058E398 80 83 00 04 */ lwz r4, 4(r3) -/* 8058E39C 7F C3 F3 78 */ mr r3, r30 -/* 8058E3A0 4B A8 C1 D9 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 8058E3A4 38 7E 05 74 */ addi r3, r30, 0x574 -/* 8058E3A8 38 80 00 FF */ li r4, 0xff -/* 8058E3AC 38 A0 00 FF */ li r5, 0xff -/* 8058E3B0 7F C6 F3 78 */ mr r6, r30 -/* 8058E3B4 4B AF 54 AD */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 8058E3B8 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 8058E3BC 3C 80 80 59 */ lis r4, mCcDCyl__13daLv2Candle_c@ha /* 0x8058F1C8@ha */ -/* 8058E3C0 38 84 F1 C8 */ addi r4, r4, mCcDCyl__13daLv2Candle_c@l /* 0x8058F1C8@l */ -/* 8058E3C4 4B AF 64 F1 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 8058E3C8 38 1E 05 74 */ addi r0, r30, 0x574 -/* 8058E3CC 90 1E 05 F4 */ stw r0, 0x5f4(r30) -/* 8058E3D0 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8058E3D4 D0 1E 06 EC */ stfs f0, 0x6ec(r30) -/* 8058E3D8 3C 60 80 59 */ lis r3, lit_3778@ha /* 0x8058F180@ha */ -/* 8058E3DC C0 23 F1 80 */ lfs f1, lit_3778@l(r3) /* 0x8058F180@l */ -/* 8058E3E0 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8058E3E4 EC 01 00 2A */ fadds f0, f1, f0 -/* 8058E3E8 D0 1E 06 F0 */ stfs f0, 0x6f0(r30) -/* 8058E3EC C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 8058E3F0 D0 1E 06 F4 */ stfs f0, 0x6f4(r30) -/* 8058E3F4 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8058E3F8 54 00 87 3E */ rlwinm r0, r0, 0x10, 0x1c, 0x1f -/* 8058E3FC 98 1E 06 FE */ stb r0, 0x6fe(r30) -/* 8058E400 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8058E404 54 00 A7 3E */ rlwinm r0, r0, 0x14, 0x1c, 0x1f -/* 8058E408 98 1E 07 0C */ stb r0, 0x70c(r30) -/* 8058E40C 88 1E 07 0C */ lbz r0, 0x70c(r30) -/* 8058E410 28 00 00 0F */ cmplwi r0, 0xf -/* 8058E414 40 82 00 0C */ bne lbl_8058E420 -/* 8058E418 38 00 00 00 */ li r0, 0 -/* 8058E41C 98 1E 07 0C */ stb r0, 0x70c(r30) -lbl_8058E420: -/* 8058E420 7F C3 F3 78 */ mr r3, r30 -/* 8058E424 48 00 02 55 */ bl lightInit__13daLv2Candle_cFv -/* 8058E428 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8058E42C 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 8058E430 98 1E 06 FC */ stb r0, 0x6fc(r30) -/* 8058E434 88 1E 06 FC */ lbz r0, 0x6fc(r30) -/* 8058E438 28 00 00 0F */ cmplwi r0, 0xf -/* 8058E43C 40 82 00 0C */ bne lbl_8058E448 -/* 8058E440 38 00 00 00 */ li r0, 0 -/* 8058E444 98 1E 06 FC */ stb r0, 0x6fc(r30) -lbl_8058E448: -/* 8058E448 C0 1E 06 EC */ lfs f0, 0x6ec(r30) -/* 8058E44C D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 8058E450 C0 1E 06 F0 */ lfs f0, 0x6f0(r30) -/* 8058E454 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 8058E458 C0 1E 06 F4 */ lfs f0, 0x6f4(r30) -/* 8058E45C D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 8058E460 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8058E464 98 1E 06 F8 */ stb r0, 0x6f8(r30) -/* 8058E468 88 1E 06 F8 */ lbz r0, 0x6f8(r30) -/* 8058E46C 28 00 00 FF */ cmplwi r0, 0xff -/* 8058E470 40 82 00 1C */ bne lbl_8058E48C -/* 8058E474 38 00 00 01 */ li r0, 1 -/* 8058E478 98 1E 06 F9 */ stb r0, 0x6f9(r30) -/* 8058E47C 98 1E 06 25 */ stb r0, 0x625(r30) -/* 8058E480 7F C3 F3 78 */ mr r3, r30 -/* 8058E484 48 00 02 9D */ bl setLight__13daLv2Candle_cFv -/* 8058E488 48 00 00 38 */ b lbl_8058E4C0 -lbl_8058E48C: -/* 8058E48C 7F C3 F3 78 */ mr r3, r30 -/* 8058E490 48 00 01 2D */ bl isSwitch__13daLv2Candle_cFv -/* 8058E494 98 7E 06 FA */ stb r3, 0x6fa(r30) -/* 8058E498 38 00 00 00 */ li r0, 0 -/* 8058E49C 98 1E 06 F9 */ stb r0, 0x6f9(r30) -/* 8058E4A0 88 1E 06 FA */ lbz r0, 0x6fa(r30) -/* 8058E4A4 28 00 00 00 */ cmplwi r0, 0 -/* 8058E4A8 41 82 00 18 */ beq lbl_8058E4C0 -/* 8058E4AC 38 00 00 01 */ li r0, 1 -/* 8058E4B0 98 1E 06 F9 */ stb r0, 0x6f9(r30) -/* 8058E4B4 98 1E 06 25 */ stb r0, 0x625(r30) -/* 8058E4B8 7F C3 F3 78 */ mr r3, r30 -/* 8058E4BC 48 00 02 65 */ bl setLight__13daLv2Candle_cFv -lbl_8058E4C0: -/* 8058E4C0 38 00 00 00 */ li r0, 0 -/* 8058E4C4 98 1E 06 FB */ stb r0, 0x6fb(r30) -/* 8058E4C8 38 7E 07 3C */ addi r3, r30, 0x73c -/* 8058E4CC 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8058E4D0 38 A0 00 01 */ li r5, 1 -/* 8058E4D4 81 9E 07 4C */ lwz r12, 0x74c(r30) -/* 8058E4D8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8058E4DC 7D 89 03 A6 */ mtctr r12 -/* 8058E4E0 4E 80 04 21 */ bctrl -/* 8058E4E4 38 00 00 00 */ li r0, 0 -/* 8058E4E8 98 1E 07 38 */ stb r0, 0x738(r30) -/* 8058E4EC 90 1E 07 34 */ stw r0, 0x734(r30) -/* 8058E4F0 88 1E 06 FD */ lbz r0, 0x6fd(r30) -/* 8058E4F4 28 00 00 01 */ cmplwi r0, 1 -/* 8058E4F8 40 82 00 18 */ bne lbl_8058E510 -/* 8058E4FC 3C 60 80 59 */ lis r3, searchDemoTagAct__13daLv2Candle_cFPvPv@ha /* 0x8058E628@ha */ -/* 8058E500 38 63 E6 28 */ addi r3, r3, searchDemoTagAct__13daLv2Candle_cFPvPv@l /* 0x8058E628@l */ -/* 8058E504 7F C4 F3 78 */ mr r4, r30 -/* 8058E508 4B A8 B2 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8058E50C 90 7E 07 34 */ stw r3, 0x734(r30) -lbl_8058E510: -/* 8058E510 7F E3 FB 78 */ mr r3, r31 -lbl_8058E514: -/* 8058E514 39 61 00 20 */ addi r11, r1, 0x20 -/* 8058E518 4B DD 3D 11 */ bl _restgpr_29 -/* 8058E51C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8058E520 7C 08 03 A6 */ mtlr r0 -/* 8058E524 38 21 00 20 */ addi r1, r1, 0x20 -/* 8058E528 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/cutLight__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/cutLight__13daLv2Candle_cFv.s deleted file mode 100644 index 10a2d2b175..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/cutLight__13daLv2Candle_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8058E750: -/* 8058E750 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E754 7C 08 02 A6 */ mflr r0 -/* 8058E758 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E75C 88 03 07 0C */ lbz r0, 0x70c(r3) -/* 8058E760 28 00 00 00 */ cmplwi r0, 0 -/* 8058E764 41 82 00 0C */ beq lbl_8058E770 -/* 8058E768 38 63 07 14 */ addi r3, r3, 0x714 -/* 8058E76C 4B C1 91 C1 */ bl dKy_plight_cut__FP15LIGHT_INFLUENCE -lbl_8058E770: -/* 8058E770 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E774 7C 08 03 A6 */ mtlr r0 -/* 8058E778 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E77C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Create__FP10fopAc_ac_c.s deleted file mode 100644 index a2b9424973..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8058F030: -/* 8058F030 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058F034 7C 08 02 A6 */ mflr r0 -/* 8058F038 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058F03C 4B FF F2 09 */ bl create__13daLv2Candle_cFv -/* 8058F040 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058F044 7C 08 03 A6 */ mtlr r0 -/* 8058F048 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058F04C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Delete__FP13daLv2Candle_c.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Delete__FP13daLv2Candle_c.s deleted file mode 100644 index 012431ec65..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Delete__FP13daLv2Candle_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8058F010: -/* 8058F010 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058F014 7C 08 02 A6 */ mflr r0 -/* 8058F018 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058F01C 4B FF FF 51 */ bl Delete__13daLv2Candle_cFv -/* 8058F020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058F024 7C 08 03 A6 */ mtlr r0 -/* 8058F028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058F02C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Draw__FP13daLv2Candle_c.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Draw__FP13daLv2Candle_c.s deleted file mode 100644 index c2fba1dd66..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Draw__FP13daLv2Candle_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8058EFD0: -/* 8058EFD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058EFD4 7C 08 02 A6 */ mflr r0 -/* 8058EFD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058EFDC 4B FF FE ED */ bl Draw__13daLv2Candle_cFv -/* 8058EFE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058EFE4 7C 08 03 A6 */ mtlr r0 -/* 8058EFE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058EFEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Execute__FP13daLv2Candle_c.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Execute__FP13daLv2Candle_c.s deleted file mode 100644 index bc9c4ba5ac..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Execute__FP13daLv2Candle_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8058EFF0: -/* 8058EFF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058EFF4 7C 08 02 A6 */ mflr r0 -/* 8058EFF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058EFFC 4B FF F9 A1 */ bl Execute__13daLv2Candle_cFv -/* 8058F000 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058F004 7C 08 03 A6 */ mtlr r0 -/* 8058F008 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058F00C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/isSwitch__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/isSwitch__13daLv2Candle_cFv.s deleted file mode 100644 index ec0b3c5d6b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/isSwitch__13daLv2Candle_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8058E5BC: -/* 8058E5BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E5C0 7C 08 02 A6 */ mflr r0 -/* 8058E5C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E5C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058E5CC 7C 7F 1B 78 */ mr r31, r3 -/* 8058E5D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8058E5D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8058E5D8 88 9F 06 F8 */ lbz r4, 0x6f8(r31) -/* 8058E5DC 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8058E5E0 7C 05 07 74 */ extsb r5, r0 -/* 8058E5E4 4B AA 6D 7D */ bl isSwitch__10dSv_info_cCFii -/* 8058E5E8 88 1F 06 FC */ lbz r0, 0x6fc(r31) -/* 8058E5EC 7C 00 1A 78 */ xor r0, r0, r3 -/* 8058E5F0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8058E5F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058E5F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E5FC 7C 08 03 A6 */ mtlr r0 -/* 8058E600 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E604 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/lightInit__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/lightInit__13daLv2Candle_cFv.s deleted file mode 100644 index 2c02b41413..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/lightInit__13daLv2Candle_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8058E678: -/* 8058E678 3C 80 80 59 */ lis r4, lit_3637@ha /* 0x8058F130@ha */ -/* 8058E67C 38 C4 F1 30 */ addi r6, r4, lit_3637@l /* 0x8058F130@l */ -/* 8058E680 C0 03 06 EC */ lfs f0, 0x6ec(r3) -/* 8058E684 D0 03 07 00 */ stfs f0, 0x700(r3) -/* 8058E688 C0 03 06 F0 */ lfs f0, 0x6f0(r3) -/* 8058E68C D0 03 07 04 */ stfs f0, 0x704(r3) -/* 8058E690 C0 03 06 F4 */ lfs f0, 0x6f4(r3) -/* 8058E694 D0 03 07 08 */ stfs f0, 0x708(r3) -/* 8058E698 C0 23 07 04 */ lfs f1, 0x704(r3) -/* 8058E69C C0 06 00 54 */ lfs f0, 0x54(r6) -/* 8058E6A0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8058E6A4 D0 03 07 04 */ stfs f0, 0x704(r3) -/* 8058E6A8 38 00 00 00 */ li r0, 0 -/* 8058E6AC 98 03 07 0E */ stb r0, 0x70e(r3) -/* 8058E6B0 3C 80 80 59 */ lis r4, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058E6B4 38 A4 F2 AC */ addi r5, r4, l_HIO@l /* 0x8058F2AC@l */ -/* 8058E6B8 88 03 07 0E */ lbz r0, 0x70e(r3) -/* 8058E6BC 7C 85 02 14 */ add r4, r5, r0 -/* 8058E6C0 88 04 00 28 */ lbz r0, 0x28(r4) -/* 8058E6C4 98 03 07 0D */ stb r0, 0x70d(r3) -/* 8058E6C8 88 03 07 0C */ lbz r0, 0x70c(r3) -/* 8058E6CC 28 00 00 00 */ cmplwi r0, 0 -/* 8058E6D0 41 82 00 44 */ beq lbl_8058E714 -/* 8058E6D4 C0 03 07 00 */ lfs f0, 0x700(r3) -/* 8058E6D8 D0 03 07 14 */ stfs f0, 0x714(r3) -/* 8058E6DC C0 03 07 04 */ lfs f0, 0x704(r3) -/* 8058E6E0 D0 03 07 18 */ stfs f0, 0x718(r3) -/* 8058E6E4 C0 03 07 08 */ lfs f0, 0x708(r3) -/* 8058E6E8 D0 03 07 1C */ stfs f0, 0x71c(r3) -/* 8058E6EC 88 05 00 2E */ lbz r0, 0x2e(r5) -/* 8058E6F0 B0 03 07 20 */ sth r0, 0x720(r3) -/* 8058E6F4 88 05 00 2F */ lbz r0, 0x2f(r5) -/* 8058E6F8 B0 03 07 22 */ sth r0, 0x722(r3) -/* 8058E6FC 88 05 00 30 */ lbz r0, 0x30(r5) -/* 8058E700 B0 03 07 24 */ sth r0, 0x724(r3) -/* 8058E704 C0 05 00 08 */ lfs f0, 8(r5) -/* 8058E708 D0 03 07 28 */ stfs f0, 0x728(r3) -/* 8058E70C C0 06 00 08 */ lfs f0, 8(r6) -/* 8058E710 D0 03 07 2C */ stfs f0, 0x72c(r3) -lbl_8058E714: -/* 8058E714 C0 06 00 58 */ lfs f0, 0x58(r6) -/* 8058E718 D0 03 07 10 */ stfs f0, 0x710(r3) -/* 8058E71C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/pointLightProc__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/pointLightProc__13daLv2Candle_cFv.s deleted file mode 100644 index 0254b461b1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/pointLightProc__13daLv2Candle_cFv.s +++ /dev/null @@ -1,145 +0,0 @@ -lbl_8058E780: -/* 8058E780 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8058E784 7C 08 02 A6 */ mflr r0 -/* 8058E788 90 01 00 24 */ stw r0, 0x24(r1) -/* 8058E78C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8058E790 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8058E794 7C 7E 1B 78 */ mr r30, r3 -/* 8058E798 3C 60 80 59 */ lis r3, lit_3637@ha /* 0x8058F130@ha */ -/* 8058E79C 3B E3 F1 30 */ addi r31, r3, lit_3637@l /* 0x8058F130@l */ -/* 8058E7A0 88 1E 07 0C */ lbz r0, 0x70c(r30) -/* 8058E7A4 28 00 00 00 */ cmplwi r0, 0 -/* 8058E7A8 41 82 00 C0 */ beq lbl_8058E868 -/* 8058E7AC 88 1E 06 F9 */ lbz r0, 0x6f9(r30) -/* 8058E7B0 28 00 00 00 */ cmplwi r0, 0 -/* 8058E7B4 41 82 01 D0 */ beq lbl_8058E984 -/* 8058E7B8 88 1E 06 FE */ lbz r0, 0x6fe(r30) -/* 8058E7BC 28 00 00 0F */ cmplwi r0, 0xf -/* 8058E7C0 41 82 01 C4 */ beq lbl_8058E984 -/* 8058E7C4 38 7E 07 10 */ addi r3, r30, 0x710 -/* 8058E7C8 3C 80 80 59 */ lis r4, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058E7CC 38 A4 F2 AC */ addi r5, r4, l_HIO@l /* 0x8058F2AC@l */ -/* 8058E7D0 88 1E 07 0E */ lbz r0, 0x70e(r30) -/* 8058E7D4 54 00 10 3A */ slwi r0, r0, 2 -/* 8058E7D8 7C 85 02 14 */ add r4, r5, r0 -/* 8058E7DC C0 24 00 10 */ lfs f1, 0x10(r4) -/* 8058E7E0 C0 5F 00 08 */ lfs f2, 8(r31) -/* 8058E7E4 C0 65 00 0C */ lfs f3, 0xc(r5) -/* 8058E7E8 C0 9F 00 60 */ lfs f4, 0x60(r31) -/* 8058E7EC 4B CE 11 91 */ bl cLib_addCalc__FPfffff -/* 8058E7F0 3C 60 80 59 */ lis r3, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058E7F4 38 63 F2 AC */ addi r3, r3, l_HIO@l /* 0x8058F2AC@l */ -/* 8058E7F8 C0 43 00 08 */ lfs f2, 8(r3) -/* 8058E7FC C0 1E 07 10 */ lfs f0, 0x710(r30) -/* 8058E800 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8058E804 D0 1E 07 28 */ stfs f0, 0x728(r30) -/* 8058E808 C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 8058E80C FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8058E810 40 82 01 74 */ bne lbl_8058E984 -/* 8058E814 88 7E 07 0D */ lbz r3, 0x70d(r30) -/* 8058E818 28 03 00 00 */ cmplwi r3, 0 -/* 8058E81C 40 82 00 40 */ bne lbl_8058E85C -/* 8058E820 88 7E 07 0E */ lbz r3, 0x70e(r30) -/* 8058E824 38 03 00 01 */ addi r0, r3, 1 -/* 8058E828 98 1E 07 0E */ stb r0, 0x70e(r30) -/* 8058E82C 88 1E 07 0E */ lbz r0, 0x70e(r30) -/* 8058E830 28 00 00 05 */ cmplwi r0, 5 -/* 8058E834 40 81 00 0C */ ble lbl_8058E840 -/* 8058E838 38 00 00 00 */ li r0, 0 -/* 8058E83C 98 1E 07 0E */ stb r0, 0x70e(r30) -lbl_8058E840: -/* 8058E840 3C 60 80 59 */ lis r3, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058E844 38 63 F2 AC */ addi r3, r3, l_HIO@l /* 0x8058F2AC@l */ -/* 8058E848 88 1E 07 0E */ lbz r0, 0x70e(r30) -/* 8058E84C 7C 63 02 14 */ add r3, r3, r0 -/* 8058E850 88 03 00 28 */ lbz r0, 0x28(r3) -/* 8058E854 98 1E 07 0D */ stb r0, 0x70d(r30) -/* 8058E858 48 00 01 2C */ b lbl_8058E984 -lbl_8058E85C: -/* 8058E85C 38 03 FF FF */ addi r0, r3, -1 -/* 8058E860 98 1E 07 0D */ stb r0, 0x70d(r30) -/* 8058E864 48 00 01 20 */ b lbl_8058E984 -lbl_8058E868: -/* 8058E868 80 1F 00 5C */ lwz r0, 0x5c(r31) -/* 8058E86C 90 01 00 08 */ stw r0, 8(r1) -/* 8058E870 3C 60 80 59 */ lis r3, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058E874 38 A3 F2 AC */ addi r5, r3, l_HIO@l /* 0x8058F2AC@l */ -/* 8058E878 88 05 00 31 */ lbz r0, 0x31(r5) -/* 8058E87C 98 01 00 08 */ stb r0, 8(r1) -/* 8058E880 88 05 00 32 */ lbz r0, 0x32(r5) -/* 8058E884 98 01 00 09 */ stb r0, 9(r1) -/* 8058E888 88 05 00 33 */ lbz r0, 0x33(r5) -/* 8058E88C 98 01 00 0A */ stb r0, 0xa(r1) -/* 8058E890 88 1E 06 F9 */ lbz r0, 0x6f9(r30) -/* 8058E894 28 00 00 00 */ cmplwi r0, 0 -/* 8058E898 41 82 00 B0 */ beq lbl_8058E948 -/* 8058E89C 88 1E 06 FE */ lbz r0, 0x6fe(r30) -/* 8058E8A0 28 00 00 0F */ cmplwi r0, 0xf -/* 8058E8A4 41 82 00 88 */ beq lbl_8058E92C -/* 8058E8A8 38 7E 07 10 */ addi r3, r30, 0x710 -/* 8058E8AC 88 1E 07 0E */ lbz r0, 0x70e(r30) -/* 8058E8B0 54 00 10 3A */ slwi r0, r0, 2 -/* 8058E8B4 7C 85 02 14 */ add r4, r5, r0 -/* 8058E8B8 C0 24 00 10 */ lfs f1, 0x10(r4) -/* 8058E8BC C0 5F 00 08 */ lfs f2, 8(r31) -/* 8058E8C0 C0 65 00 0C */ lfs f3, 0xc(r5) -/* 8058E8C4 C0 9F 00 60 */ lfs f4, 0x60(r31) -/* 8058E8C8 4B CE 10 B5 */ bl cLib_addCalc__FPfffff -/* 8058E8CC C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 8058E8D0 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 8058E8D4 40 82 00 8C */ bne lbl_8058E960 -/* 8058E8D8 88 7E 07 0D */ lbz r3, 0x70d(r30) -/* 8058E8DC 28 03 00 00 */ cmplwi r3, 0 -/* 8058E8E0 40 82 00 40 */ bne lbl_8058E920 -/* 8058E8E4 88 7E 07 0E */ lbz r3, 0x70e(r30) -/* 8058E8E8 38 03 00 01 */ addi r0, r3, 1 -/* 8058E8EC 98 1E 07 0E */ stb r0, 0x70e(r30) -/* 8058E8F0 88 1E 07 0E */ lbz r0, 0x70e(r30) -/* 8058E8F4 28 00 00 05 */ cmplwi r0, 5 -/* 8058E8F8 40 81 00 0C */ ble lbl_8058E904 -/* 8058E8FC 38 00 00 00 */ li r0, 0 -/* 8058E900 98 1E 07 0E */ stb r0, 0x70e(r30) -lbl_8058E904: -/* 8058E904 3C 60 80 59 */ lis r3, l_HIO@ha /* 0x8058F2AC@ha */ -/* 8058E908 38 63 F2 AC */ addi r3, r3, l_HIO@l /* 0x8058F2AC@l */ -/* 8058E90C 88 1E 07 0E */ lbz r0, 0x70e(r30) -/* 8058E910 7C 63 02 14 */ add r3, r3, r0 -/* 8058E914 88 03 00 28 */ lbz r0, 0x28(r3) -/* 8058E918 98 1E 07 0D */ stb r0, 0x70d(r30) -/* 8058E91C 48 00 00 44 */ b lbl_8058E960 -lbl_8058E920: -/* 8058E920 38 03 FF FF */ addi r0, r3, -1 -/* 8058E924 98 1E 07 0D */ stb r0, 0x70d(r30) -/* 8058E928 48 00 00 38 */ b lbl_8058E960 -lbl_8058E92C: -/* 8058E92C 38 7E 07 10 */ addi r3, r30, 0x710 -/* 8058E930 C0 3F 00 08 */ lfs f1, 8(r31) -/* 8058E934 C0 5F 00 64 */ lfs f2, 0x64(r31) -/* 8058E938 C0 7F 00 68 */ lfs f3, 0x68(r31) -/* 8058E93C C0 9F 00 60 */ lfs f4, 0x60(r31) -/* 8058E940 4B CE 10 3D */ bl cLib_addCalc__FPfffff -/* 8058E944 48 00 00 1C */ b lbl_8058E960 -lbl_8058E948: -/* 8058E948 38 7E 07 10 */ addi r3, r30, 0x710 -/* 8058E94C C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 8058E950 C0 5F 00 64 */ lfs f2, 0x64(r31) -/* 8058E954 C0 7F 00 68 */ lfs f3, 0x68(r31) -/* 8058E958 C0 9F 00 60 */ lfs f4, 0x60(r31) -/* 8058E95C 4B CE 10 21 */ bl cLib_addCalc__FPfffff -lbl_8058E960: -/* 8058E960 C0 3E 07 10 */ lfs f1, 0x710(r30) -/* 8058E964 C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 8058E968 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8058E96C 4C 41 13 82 */ cror 2, 1, 2 -/* 8058E970 40 82 00 14 */ bne lbl_8058E984 -/* 8058E974 38 7E 07 00 */ addi r3, r30, 0x700 -/* 8058E978 38 81 00 08 */ addi r4, r1, 8 -/* 8058E97C 38 A0 00 00 */ li r5, 0 -/* 8058E980 4B C1 B3 E1 */ bl dKy_BossLight_set__FP4cXyzP8_GXColorfUc -lbl_8058E984: -/* 8058E984 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8058E988 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8058E98C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8058E990 7C 08 03 A6 */ mtlr r0 -/* 8058E994 38 21 00 20 */ addi r1, r1, 0x20 -/* 8058E998 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/searchDemoTagAct__13daLv2Candle_cFPvPv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/searchDemoTagAct__13daLv2Candle_cFPvPv.s deleted file mode 100644 index 03669e5a42..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/searchDemoTagAct__13daLv2Candle_cFPvPv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8058E628: -/* 8058E628 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E62C 7C 08 02 A6 */ mflr r0 -/* 8058E630 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E634 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058E638 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8058E63C 41 82 00 24 */ beq lbl_8058E660 -/* 8058E640 4B A8 A6 A1 */ bl fopAc_IsActor__FPv -/* 8058E644 2C 03 00 00 */ cmpwi r3, 0 -/* 8058E648 41 82 00 18 */ beq lbl_8058E660 -/* 8058E64C A8 1F 00 0E */ lha r0, 0xe(r31) -/* 8058E650 2C 00 01 73 */ cmpwi r0, 0x173 -/* 8058E654 40 82 00 0C */ bne lbl_8058E660 -/* 8058E658 7F E3 FB 78 */ mr r3, r31 -/* 8058E65C 48 00 00 08 */ b lbl_8058E664 -lbl_8058E660: -/* 8058E660 38 60 00 00 */ li r3, 0 -lbl_8058E664: -/* 8058E664 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058E668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E66C 7C 08 03 A6 */ mtlr r0 -/* 8058E670 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E674 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setBaseMtx__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setBaseMtx__13daLv2Candle_cFv.s deleted file mode 100644 index 652b65aa7a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setBaseMtx__13daLv2Candle_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8058E13C: -/* 8058E13C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E140 7C 08 02 A6 */ mflr r0 -/* 8058E144 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E148 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8058E14C 7C 7F 1B 78 */ mr r31, r3 -/* 8058E150 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8058E154 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8058E158 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 8058E15C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 8058E160 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 8058E164 4B DB 87 85 */ bl PSMTXTrans -/* 8058E168 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8058E16C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8058E170 A8 9F 04 DC */ lha r4, 0x4dc(r31) -/* 8058E174 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 8058E178 A8 DF 04 E0 */ lha r6, 0x4e0(r31) -/* 8058E17C 4B A7 E1 25 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 8058E180 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 8058E184 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8058E188 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8058E18C C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8058E190 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 8058E194 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8058E198 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 8058E19C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8058E1A0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8058E1A4 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 8058E1A8 38 84 00 24 */ addi r4, r4, 0x24 -/* 8058E1AC 4B DB 83 05 */ bl PSMTXCopy -/* 8058E1B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8058E1B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E1B8 7C 08 03 A6 */ mtlr r0 -/* 8058E1BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E1C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setLight__13daLv2Candle_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setLight__13daLv2Candle_cFv.s deleted file mode 100644 index ecd82c3a14..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setLight__13daLv2Candle_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8058E720: -/* 8058E720 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8058E724 7C 08 02 A6 */ mflr r0 -/* 8058E728 90 01 00 14 */ stw r0, 0x14(r1) -/* 8058E72C 88 03 07 0C */ lbz r0, 0x70c(r3) -/* 8058E730 28 00 00 00 */ cmplwi r0, 0 -/* 8058E734 41 82 00 0C */ beq lbl_8058E740 -/* 8058E738 38 63 07 14 */ addi r3, r3, 0x714 -/* 8058E73C 4B C1 90 55 */ bl dKy_plight_set__FP15LIGHT_INFLUENCE -lbl_8058E740: -/* 8058E740 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8058E744 7C 08 03 A6 */ mtlr r0 -/* 8058E748 38 21 00 10 */ addi r1, r1, 0x10 -/* 8058E74C 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 62d3e2136a..785cfdedfb 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -485,6 +485,7 @@ public: void OffCoSPrmBit(u32 flag) { mObjCo.OffSPrmBit(flag); } void SetAtType(u32 type) { mObjAt.SetType(type); } void OnAtSetBit() { mObjAt.OnSPrmBit(1); } + u32 MskTgSPrm(u32 mask) const { return mObjTg.MskSPrm(mask); } void SetAtAtp(int atp) { mObjAt.SetAtp(atp); } void OffCoSetBit() { mObjCo.ClrSet(); } void SetTgType(u32 type) { mObjTg.SetType(type); } diff --git a/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h b/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h index 8044f34cd0..87df9eea6e 100644 --- a/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h +++ b/include/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h @@ -5,7 +5,6 @@ #include "f_op/f_op_actor.h" #include "d/cc/d_cc_d.h" #include "m_Do/m_Do_hostIO.h" -#include "dolphin/types.h" class daLv1Cdl00_HIO_c : public mDoHIO_entry_c { public: @@ -35,14 +34,14 @@ public: /* 0x574 */ dCcD_Stts mStts; /* 0x5B0 */ dCcD_Cyl mCyl; /* 0x6EC */ cXyz mTorchPos; - /* 0x6F8 */ bool mIsOn; - /* 0x6F9 */ u8 mSwitch; - /* 0x6FA */ u8 mStartsOn; + /* 0x6F8 */ bool mIsLit; + /* 0x6F9 */ u8 mIsSwitch; + /* 0x6FA */ u8 mSwType; /* 0x6FC */ cXyz mLightPos; - /* 0x708 */ u8 field_0x708; - /* 0x70C */ f32 field_0x70c; + /* 0x708 */ u8 mLightType; + /* 0x70C */ f32 mIntensity; /* 0x710 */ LIGHT_INFLUENCE mLight; - /* 0x730 */ u8 field_0x730; + /* 0x730 */ u8 mTgHit; /* 0x734 */ Z2SoundObjSimple mSound; static dCcD_SrcGObjInf const mCcDObjInfo; diff --git a/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h b/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h index 2ba8d6bf2e..11ece32505 100644 --- a/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h +++ b/include/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h @@ -1,6 +1,51 @@ #ifndef D_A_OBJ_LV1CANDLE01_H #define D_A_OBJ_LV1CANDLE01_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" +#include "m_Do/m_Do_hostIO.h" + +class daLv1Cdl01_HIO_c : public mDoHIO_entry_c { +public: + /* 80C56CAC */ daLv1Cdl01_HIO_c(); + /* 80C5777C */ ~daLv1Cdl01_HIO_c() {} + + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 field_0x5; +}; + +class daLv1Cdl01_c : public dBgS_MoveBgActor { +public: + /* 80C56D20 */ void setBaseMtx(); + /* 80C56DA8 */ int CreateHeap(); + /* 80C56E14 */ cPhs__Step create(); + /* 80C570D8 */ void lightInit(); + /* 80C57164 */ void setLight(); + /* 80C57194 */ void cutLight(); + /* 80C571C4 */ void pointLightProc(); + /* 80C57274 */ int Execute(f32 (**)[3][4]); + /* 80C575F4 */ int Draw(); + /* 80C57698 */ int Delete(); + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ dCcD_Stts mStts; + /* 0x5E8 */ dCcD_Cyl mCyl; + /* 0x724 */ cXyz mTorchPos; + /* 0x730 */ bool mIsLit; + /* 0x731 */ u8 mTimer; + /* 0x734 */ cXyz mLightPos; + /* 0x740 */ u8 mLightType; + /* 0x744 */ f32 mIntensity; + /* 0x748 */ LIGHT_INFLUENCE mLight; + /* 0x768 */ u8 mTgHit; + /* 0x76C */ Z2SoundObjSimple mSound; + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; +}; + +STATIC_ASSERT(sizeof(daLv1Cdl01_c) == 0x78C); #endif /* D_A_OBJ_LV1CANDLE01_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h b/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h index 4450cdb755..1c277416e8 100644 --- a/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h +++ b/include/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h @@ -1,6 +1,79 @@ #ifndef D_A_OBJ_LV2CANDLE_H #define D_A_OBJ_LV2CANDLE_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/cc/d_cc_d.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" +#include "rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h" + +class daLv2Candle_HIO_c : public mDoHIO_entry_c { +public: + /* 8058E04C */ daLv2Candle_HIO_c(); + /* 8058F050 */ ~daLv2Candle_HIO_c() {} + + /* 0x04 */ u8 mTimer; + /* 0x08 */ f32 mPow; + /* 0x0C */ f32 mAnmMaxStep; + /* 0x10 */ f32 mAnmIntensity[6]; + /* 0x28 */ u8 mAnmTimers[6]; + /* 0x2E */ u8 mColor1R; + /* 0x2F */ u8 mColor1G; + /* 0x30 */ u8 mColor1B; + /* 0x31 */ u8 mColor2R; + /* 0x32 */ u8 mColor2G; + /* 0x33 */ u8 mColor2B; +}; + +class daLv2Candle_c : public fopAc_ac_c { +public: + /* 8058E13C */ void setBaseMtx(); + /* 8058E1C4 */ int CreateHeap(); + /* 8058E244 */ cPhs__Step create(); + /* 8058E5BC */ u8 isSwitch(); + /* 8058E608 */ static int createHeapCallBack(fopAc_ac_c*); + /* 8058E628 */ static void* searchDemoTagAct(void*, void*); + /* 8058E678 */ void lightInit(); + /* 8058E720 */ void setLight(); + /* 8058E750 */ void cutLight(); + /* 8058E780 */ void pointLightProc(); + /* 8058E99C */ int Execute(); + /* 8058EEC8 */ int Draw(); + /* 8058EF6C */ int Delete(); + + int getOffType() { return fopAcM_GetParamBit(this, 0x18, 4); } + u8 getModelType() { return fopAcM_GetParamBit(this, 0x14, 4); } + u8 getLightAnm() { return fopAcM_GetParamBit(this, 0x10, 4); } + u8 getLightType() { return fopAcM_GetParamBit(this, 0xc, 4); } + u8 getSwType() { return fopAcM_GetParamBit(this, 8, 4); } + u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); } + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ dCcD_Stts mStts; + /* 0x5B0 */ dCcD_Cyl mCyl; + /* 0x6EC */ cXyz mTorchPos; + /* 0x6F8 */ u8 mSw; + /* 0x6F9 */ bool mIsLit; + /* 0x6FA */ u8 mIsSwitch; + /* 0x6FB */ u8 mTimer; + /* 0x6FC */ u8 mSwType; + /* 0x6FD */ u8 mModelType; + /* 0x6FE */ u8 mLightAnm; + /* 0x700 */ cXyz mLightPos; + /* 0x70C */ u8 mLightType; + /* 0x70D */ u8 mAnmTimer; + /* 0x70E */ u8 mAnmStage; + /* 0x710 */ f32 mIntensity; + /* 0x714 */ LIGHT_INFLUENCE mLight; + /* 0x734 */ dalv4CandleTag_c* field_0x734; + /* 0x738 */ u8 mTgHit; + /* 0x73C */ Z2SoundObjSimple mSound; + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; +}; + +STATIC_ASSERT(sizeof(daLv2Candle_c) == 0x75C); #endif /* D_A_OBJ_LV2CANDLE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h b/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h index b086af36b4..c796bb9167 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h +++ b/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h @@ -1,6 +1,72 @@ #ifndef D_A_OBJ_LV4CANDLETAG_H #define D_A_OBJ_LV4CANDLETAG_H -#include "dolphin/types.h" +#include "d/event/d_event_lib.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" + +struct unknown { + u8 unk[8]; +}; + +// dalv4CandleTag_c should inherit fopAc_ac_c, unknown, and dEvLib_callback_c +// but this causes issues with weak function ordering +class dalv4CandleTag_c : public fopAc_ac_c { +public: + enum Mode { + MODE_WATCH, + MODE_NG, + MODE_NG_WAIT, + MODE_END, + }; + + // dalv4CandleTag_c() : dEvLib_callback_c(this) {} + ~dalv4CandleTag_c() {} + + // These members are not real, remove once inheritance issue is resolved + unknown mBase2; + dEvLib_callback_c mBase3; + void* mVtable; + + /* 80C5D4B8 */ void setBaseMtx(); + /* 80C5D4F0 */ cPhs__Step create(); + /* 80C5D5D4 */ int Execute(); + /* 80C5D618 */ void procMain(); + /* 80C5D6D4 */ void init_modeWatch(); + /* 80C5D6E0 */ void modeWatch(); + /* 80C5D78C */ void init_modeNG(); + /* 80C5D814 */ void modeNG(); + /* 80C5D8A0 */ void init_modeNGWait(); + /* 80C5D8AC */ void modeNGWait(); + /* 80C5D8FC */ void init_modeEnd(); + /* 80C5D908 */ void modeEnd(); + /* 80C5D90C */ int eventStart(); + /* 80C5D930 */ int Draw(); + /* 80C5D938 */ int Delete(); + + u8 getSwTop() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSwOK() { return fopAcM_GetParamBit(this, 8, 8); } + u8 getSwNG() { return fopAcM_GetParamBit(this, 0x10, 8); } + u8 getSwTotal() { return fopAcM_GetParamBit(this, 0x18, 8); } + int getEventID() { return shape_angle.x & 0xff; } + u8 getNGSwStat() { return i_fopAcM_isSwitch(this, mSwNG); } + + /* 0x584 */ u8 mMode; + /* 0x585 */ u8 mSwTop; + /* 0x586 */ u8 mSwOK; + /* 0x587 */ u8 mSwNG; + /* 0x588 */ u8 mSwTotal; + /* 0x589 */ u8 mTimer; +}; + +STATIC_ASSERT(sizeof(dalv4CandleTag_c) == 0x58C); + +class dalv4CandleTag_HIO_c : public mDoHIO_entry_c { +public: + /* 80C5D44C */ dalv4CandleTag_HIO_c(); + /* 80C5D9C0 */ ~dalv4CandleTag_HIO_c() {} + + u8 mTimer; +}; #endif /* D_A_OBJ_LV4CANDLETAG_H */ diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp index 0e078c4a9c..3f28e3cfa3 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp @@ -1,16 +1,12 @@ // -// Generated By: dol2asm // Translation Unit: d_a_obj_lv1Candle00 // #include "rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h" #include "JSystem/JKernel/JKRHeap.h" -#include "SSystem/SComponent/c_phase.h" -#include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" -#include "f_pc/f_pc_method.h" /* 80C56B9C-80C56BA4 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ static daLv1Cdl00_HIO_c l_HIO; @@ -29,18 +25,18 @@ dCcD_SrcGObjInf const daLv1Cdl00_c::mCcDObjInfo = { {0}, }; -/* 80C55D0C-80C55D38 0000EC 002C+00 1/1 0/0 0/0 .text __ct__16daLv1Cdl00_HIO_cFv */ -daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() : - field_0x4(60), - field_0x5(1) - {} - /* 80C56AC0-80C56B04 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daLv1Cdl00_c */ dCcD_SrcCyl daLv1Cdl00_c::mCcDCyl = { daLv1Cdl00_c::mCcDObjInfo, { {0.0f, 0.0f, 0.0f}, 0, 0} }; +/* 80C55D0C-80C55D38 0000EC 002C+00 1/1 0/0 0/0 .text __ct__16daLv1Cdl00_HIO_cFv */ +daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() : + field_0x4(60), + field_0x5(1) + {} + /* 80C55D80-80C55E08 000160 0088+00 2/2 0/0 0/0 .text setBaseMtx__12daLv1Cdl00_cFv */ void daLv1Cdl00_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); @@ -76,33 +72,33 @@ cPhs__Step daLv1Cdl00_c::create() { mTorchPos.x = current.pos.x; mTorchPos.y = current.pos.y + 120.0f; mTorchPos.z = current.pos.z; - field_0x708 = fopAcM_GetParam(this) >> 16; - if (field_0x708 == 0xff) { - field_0x708 = 0; + mLightType = fopAcM_GetParam(this) >> 16; + if (mLightType == 0xff) { + mLightType = 0; } lightInit(); - mStartsOn = fopAcM_GetParam(this) >> 8; - if (mStartsOn == 0xff) { - mStartsOn = 0; + mSwType = fopAcM_GetParam(this) >> 8; + if (mSwType == 0xff) { + mSwType = 0; } mEyePos = mTorchPos; - mSwitch = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); - mIsOn = false; - if (!mStartsOn) { - if (mSwitch) { - mIsOn = true; + mIsSwitch = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + mIsLit = false; + if (!mSwType) { + if (mIsSwitch) { + mIsLit = true; mCyl.SetAtMtrl(1); setLight(); } } else { - if (!mSwitch) { - mIsOn = true; + if (!mIsSwitch) { + mIsLit = true; mCyl.SetAtMtrl(1); setLight(); } } mSound.init(¤t.pos, 1); - field_0x730 = 0; + mTgHit = 0; } return step; } @@ -117,46 +113,46 @@ int daLv1Cdl00_c::createHeapCallBack(fopAc_ac_c* i_this) { void daLv1Cdl00_c::lightInit() { mLightPos = mTorchPos; mLightPos.y += 10.0f; - if (field_0x708 == 1 || field_0x708 == 2) { + if (mLightType == 1 || mLightType == 2) { mLight.mPosition = mLightPos; mLight.mColor.r = 0xbc; mLight.mColor.g = 0x66; mLight.mColor.b = 0x42; mLight.mPow = 500.0f; mLight.mFluctuation = 1.0f; - if (field_0x708 == 2) { - field_0x70c = 0.0f; + if (mLightType == 2) { + mIntensity = 0.0f; } } else { - field_0x70c = 0.0f; + mIntensity = 0.0f; } } /* 80C56268-80C562A0 000648 0038+00 2/2 0/0 0/0 .text setLight__12daLv1Cdl00_cFv */ void daLv1Cdl00_c::setLight() { - if (field_0x708 == 1 || field_0x708 == 2) { + if (mLightType == 1 || mLightType == 2) { dKy_plight_set(&mLight); } } /* 80C562A0-80C562D8 000680 0038+00 1/1 0/0 0/0 .text cutLight__12daLv1Cdl00_cFv */ void daLv1Cdl00_c::cutLight() { - if (field_0x708 == 1 || field_0x708 == 2) { + if (mLightType == 1 || mLightType == 2) { dKy_plight_cut(&mLight); } } /* 80C562D8-80C56388 0006B8 00B0+00 1/1 0/0 0/0 .text pointLightProc__12daLv1Cdl00_cFv */ void daLv1Cdl00_c::pointLightProc() { - if (field_0x708 != 1) { + if (mLightType != 1) { GXColor color = { 0xbc, 0x66, 0x42, 0xff }; - if (mIsOn) { - cLib_addCalc(&field_0x70c, 1.0f, 0.5f, 0.1f, 0.0001f); + if (mIsLit) { + cLib_addCalc(&mIntensity, 1.0f, 0.5f, 0.1f, 0.0001f); } else { - cLib_addCalc(&field_0x70c, 0.0f, 0.5f, 0.1f, 0.0001f); + cLib_addCalc(&mIntensity, 0.0f, 0.5f, 0.1f, 0.0001f); } - if (field_0x70c >= 1e-6f) { - dKy_BossLight_set(&mLightPos, &color, field_0x70c, 0); + if (mIntensity >= 1e-6f) { + dKy_BossLight_set(&mLightPos, &color, mIntensity, 0); } } } @@ -164,27 +160,27 @@ void daLv1Cdl00_c::pointLightProc() { /* 80C56388-80C567EC 000768 0464+00 1/1 0/0 0/0 .text Execute__12daLv1Cdl00_cFv */ int daLv1Cdl00_c::Execute() { u8 sw = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); - if (mSwitch != sw) { - mIsOn = false; + if (mIsSwitch != sw) { + mIsLit = false; mCyl.SetAtMtrl(0); cutLight(); - if (!mStartsOn) { + if (!mSwType) { if (sw) { - mIsOn = true; + mIsLit = true; mCyl.SetAtMtrl(1); setLight(); } } else { if (!sw) { - mIsOn = true; + mIsLit = true; mCyl.SetAtMtrl(1); setLight(); } } - mSwitch = sw; + mIsSwitch = sw; } - if (mIsOn) { + if (mIsLit) { dComIfGp_particle_setSimple(0x83a6, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); dComIfGp_particle_setSimple(0x83a7, &mTorchPos, 0xff, @@ -198,10 +194,10 @@ int daLv1Cdl00_c::Execute() { if (mCyl.ChkTgHit()) { dCcD_GObjInf* gobj = mCyl.GetTgHitGObj(); - if (gobj->GetAtType() == AT_TYPE_LANTERN_SWING && gobj->GetAtMtrl() == 1 && !mIsOn) { - mIsOn = true; + if (gobj->GetAtType() == AT_TYPE_LANTERN_SWING && gobj->GetAtMtrl() == 1 && !mIsLit) { + mIsLit = true; mCyl.SetAtMtrl(1); - if (!mStartsOn) { + if (!mSwType) { i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); } else { i_fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); @@ -209,10 +205,10 @@ int daLv1Cdl00_c::Execute() { mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); setLight(); } - if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == 3 && mIsOn == true) { - mIsOn = false; + if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == 3 && mIsLit == true) { + mIsLit = false; mCyl.SetAtMtrl(0); - if (!mStartsOn) { + if (!mSwType) { i_fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); } else { i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); @@ -224,17 +220,17 @@ int daLv1Cdl00_c::Execute() { if (obj != NULL) { bool bvar1 = true; if (fopAcM_GetName(obj->GetAc()) == PROC_ALINK) { - if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && field_0x730) { + if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { bvar1 = false; } } if (bvar1) { mSound.startCollisionSE(mCyl.GetTgHitObjHitSeID(1), 5, NULL); - field_0x730 = true; + mTgHit = true; } } } else { - field_0x730 = 0; + mTgHit = false; } mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -260,7 +256,7 @@ int daLv1Cdl00_c::Draw() { int daLv1Cdl00_c::Delete() { mSound.deleteObject(); dComIfG_resDelete(&mPhase, "lv1cdl00"); - if (field_0x708 == 1 || field_0x708 == 2) { + if (mLightType == 1 || mLightType == 2) { dKy_plight_cut(&mLight); } return true; @@ -285,7 +281,7 @@ static int daLv1Cdl00_Delete(daLv1Cdl00_c* i_this) { /* 80C56950-80C56970 000D30 0020+00 1/0 0/0 0/0 .text daLv1Cdl00_Create__FP10fopAc_ac_c */ -static int daLv1Cdl00_Create(fopAc_ac_c* i_this) { +static cPhs__Step daLv1Cdl00_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp index 2719466888..f675639abc 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp @@ -1,659 +1,266 @@ // -// Generated By: dol2asm // Translation Unit: d_a_obj_lv1Candle01 // #include "rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.h" -#include "dol2asm.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" -// -// Types: -// +/* 80C579CC-80C579D4 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ +static daLv1Cdl01_HIO_c l_HIO; -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; +/* 80C5785C-80C5788C 000000 0030+00 4/4 0/0 0/0 .rodata mCcDObjInfo__12daLv1Cdl01_c */ +dCcD_SrcGObjInf const daLv1Cdl01_c::mCcDObjInfo = { + { + 0, { + {0, 0, 0}, + {0xd8fbffff, 0x1f}, + {0x79} + } + }, + {1, 0, 0, 0, 0}, + {0xa, 0, 0, 0, 6}, + {0}, }; -struct mDoHIO_entry_c { - /* 80C56CD8 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daLv1Cdl01_c { - /* 80C56D20 */ void setBaseMtx(); - /* 80C56DA8 */ void CreateHeap(); - /* 80C56E14 */ void create(); - /* 80C570D8 */ void lightInit(); - /* 80C57164 */ void setLight(); - /* 80C57194 */ void cutLight(); - /* 80C571C4 */ void pointLightProc(); - /* 80C57274 */ void Execute(f32 (**)[3][4]); - /* 80C575F4 */ void Draw(); - /* 80C57698 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daLv1Cdl01_HIO_c { - /* 80C56CAC */ daLv1Cdl01_HIO_c(); - /* 80C5777C */ ~daLv1Cdl01_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, - _GXColor const&, int, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80C57048 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C57090 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__16daLv1Cdl01_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daLv1Cdl01_cFv(); -extern "C" void CreateHeap__12daLv1Cdl01_cFv(); -extern "C" void create__12daLv1Cdl01_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void lightInit__12daLv1Cdl01_cFv(); -extern "C" void setLight__12daLv1Cdl01_cFv(); -extern "C" void cutLight__12daLv1Cdl01_cFv(); -extern "C" void pointLightProc__12daLv1Cdl01_cFv(); -extern "C" void Execute__12daLv1Cdl01_cFPPA3_A4_f(); -extern "C" void Draw__12daLv1Cdl01_cFv(); -extern "C" void Delete__12daLv1Cdl01_cFv(); -extern "C" static void daLv1Cdl01_Draw__FP12daLv1Cdl01_c(); -extern "C" static void daLv1Cdl01_Execute__FP12daLv1Cdl01_c(); -extern "C" static void daLv1Cdl01_Delete__FP12daLv1Cdl01_c(); -extern "C" static void daLv1Cdl01_Create__FP10fopAc_ac_c(); -extern "C" void __dt__16daLv1Cdl01_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv1Candle01_cpp(); -extern "C" u8 const mCcDObjInfo__12daLv1Cdl01_c[48]; -extern "C" extern char const* const d_a_obj_lv1Candle01__stringBase0; -extern "C" u8 mCcDCyl__12daLv1Cdl01_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -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 getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__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 dKy_plight_set__FP15LIGHT_INFLUENCE(); -extern "C" void dKy_plight_cut__FP15LIGHT_INFLUENCE(); -extern "C" void dKy_BossLight_set__FP4cXyzP8_GXColorfUc(); -extern "C" void GetAc__8cCcD_ObjFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80C578CC-80C57910 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daLv1Cdl01_c */ -SECTION_DATA u8 daLv1Cdl01_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, -}; - -/* 80C57910-80C57930 -00001 0020+00 1/0 0/0 0/0 .data l_daLv1Cdl01_Method */ -SECTION_DATA static void* l_daLv1Cdl01_Method[8] = { - (void*)daLv1Cdl01_Create__FP10fopAc_ac_c, - (void*)daLv1Cdl01_Delete__FP12daLv1Cdl01_c, - (void*)daLv1Cdl01_Execute__FP12daLv1Cdl01_c, - (void*)NULL, - (void*)daLv1Cdl01_Draw__FP12daLv1Cdl01_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C57930-80C57960 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv1Cdl01 */ -SECTION_DATA extern void* g_profile_Obj_Lv1Cdl01[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x003A0000, (void*)&g_fpcLf_Method, - (void*)0x0000078C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01EF0000, (void*)&l_daLv1Cdl01_Method, - (void*)0x00060000, (void*)0x000E0000, -}; - -/* 80C57960-80C5796C 000094 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C5796C-80C57978 0000A0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80C57978-80C579A0 0000AC 0028+00 1/1 0/0 0/0 .data __vt__12daLv1Cdl01_c */ -SECTION_DATA extern void* __vt__12daLv1Cdl01_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daLv1Cdl01_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__12daLv1Cdl01_cFPPA3_A4_f, - (void*)Draw__12daLv1Cdl01_cFv, - (void*)Delete__12daLv1Cdl01_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C579A0-80C579AC 0000D4 000C+00 2/2 0/0 0/0 .data __vt__16daLv1Cdl01_HIO_c */ -SECTION_DATA extern void* __vt__16daLv1Cdl01_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daLv1Cdl01_HIO_cFv, -}; - -/* 80C579AC-80C579B8 0000E0 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, +dCcD_SrcCyl daLv1Cdl01_c::mCcDCyl = { + daLv1Cdl01_c::mCcDObjInfo, + { {0.0f, 0.0f, 0.0f}, 0, 0} }; /* 80C56CAC-80C56CD8 0000EC 002C+00 1/1 0/0 0/0 .text __ct__16daLv1Cdl01_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv1Cdl01_HIO_c::daLv1Cdl01_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__ct__16daLv1Cdl01_HIO_cFv.s" -} -#pragma pop - -/* 80C56CD8-80C56D20 000118 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop +daLv1Cdl01_HIO_c::daLv1Cdl01_HIO_c() : + field_0x4(60), + field_0x5(1) + {} /* 80C56D20-80C56DA8 000160 0088+00 2/2 0/0 0/0 .text setBaseMtx__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setBaseMtx__12daLv1Cdl01_cFv.s" +void daLv1Cdl01_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); + mpModel->setBaseScale(mScale); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80C578C0-80C578C0 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C578C0 = "lv1cdl01"; -#pragma pop /* 80C56DA8-80C56E14 0001E8 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/CreateHeap__12daLv1Cdl01_cFv.s" +int daLv1Cdl01_c::CreateHeap() { + J3DModelData* bmd = (J3DModelData*)dComIfG_getObjectRes("lv1cdl01", 4); + mpModel = mDoExt_J3DModel__create(bmd, 0x80000, 0x11000084); + if (mpModel == NULL) { + return false; + } + return true; } -#pragma pop - -/* ############################################################################################## */ -/* 80C5785C-80C5788C 000000 0030+00 4/4 0/0 0/0 .rodata mCcDObjInfo__12daLv1Cdl01_c */ -SECTION_RODATA u8 const daLv1Cdl01_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C5785C, &daLv1Cdl01_c::mCcDObjInfo); - -/* 80C5788C-80C57890 000030 0004+00 1/1 0/0 0/0 .rodata @3723 */ -SECTION_RODATA static f32 const lit_3723 = 120.0f; -COMPILER_STRIP_GATE(0x80C5788C, &lit_3723); /* 80C56E14-80C57048 000254 0234+00 1/1 0/0 0/0 .text create__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/create__12daLv1Cdl01_cFv.s" +cPhs__Step daLv1Cdl01_c::create() { + fopAcM_SetupActor(this, daLv1Cdl01_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "lv1cdl01"); + if (step == cPhs_COMPLEATE_e) { + if (MoveBGCreate("lv1cdl01", -1, NULL, 0x820, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + setBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + mLightType = fopAcM_GetParam(this) >> 8; + if (mLightType == 0xff) { + mLightType = 1; + } + mTorchPos.x = current.pos.x; + mTorchPos.y = current.pos.y + 120.0f; + mTorchPos.z = current.pos.z; + lightInit(); + mIsLit = true; + mTimer = 0; + setLight(); + mEyePos = mTorchPos; + mStts.Init(0xff, 0xff, this); + mCyl.Set(mCcDCyl); + mCyl.SetStts(&mStts); + mSound.init(¤t.pos, 1); + mTgHit = false; + } + return step; } -#pragma pop - -/* 80C57048-80C57090 000488 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_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C57090-80C570D8 0004D0 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_lv1Candle01/d_a_obj_lv1Candle01/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C57890-80C57894 000034 0004+00 0/1 0/0 0/0 .rodata @3811 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3811 = 10.0f; -COMPILER_STRIP_GATE(0x80C57890, &lit_3811); -#pragma pop - -/* 80C57894-80C57898 000038 0004+00 0/1 0/0 0/0 .rodata @3812 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3812 = 500.0f; -COMPILER_STRIP_GATE(0x80C57894, &lit_3812); -#pragma pop - -/* 80C57898-80C5789C 00003C 0004+00 0/3 0/0 0/0 .rodata @3813 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3813 = 1.0f; -COMPILER_STRIP_GATE(0x80C57898, &lit_3813); -#pragma pop - -/* 80C5789C-80C578A0 000040 0004+00 0/3 0/0 0/0 .rodata @3814 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3814[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C5789C, &lit_3814); -#pragma pop /* 80C570D8-80C57164 000518 008C+00 1/1 0/0 0/0 .text lightInit__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::lightInit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/lightInit__12daLv1Cdl01_cFv.s" +void daLv1Cdl01_c::lightInit() { + mLightPos = mTorchPos; + mLightPos.y += 10.0f; + if (mLightType != 0) { + mLight.mPosition = mLightPos; + mLight.mColor.r = 0xbc; + mLight.mColor.g = 0x66; + mLight.mColor.b = 0x42; + mLight.mPow = 500.0f; + mLight.mFluctuation = 1.0f; + } else { + mIntensity = 0.0f; + } } -#pragma pop /* 80C57164-80C57194 0005A4 0030+00 2/2 0/0 0/0 .text setLight__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::setLight() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/setLight__12daLv1Cdl01_cFv.s" +void daLv1Cdl01_c::setLight() { + if (mLightType != 0) { + dKy_plight_set(&mLight); + } } -#pragma pop /* 80C57194-80C571C4 0005D4 0030+00 1/1 0/0 0/0 .text cutLight__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::cutLight() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/cutLight__12daLv1Cdl01_cFv.s" +void daLv1Cdl01_c::cutLight() { + if (mLightType != 0) { + dKy_plight_cut(&mLight); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C578A0-80C578A4 000044 0004+00 0/1 0/0 0/0 .rodata @3832 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3832 = 0xBC6642FF; -COMPILER_STRIP_GATE(0x80C578A0, &lit_3832); -#pragma pop - -/* 80C578A4-80C578A8 000048 0004+00 0/1 0/0 0/0 .rodata @3840 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3840 = 0.5f; -COMPILER_STRIP_GATE(0x80C578A4, &lit_3840); -#pragma pop - -/* 80C578A8-80C578AC 00004C 0004+00 0/1 0/0 0/0 .rodata @3841 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3841 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C578A8, &lit_3841); -#pragma pop - -/* 80C578AC-80C578B0 000050 0004+00 0/1 0/0 0/0 .rodata @3842 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3842 = 0x38D1B717; -COMPILER_STRIP_GATE(0x80C578AC, &lit_3842); -#pragma pop - -/* 80C578B0-80C578B4 000054 0004+00 0/1 0/0 0/0 .rodata @3843 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3843 = 0x358637BD; -COMPILER_STRIP_GATE(0x80C578B0, &lit_3843); -#pragma pop /* 80C571C4-80C57274 000604 00B0+00 1/1 0/0 0/0 .text pointLightProc__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::pointLightProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/pointLightProc__12daLv1Cdl01_cFv.s" +void daLv1Cdl01_c::pointLightProc() { + if (mLightType == 0) { + GXColor color = { 0xbc, 0x66, 0x42, 0xff }; + if (mIsLit) { + cLib_addCalc(&mIntensity, 1.0f, 0.5f, 0.1f, 0.0001f); + } else { + cLib_addCalc(&mIntensity, 0.0f, 0.5f, 0.1f, 0.0001f); + } + if (mIntensity >= 1e-6f) { + dKy_BossLight_set(&mLightPos, &color, mIntensity, 0); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C578B4-80C578B8 000058 0004+00 0/1 0/0 0/0 .rodata @3914 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3914 = -1.0f; -COMPILER_STRIP_GATE(0x80C578B4, &lit_3914); -#pragma pop - -/* 80C578B8-80C578BC 00005C 0004+00 0/1 0/0 0/0 .rodata @3915 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3915 = 25.0f; -COMPILER_STRIP_GATE(0x80C578B8, &lit_3915); -#pragma pop - -/* 80C578BC-80C578C0 000060 0004+00 0/1 0/0 0/0 .rodata @3916 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3916 = 130.0f; -COMPILER_STRIP_GATE(0x80C578BC, &lit_3916); -#pragma pop /* 80C57274-80C575F4 0006B4 0380+00 1/0 0/0 0/0 .text Execute__12daLv1Cdl01_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Execute__12daLv1Cdl01_cFPPA3_A4_f.s" +int daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) { + *param_0 = &mpModel->getBaseTRMtx(); + if (mTimer != 0) { + mTimer--; + if (mTimer == 0) { + mIsLit = true; + setLight(); + } + } + + if (mIsLit) { + dComIfGp_particle_setSimple(0x83a6, &mTorchPos, 0xff, + g_whiteColor, g_whiteColor, 0, 0.0f); + dComIfGp_particle_setSimple(0x83a7, &mTorchPos, 0xff, + g_whiteColor, g_whiteColor, 0, 0.0f); + dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff, + g_whiteColor, g_whiteColor, 0, 0.0f); + i_mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + + setBaseMtx(); + + if (mCyl.ChkTgHit()) { + dCcD_GObjInf* gobj = mCyl.GetTgHitGObj(); + if (gobj->GetAtType() == AT_TYPE_LANTERN_SWING && gobj->GetAtMtrl() == 1 && !mIsLit) { + mIsLit = true; + setLight(); + mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == 3 && mIsLit == true) { + mTimer = 30; + mIsLit = false; + mDoAud_seStart(0x80019, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + cutLight(); + } + cCcD_Obj* obj = mCyl.GetTgHitObj(); + if (obj != NULL) { + bool bvar1 = true; + if (fopAcM_GetName(obj->GetAc()) == PROC_ALINK) { + if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { + bvar1 = false; + } + } + if (bvar1) { + mSound.startCollisionSE(mCyl.GetTgHitObjHitSeID(1), 5, NULL); + mTgHit = true; + } + } + } else { + mTgHit = false; + } + + mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mCyl.SetR(25.0f); + mCyl.SetH(130.0f); + mCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCyl); + pointLightProc(); + return true; } -#pragma pop /* 80C575F4-80C57698 000A34 00A4+00 1/0 0/0 0/0 .text Draw__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Draw__12daLv1Cdl01_cFv.s" +int daLv1Cdl01_c::Draw() { + g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return true; } -#pragma pop /* 80C57698-80C576F0 000AD8 0058+00 1/0 0/0 0/0 .text Delete__12daLv1Cdl01_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl01_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/Delete__12daLv1Cdl01_cFv.s" +int daLv1Cdl01_c::Delete() { + mSound.deleteObject(); + dComIfG_resDelete(&mPhase, "lv1cdl01"); + if (mLightType != 0) { + dKy_plight_cut(&mLight); + } + return true; } -#pragma pop /* 80C576F0-80C5771C 000B30 002C+00 1/0 0/0 0/0 .text daLv1Cdl01_Draw__FP12daLv1Cdl01_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl01_Draw(daLv1Cdl01_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Draw__FP12daLv1Cdl01_c.s" +static int daLv1Cdl01_Draw(daLv1Cdl01_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80C5771C-80C5773C 000B5C 0020+00 1/0 0/0 0/0 .text daLv1Cdl01_Execute__FP12daLv1Cdl01_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl01_Execute(daLv1Cdl01_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Execute__FP12daLv1Cdl01_c.s" +static int daLv1Cdl01_Execute(daLv1Cdl01_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80C5773C-80C5775C 000B7C 0020+00 1/0 0/0 0/0 .text daLv1Cdl01_Delete__FP12daLv1Cdl01_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl01_Delete(daLv1Cdl01_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Delete__FP12daLv1Cdl01_c.s" +static int daLv1Cdl01_Delete(daLv1Cdl01_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80C5775C-80C5777C 000B9C 0020+00 1/0 0/0 0/0 .text daLv1Cdl01_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl01_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/daLv1Cdl01_Create__FP10fopAc_ac_c.s" +static cPhs__Step daLv1Cdl01_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80C5777C-80C577D8 000BBC 005C+00 2/1 0/0 0/0 .text __dt__16daLv1Cdl01_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv1Cdl01_HIO_c::~daLv1Cdl01_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__dt__16daLv1Cdl01_HIO_cFv.s" -} -#pragma pop +/* 80C57910-80C57930 -00001 0020+00 1/0 0/0 0/0 .data l_daLv1Cdl01_Method */ +static actor_method_class l_daLv1Cdl01_Method = { + (process_method_func)daLv1Cdl01_Create, + (process_method_func)daLv1Cdl01_Delete, + (process_method_func)daLv1Cdl01_Execute, + (process_method_func)NULL, + (process_method_func)daLv1Cdl01_Draw, +}; -/* ############################################################################################## */ -/* 80C579C0-80C579CC 000008 000C+00 1/1 0/0 0/0 .bss @3620 */ -static u8 lit_3620[12]; - -/* 80C579CC-80C579D4 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; - -/* 80C577D8-80C57848 000C18 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv1Candle01_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lv1Candle01_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01/__sinit_d_a_obj_lv1Candle01_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C577D8, __sinit_d_a_obj_lv1Candle01_cpp); -#pragma pop - -/* 80C578C0-80C578C0 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C57930-80C57960 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv1Cdl01 */ +extern actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_Obj_Lv1Cdl01, + &g_fpcLf_Method.mBase, + sizeof(daLv1Cdl01_c), + 0, + 0, + &g_fopAc_Method.base, + 0x1EF, + &l_daLv1Cdl01_Method, + 0x60000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp b/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp index 17abb3e58a..0055b048d0 100644 --- a/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp @@ -4,696 +4,433 @@ // #include "rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.h" -#include "dol2asm.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor.h" -// -// Types: -// +/* 8058F2AC-8058F2E0 000014 0034+00 4/4 0/0 0/0 .bss l_HIO */ +static daLv2Candle_HIO_c l_HIO; -struct request_of_phase_process_class {}; +/* 8058E04C-8058E0F4 0000EC 00A8+00 1/1 0/0 0/0 .text __ct__17daLv2Candle_HIO_cFv */ +daLv2Candle_HIO_c::daLv2Candle_HIO_c() { + mTimer = 30; + mPow = 500.0f; + mAnmIntensity[0] = 0.95f; + mAnmIntensity[1] = 1.0f; + mAnmIntensity[2] = 0.8f; + mAnmIntensity[3] = 0.95f; + mAnmIntensity[4] = 1.0f; + mAnmIntensity[5] = 1.0f; + mAnmTimers[0] = 2; + mAnmTimers[1] = 2; + mAnmTimers[2] = 1; + mAnmTimers[3] = 2; + mAnmTimers[4] = 2; + mAnmTimers[5] = 3; + mAnmMaxStep = 0.03f; + mColor1R = 0xbc; + mColor1G = 0x66; + mColor1B = 0x42; + mColor2R = 0xbc; + mColor2G = 0x66; + mColor2B = 0x42; +} -struct mDoMtx_stack_c { - static u8 now[48]; +/* 8058F144-8058F174 000014 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__13daLv2Candle_c */ +dCcD_SrcGObjInf const daLv2Candle_c::mCcDObjInfo = { + { + 0, { + {0x200, 0, 0x13}, + {0xd8fbffff, 0x1f}, + {0x79} + } + }, + {1, 0, 0, 0, 0}, + {0xa, 0, 0, 0, 6}, + {0}, }; -struct mDoHIO_entry_c { - /* 8058E0F4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daLv2Candle_c { - /* 8058E13C */ void setBaseMtx(); - /* 8058E1C4 */ void CreateHeap(); - /* 8058E244 */ void create(); - /* 8058E5BC */ void isSwitch(); - /* 8058E608 */ void createHeapCallBack(fopAc_ac_c*); - /* 8058E628 */ void searchDemoTagAct(void*, void*); - /* 8058E678 */ void lightInit(); - /* 8058E720 */ void setLight(); - /* 8058E750 */ void cutLight(); - /* 8058E780 */ void pointLightProc(); - /* 8058E99C */ void Execute(); - /* 8058EEC8 */ void Draw(); - /* 8058EF6C */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daLv2Candle_HIO_c { - /* 8058E04C */ daLv2Candle_HIO_c(); - /* 8058F050 */ ~daLv2Candle_HIO_c(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, - _GXColor const&, int, f32); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 8058E52C */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 8058E574 */ ~cM3dGAab(); -}; - -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); - /* 802BE4A4 */ void startCollisionSE(u32, u32, Z2SoundObjBase*); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct LIGHT_INFLUENCE {}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__17daLv2Candle_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__13daLv2Candle_cFv(); -extern "C" void CreateHeap__13daLv2Candle_cFv(); -extern "C" void create__13daLv2Candle_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void isSwitch__13daLv2Candle_cFv(); -extern "C" void createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c(); -extern "C" void searchDemoTagAct__13daLv2Candle_cFPvPv(); -extern "C" void lightInit__13daLv2Candle_cFv(); -extern "C" void setLight__13daLv2Candle_cFv(); -extern "C" void cutLight__13daLv2Candle_cFv(); -extern "C" void pointLightProc__13daLv2Candle_cFv(); -extern "C" void Execute__13daLv2Candle_cFv(); -extern "C" void Draw__13daLv2Candle_cFv(); -extern "C" void Delete__13daLv2Candle_cFv(); -extern "C" static void daLv2Candle_Draw__FP13daLv2Candle_c(); -extern "C" static void daLv2Candle_Execute__FP13daLv2Candle_c(); -extern "C" static void daLv2Candle_Delete__FP13daLv2Candle_c(); -extern "C" static void daLv2Candle_Create__FP10fopAc_ac_c(); -extern "C" void __dt__17daLv2Candle_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv2Candle_cpp(); -extern "C" u8 const mCcDObjInfo__13daLv2Candle_c[48]; -extern "C" extern char const* const d_a_obj_lv2Candle__stringBase0; -extern "C" u8 mCcDCyl__13daLv2Candle_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -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 onSwitch__10dSv_info_cFii(); -extern "C" void offSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__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 dKy_plight_set__FP15LIGHT_INFLUENCE(); -extern "C" void dKy_plight_cut__FP15LIGHT_INFLUENCE(); -extern "C" void dKy_BossLight_set__FP4cXyzP8_GXColorfUc(); -extern "C" void GetAc__8cCcD_ObjFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8058F130-8058F134 000000 0004+00 4/4 0/0 0/0 .rodata @3637 */ -SECTION_RODATA static f32 const lit_3637 = 500.0f; -COMPILER_STRIP_GATE(0x8058F130, &lit_3637); - -/* 8058F134-8058F138 000004 0004+00 0/1 0/0 0/0 .rodata @3638 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3638 = 19.0f / 20.0f; -COMPILER_STRIP_GATE(0x8058F134, &lit_3638); -#pragma pop - -/* 8058F138-8058F13C 000008 0004+00 0/4 0/0 0/0 .rodata @3639 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3639 = 1.0f; -COMPILER_STRIP_GATE(0x8058F138, &lit_3639); -#pragma pop - -/* 8058F13C-8058F140 00000C 0004+00 0/1 0/0 0/0 .rodata @3640 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3640 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(0x8058F13C, &lit_3640); -#pragma pop - -/* 8058F140-8058F144 000010 0004+00 0/2 0/0 0/0 .rodata @3641 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3641 = 3.0f / 100.0f; -COMPILER_STRIP_GATE(0x8058F140, &lit_3641); -#pragma pop - -/* 8058F1AC-8058F1AC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8058F1AC = "L2candl"; -SECTION_DEAD static char const* const stringBase_8058F1B4 = "L4candl"; -SECTION_DEAD static char const* const stringBase_8058F1BC = "L9Candle"; -#pragma pop - /* 8058F1C8-8058F20C 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__13daLv2Candle_c */ -SECTION_DATA u8 daLv2Candle_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, +dCcD_SrcCyl daLv2Candle_c::mCcDCyl = { + daLv2Candle_c::mCcDObjInfo, + { {0.0f, 0.0f, 0.0f}, 0, 0} }; /* 8058F20C-8058F218 -00001 000C+00 3/3 0/0 0/0 .data l_resNameIdx */ -SECTION_DATA static void* l_resNameIdx[3] = { - (void*)&d_a_obj_lv2Candle__stringBase0, - (void*)(((char*)&d_a_obj_lv2Candle__stringBase0) + 0x8), - (void*)(((char*)&d_a_obj_lv2Candle__stringBase0) + 0x10), +static char* l_resNameIdx[3] = { + "L2candl", + "L4candl", + "L9Candle", }; -/* 8058F218-8058F238 -00001 0020+00 1/0 0/0 0/0 .data l_daLv2Candle_Method */ -SECTION_DATA static void* l_daLv2Candle_Method[8] = { - (void*)daLv2Candle_Create__FP10fopAc_ac_c, - (void*)daLv2Candle_Delete__FP13daLv2Candle_c, - (void*)daLv2Candle_Execute__FP13daLv2Candle_c, - (void*)NULL, - (void*)daLv2Candle_Draw__FP13daLv2Candle_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8058F238-8058F268 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv2Candle */ -SECTION_DATA extern void* g_profile_Obj_Lv2Candle[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00490000, (void*)&g_fpcLf_Method, - (void*)0x0000075C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x020B0000, (void*)&l_daLv2Candle_Method, - (void*)0x00060000, (void*)0x000E0000, -}; - -/* 8058F268-8058F274 0000A0 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 8058F274-8058F280 0000AC 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 8058F280-8058F28C 0000B8 000C+00 2/2 0/0 0/0 .data __vt__17daLv2Candle_HIO_c */ -SECTION_DATA extern void* __vt__17daLv2Candle_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17daLv2Candle_HIO_cFv, -}; - -/* 8058F28C-8058F298 0000C4 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - -/* 8058E04C-8058E0F4 0000EC 00A8+00 1/1 0/0 0/0 .text __ct__17daLv2Candle_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv2Candle_HIO_c::daLv2Candle_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__ct__17daLv2Candle_HIO_cFv.s" -} -#pragma pop - -/* 8058E0F4-8058E13C 000194 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop - -/* 8058E13C-8058E1C4 0001DC 0088+00 2/2 0/0 0/0 .text setBaseMtx__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setBaseMtx__13daLv2Candle_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8058F144-8058F174 000014 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__13daLv2Candle_c */ -SECTION_RODATA u8 const daLv2Candle_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, - 0xD8, 0xFB, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8058F144, &daLv2Candle_c::mCcDObjInfo); - /* 8058F174-8058F180 000044 000C+00 1/1 0/0 0/0 .rodata l_bmdIdx */ -SECTION_RODATA static u8 const l_bmdIdx[12] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, +static u32 const l_bmdIdx[3] = { + 4, + 4, + 3, }; -COMPILER_STRIP_GATE(0x8058F174, &l_bmdIdx); + +/* 8058E13C-8058E1C4 0001DC 0088+00 2/2 0/0 0/0 .text setBaseMtx__13daLv2Candle_cFv */ +void daLv2Candle_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); + mpModel->setBaseScale(mScale); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); +} /* 8058E1C4-8058E244 000264 0080+00 1/1 0/0 0/0 .text CreateHeap__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/CreateHeap__13daLv2Candle_cFv.s" +int daLv2Candle_c::CreateHeap() { + J3DModelData* bmd = + (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]); + mpModel = mDoExt_J3DModel__create(bmd, 0x80000, 0x11000084); + if (mpModel == NULL) { + return false; + } + return true; } -#pragma pop - -/* ############################################################################################## */ -/* 8058F180-8058F184 000050 0004+00 1/1 0/0 0/0 .rodata @3778 */ -SECTION_RODATA static f32 const lit_3778 = 135.0f; -COMPILER_STRIP_GATE(0x8058F180, &lit_3778); /* 8058E244-8058E52C 0002E4 02E8+00 1/1 0/0 0/0 .text create__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/create__13daLv2Candle_cFv.s" +cPhs__Step daLv2Candle_c::create() { + fopAcM_SetupActor(this, daLv2Candle_c); + mModelType = getModelType(); + if (mModelType == 0xf) { + mModelType = 0; + } + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_resNameIdx[mModelType]); + if (step == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x1000)) { + return cPhs_ERROR_e; + } + setBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + mStts.Init(0xff, 0xff, this); + mCyl.Set(mCcDCyl); + mCyl.SetStts(&mStts); + mTorchPos.x = current.pos.x; + mTorchPos.y = current.pos.y + 135.0f; + mTorchPos.z = current.pos.z; + mLightAnm = getLightAnm(); + mLightType = getLightType(); + if (mLightType == 0xf) { + mLightType = 0; + } + lightInit(); + mSwType = getSwType(); + if (mSwType == 0xf) { + mSwType = 0; + } + mEyePos = mTorchPos; + mSw = getSw(); + if (mSw == 0xff) { + mIsLit = true; + mCyl.SetAtMtrl(1); + setLight(); + } else { + mIsSwitch = isSwitch(); + mIsLit = false; + if (mIsSwitch) { + mIsLit = true; + mCyl.SetAtMtrl(1); + setLight(); + } + } + mTimer = 0; + mSound.init(¤t.pos, 1); + mTgHit = 0; + field_0x734 = NULL; + if (mModelType == 1) { + field_0x734 = static_cast(fopAcM_Search(searchDemoTagAct, this)); + } + } + return step; } -#pragma pop - -/* 8058E52C-8058E574 0005CC 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_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 8058E574-8058E5BC 000614 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_lv2Candle/d_a_obj_lv2Candle/__dt__8cM3dGAabFv.s" -} -#pragma pop /* 8058E5BC-8058E608 00065C 004C+00 2/2 0/0 0/0 .text isSwitch__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::isSwitch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/isSwitch__13daLv2Candle_cFv.s" +u8 daLv2Candle_c::isSwitch() { + return mSwType ^ i_fopAcM_isSwitch(this, mSw); } -#pragma pop /* 8058E608-8058E628 0006A8 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c.s" +int daLv2Candle_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 8058E628-8058E678 0006C8 0050+00 1/1 0/0 0/0 .text searchDemoTagAct__13daLv2Candle_cFPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::searchDemoTagAct(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/searchDemoTagAct__13daLv2Candle_cFPvPv.s" +void* daLv2Candle_c::searchDemoTagAct(void* i_actor, void* param_1) { + if (i_actor != NULL && fopAc_IsActor(i_actor) && + fopAcM_GetProfName(i_actor) == PROC_Tag_Lv4Candle) { + return i_actor; + } + return NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 8058F184-8058F188 000054 0004+00 0/1 0/0 0/0 .rodata @3888 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3888 = 10.0f; -COMPILER_STRIP_GATE(0x8058F184, &lit_3888); -#pragma pop - -/* 8058F188-8058F18C 000058 0004+00 0/3 0/0 0/0 .rodata @3889 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3889[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8058F188, &lit_3889); -#pragma pop - -/* 8058F2A0-8058F2AC 000008 000C+00 1/1 0/0 0/0 .bss @3631 */ -static u8 lit_3631[12]; - -/* 8058F2AC-8058F2E0 000014 0034+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[52]; /* 8058E678-8058E720 000718 00A8+00 1/1 0/0 0/0 .text lightInit__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::lightInit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/lightInit__13daLv2Candle_cFv.s" +void daLv2Candle_c::lightInit() { + mLightPos = mTorchPos; + mLightPos.y += 10.0f; + mAnmStage = 0; + mAnmTimer = l_HIO.mAnmTimers[mAnmStage]; + if (mLightType != 0) { + mLight.mPosition = mLightPos; + mLight.mColor.r = l_HIO.mColor1R; + mLight.mColor.g = l_HIO.mColor1G; + mLight.mColor.b = l_HIO.mColor1B; + mLight.mPow = l_HIO.mPow; + mLight.mFluctuation = 1.0f; + } + mIntensity = 0.0f; } -#pragma pop /* 8058E720-8058E750 0007C0 0030+00 2/2 0/0 0/0 .text setLight__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::setLight() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/setLight__13daLv2Candle_cFv.s" +void daLv2Candle_c::setLight() { + if (mLightType != 0) { + dKy_plight_set(&mLight); + } } -#pragma pop /* 8058E750-8058E780 0007F0 0030+00 1/1 0/0 0/0 .text cutLight__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::cutLight() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/cutLight__13daLv2Candle_cFv.s" +void daLv2Candle_c::cutLight() { + if (mLightType != 0) { + dKy_plight_cut(&mLight); + } } -#pragma pop - -/* ############################################################################################## */ -/* 8058F18C-8058F190 00005C 0004+00 0/1 0/0 0/0 .rodata @3918 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3918 = 0x000000FF; -COMPILER_STRIP_GATE(0x8058F18C, &lit_3918); -#pragma pop - -/* 8058F190-8058F194 000060 0004+00 0/1 0/0 0/0 .rodata @3936 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3936 = 0x38D1B717; -COMPILER_STRIP_GATE(0x8058F190, &lit_3936); -#pragma pop - -/* 8058F194-8058F198 000064 0004+00 0/1 0/0 0/0 .rodata @3937 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3937 = 0.5f; -COMPILER_STRIP_GATE(0x8058F194, &lit_3937); -#pragma pop - -/* 8058F198-8058F19C 000068 0004+00 0/1 0/0 0/0 .rodata @3938 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3938 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x8058F198, &lit_3938); -#pragma pop - -/* 8058F19C-8058F1A0 00006C 0004+00 0/1 0/0 0/0 .rodata @3939 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3939 = 0x358637BD; -COMPILER_STRIP_GATE(0x8058F19C, &lit_3939); -#pragma pop /* 8058E780-8058E99C 000820 021C+00 1/1 0/0 0/0 .text pointLightProc__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::pointLightProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/pointLightProc__13daLv2Candle_cFv.s" +void daLv2Candle_c::pointLightProc() { + if (mLightType != 0) { + if (mIsLit && mLightAnm != 0xf) { + f32 delta = cLib_addCalc(&mIntensity, l_HIO.mAnmIntensity[mAnmStage], + 1.0f, l_HIO.mAnmMaxStep, 0.0001f); + mLight.mPow = l_HIO.mPow * mIntensity; + if (delta == 0.0f) { + if (mAnmTimer == 0) { + mAnmStage++; + if (mAnmStage > 5) { + mAnmStage = 0; + } + mAnmTimer = l_HIO.mAnmTimers[mAnmStage]; + } else { + mAnmTimer--; + } + } + } + } else { + GXColor color = {l_HIO.mColor2R, l_HIO.mColor2G, l_HIO.mColor2B, 0xff}; + if (mIsLit) { + if (mLightAnm != 0xf) { + f32 delta = cLib_addCalc(&mIntensity, l_HIO.mAnmIntensity[mAnmStage], + 1.0f, l_HIO.mAnmMaxStep, 0.0001f); + if (delta == 0.0f) { + if (mAnmTimer == 0) { + mAnmStage++; + if (mAnmStage > 5) { + mAnmStage = 0; + } + mAnmTimer = l_HIO.mAnmTimers[mAnmStage]; + } else { + mAnmTimer--; + } + } + } else { + cLib_addCalc(&mIntensity, 1.0f, 0.5f, 0.1f, 0.0001f); + } + } else { + cLib_addCalc(&mIntensity, 0.0f, 0.5f, 0.1f, 0.0001f); + } + if (mIntensity >= 1e-6f) { + dKy_BossLight_set(&mLightPos, &color, mIntensity, 0); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 8058F1A0-8058F1A4 000070 0004+00 0/1 0/0 0/0 .rodata @4097 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4097 = -1.0f; -COMPILER_STRIP_GATE(0x8058F1A0, &lit_4097); -#pragma pop - -/* 8058F1A4-8058F1A8 000074 0004+00 0/1 0/0 0/0 .rodata @4098 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4098 = 25.0f; -COMPILER_STRIP_GATE(0x8058F1A4, &lit_4098); -#pragma pop - -/* 8058F1A8-8058F1AC 000078 0004+00 0/1 0/0 0/0 .rodata @4099 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4099 = 160.0f; -COMPILER_STRIP_GATE(0x8058F1A8, &lit_4099); -#pragma pop /* 8058E99C-8058EEC8 000A3C 052C+00 1/1 0/0 0/0 .text Execute__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Execute__13daLv2Candle_cFv.s" +int daLv2Candle_c::Execute() { + if (mSw == 0xff) { + if (mTimer != 0) { + mTimer--; + if (mTimer == 0) { + mIsLit = true; + mCyl.SetAtMtrl(1); + setLight(); + } + } + } else { + mIsSwitch = isSwitch(); + if (mIsSwitch) { + if (mIsLit == false) { + mIsLit = true; + mCyl.SetAtMtrl(1); + setLight(); + } + } else { + if (mIsLit == true) { + mIsLit = false; + mCyl.SetAtMtrl(0); + cutLight(); + } + } + } + + if (mIsLit) { + dComIfGp_particle_setSimple(0x100, &mTorchPos, 0xff, + g_whiteColor, g_whiteColor, 0, 0.0f); + dComIfGp_particle_setSimple(0x101, &mTorchPos, 0xff, + g_whiteColor, g_whiteColor, 0, 0.0f); + dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff, + g_whiteColor, g_whiteColor, 0, 0.0f); + i_mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } + + if (field_0x734 != NULL) { + if (field_0x734->getNGSwStat()) { + if (mCyl.MskTgSPrm(1)) { + mCyl.OffTgSetBit(); + } + } else { + if (!mCyl.MskTgSPrm(1)) { + mCyl.OnTgSetBit(); + } + } + } + + if (mCyl.ChkTgHit()) { + dCcD_GObjInf* gobj = mCyl.GetTgHitGObj(); + if (gobj->GetAtType() == AT_TYPE_LANTERN_SWING && gobj->GetAtMtrl() == 1 && !mIsLit) { + mIsLit = true; + mCyl.SetAtMtrl(1); + if (!mSwType) { + i_fopAcM_onSwitch(this, mSw); + } else { + i_fopAcM_offSwitch(this, mSw); + } + mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + setLight(); + } + if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == 3 && + mIsLit == true && getOffType() == 1) { + mIsLit = false; + mCyl.SetAtMtrl(0); + cutLight(); + mDoAud_seStart(0x80019, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + if (mSw == 0xff) { + mTimer = l_HIO.mTimer; + } + else if (!mSwType) { + i_fopAcM_offSwitch(this, mSw); + } else { + i_fopAcM_onSwitch(this, mSw); + } + } + cCcD_Obj* obj = mCyl.GetTgHitObj(); + if (obj != NULL) { + fopAc_ac_c* actor = obj->GetAc(); + bool bvar1 = true; + if (actor != NULL) { + if (fopAcM_GetName(actor) == PROC_E_HP && mTgHit) { + bvar1 = false; + } + if (fopAcM_GetName(actor) == PROC_E_DD) { + bvar1 = false; + } + if (fopAcM_GetName(actor) == PROC_ALINK) { + if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { + bvar1 = false; + } + } + if (bvar1) { + u32 se_id = mCyl.GetTgHitObjHitSeID(1); + if (mModelType == 0) { + mSound.startCollisionSE(se_id, 2, NULL); + } else { + mSound.startCollisionSE(se_id, 9, NULL); + } + mTgHit = true; + } + } + } + } else { + mTgHit = false; + } + + mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mCyl.SetR(25.0f); + mCyl.SetH(160.0f); + mCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCyl); + pointLightProc(); + setBaseMtx(); + return true; } -#pragma pop /* 8058EEC8-8058EF6C 000F68 00A4+00 1/1 0/0 0/0 .text Draw__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Draw__13daLv2Candle_cFv.s" +int daLv2Candle_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return true; } -#pragma pop /* 8058EF6C-8058EFD0 00100C 0064+00 1/1 0/0 0/0 .text Delete__13daLv2Candle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv2Candle_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/Delete__13daLv2Candle_cFv.s" +int daLv2Candle_c::Delete() { + mSound.deleteObject(); + dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]); + if (mLightType != 0) { + dKy_plight_cut(&mLight); + } + return true; } -#pragma pop /* 8058EFD0-8058EFF0 001070 0020+00 1/0 0/0 0/0 .text daLv2Candle_Draw__FP13daLv2Candle_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv2Candle_Draw(daLv2Candle_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Draw__FP13daLv2Candle_c.s" +static int daLv2Candle_Draw(daLv2Candle_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 8058EFF0-8058F010 001090 0020+00 1/0 0/0 0/0 .text daLv2Candle_Execute__FP13daLv2Candle_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv2Candle_Execute(daLv2Candle_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Execute__FP13daLv2Candle_c.s" +static int daLv2Candle_Execute(daLv2Candle_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 8058F010-8058F030 0010B0 0020+00 1/0 0/0 0/0 .text daLv2Candle_Delete__FP13daLv2Candle_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv2Candle_Delete(daLv2Candle_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Delete__FP13daLv2Candle_c.s" +static int daLv2Candle_Delete(daLv2Candle_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 8058F030-8058F050 0010D0 0020+00 1/0 0/0 0/0 .text daLv2Candle_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv2Candle_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/daLv2Candle_Create__FP10fopAc_ac_c.s" +static cPhs__Step daLv2Candle_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 8058F050-8058F0AC 0010F0 005C+00 2/1 0/0 0/0 .text __dt__17daLv2Candle_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv2Candle_HIO_c::~daLv2Candle_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__dt__17daLv2Candle_HIO_cFv.s" -} -#pragma pop +/* 8058F218-8058F238 -00001 0020+00 1/0 0/0 0/0 .data l_daLv2Candle_Method */ +static actor_method_class l_daLv2Candle_Method = { + (process_method_func)daLv2Candle_Create, + (process_method_func)daLv2Candle_Delete, + (process_method_func)daLv2Candle_Execute, + (process_method_func)NULL, + (process_method_func)daLv2Candle_Draw, +}; -/* 8058F0AC-8058F11C 00114C 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv2Candle_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lv2Candle_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle/__sinit_d_a_obj_lv2Candle_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8058F0AC, __sinit_d_a_obj_lv2Candle_cpp); -#pragma pop - -/* 8058F1AC-8058F1AC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8058F238-8058F268 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv2Candle */ +extern actor_process_profile_definition g_profile_Obj_Lv2Candle = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_Obj_Lv2Candle, + &g_fpcLf_Method.mBase, + sizeof(daLv2Candle_c), + 0, + 0, + &g_fopAc_Method.base, + 0x20B, + &l_daLv2Candle_Method, + 0x60000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp b/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp index 94f92e9a90..0ac93637e5 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp @@ -10,69 +10,11 @@ // Types: // -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C5D470 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct dalv4CandleTag_c { - /* 80C5D4B8 */ void setBaseMtx(); - /* 80C5D4F0 */ void create(); - /* 80C5D5D4 */ void Execute(); - /* 80C5D618 */ void procMain(); - /* 80C5D6D4 */ void init_modeWatch(); - /* 80C5D6E0 */ void modeWatch(); - /* 80C5D78C */ void init_modeNG(); - /* 80C5D814 */ void modeNG(); - /* 80C5D8A0 */ void init_modeNGWait(); - /* 80C5D8AC */ void modeNGWait(); - /* 80C5D8FC */ void init_modeEnd(); - /* 80C5D908 */ void modeEnd(); - /* 80C5D90C */ void eventStart(); - /* 80C5D930 */ bool Draw(); - /* 80C5D938 */ bool Delete(); - /* 80C5DAC8 */ ~dalv4CandleTag_c(); -}; - -struct dalv4CandleTag_HIO_c { - /* 80C5D44C */ dalv4CandleTag_HIO_c(); - /* 80C5D9C0 */ ~dalv4CandleTag_HIO_c(); -}; - struct dSv_info_c { /* 800352B0 */ void offSwitch(int, int); /* 80035360 */ void isSwitch(int, int) const; }; -struct dEvLib_callback_c { - /* 8004886C */ void eventUpdate(); - /* 80048940 */ void orderEvent(int, int, int); - /* 80C5DA68 */ ~dEvLib_callback_c(); - /* 80C5DAB0 */ bool eventRun(); - /* 80C5DAB8 */ bool eventEnd(); - /* 80C5DAC0 */ bool eventStart(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - // // Forward References: // @@ -120,12 +62,9 @@ extern "C" void eventUpdate__17dEvLib_callback_cFv(); extern "C" void orderEvent__17dEvLib_callback_cFiii(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -278,7 +217,8 @@ asm dalv4CandleTag_HIO_c::dalv4CandleTag_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { +// asm mDoHIO_entry_c::~mDoHIO_entry_c() { +extern "C" asm void __dt__14mDoHIO_entry_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag/__dt__14mDoHIO_entry_cFv.s" } @@ -298,7 +238,7 @@ asm void dalv4CandleTag_c::setBaseMtx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dalv4CandleTag_c::create() { +asm cPhs__Step dalv4CandleTag_c::create() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag/create__16dalv4CandleTag_cFv.s" } @@ -308,7 +248,7 @@ asm void dalv4CandleTag_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dalv4CandleTag_c::Execute() { +asm int dalv4CandleTag_c::Execute() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag/Execute__16dalv4CandleTag_cFv.s" } @@ -424,19 +364,19 @@ void dalv4CandleTag_c::modeEnd() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dalv4CandleTag_c::eventStart() { +asm int dalv4CandleTag_c::eventStart() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag/eventStart__16dalv4CandleTag_cFv.s" } #pragma pop /* 80C5D930-80C5D938 0005D0 0008+00 1/1 0/0 0/0 .text Draw__16dalv4CandleTag_cFv */ -bool dalv4CandleTag_c::Draw() { +int dalv4CandleTag_c::Draw() { return true; } /* 80C5D938-80C5D940 0005D8 0008+00 1/1 0/0 0/0 .text Delete__16dalv4CandleTag_cFv */ -bool dalv4CandleTag_c::Delete() { +int dalv4CandleTag_c::Delete() { return true; } @@ -486,7 +426,8 @@ static asm void dalv4CandleTag_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dalv4CandleTag_HIO_c::~dalv4CandleTag_HIO_c() { +// asm dalv4CandleTag_HIO_c::~dalv4CandleTag_HIO_c() { +extern "C" asm void __dt__20dalv4CandleTag_HIO_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag/__dt__20dalv4CandleTag_HIO_cFv.s" } @@ -531,25 +472,29 @@ static asm void func_80C5DA60() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvLib_callback_c::~dEvLib_callback_c() { +// asm dEvLib_callback_c::~dEvLib_callback_c() { +extern "C" asm void __dt__17dEvLib_callback_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag/__dt__17dEvLib_callback_cFv.s" } #pragma pop /* 80C5DAB0-80C5DAB8 000750 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventRun() { +// int dEvLib_callback_c::eventRun() { +extern "C" bool eventRun__17dEvLib_callback_cFv() { return true; } /* 80C5DAB8-80C5DAC0 000758 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventEnd() { +// int dEvLib_callback_c::eventEnd() { +extern "C" bool eventEnd__17dEvLib_callback_cFv() { return true; } /* 80C5DAC0-80C5DAC8 000760 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv */ -bool dEvLib_callback_c::eventStart() { +// int dEvLib_callback_c::eventStart() { +extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } @@ -557,7 +502,8 @@ bool dEvLib_callback_c::eventStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dalv4CandleTag_c::~dalv4CandleTag_c() { +// asm dalv4CandleTag_c::~dalv4CandleTag_c() { +extern "C" asm void __dt__16dalv4CandleTag_cFv() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag/__dt__16dalv4CandleTag_cFv.s" }