diff --git a/Progress.md b/Progress.md index e98eedcc840..d36036b3f3c 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 34.566072% | 1243184 | 3596544 +.text | 34.564182% | 1243116 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 41.463716% | 1667120 | 4020672 +Total | 41.462024% | 1667052 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 41.463716% | 1667120 | 4020672 -RELs | 34.707231% | 3991444 | 11500324 -Total | 36.457480% | 5658564 | 15520996 +main.dol | 41.462024% | 1667052 | 4020672 +RELs | 34.736587% | 3994820 | 11500324 +Total | 36.478793% | 5661872 | 15520996 ## RELs @@ -481,7 +481,7 @@ d_a_obj_laundry_rope | 34.459867% | 2284 | 6628 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 | 41.348158% | 2380 | 5756 +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_lv3Candle | 45.638126% | 2260 | 4952 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 34.707231% | 3991444 | 11500324 +Total | 34.736587% | 3994820 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/CreateHeap__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/CreateHeap__12daLv1Cdl00_cFv.s deleted file mode 100644 index e2d26002eb8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/CreateHeap__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C55E08: -/* 80C55E08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C55E0C 7C 08 02 A6 */ mflr r0 -/* 80C55E10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C55E14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C55E18 7C 7F 1B 78 */ mr r31, r3 -/* 80C55E1C 3C 60 80 C5 */ lis r3, d_a_obj_lv1Candle00__stringBase0@ha /* 0x80C56AB4@ha */ -/* 80C55E20 38 63 6A B4 */ addi r3, r3, d_a_obj_lv1Candle00__stringBase0@l /* 0x80C56AB4@l */ -/* 80C55E24 38 80 00 04 */ li r4, 4 -/* 80C55E28 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C55E2C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C55E30 3C A5 00 02 */ addis r5, r5, 2 -/* 80C55E34 38 C0 00 80 */ li r6, 0x80 -/* 80C55E38 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C55E3C 4B 3E 64 B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C55E40 3C 80 00 08 */ lis r4, 8 -/* 80C55E44 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C55E48 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C55E4C 4B 3B EE 09 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C55E50 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80C55E54 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C55E58 30 03 FF FF */ addic r0, r3, -1 -/* 80C55E5C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C55E60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C55E64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C55E68 7C 08 03 A6 */ mtlr r0 -/* 80C55E6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C55E70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Delete__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Delete__12daLv1Cdl00_cFv.s deleted file mode 100644 index 55963486ce0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Delete__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C56890: -/* 80C56890 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56894 7C 08 02 A6 */ mflr r0 -/* 80C56898 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5689C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C568A0 7C 7F 1B 78 */ mr r31, r3 -/* 80C568A4 38 7F 07 34 */ addi r3, r31, 0x734 -/* 80C568A8 4B 66 77 51 */ bl deleteObject__14Z2SoundObjBaseFv -/* 80C568AC 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80C568B0 3C 80 80 C5 */ lis r4, d_a_obj_lv1Candle00__stringBase0@ha /* 0x80C56AB4@ha */ -/* 80C568B4 38 84 6A B4 */ addi r4, r4, d_a_obj_lv1Candle00__stringBase0@l /* 0x80C56AB4@l */ -/* 80C568B8 4B 3D 67 51 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C568BC 88 1F 07 08 */ lbz r0, 0x708(r31) -/* 80C568C0 28 00 00 01 */ cmplwi r0, 1 -/* 80C568C4 41 82 00 0C */ beq lbl_80C568D0 -/* 80C568C8 28 00 00 02 */ cmplwi r0, 2 -/* 80C568CC 40 82 00 0C */ bne lbl_80C568D8 -lbl_80C568D0: -/* 80C568D0 38 7F 07 10 */ addi r3, r31, 0x710 -/* 80C568D4 4B 55 10 59 */ bl dKy_plight_cut__FP15LIGHT_INFLUENCE -lbl_80C568D8: -/* 80C568D8 38 60 00 01 */ li r3, 1 -/* 80C568DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C568E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C568E4 7C 08 03 A6 */ mtlr r0 -/* 80C568E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C568EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Draw__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Draw__12daLv1Cdl00_cFv.s deleted file mode 100644 index a6b9532bdb5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Draw__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C567EC: -/* 80C567EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C567F0 7C 08 02 A6 */ mflr r0 -/* 80C567F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C567F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C567FC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C56800 7C 7E 1B 78 */ mr r30, r3 -/* 80C56804 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C56808 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5680C 38 80 00 40 */ li r4, 0x40 -/* 80C56810 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C56814 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C56818 4B 54 CF AD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C5681C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C56820 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C56824 80 9E 05 70 */ lwz r4, 0x570(r30) -/* 80C56828 80 84 00 04 */ lwz r4, 4(r4) -/* 80C5682C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C56830 4B 54 E5 71 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C56834 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C56838 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5683C 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C56840 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C56844 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C56848 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C5684C 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C56850 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C56854 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80C56858 4B 3B 74 6D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C5685C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C56860 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C56864 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C56868 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C5686C 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C56870 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C56874 38 60 00 01 */ li r3, 1 -/* 80C56878 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5687C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C56880 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56884 7C 08 03 A6 */ mtlr r0 -/* 80C56888 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5688C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Execute__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Execute__12daLv1Cdl00_cFv.s deleted file mode 100644 index 22e077b6942..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Execute__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,295 +0,0 @@ -lbl_80C56388: -/* 80C56388 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C5638C 7C 08 02 A6 */ mflr r0 -/* 80C56390 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C56394 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C56398 4B 70 BE 45 */ bl _savegpr_29 -/* 80C5639C 7C 7F 1B 78 */ mr r31, r3 -/* 80C563A0 3C 60 80 C5 */ lis r3, mCcDObjInfo__12daLv1Cdl00_c@ha /* 0x80C56A50@ha */ -/* 80C563A4 3B C3 6A 50 */ addi r30, r3, mCcDObjInfo__12daLv1Cdl00_c@l /* 0x80C56A50@l */ -/* 80C563A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C563AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C563B0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C563B4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C563B8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C563BC 7C 05 07 74 */ extsb r5, r0 -/* 80C563C0 4B 3D EF A1 */ bl isSwitch__10dSv_info_cCFii -/* 80C563C4 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 80C563C8 88 1F 06 F9 */ lbz r0, 0x6f9(r31) -/* 80C563CC 7C 00 E8 40 */ cmplw r0, r29 -/* 80C563D0 41 82 00 64 */ beq lbl_80C56434 -/* 80C563D4 38 00 00 00 */ li r0, 0 -/* 80C563D8 98 1F 06 F8 */ stb r0, 0x6f8(r31) -/* 80C563DC 98 1F 06 25 */ stb r0, 0x625(r31) -/* 80C563E0 7F E3 FB 78 */ mr r3, r31 -/* 80C563E4 4B FF FE BD */ bl cutLight__12daLv1Cdl00_cFv -/* 80C563E8 88 1F 06 FA */ lbz r0, 0x6fa(r31) -/* 80C563EC 28 00 00 00 */ cmplwi r0, 0 -/* 80C563F0 40 82 00 24 */ bne lbl_80C56414 -/* 80C563F4 28 1D 00 00 */ cmplwi r29, 0 -/* 80C563F8 41 82 00 38 */ beq lbl_80C56430 -/* 80C563FC 38 00 00 01 */ li r0, 1 -/* 80C56400 98 1F 06 F8 */ stb r0, 0x6f8(r31) -/* 80C56404 98 1F 06 25 */ stb r0, 0x625(r31) -/* 80C56408 7F E3 FB 78 */ mr r3, r31 -/* 80C5640C 4B FF FE 5D */ bl setLight__12daLv1Cdl00_cFv -/* 80C56410 48 00 00 20 */ b lbl_80C56430 -lbl_80C56414: -/* 80C56414 28 1D 00 00 */ cmplwi r29, 0 -/* 80C56418 40 82 00 18 */ bne lbl_80C56430 -/* 80C5641C 38 00 00 01 */ li r0, 1 -/* 80C56420 98 1F 06 F8 */ stb r0, 0x6f8(r31) -/* 80C56424 98 1F 06 25 */ stb r0, 0x625(r31) -/* 80C56428 7F E3 FB 78 */ mr r3, r31 -/* 80C5642C 4B FF FE 3D */ bl setLight__12daLv1Cdl00_cFv -lbl_80C56430: -/* 80C56430 9B BF 06 F9 */ stb r29, 0x6f9(r31) -lbl_80C56434: -/* 80C56434 88 1F 06 F8 */ lbz r0, 0x6f8(r31) -/* 80C56438 28 00 00 00 */ cmplwi r0, 0 -/* 80C5643C 41 82 00 E4 */ beq lbl_80C56520 -/* 80C56440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C56444 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C56448 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C5644C 3C 80 00 01 */ lis r4, 0x0001 /* 0x000083A6@ha */ -/* 80C56450 38 84 83 A6 */ addi r4, r4, 0x83A6 /* 0x000083A6@l */ -/* 80C56454 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 80C56458 38 C0 00 00 */ li r6, 0 -/* 80C5645C 38 E0 00 FF */ li r7, 0xff -/* 80C56460 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80C56464 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80C56468 7D 09 43 78 */ mr r9, r8 -/* 80C5646C 39 40 00 00 */ li r10, 0 -/* 80C56470 C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 80C56474 4B 3F 6D 45 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80C56478 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C5647C 3C 80 00 01 */ lis r4, 0x0001 /* 0x000083A7@ha */ -/* 80C56480 38 84 83 A7 */ addi r4, r4, 0x83A7 /* 0x000083A7@l */ -/* 80C56484 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 80C56488 38 C0 00 00 */ li r6, 0 -/* 80C5648C 38 E0 00 FF */ li r7, 0xff -/* 80C56490 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80C56494 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80C56498 7D 09 43 78 */ mr r9, r8 -/* 80C5649C 39 40 00 00 */ li r10, 0 -/* 80C564A0 C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 80C564A4 4B 3F 6D 15 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80C564A8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C564AC 38 80 01 03 */ li r4, 0x103 -/* 80C564B0 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 80C564B4 38 C0 00 00 */ li r6, 0 -/* 80C564B8 38 E0 00 FF */ li r7, 0xff -/* 80C564BC 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80C564C0 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80C564C4 7D 09 43 78 */ mr r9, r8 -/* 80C564C8 39 40 00 00 */ li r10, 0 -/* 80C564CC C0 3E 00 40 */ lfs f1, 0x40(r30) -/* 80C564D0 4B 3F 6C E9 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80C564D4 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C564D8 7C 03 07 74 */ extsb r3, r0 -/* 80C564DC 4B 3D 6B 91 */ bl dComIfGp_getReverb__Fi -/* 80C564E0 7C 67 1B 78 */ mr r7, r3 -/* 80C564E4 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080018@ha */ -/* 80C564E8 38 03 00 18 */ addi r0, r3, 0x0018 /* 0x00080018@l */ -/* 80C564EC 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C564F0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C564F4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C564F8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C564FC 38 81 00 10 */ addi r4, r1, 0x10 -/* 80C56500 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 80C56504 38 C0 00 00 */ li r6, 0 -/* 80C56508 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80C5650C FC 40 08 90 */ fmr f2, f1 -/* 80C56510 C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 80C56514 FC 80 18 90 */ fmr f4, f3 -/* 80C56518 39 00 00 00 */ li r8, 0 -/* 80C5651C 4B 65 5F F1 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C56520: -/* 80C56520 7F E3 FB 78 */ mr r3, r31 -/* 80C56524 4B FF F8 5D */ bl setBaseMtx__12daLv1Cdl00_cFv -/* 80C56528 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80C5652C 4B 42 DF 35 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C56530 28 03 00 00 */ cmplwi r3, 0 -/* 80C56534 41 82 02 2C */ beq lbl_80C56760 -/* 80C56538 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80C5653C 4B 42 E0 0D */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C56540 7C 7D 1B 78 */ mr r29, r3 -/* 80C56544 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C56548 28 00 02 00 */ cmplwi r0, 0x200 -/* 80C5654C 40 82 00 C4 */ bne lbl_80C56610 -/* 80C56550 88 1D 00 75 */ lbz r0, 0x75(r29) -/* 80C56554 28 00 00 01 */ cmplwi r0, 1 -/* 80C56558 40 82 00 B8 */ bne lbl_80C56610 -/* 80C5655C 88 1F 06 F8 */ lbz r0, 0x6f8(r31) -/* 80C56560 28 00 00 00 */ cmplwi r0, 0 -/* 80C56564 40 82 00 AC */ bne lbl_80C56610 -/* 80C56568 38 00 00 01 */ li r0, 1 -/* 80C5656C 98 1F 06 F8 */ stb r0, 0x6f8(r31) -/* 80C56570 98 1F 06 25 */ stb r0, 0x625(r31) -/* 80C56574 88 1F 06 FA */ lbz r0, 0x6fa(r31) -/* 80C56578 28 00 00 00 */ cmplwi r0, 0 -/* 80C5657C 40 82 00 24 */ bne lbl_80C565A0 -/* 80C56580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C56584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C56588 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5658C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C56590 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C56594 7C 05 07 74 */ extsb r5, r0 -/* 80C56598 4B 3D EC 69 */ bl onSwitch__10dSv_info_cFii -/* 80C5659C 48 00 00 20 */ b lbl_80C565BC -lbl_80C565A0: -/* 80C565A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C565A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C565A8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C565AC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C565B0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C565B4 7C 05 07 74 */ extsb r5, r0 -/* 80C565B8 4B 3D EC F9 */ bl offSwitch__10dSv_info_cFii -lbl_80C565BC: -/* 80C565BC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C565C0 7C 03 07 74 */ extsb r3, r0 -/* 80C565C4 4B 3D 6A A9 */ bl dComIfGp_getReverb__Fi -/* 80C565C8 7C 67 1B 78 */ mr r7, r3 -/* 80C565CC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080017@ha */ -/* 80C565D0 38 03 00 17 */ addi r0, r3, 0x0017 /* 0x00080017@l */ -/* 80C565D4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C565D8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C565DC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C565E0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C565E4 38 81 00 0C */ addi r4, r1, 0xc -/* 80C565E8 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 80C565EC 38 C0 00 00 */ li r6, 0 -/* 80C565F0 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80C565F4 FC 40 08 90 */ fmr f2, f1 -/* 80C565F8 C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 80C565FC FC 80 18 90 */ fmr f4, f3 -/* 80C56600 39 00 00 00 */ li r8, 0 -/* 80C56604 4B 65 53 81 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C56608 7F E3 FB 78 */ mr r3, r31 -/* 80C5660C 4B FF FC 5D */ bl setLight__12daLv1Cdl00_cFv -lbl_80C56610: -/* 80C56610 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 80C56614 3C 03 FF FF */ addis r0, r3, 0xffff -/* 80C56618 28 00 00 00 */ cmplwi r0, 0 -/* 80C5661C 40 82 00 C4 */ bne lbl_80C566E0 -/* 80C56620 88 1D 00 75 */ lbz r0, 0x75(r29) -/* 80C56624 28 00 00 03 */ cmplwi r0, 3 -/* 80C56628 40 82 00 B8 */ bne lbl_80C566E0 -/* 80C5662C 88 1F 06 F8 */ lbz r0, 0x6f8(r31) -/* 80C56630 28 00 00 01 */ cmplwi r0, 1 -/* 80C56634 40 82 00 AC */ bne lbl_80C566E0 -/* 80C56638 38 00 00 00 */ li r0, 0 -/* 80C5663C 98 1F 06 F8 */ stb r0, 0x6f8(r31) -/* 80C56640 98 1F 06 25 */ stb r0, 0x625(r31) -/* 80C56644 88 1F 06 FA */ lbz r0, 0x6fa(r31) -/* 80C56648 28 00 00 00 */ cmplwi r0, 0 -/* 80C5664C 40 82 00 24 */ bne lbl_80C56670 -/* 80C56650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C56654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C56658 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5665C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C56660 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C56664 7C 05 07 74 */ extsb r5, r0 -/* 80C56668 4B 3D EC 49 */ bl offSwitch__10dSv_info_cFii -/* 80C5666C 48 00 00 20 */ b lbl_80C5668C -lbl_80C56670: -/* 80C56670 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C56674 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C56678 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C5667C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C56680 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C56684 7C 05 07 74 */ extsb r5, r0 -/* 80C56688 4B 3D EB 79 */ bl onSwitch__10dSv_info_cFii -lbl_80C5668C: -/* 80C5668C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C56690 7C 03 07 74 */ extsb r3, r0 -/* 80C56694 4B 3D 69 D9 */ bl dComIfGp_getReverb__Fi -/* 80C56698 7C 67 1B 78 */ mr r7, r3 -/* 80C5669C 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080019@ha */ -/* 80C566A0 38 03 00 19 */ addi r0, r3, 0x0019 /* 0x00080019@l */ -/* 80C566A4 90 01 00 08 */ stw r0, 8(r1) -/* 80C566A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C566AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C566B0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C566B4 38 81 00 08 */ addi r4, r1, 8 -/* 80C566B8 38 BF 06 EC */ addi r5, r31, 0x6ec -/* 80C566BC 38 C0 00 00 */ li r6, 0 -/* 80C566C0 C0 3E 00 3C */ lfs f1, 0x3c(r30) -/* 80C566C4 FC 40 08 90 */ fmr f2, f1 -/* 80C566C8 C0 7E 00 58 */ lfs f3, 0x58(r30) -/* 80C566CC FC 80 18 90 */ fmr f4, f3 -/* 80C566D0 39 00 00 00 */ li r8, 0 -/* 80C566D4 4B 65 52 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C566D8 7F E3 FB 78 */ mr r3, r31 -/* 80C566DC 4B FF FB C5 */ bl cutLight__12daLv1Cdl00_cFv -lbl_80C566E0: -/* 80C566E0 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80C566E4 4B 42 DE 15 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80C566E8 28 03 00 00 */ cmplwi r3, 0 -/* 80C566EC 41 82 00 7C */ beq lbl_80C56768 -/* 80C566F0 3B A0 00 01 */ li r29, 1 -/* 80C566F4 4B 60 D3 55 */ bl GetAc__8cCcD_ObjFv -/* 80C566F8 A8 03 00 08 */ lha r0, 8(r3) -/* 80C566FC 2C 00 00 FD */ cmpwi r0, 0xfd -/* 80C56700 40 82 00 28 */ bne lbl_80C56728 -/* 80C56704 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80C56708 4B 42 DE 41 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C5670C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C56710 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80C56714 41 82 00 14 */ beq lbl_80C56728 -/* 80C56718 88 1F 07 30 */ lbz r0, 0x730(r31) -/* 80C5671C 28 00 00 00 */ cmplwi r0, 0 -/* 80C56720 41 82 00 08 */ beq lbl_80C56728 -/* 80C56724 3B A0 00 00 */ li r29, 0 -lbl_80C56728: -/* 80C56728 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80C5672C 41 82 00 3C */ beq lbl_80C56768 -/* 80C56730 38 7F 05 B0 */ addi r3, r31, 0x5b0 -/* 80C56734 4B 42 DE 49 */ bl GetTgHitObjSe__12dCcD_GObjInfFv -/* 80C56738 38 80 00 01 */ li r4, 1 -/* 80C5673C 4B 42 DE 75 */ bl getHitSeID__12dCcD_GObjInfFUci -/* 80C56740 7C 64 1B 78 */ mr r4, r3 -/* 80C56744 38 7F 07 34 */ addi r3, r31, 0x734 -/* 80C56748 38 A0 00 05 */ li r5, 5 -/* 80C5674C 38 C0 00 00 */ li r6, 0 -/* 80C56750 4B 66 7D 55 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase -/* 80C56754 38 00 00 01 */ li r0, 1 -/* 80C56758 98 1F 07 30 */ stb r0, 0x730(r31) -/* 80C5675C 48 00 00 0C */ b lbl_80C56768 -lbl_80C56760: -/* 80C56760 38 00 00 00 */ li r0, 0 -/* 80C56764 98 1F 07 30 */ stb r0, 0x730(r31) -lbl_80C56768: -/* 80C56768 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C5676C 7C 03 07 74 */ extsb r3, r0 -/* 80C56770 4B 3D 68 FD */ bl dComIfGp_getReverb__Fi -/* 80C56774 7C 65 1B 78 */ mr r5, r3 -/* 80C56778 38 7F 07 34 */ addi r3, r31, 0x734 -/* 80C5677C 38 80 00 00 */ li r4, 0 -/* 80C56780 81 9F 07 44 */ lwz r12, 0x744(r31) -/* 80C56784 81 8C 00 08 */ lwz r12, 8(r12) -/* 80C56788 7D 89 03 A6 */ mtctr r12 -/* 80C5678C 4E 80 04 21 */ bctrl -/* 80C56790 38 7F 06 D4 */ addi r3, r31, 0x6d4 -/* 80C56794 C0 3E 00 5C */ lfs f1, 0x5c(r30) -/* 80C56798 4B 61 8A 69 */ bl SetR__8cM3dGCylFf -/* 80C5679C 38 7F 06 D4 */ addi r3, r31, 0x6d4 -/* 80C567A0 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 80C567A4 4B 61 8A 55 */ bl SetH__8cM3dGCylFf -/* 80C567A8 38 7F 06 D4 */ addi r3, r31, 0x6d4 -/* 80C567AC 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C567B0 4B 61 8A 2D */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C567B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C567B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C567BC 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C567C0 38 9F 05 B0 */ addi r4, r31, 0x5b0 -/* 80C567C4 4B 60 E3 E5 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C567C8 7F E3 FB 78 */ mr r3, r31 -/* 80C567CC 4B FF FB 0D */ bl pointLightProc__12daLv1Cdl00_cFv -/* 80C567D0 38 60 00 01 */ li r3, 1 -/* 80C567D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C567D8 4B 70 BA 51 */ bl _restgpr_29 -/* 80C567DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C567E0 7C 08 03 A6 */ mtlr r0 -/* 80C567E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C567E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__ct__16daLv1Cdl00_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__ct__16daLv1Cdl00_HIO_cFv.s deleted file mode 100644 index bb403ea692f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__ct__16daLv1Cdl00_HIO_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C55D0C: -/* 80C55D0C 3C 80 80 C5 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C56B78@ha */ -/* 80C55D10 38 04 6B 78 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C56B78@l */ -/* 80C55D14 90 03 00 00 */ stw r0, 0(r3) -/* 80C55D18 3C 80 80 C5 */ lis r4, __vt__16daLv1Cdl00_HIO_c@ha /* 0x80C56B6C@ha */ -/* 80C55D1C 38 04 6B 6C */ addi r0, r4, __vt__16daLv1Cdl00_HIO_c@l /* 0x80C56B6C@l */ -/* 80C55D20 90 03 00 00 */ stw r0, 0(r3) -/* 80C55D24 38 00 00 3C */ li r0, 0x3c -/* 80C55D28 98 03 00 04 */ stb r0, 4(r3) -/* 80C55D2C 38 00 00 01 */ li r0, 1 -/* 80C55D30 98 03 00 05 */ stb r0, 5(r3) -/* 80C55D34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index b1cf6dd2c60..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C55D38: -/* 80C55D38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C55D3C 7C 08 02 A6 */ mflr r0 -/* 80C55D40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C55D44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C55D48 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C55D4C 41 82 00 1C */ beq lbl_80C55D68 -/* 80C55D50 3C A0 80 C5 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C56B78@ha */ -/* 80C55D54 38 05 6B 78 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C56B78@l */ -/* 80C55D58 90 1F 00 00 */ stw r0, 0(r31) -/* 80C55D5C 7C 80 07 35 */ extsh. r0, r4 -/* 80C55D60 40 81 00 08 */ ble lbl_80C55D68 -/* 80C55D64 4B 67 8F D9 */ bl __dl__FPv -lbl_80C55D68: -/* 80C55D68 7F E3 FB 78 */ mr r3, r31 -/* 80C55D6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C55D70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C55D74 7C 08 03 A6 */ mtlr r0 -/* 80C55D78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C55D7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__16daLv1Cdl00_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__16daLv1Cdl00_HIO_cFv.s deleted file mode 100644 index 8cab9c578b4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__16daLv1Cdl00_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C56970: -/* 80C56970 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56974 7C 08 02 A6 */ mflr r0 -/* 80C56978 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5697C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C56980 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C56984 41 82 00 30 */ beq lbl_80C569B4 -/* 80C56988 3C 60 80 C5 */ lis r3, __vt__16daLv1Cdl00_HIO_c@ha /* 0x80C56B6C@ha */ -/* 80C5698C 38 03 6B 6C */ addi r0, r3, __vt__16daLv1Cdl00_HIO_c@l /* 0x80C56B6C@l */ -/* 80C56990 90 1F 00 00 */ stw r0, 0(r31) -/* 80C56994 41 82 00 10 */ beq lbl_80C569A4 -/* 80C56998 3C 60 80 C5 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C56B78@ha */ -/* 80C5699C 38 03 6B 78 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C56B78@l */ -/* 80C569A0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C569A4: -/* 80C569A4 7C 80 07 35 */ extsh. r0, r4 -/* 80C569A8 40 81 00 0C */ ble lbl_80C569B4 -/* 80C569AC 7F E3 FB 78 */ mr r3, r31 -/* 80C569B0 4B 67 83 8D */ bl __dl__FPv -lbl_80C569B4: -/* 80C569B4 7F E3 FB 78 */ mr r3, r31 -/* 80C569B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C569BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C569C0 7C 08 03 A6 */ mtlr r0 -/* 80C569C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C569C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGAabFv.s deleted file mode 100644 index 510dbf79848..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C56158: -/* 80C56158 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5615C 7C 08 02 A6 */ mflr r0 -/* 80C56160 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C56164 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C56168 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5616C 41 82 00 1C */ beq lbl_80C56188 -/* 80C56170 3C A0 80 C5 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C56B60@ha */ -/* 80C56174 38 05 6B 60 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C56B60@l */ -/* 80C56178 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C5617C 7C 80 07 35 */ extsh. r0, r4 -/* 80C56180 40 81 00 08 */ ble lbl_80C56188 -/* 80C56184 4B 67 8B B9 */ bl __dl__FPv -lbl_80C56188: -/* 80C56188 7F E3 FB 78 */ mr r3, r31 -/* 80C5618C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C56190 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56194 7C 08 03 A6 */ mtlr r0 -/* 80C56198 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5619C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGCylFv.s deleted file mode 100644 index f41f7e4c462..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C56110: -/* 80C56110 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56114 7C 08 02 A6 */ mflr r0 -/* 80C56118 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5611C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C56120 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C56124 41 82 00 1C */ beq lbl_80C56140 -/* 80C56128 3C A0 80 C5 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C56B54@ha */ -/* 80C5612C 38 05 6B 54 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C56B54@l */ -/* 80C56130 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C56134 7C 80 07 35 */ extsh. r0, r4 -/* 80C56138 40 81 00 08 */ ble lbl_80C56140 -/* 80C5613C 4B 67 8C 01 */ bl __dl__FPv -lbl_80C56140: -/* 80C56140 7F E3 FB 78 */ mr r3, r31 -/* 80C56144 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C56148 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5614C 7C 08 03 A6 */ mtlr r0 -/* 80C56150 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C56154 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__sinit_d_a_obj_lv1Candle00_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__sinit_d_a_obj_lv1Candle00_cpp.s deleted file mode 100644 index 2cebe50b834..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__sinit_d_a_obj_lv1Candle00_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C569CC: -/* 80C569CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C569D0 7C 08 02 A6 */ mflr r0 -/* 80C569D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C569D8 3C 60 80 C5 */ lis r3, l_HIO@ha /* 0x80C56B9C@ha */ -/* 80C569DC 38 63 6B 9C */ addi r3, r3, l_HIO@l /* 0x80C56B9C@l */ -/* 80C569E0 4B FF F3 2D */ bl __ct__16daLv1Cdl00_HIO_cFv -/* 80C569E4 3C 80 80 C5 */ lis r4, __dt__16daLv1Cdl00_HIO_cFv@ha /* 0x80C56970@ha */ -/* 80C569E8 38 84 69 70 */ addi r4, r4, __dt__16daLv1Cdl00_HIO_cFv@l /* 0x80C56970@l */ -/* 80C569EC 3C A0 80 C5 */ lis r5, lit_3620@ha /* 0x80C56B90@ha */ -/* 80C569F0 38 A5 6B 90 */ addi r5, r5, lit_3620@l /* 0x80C56B90@l */ -/* 80C569F4 4B FF F2 A5 */ bl __register_global_object -/* 80C569F8 3C 60 80 C5 */ lis r3, mCcDCyl__12daLv1Cdl00_c@ha /* 0x80C56AC0@ha */ -/* 80C569FC 38 63 6A C0 */ addi r3, r3, mCcDCyl__12daLv1Cdl00_c@l /* 0x80C56AC0@l */ -/* 80C56A00 38 A3 FF FC */ addi r5, r3, -4 -/* 80C56A04 3C 60 80 C5 */ lis r3, mCcDObjInfo__12daLv1Cdl00_c@ha /* 0x80C56A50@ha */ -/* 80C56A08 38 63 6A 50 */ addi r3, r3, mCcDObjInfo__12daLv1Cdl00_c@l /* 0x80C56A50@l */ -/* 80C56A0C 38 83 FF FC */ addi r4, r3, -4 -/* 80C56A10 38 00 00 06 */ li r0, 6 -/* 80C56A14 7C 09 03 A6 */ mtctr r0 -lbl_80C56A18: -/* 80C56A18 80 64 00 04 */ lwz r3, 4(r4) -/* 80C56A1C 84 04 00 08 */ lwzu r0, 8(r4) -/* 80C56A20 90 65 00 04 */ stw r3, 4(r5) -/* 80C56A24 94 05 00 08 */ stwu r0, 8(r5) -/* 80C56A28 42 00 FF F0 */ bdnz lbl_80C56A18 -/* 80C56A2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56A30 7C 08 03 A6 */ mtlr r0 -/* 80C56A34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C56A38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c.s deleted file mode 100644 index f1b2c1485cd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C561A0: -/* 80C561A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C561A4 7C 08 02 A6 */ mflr r0 -/* 80C561A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C561AC 4B FF FC 5D */ bl CreateHeap__12daLv1Cdl00_cFv -/* 80C561B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C561B4 7C 08 03 A6 */ mtlr r0 -/* 80C561B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C561BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/create__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/create__12daLv1Cdl00_cFv.s deleted file mode 100644 index 7571c0110b2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/create__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,177 +0,0 @@ -lbl_80C55E74: -/* 80C55E74 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C55E78 7C 08 02 A6 */ mflr r0 -/* 80C55E7C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C55E80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C55E84 4B 70 C3 59 */ bl _savegpr_29 -/* 80C55E88 7C 7E 1B 78 */ mr r30, r3 -/* 80C55E8C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C55E90 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C55E94 40 82 00 B0 */ bne lbl_80C55F44 -/* 80C55E98 7F C0 F3 79 */ or. r0, r30, r30 -/* 80C55E9C 41 82 00 9C */ beq lbl_80C55F38 -/* 80C55EA0 7C 1F 03 78 */ mr r31, r0 -/* 80C55EA4 4B 3C 2C C1 */ bl __ct__10fopAc_ac_cFv -/* 80C55EA8 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C55EAC 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C55EB0 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 80C55EB4 38 7F 05 90 */ addi r3, r31, 0x590 -/* 80C55EB8 4B 42 D8 A9 */ bl __ct__10dCcD_GSttsFv -/* 80C55EBC 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C55EC0 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C55EC4 90 7F 05 8C */ stw r3, 0x58c(r31) -/* 80C55EC8 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C55ECC 90 1F 05 90 */ stw r0, 0x590(r31) -/* 80C55ED0 3B BF 05 B0 */ addi r29, r31, 0x5b0 -/* 80C55ED4 7F A3 EB 78 */ mr r3, r29 -/* 80C55ED8 4B 42 DB 51 */ bl __ct__12dCcD_GObjInfFv -/* 80C55EDC 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C55EE0 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C55EE4 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C55EE8 3C 60 80 C5 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C56B60@ha */ -/* 80C55EEC 38 03 6B 60 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C56B60@l */ -/* 80C55EF0 90 1D 01 1C */ stw r0, 0x11c(r29) -/* 80C55EF4 3C 60 80 C5 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C56B54@ha */ -/* 80C55EF8 38 03 6B 54 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C56B54@l */ -/* 80C55EFC 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C55F00 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C55F04 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C55F08 90 7D 01 20 */ stw r3, 0x120(r29) -/* 80C55F0C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C55F10 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C55F14 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C55F18 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C55F1C 90 7D 00 3C */ stw r3, 0x3c(r29) -/* 80C55F20 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C55F24 90 1D 01 20 */ stw r0, 0x120(r29) -/* 80C55F28 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C55F2C 90 1D 01 38 */ stw r0, 0x138(r29) -/* 80C55F30 38 7F 07 34 */ addi r3, r31, 0x734 -/* 80C55F34 4B 66 89 11 */ bl __ct__16Z2SoundObjSimpleFv -lbl_80C55F38: -/* 80C55F38 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80C55F3C 60 00 00 08 */ ori r0, r0, 8 -/* 80C55F40 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80C55F44: -/* 80C55F44 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80C55F48 3C 80 80 C5 */ lis r4, d_a_obj_lv1Candle00__stringBase0@ha /* 0x80C56AB4@ha */ -/* 80C55F4C 38 84 6A B4 */ addi r4, r4, d_a_obj_lv1Candle00__stringBase0@l /* 0x80C56AB4@l */ -/* 80C55F50 4B 3D 6F 6D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C55F54 7C 7F 1B 78 */ mr r31, r3 -/* 80C55F58 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C55F5C 40 82 01 98 */ bne lbl_80C560F4 -/* 80C55F60 7F C3 F3 78 */ mr r3, r30 -/* 80C55F64 3C 80 80 C5 */ lis r4, createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c@ha /* 0x80C561A0@ha */ -/* 80C55F68 38 84 61 A0 */ addi r4, r4, createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c@l /* 0x80C561A0@l */ -/* 80C55F6C 38 A0 08 20 */ li r5, 0x820 -/* 80C55F70 4B 3C 45 41 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80C55F74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C55F78 40 82 00 0C */ bne lbl_80C55F84 -/* 80C55F7C 38 60 00 05 */ li r3, 5 -/* 80C55F80 48 00 01 78 */ b lbl_80C560F8 -lbl_80C55F84: -/* 80C55F84 7F C3 F3 78 */ mr r3, r30 -/* 80C55F88 4B FF FD F9 */ bl setBaseMtx__12daLv1Cdl00_cFv -/* 80C55F8C 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80C55F90 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C55F94 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C55F98 80 7E 05 70 */ lwz r3, 0x570(r30) -/* 80C55F9C 80 83 00 04 */ lwz r4, 4(r3) -/* 80C55FA0 7F C3 F3 78 */ mr r3, r30 -/* 80C55FA4 4B 3C 45 D5 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C55FA8 38 7E 05 74 */ addi r3, r30, 0x574 -/* 80C55FAC 38 80 00 FF */ li r4, 0xff -/* 80C55FB0 38 A0 00 FF */ li r5, 0xff -/* 80C55FB4 7F C6 F3 78 */ mr r6, r30 -/* 80C55FB8 4B 42 D8 A9 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C55FBC 38 7E 05 B0 */ addi r3, r30, 0x5b0 -/* 80C55FC0 3C 80 80 C5 */ lis r4, mCcDCyl__12daLv1Cdl00_c@ha /* 0x80C56AC0@ha */ -/* 80C55FC4 38 84 6A C0 */ addi r4, r4, mCcDCyl__12daLv1Cdl00_c@l /* 0x80C56AC0@l */ -/* 80C55FC8 4B 42 E8 ED */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C55FCC 38 1E 05 74 */ addi r0, r30, 0x574 -/* 80C55FD0 90 1E 05 F4 */ stw r0, 0x5f4(r30) -/* 80C55FD4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C55FD8 D0 1E 06 EC */ stfs f0, 0x6ec(r30) -/* 80C55FDC 3C 60 80 C5 */ lis r3, lit_3753@ha /* 0x80C56A80@ha */ -/* 80C55FE0 C0 23 6A 80 */ lfs f1, lit_3753@l(r3) /* 0x80C56A80@l */ -/* 80C55FE4 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C55FE8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C55FEC D0 1E 06 F0 */ stfs f0, 0x6f0(r30) -/* 80C55FF0 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C55FF4 D0 1E 06 F4 */ stfs f0, 0x6f4(r30) -/* 80C55FF8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C55FFC 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80C56000 98 1E 07 08 */ stb r0, 0x708(r30) -/* 80C56004 88 1E 07 08 */ lbz r0, 0x708(r30) -/* 80C56008 28 00 00 FF */ cmplwi r0, 0xff -/* 80C5600C 40 82 00 0C */ bne lbl_80C56018 -/* 80C56010 38 00 00 00 */ li r0, 0 -/* 80C56014 98 1E 07 08 */ stb r0, 0x708(r30) -lbl_80C56018: -/* 80C56018 7F C3 F3 78 */ mr r3, r30 -/* 80C5601C 48 00 01 A5 */ bl lightInit__12daLv1Cdl00_cFv -/* 80C56020 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C56024 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80C56028 98 1E 06 FA */ stb r0, 0x6fa(r30) -/* 80C5602C 88 1E 06 FA */ lbz r0, 0x6fa(r30) -/* 80C56030 28 00 00 FF */ cmplwi r0, 0xff -/* 80C56034 40 82 00 0C */ bne lbl_80C56040 -/* 80C56038 38 00 00 00 */ li r0, 0 -/* 80C5603C 98 1E 06 FA */ stb r0, 0x6fa(r30) -lbl_80C56040: -/* 80C56040 C0 1E 06 EC */ lfs f0, 0x6ec(r30) -/* 80C56044 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80C56048 C0 1E 06 F0 */ lfs f0, 0x6f0(r30) -/* 80C5604C D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80C56050 C0 1E 06 F4 */ lfs f0, 0x6f4(r30) -/* 80C56054 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80C56058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5605C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C56060 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C56064 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80C56068 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C5606C 7C 05 07 74 */ extsb r5, r0 -/* 80C56070 4B 3D F2 F1 */ bl isSwitch__10dSv_info_cCFii -/* 80C56074 98 7E 06 F9 */ stb r3, 0x6f9(r30) -/* 80C56078 38 00 00 00 */ li r0, 0 -/* 80C5607C 98 1E 06 F8 */ stb r0, 0x6f8(r30) -/* 80C56080 88 1E 06 FA */ lbz r0, 0x6fa(r30) -/* 80C56084 28 00 00 00 */ cmplwi r0, 0 -/* 80C56088 40 82 00 28 */ bne lbl_80C560B0 -/* 80C5608C 88 1E 06 F9 */ lbz r0, 0x6f9(r30) -/* 80C56090 28 00 00 00 */ cmplwi r0, 0 -/* 80C56094 41 82 00 3C */ beq lbl_80C560D0 -/* 80C56098 38 00 00 01 */ li r0, 1 -/* 80C5609C 98 1E 06 F8 */ stb r0, 0x6f8(r30) -/* 80C560A0 98 1E 06 25 */ stb r0, 0x625(r30) -/* 80C560A4 7F C3 F3 78 */ mr r3, r30 -/* 80C560A8 48 00 01 C1 */ bl setLight__12daLv1Cdl00_cFv -/* 80C560AC 48 00 00 24 */ b lbl_80C560D0 -lbl_80C560B0: -/* 80C560B0 88 1E 06 F9 */ lbz r0, 0x6f9(r30) -/* 80C560B4 28 00 00 00 */ cmplwi r0, 0 -/* 80C560B8 40 82 00 18 */ bne lbl_80C560D0 -/* 80C560BC 38 00 00 01 */ li r0, 1 -/* 80C560C0 98 1E 06 F8 */ stb r0, 0x6f8(r30) -/* 80C560C4 98 1E 06 25 */ stb r0, 0x625(r30) -/* 80C560C8 7F C3 F3 78 */ mr r3, r30 -/* 80C560CC 48 00 01 9D */ bl setLight__12daLv1Cdl00_cFv -lbl_80C560D0: -/* 80C560D0 38 7E 07 34 */ addi r3, r30, 0x734 -/* 80C560D4 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80C560D8 38 A0 00 01 */ li r5, 1 -/* 80C560DC 81 9E 07 44 */ lwz r12, 0x744(r30) -/* 80C560E0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C560E4 7D 89 03 A6 */ mtctr r12 -/* 80C560E8 4E 80 04 21 */ bctrl -/* 80C560EC 38 00 00 00 */ li r0, 0 -/* 80C560F0 98 1E 07 30 */ stb r0, 0x730(r30) -lbl_80C560F4: -/* 80C560F4 7F E3 FB 78 */ mr r3, r31 -lbl_80C560F8: -/* 80C560F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C560FC 4B 70 C1 2D */ bl _restgpr_29 -/* 80C56100 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C56104 7C 08 03 A6 */ mtlr r0 -/* 80C56108 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C5610C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/cutLight__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/cutLight__12daLv1Cdl00_cFv.s deleted file mode 100644 index 5b7b8837ed9..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/cutLight__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C562A0: -/* 80C562A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C562A4 7C 08 02 A6 */ mflr r0 -/* 80C562A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C562AC 88 03 07 08 */ lbz r0, 0x708(r3) -/* 80C562B0 28 00 00 01 */ cmplwi r0, 1 -/* 80C562B4 41 82 00 0C */ beq lbl_80C562C0 -/* 80C562B8 28 00 00 02 */ cmplwi r0, 2 -/* 80C562BC 40 82 00 0C */ bne lbl_80C562C8 -lbl_80C562C0: -/* 80C562C0 38 63 07 10 */ addi r3, r3, 0x710 -/* 80C562C4 4B 55 16 69 */ bl dKy_plight_cut__FP15LIGHT_INFLUENCE -lbl_80C562C8: -/* 80C562C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C562CC 7C 08 03 A6 */ mtlr r0 -/* 80C562D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C562D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 731c18b9e82..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C56950: -/* 80C56950 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56954 7C 08 02 A6 */ mflr r0 -/* 80C56958 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5695C 4B FF F5 19 */ bl create__12daLv1Cdl00_cFv -/* 80C56960 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56964 7C 08 03 A6 */ mtlr r0 -/* 80C56968 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5696C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Delete__FP12daLv1Cdl00_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Delete__FP12daLv1Cdl00_c.s deleted file mode 100644 index 57b0286af25..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Delete__FP12daLv1Cdl00_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C56930: -/* 80C56930 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56934 7C 08 02 A6 */ mflr r0 -/* 80C56938 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5693C 4B FF FF 55 */ bl Delete__12daLv1Cdl00_cFv -/* 80C56940 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56944 7C 08 03 A6 */ mtlr r0 -/* 80C56948 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5694C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Draw__FP12daLv1Cdl00_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Draw__FP12daLv1Cdl00_c.s deleted file mode 100644 index a60b2e8e72d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Draw__FP12daLv1Cdl00_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C568F0: -/* 80C568F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C568F4 7C 08 02 A6 */ mflr r0 -/* 80C568F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C568FC 4B FF FE F1 */ bl Draw__12daLv1Cdl00_cFv -/* 80C56900 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56904 7C 08 03 A6 */ mtlr r0 -/* 80C56908 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5690C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Execute__FP12daLv1Cdl00_c.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Execute__FP12daLv1Cdl00_c.s deleted file mode 100644 index a3f5a0d442e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Execute__FP12daLv1Cdl00_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C56910: -/* 80C56910 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C56914 7C 08 02 A6 */ mflr r0 -/* 80C56918 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5691C 4B FF FA 6D */ bl Execute__12daLv1Cdl00_cFv -/* 80C56920 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56924 7C 08 03 A6 */ mtlr r0 -/* 80C56928 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5692C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/lightInit__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/lightInit__12daLv1Cdl00_cFv.s deleted file mode 100644 index d13a05d1455..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/lightInit__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80C561C0: -/* 80C561C0 3C 80 80 C5 */ lis r4, mCcDObjInfo__12daLv1Cdl00_c@ha /* 0x80C56A50@ha */ -/* 80C561C4 38 84 6A 50 */ addi r4, r4, mCcDObjInfo__12daLv1Cdl00_c@l /* 0x80C56A50@l */ -/* 80C561C8 C0 03 06 EC */ lfs f0, 0x6ec(r3) -/* 80C561CC D0 03 06 FC */ stfs f0, 0x6fc(r3) -/* 80C561D0 C0 03 06 F0 */ lfs f0, 0x6f0(r3) -/* 80C561D4 D0 03 07 00 */ stfs f0, 0x700(r3) -/* 80C561D8 C0 03 06 F4 */ lfs f0, 0x6f4(r3) -/* 80C561DC D0 03 07 04 */ stfs f0, 0x704(r3) -/* 80C561E0 C0 23 07 00 */ lfs f1, 0x700(r3) -/* 80C561E4 C0 04 00 34 */ lfs f0, 0x34(r4) -/* 80C561E8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C561EC D0 03 07 00 */ stfs f0, 0x700(r3) -/* 80C561F0 88 03 07 08 */ lbz r0, 0x708(r3) -/* 80C561F4 28 00 00 01 */ cmplwi r0, 1 -/* 80C561F8 41 82 00 0C */ beq lbl_80C56204 -/* 80C561FC 28 00 00 02 */ cmplwi r0, 2 -/* 80C56200 40 82 00 5C */ bne lbl_80C5625C -lbl_80C56204: -/* 80C56204 C0 03 06 FC */ lfs f0, 0x6fc(r3) -/* 80C56208 D0 03 07 10 */ stfs f0, 0x710(r3) -/* 80C5620C C0 03 07 00 */ lfs f0, 0x700(r3) -/* 80C56210 D0 03 07 14 */ stfs f0, 0x714(r3) -/* 80C56214 C0 03 07 04 */ lfs f0, 0x704(r3) -/* 80C56218 D0 03 07 18 */ stfs f0, 0x718(r3) -/* 80C5621C 38 00 00 BC */ li r0, 0xbc -/* 80C56220 B0 03 07 1C */ sth r0, 0x71c(r3) -/* 80C56224 38 00 00 66 */ li r0, 0x66 -/* 80C56228 B0 03 07 1E */ sth r0, 0x71e(r3) -/* 80C5622C 38 00 00 42 */ li r0, 0x42 -/* 80C56230 B0 03 07 20 */ sth r0, 0x720(r3) -/* 80C56234 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80C56238 D0 03 07 24 */ stfs f0, 0x724(r3) -/* 80C5623C C0 04 00 3C */ lfs f0, 0x3c(r4) -/* 80C56240 D0 03 07 28 */ stfs f0, 0x728(r3) -/* 80C56244 88 03 07 08 */ lbz r0, 0x708(r3) -/* 80C56248 28 00 00 02 */ cmplwi r0, 2 -/* 80C5624C 4C 82 00 20 */ bnelr -/* 80C56250 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 80C56254 D0 03 07 0C */ stfs f0, 0x70c(r3) -/* 80C56258 4E 80 00 20 */ blr -lbl_80C5625C: -/* 80C5625C C0 04 00 40 */ lfs f0, 0x40(r4) -/* 80C56260 D0 03 07 0C */ stfs f0, 0x70c(r3) -/* 80C56264 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/pointLightProc__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/pointLightProc__12daLv1Cdl00_cFv.s deleted file mode 100644 index 4e0b0921e53..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/pointLightProc__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80C562D8: -/* 80C562D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C562DC 7C 08 02 A6 */ mflr r0 -/* 80C562E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C562E4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C562E8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C562EC 7C 7E 1B 78 */ mr r30, r3 -/* 80C562F0 3C 60 80 C5 */ lis r3, mCcDObjInfo__12daLv1Cdl00_c@ha /* 0x80C56A50@ha */ -/* 80C562F4 3B E3 6A 50 */ addi r31, r3, mCcDObjInfo__12daLv1Cdl00_c@l /* 0x80C56A50@l */ -/* 80C562F8 88 1E 07 08 */ lbz r0, 0x708(r30) -/* 80C562FC 28 00 00 01 */ cmplwi r0, 1 -/* 80C56300 41 82 00 70 */ beq lbl_80C56370 -/* 80C56304 80 1F 00 44 */ lwz r0, 0x44(r31) -/* 80C56308 90 01 00 08 */ stw r0, 8(r1) -/* 80C5630C 88 1E 06 F8 */ lbz r0, 0x6f8(r30) -/* 80C56310 28 00 00 00 */ cmplwi r0, 0 -/* 80C56314 41 82 00 20 */ beq lbl_80C56334 -/* 80C56318 38 7E 07 0C */ addi r3, r30, 0x70c -/* 80C5631C C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80C56320 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80C56324 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80C56328 C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 80C5632C 4B 61 96 51 */ bl cLib_addCalc__FPfffff -/* 80C56330 48 00 00 1C */ b lbl_80C5634C -lbl_80C56334: -/* 80C56334 38 7E 07 0C */ addi r3, r30, 0x70c -/* 80C56338 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 80C5633C C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80C56340 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80C56344 C0 9F 00 50 */ lfs f4, 0x50(r31) -/* 80C56348 4B 61 96 35 */ bl cLib_addCalc__FPfffff -lbl_80C5634C: -/* 80C5634C C0 3E 07 0C */ lfs f1, 0x70c(r30) -/* 80C56350 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80C56354 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C56358 4C 41 13 82 */ cror 2, 1, 2 -/* 80C5635C 40 82 00 14 */ bne lbl_80C56370 -/* 80C56360 38 7E 06 FC */ addi r3, r30, 0x6fc -/* 80C56364 38 81 00 08 */ addi r4, r1, 8 -/* 80C56368 38 A0 00 00 */ li r5, 0 -/* 80C5636C 4B 55 39 F5 */ bl dKy_BossLight_set__FP4cXyzP8_GXColorfUc -lbl_80C56370: -/* 80C56370 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C56374 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C56378 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C5637C 7C 08 03 A6 */ mtlr r0 -/* 80C56380 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C56384 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setBaseMtx__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setBaseMtx__12daLv1Cdl00_cFv.s deleted file mode 100644 index 709b792025f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setBaseMtx__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C55D80: -/* 80C55D80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C55D84 7C 08 02 A6 */ mflr r0 -/* 80C55D88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C55D8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C55D90 7C 7F 1B 78 */ mr r31, r3 -/* 80C55D94 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C55D98 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C55D9C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C55DA0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C55DA4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C55DA8 4B 6F 0B 41 */ bl PSMTXTrans -/* 80C55DAC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C55DB0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C55DB4 A8 9F 04 DC */ lha r4, 0x4dc(r31) -/* 80C55DB8 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80C55DBC A8 DF 04 E0 */ lha r6, 0x4e0(r31) -/* 80C55DC0 4B 3B 64 E1 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C55DC4 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80C55DC8 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C55DCC D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C55DD0 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C55DD4 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C55DD8 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C55DDC D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C55DE0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C55DE4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C55DE8 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80C55DEC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C55DF0 4B 6F 06 C1 */ bl PSMTXCopy -/* 80C55DF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C55DF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C55DFC 7C 08 03 A6 */ mtlr r0 -/* 80C55E00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C55E04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setLight__12daLv1Cdl00_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setLight__12daLv1Cdl00_cFv.s deleted file mode 100644 index 9ca0c514e4e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setLight__12daLv1Cdl00_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C56268: -/* 80C56268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5626C 7C 08 02 A6 */ mflr r0 -/* 80C56270 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C56274 88 03 07 08 */ lbz r0, 0x708(r3) -/* 80C56278 28 00 00 01 */ cmplwi r0, 1 -/* 80C5627C 41 82 00 0C */ beq lbl_80C56288 -/* 80C56280 28 00 00 02 */ cmplwi r0, 2 -/* 80C56284 40 82 00 0C */ bne lbl_80C56290 -lbl_80C56288: -/* 80C56288 38 63 07 10 */ addi r3, r3, 0x710 -/* 80C5628C 4B 55 15 05 */ bl dKy_plight_set__FP15LIGHT_INFLUENCE -lbl_80C56290: -/* 80C56290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C56294 7C 08 03 A6 */ mtlr r0 -/* 80C56298 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5629C 4E 80 00 20 */ blr 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 dbc70f4534b..8044f34cd01 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 @@ -1,6 +1,54 @@ #ifndef D_A_OBJ_LV1CANDLE00_H #define D_A_OBJ_LV1CANDLE00_H +#include "SSystem/SComponent/c_phase.h" +#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: + /* 80C55D0C */ daLv1Cdl00_HIO_c(); + /* 80C56970 */ ~daLv1Cdl00_HIO_c() {} + + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 field_0x5; +}; + +class daLv1Cdl00_c : public fopAc_ac_c { +public: + /* 80C55D80 */ void setBaseMtx(); + /* 80C55E08 */ int CreateHeap(); + /* 80C55E74 */ cPhs__Step create(); + /* 80C561A0 */ static int createHeapCallBack(fopAc_ac_c*); + /* 80C561C0 */ void lightInit(); + /* 80C56268 */ void setLight(); + /* 80C562A0 */ void cutLight(); + /* 80C562D8 */ void pointLightProc(); + /* 80C56388 */ int Execute(); + /* 80C567EC */ int Draw(); + /* 80C56890 */ int Delete(); + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mpModel; + /* 0x574 */ dCcD_Stts mStts; + /* 0x5B0 */ dCcD_Cyl mCyl; + /* 0x6EC */ cXyz mTorchPos; + /* 0x6F8 */ bool mIsOn; + /* 0x6F9 */ u8 mSwitch; + /* 0x6FA */ u8 mStartsOn; + /* 0x6FC */ cXyz mLightPos; + /* 0x708 */ u8 field_0x708; + /* 0x70C */ f32 field_0x70c; + /* 0x710 */ LIGHT_INFLUENCE mLight; + /* 0x730 */ u8 field_0x730; + /* 0x734 */ Z2SoundObjSimple mSound; + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; +}; + +STATIC_ASSERT(sizeof(daLv1Cdl00_c) == 0x754); + #endif /* D_A_OBJ_LV1CANDLE00_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 b6ba25121ba..0e078c4a9c2 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 @@ -4,638 +4,314 @@ // #include "rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.h" -#include "dol2asm.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" -// -// Types: -// +/* 80C56B9C-80C56BA4 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ +static daLv1Cdl00_HIO_c l_HIO; -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C55D38 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daLv1Cdl00_c { - /* 80C55D80 */ void setBaseMtx(); - /* 80C55E08 */ void CreateHeap(); - /* 80C55E74 */ void create(); - /* 80C561A0 */ void createHeapCallBack(fopAc_ac_c*); - /* 80C561C0 */ void lightInit(); - /* 80C56268 */ void setLight(); - /* 80C562A0 */ void cutLight(); - /* 80C562D8 */ void pointLightProc(); - /* 80C56388 */ void Execute(); - /* 80C567EC */ void Draw(); - /* 80C56890 */ void Delete(); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daLv1Cdl00_HIO_c { - /* 80C55D0C */ daLv1Cdl00_HIO_c(); - /* 80C56970 */ ~daLv1Cdl00_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); - /* 80C56110 */ ~cM3dGCyl(); -}; - -struct cM3dGAab { - /* 80C56158 */ ~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__16daLv1Cdl00_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daLv1Cdl00_cFv(); -extern "C" void CreateHeap__12daLv1Cdl00_cFv(); -extern "C" void create__12daLv1Cdl00_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c(); -extern "C" void lightInit__12daLv1Cdl00_cFv(); -extern "C" void setLight__12daLv1Cdl00_cFv(); -extern "C" void cutLight__12daLv1Cdl00_cFv(); -extern "C" void pointLightProc__12daLv1Cdl00_cFv(); -extern "C" void Execute__12daLv1Cdl00_cFv(); -extern "C" void Draw__12daLv1Cdl00_cFv(); -extern "C" void Delete__12daLv1Cdl00_cFv(); -extern "C" static void daLv1Cdl00_Draw__FP12daLv1Cdl00_c(); -extern "C" static void daLv1Cdl00_Execute__FP12daLv1Cdl00_c(); -extern "C" static void daLv1Cdl00_Delete__FP12daLv1Cdl00_c(); -extern "C" static void daLv1Cdl00_Create__FP10fopAc_ac_c(); -extern "C" void __dt__16daLv1Cdl00_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv1Candle00_cpp(); -extern "C" u8 const mCcDObjInfo__12daLv1Cdl00_c[48]; -extern "C" extern char const* const d_a_obj_lv1Candle00__stringBase0; -extern "C" u8 mCcDCyl__12daLv1Cdl00_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 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: -// - -/* ############################################################################################## */ -/* 80C56AC0-80C56B04 000000 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daLv1Cdl00_c */ -SECTION_DATA u8 daLv1Cdl00_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, -}; - -/* 80C56B04-80C56B24 -00001 0020+00 1/0 0/0 0/0 .data l_daLv1Cdl00_Method */ -SECTION_DATA static void* l_daLv1Cdl00_Method[8] = { - (void*)daLv1Cdl00_Create__FP10fopAc_ac_c, - (void*)daLv1Cdl00_Delete__FP12daLv1Cdl00_c, - (void*)daLv1Cdl00_Execute__FP12daLv1Cdl00_c, - (void*)NULL, - (void*)daLv1Cdl00_Draw__FP12daLv1Cdl00_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C56B24-80C56B54 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv1Cdl00 */ -SECTION_DATA extern void* g_profile_Obj_Lv1Cdl00[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00390000, (void*)&g_fpcLf_Method, - (void*)0x00000754, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01EE0000, (void*)&l_daLv1Cdl00_Method, - (void*)0x00060000, (void*)0x000E0000, -}; - -/* 80C56B54-80C56B60 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, -}; - -/* 80C56B60-80C56B6C 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, -}; - -/* 80C56B6C-80C56B78 0000AC 000C+00 2/2 0/0 0/0 .data __vt__16daLv1Cdl00_HIO_c */ -SECTION_DATA extern void* __vt__16daLv1Cdl00_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daLv1Cdl00_HIO_cFv, -}; - -/* 80C56B78-80C56B84 0000B8 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, +/* 80C56A50-80C56A80 000000 0030+00 4/4 0/0 0/0 .rodata mCcDObjInfo__12daLv1Cdl00_c */ +dCcD_SrcGObjInf const daLv1Cdl00_c::mCcDObjInfo = { + { + 0, { + {0x200, 0, 0x13}, + {0xd8fbffff, 0x1f}, + {0x79} + } + }, + {1, 0, 0, 0, 0}, + {0xa, 0, 0, 0, 6}, + {0}, }; /* 80C55D0C-80C55D38 0000EC 002C+00 1/1 0/0 0/0 .text __ct__16daLv1Cdl00_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__ct__16daLv1Cdl00_HIO_cFv.s" -} -#pragma pop +daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() : + field_0x4(60), + field_0x5(1) + {} -/* 80C55D38-80C55D80 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_lv1Candle00/d_a_obj_lv1Candle00/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop +/* 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} +}; /* 80C55D80-80C55E08 000160 0088+00 2/2 0/0 0/0 .text setBaseMtx__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setBaseMtx__12daLv1Cdl00_cFv.s" +void daLv1Cdl00_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 - -/* ############################################################################################## */ -/* 80C56AB4-80C56AB4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C56AB4 = "lv1cdl00"; -#pragma pop /* 80C55E08-80C55E74 0001E8 006C+00 1/1 0/0 0/0 .text CreateHeap__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/CreateHeap__12daLv1Cdl00_cFv.s" +int daLv1Cdl00_c::CreateHeap() { + J3DModelData* bmd = (J3DModelData*)dComIfG_getObjectRes("lv1cdl00", 4); + mpModel = mDoExt_J3DModel__create(bmd, 0x80000, 0x11000084); + if (mpModel == NULL) { + return false; + } + return true; } -#pragma pop - -/* ############################################################################################## */ -/* 80C56A50-80C56A80 000000 0030+00 4/4 0/0 0/0 .rodata mCcDObjInfo__12daLv1Cdl00_c */ -SECTION_RODATA u8 const daLv1Cdl00_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(0x80C56A50, &daLv1Cdl00_c::mCcDObjInfo); - -/* 80C56A80-80C56A84 000030 0004+00 1/1 0/0 0/0 .rodata @3753 */ -SECTION_RODATA static f32 const lit_3753 = 120.0f; -COMPILER_STRIP_GATE(0x80C56A80, &lit_3753); /* 80C55E74-80C56110 000254 029C+00 1/1 0/0 0/0 .text create__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/create__12daLv1Cdl00_cFv.s" +cPhs__Step daLv1Cdl00_c::create() { + fopAcM_SetupActor(this, daLv1Cdl00_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "lv1cdl00"); + if (step == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x820)) { + 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 + 120.0f; + mTorchPos.z = current.pos.z; + field_0x708 = fopAcM_GetParam(this) >> 16; + if (field_0x708 == 0xff) { + field_0x708 = 0; + } + lightInit(); + mStartsOn = fopAcM_GetParam(this) >> 8; + if (mStartsOn == 0xff) { + mStartsOn = 0; + } + mEyePos = mTorchPos; + mSwitch = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + mIsOn = false; + if (!mStartsOn) { + if (mSwitch) { + mIsOn = true; + mCyl.SetAtMtrl(1); + setLight(); + } + } else { + if (!mSwitch) { + mIsOn = true; + mCyl.SetAtMtrl(1); + setLight(); + } + } + mSound.init(¤t.pos, 1); + field_0x730 = 0; + } + return step; } -#pragma pop - -/* 80C56110-80C56158 0004F0 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_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C56158-80C561A0 000538 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_lv1Candle00/d_a_obj_lv1Candle00/__dt__8cM3dGAabFv.s" -} -#pragma pop /* 80C561A0-80C561C0 000580 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c.s" +int daLv1Cdl00_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80C56A84-80C56A88 000034 0004+00 0/1 0/0 0/0 .rodata @3847 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3847 = 10.0f; -COMPILER_STRIP_GATE(0x80C56A84, &lit_3847); -#pragma pop - -/* 80C56A88-80C56A8C 000038 0004+00 0/1 0/0 0/0 .rodata @3848 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3848 = 500.0f; -COMPILER_STRIP_GATE(0x80C56A88, &lit_3848); -#pragma pop - -/* 80C56A8C-80C56A90 00003C 0004+00 0/3 0/0 0/0 .rodata @3849 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3849 = 1.0f; -COMPILER_STRIP_GATE(0x80C56A8C, &lit_3849); -#pragma pop - -/* 80C56A90-80C56A94 000040 0004+00 0/3 0/0 0/0 .rodata @3850 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3850[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C56A90, &lit_3850); -#pragma pop /* 80C561C0-80C56268 0005A0 00A8+00 1/1 0/0 0/0 .text lightInit__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::lightInit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/lightInit__12daLv1Cdl00_cFv.s" +void daLv1Cdl00_c::lightInit() { + mLightPos = mTorchPos; + mLightPos.y += 10.0f; + if (field_0x708 == 1 || field_0x708 == 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; + } + } else { + field_0x70c = 0.0f; + } } -#pragma pop /* 80C56268-80C562A0 000648 0038+00 2/2 0/0 0/0 .text setLight__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::setLight() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/setLight__12daLv1Cdl00_cFv.s" +void daLv1Cdl00_c::setLight() { + if (field_0x708 == 1 || field_0x708 == 2) { + dKy_plight_set(&mLight); + } } -#pragma pop /* 80C562A0-80C562D8 000680 0038+00 1/1 0/0 0/0 .text cutLight__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::cutLight() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/cutLight__12daLv1Cdl00_cFv.s" +void daLv1Cdl00_c::cutLight() { + if (field_0x708 == 1 || field_0x708 == 2) { + dKy_plight_cut(&mLight); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C56A94-80C56A98 000044 0004+00 0/1 0/0 0/0 .rodata @3872 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3872 = 0xBC6642FF; -COMPILER_STRIP_GATE(0x80C56A94, &lit_3872); -#pragma pop - -/* 80C56A98-80C56A9C 000048 0004+00 0/1 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3880 = 0.5f; -COMPILER_STRIP_GATE(0x80C56A98, &lit_3880); -#pragma pop - -/* 80C56A9C-80C56AA0 00004C 0004+00 0/1 0/0 0/0 .rodata @3881 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3881 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C56A9C, &lit_3881); -#pragma pop - -/* 80C56AA0-80C56AA4 000050 0004+00 0/1 0/0 0/0 .rodata @3882 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3882 = 0x38D1B717; -COMPILER_STRIP_GATE(0x80C56AA0, &lit_3882); -#pragma pop - -/* 80C56AA4-80C56AA8 000054 0004+00 0/1 0/0 0/0 .rodata @3883 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3883 = 0x358637BD; -COMPILER_STRIP_GATE(0x80C56AA4, &lit_3883); -#pragma pop /* 80C562D8-80C56388 0006B8 00B0+00 1/1 0/0 0/0 .text pointLightProc__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::pointLightProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/pointLightProc__12daLv1Cdl00_cFv.s" +void daLv1Cdl00_c::pointLightProc() { + if (field_0x708 != 1) { + GXColor color = { 0xbc, 0x66, 0x42, 0xff }; + if (mIsOn) { + cLib_addCalc(&field_0x70c, 1.0f, 0.5f, 0.1f, 0.0001f); + } else { + cLib_addCalc(&field_0x70c, 0.0f, 0.5f, 0.1f, 0.0001f); + } + if (field_0x70c >= 1e-6f) { + dKy_BossLight_set(&mLightPos, &color, field_0x70c, 0); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80C56AA8-80C56AAC 000058 0004+00 0/1 0/0 0/0 .rodata @4006 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4006 = -1.0f; -COMPILER_STRIP_GATE(0x80C56AA8, &lit_4006); -#pragma pop - -/* 80C56AAC-80C56AB0 00005C 0004+00 0/1 0/0 0/0 .rodata @4007 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4007 = 25.0f; -COMPILER_STRIP_GATE(0x80C56AAC, &lit_4007); -#pragma pop - -/* 80C56AB0-80C56AB4 000060 0004+00 0/1 0/0 0/0 .rodata @4008 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4008 = 130.0f; -COMPILER_STRIP_GATE(0x80C56AB0, &lit_4008); -#pragma pop /* 80C56388-80C567EC 000768 0464+00 1/1 0/0 0/0 .text Execute__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Execute__12daLv1Cdl00_cFv.s" +int daLv1Cdl00_c::Execute() { + u8 sw = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + if (mSwitch != sw) { + mIsOn = false; + mCyl.SetAtMtrl(0); + cutLight(); + if (!mStartsOn) { + if (sw) { + mIsOn = true; + mCyl.SetAtMtrl(1); + setLight(); + } + } else { + if (!sw) { + mIsOn = true; + mCyl.SetAtMtrl(1); + setLight(); + } + } + mSwitch = sw; + } + + if (mIsOn) { + 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 && !mIsOn) { + mIsOn = true; + mCyl.SetAtMtrl(1); + if (!mStartsOn) { + i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + } else { + i_fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); + } + mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + setLight(); + } + if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == 3 && mIsOn == true) { + mIsOn = false; + mCyl.SetAtMtrl(0); + if (!mStartsOn) { + i_fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); + } else { + i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + } + 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) && field_0x730) { + bvar1 = false; + } + } + if (bvar1) { + mSound.startCollisionSE(mCyl.GetTgHitObjHitSeID(1), 5, NULL); + field_0x730 = true; + } + } + } else { + field_0x730 = 0; + } + + 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 /* 80C567EC-80C56890 000BCC 00A4+00 1/1 0/0 0/0 .text Draw__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Draw__12daLv1Cdl00_cFv.s" +int daLv1Cdl00_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 /* 80C56890-80C568F0 000C70 0060+00 1/1 0/0 0/0 .text Delete__12daLv1Cdl00_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv1Cdl00_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/Delete__12daLv1Cdl00_cFv.s" +int daLv1Cdl00_c::Delete() { + mSound.deleteObject(); + dComIfG_resDelete(&mPhase, "lv1cdl00"); + if (field_0x708 == 1 || field_0x708 == 2) { + dKy_plight_cut(&mLight); + } + return true; } -#pragma pop /* 80C568F0-80C56910 000CD0 0020+00 1/0 0/0 0/0 .text daLv1Cdl00_Draw__FP12daLv1Cdl00_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl00_Draw(daLv1Cdl00_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Draw__FP12daLv1Cdl00_c.s" +static int daLv1Cdl00_Draw(daLv1Cdl00_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80C56910-80C56930 000CF0 0020+00 1/0 0/0 0/0 .text daLv1Cdl00_Execute__FP12daLv1Cdl00_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl00_Execute(daLv1Cdl00_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Execute__FP12daLv1Cdl00_c.s" +static int daLv1Cdl00_Execute(daLv1Cdl00_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 80C56930-80C56950 000D10 0020+00 1/0 0/0 0/0 .text daLv1Cdl00_Delete__FP12daLv1Cdl00_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl00_Delete(daLv1Cdl00_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Delete__FP12daLv1Cdl00_c.s" +static int daLv1Cdl00_Delete(daLv1Cdl00_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80C56950-80C56970 000D30 0020+00 1/0 0/0 0/0 .text daLv1Cdl00_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv1Cdl00_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/daLv1Cdl00_Create__FP10fopAc_ac_c.s" +static int daLv1Cdl00_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80C56970-80C569CC 000D50 005C+00 2/1 0/0 0/0 .text __dt__16daLv1Cdl00_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv1Cdl00_HIO_c::~daLv1Cdl00_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__dt__16daLv1Cdl00_HIO_cFv.s" -} -#pragma pop +/* 80C56B04-80C56B24 -00001 0020+00 1/0 0/0 0/0 .data l_daLv1Cdl00_Method */ +static actor_method_class l_daLv1Cdl00_Method = { + (process_method_func)daLv1Cdl00_Create, + (process_method_func)daLv1Cdl00_Delete, + (process_method_func)daLv1Cdl00_Execute, + (process_method_func)NULL, + (process_method_func)daLv1Cdl00_Draw, +}; -/* ############################################################################################## */ -/* 80C56B90-80C56B9C 000008 000C+00 1/1 0/0 0/0 .bss @3620 */ -static u8 lit_3620[12]; - -/* 80C56B9C-80C56BA4 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; - -/* 80C569CC-80C56A3C 000DAC 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv1Candle00_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lv1Candle00_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00/__sinit_d_a_obj_lv1Candle00_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C569CC, __sinit_d_a_obj_lv1Candle00_cpp); -#pragma pop - -/* 80C56AB4-80C56AB4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C56B24-80C56B54 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv1Cdl00 */ +extern actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_Obj_Lv1Cdl00, + &g_fpcLf_Method.mBase, + sizeof(daLv1Cdl00_c), + 0, + 0, + &g_fopAc_Method.base, + 0x1EE, + &l_daLv1Cdl00_Method, + 0x60000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; \ No newline at end of file