diff --git a/Progress.md b/Progress.md index 9bcb5581c9d..206fbfec934 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 51.107875% | 2054880 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 51.107875% | 2054880 | 4020672 -RELs | 35.714159% | 4107244 | 11500324 -Total | 39.701859% | 6162124 | 15520996 +RELs | 35.736871% | 4109856 | 11500324 +Total | 39.718688% | 6164736 | 15520996 ## RELs @@ -478,7 +478,7 @@ d_a_obj_kznkarm | 35.088583% | 2852 | 8128 d_a_obj_ladder | 42.348485% | 2236 | 5280 d_a_obj_laundry | 39.077103% | 2676 | 6848 d_a_obj_laundry_rope | 34.459867% | 2284 | 6628 -d_a_obj_lbox | 47.423510% | 2356 | 4968 +d_a_obj_lbox | 100.000000% | 4968 | 4968 d_a_obj_life_container | 34.456243% | 3764 | 10924 d_a_obj_lp | 29.557762% | 2620 | 8864 d_a_obj_lv1Candle00 | 100.000000% | 5756 | 5756 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 35.714159% | 4107244 | 11500324 +Total | 35.736871% | 4109856 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__ct__16daObj_Lbox_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__ct__16daObj_Lbox_HIO_cFv.s deleted file mode 100644 index 60c2c159d4e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__ct__16daObj_Lbox_HIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C5356C: -/* 80C5356C 3C 80 80 C5 */ lis r4, __vt__16daObj_Lbox_HIO_c@ha /* 0x80C540D4@ha */ -/* 80C53570 38 04 40 D4 */ addi r0, r4, __vt__16daObj_Lbox_HIO_c@l /* 0x80C540D4@l */ -/* 80C53574 90 03 00 00 */ stw r0, 0(r3) -/* 80C53578 38 00 FF FF */ li r0, -1 -/* 80C5357C 98 03 00 04 */ stb r0, 4(r3) -/* 80C53580 3C 80 80 C5 */ lis r4, lit_3768@ha /* 0x80C53FBC@ha */ -/* 80C53584 C0 04 3F BC */ lfs f0, lit_3768@l(r4) /* 0x80C53FBC@l */ -/* 80C53588 D0 03 00 08 */ stfs f0, 8(r3) -/* 80C5358C 3C 80 80 C5 */ lis r4, lit_3769@ha /* 0x80C53FC0@ha */ -/* 80C53590 C0 04 3F C0 */ lfs f0, lit_3769@l(r4) /* 0x80C53FC0@l */ -/* 80C53594 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80C53598 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 8c7191d6041..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80C53EA4: -/* 80C53EA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C53EA8 7C 08 02 A6 */ mflr r0 -/* 80C53EAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C53EB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C53EB4 93 C1 00 08 */ stw r30, 8(r1) -/* 80C53EB8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C53EBC 7C 9F 23 78 */ mr r31, r4 -/* 80C53EC0 41 82 00 38 */ beq lbl_80C53EF8 -/* 80C53EC4 3C 80 80 C5 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80C540B0@ha */ -/* 80C53EC8 38 84 40 B0 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80C540B0@l */ -/* 80C53ECC 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80C53ED0 38 04 00 0C */ addi r0, r4, 0xc -/* 80C53ED4 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80C53ED8 38 04 00 18 */ addi r0, r4, 0x18 -/* 80C53EDC 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80C53EE0 38 80 00 00 */ li r4, 0 -/* 80C53EE4 4B 42 20 B1 */ bl __dt__9dBgS_AcchFv -/* 80C53EE8 7F E0 07 35 */ extsh. r0, r31 -/* 80C53EEC 40 81 00 0C */ ble lbl_80C53EF8 -/* 80C53EF0 7F C3 F3 78 */ mr r3, r30 -/* 80C53EF4 4B 67 AE 49 */ bl __dl__FPv -lbl_80C53EF8: -/* 80C53EF8 7F C3 F3 78 */ mr r3, r30 -/* 80C53EFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C53F00 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C53F04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C53F08 7C 08 03 A6 */ mtlr r0 -/* 80C53F0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C53F10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__16daObj_Lbox_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__16daObj_Lbox_HIO_cFv.s deleted file mode 100644 index c6a64d1c0d0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__16daObj_Lbox_HIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C53F14: -/* 80C53F14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C53F18 7C 08 02 A6 */ mflr r0 -/* 80C53F1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C53F20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C53F24 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C53F28 41 82 00 1C */ beq lbl_80C53F44 -/* 80C53F2C 3C A0 80 C5 */ lis r5, __vt__16daObj_Lbox_HIO_c@ha /* 0x80C540D4@ha */ -/* 80C53F30 38 05 40 D4 */ addi r0, r5, __vt__16daObj_Lbox_HIO_c@l /* 0x80C540D4@l */ -/* 80C53F34 90 1F 00 00 */ stw r0, 0(r31) -/* 80C53F38 7C 80 07 35 */ extsh. r0, r4 -/* 80C53F3C 40 81 00 08 */ ble lbl_80C53F44 -/* 80C53F40 4B 67 AD FD */ bl __dl__FPv -lbl_80C53F44: -/* 80C53F44 7F E3 FB 78 */ mr r3, r31 -/* 80C53F48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C53F4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C53F50 7C 08 03 A6 */ mtlr r0 -/* 80C53F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C53F58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__8cM3dGAabFv.s deleted file mode 100644 index a4fdec61712..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C53E5C: -/* 80C53E5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C53E60 7C 08 02 A6 */ mflr r0 -/* 80C53E64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C53E68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C53E6C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C53E70 41 82 00 1C */ beq lbl_80C53E8C -/* 80C53E74 3C A0 80 C5 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C540A4@ha */ -/* 80C53E78 38 05 40 A4 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C540A4@l */ -/* 80C53E7C 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C53E80 7C 80 07 35 */ extsh. r0, r4 -/* 80C53E84 40 81 00 08 */ ble lbl_80C53E8C -/* 80C53E88 4B 67 AE B5 */ bl __dl__FPv -lbl_80C53E8C: -/* 80C53E8C 7F E3 FB 78 */ mr r3, r31 -/* 80C53E90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C53E94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C53E98 7C 08 03 A6 */ mtlr r0 -/* 80C53E9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C53EA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__8cM3dGSphFv.s deleted file mode 100644 index 9455506e647..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C53E14: -/* 80C53E14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C53E18 7C 08 02 A6 */ mflr r0 -/* 80C53E1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C53E20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C53E24 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C53E28 41 82 00 1C */ beq lbl_80C53E44 -/* 80C53E2C 3C A0 80 C5 */ lis r5, __vt__8cM3dGSph@ha /* 0x80C54098@ha */ -/* 80C53E30 38 05 40 98 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80C54098@l */ -/* 80C53E34 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80C53E38 7C 80 07 35 */ extsh. r0, r4 -/* 80C53E3C 40 81 00 08 */ ble lbl_80C53E44 -/* 80C53E40 4B 67 AE FD */ bl __dl__FPv -lbl_80C53E44: -/* 80C53E44 7F E3 FB 78 */ mr r3, r31 -/* 80C53E48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C53E4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C53E50 7C 08 03 A6 */ mtlr r0 -/* 80C53E54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C53E58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__sinit_d_a_obj_lbox_cpp.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__sinit_d_a_obj_lbox_cpp.s deleted file mode 100644 index bde6dfee102..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__sinit_d_a_obj_lbox_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C53F5C: -/* 80C53F5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C53F60 7C 08 02 A6 */ mflr r0 -/* 80C53F64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C53F68 3C 60 80 C5 */ lis r3, l_HIO@ha /* 0x80C540F8@ha */ -/* 80C53F6C 38 63 40 F8 */ addi r3, r3, l_HIO@l /* 0x80C540F8@l */ -/* 80C53F70 4B FF F5 FD */ bl __ct__16daObj_Lbox_HIO_cFv -/* 80C53F74 3C 80 80 C5 */ lis r4, __dt__16daObj_Lbox_HIO_cFv@ha /* 0x80C53F14@ha */ -/* 80C53F78 38 84 3F 14 */ addi r4, r4, __dt__16daObj_Lbox_HIO_cFv@l /* 0x80C53F14@l */ -/* 80C53F7C 3C A0 80 C5 */ lis r5, lit_3763@ha /* 0x80C540EC@ha */ -/* 80C53F80 38 A5 40 EC */ addi r5, r5, lit_3763@l /* 0x80C540EC@l */ -/* 80C53F84 4B FF F5 75 */ bl __register_global_object -/* 80C53F88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C53F8C 7C 08 03 A6 */ mtlr r0 -/* 80C53F90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C53F94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/action__FP14obj_lbox_class.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/action__FP14obj_lbox_class.s deleted file mode 100644 index 365953fa468..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/action__FP14obj_lbox_class.s +++ /dev/null @@ -1,226 +0,0 @@ -lbl_80C53600: -/* 80C53600 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C53604 7C 08 02 A6 */ mflr r0 -/* 80C53608 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C5360C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C53610 4B 70 EB CD */ bl _savegpr_29 -/* 80C53614 7C 7E 1B 78 */ mr r30, r3 -/* 80C53618 3C 60 80 C5 */ lis r3, lit_3768@ha /* 0x80C53FBC@ha */ -/* 80C5361C 3B E3 3F BC */ addi r31, r3, lit_3768@l /* 0x80C53FBC@l */ -/* 80C53620 A8 1E 05 7A */ lha r0, 0x57a(r30) -/* 80C53624 2C 00 00 01 */ cmpwi r0, 1 -/* 80C53628 41 82 00 A8 */ beq lbl_80C536D0 -/* 80C5362C 40 80 01 DC */ bge lbl_80C53808 -/* 80C53630 2C 00 00 00 */ cmpwi r0, 0 -/* 80C53634 40 80 00 0C */ bge lbl_80C53640 -/* 80C53638 48 00 01 D0 */ b lbl_80C53808 -/* 80C5363C 48 00 01 CC */ b lbl_80C53808 -lbl_80C53640: -/* 80C53640 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80C53644 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80C53648 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80C5364C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80C53650 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 80C53654 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 80C53658 38 7E 07 DC */ addi r3, r30, 0x7dc -/* 80C5365C 4B 43 0E 05 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80C53660 28 03 00 00 */ cmplwi r3, 0 -/* 80C53664 41 82 01 A4 */ beq lbl_80C53808 -/* 80C53668 38 00 00 01 */ li r0, 1 -/* 80C5366C B0 1E 05 7A */ sth r0, 0x57a(r30) -/* 80C53670 38 00 00 00 */ li r0, 0 -/* 80C53674 B0 1E 05 7C */ sth r0, 0x57c(r30) -/* 80C53678 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C5367C 7C 03 07 74 */ extsb r3, r0 -/* 80C53680 4B 3D 99 ED */ bl dComIfGp_getReverb__Fi -/* 80C53684 7C 67 1B 78 */ mr r7, r3 -/* 80C53688 3C 60 00 06 */ lis r3, 0x0006 /* 0x00060010@ha */ -/* 80C5368C 38 03 00 10 */ addi r0, r3, 0x0010 /* 0x00060010@l */ -/* 80C53690 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C53694 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C53698 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C5369C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C536A0 38 81 00 0C */ addi r4, r1, 0xc -/* 80C536A4 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80C536A8 38 C0 00 00 */ li r6, 0 -/* 80C536AC C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80C536B0 FC 40 08 90 */ fmr f2, f1 -/* 80C536B4 C0 7F 00 14 */ lfs f3, 0x14(r31) -/* 80C536B8 FC 80 18 90 */ fmr f4, f3 -/* 80C536BC 39 00 00 00 */ li r8, 0 -/* 80C536C0 4B 65 82 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C536C4 38 00 00 14 */ li r0, 0x14 -/* 80C536C8 B0 1E 05 7E */ sth r0, 0x57e(r30) -/* 80C536CC 48 00 01 3C */ b lbl_80C53808 -lbl_80C536D0: -/* 80C536D0 A8 7E 05 7E */ lha r3, 0x57e(r30) -/* 80C536D4 7C 60 07 35 */ extsh. r0, r3 -/* 80C536D8 40 82 00 20 */ bne lbl_80C536F8 -/* 80C536DC C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 80C536E0 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80C536E4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C536E8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80C536EC 38 00 00 00 */ li r0, 0 -/* 80C536F0 B0 1E 04 E8 */ sth r0, 0x4e8(r30) -/* 80C536F4 48 00 00 4C */ b lbl_80C53740 -lbl_80C536F8: -/* 80C536F8 2C 03 00 0F */ cmpwi r3, 0xf -/* 80C536FC 40 80 00 44 */ bge lbl_80C53740 -/* 80C53700 A8 1E 05 78 */ lha r0, 0x578(r30) -/* 80C53704 1C 00 32 C8 */ mulli r0, r0, 0x32c8 -/* 80C53708 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80C5370C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80C53710 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80C53714 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80C53718 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80C5371C EC 00 00 72 */ fmuls f0, f0, f1 -/* 80C53720 FC 00 00 1E */ fctiwz f0, f0 -/* 80C53724 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80C53728 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80C5372C B0 1E 04 E8 */ sth r0, 0x4e8(r30) -/* 80C53730 C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 80C53734 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80C53738 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C5373C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -lbl_80C53740: -/* 80C53740 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80C53744 C0 1E 04 FC */ lfs f0, 0x4fc(r30) -/* 80C53748 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C5374C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80C53750 80 1E 05 F4 */ lwz r0, 0x5f4(r30) -/* 80C53754 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80C53758 41 82 00 B0 */ beq lbl_80C53808 -/* 80C5375C C0 3F 00 04 */ lfs f1, 4(r31) -/* 80C53760 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80C53764 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 80C53768 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80C5376C D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80C53770 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C53774 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C53778 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80C5377C 38 80 00 05 */ li r4, 5 -/* 80C53780 38 A0 00 0F */ li r5, 0xf -/* 80C53784 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80C53788 4B 41 C2 9D */ bl StartShock__12dVibration_cFii4cXyz -/* 80C5378C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80C53790 7C 03 07 74 */ extsb r3, r0 -/* 80C53794 4B 3D 98 D9 */ bl dComIfGp_getReverb__Fi -/* 80C53798 7C 67 1B 78 */ mr r7, r3 -/* 80C5379C 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070001@ha */ -/* 80C537A0 38 03 00 01 */ addi r0, r3, 0x0001 /* 0x00070001@l */ -/* 80C537A4 90 01 00 08 */ stw r0, 8(r1) -/* 80C537A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C537AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C537B0 80 63 00 00 */ lwz r3, 0(r3) -/* 80C537B4 38 81 00 08 */ addi r4, r1, 8 -/* 80C537B8 38 BE 05 38 */ addi r5, r30, 0x538 -/* 80C537BC 38 C0 00 00 */ li r6, 0 -/* 80C537C0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80C537C4 FC 40 08 90 */ fmr f2, f1 -/* 80C537C8 C0 7F 00 14 */ lfs f3, 0x14(r31) -/* 80C537CC FC 80 18 90 */ fmr f4, f3 -/* 80C537D0 39 00 00 00 */ li r8, 0 -/* 80C537D4 4B 65 81 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C537D8 38 00 00 02 */ li r0, 2 -/* 80C537DC B0 1E 05 7A */ sth r0, 0x57a(r30) -/* 80C537E0 38 00 00 00 */ li r0, 0 -/* 80C537E4 B0 1E 05 7C */ sth r0, 0x57c(r30) -/* 80C537E8 38 7E 0A 84 */ addi r3, r30, 0xa84 -/* 80C537EC 38 9E 0A 88 */ addi r4, r30, 0xa88 -/* 80C537F0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C537F4 38 DE 04 E4 */ addi r6, r30, 0x4e4 -/* 80C537F8 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 80C537FC 38 FE 01 0C */ addi r7, r30, 0x10c -/* 80C53800 39 00 00 01 */ li r8, 1 -/* 80C53804 4B 3C 98 1D */ bl fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci -lbl_80C53808: -/* 80C53808 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80C5380C 54 00 00 3E */ slwi r0, r0, 0 -/* 80C53810 90 1E 04 9C */ stw r0, 0x49c(r30) -/* 80C53814 38 00 00 00 */ li r0, 0 -/* 80C53818 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80C5381C 38 7E 05 C8 */ addi r3, r30, 0x5c8 -/* 80C53820 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C53824 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C53828 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80C5382C 4B 42 32 81 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80C53830 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C53834 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C53838 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80C5383C C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80C53840 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80C53844 4B 6F 30 A5 */ bl PSMTXTrans -/* 80C53848 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5384C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C53850 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80C53854 4B 3B 8B E1 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C53858 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5385C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C53860 A8 9E 04 E8 */ lha r4, 0x4e8(r30) -/* 80C53864 4B 3B 8C 69 */ bl mDoMtx_ZrotM__FPA4_fs -/* 80C53868 3C 60 80 C5 */ lis r3, l_HIO@ha /* 0x80C540F8@ha */ -/* 80C5386C 3B A3 40 F8 */ addi r29, r3, l_HIO@l /* 0x80C540F8@l */ -/* 80C53870 C0 3D 00 08 */ lfs f1, 8(r29) -/* 80C53874 FC 40 08 90 */ fmr f2, f1 -/* 80C53878 FC 60 08 90 */ fmr f3, f1 -/* 80C5387C 4B 3B 95 BD */ bl scaleM__14mDoMtx_stack_cFfff -/* 80C53880 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C53884 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C53888 80 9E 05 74 */ lwz r4, 0x574(r30) -/* 80C5388C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C53890 4B 6F 2C 21 */ bl PSMTXCopy -/* 80C53894 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C53898 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5389C 38 9E 0A 50 */ addi r4, r30, 0xa50 -/* 80C538A0 4B 6F 2C 11 */ bl PSMTXCopy -/* 80C538A4 80 7E 0A 80 */ lwz r3, 0xa80(r30) -/* 80C538A8 4B 42 81 19 */ bl Move__4dBgWFv -/* 80C538AC C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C538B0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80C538B4 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80C538B8 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80C538BC C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C538C0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80C538C4 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C538C8 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80C538CC EC 01 00 32 */ fmuls f0, f1, f0 -/* 80C538D0 EC 22 00 2A */ fadds f1, f2, f0 -/* 80C538D4 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80C538D8 A8 1E 05 7A */ lha r0, 0x57a(r30) -/* 80C538DC 2C 00 00 00 */ cmpwi r0, 0 -/* 80C538E0 41 82 00 10 */ beq lbl_80C538F0 -/* 80C538E4 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 80C538E8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C538EC D0 01 00 20 */ stfs f0, 0x20(r1) -lbl_80C538F0: -/* 80C538F0 38 7E 09 00 */ addi r3, r30, 0x900 -/* 80C538F4 38 81 00 1C */ addi r4, r1, 0x1c -/* 80C538F8 4B 61 BD 51 */ bl SetC__8cM3dGSphFRC4cXyz -/* 80C538FC 38 7E 09 00 */ addi r3, r30, 0x900 -/* 80C53900 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80C53904 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80C53908 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80C5390C 4B 61 BD FD */ bl SetR__8cM3dGSphFf -/* 80C53910 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C53914 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C53918 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C5391C 38 9E 07 DC */ addi r4, r30, 0x7dc -/* 80C53920 4B 61 12 89 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C53924 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80C53928 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80C5392C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80C53930 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80C53934 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80C53938 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80C5393C C0 1E 05 38 */ lfs f0, 0x538(r30) -/* 80C53940 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80C53944 C0 1E 05 3C */ lfs f0, 0x53c(r30) -/* 80C53948 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80C5394C C0 1E 05 40 */ lfs f0, 0x540(r30) -/* 80C53950 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80C53954 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C53958 4B 70 E8 D1 */ bl _restgpr_29 -/* 80C5395C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C53960 7C 08 03 A6 */ mtlr r0 -/* 80C53964 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C53968 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 7deb9e6ba6a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,191 +0,0 @@ -lbl_80C53B3C: -/* 80C53B3C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C53B40 7C 08 02 A6 */ mflr r0 -/* 80C53B44 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C53B48 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C53B4C 4B 70 E6 81 */ bl _savegpr_25 -/* 80C53B50 7C 7B 1B 78 */ mr r27, r3 -/* 80C53B54 3C 80 80 C5 */ lis r4, lit_3768@ha /* 0x80C53FBC@ha */ -/* 80C53B58 3B E4 3F BC */ addi r31, r4, lit_3768@l /* 0x80C53FBC@l */ -/* 80C53B5C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C53B60 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C53B64 40 82 01 34 */ bne lbl_80C53C98 -/* 80C53B68 7F 60 DB 79 */ or. r0, r27, r27 -/* 80C53B6C 41 82 01 20 */ beq lbl_80C53C8C -/* 80C53B70 7C 1A 03 78 */ mr r26, r0 -/* 80C53B74 4B 3C 4F F1 */ bl __ct__10fopAc_ac_cFv -/* 80C53B78 38 7A 05 88 */ addi r3, r26, 0x588 -/* 80C53B7C 4B 42 23 31 */ bl __ct__12dBgS_AcchCirFv -/* 80C53B80 3B 3A 05 C8 */ addi r25, r26, 0x5c8 -/* 80C53B84 7F 23 CB 78 */ mr r3, r25 -/* 80C53B88 4B 42 25 19 */ bl __ct__9dBgS_AcchFv -/* 80C53B8C 3C 60 80 C5 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80C540B0@ha */ -/* 80C53B90 38 63 40 B0 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80C540B0@l */ -/* 80C53B94 90 79 00 10 */ stw r3, 0x10(r25) -/* 80C53B98 38 03 00 0C */ addi r0, r3, 0xc -/* 80C53B9C 90 19 00 14 */ stw r0, 0x14(r25) -/* 80C53BA0 38 03 00 18 */ addi r0, r3, 0x18 -/* 80C53BA4 90 19 00 24 */ stw r0, 0x24(r25) -/* 80C53BA8 38 79 00 14 */ addi r3, r25, 0x14 -/* 80C53BAC 4B 42 52 BD */ bl SetObj__16dBgS_PolyPassChkFv -/* 80C53BB0 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C53BB4 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C53BB8 90 1A 07 B8 */ stw r0, 0x7b8(r26) -/* 80C53BBC 38 7A 07 BC */ addi r3, r26, 0x7bc -/* 80C53BC0 4B 42 FB A1 */ bl __ct__10dCcD_GSttsFv -/* 80C53BC4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C53BC8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C53BCC 90 7A 07 B8 */ stw r3, 0x7b8(r26) -/* 80C53BD0 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C53BD4 90 1A 07 BC */ stw r0, 0x7bc(r26) -/* 80C53BD8 3B 3A 07 DC */ addi r25, r26, 0x7dc -/* 80C53BDC 7F 23 CB 78 */ mr r3, r25 -/* 80C53BE0 4B 42 FE 49 */ bl __ct__12dCcD_GObjInfFv -/* 80C53BE4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C53BE8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C53BEC 90 19 01 20 */ stw r0, 0x120(r25) -/* 80C53BF0 3C 60 80 C5 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C540A4@ha */ -/* 80C53BF4 38 03 40 A4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C540A4@l */ -/* 80C53BF8 90 19 01 1C */ stw r0, 0x11c(r25) -/* 80C53BFC 3C 60 80 C5 */ lis r3, __vt__8cM3dGSph@ha /* 0x80C54098@ha */ -/* 80C53C00 38 03 40 98 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80C54098@l */ -/* 80C53C04 90 19 01 34 */ stw r0, 0x134(r25) -/* 80C53C08 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80C53C0C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80C53C10 90 79 01 20 */ stw r3, 0x120(r25) -/* 80C53C14 3B C3 00 58 */ addi r30, r3, 0x58 -/* 80C53C18 93 D9 01 34 */ stw r30, 0x134(r25) -/* 80C53C1C 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80C53C20 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80C53C24 90 79 00 3C */ stw r3, 0x3c(r25) -/* 80C53C28 3B A3 00 2C */ addi r29, r3, 0x2c -/* 80C53C2C 93 B9 01 20 */ stw r29, 0x120(r25) -/* 80C53C30 3B 83 00 84 */ addi r28, r3, 0x84 -/* 80C53C34 93 99 01 34 */ stw r28, 0x134(r25) -/* 80C53C38 3B 3A 09 14 */ addi r25, r26, 0x914 -/* 80C53C3C 7F 23 CB 78 */ mr r3, r25 -/* 80C53C40 4B 42 FD E9 */ bl __ct__12dCcD_GObjInfFv -/* 80C53C44 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C53C48 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C53C4C 90 19 01 20 */ stw r0, 0x120(r25) -/* 80C53C50 3C 60 80 C5 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C540A4@ha */ -/* 80C53C54 38 03 40 A4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C540A4@l */ -/* 80C53C58 90 19 01 1C */ stw r0, 0x11c(r25) -/* 80C53C5C 3C 60 80 C5 */ lis r3, __vt__8cM3dGSph@ha /* 0x80C54098@ha */ -/* 80C53C60 38 03 40 98 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80C54098@l */ -/* 80C53C64 90 19 01 34 */ stw r0, 0x134(r25) -/* 80C53C68 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80C53C6C 38 03 35 40 */ addi r0, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80C53C70 90 19 01 20 */ stw r0, 0x120(r25) -/* 80C53C74 93 D9 01 34 */ stw r30, 0x134(r25) -/* 80C53C78 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80C53C7C 38 03 BF C0 */ addi r0, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80C53C80 90 19 00 3C */ stw r0, 0x3c(r25) -/* 80C53C84 93 B9 01 20 */ stw r29, 0x120(r25) -/* 80C53C88 93 99 01 34 */ stw r28, 0x134(r25) -lbl_80C53C8C: -/* 80C53C8C 80 1B 04 A0 */ lwz r0, 0x4a0(r27) -/* 80C53C90 60 00 00 08 */ ori r0, r0, 8 -/* 80C53C94 90 1B 04 A0 */ stw r0, 0x4a0(r27) -lbl_80C53C98: -/* 80C53C98 38 7B 05 68 */ addi r3, r27, 0x568 -/* 80C53C9C 3C 80 80 C5 */ lis r4, d_a_obj_lbox__stringBase0@ha /* 0x80C53FFC@ha */ -/* 80C53CA0 38 84 3F FC */ addi r4, r4, d_a_obj_lbox__stringBase0@l /* 0x80C53FFC@l */ -/* 80C53CA4 4B 3D 92 19 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C53CA8 7C 7C 1B 78 */ mr r28, r3 -/* 80C53CAC 2C 1C 00 04 */ cmpwi r28, 4 -/* 80C53CB0 40 82 01 48 */ bne lbl_80C53DF8 -/* 80C53CB4 80 1B 00 B0 */ lwz r0, 0xb0(r27) -/* 80C53CB8 98 1B 05 70 */ stb r0, 0x570(r27) -/* 80C53CBC 88 1B 05 70 */ lbz r0, 0x570(r27) -/* 80C53CC0 28 00 00 FF */ cmplwi r0, 0xff -/* 80C53CC4 40 82 00 0C */ bne lbl_80C53CD0 -/* 80C53CC8 38 00 00 00 */ li r0, 0 -/* 80C53CCC 98 1B 05 70 */ stb r0, 0x570(r27) -lbl_80C53CD0: -/* 80C53CD0 7F 63 DB 78 */ mr r3, r27 -/* 80C53CD4 3C 80 80 C5 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80C53A38@ha */ -/* 80C53CD8 38 84 3A 38 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80C53A38@l */ -/* 80C53CDC 3C A0 00 05 */ lis r5, 0x0005 /* 0x0004B000@ha */ -/* 80C53CE0 38 A5 B0 00 */ addi r5, r5, 0xB000 /* 0x0004B000@l */ -/* 80C53CE4 4B 3C 67 CD */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80C53CE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C53CEC 40 82 00 0C */ bne lbl_80C53CF8 -/* 80C53CF0 38 60 00 05 */ li r3, 5 -/* 80C53CF4 48 00 01 08 */ b lbl_80C53DFC -lbl_80C53CF8: -/* 80C53CF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C53CFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C53D00 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C53D04 80 9B 0A 80 */ lwz r4, 0xa80(r27) -/* 80C53D08 7F 65 DB 78 */ mr r5, r27 -/* 80C53D0C 4B 42 0C FD */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 80C53D10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C53D14 41 82 00 0C */ beq lbl_80C53D20 -/* 80C53D18 38 60 00 05 */ li r3, 5 -/* 80C53D1C 48 00 00 E0 */ b lbl_80C53DFC -lbl_80C53D20: -/* 80C53D20 3C 60 80 C5 */ lis r3, data_80C540E8@ha /* 0x80C540E8@ha */ -/* 80C53D24 8C 03 40 E8 */ lbzu r0, data_80C540E8@l(r3) /* 0x80C540E8@l */ -/* 80C53D28 28 00 00 00 */ cmplwi r0, 0 -/* 80C53D2C 40 82 00 20 */ bne lbl_80C53D4C -/* 80C53D30 38 00 00 01 */ li r0, 1 -/* 80C53D34 98 1B 0A 8C */ stb r0, 0xa8c(r27) -/* 80C53D38 98 03 00 00 */ stb r0, 0(r3) -/* 80C53D3C 38 00 FF FF */ li r0, -1 -/* 80C53D40 3C 60 80 C5 */ lis r3, l_HIO@ha /* 0x80C540F8@ha */ -/* 80C53D44 38 63 40 F8 */ addi r3, r3, l_HIO@l /* 0x80C540F8@l */ -/* 80C53D48 98 03 00 04 */ stb r0, 4(r3) -lbl_80C53D4C: -/* 80C53D4C 80 7B 05 74 */ lwz r3, 0x574(r27) -/* 80C53D50 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C53D54 90 1B 05 04 */ stw r0, 0x504(r27) -/* 80C53D58 7F 63 DB 78 */ mr r3, r27 -/* 80C53D5C C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C53D60 C0 5F 00 38 */ lfs f2, 0x38(r31) -/* 80C53D64 FC 60 08 90 */ fmr f3, f1 -/* 80C53D68 4B 3C 67 C1 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80C53D6C 7F 63 DB 78 */ mr r3, r27 -/* 80C53D70 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80C53D74 C0 5F 00 3C */ lfs f2, 0x3c(r31) -/* 80C53D78 FC 60 08 90 */ fmr f3, f1 -/* 80C53D7C 4B 3C 67 BD */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80C53D80 38 7B 07 A0 */ addi r3, r27, 0x7a0 -/* 80C53D84 38 80 00 FF */ li r4, 0xff -/* 80C53D88 38 A0 00 00 */ li r5, 0 -/* 80C53D8C 7F 66 DB 78 */ mr r6, r27 -/* 80C53D90 4B 42 FA D1 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C53D94 38 7B 07 DC */ addi r3, r27, 0x7dc -/* 80C53D98 3C 80 80 C5 */ lis r4, cc_sph_src@ha /* 0x80C54008@ha */ -/* 80C53D9C 38 84 40 08 */ addi r4, r4, cc_sph_src@l /* 0x80C54008@l */ -/* 80C53DA0 4B 43 0C 95 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80C53DA4 38 1B 07 A0 */ addi r0, r27, 0x7a0 -/* 80C53DA8 90 1B 08 20 */ stw r0, 0x820(r27) -/* 80C53DAC 38 00 00 00 */ li r0, 0 -/* 80C53DB0 90 01 00 08 */ stw r0, 8(r1) -/* 80C53DB4 38 7B 05 C8 */ addi r3, r27, 0x5c8 -/* 80C53DB8 38 9B 04 D0 */ addi r4, r27, 0x4d0 -/* 80C53DBC 38 BB 04 BC */ addi r5, r27, 0x4bc -/* 80C53DC0 7F 66 DB 78 */ mr r6, r27 -/* 80C53DC4 38 E0 00 01 */ li r7, 1 -/* 80C53DC8 39 1B 05 88 */ addi r8, r27, 0x588 -/* 80C53DCC 39 3B 04 F8 */ addi r9, r27, 0x4f8 -/* 80C53DD0 39 40 00 00 */ li r10, 0 -/* 80C53DD4 4B 42 24 75 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80C53DD8 38 7B 05 88 */ addi r3, r27, 0x588 -/* 80C53DDC C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80C53DE0 FC 40 08 90 */ fmr f2, f1 -/* 80C53DE4 4B 42 21 75 */ bl SetWall__12dBgS_AcchCirFff -/* 80C53DE8 38 00 00 16 */ li r0, 0x16 -/* 80C53DEC 98 1B 05 46 */ stb r0, 0x546(r27) -/* 80C53DF0 7F 63 DB 78 */ mr r3, r27 -/* 80C53DF4 4B FF FB 79 */ bl daObj_Lbox_Execute__FP14obj_lbox_class -lbl_80C53DF8: -/* 80C53DF8 7F 83 E3 78 */ mr r3, r28 -lbl_80C53DFC: -/* 80C53DFC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C53E00 4B 70 E4 19 */ bl _restgpr_25 -/* 80C53E04 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C53E08 7C 08 03 A6 */ mtlr r0 -/* 80C53E0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C53E10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Delete__FP14obj_lbox_class.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Delete__FP14obj_lbox_class.s deleted file mode 100644 index 67c75671c27..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Delete__FP14obj_lbox_class.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C539D0: -/* 80C539D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C539D4 7C 08 02 A6 */ mflr r0 -/* 80C539D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C539DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C539E0 7C 7F 1B 78 */ mr r31, r3 -/* 80C539E4 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80C539E8 3C 80 80 C5 */ lis r4, d_a_obj_lbox__stringBase0@ha /* 0x80C53FFC@ha */ -/* 80C539EC 38 84 3F FC */ addi r4, r4, d_a_obj_lbox__stringBase0@l /* 0x80C53FFC@l */ -/* 80C539F0 4B 3D 96 19 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C539F4 88 1F 0A 8C */ lbz r0, 0xa8c(r31) -/* 80C539F8 28 00 00 00 */ cmplwi r0, 0 -/* 80C539FC 41 82 00 10 */ beq lbl_80C53A0C -/* 80C53A00 38 00 00 00 */ li r0, 0 -/* 80C53A04 3C 60 80 C5 */ lis r3, data_80C540E8@ha /* 0x80C540E8@ha */ -/* 80C53A08 98 03 40 E8 */ stb r0, data_80C540E8@l(r3) /* 0x80C540E8@l */ -lbl_80C53A0C: -/* 80C53A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C53A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C53A14 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C53A18 80 9F 0A 80 */ lwz r4, 0xa80(r31) -/* 80C53A1C 4B 42 08 35 */ bl Release__4cBgSFP9dBgW_Base -/* 80C53A20 38 60 00 01 */ li r3, 1 -/* 80C53A24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C53A28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C53A2C 7C 08 03 A6 */ mtlr r0 -/* 80C53A30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C53A34 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Draw__FP14obj_lbox_class.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Draw__FP14obj_lbox_class.s deleted file mode 100644 index b09d5d6ddfb..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Draw__FP14obj_lbox_class.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C5359C: -/* 80C5359C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C535A0 7C 08 02 A6 */ mflr r0 -/* 80C535A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C535A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C535AC 7C 7F 1B 78 */ mr r31, r3 -/* 80C535B0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C535B4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C535B8 38 80 00 10 */ li r4, 0x10 -/* 80C535BC 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C535C0 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C535C4 4B 55 02 01 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C535C8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C535CC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C535D0 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80C535D4 80 84 00 04 */ lwz r4, 4(r4) -/* 80C535D8 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C535DC 4B 55 17 C5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C535E0 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80C535E4 4B 3B A6 E1 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C535E8 38 60 00 01 */ li r3, 1 -/* 80C535EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C535F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C535F4 7C 08 03 A6 */ mtlr r0 -/* 80C535F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C535FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Execute__FP14obj_lbox_class.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Execute__FP14obj_lbox_class.s deleted file mode 100644 index ad4424e3498..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Execute__FP14obj_lbox_class.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C5396C: -/* 80C5396C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C53970 7C 08 02 A6 */ mflr r0 -/* 80C53974 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C53978 A8 83 05 78 */ lha r4, 0x578(r3) -/* 80C5397C 38 04 00 01 */ addi r0, r4, 1 -/* 80C53980 B0 03 05 78 */ sth r0, 0x578(r3) -/* 80C53984 38 80 00 00 */ li r4, 0 -/* 80C53988 38 00 00 02 */ li r0, 2 -/* 80C5398C 7C 09 03 A6 */ mtctr r0 -lbl_80C53990: -/* 80C53990 38 C4 05 7E */ addi r6, r4, 0x57e -/* 80C53994 7C A3 32 AE */ lhax r5, r3, r6 -/* 80C53998 2C 05 00 00 */ cmpwi r5, 0 -/* 80C5399C 41 82 00 0C */ beq lbl_80C539A8 -/* 80C539A0 38 05 FF FF */ addi r0, r5, -1 -/* 80C539A4 7C 03 33 2E */ sthx r0, r3, r6 -lbl_80C539A8: -/* 80C539A8 38 84 00 02 */ addi r4, r4, 2 -/* 80C539AC 42 00 FF E4 */ bdnz lbl_80C53990 -/* 80C539B0 4B FF FC 51 */ bl action__FP14obj_lbox_class -/* 80C539B4 38 60 00 01 */ li r3, 1 -/* 80C539B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C539BC 7C 08 03 A6 */ mtlr r0 -/* 80C539C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C539C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53F98.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53F98.s deleted file mode 100644 index 67d52f7f803..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53F98.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C53F98: -/* 80C53F98 38 63 FF DC */ addi r3, r3, -36 -/* 80C53F9C 4B FF FF 08 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53FA0.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53FA0.s deleted file mode 100644 index f861c0bf9ef..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53FA0.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80C53FA0: -/* 80C53FA0 38 63 FF EC */ addi r3, r3, -20 -/* 80C53FA4 4B FF FF 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index f29a4289619..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,71 +0,0 @@ -lbl_80C53A38: -/* 80C53A38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C53A3C 7C 08 02 A6 */ mflr r0 -/* 80C53A40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C53A44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C53A48 93 C1 00 08 */ stw r30, 8(r1) -/* 80C53A4C 7C 7F 1B 78 */ mr r31, r3 -/* 80C53A50 3C 60 80 C5 */ lis r3, d_a_obj_lbox__stringBase0@ha /* 0x80C53FFC@ha */ -/* 80C53A54 38 63 3F FC */ addi r3, r3, d_a_obj_lbox__stringBase0@l /* 0x80C53FFC@l */ -/* 80C53A58 38 80 00 04 */ li r4, 4 -/* 80C53A5C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C53A60 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C53A64 3F C5 00 02 */ addis r30, r5, 2 -/* 80C53A68 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80C53A6C 7F C5 F3 78 */ mr r5, r30 -/* 80C53A70 38 C0 00 80 */ li r6, 0x80 -/* 80C53A74 4B 3E 88 79 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C53A78 3C 80 00 08 */ lis r4, 8 -/* 80C53A7C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C53A80 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C53A84 4B 3C 11 D1 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C53A88 90 7F 05 74 */ stw r3, 0x574(r31) -/* 80C53A8C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80C53A90 28 00 00 00 */ cmplwi r0, 0 -/* 80C53A94 40 82 00 0C */ bne lbl_80C53AA0 -/* 80C53A98 38 60 00 00 */ li r3, 0 -/* 80C53A9C 48 00 00 88 */ b lbl_80C53B24 -lbl_80C53AA0: -/* 80C53AA0 38 60 00 C0 */ li r3, 0xc0 -/* 80C53AA4 4B 67 B1 A9 */ bl __nw__FUl -/* 80C53AA8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80C53AAC 41 82 00 0C */ beq lbl_80C53AB8 -/* 80C53AB0 4B 42 7E C1 */ bl __ct__4dBgWFv -/* 80C53AB4 7C 60 1B 78 */ mr r0, r3 -lbl_80C53AB8: -/* 80C53AB8 90 1F 0A 80 */ stw r0, 0xa80(r31) -/* 80C53ABC 80 1F 0A 80 */ lwz r0, 0xa80(r31) -/* 80C53AC0 28 00 00 00 */ cmplwi r0, 0 -/* 80C53AC4 40 82 00 0C */ bne lbl_80C53AD0 -/* 80C53AC8 38 60 00 00 */ li r3, 0 -/* 80C53ACC 48 00 00 58 */ b lbl_80C53B24 -lbl_80C53AD0: -/* 80C53AD0 3C 60 80 C5 */ lis r3, d_a_obj_lbox__stringBase0@ha /* 0x80C53FFC@ha */ -/* 80C53AD4 38 63 3F FC */ addi r3, r3, d_a_obj_lbox__stringBase0@l /* 0x80C53FFC@l */ -/* 80C53AD8 38 80 00 07 */ li r4, 7 -/* 80C53ADC 7F C5 F3 78 */ mr r5, r30 -/* 80C53AE0 38 C0 00 80 */ li r6, 0x80 -/* 80C53AE4 4B 3E 88 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C53AE8 7C 64 1B 78 */ mr r4, r3 -/* 80C53AEC 80 7F 0A 80 */ lwz r3, 0xa80(r31) -/* 80C53AF0 38 A0 00 01 */ li r5, 1 -/* 80C53AF4 38 DF 0A 50 */ addi r6, r31, 0xa50 -/* 80C53AF8 4B 42 64 41 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80C53AFC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80C53B00 28 00 00 01 */ cmplwi r0, 1 -/* 80C53B04 40 82 00 0C */ bne lbl_80C53B10 -/* 80C53B08 38 60 00 00 */ li r3, 0 -/* 80C53B0C 48 00 00 18 */ b lbl_80C53B24 -lbl_80C53B10: -/* 80C53B10 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075A24@ha */ -/* 80C53B14 38 03 5A 24 */ addi r0, r3, dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075A24@l */ -/* 80C53B18 80 7F 0A 80 */ lwz r3, 0xa80(r31) -/* 80C53B1C 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80C53B20 38 60 00 01 */ li r3, 1 -lbl_80C53B24: -/* 80C53B24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C53B28 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C53B2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C53B30 7C 08 03 A6 */ mtlr r0 -/* 80C53B34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C53B38 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h b/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h index 9efb8146045..be66515aaff 100644 --- a/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h +++ b/include/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h @@ -1,6 +1,43 @@ #ifndef D_A_OBJ_LBOX_H #define D_A_OBJ_LBOX_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "f_op/f_op_actor.h" +#include "d/bg/d_bg_w.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" + +class obj_lbox_class : public fopAc_ac_c { +public: + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ u8 mParam; + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ s16 field_0x578; + /* 0x57A */ s16 field_0x57a; + /* 0x57C */ s16 field_0x57c; + /* 0x57E */ s16 field_0x57e[2]; + /* 0x584 */ u32 field_0x584; + /* 0x588 */ dBgS_AcchCir mAcchCir; + /* 0x5C8 */ dBgS_ObjAcch mObjAcch; + /* 0x7A0 */ dCcD_Stts mStts; + /* 0x7DC */ dCcD_Sph mSph; + /* 0x914 */ dCcD_Sph mSph2; + /* 0xA4C */ u32 field_0xa4c; + /* 0xA50 */ Mtx mMtx; + /* 0xA80 */ dBgW* mpBgW; + /* 0xA84 */ u32 field_0xa84; + /* 0xA88 */ u32 field_0xa88; + /* 0xA8C */ u8 field_0xa8c; +}; // Size = 0xA90 + +class daObj_Lbox_HIO_c { +public: + /* 80C5356C */ daObj_Lbox_HIO_c(); + /* 80C53F14 */ virtual ~daObj_Lbox_HIO_c() {}; + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mSize; + /* 0xC */ f32 mHeight; +}; // Size = 0x10 #endif /* D_A_OBJ_LBOX_H */ diff --git a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp index 2a8662c8437..090622030ad 100644 --- a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp +++ b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp @@ -1,550 +1,245 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lbox -// +/** + * d_a_obj_lbox.cpp + * Object - Unused Block (HIO Label is "Block for boss battle") + */ #include "rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.h" -#include "d/cc/d_cc_d.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_resorce.h" +#include "d/d_vibration.h" #include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct obj_lbox_class {}; - -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObj_Lbox_HIO_c { - /* 80C5356C */ daObj_Lbox_HIO_c(); - /* 80C53F14 */ ~daObj_Lbox_HIO_c(); -}; - -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80C53EA4 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - -struct csXyz {}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__16daObj_Lbox_HIO_cFv(); -extern "C" static void daObj_Lbox_Draw__FP14obj_lbox_class(); -extern "C" static void action__FP14obj_lbox_class(); -extern "C" static void daObj_Lbox_Execute__FP14obj_lbox_class(); -extern "C" static bool daObj_Lbox_IsDelete__FP14obj_lbox_class(); -extern "C" static void daObj_Lbox_Delete__FP14obj_lbox_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daObj_Lbox_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__16daObj_Lbox_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lbox_cpp(); -extern "C" static void func_80C53F98(); -extern "C" static void func_80C53FA0(); -extern "C" extern char const* const d_a_obj_lbox__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -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__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C53FBC-80C53FC0 000000 0004+00 3/3 0/0 0/0 .rodata @3768 */ -SECTION_RODATA static f32 const lit_3768 = 2.0f; -COMPILER_STRIP_GATE(0x80C53FBC, &lit_3768); - -/* 80C53FC0-80C53FC4 000004 0004+00 1/2 0/0 0/0 .rodata @3769 */ -SECTION_RODATA static u8 const lit_3769[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C53FC0, &lit_3769); +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" /* 80C54008-80C54048 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$3950 */ static dCcD_SrcSph cc_sph_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr }; -/* 80C54048-80C54068 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Lbox_Method */ -SECTION_DATA static void* l_daObj_Lbox_Method[8] = { - (void*)daObj_Lbox_Create__FP10fopAc_ac_c, - (void*)daObj_Lbox_Delete__FP14obj_lbox_class, - (void*)daObj_Lbox_Execute__FP14obj_lbox_class, - (void*)daObj_Lbox_IsDelete__FP14obj_lbox_class, - (void*)daObj_Lbox_Draw__FP14obj_lbox_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; +/* 80C540E8-80C540EC 000008 0004+00 2/2 0/0 0/0 .bss None */ +static u8 data_80C540E8; -/* 80C54068-80C54098 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_LBOX */ -SECTION_DATA extern void* g_profile_OBJ_LBOX[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00270000, (void*)&g_fpcLf_Method, - (void*)0x00000A90, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00290000, (void*)&l_daObj_Lbox_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80C54098-80C540A4 000090 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80C540A4-80C540B0 00009C 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, -}; - -/* 80C540B0-80C540D4 0000A8 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80C53FA0, - (void*)NULL, - (void*)NULL, - (void*)func_80C53F98, -}; - -/* 80C540D4-80C540E0 0000CC 000C+00 2/2 0/0 0/0 .data __vt__16daObj_Lbox_HIO_c */ -SECTION_DATA extern void* __vt__16daObj_Lbox_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daObj_Lbox_HIO_cFv, -}; +/* 80C540F8-80C54108 000018 0010+00 3/3 0/0 0/0 .bss l_HIO */ +static daObj_Lbox_HIO_c l_HIO; /* 80C5356C-80C5359C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__16daObj_Lbox_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Lbox_HIO_c::daObj_Lbox_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__ct__16daObj_Lbox_HIO_cFv.s" +daObj_Lbox_HIO_c::daObj_Lbox_HIO_c() { + field_0x4 = -1; + mSize = 2.0f; + mHeight = 0.0f; } -#pragma pop /* 80C5359C-80C53600 00011C 0064+00 1/0 0/0 0/0 .text daObj_Lbox_Draw__FP14obj_lbox_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lbox_Draw(obj_lbox_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Draw__FP14obj_lbox_class.s" +static int daObj_Lbox_Draw(obj_lbox_class* i_this) { + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->mTevStr); + mDoExt_modelUpdateDL(i_this->mpModel); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C53FC4-80C53FC8 000008 0004+00 0/1 0/0 0/0 .rodata @3877 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3877 = 4500.0f; -COMPILER_STRIP_GATE(0x80C53FC4, &lit_3877); -#pragma pop - -/* 80C53FC8-80C53FCC 00000C 0004+00 0/1 0/0 0/0 .rodata @3878 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3878 = -3450.0f; -COMPILER_STRIP_GATE(0x80C53FC8, &lit_3878); -#pragma pop - -/* 80C53FCC-80C53FD0 000010 0004+00 0/1 0/0 0/0 .rodata @3879 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3879 = 1.0f; -COMPILER_STRIP_GATE(0x80C53FCC, &lit_3879); -#pragma pop - -/* 80C53FD0-80C53FD4 000014 0004+00 0/1 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3880 = -1.0f; -COMPILER_STRIP_GATE(0x80C53FD0, &lit_3880); -#pragma pop - -/* 80C53FD4-80C53FD8 000018 0004+00 0/1 0/0 0/0 .rodata @3881 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3881 = 5.0f; -COMPILER_STRIP_GATE(0x80C53FD4, &lit_3881); -#pragma pop - -/* 80C53FD8-80C53FDC 00001C 0004+00 0/2 0/0 0/0 .rodata @3882 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3882 = 200.0f; -COMPILER_STRIP_GATE(0x80C53FD8, &lit_3882); -#pragma pop - -/* 80C53FDC-80C53FE0 000020 0004+00 0/1 0/0 0/0 .rodata @3883 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3883 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C53FDC, &lit_3883); -#pragma pop - -/* 80C53FE0-80C53FE4 000024 0004+00 0/1 0/0 0/0 .rodata @3884 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3884 = 3.5f; -COMPILER_STRIP_GATE(0x80C53FE0, &lit_3884); -#pragma pop - -/* 80C53FE4-80C53FE8 000028 0004+00 0/2 0/0 0/0 .rodata @3885 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3885 = 50.0f; -COMPILER_STRIP_GATE(0x80C53FE4, &lit_3885); -#pragma pop - -/* 80C540E8-80C540EC 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80C540E8[4]; - -/* 80C540EC-80C540F8 00000C 000C+00 1/1 0/0 0/0 .bss @3763 */ -static u8 lit_3763[12]; - -/* 80C540F8-80C54108 000018 0010+00 3/3 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[16]; /* 80C53600-80C5396C 000180 036C+00 1/1 0/0 0/0 .text action__FP14obj_lbox_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(obj_lbox_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/action__FP14obj_lbox_class.s" +static void action(obj_lbox_class* i_this) { + switch (i_this->field_0x57a) { + case 2: + break; + case 0: + i_this->current.pos.x = 0.0f; + i_this->current.pos.y = 4500.0f; + i_this->current.pos.z = -3450.0f; + if (i_this->mSph.ChkTgHit()) { + i_this->field_0x57a = 1; + i_this->field_0x57c = 0; + fopAcM_seStart(i_this, JA_SE_CM_MAGBALL_BOUND, 0); + i_this->field_0x57e[0] = 20; + } + break; + case 1: + if (i_this->field_0x57e[0] == 0) { + i_this->speed.y -= 5.0f; + i_this->shape_angle.z = 0.0f; + } else if (i_this->field_0x57e[0] < 0xf) { + i_this->shape_angle.z = cM_ssin(i_this->field_0x578 * 13000) * 200.0f; + i_this->speed.y -= 0.1f; + } + i_this->current.pos.y += i_this->speed.y; + if (i_this->mObjAcch.m_flags & 0x20) { + dComIfGp_getVibration().StartShock(5, 15, cXyz(0.0f, 1.0f, 0.0f)); + fopAcM_seStart(i_this, Z2SE_EN_FM_FOOTNOTE, 0); + i_this->field_0x57a = 2; + i_this->field_0x57c = 0; + fopAcM_effSmokeSet1(&i_this->field_0xa84, &i_this->field_0xa88, &i_this->current.pos, + &i_this->shape_angle, 3.5f, &i_this->mTevStr, 1); + } + break; + } + + fopAcM_OffStatus(i_this, 0); + i_this->mAttentionInfo.mFlags = 0; + i_this->mObjAcch.CrrPos(dComIfG_Bgsp()); + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); + mDoMtx_stack_c::scaleM(l_HIO.mSize, l_HIO.mSize, l_HIO.mSize); + i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); + i_this->mpBgW->Move(); + cXyz cStack_48(i_this->current.pos); + cStack_48.y += 50.0f * l_HIO.mSize; + if (i_this->field_0x57a != 0) { + cStack_48.y += 20000.0f; + } + i_this->mSph.SetC(cStack_48); + i_this->mSph.SetR(150.0f * l_HIO.mSize); + dComIfG_Ccsp()->Set(&i_this->mSph); + i_this->mEyePos = i_this->current.pos; + i_this->mAttentionInfo.mPosition = i_this->mEyePos; } -#pragma pop /* 80C5396C-80C539C8 0004EC 005C+00 2/1 0/0 0/0 .text daObj_Lbox_Execute__FP14obj_lbox_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lbox_Execute(obj_lbox_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Execute__FP14obj_lbox_class.s" +static int daObj_Lbox_Execute(obj_lbox_class* i_this) { + i_this->field_0x578++; + for (int i = 0; i < 2; i++) { + if (i_this->field_0x57e[i] != 0) { + i_this->field_0x57e[i]--; + } + } + action(i_this); + return 1; } -#pragma pop /* 80C539C8-80C539D0 000548 0008+00 1/0 0/0 0/0 .text daObj_Lbox_IsDelete__FP14obj_lbox_class */ -static bool daObj_Lbox_IsDelete(obj_lbox_class* param_0) { - return true; +static int daObj_Lbox_IsDelete(obj_lbox_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80C53FFC-80C53FFC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C53FFC = "Obj_lbox"; -#pragma pop - /* 80C539D0-80C53A38 000550 0068+00 1/0 0/0 0/0 .text daObj_Lbox_Delete__FP14obj_lbox_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lbox_Delete(obj_lbox_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Delete__FP14obj_lbox_class.s" +static int daObj_Lbox_Delete(obj_lbox_class* i_this) { + fopAcM_GetID(i_this); + dComIfG_resDelete(&i_this->mPhaseReq, "Obj_lbox"); + if (i_this->field_0xa8c != 0) { + data_80C540E8 = 0; + } + dComIfG_Bgsp().Release(i_this->mpBgW); + return 1; } -#pragma pop /* 80C53A38-80C53B3C 0005B8 0104+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + obj_lbox_class* _this = static_cast(i_this); + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_lbox", 4); + JUT_ASSERT(478, modelData != 0); + _this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (_this->mpModel == NULL) { + return 0; + } + + _this->mpBgW = new dBgW(); + if (_this->mpBgW == NULL) { + return 0; + } + + cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Obj_lbox", 7); + if (_this->mpBgW->Set(dzb, 1, &_this->mMtx) == true) { + return 0; + } + + _this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C53FE8-80C53FEC 00002C 0004+00 0/0 0/0 0/0 .rodata @3886 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3886 = 20000.0f; -COMPILER_STRIP_GATE(0x80C53FE8, &lit_3886); -#pragma pop - -/* 80C53FEC-80C53FF0 000030 0004+00 0/0 0/0 0/0 .rodata @3887 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3887 = 150.0f; -COMPILER_STRIP_GATE(0x80C53FEC, &lit_3887); -#pragma pop - -/* 80C53FF0-80C53FF4 000034 0004+00 0/1 0/0 0/0 .rodata @4020 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4020 = -200.0f; -COMPILER_STRIP_GATE(0x80C53FF0, &lit_4020); -#pragma pop - -/* 80C53FF4-80C53FF8 000038 0004+00 0/1 0/0 0/0 .rodata @4021 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4021 = -3000.0f; -COMPILER_STRIP_GATE(0x80C53FF4, &lit_4021); -#pragma pop - -/* 80C53FF8-80C53FFC 00003C 0004+00 0/1 0/0 0/0 .rodata @4022 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4022 = 3000.0f; -COMPILER_STRIP_GATE(0x80C53FF8, &lit_4022); -#pragma pop /* 80C53B3C-80C53E14 0006BC 02D8+00 1/0 0/0 0/0 .text daObj_Lbox_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_Lbox_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/daObj_Lbox_Create__FP10fopAc_ac_c.s" +static cPhs__Step daObj_Lbox_Create(fopAc_ac_c* i_this) { + obj_lbox_class* _this = static_cast(i_this); + fopAcM_SetupActor(_this, obj_lbox_class); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhaseReq, "Obj_lbox"); + + if (step == cPhs_COMPLEATE_e) { + _this->mParam = fopAcM_GetParam(i_this); + if (_this->mParam == 0xFF) { + _this->mParam = 0; + } + + if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x4b000)) { + return cPhs_ERROR_e; + } + + if (dComIfG_Bgsp().Regist(_this->mpBgW, _this)) { + return cPhs_ERROR_e; + } + + if (data_80C540E8 == 0) { + _this->field_0xa8c = 1; + data_80C540E8 = 1; + l_HIO.field_0x4 = -1; + } + + fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); + fopAcM_SetMin(_this, -200.0f, -3000.0f, -200.0f); + fopAcM_SetMax(_this, 200.0f, 3000.0f, 200.0f); + + _this->mStts.Init(0xff, 0, _this); + _this->mSph.Set(cc_sph_src); + _this->mSph.SetStts(&_this->mStts); + _this->mObjAcch.Set(&fopAcM_GetPosition_p(_this), &fopAcM_GetOldPosition_p(_this), _this, 1, + &_this->mAcchCir, &fopAcM_GetSpeed_p(_this), NULL, NULL); + _this->mAcchCir.SetWall(50.0f, 50.0f); + + _this->mAttentionInfo.field_0x0[2] = 0x16; + + daObj_Lbox_Execute(_this); + } + + return step; } -#pragma pop + +/* 80C54048-80C54068 -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Lbox_Method */ +static actor_method_class l_daObj_Lbox_Method = { + (process_method_func)daObj_Lbox_Create, (process_method_func)daObj_Lbox_Delete, + (process_method_func)daObj_Lbox_Execute, (process_method_func)daObj_Lbox_IsDelete, + (process_method_func)daObj_Lbox_Draw}; + +/* 80C54068-80C54098 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_LBOX */ +extern actor_process_profile_definition g_profile_OBJ_LBOX = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_OBJ_LBOX, + &g_fpcLf_Method.mBase, + sizeof(obj_lbox_class), + 0, + 0, + &g_fopAc_Method.base, + 0x29, + &l_daObj_Lbox_Method, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; /* 80C53E14-80C53E5C 000994 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGSph::~cM3dGSph() { -extern "C" asm void __dt__8cM3dGSphFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__8cM3dGSphFv.s" -} -#pragma pop /* 80C53E5C-80C53EA4 0009DC 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_lbox/d_a_obj_lbox/__dt__8cM3dGAabFv.s" -} -#pragma pop /* 80C53EA4-80C53F14 000A24 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 80C53F14-80C53F5C 000A94 0048+00 2/1 0/0 0/0 .text __dt__16daObj_Lbox_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_Lbox_HIO_c::~daObj_Lbox_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__dt__16daObj_Lbox_HIO_cFv.s" -} -#pragma pop /* 80C53F5C-80C53F98 000ADC 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lbox_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lbox_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/__sinit_d_a_obj_lbox_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C53F5C, __sinit_d_a_obj_lbox_cpp); -#pragma pop /* 80C53F98-80C53FA0 000B18 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80C53F98() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53F98.s" -} -#pragma pop /* 80C53FA0-80C53FA8 000B20 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80C53FA0() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox/func_80C53FA0.s" -} -#pragma pop /* 80C53FFC-80C53FFC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */