diff --git a/Progress.md b/Progress.md index 552b541711..b6d09f4940 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 55.945374% | 2249380 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 55.945374% | 2249380 | 4020672 -RELs | 38.946451% | 4478968 | 11500324 -Total | 43.349976% | 6728348 | 15520996 +RELs | 39.141193% | 4501364 | 11500324 +Total | 43.494271% | 6750744 | 15520996 ## RELs @@ -506,10 +506,10 @@ d_a_obj_lv4gear | 100.000000% | 2604 | 2604 d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 d_a_obj_lv4prwall | 38.593750% | 1976 | 5120 d_a_obj_lv4sand | 46.461825% | 1996 | 4296 -d_a_obj_lv5FloorBoard | 47.577093% | 2592 | 5448 -d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 -d_a_obj_lv5SwIce | 46.408046% | 2584 | 5568 -d_a_obj_lv5ychndlr | 40.267765% | 3128 | 7768 +d_a_obj_lv5FloorBoard | 100.000000% | 5448 | 5448 +d_a_obj_lv5IceWall | 100.000000% | 7672 | 7672 +d_a_obj_lv5SwIce | 100.000000% | 5568 | 5568 +d_a_obj_lv5ychndlr | 100.000000% | 7768 | 7768 d_a_obj_lv5yiblltray | 100.000000% | 11388 | 11388 d_a_obj_lv6ChangeGate | 41.732283% | 3816 | 9144 d_a_obj_lv6FurikoTrap | 45.967742% | 2736 | 5952 @@ -707,7 +707,7 @@ d_a_tag_CstaSw | 100.000000% | 2560 | 2560 d_a_tag_Lv6Gate | 71.494786% | 4936 | 6904 d_a_tag_Lv7Gate | 100.000000% | 6296 | 6296 d_a_tag_Lv8Gate | 100.000000% | 3848 | 3848 -d_a_tag_TWgate | 57.593007% | 11332 | 19676 +d_a_tag_TWgate | 61.150640% | 12032 | 19676 d_a_tag_ajnot | 100.000000% | 1232 | 1232 d_a_tag_allmato | 30.234070% | 3720 | 12304 d_a_tag_arena | 100.000000% | 712 | 712 @@ -718,7 +718,7 @@ d_a_tag_bottle_item | 100.000000% | 2656 | 2656 d_a_tag_camera | 37.023593% | 1632 | 4408 d_a_tag_chgrestart | 100.000000% | 1768 | 1768 d_a_tag_chkpoint | 100.000000% | 2168 | 2168 -d_a_tag_csw | 35.869565% | 3696 | 10304 +d_a_tag_csw | 100.000000% | 10304 | 10304 d_a_tag_escape | 100.000000% | 712 | 712 d_a_tag_event | 100.000000% | 4016 | 4016 d_a_tag_evt | 100.000000% | 4284 | 4284 @@ -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 | 38.946451% | 4478968 | 11500324 +Total | 39.141193% | 4501364 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/CreateHeap__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/CreateHeap__12daFlorBoad_cFv.s deleted file mode 100644 index 4b4aa41c78..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/CreateHeap__12daFlorBoad_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C6A784: -/* 80C6A784 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6A788 7C 08 02 A6 */ mflr r0 -/* 80C6A78C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6A790 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6A794 7C 7F 1B 78 */ mr r31, r3 -/* 80C6A798 3C 60 80 C7 */ lis r3, d_a_obj_lv5FloorBoard__stringBase0@ha /* 0x80C6B18C@ha */ -/* 80C6A79C 38 63 B1 8C */ addi r3, r3, d_a_obj_lv5FloorBoard__stringBase0@l /* 0x80C6B18C@l */ -/* 80C6A7A0 38 80 00 04 */ li r4, 4 -/* 80C6A7A4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6A7A8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6A7AC 3C A5 00 02 */ addis r5, r5, 2 -/* 80C6A7B0 38 C0 00 80 */ li r6, 0x80 -/* 80C6A7B4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C6A7B8 4B 3D 1B 35 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6A7BC 3C 80 00 08 */ lis r4, 8 -/* 80C6A7C0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C6A7C4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6A7C8 4B 3A A4 8D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6A7CC 90 7F 07 20 */ stw r3, 0x720(r31) -/* 80C6A7D0 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6A7D4 30 03 FF FF */ addic r0, r3, -1 -/* 80C6A7D8 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C6A7DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6A7E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6A7E4 7C 08 03 A6 */ mtlr r0 -/* 80C6A7E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6A7EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Delete__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Delete__12daFlorBoad_cFv.s deleted file mode 100644 index db65be534b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Delete__12daFlorBoad_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C6AF54: -/* 80C6AF54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AF58 7C 08 02 A6 */ mflr r0 -/* 80C6AF5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AF60 3C 80 80 C7 */ lis r4, d_a_obj_lv5FloorBoard__stringBase0@ha /* 0x80C6B18C@ha */ -/* 80C6AF64 38 84 B1 8C */ addi r4, r4, d_a_obj_lv5FloorBoard__stringBase0@l /* 0x80C6B18C@l */ -/* 80C6AF68 38 63 07 18 */ addi r3, r3, 0x718 -/* 80C6AF6C 4B 3C 20 9D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C6AF70 38 60 00 01 */ li r3, 1 -/* 80C6AF74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AF78 7C 08 03 A6 */ mtlr r0 -/* 80C6AF7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AF80 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Draw__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Draw__12daFlorBoad_cFv.s deleted file mode 100644 index 0272bf12c4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Draw__12daFlorBoad_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C6AEB0: -/* 80C6AEB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AEB4 7C 08 02 A6 */ mflr r0 -/* 80C6AEB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AEBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6AEC0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6AEC4 7C 7E 1B 78 */ mr r30, r3 -/* 80C6AEC8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6AECC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6AED0 38 80 00 10 */ li r4, 0x10 -/* 80C6AED4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C6AED8 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C6AEDC 4B 53 88 E9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C6AEE0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6AEE4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6AEE8 80 9E 07 20 */ lwz r4, 0x720(r30) -/* 80C6AEEC 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6AEF0 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C6AEF4 4B 53 9E AD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C6AEF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6AEFC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6AF00 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C6AF04 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C6AF08 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C6AF0C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C6AF10 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C6AF14 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C6AF18 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80C6AF1C 4B 3A 2D A9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C6AF20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6AF24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6AF28 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C6AF2C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C6AF30 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C6AF34 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C6AF38 38 60 00 01 */ li r3, 1 -/* 80C6AF3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6AF40 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6AF44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AF48 7C 08 03 A6 */ mtlr r0 -/* 80C6AF4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AF50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Execute__12daFlorBoad_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Execute__12daFlorBoad_cFPPA3_A4_f.s deleted file mode 100644 index c3fa6e7ad6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Execute__12daFlorBoad_cFPPA3_A4_f.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80C6AAAC: -/* 80C6AAAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AAB0 7C 08 02 A6 */ mflr r0 -/* 80C6AAB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AAB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6AABC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6AAC0 7C 7E 1B 78 */ mr r30, r3 -/* 80C6AAC4 7C 9F 23 78 */ mr r31, r4 -/* 80C6AAC8 48 00 00 3D */ bl procMain__12daFlorBoad_cFv -/* 80C6AACC 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80C6AAD0 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C6AAD4 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6AAD8 7F C3 F3 78 */ mr r3, r30 -/* 80C6AADC 4B FF FC 21 */ bl setBaseMtx__12daFlorBoad_cFv -/* 80C6AAE0 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C6AAE4 4B 41 8D 4D */ bl Move__10dCcD_GSttsFv -/* 80C6AAE8 38 60 00 01 */ li r3, 1 -/* 80C6AAEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6AAF0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6AAF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AAF8 7C 08 03 A6 */ mtlr r0 -/* 80C6AAFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AB00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__ct__16daFlorBoad_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__ct__16daFlorBoad_HIO_cFv.s deleted file mode 100644 index 9559f58576..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__ct__16daFlorBoad_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6A60C: -/* 80C6A60C 3C 80 80 C7 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C6B2EC@ha */ -/* 80C6A610 38 04 B2 EC */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C6B2EC@l */ -/* 80C6A614 90 03 00 00 */ stw r0, 0(r3) -/* 80C6A618 3C 80 80 C7 */ lis r4, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6B2E0@ha */ -/* 80C6A61C 38 04 B2 E0 */ addi r0, r4, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6B2E0@l */ -/* 80C6A620 90 03 00 00 */ stw r0, 0(r3) -/* 80C6A624 3C 80 80 C7 */ lis r4, __vt__16daFlorBoad_HIO_c@ha /* 0x80C6B2D4@ha */ -/* 80C6A628 38 04 B2 D4 */ addi r0, r4, __vt__16daFlorBoad_HIO_c@l /* 0x80C6B2D4@l */ -/* 80C6A62C 90 03 00 00 */ stw r0, 0(r3) -/* 80C6A630 38 00 00 03 */ li r0, 3 -/* 80C6A634 98 03 00 10 */ stb r0, 0x10(r3) -/* 80C6A638 38 00 00 02 */ li r0, 2 -/* 80C6A63C 98 03 00 11 */ stb r0, 0x11(r3) -/* 80C6A640 3C 80 80 C7 */ lis r4, lit_3656@ha /* 0x80C6B148@ha */ -/* 80C6A644 C0 04 B1 48 */ lfs f0, lit_3656@l(r4) /* 0x80C6B148@l */ -/* 80C6A648 D0 03 00 04 */ stfs f0, 4(r3) -/* 80C6A64C D0 03 00 08 */ stfs f0, 8(r3) -/* 80C6A650 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C6A654 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 71e1d022ae..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6B010: -/* 80C6B010 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B014 7C 08 02 A6 */ mflr r0 -/* 80C6B018 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B01C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6B020 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6B024 41 82 00 1C */ beq lbl_80C6B040 -/* 80C6B028 3C A0 80 C7 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80C6B27C@ha */ -/* 80C6B02C 38 05 B2 7C */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80C6B27C@l */ -/* 80C6B030 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6B034 7C 80 07 35 */ extsh. r0, r4 -/* 80C6B038 40 81 00 08 */ ble lbl_80C6B040 -/* 80C6B03C 4B 66 3D 01 */ bl __dl__FPv -lbl_80C6B040: -/* 80C6B040 7F E3 FB 78 */ mr r3, r31 -/* 80C6B044 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6B048 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B04C 7C 08 03 A6 */ mtlr r0 -/* 80C6B050 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B054 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index ec2295f9fc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6AA50: -/* 80C6AA50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AA54 7C 08 02 A6 */ mflr r0 -/* 80C6AA58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AA5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6AA60 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6AA64 41 82 00 30 */ beq lbl_80C6AA94 -/* 80C6AA68 3C 60 80 C7 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C6B288@ha */ -/* 80C6AA6C 38 03 B2 88 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C6B288@l */ -/* 80C6AA70 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6AA74 41 82 00 10 */ beq lbl_80C6AA84 -/* 80C6AA78 3C 60 80 C7 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C6B27C@ha */ -/* 80C6AA7C 38 03 B2 7C */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C6B27C@l */ -/* 80C6AA80 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6AA84: -/* 80C6AA84 7C 80 07 35 */ extsh. r0, r4 -/* 80C6AA88 40 81 00 0C */ ble lbl_80C6AA94 -/* 80C6AA8C 7F E3 FB 78 */ mr r3, r31 -/* 80C6AA90 4B 66 42 AD */ bl __dl__FPv -lbl_80C6AA94: -/* 80C6AA94 7F E3 FB 78 */ mr r3, r31 -/* 80C6AA98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6AA9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AAA0 7C 08 03 A6 */ mtlr r0 -/* 80C6AAA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AAA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index b3a6cf989d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6A6B4: -/* 80C6A6B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6A6B8 7C 08 02 A6 */ mflr r0 -/* 80C6A6BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6A6C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6A6C4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6A6C8 41 82 00 1C */ beq lbl_80C6A6E4 -/* 80C6A6CC 3C A0 80 C7 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C6B2EC@ha */ -/* 80C6A6D0 38 05 B2 EC */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C6B2EC@l */ -/* 80C6A6D4 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6A6D8 7C 80 07 35 */ extsh. r0, r4 -/* 80C6A6DC 40 81 00 08 */ ble lbl_80C6A6E4 -/* 80C6A6E0 4B 66 46 5D */ bl __dl__FPv -lbl_80C6A6E4: -/* 80C6A6E4 7F E3 FB 78 */ mr r3, r31 -/* 80C6A6E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6A6EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6A6F0 7C 08 03 A6 */ mtlr r0 -/* 80C6A6F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6A6F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__16daFlorBoad_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__16daFlorBoad_HIO_cFv.s deleted file mode 100644 index 65171c4c2b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__16daFlorBoad_HIO_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C6B058: -/* 80C6B058 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B05C 7C 08 02 A6 */ mflr r0 -/* 80C6B060 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B064 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6B068 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6B06C 41 82 00 40 */ beq lbl_80C6B0AC -/* 80C6B070 3C 60 80 C7 */ lis r3, __vt__16daFlorBoad_HIO_c@ha /* 0x80C6B2D4@ha */ -/* 80C6B074 38 03 B2 D4 */ addi r0, r3, __vt__16daFlorBoad_HIO_c@l /* 0x80C6B2D4@l */ -/* 80C6B078 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6B07C 41 82 00 20 */ beq lbl_80C6B09C -/* 80C6B080 3C 60 80 C7 */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6B2E0@ha */ -/* 80C6B084 38 03 B2 E0 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6B2E0@l */ -/* 80C6B088 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6B08C 41 82 00 10 */ beq lbl_80C6B09C -/* 80C6B090 3C 60 80 C7 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C6B2EC@ha */ -/* 80C6B094 38 03 B2 EC */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C6B2EC@l */ -/* 80C6B098 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6B09C: -/* 80C6B09C 7C 80 07 35 */ extsh. r0, r4 -/* 80C6B0A0 40 81 00 0C */ ble lbl_80C6B0AC -/* 80C6B0A4 7F E3 FB 78 */ mr r3, r31 -/* 80C6B0A8 4B 66 3C 95 */ bl __dl__FPv -lbl_80C6B0AC: -/* 80C6B0AC 7F E3 FB 78 */ mr r3, r31 -/* 80C6B0B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6B0B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B0B8 7C 08 03 A6 */ mtlr r0 -/* 80C6B0BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B0C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__18fOpAcm_HIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__18fOpAcm_HIO_entry_cFv.s deleted file mode 100644 index 001fd4293b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__18fOpAcm_HIO_entry_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6A658: -/* 80C6A658 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6A65C 7C 08 02 A6 */ mflr r0 -/* 80C6A660 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6A664 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6A668 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6A66C 41 82 00 30 */ beq lbl_80C6A69C -/* 80C6A670 3C 60 80 C7 */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6B2E0@ha */ -/* 80C6A674 38 03 B2 E0 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6B2E0@l */ -/* 80C6A678 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6A67C 41 82 00 10 */ beq lbl_80C6A68C -/* 80C6A680 3C 60 80 C7 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C6B2EC@ha */ -/* 80C6A684 38 03 B2 EC */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C6B2EC@l */ -/* 80C6A688 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6A68C: -/* 80C6A68C 7C 80 07 35 */ extsh. r0, r4 -/* 80C6A690 40 81 00 0C */ ble lbl_80C6A69C -/* 80C6A694 7F E3 FB 78 */ mr r3, r31 -/* 80C6A698 4B 66 46 A5 */ bl __dl__FPv -lbl_80C6A69C: -/* 80C6A69C 7F E3 FB 78 */ mr r3, r31 -/* 80C6A6A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6A6A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6A6A8 7C 08 03 A6 */ mtlr r0 -/* 80C6A6AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6A6B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGAabFv.s deleted file mode 100644 index bf3078916b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6AA08: -/* 80C6AA08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AA0C 7C 08 02 A6 */ mflr r0 -/* 80C6AA10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AA14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6AA18 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6AA1C 41 82 00 1C */ beq lbl_80C6AA38 -/* 80C6AA20 3C A0 80 C7 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C6B2A0@ha */ -/* 80C6AA24 38 05 B2 A0 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C6B2A0@l */ -/* 80C6AA28 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C6AA2C 7C 80 07 35 */ extsh. r0, r4 -/* 80C6AA30 40 81 00 08 */ ble lbl_80C6AA38 -/* 80C6AA34 4B 66 43 09 */ bl __dl__FPv -lbl_80C6AA38: -/* 80C6AA38 7F E3 FB 78 */ mr r3, r31 -/* 80C6AA3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6AA40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AA44 7C 08 03 A6 */ mtlr r0 -/* 80C6AA48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AA4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGCylFv.s deleted file mode 100644 index f0275b2ad7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6A9C0: -/* 80C6A9C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6A9C4 7C 08 02 A6 */ mflr r0 -/* 80C6A9C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6A9CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6A9D0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6A9D4 41 82 00 1C */ beq lbl_80C6A9F0 -/* 80C6A9D8 3C A0 80 C7 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C6B294@ha */ -/* 80C6A9DC 38 05 B2 94 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C6B294@l */ -/* 80C6A9E0 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C6A9E4 7C 80 07 35 */ extsh. r0, r4 -/* 80C6A9E8 40 81 00 08 */ ble lbl_80C6A9F0 -/* 80C6A9EC 4B 66 43 51 */ bl __dl__FPv -lbl_80C6A9F0: -/* 80C6A9F0 7F E3 FB 78 */ mr r3, r31 -/* 80C6A9F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6A9F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6A9FC 7C 08 03 A6 */ mtlr r0 -/* 80C6AA00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AA04 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__sinit_d_a_obj_lv5FloorBoard_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__sinit_d_a_obj_lv5FloorBoard_cpp.s deleted file mode 100644 index 34224a1378..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__sinit_d_a_obj_lv5FloorBoard_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C6B0C4: -/* 80C6B0C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B0C8 7C 08 02 A6 */ mflr r0 -/* 80C6B0CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B0D0 3C 60 80 C7 */ lis r3, l_HIO@ha /* 0x80C6B30C@ha */ -/* 80C6B0D4 38 63 B3 0C */ addi r3, r3, l_HIO@l /* 0x80C6B30C@l */ -/* 80C6B0D8 4B FF F5 35 */ bl __ct__16daFlorBoad_HIO_cFv -/* 80C6B0DC 3C 80 80 C7 */ lis r4, __dt__16daFlorBoad_HIO_cFv@ha /* 0x80C6B058@ha */ -/* 80C6B0E0 38 84 B0 58 */ addi r4, r4, __dt__16daFlorBoad_HIO_cFv@l /* 0x80C6B058@l */ -/* 80C6B0E4 3C A0 80 C7 */ lis r5, lit_3647@ha /* 0x80C6B300@ha */ -/* 80C6B0E8 38 A5 B3 00 */ addi r5, r5, lit_3647@l /* 0x80C6B300@l */ -/* 80C6B0EC 4B FF F4 AD */ bl __register_global_object -/* 80C6B0F0 3C 60 80 C7 */ lis r3, mCcDCyl__12daFlorBoad_c@ha /* 0x80C6B1B8@ha */ -/* 80C6B0F4 38 63 B1 B8 */ addi r3, r3, mCcDCyl__12daFlorBoad_c@l /* 0x80C6B1B8@l */ -/* 80C6B0F8 38 A3 FF FC */ addi r5, r3, -4 -/* 80C6B0FC 3C 60 80 C7 */ lis r3, mCcDObjInfo__12daFlorBoad_c@ha /* 0x80C6B14C@ha */ -/* 80C6B100 38 63 B1 4C */ addi r3, r3, mCcDObjInfo__12daFlorBoad_c@l /* 0x80C6B14C@l */ -/* 80C6B104 38 83 FF FC */ addi r4, r3, -4 -/* 80C6B108 38 00 00 06 */ li r0, 6 -/* 80C6B10C 7C 09 03 A6 */ mtctr r0 -lbl_80C6B110: -/* 80C6B110 80 64 00 04 */ lwz r3, 4(r4) -/* 80C6B114 84 04 00 08 */ lwzu r0, 8(r4) -/* 80C6B118 90 65 00 04 */ stw r3, 4(r5) -/* 80C6B11C 94 05 00 08 */ stwu r0, 8(r5) -/* 80C6B120 42 00 FF F0 */ bdnz lbl_80C6B110 -/* 80C6B124 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B128 7C 08 03 A6 */ mtlr r0 -/* 80C6B12C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B130 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/create__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/create__12daFlorBoad_cFv.s deleted file mode 100644 index af049c747f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/create__12daFlorBoad_cFv.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_80C6A7F0: -/* 80C6A7F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6A7F4 7C 08 02 A6 */ mflr r0 -/* 80C6A7F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6A7FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6A800 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6A804 7C 7F 1B 78 */ mr r31, r3 -/* 80C6A808 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C6A80C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C6A810 40 82 00 B4 */ bne lbl_80C6A8C4 -/* 80C6A814 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C6A818 41 82 00 A0 */ beq lbl_80C6A8B8 -/* 80C6A81C 7C 1E 03 78 */ mr r30, r0 -/* 80C6A820 4B 40 DE 05 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C6A824 3C 60 80 C7 */ lis r3, __vt__12daFlorBoad_c@ha /* 0x80C6B2AC@ha */ -/* 80C6A828 38 03 B2 AC */ addi r0, r3, __vt__12daFlorBoad_c@l /* 0x80C6B2AC@l */ -/* 80C6A82C 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C6A830 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C6A834 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C6A838 90 1E 05 B8 */ stw r0, 0x5b8(r30) -/* 80C6A83C 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C6A840 4B 41 8F 21 */ bl __ct__10dCcD_GSttsFv -/* 80C6A844 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C6A848 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C6A84C 90 7E 05 B8 */ stw r3, 0x5b8(r30) -/* 80C6A850 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C6A854 90 1E 05 BC */ stw r0, 0x5bc(r30) -/* 80C6A858 3B DE 05 DC */ addi r30, r30, 0x5dc -/* 80C6A85C 7F C3 F3 78 */ mr r3, r30 -/* 80C6A860 4B 41 91 C9 */ bl __ct__12dCcD_GObjInfFv -/* 80C6A864 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6A868 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6A86C 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6A870 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6B2A0@ha */ -/* 80C6A874 38 03 B2 A0 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6B2A0@l */ -/* 80C6A878 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80C6A87C 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6B294@ha */ -/* 80C6A880 38 03 B2 94 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6B294@l */ -/* 80C6A884 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6A888 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6A88C 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6A890 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80C6A894 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6A898 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6A89C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6A8A0 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6A8A4 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80C6A8A8 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6A8AC 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6A8B0 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6A8B4 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80C6A8B8: -/* 80C6A8B8 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C6A8BC 60 00 00 08 */ ori r0, r0, 8 -/* 80C6A8C0 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C6A8C4: -/* 80C6A8C4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6A8C8 98 1F 07 26 */ stb r0, 0x726(r31) -/* 80C6A8CC 88 9F 07 26 */ lbz r4, 0x726(r31) -/* 80C6A8D0 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6A8D4 41 82 00 28 */ beq lbl_80C6A8FC -/* 80C6A8D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6A8DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6A8E0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6A8E4 7C 05 07 74 */ extsb r5, r0 -/* 80C6A8E8 4B 3C AA 79 */ bl isSwitch__10dSv_info_cCFii -/* 80C6A8EC 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6A8F0 41 82 00 0C */ beq lbl_80C6A8FC -/* 80C6A8F4 38 60 00 05 */ li r3, 5 -/* 80C6A8F8 48 00 00 B0 */ b lbl_80C6A9A8 -lbl_80C6A8FC: -/* 80C6A8FC 38 7F 07 18 */ addi r3, r31, 0x718 -/* 80C6A900 3C 80 80 C7 */ lis r4, d_a_obj_lv5FloorBoard__stringBase0@ha /* 0x80C6B18C@ha */ -/* 80C6A904 38 84 B1 8C */ addi r4, r4, d_a_obj_lv5FloorBoard__stringBase0@l /* 0x80C6B18C@l */ -/* 80C6A908 4B 3C 25 B5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C6A90C 7C 7E 1B 78 */ mr r30, r3 -/* 80C6A910 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C6A914 40 82 00 90 */ bne lbl_80C6A9A4 -/* 80C6A918 7F E3 FB 78 */ mr r3, r31 -/* 80C6A91C 3C 80 80 C7 */ lis r4, d_a_obj_lv5FloorBoard__stringBase0@ha /* 0x80C6B18C@ha */ -/* 80C6A920 38 84 B1 8C */ addi r4, r4, d_a_obj_lv5FloorBoard__stringBase0@l /* 0x80C6B18C@l */ -/* 80C6A924 38 A0 00 07 */ li r5, 7 -/* 80C6A928 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C6A92C 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C6A930 38 E0 19 00 */ li r7, 0x1900 -/* 80C6A934 39 00 00 00 */ li r8, 0 -/* 80C6A938 4B 40 DE 85 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C6A93C 2C 03 00 05 */ cmpwi r3, 5 -/* 80C6A940 40 82 00 0C */ bne lbl_80C6A94C -/* 80C6A944 38 60 00 05 */ li r3, 5 -/* 80C6A948 48 00 00 60 */ b lbl_80C6A9A8 -lbl_80C6A94C: -/* 80C6A94C 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6A950 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C6A954 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C6A958 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6A95C 80 83 00 04 */ lwz r4, 4(r3) -/* 80C6A960 7F E3 FB 78 */ mr r3, r31 -/* 80C6A964 4B 3A FC 15 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C6A968 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C6A96C 38 80 00 FF */ li r4, 0xff -/* 80C6A970 38 A0 00 FF */ li r5, 0xff -/* 80C6A974 7F E6 FB 78 */ mr r6, r31 -/* 80C6A978 4B 41 8E E9 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C6A97C 38 7F 05 DC */ addi r3, r31, 0x5dc -/* 80C6A980 3C 80 80 C7 */ lis r4, mCcDCyl__12daFlorBoad_c@ha /* 0x80C6B1B8@ha */ -/* 80C6A984 38 84 B1 B8 */ addi r4, r4, mCcDCyl__12daFlorBoad_c@l /* 0x80C6B1B8@l */ -/* 80C6A988 4B 41 9F 2D */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6A98C 38 1F 05 A0 */ addi r0, r31, 0x5a0 -/* 80C6A990 90 1F 06 20 */ stw r0, 0x620(r31) -/* 80C6A994 7F E3 FB 78 */ mr r3, r31 -/* 80C6A998 48 00 01 F9 */ bl init_modeWait__12daFlorBoad_cFv -/* 80C6A99C 7F E3 FB 78 */ mr r3, r31 -/* 80C6A9A0 4B FF FD 5D */ bl setBaseMtx__12daFlorBoad_cFv -lbl_80C6A9A4: -/* 80C6A9A4 7F C3 F3 78 */ mr r3, r30 -lbl_80C6A9A8: -/* 80C6A9A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6A9AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6A9B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6A9B4 7C 08 03 A6 */ mtlr r0 -/* 80C6A9B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6A9BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 3bf54bf303..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6AFF0: -/* 80C6AFF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AFF4 7C 08 02 A6 */ mflr r0 -/* 80C6AFF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AFFC 4B FF F7 F5 */ bl create__12daFlorBoad_cFv -/* 80C6B000 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B004 7C 08 03 A6 */ mtlr r0 -/* 80C6B008 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B00C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Delete__FP12daFlorBoad_c.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Delete__FP12daFlorBoad_c.s deleted file mode 100644 index 115497cf6c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Delete__FP12daFlorBoad_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6AFD0: -/* 80C6AFD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AFD4 7C 08 02 A6 */ mflr r0 -/* 80C6AFD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AFDC 4B 40 D9 01 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C6AFE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AFE4 7C 08 03 A6 */ mtlr r0 -/* 80C6AFE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AFEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Draw__FP12daFlorBoad_c.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Draw__FP12daFlorBoad_c.s deleted file mode 100644 index 6d9b176734..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Draw__FP12daFlorBoad_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C6AF84: -/* 80C6AF84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AF88 7C 08 02 A6 */ mflr r0 -/* 80C6AF8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AF90 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C6AF94 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C6AF98 7D 89 03 A6 */ mtctr r12 -/* 80C6AF9C 4E 80 04 21 */ bctrl -/* 80C6AFA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AFA4 7C 08 03 A6 */ mtlr r0 -/* 80C6AFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AFAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Execute__FP12daFlorBoad_c.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Execute__FP12daFlorBoad_c.s deleted file mode 100644 index 6ffb5caac5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Execute__FP12daFlorBoad_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6AFB0: -/* 80C6AFB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AFB4 7C 08 02 A6 */ mflr r0 -/* 80C6AFB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AFBC 4B 40 D9 95 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C6AFC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AFC4 7C 08 03 A6 */ mtlr r0 -/* 80C6AFC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AFCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeBreak__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeBreak__12daFlorBoad_cFv.s deleted file mode 100644 index 31fb980097..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeBreak__12daFlorBoad_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80C6AC9C: -/* 80C6AC9C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C6ACA0 7C 08 02 A6 */ mflr r0 -/* 80C6ACA4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6ACA8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C6ACAC 7C 7F 1B 78 */ mr r31, r3 -/* 80C6ACB0 88 83 07 26 */ lbz r4, 0x726(r3) -/* 80C6ACB4 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6ACB8 41 82 00 18 */ beq lbl_80C6ACD0 -/* 80C6ACBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6ACC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6ACC4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6ACC8 7C 05 07 74 */ extsb r5, r0 -/* 80C6ACCC 4B 3C A5 35 */ bl onSwitch__10dSv_info_cFii -lbl_80C6ACD0: -/* 80C6ACD0 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C6ACD4 7C 03 07 74 */ extsb r3, r0 -/* 80C6ACD8 4B 3C 23 95 */ bl dComIfGp_getReverb__Fi -/* 80C6ACDC 7C 67 1B 78 */ mr r7, r3 -/* 80C6ACE0 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DC@ha */ -/* 80C6ACE4 38 03 01 DC */ addi r0, r3, 0x01DC /* 0x000801DC@l */ -/* 80C6ACE8 90 01 00 08 */ stw r0, 8(r1) -/* 80C6ACEC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6ACF0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6ACF4 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6ACF8 38 81 00 08 */ addi r4, r1, 8 -/* 80C6ACFC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C6AD00 38 C0 00 00 */ li r6, 0 -/* 80C6AD04 3D 00 80 C7 */ lis r8, lit_3656@ha /* 0x80C6B148@ha */ -/* 80C6AD08 C0 28 B1 48 */ lfs f1, lit_3656@l(r8) /* 0x80C6B148@l */ -/* 80C6AD0C FC 40 08 90 */ fmr f2, f1 -/* 80C6AD10 3D 00 80 C7 */ lis r8, lit_3891@ha /* 0x80C6B188@ha */ -/* 80C6AD14 C0 68 B1 88 */ lfs f3, lit_3891@l(r8) /* 0x80C6B188@l */ -/* 80C6AD18 FC 80 18 90 */ fmr f4, f3 -/* 80C6AD1C 39 00 00 00 */ li r8, 0 -/* 80C6AD20 4B 64 0C 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6AD24 38 00 00 01 */ li r0, 1 -/* 80C6AD28 98 1F 07 24 */ stb r0, 0x724(r31) -/* 80C6AD2C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C6AD30 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C6AD34 7C 08 03 A6 */ mtlr r0 -/* 80C6AD38 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6AD3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeWait__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeWait__12daFlorBoad_cFv.s deleted file mode 100644 index bf346a7851..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeWait__12daFlorBoad_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C6AB90: -/* 80C6AB90 3C 80 80 C7 */ lis r4, l_HIO@ha /* 0x80C6B30C@ha */ -/* 80C6AB94 38 84 B3 0C */ addi r4, r4, l_HIO@l /* 0x80C6B30C@l */ -/* 80C6AB98 88 04 00 10 */ lbz r0, 0x10(r4) -/* 80C6AB9C 98 03 07 25 */ stb r0, 0x725(r3) -/* 80C6ABA0 38 00 00 00 */ li r0, 0 -/* 80C6ABA4 98 03 07 24 */ stb r0, 0x724(r3) -/* 80C6ABA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeBreak__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeBreak__12daFlorBoad_cFv.s deleted file mode 100644 index bb50b61dad..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeBreak__12daFlorBoad_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_80C6AD40: -/* 80C6AD40 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C6AD44 7C 08 02 A6 */ mflr r0 -/* 80C6AD48 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C6AD4C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80C6AD50 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80C6AD54 7C 7E 1B 78 */ mr r30, r3 -/* 80C6AD58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6AD5C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6AD60 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80C6AD64 38 80 00 00 */ li r4, 0 -/* 80C6AD68 90 81 00 08 */ stw r4, 8(r1) -/* 80C6AD6C 38 00 FF FF */ li r0, -1 -/* 80C6AD70 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6AD74 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C6AD78 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6AD7C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6AD80 38 80 00 00 */ li r4, 0 -/* 80C6AD84 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008C01@ha */ -/* 80C6AD88 38 A5 8C 01 */ addi r5, r5, 0x8C01 /* 0x00008C01@l */ -/* 80C6AD8C 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80C6AD90 38 E0 00 00 */ li r7, 0 -/* 80C6AD94 39 00 00 00 */ li r8, 0 -/* 80C6AD98 39 20 00 00 */ li r9, 0 -/* 80C6AD9C 39 40 00 FF */ li r10, 0xff -/* 80C6ADA0 3D 60 80 C7 */ lis r11, lit_3656@ha /* 0x80C6B148@ha */ -/* 80C6ADA4 C0 2B B1 48 */ lfs f1, lit_3656@l(r11) /* 0x80C6B148@l */ -/* 80C6ADA8 4B 3E 1C E9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6ADAC 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80C6ADB0 38 80 00 00 */ li r4, 0 -/* 80C6ADB4 90 81 00 08 */ stw r4, 8(r1) -/* 80C6ADB8 38 00 FF FF */ li r0, -1 -/* 80C6ADBC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6ADC0 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C6ADC4 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6ADC8 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6ADCC 38 80 00 00 */ li r4, 0 -/* 80C6ADD0 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008C02@ha */ -/* 80C6ADD4 38 A5 8C 02 */ addi r5, r5, 0x8C02 /* 0x00008C02@l */ -/* 80C6ADD8 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80C6ADDC 38 E0 00 00 */ li r7, 0 -/* 80C6ADE0 39 00 00 00 */ li r8, 0 -/* 80C6ADE4 39 20 00 00 */ li r9, 0 -/* 80C6ADE8 39 40 00 FF */ li r10, 0xff -/* 80C6ADEC 3D 60 80 C7 */ lis r11, lit_3656@ha /* 0x80C6B148@ha */ -/* 80C6ADF0 C0 2B B1 48 */ lfs f1, lit_3656@l(r11) /* 0x80C6B148@l */ -/* 80C6ADF4 4B 3E 1C 9D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6ADF8 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80C6ADFC 38 80 00 00 */ li r4, 0 -/* 80C6AE00 90 81 00 08 */ stw r4, 8(r1) -/* 80C6AE04 38 00 FF FF */ li r0, -1 -/* 80C6AE08 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6AE0C 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C6AE10 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6AE14 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6AE18 38 80 00 00 */ li r4, 0 -/* 80C6AE1C 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008C03@ha */ -/* 80C6AE20 38 A5 8C 03 */ addi r5, r5, 0x8C03 /* 0x00008C03@l */ -/* 80C6AE24 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80C6AE28 38 E0 00 00 */ li r7, 0 -/* 80C6AE2C 39 00 00 00 */ li r8, 0 -/* 80C6AE30 39 20 00 00 */ li r9, 0 -/* 80C6AE34 39 40 00 FF */ li r10, 0xff -/* 80C6AE38 3D 60 80 C7 */ lis r11, lit_3656@ha /* 0x80C6B148@ha */ -/* 80C6AE3C C0 2B B1 48 */ lfs f1, lit_3656@l(r11) /* 0x80C6B148@l */ -/* 80C6AE40 4B 3E 1C 51 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6AE44 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80C6AE48 38 80 00 00 */ li r4, 0 -/* 80C6AE4C 90 81 00 08 */ stw r4, 8(r1) -/* 80C6AE50 38 00 FF FF */ li r0, -1 -/* 80C6AE54 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6AE58 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C6AE5C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6AE60 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6AE64 38 80 00 00 */ li r4, 0 -/* 80C6AE68 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008C04@ha */ -/* 80C6AE6C 38 A5 8C 04 */ addi r5, r5, 0x8C04 /* 0x00008C04@l */ -/* 80C6AE70 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 80C6AE74 38 E0 00 00 */ li r7, 0 -/* 80C6AE78 39 00 00 00 */ li r8, 0 -/* 80C6AE7C 39 20 00 00 */ li r9, 0 -/* 80C6AE80 39 40 00 FF */ li r10, 0xff -/* 80C6AE84 3D 60 80 C7 */ lis r11, lit_3656@ha /* 0x80C6B148@ha */ -/* 80C6AE88 C0 2B B1 48 */ lfs f1, lit_3656@l(r11) /* 0x80C6B148@l */ -/* 80C6AE8C 4B 3E 1C 05 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6AE90 7F C3 F3 78 */ mr r3, r30 -/* 80C6AE94 4B 3A ED E9 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80C6AE98 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80C6AE9C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80C6AEA0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C6AEA4 7C 08 03 A6 */ mtlr r0 -/* 80C6AEA8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C6AEAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeWait__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeWait__12daFlorBoad_cFv.s deleted file mode 100644 index 60e0f78bbc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeWait__12daFlorBoad_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80C6ABAC: -/* 80C6ABAC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C6ABB0 7C 08 02 A6 */ mflr r0 -/* 80C6ABB4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C6ABB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C6ABBC 4B 6F 76 21 */ bl _savegpr_29 -/* 80C6ABC0 7C 7D 1B 78 */ mr r29, r3 -/* 80C6ABC4 3C 60 80 C7 */ lis r3, lit_3656@ha /* 0x80C6B148@ha */ -/* 80C6ABC8 3B C3 B1 48 */ addi r30, r3, lit_3656@l /* 0x80C6B148@l */ -/* 80C6ABCC 38 7D 05 DC */ addi r3, r29, 0x5dc -/* 80C6ABD0 4B 41 98 91 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C6ABD4 28 03 00 00 */ cmplwi r3, 0 -/* 80C6ABD8 41 82 00 50 */ beq lbl_80C6AC28 -/* 80C6ABDC 38 7D 05 DC */ addi r3, r29, 0x5dc -/* 80C6ABE0 4B 41 99 69 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C6ABE4 7C 7F 1B 78 */ mr r31, r3 -/* 80C6ABE8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C6ABEC 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 80C6ABF0 41 82 00 24 */ beq lbl_80C6AC14 -/* 80C6ABF4 88 1F 00 14 */ lbz r0, 0x14(r31) -/* 80C6ABF8 28 00 00 64 */ cmplwi r0, 0x64 -/* 80C6ABFC 41 82 00 10 */ beq lbl_80C6AC0C -/* 80C6AC00 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80C6AC04 28 00 00 03 */ cmplwi r0, 3 -/* 80C6AC08 40 82 00 0C */ bne lbl_80C6AC14 -lbl_80C6AC0C: -/* 80C6AC0C 7F A3 EB 78 */ mr r3, r29 -/* 80C6AC10 48 00 00 8D */ bl init_modeBreak__12daFlorBoad_cFv -lbl_80C6AC14: -/* 80C6AC14 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 80C6AC18 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80C6AC1C 41 82 00 0C */ beq lbl_80C6AC28 -/* 80C6AC20 7F A3 EB 78 */ mr r3, r29 -/* 80C6AC24 48 00 00 79 */ bl init_modeBreak__12daFlorBoad_cFv -lbl_80C6AC28: -/* 80C6AC28 38 7D 07 00 */ addi r3, r29, 0x700 -/* 80C6AC2C C0 3E 00 34 */ lfs f1, 0x34(r30) -/* 80C6AC30 4B 60 45 D1 */ bl SetR__8cM3dGCylFf -/* 80C6AC34 38 7D 07 00 */ addi r3, r29, 0x700 -/* 80C6AC38 C0 3E 00 38 */ lfs f1, 0x38(r30) -/* 80C6AC3C 4B 60 45 BD */ bl SetH__8cM3dGCylFf -/* 80C6AC40 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80C6AC44 D0 01 00 08 */ stfs f0, 8(r1) -/* 80C6AC48 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80C6AC4C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80C6AC50 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80C6AC54 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C6AC58 C0 1E 00 3C */ lfs f0, 0x3c(r30) -/* 80C6AC5C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C6AC60 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C6AC64 38 7D 07 00 */ addi r3, r29, 0x700 -/* 80C6AC68 38 81 00 08 */ addi r4, r1, 8 -/* 80C6AC6C 4B 60 45 71 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C6AC70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6AC74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6AC78 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C6AC7C 38 9D 05 DC */ addi r4, r29, 0x5dc -/* 80C6AC80 4B 5F 9F 29 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C6AC84 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C6AC88 4B 6F 75 A1 */ bl _restgpr_29 -/* 80C6AC8C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C6AC90 7C 08 03 A6 */ mtlr r0 -/* 80C6AC94 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C6AC98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/procMain__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/procMain__12daFlorBoad_cFv.s deleted file mode 100644 index b23b4d3a10..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/procMain__12daFlorBoad_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80C6AB04: -/* 80C6AB04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6AB08 7C 08 02 A6 */ mflr r0 -/* 80C6AB0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6AB10 3C 80 80 C7 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80C6B198@ha */ -/* 80C6AB14 38 E4 B1 98 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80C6B198@l */ -/* 80C6AB18 3C 80 80 C7 */ lis r4, data_80C6B320@ha /* 0x80C6B320@ha */ -/* 80C6AB1C 38 C4 B3 20 */ addi r6, r4, data_80C6B320@l /* 0x80C6B320@l */ -/* 80C6AB20 88 06 00 00 */ lbz r0, 0(r6) -/* 80C6AB24 7C 00 07 75 */ extsb. r0, r0 -/* 80C6AB28 40 82 00 40 */ bne lbl_80C6AB68 -/* 80C6AB2C 80 87 00 64 */ lwz r4, 0x64(r7) -/* 80C6AB30 80 07 00 68 */ lwz r0, 0x68(r7) -/* 80C6AB34 90 87 00 7C */ stw r4, 0x7c(r7) -/* 80C6AB38 90 07 00 80 */ stw r0, 0x80(r7) -/* 80C6AB3C 80 07 00 6C */ lwz r0, 0x6c(r7) -/* 80C6AB40 90 07 00 84 */ stw r0, 0x84(r7) -/* 80C6AB44 38 A7 00 7C */ addi r5, r7, 0x7c -/* 80C6AB48 80 87 00 70 */ lwz r4, 0x70(r7) -/* 80C6AB4C 80 07 00 74 */ lwz r0, 0x74(r7) -/* 80C6AB50 90 85 00 0C */ stw r4, 0xc(r5) -/* 80C6AB54 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C6AB58 80 07 00 78 */ lwz r0, 0x78(r7) -/* 80C6AB5C 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C6AB60 38 00 00 01 */ li r0, 1 -/* 80C6AB64 98 06 00 00 */ stb r0, 0(r6) -lbl_80C6AB68: -/* 80C6AB68 88 03 07 24 */ lbz r0, 0x724(r3) -/* 80C6AB6C 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C6AB70 39 87 00 7C */ addi r12, r7, 0x7c -/* 80C6AB74 7D 8C 02 14 */ add r12, r12, r0 -/* 80C6AB78 4B 6F 75 0D */ bl __ptmf_scall -/* 80C6AB7C 60 00 00 00 */ nop -/* 80C6AB80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6AB84 7C 08 03 A6 */ mtlr r0 -/* 80C6AB88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6AB8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/setBaseMtx__12daFlorBoad_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/setBaseMtx__12daFlorBoad_cFv.s deleted file mode 100644 index 3b94513387..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/setBaseMtx__12daFlorBoad_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C6A6FC: -/* 80C6A6FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6A700 7C 08 02 A6 */ mflr r0 -/* 80C6A704 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6A708 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6A70C 7C 7F 1B 78 */ mr r31, r3 -/* 80C6A710 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6A714 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6A718 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6A71C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C6A720 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C6A724 4B 6D C1 C5 */ bl PSMTXTrans -/* 80C6A728 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6A72C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6A730 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C6A734 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C6A738 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C6A73C 4B 3A 1B 65 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C6A740 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6A744 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C6A748 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C6A74C C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C6A750 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C6A754 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C6A758 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C6A75C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6A760 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6A764 80 9F 07 20 */ lwz r4, 0x720(r31) -/* 80C6A768 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6A76C 4B 6D BD 45 */ bl PSMTXCopy -/* 80C6A770 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6A774 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6A778 7C 08 03 A6 */ mtlr r0 -/* 80C6A77C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6A780 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/CreateHeap__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/CreateHeap__11daIceWall_cFv.s deleted file mode 100644 index 777bfb1d19..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/CreateHeap__11daIceWall_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80C6B5E4: -/* 80C6B5E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B5E8 7C 08 02 A6 */ mflr r0 -/* 80C6B5EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B5F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6B5F4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6B5F8 7C 7E 1B 78 */ mr r30, r3 -/* 80C6B5FC 3C 60 80 C7 */ lis r3, d_a_obj_lv5IceWall__stringBase0@ha /* 0x80C6C6BC@ha */ -/* 80C6B600 38 63 C6 BC */ addi r3, r3, d_a_obj_lv5IceWall__stringBase0@l /* 0x80C6C6BC@l */ -/* 80C6B604 38 80 00 04 */ li r4, 4 -/* 80C6B608 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6B60C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6B610 3F E5 00 02 */ addis r31, r5, 2 -/* 80C6B614 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80C6B618 7F E5 FB 78 */ mr r5, r31 -/* 80C6B61C 38 C0 00 80 */ li r6, 0x80 -/* 80C6B620 4B 3D 0C CD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6B624 38 80 00 00 */ li r4, 0 -/* 80C6B628 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C6B62C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6B630 4B 3A 96 25 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6B634 90 7E 08 5C */ stw r3, 0x85c(r30) -/* 80C6B638 80 1E 08 5C */ lwz r0, 0x85c(r30) -/* 80C6B63C 28 00 00 00 */ cmplwi r0, 0 -/* 80C6B640 40 82 00 0C */ bne lbl_80C6B64C -/* 80C6B644 38 60 00 00 */ li r3, 0 -/* 80C6B648 48 00 00 3C */ b lbl_80C6B684 -lbl_80C6B64C: -/* 80C6B64C 3C 60 80 C7 */ lis r3, d_a_obj_lv5IceWall__stringBase0@ha /* 0x80C6C6BC@ha */ -/* 80C6B650 38 63 C6 BC */ addi r3, r3, d_a_obj_lv5IceWall__stringBase0@l /* 0x80C6C6BC@l */ -/* 80C6B654 38 80 00 05 */ li r4, 5 -/* 80C6B658 7F E5 FB 78 */ mr r5, r31 -/* 80C6B65C 38 C0 00 80 */ li r6, 0x80 -/* 80C6B660 4B 3D 0C 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6B664 38 80 00 00 */ li r4, 0 -/* 80C6B668 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C6B66C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6B670 4B 3A 95 E5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6B674 90 7E 08 60 */ stw r3, 0x860(r30) -/* 80C6B678 80 7E 08 60 */ lwz r3, 0x860(r30) -/* 80C6B67C 30 03 FF FF */ addic r0, r3, -1 -/* 80C6B680 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80C6B684: -/* 80C6B684 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6B688 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6B68C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B690 7C 08 03 A6 */ mtlr r0 -/* 80C6B694 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B698 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Delete__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Delete__11daIceWall_cFv.s deleted file mode 100644 index bad7dda534..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Delete__11daIceWall_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C6C44C: -/* 80C6C44C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C450 7C 08 02 A6 */ mflr r0 -/* 80C6C454 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C458 3C 80 80 C7 */ lis r4, d_a_obj_lv5IceWall__stringBase0@ha /* 0x80C6C6BC@ha */ -/* 80C6C45C 38 84 C6 BC */ addi r4, r4, d_a_obj_lv5IceWall__stringBase0@l /* 0x80C6C6BC@l */ -/* 80C6C460 38 63 08 54 */ addi r3, r3, 0x854 -/* 80C6C464 4B 3C 0B A5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C6C468 38 60 00 01 */ li r3, 1 -/* 80C6C46C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C470 7C 08 03 A6 */ mtlr r0 -/* 80C6C474 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C478 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Draw__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Draw__11daIceWall_cFv.s deleted file mode 100644 index fd60619dfe..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Draw__11daIceWall_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80C6C374: -/* 80C6C374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C378 7C 08 02 A6 */ mflr r0 -/* 80C6C37C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6C384 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6C388 7C 7F 1B 78 */ mr r31, r3 -/* 80C6C38C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6C390 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6C394 38 80 00 10 */ li r4, 0x10 -/* 80C6C398 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C6C39C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C6C3A0 4B 53 74 25 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C6C3A4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6C3A8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6C3AC 88 1F 08 65 */ lbz r0, 0x865(r31) -/* 80C6C3B0 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6C3B4 7C 9F 02 14 */ add r4, r31, r0 -/* 80C6C3B8 80 84 08 5C */ lwz r4, 0x85c(r4) -/* 80C6C3BC 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6C3C0 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C6C3C4 4B 53 89 DD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C6C3C8 88 1F 08 65 */ lbz r0, 0x865(r31) -/* 80C6C3CC 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6C3D0 7C 7F 02 14 */ add r3, r31, r0 -/* 80C6C3D4 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6C3D8 80 83 00 04 */ lwz r4, 4(r3) -/* 80C6C3DC 7F E3 FB 78 */ mr r3, r31 -/* 80C6C3E0 4B 3B 10 4D */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData -/* 80C6C3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6C3E8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6C3EC 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C6C3F0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C6C3F4 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C6C3F8 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C6C3FC 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C6C400 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C6C404 88 1F 08 65 */ lbz r0, 0x865(r31) -/* 80C6C408 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6C40C 7C 7F 02 14 */ add r3, r31, r0 -/* 80C6C410 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6C414 4B 3A 18 B1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C6C418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6C41C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6C420 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C6C424 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C6C428 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C6C42C 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C6C430 38 60 00 01 */ li r3, 1 -/* 80C6C434 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6C438 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6C43C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C440 7C 08 03 A6 */ mtlr r0 -/* 80C6C444 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C448 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Execute__11daIceWall_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Execute__11daIceWall_cFPPA3_A4_f.s deleted file mode 100644 index 6000c9db8d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Execute__11daIceWall_cFPPA3_A4_f.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6BB60: -/* 80C6BB60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6BB64 7C 08 02 A6 */ mflr r0 -/* 80C6BB68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6BB6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6BB70 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6BB74 7C 7E 1B 78 */ mr r30, r3 -/* 80C6BB78 7C 9F 23 78 */ mr r31, r4 -/* 80C6BB7C 48 00 00 49 */ bl procMain__11daIceWall_cFv -/* 80C6BB80 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6BB84 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6BB88 7C 7E 02 14 */ add r3, r30, r0 -/* 80C6BB8C 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6BB90 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C6BB94 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6BB98 7F C3 F3 78 */ mr r3, r30 -/* 80C6BB9C 4B FF F9 81 */ bl setBaseMtx__11daIceWall_cFv -/* 80C6BBA0 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C6BBA4 4B 41 7C 8D */ bl Move__10dCcD_GSttsFv -/* 80C6BBA8 38 60 00 01 */ li r3, 1 -/* 80C6BBAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6BBB0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6BBB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6BBB8 7C 08 03 A6 */ mtlr r0 -/* 80C6BBBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6BBC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__15daIceWall_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__15daIceWall_HIO_cFv.s deleted file mode 100644 index 6466e17bb1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__15daIceWall_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6B42C: -/* 80C6B42C 3C 80 80 C7 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C6C81C@ha */ -/* 80C6B430 38 04 C8 1C */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C6C81C@l */ -/* 80C6B434 90 03 00 00 */ stw r0, 0(r3) -/* 80C6B438 3C 80 80 C7 */ lis r4, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6C810@ha */ -/* 80C6B43C 38 04 C8 10 */ addi r0, r4, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6C810@l */ -/* 80C6B440 90 03 00 00 */ stw r0, 0(r3) -/* 80C6B444 3C 80 80 C7 */ lis r4, __vt__15daIceWall_HIO_c@ha /* 0x80C6C804@ha */ -/* 80C6B448 38 04 C8 04 */ addi r0, r4, __vt__15daIceWall_HIO_c@l /* 0x80C6C804@l */ -/* 80C6B44C 90 03 00 00 */ stw r0, 0(r3) -/* 80C6B450 38 00 00 03 */ li r0, 3 -/* 80C6B454 98 03 00 10 */ stb r0, 0x10(r3) -/* 80C6B458 38 00 00 02 */ li r0, 2 -/* 80C6B45C 98 03 00 11 */ stb r0, 0x11(r3) -/* 80C6B460 3C 80 80 C7 */ lis r4, lit_3656@ha /* 0x80C6C640@ha */ -/* 80C6B464 C0 04 C6 40 */ lfs f0, lit_3656@l(r4) /* 0x80C6C640@l */ -/* 80C6B468 D0 03 00 04 */ stfs f0, 4(r3) -/* 80C6B46C D0 03 00 08 */ stfs f0, 8(r3) -/* 80C6B470 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C6B474 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__8dCcD_CylFv.s deleted file mode 100644 index 7b0796b9ea..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__8dCcD_CylFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C6B9F0: -/* 80C6B9F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B9F4 7C 08 02 A6 */ mflr r0 -/* 80C6B9F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B9FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6BA00 7C 7F 1B 78 */ mr r31, r3 -/* 80C6BA04 4B 41 80 25 */ bl __ct__12dCcD_GObjInfFv -/* 80C6BA08 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6BA0C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6BA10 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80C6BA14 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6C7C4@ha */ -/* 80C6BA18 38 03 C7 C4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6C7C4@l */ -/* 80C6BA1C 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80C6BA20 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6C7D0@ha */ -/* 80C6BA24 38 03 C7 D0 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6C7D0@l */ -/* 80C6BA28 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C6BA2C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6BA30 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6BA34 90 7F 01 20 */ stw r3, 0x120(r31) -/* 80C6BA38 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6BA3C 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C6BA40 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6BA44 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6BA48 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 80C6BA4C 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6BA50 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80C6BA54 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6BA58 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C6BA5C 7F E3 FB 78 */ mr r3, r31 -/* 80C6BA60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6BA64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6BA68 7C 08 03 A6 */ mtlr r0 -/* 80C6BA6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6BA70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index ca9a706628..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6C508: -/* 80C6C508 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C50C 7C 08 02 A6 */ mflr r0 -/* 80C6C510 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C514 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6C518 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6C51C 41 82 00 1C */ beq lbl_80C6C538 -/* 80C6C520 3C A0 80 C7 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80C6C7AC@ha */ -/* 80C6C524 38 05 C7 AC */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80C6C7AC@l */ -/* 80C6C528 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6C52C 7C 80 07 35 */ extsh. r0, r4 -/* 80C6C530 40 81 00 08 */ ble lbl_80C6C538 -/* 80C6C534 4B 66 28 09 */ bl __dl__FPv -lbl_80C6C538: -/* 80C6C538 7F E3 FB 78 */ mr r3, r31 -/* 80C6C53C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6C540 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C544 7C 08 03 A6 */ mtlr r0 -/* 80C6C548 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C54C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index ed23d4df3e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6BB04: -/* 80C6BB04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6BB08 7C 08 02 A6 */ mflr r0 -/* 80C6BB0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6BB10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6BB14 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6BB18 41 82 00 30 */ beq lbl_80C6BB48 -/* 80C6BB1C 3C 60 80 C7 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C6C7B8@ha */ -/* 80C6BB20 38 03 C7 B8 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C6C7B8@l */ -/* 80C6BB24 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6BB28 41 82 00 10 */ beq lbl_80C6BB38 -/* 80C6BB2C 3C 60 80 C7 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C6C7AC@ha */ -/* 80C6BB30 38 03 C7 AC */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C6C7AC@l */ -/* 80C6BB34 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6BB38: -/* 80C6BB38 7C 80 07 35 */ extsh. r0, r4 -/* 80C6BB3C 40 81 00 0C */ ble lbl_80C6BB48 -/* 80C6BB40 7F E3 FB 78 */ mr r3, r31 -/* 80C6BB44 4B 66 31 F9 */ bl __dl__FPv -lbl_80C6BB48: -/* 80C6BB48 7F E3 FB 78 */ mr r3, r31 -/* 80C6BB4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6BB50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6BB54 7C 08 03 A6 */ mtlr r0 -/* 80C6BB58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6BB5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index e5e422718c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6B4D4: -/* 80C6B4D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B4D8 7C 08 02 A6 */ mflr r0 -/* 80C6B4DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B4E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6B4E4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6B4E8 41 82 00 1C */ beq lbl_80C6B504 -/* 80C6B4EC 3C A0 80 C7 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C6C81C@ha */ -/* 80C6B4F0 38 05 C8 1C */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C6C81C@l */ -/* 80C6B4F4 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6B4F8 7C 80 07 35 */ extsh. r0, r4 -/* 80C6B4FC 40 81 00 08 */ ble lbl_80C6B504 -/* 80C6B500 4B 66 38 3D */ bl __dl__FPv -lbl_80C6B504: -/* 80C6B504 7F E3 FB 78 */ mr r3, r31 -/* 80C6B508 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6B50C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B510 7C 08 03 A6 */ mtlr r0 -/* 80C6B514 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B518 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__15daIceWall_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__15daIceWall_HIO_cFv.s deleted file mode 100644 index b18c6e8b1c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__15daIceWall_HIO_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C6C550: -/* 80C6C550 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C554 7C 08 02 A6 */ mflr r0 -/* 80C6C558 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C55C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6C560 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6C564 41 82 00 40 */ beq lbl_80C6C5A4 -/* 80C6C568 3C 60 80 C7 */ lis r3, __vt__15daIceWall_HIO_c@ha /* 0x80C6C804@ha */ -/* 80C6C56C 38 03 C8 04 */ addi r0, r3, __vt__15daIceWall_HIO_c@l /* 0x80C6C804@l */ -/* 80C6C570 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6C574 41 82 00 20 */ beq lbl_80C6C594 -/* 80C6C578 3C 60 80 C7 */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6C810@ha */ -/* 80C6C57C 38 03 C8 10 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6C810@l */ -/* 80C6C580 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6C584 41 82 00 10 */ beq lbl_80C6C594 -/* 80C6C588 3C 60 80 C7 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C6C81C@ha */ -/* 80C6C58C 38 03 C8 1C */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C6C81C@l */ -/* 80C6C590 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6C594: -/* 80C6C594 7C 80 07 35 */ extsh. r0, r4 -/* 80C6C598 40 81 00 0C */ ble lbl_80C6C5A4 -/* 80C6C59C 7F E3 FB 78 */ mr r3, r31 -/* 80C6C5A0 4B 66 27 9D */ bl __dl__FPv -lbl_80C6C5A4: -/* 80C6C5A4 7F E3 FB 78 */ mr r3, r31 -/* 80C6C5A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6C5AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C5B0 7C 08 03 A6 */ mtlr r0 -/* 80C6C5B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C5B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__18fOpAcm_HIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__18fOpAcm_HIO_entry_cFv.s deleted file mode 100644 index 03620e6957..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__18fOpAcm_HIO_entry_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6B478: -/* 80C6B478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B47C 7C 08 02 A6 */ mflr r0 -/* 80C6B480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B484 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6B488 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6B48C 41 82 00 30 */ beq lbl_80C6B4BC -/* 80C6B490 3C 60 80 C7 */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6C810@ha */ -/* 80C6B494 38 03 C8 10 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6C810@l */ -/* 80C6B498 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6B49C 41 82 00 10 */ beq lbl_80C6B4AC -/* 80C6B4A0 3C 60 80 C7 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C6C81C@ha */ -/* 80C6B4A4 38 03 C8 1C */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C6C81C@l */ -/* 80C6B4A8 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6B4AC: -/* 80C6B4AC 7C 80 07 35 */ extsh. r0, r4 -/* 80C6B4B0 40 81 00 0C */ ble lbl_80C6B4BC -/* 80C6B4B4 7F E3 FB 78 */ mr r3, r31 -/* 80C6B4B8 4B 66 38 85 */ bl __dl__FPv -lbl_80C6B4BC: -/* 80C6B4BC 7F E3 FB 78 */ mr r3, r31 -/* 80C6B4C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6B4C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B4C8 7C 08 03 A6 */ mtlr r0 -/* 80C6B4CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B4D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGAabFv.s deleted file mode 100644 index ef0d1b06cc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6BABC: -/* 80C6BABC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6BAC0 7C 08 02 A6 */ mflr r0 -/* 80C6BAC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6BAC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6BACC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6BAD0 41 82 00 1C */ beq lbl_80C6BAEC -/* 80C6BAD4 3C A0 80 C7 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C6C7C4@ha */ -/* 80C6BAD8 38 05 C7 C4 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C6C7C4@l */ -/* 80C6BADC 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C6BAE0 7C 80 07 35 */ extsh. r0, r4 -/* 80C6BAE4 40 81 00 08 */ ble lbl_80C6BAEC -/* 80C6BAE8 4B 66 32 55 */ bl __dl__FPv -lbl_80C6BAEC: -/* 80C6BAEC 7F E3 FB 78 */ mr r3, r31 -/* 80C6BAF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6BAF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6BAF8 7C 08 03 A6 */ mtlr r0 -/* 80C6BAFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6BB00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGCylFv.s deleted file mode 100644 index 5aec4af017..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6BA74: -/* 80C6BA74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6BA78 7C 08 02 A6 */ mflr r0 -/* 80C6BA7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6BA80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6BA84 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6BA88 41 82 00 1C */ beq lbl_80C6BAA4 -/* 80C6BA8C 3C A0 80 C7 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C6C7D0@ha */ -/* 80C6BA90 38 05 C7 D0 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C6C7D0@l */ -/* 80C6BA94 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C6BA98 7C 80 07 35 */ extsh. r0, r4 -/* 80C6BA9C 40 81 00 08 */ ble lbl_80C6BAA4 -/* 80C6BAA0 4B 66 32 9D */ bl __dl__FPv -lbl_80C6BAA4: -/* 80C6BAA4 7F E3 FB 78 */ mr r3, r31 -/* 80C6BAA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6BAAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6BAB0 7C 08 03 A6 */ mtlr r0 -/* 80C6BAB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6BAB8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8dCcD_CylFv.s deleted file mode 100644 index 2ad4b8183b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8dCcD_CylFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80C6B924: -/* 80C6B924 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6B928 7C 08 02 A6 */ mflr r0 -/* 80C6B92C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B930 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6B934 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6B938 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C6B93C 7C 9F 23 78 */ mr r31, r4 -/* 80C6B940 41 82 00 94 */ beq lbl_80C6B9D4 -/* 80C6B944 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6B948 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6B94C 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80C6B950 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6B954 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6B958 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6B95C 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6B960 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C6B964 41 82 00 54 */ beq lbl_80C6B9B8 -/* 80C6B968 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6B96C 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6B970 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80C6B974 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6B978 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6B97C 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 80C6B980 41 82 00 10 */ beq lbl_80C6B990 -/* 80C6B984 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6C7D0@ha */ -/* 80C6B988 38 03 C7 D0 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6C7D0@l */ -/* 80C6B98C 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80C6B990: -/* 80C6B990 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C6B994 41 82 00 24 */ beq lbl_80C6B9B8 -/* 80C6B998 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6B99C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6B9A0 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6B9A4 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C6B9A8 41 82 00 10 */ beq lbl_80C6B9B8 -/* 80C6B9AC 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6C7C4@ha */ -/* 80C6B9B0 38 03 C7 C4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6C7C4@l */ -/* 80C6B9B4 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_80C6B9B8: -/* 80C6B9B8 7F C3 F3 78 */ mr r3, r30 -/* 80C6B9BC 38 80 00 00 */ li r4, 0 -/* 80C6B9C0 4B 41 87 25 */ bl __dt__12dCcD_GObjInfFv -/* 80C6B9C4 7F E0 07 35 */ extsh. r0, r31 -/* 80C6B9C8 40 81 00 0C */ ble lbl_80C6B9D4 -/* 80C6B9CC 7F C3 F3 78 */ mr r3, r30 -/* 80C6B9D0 4B 66 33 6D */ bl __dl__FPv -lbl_80C6B9D4: -/* 80C6B9D4 7F C3 F3 78 */ mr r3, r30 -/* 80C6B9D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6B9DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6B9E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6B9E4 7C 08 03 A6 */ mtlr r0 -/* 80C6B9E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6B9EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__sinit_d_a_obj_lv5IceWall_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__sinit_d_a_obj_lv5IceWall_cpp.s deleted file mode 100644 index 150c7289c2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__sinit_d_a_obj_lv5IceWall_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C6C5BC: -/* 80C6C5BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C5C0 7C 08 02 A6 */ mflr r0 -/* 80C6C5C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C5C8 3C 60 80 C7 */ lis r3, l_HIO@ha /* 0x80C6C83C@ha */ -/* 80C6C5CC 38 63 C8 3C */ addi r3, r3, l_HIO@l /* 0x80C6C83C@l */ -/* 80C6C5D0 4B FF EE 5D */ bl __ct__15daIceWall_HIO_cFv -/* 80C6C5D4 3C 80 80 C7 */ lis r4, __dt__15daIceWall_HIO_cFv@ha /* 0x80C6C550@ha */ -/* 80C6C5D8 38 84 C5 50 */ addi r4, r4, __dt__15daIceWall_HIO_cFv@l /* 0x80C6C550@l */ -/* 80C6C5DC 3C A0 80 C7 */ lis r5, lit_3647@ha /* 0x80C6C830@ha */ -/* 80C6C5E0 38 A5 C8 30 */ addi r5, r5, lit_3647@l /* 0x80C6C830@l */ -/* 80C6C5E4 4B FF ED D5 */ bl __register_global_object -/* 80C6C5E8 3C 60 80 C7 */ lis r3, mCcDCyl__11daIceWall_c@ha /* 0x80C6C6E8@ha */ -/* 80C6C5EC 38 63 C6 E8 */ addi r3, r3, mCcDCyl__11daIceWall_c@l /* 0x80C6C6E8@l */ -/* 80C6C5F0 38 A3 FF FC */ addi r5, r3, -4 -/* 80C6C5F4 3C 60 80 C7 */ lis r3, mCcDObjInfo__11daIceWall_c@ha /* 0x80C6C644@ha */ -/* 80C6C5F8 38 63 C6 44 */ addi r3, r3, mCcDObjInfo__11daIceWall_c@l /* 0x80C6C644@l */ -/* 80C6C5FC 38 83 FF FC */ addi r4, r3, -4 -/* 80C6C600 38 00 00 06 */ li r0, 6 -/* 80C6C604 7C 09 03 A6 */ mtctr r0 -lbl_80C6C608: -/* 80C6C608 80 64 00 04 */ lwz r3, 4(r4) -/* 80C6C60C 84 04 00 08 */ lwzu r0, 8(r4) -/* 80C6C610 90 65 00 04 */ stw r3, 4(r5) -/* 80C6C614 94 05 00 08 */ stwu r0, 8(r5) -/* 80C6C618 42 00 FF F0 */ bdnz lbl_80C6C608 -/* 80C6C61C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C620 7C 08 03 A6 */ mtlr r0 -/* 80C6C624 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C628 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/create__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/create__11daIceWall_cFv.s deleted file mode 100644 index 8d357ef591..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/create__11daIceWall_cFv.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80C6B69C: -/* 80C6B69C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C6B6A0 7C 08 02 A6 */ mflr r0 -/* 80C6B6A4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C6B6A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C6B6AC 4B 6F 6B 21 */ bl _savegpr_25 -/* 80C6B6B0 7C 7E 1B 78 */ mr r30, r3 -/* 80C6B6B4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C6B6B8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C6B6BC 40 82 00 74 */ bne lbl_80C6B730 -/* 80C6B6C0 7F C0 F3 79 */ or. r0, r30, r30 -/* 80C6B6C4 41 82 00 60 */ beq lbl_80C6B724 -/* 80C6B6C8 7C 19 03 78 */ mr r25, r0 -/* 80C6B6CC 4B 40 CF 59 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C6B6D0 3C 60 80 C7 */ lis r3, __vt__11daIceWall_c@ha /* 0x80C6C7DC@ha */ -/* 80C6B6D4 38 03 C7 DC */ addi r0, r3, __vt__11daIceWall_c@l /* 0x80C6C7DC@l */ -/* 80C6B6D8 90 19 05 9C */ stw r0, 0x59c(r25) -/* 80C6B6DC 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C6B6E0 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C6B6E4 90 19 05 B8 */ stw r0, 0x5b8(r25) -/* 80C6B6E8 38 79 05 BC */ addi r3, r25, 0x5bc -/* 80C6B6EC 4B 41 80 75 */ bl __ct__10dCcD_GSttsFv -/* 80C6B6F0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C6B6F4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C6B6F8 90 79 05 B8 */ stw r3, 0x5b8(r25) -/* 80C6B6FC 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C6B700 90 19 05 BC */ stw r0, 0x5bc(r25) -/* 80C6B704 38 79 05 DC */ addi r3, r25, 0x5dc -/* 80C6B708 3C 80 80 C7 */ lis r4, __ct__8dCcD_CylFv@ha /* 0x80C6B9F0@ha */ -/* 80C6B70C 38 84 B9 F0 */ addi r4, r4, __ct__8dCcD_CylFv@l /* 0x80C6B9F0@l */ -/* 80C6B710 3C A0 80 C7 */ lis r5, __dt__8dCcD_CylFv@ha /* 0x80C6B924@ha */ -/* 80C6B714 38 A5 B9 24 */ addi r5, r5, __dt__8dCcD_CylFv@l /* 0x80C6B924@l */ -/* 80C6B718 38 C0 01 3C */ li r6, 0x13c -/* 80C6B71C 38 E0 00 02 */ li r7, 2 -/* 80C6B720 4B 6F 66 41 */ bl __construct_array -lbl_80C6B724: -/* 80C6B724 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80C6B728 60 00 00 08 */ ori r0, r0, 8 -/* 80C6B72C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80C6B730: -/* 80C6B730 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C6B734 98 1E 08 67 */ stb r0, 0x867(r30) -/* 80C6B738 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C6B73C 98 1E 08 68 */ stb r0, 0x868(r30) -/* 80C6B740 88 9E 08 67 */ lbz r4, 0x867(r30) -/* 80C6B744 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6B748 41 82 00 58 */ beq lbl_80C6B7A0 -/* 80C6B74C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6B750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6B754 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C6B758 7C 05 07 74 */ extsb r5, r0 -/* 80C6B75C 4B 3C 9C 05 */ bl isSwitch__10dSv_info_cCFii -/* 80C6B760 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6B764 41 82 00 0C */ beq lbl_80C6B770 -/* 80C6B768 38 60 00 05 */ li r3, 5 -/* 80C6B76C 48 00 01 A0 */ b lbl_80C6B90C -lbl_80C6B770: -/* 80C6B770 38 00 00 00 */ li r0, 0 -/* 80C6B774 98 1E 08 65 */ stb r0, 0x865(r30) -/* 80C6B778 88 9E 08 68 */ lbz r4, 0x868(r30) -/* 80C6B77C 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6B780 41 82 00 28 */ beq lbl_80C6B7A8 -/* 80C6B784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6B788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6B78C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C6B790 7C 05 07 74 */ extsb r5, r0 -/* 80C6B794 4B 3C 9B CD */ bl isSwitch__10dSv_info_cCFii -/* 80C6B798 98 7E 08 65 */ stb r3, 0x865(r30) -/* 80C6B79C 48 00 00 0C */ b lbl_80C6B7A8 -lbl_80C6B7A0: -/* 80C6B7A0 38 00 00 00 */ li r0, 0 -/* 80C6B7A4 98 1E 08 65 */ stb r0, 0x865(r30) -lbl_80C6B7A8: -/* 80C6B7A8 38 7E 08 54 */ addi r3, r30, 0x854 -/* 80C6B7AC 3C 80 80 C7 */ lis r4, d_a_obj_lv5IceWall__stringBase0@ha /* 0x80C6C6BC@ha */ -/* 80C6B7B0 38 84 C6 BC */ addi r4, r4, d_a_obj_lv5IceWall__stringBase0@l /* 0x80C6C6BC@l */ -/* 80C6B7B4 4B 3C 17 09 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C6B7B8 7C 7F 1B 78 */ mr r31, r3 -/* 80C6B7BC 2C 1F 00 04 */ cmpwi r31, 4 -/* 80C6B7C0 40 82 01 48 */ bne lbl_80C6B908 -/* 80C6B7C4 7F C3 F3 78 */ mr r3, r30 -/* 80C6B7C8 3C 80 80 C7 */ lis r4, d_a_obj_lv5IceWall__stringBase0@ha /* 0x80C6C6BC@ha */ -/* 80C6B7CC 38 84 C6 BC */ addi r4, r4, d_a_obj_lv5IceWall__stringBase0@l /* 0x80C6C6BC@l */ -/* 80C6B7D0 38 A0 00 08 */ li r5, 8 -/* 80C6B7D4 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C6B7D8 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C6B7DC 38 E0 21 00 */ li r7, 0x2100 -/* 80C6B7E0 39 00 00 00 */ li r8, 0 -/* 80C6B7E4 4B 40 CF D9 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C6B7E8 2C 03 00 05 */ cmpwi r3, 5 -/* 80C6B7EC 40 82 00 0C */ bne lbl_80C6B7F8 -/* 80C6B7F0 38 60 00 05 */ li r3, 5 -/* 80C6B7F4 48 00 01 18 */ b lbl_80C6B90C -lbl_80C6B7F8: -/* 80C6B7F8 3C 60 80 C7 */ lis r3, lit_3795@ha /* 0x80C6C67C@ha */ -/* 80C6B7FC C0 43 C6 7C */ lfs f2, lit_3795@l(r3) /* 0x80C6C67C@l */ -/* 80C6B800 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C6B804 54 00 86 FE */ rlwinm r0, r0, 0x10, 0x1b, 0x1f -/* 80C6B808 3C 60 80 C7 */ lis r3, lit_3797@ha /* 0x80C6C680@ha */ -/* 80C6B80C C8 23 C6 80 */ lfd f1, lit_3797@l(r3) /* 0x80C6C680@l */ -/* 80C6B810 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6B814 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6B818 3C 60 43 30 */ lis r3, 0x4330 -/* 80C6B81C 90 61 00 08 */ stw r3, 8(r1) -/* 80C6B820 C8 01 00 08 */ lfd f0, 8(r1) -/* 80C6B824 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6B828 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C6B82C D0 1E 08 6C */ stfs f0, 0x86c(r30) -/* 80C6B830 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C6B834 54 00 5E FE */ rlwinm r0, r0, 0xb, 0x1b, 0x1f -/* 80C6B838 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6B83C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6B840 90 61 00 10 */ stw r3, 0x10(r1) -/* 80C6B844 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80C6B848 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6B84C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C6B850 D0 1E 08 70 */ stfs f0, 0x870(r30) -/* 80C6B854 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C6B858 54 00 36 FE */ rlwinm r0, r0, 6, 0x1b, 0x1f -/* 80C6B85C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6B860 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80C6B864 90 61 00 18 */ stw r3, 0x18(r1) -/* 80C6B868 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80C6B86C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6B870 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C6B874 D0 1E 08 74 */ stfs f0, 0x874(r30) -/* 80C6B878 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6B87C 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6B880 7C 7E 02 14 */ add r3, r30, r0 -/* 80C6B884 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6B888 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C6B88C 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C6B890 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6B894 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6B898 7C 7E 02 14 */ add r3, r30, r0 -/* 80C6B89C 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6B8A0 80 83 00 04 */ lwz r4, 4(r3) -/* 80C6B8A4 7F C3 F3 78 */ mr r3, r30 -/* 80C6B8A8 4B 3A EC D1 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C6B8AC 38 7E 05 A0 */ addi r3, r30, 0x5a0 -/* 80C6B8B0 38 80 00 FF */ li r4, 0xff -/* 80C6B8B4 38 A0 00 FF */ li r5, 0xff -/* 80C6B8B8 7F C6 F3 78 */ mr r6, r30 -/* 80C6B8BC 4B 41 7F A5 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C6B8C0 3B 20 00 00 */ li r25, 0 -/* 80C6B8C4 3B A0 00 00 */ li r29, 0 -/* 80C6B8C8 3C 60 80 C7 */ lis r3, mCcDCyl__11daIceWall_c@ha /* 0x80C6C6E8@ha */ -/* 80C6B8CC 3B 63 C6 E8 */ addi r27, r3, mCcDCyl__11daIceWall_c@l /* 0x80C6C6E8@l */ -/* 80C6B8D0 3B 9E 05 A0 */ addi r28, r30, 0x5a0 -lbl_80C6B8D4: -/* 80C6B8D4 7F 5E EA 14 */ add r26, r30, r29 -/* 80C6B8D8 38 7A 05 DC */ addi r3, r26, 0x5dc -/* 80C6B8DC 7F 64 DB 78 */ mr r4, r27 -/* 80C6B8E0 4B 41 8F D5 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6B8E4 93 9A 06 20 */ stw r28, 0x620(r26) -/* 80C6B8E8 3B 39 00 01 */ addi r25, r25, 1 -/* 80C6B8EC 2C 19 00 02 */ cmpwi r25, 2 -/* 80C6B8F0 3B BD 01 3C */ addi r29, r29, 0x13c -/* 80C6B8F4 41 80 FF E0 */ blt lbl_80C6B8D4 -/* 80C6B8F8 7F C3 F3 78 */ mr r3, r30 -/* 80C6B8FC 48 00 03 55 */ bl init_modeWait__11daIceWall_cFv -/* 80C6B900 7F C3 F3 78 */ mr r3, r30 -/* 80C6B904 4B FF FC 19 */ bl setBaseMtx__11daIceWall_cFv -lbl_80C6B908: -/* 80C6B908 7F E3 FB 78 */ mr r3, r31 -lbl_80C6B90C: -/* 80C6B90C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C6B910 4B 6F 69 09 */ bl _restgpr_25 -/* 80C6B914 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C6B918 7C 08 03 A6 */ mtlr r0 -/* 80C6B91C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C6B920 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 4f39c546dd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6C4E8: -/* 80C6C4E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C4EC 7C 08 02 A6 */ mflr r0 -/* 80C6C4F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C4F4 4B FF F1 A9 */ bl create__11daIceWall_cFv -/* 80C6C4F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C4FC 7C 08 03 A6 */ mtlr r0 -/* 80C6C500 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C504 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Delete__FP11daIceWall_c.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Delete__FP11daIceWall_c.s deleted file mode 100644 index 506a78931c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Delete__FP11daIceWall_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6C4C8: -/* 80C6C4C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C4CC 7C 08 02 A6 */ mflr r0 -/* 80C6C4D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C4D4 4B 40 C4 09 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C6C4D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C4DC 7C 08 03 A6 */ mtlr r0 -/* 80C6C4E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C4E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Draw__FP11daIceWall_c.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Draw__FP11daIceWall_c.s deleted file mode 100644 index 241d584b0b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Draw__FP11daIceWall_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C6C47C: -/* 80C6C47C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C480 7C 08 02 A6 */ mflr r0 -/* 80C6C484 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C488 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C6C48C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C6C490 7D 89 03 A6 */ mtctr r12 -/* 80C6C494 4E 80 04 21 */ bctrl -/* 80C6C498 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C49C 7C 08 03 A6 */ mtlr r0 -/* 80C6C4A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C4A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Execute__FP11daIceWall_c.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Execute__FP11daIceWall_c.s deleted file mode 100644 index 24a2a2096d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Execute__FP11daIceWall_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6C4A8: -/* 80C6C4A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C4AC 7C 08 02 A6 */ mflr r0 -/* 80C6C4B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C4B4 4B 40 C4 9D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C6C4B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C4BC 7C 08 03 A6 */ mtlr r0 -/* 80C6C4C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C4C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeBreak__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeBreak__11daIceWall_cFv.s deleted file mode 100644 index 792026dc8d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeBreak__11daIceWall_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80C6C170: -/* 80C6C170 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C174 7C 08 02 A6 */ mflr r0 -/* 80C6C178 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C17C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6C180 7C 7F 1B 78 */ mr r31, r3 -/* 80C6C184 88 83 08 67 */ lbz r4, 0x867(r3) -/* 80C6C188 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6C18C 41 82 00 18 */ beq lbl_80C6C1A4 -/* 80C6C190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6C194 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6C198 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6C19C 7C 05 07 74 */ extsb r5, r0 -/* 80C6C1A0 4B 3C 90 61 */ bl onSwitch__10dSv_info_cFii -lbl_80C6C1A4: -/* 80C6C1A4 38 00 00 01 */ li r0, 1 -/* 80C6C1A8 98 1F 08 64 */ stb r0, 0x864(r31) -/* 80C6C1AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6C1B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C1B4 7C 08 03 A6 */ mtlr r0 -/* 80C6C1B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C1BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeWait__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeWait__11daIceWall_cFv.s deleted file mode 100644 index 18dc363d6b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeWait__11daIceWall_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C6BC50: -/* 80C6BC50 3C 80 80 C7 */ lis r4, l_HIO@ha /* 0x80C6C83C@ha */ -/* 80C6BC54 38 84 C8 3C */ addi r4, r4, l_HIO@l /* 0x80C6C83C@l */ -/* 80C6BC58 88 04 00 10 */ lbz r0, 0x10(r4) -/* 80C6BC5C 98 03 08 66 */ stb r0, 0x866(r3) -/* 80C6BC60 38 00 00 00 */ li r0, 0 -/* 80C6BC64 98 03 08 64 */ stb r0, 0x864(r3) -/* 80C6BC68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeBreak__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeBreak__11daIceWall_cFv.s deleted file mode 100644 index ed0e028b0a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeBreak__11daIceWall_cFv.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_80C6C1C0: -/* 80C6C1C0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80C6C1C4 7C 08 02 A6 */ mflr r0 -/* 80C6C1C8 90 01 00 64 */ stw r0, 0x64(r1) -/* 80C6C1CC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80C6C1D0 4B 6F 60 0D */ bl _savegpr_29 -/* 80C6C1D4 7C 7E 1B 78 */ mr r30, r3 -/* 80C6C1D8 3C 60 80 C7 */ lis r3, lit_3656@ha /* 0x80C6C640@ha */ -/* 80C6C1DC 3B E3 C6 40 */ addi r31, r3, lit_3656@l /* 0x80C6C640@l */ -/* 80C6C1E0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6C1E4 D0 21 00 3C */ stfs f1, 0x3c(r1) -/* 80C6C1E8 D0 21 00 40 */ stfs f1, 0x40(r1) -/* 80C6C1EC D0 21 00 44 */ stfs f1, 0x44(r1) -/* 80C6C1F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6C1F4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6C1F8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C6C1FC 38 00 00 FF */ li r0, 0xff -/* 80C6C200 90 01 00 08 */ stw r0, 8(r1) -/* 80C6C204 38 80 00 00 */ li r4, 0 -/* 80C6C208 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6C20C 38 00 FF FF */ li r0, -1 -/* 80C6C210 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6C214 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6C218 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6C21C 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6C220 80 9E 08 78 */ lwz r4, 0x878(r30) -/* 80C6C224 38 A0 00 00 */ li r5, 0 -/* 80C6C228 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000867B@ha */ -/* 80C6C22C 38 C6 86 7B */ addi r6, r6, 0x867B /* 0x0000867B@l */ -/* 80C6C230 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6C234 39 00 00 00 */ li r8, 0 -/* 80C6C238 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80C6C23C 39 41 00 3C */ addi r10, r1, 0x3c -/* 80C6C240 4B 3E 12 8D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6C244 90 7E 08 78 */ stw r3, 0x878(r30) -/* 80C6C248 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C6C24C 38 00 00 FF */ li r0, 0xff -/* 80C6C250 90 01 00 08 */ stw r0, 8(r1) -/* 80C6C254 38 80 00 00 */ li r4, 0 -/* 80C6C258 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6C25C 38 00 FF FF */ li r0, -1 -/* 80C6C260 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6C264 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6C268 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6C26C 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6C270 80 9E 08 7C */ lwz r4, 0x87c(r30) -/* 80C6C274 38 A0 00 00 */ li r5, 0 -/* 80C6C278 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6C27C 54 00 08 3C */ slwi r0, r0, 1 -/* 80C6C280 38 DF 00 78 */ addi r6, r31, 0x78 -/* 80C6C284 7C C6 02 2E */ lhzx r6, r6, r0 -/* 80C6C288 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6C28C 39 00 00 00 */ li r8, 0 -/* 80C6C290 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80C6C294 39 41 00 3C */ addi r10, r1, 0x3c -/* 80C6C298 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6C29C 4B 3E 12 31 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6C2A0 90 7E 08 7C */ stw r3, 0x87c(r30) -/* 80C6C2A4 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C6C2A8 38 63 02 10 */ addi r3, r3, 0x210 -/* 80C6C2AC 80 9E 08 7C */ lwz r4, 0x87c(r30) -/* 80C6C2B0 4B 3D F6 69 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80C6C2B4 28 03 00 00 */ cmplwi r3, 0 -/* 80C6C2B8 41 82 00 50 */ beq lbl_80C6C308 -/* 80C6C2BC C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 80C6C2C0 C0 1E 08 6C */ lfs f0, 0x86c(r30) -/* 80C6C2C4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C6C2C8 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80C6C2CC C0 1E 08 74 */ lfs f0, 0x874(r30) -/* 80C6C2D0 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80C6C2D4 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80C6C2D8 C0 1E 08 70 */ lfs f0, 0x870(r30) -/* 80C6C2DC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80C6C2E0 D0 21 00 38 */ stfs f1, 0x38(r1) -/* 80C6C2E4 E0 01 00 30 */ psq_l f0, 48(r1), 0, 0 /* qr0 */ -/* 80C6C2E8 F0 01 00 24 */ psq_st f0, 36(r1), 0, 0 /* qr0 */ -/* 80C6C2EC D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80C6C2F0 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80C6C2F4 D0 03 00 00 */ stfs f0, 0(r3) -/* 80C6C2F8 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80C6C2FC D0 03 00 04 */ stfs f0, 4(r3) -/* 80C6C300 FC 00 08 18 */ frsp f0, f1 -/* 80C6C304 D0 03 00 08 */ stfs f0, 8(r3) -lbl_80C6C308: -/* 80C6C308 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C6C30C 7C 03 07 74 */ extsb r3, r0 -/* 80C6C310 4B 3C 0D 5D */ bl dComIfGp_getReverb__Fi -/* 80C6C314 7C 67 1B 78 */ mr r7, r3 -/* 80C6C318 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C7@ha */ -/* 80C6C31C 38 03 01 C7 */ addi r0, r3, 0x01C7 /* 0x000801C7@l */ -/* 80C6C320 90 01 00 20 */ stw r0, 0x20(r1) -/* 80C6C324 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6C328 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6C32C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6C330 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C6C334 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C6C338 38 C0 00 00 */ li r6, 0 -/* 80C6C33C C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6C340 FC 40 08 90 */ fmr f2, f1 -/* 80C6C344 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80C6C348 FC 80 18 90 */ fmr f4, f3 -/* 80C6C34C 39 00 00 00 */ li r8, 0 -/* 80C6C350 4B 63 F6 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6C354 7F C3 F3 78 */ mr r3, r30 -/* 80C6C358 4B 3A D9 25 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80C6C35C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80C6C360 4B 6F 5E C9 */ bl _restgpr_29 -/* 80C6C364 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80C6C368 7C 08 03 A6 */ mtlr r0 -/* 80C6C36C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80C6C370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeWait__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeWait__11daIceWall_cFv.s deleted file mode 100644 index bfc6185ed1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeWait__11daIceWall_cFv.s +++ /dev/null @@ -1,332 +0,0 @@ -lbl_80C6BC6C: -/* 80C6BC6C 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 80C6BC70 7C 08 02 A6 */ mflr r0 -/* 80C6BC74 90 01 01 24 */ stw r0, 0x124(r1) -/* 80C6BC78 DB E1 01 10 */ stfd f31, 0x110(r1) -/* 80C6BC7C F3 E1 01 18 */ psq_st f31, 280(r1), 0, 0 /* qr0 */ -/* 80C6BC80 DB C1 01 00 */ stfd f30, 0x100(r1) -/* 80C6BC84 F3 C1 01 08 */ psq_st f30, 264(r1), 0, 0 /* qr0 */ -/* 80C6BC88 DB A1 00 F0 */ stfd f29, 0xf0(r1) -/* 80C6BC8C F3 A1 00 F8 */ psq_st f29, 248(r1), 0, 0 /* qr0 */ -/* 80C6BC90 DB 81 00 E0 */ stfd f28, 0xe0(r1) -/* 80C6BC94 F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0 /* qr0 */ -/* 80C6BC98 DB 61 00 D0 */ stfd f27, 0xd0(r1) -/* 80C6BC9C F3 61 00 D8 */ psq_st f27, 216(r1), 0, 0 /* qr0 */ -/* 80C6BCA0 DB 41 00 C0 */ stfd f26, 0xc0(r1) -/* 80C6BCA4 F3 41 00 C8 */ psq_st f26, 200(r1), 0, 0 /* qr0 */ -/* 80C6BCA8 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80C6BCAC 4B 6F 65 19 */ bl _savegpr_23 -/* 80C6BCB0 7C 7E 1B 78 */ mr r30, r3 -/* 80C6BCB4 3C 60 80 C7 */ lis r3, lit_3656@ha /* 0x80C6C640@ha */ -/* 80C6BCB8 3B E3 C6 40 */ addi r31, r3, lit_3656@l /* 0x80C6C640@l */ -/* 80C6BCBC 3B 00 00 00 */ li r24, 0 -/* 80C6BCC0 3B A0 00 00 */ li r29, 0 -lbl_80C6BCC4: -/* 80C6BCC4 3B 5D 05 DC */ addi r26, r29, 0x5dc -/* 80C6BCC8 7F 5E D2 14 */ add r26, r30, r26 -/* 80C6BCCC 7F 43 D3 78 */ mr r3, r26 -/* 80C6BCD0 4B 41 87 91 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C6BCD4 28 03 00 00 */ cmplwi r3, 0 -/* 80C6BCD8 41 82 02 10 */ beq lbl_80C6BEE8 -/* 80C6BCDC 7F 43 D3 78 */ mr r3, r26 -/* 80C6BCE0 4B 41 88 69 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C6BCE4 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C6BCE8 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 80C6BCEC 41 82 02 0C */ beq lbl_80C6BEF8 -/* 80C6BCF0 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80C6BCF4 28 00 00 64 */ cmplwi r0, 0x64 -/* 80C6BCF8 41 82 00 10 */ beq lbl_80C6BD08 -/* 80C6BCFC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80C6BD00 28 00 00 03 */ cmplwi r0, 3 -/* 80C6BD04 40 82 00 10 */ bne lbl_80C6BD14 -lbl_80C6BD08: -/* 80C6BD08 7F C3 F3 78 */ mr r3, r30 -/* 80C6BD0C 48 00 04 65 */ bl init_modeBreak__11daIceWall_cFv -/* 80C6BD10 48 00 01 E8 */ b lbl_80C6BEF8 -lbl_80C6BD14: -/* 80C6BD14 28 00 00 02 */ cmplwi r0, 2 -/* 80C6BD18 40 82 01 E0 */ bne lbl_80C6BEF8 -/* 80C6BD1C C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6BD20 D0 21 00 78 */ stfs f1, 0x78(r1) -/* 80C6BD24 D0 21 00 7C */ stfs f1, 0x7c(r1) -/* 80C6BD28 D0 21 00 80 */ stfs f1, 0x80(r1) -/* 80C6BD2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6BD30 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6BD34 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 80C6BD38 38 00 00 FF */ li r0, 0xff -/* 80C6BD3C 90 01 00 08 */ stw r0, 8(r1) -/* 80C6BD40 38 80 00 00 */ li r4, 0 -/* 80C6BD44 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6BD48 38 00 FF FF */ li r0, -1 -/* 80C6BD4C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6BD50 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6BD54 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6BD58 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6BD5C 80 9E 08 80 */ lwz r4, 0x880(r30) -/* 80C6BD60 38 A0 00 00 */ li r5, 0 -/* 80C6BD64 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008678@ha */ -/* 80C6BD68 38 C6 86 78 */ addi r6, r6, 0x8678 /* 0x00008678@l */ -/* 80C6BD6C 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6BD70 39 00 00 00 */ li r8, 0 -/* 80C6BD74 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80C6BD78 39 41 00 78 */ addi r10, r1, 0x78 -/* 80C6BD7C 4B 3E 17 51 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6BD80 90 7E 08 80 */ stw r3, 0x880(r30) -/* 80C6BD84 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 80C6BD88 38 63 02 10 */ addi r3, r3, 0x210 -/* 80C6BD8C 80 9E 08 7C */ lwz r4, 0x87c(r30) -/* 80C6BD90 4B 3D FB 89 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80C6BD94 28 03 00 00 */ cmplwi r3, 0 -/* 80C6BD98 41 82 00 50 */ beq lbl_80C6BDE8 -/* 80C6BD9C C0 3F 00 4C */ lfs f1, 0x4c(r31) -/* 80C6BDA0 C0 1E 08 6C */ lfs f0, 0x86c(r30) -/* 80C6BDA4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C6BDA8 D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 80C6BDAC C0 1E 08 74 */ lfs f0, 0x874(r30) -/* 80C6BDB0 D0 01 00 70 */ stfs f0, 0x70(r1) -/* 80C6BDB4 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80C6BDB8 C0 1E 08 70 */ lfs f0, 0x870(r30) -/* 80C6BDBC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80C6BDC0 D0 21 00 74 */ stfs f1, 0x74(r1) -/* 80C6BDC4 E0 01 00 6C */ psq_l f0, 108(r1), 0, 0 /* qr0 */ -/* 80C6BDC8 F0 01 00 30 */ psq_st f0, 48(r1), 0, 0 /* qr0 */ -/* 80C6BDCC D0 21 00 38 */ stfs f1, 0x38(r1) -/* 80C6BDD0 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80C6BDD4 D0 03 00 00 */ stfs f0, 0(r3) -/* 80C6BDD8 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80C6BDDC D0 03 00 04 */ stfs f0, 4(r3) -/* 80C6BDE0 FC 00 08 18 */ frsp f0, f1 -/* 80C6BDE4 D0 03 00 08 */ stfs f0, 8(r3) -lbl_80C6BDE8: -/* 80C6BDE8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C6BDEC 7C 03 07 74 */ extsb r3, r0 -/* 80C6BDF0 4B 3C 12 7D */ bl dComIfGp_getReverb__Fi -/* 80C6BDF4 7C 67 1B 78 */ mr r7, r3 -/* 80C6BDF8 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C8@ha */ -/* 80C6BDFC 38 03 01 C8 */ addi r0, r3, 0x01C8 /* 0x000801C8@l */ -/* 80C6BE00 90 01 00 20 */ stw r0, 0x20(r1) -/* 80C6BE04 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6BE08 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6BE0C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6BE10 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C6BE14 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C6BE18 38 C0 00 00 */ li r6, 0 -/* 80C6BE1C C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6BE20 FC 40 08 90 */ fmr f2, f1 -/* 80C6BE24 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80C6BE28 FC 80 18 90 */ fmr f4, f3 -/* 80C6BE2C 39 00 00 00 */ li r8, 0 -/* 80C6BE30 4B 63 FB 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6BE34 88 7E 08 66 */ lbz r3, 0x866(r30) -/* 80C6BE38 38 03 FF FF */ addi r0, r3, -1 -/* 80C6BE3C 98 1E 08 66 */ stb r0, 0x866(r30) -/* 80C6BE40 88 1E 08 66 */ lbz r0, 0x866(r30) -/* 80C6BE44 28 00 00 00 */ cmplwi r0, 0 -/* 80C6BE48 40 82 00 B0 */ bne lbl_80C6BEF8 -/* 80C6BE4C 88 7E 08 65 */ lbz r3, 0x865(r30) -/* 80C6BE50 38 03 00 01 */ addi r0, r3, 1 -/* 80C6BE54 98 1E 08 65 */ stb r0, 0x865(r30) -/* 80C6BE58 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6BE5C 28 00 00 01 */ cmplwi r0, 1 -/* 80C6BE60 40 82 00 68 */ bne lbl_80C6BEC8 -/* 80C6BE64 88 9E 08 68 */ lbz r4, 0x868(r30) -/* 80C6BE68 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6BE6C 41 82 00 18 */ beq lbl_80C6BE84 -/* 80C6BE70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6BE74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6BE78 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C6BE7C 7C 05 07 74 */ extsb r5, r0 -/* 80C6BE80 4B 3C 93 81 */ bl onSwitch__10dSv_info_cFii -lbl_80C6BE84: -/* 80C6BE84 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6BE88 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6BE8C 7C 7E 02 14 */ add r3, r30, r0 -/* 80C6BE90 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6BE94 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C6BE98 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C6BE9C 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6BEA0 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6BEA4 7C 7E 02 14 */ add r3, r30, r0 -/* 80C6BEA8 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6BEAC 80 83 00 04 */ lwz r4, 4(r3) -/* 80C6BEB0 7F C3 F3 78 */ mr r3, r30 -/* 80C6BEB4 4B 3A E6 C5 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C6BEB8 3C 60 80 C7 */ lis r3, l_HIO@ha /* 0x80C6C83C@ha */ -/* 80C6BEBC 38 63 C8 3C */ addi r3, r3, l_HIO@l /* 0x80C6C83C@l */ -/* 80C6BEC0 88 03 00 11 */ lbz r0, 0x11(r3) -/* 80C6BEC4 98 1E 08 66 */ stb r0, 0x866(r30) -lbl_80C6BEC8: -/* 80C6BEC8 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6BECC 28 00 00 01 */ cmplwi r0, 1 -/* 80C6BED0 40 81 00 28 */ ble lbl_80C6BEF8 -/* 80C6BED4 38 00 00 01 */ li r0, 1 -/* 80C6BED8 98 1E 08 65 */ stb r0, 0x865(r30) -/* 80C6BEDC 7F C3 F3 78 */ mr r3, r30 -/* 80C6BEE0 48 00 02 91 */ bl init_modeBreak__11daIceWall_cFv -/* 80C6BEE4 48 00 00 14 */ b lbl_80C6BEF8 -lbl_80C6BEE8: -/* 80C6BEE8 3B 18 00 01 */ addi r24, r24, 1 -/* 80C6BEEC 2C 18 00 02 */ cmpwi r24, 2 -/* 80C6BEF0 3B BD 01 3C */ addi r29, r29, 0x13c -/* 80C6BEF4 41 80 FD D0 */ blt lbl_80C6BCC4 -lbl_80C6BEF8: -/* 80C6BEF8 3A E0 00 00 */ li r23, 0 -/* 80C6BEFC 3B A0 00 00 */ li r29, 0 -/* 80C6BF00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6BF04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6BF08 3B 43 23 3C */ addi r26, r3, 0x233c -/* 80C6BF0C C3 5F 00 58 */ lfs f26, 0x58(r31) -/* 80C6BF10 C3 7F 00 5C */ lfs f27, 0x5c(r31) -/* 80C6BF14 CB 9F 00 40 */ lfd f28, 0x40(r31) -/* 80C6BF18 3F 60 43 30 */ lis r27, 0x4330 -/* 80C6BF1C C3 BF 00 60 */ lfs f29, 0x60(r31) -/* 80C6BF20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6BF24 3B 83 D4 70 */ addi r28, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6BF28 C3 DF 00 64 */ lfs f30, 0x64(r31) -/* 80C6BF2C C3 FF 00 68 */ lfs f31, 0x68(r31) -lbl_80C6BF30: -/* 80C6BF30 D3 41 00 60 */ stfs f26, 0x60(r1) -/* 80C6BF34 D3 41 00 64 */ stfs f26, 0x64(r1) -/* 80C6BF38 D3 41 00 68 */ stfs f26, 0x68(r1) -/* 80C6BF3C 6E E0 80 00 */ xoris r0, r23, 0x8000 -/* 80C6BF40 90 01 00 8C */ stw r0, 0x8c(r1) -/* 80C6BF44 93 61 00 88 */ stw r27, 0x88(r1) -/* 80C6BF48 C8 01 00 88 */ lfd f0, 0x88(r1) -/* 80C6BF4C EC 00 E0 28 */ fsubs f0, f0, f28 -/* 80C6BF50 EC 1B 00 32 */ fmuls f0, f27, f0 -/* 80C6BF54 EC 00 E8 28 */ fsubs f0, f0, f29 -/* 80C6BF58 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 80C6BF5C 7F 83 E3 78 */ mr r3, r28 -/* 80C6BF60 A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 80C6BF64 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 80C6BF68 A8 DE 04 E8 */ lha r6, 0x4e8(r30) -/* 80C6BF6C 4B 3A 02 9D */ bl mDoMtx_ZXYrotS__FPA4_fsss -/* 80C6BF70 7F 83 E3 78 */ mr r3, r28 -/* 80C6BF74 38 81 00 60 */ addi r4, r1, 0x60 -/* 80C6BF78 7C 85 23 78 */ mr r5, r4 -/* 80C6BF7C 4B 6D AD F1 */ bl PSMTXMultVec -/* 80C6BF80 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C6BF84 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80C6BF88 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C6BF8C D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80C6BF90 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C6BF94 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 80C6BF98 38 61 00 54 */ addi r3, r1, 0x54 -/* 80C6BF9C 38 81 00 60 */ addi r4, r1, 0x60 -/* 80C6BFA0 7C 65 1B 78 */ mr r5, r3 -/* 80C6BFA4 4B 6D B0 ED */ bl PSVECAdd -/* 80C6BFA8 7F 1E EA 14 */ add r24, r30, r29 -/* 80C6BFAC 3B 38 07 00 */ addi r25, r24, 0x700 -/* 80C6BFB0 7F 23 CB 78 */ mr r3, r25 -/* 80C6BFB4 C0 1E 08 74 */ lfs f0, 0x874(r30) -/* 80C6BFB8 EC 3E 00 32 */ fmuls f1, f30, f0 -/* 80C6BFBC 4B 60 32 45 */ bl SetR__8cM3dGCylFf -/* 80C6BFC0 7F 23 CB 78 */ mr r3, r25 -/* 80C6BFC4 C0 1E 08 70 */ lfs f0, 0x870(r30) -/* 80C6BFC8 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80C6BFCC 4B 60 32 2D */ bl SetH__8cM3dGCylFf -/* 80C6BFD0 7F 23 CB 78 */ mr r3, r25 -/* 80C6BFD4 38 81 00 54 */ addi r4, r1, 0x54 -/* 80C6BFD8 4B 60 32 05 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C6BFDC 7F 43 D3 78 */ mr r3, r26 -/* 80C6BFE0 38 98 05 DC */ addi r4, r24, 0x5dc -/* 80C6BFE4 4B 5F 8B C5 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C6BFE8 3A F7 00 01 */ addi r23, r23, 1 -/* 80C6BFEC 2C 17 00 02 */ cmpwi r23, 2 -/* 80C6BFF0 3B BD 01 3C */ addi r29, r29, 0x13c -/* 80C6BFF4 41 80 FF 3C */ blt lbl_80C6BF30 -/* 80C6BFF8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6BFFC D0 21 00 48 */ stfs f1, 0x48(r1) -/* 80C6C000 D0 21 00 4C */ stfs f1, 0x4c(r1) -/* 80C6C004 D0 21 00 50 */ stfs f1, 0x50(r1) -/* 80C6C008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6C00C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6C010 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C6C014 38 00 00 FF */ li r0, 0xff -/* 80C6C018 90 01 00 08 */ stw r0, 8(r1) -/* 80C6C01C 38 80 00 00 */ li r4, 0 -/* 80C6C020 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6C024 38 00 FF FF */ li r0, -1 -/* 80C6C028 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6C02C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6C030 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6C034 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6C038 80 9E 08 78 */ lwz r4, 0x878(r30) -/* 80C6C03C 38 A0 00 00 */ li r5, 0 -/* 80C6C040 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000867C@ha */ -/* 80C6C044 38 C6 86 7C */ addi r6, r6, 0x867C /* 0x0000867C@l */ -/* 80C6C048 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6C04C 39 00 00 00 */ li r8, 0 -/* 80C6C050 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80C6C054 39 41 00 48 */ addi r10, r1, 0x48 -/* 80C6C058 4B 3E 14 75 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6C05C 90 7E 08 78 */ stw r3, 0x878(r30) -/* 80C6C060 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C6C064 38 00 00 FF */ li r0, 0xff -/* 80C6C068 90 01 00 08 */ stw r0, 8(r1) -/* 80C6C06C 38 80 00 00 */ li r4, 0 -/* 80C6C070 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6C074 38 00 FF FF */ li r0, -1 -/* 80C6C078 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6C07C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6C080 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6C084 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6C088 80 9E 08 7C */ lwz r4, 0x87c(r30) -/* 80C6C08C 38 A0 00 00 */ li r5, 0 -/* 80C6C090 88 1E 08 65 */ lbz r0, 0x865(r30) -/* 80C6C094 54 00 08 3C */ slwi r0, r0, 1 -/* 80C6C098 38 DF 00 48 */ addi r6, r31, 0x48 -/* 80C6C09C 7C C6 02 2E */ lhzx r6, r6, r0 -/* 80C6C0A0 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6C0A4 39 00 00 00 */ li r8, 0 -/* 80C6C0A8 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80C6C0AC 39 41 00 48 */ addi r10, r1, 0x48 -/* 80C6C0B0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6C0B4 4B 3E 14 19 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6C0B8 90 7E 08 7C */ stw r3, 0x87c(r30) -/* 80C6C0BC 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80C6C0C0 38 63 02 10 */ addi r3, r3, 0x210 -/* 80C6C0C4 80 9E 08 7C */ lwz r4, 0x87c(r30) -/* 80C6C0C8 4B 3D F8 51 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80C6C0CC 28 03 00 00 */ cmplwi r3, 0 -/* 80C6C0D0 41 82 00 58 */ beq lbl_80C6C128 -/* 80C6C0D4 C0 3F 00 6C */ lfs f1, 0x6c(r31) -/* 80C6C0D8 C0 1E 08 6C */ lfs f0, 0x86c(r30) -/* 80C6C0DC EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C6C0E0 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80C6C0E4 C0 3F 00 70 */ lfs f1, 0x70(r31) -/* 80C6C0E8 C0 1E 08 74 */ lfs f0, 0x874(r30) -/* 80C6C0EC EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C6C0F0 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80C6C0F4 C0 3F 00 74 */ lfs f1, 0x74(r31) -/* 80C6C0F8 C0 1E 08 70 */ lfs f0, 0x870(r30) -/* 80C6C0FC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80C6C100 D0 21 00 44 */ stfs f1, 0x44(r1) -/* 80C6C104 E0 01 00 3C */ psq_l f0, 60(r1), 0, 0 /* qr0 */ -/* 80C6C108 F0 01 00 24 */ psq_st f0, 36(r1), 0, 0 /* qr0 */ -/* 80C6C10C D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80C6C110 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80C6C114 D0 03 00 00 */ stfs f0, 0(r3) -/* 80C6C118 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80C6C11C D0 03 00 04 */ stfs f0, 4(r3) -/* 80C6C120 FC 00 08 18 */ frsp f0, f1 -/* 80C6C124 D0 03 00 08 */ stfs f0, 8(r3) -lbl_80C6C128: -/* 80C6C128 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* qr0 */ -/* 80C6C12C CB E1 01 10 */ lfd f31, 0x110(r1) -/* 80C6C130 E3 C1 01 08 */ psq_l f30, 264(r1), 0, 0 /* qr0 */ -/* 80C6C134 CB C1 01 00 */ lfd f30, 0x100(r1) -/* 80C6C138 E3 A1 00 F8 */ psq_l f29, 248(r1), 0, 0 /* qr0 */ -/* 80C6C13C CB A1 00 F0 */ lfd f29, 0xf0(r1) -/* 80C6C140 E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0 /* qr0 */ -/* 80C6C144 CB 81 00 E0 */ lfd f28, 0xe0(r1) -/* 80C6C148 E3 61 00 D8 */ psq_l f27, 216(r1), 0, 0 /* qr0 */ -/* 80C6C14C CB 61 00 D0 */ lfd f27, 0xd0(r1) -/* 80C6C150 E3 41 00 C8 */ psq_l f26, 200(r1), 0, 0 /* qr0 */ -/* 80C6C154 CB 41 00 C0 */ lfd f26, 0xc0(r1) -/* 80C6C158 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80C6C15C 4B 6F 60 B5 */ bl _restgpr_23 -/* 80C6C160 80 01 01 24 */ lwz r0, 0x124(r1) -/* 80C6C164 7C 08 03 A6 */ mtlr r0 -/* 80C6C168 38 21 01 20 */ addi r1, r1, 0x120 -/* 80C6C16C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/procMain__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/procMain__11daIceWall_cFv.s deleted file mode 100644 index 29a0e3626a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/procMain__11daIceWall_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80C6BBC4: -/* 80C6BBC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6BBC8 7C 08 02 A6 */ mflr r0 -/* 80C6BBCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6BBD0 3C 80 80 C7 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80C6C6C8@ha */ -/* 80C6BBD4 38 E4 C6 C8 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80C6C6C8@l */ -/* 80C6BBD8 3C 80 80 C7 */ lis r4, data_80C6C850@ha /* 0x80C6C850@ha */ -/* 80C6BBDC 38 C4 C8 50 */ addi r6, r4, data_80C6C850@l /* 0x80C6C850@l */ -/* 80C6BBE0 88 06 00 00 */ lbz r0, 0(r6) -/* 80C6BBE4 7C 00 07 75 */ extsb. r0, r0 -/* 80C6BBE8 40 82 00 40 */ bne lbl_80C6BC28 -/* 80C6BBEC 80 87 00 64 */ lwz r4, 0x64(r7) -/* 80C6BBF0 80 07 00 68 */ lwz r0, 0x68(r7) -/* 80C6BBF4 90 87 00 7C */ stw r4, 0x7c(r7) -/* 80C6BBF8 90 07 00 80 */ stw r0, 0x80(r7) -/* 80C6BBFC 80 07 00 6C */ lwz r0, 0x6c(r7) -/* 80C6BC00 90 07 00 84 */ stw r0, 0x84(r7) -/* 80C6BC04 38 A7 00 7C */ addi r5, r7, 0x7c -/* 80C6BC08 80 87 00 70 */ lwz r4, 0x70(r7) -/* 80C6BC0C 80 07 00 74 */ lwz r0, 0x74(r7) -/* 80C6BC10 90 85 00 0C */ stw r4, 0xc(r5) -/* 80C6BC14 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C6BC18 80 07 00 78 */ lwz r0, 0x78(r7) -/* 80C6BC1C 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C6BC20 38 00 00 01 */ li r0, 1 -/* 80C6BC24 98 06 00 00 */ stb r0, 0(r6) -lbl_80C6BC28: -/* 80C6BC28 88 03 08 64 */ lbz r0, 0x864(r3) -/* 80C6BC2C 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C6BC30 39 87 00 7C */ addi r12, r7, 0x7c -/* 80C6BC34 7D 8C 02 14 */ add r12, r12, r0 -/* 80C6BC38 4B 6F 64 4D */ bl __ptmf_scall -/* 80C6BC3C 60 00 00 00 */ nop -/* 80C6BC40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6BC44 7C 08 03 A6 */ mtlr r0 -/* 80C6BC48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6BC4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/setBaseMtx__11daIceWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/setBaseMtx__11daIceWall_cFv.s deleted file mode 100644 index 82336a1b83..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/setBaseMtx__11daIceWall_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80C6B51C: -/* 80C6B51C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C6B520 7C 08 02 A6 */ mflr r0 -/* 80C6B524 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6B528 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C6B52C 7C 7F 1B 78 */ mr r31, r3 -/* 80C6B530 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6B534 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6B538 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6B53C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C6B540 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C6B544 4B 6D B3 A5 */ bl PSMTXTrans -/* 80C6B548 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6B54C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6B550 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C6B554 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C6B558 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C6B55C 4B 3A 0D 45 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C6B560 C0 3F 08 6C */ lfs f1, 0x86c(r31) -/* 80C6B564 C0 5F 08 70 */ lfs f2, 0x870(r31) -/* 80C6B568 C0 7F 08 74 */ lfs f3, 0x874(r31) -/* 80C6B56C 4B 3A 18 CD */ bl scaleM__14mDoMtx_stack_cFfff -/* 80C6B570 3C 60 80 C7 */ lis r3, lit_3656@ha /* 0x80C6C640@ha */ -/* 80C6B574 C0 03 C6 40 */ lfs f0, lit_3656@l(r3) /* 0x80C6C640@l */ -/* 80C6B578 D0 01 00 08 */ stfs f0, 8(r1) -/* 80C6B57C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80C6B580 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80C6B584 88 1F 08 65 */ lbz r0, 0x865(r31) -/* 80C6B588 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6B58C 7C 7F 02 14 */ add r3, r31, r0 -/* 80C6B590 80 63 08 5C */ lwz r3, 0x85c(r3) -/* 80C6B594 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C6B598 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C6B59C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C6B5A0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6B5A4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6B5A8 88 1F 08 65 */ lbz r0, 0x865(r31) -/* 80C6B5AC 54 00 10 3A */ slwi r0, r0, 2 -/* 80C6B5B0 7C 9F 02 14 */ add r4, r31, r0 -/* 80C6B5B4 80 84 08 5C */ lwz r4, 0x85c(r4) -/* 80C6B5B8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6B5BC 4B 6D AE F5 */ bl PSMTXCopy -/* 80C6B5C0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6B5C4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6B5C8 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80C6B5CC 4B 6D AE E5 */ bl PSMTXCopy -/* 80C6B5D0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C6B5D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C6B5D8 7C 08 03 A6 */ mtlr r0 -/* 80C6B5DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6B5E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/CreateHeap__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/CreateHeap__12daLv5SwIce_cFv.s deleted file mode 100644 index 04191912ea..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/CreateHeap__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C6CAA8: -/* 80C6CAA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CAAC 7C 08 02 A6 */ mflr r0 -/* 80C6CAB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CAB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6CAB8 7C 7F 1B 78 */ mr r31, r3 -/* 80C6CABC 3C 60 80 C7 */ lis r3, d_a_obj_lv5SwIce__stringBase0@ha /* 0x80C6D558@ha */ -/* 80C6CAC0 38 63 D5 58 */ addi r3, r3, d_a_obj_lv5SwIce__stringBase0@l /* 0x80C6D558@l */ -/* 80C6CAC4 38 80 00 04 */ li r4, 4 -/* 80C6CAC8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6CACC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6CAD0 3C A5 00 02 */ addis r5, r5, 2 -/* 80C6CAD4 38 C0 00 80 */ li r6, 0x80 -/* 80C6CAD8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C6CADC 4B 3C F8 11 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6CAE0 38 80 00 00 */ li r4, 0 -/* 80C6CAE4 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C6CAE8 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6CAEC 4B 3A 81 69 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6CAF0 90 7F 07 20 */ stw r3, 0x720(r31) -/* 80C6CAF4 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6CAF8 30 03 FF FF */ addic r0, r3, -1 -/* 80C6CAFC 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C6CB00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CB04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CB08 7C 08 03 A6 */ mtlr r0 -/* 80C6CB0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CB10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Delete__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Delete__12daLv5SwIce_cFv.s deleted file mode 100644 index 152de30141..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Delete__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C6D314: -/* 80C6D314 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D318 7C 08 02 A6 */ mflr r0 -/* 80C6D31C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D320 3C 80 80 C7 */ lis r4, d_a_obj_lv5SwIce__stringBase0@ha /* 0x80C6D558@ha */ -/* 80C6D324 38 84 D5 58 */ addi r4, r4, d_a_obj_lv5SwIce__stringBase0@l /* 0x80C6D558@l */ -/* 80C6D328 38 63 07 18 */ addi r3, r3, 0x718 -/* 80C6D32C 4B 3B FC DD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C6D330 38 60 00 01 */ li r3, 1 -/* 80C6D334 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D338 7C 08 03 A6 */ mtlr r0 -/* 80C6D33C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D340 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Draw__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Draw__12daLv5SwIce_cFv.s deleted file mode 100644 index 9b8909ef1a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Draw__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80C6D260: -/* 80C6D260 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D264 7C 08 02 A6 */ mflr r0 -/* 80C6D268 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D26C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6D270 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6D274 7C 7E 1B 78 */ mr r30, r3 -/* 80C6D278 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6D27C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6D280 38 80 00 10 */ li r4, 0x10 -/* 80C6D284 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C6D288 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C6D28C 4B 53 65 39 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C6D290 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6D294 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6D298 80 9E 07 20 */ lwz r4, 0x720(r30) -/* 80C6D29C 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6D2A0 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C6D2A4 4B 53 7A FD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C6D2A8 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80C6D2AC 80 83 00 04 */ lwz r4, 4(r3) -/* 80C6D2B0 7F C3 F3 78 */ mr r3, r30 -/* 80C6D2B4 4B 3B 01 79 */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData -/* 80C6D2B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6D2BC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6D2C0 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C6D2C4 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C6D2C8 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C6D2CC 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C6D2D0 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C6D2D4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C6D2D8 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80C6D2DC 4B 3A 09 E9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C6D2E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6D2E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6D2E8 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C6D2EC 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C6D2F0 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C6D2F4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C6D2F8 38 60 00 01 */ li r3, 1 -/* 80C6D2FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6D300 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6D304 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D308 7C 08 03 A6 */ mtlr r0 -/* 80C6D30C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D310 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Execute__12daLv5SwIce_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Execute__12daLv5SwIce_cFPPA3_A4_f.s deleted file mode 100644 index 45cbaab228..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Execute__12daLv5SwIce_cFPPA3_A4_f.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80C6CDD0: -/* 80C6CDD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CDD4 7C 08 02 A6 */ mflr r0 -/* 80C6CDD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CDDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6CDE0 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6CDE4 7C 7E 1B 78 */ mr r30, r3 -/* 80C6CDE8 7C 9F 23 78 */ mr r31, r4 -/* 80C6CDEC 48 00 00 3D */ bl procMain__12daLv5SwIce_cFv -/* 80C6CDF0 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80C6CDF4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C6CDF8 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6CDFC 7F C3 F3 78 */ mr r3, r30 -/* 80C6CE00 4B FF FC 21 */ bl setBaseMtx__12daLv5SwIce_cFv -/* 80C6CE04 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C6CE08 4B 41 6A 29 */ bl Move__10dCcD_GSttsFv -/* 80C6CE0C 38 60 00 01 */ li r3, 1 -/* 80C6CE10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CE14 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6CE18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CE1C 7C 08 03 A6 */ mtlr r0 -/* 80C6CE20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CE24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__ct__16daLv5SwIce_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__ct__16daLv5SwIce_HIO_cFv.s deleted file mode 100644 index 752003349a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__ct__16daLv5SwIce_HIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C6C94C: -/* 80C6C94C 3C 80 80 C7 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C6D6B4@ha */ -/* 80C6C950 38 04 D6 B4 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C6D6B4@l */ -/* 80C6C954 90 03 00 00 */ stw r0, 0(r3) -/* 80C6C958 3C 80 80 C7 */ lis r4, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6D6A8@ha */ -/* 80C6C95C 38 04 D6 A8 */ addi r0, r4, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6D6A8@l */ -/* 80C6C960 90 03 00 00 */ stw r0, 0(r3) -/* 80C6C964 3C 80 80 C7 */ lis r4, __vt__16daLv5SwIce_HIO_c@ha /* 0x80C6D69C@ha */ -/* 80C6C968 38 04 D6 9C */ addi r0, r4, __vt__16daLv5SwIce_HIO_c@l /* 0x80C6D69C@l */ -/* 80C6C96C 90 03 00 00 */ stw r0, 0(r3) -/* 80C6C970 38 00 00 03 */ li r0, 3 -/* 80C6C974 98 03 00 04 */ stb r0, 4(r3) -/* 80C6C978 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 2fcb54d3da..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6D3D0: -/* 80C6D3D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D3D4 7C 08 02 A6 */ mflr r0 -/* 80C6D3D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D3DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6D3E0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6D3E4 41 82 00 1C */ beq lbl_80C6D400 -/* 80C6D3E8 3C A0 80 C7 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80C6D644@ha */ -/* 80C6D3EC 38 05 D6 44 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80C6D644@l */ -/* 80C6D3F0 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6D3F4 7C 80 07 35 */ extsh. r0, r4 -/* 80C6D3F8 40 81 00 08 */ ble lbl_80C6D400 -/* 80C6D3FC 4B 66 19 41 */ bl __dl__FPv -lbl_80C6D400: -/* 80C6D400 7F E3 FB 78 */ mr r3, r31 -/* 80C6D404 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6D408 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D40C 7C 08 03 A6 */ mtlr r0 -/* 80C6D410 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D414 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 8f0dead4c6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6CD74: -/* 80C6CD74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CD78 7C 08 02 A6 */ mflr r0 -/* 80C6CD7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CD80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6CD84 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6CD88 41 82 00 30 */ beq lbl_80C6CDB8 -/* 80C6CD8C 3C 60 80 C7 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C6D650@ha */ -/* 80C6CD90 38 03 D6 50 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C6D650@l */ -/* 80C6CD94 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6CD98 41 82 00 10 */ beq lbl_80C6CDA8 -/* 80C6CD9C 3C 60 80 C7 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C6D644@ha */ -/* 80C6CDA0 38 03 D6 44 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C6D644@l */ -/* 80C6CDA4 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6CDA8: -/* 80C6CDA8 7C 80 07 35 */ extsh. r0, r4 -/* 80C6CDAC 40 81 00 0C */ ble lbl_80C6CDB8 -/* 80C6CDB0 7F E3 FB 78 */ mr r3, r31 -/* 80C6CDB4 4B 66 1F 89 */ bl __dl__FPv -lbl_80C6CDB8: -/* 80C6CDB8 7F E3 FB 78 */ mr r3, r31 -/* 80C6CDBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CDC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CDC4 7C 08 03 A6 */ mtlr r0 -/* 80C6CDC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CDCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 63cb946203..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6C9D8: -/* 80C6C9D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C9DC 7C 08 02 A6 */ mflr r0 -/* 80C6C9E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C9E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6C9E8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6C9EC 41 82 00 1C */ beq lbl_80C6CA08 -/* 80C6C9F0 3C A0 80 C7 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C6D6B4@ha */ -/* 80C6C9F4 38 05 D6 B4 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C6D6B4@l */ -/* 80C6C9F8 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6C9FC 7C 80 07 35 */ extsh. r0, r4 -/* 80C6CA00 40 81 00 08 */ ble lbl_80C6CA08 -/* 80C6CA04 4B 66 23 39 */ bl __dl__FPv -lbl_80C6CA08: -/* 80C6CA08 7F E3 FB 78 */ mr r3, r31 -/* 80C6CA0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CA10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CA14 7C 08 03 A6 */ mtlr r0 -/* 80C6CA18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CA1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__16daLv5SwIce_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__16daLv5SwIce_HIO_cFv.s deleted file mode 100644 index a0e2f1859d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__16daLv5SwIce_HIO_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C6D418: -/* 80C6D418 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D41C 7C 08 02 A6 */ mflr r0 -/* 80C6D420 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D424 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6D428 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6D42C 41 82 00 40 */ beq lbl_80C6D46C -/* 80C6D430 3C 60 80 C7 */ lis r3, __vt__16daLv5SwIce_HIO_c@ha /* 0x80C6D69C@ha */ -/* 80C6D434 38 03 D6 9C */ addi r0, r3, __vt__16daLv5SwIce_HIO_c@l /* 0x80C6D69C@l */ -/* 80C6D438 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6D43C 41 82 00 20 */ beq lbl_80C6D45C -/* 80C6D440 3C 60 80 C7 */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6D6A8@ha */ -/* 80C6D444 38 03 D6 A8 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6D6A8@l */ -/* 80C6D448 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6D44C 41 82 00 10 */ beq lbl_80C6D45C -/* 80C6D450 3C 60 80 C7 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C6D6B4@ha */ -/* 80C6D454 38 03 D6 B4 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C6D6B4@l */ -/* 80C6D458 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6D45C: -/* 80C6D45C 7C 80 07 35 */ extsh. r0, r4 -/* 80C6D460 40 81 00 0C */ ble lbl_80C6D46C -/* 80C6D464 7F E3 FB 78 */ mr r3, r31 -/* 80C6D468 4B 66 18 D5 */ bl __dl__FPv -lbl_80C6D46C: -/* 80C6D46C 7F E3 FB 78 */ mr r3, r31 -/* 80C6D470 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6D474 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D478 7C 08 03 A6 */ mtlr r0 -/* 80C6D47C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D480 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__18fOpAcm_HIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__18fOpAcm_HIO_entry_cFv.s deleted file mode 100644 index 404cf43837..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__18fOpAcm_HIO_entry_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6C97C: -/* 80C6C97C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6C980 7C 08 02 A6 */ mflr r0 -/* 80C6C984 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6C988 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6C98C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6C990 41 82 00 30 */ beq lbl_80C6C9C0 -/* 80C6C994 3C 60 80 C7 */ lis r3, __vt__18fOpAcm_HIO_entry_c@ha /* 0x80C6D6A8@ha */ -/* 80C6C998 38 03 D6 A8 */ addi r0, r3, __vt__18fOpAcm_HIO_entry_c@l /* 0x80C6D6A8@l */ -/* 80C6C99C 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6C9A0 41 82 00 10 */ beq lbl_80C6C9B0 -/* 80C6C9A4 3C 60 80 C7 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C6D6B4@ha */ -/* 80C6C9A8 38 03 D6 B4 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C6D6B4@l */ -/* 80C6C9AC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6C9B0: -/* 80C6C9B0 7C 80 07 35 */ extsh. r0, r4 -/* 80C6C9B4 40 81 00 0C */ ble lbl_80C6C9C0 -/* 80C6C9B8 7F E3 FB 78 */ mr r3, r31 -/* 80C6C9BC 4B 66 23 81 */ bl __dl__FPv -lbl_80C6C9C0: -/* 80C6C9C0 7F E3 FB 78 */ mr r3, r31 -/* 80C6C9C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6C9C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6C9CC 7C 08 03 A6 */ mtlr r0 -/* 80C6C9D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6C9D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGAabFv.s deleted file mode 100644 index 6c62de9d99..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6CD2C: -/* 80C6CD2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CD30 7C 08 02 A6 */ mflr r0 -/* 80C6CD34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CD38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6CD3C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6CD40 41 82 00 1C */ beq lbl_80C6CD5C -/* 80C6CD44 3C A0 80 C7 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C6D668@ha */ -/* 80C6CD48 38 05 D6 68 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C6D668@l */ -/* 80C6CD4C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C6CD50 7C 80 07 35 */ extsh. r0, r4 -/* 80C6CD54 40 81 00 08 */ ble lbl_80C6CD5C -/* 80C6CD58 4B 66 1F E5 */ bl __dl__FPv -lbl_80C6CD5C: -/* 80C6CD5C 7F E3 FB 78 */ mr r3, r31 -/* 80C6CD60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CD64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CD68 7C 08 03 A6 */ mtlr r0 -/* 80C6CD6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CD70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGCylFv.s deleted file mode 100644 index 9dee3c538a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6CCE4: -/* 80C6CCE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CCE8 7C 08 02 A6 */ mflr r0 -/* 80C6CCEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CCF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6CCF4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6CCF8 41 82 00 1C */ beq lbl_80C6CD14 -/* 80C6CCFC 3C A0 80 C7 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C6D65C@ha */ -/* 80C6CD00 38 05 D6 5C */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C6D65C@l */ -/* 80C6CD04 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C6CD08 7C 80 07 35 */ extsh. r0, r4 -/* 80C6CD0C 40 81 00 08 */ ble lbl_80C6CD14 -/* 80C6CD10 4B 66 20 2D */ bl __dl__FPv -lbl_80C6CD14: -/* 80C6CD14 7F E3 FB 78 */ mr r3, r31 -/* 80C6CD18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CD1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CD20 7C 08 03 A6 */ mtlr r0 -/* 80C6CD24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CD28 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__sinit_d_a_obj_lv5SwIce_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__sinit_d_a_obj_lv5SwIce_cpp.s deleted file mode 100644 index 6d1d365c5b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__sinit_d_a_obj_lv5SwIce_cpp.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C6D484: -/* 80C6D484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D488 7C 08 02 A6 */ mflr r0 -/* 80C6D48C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D490 3C 60 80 C7 */ lis r3, l_HIO@ha /* 0x80C6D6D4@ha */ -/* 80C6D494 38 63 D6 D4 */ addi r3, r3, l_HIO@l /* 0x80C6D6D4@l */ -/* 80C6D498 4B FF F4 B5 */ bl __ct__16daLv5SwIce_HIO_cFv -/* 80C6D49C 3C 80 80 C7 */ lis r4, __dt__16daLv5SwIce_HIO_cFv@ha /* 0x80C6D418@ha */ -/* 80C6D4A0 38 84 D4 18 */ addi r4, r4, __dt__16daLv5SwIce_HIO_cFv@l /* 0x80C6D418@l */ -/* 80C6D4A4 3C A0 80 C7 */ lis r5, lit_3647@ha /* 0x80C6D6C8@ha */ -/* 80C6D4A8 38 A5 D6 C8 */ addi r5, r5, lit_3647@l /* 0x80C6D6C8@l */ -/* 80C6D4AC 4B FF F4 2D */ bl __register_global_object -/* 80C6D4B0 3C 60 80 C7 */ lis r3, mCcDCyl__12daLv5SwIce_c@ha /* 0x80C6D580@ha */ -/* 80C6D4B4 38 63 D5 80 */ addi r3, r3, mCcDCyl__12daLv5SwIce_c@l /* 0x80C6D580@l */ -/* 80C6D4B8 38 A3 FF FC */ addi r5, r3, -4 -/* 80C6D4BC 3C 60 80 C7 */ lis r3, mCcDObjInfo__12daLv5SwIce_c@ha /* 0x80C6D508@ha */ -/* 80C6D4C0 38 63 D5 08 */ addi r3, r3, mCcDObjInfo__12daLv5SwIce_c@l /* 0x80C6D508@l */ -/* 80C6D4C4 38 83 FF FC */ addi r4, r3, -4 -/* 80C6D4C8 38 00 00 06 */ li r0, 6 -/* 80C6D4CC 7C 09 03 A6 */ mtctr r0 -lbl_80C6D4D0: -/* 80C6D4D0 80 64 00 04 */ lwz r3, 4(r4) -/* 80C6D4D4 84 04 00 08 */ lwzu r0, 8(r4) -/* 80C6D4D8 90 65 00 04 */ stw r3, 4(r5) -/* 80C6D4DC 94 05 00 08 */ stwu r0, 8(r5) -/* 80C6D4E0 42 00 FF F0 */ bdnz lbl_80C6D4D0 -/* 80C6D4E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D4E8 7C 08 03 A6 */ mtlr r0 -/* 80C6D4EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D4F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/create__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/create__12daLv5SwIce_cFv.s deleted file mode 100644 index 0d35af7c36..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/create__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_80C6CB14: -/* 80C6CB14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CB18 7C 08 02 A6 */ mflr r0 -/* 80C6CB1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CB20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6CB24 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6CB28 7C 7F 1B 78 */ mr r31, r3 -/* 80C6CB2C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C6CB30 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C6CB34 40 82 00 B4 */ bne lbl_80C6CBE8 -/* 80C6CB38 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C6CB3C 41 82 00 A0 */ beq lbl_80C6CBDC -/* 80C6CB40 7C 1E 03 78 */ mr r30, r0 -/* 80C6CB44 4B 40 BA E1 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C6CB48 3C 60 80 C7 */ lis r3, __vt__12daLv5SwIce_c@ha /* 0x80C6D674@ha */ -/* 80C6CB4C 38 03 D6 74 */ addi r0, r3, __vt__12daLv5SwIce_c@l /* 0x80C6D674@l */ -/* 80C6CB50 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C6CB54 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C6CB58 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C6CB5C 90 1E 05 B8 */ stw r0, 0x5b8(r30) -/* 80C6CB60 38 7E 05 BC */ addi r3, r30, 0x5bc -/* 80C6CB64 4B 41 6B FD */ bl __ct__10dCcD_GSttsFv -/* 80C6CB68 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C6CB6C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C6CB70 90 7E 05 B8 */ stw r3, 0x5b8(r30) -/* 80C6CB74 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C6CB78 90 1E 05 BC */ stw r0, 0x5bc(r30) -/* 80C6CB7C 3B DE 05 DC */ addi r30, r30, 0x5dc -/* 80C6CB80 7F C3 F3 78 */ mr r3, r30 -/* 80C6CB84 4B 41 6E A5 */ bl __ct__12dCcD_GObjInfFv -/* 80C6CB88 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6CB8C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6CB90 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6CB94 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6D668@ha */ -/* 80C6CB98 38 03 D6 68 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6D668@l */ -/* 80C6CB9C 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80C6CBA0 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6D65C@ha */ -/* 80C6CBA4 38 03 D6 5C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6D65C@l */ -/* 80C6CBA8 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6CBAC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6CBB0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6CBB4 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80C6CBB8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6CBBC 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6CBC0 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6CBC4 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6CBC8 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80C6CBCC 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6CBD0 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6CBD4 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6CBD8 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80C6CBDC: -/* 80C6CBDC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C6CBE0 60 00 00 08 */ ori r0, r0, 8 -/* 80C6CBE4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C6CBE8: -/* 80C6CBE8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6CBEC 98 1F 07 26 */ stb r0, 0x726(r31) -/* 80C6CBF0 88 9F 07 26 */ lbz r4, 0x726(r31) -/* 80C6CBF4 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6CBF8 41 82 00 28 */ beq lbl_80C6CC20 -/* 80C6CBFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6CC00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6CC04 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6CC08 7C 05 07 74 */ extsb r5, r0 -/* 80C6CC0C 4B 3C 87 55 */ bl isSwitch__10dSv_info_cCFii -/* 80C6CC10 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6CC14 41 82 00 0C */ beq lbl_80C6CC20 -/* 80C6CC18 38 60 00 05 */ li r3, 5 -/* 80C6CC1C 48 00 00 B0 */ b lbl_80C6CCCC -lbl_80C6CC20: -/* 80C6CC20 38 7F 07 18 */ addi r3, r31, 0x718 -/* 80C6CC24 3C 80 80 C7 */ lis r4, d_a_obj_lv5SwIce__stringBase0@ha /* 0x80C6D558@ha */ -/* 80C6CC28 38 84 D5 58 */ addi r4, r4, d_a_obj_lv5SwIce__stringBase0@l /* 0x80C6D558@l */ -/* 80C6CC2C 4B 3C 02 91 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C6CC30 7C 7E 1B 78 */ mr r30, r3 -/* 80C6CC34 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C6CC38 40 82 00 90 */ bne lbl_80C6CCC8 -/* 80C6CC3C 7F E3 FB 78 */ mr r3, r31 -/* 80C6CC40 3C 80 80 C7 */ lis r4, d_a_obj_lv5SwIce__stringBase0@ha /* 0x80C6D558@ha */ -/* 80C6CC44 38 84 D5 58 */ addi r4, r4, d_a_obj_lv5SwIce__stringBase0@l /* 0x80C6D558@l */ -/* 80C6CC48 38 A0 00 07 */ li r5, 7 -/* 80C6CC4C 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80C6CC50 38 C6 5A 24 */ addi r6, r6, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80C6CC54 38 E0 14 B0 */ li r7, 0x14b0 -/* 80C6CC58 39 00 00 00 */ li r8, 0 -/* 80C6CC5C 4B 40 BB 61 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C6CC60 2C 03 00 05 */ cmpwi r3, 5 -/* 80C6CC64 40 82 00 0C */ bne lbl_80C6CC70 -/* 80C6CC68 38 60 00 05 */ li r3, 5 -/* 80C6CC6C 48 00 00 60 */ b lbl_80C6CCCC -lbl_80C6CC70: -/* 80C6CC70 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6CC74 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C6CC78 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C6CC7C 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6CC80 80 83 00 04 */ lwz r4, 4(r3) -/* 80C6CC84 7F E3 FB 78 */ mr r3, r31 -/* 80C6CC88 4B 3A D8 F1 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C6CC8C 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C6CC90 38 80 00 FF */ li r4, 0xff -/* 80C6CC94 38 A0 00 FF */ li r5, 0xff -/* 80C6CC98 7F E6 FB 78 */ mr r6, r31 -/* 80C6CC9C 4B 41 6B C5 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C6CCA0 38 7F 05 DC */ addi r3, r31, 0x5dc -/* 80C6CCA4 3C 80 80 C7 */ lis r4, mCcDCyl__12daLv5SwIce_c@ha /* 0x80C6D580@ha */ -/* 80C6CCA8 38 84 D5 80 */ addi r4, r4, mCcDCyl__12daLv5SwIce_c@l /* 0x80C6D580@l */ -/* 80C6CCAC 4B 41 7C 09 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6CCB0 38 1F 05 A0 */ addi r0, r31, 0x5a0 -/* 80C6CCB4 90 1F 06 20 */ stw r0, 0x620(r31) -/* 80C6CCB8 7F E3 FB 78 */ mr r3, r31 -/* 80C6CCBC 48 00 01 F9 */ bl init_modeWait__12daLv5SwIce_cFv -/* 80C6CCC0 7F E3 FB 78 */ mr r3, r31 -/* 80C6CCC4 4B FF FD 5D */ bl setBaseMtx__12daLv5SwIce_cFv -lbl_80C6CCC8: -/* 80C6CCC8 7F C3 F3 78 */ mr r3, r30 -lbl_80C6CCCC: -/* 80C6CCCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CCD0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6CCD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CCD8 7C 08 03 A6 */ mtlr r0 -/* 80C6CCDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CCE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 0971263719..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6D3B0: -/* 80C6D3B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D3B4 7C 08 02 A6 */ mflr r0 -/* 80C6D3B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D3BC 4B FF F7 59 */ bl create__12daLv5SwIce_cFv -/* 80C6D3C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D3C4 7C 08 03 A6 */ mtlr r0 -/* 80C6D3C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D3CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Delete__FP12daLv5SwIce_c.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Delete__FP12daLv5SwIce_c.s deleted file mode 100644 index e19b986a1f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Delete__FP12daLv5SwIce_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6D390: -/* 80C6D390 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D394 7C 08 02 A6 */ mflr r0 -/* 80C6D398 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D39C 4B 40 B5 41 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C6D3A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D3A4 7C 08 03 A6 */ mtlr r0 -/* 80C6D3A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D3AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Draw__FP12daLv5SwIce_c.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Draw__FP12daLv5SwIce_c.s deleted file mode 100644 index 18197eb15d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Draw__FP12daLv5SwIce_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C6D344: -/* 80C6D344 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D348 7C 08 02 A6 */ mflr r0 -/* 80C6D34C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D350 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C6D354 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C6D358 7D 89 03 A6 */ mtctr r12 -/* 80C6D35C 4E 80 04 21 */ bctrl -/* 80C6D360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D364 7C 08 03 A6 */ mtlr r0 -/* 80C6D368 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D36C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Execute__FP12daLv5SwIce_c.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Execute__FP12daLv5SwIce_c.s deleted file mode 100644 index bcc9eeeb9a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Execute__FP12daLv5SwIce_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6D370: -/* 80C6D370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D374 7C 08 02 A6 */ mflr r0 -/* 80C6D378 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D37C 4B 40 B5 D5 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C6D380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D384 7C 08 03 A6 */ mtlr r0 -/* 80C6D388 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D38C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeBreak__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeBreak__12daLv5SwIce_cFv.s deleted file mode 100644 index 60662fe17b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeBreak__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80C6D0F4: -/* 80C6D0F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D0F8 7C 08 02 A6 */ mflr r0 -/* 80C6D0FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D100 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6D104 7C 7F 1B 78 */ mr r31, r3 -/* 80C6D108 88 83 07 26 */ lbz r4, 0x726(r3) -/* 80C6D10C 28 04 00 FF */ cmplwi r4, 0xff -/* 80C6D110 41 82 00 18 */ beq lbl_80C6D128 -/* 80C6D114 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6D118 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6D11C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6D120 7C 05 07 74 */ extsb r5, r0 -/* 80C6D124 4B 3C 80 DD */ bl onSwitch__10dSv_info_cFii -lbl_80C6D128: -/* 80C6D128 38 00 00 01 */ li r0, 1 -/* 80C6D12C 98 1F 07 24 */ stb r0, 0x724(r31) -/* 80C6D130 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6D134 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D138 7C 08 03 A6 */ mtlr r0 -/* 80C6D13C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D140 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeWait__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeWait__12daLv5SwIce_cFv.s deleted file mode 100644 index 2813ac4709..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeWait__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C6CEB4: -/* 80C6CEB4 3C 80 80 C7 */ lis r4, l_HIO@ha /* 0x80C6D6D4@ha */ -/* 80C6CEB8 38 84 D6 D4 */ addi r4, r4, l_HIO@l /* 0x80C6D6D4@l */ -/* 80C6CEBC 88 04 00 04 */ lbz r0, 4(r4) -/* 80C6CEC0 98 03 07 25 */ stb r0, 0x725(r3) -/* 80C6CEC4 38 00 00 00 */ li r0, 0 -/* 80C6CEC8 98 03 07 24 */ stb r0, 0x724(r3) -/* 80C6CECC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeBreak__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeBreak__12daLv5SwIce_cFv.s deleted file mode 100644 index 9827dfec37..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeBreak__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80C6D144: -/* 80C6D144 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80C6D148 7C 08 02 A6 */ mflr r0 -/* 80C6D14C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80C6D150 39 61 00 50 */ addi r11, r1, 0x50 -/* 80C6D154 4B 6F 50 75 */ bl _savegpr_24 -/* 80C6D158 7C 7E 1B 78 */ mr r30, r3 -/* 80C6D15C 3C 60 80 C7 */ lis r3, mCcDObjInfo__12daLv5SwIce_c@ha /* 0x80C6D508@ha */ -/* 80C6D160 3B E3 D5 08 */ addi r31, r3, mCcDObjInfo__12daLv5SwIce_c@l /* 0x80C6D508@l */ -/* 80C6D164 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80C6D168 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80C6D16C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80C6D170 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80C6D174 3B 00 00 00 */ li r24, 0 -/* 80C6D178 3B A0 00 00 */ li r29, 0 -/* 80C6D17C 3B 80 00 00 */ li r28, 0 -/* 80C6D180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6D184 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6D188 3B 7F 00 48 */ addi r27, r31, 0x48 -lbl_80C6D18C: -/* 80C6D18C 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 80C6D190 38 00 00 FF */ li r0, 0xff -/* 80C6D194 90 01 00 08 */ stw r0, 8(r1) -/* 80C6D198 38 80 00 00 */ li r4, 0 -/* 80C6D19C 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6D1A0 38 00 FF FF */ li r0, -1 -/* 80C6D1A4 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6D1A8 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6D1AC 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6D1B0 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6D1B4 3B 3C 07 30 */ addi r25, r28, 0x730 -/* 80C6D1B8 7C 9E C8 2E */ lwzx r4, r30, r25 -/* 80C6D1BC 38 A0 00 00 */ li r5, 0 -/* 80C6D1C0 7C DB EA 2E */ lhzx r6, r27, r29 -/* 80C6D1C4 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6D1C8 39 00 00 00 */ li r8, 0 -/* 80C6D1CC 39 20 00 00 */ li r9, 0 -/* 80C6D1D0 39 41 00 24 */ addi r10, r1, 0x24 -/* 80C6D1D4 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C6D1D8 4B 3E 02 F5 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6D1DC 7C 7E C9 2E */ stwx r3, r30, r25 -/* 80C6D1E0 3B 18 00 01 */ addi r24, r24, 1 -/* 80C6D1E4 2C 18 00 02 */ cmpwi r24, 2 -/* 80C6D1E8 3B BD 00 02 */ addi r29, r29, 2 -/* 80C6D1EC 3B 9C 00 04 */ addi r28, r28, 4 -/* 80C6D1F0 41 80 FF 9C */ blt lbl_80C6D18C -/* 80C6D1F4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C6D1F8 7C 03 07 74 */ extsb r3, r0 -/* 80C6D1FC 4B 3B FE 71 */ bl dComIfGp_getReverb__Fi -/* 80C6D200 7C 67 1B 78 */ mr r7, r3 -/* 80C6D204 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C7@ha */ -/* 80C6D208 38 03 01 C7 */ addi r0, r3, 0x01C7 /* 0x000801C7@l */ -/* 80C6D20C 90 01 00 20 */ stw r0, 0x20(r1) -/* 80C6D210 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6D214 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6D218 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6D21C 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C6D220 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C6D224 38 C0 00 00 */ li r6, 0 -/* 80C6D228 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C6D22C FC 40 08 90 */ fmr f2, f1 -/* 80C6D230 C0 7F 00 38 */ lfs f3, 0x38(r31) -/* 80C6D234 FC 80 18 90 */ fmr f4, f3 -/* 80C6D238 39 00 00 00 */ li r8, 0 -/* 80C6D23C 4B 63 E7 49 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6D240 7F C3 F3 78 */ mr r3, r30 -/* 80C6D244 4B 3A CA 39 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80C6D248 39 61 00 50 */ addi r11, r1, 0x50 -/* 80C6D24C 4B 6F 4F C9 */ bl _restgpr_24 -/* 80C6D250 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80C6D254 7C 08 03 A6 */ mtlr r0 -/* 80C6D258 38 21 00 50 */ addi r1, r1, 0x50 -/* 80C6D25C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeWait__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeWait__12daLv5SwIce_cFv.s deleted file mode 100644 index 178b217042..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeWait__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,142 +0,0 @@ -lbl_80C6CED0: -/* 80C6CED0 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80C6CED4 7C 08 02 A6 */ mflr r0 -/* 80C6CED8 90 01 00 64 */ stw r0, 0x64(r1) -/* 80C6CEDC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80C6CEE0 4B 6F 52 E9 */ bl _savegpr_24 -/* 80C6CEE4 7C 7E 1B 78 */ mr r30, r3 -/* 80C6CEE8 3C 60 80 C7 */ lis r3, mCcDObjInfo__12daLv5SwIce_c@ha /* 0x80C6D508@ha */ -/* 80C6CEEC 3B E3 D5 08 */ addi r31, r3, mCcDObjInfo__12daLv5SwIce_c@l /* 0x80C6D508@l */ -/* 80C6CEF0 38 7E 05 DC */ addi r3, r30, 0x5dc -/* 80C6CEF4 4B 41 75 6D */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C6CEF8 28 03 00 00 */ cmplwi r3, 0 -/* 80C6CEFC 41 82 01 18 */ beq lbl_80C6D014 -/* 80C6CF00 38 7E 05 DC */ addi r3, r30, 0x5dc -/* 80C6CF04 4B 41 76 45 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80C6CF08 80 03 00 10 */ lwz r0, 0x10(r3) -/* 80C6CF0C 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 -/* 80C6CF10 41 82 01 04 */ beq lbl_80C6D014 -/* 80C6CF14 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80C6CF18 28 00 00 64 */ cmplwi r0, 0x64 -/* 80C6CF1C 41 82 00 10 */ beq lbl_80C6CF2C -/* 80C6CF20 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80C6CF24 28 00 00 03 */ cmplwi r0, 3 -/* 80C6CF28 40 82 00 10 */ bne lbl_80C6CF38 -lbl_80C6CF2C: -/* 80C6CF2C 7F C3 F3 78 */ mr r3, r30 -/* 80C6CF30 48 00 01 C5 */ bl init_modeBreak__12daLv5SwIce_cFv -/* 80C6CF34 48 00 00 E0 */ b lbl_80C6D014 -lbl_80C6CF38: -/* 80C6CF38 28 00 00 02 */ cmplwi r0, 2 -/* 80C6CF3C 40 82 00 D8 */ bne lbl_80C6D014 -/* 80C6CF40 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C6CF44 D0 21 00 30 */ stfs f1, 0x30(r1) -/* 80C6CF48 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 80C6CF4C D0 21 00 38 */ stfs f1, 0x38(r1) -/* 80C6CF50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6CF54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6CF58 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80C6CF5C 38 00 00 FF */ li r0, 0xff -/* 80C6CF60 90 01 00 08 */ stw r0, 8(r1) -/* 80C6CF64 38 80 00 00 */ li r4, 0 -/* 80C6CF68 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6CF6C 38 00 FF FF */ li r0, -1 -/* 80C6CF70 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6CF74 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6CF78 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6CF7C 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6CF80 80 9E 07 30 */ lwz r4, 0x730(r30) -/* 80C6CF84 38 A0 00 00 */ li r5, 0 -/* 80C6CF88 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008678@ha */ -/* 80C6CF8C 38 C6 86 78 */ addi r6, r6, 0x8678 /* 0x00008678@l */ -/* 80C6CF90 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6CF94 39 00 00 00 */ li r8, 0 -/* 80C6CF98 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80C6CF9C 39 41 00 30 */ addi r10, r1, 0x30 -/* 80C6CFA0 4B 3E 05 2D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6CFA4 90 7E 07 30 */ stw r3, 0x730(r30) -/* 80C6CFA8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C6CFAC 7C 03 07 74 */ extsb r3, r0 -/* 80C6CFB0 4B 3C 00 BD */ bl dComIfGp_getReverb__Fi -/* 80C6CFB4 7C 67 1B 78 */ mr r7, r3 -/* 80C6CFB8 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801C8@ha */ -/* 80C6CFBC 38 03 01 C8 */ addi r0, r3, 0x01C8 /* 0x000801C8@l */ -/* 80C6CFC0 90 01 00 20 */ stw r0, 0x20(r1) -/* 80C6CFC4 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6CFC8 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6CFCC 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6CFD0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C6CFD4 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C6CFD8 38 C0 00 00 */ li r6, 0 -/* 80C6CFDC C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C6CFE0 FC 40 08 90 */ fmr f2, f1 -/* 80C6CFE4 C0 7F 00 38 */ lfs f3, 0x38(r31) -/* 80C6CFE8 FC 80 18 90 */ fmr f4, f3 -/* 80C6CFEC 39 00 00 00 */ li r8, 0 -/* 80C6CFF0 4B 63 E9 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6CFF4 88 7E 07 25 */ lbz r3, 0x725(r30) -/* 80C6CFF8 38 03 FF FF */ addi r0, r3, -1 -/* 80C6CFFC 98 1E 07 25 */ stb r0, 0x725(r30) -/* 80C6D000 88 1E 07 25 */ lbz r0, 0x725(r30) -/* 80C6D004 28 00 00 00 */ cmplwi r0, 0 -/* 80C6D008 40 82 00 0C */ bne lbl_80C6D014 -/* 80C6D00C 7F C3 F3 78 */ mr r3, r30 -/* 80C6D010 48 00 00 E5 */ bl init_modeBreak__12daLv5SwIce_cFv -lbl_80C6D014: -/* 80C6D014 38 7E 07 00 */ addi r3, r30, 0x700 -/* 80C6D018 C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80C6D01C 4B 60 21 E5 */ bl SetR__8cM3dGCylFf -/* 80C6D020 38 7E 07 00 */ addi r3, r30, 0x700 -/* 80C6D024 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 80C6D028 4B 60 21 D1 */ bl SetH__8cM3dGCylFf -/* 80C6D02C 38 7E 07 00 */ addi r3, r30, 0x700 -/* 80C6D030 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80C6D034 4B 60 21 A9 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C6D038 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6D03C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6D040 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C6D044 38 9E 05 DC */ addi r4, r30, 0x5dc -/* 80C6D048 4B 5F 7B 61 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C6D04C C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80C6D050 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80C6D054 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80C6D058 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80C6D05C 3B 00 00 00 */ li r24, 0 -/* 80C6D060 3B A0 00 00 */ li r29, 0 -/* 80C6D064 3B 80 00 00 */ li r28, 0 -/* 80C6D068 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6D06C 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6D070 3B 7F 00 30 */ addi r27, r31, 0x30 -lbl_80C6D074: -/* 80C6D074 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 80C6D078 38 00 00 FF */ li r0, 0xff -/* 80C6D07C 90 01 00 08 */ stw r0, 8(r1) -/* 80C6D080 38 80 00 00 */ li r4, 0 -/* 80C6D084 90 81 00 0C */ stw r4, 0xc(r1) -/* 80C6D088 38 00 FF FF */ li r0, -1 -/* 80C6D08C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6D090 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C6D094 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C6D098 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80C6D09C 3B 3C 07 28 */ addi r25, r28, 0x728 -/* 80C6D0A0 7C 9E C8 2E */ lwzx r4, r30, r25 -/* 80C6D0A4 38 A0 00 00 */ li r5, 0 -/* 80C6D0A8 7C DB EA 2E */ lhzx r6, r27, r29 -/* 80C6D0AC 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80C6D0B0 39 00 00 00 */ li r8, 0 -/* 80C6D0B4 39 20 00 00 */ li r9, 0 -/* 80C6D0B8 39 41 00 24 */ addi r10, r1, 0x24 -/* 80C6D0BC C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C6D0C0 4B 3E 04 0D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C6D0C4 7C 7E C9 2E */ stwx r3, r30, r25 -/* 80C6D0C8 3B 18 00 01 */ addi r24, r24, 1 -/* 80C6D0CC 2C 18 00 02 */ cmpwi r24, 2 -/* 80C6D0D0 3B BD 00 02 */ addi r29, r29, 2 -/* 80C6D0D4 3B 9C 00 04 */ addi r28, r28, 4 -/* 80C6D0D8 41 80 FF 9C */ blt lbl_80C6D074 -/* 80C6D0DC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80C6D0E0 4B 6F 51 35 */ bl _restgpr_24 -/* 80C6D0E4 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80C6D0E8 7C 08 03 A6 */ mtlr r0 -/* 80C6D0EC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80C6D0F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/procMain__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/procMain__12daLv5SwIce_cFv.s deleted file mode 100644 index fac38448e1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/procMain__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80C6CE28: -/* 80C6CE28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CE2C 7C 08 02 A6 */ mflr r0 -/* 80C6CE30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CE34 3C 80 80 C7 */ lis r4, cNullVec__6Z2Calc@ha /* 0x80C6D560@ha */ -/* 80C6CE38 38 E4 D5 60 */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80C6D560@l */ -/* 80C6CE3C 3C 80 80 C7 */ lis r4, data_80C6D6DC@ha /* 0x80C6D6DC@ha */ -/* 80C6CE40 38 C4 D6 DC */ addi r6, r4, data_80C6D6DC@l /* 0x80C6D6DC@l */ -/* 80C6CE44 88 06 00 00 */ lbz r0, 0(r6) -/* 80C6CE48 7C 00 07 75 */ extsb. r0, r0 -/* 80C6CE4C 40 82 00 40 */ bne lbl_80C6CE8C -/* 80C6CE50 80 87 00 64 */ lwz r4, 0x64(r7) -/* 80C6CE54 80 07 00 68 */ lwz r0, 0x68(r7) -/* 80C6CE58 90 87 00 7C */ stw r4, 0x7c(r7) -/* 80C6CE5C 90 07 00 80 */ stw r0, 0x80(r7) -/* 80C6CE60 80 07 00 6C */ lwz r0, 0x6c(r7) -/* 80C6CE64 90 07 00 84 */ stw r0, 0x84(r7) -/* 80C6CE68 38 A7 00 7C */ addi r5, r7, 0x7c -/* 80C6CE6C 80 87 00 70 */ lwz r4, 0x70(r7) -/* 80C6CE70 80 07 00 74 */ lwz r0, 0x74(r7) -/* 80C6CE74 90 85 00 0C */ stw r4, 0xc(r5) -/* 80C6CE78 90 05 00 10 */ stw r0, 0x10(r5) -/* 80C6CE7C 80 07 00 78 */ lwz r0, 0x78(r7) -/* 80C6CE80 90 05 00 14 */ stw r0, 0x14(r5) -/* 80C6CE84 38 00 00 01 */ li r0, 1 -/* 80C6CE88 98 06 00 00 */ stb r0, 0(r6) -lbl_80C6CE8C: -/* 80C6CE8C 88 03 07 24 */ lbz r0, 0x724(r3) -/* 80C6CE90 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80C6CE94 39 87 00 7C */ addi r12, r7, 0x7c -/* 80C6CE98 7D 8C 02 14 */ add r12, r12, r0 -/* 80C6CE9C 4B 6F 51 E9 */ bl __ptmf_scall -/* 80C6CEA0 60 00 00 00 */ nop -/* 80C6CEA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CEA8 7C 08 03 A6 */ mtlr r0 -/* 80C6CEAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CEB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/setBaseMtx__12daLv5SwIce_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/setBaseMtx__12daLv5SwIce_cFv.s deleted file mode 100644 index b57825aa8c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/setBaseMtx__12daLv5SwIce_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C6CA20: -/* 80C6CA20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6CA24 7C 08 02 A6 */ mflr r0 -/* 80C6CA28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6CA2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6CA30 7C 7F 1B 78 */ mr r31, r3 -/* 80C6CA34 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6CA38 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6CA3C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6CA40 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C6CA44 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C6CA48 4B 6D 9E A1 */ bl PSMTXTrans -/* 80C6CA4C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6CA50 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6CA54 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C6CA58 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C6CA5C A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C6CA60 4B 39 F8 41 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C6CA64 80 7F 07 20 */ lwz r3, 0x720(r31) -/* 80C6CA68 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C6CA6C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C6CA70 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C6CA74 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C6CA78 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C6CA7C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C6CA80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6CA84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6CA88 80 9F 07 20 */ lwz r4, 0x720(r31) -/* 80C6CA8C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6CA90 4B 6D 9A 21 */ bl PSMTXCopy -/* 80C6CA94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6CA98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6CA9C 7C 08 03 A6 */ mtlr r0 -/* 80C6CAA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6CAA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/CreateHeap__14daObjYchndlr_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/CreateHeap__14daObjYchndlr_cFv.s deleted file mode 100644 index fb64121076..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/CreateHeap__14daObjYchndlr_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80C6DA5C: -/* 80C6DA5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C6DA60 7C 08 02 A6 */ mflr r0 -/* 80C6DA64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6DA68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C6DA6C 4B 6F 47 69 */ bl _savegpr_27 -/* 80C6DA70 7C 7F 1B 78 */ mr r31, r3 -/* 80C6DA74 3C 60 80 C7 */ lis r3, l_arcName@ha /* 0x80C6E9F4@ha */ -/* 80C6DA78 38 63 E9 F4 */ addi r3, r3, l_arcName@l /* 0x80C6E9F4@l */ -/* 80C6DA7C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6DA80 3C 80 80 C7 */ lis r4, l_bmdidx@ha /* 0x80C6E980@ha */ -/* 80C6DA84 38 84 E9 80 */ addi r4, r4, l_bmdidx@l /* 0x80C6E980@l */ -/* 80C6DA88 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6DA8C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6DA90 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6DA94 3F A5 00 02 */ addis r29, r5, 2 -/* 80C6DA98 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80C6DA9C 7F A5 EB 78 */ mr r5, r29 -/* 80C6DAA0 38 C0 00 80 */ li r6, 0x80 -/* 80C6DAA4 4B 3C E8 49 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6DAA8 3C 80 00 08 */ lis r4, 8 -/* 80C6DAAC 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C6DAB0 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6DAB4 4B 3A 71 A1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6DAB8 90 7F 06 08 */ stw r3, 0x608(r31) -/* 80C6DABC 80 1F 06 08 */ lwz r0, 0x608(r31) -/* 80C6DAC0 28 00 00 00 */ cmplwi r0, 0 -/* 80C6DAC4 40 82 00 0C */ bne lbl_80C6DAD0 -/* 80C6DAC8 38 60 00 00 */ li r3, 0 -/* 80C6DACC 48 00 00 78 */ b lbl_80C6DB44 -lbl_80C6DAD0: -/* 80C6DAD0 3C 60 80 C7 */ lis r3, l_arcName@ha /* 0x80C6E9F4@ha */ -/* 80C6DAD4 38 63 E9 F4 */ addi r3, r3, l_arcName@l /* 0x80C6E9F4@l */ -/* 80C6DAD8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6DADC 3C 80 80 C7 */ lis r4, l_bmdidx@ha /* 0x80C6E980@ha */ -/* 80C6DAE0 38 84 E9 80 */ addi r4, r4, l_bmdidx@l /* 0x80C6E980@l */ -/* 80C6DAE4 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6DAE8 7F A5 EB 78 */ mr r5, r29 -/* 80C6DAEC 38 C0 00 80 */ li r6, 0x80 -/* 80C6DAF0 4B 3C E7 FD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6DAF4 7C 7C 1B 78 */ mr r28, r3 -/* 80C6DAF8 3B 60 00 00 */ li r27, 0 -/* 80C6DAFC 3B C0 00 00 */ li r30, 0 -/* 80C6DB00 3F A0 11 00 */ lis r29, 0x1100 /* 0x11000084@ha */ -lbl_80C6DB04: -/* 80C6DB04 7F 83 E3 78 */ mr r3, r28 -/* 80C6DB08 3C 80 00 08 */ lis r4, 8 -/* 80C6DB0C 38 BD 00 84 */ addi r5, r29, 0x0084 /* 0x11000084@l */ -/* 80C6DB10 4B 3A 71 45 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6DB14 38 1E 06 0C */ addi r0, r30, 0x60c -/* 80C6DB18 7C 7F 01 2E */ stwx r3, r31, r0 -/* 80C6DB1C 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 80C6DB20 28 00 00 00 */ cmplwi r0, 0 -/* 80C6DB24 40 82 00 0C */ bne lbl_80C6DB30 -/* 80C6DB28 38 60 00 00 */ li r3, 0 -/* 80C6DB2C 48 00 00 18 */ b lbl_80C6DB44 -lbl_80C6DB30: -/* 80C6DB30 3B 7B 00 01 */ addi r27, r27, 1 -/* 80C6DB34 2C 1B 00 04 */ cmpwi r27, 4 -/* 80C6DB38 3B DE 00 04 */ addi r30, r30, 4 -/* 80C6DB3C 41 80 FF C8 */ blt lbl_80C6DB04 -/* 80C6DB40 38 60 00 01 */ li r3, 1 -lbl_80C6DB44: -/* 80C6DB44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C6DB48 4B 6F 46 D9 */ bl _restgpr_27 -/* 80C6DB4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C6DB50 7C 08 03 A6 */ mtlr r0 -/* 80C6DB54 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6DB58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Create__14daObjYchndlr_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Create__14daObjYchndlr_cFv.s deleted file mode 100644 index 8cef3c40a3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Create__14daObjYchndlr_cFv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80C6DB5C: -/* 80C6DB5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C6DB60 7C 08 02 A6 */ mflr r0 -/* 80C6DB64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6DB68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C6DB6C 4B 6F 46 65 */ bl _savegpr_26 -/* 80C6DB70 7C 7F 1B 78 */ mr r31, r3 -/* 80C6DB74 38 1F 05 D8 */ addi r0, r31, 0x5d8 -/* 80C6DB78 90 03 05 04 */ stw r0, 0x504(r3) -/* 80C6DB7C 4B FF FC 65 */ bl setMtx__14daObjYchndlr_cFv -/* 80C6DB80 7F E3 FB 78 */ mr r3, r31 -/* 80C6DB84 3C 80 80 C7 */ lis r4, l_cull_box@ha /* 0x80C6E988@ha */ -/* 80C6DB88 C4 24 E9 88 */ lfsu f1, l_cull_box@l(r4) /* 0x80C6E988@l */ -/* 80C6DB8C C0 44 00 04 */ lfs f2, 4(r4) -/* 80C6DB90 C0 64 00 08 */ lfs f3, 8(r4) -/* 80C6DB94 C0 84 00 0C */ lfs f4, 0xc(r4) -/* 80C6DB98 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 80C6DB9C C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 80C6DBA0 4B 3A C9 A9 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80C6DBA4 38 7F 06 24 */ addi r3, r31, 0x624 -/* 80C6DBA8 38 80 00 FF */ li r4, 0xff -/* 80C6DBAC 38 A0 00 00 */ li r5, 0 -/* 80C6DBB0 7F E6 FB 78 */ mr r6, r31 -/* 80C6DBB4 4B 41 5C AD */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C6DBB8 3B 40 00 00 */ li r26, 0 -/* 80C6DBBC 3B C0 00 00 */ li r30, 0 -/* 80C6DBC0 3C 60 80 C7 */ lis r3, l_cc_src_shaft_cyl@ha /* 0x80C6EA30@ha */ -/* 80C6DBC4 3B 83 EA 30 */ addi r28, r3, l_cc_src_shaft_cyl@l /* 0x80C6EA30@l */ -/* 80C6DBC8 3B BF 06 24 */ addi r29, r31, 0x624 -lbl_80C6DBCC: -/* 80C6DBCC 7F 7F F2 14 */ add r27, r31, r30 -/* 80C6DBD0 38 7B 06 60 */ addi r3, r27, 0x660 -/* 80C6DBD4 7F 84 E3 78 */ mr r4, r28 -/* 80C6DBD8 4B 41 6C DD */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6DBDC 93 BB 06 A4 */ stw r29, 0x6a4(r27) -/* 80C6DBE0 3B 5A 00 01 */ addi r26, r26, 1 -/* 80C6DBE4 2C 1A 00 04 */ cmpwi r26, 4 -/* 80C6DBE8 3B DE 01 3C */ addi r30, r30, 0x13c -/* 80C6DBEC 41 80 FF E0 */ blt lbl_80C6DBCC -/* 80C6DBF0 38 7F 0B 50 */ addi r3, r31, 0xb50 -/* 80C6DBF4 3C 80 80 C7 */ lis r4, l_cc_cyl_src@ha /* 0x80C6EA74@ha */ -/* 80C6DBF8 38 84 EA 74 */ addi r4, r4, l_cc_cyl_src@l /* 0x80C6EA74@l */ -/* 80C6DBFC 4B 41 6C B9 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6DC00 38 1F 06 24 */ addi r0, r31, 0x624 -/* 80C6DC04 90 1F 0B 94 */ stw r0, 0xb94(r31) -/* 80C6DC08 3C 60 80 C7 */ lis r3, rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@ha /* 0x80C6D980@ha */ -/* 80C6DC0C 38 03 D9 80 */ addi r0, r3, rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@l /* 0x80C6D980@l */ -/* 80C6DC10 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C6DC14 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80C6DC18 38 60 00 00 */ li r3, 0 -/* 80C6DC1C B0 7F 06 1C */ sth r3, 0x61c(r31) -/* 80C6DC20 38 00 00 32 */ li r0, 0x32 -/* 80C6DC24 B0 1F 06 1E */ sth r0, 0x61e(r31) -/* 80C6DC28 38 00 00 01 */ li r0, 1 -/* 80C6DC2C 98 1F 06 20 */ stb r0, 0x620(r31) -/* 80C6DC30 98 7F 0C 8C */ stb r3, 0xc8c(r31) -/* 80C6DC34 3C 60 80 C7 */ lis r3, lit_3699@ha /* 0x80C6E9A0@ha */ -/* 80C6DC38 C0 03 E9 A0 */ lfs f0, lit_3699@l(r3) /* 0x80C6E9A0@l */ -/* 80C6DC3C D0 1F 0C 90 */ stfs f0, 0xc90(r31) -/* 80C6DC40 38 00 00 5B */ li r0, 0x5b -/* 80C6DC44 98 1F 05 46 */ stb r0, 0x546(r31) -/* 80C6DC48 38 60 00 01 */ li r3, 1 -/* 80C6DC4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C6DC50 4B 6F 45 CD */ bl _restgpr_26 -/* 80C6DC54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C6DC58 7C 08 03 A6 */ mtlr r0 -/* 80C6DC5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6DC60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Delete__14daObjYchndlr_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Delete__14daObjYchndlr_cFv.s deleted file mode 100644 index d583ce4cba..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Delete__14daObjYchndlr_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C6E3C8: -/* 80C6E3C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E3CC 7C 08 02 A6 */ mflr r0 -/* 80C6E3D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E3D4 28 03 00 00 */ cmplwi r3, 0 -/* 80C6E3D8 41 82 00 08 */ beq lbl_80C6E3E0 -/* 80C6E3DC 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C6E3E0: -/* 80C6E3E0 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C6E9F4@ha */ -/* 80C6E3E4 38 84 E9 F4 */ addi r4, r4, l_arcName@l /* 0x80C6E9F4@l */ -/* 80C6E3E8 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6E3EC 4B 3B EC 1D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C6E3F0 38 60 00 01 */ li r3, 1 -/* 80C6E3F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E3F8 7C 08 03 A6 */ mtlr r0 -/* 80C6E3FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E400 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Draw__14daObjYchndlr_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Draw__14daObjYchndlr_cFv.s deleted file mode 100644 index 0b7a735531..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Draw__14daObjYchndlr_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80C6E300: -/* 80C6E300 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C6E304 7C 08 02 A6 */ mflr r0 -/* 80C6E308 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6E30C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C6E310 4B 6F 3E C9 */ bl _savegpr_28 -/* 80C6E314 7C 7C 1B 78 */ mr r28, r3 -/* 80C6E318 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6E31C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6E320 38 80 00 10 */ li r4, 0x10 -/* 80C6E324 38 BC 04 D0 */ addi r5, r28, 0x4d0 -/* 80C6E328 38 DC 01 0C */ addi r6, r28, 0x10c -/* 80C6E32C 4B 53 54 99 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C6E330 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C6E334 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C6E338 80 9C 06 08 */ lwz r4, 0x608(r28) -/* 80C6E33C 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6E340 38 BC 01 0C */ addi r5, r28, 0x10c -/* 80C6E344 4B 53 6A 5D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C6E348 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6E34C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6E350 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C6E354 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C6E358 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C6E35C 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C6E360 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C6E364 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C6E368 80 7C 06 08 */ lwz r3, 0x608(r28) -/* 80C6E36C 4B 39 F9 59 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C6E370 3B A0 00 00 */ li r29, 0 -/* 80C6E374 3B E0 00 00 */ li r31, 0 -lbl_80C6E378: -/* 80C6E378 38 1F 06 0C */ addi r0, r31, 0x60c -/* 80C6E37C 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 80C6E380 4B 39 F9 45 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C6E384 3B BD 00 01 */ addi r29, r29, 1 -/* 80C6E388 2C 1D 00 04 */ cmpwi r29, 4 -/* 80C6E38C 3B FF 00 04 */ addi r31, r31, 4 -/* 80C6E390 41 80 FF E8 */ blt lbl_80C6E378 -/* 80C6E394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6E398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6E39C 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C6E3A0 90 1E 00 48 */ stw r0, 0x48(r30) -/* 80C6E3A4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C6E3A8 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80C6E3AC 38 60 00 01 */ li r3, 1 -/* 80C6E3B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80C6E3B4 4B 6F 3E 71 */ bl _restgpr_28 -/* 80C6E3B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C6E3BC 7C 08 03 A6 */ mtlr r0 -/* 80C6E3C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6E3C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Execute__14daObjYchndlr_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Execute__14daObjYchndlr_cFPPA3_A4_f.s deleted file mode 100644 index 3dd4dfb07b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Execute__14daObjYchndlr_cFPPA3_A4_f.s +++ /dev/null @@ -1,444 +0,0 @@ -lbl_80C6DC64: -/* 80C6DC64 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 80C6DC68 7C 08 02 A6 */ mflr r0 -/* 80C6DC6C 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 80C6DC70 DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 80C6DC74 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 80C6DC78 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80C6DC7C 4B 6F 45 4D */ bl _savegpr_24 -/* 80C6DC80 7C 7D 1B 78 */ mr r29, r3 -/* 80C6DC84 7C 9E 23 78 */ mr r30, r4 -/* 80C6DC88 3C 60 80 C7 */ lis r3, l_bmdidx@ha /* 0x80C6E980@ha */ -/* 80C6DC8C 3B E3 E9 80 */ addi r31, r3, l_bmdidx@l /* 0x80C6E980@l */ -/* 80C6DC90 A8 9D 06 1C */ lha r4, 0x61c(r29) -/* 80C6DC94 7C 80 07 35 */ extsh. r0, r4 -/* 80C6DC98 40 80 00 0C */ bge lbl_80C6DCA4 -/* 80C6DC9C 1C 04 FF FF */ mulli r0, r4, -1 -/* 80C6DCA0 7C 04 07 34 */ extsh r4, r0 -lbl_80C6DCA4: -/* 80C6DCA4 C0 5D 0C 90 */ lfs f2, 0xc90(r29) -/* 80C6DCA8 FC 00 12 10 */ fabs f0, f2 -/* 80C6DCAC FC 20 00 18 */ frsp f1, f0 -/* 80C6DCB0 3C 60 80 45 */ lis r3, G_CM3D_F_ABS_MIN@ha /* 0x80451180@ha */ -/* 80C6DCB4 C0 03 11 80 */ lfs f0, G_CM3D_F_ABS_MIN@l(r3) /* 0x80451180@l */ -/* 80C6DCB8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6DCBC 41 80 02 54 */ blt lbl_80C6DF10 -/* 80C6DCC0 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80C6DCC4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80C6DCC8 40 80 00 0C */ bge lbl_80C6DCD4 -/* 80C6DCCC C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80C6DCD0 D0 1D 0C 90 */ stfs f0, 0xc90(r29) -lbl_80C6DCD4: -/* 80C6DCD4 88 1D 06 20 */ lbz r0, 0x620(r29) -/* 80C6DCD8 28 00 00 00 */ cmplwi r0, 0 -/* 80C6DCDC 41 82 01 14 */ beq lbl_80C6DDF0 -/* 80C6DCE0 C0 9F 00 30 */ lfs f4, 0x30(r31) -/* 80C6DCE4 C0 BD 0C 90 */ lfs f5, 0xc90(r29) -/* 80C6DCE8 C0 7F 00 34 */ lfs f3, 0x34(r31) -/* 80C6DCEC EC 43 01 72 */ fmuls f2, f3, f5 -/* 80C6DCF0 7C 80 07 34 */ extsh r0, r4 -/* 80C6DCF4 C8 3F 00 60 */ lfd f1, 0x60(r31) -/* 80C6DCF8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6DCFC 90 01 00 7C */ stw r0, 0x7c(r1) -/* 80C6DD00 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6DD04 90 01 00 78 */ stw r0, 0x78(r1) -/* 80C6DD08 C8 01 00 78 */ lfd f0, 0x78(r1) -/* 80C6DD0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6DD10 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80C6DD14 EC 00 18 24 */ fdivs f0, f0, f3 -/* 80C6DD18 EC 05 00 32 */ fmuls f0, f5, f0 -/* 80C6DD1C EC 04 00 32 */ fmuls f0, f4, f0 -/* 80C6DD20 FC 00 00 1E */ fctiwz f0, f0 -/* 80C6DD24 D8 01 00 80 */ stfd f0, 0x80(r1) -/* 80C6DD28 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80C6DD2C B0 1D 06 1E */ sth r0, 0x61e(r29) -/* 80C6DD30 A8 1D 06 1E */ lha r0, 0x61e(r29) -/* 80C6DD34 2C 00 00 23 */ cmpwi r0, 0x23 -/* 80C6DD38 40 80 00 0C */ bge lbl_80C6DD44 -/* 80C6DD3C 38 00 00 23 */ li r0, 0x23 -/* 80C6DD40 B0 1D 06 1E */ sth r0, 0x61e(r29) -lbl_80C6DD44: -/* 80C6DD44 A8 7D 06 1C */ lha r3, 0x61c(r29) -/* 80C6DD48 A8 1D 06 1E */ lha r0, 0x61e(r29) -/* 80C6DD4C 7C 03 02 15 */ add. r0, r3, r0 -/* 80C6DD50 40 81 00 4C */ ble lbl_80C6DD9C -/* 80C6DD54 7C 60 07 35 */ extsh. r0, r3 -/* 80C6DD58 40 80 00 44 */ bge lbl_80C6DD9C -/* 80C6DD5C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DB@ha */ -/* 80C6DD60 38 03 01 DB */ addi r0, r3, 0x01DB /* 0x000801DB@l */ -/* 80C6DD64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6DD68 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6DD6C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6DD70 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6DD74 38 81 00 14 */ addi r4, r1, 0x14 -/* 80C6DD78 38 BD 0C 94 */ addi r5, r29, 0xc94 -/* 80C6DD7C A8 DD 06 1E */ lha r6, 0x61e(r29) -/* 80C6DD80 38 E0 00 00 */ li r7, 0 -/* 80C6DD84 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C6DD88 FC 40 08 90 */ fmr f2, f1 -/* 80C6DD8C C0 7F 00 38 */ lfs f3, 0x38(r31) -/* 80C6DD90 FC 80 18 90 */ fmr f4, f3 -/* 80C6DD94 39 00 00 00 */ li r8, 0 -/* 80C6DD98 4B 63 DB ED */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C6DD9C: -/* 80C6DD9C A8 7D 06 1C */ lha r3, 0x61c(r29) -/* 80C6DDA0 A8 1D 06 1E */ lha r0, 0x61e(r29) -/* 80C6DDA4 7C 03 02 14 */ add r0, r3, r0 -/* 80C6DDA8 B0 1D 06 1C */ sth r0, 0x61c(r29) -/* 80C6DDAC A8 1D 06 1C */ lha r0, 0x61c(r29) -/* 80C6DDB0 C8 3F 00 60 */ lfd f1, 0x60(r31) -/* 80C6DDB4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6DDB8 90 01 00 84 */ stw r0, 0x84(r1) -/* 80C6DDBC 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6DDC0 90 01 00 80 */ stw r0, 0x80(r1) -/* 80C6DDC4 C8 01 00 80 */ lfd f0, 0x80(r1) -/* 80C6DDC8 EC 40 08 28 */ fsubs f2, f0, f1 -/* 80C6DDCC C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C6DDD0 C0 1D 0C 90 */ lfs f0, 0xc90(r29) -/* 80C6DDD4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C6DDD8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80C6DDDC 4C 41 13 82 */ cror 2, 1, 2 -/* 80C6DDE0 40 82 01 20 */ bne lbl_80C6DF00 -/* 80C6DDE4 38 00 00 00 */ li r0, 0 -/* 80C6DDE8 98 1D 06 20 */ stb r0, 0x620(r29) -/* 80C6DDEC 48 00 01 14 */ b lbl_80C6DF00 -lbl_80C6DDF0: -/* 80C6DDF0 C0 9F 00 3C */ lfs f4, 0x3c(r31) -/* 80C6DDF4 C0 BD 0C 90 */ lfs f5, 0xc90(r29) -/* 80C6DDF8 C0 7F 00 34 */ lfs f3, 0x34(r31) -/* 80C6DDFC EC 43 01 72 */ fmuls f2, f3, f5 -/* 80C6DE00 7C 80 07 34 */ extsh r0, r4 -/* 80C6DE04 C8 3F 00 60 */ lfd f1, 0x60(r31) -/* 80C6DE08 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6DE0C 90 01 00 84 */ stw r0, 0x84(r1) -/* 80C6DE10 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6DE14 90 01 00 80 */ stw r0, 0x80(r1) -/* 80C6DE18 C8 01 00 80 */ lfd f0, 0x80(r1) -/* 80C6DE1C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6DE20 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80C6DE24 EC 00 18 24 */ fdivs f0, f0, f3 -/* 80C6DE28 EC 05 00 32 */ fmuls f0, f5, f0 -/* 80C6DE2C EC 04 00 32 */ fmuls f0, f4, f0 -/* 80C6DE30 FC 00 00 1E */ fctiwz f0, f0 -/* 80C6DE34 D8 01 00 78 */ stfd f0, 0x78(r1) -/* 80C6DE38 80 01 00 7C */ lwz r0, 0x7c(r1) -/* 80C6DE3C B0 1D 06 1E */ sth r0, 0x61e(r29) -/* 80C6DE40 A8 1D 06 1E */ lha r0, 0x61e(r29) -/* 80C6DE44 2C 00 FF DD */ cmpwi r0, -35 -/* 80C6DE48 40 81 00 0C */ ble lbl_80C6DE54 -/* 80C6DE4C 38 00 FF DD */ li r0, -35 -/* 80C6DE50 B0 1D 06 1E */ sth r0, 0x61e(r29) -lbl_80C6DE54: -/* 80C6DE54 A8 7D 06 1C */ lha r3, 0x61c(r29) -/* 80C6DE58 A8 1D 06 1E */ lha r0, 0x61e(r29) -/* 80C6DE5C 7C 03 02 15 */ add. r0, r3, r0 -/* 80C6DE60 40 80 00 50 */ bge lbl_80C6DEB0 -/* 80C6DE64 7C 60 07 35 */ extsh. r0, r3 -/* 80C6DE68 40 81 00 48 */ ble lbl_80C6DEB0 -/* 80C6DE6C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DB@ha */ -/* 80C6DE70 38 03 01 DB */ addi r0, r3, 0x01DB /* 0x000801DB@l */ -/* 80C6DE74 90 01 00 10 */ stw r0, 0x10(r1) -/* 80C6DE78 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6DE7C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6DE80 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6DE84 38 81 00 10 */ addi r4, r1, 0x10 -/* 80C6DE88 38 BD 0C 94 */ addi r5, r29, 0xc94 -/* 80C6DE8C A8 1D 06 1E */ lha r0, 0x61e(r29) -/* 80C6DE90 7C C0 00 D0 */ neg r6, r0 -/* 80C6DE94 38 E0 00 00 */ li r7, 0 -/* 80C6DE98 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C6DE9C FC 40 08 90 */ fmr f2, f1 -/* 80C6DEA0 C0 7F 00 38 */ lfs f3, 0x38(r31) -/* 80C6DEA4 FC 80 18 90 */ fmr f4, f3 -/* 80C6DEA8 39 00 00 00 */ li r8, 0 -/* 80C6DEAC 4B 63 DA D9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C6DEB0: -/* 80C6DEB0 A8 7D 06 1C */ lha r3, 0x61c(r29) -/* 80C6DEB4 A8 1D 06 1E */ lha r0, 0x61e(r29) -/* 80C6DEB8 7C 03 02 14 */ add r0, r3, r0 -/* 80C6DEBC B0 1D 06 1C */ sth r0, 0x61c(r29) -/* 80C6DEC0 A8 1D 06 1C */ lha r0, 0x61c(r29) -/* 80C6DEC4 C8 3F 00 60 */ lfd f1, 0x60(r31) -/* 80C6DEC8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6DECC 90 01 00 84 */ stw r0, 0x84(r1) -/* 80C6DED0 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6DED4 90 01 00 80 */ stw r0, 0x80(r1) -/* 80C6DED8 C8 01 00 80 */ lfd f0, 0x80(r1) -/* 80C6DEDC EC 40 08 28 */ fsubs f2, f0, f1 -/* 80C6DEE0 C0 3F 00 40 */ lfs f1, 0x40(r31) -/* 80C6DEE4 C0 1D 0C 90 */ lfs f0, 0xc90(r29) -/* 80C6DEE8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C6DEEC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80C6DEF0 4C 40 13 82 */ cror 2, 0, 2 -/* 80C6DEF4 40 82 00 0C */ bne lbl_80C6DF00 -/* 80C6DEF8 38 00 00 01 */ li r0, 1 -/* 80C6DEFC 98 1D 06 20 */ stb r0, 0x620(r29) -lbl_80C6DF00: -/* 80C6DF00 C0 3D 0C 90 */ lfs f1, 0xc90(r29) -/* 80C6DF04 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80C6DF08 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C6DF0C D0 1D 0C 90 */ stfs f0, 0xc90(r29) -lbl_80C6DF10: -/* 80C6DF10 7F A3 EB 78 */ mr r3, r29 -/* 80C6DF14 4B FF F8 CD */ bl setMtx__14daObjYchndlr_cFv -/* 80C6DF18 38 1D 05 A8 */ addi r0, r29, 0x5a8 -/* 80C6DF1C 90 1E 00 00 */ stw r0, 0(r30) -/* 80C6DF20 3B 00 00 00 */ li r24, 0 -/* 80C6DF24 3B 80 00 00 */ li r28, 0 -/* 80C6DF28 3B 60 00 00 */ li r27, 0 -/* 80C6DF2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6DF30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6DF34 3B C3 23 3C */ addi r30, r3, 0x233c -/* 80C6DF38 3C 60 80 C7 */ lis r3, l_shaft_vec@ha /* 0x80C6E9F8@ha */ -/* 80C6DF3C 3B 43 E9 F8 */ addi r26, r3, l_shaft_vec@l /* 0x80C6E9F8@l */ -lbl_80C6DF40: -/* 80C6DF40 38 7D 05 A8 */ addi r3, r29, 0x5a8 -/* 80C6DF44 7C 9A DA 14 */ add r4, r26, r27 -/* 80C6DF48 38 A1 00 6C */ addi r5, r1, 0x6c -/* 80C6DF4C 4B 6D 8E 21 */ bl PSMTXMultVec -/* 80C6DF50 7F 3D E2 14 */ add r25, r29, r28 -/* 80C6DF54 38 79 07 84 */ addi r3, r25, 0x784 -/* 80C6DF58 38 81 00 6C */ addi r4, r1, 0x6c -/* 80C6DF5C 4B 60 12 81 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C6DF60 7F C3 F3 78 */ mr r3, r30 -/* 80C6DF64 38 99 06 60 */ addi r4, r25, 0x660 -/* 80C6DF68 4B 5F 6C 41 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C6DF6C 3B 18 00 01 */ addi r24, r24, 1 -/* 80C6DF70 2C 18 00 04 */ cmpwi r24, 4 -/* 80C6DF74 3B 9C 01 3C */ addi r28, r28, 0x13c -/* 80C6DF78 3B 7B 00 0C */ addi r27, r27, 0xc -/* 80C6DF7C 41 80 FF C4 */ blt lbl_80C6DF40 -/* 80C6DF80 38 7D 0B 50 */ addi r3, r29, 0xb50 -/* 80C6DF84 4B 41 64 DD */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C6DF88 28 03 00 00 */ cmplwi r3, 0 -/* 80C6DF8C 41 82 01 84 */ beq lbl_80C6E110 -/* 80C6DF90 88 1D 0C 8C */ lbz r0, 0xc8c(r29) -/* 80C6DF94 28 00 00 00 */ cmplwi r0, 0 -/* 80C6DF98 40 82 01 78 */ bne lbl_80C6E110 -/* 80C6DF9C 38 61 00 24 */ addi r3, r1, 0x24 -/* 80C6DFA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6DFA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6DFA8 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 80C6DFAC 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80C6DFB0 38 BD 0C 94 */ addi r5, r29, 0xc94 -/* 80C6DFB4 4B 5F 8B 81 */ bl __mi__4cXyzCFRC3Vec -/* 80C6DFB8 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80C6DFBC D0 01 00 60 */ stfs f0, 0x60(r1) -/* 80C6DFC0 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80C6DFC4 D0 01 00 64 */ stfs f0, 0x64(r1) -/* 80C6DFC8 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80C6DFCC D0 01 00 68 */ stfs f0, 0x68(r1) -/* 80C6DFD0 38 61 00 60 */ addi r3, r1, 0x60 -/* 80C6DFD4 4B 6D 91 65 */ bl PSVECSquareMag -/* 80C6DFD8 FC 00 0A 10 */ fabs f0, f1 -/* 80C6DFDC FC 20 00 18 */ frsp f1, f0 -/* 80C6DFE0 3C 60 80 45 */ lis r3, G_CM3D_F_ABS_MIN@ha /* 0x80451180@ha */ -/* 80C6DFE4 C0 03 11 80 */ lfs f0, G_CM3D_F_ABS_MIN@l(r3) /* 0x80451180@l */ -/* 80C6DFE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6DFEC 41 80 01 24 */ blt lbl_80C6E110 -/* 80C6DFF0 38 61 00 18 */ addi r3, r1, 0x18 -/* 80C6DFF4 38 81 00 60 */ addi r4, r1, 0x60 -/* 80C6DFF8 4B 5F 8E FD */ bl normalize__4cXyzFv -/* 80C6DFFC C0 21 00 60 */ lfs f1, 0x60(r1) -/* 80C6E000 C0 41 00 68 */ lfs f2, 0x68(r1) -/* 80C6E004 4B 5F 96 71 */ bl cM_atan2s__Fff -/* 80C6E008 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80C6E00C 7C 03 00 50 */ subf r0, r3, r0 -/* 80C6E010 7C 00 07 34 */ extsh r0, r0 -/* 80C6E014 2C 00 2F FF */ cmpwi r0, 0x2fff -/* 80C6E018 40 81 00 6C */ ble lbl_80C6E084 -/* 80C6E01C 2C 00 4F FF */ cmpwi r0, 0x4fff -/* 80C6E020 40 80 00 64 */ bge lbl_80C6E084 -/* 80C6E024 A8 DD 06 1E */ lha r6, 0x61e(r29) -/* 80C6E028 7C C0 07 35 */ extsh. r0, r6 -/* 80C6E02C 40 80 00 08 */ bge lbl_80C6E034 -/* 80C6E030 7C C6 00 D0 */ neg r6, r6 -lbl_80C6E034: -/* 80C6E034 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DA@ha */ -/* 80C6E038 38 03 01 DA */ addi r0, r3, 0x01DA /* 0x000801DA@l */ -/* 80C6E03C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6E040 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6E044 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6E048 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6E04C 38 81 00 0C */ addi r4, r1, 0xc -/* 80C6E050 38 BD 0C 94 */ addi r5, r29, 0xc94 -/* 80C6E054 38 E0 00 00 */ li r7, 0 -/* 80C6E058 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C6E05C FC 40 08 90 */ fmr f2, f1 -/* 80C6E060 C0 7F 00 38 */ lfs f3, 0x38(r31) -/* 80C6E064 FC 80 18 90 */ fmr f4, f3 -/* 80C6E068 39 00 00 00 */ li r8, 0 -/* 80C6E06C 4B 63 D9 19 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6E070 38 00 00 01 */ li r0, 1 -/* 80C6E074 98 1D 06 20 */ stb r0, 0x620(r29) -/* 80C6E078 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80C6E07C D0 1D 0C 90 */ stfs f0, 0xc90(r29) -/* 80C6E080 48 00 00 90 */ b lbl_80C6E110 -lbl_80C6E084: -/* 80C6E084 2C 00 D0 01 */ cmpwi r0, -12287 -/* 80C6E088 40 80 00 6C */ bge lbl_80C6E0F4 -/* 80C6E08C 2C 00 B0 01 */ cmpwi r0, -20479 -/* 80C6E090 40 81 00 64 */ ble lbl_80C6E0F4 -/* 80C6E094 A8 DD 06 1E */ lha r6, 0x61e(r29) -/* 80C6E098 7C C0 07 35 */ extsh. r0, r6 -/* 80C6E09C 40 80 00 08 */ bge lbl_80C6E0A4 -/* 80C6E0A0 7C C6 00 D0 */ neg r6, r6 -lbl_80C6E0A4: -/* 80C6E0A4 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DA@ha */ -/* 80C6E0A8 38 03 01 DA */ addi r0, r3, 0x01DA /* 0x000801DA@l */ -/* 80C6E0AC 90 01 00 08 */ stw r0, 8(r1) -/* 80C6E0B0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6E0B4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6E0B8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6E0BC 38 81 00 08 */ addi r4, r1, 8 -/* 80C6E0C0 38 BD 0C 94 */ addi r5, r29, 0xc94 -/* 80C6E0C4 38 E0 00 00 */ li r7, 0 -/* 80C6E0C8 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C6E0CC FC 40 08 90 */ fmr f2, f1 -/* 80C6E0D0 C0 7F 00 38 */ lfs f3, 0x38(r31) -/* 80C6E0D4 FC 80 18 90 */ fmr f4, f3 -/* 80C6E0D8 39 00 00 00 */ li r8, 0 -/* 80C6E0DC 4B 63 D8 A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6E0E0 38 00 00 00 */ li r0, 0 -/* 80C6E0E4 98 1D 06 20 */ stb r0, 0x620(r29) -/* 80C6E0E8 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80C6E0EC D0 1D 0C 90 */ stfs f0, 0xc90(r29) -/* 80C6E0F0 48 00 00 20 */ b lbl_80C6E110 -lbl_80C6E0F4: -/* 80C6E0F4 C0 3D 0C 90 */ lfs f1, 0xc90(r29) -/* 80C6E0F8 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 80C6E0FC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6E100 40 80 00 10 */ bge lbl_80C6E110 -/* 80C6E104 38 00 00 01 */ li r0, 1 -/* 80C6E108 98 1D 06 20 */ stb r0, 0x620(r29) -/* 80C6E10C D0 1D 0C 90 */ stfs f0, 0xc90(r29) -lbl_80C6E110: -/* 80C6E110 C0 1D 0C 94 */ lfs f0, 0xc94(r29) -/* 80C6E114 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80C6E118 C0 3D 0C 98 */ lfs f1, 0xc98(r29) -/* 80C6E11C D0 21 00 58 */ stfs f1, 0x58(r1) -/* 80C6E120 C0 1D 0C 9C */ lfs f0, 0xc9c(r29) -/* 80C6E124 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 80C6E128 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80C6E12C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C6E130 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80C6E134 38 7D 0C 74 */ addi r3, r29, 0xc74 -/* 80C6E138 38 81 00 54 */ addi r4, r1, 0x54 -/* 80C6E13C 4B 60 10 A1 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C6E140 7F C3 F3 78 */ mr r3, r30 -/* 80C6E144 38 9D 0B 50 */ addi r4, r29, 0xb50 -/* 80C6E148 4B 5F 6A 61 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C6E14C 38 7D 06 40 */ addi r3, r29, 0x640 -/* 80C6E150 4B 41 56 E1 */ bl Move__10dCcD_GSttsFv -/* 80C6E154 88 1D 0C 8C */ lbz r0, 0xc8c(r29) -/* 80C6E158 28 00 00 00 */ cmplwi r0, 0 -/* 80C6E15C 41 82 00 20 */ beq lbl_80C6E17C -/* 80C6E160 80 1D 04 9C */ lwz r0, 0x49c(r29) -/* 80C6E164 54 00 00 3E */ slwi r0, r0, 0 -/* 80C6E168 90 1D 04 9C */ stw r0, 0x49c(r29) -/* 80C6E16C 80 1D 05 5C */ lwz r0, 0x55c(r29) -/* 80C6E170 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 80C6E174 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80C6E178 48 00 01 5C */ b lbl_80C6E2D4 -lbl_80C6E17C: -/* 80C6E17C 38 00 00 04 */ li r0, 4 -/* 80C6E180 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80C6E184 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80C6E188 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80C6E18C C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80C6E190 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80C6E194 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80C6E198 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80C6E19C 38 7D 05 A8 */ addi r3, r29, 0x5a8 -/* 80C6E1A0 38 81 00 30 */ addi r4, r1, 0x30 -/* 80C6E1A4 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80C6E1A8 4B 6D 8B C5 */ bl PSMTXMultVec -/* 80C6E1AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6E1B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6E1B4 83 03 5D AC */ lwz r24, 0x5dac(r3) -/* 80C6E1B8 38 78 04 D0 */ addi r3, r24, 0x4d0 -/* 80C6E1BC 38 81 00 48 */ addi r4, r1, 0x48 -/* 80C6E1C0 4B 6D 91 DD */ bl PSVECSquareDistance -/* 80C6E1C4 FF E0 08 90 */ fmr f31, f1 -/* 80C6E1C8 C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 80C6E1CC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80C6E1D0 38 7D 05 A8 */ addi r3, r29, 0x5a8 -/* 80C6E1D4 38 81 00 30 */ addi r4, r1, 0x30 -/* 80C6E1D8 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80C6E1DC 4B 6D 8B 91 */ bl PSMTXMultVec -/* 80C6E1E0 38 78 04 D0 */ addi r3, r24, 0x4d0 -/* 80C6E1E4 38 81 00 3C */ addi r4, r1, 0x3c -/* 80C6E1E8 4B 6D 91 B5 */ bl PSVECSquareDistance -/* 80C6E1EC FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 80C6E1F0 40 81 00 20 */ ble lbl_80C6E210 -/* 80C6E1F4 FF E0 08 90 */ fmr f31, f1 -/* 80C6E1F8 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80C6E1FC D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80C6E200 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80C6E204 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80C6E208 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 80C6E20C D0 01 00 50 */ stfs f0, 0x50(r1) -lbl_80C6E210: -/* 80C6E210 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80C6E214 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80C6E218 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80C6E21C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80C6E220 38 7D 05 A8 */ addi r3, r29, 0x5a8 -/* 80C6E224 38 81 00 30 */ addi r4, r1, 0x30 -/* 80C6E228 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80C6E22C 4B 6D 8B 41 */ bl PSMTXMultVec -/* 80C6E230 38 78 04 D0 */ addi r3, r24, 0x4d0 -/* 80C6E234 38 81 00 3C */ addi r4, r1, 0x3c -/* 80C6E238 4B 6D 91 65 */ bl PSVECSquareDistance -/* 80C6E23C FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 80C6E240 40 81 00 20 */ ble lbl_80C6E260 -/* 80C6E244 FF E0 08 90 */ fmr f31, f1 -/* 80C6E248 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80C6E24C D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80C6E250 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80C6E254 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80C6E258 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 80C6E25C D0 01 00 50 */ stfs f0, 0x50(r1) -lbl_80C6E260: -/* 80C6E260 C0 1F 00 58 */ lfs f0, 0x58(r31) -/* 80C6E264 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80C6E268 38 7D 05 A8 */ addi r3, r29, 0x5a8 -/* 80C6E26C 38 81 00 30 */ addi r4, r1, 0x30 -/* 80C6E270 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80C6E274 4B 6D 8A F9 */ bl PSMTXMultVec -/* 80C6E278 38 78 04 D0 */ addi r3, r24, 0x4d0 -/* 80C6E27C 38 81 00 3C */ addi r4, r1, 0x3c -/* 80C6E280 4B 6D 91 1D */ bl PSVECSquareDistance -/* 80C6E284 FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 80C6E288 40 81 00 1C */ ble lbl_80C6E2A4 -/* 80C6E28C C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80C6E290 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80C6E294 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80C6E298 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80C6E29C C0 01 00 44 */ lfs f0, 0x44(r1) -/* 80C6E2A0 D0 01 00 50 */ stfs f0, 0x50(r1) -lbl_80C6E2A4: -/* 80C6E2A4 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80C6E2A8 D0 1D 05 50 */ stfs f0, 0x550(r29) -/* 80C6E2AC C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 80C6E2B0 D0 1D 05 54 */ stfs f0, 0x554(r29) -/* 80C6E2B4 C0 01 00 50 */ lfs f0, 0x50(r1) -/* 80C6E2B8 D0 1D 05 58 */ stfs f0, 0x558(r29) -/* 80C6E2BC C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80C6E2C0 D0 1D 05 38 */ stfs f0, 0x538(r29) -/* 80C6E2C4 C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 80C6E2C8 D0 1D 05 3C */ stfs f0, 0x53c(r29) -/* 80C6E2CC C0 01 00 50 */ lfs f0, 0x50(r1) -/* 80C6E2D0 D0 1D 05 40 */ stfs f0, 0x540(r29) -lbl_80C6E2D4: -/* 80C6E2D4 38 00 00 00 */ li r0, 0 -/* 80C6E2D8 98 1D 0C 8C */ stb r0, 0xc8c(r29) -/* 80C6E2DC 38 60 00 01 */ li r3, 1 -/* 80C6E2E0 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 80C6E2E4 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 80C6E2E8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80C6E2EC 4B 6F 3F 29 */ bl _restgpr_24 -/* 80C6E2F0 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 80C6E2F4 7C 08 03 A6 */ mtlr r0 -/* 80C6E2F8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80C6E2FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__ct__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__ct__8dCcD_CylFv.s deleted file mode 100644 index 5401217362..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__ct__8dCcD_CylFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C6E674: -/* 80C6E674 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E678 7C 08 02 A6 */ mflr r0 -/* 80C6E67C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E680 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E684 7C 7F 1B 78 */ mr r31, r3 -/* 80C6E688 4B 41 53 A1 */ bl __ct__12dCcD_GObjInfFv -/* 80C6E68C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6E690 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6E694 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80C6E698 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6EB2C@ha */ -/* 80C6E69C 38 03 EB 2C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6EB2C@l */ -/* 80C6E6A0 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80C6E6A4 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6EB20@ha */ -/* 80C6E6A8 38 03 EB 20 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6EB20@l */ -/* 80C6E6AC 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C6E6B0 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6E6B4 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6E6B8 90 7F 01 20 */ stw r3, 0x120(r31) -/* 80C6E6BC 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6E6C0 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C6E6C4 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6E6C8 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6E6CC 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 80C6E6D0 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6E6D4 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80C6E6D8 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6E6DC 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C6E6E0 7F E3 FB 78 */ mr r3, r31 -/* 80C6E6E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E6E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E6EC 7C 08 03 A6 */ mtlr r0 -/* 80C6E6F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E6F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 57ea815250..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6E7C0: -/* 80C6E7C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E7C4 7C 08 02 A6 */ mflr r0 -/* 80C6E7C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E7CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E7D0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6E7D4 41 82 00 1C */ beq lbl_80C6E7F0 -/* 80C6E7D8 3C A0 80 C7 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80C6EB08@ha */ -/* 80C6E7DC 38 05 EB 08 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80C6EB08@l */ -/* 80C6E7E0 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6E7E4 7C 80 07 35 */ extsh. r0, r4 -/* 80C6E7E8 40 81 00 08 */ ble lbl_80C6E7F0 -/* 80C6E7EC 4B 66 05 51 */ bl __dl__FPv -lbl_80C6E7F0: -/* 80C6E7F0 7F E3 FB 78 */ mr r3, r31 -/* 80C6E7F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E7F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E7FC 7C 08 03 A6 */ mtlr r0 -/* 80C6E800 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E804 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index d057c7ddb3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C6E6F8: -/* 80C6E6F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E6FC 7C 08 02 A6 */ mflr r0 -/* 80C6E700 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E704 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E708 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6E70C 41 82 00 30 */ beq lbl_80C6E73C -/* 80C6E710 3C 60 80 C7 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C6EB14@ha */ -/* 80C6E714 38 03 EB 14 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C6EB14@l */ -/* 80C6E718 90 1F 00 00 */ stw r0, 0(r31) -/* 80C6E71C 41 82 00 10 */ beq lbl_80C6E72C -/* 80C6E720 3C 60 80 C7 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C6EB08@ha */ -/* 80C6E724 38 03 EB 08 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C6EB08@l */ -/* 80C6E728 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C6E72C: -/* 80C6E72C 7C 80 07 35 */ extsh. r0, r4 -/* 80C6E730 40 81 00 0C */ ble lbl_80C6E73C -/* 80C6E734 7F E3 FB 78 */ mr r3, r31 -/* 80C6E738 4B 66 06 05 */ bl __dl__FPv -lbl_80C6E73C: -/* 80C6E73C 7F E3 FB 78 */ mr r3, r31 -/* 80C6E740 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E744 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E748 7C 08 03 A6 */ mtlr r0 -/* 80C6E74C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E750 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__14daObjYchndlr_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__14daObjYchndlr_cFv.s deleted file mode 100644 index c2c76bd03c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__14daObjYchndlr_cFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80C6E808: -/* 80C6E808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E80C 7C 08 02 A6 */ mflr r0 -/* 80C6E810 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E814 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E818 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6E81C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C6E820 7C 9F 23 78 */ mr r31, r4 -/* 80C6E824 41 82 01 38 */ beq lbl_80C6E95C -/* 80C6E828 3C 60 80 C7 */ lis r3, __vt__14daObjYchndlr_c@ha /* 0x80C6EB38@ha */ -/* 80C6E82C 38 03 EB 38 */ addi r0, r3, __vt__14daObjYchndlr_c@l /* 0x80C6EB38@l */ -/* 80C6E830 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C6E834 34 1E 0B 50 */ addic. r0, r30, 0xb50 -/* 80C6E838 41 82 00 84 */ beq lbl_80C6E8BC -/* 80C6E83C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6E840 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6E844 90 7E 0B 8C */ stw r3, 0xb8c(r30) -/* 80C6E848 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6E84C 90 1E 0C 70 */ stw r0, 0xc70(r30) -/* 80C6E850 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6E854 90 1E 0C 88 */ stw r0, 0xc88(r30) -/* 80C6E858 34 1E 0C 54 */ addic. r0, r30, 0xc54 -/* 80C6E85C 41 82 00 54 */ beq lbl_80C6E8B0 -/* 80C6E860 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6E864 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6E868 90 7E 0C 70 */ stw r3, 0xc70(r30) -/* 80C6E86C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6E870 90 1E 0C 88 */ stw r0, 0xc88(r30) -/* 80C6E874 34 1E 0C 74 */ addic. r0, r30, 0xc74 -/* 80C6E878 41 82 00 10 */ beq lbl_80C6E888 -/* 80C6E87C 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6EB20@ha */ -/* 80C6E880 38 03 EB 20 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6EB20@l */ -/* 80C6E884 90 1E 0C 88 */ stw r0, 0xc88(r30) -lbl_80C6E888: -/* 80C6E888 34 1E 0C 54 */ addic. r0, r30, 0xc54 -/* 80C6E88C 41 82 00 24 */ beq lbl_80C6E8B0 -/* 80C6E890 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6E894 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6E898 90 1E 0C 70 */ stw r0, 0xc70(r30) -/* 80C6E89C 34 1E 0C 54 */ addic. r0, r30, 0xc54 -/* 80C6E8A0 41 82 00 10 */ beq lbl_80C6E8B0 -/* 80C6E8A4 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6EB2C@ha */ -/* 80C6E8A8 38 03 EB 2C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6EB2C@l */ -/* 80C6E8AC 90 1E 0C 6C */ stw r0, 0xc6c(r30) -lbl_80C6E8B0: -/* 80C6E8B0 38 7E 0B 50 */ addi r3, r30, 0xb50 -/* 80C6E8B4 38 80 00 00 */ li r4, 0 -/* 80C6E8B8 4B 41 58 2D */ bl __dt__12dCcD_GObjInfFv -lbl_80C6E8BC: -/* 80C6E8BC 38 7E 06 60 */ addi r3, r30, 0x660 -/* 80C6E8C0 3C 80 80 C7 */ lis r4, __dt__8dCcD_CylFv@ha /* 0x80C6E5A8@ha */ -/* 80C6E8C4 38 84 E5 A8 */ addi r4, r4, __dt__8dCcD_CylFv@l /* 0x80C6E5A8@l */ -/* 80C6E8C8 38 A0 01 3C */ li r5, 0x13c -/* 80C6E8CC 38 C0 00 04 */ li r6, 4 -/* 80C6E8D0 4B 6F 34 19 */ bl __destroy_arr -/* 80C6E8D4 34 1E 06 24 */ addic. r0, r30, 0x624 -/* 80C6E8D8 41 82 00 54 */ beq lbl_80C6E92C -/* 80C6E8DC 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C6E8E0 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C6E8E4 90 7E 06 3C */ stw r3, 0x63c(r30) -/* 80C6E8E8 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C6E8EC 90 1E 06 40 */ stw r0, 0x640(r30) -/* 80C6E8F0 34 1E 06 40 */ addic. r0, r30, 0x640 -/* 80C6E8F4 41 82 00 24 */ beq lbl_80C6E918 -/* 80C6E8F8 3C 60 80 C7 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C6EB14@ha */ -/* 80C6E8FC 38 03 EB 14 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C6EB14@l */ -/* 80C6E900 90 1E 06 40 */ stw r0, 0x640(r30) -/* 80C6E904 34 1E 06 40 */ addic. r0, r30, 0x640 -/* 80C6E908 41 82 00 10 */ beq lbl_80C6E918 -/* 80C6E90C 3C 60 80 C7 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C6EB08@ha */ -/* 80C6E910 38 03 EB 08 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C6EB08@l */ -/* 80C6E914 90 1E 06 40 */ stw r0, 0x640(r30) -lbl_80C6E918: -/* 80C6E918 34 1E 06 24 */ addic. r0, r30, 0x624 -/* 80C6E91C 41 82 00 10 */ beq lbl_80C6E92C -/* 80C6E920 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C6E924 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C6E928 90 1E 06 3C */ stw r0, 0x63c(r30) -lbl_80C6E92C: -/* 80C6E92C 28 1E 00 00 */ cmplwi r30, 0 -/* 80C6E930 41 82 00 1C */ beq lbl_80C6E94C -/* 80C6E934 3C 60 80 3B */ lis r3, __vt__16dBgS_MoveBgActor@ha /* 0x803AB9A0@ha */ -/* 80C6E938 38 03 B9 A0 */ addi r0, r3, __vt__16dBgS_MoveBgActor@l /* 0x803AB9A0@l */ -/* 80C6E93C 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C6E940 7F C3 F3 78 */ mr r3, r30 -/* 80C6E944 38 80 00 00 */ li r4, 0 -/* 80C6E948 4B 3A A3 45 */ bl __dt__10fopAc_ac_cFv -lbl_80C6E94C: -/* 80C6E94C 7F E0 07 35 */ extsh. r0, r31 -/* 80C6E950 40 81 00 0C */ ble lbl_80C6E95C -/* 80C6E954 7F C3 F3 78 */ mr r3, r30 -/* 80C6E958 4B 66 03 E5 */ bl __dl__FPv -lbl_80C6E95C: -/* 80C6E95C 7F C3 F3 78 */ mr r3, r30 -/* 80C6E960 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E964 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6E968 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E96C 7C 08 03 A6 */ mtlr r0 -/* 80C6E970 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E974 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGAabFv.s deleted file mode 100644 index bbd387a987..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6E560: -/* 80C6E560 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E564 7C 08 02 A6 */ mflr r0 -/* 80C6E568 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E56C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E570 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6E574 41 82 00 1C */ beq lbl_80C6E590 -/* 80C6E578 3C A0 80 C7 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C6EB2C@ha */ -/* 80C6E57C 38 05 EB 2C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C6EB2C@l */ -/* 80C6E580 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C6E584 7C 80 07 35 */ extsh. r0, r4 -/* 80C6E588 40 81 00 08 */ ble lbl_80C6E590 -/* 80C6E58C 4B 66 07 B1 */ bl __dl__FPv -lbl_80C6E590: -/* 80C6E590 7F E3 FB 78 */ mr r3, r31 -/* 80C6E594 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E598 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E59C 7C 08 03 A6 */ mtlr r0 -/* 80C6E5A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E5A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGCylFv.s deleted file mode 100644 index ea56e1472f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C6E518: -/* 80C6E518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E51C 7C 08 02 A6 */ mflr r0 -/* 80C6E520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E528 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6E52C 41 82 00 1C */ beq lbl_80C6E548 -/* 80C6E530 3C A0 80 C7 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C6EB20@ha */ -/* 80C6E534 38 05 EB 20 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C6EB20@l */ -/* 80C6E538 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C6E53C 7C 80 07 35 */ extsh. r0, r4 -/* 80C6E540 40 81 00 08 */ ble lbl_80C6E548 -/* 80C6E544 4B 66 07 F9 */ bl __dl__FPv -lbl_80C6E548: -/* 80C6E548 7F E3 FB 78 */ mr r3, r31 -/* 80C6E54C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E550 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E554 7C 08 03 A6 */ mtlr r0 -/* 80C6E558 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E55C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8dCcD_CylFv.s deleted file mode 100644 index 2d831f76f6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8dCcD_CylFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80C6E5A8: -/* 80C6E5A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E5AC 7C 08 02 A6 */ mflr r0 -/* 80C6E5B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E5B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E5B8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6E5BC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C6E5C0 7C 9F 23 78 */ mr r31, r4 -/* 80C6E5C4 41 82 00 94 */ beq lbl_80C6E658 -/* 80C6E5C8 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6E5CC 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6E5D0 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80C6E5D4 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6E5D8 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6E5DC 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6E5E0 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6E5E4 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C6E5E8 41 82 00 54 */ beq lbl_80C6E63C -/* 80C6E5EC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6E5F0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6E5F4 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80C6E5F8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6E5FC 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6E600 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 80C6E604 41 82 00 10 */ beq lbl_80C6E614 -/* 80C6E608 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6EB20@ha */ -/* 80C6E60C 38 03 EB 20 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6EB20@l */ -/* 80C6E610 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80C6E614: -/* 80C6E614 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C6E618 41 82 00 24 */ beq lbl_80C6E63C -/* 80C6E61C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6E620 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6E624 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6E628 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C6E62C 41 82 00 10 */ beq lbl_80C6E63C -/* 80C6E630 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6EB2C@ha */ -/* 80C6E634 38 03 EB 2C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6EB2C@l */ -/* 80C6E638 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_80C6E63C: -/* 80C6E63C 7F C3 F3 78 */ mr r3, r30 -/* 80C6E640 38 80 00 00 */ li r4, 0 -/* 80C6E644 4B 41 5A A1 */ bl __dt__12dCcD_GObjInfFv -/* 80C6E648 7F E0 07 35 */ extsh. r0, r31 -/* 80C6E64C 40 81 00 0C */ ble lbl_80C6E658 -/* 80C6E650 7F C3 F3 78 */ mr r3, r30 -/* 80C6E654 4B 66 06 E9 */ bl __dl__FPv -lbl_80C6E658: -/* 80C6E658 7F C3 F3 78 */ mr r3, r30 -/* 80C6E65C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E660 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6E664 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E668 7C 08 03 A6 */ mtlr r0 -/* 80C6E66C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E670 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/create1st__14daObjYchndlr_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/create1st__14daObjYchndlr_cFv.s deleted file mode 100644 index c63b8613f3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/create1st__14daObjYchndlr_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80C6D758: -/* 80C6D758 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D75C 7C 08 02 A6 */ mflr r0 -/* 80C6D760 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D764 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6D768 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6D76C 41 82 00 08 */ beq lbl_80C6D774 -/* 80C6D770 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C6D774: -/* 80C6D774 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C6E9F4@ha */ -/* 80C6D778 38 84 E9 F4 */ addi r4, r4, l_arcName@l /* 0x80C6E9F4@l */ -/* 80C6D77C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6D780 4B 3B F7 3D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C6D784 7C 60 1B 78 */ mr r0, r3 -/* 80C6D788 2C 00 00 04 */ cmpwi r0, 4 -/* 80C6D78C 40 82 00 3C */ bne lbl_80C6D7C8 -/* 80C6D790 7F E3 FB 78 */ mr r3, r31 -/* 80C6D794 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C6E9F4@ha */ -/* 80C6D798 38 84 E9 F4 */ addi r4, r4, l_arcName@l /* 0x80C6E9F4@l */ -/* 80C6D79C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6D7A0 38 A0 00 08 */ li r5, 8 -/* 80C6D7A4 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C6D7A8 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C6D7AC 38 E0 4D B0 */ li r7, 0x4db0 -/* 80C6D7B0 39 1F 05 A8 */ addi r8, r31, 0x5a8 -/* 80C6D7B4 4B 40 B0 09 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C6D7B8 7C 60 1B 78 */ mr r0, r3 -/* 80C6D7BC 2C 00 00 05 */ cmpwi r0, 5 -/* 80C6D7C0 40 82 00 08 */ bne lbl_80C6D7C8 -/* 80C6D7C4 48 00 00 08 */ b lbl_80C6D7CC -lbl_80C6D7C8: -/* 80C6D7C8 7C 03 03 78 */ mr r3, r0 -lbl_80C6D7CC: -/* 80C6D7CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6D7D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D7D4 7C 08 03 A6 */ mtlr r0 -/* 80C6D7D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D7DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c.s deleted file mode 100644 index 6d274fb114..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6E754: -/* 80C6E754 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E758 7C 08 02 A6 */ mflr r0 -/* 80C6E75C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E760 4B 40 A1 7D */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C6E764 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E768 7C 08 03 A6 */ mtlr r0 -/* 80C6E76C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E770 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c.s deleted file mode 100644 index 437162be08..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C6E794: -/* 80C6E794 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E798 7C 08 02 A6 */ mflr r0 -/* 80C6E79C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E7A0 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C6E7A4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C6E7A8 7D 89 03 A6 */ mtctr r12 -/* 80C6E7AC 4E 80 04 21 */ bctrl -/* 80C6E7B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E7B4 7C 08 03 A6 */ mtlr r0 -/* 80C6E7B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E7BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c.s deleted file mode 100644 index a96f041898..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C6E774: -/* 80C6E774 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E778 7C 08 02 A6 */ mflr r0 -/* 80C6E77C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E780 4B 40 A1 D1 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C6E784 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E788 7C 08 03 A6 */ mtlr r0 -/* 80C6E78C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E790 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_create1st__FP14daObjYchndlr_c.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_create1st__FP14daObjYchndlr_c.s deleted file mode 100644 index 0fdcbe40a3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_create1st__FP14daObjYchndlr_c.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80C6E404: -/* 80C6E404 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6E408 7C 08 02 A6 */ mflr r0 -/* 80C6E40C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6E410 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6E414 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6E418 7C 7F 1B 78 */ mr r31, r3 -/* 80C6E41C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C6E420 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C6E424 40 82 00 D4 */ bne lbl_80C6E4F8 -/* 80C6E428 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C6E42C 41 82 00 C0 */ beq lbl_80C6E4EC -/* 80C6E430 7C 1E 03 78 */ mr r30, r0 -/* 80C6E434 4B 40 A1 F1 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C6E438 3C 60 80 C7 */ lis r3, __vt__14daObjYchndlr_c@ha /* 0x80C6EB38@ha */ -/* 80C6E43C 38 03 EB 38 */ addi r0, r3, __vt__14daObjYchndlr_c@l /* 0x80C6EB38@l */ -/* 80C6E440 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C6E444 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C6E448 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C6E44C 90 1E 06 3C */ stw r0, 0x63c(r30) -/* 80C6E450 38 7E 06 40 */ addi r3, r30, 0x640 -/* 80C6E454 4B 41 53 0D */ bl __ct__10dCcD_GSttsFv -/* 80C6E458 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C6E45C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C6E460 90 7E 06 3C */ stw r3, 0x63c(r30) -/* 80C6E464 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C6E468 90 1E 06 40 */ stw r0, 0x640(r30) -/* 80C6E46C 38 7E 06 60 */ addi r3, r30, 0x660 -/* 80C6E470 3C 80 80 C7 */ lis r4, __ct__8dCcD_CylFv@ha /* 0x80C6E674@ha */ -/* 80C6E474 38 84 E6 74 */ addi r4, r4, __ct__8dCcD_CylFv@l /* 0x80C6E674@l */ -/* 80C6E478 3C A0 80 C7 */ lis r5, __dt__8dCcD_CylFv@ha /* 0x80C6E5A8@ha */ -/* 80C6E47C 38 A5 E5 A8 */ addi r5, r5, __dt__8dCcD_CylFv@l /* 0x80C6E5A8@l */ -/* 80C6E480 38 C0 01 3C */ li r6, 0x13c -/* 80C6E484 38 E0 00 04 */ li r7, 4 -/* 80C6E488 4B 6F 38 D9 */ bl __construct_array -/* 80C6E48C 3B DE 0B 50 */ addi r30, r30, 0xb50 -/* 80C6E490 7F C3 F3 78 */ mr r3, r30 -/* 80C6E494 4B 41 55 95 */ bl __ct__12dCcD_GObjInfFv -/* 80C6E498 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C6E49C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C6E4A0 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6E4A4 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C6EB2C@ha */ -/* 80C6E4A8 38 03 EB 2C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C6EB2C@l */ -/* 80C6E4AC 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80C6E4B0 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C6EB20@ha */ -/* 80C6E4B4 38 03 EB 20 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C6EB20@l */ -/* 80C6E4B8 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6E4BC 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C6E4C0 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C6E4C4 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80C6E4C8 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C6E4CC 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C6E4D0 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C6E4D4 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C6E4D8 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80C6E4DC 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C6E4E0 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C6E4E4 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C6E4E8 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80C6E4EC: -/* 80C6E4EC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C6E4F0 60 00 00 08 */ ori r0, r0, 8 -/* 80C6E4F4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C6E4F8: -/* 80C6E4F8 7F E3 FB 78 */ mr r3, r31 -/* 80C6E4FC 4B FF F2 5D */ bl create1st__14daObjYchndlr_cFv -/* 80C6E500 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6E504 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6E508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6E50C 7C 08 03 A6 */ mtlr r0 -/* 80C6E510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6E514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideActor__14daObjYchndlr_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideActor__14daObjYchndlr_cFP10fopAc_ac_c.s deleted file mode 100644 index 27df706af8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideActor__14daObjYchndlr_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80C6D9A8: -/* 80C6D9A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D9AC 7C 08 02 A6 */ mflr r0 -/* 80C6D9B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D9B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6D9B8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6D9BC 7C 7E 1B 78 */ mr r30, r3 -/* 80C6D9C0 38 00 00 01 */ li r0, 1 -/* 80C6D9C4 98 03 0C 8C */ stb r0, 0xc8c(r3) -/* 80C6D9C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6D9CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6D9D0 83 E3 5D AC */ lwz r31, 0x5dac(r3) -/* 80C6D9D4 7C 04 F8 40 */ cmplw r4, r31 -/* 80C6D9D8 40 82 00 6C */ bne lbl_80C6DA44 -/* 80C6D9DC 7F E3 FB 78 */ mr r3, r31 -/* 80C6D9E0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 80C6D9E4 81 8C 01 FC */ lwz r12, 0x1fc(r12) -/* 80C6D9E8 7D 89 03 A6 */ mtctr r12 -/* 80C6D9EC 4E 80 04 21 */ bctrl -/* 80C6D9F0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6D9F4 41 82 00 50 */ beq lbl_80C6DA44 -/* 80C6D9F8 38 7E 0B 50 */ addi r3, r30, 0xb50 -/* 80C6D9FC 4B 41 6A 65 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C6DA00 28 03 00 00 */ cmplwi r3, 0 -/* 80C6DA04 40 82 00 40 */ bne lbl_80C6DA44 -/* 80C6DA08 3C 60 80 C7 */ lis r3, lit_3718@ha /* 0x80C6E9A8@ha */ -/* 80C6DA0C C0 03 E9 A8 */ lfs f0, lit_3718@l(r3) /* 0x80C6E9A8@l */ -/* 80C6DA10 D0 1E 0C 90 */ stfs f0, 0xc90(r30) -/* 80C6DA14 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6DA18 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C6DA1C EC 21 00 28 */ fsubs f1, f1, f0 -/* 80C6DA20 3C 60 80 C7 */ lis r3, lit_3699@ha /* 0x80C6E9A0@ha */ -/* 80C6DA24 C0 03 E9 A0 */ lfs f0, lit_3699@l(r3) /* 0x80C6E9A0@l */ -/* 80C6DA28 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6DA2C 40 81 00 10 */ ble lbl_80C6DA3C -/* 80C6DA30 38 00 00 00 */ li r0, 0 -/* 80C6DA34 98 1E 06 20 */ stb r0, 0x620(r30) -/* 80C6DA38 48 00 00 0C */ b lbl_80C6DA44 -lbl_80C6DA3C: -/* 80C6DA3C 38 00 00 01 */ li r0, 1 -/* 80C6DA40 98 1E 06 20 */ stb r0, 0x620(r30) -lbl_80C6DA44: -/* 80C6DA44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6DA48 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6DA4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6DA50 7C 08 03 A6 */ mtlr r0 -/* 80C6DA54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6DA58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 1435a767de..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80C6D980: -/* 80C6D980 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6D984 7C 08 02 A6 */ mflr r0 -/* 80C6D988 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6D98C 7C 83 23 78 */ mr r3, r4 -/* 80C6D990 7C A4 2B 78 */ mr r4, r5 -/* 80C6D994 48 00 00 15 */ bl rideActor__14daObjYchndlr_cFP10fopAc_ac_c -/* 80C6D998 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6D99C 7C 08 03 A6 */ mtlr r0 -/* 80C6D9A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6D9A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/setMtx__14daObjYchndlr_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/setMtx__14daObjYchndlr_cFv.s deleted file mode 100644 index e9ddd42371..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/setMtx__14daObjYchndlr_cFv.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_80C6D7E0: -/* 80C6D7E0 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C6D7E4 7C 08 02 A6 */ mflr r0 -/* 80C6D7E8 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C6D7EC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C6D7F0 4B 6F 49 CD */ bl _savegpr_21 -/* 80C6D7F4 7C 7F 1B 78 */ mr r31, r3 -/* 80C6D7F8 3A A0 00 00 */ li r21, 0 -/* 80C6D7FC 3B C0 00 00 */ li r30, 0 -/* 80C6D800 3B A0 00 00 */ li r29, 0 -/* 80C6D804 3B 80 00 00 */ li r28, 0 -/* 80C6D808 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D80C 3A C3 D4 70 */ addi r22, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D810 3C 60 80 C7 */ lis r3, l_shaft_vec@ha /* 0x80C6E9F8@ha */ -/* 80C6D814 3A E3 E9 F8 */ addi r23, r3, l_shaft_vec@l /* 0x80C6E9F8@l */ -/* 80C6D818 7E D8 B3 78 */ mr r24, r22 -/* 80C6D81C 7E D9 B3 78 */ mr r25, r22 -/* 80C6D820 3C 60 80 C7 */ lis r3, l_shaft_roty@ha /* 0x80C6EA28@ha */ -/* 80C6D824 3B 43 EA 28 */ addi r26, r3, l_shaft_roty@l /* 0x80C6EA28@l */ -/* 80C6D828 7E DB B3 78 */ mr r27, r22 -lbl_80C6D82C: -/* 80C6D82C 7E C3 B3 78 */ mr r3, r22 -/* 80C6D830 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6D834 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C6D838 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C6D83C 4B 6D 90 AD */ bl PSMTXTrans -/* 80C6D840 7E C3 B3 78 */ mr r3, r22 -/* 80C6D844 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80C6D848 4B 39 EB ED */ bl mDoMtx_YrotM__FPA4_fs -/* 80C6D84C 7C 77 E2 14 */ add r3, r23, r28 -/* 80C6D850 C0 23 00 00 */ lfs f1, 0(r3) -/* 80C6D854 C0 43 00 04 */ lfs f2, 4(r3) -/* 80C6D858 C0 63 00 08 */ lfs f3, 8(r3) -/* 80C6D85C 4B 39 F5 41 */ bl transM__14mDoMtx_stack_cFfff -/* 80C6D860 7F 03 C3 78 */ mr r3, r24 -/* 80C6D864 A8 9F 06 1C */ lha r4, 0x61c(r31) -/* 80C6D868 4B 39 EC 65 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80C6D86C 7F 23 CB 78 */ mr r3, r25 -/* 80C6D870 7C 9A EA AE */ lhax r4, r26, r29 -/* 80C6D874 4B 39 EB C1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C6D878 7F 63 DB 78 */ mr r3, r27 -/* 80C6D87C 38 1E 06 0C */ addi r0, r30, 0x60c -/* 80C6D880 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 80C6D884 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6D888 4B 6D 8C 29 */ bl PSMTXCopy -/* 80C6D88C 3A B5 00 01 */ addi r21, r21, 1 -/* 80C6D890 2C 15 00 04 */ cmpwi r21, 4 -/* 80C6D894 3B DE 00 04 */ addi r30, r30, 4 -/* 80C6D898 3B BD 00 02 */ addi r29, r29, 2 -/* 80C6D89C 3B 9C 00 0C */ addi r28, r28, 0xc -/* 80C6D8A0 41 80 FF 8C */ blt lbl_80C6D82C -/* 80C6D8A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D8A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D8AC C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6D8B0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C6D8B4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C6D8B8 4B 6D 90 31 */ bl PSMTXTrans -/* 80C6D8BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D8C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D8C4 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80C6D8C8 4B 39 EB 6D */ bl mDoMtx_YrotM__FPA4_fs -/* 80C6D8CC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D8D0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D8D4 38 9F 05 D8 */ addi r4, r31, 0x5d8 -/* 80C6D8D8 4B 6D 8B D9 */ bl PSMTXCopy -/* 80C6D8DC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D8E0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D8E4 A8 9F 06 1C */ lha r4, 0x61c(r31) -/* 80C6D8E8 4B 39 EB E5 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80C6D8EC 3C 60 80 C7 */ lis r3, lit_3699@ha /* 0x80C6E9A0@ha */ -/* 80C6D8F0 C0 23 E9 A0 */ lfs f1, lit_3699@l(r3) /* 0x80C6E9A0@l */ -/* 80C6D8F4 3C 60 80 C7 */ lis r3, lit_3700@ha /* 0x80C6E9A4@ha */ -/* 80C6D8F8 C0 43 E9 A4 */ lfs f2, lit_3700@l(r3) /* 0x80C6E9A4@l */ -/* 80C6D8FC FC 60 08 90 */ fmr f3, f1 -/* 80C6D900 4B 39 F4 9D */ bl transM__14mDoMtx_stack_cFfff -/* 80C6D904 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D908 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D90C 3C 80 80 43 */ lis r4, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80C6D910 38 84 0C F4 */ addi r4, r4, Zero__4cXyz@l /* 0x80430CF4@l */ -/* 80C6D914 38 BF 0C 94 */ addi r5, r31, 0xc94 -/* 80C6D918 4B 6D 94 55 */ bl PSMTXMultVec -/* 80C6D91C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D920 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D924 C0 3F 0C 94 */ lfs f1, 0xc94(r31) -/* 80C6D928 C0 5F 0C 98 */ lfs f2, 0xc98(r31) -/* 80C6D92C C0 7F 0C 9C */ lfs f3, 0xc9c(r31) -/* 80C6D930 4B 6D 8F B9 */ bl PSMTXTrans -/* 80C6D934 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D938 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D93C A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80C6D940 4B 39 EA F5 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C6D944 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D948 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D94C 80 9F 06 08 */ lwz r4, 0x608(r31) -/* 80C6D950 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6D954 4B 6D 8B 5D */ bl PSMTXCopy -/* 80C6D958 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6D95C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6D960 38 9F 05 A8 */ addi r4, r31, 0x5a8 -/* 80C6D964 4B 6D 8B 4D */ bl PSMTXCopy -/* 80C6D968 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C6D96C 4B 6F 48 9D */ bl _restgpr_21 -/* 80C6D970 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C6D974 7C 08 03 A6 */ mtlr r0 -/* 80C6D978 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C6D97C 4E 80 00 20 */ blr diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index c82839360f..5606837b6f 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -161,6 +161,10 @@ public: mGlobalPScl.set(mGlobalScl.x, mGlobalScl.y); } + void setLocalScale(const JGeometry::TVec3& scale) { + mLocalScl.set(scale); + } + f32 get_r_f() { return mRndm.get_rndm_f(); } f32 get_r_zp() { return mRndm.get_rndm_zp(); } f32 get_r_zh() { return mRndm.get_rndm_zh(); } diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index cb76aa13c5..5087638ad4 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -3078,7 +3078,7 @@ public: virtual bool checkSpinnerPathMove(); virtual bool checkSpinnerTriggerAttack(); virtual void onSpinnerPathForceRemove(); - virtual s16 getIronBallBgHit() const; + virtual int getIronBallBgHit() const; virtual cXyz* getIronBallCenterPos(); virtual bool checkCanoeFishingGetLeft() const; virtual bool checkCanoeFishingGetRight() const; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index a0515a0524..7ccf682043 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -674,7 +674,7 @@ public: virtual bool checkSpinnerPathMove(); virtual bool checkSpinnerTriggerAttack(); virtual void onSpinnerPathForceRemove(); - virtual s16 getIronBallBgHit() const; + virtual int getIronBallBgHit() const; virtual cXyz* getIronBallCenterPos(); virtual bool checkCanoeFishingGetLeft() const; virtual bool checkCanoeFishingGetRight() const; diff --git a/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h b/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h index 229b639e0a..45b7bd50c2 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h +++ b/include/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h @@ -2,6 +2,8 @@ #define D_A_OBJ_LV5FLOORBOARD_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" /** * @ingroup actors-objects @@ -11,33 +13,52 @@ * @details * */ -class daFlorBoad_c : public fopAc_ac_c { +class daFlorBoad_c : public dBgS_MoveBgActor { public: + enum daFlorBoad_MODE { + MODE_WAIT, + MODE_BREAK, + }; + /* 80C6A6FC */ void setBaseMtx(); - /* 80C6A784 */ void CreateHeap(); - /* 80C6A7F0 */ void create(); - /* 80C6AAAC */ void Execute(f32 (**)[3][4]); + /* 80C6A7F0 */ int create(); /* 80C6AB04 */ void procMain(); /* 80C6AB90 */ void init_modeWait(); /* 80C6ABAC */ void modeWait(); /* 80C6AC9C */ void init_modeBreak(); /* 80C6AD40 */ void modeBreak(); - /* 80C6AEB0 */ void Draw(); - /* 80C6AF54 */ void Delete(); - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; + /* 80C6A784 */ virtual int CreateHeap(); + /* 80C6AAAC */ virtual int Execute(Mtx**); + /* 80C6AEB0 */ virtual int Draw(); + /* 80C6AF54 */ virtual int Delete(); + + int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); } + + static const dCcD_SrcGObjInf mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; private: - /* 0x568 */ u8 field_0x568[0x734 - 0x568]; + /* 0x5A0 */ dCcD_Stts mCcStts; + /* 0x5DC */ dCcD_Cyl mCcCyl; + /* 0x718 */ request_of_phase_process_class mPhase; + /* 0x720 */ J3DModel* mpModel; + /* 0x724 */ u8 mMode; + /* 0x725 */ u8 field_0x725; + /* 0x726 */ u8 mSwBit1; + /* 0x727 */ u8 field_0x727[0x734 - 0x727]; }; STATIC_ASSERT(sizeof(daFlorBoad_c) == 0x734); -class daFlorBoad_HIO_c { +class daFlorBoad_HIO_c : public fOpAcm_HIO_entry_c { public: /* 80C6A60C */ daFlorBoad_HIO_c(); - /* 80C6B058 */ ~daFlorBoad_HIO_c(); + /* 80C6B058 */ virtual ~daFlorBoad_HIO_c() {} + + /* 0x04 */ cXyz field_0x4; + /* 0x10 */ u8 field_0x10; + /* 0x11 */ u8 field_0x11; }; diff --git a/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h b/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h index 1c42a39300..a65a3bfa1b 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h +++ b/include/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h @@ -2,6 +2,8 @@ #define D_A_OBJ_LV5ICEWALL_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" /** * @ingroup actors-objects @@ -11,33 +13,61 @@ * @details * */ -class daIceWall_c : public fopAc_ac_c { +class daIceWall_c : public dBgS_MoveBgActor { public: + enum daIceWall_MODE { + MODE_WAIT, + MODE_BREAK, + }; + /* 80C6B51C */ void setBaseMtx(); - /* 80C6B5E4 */ void CreateHeap(); - /* 80C6B69C */ void create(); - /* 80C6BB60 */ void Execute(f32 (**)[3][4]); + /* 80C6B69C */ int create(); /* 80C6BBC4 */ void procMain(); /* 80C6BC50 */ void init_modeWait(); /* 80C6BC6C */ void modeWait(); /* 80C6C170 */ void init_modeBreak(); /* 80C6C1C0 */ void modeBreak(); - /* 80C6C374 */ void Draw(); - /* 80C6C44C */ void Delete(); - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; + /* 80C6B5E4 */ virtual int CreateHeap(); + /* 80C6BB60 */ virtual int Execute(Mtx**); + /* 80C6C374 */ virtual int Draw(); + /* 80C6C44C */ virtual int Delete(); + + int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); } + + int getScaleX() { return fopAcM_GetParamBit(this, 0x10, 5); } + int getScaleY() { return fopAcM_GetParamBit(this, 0x15, 5); } + int getScaleZ() { return fopAcM_GetParamBit(this, 0x1A, 5); } + + static const dCcD_SrcGObjInf mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; private: - /* 0x568 */ u8 field_0x568[0x884 - 0x568]; + /* 0x5A0 */ dCcD_Stts mCcStts; + /* 0x5DC */ dCcD_Cyl mCcCyl[2]; + /* 0x854 */ request_of_phase_process_class mPhase; + /* 0x85C */ J3DModel* mpModel[2]; + /* 0x864 */ u8 mMode; + /* 0x865 */ u8 mIsBreaking; + /* 0x866 */ u8 mHitcount; + /* 0x867 */ u8 mIsBreakSwBit; + /* 0x868 */ u8 mIsBreakingSwBit; + /* 0x86C */ cXyz mScale; + /* 0x878 */ u32 mEmitter0ID; + /* 0x87C */ u32 mEmitter1ID; + /* 0x880 */ u32 mEmitter2ID; }; STATIC_ASSERT(sizeof(daIceWall_c) == 0x884); -class daIceWall_HIO_c { +class daIceWall_HIO_c : public fOpAcm_HIO_entry_c { public: /* 80C6B42C */ daIceWall_HIO_c(); - /* 80C6C550 */ ~daIceWall_HIO_c(); + /* 80C6C550 */ virtual ~daIceWall_HIO_c() {} + + /* 0x04 */ cXyz xyz; + /* 0x10 */ u8 hitcount; + /* 0x11 */ u8 hitcount2; }; diff --git a/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h b/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h index 2281d447bb..489b33c9de 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h +++ b/include/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h @@ -2,6 +2,8 @@ #define D_A_OBJ_LV5SWICE_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" /** * @ingroup actors-objects @@ -11,33 +13,51 @@ * @details * */ -class daLv5SwIce_c : public fopAc_ac_c { +class daLv5SwIce_c : public dBgS_MoveBgActor { public: + enum daLv5SwIce_MODE { + MODE_WAIT, + MODE_BREAK, + }; + /* 80C6CA20 */ void setBaseMtx(); - /* 80C6CAA8 */ void CreateHeap(); - /* 80C6CB14 */ void create(); - /* 80C6CDD0 */ void Execute(f32 (**)[3][4]); + /* 80C6CB14 */ int create(); /* 80C6CE28 */ void procMain(); /* 80C6CEB4 */ void init_modeWait(); /* 80C6CED0 */ void modeWait(); /* 80C6D0F4 */ void init_modeBreak(); /* 80C6D144 */ void modeBreak(); - /* 80C6D260 */ void Draw(); - /* 80C6D314 */ void Delete(); - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; + /* 80C6CAA8 */ virtual int CreateHeap(); + /* 80C6CDD0 */ virtual int Execute(Mtx**); + /* 80C6D260 */ virtual int Draw(); + /* 80C6D314 */ virtual int Delete(); + + int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); } + + static const dCcD_SrcGObjInf mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; private: - /* 0x568 */ u8 field_0x568[0x738 - 0x568]; + /* 0x5A0 */ dCcD_Stts mCcStts; + /* 0x5DC */ dCcD_Cyl mCcCyl; + /* 0x718 */ request_of_phase_process_class mPhase; + /* 0x720 */ J3DModel* mpModel; + /* 0x724 */ u8 mMode; + /* 0x725 */ u8 mHitcount; + /* 0x726 */ u8 mSwBit1; + /* 0x728 */ u32 mEmitter0ID[2]; + /* 0x730 */ u32 mEmitter1ID[2]; }; STATIC_ASSERT(sizeof(daLv5SwIce_c) == 0x738); -class daLv5SwIce_HIO_c { +class daLv5SwIce_HIO_c : public fOpAcm_HIO_entry_c { public: /* 80C6C94C */ daLv5SwIce_HIO_c(); - /* 80C6D418 */ ~daLv5SwIce_HIO_c(); + /* 80C6D418 */ virtual ~daLv5SwIce_HIO_c() {} + + /* 0x4 */ u8 hitcount; }; diff --git a/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h b/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h index 41689cd14c..2041e6dda6 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h +++ b/include/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h @@ -2,29 +2,44 @@ #define D_A_OBJ_LV5YCHNDLR_H #include "f_op/f_op_actor_mng.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/cc/d_cc_d.h" /** * @ingroup actors-objects * @class daObjYchndlr_c - * @brief Snowpeak Ruins Chandelier (Swinging Platform?) + * @brief Snowpeak Ruins Chandelier (Swinging Platform) * * @details * */ -class daObjYchndlr_c : public fopAc_ac_c { +class daObjYchndlr_c : public dBgS_MoveBgActor, public request_of_phase_process_class { public: - /* 80C6D758 */ void create1st(); + /* 80C6D758 */ int create1st(); /* 80C6D7E0 */ void setMtx(); /* 80C6D9A8 */ void rideActor(fopAc_ac_c*); - /* 80C6DA5C */ void CreateHeap(); - /* 80C6DB5C */ void Create(); - /* 80C6DC64 */ void Execute(f32 (**)[3][4]); - /* 80C6E300 */ void Draw(); - /* 80C6E3C8 */ void Delete(); - /* 80C6E808 */ ~daObjYchndlr_c(); + + /* 80C6DA5C */ virtual int CreateHeap(); + /* 80C6DB5C */ virtual int Create(); + /* 80C6DC64 */ virtual int Execute(f32 (**)[3][4]); + /* 80C6E300 */ virtual int Draw(); + /* 80C6E3C8 */ virtual int Delete(); + /* 80C6E808 */ virtual ~daObjYchndlr_c() {} private: - /* 0x568 */ u8 field_0x568[0xca0 - 0x568]; + /* 0x5A8 */ Mtx field_0x5a8; + /* 0x5D8 */ Mtx field_0x5d8; + /* 0x608 */ J3DModel* mpChandlierModel; + /* 0x60C */ J3DModel* mpShaftModels[4]; + /* 0x61C */ s16 mShaftRotZ; + /* 0x61E */ s16 field_0x61e; + /* 0x620 */ u8 field_0x620; + /* 0x624 */ dCcD_Stts mCcStts; + /* 0x660 */ dCcD_Cyl mShaftCcCyl[4]; + /* 0xB50 */ dCcD_Cyl mCcCyl; + /* 0xC8C */ u8 field_0xc8c; + /* 0xC90 */ f32 field_0xc90; + /* 0xC94 */ cXyz mChandelierCenter; }; STATIC_ASSERT(sizeof(daObjYchndlr_c) == 0xca0); diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp index 2855d0111a..872024882c 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp @@ -1,118 +1,21 @@ /** * @file d_a_obj_lv5FloorBoard.cpp - * -*/ + * Snowpeak Ruins Destructable Floor + */ #include "rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__16daFlorBoad_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daFlorBoad_cFv(); -extern "C" void CreateHeap__12daFlorBoad_cFv(); -extern "C" void create__12daFlorBoad_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void Execute__12daFlorBoad_cFPPA3_A4_f(); -extern "C" void procMain__12daFlorBoad_cFv(); -extern "C" void init_modeWait__12daFlorBoad_cFv(); -extern "C" void modeWait__12daFlorBoad_cFv(); -extern "C" void init_modeBreak__12daFlorBoad_cFv(); -extern "C" void modeBreak__12daFlorBoad_cFv(); -extern "C" void Draw__12daFlorBoad_cFv(); -extern "C" void Delete__12daFlorBoad_cFv(); -extern "C" static void daFlorBoad_Draw__FP12daFlorBoad_c(); -extern "C" static void daFlorBoad_Execute__FP12daFlorBoad_c(); -extern "C" static void daFlorBoad_Delete__FP12daFlorBoad_c(); -extern "C" static void daFlorBoad_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__16daFlorBoad_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv5FloorBoard_cpp(); -extern "C" u8 const mCcDObjInfo__12daFlorBoad_c[48]; -extern "C" extern char const* const d_a_obj_lv5FloorBoard__stringBase0; -extern "C" u8 mCcDCyl__12daFlorBoad_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_delete__FP10fopAc_ac_c(); -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 isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -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 Move__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 GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C6B148-80C6B14C 000000 0004+00 4/5 0/0 0/0 .rodata @3656 */ -SECTION_RODATA static f32 const lit_3656 = 1.0f; -COMPILER_STRIP_GATE(0x80C6B148, &lit_3656); +#include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" /* 80C6B198-80C6B1A4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80C6B1A4-80C6B1B8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -122,440 +25,222 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop +/* 80C6A60C-80C6A658 0000EC 004C+00 1/1 0/0 0/0 .text __ct__16daFlorBoad_HIO_cFv */ +daFlorBoad_HIO_c::daFlorBoad_HIO_c() { + field_0x10 = 3; + field_0x11 = 2; + + field_0x4.x = 1.0f; + field_0x4.y = 1.0f; + field_0x4.z = 1.0f; +} + +/* 80C6A6FC-80C6A784 0001DC 0088+00 2/2 0/0 0/0 .text setBaseMtx__12daFlorBoad_cFv */ +void daFlorBoad_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + + mpModel->setBaseScale(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); +} + +/* 80C6A784-80C6A7F0 000264 006C+00 1/0 0/0 0/0 .text CreateHeap__12daFlorBoad_cFv */ +int daFlorBoad_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5haYuka", 4); + JUT_ASSERT(modelData != 0); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + return 1; +} + +/* 80C6A7F0-80C6A9C0 0002D0 01D0+00 1/1 0/0 0/0 .text create__12daFlorBoad_cFv */ +int daFlorBoad_c::create() { + fopAcM_SetupActor(this, daFlorBoad_c); + + mSwBit1 = getSwBit1(); + if (mSwBit1 != 0xFF && fopAcM_isSwitch(this, mSwBit1)) { + return cPhs_ERROR_e; + } + + int phase = dComIfG_resLoad(&mPhase, "L5haYuka"); + if (phase == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L5haYuka", 7, dBgS_MoveBGProc_TypicalRotY, 0x1900, NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + mCcStts.Init(0xFF, 0xFF, this); + mCcCyl.Set(mCcDCyl); + mCcCyl.SetStts(&mCcStts); + + init_modeWait(); + setBaseMtx(); + } + + return phase; +} + +/* 80C6AAAC-80C6AB04 00058C 0058+00 1/0 0/0 0/0 .text Execute__12daFlorBoad_cFPPA3_A4_f + */ +int daFlorBoad_c::Execute(Mtx** param_0) { + procMain(); + *param_0 = &mpModel->getBaseTRMtx(); + setBaseMtx(); + mCcStts.Move(); + return 1; +} + +/* 80C6B30C-80C6B320 000014 0014+00 2/2 0/0 0/0 .bss l_HIO */ +static daFlorBoad_HIO_c l_HIO; + +/* 80C6B14C-80C6B17C 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__12daFlorBoad_c */ +const dCcD_SrcGObjInf daFlorBoad_c::mCcDObjInfo = { + {0, {{0, 1, 0}, {0x400020, 0x11}, {0}}}, + {dCcD_SE_SWORD, 0, 0, 2, 1}, + {dCcD_SE_STONE, 0, 0, 0, 6}, + {0}, +}; + /* 80C6B1B8-80C6B1FC 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daFlorBoad_c */ -SECTION_DATA u8 daFlorBoad_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 daFlorBoad_c::mCcDCyl = { + daFlorBoad_c::mCcDObjInfo, + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl }; -/* 80C6B1FC-80C6B208 -00001 000C+00 0/1 0/0 0/0 .data @3839 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3839[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__12daFlorBoad_cFv, -}; -#pragma pop +/* 80C6AB04-80C6AB90 0005E4 008C+00 1/1 0/0 0/0 .text procMain__12daFlorBoad_cFv */ +void daFlorBoad_c::procMain() { + typedef void (daFlorBoad_c::*procFunc)(); + static procFunc mode_proc[] = { + &daFlorBoad_c::modeWait, + &daFlorBoad_c::modeBreak, + }; -/* 80C6B208-80C6B214 -00001 000C+00 0/1 0/0 0/0 .data @3840 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3840[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__12daFlorBoad_cFv, -}; -#pragma pop + (this->*mode_proc[mMode])(); +} -/* 80C6B214-80C6B22C 00007C 0018+00 0/1 0/0 0/0 .data mode_proc$3838 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop +/* 80C6AB90-80C6ABAC 000670 001C+00 1/1 0/0 0/0 .text init_modeWait__12daFlorBoad_cFv */ +void daFlorBoad_c::init_modeWait() { + field_0x725 = l_HIO.field_0x10; + mMode = MODE_WAIT; +} + +/* 80C6ABAC-80C6AC9C 00068C 00F0+00 1/0 0/0 0/0 .text modeWait__12daFlorBoad_cFv */ +void daFlorBoad_c::modeWait() { + if (mCcCyl.ChkTgHit()) { + dCcD_GObjInf* hit_obj = mCcCyl.GetTgHitGObj(); + + if (hit_obj->GetAtType() & AT_TYPE_IRON_BALL && + (hit_obj->GetAtAtp() == 100 || hit_obj->GetAtAtp() == 3)) + { + init_modeBreak(); + } + + if (hit_obj->GetAtType() & AT_TYPE_BOMB) { + init_modeBreak(); + } + } + + mCcCyl.SetR(oREG_F(0) + 280.0f); + mCcCyl.SetH(oREG_F(1) + 170.0f); + + cXyz center(current.pos); + center.y -= 150.0f; + mCcCyl.SetC(center); + + dComIfG_Ccsp()->Set(&mCcCyl); +} + +/* 80C6AC9C-80C6AD40 00077C 00A4+00 1/1 0/0 0/0 .text init_modeBreak__12daFlorBoad_cFv */ +void daFlorBoad_c::init_modeBreak() { + if (mSwBit1 != 0xFF) { + fopAcM_onSwitch(this, mSwBit1); + } + + mDoAud_seStart(Z2SE_OBJ_BREAK_FLOOR, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mMode = MODE_BREAK; +} + +/* 80C6AD40-80C6AEB0 000820 0170+00 1/0 0/0 0/0 .text modeBreak__12daFlorBoad_cFv */ +void daFlorBoad_c::modeBreak() { + dComIfGp_particle_set(0x8C01, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x8C02, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x8C03, ¤t.pos, NULL, NULL); + dComIfGp_particle_set(0x8C04, ¤t.pos, NULL, NULL); + fopAcM_delete(this); +} + +/* 80C6AEB0-80C6AF54 000990 00A4+00 1/0 0/0 0/0 .text Draw__12daFlorBoad_cFv */ +int daFlorBoad_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; +} + +/* 80C6AF54-80C6AF84 000A34 0030+00 1/0 0/0 0/0 .text Delete__12daFlorBoad_cFv */ +int daFlorBoad_c::Delete() { + dComIfG_resDelete(&mPhase, "L5haYuka"); + return 1; +} + +/* 80C6AF84-80C6AFB0 000A64 002C+00 1/0 0/0 0/0 .text daFlorBoad_Draw__FP12daFlorBoad_c + */ +static int daFlorBoad_Draw(daFlorBoad_c* i_this) { + return i_this->MoveBGDraw(); +} + +/* 80C6AFB0-80C6AFD0 000A90 0020+00 1/0 0/0 0/0 .text daFlorBoad_Execute__FP12daFlorBoad_c */ +static int daFlorBoad_Execute(daFlorBoad_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C6AFD0-80C6AFF0 000AB0 0020+00 1/0 0/0 0/0 .text daFlorBoad_Delete__FP12daFlorBoad_c + */ +static int daFlorBoad_Delete(daFlorBoad_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C6AFF0-80C6B010 000AD0 0020+00 1/0 0/0 0/0 .text daFlorBoad_Create__FP10fopAc_ac_c + */ +static int daFlorBoad_Create(fopAc_ac_c* i_this) { + return ((daFlorBoad_c*)i_this)->create(); +} /* 80C6B22C-80C6B24C -00001 0020+00 1/0 0/0 0/0 .data l_daFlorBoad_Method */ static actor_method_class l_daFlorBoad_Method = { - (process_method_func)daFlorBoad_Create__FP10fopAc_ac_c, - (process_method_func)daFlorBoad_Delete__FP12daFlorBoad_c, - (process_method_func)daFlorBoad_Execute__FP12daFlorBoad_c, - 0, - (process_method_func)daFlorBoad_Draw__FP12daFlorBoad_c, + (process_method_func)daFlorBoad_Create, (process_method_func)daFlorBoad_Delete, + (process_method_func)daFlorBoad_Execute, (process_method_func)NULL, + (process_method_func)daFlorBoad_Draw, }; /* 80C6B24C-80C6B27C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv5FBoard */ extern actor_process_profile_definition g_profile_Obj_Lv5FBoard = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5FBoard, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daFlorBoad_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 538, // mPriority - &l_daFlorBoad_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv5FBoard, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daFlorBoad_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 538, // mPriority + &l_daFlorBoad_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C6B27C-80C6B288 0000E4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80C6B288-80C6B294 0000F0 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80C6B294-80C6B2A0 0000FC 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, -}; - -/* 80C6B2A0-80C6B2AC 000108 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, -}; - -/* 80C6B2AC-80C6B2D4 000114 0028+00 1/1 0/0 0/0 .data __vt__12daFlorBoad_c */ -SECTION_DATA extern void* __vt__12daFlorBoad_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daFlorBoad_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__12daFlorBoad_cFPPA3_A4_f, - (void*)Draw__12daFlorBoad_cFv, - (void*)Delete__12daFlorBoad_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C6B2D4-80C6B2E0 00013C 000C+00 2/2 0/0 0/0 .data __vt__16daFlorBoad_HIO_c */ -SECTION_DATA extern void* __vt__16daFlorBoad_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daFlorBoad_HIO_cFv, -}; - -/* 80C6B2E0-80C6B2EC 000148 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, -}; - -/* 80C6B2EC-80C6B2F8 000154 000C+00 4/4 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, -}; - -/* 80C6A60C-80C6A658 0000EC 004C+00 1/1 0/0 0/0 .text __ct__16daFlorBoad_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daFlorBoad_HIO_c::daFlorBoad_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__ct__16daFlorBoad_HIO_cFv.s" -} -#pragma pop - -/* 80C6A658-80C6A6B4 000138 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { -extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__18fOpAcm_HIO_entry_cFv.s" -} -#pragma pop - -/* 80C6A6B4-80C6A6FC 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() { -extern "C" asm void __dt__14mDoHIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop - -/* 80C6A6FC-80C6A784 0001DC 0088+00 2/2 0/0 0/0 .text setBaseMtx__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/setBaseMtx__12daFlorBoad_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6B18C-80C6B18C 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C6B18C = "L5haYuka"; -#pragma pop - -/* 80C6A784-80C6A7F0 000264 006C+00 1/0 0/0 0/0 .text CreateHeap__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/CreateHeap__12daFlorBoad_cFv.s" -} -#pragma pop - -/* 80C6A7F0-80C6A9C0 0002D0 01D0+00 1/1 0/0 0/0 .text create__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/create__12daFlorBoad_cFv.s" -} -#pragma pop - -/* 80C6A9C0-80C6AA08 0004A0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C6AA08-80C6AA50 0004E8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80C6AA50-80C6AAAC 000530 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6AAAC-80C6AB04 00058C 0058+00 1/0 0/0 0/0 .text Execute__12daFlorBoad_cFPPA3_A4_f - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Execute__12daFlorBoad_cFPPA3_A4_f.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6B300-80C6B30C 000008 000C+00 1/1 0/0 0/0 .bss @3647 */ -static u8 lit_3647[12]; - -/* 80C6B30C-80C6B320 000014 0014+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[20]; - -/* 80C6B320-80C6B324 000028 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C6B320[4]; - -/* 80C6AB04-80C6AB90 0005E4 008C+00 1/1 0/0 0/0 .text procMain__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::procMain() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/procMain__12daFlorBoad_cFv.s" -} -#pragma pop - -/* 80C6AB90-80C6ABAC 000670 001C+00 1/1 0/0 0/0 .text init_modeWait__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeWait__12daFlorBoad_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6B14C-80C6B17C 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__12daFlorBoad_c */ -SECTION_RODATA u8 const daFlorBoad_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x20, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C6B14C, &daFlorBoad_c::mCcDObjInfo); - -/* 80C6B17C-80C6B180 000034 0004+00 0/1 0/0 0/0 .rodata @3870 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3870 = 280.0f; -COMPILER_STRIP_GATE(0x80C6B17C, &lit_3870); -#pragma pop - -/* 80C6B180-80C6B184 000038 0004+00 0/1 0/0 0/0 .rodata @3871 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3871 = 170.0f; -COMPILER_STRIP_GATE(0x80C6B180, &lit_3871); -#pragma pop - -/* 80C6B184-80C6B188 00003C 0004+00 0/1 0/0 0/0 .rodata @3872 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3872 = 150.0f; -COMPILER_STRIP_GATE(0x80C6B184, &lit_3872); -#pragma pop - -/* 80C6ABAC-80C6AC9C 00068C 00F0+00 1/0 0/0 0/0 .text modeWait__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeWait__12daFlorBoad_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6B188-80C6B18C 000040 0004+00 1/1 0/0 0/0 .rodata @3891 */ -SECTION_RODATA static f32 const lit_3891 = -1.0f; -COMPILER_STRIP_GATE(0x80C6B188, &lit_3891); - -/* 80C6AC9C-80C6AD40 00077C 00A4+00 1/1 0/0 0/0 .text init_modeBreak__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::init_modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/init_modeBreak__12daFlorBoad_cFv.s" -} -#pragma pop - -/* 80C6AD40-80C6AEB0 000820 0170+00 1/0 0/0 0/0 .text modeBreak__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/modeBreak__12daFlorBoad_cFv.s" -} -#pragma pop - -/* 80C6AEB0-80C6AF54 000990 00A4+00 1/0 0/0 0/0 .text Draw__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Draw__12daFlorBoad_cFv.s" -} -#pragma pop - -/* 80C6AF54-80C6AF84 000A34 0030+00 1/0 0/0 0/0 .text Delete__12daFlorBoad_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daFlorBoad_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/Delete__12daFlorBoad_cFv.s" -} -#pragma pop - -/* 80C6AF84-80C6AFB0 000A64 002C+00 1/0 0/0 0/0 .text daFlorBoad_Draw__FP12daFlorBoad_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daFlorBoad_Draw(daFlorBoad_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Draw__FP12daFlorBoad_c.s" -} -#pragma pop - -/* 80C6AFB0-80C6AFD0 000A90 0020+00 1/0 0/0 0/0 .text daFlorBoad_Execute__FP12daFlorBoad_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daFlorBoad_Execute(daFlorBoad_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Execute__FP12daFlorBoad_c.s" -} -#pragma pop - -/* 80C6AFD0-80C6AFF0 000AB0 0020+00 1/0 0/0 0/0 .text daFlorBoad_Delete__FP12daFlorBoad_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daFlorBoad_Delete(daFlorBoad_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Delete__FP12daFlorBoad_c.s" -} -#pragma pop - -/* 80C6AFF0-80C6B010 000AD0 0020+00 1/0 0/0 0/0 .text daFlorBoad_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daFlorBoad_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/daFlorBoad_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80C6B010-80C6B058 000AF0 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6B058-80C6B0C4 000B38 006C+00 2/1 0/0 0/0 .text __dt__16daFlorBoad_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daFlorBoad_HIO_c::~daFlorBoad_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__dt__16daFlorBoad_HIO_cFv.s" -} -#pragma pop - -/* 80C6B0C4-80C6B134 000BA4 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv5FloorBoard_cpp - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lv5FloorBoard_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard/__sinit_d_a_obj_lv5FloorBoard_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C6B0C4, __sinit_d_a_obj_lv5FloorBoard_cpp); -#pragma pop - -/* 80C6B18C-80C6B18C 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp index e7fdce89a2..36ee7fedaf 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp @@ -1,130 +1,21 @@ /** * @file d_a_obj_lv5IceWall.cpp - * -*/ + * Snowpeak Ruins Ice Wall + */ #include "rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__15daIceWall_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__11daIceWall_cFv(); -extern "C" void CreateHeap__11daIceWall_cFv(); -extern "C" void create__11daIceWall_cFv(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void Execute__11daIceWall_cFPPA3_A4_f(); -extern "C" void procMain__11daIceWall_cFv(); -extern "C" void init_modeWait__11daIceWall_cFv(); -extern "C" void modeWait__11daIceWall_cFv(); -extern "C" void init_modeBreak__11daIceWall_cFv(); -extern "C" void modeBreak__11daIceWall_cFv(); -extern "C" void Draw__11daIceWall_cFv(); -extern "C" void Delete__11daIceWall_cFv(); -extern "C" static void daIceWall_Draw__FP11daIceWall_c(); -extern "C" static void daIceWall_Execute__FP11daIceWall_c(); -extern "C" static void daIceWall_Delete__FP11daIceWall_c(); -extern "C" static void daIceWall_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__15daIceWall_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv5IceWall_cpp(); -extern "C" u8 const mCcDObjInfo__11daIceWall_c[48]; -extern "C" extern char const* const d_a_obj_lv5IceWall__stringBase0; -extern "C" u8 mCcDCyl__11daIceWall_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -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 isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -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 Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C6C640-80C6C644 000000 0004+00 4/5 0/0 0/0 .rodata @3656 */ -SECTION_RODATA static f32 const lit_3656 = 1.0f; -COMPILER_STRIP_GATE(0x80C6C640, &lit_3656); +#include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" /* 80C6C6C8-80C6C6D4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80C6C6D4-80C6C6E8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -134,560 +25,327 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop +/* 80C6B42C-80C6B478 0000EC 004C+00 1/1 0/0 0/0 .text __ct__15daIceWall_HIO_cFv */ +daIceWall_HIO_c::daIceWall_HIO_c() { + hitcount = 3; + hitcount2 = 2; + + xyz.x = 1.0f; + xyz.y = 1.0f; + xyz.z = 1.0f; +} + +/* 80C6B51C-80C6B5E4 0001DC 00C8+00 2/2 0/0 0/0 .text setBaseMtx__11daIceWall_cFv */ +void daIceWall_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + + mpModel[mIsBreaking]->setBaseScale(cXyz(1.0f, 1.0f, 1.0f)); + mpModel[mIsBreaking]->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); +} + +/* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text CreateHeap__11daIceWall_cFv */ +int daIceWall_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 4); + JUT_ASSERT(modelData != 0); + + mpModel[0] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); + if (mpModel[0] == NULL) { + return 0; + } + + modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 5); + JUT_ASSERT(modelData != 0); + + mpModel[1] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); + if (mpModel[1] == NULL) { + return 0; + } + + return 1; +} + +/* 80C6C83C-80C6C850 000014 0014+00 3/3 0/0 0/0 .bss l_HIO */ +static daIceWall_HIO_c l_HIO; + +/* 80C6C644-80C6C674 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__11daIceWall_c */ +const dCcD_SrcGObjInf daIceWall_c::mCcDObjInfo = { + {0, {{0x100, 1, 0}, {0x400000, 0x11}, {0}}}, + {dCcD_SE_SWORD, 0, 0, 2, 1}, + {dCcD_SE_STONE, 0, 0, 0, 0x2006}, + {0}, +}; + /* 80C6C6E8-80C6C72C 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daIceWall_c */ -SECTION_DATA u8 daIceWall_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 daIceWall_c::mCcDCyl = { + daIceWall_c::mCcDObjInfo, + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl }; -/* 80C6C72C-80C6C738 -00001 000C+00 0/1 0/0 0/0 .data @3891 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3891[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__11daIceWall_cFv, -}; -#pragma pop +/* 80C6C674-80C6C67C 000034 0008+00 0/0 0/0 0/0 .rodata l_bmdIdx */ +static const int l_bmdIdx[] = {4, 5}; -/* 80C6C738-80C6C744 -00001 000C+00 0/1 0/0 0/0 .data @3892 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3892[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__11daIceWall_cFv, -}; -#pragma pop +/* 80C6B69C-80C6B924 00035C 0288+00 1/1 0/0 0/0 .text create__11daIceWall_cFv */ +int daIceWall_c::create() { + fopAcM_SetupActor(this, daIceWall_c); -/* 80C6C744-80C6C75C 00007C 0018+00 0/1 0/0 0/0 .data mode_proc$3890 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop + mIsBreakSwBit = getSwBit1(); + mIsBreakingSwBit = getSwBit1(); + if (mIsBreakSwBit != 0xFF) { + if (fopAcM_isSwitch(this, mIsBreakSwBit)) { + return cPhs_ERROR_e; + } + + mIsBreaking = false; + if (mIsBreakingSwBit != 0xFF) { + mIsBreaking = fopAcM_isSwitch(this, mIsBreakingSwBit); + } + } else { + mIsBreaking = false; + } + + int phase = dComIfG_resLoad(&mPhase, "l5IceWall"); + if (phase == cPhs_COMPLEATE_e) { + if (MoveBGCreate("l5IceWall", 8, dBgS_MoveBGProc_TypicalRotY, 0x2100, NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } + + mScale.x = getScaleX() * 0.1f; + mScale.y = getScaleY() * 0.1f; + mScale.z = getScaleZ() * 0.1f; + + fopAcM_SetMtx(this, mpModel[mIsBreaking]->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel[mIsBreaking]->getModelData()); + mCcStts.Init(0xFF, 0xFF, this); + + for (int i = 0; i < 2; i++) { + mCcCyl[i].Set(mCcDCyl); + mCcCyl[i].SetStts(&mCcStts); + } + + init_modeWait(); + setBaseMtx(); + } + + return phase; +} + +/* 80C6BB60-80C6BBC4 000820 0064+00 1/0 0/0 0/0 .text Execute__11daIceWall_cFPPA3_A4_f */ +int daIceWall_c::Execute(Mtx** param_0) { + procMain(); + *param_0 = &mpModel[mIsBreaking]->getBaseTRMtx(); + setBaseMtx(); + mCcStts.Move(); + return 1; +} + +/* 80C6BBC4-80C6BC50 000884 008C+00 1/1 0/0 0/0 .text procMain__11daIceWall_cFv */ +void daIceWall_c::procMain() { + typedef void (daIceWall_c::*procFunc)(); + static procFunc mode_proc[] = { + &daIceWall_c::modeWait, + &daIceWall_c::modeBreak, + }; + + (this->*mode_proc[mMode])(); +} + +/* 80C6BC50-80C6BC6C 000910 001C+00 1/1 0/0 0/0 .text init_modeWait__11daIceWall_cFv */ +void daIceWall_c::init_modeWait() { + mHitcount = l_HIO.hitcount; + mMode = MODE_WAIT; +} + +/* 80C6BC6C-80C6C170 00092C 0504+00 1/0 0/0 0/0 .text modeWait__11daIceWall_cFv */ +void daIceWall_c::modeWait() { + for (int i = 0; i < 2; i++) { + if (mCcCyl[i].ChkTgHit()) { + dCcD_GObjInf* hit_obj = mCcCyl[i].GetTgHitGObj(); + + if (hit_obj->GetAtType() & AT_TYPE_IRON_BALL) { + if (hit_obj->GetAtAtp() == 100 || hit_obj->GetAtAtp() == 3) { + init_modeBreak(); + } else if (hit_obj->GetAtAtp() == 2) { + cXyz ptcl_scale(1.0f, 1.0f, 1.0f); + mEmitter2ID = + dComIfGp_particle_set(mEmitter2ID, 0x8678, ¤t.pos, &shape_angle, + &ptcl_scale, 0xFF, 0, -1, NULL, NULL, NULL); + + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mEmitter1ID); + if (emitter != NULL) { + cXyz scale; + scale.x = mScale.x * 0.65f; + scale.y = mScale.z; + scale.z = mScale.y * 2.5f; + + emitter->setLocalScale(scale); + } + + mDoAud_seStart(Z2SE_OBJ_ICE_KEZURU, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + mHitcount--; + if (mHitcount == 0) { + mIsBreaking++; + if (mIsBreaking == 1) { + if (mIsBreakingSwBit != 0xFF) { + fopAcM_onSwitch(this, mIsBreakingSwBit); + } + + fopAcM_SetMtx(this, mpModel[mIsBreaking]->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel[mIsBreaking]->getModelData()); + mHitcount = l_HIO.hitcount2; + } + + if (mIsBreaking > 1) { + mIsBreaking = 1; + init_modeBreak(); + } + } + } + } + break; + } + } + + for (int i = 0; i < 2; i++) { + cXyz pos_offset(0.0f, 0.0f, 0.0f); + pos_offset.z = (f32)i * (oREG_F(2) + 130.0f) - (oREG_F(3) + 60.0f); + + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&pos_offset, &pos_offset); + + cXyz center(current.pos); + center += pos_offset; + + mCcCyl[i].SetR(mScale.z * (oREG_F(0) + 140.0f)); + mCcCyl[i].SetH(mScale.y * (oREG_F(1) + 510.0f)); + mCcCyl[i].SetC(center); + + dComIfG_Ccsp()->Set(&mCcCyl[i]); + } + + cXyz ptcl_scale(1.0f, 1.0f, 1.0f); + mEmitter0ID = dComIfGp_particle_set(mEmitter0ID, 0x867C, ¤t.pos, &shape_angle, + &ptcl_scale, 0xFF, 0, -1, NULL, NULL, NULL); + + static const u16 l_eff_b[] = {0x8676, 0x8677}; + mEmitter1ID = dComIfGp_particle_set(mEmitter1ID, l_eff_b[mIsBreaking], ¤t.pos, + &shape_angle, &ptcl_scale, 0xFF, 0, -1, NULL, NULL, NULL); + + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mEmitter1ID); + if (emitter != NULL) { + cXyz scale; + scale.x = mScale.x * 0.85f; + scale.y = mScale.z * 0.9f; + scale.z = mScale.y * 2.0f; + + emitter->setLocalScale(scale); + } +} + +/* 80C6C170-80C6C1C0 000E30 0050+00 1/1 0/0 0/0 .text init_modeBreak__11daIceWall_cFv */ +void daIceWall_c::init_modeBreak() { + if (mIsBreakSwBit != 0xFF) { + fopAcM_onSwitch(this, mIsBreakSwBit); + } + + mMode = MODE_BREAK; +} + +/* 80C6C1C0-80C6C374 000E80 01B4+00 1/0 0/0 0/0 .text modeBreak__11daIceWall_cFv */ +void daIceWall_c::modeBreak() { + cXyz ptcl_scale(1.0f, 1.0f, 1.0f); + mEmitter0ID = dComIfGp_particle_set(mEmitter0ID, 0x867B, ¤t.pos, &shape_angle, + &ptcl_scale, 0xFF, 0, -1, NULL, NULL, NULL); + + static const u16 l_eff_break_b[] = {0x8679, 0x867A}; + mEmitter1ID = dComIfGp_particle_set(mEmitter1ID, l_eff_break_b[mIsBreaking], ¤t.pos, + &shape_angle, &ptcl_scale, 0xFF, 0, -1, NULL, NULL, NULL); + + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mEmitter1ID); + if (emitter != NULL) { + cXyz scale; + scale.x = mScale.x * 0.65f; + scale.y = mScale.z; + scale.z = mScale.y * 2.5f; + + emitter->setLocalScale(scale); + } + + mDoAud_seStart(Z2SE_OBJ_ICE_BREAK, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + fopAcM_delete(this); +} + +/* 80C6C374-80C6C44C 001034 00D8+00 1/0 0/0 0/0 .text Draw__11daIceWall_cFv */ +int daIceWall_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[mIsBreaking], &tevStr); + + fopAcM_setEffectMtx(this, mpModel[mIsBreaking]->getModelData()); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel[mIsBreaking]); + dComIfGd_setList(); + return 1; +} + +/* 80C6C44C-80C6C47C 00110C 0030+00 1/0 0/0 0/0 .text Delete__11daIceWall_cFv */ +int daIceWall_c::Delete() { + dComIfG_resDelete(&mPhase, "l5IceWall"); + return 1; +} + +/* 80C6C47C-80C6C4A8 00113C 002C+00 1/0 0/0 0/0 .text daIceWall_Draw__FP11daIceWall_c */ +static int daIceWall_Draw(daIceWall_c* i_this) { + return i_this->MoveBGDraw(); +} + +/* 80C6C4A8-80C6C4C8 001168 0020+00 1/0 0/0 0/0 .text daIceWall_Execute__FP11daIceWall_c + */ +static int daIceWall_Execute(daIceWall_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C6C4C8-80C6C4E8 001188 0020+00 1/0 0/0 0/0 .text daIceWall_Delete__FP11daIceWall_c + */ +static int daIceWall_Delete(daIceWall_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C6C4E8-80C6C508 0011A8 0020+00 1/0 0/0 0/0 .text daIceWall_Create__FP10fopAc_ac_c */ +static int daIceWall_Create(fopAc_ac_c* i_this) { + return ((daIceWall_c*)i_this)->create(); +} /* 80C6C75C-80C6C77C -00001 0020+00 1/0 0/0 0/0 .data l_daIceWall_Method */ static actor_method_class l_daIceWall_Method = { - (process_method_func)daIceWall_Create__FP10fopAc_ac_c, - (process_method_func)daIceWall_Delete__FP11daIceWall_c, - (process_method_func)daIceWall_Execute__FP11daIceWall_c, - 0, - (process_method_func)daIceWall_Draw__FP11daIceWall_c, + (process_method_func)daIceWall_Create, (process_method_func)daIceWall_Delete, + (process_method_func)daIceWall_Execute, (process_method_func)NULL, + (process_method_func)daIceWall_Draw, }; /* 80C6C77C-80C6C7AC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_IceWall */ extern actor_process_profile_definition g_profile_Obj_IceWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceWall, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daIceWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 536, // mPriority - &l_daIceWall_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_IceWall, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daIceWall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 536, // mPriority + &l_daIceWall_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C6C7AC-80C6C7B8 0000E4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80C6C7B8-80C6C7C4 0000F0 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80C6C7C4-80C6C7D0 0000FC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80C6C7D0-80C6C7DC 000108 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C6C7DC-80C6C804 000114 0028+00 1/1 0/0 0/0 .data __vt__11daIceWall_c */ -SECTION_DATA extern void* __vt__11daIceWall_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__11daIceWall_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__11daIceWall_cFPPA3_A4_f, - (void*)Draw__11daIceWall_cFv, - (void*)Delete__11daIceWall_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C6C804-80C6C810 00013C 000C+00 2/2 0/0 0/0 .data __vt__15daIceWall_HIO_c */ -SECTION_DATA extern void* __vt__15daIceWall_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daIceWall_HIO_cFv, -}; - -/* 80C6C810-80C6C81C 000148 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, -}; - -/* 80C6C81C-80C6C828 000154 000C+00 4/4 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, -}; - -/* 80C6B42C-80C6B478 0000EC 004C+00 1/1 0/0 0/0 .text __ct__15daIceWall_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daIceWall_HIO_c::daIceWall_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__15daIceWall_HIO_cFv.s" -} -#pragma pop - -/* 80C6B478-80C6B4D4 000138 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { -extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__18fOpAcm_HIO_entry_cFv.s" -} -#pragma pop - -/* 80C6B4D4-80C6B51C 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() { -extern "C" asm void __dt__14mDoHIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop - -/* 80C6B51C-80C6B5E4 0001DC 00C8+00 2/2 0/0 0/0 .text setBaseMtx__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/setBaseMtx__11daIceWall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6C6BC-80C6C6BC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C6C6BC = "l5IceWall"; -#pragma pop - -/* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text CreateHeap__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/CreateHeap__11daIceWall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6C644-80C6C674 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__11daIceWall_c */ -SECTION_RODATA u8 const daIceWall_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x06, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C6C644, &daIceWall_c::mCcDObjInfo); - -/* 80C6C674-80C6C67C 000034 0008+00 0/0 0/0 0/0 .rodata l_bmdIdx */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_bmdIdx[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, -}; -COMPILER_STRIP_GATE(0x80C6C674, &l_bmdIdx); -#pragma pop - -/* 80C6C67C-80C6C680 00003C 0004+00 1/1 0/0 0/0 .rodata @3795 */ -SECTION_RODATA static f32 const lit_3795 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C6C67C, &lit_3795); - -/* 80C6C680-80C6C688 000040 0008+00 1/2 0/0 0/0 .rodata @3797 */ -SECTION_RODATA static u8 const lit_3797[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C6C680, &lit_3797); - -/* 80C6B69C-80C6B924 00035C 0288+00 1/1 0/0 0/0 .text create__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/create__11daIceWall_cFv.s" -} -#pragma pop - -/* 80C6B924-80C6B9F0 0005E4 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::~dCcD_Cyl() { -extern "C" asm void __dt__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8dCcD_CylFv.s" -} -#pragma pop - -/* 80C6B9F0-80C6BA74 0006B0 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::dCcD_Cyl() { -extern "C" asm void __ct__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__ct__8dCcD_CylFv.s" -} -#pragma pop - -/* 80C6BA74-80C6BABC 000734 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C6BABC-80C6BB04 00077C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80C6BB04-80C6BB60 0007C4 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6BB60-80C6BBC4 000820 0064+00 1/0 0/0 0/0 .text Execute__11daIceWall_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Execute__11daIceWall_cFPPA3_A4_f.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6C830-80C6C83C 000008 000C+00 1/1 0/0 0/0 .bss @3647 */ -static u8 lit_3647[12]; - -/* 80C6C83C-80C6C850 000014 0014+00 3/3 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[20]; - -/* 80C6C850-80C6C854 000028 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C6C850[4]; - -/* 80C6BBC4-80C6BC50 000884 008C+00 1/1 0/0 0/0 .text procMain__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::procMain() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/procMain__11daIceWall_cFv.s" -} -#pragma pop - -/* 80C6BC50-80C6BC6C 000910 001C+00 1/1 0/0 0/0 .text init_modeWait__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeWait__11daIceWall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6C688-80C6C68C 000048 0004+00 0/1 0/0 0/0 .rodata l_eff_b$3933 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_b[4] = { - 0x86, - 0x76, - 0x86, - 0x77, -}; -COMPILER_STRIP_GATE(0x80C6C688, &l_eff_b); -#pragma pop - -/* 80C6C68C-80C6C690 00004C 0004+00 0/2 0/0 0/0 .rodata @4050 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4050 = 13.0f / 20.0f; -COMPILER_STRIP_GATE(0x80C6C68C, &lit_4050); -#pragma pop - -/* 80C6C690-80C6C694 000050 0004+00 0/2 0/0 0/0 .rodata @4051 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4051 = 2.5f; -COMPILER_STRIP_GATE(0x80C6C690, &lit_4051); -#pragma pop - -/* 80C6C694-80C6C698 000054 0004+00 0/2 0/0 0/0 .rodata @4052 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4052 = -1.0f; -COMPILER_STRIP_GATE(0x80C6C694, &lit_4052); -#pragma pop - -/* 80C6C698-80C6C69C 000058 0004+00 0/1 0/0 0/0 .rodata @4053 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4053[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C6C698, &lit_4053); -#pragma pop - -/* 80C6C69C-80C6C6A0 00005C 0004+00 0/1 0/0 0/0 .rodata @4054 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4054 = 130.0f; -COMPILER_STRIP_GATE(0x80C6C69C, &lit_4054); -#pragma pop - -/* 80C6C6A0-80C6C6A4 000060 0004+00 0/1 0/0 0/0 .rodata @4055 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4055 = 60.0f; -COMPILER_STRIP_GATE(0x80C6C6A0, &lit_4055); -#pragma pop - -/* 80C6C6A4-80C6C6A8 000064 0004+00 0/1 0/0 0/0 .rodata @4056 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4056 = 140.0f; -COMPILER_STRIP_GATE(0x80C6C6A4, &lit_4056); -#pragma pop - -/* 80C6C6A8-80C6C6AC 000068 0004+00 0/1 0/0 0/0 .rodata @4057 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4057 = 510.0f; -COMPILER_STRIP_GATE(0x80C6C6A8, &lit_4057); -#pragma pop - -/* 80C6C6AC-80C6C6B0 00006C 0004+00 0/1 0/0 0/0 .rodata @4058 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4058 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(0x80C6C6AC, &lit_4058); -#pragma pop - -/* 80C6C6B0-80C6C6B4 000070 0004+00 0/1 0/0 0/0 .rodata @4059 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4059 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C6C6B0, &lit_4059); -#pragma pop - -/* 80C6C6B4-80C6C6B8 000074 0004+00 0/1 0/0 0/0 .rodata @4060 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4060 = 2.0f; -COMPILER_STRIP_GATE(0x80C6C6B4, &lit_4060); -#pragma pop - -/* 80C6BC6C-80C6C170 00092C 0504+00 1/0 0/0 0/0 .text modeWait__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeWait__11daIceWall_cFv.s" -} -#pragma pop - -/* 80C6C170-80C6C1C0 000E30 0050+00 1/1 0/0 0/0 .text init_modeBreak__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::init_modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/init_modeBreak__11daIceWall_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6C6B8-80C6C6BC 000078 0004+00 0/1 0/0 0/0 .rodata l_eff_break_b$4077 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_break_b[4] = { - 0x86, - 0x79, - 0x86, - 0x7A, -}; -COMPILER_STRIP_GATE(0x80C6C6B8, &l_eff_break_b); -#pragma pop - -/* 80C6C1C0-80C6C374 000E80 01B4+00 1/0 0/0 0/0 .text modeBreak__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/modeBreak__11daIceWall_cFv.s" -} -#pragma pop - -/* 80C6C374-80C6C44C 001034 00D8+00 1/0 0/0 0/0 .text Draw__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Draw__11daIceWall_cFv.s" -} -#pragma pop - -/* 80C6C44C-80C6C47C 00110C 0030+00 1/0 0/0 0/0 .text Delete__11daIceWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daIceWall_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/Delete__11daIceWall_cFv.s" -} -#pragma pop - -/* 80C6C47C-80C6C4A8 00113C 002C+00 1/0 0/0 0/0 .text daIceWall_Draw__FP11daIceWall_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIceWall_Draw(daIceWall_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Draw__FP11daIceWall_c.s" -} -#pragma pop - -/* 80C6C4A8-80C6C4C8 001168 0020+00 1/0 0/0 0/0 .text daIceWall_Execute__FP11daIceWall_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIceWall_Execute(daIceWall_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Execute__FP11daIceWall_c.s" -} -#pragma pop - -/* 80C6C4C8-80C6C4E8 001188 0020+00 1/0 0/0 0/0 .text daIceWall_Delete__FP11daIceWall_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIceWall_Delete(daIceWall_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Delete__FP11daIceWall_c.s" -} -#pragma pop - -/* 80C6C4E8-80C6C508 0011A8 0020+00 1/0 0/0 0/0 .text daIceWall_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daIceWall_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/daIceWall_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80C6C508-80C6C550 0011C8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6C550-80C6C5BC 001210 006C+00 2/1 0/0 0/0 .text __dt__15daIceWall_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daIceWall_HIO_c::~daIceWall_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__dt__15daIceWall_HIO_cFv.s" -} -#pragma pop - -/* 80C6C5BC-80C6C62C 00127C 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv5IceWall_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lv5IceWall_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall/__sinit_d_a_obj_lv5IceWall_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C6C5BC, __sinit_d_a_obj_lv5IceWall_cpp); -#pragma pop - -/* 80C6C6BC-80C6C6BC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp index d035f8ca59..802f877308 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp @@ -1,115 +1,21 @@ /** * @file d_a_obj_lv5SwIce.cpp - * -*/ + * Snowpeak Ruins Ice Switch + */ #include "rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.h" -#include "dol2asm.h" +#include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" - - -// -// Forward References: -// - -extern "C" void __ct__16daLv5SwIce_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daLv5SwIce_cFv(); -extern "C" void CreateHeap__12daLv5SwIce_cFv(); -extern "C" void create__12daLv5SwIce_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void Execute__12daLv5SwIce_cFPPA3_A4_f(); -extern "C" void procMain__12daLv5SwIce_cFv(); -extern "C" void init_modeWait__12daLv5SwIce_cFv(); -extern "C" void modeWait__12daLv5SwIce_cFv(); -extern "C" void init_modeBreak__12daLv5SwIce_cFv(); -extern "C" void modeBreak__12daLv5SwIce_cFv(); -extern "C" void Draw__12daLv5SwIce_cFv(); -extern "C" void Delete__12daLv5SwIce_cFv(); -extern "C" static void daLv5SwIce_Draw__FP12daLv5SwIce_c(); -extern "C" static void daLv5SwIce_Execute__FP12daLv5SwIce_c(); -extern "C" static void daLv5SwIce_Delete__FP12daLv5SwIce_c(); -extern "C" static void daLv5SwIce_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__16daLv5SwIce_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv5SwIce_cpp(); -extern "C" u8 const mCcDObjInfo__12daLv5SwIce_c[48]; -extern "C" extern char const* const d_a_obj_lv5SwIce__stringBase0; -extern "C" u8 mCcDCyl__12daLv5SwIce_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_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -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 isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -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 Move__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 GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_24(); -extern "C" void _restgpr_24(); -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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80C6D560-80C6D56C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80C6D56C-80C6D580 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -119,480 +25,232 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop +/* 80C6C94C-80C6C97C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__16daLv5SwIce_HIO_cFv */ +daLv5SwIce_HIO_c::daLv5SwIce_HIO_c() { + hitcount = 3; +} + +/* 80C6CA20-80C6CAA8 0001C0 0088+00 2/2 0/0 0/0 .text setBaseMtx__12daLv5SwIce_cFv */ +void daLv5SwIce_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + + mpModel->setBaseScale(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); +} + +/* 80C6CAA8-80C6CB14 000248 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv5SwIce_cFv */ +int daLv5SwIce_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5SwIce", 4); + JUT_ASSERT(modelData != 0); + + mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + return 1; +} + +/* 80C6CB14-80C6CCE4 0002B4 01D0+00 1/1 0/0 0/0 .text create__12daLv5SwIce_cFv */ +int daLv5SwIce_c::create() { + fopAcM_SetupActor(this, daLv5SwIce_c); + + mSwBit1 = getSwBit1(); + if (mSwBit1 != 0xFF && fopAcM_isSwitch(this, mSwBit1)) { + return cPhs_ERROR_e; + } + + int phase = dComIfG_resLoad(&mPhase, "L5SwIce"); + if (phase == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L5SwIce", 7, dBgS_MoveBGProc_Typical, 0x14B0, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + mCcStts.Init(0xFF, 0xFF, this); + mCcCyl.Set(mCcDCyl); + mCcCyl.SetStts(&mCcStts); + + init_modeWait(); + setBaseMtx(); + } + + return phase; +} + +/* 80C6CDD0-80C6CE28 000570 0058+00 1/0 0/0 0/0 .text Execute__12daLv5SwIce_cFPPA3_A4_f + */ +int daLv5SwIce_c::Execute(Mtx** param_0) { + procMain(); + *param_0 = &mpModel->getBaseTRMtx(); + setBaseMtx(); + mCcStts.Move(); + return 1; +} + +/* 80C6D6D4-80C6D6DC 000014 0008+00 2/2 0/0 0/0 .bss l_HIO */ +static daLv5SwIce_HIO_c l_HIO; + +/* 80C6D508-80C6D538 000000 0030+00 3/3 0/0 0/0 .rodata mCcDObjInfo__12daLv5SwIce_c */ +const dCcD_SrcGObjInf daLv5SwIce_c::mCcDObjInfo = { + {0, {{0x100, 1, 0}, {0x400000, 0x11}, {0}}}, + {dCcD_SE_SWORD, 0, 0, 2, 1}, + {dCcD_SE_STONE, 0, 0, 0, 0x6}, + {0}, +}; + /* 80C6D580-80C6D5C4 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__12daLv5SwIce_c */ -SECTION_DATA u8 daLv5SwIce_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 daLv5SwIce_c::mCcDCyl = { + daLv5SwIce_c::mCcDObjInfo, + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl }; -/* 80C6D5C4-80C6D5D0 -00001 000C+00 0/1 0/0 0/0 .data @3837 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3837[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__12daLv5SwIce_cFv, -}; -#pragma pop +/* 80C6CE28-80C6CEB4 0005C8 008C+00 1/1 0/0 0/0 .text procMain__12daLv5SwIce_cFv */ +void daLv5SwIce_c::procMain() { + typedef void (daLv5SwIce_c::*procFunc)(); + static procFunc mode_proc[] = { + &daLv5SwIce_c::modeWait, + &daLv5SwIce_c::modeBreak, + }; -/* 80C6D5D0-80C6D5DC -00001 000C+00 0/1 0/0 0/0 .data @3838 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3838[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__12daLv5SwIce_cFv, -}; -#pragma pop + (this->*mode_proc[mMode])(); +} -/* 80C6D5DC-80C6D5F4 00007C 0018+00 0/1 0/0 0/0 .data mode_proc$3836 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop +/* 80C6CEB4-80C6CED0 000654 001C+00 1/1 0/0 0/0 .text init_modeWait__12daLv5SwIce_cFv */ +void daLv5SwIce_c::init_modeWait() { + mHitcount = l_HIO.hitcount; + mMode = MODE_WAIT; +} + +/* 80C6CED0-80C6D0F4 000670 0224+00 1/0 0/0 0/0 .text modeWait__12daLv5SwIce_cFv */ +void daLv5SwIce_c::modeWait() { + if (mCcCyl.ChkTgHit()) { + dCcD_GObjInf* hit_obj = mCcCyl.GetTgHitGObj(); + + if (hit_obj->GetAtType() & AT_TYPE_IRON_BALL) { + if (hit_obj->GetAtAtp() == 100 || hit_obj->GetAtAtp() == 3) { + init_modeBreak(); + } else if (hit_obj->GetAtAtp() == 2) { + cXyz ptcl_scale(1.0f, 1.0f, 1.0f); + mEmitter1ID[0] = + dComIfGp_particle_set(mEmitter1ID[0], 0x8678, ¤t.pos, &shape_angle, + &ptcl_scale, 0xFF, 0, -1, NULL, NULL, NULL); + + mDoAud_seStart(Z2SE_OBJ_ICE_KEZURU, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + mHitcount--; + if (mHitcount == 0) { + init_modeBreak(); + } + } + } + } + + mCcCyl.SetR(oREG_F(0) + 120.0f); + mCcCyl.SetH(oREG_F(1) + 220.0f); + mCcCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcCyl); + + cXyz ptcl_scale(0.6f, 0.6f, 0.6f); + for (int i = 0; i < 2; i++) { + static const u16 l_eff_r[] = {0x8AE1, 0x8AE2}; + mEmitter0ID[i] = + dComIfGp_particle_set(mEmitter0ID[i], l_eff_r[i], ¤t.pos, NULL, &ptcl_scale); + } +} + +/* 80C6D0F4-80C6D144 000894 0050+00 1/1 0/0 0/0 .text init_modeBreak__12daLv5SwIce_cFv */ +void daLv5SwIce_c::init_modeBreak() { + if (mSwBit1 != 0xFF) { + fopAcM_onSwitch(this, mSwBit1); + } + + mMode = MODE_BREAK; +} + +/* 80C6D144-80C6D260 0008E4 011C+00 1/0 0/0 0/0 .text modeBreak__12daLv5SwIce_cFv */ +void daLv5SwIce_c::modeBreak() { + cXyz ptcl_scale(0.75f, 0.75f, 0.75f); + for (int i = 0; i < 2; i++) { + static const u16 l_eff_break[] = {0x8ADF, 0x8AE0}; + mEmitter1ID[i] = + dComIfGp_particle_set(mEmitter1ID[i], l_eff_break[i], ¤t.pos, NULL, &ptcl_scale); + } + + mDoAud_seStart(Z2SE_OBJ_ICE_BREAK, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + fopAcM_delete(this); +} + +/* 80C6D260-80C6D314 000A00 00B4+00 1/0 0/0 0/0 .text Draw__12daLv5SwIce_cFv */ +int daLv5SwIce_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + fopAcM_setEffectMtx(this, mpModel->getModelData()); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; +} + +/* 80C6D314-80C6D344 000AB4 0030+00 1/0 0/0 0/0 .text Delete__12daLv5SwIce_cFv */ +int daLv5SwIce_c::Delete() { + dComIfG_resDelete(&mPhase, "L5SwIce"); + return 1; +} + +/* 80C6D344-80C6D370 000AE4 002C+00 1/0 0/0 0/0 .text daLv5SwIce_Draw__FP12daLv5SwIce_c + */ +static int daLv5SwIce_Draw(daLv5SwIce_c* i_this) { + return i_this->MoveBGDraw(); +} + +/* 80C6D370-80C6D390 000B10 0020+00 1/0 0/0 0/0 .text daLv5SwIce_Execute__FP12daLv5SwIce_c */ +static int daLv5SwIce_Execute(daLv5SwIce_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C6D390-80C6D3B0 000B30 0020+00 1/0 0/0 0/0 .text daLv5SwIce_Delete__FP12daLv5SwIce_c + */ +static int daLv5SwIce_Delete(daLv5SwIce_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C6D3B0-80C6D3D0 000B50 0020+00 1/0 0/0 0/0 .text daLv5SwIce_Create__FP10fopAc_ac_c + */ +static int daLv5SwIce_Create(fopAc_ac_c* i_this) { + return ((daLv5SwIce_c*)i_this)->create(); +} /* 80C6D5F4-80C6D614 -00001 0020+00 1/0 0/0 0/0 .data l_daLv5SwIce_Method */ static actor_method_class l_daLv5SwIce_Method = { - (process_method_func)daLv5SwIce_Create__FP10fopAc_ac_c, - (process_method_func)daLv5SwIce_Delete__FP12daLv5SwIce_c, - (process_method_func)daLv5SwIce_Execute__FP12daLv5SwIce_c, - 0, - (process_method_func)daLv5SwIce_Draw__FP12daLv5SwIce_c, + (process_method_func)daLv5SwIce_Create, (process_method_func)daLv5SwIce_Delete, + (process_method_func)daLv5SwIce_Execute, (process_method_func)NULL, + (process_method_func)daLv5SwIce_Draw, }; /* 80C6D614-80C6D644 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv5SwIce */ extern actor_process_profile_definition g_profile_Obj_Lv5SwIce = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5SwIce, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daLv5SwIce_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 537, // mPriority - &l_daLv5SwIce_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv5SwIce, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daLv5SwIce_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 537, // mPriority + &l_daLv5SwIce_Method, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C6D644-80C6D650 0000E4 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80C6D650-80C6D65C 0000F0 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80C6D65C-80C6D668 0000FC 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, -}; - -/* 80C6D668-80C6D674 000108 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, -}; - -/* 80C6D674-80C6D69C 000114 0028+00 1/1 0/0 0/0 .data __vt__12daLv5SwIce_c */ -SECTION_DATA extern void* __vt__12daLv5SwIce_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daLv5SwIce_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__12daLv5SwIce_cFPPA3_A4_f, - (void*)Draw__12daLv5SwIce_cFv, - (void*)Delete__12daLv5SwIce_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C6D69C-80C6D6A8 00013C 000C+00 2/2 0/0 0/0 .data __vt__16daLv5SwIce_HIO_c */ -SECTION_DATA extern void* __vt__16daLv5SwIce_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daLv5SwIce_HIO_cFv, -}; - -/* 80C6D6A8-80C6D6B4 000148 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, -}; - -/* 80C6D6B4-80C6D6C0 000154 000C+00 4/4 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, -}; - -/* 80C6C94C-80C6C97C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__16daLv5SwIce_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv5SwIce_HIO_c::daLv5SwIce_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__ct__16daLv5SwIce_HIO_cFv.s" -} -#pragma pop - -/* 80C6C97C-80C6C9D8 00011C 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { -extern "C" asm void __dt__18fOpAcm_HIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__18fOpAcm_HIO_entry_cFv.s" -} -#pragma pop - -/* 80C6C9D8-80C6CA20 000178 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() { -extern "C" asm void __dt__14mDoHIO_entry_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop - -/* 80C6CA20-80C6CAA8 0001C0 0088+00 2/2 0/0 0/0 .text setBaseMtx__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/setBaseMtx__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6D558-80C6D558 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C6D558 = "L5SwIce"; -#pragma pop - -/* 80C6CAA8-80C6CB14 000248 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/CreateHeap__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* 80C6CB14-80C6CCE4 0002B4 01D0+00 1/1 0/0 0/0 .text create__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/create__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* 80C6CCE4-80C6CD2C 000484 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C6CD2C-80C6CD74 0004CC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80C6CD74-80C6CDD0 000514 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6CDD0-80C6CE28 000570 0058+00 1/0 0/0 0/0 .text Execute__12daLv5SwIce_cFPPA3_A4_f - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Execute__12daLv5SwIce_cFPPA3_A4_f.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6D6C8-80C6D6D4 000008 000C+00 1/1 0/0 0/0 .bss @3647 */ -static u8 lit_3647[12]; - -/* 80C6D6D4-80C6D6DC 000014 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; - -/* 80C6D6DC-80C6D6E0 00001C 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C6D6DC[4]; - -/* 80C6CE28-80C6CEB4 0005C8 008C+00 1/1 0/0 0/0 .text procMain__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::procMain() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/procMain__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* 80C6CEB4-80C6CED0 000654 001C+00 1/1 0/0 0/0 .text init_modeWait__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeWait__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6D508-80C6D538 000000 0030+00 3/3 0/0 0/0 .rodata mCcDObjInfo__12daLv5SwIce_c */ -SECTION_RODATA u8 const daLv5SwIce_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C6D508, &daLv5SwIce_c::mCcDObjInfo); - -/* 80C6D538-80C6D53C 000030 0004+00 0/1 0/0 0/0 .rodata l_eff_r$3861 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_r[4] = { - 0x8A, - 0xE1, - 0x8A, - 0xE2, -}; -COMPILER_STRIP_GATE(0x80C6D538, &l_eff_r); -#pragma pop - -/* 80C6D53C-80C6D540 000034 0004+00 0/2 0/0 0/0 .rodata @3902 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3902 = 1.0f; -COMPILER_STRIP_GATE(0x80C6D53C, &lit_3902); -#pragma pop - -/* 80C6D540-80C6D544 000038 0004+00 0/2 0/0 0/0 .rodata @3903 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3903 = -1.0f; -COMPILER_STRIP_GATE(0x80C6D540, &lit_3903); -#pragma pop - -/* 80C6D544-80C6D548 00003C 0004+00 0/1 0/0 0/0 .rodata @3904 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3904 = 120.0f; -COMPILER_STRIP_GATE(0x80C6D544, &lit_3904); -#pragma pop - -/* 80C6D548-80C6D54C 000040 0004+00 0/1 0/0 0/0 .rodata @3905 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3905 = 220.0f; -COMPILER_STRIP_GATE(0x80C6D548, &lit_3905); -#pragma pop - -/* 80C6D54C-80C6D550 000044 0004+00 0/1 0/0 0/0 .rodata @3906 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3906 = 3.0f / 5.0f; -COMPILER_STRIP_GATE(0x80C6D54C, &lit_3906); -#pragma pop - -/* 80C6CED0-80C6D0F4 000670 0224+00 1/0 0/0 0/0 .text modeWait__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeWait__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* 80C6D0F4-80C6D144 000894 0050+00 1/1 0/0 0/0 .text init_modeBreak__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::init_modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/init_modeBreak__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C6D550-80C6D554 000048 0004+00 0/1 0/0 0/0 .rodata l_eff_break$3922 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_eff_break[4] = { - 0x8A, - 0xDF, - 0x8A, - 0xE0, -}; -COMPILER_STRIP_GATE(0x80C6D550, &l_eff_break); -#pragma pop - -/* 80C6D554-80C6D558 00004C 0004+00 0/1 0/0 0/0 .rodata @3948 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3948 = 0.75f; -COMPILER_STRIP_GATE(0x80C6D554, &lit_3948); -#pragma pop - -/* 80C6D144-80C6D260 0008E4 011C+00 1/0 0/0 0/0 .text modeBreak__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::modeBreak() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/modeBreak__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* 80C6D260-80C6D314 000A00 00B4+00 1/0 0/0 0/0 .text Draw__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Draw__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* 80C6D314-80C6D344 000AB4 0030+00 1/0 0/0 0/0 .text Delete__12daLv5SwIce_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv5SwIce_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/Delete__12daLv5SwIce_cFv.s" -} -#pragma pop - -/* 80C6D344-80C6D370 000AE4 002C+00 1/0 0/0 0/0 .text daLv5SwIce_Draw__FP12daLv5SwIce_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv5SwIce_Draw(daLv5SwIce_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Draw__FP12daLv5SwIce_c.s" -} -#pragma pop - -/* 80C6D370-80C6D390 000B10 0020+00 1/0 0/0 0/0 .text daLv5SwIce_Execute__FP12daLv5SwIce_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv5SwIce_Execute(daLv5SwIce_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Execute__FP12daLv5SwIce_c.s" -} -#pragma pop - -/* 80C6D390-80C6D3B0 000B30 0020+00 1/0 0/0 0/0 .text daLv5SwIce_Delete__FP12daLv5SwIce_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv5SwIce_Delete(daLv5SwIce_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Delete__FP12daLv5SwIce_c.s" -} -#pragma pop - -/* 80C6D3B0-80C6D3D0 000B50 0020+00 1/0 0/0 0/0 .text daLv5SwIce_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv5SwIce_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/daLv5SwIce_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80C6D3D0-80C6D418 000B70 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6D418-80C6D484 000BB8 006C+00 2/1 0/0 0/0 .text __dt__16daLv5SwIce_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv5SwIce_HIO_c::~daLv5SwIce_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__dt__16daLv5SwIce_HIO_cFv.s" -} -#pragma pop - -/* 80C6D484-80C6D4F4 000C24 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv5SwIce_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lv5SwIce_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce/__sinit_d_a_obj_lv5SwIce_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C6D484, __sinit_d_a_obj_lv5SwIce_cpp); -#pragma pop - -/* 80C6D558-80C6D558 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp index 899ecdb256..3e6d6ce1aa 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp @@ -1,569 +1,400 @@ /** * @file d_a_obj_lv5ychndlr.cpp - * -*/ + * Snowpeak Ruins Chandelier (Swinging Platform) + */ #include "rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" void create1st__14daObjYchndlr_cFv(); -extern "C" void setMtx__14daObjYchndlr_cFv(); -extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void rideActor__14daObjYchndlr_cFP10fopAc_ac_c(); -extern "C" void CreateHeap__14daObjYchndlr_cFv(); -extern "C" void Create__14daObjYchndlr_cFv(); -extern "C" void Execute__14daObjYchndlr_cFPPA3_A4_f(); -extern "C" void Draw__14daObjYchndlr_cFv(); -extern "C" void Delete__14daObjYchndlr_cFv(); -extern "C" static void daObjYchndlr_create1st__FP14daObjYchndlr_c(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" static void daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c(); -extern "C" static void daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c(); -extern "C" static void daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__14daObjYchndlr_cFv(); -extern "C" extern char const* const d_a_obj_lv5ychndlr__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void normalize__4cXyzFv(); -extern "C" void cM_atan2s__Fff(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void _savegpr_21(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_21(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -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" f32 Zero__4cXyz[3]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C6E9E8-80C6E9E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C6E9E8 = "Ychandelr"; -#pragma pop +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" /* 80C6E9F4-80C6E9F8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv5ychndlr__stringBase0; +static char* l_arcName = "Ychandelr"; /* 80C6D758-80C6D7E0 000078 0088+00 1/1 0/0 0/0 .text create1st__14daObjYchndlr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/create1st__14daObjYchndlr_cFv.s" -} -#pragma pop +int daObjYchndlr_c::create1st() { + int phase = dComIfG_resLoad(this, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName, 8, dBgS_MoveBGProc_TypicalRotY, 0x4DB0, &field_0x5a8); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + + return phase; +} -/* ############################################################################################## */ /* 80C6E980-80C6E988 000000 0008+00 2/2 0/0 0/0 .rodata l_bmdidx */ -SECTION_RODATA static u8 const l_bmdidx[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, -}; -COMPILER_STRIP_GATE(0x80C6E980, &l_bmdidx); +static const int l_bmdidx[] = {4, 5}; /* 80C6E988-80C6E9A0 000008 0018+00 1/1 0/0 0/0 .rodata l_cull_box */ -SECTION_RODATA static u8 const l_cull_box[24] = { - 0xC4, 0xBB, 0x80, 0x00, 0xC5, 0x1C, 0x40, 0x00, 0xC3, 0xFA, 0x00, 0x00, - 0x44, 0xBB, 0x80, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, +static const cull_box l_cull_box = { + {-1500.0f, -2500.0f, -500.0f}, + {1500.0f, 200.0f, 500.0f}, }; -COMPILER_STRIP_GATE(0x80C6E988, &l_cull_box); - -/* 80C6E9A0-80C6E9A4 000020 0004+00 3/4 0/0 0/0 .rodata @3699 */ -SECTION_RODATA static u8 const lit_3699[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C6E9A0, &lit_3699); - -/* 80C6E9A4-80C6E9A8 000024 0004+00 1/1 0/0 0/0 .rodata @3700 */ -SECTION_RODATA static f32 const lit_3700 = -840.0f; -COMPILER_STRIP_GATE(0x80C6E9A4, &lit_3700); /* 80C6E9F8-80C6EA28 000004 0030+00 2/2 0/0 0/0 .data l_shaft_vec */ -SECTION_DATA static u8 l_shaft_vec[48] = { - 0xC3, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0xC3, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xC3, 0x48, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, +static Vec l_shaft_vec[] = { + {-140.0f, 0.0f, 200.0f}, + {140.0f, 0.0f, 200.0f}, + {-140.0f, 0.0f, -200.0f}, + {140.0f, 0.0f, -200.0f}, }; /* 80C6EA28-80C6EA30 000034 0008+00 1/1 0/0 0/0 .data l_shaft_roty */ -SECTION_DATA static u8 l_shaft_roty[8] = { - 0x7F, 0xFF, 0x7F, 0xFF, 0x00, 0x00, 0x00, 0x00, -}; +static s16 l_shaft_roty[] = {0x7FFF, 0x7FFF, 0x0000, 0x0000}; /* 80C6D7E0-80C6D980 000100 01A0+00 2/2 0/0 0/0 .text setMtx__14daObjYchndlr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/setMtx__14daObjYchndlr_cFv.s" +void daObjYchndlr_c::setMtx() { + for (int i = 0; i < 4; i++) { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + mDoMtx_stack_c::transM(l_shaft_vec[i].x, l_shaft_vec[i].y, l_shaft_vec[i].z); + mDoMtx_stack_c::ZrotM(mShaftRotZ); + mDoMtx_stack_c::YrotM(l_shaft_roty[i]); + mpShaftModels[i]->setBaseTRMtx(mDoMtx_stack_c::get()); + } + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + MTXCopy(mDoMtx_stack_c::get(), field_0x5d8); + + mDoMtx_stack_c::ZrotM(mShaftRotZ); + mDoMtx_stack_c::transM(0.0f, -840.0f, 0.0f); + MTXMultVec(mDoMtx_stack_c::get(), &cXyz::Zero, &mChandelierCenter); + + mDoMtx_stack_c::transS(mChandelierCenter.x, mChandelierCenter.y, mChandelierCenter.z); + mDoMtx_stack_c::YrotM(current.angle.y); + mpChandlierModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), field_0x5a8); } -#pragma pop /* 80C6D980-80C6D9A8 0002A0 0028+00 1/1 0/0 0/0 .text * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s" +static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { + ((daObjYchndlr_c*)i_this)->rideActor(i_rideActor); } -#pragma pop - -/* ############################################################################################## */ -/* 80C6E9A8-80C6E9AC 000028 0004+00 1/2 0/0 0/0 .rodata @3718 */ -SECTION_RODATA static f32 const lit_3718 = 1.0f; -COMPILER_STRIP_GATE(0x80C6E9A8, &lit_3718); /* 80C6D9A8-80C6DA5C 0002C8 00B4+00 1/1 0/0 0/0 .text rideActor__14daObjYchndlr_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::rideActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/rideActor__14daObjYchndlr_cFP10fopAc_ac_c.s" +void daObjYchndlr_c::rideActor(fopAc_ac_c* i_actor) { + field_0xc8c = 1; + + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + if (i_actor == player && player->getIronBallBgHit() && !mCcCyl.ChkTgHit()) { + field_0xc90 = 1.0f; + + if (player->current.pos.x - current.pos.x > 0.0f) { + field_0x620 = 0; + } else { + field_0x620 = 1; + } + } } -#pragma pop /* 80C6DA5C-80C6DB5C 00037C 0100+00 1/0 0/0 0/0 .text CreateHeap__14daObjYchndlr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/CreateHeap__14daObjYchndlr_cFv.s" -} -#pragma pop +int daObjYchndlr_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]); + JUT_ASSERT(model_data != 0); + + mpChandlierModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpChandlierModel == NULL) { + return 0; + } + + model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]); + JUT_ASSERT(model_data != 0); + + for (int i = 0; i < 4; i++) { + mpShaftModels[i] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpShaftModels[i] == NULL) { + return 0; + } + } + + return 1; +} -/* ############################################################################################## */ /* 80C6EA30-80C6EA74 00003C 0044+00 1/1 0/0 0/0 .data l_cc_src_shaft_cyl */ static dCcD_SrcCyl l_cc_src_shaft_cyl = { { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl }; /* 80C6EA74-80C6EAB8 000080 0044+00 1/1 0/0 0/0 .data l_cc_cyl_src */ static dCcD_SrcCyl l_cc_cyl_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0x408000, 0x11}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x0}, {0x408000, 0x11}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 350.0f, // mRadius - 150.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 350.0f, // mRadius + 150.0f // mHeight + } // mCyl }; /* 80C6DB5C-80C6DC64 00047C 0108+00 1/0 0/0 0/0 .text Create__14daObjYchndlr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Create__14daObjYchndlr_cFv.s" +int daObjYchndlr_c::Create() { + fopAcM_SetMtx(this, field_0x5d8); + setMtx(); + fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, + l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z); + + mCcStts.Init(0xFF, 0, this); + + for (int i = 0; i < 4; i++) { + mShaftCcCyl[i].Set(l_cc_src_shaft_cyl); + mShaftCcCyl[i].SetStts(&mCcStts); + } + + mCcCyl.Set(l_cc_cyl_src); + mCcCyl.SetStts(&mCcStts); + mpBgW->SetRideCallback(rideCallBack); + + mShaftRotZ = 0; + field_0x61e = 50; + field_0x620 = 1; + field_0xc8c = 0; + field_0xc90 = 0.0f; + attention_info.distances[fopAc_attn_BATTLE_e] = 91; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C6E9AC-80C6E9B0 00002C 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(0x80C6E9AC, &lit_3881); -#pragma pop - -/* 80C6E9B0-80C6E9B4 000030 0004+00 0/1 0/0 0/0 .rodata @3882 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3882 = 350.0f; -COMPILER_STRIP_GATE(0x80C6E9B0, &lit_3882); -#pragma pop - -/* 80C6E9B4-80C6E9B8 000034 0004+00 0/1 0/0 0/0 .rodata @3883 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3883 = 4750.0f; -COMPILER_STRIP_GATE(0x80C6E9B4, &lit_3883); -#pragma pop - -/* 80C6E9B8-80C6E9BC 000038 0004+00 0/1 0/0 0/0 .rodata @3884 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3884 = -1.0f; -COMPILER_STRIP_GATE(0x80C6E9B8, &lit_3884); -#pragma pop - -/* 80C6E9BC-80C6E9C0 00003C 0004+00 0/1 0/0 0/0 .rodata @3885 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3885 = -350.0f; -COMPILER_STRIP_GATE(0x80C6E9BC, &lit_3885); -#pragma pop - -/* 80C6E9C0-80C6E9C4 000040 0004+00 0/1 0/0 0/0 .rodata @3886 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3886 = -4750.0f; -COMPILER_STRIP_GATE(0x80C6E9C0, &lit_3886); -#pragma pop - -/* 80C6E9C4-80C6E9C8 000044 0004+00 0/1 0/0 0/0 .rodata @3887 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3887 = 0x3F7F9DB2; -COMPILER_STRIP_GATE(0x80C6E9C4, &lit_3887); -#pragma pop - -/* 80C6E9C8-80C6E9CC 000048 0004+00 0/1 0/0 0/0 .rodata @3888 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3888 = 3.0f / 25.0f; -COMPILER_STRIP_GATE(0x80C6E9C8, &lit_3888); -#pragma pop - -/* 80C6E9CC-80C6E9D0 00004C 0004+00 0/1 0/0 0/0 .rodata @3889 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3889 = 120.0f; -COMPILER_STRIP_GATE(0x80C6E9CC, &lit_3889); -#pragma pop - -/* 80C6E9D0-80C6E9D4 000050 0004+00 0/1 0/0 0/0 .rodata @3890 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3890 = 210.0f; -COMPILER_STRIP_GATE(0x80C6E9D0, &lit_3890); -#pragma pop - -/* 80C6E9D4-80C6E9D8 000054 0004+00 0/1 0/0 0/0 .rodata @3891 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3891 = -30.0f; -COMPILER_STRIP_GATE(0x80C6E9D4, &lit_3891); -#pragma pop - -/* 80C6E9D8-80C6E9E0 000058 0004+04 0/1 0/0 0/0 .rodata @3892 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3892[1 + 1 /* padding */] = { - -210.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80C6E9D8, &lit_3892); -#pragma pop - -/* 80C6E9E0-80C6E9E8 000060 0008+00 0/1 0/0 0/0 .rodata @3894 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3894[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C6E9E0, &lit_3894); -#pragma pop /* 80C6DC64-80C6E300 000584 069C+00 1/0 0/0 0/0 .text Execute__14daObjYchndlr_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Execute__14daObjYchndlr_cFPPA3_A4_f.s" +int daObjYchndlr_c::Execute(Mtx** param_0) { + s16 var_r27 = mShaftRotZ; + if (var_r27 < 0) { + var_r27 *= -1; + } + + if (!cM3d_IsZero(field_0xc90)) { + if (field_0xc90 < 0.1f) { + field_0xc90 = 0.0f; + } + + if (field_0x620) { + field_0x61e = field_0xc90 * ((field_0xc90 * 4750.0f - (f32)var_r27) / 4750.0f) * 350.0f; + if (field_0x61e < 35) { + field_0x61e = 35; + } + + if (mShaftRotZ + field_0x61e > 0 && mShaftRotZ < 0) { + Z2GetAudioMgr()->seStart(Z2SE_OBJ_CHANDLV5_SWING, &mChandelierCenter, field_0x61e, + 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + + mShaftRotZ += field_0x61e; + + if (mShaftRotZ >= field_0xc90 * 4750.0f) { + field_0x620 = 0; + } + } else { + field_0x61e = + field_0xc90 * ((field_0xc90 * 4750.0f - (f32)var_r27) / 4750.0f) * -350.0f; + if (field_0x61e > -35) { + field_0x61e = -35; + } + + if (mShaftRotZ + field_0x61e < 0 && mShaftRotZ > 0) { + Z2GetAudioMgr()->seStart(Z2SE_OBJ_CHANDLV5_SWING, &mChandelierCenter, -field_0x61e, + 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } + + mShaftRotZ += field_0x61e; + + if (mShaftRotZ <= field_0xc90 * -4750.0f) { + field_0x620 = 1; + } + } + + field_0xc90 *= 0.9985f; + } + + setMtx(); + *param_0 = &field_0x5a8; + + for (int i = 0; i < 4; i++) { + cXyz shaft_center; + MTXMultVec(field_0x5a8, &l_shaft_vec[i], &shaft_center); + mShaftCcCyl[i].SetC(shaft_center); + dComIfG_Ccsp()->Set(&mShaftCcCyl[i]); + } + + if (mCcCyl.ChkTgHit() && field_0xc8c == 0) { + cXyz dist_to_player = dComIfGp_getPlayer(0)->current.pos - mChandelierCenter; + + if (!cM3d_IsZero(dist_to_player.getSquareMag())) { + dist_to_player.normalize(); + + s16 var_r26 = current.angle.y - cM_atan2s(dist_to_player.x, dist_to_player.z); + if (var_r26 > 0x2FFF && var_r26 < 0x4FFF) { + u32 spC0; + if (field_0x61e < 0) { + spC0 = -field_0x61e; + } else { + spC0 = field_0x61e; + } + + Z2GetAudioMgr()->seStart(Z2SE_OBJ_CHANDLV5_HIT, &mChandelierCenter, spC0, 0, 1.0f, + 1.0f, -1.0f, -1.0f, 0); + field_0x620 = 1; + field_0xc90 = 1.0f; + } else if (var_r26 < -0x2FFF && var_r26 > -0x4FFF) { + u32 spC4; + if (field_0x61e < 0) { + spC4 = -field_0x61e; + } else { + spC4 = field_0x61e; + } + + Z2GetAudioMgr()->seStart(Z2SE_OBJ_CHANDLV5_HIT, &mChandelierCenter, spC4, 0, 1.0f, + 1.0f, -1.0f, -1.0f, 0); + field_0x620 = 0; + field_0xc90 = 1.0f; + } else if (field_0xc90 < 0.12f) { + field_0x620 = 1; + field_0xc90 = 0.12f; + } + } + } + + cXyz cyl_center(mChandelierCenter); + cyl_center.y -= 120.0f; + mCcCyl.SetC(cyl_center); + dComIfG_Ccsp()->Set(&mCcCyl); + mCcStts.Move(); + + if (field_0xc8c) { + fopAcM_OffStatus(this, 0); + attention_info.flags &= ~0x4; + } else { + fopAcM_OnStatus(this, 0); + attention_info.flags = 0x4; + + Vec attn_pos, spA0, offset; + f32 var_f31, var_f30; + + offset.x = 210.0f; + offset.y = -30.0f; + offset.z = 0.0f; + MTXMultVec(field_0x5a8, &offset, &attn_pos); + fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); + var_f30 = VECSquareDistance(&player->current.pos, &attn_pos); + + offset.x = -210.0f; + MTXMultVec(field_0x5a8, &offset, &spA0); + var_f31 = VECSquareDistance(&player->current.pos, &spA0); + if (var_f30 > var_f31) { + var_f30 = var_f31; + attn_pos = spA0; + } + + offset.x = 0.0f; + offset.z = 210.0f; + MTXMultVec(field_0x5a8, &offset, &spA0); + var_f31 = VECSquareDistance(&player->current.pos, &spA0); + if (var_f30 > var_f31) { + var_f30 = var_f31; + attn_pos = spA0; + } + + offset.z = -210.0f; + MTXMultVec(field_0x5a8, &offset, &spA0); + var_f31 = VECSquareDistance(&player->current.pos, &spA0); + if (var_f30 > var_f31) { + var_f30 = var_f31; + attn_pos = spA0; + } + + attention_info.position = attn_pos; + eyePos = attn_pos; + } + + field_0xc8c = 0; + return 1; } -#pragma pop /* 80C6E300-80C6E3C8 000C20 00C8+00 1/0 0/0 0/0 .text Draw__14daObjYchndlr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Draw__14daObjYchndlr_cFv.s" +int daObjYchndlr_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpChandlierModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpChandlierModel); + + for (int i = 0; i < 4; i++) { + mDoExt_modelUpdateDL(mpShaftModels[i]); + } + + dComIfGd_setList(); + return 1; } -#pragma pop /* 80C6E3C8-80C6E404 000CE8 003C+00 1/0 0/0 0/0 .text Delete__14daObjYchndlr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYchndlr_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/Delete__14daObjYchndlr_cFv.s" +int daObjYchndlr_c::Delete() { + dComIfG_resDelete(this, l_arcName); + return 1; +} + +/* 80C6E404-80C6E518 000D24 0114+00 1/0 0/0 0/0 .text daObjYchndlr_create1st__FP14daObjYchndlr_c + */ +static int daObjYchndlr_create1st(daObjYchndlr_c* i_this) { + fopAcM_SetupActor(i_this, daObjYchndlr_c); + return i_this->create1st(); +} + +/* 80C6E754-80C6E774 001074 0020+00 1/0 0/0 0/0 .text + * daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c */ +static int daObjYchndlr_MoveBGDelete(daObjYchndlr_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C6E774-80C6E794 001094 0020+00 1/0 0/0 0/0 .text + * daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c */ +static int daObjYchndlr_MoveBGExecute(daObjYchndlr_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C6E794-80C6E7C0 0010B4 002C+00 1/0 0/0 0/0 .text daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c + */ +static int daObjYchndlr_MoveBGDraw(daObjYchndlr_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* ############################################################################################## */ /* 80C6EAB8-80C6EAD8 -00001 0020+00 1/0 0/0 0/0 .data daObjYchndlr_METHODS */ static actor_method_class daObjYchndlr_METHODS = { - (process_method_func)daObjYchndlr_create1st__FP14daObjYchndlr_c, - (process_method_func)daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c, - (process_method_func)daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c, - 0, - (process_method_func)daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c, + (process_method_func)daObjYchndlr_create1st, (process_method_func)daObjYchndlr_MoveBGDelete, + (process_method_func)daObjYchndlr_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjYchndlr_MoveBGDraw, }; /* 80C6EAD8-80C6EB08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Ychndlr */ extern actor_process_profile_definition g_profile_Obj_Ychndlr = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ychndlr, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daObjYchndlr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 664, // mPriority - &daObjYchndlr_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Ychndlr, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjYchndlr_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 664, // mPriority + &daObjYchndlr_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C6EB08-80C6EB14 000114 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80C6EB14-80C6EB20 000120 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80C6EB20-80C6EB2C 00012C 000C+00 5/5 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C6EB2C-80C6EB38 000138 000C+00 5/5 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80C6EB38-80C6EB64 000144 002C+00 2/2 0/0 0/0 .data __vt__14daObjYchndlr_c */ -SECTION_DATA extern void* __vt__14daObjYchndlr_c[11] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daObjYchndlr_cFv, - (void*)Create__14daObjYchndlr_cFv, - (void*)Execute__14daObjYchndlr_cFPPA3_A4_f, - (void*)Draw__14daObjYchndlr_cFv, - (void*)Delete__14daObjYchndlr_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)__dt__14daObjYchndlr_cFv, -}; - -/* 80C6E404-80C6E518 000D24 0114+00 1/0 0/0 0/0 .text daObjYchndlr_create1st__FP14daObjYchndlr_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYchndlr_create1st(daObjYchndlr_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_create1st__FP14daObjYchndlr_c.s" -} -#pragma pop - -/* 80C6E518-80C6E560 000E38 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C6E560-80C6E5A8 000E80 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80C6E5A8-80C6E674 000EC8 00CC+00 2/2 0/0 0/0 .text __dt__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::~dCcD_Cyl() { -extern "C" asm void __dt__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__8dCcD_CylFv.s" -} -#pragma pop - -/* 80C6E674-80C6E6F8 000F94 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::dCcD_Cyl() { -extern "C" asm void __ct__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__ct__8dCcD_CylFv.s" -} -#pragma pop - -/* 80C6E6F8-80C6E754 001018 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6E754-80C6E774 001074 0020+00 1/0 0/0 0/0 .text - * daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYchndlr_MoveBGDelete(daObjYchndlr_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c.s" -} -#pragma pop - -/* 80C6E774-80C6E794 001094 0020+00 1/0 0/0 0/0 .text - * daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYchndlr_MoveBGExecute(daObjYchndlr_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c.s" -} -#pragma pop - -/* 80C6E794-80C6E7C0 0010B4 002C+00 1/0 0/0 0/0 .text daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYchndlr_MoveBGDraw(daObjYchndlr_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c.s" -} -#pragma pop - -/* 80C6E7C0-80C6E808 0010E0 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80C6E808-80C6E978 001128 0170+00 1/0 0/0 0/0 .text __dt__14daObjYchndlr_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjYchndlr_c::~daObjYchndlr_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr/__dt__14daObjYchndlr_cFv.s" -} -#pragma pop - -/* 80C6E9E8-80C6E9E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_alink_ironball.inc b/src/d/a/d_a_alink_ironball.inc index a25cc8e3b4..6ea4789441 100644 --- a/src/d/a/d_a_alink_ironball.inc +++ b/src/d/a/d_a_alink_ironball.inc @@ -14,7 +14,7 @@ cXyz* daAlink_c::getIronBallCenterPos() { } /* 80112458-80112474 10CD98 001C+00 1/0 0/0 0/0 .text getIronBallBgHit__9daAlink_cCFv */ -s16 daAlink_c::getIronBallBgHit() const { +int daAlink_c::getIronBallBgHit() const { if (mEquipItem == IRONBALL) { return field_0x301c; }