diff --git a/asm/d/d_k_wmark/__dt__9dkWmark_cFv.s b/asm/d/d_k_wmark/__dt__9dkWmark_cFv.s deleted file mode 100644 index 5c982b29a1f..00000000000 --- a/asm/d/d_k_wmark/__dt__9dkWmark_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80261640: -/* 80261640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261644 7C 08 02 A6 */ mflr r0 -/* 80261648 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026164C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261650 93 C1 00 08 */ stw r30, 8(r1) -/* 80261654 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80261658 7C 9F 23 78 */ mr r31, r4 -/* 8026165C 41 82 00 24 */ beq lbl_80261680 -/* 80261660 80 7E 00 F8 */ lwz r3, 0xf8(r30) -/* 80261664 28 03 00 00 */ cmplwi r3, 0 -/* 80261668 41 82 00 08 */ beq lbl_80261670 -/* 8026166C 4B DA DB 21 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap -lbl_80261670: -/* 80261670 7F E0 07 35 */ extsh. r0, r31 -/* 80261674 40 81 00 0C */ ble lbl_80261680 -/* 80261678 7F C3 F3 78 */ mr r3, r30 -/* 8026167C 48 06 D6 C1 */ bl __dl__FPv -lbl_80261680: -/* 80261680 7F C3 F3 78 */ mr r3, r30 -/* 80261684 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80261688 83 C1 00 08 */ lwz r30, 8(r1) -/* 8026168C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261690 7C 08 03 A6 */ mtlr r0 -/* 80261694 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261698 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s b/asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s deleted file mode 100644 index 93239463b51..00000000000 --- a/asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_8026141C: -/* 8026141C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261420 7C 08 02 A6 */ mflr r0 -/* 80261424 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261428 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026142C 93 C1 00 08 */ stw r30, 8(r1) -/* 80261430 7C 7F 1B 78 */ mr r31, r3 -/* 80261434 88 0D 8B B4 */ lbz r0, data_80451134(r13) -/* 80261438 7C 00 07 75 */ extsb. r0, r0 -/* 8026143C 40 82 00 3C */ bne lbl_80261478 -/* 80261440 C0 02 B5 B0 */ lfs f0, lit_3718(r2) -/* 80261444 3C 60 80 43 */ lis r3, data_80430C9C@ha /* 0x80430C9C@ha */ -/* 80261448 D4 03 0C 9C */ stfsu f0, data_80430C9C@l(r3) /* 0x80430C9C@l */ -/* 8026144C C0 02 B5 B4 */ lfs f0, lit_3719(r2) -/* 80261450 D0 03 00 04 */ stfs f0, 4(r3) -/* 80261454 C0 02 B5 B8 */ lfs f0, lit_3720(r2) -/* 80261458 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026145C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80261460 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 80261464 3C A0 80 43 */ lis r5, lit_3644@ha /* 0x80430C90@ha */ -/* 80261468 38 A5 0C 90 */ addi r5, r5, lit_3644@l /* 0x80430C90@l */ -/* 8026146C 48 10 07 B9 */ bl __register_global_object -/* 80261470 38 00 00 01 */ li r0, 1 -/* 80261474 98 0D 8B B4 */ stb r0, data_80451134(r13) -lbl_80261478: -/* 80261478 28 1F 00 00 */ cmplwi r31, 0 -/* 8026147C 41 82 00 34 */ beq lbl_802614B0 -/* 80261480 3B DF 01 00 */ addi r30, r31, 0x100 -/* 80261484 7F C3 F3 78 */ mr r3, r30 -/* 80261488 3C 80 80 3A */ lis r4, j3dDefaultLightInfo@ha /* 0x803A1EC8@ha */ -/* 8026148C 38 84 1E C8 */ addi r4, r4, j3dDefaultLightInfo@l /* 0x803A1EC8@l */ -/* 80261490 48 0C 42 35 */ bl __as__12J3DLightInfoFRC12J3DLightInfo -/* 80261494 38 7E 00 74 */ addi r3, r30, 0x74 -/* 80261498 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha /* 0x80018C0C@ha */ -/* 8026149C 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 0x80018C0C@l */ -/* 802614A0 38 A0 00 00 */ li r5, 0 -/* 802614A4 38 C0 00 74 */ li r6, 0x74 -/* 802614A8 38 E0 00 06 */ li r7, 6 -/* 802614AC 48 10 08 B5 */ bl __construct_array -lbl_802614B0: -/* 802614B0 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 802614B4 54 00 84 3E */ srwi r0, r0, 0x10 -/* 802614B8 B0 1F 04 8A */ sth r0, 0x48a(r31) -/* 802614BC 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 802614C0 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 802614C4 90 1F 00 F4 */ stw r0, 0xf4(r31) -/* 802614C8 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 802614CC 2C 00 00 04 */ cmpwi r0, 4 -/* 802614D0 41 80 00 0C */ blt lbl_802614DC -/* 802614D4 38 60 00 05 */ li r3, 5 -/* 802614D8 48 00 01 50 */ b lbl_80261628 -lbl_802614DC: -/* 802614DC 2C 00 00 03 */ cmpwi r0, 3 -/* 802614E0 40 82 00 10 */ bne lbl_802614F0 -/* 802614E4 38 00 00 02 */ li r0, 2 -/* 802614E8 B0 1F 04 8E */ sth r0, 0x48e(r31) -/* 802614EC 48 00 00 08 */ b lbl_802614F4 -lbl_802614F0: -/* 802614F0 B0 1F 04 8E */ sth r0, 0x48e(r31) -lbl_802614F4: -/* 802614F4 38 60 08 80 */ li r3, 0x880 -/* 802614F8 38 80 00 20 */ li r4, 0x20 -/* 802614FC 4B DA DB 49 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl -/* 80261500 90 7F 00 F8 */ stw r3, 0xf8(r31) -/* 80261504 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 80261508 28 00 00 00 */ cmplwi r0, 0 -/* 8026150C 41 82 00 4C */ beq lbl_80261558 -/* 80261510 3C 60 80 3A */ lis r3, d_d_k_wmark__stringBase0@ha /* 0x8039A494@ha */ -/* 80261514 38 63 A4 94 */ addi r3, r3, d_d_k_wmark__stringBase0@l /* 0x8039A494@l */ -/* 80261518 38 80 00 23 */ li r4, 0x23 -/* 8026151C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261520 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261524 3C A5 00 02 */ addis r5, r5, 2 -/* 80261528 38 C0 00 80 */ li r6, 0x80 -/* 8026152C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80261530 4B DD AD BD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80261534 3C 80 00 08 */ lis r4, 8 -/* 80261538 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8026153C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80261540 4B DB 37 15 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80261544 90 7F 00 FC */ stw r3, 0xfc(r31) -/* 80261548 4B DA DC AD */ bl mDoExt_restoreCurrentHeap__Fv -/* 8026154C 80 7F 00 F8 */ lwz r3, 0xf8(r31) -/* 80261550 4B DA DB 3D */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap -/* 80261554 48 00 00 0C */ b lbl_80261560 -lbl_80261558: -/* 80261558 38 60 00 05 */ li r3, 5 -/* 8026155C 48 00 00 CC */ b lbl_80261628 -lbl_80261560: -/* 80261560 80 9F 00 FC */ lwz r4, 0xfc(r31) -/* 80261564 28 04 00 00 */ cmplwi r4, 0 -/* 80261568 40 82 00 0C */ bne lbl_80261574 -/* 8026156C 38 60 00 05 */ li r3, 5 -/* 80261570 48 00 00 B8 */ b lbl_80261628 -lbl_80261574: -/* 80261574 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 80261578 2C 00 00 03 */ cmpwi r0, 3 -/* 8026157C 41 82 00 38 */ beq lbl_802615B4 -/* 80261580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261588 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8026158C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80261590 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80261594 41 82 00 20 */ beq lbl_802615B4 -/* 80261598 3C 60 80 43 */ lis r3, data_80430C9C@ha /* 0x80430C9C@ha */ -/* 8026159C C4 03 0C 9C */ lfsu f0, data_80430C9C@l(r3) /* 0x80430C9C@l */ -/* 802615A0 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 802615A4 C0 03 00 04 */ lfs f0, 4(r3) -/* 802615A8 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 802615AC C0 03 00 08 */ lfs f0, 8(r3) -/* 802615B0 D0 04 00 20 */ stfs f0, 0x20(r4) -lbl_802615B4: -/* 802615B4 7F E3 FB 78 */ mr r3, r31 -/* 802615B8 48 00 01 0D */ bl setMatrix__9dkWmark_cFv -/* 802615BC 2C 03 00 00 */ cmpwi r3, 0 -/* 802615C0 40 82 00 0C */ bne lbl_802615CC -/* 802615C4 38 60 00 05 */ li r3, 5 -/* 802615C8 48 00 00 60 */ b lbl_80261628 -lbl_802615CC: -/* 802615CC 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 802615D0 2C 00 00 01 */ cmpwi r0, 1 -/* 802615D4 41 82 00 14 */ beq lbl_802615E8 -/* 802615D8 2C 00 00 03 */ cmpwi r0, 3 -/* 802615DC 41 82 00 0C */ beq lbl_802615E8 -/* 802615E0 2C 00 00 02 */ cmpwi r0, 2 -/* 802615E4 40 82 00 1C */ bne lbl_80261600 -lbl_802615E8: -/* 802615E8 80 0D 8B B0 */ lwz r0, m_nowID__9dkWmark_c(r13) -/* 802615EC 90 1F 04 94 */ stw r0, 0x494(r31) -/* 802615F0 80 6D 8B B0 */ lwz r3, m_nowID__9dkWmark_c(r13) -/* 802615F4 38 03 00 01 */ addi r0, r3, 1 -/* 802615F8 90 0D 8B B0 */ stw r0, m_nowID__9dkWmark_c(r13) -/* 802615FC 48 00 00 0C */ b lbl_80261608 -lbl_80261600: -/* 80261600 38 00 00 01 */ li r0, 1 -/* 80261604 98 1F 04 88 */ stb r0, 0x488(r31) -lbl_80261608: -/* 80261608 C0 02 B5 B4 */ lfs f0, lit_3719(r2) -/* 8026160C D0 1F 04 90 */ stfs f0, 0x490(r31) -/* 80261610 38 7F 01 00 */ addi r3, r31, 0x100 -/* 80261614 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 80261618 7C 04 07 74 */ extsb r4, r0 -/* 8026161C 38 A0 00 FF */ li r5, 0xff -/* 80261620 4B F4 72 CD */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc -/* 80261624 38 60 00 04 */ li r3, 4 -lbl_80261628: -/* 80261628 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026162C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80261630 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261634 7C 08 03 A6 */ mtlr r0 -/* 80261638 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026163C 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wmark/dkWmark_Delete__FP9dkWmark_c.s b/asm/d/d_k_wmark/dkWmark_Delete__FP9dkWmark_c.s deleted file mode 100644 index 5ab51eaf82e..00000000000 --- a/asm/d/d_k_wmark/dkWmark_Delete__FP9dkWmark_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8026169C: -/* 8026169C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802616A0 7C 08 02 A6 */ mflr r0 -/* 802616A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802616A8 38 80 FF FF */ li r4, -1 -/* 802616AC 4B FF FF 95 */ bl __dt__9dkWmark_cFv -/* 802616B0 38 60 00 01 */ li r3, 1 -/* 802616B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802616B8 7C 08 03 A6 */ mtlr r0 -/* 802616BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802616C0 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wmark/dkWmark_Draw__FP9dkWmark_c.s b/asm/d/d_k_wmark/dkWmark_Draw__FP9dkWmark_c.s deleted file mode 100644 index 07e68bd8425..00000000000 --- a/asm/d/d_k_wmark/dkWmark_Draw__FP9dkWmark_c.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_80261A18: -/* 80261A18 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80261A1C 7C 08 02 A6 */ mflr r0 -/* 80261A20 90 01 00 34 */ stw r0, 0x34(r1) -/* 80261A24 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80261A28 7C 7F 1B 78 */ mr r31, r3 -/* 80261A2C C0 22 B5 E4 */ lfs f1, lit_3906(r2) -/* 80261A30 C0 03 00 E8 */ lfs f0, 0xe8(r3) -/* 80261A34 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80261A38 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 80261A3C 80 1F 00 E0 */ lwz r0, 0xe0(r31) -/* 80261A40 90 61 00 0C */ stw r3, 0xc(r1) -/* 80261A44 90 01 00 10 */ stw r0, 0x10(r1) -/* 80261A48 80 1F 00 E4 */ lwz r0, 0xe4(r31) -/* 80261A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261A50 3C 60 80 3E */ lis r3, mClipper__14mDoLib_clipper@ha /* 0x803DD8E4@ha */ -/* 80261A54 38 63 D8 E4 */ addi r3, r3, mClipper__14mDoLib_clipper@l /* 0x803DD8E4@l */ -/* 80261A58 3C 80 80 43 */ lis r4, j3dSys@ha /* 0x80434AC8@ha */ -/* 80261A5C 38 84 4A C8 */ addi r4, r4, j3dSys@l /* 0x80434AC8@l */ -/* 80261A60 38 A1 00 0C */ addi r5, r1, 0xc -/* 80261A64 48 01 1E 99 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf -/* 80261A68 2C 03 00 00 */ cmpwi r3, 0 -/* 80261A6C 41 82 00 0C */ beq lbl_80261A78 -/* 80261A70 38 60 00 01 */ li r3, 1 -/* 80261A74 48 00 00 CC */ b lbl_80261B40 -lbl_80261A78: -/* 80261A78 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80261A7C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80261A80 38 80 00 00 */ li r4, 0 -/* 80261A84 38 BF 00 DC */ addi r5, r31, 0xdc -/* 80261A88 38 DF 01 00 */ addi r6, r31, 0x100 -/* 80261A8C 4B F4 1D 39 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80261A90 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80261A94 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80261A98 80 9F 00 FC */ lwz r4, 0xfc(r31) -/* 80261A9C 80 84 00 04 */ lwz r4, 4(r4) -/* 80261AA0 38 BF 01 00 */ addi r5, r31, 0x100 -/* 80261AA4 4B F4 32 FD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80261AA8 A8 1F 04 8E */ lha r0, 0x48e(r31) -/* 80261AAC 54 04 10 3A */ slwi r4, r0, 2 -/* 80261AB0 3C 60 80 3A */ lis r3, data_8039A488@ha /* 0x8039A488@ha */ -/* 80261AB4 38 03 A4 88 */ addi r0, r3, data_8039A488@l /* 0x8039A488@l */ -/* 80261AB8 7C 60 22 14 */ add r3, r0, r4 -/* 80261ABC 88 03 00 00 */ lbz r0, 0(r3) -/* 80261AC0 98 01 00 08 */ stb r0, 8(r1) -/* 80261AC4 88 03 00 01 */ lbz r0, 1(r3) -/* 80261AC8 98 01 00 09 */ stb r0, 9(r1) -/* 80261ACC 88 03 00 02 */ lbz r0, 2(r3) -/* 80261AD0 98 01 00 0A */ stb r0, 0xa(r1) -/* 80261AD4 88 03 00 03 */ lbz r0, 3(r3) -/* 80261AD8 C8 22 B5 E8 */ lfd f1, lit_3908(r2) -/* 80261ADC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80261AE0 3C 00 43 30 */ lis r0, 0x4330 -/* 80261AE4 90 01 00 18 */ stw r0, 0x18(r1) -/* 80261AE8 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80261AEC EC 20 08 28 */ fsubs f1, f0, f1 -/* 80261AF0 C0 1F 04 90 */ lfs f0, 0x490(r31) -/* 80261AF4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80261AF8 FC 00 00 1E */ fctiwz f0, f0 -/* 80261AFC D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80261B00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80261B04 98 01 00 0B */ stb r0, 0xb(r1) -/* 80261B08 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 80261B0C 80 63 00 04 */ lwz r3, 4(r3) -/* 80261B10 80 63 00 60 */ lwz r3, 0x60(r3) -/* 80261B14 80 63 00 00 */ lwz r3, 0(r3) -/* 80261B18 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80261B1C 38 80 00 01 */ li r4, 1 -/* 80261B20 38 A1 00 08 */ addi r5, r1, 8 -/* 80261B24 81 83 00 00 */ lwz r12, 0(r3) -/* 80261B28 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 80261B2C 7D 89 03 A6 */ mtctr r12 -/* 80261B30 4E 80 04 21 */ bctrl -/* 80261B34 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 80261B38 4B DA C1 8D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80261B3C 38 60 00 01 */ li r3, 1 -lbl_80261B40: -/* 80261B40 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80261B44 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80261B48 7C 08 03 A6 */ mtlr r0 -/* 80261B4C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80261B50 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wmark/dkWmark_Execute__FP9dkWmark_c.s b/asm/d/d_k_wmark/dkWmark_Execute__FP9dkWmark_c.s deleted file mode 100644 index bb4d593e162..00000000000 --- a/asm/d/d_k_wmark/dkWmark_Execute__FP9dkWmark_c.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80261964: -/* 80261964 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261968 7C 08 02 A6 */ mflr r0 -/* 8026196C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261970 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261974 7C 7F 1B 78 */ mr r31, r3 -/* 80261978 88 03 04 88 */ lbz r0, 0x488(r3) -/* 8026197C 28 00 00 00 */ cmplwi r0, 0 -/* 80261980 40 82 00 24 */ bne lbl_802619A4 -/* 80261984 80 6D 8B B0 */ lwz r3, m_nowID__9dkWmark_c(r13) -/* 80261988 80 1F 04 94 */ lwz r0, 0x494(r31) -/* 8026198C 7C 63 00 50 */ subf r3, r3, r0 -/* 80261990 48 10 37 41 */ bl abs -/* 80261994 2C 03 00 14 */ cmpwi r3, 0x14 -/* 80261998 40 81 00 0C */ ble lbl_802619A4 -/* 8026199C 38 00 00 01 */ li r0, 1 -/* 802619A0 98 1F 04 88 */ stb r0, 0x488(r31) -lbl_802619A4: -/* 802619A4 88 1F 04 88 */ lbz r0, 0x488(r31) -/* 802619A8 28 00 00 00 */ cmplwi r0, 0 -/* 802619AC 41 82 00 14 */ beq lbl_802619C0 -/* 802619B0 C0 3F 04 90 */ lfs f1, 0x490(r31) -/* 802619B4 C0 02 B5 E0 */ lfs f0, lit_3873(r2) -/* 802619B8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802619BC D0 1F 04 90 */ stfs f0, 0x490(r31) -lbl_802619C0: -/* 802619C0 C0 3F 04 90 */ lfs f1, 0x490(r31) -/* 802619C4 C0 02 B5 C0 */ lfs f0, lit_3845(r2) -/* 802619C8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802619CC 4C 40 13 82 */ cror 2, 0, 2 -/* 802619D0 41 82 00 20 */ beq lbl_802619F0 -/* 802619D4 A8 1F 04 8C */ lha r0, 0x48c(r31) -/* 802619D8 2C 00 00 01 */ cmpwi r0, 1 -/* 802619DC 40 82 00 24 */ bne lbl_80261A00 -/* 802619E0 7F E3 FB 78 */ mr r3, r31 -/* 802619E4 4B FF FC E1 */ bl setMatrix__9dkWmark_cFv -/* 802619E8 2C 03 00 00 */ cmpwi r3, 0 -/* 802619EC 40 82 00 14 */ bne lbl_80261A00 -lbl_802619F0: -/* 802619F0 7F E3 FB 78 */ mr r3, r31 -/* 802619F4 4B DB DD 55 */ bl fopKyM_Delete__FPv -/* 802619F8 C0 02 B5 C0 */ lfs f0, lit_3845(r2) -/* 802619FC D0 1F 04 90 */ stfs f0, 0x490(r31) -lbl_80261A00: -/* 80261A00 38 60 00 01 */ li r3, 1 -/* 80261A04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80261A08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261A0C 7C 08 03 A6 */ mtlr r0 -/* 80261A10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261A14 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wmark/setMatrix__9dkWmark_cFv.s b/asm/d/d_k_wmark/setMatrix__9dkWmark_cFv.s deleted file mode 100644 index e84aaf88bae..00000000000 --- a/asm/d/d_k_wmark/setMatrix__9dkWmark_cFv.s +++ /dev/null @@ -1,184 +0,0 @@ -lbl_802616C4: -/* 802616C4 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 802616C8 7C 08 02 A6 */ mflr r0 -/* 802616CC 90 01 00 64 */ stw r0, 0x64(r1) -/* 802616D0 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 802616D4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 802616D8 39 61 00 50 */ addi r11, r1, 0x50 -/* 802616DC 48 10 0A F5 */ bl _savegpr_26 -/* 802616E0 7C 7D 1B 78 */ mr r29, r3 -/* 802616E4 C0 43 00 E4 */ lfs f2, 0xe4(r3) -/* 802616E8 C0 22 B5 BC */ lfs f1, lit_3844(r2) -/* 802616EC C0 03 00 E0 */ lfs f0, 0xe0(r3) -/* 802616F0 EC 21 00 2A */ fadds f1, f1, f0 -/* 802616F4 C0 03 00 DC */ lfs f0, 0xdc(r3) -/* 802616F8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 802616FC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80261700 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80261704 38 61 00 18 */ addi r3, r1, 0x18 -/* 80261708 4B DB C5 B5 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 8026170C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80261710 41 82 02 28 */ beq lbl_80261938 -/* 80261714 C0 0D 87 50 */ lfs f0, mGroundY__11fopAcM_gc_c(r13) -/* 80261718 D0 1D 00 E0 */ stfs f0, 0xe0(r29) -/* 8026171C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 80261720 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80261724 90 01 00 34 */ stw r0, 0x34(r1) -/* 80261728 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8026172C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261730 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 80261734 7F C3 F3 78 */ mr r3, r30 -/* 80261738 3C 80 80 3F */ lis r4, mGndCheck__11fopAcM_gc_c@ha /* 0x803F1CC4@ha */ -/* 8026173C 38 84 1C C4 */ addi r4, r4, mGndCheck__11fopAcM_gc_c@l /* 0x803F1CC4@l */ -/* 80261740 3B E4 00 14 */ addi r31, r4, 0x14 -/* 80261744 7F E4 FB 78 */ mr r4, r31 -/* 80261748 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8026174C 4B E1 2F F9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80261750 38 61 00 24 */ addi r3, r1, 0x24 -/* 80261754 48 00 59 D5 */ bl atan2sX_Z__4cXyzCFv -/* 80261758 A8 1D 04 8A */ lha r0, 0x48a(r29) -/* 8026175C 7C 00 18 50 */ subf r0, r0, r3 -/* 80261760 7C 1A 07 34 */ extsh r26, r0 -/* 80261764 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80261768 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8026176C C0 02 B5 C0 */ lfs f0, lit_3845(r2) -/* 80261770 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80261774 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80261778 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8026177C 38 61 00 0C */ addi r3, r1, 0xc -/* 80261780 48 0E 59 B9 */ bl PSVECSquareMag -/* 80261784 C0 02 B5 C0 */ lfs f0, lit_3845(r2) -/* 80261788 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026178C 40 81 00 58 */ ble lbl_802617E4 -/* 80261790 FC 00 08 34 */ frsqrte f0, f1 -/* 80261794 C8 82 B5 C8 */ lfd f4, lit_3846(r2) -/* 80261798 FC 44 00 32 */ fmul f2, f4, f0 -/* 8026179C C8 62 B5 D0 */ lfd f3, lit_3847(r2) -/* 802617A0 FC 00 00 32 */ fmul f0, f0, f0 -/* 802617A4 FC 01 00 32 */ fmul f0, f1, f0 -/* 802617A8 FC 03 00 28 */ fsub f0, f3, f0 -/* 802617AC FC 02 00 32 */ fmul f0, f2, f0 -/* 802617B0 FC 44 00 32 */ fmul f2, f4, f0 -/* 802617B4 FC 00 00 32 */ fmul f0, f0, f0 -/* 802617B8 FC 01 00 32 */ fmul f0, f1, f0 -/* 802617BC FC 03 00 28 */ fsub f0, f3, f0 -/* 802617C0 FC 02 00 32 */ fmul f0, f2, f0 -/* 802617C4 FC 44 00 32 */ fmul f2, f4, f0 -/* 802617C8 FC 00 00 32 */ fmul f0, f0, f0 -/* 802617CC FC 01 00 32 */ fmul f0, f1, f0 -/* 802617D0 FC 03 00 28 */ fsub f0, f3, f0 -/* 802617D4 FC 02 00 32 */ fmul f0, f2, f0 -/* 802617D8 FF E1 00 32 */ fmul f31, f1, f0 -/* 802617DC FF E0 F8 18 */ frsp f31, f31 -/* 802617E0 48 00 00 90 */ b lbl_80261870 -lbl_802617E4: -/* 802617E4 C8 02 B5 D8 */ lfd f0, lit_3848(r2) -/* 802617E8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802617EC 40 80 00 10 */ bge lbl_802617FC -/* 802617F0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 802617F4 C3 E3 0A E0 */ lfs f31, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 802617F8 48 00 00 78 */ b lbl_80261870 -lbl_802617FC: -/* 802617FC D0 21 00 08 */ stfs f1, 8(r1) -/* 80261800 80 81 00 08 */ lwz r4, 8(r1) -/* 80261804 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80261808 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8026180C 7C 03 00 00 */ cmpw r3, r0 -/* 80261810 41 82 00 14 */ beq lbl_80261824 -/* 80261814 40 80 00 40 */ bge lbl_80261854 -/* 80261818 2C 03 00 00 */ cmpwi r3, 0 -/* 8026181C 41 82 00 20 */ beq lbl_8026183C -/* 80261820 48 00 00 34 */ b lbl_80261854 -lbl_80261824: -/* 80261824 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80261828 41 82 00 0C */ beq lbl_80261834 -/* 8026182C 38 00 00 01 */ li r0, 1 -/* 80261830 48 00 00 28 */ b lbl_80261858 -lbl_80261834: -/* 80261834 38 00 00 02 */ li r0, 2 -/* 80261838 48 00 00 20 */ b lbl_80261858 -lbl_8026183C: -/* 8026183C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80261840 41 82 00 0C */ beq lbl_8026184C -/* 80261844 38 00 00 05 */ li r0, 5 -/* 80261848 48 00 00 10 */ b lbl_80261858 -lbl_8026184C: -/* 8026184C 38 00 00 03 */ li r0, 3 -/* 80261850 48 00 00 08 */ b lbl_80261858 -lbl_80261854: -/* 80261854 38 00 00 04 */ li r0, 4 -lbl_80261858: -/* 80261858 2C 00 00 01 */ cmpwi r0, 1 -/* 8026185C 40 82 00 10 */ bne lbl_8026186C -/* 80261860 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80261864 C3 E3 0A E0 */ lfs f31, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80261868 48 00 00 08 */ b lbl_80261870 -lbl_8026186C: -/* 8026186C FF E0 08 90 */ fmr f31, f1 -lbl_80261870: -/* 80261870 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80261874 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80261878 C0 3D 00 DC */ lfs f1, 0xdc(r29) -/* 8026187C C0 42 B5 B4 */ lfs f2, lit_3719(r2) -/* 80261880 C0 1D 00 E0 */ lfs f0, 0xe0(r29) -/* 80261884 EC 42 00 2A */ fadds f2, f2, f0 -/* 80261888 C0 7D 00 E4 */ lfs f3, 0xe4(r29) -/* 8026188C 48 0E 50 5D */ bl PSMTXTrans -/* 80261890 57 5A 04 38 */ rlwinm r26, r26, 0, 0x10, 0x1c -/* 80261894 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80261898 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 8026189C 7C 03 D4 2E */ lfsx f0, r3, r26 -/* 802618A0 FC 00 00 50 */ fneg f0, f0 -/* 802618A4 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 802618A8 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 802618AC 48 00 5D C9 */ bl cM_atan2s__Fff -/* 802618B0 7C 7B 1B 78 */ mr r27, r3 -/* 802618B4 AB 9D 04 8A */ lha r28, 0x48a(r29) -/* 802618B8 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 802618BC 38 03 9A 20 */ addi r0, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 802618C0 7C 60 D2 14 */ add r3, r0, r26 -/* 802618C4 C0 03 00 04 */ lfs f0, 4(r3) -/* 802618C8 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 802618CC C0 41 00 28 */ lfs f2, 0x28(r1) -/* 802618D0 48 00 5D A5 */ bl cM_atan2s__Fff -/* 802618D4 7C 64 1B 78 */ mr r4, r3 -/* 802618D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 802618DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 802618E0 7F 85 E3 78 */ mr r5, r28 -/* 802618E4 7F 66 DB 78 */ mr r6, r27 -/* 802618E8 4B DA A9 B9 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 802618EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 802618F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 802618F4 80 9D 00 FC */ lwz r4, 0xfc(r29) -/* 802618F8 38 84 00 24 */ addi r4, r4, 0x24 -/* 802618FC 48 0E 4B B5 */ bl PSMTXCopy -/* 80261900 7F C3 F3 78 */ mr r3, r30 -/* 80261904 7F E4 FB 78 */ mr r4, r31 -/* 80261908 4B E1 31 B5 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo -/* 8026190C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80261910 41 82 00 10 */ beq lbl_80261920 -/* 80261914 38 00 00 01 */ li r0, 1 -/* 80261918 B0 1D 04 8C */ sth r0, 0x48c(r29) -/* 8026191C 48 00 00 0C */ b lbl_80261928 -lbl_80261920: -/* 80261920 38 00 00 00 */ li r0, 0 -/* 80261924 B0 1D 04 8C */ sth r0, 0x48c(r29) -lbl_80261928: -/* 80261928 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8026192C 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 80261930 90 01 00 34 */ stw r0, 0x34(r1) -/* 80261934 48 00 00 0C */ b lbl_80261940 -lbl_80261938: -/* 80261938 38 60 00 00 */ li r3, 0 -/* 8026193C 48 00 00 08 */ b lbl_80261944 -lbl_80261940: -/* 80261940 38 60 00 01 */ li r3, 1 -lbl_80261944: -/* 80261944 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80261948 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 8026194C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80261950 48 10 08 CD */ bl _restgpr_26 -/* 80261954 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80261958 7C 08 03 A6 */ mtlr r0 -/* 8026195C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80261960 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/__dt__11dkWpillar_cFv.s b/asm/d/d_k_wpillar/__dt__11dkWpillar_cFv.s deleted file mode 100644 index dfd03c655dd..00000000000 --- a/asm/d/d_k_wpillar/__dt__11dkWpillar_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80261F24: -/* 80261F24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261F28 7C 08 02 A6 */ mflr r0 -/* 80261F2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261F30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80261F34 93 C1 00 08 */ stw r30, 8(r1) -/* 80261F38 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80261F3C 7C 9E 23 78 */ mr r30, r4 -/* 80261F40 41 82 00 90 */ beq lbl_80261FD0 -/* 80261F44 80 7F 01 48 */ lwz r3, 0x148(r31) -/* 80261F48 28 03 00 00 */ cmplwi r3, 0 -/* 80261F4C 41 82 00 08 */ beq lbl_80261F54 -/* 80261F50 4B DA D2 3D */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap -lbl_80261F54: -/* 80261F54 34 1F 01 30 */ addic. r0, r31, 0x130 -/* 80261F58 41 82 00 20 */ beq lbl_80261F78 -/* 80261F5C 34 1F 01 30 */ addic. r0, r31, 0x130 -/* 80261F60 41 82 00 18 */ beq lbl_80261F78 -/* 80261F64 34 1F 01 30 */ addic. r0, r31, 0x130 -/* 80261F68 41 82 00 10 */ beq lbl_80261F78 -/* 80261F6C 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80261F70 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80261F74 90 1F 01 30 */ stw r0, 0x130(r31) -lbl_80261F78: -/* 80261F78 34 1F 01 18 */ addic. r0, r31, 0x118 -/* 80261F7C 41 82 00 20 */ beq lbl_80261F9C -/* 80261F80 34 1F 01 18 */ addic. r0, r31, 0x118 -/* 80261F84 41 82 00 18 */ beq lbl_80261F9C -/* 80261F88 34 1F 01 18 */ addic. r0, r31, 0x118 -/* 80261F8C 41 82 00 10 */ beq lbl_80261F9C -/* 80261F90 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80261F94 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80261F98 90 1F 01 18 */ stw r0, 0x118(r31) -lbl_80261F9C: -/* 80261F9C 34 1F 00 FC */ addic. r0, r31, 0xfc -/* 80261FA0 41 82 00 20 */ beq lbl_80261FC0 -/* 80261FA4 34 1F 00 FC */ addic. r0, r31, 0xfc -/* 80261FA8 41 82 00 18 */ beq lbl_80261FC0 -/* 80261FAC 34 1F 00 FC */ addic. r0, r31, 0xfc -/* 80261FB0 41 82 00 10 */ beq lbl_80261FC0 -/* 80261FB4 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80261FB8 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80261FBC 90 1F 00 FC */ stw r0, 0xfc(r31) -lbl_80261FC0: -/* 80261FC0 7F C0 07 35 */ extsh. r0, r30 -/* 80261FC4 40 81 00 0C */ ble lbl_80261FD0 -/* 80261FC8 7F E3 FB 78 */ mr r3, r31 -/* 80261FCC 48 06 CD 71 */ bl __dl__FPv -lbl_80261FD0: -/* 80261FD0 7F E3 FB 78 */ mr r3, r31 -/* 80261FD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80261FD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80261FDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261FE0 7C 08 03 A6 */ mtlr r0 -/* 80261FE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261FE8 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/create__11dkWpillar_cFv.s b/asm/d/d_k_wpillar/create__11dkWpillar_cFv.s deleted file mode 100644 index 6e805f0aaca..00000000000 --- a/asm/d/d_k_wpillar/create__11dkWpillar_cFv.s +++ /dev/null @@ -1,248 +0,0 @@ -lbl_80261B54: -/* 80261B54 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80261B58 7C 08 02 A6 */ mflr r0 -/* 80261B5C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80261B60 39 61 00 30 */ addi r11, r1, 0x30 -/* 80261B64 48 10 06 75 */ bl _savegpr_28 -/* 80261B68 7C 7F 1B 78 */ mr r31, r3 -/* 80261B6C 28 03 00 00 */ cmplwi r3, 0 -/* 80261B70 41 82 00 A4 */ beq lbl_80261C14 -/* 80261B74 7C 7C 1B 78 */ mr r28, r3 -/* 80261B78 3B A3 00 FC */ addi r29, r3, 0xfc -/* 80261B7C 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80261B80 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80261B84 90 1D 00 00 */ stw r0, 0(r29) -/* 80261B88 7F A3 EB 78 */ mr r3, r29 -/* 80261B8C 38 80 00 00 */ li r4, 0 -/* 80261B90 48 0C 68 6D */ bl init__12J3DFrameCtrlFs -/* 80261B94 38 00 00 00 */ li r0, 0 -/* 80261B98 90 1D 00 18 */ stw r0, 0x18(r29) -/* 80261B9C 3B BC 01 18 */ addi r29, r28, 0x118 -/* 80261BA0 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80261BA4 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80261BA8 90 1C 01 18 */ stw r0, 0x118(r28) -/* 80261BAC 7F A3 EB 78 */ mr r3, r29 -/* 80261BB0 38 80 00 00 */ li r4, 0 -/* 80261BB4 48 0C 68 49 */ bl init__12J3DFrameCtrlFs -/* 80261BB8 38 00 00 00 */ li r0, 0 -/* 80261BBC 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80261BC0 3B BC 01 30 */ addi r29, r28, 0x130 -/* 80261BC4 3C 60 80 3A */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x803A3354@ha */ -/* 80261BC8 38 03 33 54 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x803A3354@l */ -/* 80261BCC 90 1C 01 30 */ stw r0, 0x130(r28) -/* 80261BD0 7F A3 EB 78 */ mr r3, r29 -/* 80261BD4 38 80 00 00 */ li r4, 0 -/* 80261BD8 48 0C 68 25 */ bl init__12J3DFrameCtrlFs -/* 80261BDC 38 00 00 00 */ li r0, 0 -/* 80261BE0 90 1D 00 14 */ stw r0, 0x14(r29) -/* 80261BE4 3B BC 01 4C */ addi r29, r28, 0x14c -/* 80261BE8 7F A3 EB 78 */ mr r3, r29 -/* 80261BEC 3C 80 80 3A */ lis r4, j3dDefaultLightInfo@ha /* 0x803A1EC8@ha */ -/* 80261BF0 38 84 1E C8 */ addi r4, r4, j3dDefaultLightInfo@l /* 0x803A1EC8@l */ -/* 80261BF4 48 0C 3A D1 */ bl __as__12J3DLightInfoFRC12J3DLightInfo -/* 80261BF8 38 7D 00 74 */ addi r3, r29, 0x74 -/* 80261BFC 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha /* 0x80018C0C@ha */ -/* 80261C00 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 0x80018C0C@l */ -/* 80261C04 38 A0 00 00 */ li r5, 0 -/* 80261C08 38 C0 00 74 */ li r6, 0x74 -/* 80261C0C 38 E0 00 06 */ li r7, 6 -/* 80261C10 48 10 01 51 */ bl __construct_array -lbl_80261C14: -/* 80261C14 38 7F 00 DC */ addi r3, r31, 0xdc -/* 80261C18 4B DB C0 A5 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 80261C1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80261C20 41 82 00 40 */ beq lbl_80261C60 -/* 80261C24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261C28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261C2C 3B C3 0F 38 */ addi r30, r3, 0xf38 -/* 80261C30 7F C3 F3 78 */ mr r3, r30 -/* 80261C34 3C 80 80 3F */ lis r4, mGndCheck__11fopAcM_gc_c@ha /* 0x803F1CC4@ha */ -/* 80261C38 38 84 1C C4 */ addi r4, r4, mGndCheck__11fopAcM_gc_c@l /* 0x803F1CC4@l */ -/* 80261C3C 3B A4 00 14 */ addi r29, r4, 0x14 -/* 80261C40 7F A4 EB 78 */ mr r4, r29 -/* 80261C44 4B E1 34 BD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80261C48 7C 7C 1B 78 */ mr r28, r3 -/* 80261C4C 7F C3 F3 78 */ mr r3, r30 -/* 80261C50 7F A4 EB 78 */ mr r4, r29 -/* 80261C54 4B E1 2F 95 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80261C58 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 80261C5C 48 00 00 10 */ b lbl_80261C6C -lbl_80261C60: -/* 80261C60 8B 8D 87 E4 */ lbz r28, mStayNo__20dStage_roomControl_c+0x0(r13) -/* 80261C64 7F 9C 07 74 */ extsb r28, r28 -/* 80261C68 38 A0 00 FF */ li r5, 0xff -lbl_80261C6C: -/* 80261C6C 38 7F 01 4C */ addi r3, r31, 0x14c -/* 80261C70 7F 84 07 74 */ extsb r4, r28 -/* 80261C74 4B F4 6C 79 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc -/* 80261C78 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80261C7C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80261C80 38 80 00 10 */ li r4, 0x10 -/* 80261C84 38 BF 00 DC */ addi r5, r31, 0xdc -/* 80261C88 38 DF 01 4C */ addi r6, r31, 0x14c -/* 80261C8C 4B F4 1B 39 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80261C90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261C94 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261C98 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80261C9C 38 80 00 00 */ li r4, 0 -/* 80261CA0 90 81 00 08 */ stw r4, 8(r1) -/* 80261CA4 7F 80 07 74 */ extsb r0, r28 -/* 80261CA8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80261CAC 90 81 00 10 */ stw r4, 0x10(r1) -/* 80261CB0 90 81 00 14 */ stw r4, 0x14(r1) -/* 80261CB4 90 81 00 18 */ stw r4, 0x18(r1) -/* 80261CB8 38 80 00 00 */ li r4, 0 -/* 80261CBC 38 A0 01 BD */ li r5, 0x1bd -/* 80261CC0 38 DF 00 DC */ addi r6, r31, 0xdc -/* 80261CC4 38 FF 01 4C */ addi r7, r31, 0x14c -/* 80261CC8 39 00 00 00 */ li r8, 0 -/* 80261CCC 39 3F 00 E8 */ addi r9, r31, 0xe8 -/* 80261CD0 39 40 00 FF */ li r10, 0xff -/* 80261CD4 C0 22 B5 F8 */ lfs f1, lit_3838(r2) -/* 80261CD8 4B DE AD B9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80261CDC 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 80261CE0 2C 00 00 03 */ cmpwi r0, 3 -/* 80261CE4 41 82 00 48 */ beq lbl_80261D2C -/* 80261CE8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) -/* 80261CEC 38 80 00 00 */ li r4, 0 -/* 80261CF0 90 81 00 08 */ stw r4, 8(r1) -/* 80261CF4 7F 80 07 74 */ extsb r0, r28 -/* 80261CF8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80261CFC 90 81 00 10 */ stw r4, 0x10(r1) -/* 80261D00 90 81 00 14 */ stw r4, 0x14(r1) -/* 80261D04 90 81 00 18 */ stw r4, 0x18(r1) -/* 80261D08 38 80 00 00 */ li r4, 0 -/* 80261D0C 38 A0 01 BE */ li r5, 0x1be -/* 80261D10 38 DF 00 DC */ addi r6, r31, 0xdc -/* 80261D14 38 FF 01 4C */ addi r7, r31, 0x14c -/* 80261D18 39 00 00 00 */ li r8, 0 -/* 80261D1C 39 3F 00 E8 */ addi r9, r31, 0xe8 -/* 80261D20 39 40 00 FF */ li r10, 0xff -/* 80261D24 C0 22 B5 F8 */ lfs f1, lit_3838(r2) -/* 80261D28 4B DE AD 69 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -lbl_80261D2C: -/* 80261D2C 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 80261D30 2C 00 00 01 */ cmpwi r0, 1 -/* 80261D34 40 82 00 0C */ bne lbl_80261D40 -/* 80261D38 38 60 00 05 */ li r3, 5 -/* 80261D3C 48 00 01 B0 */ b lbl_80261EEC -lbl_80261D40: -/* 80261D40 38 60 22 00 */ li r3, 0x2200 -/* 80261D44 38 80 00 20 */ li r4, 0x20 -/* 80261D48 4B DA D2 FD */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl -/* 80261D4C 90 7F 01 48 */ stw r3, 0x148(r31) -/* 80261D50 80 1F 01 48 */ lwz r0, 0x148(r31) -/* 80261D54 28 00 00 00 */ cmplwi r0, 0 -/* 80261D58 41 82 01 04 */ beq lbl_80261E5C -/* 80261D5C 38 62 B5 F0 */ la r3, l_arcName(r2) /* 80454FF0-_SDA2_BASE_ */ -/* 80261D60 38 80 00 1C */ li r4, 0x1c -/* 80261D64 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80261D68 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80261D6C 3F 85 00 02 */ addis r28, r5, 2 -/* 80261D70 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 80261D74 7F 85 E3 78 */ mr r5, r28 -/* 80261D78 38 C0 00 80 */ li r6, 0x80 -/* 80261D7C 4B DD A5 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80261D80 7C 7D 1B 78 */ mr r29, r3 -/* 80261D84 3C 80 00 08 */ lis r4, 8 -/* 80261D88 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80261D8C 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80261D90 4B DB 2E C5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80261D94 90 7F 00 F8 */ stw r3, 0xf8(r31) -/* 80261D98 38 62 B5 F0 */ la r3, l_arcName(r2) /* 80454FF0-_SDA2_BASE_ */ -/* 80261D9C 38 80 00 0B */ li r4, 0xb -/* 80261DA0 7F 85 E3 78 */ mr r5, r28 -/* 80261DA4 38 C0 00 80 */ li r6, 0x80 -/* 80261DA8 4B DD A5 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80261DAC 7C 64 1B 78 */ mr r4, r3 -/* 80261DB0 38 7F 00 FC */ addi r3, r31, 0xfc -/* 80261DB4 38 A0 00 01 */ li r5, 1 -/* 80261DB8 38 C0 00 00 */ li r6, 0 -/* 80261DBC C0 22 B5 F8 */ lfs f1, lit_3838(r2) -/* 80261DC0 38 E0 00 00 */ li r7, 0 -/* 80261DC4 39 00 FF FF */ li r8, -1 -/* 80261DC8 39 20 00 00 */ li r9, 0 -/* 80261DCC 4B DA BA 11 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80261DD0 7C 7E 1B 78 */ mr r30, r3 -/* 80261DD4 38 62 B5 F0 */ la r3, l_arcName(r2) /* 80454FF0-_SDA2_BASE_ */ -/* 80261DD8 38 80 00 3B */ li r4, 0x3b -/* 80261DDC 7F 85 E3 78 */ mr r5, r28 -/* 80261DE0 38 C0 00 80 */ li r6, 0x80 -/* 80261DE4 4B DD A5 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80261DE8 7C 65 1B 78 */ mr r5, r3 -/* 80261DEC 38 7F 01 18 */ addi r3, r31, 0x118 -/* 80261DF0 38 9D 00 58 */ addi r4, r29, 0x58 -/* 80261DF4 38 C0 00 00 */ li r6, 0 -/* 80261DF8 38 E0 00 02 */ li r7, 2 -/* 80261DFC C0 22 B5 F8 */ lfs f1, lit_3838(r2) -/* 80261E00 39 00 00 00 */ li r8, 0 -/* 80261E04 39 20 FF FF */ li r9, -1 -/* 80261E08 4B DA B8 35 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80261E0C 7F DE 18 38 */ and r30, r30, r3 -/* 80261E10 38 62 B5 F0 */ la r3, l_arcName(r2) /* 80454FF0-_SDA2_BASE_ */ -/* 80261E14 38 80 00 2E */ li r4, 0x2e -/* 80261E18 7F 85 E3 78 */ mr r5, r28 -/* 80261E1C 38 C0 00 80 */ li r6, 0x80 -/* 80261E20 4B DD A4 CD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80261E24 7C 65 1B 78 */ mr r5, r3 -/* 80261E28 38 7F 01 30 */ addi r3, r31, 0x130 -/* 80261E2C 38 9D 00 58 */ addi r4, r29, 0x58 -/* 80261E30 38 C0 00 00 */ li r6, 0 -/* 80261E34 38 E0 00 02 */ li r7, 2 -/* 80261E38 C0 22 B5 F8 */ lfs f1, lit_3838(r2) -/* 80261E3C 39 00 00 00 */ li r8, 0 -/* 80261E40 39 20 FF FF */ li r9, -1 -/* 80261E44 4B DA B8 C9 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80261E48 7F DE 18 38 */ and r30, r30, r3 -/* 80261E4C 4B DA D3 A9 */ bl mDoExt_restoreCurrentHeap__Fv -/* 80261E50 80 7F 01 48 */ lwz r3, 0x148(r31) -/* 80261E54 4B DA D2 39 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap -/* 80261E58 48 00 00 0C */ b lbl_80261E64 -lbl_80261E5C: -/* 80261E5C 38 60 00 05 */ li r3, 5 -/* 80261E60 48 00 00 8C */ b lbl_80261EEC -lbl_80261E64: -/* 80261E64 80 1F 00 F8 */ lwz r0, 0xf8(r31) -/* 80261E68 28 00 00 00 */ cmplwi r0, 0 -/* 80261E6C 41 82 00 0C */ beq lbl_80261E78 -/* 80261E70 2C 1E 00 00 */ cmpwi r30, 0 -/* 80261E74 40 82 00 0C */ bne lbl_80261E80 -lbl_80261E78: -/* 80261E78 38 60 00 05 */ li r3, 5 -/* 80261E7C 48 00 00 70 */ b lbl_80261EEC -lbl_80261E80: -/* 80261E80 80 1F 00 F4 */ lwz r0, 0xf4(r31) -/* 80261E84 2C 00 00 02 */ cmpwi r0, 2 -/* 80261E88 40 82 00 18 */ bne lbl_80261EA0 -/* 80261E8C C0 22 B5 FC */ lfs f1, lit_3839(r2) -/* 80261E90 D0 3F 00 E8 */ stfs f1, 0xe8(r31) -/* 80261E94 C0 02 B6 00 */ lfs f0, lit_3840(r2) -/* 80261E98 D0 1F 00 EC */ stfs f0, 0xec(r31) -/* 80261E9C D0 3F 00 F0 */ stfs f1, 0xf0(r31) -lbl_80261EA0: -/* 80261EA0 80 7F 00 F8 */ lwz r3, 0xf8(r31) -/* 80261EA4 C0 1F 00 E8 */ lfs f0, 0xe8(r31) -/* 80261EA8 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80261EAC C0 1F 00 EC */ lfs f0, 0xec(r31) -/* 80261EB0 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80261EB4 C0 1F 00 F0 */ lfs f0, 0xf0(r31) -/* 80261EB8 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80261EBC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80261EC0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80261EC4 C0 3F 00 DC */ lfs f1, 0xdc(r31) -/* 80261EC8 C0 5F 00 E0 */ lfs f2, 0xe0(r31) -/* 80261ECC C0 7F 00 E4 */ lfs f3, 0xe4(r31) -/* 80261ED0 48 0E 4A 19 */ bl PSMTXTrans -/* 80261ED4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80261ED8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80261EDC 80 9F 00 F8 */ lwz r4, 0xf8(r31) -/* 80261EE0 38 84 00 24 */ addi r4, r4, 0x24 -/* 80261EE4 48 0E 45 CD */ bl PSMTXCopy -/* 80261EE8 38 60 00 04 */ li r3, 4 -lbl_80261EEC: -/* 80261EEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80261EF0 48 10 03 35 */ bl _restgpr_28 -/* 80261EF4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80261EF8 7C 08 03 A6 */ mtlr r0 -/* 80261EFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80261F00 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/dkWpillar_Create__FP12kankyo_class.s b/asm/d/d_k_wpillar/dkWpillar_Create__FP12kankyo_class.s deleted file mode 100644 index cb9cc3a2924..00000000000 --- a/asm/d/d_k_wpillar/dkWpillar_Create__FP12kankyo_class.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80261F04: -/* 80261F04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261F08 7C 08 02 A6 */ mflr r0 -/* 80261F0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261F10 4B FF FC 45 */ bl create__11dkWpillar_cFv -/* 80261F14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80261F18 7C 08 03 A6 */ mtlr r0 -/* 80261F1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261F20 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/dkWpillar_Delete__FP11dkWpillar_c.s b/asm/d/d_k_wpillar/dkWpillar_Delete__FP11dkWpillar_c.s deleted file mode 100644 index 614fb81fa5f..00000000000 --- a/asm/d/d_k_wpillar/dkWpillar_Delete__FP11dkWpillar_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80261FEC: -/* 80261FEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80261FF0 7C 08 02 A6 */ mflr r0 -/* 80261FF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261FF8 38 80 FF FF */ li r4, -1 -/* 80261FFC 4B FF FF 29 */ bl __dt__11dkWpillar_cFv -/* 80262000 38 60 00 01 */ li r3, 1 -/* 80262004 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80262008 7C 08 03 A6 */ mtlr r0 -/* 8026200C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80262010 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/dkWpillar_Draw__FP11dkWpillar_c.s b/asm/d/d_k_wpillar/dkWpillar_Draw__FP11dkWpillar_c.s deleted file mode 100644 index 4130fdb1ef0..00000000000 --- a/asm/d/d_k_wpillar/dkWpillar_Draw__FP11dkWpillar_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802621AC: -/* 802621AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802621B0 7C 08 02 A6 */ mflr r0 -/* 802621B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802621B8 4B FF FF 11 */ bl draw__11dkWpillar_cFv -/* 802621BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802621C0 7C 08 03 A6 */ mtlr r0 -/* 802621C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802621C8 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/dkWpillar_Execute__FP11dkWpillar_c.s b/asm/d/d_k_wpillar/dkWpillar_Execute__FP11dkWpillar_c.s deleted file mode 100644 index b4493fa9b88..00000000000 --- a/asm/d/d_k_wpillar/dkWpillar_Execute__FP11dkWpillar_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802620A8: -/* 802620A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802620AC 7C 08 02 A6 */ mflr r0 -/* 802620B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802620B4 4B FF FF 61 */ bl execute__11dkWpillar_cFv -/* 802620B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802620BC 7C 08 03 A6 */ mtlr r0 -/* 802620C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802620C4 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/draw__11dkWpillar_cFv.s b/asm/d/d_k_wpillar/draw__11dkWpillar_cFv.s deleted file mode 100644 index 0d482b79349..00000000000 --- a/asm/d/d_k_wpillar/draw__11dkWpillar_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_802620C8: -/* 802620C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802620CC 7C 08 02 A6 */ mflr r0 -/* 802620D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802620D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802620D8 93 C1 00 08 */ stw r30, 8(r1) -/* 802620DC 7C 7E 1B 78 */ mr r30, r3 -/* 802620E0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 802620E4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 802620E8 38 80 00 10 */ li r4, 0x10 -/* 802620EC 38 BE 00 DC */ addi r5, r30, 0xdc -/* 802620F0 38 DE 01 4C */ addi r6, r30, 0x14c -/* 802620F4 4B F4 16 D1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 802620F8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 802620FC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80262100 80 9E 00 F8 */ lwz r4, 0xf8(r30) -/* 80262104 80 84 00 04 */ lwz r4, 4(r4) -/* 80262108 38 BE 01 4C */ addi r5, r30, 0x14c -/* 8026210C 4B F4 2C 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80262110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80262114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80262118 80 03 5F 6C */ lwz r0, 0x5f6c(r3) -/* 8026211C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80262120 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80262124 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80262128 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 8026212C 80 7E 00 F8 */ lwz r3, 0xf8(r30) -/* 80262130 80 83 00 04 */ lwz r4, 4(r3) -/* 80262134 38 7E 00 FC */ addi r3, r30, 0xfc -/* 80262138 C0 3E 01 0C */ lfs f1, 0x10c(r30) -/* 8026213C 4B DA B8 91 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80262140 C0 3E 01 0C */ lfs f1, 0x10c(r30) -/* 80262144 80 7E 00 F8 */ lwz r3, 0xf8(r30) -/* 80262148 80 83 00 04 */ lwz r4, 4(r3) -/* 8026214C 38 7E 01 18 */ addi r3, r30, 0x118 -/* 80262150 38 84 00 58 */ addi r4, r4, 0x58 -/* 80262154 4B DA B5 85 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80262158 C0 3E 01 0C */ lfs f1, 0x10c(r30) -/* 8026215C 80 7E 00 F8 */ lwz r3, 0xf8(r30) -/* 80262160 80 83 00 04 */ lwz r4, 4(r3) -/* 80262164 38 7E 01 30 */ addi r3, r30, 0x130 -/* 80262168 38 84 00 58 */ addi r4, r4, 0x58 -/* 8026216C 4B DA B6 3D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80262170 80 7E 00 F8 */ lwz r3, 0xf8(r30) -/* 80262174 4B DA BB 51 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80262178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8026217C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80262180 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80262184 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80262188 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 8026218C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80262190 38 60 00 01 */ li r3, 1 -/* 80262194 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80262198 83 C1 00 08 */ lwz r30, 8(r1) -/* 8026219C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802621A0 7C 08 03 A6 */ mtlr r0 -/* 802621A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802621A8 4E 80 00 20 */ blr diff --git a/asm/d/d_k_wpillar/execute__11dkWpillar_cFv.s b/asm/d/d_k_wpillar/execute__11dkWpillar_cFv.s deleted file mode 100644 index 224b381b9cf..00000000000 --- a/asm/d/d_k_wpillar/execute__11dkWpillar_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80262014: -/* 80262014 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80262018 7C 08 02 A6 */ mflr r0 -/* 8026201C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80262020 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80262024 7C 7F 1B 78 */ mr r31, r3 -/* 80262028 38 7F 00 FC */ addi r3, r31, 0xfc -/* 8026202C 4B DA B3 FD */ bl play__14mDoExt_baseAnmFv -/* 80262030 38 60 00 01 */ li r3, 1 -/* 80262034 88 1F 01 01 */ lbz r0, 0x101(r31) -/* 80262038 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8026203C 40 82 00 18 */ bne lbl_80262054 -/* 80262040 C0 22 B6 04 */ lfs f1, lit_3946(r2) -/* 80262044 C0 1F 01 08 */ lfs f0, 0x108(r31) -/* 80262048 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 8026204C 41 82 00 08 */ beq lbl_80262054 -/* 80262050 38 60 00 00 */ li r3, 0 -lbl_80262054: -/* 80262054 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80262058 41 82 00 10 */ beq lbl_80262068 -/* 8026205C 7F E3 FB 78 */ mr r3, r31 -/* 80262060 4B DB D6 E9 */ bl fopKyM_Delete__FPv -/* 80262064 48 00 00 2C */ b lbl_80262090 -lbl_80262068: -/* 80262068 38 7F 00 DC */ addi r3, r31, 0xdc -/* 8026206C 38 81 00 08 */ addi r4, r1, 8 -/* 80262070 4B DB B8 21 */ bl fopAcM_getWaterY__FPC4cXyzPf -/* 80262074 2C 03 00 00 */ cmpwi r3, 0 -/* 80262078 41 82 00 18 */ beq lbl_80262090 -/* 8026207C 80 7F 00 F8 */ lwz r3, 0xf8(r31) -/* 80262080 C0 01 00 08 */ lfs f0, 8(r1) -/* 80262084 D0 03 00 40 */ stfs f0, 0x40(r3) -/* 80262088 C0 01 00 08 */ lfs f0, 8(r1) -/* 8026208C D0 1F 00 E0 */ stfs f0, 0xe0(r31) -lbl_80262090: -/* 80262090 38 60 00 01 */ li r3, 1 -/* 80262094 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80262098 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026209C 7C 08 03 A6 */ mtlr r0 -/* 802620A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802620A4 4E 80 00 20 */ blr diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h index cb684ea86e8..2ce2b8f8842 100644 --- a/include/JSystem/JAudio2/JAIStreamMgr.h +++ b/include/JSystem/JAudio2/JAIStreamMgr.h @@ -30,7 +30,7 @@ public: /* 802A40B8 */ void stopSoundID(JAISoundID); /* 802A4118 */ void mixOut(); /* 802A4174 */ void newStream_(); - /* 802B9978 */ void isActive() const; + /* 802B9978 */ bool isActive() const; JAISoundParamsMove* getParams() { return &mParams; } void setStreamDataMgr(JAIStreamDataMgr* param_0) { diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index c2c455638ea..7d78d525fd2 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -142,7 +142,7 @@ public: static void* getUserRamEnd(void) { return mUserRamEnd; } static u32 getMemorySize(void) { return mMemorySize; } static JKRHeap* getRootHeap() { return sRootHeap; } -#if DEBUG +#ifdef DEBUG static JKRHeap* getRootHeap2() { return sRootHeap2; } #endif @@ -166,7 +166,7 @@ public: static u32 mMemorySize; static JKRHeap* sRootHeap; -#if DEBUG +#ifdef DEBUG static JKRHeap* sRootHeap2; #endif diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 2107956567f..997aa29fc4c 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -2,8 +2,9 @@ #define JUTASSERT_H #include "dolphin/types.h" +#include "dolphin/os/OS.h" -#if DEBUG +#ifdef DEBUG #define JUT_ASSERT(LINE, COND) \ if ((COND) == 0) { \ JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND); \ @@ -34,6 +35,11 @@ namespace JUTAssertion { /* 802E4A54 */ void flushMessage_dbPrint(); /* 802E4C34 */ void setVisible(bool); /* 802E4C3C */ void setMessageCount(int); + + u32 getSDevice(); + void showAssert(u32 device, const char * file, int line, const char * assertion); + void setWarningMessage_f(u32 device, char * file, int line, const char * fmt, ...); + void setLogMessage_f(u32 device, char* file, int line, const char* fmt, ...); }; extern bool sAssertVisible; diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 7786c64b462..efe8ac73352 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -144,6 +144,7 @@ extern "C" void JUTSetReportConsole(JUTConsole*); extern "C" JUTConsole* JUTGetReportConsole(); extern "C" void JUTSetWarningConsole(JUTConsole*); extern "C" JUTConsole* JUTGetWarningConsole(); +extern "C" void JUTWarningConsole_f_va(const char*, va_list); extern "C" void JUTReportConsole_f_va(const char*, va_list); extern "C" void JUTReportConsole_f(const char*, ...); extern "C" void JUTWarningConsole(const char* message); diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index 745f8c9ba22..6016489c760 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -24,6 +24,7 @@ public: bool isActive() const { return field_0x00 != 0; } JUtility::TColor getCharColor() const { return mCharColor; } void changeFrameBuffer(void *param_0) { changeFrameBuffer(param_0, mFrameBufferWidth, mFrameBufferHeight); } + void* getFrameBuffer() { return field_0x00; } static JUTDirectPrint* getManager() { return sDirectPrint; } diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 348717fc17f..b6dfbbcdbf4 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -3511,6 +3511,11 @@ inline void dComIfGd_setListBG() { g_dComIfG_gameInfo.drawlist.setXluListBG(); } +inline void dComIfGd_setListIndScreen() { + g_dComIfG_gameInfo.drawlist.setOpaListP0(); + g_dComIfG_gameInfo.drawlist.setXluListP0(); +} + inline J3DDrawBuffer* dComIfGd_getOpaListBG() { return g_dComIfG_gameInfo.drawlist.getOpaListBG(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 6da1a779f16..bf130748553 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -331,6 +331,8 @@ public: void setOpaList3Dlast() { setOpaDrawList(mDrawBuffers[DB_LIST_3D_LAST]); } void setXluList3Dlast() { setXluDrawList(mDrawBuffers[DB_LIST_3D_LAST]); } void setXluList2DScreen() { setXluDrawList(mDrawBuffers[DB_LIST_2D_SCREEN]); } + void setXluListP0() { setXluDrawList(mDrawBuffers[DB_LIST_P0]); } + void setOpaListP0() { setOpaDrawList(mDrawBuffers[DB_LIST_P0]); } void peekZdata() { mPeekZ.peekData(); } void entryZSortListZxlu(J3DPacket* i_packet, cXyz& param_1) { diff --git a/include/d/d_k_wmark.h b/include/d/d_k_wmark.h index 87814fd6601..288edd8ce79 100644 --- a/include/d/d_k_wmark.h +++ b/include/d/d_k_wmark.h @@ -1,6 +1,29 @@ #ifndef D_D_K_WMARK_H #define D_D_K_WMARK_H -#include "dolphin/types.h" +#include "f_op/f_op_kankyo_mng.h" +#include "d/kankyo/d_kankyo.h" + +class dkWmark_c : public kankyo_class { +public: + /* 80261640 */ ~dkWmark_c(); + /* 802616C4 */ BOOL setMatrix(); + + inline int create(); + inline int execute(); + inline int draw(); + + static int m_nowID; + + /* 0x0F8 */ JKRSolidHeap* mpHeap; + /* 0x0FC */ J3DModel* mpModel; + /* 0x100 */ dKy_tevstr_c mTevstr; + /* 0x488 */ u8 field_0x488; + /* 0x48A */ s16 field_0x48a; + /* 0x48C */ s16 field_0x48c; + /* 0x48E */ s16 mColorType; + /* 0x490 */ f32 mAlphaFactor; + /* 0x494 */ int field_0x494; +}; #endif /* D_D_K_WMARK_H */ diff --git a/include/d/d_k_wpillar.h b/include/d/d_k_wpillar.h index b142a51e420..1655ff1ef75 100644 --- a/include/d/d_k_wpillar.h +++ b/include/d/d_k_wpillar.h @@ -1,6 +1,22 @@ #ifndef D_D_K_WPILLAR_H #define D_D_K_WPILLAR_H -#include "dolphin/types.h" +#include "f_op/f_op_kankyo_mng.h" +#include "d/kankyo/d_kankyo.h" + +class dkWpillar_c : public kankyo_class { +public: + /* 80261B54 */ int create(); + /* 80261F24 */ ~dkWpillar_c(); + /* 80262014 */ int execute(); + /* 802620C8 */ int draw(); + + /* 0x0F8 */ J3DModel* mpModel; + /* 0x0FC */ mDoExt_bckAnm mBck; + /* 0x118 */ mDoExt_btkAnm mBtk; + /* 0x130 */ mDoExt_brkAnm mBrk; + /* 0x148 */ JKRSolidHeap* mpHeap; + /* 0x14C */ dKy_tevstr_c mTevstr; +}; #endif /* D_D_K_WPILLAR_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 47acb2db3d7..21d8bb42510 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -7,7 +7,7 @@ struct dStage_MapEvent_dt_c; class fopAc_ac_c; -#if DEBUG +#ifdef DEBUG class dEvDb_bit_c { public: /* 0x00 */ char* mFlagName; @@ -36,9 +36,9 @@ public: /* 0x04 */ dEvDb_reg_c* mRegTable; /* 0x08 */ int mBitNum; /* 0x0C */ int mRegNum; - /* 0x10 */ field_0x10; - /* 0x14 */ field_0x14; -} + /* 0x10 */ int field_0x10; + /* 0x14 */ int field_0x14; +}; #endif class dEvt_order_c { diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 8dd39bb39c0..f0375fad915 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -359,7 +359,7 @@ public: /* 0x0EC0 */ dKankyo_cloud_Packet* mpCloudPacket; /* 0x0EC4 */ u8 mVrkumoStatus; /* 0x0EC8 */ int mVrkumoCount; - /* 0x0ECC */ f32 field_0xecc; + /* 0x0ECC */ f32 mVrkumoStrength; /* 0x0ED0 */ dKankyo_vrkumo_Packet* mpVrkumoPacket; /* 0x0ED4 */ EF_THUNDER mThunderEff; /* 0x0F18 */ u8 field_0xf18[4]; diff --git a/include/dolphin/mtx/mtx.h b/include/dolphin/mtx/mtx.h index 5764d5b696c..ceb50e927ac 100644 --- a/include/dolphin/mtx/mtx.h +++ b/include/dolphin/mtx/mtx.h @@ -42,7 +42,8 @@ inline void C_MTXRotAxisRad(Mtx m, const Vec* axis, f32 rad) { /* When compiling in debug mode, use C implementations */ #ifdef DEBUG -#define MTXIdentity C_MTXIdentity +// TODO: Add debug rom C implementations +/* #define MTXIdentity C_MTXIdentity #define MTXCopy C_MTXCopy #define MTXConcat C_MTXConcat #define MTXInverse C_MTXInverse @@ -53,7 +54,20 @@ inline void C_MTXRotAxisRad(Mtx m, const Vec* axis, f32 rad) { #define MTXTransApply C_MTXTransApply #define MTXScale C_MTXScale #define MTXScaleApply C_MTXScaleApply -#define MTXQuat C_MTXQuat +#define MTXQuat C_MTXQuat */ + +#define MTXIdentity PSMTXIdentity +#define MTXCopy PSMTXCopy +#define MTXConcat PSMTXConcat +#define MTXInverse PSMTXInverse +#define MTXRotRad PSMTXRotRad +#define MTXRotTrig PSMTXRotTrig +#define MTXRotAxisRad PSMTXRotAxisRad +#define MTXTrans PSMTXTrans +#define MTXTransApply PSMTXTransApply +#define MTXScale PSMTXScale +#define MTXScaleApply PSMTXScaleApply +#define MTXQuat PSMTXQuat #else #define MTXIdentity PSMTXIdentity #define MTXCopy PSMTXCopy diff --git a/include/dolphin/mtx/mtxvec.h b/include/dolphin/mtx/mtxvec.h index 8e8aaab4a66..0a2a9cfe3f1 100644 --- a/include/dolphin/mtx/mtxvec.h +++ b/include/dolphin/mtx/mtxvec.h @@ -14,10 +14,16 @@ void PSMTXMultVecArraySR(const Mtx m, const Vec* srcBase, Vec* dstBase, u32 coun /* When compiling in debug mode, use C implementations */ #ifdef DEBUG -#define MTXMultVec C_MTXMultVec +// TODO: Add debug rom C implementations +/* #define MTXMultVec C_MTXMultVec #define MTXMultVecSR C_MTXMultVecSR #define MTXMultVecArray C_MTXMultVecArray -#define MTXMultVecArraySR C_MTXMultVecArraySR +#define MTXMultVecArraySR C_MTXMultVecArraySR */ + +#define MTXMultVec PSMTXMultVec +#define MTXMultVecSR PSMTXMultVecSR +#define MTXMultVecArray PSMTXMultVecArray +#define MTXMultVecArraySR PSMTXMultVecArraySR #else #define MTXMultVec PSMTXMultVec #define MTXMultVecSR PSMTXMultVecSR diff --git a/include/dolphin/mtx/quat.h b/include/dolphin/mtx/quat.h index b73d28f02f7..96ddf8bd6bf 100644 --- a/include/dolphin/mtx/quat.h +++ b/include/dolphin/mtx/quat.h @@ -17,7 +17,10 @@ void C_QUATSlerp(const Quaternion* p, const Quaternion* q, Quaternion* r, f32 t) /* When compiling in debug mode, use C implementations */ #ifdef DEBUG -#define QUATMultiply C_QUATMultiply +// TODO: Add debug rom C implementations +/* #define QUATMultiply C_QUATMultiply */ + +#define QUATMultiply PSQUATMultiply #else #define QUATMultiply PSQUATMultiply #endif diff --git a/include/dolphin/mtx/vec.h b/include/dolphin/mtx/vec.h index aa09ad3713f..0184fd47faf 100644 --- a/include/dolphin/mtx/vec.h +++ b/include/dolphin/mtx/vec.h @@ -87,7 +87,8 @@ inline f32 C_VECSquareMag(const Vec* v) { /* When compiling in debug mode, use C implementations */ #ifdef DEBUG -#define VECAdd C_VECAdd +// TODO: Add debug rom C implementations +/* #define VECAdd C_VECAdd #define VECSubtract C_VECSubtract #define VECScale C_VECScale #define VECNormalize C_VECNormalize @@ -96,7 +97,18 @@ inline f32 C_VECSquareMag(const Vec* v) { #define VECDotProduct C_VECDotProduct #define VECCrossProduct C_VECCrossProduct #define VECSquareDistance C_VECSquareDistance -#define VECDistance C_VECDistance +#define VECDistance C_VECDistance */ + +#define VECAdd PSVECAdd +#define VECSubtract PSVECSubtract +#define VECScale PSVECScale +#define VECNormalize PSVECNormalize +#define VECSquareMag PSVECSquareMag +#define VECMag PSVECMag +#define VECDotProduct PSVECDotProduct +#define VECCrossProduct PSVECCrossProduct +#define VECSquareDistance PSVECSquareDistance +#define VECDistance PSVECDistance #else #define VECAdd PSVECAdd #define VECSubtract PSVECSubtract diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index a72010c110f..0225e145b1e 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -24,12 +24,84 @@ struct actor_process_profile_definition2 { /* 0x30 */ u32 field_0x30; }; -enum { - ACTOR_TYPE_ENEMY = 2, +enum fopAc_Status_e { + fopAcStts_NOEXEC_e = 0x00000080, + fopAcStts_CULL_e = 0x00000100, + fopAcStts_FREEZE_e = 0x00000400, + fopAcStts_CARRY_e = 0x00002000, + fopAcStts_NOPAUSE_e = 0x00020000, + fopAcStts_NODRAW_e = 0x01000000, + fopAcStts_BOSS_e = 0x04000000, +}; + +enum fopAc_Group_e { + /* 0 */ fopAc_ACTOR_e, + /* 1 */ fopAc_PLAYER_e, + /* 2 */ fopAc_ENEMY_e, + /* 3 */ fopAc_ENV_e, // is this correct? + /* 4 */ fopAc_NPC_e, +}; + +enum fopAc_Condition_e { + fopAcCnd_NOEXEC_e = 0x02, + fopAcCnd_NODRAW_e = 0x04, + fopAcCnd_INIT_e = 0x08, +}; + +enum fopAc_Cull_e { + fopAc_CULLBOX_0_e, + fopAc_CULLBOX_1_e, + fopAc_CULLBOX_2_e, + fopAc_CULLBOX_3_e, + fopAc_CULLBOX_4_e, + fopAc_CULLBOX_5_e, + fopAc_CULLBOX_6_e, + fopAc_CULLBOX_7_e, + fopAc_CULLBOX_8_e, + fopAc_CULLBOX_9_e, + fopAc_CULLBOX_10_e, + fopAc_CULLBOX_11_e, + fopAc_CULLBOX_12_e, + fopAc_CULLBOX_13_e, + fopAc_CULLBOX_CUSTOM_e, + fopAc_CULLSPHERE_0_e, + fopAc_CULLSPHERE_1_e, + fopAc_CULLSPHERE_2_e, + fopAc_CULLSPHERE_3_e, + fopAc_CULLSPHERE_4_e, + fopAc_CULLSPHERE_5_e, + fopAc_CULLSPHERE_6_e, + fopAc_CULLSPHERE_7_e, + fopAc_CULLSPHERE_8_e, + fopAc_CULLSPHERE_9_e, + fopAc_CULLSPHERE_10_e, + fopAc_CULLSPHERE_11_e, + fopAc_CULLSPHERE_12_e, + fopAc_CULLSPHERE_13_e, + fopAc_CULLSPHERE_CUSTOM_e, }; class JKRSolidHeap; +enum dEvt_Command_e { + dEvtCmd_NONE_e, + dEvtCmd_INTALK_e, + dEvtCmd_INDEMO_e, + dEvtCmd_INDOOR_e, + dEvtCmd_INGETITEM_e, + dEvtCmd_INCATCH_e = 6, + dEvtCmd_DUMMY = 0xFFFF, +}; + +enum dEvt_Condition_e { + dEvtCnd_NONE_e = 0x0000, + dEvtCnd_CANTALK_e = 0x0001, + dEvtCnd_CANDOOR_e = 0x0004, + dEvtCnd_CANGETITEM_e = 0x0008, + dEvtCnd_CANTALKITEM_e = 0x0020, + dEvtCnd_DUMMY = 0x8000, +}; + class dEvt_info_c { public: dEvt_info_c(); @@ -41,7 +113,7 @@ public: void offCondition(u16); bool checkCommandCatch(); BOOL checkCommandDoor(); - BOOL checkCommandDemoAccrpt() { return mCommand == 2; } + BOOL checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; } void setCommand(u16 command) { mCommand = command; } void setMapToolId(u8 id) { mMapToolId = id; } @@ -58,11 +130,11 @@ public: void i_onCondition(u16 cond) { mCondition |= cond; } void i_offCondition(u16 cond) { mCondition &= ~cond; } - bool checkCommandTalk() { return mCommand == 1; } - bool checkCommandItem() { return mCommand == 4; } - BOOL i_checkCommandDoor() { return mCommand == 3; } - bool i_checkCommandDemoAccrpt() { return mCommand == 2; } - bool i_checkCommandCatch() { return mCommand == 6; } + bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; } + bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; } + BOOL i_checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; } + bool i_checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; } + bool i_checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; } void suspendProc(void* actor) { if (field_0x10 != NULL) { @@ -81,7 +153,7 @@ public: }; // Size = 0x18 struct actor_place { - /* 807E2468 */ //void operator=(actor_place const&); + /* 807E2468 */ // void operator=(actor_place const&); /* 0x00 */ cXyz pos; /* 0x0C */ csXyz angle; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 91b2a94e085..1df55cdfb28 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -7,9 +7,9 @@ #include "f_pc/f_pc_searcher.h" #define fopAcM_SetupActor(ptr,ClassName) \ - if (!fopAcM_CheckCondition(ptr, 8)) { \ + if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ new (ptr) ClassName(); \ - fopAcM_OnCondition(ptr, 8); \ + fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ } class J3DModelData; // placeholder @@ -77,16 +77,16 @@ public: class dBgS_GndChk; class fopAcM_gc_c { public: - static dBgS_GndChk* getGroundCheck() { return (dBgS_GndChk*)&mGndCheck; } static bool gndCheck(const cXyz*); static u8 mGndCheck[84]; // this is dBgS_GndChk but all static data in the TU probably needs to be setup first (otherwise causes a reordering problem with the __sinit function) static f32 mGroundY; - // strange issue where f_op_actor_mng.h can't find the dComIfG_Bgsp() inline even when you include the header - // static bool getTriPla(cM3dGPla* pPlane) { - // return dComIfG_Bgsp().GetTriPla(mGndCheck,pPlane); - // } + // this avoids having to include d_bg_s.h here + static inline bool getTriPla(cM3dGPla* pPlane); + static inline int getRoomId(); + static inline int getPolyColor(); + static dBgS_GndChk* getGroundCheck() { return (dBgS_GndChk*)&mGndCheck; } static f32 getGroundY() { return mGroundY; } }; diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index d875eb8e8d5..0e0c01e18e1 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "f_pc/f_pc_manager.h" +#include "f_op/f_op_kankyo.h" struct fopKyM_prm_class { /* 0x00 */ cXyz mPos; diff --git a/include/f_pc/f_pc_layer_tag.h b/include/f_pc/f_pc_layer_tag.h index 2cf25d0388b..4818deba99e 100644 --- a/include/f_pc/f_pc_layer_tag.h +++ b/include/f_pc/f_pc_layer_tag.h @@ -4,8 +4,16 @@ #include "SSystem/SComponent/c_tag.h" +enum { + fpcLy_ROOT_e = 0, + fpcLy_CURRENT_e = 0xFFFFFFFD, + fpcLy_SPECIAL_e = 0xFFFFFFFE, + fpcLy_NONE_e = 0xFFFFFFFF, +}; + typedef struct layer_class layer_class; + typedef struct layer_management_tag_class { create_tag_class mCreateTag; layer_class* mpLayer; diff --git a/include/f_pc/f_pc_priority.h b/include/f_pc/f_pc_priority.h index 358ae721448..d1ed8f30086 100644 --- a/include/f_pc/f_pc_priority.h +++ b/include/f_pc/f_pc_priority.h @@ -4,6 +4,11 @@ #include "f_pc/f_pc_method_tag.h" +enum { + fpcPi_CURRENT_e = 0xFFFD, + fpcPi_SPECIAL_e = 0xFFFE, +}; + typedef struct process_priority_queue_info { u32 mLayer; u16 mListID; diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index 7d13d3e45d7..05d9cad76a2 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -81,11 +81,4 @@ inline void mDoMemCd_save(void* i_data, u32 param_1, u32 param_2) { g_mDoMemCd_control.save(i_data,param_1,param_2); } -// This is probably debug only -#if DEBUG -inline void mDoMemCd_saveNAND(void* i_data, u32 param_1, u32 param_2) { - g_mDoMemCd_control.saveNAND(i_data,param_1,param_2); -} -#endif - #endif /* M_DO_M_DO_MEMCARD_H */ diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h index 58d25435ea4..7a3d291a4ec 100644 --- a/include/m_Do/m_Do_lib.h +++ b/include/m_Do/m_Do_lib.h @@ -20,7 +20,7 @@ struct mDoLib_clipper { return mClipper.clip(m, (Vec*)param_1, (Vec*)param_2); } - static u32 clip(const Mtx m, Vec param_1, f32 param_2) { + static int clip(const Mtx m, Vec param_1, f32 param_2) { return mClipper.clip(m, param_1, param_2); } diff --git a/libs/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/JAudio2/JASTrack.cpp index cd12aa31d24..6c5fab87493 100644 --- a/libs/JSystem/JAudio2/JASTrack.cpp +++ b/libs/JSystem/JAudio2/JASTrack.cpp @@ -175,8 +175,6 @@ extern "C" void __dt__Q27JGadget13TNodeLinkListFv(); extern "C" void Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode(); extern "C" void Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); extern "C" void __register_global_object(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp index 3731a6d427e..4c3fcfbb2c2 100644 --- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp @@ -346,8 +346,8 @@ void JAUSection::finishBuild() { /* 802A5160-802A51E4 29FAA0 0084+00 2/0 0/0 0/0 .text dispose__10JAUSectionFv */ void JAUSection::dispose() { - JUT_ASSERT(267, ! data_.registeredBankTables.any()); - JUT_ASSERT(268, ! data_.registeredWaveBankTables.any()); + /* JUT_ASSERT(267, ! data_.registeredBankTables.any()); + JUT_ASSERT(268, ! data_.registeredWaveBankTables.any()); */ if (data_.mBstDst) { sectionHeap_->sectionHeapData_.soundTable->~JAUSoundTable(); sectionHeap_->sectionHeapData_.soundTable = NULL; @@ -469,7 +469,7 @@ asm JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool p /* 802A5500-802A5598 29FE40 0098+00 0/0 1/1 0/0 .text newSeSeqCollection__10JAUSectionFPCvUl */ JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) { - JUT_ASSERT(398, asSectionHeap() == this); + // JUT_ASSERT(398, asSectionHeap() == this); JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == 0); if (param_1) { bsc = newCopy(bsc, param_1, 4); @@ -791,6 +791,11 @@ void JAUSectionHeap::releaseIdleDynamicSeqDataBlock() { sectionHeapData_.field_0x408.releaseIdleDynamicSeqDataBlock(sectionHeapData_.seqDataUser); } +namespace { + // TODO + bool JKRSolidHeap_isEmpty(JKRSolidHeap*) { return 1; } +} + /* 802A5F24-802A5F9C 2A0864 0078+00 1/1 0/0 0/0 .text JAUNewSectionHeap__FP12JKRSolidHeapb */ static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) { JUT_ASSERT(809, JKRSolidHeap_isEmpty( heap )); @@ -840,9 +845,9 @@ bool JAUSectionHeap::setSeqDataUser(JAISeqDataUser* param_0) { /* 802A60AC-802A61D0 2A09EC 0124+00 0/0 2/2 0/0 .text newDynamicSeqBlock__14JAUSectionHeapFUl */ bool JAUSectionHeap::newDynamicSeqBlock(u32 param_0) { - JUT_ASSERT(937, isOpen()); + /* JUT_ASSERT(937, isOpen()); JUT_ASSERT(938, isBuilding()); - JUT_ASSERT(939, sectionHeap_ == this); + JUT_ASSERT(939, sectionHeap_ == this); */ TPushCurrentHeap push(base1.getHeap_()); JAUSeqDataBlock * seqDataBlock = new JAUSeqDataBlock(); if (!seqDataBlock) { @@ -871,7 +876,7 @@ bool JAUSectionHeap::newDynamicSeqBlock(u32 param_0) { s32 JAUSectionHeap::getSeqData(JAISoundID param_0, JAISeqData* param_1) { for (JSULink * link = mSectionList.getFirst(); link; link = link->getNext()) { s32 result = link->getObject()->data_.field_0x00.getSeqData(param_0, sectionHeapData_.seqDataUser, param_1, false); - JUT_ASSERT(994, result != JAI_ASYNC_RESULT_RETRY); + // JUT_ASSERT(994, result != JAI_ASYNC_RESULT_RETRY); if (result == 2) { return 2; } diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index dc1c660f221..63b17381620 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -241,7 +241,7 @@ cleanup: } if (mMountMode == 0) { -#if DEBUG +#ifdef DEBUG OSReport(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415); #endif if (mDvdFile != NULL) diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 90fbf56f825..1cc3ec008ea 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -226,7 +226,7 @@ bool JKRCompArchive::open(s32 entryNum) { JKRFreeToSysHeap(arcHeader); } if(mMountMode == 0) { -#if DEBUG +#ifdef DEBUG OSReport(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567); #endif if(mDvdFile != NULL) { diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index 4328aea2469..a3350d113de 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -196,7 +196,7 @@ cleanup: } if (mMountMode == UNKNOWN_MOUNT_MODE) { -#if DEBUG +#ifdef DEBUG OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397); #endif if (mDvdFile) { diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp index 586f1c648b0..918e0e340bb 100644 --- a/libs/JSystem/JKernel/JKRDvdFile.cpp +++ b/libs/JSystem/JKernel/JKRDvdFile.cpp @@ -124,7 +124,7 @@ s32 JKRDvdFile::readData(void* param_1, s32 length, s32 param_3) { } /* 802D9A68-802D9A70 2D43A8 0008+00 1/0 0/0 0/0 .text writeData__10JKRDvdFileFPCvll */ -s32 JKRDvdFile::writeData(void const* param_0, s32 param_1, s32 param_2) { +s32 JKRDvdFile::writeData(void const* param_0, s32 length, s32 param_2) { /* clang-format off */ JUT_ASSERT(344, ( length & 0x1f ) == 0); /* clang-format on */ diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index 8ed32e29548..c5ad70d973d 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -21,6 +21,10 @@ JKRHeap* JKRHeap::sCurrentHeap; /* 80451378-8045137C 000878 0004+00 3/3 10/10 0/0 .sbss sRootHeap__7JKRHeap */ JKRHeap* JKRHeap::sRootHeap; +#ifdef DEBUG +JKRHeap* JKRHeap::sRootHeap2; +#endif + /* 8045137C-80451380 00087C 0004+00 2/2 3/3 0/0 .sbss mErrorHandler__7JKRHeap */ JKRErrorHandler JKRHeap::mErrorHandler; @@ -389,7 +393,7 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) { /* 802CEB40-802CEB78 2C9480 0038+00 2/2 0/0 0/0 .text JKRDefaultMemoryErrorRoutine__FPvUli */ void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment) { -#if DEBUG +#ifdef DEBUG OSReport("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size, size, alignment, heap); #endif diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index 84c78d7fdfb..4dc4d9beb8f 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -116,9 +116,9 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio mIsOpen = true; } -#if DEBUG +#ifdef DEBUG if (mMountMode == 0) { - OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 460) + OSReport(":::Cannot alloc memory [%s][%d]\n", __FILE__, 460); } #endif diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp index f09291c7272..186f9c5dba3 100644 --- a/libs/JSystem/JKernel/JKRSolidHeap.cpp +++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp @@ -95,13 +95,13 @@ s32 JKRSolidHeap::adjustSize(void) { /* 802D0CB0-802D0D58 2CB5F0 00A8+00 1/0 0/0 0/0 .text do_alloc__12JKRSolidHeapFUli */ void* JKRSolidHeap::do_alloc(u32 size, int alignment) { -#if DEBUG +#ifdef DEBUG // TODO(Julgodis): JUTAssertion::setConfirmMessage - if (alignment != 0) { + /* if (alignment != 0) { int u = abs(alignment); JUT_ASSERT(219, u < 0x80); JUT_ASSERT(220, JGadget::binary::isPower2(u)); - } + } */ #endif lock(); @@ -210,8 +210,8 @@ void JKRSolidHeap::do_freeTail(void) { /* 802D1000-802D1004 2CB940 0004+00 1/0 0/0 0/0 .text do_fillFreeArea__12JKRSolidHeapFv */ void JKRSolidHeap::do_fillFreeArea() { -#if DEBUG - fillMemory(mSolidHead, mEnd - mSolidHead, (uint)DAT_8074a8ba); +#ifdef DEBUG + // fillMemory(mSolidHead, mEnd - mSolidHead, (uint)DAT_8074a8ba); #endif } diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index 364d283b8a5..d2ed52d5204 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -217,7 +217,7 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) { next_heap = JKRHeap::getCurrentHeap(); } else if (JKRHeap::getRootHeap()->isSubHeap(next_heap)) { continue; -#if DEBUG +#ifdef DEBUG } else if (!JKRHeap::getRootHeap2()->isSubHeap(next_heap)) { continue; #endif @@ -258,7 +258,7 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console const char* print_1 = " -------------------------------------\n"; if (!console) { -#if DEBUG +#ifdef DEBUG OSReport(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); OSReport(print_1); #endif @@ -298,7 +298,7 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console u32 cost_int = (u32)(cost_per_0x18 * 100.0f); u32 cost_float = (u32)(cost_per_0x18 * 1000.0f) % 10; if (!console) { -#if DEBUG +#ifdef DEBUG OSReport(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, cost_int, cost_float); #endif diff --git a/libs/JSystem/JUtility/JUTAssert.cpp b/libs/JSystem/JUtility/JUTAssert.cpp index d9f7d2427e5..2ed45e31462 100644 --- a/libs/JSystem/JUtility/JUTAssert.cpp +++ b/libs/JSystem/JUtility/JUTAssert.cpp @@ -4,8 +4,10 @@ // #include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" +#include "MSL_C/stdio.h" #include "dolphin/vi/vi.h" namespace JUTAssertion { @@ -25,6 +27,12 @@ static char sMessageFileLine[64]; /* 804348B0-804349B0 0615D0 0100+00 2/2 0/0 0/0 .bss * sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ */ static char sMessageString[256]; + +static s32 sDisplayTime = -1; +static s32 sDevice = 3; +static bool mVisible = true; +static s32 sMessageOwner; +static u8 mSynchro; }; // namespace /* 802E4960-802E499C 2DF2A0 003C+00 2/2 0/0 0/0 .text flush_subroutine__12JUTAssertionFv @@ -71,6 +79,139 @@ void flushMessage_dbPrint() { } } +u32 getSDevice() { + return sDevice; +} + +/* 802C7698-802C7788 .text setConfirmMessage__12JUTAssertionFUlPcibPCc */ +void setConfirmMessage(u32 param_1, char* file, int line, bool param_4, const char* msg) { + if (param_4 == 1) { + return; + } + u32 r28 = sMessageLife; + if (r28 == 0 && (param_1 & 1) != 0) { + sMessageLife = sDisplayTime; + sMessageOwner = 2; + snprintf(sMessageFileLine, sizeof(sMessageFileLine) - 1, "FAILED [%s:%d]", file, line); + snprintf(sMessageString, sizeof(sMessageString) - 1, "%s", msg); + } + if ((r28 == 0 || mSynchro == 0) && (param_1 & 2) != 0) { + JUTWarningConsole_f("FAILED [%s:%d] %s\n", file, line, msg); + } +} + +void showAssert_f_va(u32 device, const char* file, int line, const char* msg, va_list args) { + sMessageLife = -1; + vsnprintf(sMessageString, 255, msg, args); + + if (device & 2) { + OSReport("Failed assertion: %s:%d\n", file, line); + OSReport("%s\n", sMessageString); + } + + if ((device & 1) && JUTDirectPrint::getManager()) { + JUtility::TColor old_color(JUTDirectPrint::getManager()->getCharColor()); + JUTDirectPrint::getManager()->setCharColor(JUtility::TColor(255, 255, 255, 255)); + JUTDirectPrint::getManager()->erase(10, 16, 306, 24); + + snprintf(sMessageFileLine, 63, "Failed assertion: %s:%d", file, line); + JUTDirectPrint::getManager()->drawString(16, 16, sMessageFileLine); + JUTDirectPrint::getManager()->drawString(16, 24, sMessageString); + + JUTDirectPrint::getManager()->setCharColor(old_color); + VISetNextFrameBuffer(JUTDirectPrint::getManager()->getFrameBuffer()); + VIFlush(); + OSEnableInterrupts(); + + u32 retrace_count = VIGetRetraceCount(); + u32 new_count; + do { + new_count = VIGetRetraceCount(); + } while (retrace_count == new_count); + + // busy loop for 2 seconds + OSTime var1 = OSGetTime(); + while (OSTicksToMilliseconds(OSGetTime() - var1) < 2000) { + } + } +} + +void showAssert_f(u32 device, const char* file, int line, const char* msg, ...) { + va_list args; + va_start(args, msg); + showAssert_f_va(device, file, line, msg, args); + va_end(args); +} + +/* 802C7788-802C78E4 .text showAssert__12JUTAssertionFUlPCciPCc */ +void showAssert(u32 device, const char* file, int line, const char* msg) { + showAssert_f(device, file, line, "%s", msg); +} + +/* 802C78E4-802C79FC .text setWarningMessage_f_va */ +void setWarningMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args) { + u32 messageLife = sMessageLife; + bool r26 = false; + if (messageLife == 0) { + if (device & 1) { + sMessageLife = sDisplayTime; + sMessageOwner = 3; + snprintf(sMessageFileLine, sizeof(sMessageFileLine) - 1, "WARNING [%s:%d]", file, line); + } + vsnprintf(sMessageString, sizeof(sMessageString) - 1, msg, args); + r26 = true; + } + if ((messageLife == 0 || mSynchro == 0) && (device & 2)) { + JUTWarningConsole_f("WARNING [%s:%d] ", file, line); + if (!r26) { + JUTWarningConsole_f_va(msg, args); + } else { + JUTWarningConsole(sMessageString); + } + JUTWarningConsole("\n"); + } +} + +/* 802C79FC-802C7A7C .text setWarningMessage_f__12JUTAssertionFUlPciPCce */ +void setWarningMessage_f(u32 device, char* file, int line, const char* msg, ...) { + va_list args; + va_start(args, msg); + setWarningMessage_f_va(device, file, line, msg, args); + va_end(args); +} + +/* 802C7A7C-802C7B94 .text setLogMessage_f_va */ +void setLogMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args) { + u32 messageLife = sMessageLife; + bool r26 = false; + if (messageLife == 0) { + if (device & 1) { + sMessageLife = sDisplayTime; + sMessageOwner = 4; + snprintf(sMessageFileLine, sizeof(sMessageFileLine) - 1, "[%s:%d]", file, line); + } + vsnprintf(sMessageString, sizeof(sMessageString) - 1, msg, args); + r26 = true; + } + if ((messageLife == 0 || mSynchro == 0) && (device & 2)) { + JUTReportConsole_f("[%s:%d] ", file, line); + if (!r26) { + JUTReportConsole_f_va(msg, args); + } else { + JUTReportConsole(sMessageString); + } + JUTReportConsole("\n"); + } +} + +/* 802C7B94-802C7C14 .text setLogMessage_f__12JUTAssertionFUlPciPCce */ +void setLogMessage_f(u32 device, char* file, int line, const char* msg, ...) { + va_list args; + va_start(args, msg); + setLogMessage_f_va(device, file, line, msg, args); + va_end(args); +} + /* 802E4C34-802E4C3C 2DF574 0008+00 0/0 2/2 0/0 .text setVisible__12JUTAssertionFb */ void setVisible(bool visible) { sAssertVisible = visible; diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index e1c06db78cd..dedd5688b14 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -266,7 +266,7 @@ void JUTConsole::print_f(char const* fmt, ...) { #ifdef NONMATCHING void JUTConsole::print(char const* param_0) { if (mOutput & 2) { -#if DEBUG +#ifdef DEBUG OSReport("%s", param_0); #endif } @@ -378,7 +378,7 @@ void JUTConsole::dumpToTerminal(unsigned int param_0) { } int r27 = 0; -#if DEBUG +#ifdef DEBUG OSReport("\n:::dump of console[%x]--------------------------------\n",this); #endif do { @@ -395,7 +395,7 @@ void JUTConsole::dumpToTerminal(unsigned int param_0) { r29 = nextIndex(r29); r27++; } while (r27 != field_0x34); -#if DEBUG +#ifdef DEBUG OSReport(":::dump of console[%x] END----------------------------\n",this); #endif } @@ -609,6 +609,18 @@ void JUTReportConsole(const char* message) { JUTReportConsole_f("%s", message); } +void JUTWarningConsole_f_va(const char* fmt, va_list args) { + char buf[256]; + + if (JUTGetWarningConsole() == NULL) { + vsnprintf(buf, sizeof(buf), fmt, args); + OSReport("%s", buf); + } else if (JUTGetWarningConsole()->getOutput() & (JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT)) { + vsnprintf(buf, sizeof(buf), fmt, args); + JUTGetWarningConsole()->print(buf); + } +} + /* 802E867C-802E86FC 2E2FBC 0080+00 0/0 9/9 0/0 .text JUTWarningConsole_f */ void JUTWarningConsole_f(const char* fmt, ...) { va_list args; diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 43d2c80b5bb..57ec4423470 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -724,7 +724,7 @@ void Z2SeqMgr::setFieldBgmPlay(bool param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JAIStreamMgr::isActive() const { +asm bool JAIStreamMgr::isActive() const { nofralloc #include "asm/Z2AudioLib/Z2SceneMgr/isActive__12JAIStreamMgrCFv.s" } diff --git a/libs/dolphin/gx/GXAttr.c b/libs/dolphin/gx/GXAttr.c index 8572c332e15..2cc458ab869 100644 --- a/libs/dolphin/gx/GXAttr.c +++ b/libs/dolphin/gx/GXAttr.c @@ -333,7 +333,7 @@ void GXGetVtxAttrFmtv(GXVtxFmt param_0, GXVtxAttrFmtList* param_1) { #ifdef DEBUG // not fully matching - tmp = 1; + /* tmp = 1; if (data_8074d3c8 != 0) { OSPanic("GXAttr.c", 941, "\'GXGetVtxAttrFmtv\' is not allowed between GXBegin/GXEnd"); tmp = 0; @@ -349,7 +349,7 @@ void GXGetVtxAttrFmtv(GXVtxFmt param_0, GXVtxAttrFmtList* param_1) { if (param_0 >= 8) { OSPanic("GXAttr.c", 943, "GXSetVtxAttrFmt: Format Index is out of range"); tmp3 = 0; - } + } */ #endif for (i = 9; i <= 0x14; i++) { @@ -371,7 +371,7 @@ void GXGetVtxAttrFmt(GXVtxFmt param_0, int param_1, GXCompCnt* param_2, GXCompTy #ifdef DEBUG // not fully matching - tmp = 1; + /* tmp = 1; if (data_8074d3c8) { OSPanic("GXAttr.c", 844, "\'GXGetVtxAttrFmt\' is not allowed between GXBegin/GXEnd"); tmp = 0; @@ -381,7 +381,7 @@ void GXGetVtxAttrFmt(GXVtxFmt param_0, int param_1, GXCompCnt* param_2, GXCompTy if (param_0 >= 8) { OSPanic("GXAttr.c", 845, "GXSetVtxAttrFmt: Format Index is out of range"); tmp2 = 0; - } + } */ #endif tmp_1 = &__GXData->field_0x1c[param_0]; diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index 61b84b7ef1b..aaaf10b2c7b 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -312,18 +312,18 @@ static actor_method_class l_daB_OH2_Method = { /* 8061EAAC-8061EADC -00001 0030+00 0/0 0/0 1/0 .data g_profile_B_OH2 */ extern actor_process_profile_definition g_profile_B_OH2 = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_B_OH2, &g_fpcLf_Method.mBase, sizeof(b_oh2_class), 0, 0, &g_fopAc_Method.base, - 0x00DB, + 219, &l_daB_OH2_Method, - 0x00044000, - ACTOR_TYPE_ENEMY, - 14, + 0x44000, + fopAc_ENEMY_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp index f7c744f6e72..32fd57bbd52 100644 --- a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp +++ b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp @@ -157,9 +157,9 @@ static actor_method_class l_daB_ZANTS_Method = { /* 80653390-806533C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_B_ZANTS */ extern actor_process_profile_definition g_profile_B_ZANTS = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_B_ZANTS, &g_fpcLf_Method.mBase, sizeof(daB_ZANTS_c), @@ -169,8 +169,8 @@ extern actor_process_profile_definition g_profile_B_ZANTS = { 229, &l_daB_ZANTS_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; /* 80652F38-80653180 0005D8 0248+00 1/1 0/0 0/0 .text CreateHeap__11daB_ZANTS_cFv */ diff --git a/rel/d/a/d_a_alldie/d_a_alldie.cpp b/rel/d/a/d_a_alldie/d_a_alldie.cpp index 8cf67fdbf9a..49690304e09 100644 --- a/rel/d/a/d_a_alldie/d_a_alldie.cpp +++ b/rel/d/a/d_a_alldie/d_a_alldie.cpp @@ -210,18 +210,18 @@ static actor_method_class l_daAlldie_Method = { /* 804D5D44-804D5D74 -00001 0030+00 0/0 0/0 1/0 .data g_profile_ALLDIE */ extern actor_process_profile_definition g_profile_ALLDIE = { - -3, + fpcLy_CURRENT_e, 2, - 0xFFFD, + fpcPi_CURRENT_e, PROC_ALLDIE, &g_fpcLf_Method.mBase, sizeof(daAlldie_c), 0, 0, &g_fopAc_Method.base, - 0x0116, + 278, &l_daAlldie_Method, - 0x00044000, - 0, - 6, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_6_e, }; diff --git a/rel/d/a/d_a_andsw/d_a_andsw.cpp b/rel/d/a/d_a_andsw/d_a_andsw.cpp index 5aaf9a68478..2d27fe8d1a9 100644 --- a/rel/d/a/d_a_andsw/d_a_andsw.cpp +++ b/rel/d/a/d_a_andsw/d_a_andsw.cpp @@ -76,18 +76,18 @@ static actor_method_class l_daAndsw_Method = { /* 80457B4C-80457B7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_ANDSW */ extern actor_process_profile_definition g_profile_ANDSW = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_ANDSW, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daAndsw_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x012E, // mPriority + 302, // mPriority &l_daAndsw_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp index 140b558a603..6694fb13455 100644 --- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp +++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp @@ -1479,9 +1479,9 @@ static actor_method_class daBgObj_METHODS = { /* 8045CD54-8045CD84 -00001 0030+00 0/0 0/0 1/0 .data g_profile_BG_OBJ */ extern actor_process_profile_definition g_profile_BG_OBJ = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_BG_OBJ, &g_fpcLf_Method.mBase, sizeof(daBgObj_c), @@ -1491,6 +1491,6 @@ extern actor_process_profile_definition g_profile_BG_OBJ = { 752, &daBgObj_METHODS, 0x10044100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index f61fb25f2a2..13748adfbb0 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -409,18 +409,18 @@ static actor_method_class l_daCrod_Method = { /* 804A41B4-804A41E4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_CROD */ extern actor_process_profile_definition g_profile_CROD = { - -3, + fpcLy_CURRENT_e, 8, - 0xFFFD, + fpcPi_CURRENT_e, PROC_CROD, &g_fpcLf_Method.mBase, sizeof(daCrod_c), 0, 0, &g_fopAc_Method.base, - 0x02B0, + 688, &l_daCrod_Method, - 0x00060000, + 0x60000, 5, - 0, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/d_a_disappear/d_a_disappear.cpp b/rel/d/a/d_a_disappear/d_a_disappear.cpp index 09366d7e3bb..dadbb75f5e0 100644 --- a/rel/d/a/d_a_disappear/d_a_disappear.cpp +++ b/rel/d/a/d_a_disappear/d_a_disappear.cpp @@ -136,9 +136,9 @@ static actor_method_class l_daDisappear_Method = { /* 804A94C4-804A94F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_DISAPPEAR */ extern actor_process_profile_definition g_profile_DISAPPEAR = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_DISAPPEAR, &g_fpcLf_Method.mBase, sizeof(disappear_class), @@ -148,6 +148,6 @@ extern actor_process_profile_definition g_profile_DISAPPEAR = { 725, &l_daDisappear_Method, 0x44000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp index e44b652dbfa..103d8819743 100644 --- a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp +++ b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp @@ -105,18 +105,18 @@ static actor_method_class l_daDmidna_Method = { /* 8045D2BC-8045D2EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_DMIDNA */ extern actor_process_profile_definition g_profile_DMIDNA = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_DMIDNA, &g_fpcLf_Method.mBase, sizeof(daDmidna_c), 0, 0, &g_fopAc_Method.base, - 0x005D, + 93, &l_daDmidna_Method, - 0x00060000, - 3, - 0, + 0x60000, + fopAc_ENV_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index bbf10ffcdad..ea2c20e8229 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -3002,7 +3002,7 @@ static void message(do_class* i_this) { if (i_this->field_0xc05 == 2 && i_this->field_0xc08 != -1 && daPy_py_c::i_checkNowWolf()) { fopAcM_OnStatus(i_this, 0); cLib_onBit(i_this->mAttentionInfo.mFlags, 10); - i_this->mEvtInfo.i_onCondition(1); + i_this->mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); } else { fopAcM_OffStatus(i_this, 0); cLib_offBit(i_this->mAttentionInfo.mFlags, 10); diff --git a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp index eb4ffa31beb..d94ad2c3e2e 100644 --- a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp +++ b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp @@ -700,20 +700,20 @@ static actor_method_class l_daDsh_Method = { /* 80468010-80468044 -00001 0034+00 0/0 0/0 1/0 .data g_profile_DSHUTTER */ extern actor_process_profile_definition2 g_profile_DSHUTTER = { { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_DSHUTTER, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daDsh_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0128, // mPriority + 296, // mPriority &l_daDsh_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }, 0, }; diff --git a/rel/d/a/d_a_econt/d_a_econt.cpp b/rel/d/a/d_a_econt/d_a_econt.cpp index 33e28d8e22b..9fb4a306569 100644 --- a/rel/d/a/d_a_econt/d_a_econt.cpp +++ b/rel/d/a/d_a_econt/d_a_econt.cpp @@ -91,18 +91,18 @@ static actor_method_class l_daEcont_Method = { /* 805197AC-805197DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_ECONT */ extern actor_process_profile_definition g_profile_ECONT = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 8, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_ECONT, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(econt_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x009B, // mPriority + 155, // mPriority &l_daEcont_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp index e3910d78e19..b506f45ec0d 100644 --- a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp +++ b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp @@ -80,18 +80,18 @@ static actor_method_class l_daGuardMng_Method = { /* 80837E10-80837E40 -00001 0030+00 0/0 0/0 1/0 .data g_profile_GUARD_MNG */ extern actor_process_profile_definition g_profile_GUARD_MNG = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_GUARD_MNG, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daGuardMng_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0197, // mPriority + 407, // mPriority &l_daGuardMng_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 0, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp index 81789022624..23f42b4d65b 100644 --- a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp +++ b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp @@ -86,18 +86,18 @@ static actor_method_class l_daHitobj_Method = { /* 8046B63C-8046B66C -00001 0030+00 0/0 0/0 1/0 .data g_profile_HITOBJ */ extern actor_process_profile_definition g_profile_HITOBJ = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_HITOBJ, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(hitobj_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x02B2, // mPriority + 690, // mPriority &l_daHitobj_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp index ce88ddd14c8..b7605db946b 100644 --- a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp +++ b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp @@ -110,18 +110,18 @@ static actor_method_class l_daIzumiGate_Method = { /* 8084945C-8084948C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Izumi_Gate */ extern actor_process_profile_definition g_profile_Izumi_Gate = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Izumi_Gate, &g_fpcLf_Method.mBase, sizeof(daIzumiGate_c), 0, 0, &g_fopAc_Method.base, - 0x0026, + 38, &l_daIzumiGate_Method, - 0x00040000, - 0, - 14, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/d_a_mirror/d_a_mirror.cpp b/rel/d/a/d_a_mirror/d_a_mirror.cpp index b59242295d3..9e6d645bd5c 100644 --- a/rel/d/a/d_a_mirror/d_a_mirror.cpp +++ b/rel/d/a/d_a_mirror/d_a_mirror.cpp @@ -778,18 +778,18 @@ static actor_method_class daMirror_METHODS = { /* 80872694-808726C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_MIRROR */ extern actor_process_profile_definition g_profile_MIRROR = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_MIRROR, &g_fpcLf_Method.mBase, sizeof(daMirror_c), 0, 0, &g_fopAc_Method.base, - 0x02F5, + 757, &daMirror_METHODS, 0x00060000, 5, - 0, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp index 597f2fbf7ee..79c3dc4b839 100644 --- a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp +++ b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp @@ -224,9 +224,9 @@ static actor_method_class l_daScExit_Method = { /* 8059E8EC-8059E91C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SCENE_EXIT2 */ extern actor_process_profile_definition g_profile_SCENE_EXIT2 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_SCENE_EXIT2, &g_fpcLf_Method.mBase, sizeof(daScExit_c), @@ -236,6 +236,6 @@ extern actor_process_profile_definition g_profile_SCENE_EXIT2 = { 583, &l_daScExit_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index 4b5f74c282a..5957c09d73e 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -67,18 +67,18 @@ static actor_method_class l_daSetBgObj_Method = { /* 80485F3C-80485F6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SET_BG_OBJ */ extern actor_process_profile_definition g_profile_SET_BG_OBJ = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_SET_BG_OBJ, &g_fpcLf_Method.mBase, sizeof(daSetBgObj_c), 0, 0, &g_fopAc_Method.base, - 0x02F2, + 754, &l_daSetBgObj_Method, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp index 50d39600da4..e4d0d9a9a00 100644 --- a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp +++ b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp @@ -95,18 +95,18 @@ static actor_method_class daSkip2D_MethodTable = { /* 80D4D6FC-80D4D72C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SKIP2D */ extern actor_process_profile_definition g_profile_SKIP2D = { - -3, + fpcLy_CURRENT_e, 3, - 0xFFFD, + fpcPi_CURRENT_e, PROC_SKIP2D, &g_fpcLf_Method.mBase, sizeof(daSkip2D_c), 0, 0, &g_fopAc_Method.base, - 0x0304, + 772, &daSkip2D_MethodTable, - 0x00040000, - 0, - 0, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; \ No newline at end of file diff --git a/rel/d/a/d_a_suspend/d_a_suspend.cpp b/rel/d/a/d_a_suspend/d_a_suspend.cpp index e83dfb302a9..d3baabb439a 100644 --- a/rel/d/a/d_a_suspend/d_a_suspend.cpp +++ b/rel/d/a/d_a_suspend/d_a_suspend.cpp @@ -47,9 +47,9 @@ static actor_method_class daSus_METHODS = { /* 804D526C-804D529C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SUSPEND */ extern actor_process_profile_definition g_profile_SUSPEND = { - -3, + fpcLy_CURRENT_e, 11, - -3, + fpcPi_CURRENT_e, PROC_SUSPEND, &g_fpcLf_Method.mBase, sizeof(daSus_c), @@ -58,7 +58,7 @@ extern actor_process_profile_definition g_profile_SUSPEND = { &g_fopAc_Method.base, 763, &daSus_METHODS, - 0x00060000, + 0x60000, 5, - 0, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/d_a_swTime/d_a_swTime.cpp b/rel/d/a/d_a_swTime/d_a_swTime.cpp index 97e3ab8c783..36c41bbc45c 100644 --- a/rel/d/a/d_a_swTime/d_a_swTime.cpp +++ b/rel/d/a/d_a_swTime/d_a_swTime.cpp @@ -68,18 +68,18 @@ static actor_method_class l_daSwTime_Method = { /* 80D4F7E8-80D4F818 -00001 0030+00 0/0 0/0 1/0 .data g_profile_SwTime */ extern actor_process_profile_definition g_profile_SwTime = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_SwTime, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daSwTime_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0240, // mPriority + 576, // mPriority &l_daSwTime_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/d_a_talk/d_a_talk.cpp b/rel/d/a/d_a_talk/d_a_talk.cpp index 234c19aa1ba..5e3ecdfd5ab 100644 --- a/rel/d/a/d_a_talk/d_a_talk.cpp +++ b/rel/d/a/d_a_talk/d_a_talk.cpp @@ -53,7 +53,7 @@ int daTalk_c::execute() { mMessageID = -1; fopAcM_delete(this); } else { - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); } } @@ -134,9 +134,9 @@ static actor_method_class l_daTalk_Method = { /* 80D66794-80D667C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TALK */ extern actor_process_profile_definition g_profile_TALK = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_TALK, &g_fpcLf_Method.mBase, sizeof(daTalk_c), @@ -146,6 +146,6 @@ extern actor_process_profile_definition g_profile_TALK = { 766, &l_daTalk_Method, 0x44000, - 0, - 6, + fopAc_ACTOR_e, + fopAc_CULLBOX_6_e, }; diff --git a/rel/d/a/d_a_tbox/d_a_tbox.cpp b/rel/d/a/d_a_tbox/d_a_tbox.cpp index 8ec55ff498d..020b3817648 100644 --- a/rel/d/a/d_a_tbox/d_a_tbox.cpp +++ b/rel/d/a/d_a_tbox/d_a_tbox.cpp @@ -443,7 +443,6 @@ extern "C" extern char const* const d_a_tbox__stringBase0; // External References: // -extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp b/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp index 326ac80a61f..935b425c463 100644 --- a/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp +++ b/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp @@ -74,18 +74,18 @@ static actor_method_class l_daTboxSw_Method = { /* 80D669F0-80D66A20 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TBOX_SW */ extern actor_process_profile_definition g_profile_TBOX_SW = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_TBOX_SW, &g_fpcLf_Method.mBase, sizeof(daTboxSw_c), 0, 0, &g_fopAc_Method.base, - 0x020E, + 526, &l_daTboxSw_Method, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp index 60b7c4e0ac9..988b06a359e 100644 --- a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp +++ b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp @@ -162,9 +162,9 @@ static actor_method_class l_daVrbox_Method = { /* 804989C8-804989F8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_VRBOX */ extern actor_process_profile_definition g_profile_VRBOX = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_VRBOX, &g_fpcLf_Method.mBase, sizeof(vrbox_class), @@ -173,7 +173,7 @@ extern actor_process_profile_definition g_profile_VRBOX = { &g_fopAc_Method.base, 7, &l_daVrbox_Method, - 0x00044000, - 0, - 0, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp index d66fe5fea96..43a548688e2 100644 --- a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp +++ b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp @@ -707,9 +707,9 @@ static actor_method_class l_daVrbox2_Method = { /* 80499B38-80499B68 -00001 0030+00 0/0 0/0 1/0 .data g_profile_VRBOX2 */ extern actor_process_profile_definition g_profile_VRBOX2 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_VRBOX2, &g_fpcLf_Method.mBase, sizeof(vrbox2_class), @@ -719,6 +719,6 @@ extern actor_process_profile_definition g_profile_VRBOX2 = { 4, &l_daVrbox2_Method, 0x44000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp index b6d2953643d..e7d05433464 100644 --- a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp +++ b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp @@ -4,7 +4,9 @@ */ #include "rel/d/a/d_a_warp_bug/d_a_warp_bug.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" @@ -114,8 +116,8 @@ int daWarpBug_c::execute() { if (player_p->checkMidnaWarp()) { mpBrk->play(); mpBtk->play(); - Z2GetAudioMgr()->seStartLevel(Z2SE_EN_YM_WAIT, ¤t.pos, NULL, 0, 1.0f, 1.0f, - -1.0f, -1.0f, 0); + Z2GetAudioMgr()->seStartLevel(Z2SE_EN_YM_WAIT, ¤t.pos, NULL, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); } #endif return 1; @@ -173,9 +175,9 @@ static actor_method_class l_daWarpBug_Method = { /* 80D6822C-80D6825C -00001 0030+00 0/0 0/0 1/0 .data g_profile_WarpBug */ extern actor_process_profile_definition g_profile_WarpBug = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_WarpBug, &g_fpcLf_Method.mBase, sizeof(daWarpBug_c), @@ -185,6 +187,6 @@ extern actor_process_profile_definition g_profile_WarpBug = { 726, &l_daWarpBug_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp index bc9686c612e..a66eedaa1eb 100644 --- a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp @@ -76,18 +76,18 @@ static actor_method_class l_daE_DB_LEAF_Method = { /* 806A2140-806A2170 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_DB_LEAF */ extern actor_process_profile_definition g_profile_E_DB_LEAF = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_E_DB_LEAF, &g_fpcLf_Method.mBase, sizeof(e_db_leaf_class), 0, 0, &g_fopAc_Method.base, - 0x0089, + 137, &l_daE_DB_LEAF_Method, - 0x00040000, - 0, - 0, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index 3910232ecf7..e16b8ab6c9d 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -344,20 +344,20 @@ static actor_method_class l_daE_YK_Method = { /* 80807E50-80807E80 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_YK */ extern actor_process_profile_definition g_profile_E_YK = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_E_YK, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(e_yk_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x00BC, // mPriority + 188, // mPriority &l_daE_YK_Method, // mSubMtd 0x10050100, // mStatus - ACTOR_TYPE_ENEMY, // mActorType - 0x0E, // mCullType + fopAc_ENEMY_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; /* 80807E80-80807E8C 000110 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ diff --git a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp index 2f5a5494819..d53d37e9c00 100644 --- a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp +++ b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp @@ -83,18 +83,18 @@ static actor_method_class l_daE_YM_TAG_Method = { /* 80815FD8-80816008 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_YM_TAG */ extern actor_process_profile_definition g_profile_E_YM_TAG = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_E_YM_TAG, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daE_YM_TAG_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x00C3, // mPriority + 195, // mPriority &l_daE_YM_TAG_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp index f4cd87c7e3b..c61903c29ed 100644 --- a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp +++ b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp @@ -757,9 +757,9 @@ static actor_method_class l_daKytag00_Method = { /* 8046CA98-8046CAC8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG00 */ extern actor_process_profile_definition g_profile_KYTAG00 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG00, &g_fpcLf_Method.mBase, sizeof(kytag00_class), @@ -769,6 +769,6 @@ extern actor_process_profile_definition g_profile_KYTAG00 = { 94, &l_daKytag00_Method, 0x44000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp index 675b924b092..69c25ffd803 100644 --- a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp +++ b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp @@ -145,18 +145,18 @@ static actor_method_class l_daKytag02_Method = { /* 80855E2C-80855E5C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG02 */ extern actor_process_profile_definition g_profile_KYTAG02 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG02, &g_fpcLf_Method.mBase, sizeof(kytag02_class), 0, 0, &g_fopAc_Method.base, - 0x60, + 96, &l_daKytag02_Method, - 0x00044000, - 0, - 0, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp index d73104ad3d7..5448ac2c9bf 100644 --- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp +++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp @@ -56,18 +56,18 @@ static actor_method_class l_daKytag05_Method = { /* 80528B3C-80528B6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG05 */ extern actor_process_profile_definition g_profile_KYTAG05 = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_KYTAG05, &g_fpcLf_Method.mBase, sizeof(kytag05_class), 0, 0, &g_fopAc_Method.base, - 0x0063, + 99, &l_daKytag05_Method, - 0x00044000, - 0, - 0, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index 9ca03ce37b7..2404dca01c9 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -1350,20 +1350,20 @@ static actor_method_class l_daKytag06_Method = { /* 8085A0F4-8085A124 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG06 */ extern actor_process_profile_definition g_profile_KYTAG06 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG06, &g_fpcLf_Method.mBase, sizeof(kytag06_class), 0, 0, &g_fopAc_Method.base, - 0x64, + 100, &l_daKytag06_Method, - 0x00060000, - 0, - 0, + 0x60000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; /* 8085A18C-8085A190 000064 0004+00 0/0 0/0 0/0 .bss diff --git a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp index 1750888b5a1..a127fb2b588 100644 --- a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp +++ b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp @@ -82,18 +82,18 @@ static actor_method_class l_daKytag07_Method = { /* 8085A4C8-8085A4F8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG07 */ extern actor_process_profile_definition g_profile_KYTAG07 = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_KYTAG07, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(kytag07_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0065, // mPriority + 101, // mPriority &l_daKytag07_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp index 2f9468042ec..420c48c28e4 100644 --- a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp +++ b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp @@ -155,9 +155,9 @@ static actor_method_class l_daKytag09_Method = { /* 8085BA80-8085BAB0 -00001 0030+00 0/2 0/0 1/0 .data g_profile_KYTAG09 */ extern actor_process_profile_definition g_profile_KYTAG09 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG09, &g_fpcLf_Method.mBase, sizeof(kytag09_class), @@ -167,6 +167,6 @@ extern actor_process_profile_definition g_profile_KYTAG09 = { 103, &l_daKytag09_Method, 0x60000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp index ef862af111f..2f86a8a36f4 100644 --- a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp +++ b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp @@ -401,9 +401,9 @@ static actor_method_class l_daKytag10_Method = { /* 80529468-80529498 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG10 */ extern actor_process_profile_definition g_profile_KYTAG10 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG10, &g_fpcLf_Method.mBase, sizeof(kytag10_class), @@ -413,6 +413,6 @@ extern actor_process_profile_definition g_profile_KYTAG10 = { 104, &l_daKytag10_Method, 0x44000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp index 19bdddae342..4f2bc578c61 100644 --- a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp +++ b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp @@ -135,9 +135,9 @@ static actor_method_class l_daKytag11_Method = { /* 805298D4-80529904 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG11 */ extern actor_process_profile_definition g_profile_KYTAG11 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG11, &g_fpcLf_Method.mBase, sizeof(kytag11_class), @@ -147,6 +147,6 @@ extern actor_process_profile_definition g_profile_KYTAG11 = { 105, &l_daKytag11_Method, 0x44000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp index 50f9068c4d6..a52d0e0623f 100644 --- a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp +++ b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp @@ -110,18 +110,18 @@ static actor_method_class l_daKytag14_Method = { /* 80529C08-80529C38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG14 */ extern actor_process_profile_definition g_profile_KYTAG14 = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_KYTAG14, &g_fpcLf_Method.mBase, sizeof(kytag14_class), 0, 0, &g_fopAc_Method.base, - 0x006C, + 108, &l_daKytag14_Method, - 0x00044000, - 0, - 0, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp index 88555703643..3f2c2fb6da6 100644 --- a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp +++ b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp @@ -139,9 +139,9 @@ static actor_method_class l_daKytag15_Method = { /* 80860B98-80860BC8 -00001 0030+00 0/1 0/0 1/0 .data g_profile_KYTAG15 */ extern actor_process_profile_definition g_profile_KYTAG15 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG15, &g_fpcLf_Method.mBase, sizeof(kytag15_class), @@ -151,6 +151,6 @@ extern actor_process_profile_definition g_profile_KYTAG15 = { 109, &l_daKytag15_Method, 0x44000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp index 869779e1acf..2d1d981c68f 100644 --- a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp +++ b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp @@ -177,9 +177,9 @@ static actor_method_class l_daKytag16_Method = { /* 808611DC-8086120C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG16 */ extern actor_process_profile_definition g_profile_KYTAG16 = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KYTAG16, &g_fpcLf_Method.mBase, sizeof(kytag16_class), @@ -189,6 +189,6 @@ extern actor_process_profile_definition g_profile_KYTAG16 = { 110, &l_daKytag16_Method, 0x60000, - 0, - 0, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; diff --git a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp index 052349d4fe9..72be4cb1f54 100644 --- a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp +++ b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp @@ -49,18 +49,18 @@ static actor_method_class l_daKytag17_Method = { /* 8046DC08-8046DC38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG17 */ extern actor_process_profile_definition g_profile_KYTAG17 = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_KYTAG17, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(kytag17_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x006F, // mPriority + 111, // mPriority &l_daKytag17_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp index 02cc2558462..34f80847d84 100644 --- a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp +++ b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp @@ -652,20 +652,20 @@ static actor_method_class daNpcAsh_MethodTable = { /* 8095DC24-8095DC54 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_ASH */ extern actor_process_profile_definition g_profile_NPC_ASH = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_NPC_ASH, &g_fpcLf_Method.mBase, sizeof(daNpcAsh_c), 0, 0, &g_fopAc_Method.base, - 0x019B, + 411, &daNpcAsh_MethodTable, - 0x00040100, - 4, - 14, + 0x40100, + fopAc_NPC_e, + fopAc_CULLBOX_CUSTOM_e, }; /* 8095DC54-8095DC60 0002C4 000C+00 2/2 0/0 0/0 .data __vt__11J3DTexNoAnm */ diff --git a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp index 71b4aa05b2e..c7fcb11fdd2 100644 --- a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp +++ b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp @@ -186,9 +186,9 @@ static actor_method_class l_daNpc_Fish_Method = { /* 80542DE8-80542E18 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_FISH */ extern actor_process_profile_definition g_profile_NPC_FISH = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_NPC_FISH, &g_fpcLf_Method.mBase, sizeof(npc_fish_class), @@ -198,8 +198,8 @@ extern actor_process_profile_definition g_profile_NPC_FISH = { 719, &l_daNpc_Fish_Method, 0x40100, - 0, - 6, + fopAc_ACTOR_e, + fopAc_CULLBOX_6_e, }; /* 805424DC-805424DC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp index 592cd5c785d..278b3160d5c 100644 --- a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp @@ -128,18 +128,18 @@ static actor_method_class l_daObjBombf_Method = { /* 80BBAEC8-80BBAEF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Bombf */ extern actor_process_profile_definition g_profile_Obj_Bombf = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_Bombf, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjBombf_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x00FB, // mPriority + 251, // mPriority &l_daObjBombf_Method, // mSubMtd - 0x00040100, // mStatus - 3, // mActorType - 14, // mCullType + 0x40100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 753ec65a0f7..c7d08b684ad 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -1962,20 +1962,20 @@ static actor_method_class l_daObjCarry_Method = { /* 8047B130-8047B160 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Carry */ extern actor_process_profile_definition g_profile_Obj_Carry = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 8, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_Carry, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjCarry_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x000000F4, // mPriority + 244, // mPriority &l_daObjCarry_Method, // mSubMtd - 0x00040500, // mStatus - 0, // mActorType - 0xE // mCullType + 0x40500, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; /* 8047B160-8047B16C 000B10 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ diff --git a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp index df9ba84a0f3..4b4d0bad44e 100644 --- a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp @@ -176,18 +176,18 @@ static actor_method_class daObjBoard_METHODS = { /* 8057BEB0-8057BEE0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cboard */ extern actor_process_profile_definition g_profile_Obj_Cboard = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Cboard, &g_fpcLf_Method.mBase, sizeof(daObjBoard_c), 0, 0, &g_fopAc_Method.base, - 0x01C5, + 453, &daObjBoard_METHODS, - 0x00040000, - 0, - 14, + 0x40000, + fopAc_CULLBOX_0_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp index 7e7d16e7623..955aca46576 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp @@ -109,18 +109,18 @@ static actor_method_class l_daCowdoor_Method = { /* 80BCCC08-80BCCC38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cowdoor */ extern actor_process_profile_definition g_profile_Obj_Cowdoor = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 3, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_Cowdoor, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daCowdoor_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x01BF, // mPriority + 447, // mPriority &l_daCowdoor_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 14, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp index c64945d32b9..301239ecdb5 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp @@ -152,7 +152,6 @@ extern "C" extern char const* const d_a_obj_crvlh_down__stringBase0; // External References: // -extern "C" void OSReport(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp index 7087ccff365..980cea94688 100644 --- a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp @@ -153,9 +153,9 @@ static actor_method_class l_daObjCrystal_Method = { /* 80BD6914-80BD6944 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Crystal */ extern actor_process_profile_definition g_profile_Obj_Crystal = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Obj_Crystal, &g_fpcLf_Method.mBase, sizeof(daObjCrystal_c), @@ -165,6 +165,6 @@ extern actor_process_profile_definition g_profile_Obj_Crystal = { 579, &l_daObjCrystal_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp index 3205d3142ba..534f3815d43 100644 --- a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp @@ -112,18 +112,18 @@ static actor_method_class l_daObjDigholl_Method = { /* 80BDCBA0-80BDCBD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Digholl */ extern actor_process_profile_definition g_profile_Obj_Digholl = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Digholl, &g_fpcLf_Method.mBase, sizeof(daObjDigholl_c), 0, 0, &g_fopAc_Method.base, - 0x00F9, + 249, &l_daObjDigholl_Method, - 0x00044100, - 3, - 14, + 0x44100, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp index 399fe3bb8bc..ce4161f1b23 100644 --- a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp @@ -187,9 +187,9 @@ static actor_method_class l_daObjDigpl_Method = { /* 8057C918-8057C948 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Digpl */ extern actor_process_profile_definition g_profile_Obj_Digpl = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Digpl, &g_fpcLf_Method.mBase, sizeof(daObjDigpl_c), @@ -199,6 +199,6 @@ extern actor_process_profile_definition g_profile_Obj_Digpl = { 250, &l_daObjDigpl_Method, 0x44080, - 3, - 14, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp index cfb50b6c7e1..ef24fa701a5 100644 --- a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp +++ b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp @@ -84,18 +84,18 @@ static actor_method_class Mthd_Table = { /* 8057CB1C-8057CB4C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Eff */ extern actor_process_profile_definition g_profile_Obj_Eff = { - -3, + fpcLy_CURRENT_e, 9, - -3, + fpcPi_CURRENT_e, PROC_Obj_Eff, &g_fpcLf_Method.mBase, sizeof(daObjEff::Act_c), 0, 0, &g_fopAc_Method.base, - 0x10B, + 267, &daObjEff::Mthd_Table, - 0x00040000, - 0, - 0, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp index 95902cc3804..5f5ddc9603a 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp +++ b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp @@ -273,18 +273,18 @@ static actor_method_class l_daObjE_CREATE_Method = { /* 80BE38F4-80BE3924 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_E_CREATE */ extern actor_process_profile_definition g_profile_Obj_E_CREATE = { - -3, + fpcLy_CURRENT_e, 3, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Obj_E_CREATE, &g_fpcLf_Method.mBase, sizeof(daObjE_CREATE_c), 0, 0, &g_fopAc_Method.base, - 0x01CA, + 458, &l_daObjE_CREATE_Method, - 0x00040000, - 0x0, - 0xE, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp index 92e0f93233f..fddd8f2e18e 100644 --- a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp +++ b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp @@ -191,7 +191,6 @@ extern "C" void reinitGX__6J3DSysFv(); extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer(); extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); -extern "C" void DCStoreRangeNoSync(); extern "C" void PSMTXCopy(); extern "C" void PSMTXConcat(); extern "C" void GXSetVtxDesc(); diff --git a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp index be8c5c475c8..f2d5626938f 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp @@ -198,9 +198,9 @@ static actor_method_class l_daObj_Fmobj_Method = { /* 8057CFA0-8057CFD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_FMOBJ */ extern actor_process_profile_definition g_profile_OBJ_FMOBJ = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_OBJ_FMOBJ, &g_fpcLf_Method.mBase, sizeof(obj_fmobj_class), @@ -210,6 +210,6 @@ extern actor_process_profile_definition g_profile_OBJ_FMOBJ = { 40, &l_daObj_Fmobj_Method, 0x40100, - 0, - 7, + fopAc_ACTOR_e, + fopAc_CULLBOX_7_e, }; diff --git a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp index 79ba4aeaa55..12c35693f2e 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp @@ -115,18 +115,18 @@ static actor_method_class l_daHsTarget_Method = { /* 80C1F8E8-80C1F918 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HsTarget */ extern actor_process_profile_definition g_profile_Obj_HsTarget = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_HsTarget, &g_fpcLf_Method.mBase, sizeof(daHsTarget_c), 0, 0, &g_fopAc_Method.base, - 0x01F5, + 501, &l_daHsTarget_Method, 0x40100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp index ba0e6e5e14c..42fb2989889 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp @@ -273,7 +273,6 @@ extern "C" extern char const* const d_a_obj_iceblock__stringBase0; // External References: // -extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp index 4b8278235a1..00dbabe7e54 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp @@ -133,18 +133,18 @@ static actor_method_class daObjKJgjs_METHODS = { /* 80C465B0-80C465E0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KJgjs */ extern actor_process_profile_definition g_profile_Obj_KJgjs = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_KJgjs, &g_fpcLf_Method.mBase, sizeof(daObjKJgjs_c), 0, 0, &g_fopAc_Method.base, - 0x02A5, + 677, &daObjKJgjs_METHODS, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp index 11475b50d8e..e3db5d77c32 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp @@ -166,20 +166,20 @@ static actor_method_class daObjLv3saka_METHODS = { /* 80C5C418-80C5C448 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv3R10Saka */ extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 3, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv3R10Saka, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjLv3saka_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0210, // mPriority + 528, // mPriority &daObjLv3saka_METHODS, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 14, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; /* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp index aea61f87d36..1730dff06b1 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp @@ -103,9 +103,9 @@ static actor_method_class l_daObjWaterEff_Method = { /* 80C5C8C0-80C5C8F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WaterEff */ extern actor_process_profile_definition g_profile_Obj_WaterEff = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Obj_WaterEff, &g_fpcLf_Method.mBase, sizeof(daObjWaterEff_c), @@ -115,6 +115,6 @@ extern actor_process_profile_definition g_profile_Obj_WaterEff = { 555, &l_daObjWaterEff_Method, 0x40100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp index d901d2c69f7..48ad2ec781b 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp @@ -260,9 +260,9 @@ static actor_method_class l_daLv4Gate_Method = { /* 80C5F4A4-80C5F4D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Gate */ extern actor_process_profile_definition g_profile_Obj_Lv4Gate = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Lv4Gate, &g_fpcLf_Method.mBase, sizeof(daLv4Gate_c), @@ -272,8 +272,8 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Gate = { 637, &l_daLv4Gate_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; /* 80C5F4D4-80C5F4FC 0000B8 0028+00 1/1 0/0 0/0 .data __vt__11daLv4Gate_c */ diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp index 2cd2e81166a..f069a1a6ba4 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp @@ -106,9 +106,9 @@ static actor_method_class l_daLv4HsTarget_Method = { /* 80C5FA68-80C5FA98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4HsTarget */ extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Lv4HsTarget, &g_fpcLf_Method.mBase, sizeof(daLv4HsTarget_c), @@ -118,6 +118,6 @@ extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { 640, &l_daLv4HsTarget_Method, 0x40100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp index d519052ad75..4da13928d7b 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp @@ -312,9 +312,9 @@ static actor_method_class l_daLv4PoGate_Method = { /* 80C6093C-80C6096C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4PoGate */ extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Lv4PoGate, &g_fpcLf_Method.mBase, sizeof(daLv4PoGate_c), @@ -324,6 +324,6 @@ extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = { 638, &l_daLv4PoGate_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp index 8d28bbc58d4..7dd1bda09d4 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp @@ -187,9 +187,9 @@ static actor_method_class daObjLv4Floor_METHODS = { /* 80C67E28-80C67E58 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Floor */ extern actor_process_profile_definition g_profile_Obj_Lv4Floor = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Lv4Floor, &g_fpcLf_Method.mBase, sizeof(daObjLv4Floor_c), @@ -199,6 +199,6 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Floor = { 584, &daObjLv4Floor_METHODS, 0x44000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp index 391ea35897a..e45f7dbc17a 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp @@ -186,20 +186,20 @@ static actor_method_class l_daObjLv4Gear_Method = { /* 80C68550-80C68580 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Gear */ extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4Gear, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjLv4Gear_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0231, // mPriority + 561, // mPriority &l_daObjLv4Gear_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 14, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; /* 80C68524-80C68524 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp index dab70ff5017..da87d508f91 100644 --- a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp @@ -289,18 +289,18 @@ static actor_method_class daObjMGate_METHODS = { /* 80593FC8-80593FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MGate */ extern actor_process_profile_definition g_profile_Obj_MGate = { - -3, + fpcLy_CURRENT_e, 3, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Obj_MGate, &g_fpcLf_Method.mBase, - 0x5D0, + sizeof(daObjMGate_c), 0, 0, &g_fopAc_Method.base, - 0x01C4, + 452, &daObjMGate_METHODS, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp index 945aa3d2b3a..7d322b8340b 100644 --- a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp +++ b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp @@ -183,9 +183,9 @@ static actor_method_class l_daObj_Myogan_Method = { /* 80C9F2C8-80C9F2F8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_MYOGAN */ extern actor_process_profile_definition g_profile_OBJ_MYOGAN = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_OBJ_MYOGAN, &g_fpcLf_Method.mBase, sizeof(obj_myogan_class), @@ -195,6 +195,6 @@ extern actor_process_profile_definition g_profile_OBJ_MYOGAN = { 52, &l_daObj_Myogan_Method, 0x44000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp index f7d1c18eb6d..af57d549fa8 100644 --- a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp @@ -149,18 +149,18 @@ static actor_method_class daObjOnsen_METHODS = { /* 80CA8184-80CA81B4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Onsen */ extern actor_process_profile_definition g_profile_Obj_Onsen = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Onsen, &g_fpcLf_Method.mBase, sizeof(daObjOnsen_c), 0, 0, &g_fopAc_Method.base, - 0x025A, + 602, &daObjOnsen_METHODS, - 0x00044100, - 0, - 14, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp index cb078c5ec11..00b3fef79d0 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp @@ -53,18 +53,18 @@ static actor_method_class l_daObjOnsenFire_Method = { /* 80CA84A0-80CA84D0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_ONSEN_FIRE */ extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 3, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_OBJ_ONSEN_FIRE, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjOnsenFire_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0264, // mPriority + 612, // mPriority &l_daObjOnsenFire_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp index c3655eab3ec..8468ee7afbe 100644 --- a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp +++ b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp @@ -128,18 +128,18 @@ static actor_method_class daObjProp_METHODS = { /* 80CB564C-80CB567C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Prop */ extern actor_process_profile_definition g_profile_Obj_Prop = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Obj_Prop, &g_fpcLf_Method.mBase, sizeof(daObjProp_c), 0, 0, &g_fopAc_Method.base, - 0x02E1, + 737, &daObjProp_METHODS, - 0x00040000, - 3, - 14, + 0x40000, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp index 916f89abec8..0a337a87ab9 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp @@ -147,18 +147,18 @@ static actor_method_class daObjRCircle_METHODS = { /* 80CB8D34-80CB8D64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RCircle */ extern actor_process_profile_definition g_profile_Obj_RCircle = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Obj_RCircle, &g_fpcLf_Method.mBase, sizeof(daObjRCircle_c), 0, 0, &g_fopAc_Method.base, - 0x02E4, + 740, &daObjRCircle_METHODS, - 0x00044180, - 3, - 14, + 0x44180, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp index cb1a1684541..96693aecd4b 100644 --- a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp @@ -14,16 +14,17 @@ void daObjSmoke_c::initBaseMtx() { /* 80CDCE98-80CDCEF0 000098 0058+00 1/1 0/0 0/0 .text setBaseMtx__12daObjSmoke_cFv */ void daObjSmoke_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::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); } /* 80CDCEF0-80CDCF9C 0000F0 00AC+00 1/1 0/0 0/0 .text Create__12daObjSmoke_cFv */ int daObjSmoke_c::Create() { initBaseMtx(); - if (i_fopAcM_isSwitch(this,getSwbit())) { - mParticle = dComIfGp_particle_set(0x85a6,¤t.pos,¤t.angle,&mScale,0xff,0,0xffffffff,0,0,0); + if (i_fopAcM_isSwitch(this, getSwbit())) { + mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &mScale, 255, NULL, + -1, NULL, NULL, NULL); } return 1; @@ -35,19 +36,19 @@ int daObjSmoke_c::create() { if (Create() == 0) { return cPhs_ERROR_e; } - return cPhs_COMPLEATE_e; + return cPhs_COMPLEATE_e; } /* 80CDD004-80CDD0B8 000204 00B4+00 1/1 0/0 0/0 .text execute__12daObjSmoke_cFv */ int daObjSmoke_c::execute() { - if (i_fopAcM_isSwitch(this,getSwbit()) && !mParticle) { - mParticle = dComIfGp_particle_set(0x85a6,¤t.pos,¤t.angle,&mScale,0xff,0,0xffffffff,0,0,0); + if (i_fopAcM_isSwitch(this, getSwbit()) && !mParticle) { + mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &mScale, 255, NULL, + -1, NULL, NULL, NULL); } return 1; } - /* 80CDD0B8-80CDD0F8 0002B8 0040+00 1/1 0/0 0/0 .text _delete__12daObjSmoke_cFv */ int daObjSmoke_c::_delete() { if (mParticle) { @@ -80,23 +81,23 @@ static int daObjSmoke_Create(fopAc_ac_c* i_this) { static actor_method_class l_daObjSmoke_Method = { (process_method_func)daObjSmoke_Create, (process_method_func)daObjSmoke_Delete, - (process_method_func)daObjSmoke_Execute + (process_method_func)daObjSmoke_Execute, }; /* 80CDD184-80CDD1B4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Smoke */ extern actor_process_profile_definition g_profile_Obj_Smoke = { - -3, // mLayerID - 7, // mListID - -3, // mListPrio - PROC_Obj_Smoke, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd - sizeof(daObjSmoke_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // mSubMtd - 0x0278, // mPriority - &l_daObjSmoke_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 0x0E, // mCullType + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Smoke, // mProcName + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daObjSmoke_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 632, // mPriority + &l_daObjSmoke_Method, // mSubMtd + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp index 82a4b46e89e..14f9807e6d8 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp @@ -148,9 +148,9 @@ static actor_method_class l_daSnowEffTag_Method = { /* 80CDF778-80CDF7A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SnowEff */ extern actor_process_profile_definition g_profile_Tag_SnowEff = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Tag_SnowEff, &g_fpcLf_Method.mBase, sizeof(daSnowEffTag_c), @@ -160,6 +160,6 @@ extern actor_process_profile_definition g_profile_Tag_SnowEff = { 656, &l_daSnowEffTag_Method, 0x44000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp index f7bcd0e0de5..a8090406b19 100644 --- a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp +++ b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp @@ -563,20 +563,20 @@ static actor_method_class l_daObjStone_Method = { /* 80CECD44-80CECD74 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Stone */ extern actor_process_profile_definition g_profile_Obj_Stone = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 8, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_Stone, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjStone_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x01FF, // mPriority + 511, // mPriority &l_daObjStone_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 23, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLSPHERE_8_e, // mCullType }; /* 80CECD74-80CECDA4 000120 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ diff --git a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp index afaf0291f2e..cfa87c9ec32 100644 --- a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp +++ b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp @@ -277,20 +277,20 @@ static actor_method_class l_daObjSMark_Method = { /* 8059A434-8059A464 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_StoneMark */ extern actor_process_profile_definition g_profile_Obj_StoneMark = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_StoneMark, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjSMark_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0216, // mPriority + 534, // mPriority &l_daObjSMark_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 23, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLSPHERE_8_e, // mCullType }; /* 8059A464-8059A488 000054 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ diff --git a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp index 9f7da519fcb..dbcbdc7e684 100644 --- a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp @@ -117,9 +117,9 @@ static actor_method_class l_daObj_Suisya_Method = { /* 80CF056C-80CF059C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SUISYA */ extern actor_process_profile_definition g_profile_OBJ_SUISYA = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_OBJ_SUISYA, &g_fpcLf_Method.mBase, sizeof(daObj_Suisya_c), @@ -129,6 +129,6 @@ extern actor_process_profile_definition g_profile_OBJ_SUISYA = { 65, &l_daObj_Suisya_Method, 0x40100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp index 7434fcaa71c..8a3046d7db3 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp @@ -392,9 +392,9 @@ static actor_method_class l_daObjSwPr_Method = { /* 8059B3AC-8059B3DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Swpropeller */ extern actor_process_profile_definition g_profile_Obj_Swpropeller = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Swpropeller, &g_fpcLf_Method.mBase, sizeof(daObjSwPr_c), @@ -404,6 +404,6 @@ extern actor_process_profile_definition g_profile_Obj_Swpropeller = { 448, &l_daObjSwPr_Method, 0x44100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp index 63446515197..f7742c71543 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp @@ -241,20 +241,20 @@ static actor_method_class daObjSwSpinner_METHODS = { /* 80D00B04-80D00B34 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_SwSpinner */ extern actor_process_profile_definition g_profile_Obj_SwSpinner = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 3, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwSpinner, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjSwSpinner_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x022F, // mPriority + 559, // mPriority &daObjSwSpinner_METHODS, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 14, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; /* 80D00AD4-80D00AD4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp index b565d1f75ff..71a309b1510 100644 --- a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp @@ -146,9 +146,9 @@ static actor_method_class daObjGake_METHODS = { /* 80D0C168-80D0C198 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Gake */ extern actor_process_profile_definition g_profile_Obj_Gake = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Gake, &g_fpcLf_Method.mBase, sizeof(daObjGake_c), @@ -158,6 +158,6 @@ extern actor_process_profile_definition g_profile_Obj_Gake = { 568, &daObjGake_METHODS, 0x40100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp index 47bd7c63663..d7d6e378cbd 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp @@ -118,18 +118,18 @@ static actor_method_class l_daObjTMoon_Method = { /* 80D12FC4-80D12FF4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TMoon */ extern actor_process_profile_definition g_profile_Obj_TMoon = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Obj_TMoon, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daObjTMoon_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0239, // mPriority + 569, // mPriority &l_daObjTMoon_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 14, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp index 2d65cc9f6a1..7229fdb20ae 100644 --- a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp +++ b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp @@ -111,9 +111,9 @@ static actor_method_class l_daObj_Usaku_Method = { /* 80D21318-80D21348 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_USAKU */ extern actor_process_profile_definition g_profile_OBJ_USAKU = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_OBJ_USAKU, &g_fpcLf_Method.mBase, sizeof(obj_usaku_class), @@ -123,6 +123,6 @@ extern actor_process_profile_definition g_profile_OBJ_USAKU = { 78, &l_daObj_Usaku_Method, 0x40100, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp index 139ee52a282..0f033674a29 100644 --- a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp +++ b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp @@ -143,18 +143,18 @@ static actor_method_class l_daObjVGnd_Method = { /* 80D21A48-80D21A78 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcGnd */ extern actor_process_profile_definition g_profile_Obj_VolcGnd = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_VolcGnd, &g_fpcLf_Method.mBase, sizeof(daObjVGnd_c), 0, 0, &g_fopAc_Method.base, - 0x0253, + 595, &l_daObjVGnd_Method, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index caff1c25f0c..b30d3f8d2db 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -442,18 +442,18 @@ static actor_method_class l_daObj_Web0_Method = { /* 80D35228-80D35258 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB0 */ extern actor_process_profile_definition g_profile_OBJ_WEB0 = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_OBJ_WEB0, &g_fpcLf_Method.mBase, sizeof(obj_web0_class), 0, 0, &g_fopAc_Method.base, - 0x002F, + 47, &l_daObj_Web0_Method, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index 222cdea4102..71260f3373a 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -331,18 +331,18 @@ static actor_method_class l_daObj_Web1_Method = { /* 80D36190-80D361C0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_WEB1 */ extern actor_process_profile_definition g_profile_OBJ_WEB1 = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_OBJ_WEB1, &g_fpcLf_Method.mBase, sizeof(obj_web1_class), 0, 0, &g_fopAc_Method.base, - 0x0030, + 48, &l_daObj_Web1_Method, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp index 33b7b08b1ff..13b43bfb324 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp @@ -186,9 +186,9 @@ static actor_method_class l_daObjMirror6Pole_Method = { /* 80C965D0-80C96600 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Mirror6Pole */ extern actor_process_profile_definition g_profile_Obj_Mirror6Pole = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_Mirror6Pole, &g_fpcLf_Method.mBase, sizeof(daObjMirror6Pole_c), @@ -198,6 +198,6 @@ extern actor_process_profile_definition g_profile_Obj_Mirror6Pole = { 682, &l_daObjMirror6Pole_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp index 1218079c22e..9ea9ca1e53b 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp @@ -187,9 +187,9 @@ static actor_method_class l_daObjMirrorSand_Method = { /* 80C98A14-80C98A44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MirrorSand */ extern actor_process_profile_definition g_profile_Obj_MirrorSand = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Obj_MirrorSand, &g_fpcLf_Method.mBase, sizeof(daObjMirrorSand_c), @@ -199,6 +199,6 @@ extern actor_process_profile_definition g_profile_Obj_MirrorSand = { 679, &l_daObjMirrorSand_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp b/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp index 71985698d33..073d8a168d8 100644 --- a/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp @@ -113,18 +113,18 @@ static actor_method_class l_daTagCstaSw_Method = { /* 805A2570-805A25A0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_CstaSw */ extern actor_process_profile_definition g_profile_Tag_CstaSw = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_CstaSw, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagCstaSw_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0291, // mPriority + 657, // mPriority &l_daTagCstaSw_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 14, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp index e3f9ff65036..bd233b9ae42 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp @@ -75,18 +75,18 @@ static actor_method_class l_daTagAJnot_Method = { /* 805A28AC-805A28DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_AJnot */ extern actor_process_profile_definition g_profile_Tag_AJnot = { - -3, + fpcLy_CURRENT_e, 3, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_AJnot, &g_fpcLf_Method.mBase, sizeof(daTagAJnot_c), 0, 0, &g_fopAc_Method.base, - 0x01B4, + 436, &l_daTagAJnot_Method, - 0x00044000, - 3, - 14, + 0x44000, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp b/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp index 992b478fe91..2004ad633ec 100644 --- a/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp +++ b/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp @@ -29,18 +29,18 @@ static actor_method_class l_daTagArena_Method = { /* 80D55D80-80D55DB0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Arena */ extern actor_process_profile_definition g_profile_Tag_Arena = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Arena, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagArena_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x014D, // mPriority + 333, // mPriority &l_daTagArena_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp index 6d4bae0e04b..2341fa5f1ee 100644 --- a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp +++ b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp @@ -40,18 +40,18 @@ static actor_method_class l_daTagAssist_Method = { /* 80D55F28-80D55F58 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Assist */ extern actor_process_profile_definition g_profile_Tag_Assist = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Assist, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagAssist_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x010A, // mPriority + 266, // mPriority &l_daTagAssist_Method, // mSubMtd - 0x00040000, // mStatus - 0x00, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp index 9fc80ad3439..6b205a61aac 100644 --- a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp +++ b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp @@ -162,18 +162,18 @@ static actor_method_class l_daAttp_Method = { /* 804D576C-804D579C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Attp */ extern actor_process_profile_definition g_profile_Tag_Attp = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Attp, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daAttp_c), // mSize 0, // mSizeOther 0, // mParameter &g_fopAc_Method.base, // mSubMtd - 0x01B8, // mPriority + 440, // mPriority &l_daAttp_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 0, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp index 5cc5bae26b7..318d5e8c632 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp +++ b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp @@ -140,7 +140,7 @@ s32 daTag_BottleItem_c::orderEvent() { if (mAttentionInfo.mFlags == 0x20000008) { mAttentionInfo.field_0x0[1] = EMPTY_BOTTLE; mAttentionInfo.field_0x0[3] = EMPTY_BOTTLE; - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); } return 1; @@ -214,18 +214,18 @@ static actor_method_class daTag_BottleItem_MethodTable = { /* 80D5669C-80D566CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_BTLITM */ extern actor_process_profile_definition g_profile_TAG_BTLITM = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPri + fpcPi_CURRENT_e, // mListPri PROC_TAG_SSDRINK, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTag_BottleItem_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x46, // mPriority + 70, // mPriority &daTag_BottleItem_MethodTable, // mSubMtd - 0x00064100, // mStatus + 0x64100, // mStatus 5, // mActorType - 0xE, // mCullType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp index 33aec83a66f..d729559b61a 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp +++ b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp @@ -118,18 +118,18 @@ static actor_method_class l_daTagChgRestart_Method = { /* 80D56B20-80D56B50 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_ChgRestart */ extern actor_process_profile_definition g_profile_Tag_ChgRestart = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_ChgRestart, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagChgRestart_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x024F, // mPriority + 591, // mPriority &l_daTagChgRestart_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0x0E // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp index 20a4ae26e8a..dd3ac3339df 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp @@ -261,18 +261,18 @@ static actor_method_class l_daTag_Chk_Method = { /* 8048AC88-8048ACB8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_CHKPOINT */ extern actor_process_profile_definition g_profile_TAG_CHKPOINT = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_TAG_CHKPOINT, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTag_Chk_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0118, // mPriority + 280, // mPriority &l_daTag_Chk_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 6 // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_6_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp index ccd6c7ee2e8..bac34e8a4a4 100644 --- a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp +++ b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp @@ -32,18 +32,18 @@ static actor_method_class l_daTagEscape_Method = { /* 80D58880-80D588B0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Escape */ extern actor_process_profile_definition g_profile_Tag_Escape = { - -3, - 07, - 0xFFFD, + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, PROC_Tag_Escape, &g_fpcLf_Method.mBase, sizeof(daTagEscape_c), 0, 0, &g_fopAc_Method.base, - 0x018D, + 397, &l_daTagEscape_Method, - 0x00040000, - 0, - 14, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index f12a753f382..015cecb3564 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -253,18 +253,18 @@ static actor_method_class daTag_EvtArea_MethodTable = { /* 8048CE68-8048CE98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTAREA */ extern actor_process_profile_definition g_profile_TAG_EVTAREA = { - -3, + fpcLy_CURRENT_e, 8, - -3, + fpcPi_CURRENT_e, PROC_TAG_EVTAREA, &g_fpcLf_Method.mBase, sizeof(daTag_EvtArea_c), 0, 0, &g_fopAc_Method.base, - 0x011F, + 287, &daTag_EvtArea_MethodTable, - 0x00044000, - 0, - 14, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp index fc6dabd9e76..a154a2b8a84 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp @@ -124,7 +124,7 @@ int daTag_EvtMsg_c::Execute() { fopAcM_orderOtherEventId(this, mEventID, 0xFF, 0xFFFF, 0, 1); } } else { - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } } @@ -290,9 +290,9 @@ static actor_method_class daTag_EvtMsg_MethodTable = { /* 8048D8A4-8048D8D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTMSG */ extern actor_process_profile_definition g_profile_TAG_EVTMSG = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_TAG_MSG, &g_fpcLf_Method.mBase, sizeof(daTag_EvtMsg_c), @@ -302,6 +302,6 @@ extern actor_process_profile_definition g_profile_TAG_EVTMSG = { 285, &daTag_EvtMsg_MethodTable, 0x44000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp b/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp index 8e19939f707..3c03ba30455 100644 --- a/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp +++ b/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp @@ -27,18 +27,18 @@ static actor_method_class l_daTagGra_Method = { /* 80D59740-80D59770 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_GRA */ extern actor_process_profile_definition g_profile_TAG_GRA = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 3, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_TAG_GRA, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagGra_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0014, // mPriority + 20, // mPriority &l_daTagGra_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp index 36a7db05dec..103b589e957 100644 --- a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp +++ b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp @@ -71,18 +71,18 @@ static actor_method_class l_daTagGstart_Method = { /* 805A36A8-805A36D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Gstart */ extern actor_process_profile_definition g_profile_Tag_Gstart = { - -3, + fpcLy_CURRENT_e, 2, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_Gstart, &g_fpcLf_Method.mBase, sizeof(daTagGstart_c), 0, 0, &g_fopAc_Method.base, - 0x01B5, + 437, &l_daTagGstart_Method, - 0x00060000, - 3, - 14, + 0x60000, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp b/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp index 30325ec6cde..f280c9492ff 100644 --- a/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp +++ b/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp @@ -71,18 +71,18 @@ static actor_method_class l_daTagGuard_Method = { /* 80D59A38-80D59A68 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_GUARD */ extern actor_process_profile_definition g_profile_TAG_GUARD = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_TAG_GUARD, &g_fpcLf_Method.mBase, sizeof(daTagGuard_c), 0, 0, &g_fopAc_Method.base, - 0x0198, + 408, &l_daTagGuard_Method, - 0x00040000, - 0x00, - 0x0E, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp index 7307e0f7d40..dc7c9d8d0c2 100644 --- a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp @@ -84,18 +84,18 @@ static actor_method_class l_daTagHinit_Method = { /* 805A3A08-805A3A38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Hinit */ extern actor_process_profile_definition g_profile_Tag_Hinit = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Tag_Hinit, &g_fpcLf_Method.mBase, sizeof(daTagHinit_c), 0, 0, &g_fopAc_Method.base, - 0x01B1, + 433, &l_daTagHinit_Method, - 0x00060000, - 3, - 0x0E, + 0x60000, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp index 74e3aab5533..c3d7d5b9a57 100644 --- a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp +++ b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp @@ -202,9 +202,9 @@ static actor_method_class l_daTagHjump_Method = { /* 805A428C-805A42BC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Hjump */ extern actor_process_profile_definition g_profile_Tag_Hjump = { - -3, + fpcLy_CURRENT_e, 3, - -3, + fpcPi_CURRENT_e, PROC_Tag_Hjump, &g_fpcLf_Method.mBase, sizeof(daTagHjump_c), @@ -214,6 +214,6 @@ extern actor_process_profile_definition g_profile_Tag_Hjump = { 434, &l_daTagHjump_Method, 0x44100, - 3, - 14, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp index 326b37324ac..f08fe95590f 100644 --- a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp +++ b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp @@ -104,18 +104,18 @@ static actor_method_class daTag_Howl_MethodTable = { /* 8048DDA8-8048DDD8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_HOWL */ extern actor_process_profile_definition g_profile_TAG_HOWL = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_TAG_HOWL, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTag_Howl_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x011B, // mPriority + 283, // mPriority &daTag_Howl_MethodTable, // mSubMtd - 0x00040000, // mStatus - 0x00, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp index 852886e0ae6..c8e90607b5c 100644 --- a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp @@ -148,7 +148,7 @@ int daTagHstop_c::execute() { } } else if (field_0x573 == 2 && !i_dComIfGp_getHorseActor()->checkTurnStand()) { fopAcM_orderSpeakEvent(this, 0, 0); - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); } } else if (mPrm1 == 2 && !i_dComIfGp_event_runCheck()) { if (dComIfGs_getArrowNum() == 0 && !dComIfGs_isSwitch(0x8D, fopAcM_GetHomeRoomNo(this))) @@ -193,18 +193,18 @@ static actor_method_class l_daTagHstop_Method = { /* 805A4B44-805A4B74 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Hstop */ extern actor_process_profile_definition g_profile_Tag_Hstop = { - -3, + fpcLy_CURRENT_e, 3, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_Hstop, &g_fpcLf_Method.mBase, sizeof(daTagHstop_c), 0, 0, &g_fopAc_Method.base, - 0x01B3, + 435, &l_daTagHstop_Method, - 0x00040000, - 3, - 14, + 0x40000, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp b/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp index c3ad73ac231..7ac4c8e41b3 100644 --- a/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp +++ b/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp @@ -32,18 +32,18 @@ static actor_method_class l_daTagInst_Method = { /* 80D59BA0-80D59BD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Instruction */ extern actor_process_profile_definition g_profile_Tag_Instruction = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_Instruction, &g_fpcLf_Method.mBase, sizeof(daTagInst_c), 0, 0, &g_fopAc_Method.base, - 0x014E, + 334, &l_daTagInst_Method, - 0x00040000, - 0, - 14, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp index 94648851697..892de84b276 100644 --- a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp @@ -39,7 +39,7 @@ int daTag_Lantern_c::Execute() { } } } else if (field_0x5f8) { - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } @@ -124,9 +124,9 @@ static actor_method_class daTag_Lantern_MethodTable = { /* 8048F174-8048F1A4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_LANTERN */ extern actor_process_profile_definition g_profile_TAG_LANTERN = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_TAG_LANTERN, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTag_Lantern_c), // mSize @@ -135,7 +135,7 @@ extern actor_process_profile_definition g_profile_TAG_LANTERN = { &g_fopAc_Method.base, // mSubMtd 286, // mPriority &daTag_Lantern_MethodTable, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 14, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp index 88766e8bc00..765719634f2 100644 --- a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp +++ b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp @@ -131,9 +131,9 @@ static actor_method_class l_daTagLightBall_Method = { /* 80D5AC9C-80D5ACCC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_LightBall */ extern actor_process_profile_definition g_profile_Tag_LightBall = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_LightBall, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagLightBall_c), // mSize @@ -143,6 +143,6 @@ extern actor_process_profile_definition g_profile_Tag_LightBall = { 547, // mPriority &l_daTagLightBall_Method, // mSubMtd 0x40100, // mStatus - 0, // mActorType - 14, // mCullType + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp index 95f078aebc2..dac436c302b 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp @@ -212,9 +212,9 @@ static actor_method_class l_daTagLv2PrChk_Method = { /* 805A53DC-805A540C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Lv2PrChk */ extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Tag_Lv2PrChk, &g_fpcLf_Method.mBase, sizeof(daTagLv2PrChk_c), @@ -224,6 +224,6 @@ extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = { 558, &l_daTagLv2PrChk_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp index 076cdd456b0..20d60e5ad15 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp @@ -94,18 +94,18 @@ static actor_method_class daTag_Lv5Soup_MethodTable = { /* 80D5B1AC-80D5B1DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_LV5SOUP */ extern actor_process_profile_definition g_profile_TAG_LV5SOUP = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, 0x122, &g_fpcLf_Method.mBase, sizeof(daTag_Lv5Soup_c), 0, 0, &g_fopAc_Method.base, - 0x0046, + 70, &daTag_Lv5Soup_MethodTable, - 0x00064100, + 0x64100, 5, - 14, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp index c1312850a51..6b24d1ffccb 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp @@ -115,18 +115,18 @@ static actor_method_class l_daLv6CstaSw_Method = { /* 80D5B830-80D5B860 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Lv6CstaSw */ extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_Lv6CstaSw, &g_fpcLf_Method.mBase, sizeof(daLv6CstaSw_c), 0, 0, &g_fopAc_Method.base, - 0x0292, + 658, &l_daLv6CstaSw_Method, - 0x00044000, - 0, - 14, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp b/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp index 710ee78a120..3634ea19e92 100644 --- a/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp +++ b/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp @@ -66,18 +66,18 @@ static actor_method_class l_daTagMagne_Method = { /* 805A55F4-805A5624 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Magne */ extern actor_process_profile_definition g_profile_Tag_Magne = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_Magne, &g_fpcLf_Method.mBase, sizeof(daTagMagne_c), 0, 0, &g_fopAc_Method.base, - 0x024E, + 590, &l_daTagMagne_Method, - 0x00040000, - 0, - 14, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp index 71e31bdc7d5..9a6c0356b20 100644 --- a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp @@ -158,7 +158,7 @@ SECTION_DEAD static char const* const stringBase_805A604C = "D_MN04B"; #ifdef NONMATCHING void daTagMhint_c::eventOrder() { if (!i_dComIfGp_event_runCheck()) { - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); if (!daPy_getPlayerActorClass()->checkPlayerFly() || i_dComIfGp_checkPlayerStatus0(0, 0x100000)) @@ -280,7 +280,7 @@ int daTagMhint_c::execute() { } } else { if (field_0x570 != 0) { - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 3, 0); return 1; } @@ -321,7 +321,7 @@ int daTagMhint_c::execute() { } } - if (!mEvtInfo.chkCondition(1)) { + if (!mEvtInfo.chkCondition(dEvtCnd_CANTALK_e)) { field_0x56f = 0; } @@ -359,9 +359,9 @@ static actor_method_class l_daTagMhint_Method = { /* 805A6074-805A60A4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Mhint */ extern actor_process_profile_definition g_profile_Tag_Mhint = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Tag_Mhint, &g_fpcLf_Method.mBase, sizeof(daTagMhint_c), @@ -371,6 +371,6 @@ extern actor_process_profile_definition g_profile_Tag_Mhint = { 254, &l_daTagMhint_Method, 0x44000, - 3, - 14, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp index 421df416ecc..ffc9da846ad 100644 --- a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp +++ b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp @@ -161,9 +161,9 @@ static actor_method_class l_daTagMist_Method = { /* 8048F72C-8048F75C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Mist */ extern actor_process_profile_definition g_profile_Tag_Mist = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Tag_Mist, &g_fpcLf_Method.mBase, sizeof(daTagMist_c), @@ -173,6 +173,6 @@ extern actor_process_profile_definition g_profile_Tag_Mist = { 292, &l_daTagMist_Method, 0x40000, - 0, - 14, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp index 7ae96d85e39..f5592ffea90 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp @@ -115,18 +115,18 @@ static actor_method_class l_daTagMmsg_Method = { /* 80D5BD64-80D5BD94 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Mmsg */ extern actor_process_profile_definition g_profile_Tag_Mmsg = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - 0xFFFD, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Mmsg, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagMmsg_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x00FF, // mPriority + 255, // mPriority &l_daTagMmsg_Method, // mSubMtd - 0x00044000, // mStatus - 0x03, // mActorType - 0x0E, // mCullType + 0x44000, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index b95b9bd2460..b2ebef0dce3 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -156,7 +156,7 @@ static int daTagMstop_Delete(daTagMstop_c* i_this) { /* 805A63C4-805A63F8 000304 0034+00 1/1 0/0 0/0 .text eventOrder__12daTagMstop_cFv */ void daTagMstop_c::eventOrder() { - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } @@ -307,18 +307,18 @@ static actor_method_class l_daTagMstop_Method = { /* 805A69A4-805A69D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Mstop */ extern actor_process_profile_definition g_profile_Tag_Mstop = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Mstop, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagMstop_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0101, // mPriority + 257 , // mPriority &l_daTagMstop_Method, // mSubMtd - 0x00044000, // mStatus - 3, // mActorType - 0x0E, // mCullType + 0x44000, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp index 4d2dadb08fc..8b06eb0ebb7 100644 --- a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp +++ b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp @@ -97,7 +97,7 @@ int daTagMwait_c::execute() { } } else if (mEnteredTrigger) { fopAcM_orderSpeakEvent(this, 0, 0); - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); mAttentionInfo.mPosition = midna_p->mAttentionInfo.mPosition; mEyePos = mAttentionInfo.mPosition; } else { @@ -132,14 +132,14 @@ int daTagMwait_c::execute() { mAttentionInfo.mPosition = midna_p->mAttentionInfo.mPosition; mEyePos = mAttentionInfo.mPosition; fopAcM_orderSpeakEvent(this, 0, 0); - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); } } else if (field_0x570 > 0.0f && player_dist < field_0x570 && player_p->current.pos.y >= current.pos.y && player_p->current.pos.y <= current.pos.y + mScale.y) { mAttentionInfo.mFlags = 2; - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); } } } @@ -169,9 +169,9 @@ static actor_method_class l_daTagMwait_Method = { /* 80D5C5E4-80D5C614 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Mwait */ extern actor_process_profile_definition g_profile_Tag_Mwait = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Tag_Mwait, &g_fpcLf_Method.mBase, sizeof(daTagMwait_c), @@ -181,6 +181,6 @@ extern actor_process_profile_definition g_profile_Tag_Mwait = { 256, &l_daTagMwait_Method, 0x44000, - 3, - 14, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp index 80806746c85..f5261120f79 100644 --- a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp +++ b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp @@ -95,18 +95,18 @@ static actor_method_class l_daTagMyna2_Method = { /* 80D5CA84-80D5CAB4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_MYNA2 */ extern actor_process_profile_definition g_profile_TAG_MYNA2 = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_TAG_MYNA2, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagMyna2_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0000018A, // mPriority + 394, // mPriority &l_daTagMyna2_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0xE // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp index 5705e34d13f..64ab8076878 100644 --- a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp @@ -84,18 +84,18 @@ static actor_method_class l_daTagPoFire_Method = { /* 80D5DD7C-80D5DDAC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_poFire */ extern actor_process_profile_definition g_profile_Tag_poFire = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_poFire, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagPoFire_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0289, // mPriority + 649, // mPriority &l_daTagPoFire_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 14, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp index 39ae2caa359..70faeb82909 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp @@ -105,18 +105,18 @@ static actor_method_class daTagRetRm_METHODS = { /* 80D5F234-80D5F264 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_RetRoom */ extern actor_process_profile_definition g_profile_Tag_RetRoom = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_RetRoom, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagRetRm_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x02DB, // mPriority + 731, // mPriority &daTagRetRm_METHODS, // mSubMtd - 0x00040000, // mStatus - 0x00, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp index 113d8a078d7..83e56f0982b 100644 --- a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp @@ -210,20 +210,20 @@ static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagR /* 80D5FA34-80D5FA64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_RiverBack */ extern actor_process_profile_definition g_profile_Tag_RiverBack = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_RiverBack, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagRiverBack_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x022C, // mPriority + 556, // mPriority &l_daTagRiverBack_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 14, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; /* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp index 7189d5bdb58..04a69716643 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp @@ -136,18 +136,18 @@ static actor_method_class daTagRmbitSw_METHODS = { /* 80D5FFD4-80D60004 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_RmbitSw */ extern actor_process_profile_definition g_profile_Tag_RmbitSw = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Tag_RmbitSw, &g_fpcLf_Method.mBase, sizeof(daTagRmbitSw_c), 0, 0, &g_fopAc_Method.base, - 0x02EC, + 748, &daTagRmbitSw_METHODS, - 0x00040000, - 0, - 0x0E, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp b/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp index c7ae66884c3..e041f40788b 100644 --- a/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp +++ b/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp @@ -27,18 +27,18 @@ static actor_method_class l_daTagSchedule_Method = { /* 80D60140-80D60170 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Schedule */ extern actor_process_profile_definition g_profile_Tag_Schedule = { - 0xFFFFFFFD, // mLayerID - 0x0007, // mListID - 0xFFFD, // mListPrio + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Schedule, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagSchedule_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x018C, // mPriority + 396, // mPriority &l_daTagSchedule_Method, // mSubMtd - 0x00040000, // mStatus - 0x00, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp index 622fc89e0d9..4640d982a8a 100644 --- a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp +++ b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp @@ -70,18 +70,18 @@ static actor_method_class l_daTagSetBall_Method = { /* 80D6034C-80D6037C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SetBall */ extern actor_process_profile_definition g_profile_Tag_SetBall = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_SetBall, &g_fpcLf_Method.mBase, sizeof(daTagSetBall_c), 0, 0, &g_fopAc_Method.base, - 0x023F, + 575, &l_daTagSetBall_Method, - 0x00040100, - 0, - 14, + 0x40100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp index 2cde0914cd6..b8670dc3ac9 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp @@ -118,18 +118,18 @@ static actor_method_class l_daTagRestart_Method = { /* 80D607E0-80D60810 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Restart */ extern actor_process_profile_definition g_profile_Tag_Restart = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_Restart, &g_fpcLf_Method.mBase, sizeof(daTagRestart_c), 0, 0, &g_fopAc_Method.base, - 0x0250, + 592, &l_daTagRestart_Method, - 0x00040000, - 0, - 14, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp index 824ed53efc9..6b972852e43 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp @@ -173,18 +173,18 @@ static actor_method_class daTag_ShopItem_MethodTable = { /* 80D61210-80D61240 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_SHOPITM */ extern actor_process_profile_definition g_profile_TAG_SHOPITM = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_TAG_SHOPITM, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTag_ShopItem_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x004B, // mPriority + 75, // mPriority &daTag_ShopItem_MethodTable, // mSubMtd - 0x00064100, // mStatus + 0x64100, // mStatus 5, // mActorType - 14, // mCullType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp index ec819b11263..f2863131c03 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp @@ -101,18 +101,18 @@ static actor_method_class daTagSmkEmt_METHODS = { /* 80D6162C-80D6165C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SmkEmt */ extern actor_process_profile_definition g_profile_Tag_SmkEmt = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_SmkEmt, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagSmkEmt_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x02E7, // mPriority + 743, // mPriority &daTagSmkEmt_METHODS, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp index d42041aba08..a48c2375f5a 100644 --- a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp @@ -114,18 +114,18 @@ static actor_method_class l_daTagSpinner_Method = { /* 80D61B68-80D61B98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Spinner */ extern actor_process_profile_definition g_profile_Tag_Spinner = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 3, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Spinner, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagSpinner_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x025D, // mPriority + 605, // mPriority &l_daTagSpinner_Method, // mSubMtd - 0x00040100, // mStatus - 0, // mActorType - 14, // mCullType + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp index b2a9fd2bc95..63b2f86da3a 100644 --- a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp +++ b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp @@ -106,18 +106,18 @@ static actor_method_class l_daTagSpring_Method = { /* 805A6EB0-805A6EE0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Spring */ extern actor_process_profile_definition g_profile_Tag_Spring = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Spring, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagSpring_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x024B, // mPriority + 587, // mPriority &l_daTagSpring_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp index edd06348cf2..8b075be31b1 100644 --- a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp +++ b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp @@ -120,18 +120,18 @@ static actor_method_class l_daTagStream_Method = { /* 80D63C14-80D63C44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Stream */ extern actor_process_profile_definition g_profile_Tag_Stream = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_Stream, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagStream_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0103, // mPriority + 259, // mPriority &l_daTagStream_Method, // mSubMtd - 0x00044000, // mStatus - 3, // mActorType - 0x0E, // mCullType + 0x44000, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp index 2f9f2c88ed4..3499927446a 100644 --- a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp +++ b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp @@ -79,18 +79,18 @@ static actor_method_class l_daTag_Telop_Method = { /* 80490C08-80490C38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_TELOP */ extern actor_process_profile_definition g_profile_TAG_TELOP = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_TAG_TELOP, &g_fpcLf_Method.mBase, sizeof(daTag_Telop_c), 0, 0, &g_fopAc_Method.base, - 0x011A, + 282, &l_daTag_Telop_Method, - 0x00044000, - 0, - 6, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_6_e, }; diff --git a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp index 5c0d519df26..5673f3e9e83 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp +++ b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp @@ -32,18 +32,18 @@ static actor_method_class l_daTagTheBHint_Method = { /* 80D63E84-80D63EB4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_TheBHint */ extern actor_process_profile_definition g_profile_Tag_TheBHint = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_TheBHint, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagTheBHint_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x0109, // mPriority + 265, // mPriority &l_daTagTheBHint_Method, // mSubMtd - 0x00040000, // mStatus - 0, // mActorType - 0x0E, // mCullType + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp index a128f530d70..1e42d6030fe 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp @@ -98,18 +98,18 @@ static actor_method_class daTagWrHowl_METHODS = { /* 80D64224-80D64254 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaraHowl */ extern actor_process_profile_definition g_profile_Tag_WaraHowl = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_WaraHowl, &g_fpcLf_Method.mBase, sizeof(daTagWrHowl_c), 0, 0, &g_fopAc_Method.base, - 0x02DD, + 733, &daTagWrHowl_METHODS, - 0x00040000, - 0, - 14, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp index 4b9658fa6ec..f0be42813da 100644 --- a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp +++ b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp @@ -104,18 +104,18 @@ static actor_method_class l_daTagWatchGe_Method = { /* 80D644F8-80D64528 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WatchGe */ extern actor_process_profile_definition g_profile_Tag_WatchGe = { - -3, // mLayerID + fpcLy_CURRENT_e, // mLayerID 7, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_Tag_WatchGe, // mProcName &g_fpcLf_Method.mBase, // mSubMtd sizeof(daTagWatchGe_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x00C1, // mPriority + 193, // mPriority &l_daTagWatchGe_Method, // mSubMtd - 0x00044000, // mStatus - 0, // mActorType - 0, // mCullType + 0x44000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // mCullType }; diff --git a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp index db0c39309b0..8d2583f9e40 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp @@ -32,20 +32,20 @@ static actor_method_class l_daTagWaterFall_Method = { /* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaterFall */ extern actor_process_profile_definition g_profile_Tag_WaterFall = { - -3, + fpcLy_CURRENT_e, 7, - 0xFFFD, + fpcPi_CURRENT_e, PROC_Tag_WaterFall, &g_fpcLf_Method.mBase, sizeof(daTagWaterFall_c), 0, 0, &g_fopAc_Method.base, - 0x00C6, + 198, &l_daTagWaterFall_Method, - 0x00044000, - 0, - 0, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; /* 80D6462C-80D64680 0000EC 0054+00 1/1 0/0 0/0 .text __ct__20daTagWaterFall_HIO_cFv */ diff --git a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp index b44192a852f..4f257ba63ff 100644 --- a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp @@ -229,9 +229,9 @@ int daTagWljump_c::execute() { } if (field_0x572 == 0) { if (!g_dComIfG_gameInfo.play.getEvent().runCheck()) { - mEvtInfo.i_onCondition(1); + mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); if (!linkPlayer->checkPlayerFly() && - linkPlayer->mEvtInfo.chkCondition(1)) { + linkPlayer->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e)) { dComIfGp_att_ZHintRequest(this, 0x1ff); if (field_0x56c[2] == 0) { field_0x56c[2] = 1; @@ -255,7 +255,7 @@ int daTagWljump_c::execute() { field_0x568 = -1; } current.pos = mAttentionInfo.mPosition; - if (!mEvtInfo.chkCondition(1)) { + if (!mEvtInfo.chkCondition(dEvtCnd_CANTALK_e)) { field_0x56c[2] = 0; } @@ -398,18 +398,18 @@ static actor_method_class l_daTagWljump_Method = { /* 80D65934-80D65964 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Wljump */ extern actor_process_profile_definition g_profile_Tag_Wljump = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_Tag_Wljump, &g_fpcLf_Method.mBase, sizeof(daTagWljump_c), 0, 0, &g_fopAc_Method.base, - 0x0104, + 260, &l_daTagWljump_Method, - 0x00044000, - 3, - 0x0E, + 0x44000, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 05e9758ed96..0d512c054b0 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -11663,20 +11663,20 @@ static actor_method_class l_daAlink_Method = { /* 803B2DCC-803B2E20 -00001 0030+24 0/0 0/0 1/0 .data g_profile_ALINK */ extern actor_process_profile_definition g_profile_ALINK = { - -3, + fpcLy_CURRENT_e, 5, - -3, + fpcPi_CURRENT_e, PROC_ALINK, &g_fpcLf_Method.mBase, sizeof(daAlink_c), 0, 0, &g_fopAc_Method.base, - 0x5B, + 91, &l_daAlink_Method, - 0x00060400, - 1, - 0, + 0x60400, + fopAc_PLAYER_e, + fopAc_CULLBOX_0_e, }; // tons of extra padding? not sure what this is diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index c73b8cfda2a..b192b5a7ac9 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -2536,7 +2536,7 @@ int daAlink_c::execute() { } if (checkDeadHP()) { - mEvtInfo.offCondition(2); + mEvtInfo.offCondition(fopAcCnd_NOEXEC_e); } else if (!checkMagneBootsOn()) { f32 var_f31_2; if (mLinkAcch.ChkGroundHit()) { @@ -2553,13 +2553,13 @@ int daAlink_c::execute() { ((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) && !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP))) { - mEvtInfo.onCondition(1); + mEvtInfo.onCondition(dEvtCnd_CANTALK_e); if (checkReinRide() || checkCanoeRide()) { - mEvtInfo.onCondition(8); + mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e); } } } else if (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) { - mEvtInfo.onCondition(1); + mEvtInfo.onCondition(dEvtCnd_CANTALK_e); } if (checkEndResetFlg1(ERFLG1_UNK_40000) && checkMidnaRide() && checkWolf()) { diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index 473e9909c04..feb081b15b2 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -1009,7 +1009,7 @@ void daItem_c::procInitGetDemoEvent() { field_0x9c1 = 10; fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(8); + mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); @@ -1027,7 +1027,7 @@ void daItem_c::procWaitGetDemoEvent() { } else { if (m_itemNo == BOOMERANG) { fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(8); + mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); return; } @@ -1042,7 +1042,7 @@ void daItem_c::procWaitGetDemoEvent() { } } else { fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(8); + mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); } } } diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index f7f50a5b649..9758510705f 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -524,7 +524,7 @@ dAttList_c* dAttention_c::getActionBtnXY() { dAttList_c* list = GetLockonList(0); if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth()) { - if (list->getActor()->mEvtInfo.chkCondition(0x20)) { + if (list->getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return list; } @@ -537,7 +537,7 @@ dAttList_c* dAttention_c::getActionBtnXY() { for (i = 0; i < mActionCount; i++) { if (mActionList[i].mType == 3) { - if (mActionList[i].getActor()->mEvtInfo.chkCondition(0x20)) { + if (mActionList[i].getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return &mActionList[i]; } } diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index d3d8c605f3c..0fbd15c59e0 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -29,7 +29,7 @@ void dInsect_c::Insect_GetDemoMain() { cLib_offBit(mAttentionInfo.mFlags, 0x10); fopAcM_cancelCarryNow(this); fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(8); + mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); m_itemId = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); @@ -52,7 +52,7 @@ void dInsect_c::Insect_GetDemoMain() { m_mode = 2; } else { fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(8); + mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); } break; case 2: diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index 01720a742c2..ef72b21eeb9 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -1,312 +1,197 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_k_wmark -// +/** + * d_k_wmark.cpp + * + */ #include "d/d_k_wmark.h" -#include "dol2asm.h" - -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoLib_clipper { - static u8 mClipper[92]; -}; - -struct kankyo_class {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 80267128 */ void atan2sX_Z() const; -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; - static f32 mGroundY; -}; - -struct dkWmark_c { - /* 80261640 */ ~dkWmark_c(); - /* 802616C4 */ void setMatrix(); - - static u8 m_nowID[4]; -}; - -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 cBgS_PolyInfo {}; - -struct dBgS { - /* 80074ABC */ void ChkMoveBG(cBgS_PolyInfo const&); -}; - -struct cM3dGPla {}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct Vec {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct JKRSolidHeap {}; - -struct J3DUClipper { - /* 802738FC */ void clip(f32 const (*)[4], Vec, f32) const; -}; - -struct J3DModel {}; - -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - -// -// Forward References: -// - -extern "C" static void dkWmark_Create__FP12kankyo_class(); -extern "C" void __dt__9dkWmark_cFv(); -extern "C" static void dkWmark_Delete__FP9dkWmark_c(); -extern "C" void setMatrix__9dkWmark_cFv(); -extern "C" static void dkWmark_Execute__FP9dkWmark_c(); -extern "C" static void dkWmark_Draw__FP9dkWmark_c(); -extern "C" extern char const* const d_d_k_wmark__stringBase0; -extern "C" extern void* g_profile_WMARK[10 + 1 /* padding */]; -extern "C" u8 m_nowID__9dkWmark_c[4]; - -// -// External References: -// - -extern "C" void __dt__4cXyzFv(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(); -extern "C" void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(); -extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap(); -extern "C" void mDoExt_restoreCurrentHeap__Fv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__11J3DLightObjFv(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void fopKyM_Delete__FPv(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(); -extern "C" void ChkMoveBG__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_tevstr_init__FP12dKy_tevstr_cScUc(); -extern "C" void atan2sX_Z__4cXyzCFv(); -extern "C" void cM_atan2s__Fff(); -extern "C" void clip__11J3DUClipperCFPA4_Cf3Vecf(); -extern "C" void __dl__FPv(); -extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); -extern "C" void __register_global_object(); -extern "C" void __construct_array(); -extern "C" void _savegpr_26(); -extern "C" void _restgpr_26(); -extern "C" void abs(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mClipper__14mDoLib_clipper[92]; -extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8039A494-8039A494 026AF4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A494 = "Alink"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A49A = "\0\0\0\0\0"; -#pragma pop - -/* 80430C90-80430C9C 05D9B0 000C+00 1/1 0/0 0/0 .bss @3644 */ -static u8 lit_3644[12]; - -/* 80430C9C-80430CA8 05D9BC 000C+00 1/1 0/0 0/0 .bss - * wolfFootScale$localstatic3$create__9dkWmark_cFv */ -static f32 data_80430C9C[3]; +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_lib.h" /* 80451130-80451134 000630 0004+00 2/2 0/0 0/0 .sbss m_nowID__9dkWmark_c */ -u8 dkWmark_c::m_nowID[4]; +int dkWmark_c::m_nowID; -/* 80451134-80451138 000634 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_80451134[4]; +int dkWmark_c::create() { + static cXyz wolfFootScale(1.1f, 1.0f, 0.6f); -/* 80454FB0-80454FB4 0035B0 0004+00 1/1 0/0 0/0 .sdata2 @3718 */ -SECTION_SDATA2 static f32 lit_3718 = 11.0f / 10.0f; + new (this) dkWmark_c(); -/* 80454FB4-80454FB8 0035B4 0004+00 2/2 0/0 0/0 .sdata2 @3719 */ -SECTION_SDATA2 static f32 lit_3719 = 1.0f; + field_0x48a = mParam >> 0x10; + mParam &= 0xFFFF; -/* 80454FB8-80454FBC 0035B8 0004+00 1/1 0/0 0/0 .sdata2 @3720 */ -SECTION_SDATA2 static f32 lit_3720 = 3.0f / 5.0f; + if ((int)mParam >= 4) { + return cPhs_ERROR_e; + } + + if ((int)mParam == 3) { + mColorType = 2; + } else { + mColorType = mParam; + } + + mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x880, 0x20); + if (mpHeap != NULL) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x23); + JUT_ASSERT(60, modelData != 0); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + mDoExt_restoreCurrentHeap(); + mDoExt_adjustSolidHeap(mpHeap); + } else { + return cPhs_ERROR_e; + } + + if (mpModel == NULL) { + return cPhs_ERROR_e; + } + + if ((int)mParam != 3 && daPy_py_c::i_checkNowWolf()) { + mpModel->setBaseScale(wolfFootScale); + } + + if (!setMatrix()) { + return cPhs_ERROR_e; + } + + if ((int)mParam == 1 || (int)mParam == 3 || (int)mParam == 2) { + field_0x494 = m_nowID; + m_nowID++; + } else { + field_0x488 = 1; + } + + mAlphaFactor = 1.0f; + dKy_tevstr_init(&mTevstr, dComIfGp_roomControl_getStayNo(), 0xFF); + return cPhs_COMPLEATE_e; +} /* 8026141C-80261640 25BD5C 0224+00 1/0 0/0 0/0 .text dkWmark_Create__FP12kankyo_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWmark_Create(kankyo_class* param_0) { - nofralloc -#include "asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s" +static int dkWmark_Create(kankyo_class* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80261640-8026169C 25BF80 005C+00 1/1 0/0 0/0 .text __dt__9dkWmark_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dkWmark_c::~dkWmark_c() { - nofralloc -#include "asm/d/d_k_wmark/__dt__9dkWmark_cFv.s" +dkWmark_c::~dkWmark_c() { + if (mpHeap != NULL) { + mDoExt_destroySolidHeap(mpHeap); + } } -#pragma pop /* 8026169C-802616C4 25BFDC 0028+00 1/0 0/0 0/0 .text dkWmark_Delete__FP9dkWmark_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWmark_Delete(dkWmark_c* param_0) { - nofralloc -#include "asm/d/d_k_wmark/dkWmark_Delete__FP9dkWmark_c.s" +static int dkWmark_Delete(dkWmark_c* i_this) { + i_this->~dkWmark_c(); + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 80454FBC-80454FC0 0035BC 0004+00 1/1 0/0 0/0 .sdata2 @3844 */ -SECTION_SDATA2 static f32 lit_3844 = 100.0f; - -/* 80454FC0-80454FC8 0035C0 0004+04 2/2 0/0 0/0 .sdata2 @3845 */ -SECTION_SDATA2 static f32 lit_3845[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - -/* 80454FC8-80454FD0 0035C8 0008+00 1/1 0/0 0/0 .sdata2 @3846 */ -SECTION_SDATA2 static f64 lit_3846 = 0.5; - -/* 80454FD0-80454FD8 0035D0 0008+00 1/1 0/0 0/0 .sdata2 @3847 */ -SECTION_SDATA2 static f64 lit_3847 = 3.0; - -/* 80454FD8-80454FE0 0035D8 0008+00 1/1 0/0 0/0 .sdata2 @3848 */ -SECTION_SDATA2 static u8 lit_3848[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +inline bool fopAcM_gc_c::getTriPla(cM3dGPla* i_plane) { + return dComIfG_Bgsp().GetTriPla(*(dBgS_GndChk*)mGndCheck, i_plane); +} /* 802616C4-80261964 25C004 02A0+00 2/2 0/0 0/0 .text setMatrix__9dkWmark_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dkWmark_c::setMatrix() { - nofralloc -#include "asm/d/d_k_wmark/setMatrix__9dkWmark_cFv.s" -} -#pragma pop +BOOL dkWmark_c::setMatrix() { + cXyz chk_pos(mPos.x, mPos.y + 100.0f, mPos.z); -/* ############################################################################################## */ -/* 80454FE0-80454FE4 0035E0 0004+00 1/1 0/0 0/0 .sdata2 @3873 */ -SECTION_SDATA2 static f32 lit_3873 = 1.0f / 50.0f; + if (fopAcM_gc_c::gndCheck(&chk_pos)) { + mPos.y = fopAcM_gc_c::getGroundY(); + + cM3dGPla poly; + fopAcM_gc_c::getTriPla(&poly); + + s16 temp_r26 = poly.mNormal.atan2sX_Z() - field_0x48a; + f32 var_f31 = poly.mNormal.absXZ(); + + mDoMtx_stack_c::transS(mPos.x, mPos.y + 1.0f, mPos.z); + mDoMtx_stack_c::ZXYrotM(cM_atan2s(var_f31 * cM_scos(temp_r26), poly.mNormal.y), field_0x48a, + cM_atan2s(var_f31 * -cM_ssin(temp_r26), poly.mNormal.y)); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + + if (dComIfG_Bgsp().ChkMoveBG(*fopAcM_gc_c::getGroundCheck())) { + field_0x48c = 1; + } else { + field_0x48c = 0; + } + } else { + return 0; + } + + return 1; +} + +int dkWmark_c::execute() { + if (field_0x488 == 0 && abs(field_0x494 - m_nowID) > 20) { + field_0x488 = 1; + } + + if (field_0x488 != 0) { + mAlphaFactor -= 0.02f; + } + + if (mAlphaFactor <= 0.0f || (field_0x48c == 1 && !setMatrix())) { + fopKyM_Delete(this); + mAlphaFactor = 0.0f; + } + + return 1; +} /* 80261964-80261A18 25C2A4 00B4+00 1/0 0/0 0/0 .text dkWmark_Execute__FP9dkWmark_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWmark_Execute(dkWmark_c* param_0) { - nofralloc -#include "asm/d/d_k_wmark/dkWmark_Execute__FP9dkWmark_c.s" +static int dkWmark_Execute(dkWmark_c* i_this) { + return i_this->execute(); } -#pragma pop -/* ############################################################################################## */ -/* 8039A488-8039A494 026AE8 000C+00 1/1 0/0 0/0 .rodata kColor$localstatic3$draw__9dkWmark_cFv */ -SECTION_RODATA static u8 const data_8039A488[12] = { - 0x00, 0x00, 0x00, 0x82, 0x5F, 0x4B, 0x32, 0x3C, 0x64, 0x6E, 0x78, 0x28, -}; -COMPILER_STRIP_GATE(0x8039A488, &data_8039A488); +int dkWmark_c::draw() { + J3DGXColor color; -/* 80454FE4-80454FE8 0035E4 0004+00 1/1 0/0 0/0 .sdata2 @3906 */ -SECTION_SDATA2 static f32 lit_3906 = 50.0f; + if (mDoLib_clipper::clip(j3dSys.getViewMtx(), mPos, mScale.x * 50.0f)) { + return 1; + } -/* 80454FE8-80454FF0 0035E8 0008+00 1/1 0/0 0/0 .sdata2 @3908 */ -SECTION_SDATA2 static f64 lit_3908 = 4503599627370496.0 /* cast u32 to float */; + g_env_light.settingTevStruct(0, &mPos, &mTevstr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevstr); + + static const GXColor kColor[] = {{0, 0, 0, 130}, {95, 75, 50, 60}, {100, 110, 120, 40}}; + const GXColor* color_p = &kColor[mColorType]; + + color.r = color_p->r; + color.g = color_p->g; + color.b = color_p->b; + color.a = color_p->a * mAlphaFactor; + + mpModel->getModelData()->getMaterialNodePointer(0)->setTevKColor(1, &color); + mDoExt_modelUpdateDL(mpModel); + + return 1; +} /* 80261A18-80261B54 25C358 013C+00 1/0 0/0 0/0 .text dkWmark_Draw__FP9dkWmark_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWmark_Draw(dkWmark_c* param_0) { - nofralloc -#include "asm/d/d_k_wmark/dkWmark_Draw__FP9dkWmark_c.s" +static int dkWmark_Draw(dkWmark_c* i_this) { + return i_this->draw(); } -#pragma pop /* ############################################################################################## */ /* 803C3430-803C3444 -00001 0014+00 1/0 0/0 0/0 .data l_dkWmark_Method */ -SECTION_DATA static void* l_dkWmark_Method[5] = { - (void*)dkWmark_Create__FP12kankyo_class, (void*)dkWmark_Delete__FP9dkWmark_c, - (void*)dkWmark_Execute__FP9dkWmark_c, (void*)NULL, - (void*)dkWmark_Draw__FP9dkWmark_c, +static leafdraw_method_class l_dkWmark_Method = { + (process_method_func)dkWmark_Create, (process_method_func)dkWmark_Delete, + (process_method_func)dkWmark_Execute, (process_method_func)NULL, + (process_method_func)dkWmark_Draw, }; /* 803C3444-803C3470 -00001 0028+04 0/0 0/0 1/0 .data g_profile_WMARK */ -SECTION_DATA extern void* g_profile_WMARK[10 + 1 /* padding */] = { - (void*)0xFFFFFFFD, - (void*)0x0009FFFD, - (void*)0x03030000, - (void*)&g_fpcLf_Method, - (void*)0x00000498, - (void*)NULL, - (void*)NULL, - (void*)&g_fopKy_Method, - (void*)0x02F80000, - (void*)&l_dkWmark_Method, - /* padding */ - NULL, +extern kankyo_process_profile_definition g_profile_WMARK = { + fpcLy_CURRENT_e, + 9, + fpcPi_CURRENT_e, + PROC_WMARK, + &g_fpcLf_Method.mBase, + sizeof(dkWmark_c), + 0, + 0, + &g_fopKy_Method, + 760, + &l_dkWmark_Method, }; - -/* 8039A494-8039A494 026AF4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 4f53e76653b..28d7fe6f2c9 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -4,311 +4,174 @@ // #include "d/d_k_wpillar.h" -#include "dol2asm.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct kankyo_class {}; - -struct cXyz {}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; -}; - -struct dkWpillar_c { - /* 80261B54 */ void create(); - /* 80261F24 */ ~dkWpillar_c(); - /* 80262014 */ void execute(); - /* 802620C8 */ void draw(); -}; - -struct dKy_tevstr_c {}; - -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 dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct JKRSolidHeap {}; - -struct J3DModel {}; - -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); -}; - -// -// Forward References: -// - -extern "C" void create__11dkWpillar_cFv(); -extern "C" static void dkWpillar_Create__FP12kankyo_class(); -extern "C" void __dt__11dkWpillar_cFv(); -extern "C" static void dkWpillar_Delete__FP11dkWpillar_c(); -extern "C" void execute__11dkWpillar_cFv(); -extern "C" static void dkWpillar_Execute__FP11dkWpillar_c(); -extern "C" void draw__11dkWpillar_cFv(); -extern "C" static void dkWpillar_Draw__FP11dkWpillar_c(); -extern "C" extern void* g_profile_WPILLAR[10 + 1 /* padding */]; - -// -// External References: -// - -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(); -extern "C" void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(); -extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap(); -extern "C" void mDoExt_restoreCurrentHeap__Fv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__11J3DLightObjFv(); -extern "C" void fopAcM_getWaterY__FPC4cXyzPf(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void fopKyM_Delete__FPv(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_tevstr_init__FP12dKy_tevstr_cScUc(); -extern "C" void __dl__FPv(); -extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __construct_array(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80454FF0-80454FF8 0035F0 0007+01 1/1 0/0 0/0 .sdata2 l_arcName */ -SECTION_SDATA2 static u8 l_arcName[7 + 1 /* padding */] = { - 0x41, - 0x6C, - 0x77, - 0x61, - 0x79, - 0x73, - 0x00, - /* padding */ - 0x00, -}; +static const char l_arcName[] = "Always"; -/* 80454FF8-80454FFC 0035F8 0004+00 1/1 0/0 0/0 .sdata2 @3838 */ -SECTION_SDATA2 static f32 lit_3838 = 1.0f; +inline int fopAcM_gc_c::getRoomId() { + return dComIfG_Bgsp().GetRoomId(*(dBgS_GndChk*)mGndCheck); +} -/* 80454FFC-80455000 0035FC 0004+00 1/1 0/0 0/0 .sdata2 @3839 */ -SECTION_SDATA2 static f32 lit_3839 = 0.5f; - -/* 80455000-80455004 003600 0004+00 1/1 0/0 0/0 .sdata2 @3840 */ -SECTION_SDATA2 static f32 lit_3840 = 0.25f; +inline int fopAcM_gc_c::getPolyColor() { + return dComIfG_Bgsp().GetPolyColor(*(dBgS_GndChk*)mGndCheck); +} /* 80261B54-80261F04 25C494 03B0+00 1/1 0/0 0/0 .text create__11dkWpillar_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dkWpillar_c::create() { - nofralloc -#include "asm/d/d_k_wpillar/create__11dkWpillar_cFv.s" +int dkWpillar_c::create() { + new (this) dkWpillar_c(); + + int roomNo; + u8 envrOverride; + if (fopAcM_gc_c::gndCheck(&mPos)) { + roomNo = fopAcM_gc_c::getRoomId(); + envrOverride = fopAcM_gc_c::getPolyColor(); + } else { + roomNo = dComIfGp_roomControl_getStayNo(); + envrOverride = 0xFF; + } + + dKy_tevstr_init(&mTevstr, roomNo, envrOverride); + g_env_light.settingTevStruct(0x10, &mPos, &mTevstr); + + dComIfGp_particle_set(0x1BD, &mPos, &mTevstr, NULL, &mScale, 255, NULL, roomNo, NULL, NULL, + NULL); + if ((int)mParam != 3) { + dComIfGp_particle_set(0x1BE, &mPos, &mTevstr, NULL, &mScale, 255, NULL, roomNo, NULL, NULL, + NULL); + } + + if ((int)mParam == 1) { + return cPhs_ERROR_e; + } + + BOOL var_r30; + + mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x2200, 0x20); + if (mpHeap != NULL) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0x1C); + JUT_ASSERT(96, modelData); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + + J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 0xB); + JUT_ASSERT(106, bckAnm); + + var_r30 = mBck.init(bckAnm, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false); + + J3DAnmTextureSRTKey* btkAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x3B); + var_r30 &= mBtk.init(modelData, btkAnm, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1); + + J3DAnmTevRegKey* brkAnm = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x2E); + var_r30 &= mBrk.init(modelData, brkAnm, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1); + + mDoExt_restoreCurrentHeap(); + mDoExt_adjustSolidHeap(mpHeap); + } else { + return cPhs_ERROR_e; + } + + if (mpModel == NULL || !var_r30) { + return cPhs_ERROR_e; + } + + if ((int)mParam == 2) { + mScale.set(0.5f, 0.25f, 0.5f); + } + + mpModel->setBaseScale(mScale); + mDoMtx_stack_c::transS(mPos.x, mPos.y, mPos.z); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + return cPhs_COMPLEATE_e; } -#pragma pop /* 80261F04-80261F24 25C844 0020+00 1/0 0/0 0/0 .text dkWpillar_Create__FP12kankyo_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWpillar_Create(kankyo_class* param_0) { - nofralloc -#include "asm/d/d_k_wpillar/dkWpillar_Create__FP12kankyo_class.s" +static int dkWpillar_Create(kankyo_class* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80261F24-80261FEC 25C864 00C8+00 1/1 0/0 0/0 .text __dt__11dkWpillar_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dkWpillar_c::~dkWpillar_c() { - nofralloc -#include "asm/d/d_k_wpillar/__dt__11dkWpillar_cFv.s" +dkWpillar_c::~dkWpillar_c() { + if (mpHeap != NULL) { + mDoExt_destroySolidHeap(mpHeap); + } } -#pragma pop /* 80261FEC-80262014 25C92C 0028+00 1/0 0/0 0/0 .text dkWpillar_Delete__FP11dkWpillar_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWpillar_Delete(dkWpillar_c* param_0) { - nofralloc -#include "asm/d/d_k_wpillar/dkWpillar_Delete__FP11dkWpillar_c.s" +static int dkWpillar_Delete(dkWpillar_c* i_this) { + i_this->~dkWpillar_c(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80455004-80455008 003604 0004+00 1/1 0/0 0/0 .sdata2 @3946 */ -SECTION_SDATA2 static u8 lit_3946[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; /* 80262014-802620A8 25C954 0094+00 1/1 0/0 0/0 .text execute__11dkWpillar_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dkWpillar_c::execute() { - nofralloc -#include "asm/d/d_k_wpillar/execute__11dkWpillar_cFv.s" +int dkWpillar_c::execute() { + mBck.play(); + + if (mBck.isStop()) { + fopKyM_Delete(this); + } else { + f32 sp8; + if (fopAcM_getWaterY(&mPos, &sp8) != 0) { + mpModel->getBaseTRMtx()[1][3] = sp8; + mPos.y = sp8; + } + } + + return 1; } -#pragma pop /* 802620A8-802620C8 25C9E8 0020+00 1/0 0/0 0/0 .text dkWpillar_Execute__FP11dkWpillar_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWpillar_Execute(dkWpillar_c* param_0) { - nofralloc -#include "asm/d/d_k_wpillar/dkWpillar_Execute__FP11dkWpillar_c.s" +static int dkWpillar_Execute(dkWpillar_c* i_this) { + return i_this->execute(); } -#pragma pop /* 802620C8-802621AC 25CA08 00E4+00 1/1 0/0 0/0 .text draw__11dkWpillar_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dkWpillar_c::draw() { - nofralloc -#include "asm/d/d_k_wpillar/draw__11dkWpillar_cFv.s" +int dkWpillar_c::draw() { + g_env_light.settingTevStruct(0x10, &mPos, &mTevstr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevstr); + + dComIfGd_setListIndScreen(); + mBck.entry(mpModel->getModelData()); + mBtk.entry(mpModel->getModelData(), mBck.getFrame()); + mBrk.entry(mpModel->getModelData(), mBck.getFrame()); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 802621AC-802621CC 25CAEC 0020+00 1/0 0/0 0/0 .text dkWpillar_Draw__FP11dkWpillar_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dkWpillar_Draw(dkWpillar_c* param_0) { - nofralloc -#include "asm/d/d_k_wpillar/dkWpillar_Draw__FP11dkWpillar_c.s" +static int dkWpillar_Draw(dkWpillar_c* i_this) { + return i_this->draw(); } -#pragma pop /* ############################################################################################## */ /* 803C3470-803C3484 -00001 0014+00 1/0 0/0 0/0 .data l_dkWpillar_Method */ -SECTION_DATA static void* l_dkWpillar_Method[5] = { - (void*)dkWpillar_Create__FP12kankyo_class, (void*)dkWpillar_Delete__FP11dkWpillar_c, - (void*)dkWpillar_Execute__FP11dkWpillar_c, (void*)NULL, - (void*)dkWpillar_Draw__FP11dkWpillar_c, +static leafdraw_method_class l_dkWpillar_Method = { + (process_method_func)dkWpillar_Create, (process_method_func)dkWpillar_Delete, + (process_method_func)dkWpillar_Execute, (process_method_func)NULL, + (process_method_func)dkWpillar_Draw, }; /* 803C3484-803C34B0 -00001 0028+04 0/0 0/0 1/0 .data g_profile_WPILLAR */ -SECTION_DATA extern void* g_profile_WPILLAR[10 + 1 /* padding */] = { - (void*)0xFFFFFFFD, - (void*)0x0009FFFD, - (void*)0x03020000, - (void*)&g_fpcLf_Method, - (void*)0x000004D4, - (void*)NULL, - (void*)NULL, - (void*)&g_fopKy_Method, - (void*)0x02F70000, - (void*)&l_dkWpillar_Method, - /* padding */ - NULL, +extern kankyo_process_profile_definition g_profile_WPILLAR = { + fpcLy_CURRENT_e, + 9, + fpcPi_CURRENT_e, + PROC_WPILLAR, + &g_fpcLf_Method.mBase, + sizeof(dkWpillar_c), + 0, + 0, + &g_fopKy_Method, + 759, + &l_dkWpillar_Method, }; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 7433a9690cd..7590b2e77d7 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -280,9 +280,9 @@ static leafdraw_method_class l_dThunder_Method = { /* 803BC1EC-803BC218 -00001 0028+04 0/0 0/0 1/0 .data g_profile_KY_THUNDER */ extern kankyo_process_profile_definition g_profile_KY_THUNDER = { - -3, + fpcLy_CURRENT_e, 7, - -3, + fpcPi_CURRENT_e, PROC_KY_THUNDER, &g_fpcLf_Method.mBase, sizeof(dThunder_c), diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 10e4293088b..77f04f216a9 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -81,15 +81,15 @@ static leafdraw_method_class l_dKyeff_Method = { /* 803BC16C-803BC198 -00001 0028+04 0/0 0/0 1/0 .data g_profile_KYEFF */ extern kankyo_process_profile_definition g_profile_KYEFF = { - -3, + fpcLy_CURRENT_e, 12, - 0xFFFD, + fpcPi_CURRENT_e, PROC_KYEFF, &g_fpcLf_Method.mBase, sizeof(dKyeff_c), 0, 0, &g_fopKy_Method, - 0x0005, + 5, &l_dKyeff_Method, }; diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index e3e0b5754fb..9dbc5fc8f75 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -46,15 +46,15 @@ static leafdraw_method_class l_dKyeff2_Method = { /* 803BC1AC-803BC1D8 -00001 0028+04 0/0 0/0 1/0 .data g_profile_KYEFF2 */ extern kankyo_process_profile_definition g_profile_KYEFF2 = { - -3, + fpcLy_CURRENT_e, 12, - 0xFFFD, + fpcPi_CURRENT_e, PROC_KYEFF2, &g_fpcLf_Method.mBase, sizeof(dKyeff2_c), 0, 0, &g_fopKy_Method, - 0x0003, + 3, &l_dKyeff2_Method, }; diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index c84e61131f8..c1632548363 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -144,7 +144,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // // This probably will need to be moved once actual debug rom decomp begins -#if DEBUG +#ifdef DEBUG static dEvDb_bit_c dEvDb_bit_table[799] = { #include "src/d/event/d_event_debug_bit_table.inc" }; @@ -328,7 +328,7 @@ void dEvt_control_c::setParam(dEvt_order_c* p_order) { s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* p_order) { fopAc_ac_c* actor = p_order->mActor2; - if (p_order->mFlag & 4 && actor->mEvtInfo.chkCondition(1) != true) { + if (p_order->mFlag & 4 && actor->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e) != true) { return 0; } @@ -442,7 +442,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) { return 0; } - if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(0x20)) { + if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return 0; } @@ -467,9 +467,9 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { return 0; } - actor1->mEvtInfo.setCommand(6); + actor1->mEvtInfo.setCommand(dEvtCmd_INCATCH_e); if (actor2 != NULL) { - actor2->mEvtInfo.setCommand(6); + actor2->mEvtInfo.setCommand(dEvtCmd_INCATCH_e); } setParam(p_order); @@ -486,12 +486,12 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { int dEvt_control_c::talkEnd() { fopAc_ac_c* actor = getPt1(); if (actor != NULL) { - actor->mEvtInfo.setCommand(0); + actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); } actor = getPt2(); if (actor != NULL) { - actor->mEvtInfo.setCommand(0); + actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); } if (mSpecifiedEvent != -1) { @@ -540,11 +540,11 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { } if (actor1 != NULL) { - actor1->mEvtInfo.setCommand(2); + actor1->mEvtInfo.setCommand(dEvtCmd_INDEMO_e); } if (actor2 != NULL) { - actor2->mEvtInfo.setCommand(2); + actor2->mEvtInfo.setCommand(dEvtCmd_INDEMO_e); } mMode = EVT_MODE_DEMO; @@ -557,12 +557,12 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { int dEvt_control_c::demoEnd() { fopAc_ac_c* actor = getPt1(); if (actor != NULL) { - actor->mEvtInfo.setCommand(0); + actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); } actor = getPt2(); if (actor != NULL) { - actor->mEvtInfo.setCommand(0); + actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); } if (mSpecifiedEvent != -1) { @@ -578,7 +578,7 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* p_order) { if (!beforeFlagProc(p_order)) { return 0; } else { - actor->mEvtInfo.setCommand(2); + actor->mEvtInfo.setCommand(dEvtCmd_INDEMO_e); mMode = EVT_MODE_DEMO; setParam(p_order); afterFlagProc(p_order); @@ -1271,7 +1271,7 @@ void* dEvt_control_c::getStbDemoData(char* resName) { } dEvt_info_c::dEvt_info_c() { - setCommand(0); + setCommand(dEvtCmd_NONE_e); setCondition(2); setEventId(-1); setMapToolId(-1); diff --git a/src/d/event/d_event_debug_bit_table.inc b/src/d/event/d_event_debug_bit_table.inc index 69b2ba5ca9a..da532578fd9 100644 --- a/src/d/event/d_event_debug_bit_table.inc +++ b/src/d/event/d_event_debug_bit_table.inc @@ -102,7 +102,7 @@ "810 ゴーストのにおいを覚えた", // Learned ghost's scent "京極", // Kyogoku 0x6210, - "D_MN10:LV4ダンジョン" // LV4 Dungeon + "D_MN10:LV4ダンジョン", // LV4 Dungeon 0x9, 0xa, }, @@ -1155,7 +1155,7 @@ "681 １匹目のゴーストを倒した後のミドナヒントを聞いた", // Heard Midna's hint after defeating first ghost "京極", // Kyogoku 0x5302, - "D_MN10:LV4ダンジョン" // LV4 Dungeon, + "D_MN10:LV4ダンジョン", // LV4 Dungeon, 0x9, 0xa, }, @@ -1164,7 +1164,7 @@ "680 ゴースト逃亡デモ後のミドナヒントを聞いた", // Heard Midna's hint after cutscene of ghost escaping "京極", // Kyogoku 0x5304, - "D_MN10:LV4ダンジョン" // LV4 Dungeon, + "D_MN10:LV4ダンジョン", // LV4 Dungeon, 0x9, 0xa, }, @@ -1386,7 +1386,7 @@ }, { "F_0655", - "655 ウキ釣りで【トアルナマズ】を初めて釣った",　// Caught an Ordon Catfish using bobber first time + "655 ウキ釣りで【トアルナマズ】を初めて釣った", // Caught an Ordon Catfish using bobber first time "京極", // Kyogoku 0x5008, "釣り", // Fishing @@ -3990,7 +3990,7 @@ "361 スピナー柱まわした", // Spun the spinning pillars "京極", // Kyogoku 0x2c10, - "D_MN10:LV4ダンジョン" // LV4 Dungeon, + "D_MN10:LV4ダンジョン", // LV4 Dungeon, 0x9, 0xa, }, @@ -4854,7 +4854,7 @@ "265 LV4ダンジョンクリア", // LV4 dungeon clear "京極", // Kyogoku 0x2010, - "D_MN10:LV4ダンジョン" // LV4 Dungeon, + "D_MN10:LV4ダンジョン", // LV4 Dungeon, 0x9, 0xa, }, diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index 4f7254d1443..0e5c49e5b97 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -4868,11 +4868,7 @@ asm void dFile_select_c::setInitSaveData() { /* 801902B8-801902F0 18ABF8 0038+00 2/2 0/0 0/0 .text dataSave__14dFile_select_cFv */ #ifndef NONMATCHING void dFile_select_c::dataSave() { - #if DEBUG - mDoMemCd_saveNAND(&mpMemCard,0x1fbc,0); - #else mDoMemCd_save(&mpMemCard,0x1fbc,0); - #endif } #else #pragma push diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index 5e5ebacde9f..fd39912d07b 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -130,7 +130,6 @@ extern "C" void dKyw_evt_wind_set_go__Fv(); extern "C" void dKyw_rain_set__Fi(); extern "C" extern char const* const d_kankyo_d_kankyo_wether__stringBase0; - // // External References: // @@ -533,18 +532,19 @@ SECTION_SDATA2 static u8 lit_4378[4] = { SECTION_SDATA2 static f32 lit_4379 = 1.0f; // remove these once float data is fixed -inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, - const csXyz* param_4, const cXyz* param_5, u8 param_6, - dPa_levelEcallBack* param_7, s8 param_8, - const GXColor* param_9, const GXColor* param_10, - const cXyz* param_11) { +inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3, const csXyz* param_4, + const cXyz* param_5, u8 param_6, + dPa_levelEcallBack* param_7, s8 param_8, + const GXColor* param_9, const GXColor* param_10, + const cXyz* param_11) { return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10, param_11, lit_4379); } -inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, - const cXyz* param_3) { +inline JPABaseEmitter* tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1, + const csXyz* param_2, const cXyz* param_3) { return tmp_dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -589,7 +589,8 @@ void dKyw_wether_init() { // Stage is Zora's Domain and Room is Outside Throne Room if (!strcmp(dComIfGp_getStartStageName(), "F_SP113") && dComIfGp_roomControl_getStayNo() == 1 && - dComIfG_play_c::getLayerNo(0) < 8) { + dComIfG_play_c::getLayerNo(0) < 8) + { cXyz tmp; f32 tmp0_2 = FLOAT_LABEL(lit_4378); tmp.z = tmp0_2; @@ -615,7 +616,8 @@ void dKyw_wether_init() { // Room is Entrance or Right Wing Outside or Left Wing Outside or Central Hub Outside if (!strcmp(dComIfGp_getStartStageName(), "D_MN07")) { if ((dComIfGp_roomControl_getStayNo() == 0 || dComIfGp_roomControl_getStayNo() == 3) || - dComIfGp_roomControl_getStayNo() == 6 || dComIfGp_roomControl_getStayNo() == 13) { + dComIfGp_roomControl_getStayNo() == 6 || dComIfGp_roomControl_getStayNo() == 13) + { g_mEnvSeMgr.initStrongWindSe(); } } @@ -790,7 +792,8 @@ static void wether_move_sun() { sunVisible = true; // Stage is Hyrule Castle or Castle Throne Room } else if (!strcmp(dComIfGp_getStartStageName(), "D_MN09") || - !strcmp(dComIfGp_getStartStageName(), "D_MN09A")) { + !strcmp(dComIfGp_getStartStageName(), "D_MN09A")) + { sunVisible = false; } @@ -1017,12 +1020,14 @@ static void wether_move_star() { s32 starsVisible = false; // Stage is Hyrule Castle or Castle Throne Room if (!strcmp(dComIfGp_getStartStageName(), "D_MN09") || - !strcmp(dComIfGp_getStartStageName(), "D_MN09A")) { + !strcmp(dComIfGp_getStartStageName(), "D_MN09A")) + { return; } else { // Stage is Hero Shade arena if ((dComIfGp_checkStatus(1) && !g_env_light.mVrboxInvisible) || - !strcmp(dComIfGp_getStartStageName(), "F_SP200")) { + !strcmp(dComIfGp_getStartStageName(), "F_SP200")) + { roomRead_class* room = dComIfGp_getStageRoom(); if (room != NULL && room->field_0x0 > dComIfGp_roomControl_getStayNo()) { starsVisible = dStage_roomRead_dt_c_GetVrboxswitch( @@ -1068,7 +1073,8 @@ static void wether_move_star() { // Stage is Hyrule Field or Outside Castle Town or Hidden Village if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") || !strcmp(dComIfGp_getStartStageName(), "F_SP122") || - !strcmp(dComIfGp_getStartStageName(), "F_SP128")) { + !strcmp(dComIfGp_getStartStageName(), "F_SP128")) + { g_env_light.mStarCount = (s16)(lit_4772 * g_env_light.mStarDensity); } @@ -1110,14 +1116,16 @@ static void wether_move_housi() { dComIfGp_roomControl_getStayNo() != 11) || (!strcmp(dComIfGp_getStartStageName(), "D_MN08A") || !strcmp(dComIfGp_getStartStageName(), "D_MN08B") || - !strcmp(dComIfGp_getStartStageName(), "D_MN08C"))) { + !strcmp(dComIfGp_getStartStageName(), "D_MN08C"))) + { return; } // Stage is darkworld or Stage is Lake Hylia and Room is Lanayru Spring if (dKy_darkworld_check() == true || (!strcmp(dComIfGp_getStartStageName(), "F_SP115") && - dComIfGp_roomControl_getStayNo() == 1 && dComIfGp_getStartStageLayer() == 9)) { + dComIfGp_roomControl_getStayNo() == 1 && dComIfGp_getStartStageLayer() == 9)) + { if (g_env_light.mInitAnmTimer != 0) { g_env_light.field_0xea9 = 0; g_env_light.mHousiCount = 200; @@ -1133,7 +1141,8 @@ static void wether_move_housi() { (!strcmp(dComIfGp_getStartStageName(), "F_SP108") && dComIfGp_getStartStageRoomNo() == 0 && dComIfGp_getStartStageLayer() == 9) || (!strcmp(dComIfGp_getStartStageName(), "F_SP115") && - dComIfGp_getStartStageLayer() == 9)) { + dComIfGp_getStartStageLayer() == 9)) + { g_env_light.mHousiCount = 0; } } @@ -1183,7 +1192,8 @@ static void wether_move_housi() { break; case TRUE: if (g_env_light.mHousiCount == 0 && - g_env_light.mpHousiPacket->field_0x5de8 <= FLOAT_LABEL(lit_4378)) { + g_env_light.mpHousiPacket->field_0x5de8 <= FLOAT_LABEL(lit_4378)) + { g_env_light.mHousiInitialized = false; delete g_env_light.mpHousiPacket; g_env_light.mpHousiPacket = NULL; @@ -1503,14 +1513,17 @@ void dKyw_wether_proc() { if (!strcmp(dComIfGp_getStartStageName(), "F_SP108") || !strcmp(dComIfGp_getStartStageName(), "F_SP127") || (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && - FLOAT_LABEL(lit_4378) != g_env_light.mDiceWeatherTime)) { + FLOAT_LABEL(lit_4378) != g_env_light.mDiceWeatherTime)) + { if (!dKy_darkworld_check()) { // Stage is Hyrule Field if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") || g_env_light.mDaytime >= 75.0f || - g_env_light.mDaytime <= 120.0f) { + g_env_light.mDaytime <= 120.0f) + { // Stage is Hyrule Field if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && - g_env_light.mDiceWeatherMode >= 1 && g_env_light.mDiceWeatherMode < 6) { + g_env_light.mDiceWeatherMode >= 1 && g_env_light.mDiceWeatherMode < 6) + { dKy_get_dayofweek(); cLib_addCalc(&g_env_light.field_0xebc, lit_4379, lit_5362, lit_5363, lit_4770); g_env_light.mMoyaMode = 7; @@ -1528,7 +1541,8 @@ void dKyw_wether_proc() { // Stage is Fishing Pond if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && - (g_env_light.mPondSeason == 1 || g_env_light.mPondSeason == 3)) { + (g_env_light.mPondSeason == 1 || g_env_light.mPondSeason == 3)) + { if (g_env_light.mPondSeason == 1) { g_env_light.mHousiCount = 35; } else { diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index ba04675c904..889c36b98e3 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -761,9 +761,9 @@ static dScnLogo_Method l_dScnLogo_Method[5] = { /* 803C2FE4-803C300C -00001 0028+00 0/0 0/0 1/0 .data g_profile_LOGO_SCENE */ extern scene_process_profile_definition g_profile_LOGO_SCENE = { - 0, + fpcLy_ROOT_e, 1, - -3, + fpcPi_CURRENT_e, PROC_LOGO_SCENE, &g_fpcNd_Method.mBase, sizeof(dScnLogo_c), diff --git a/src/d/s/d_s_menu.cpp b/src/d/s/d_s_menu.cpp index becd11e2d46..74f482fada9 100644 --- a/src/d/s/d_s_menu.cpp +++ b/src/d/s/d_s_menu.cpp @@ -12,15 +12,14 @@ /* ############################################################################################## */ /* 803C3018-803C3040 -00001 0028+00 0/0 0/0 1/0 .data g_profile_MENU_SCENE */ extern scene_process_profile_definition g_profile_MENU_SCENE = { - 0, // mLayerID + fpcLy_ROOT_e, // mLayerID 1, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_MENU_SCENE, // mProcName &g_fpcNd_Method.mBase, // mSubMtd 0, // mSize 0, // mSizeOther 0, // mParameters &g_fopScn_Method.mBase, // mSubMtd - 0, // mpMtd - 0 // padding + NULL, // mpMtd }; diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index 60bf45b34bb..6be08057114 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -410,9 +410,9 @@ static leafdraw_method_class l_dScnName_Method = { /* 803C30F0-803C3118 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAME_SCENE */ extern scene_process_profile_definition g_profile_NAME_SCENE = { - 0, + fpcLy_ROOT_e, 1, - -3, + fpcPi_CURRENT_e, PROC_NAME_SCENE, &g_fpcNd_Method.mBase, sizeof(dScnName_c), @@ -425,9 +425,9 @@ extern scene_process_profile_definition g_profile_NAME_SCENE = { /* 803C3118-803C3140 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAMEEX_SCENE */ extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { - 0, + fpcLy_ROOT_e, 1, - -3, + fpcPi_CURRENT_e, PROC_NAMEEX_SCENE, &g_fpcNd_Method.mBase, sizeof(dScnName_c), diff --git a/src/d/s/d_s_title.cpp b/src/d/s/d_s_title.cpp index e3617537ab4..fe13b9adf1d 100644 --- a/src/d/s/d_s_title.cpp +++ b/src/d/s/d_s_title.cpp @@ -11,30 +11,28 @@ /* ############################################################################################## */ /* 803C32B0-803C32D8 -00001 0028+00 0/0 0/0 1/0 .data g_profile_WARNING_SCENE */ extern scene_process_profile_definition g_profile_WARNING_SCENE = { - 0, // mLayerID + fpcLy_ROOT_e, // mLayerID 1, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_WARNING_SCENE, // mProcName &g_fpcNd_Method.mBase, // mSubMtd - 0x00000204, // mSize + 0x204, // mSize 0, // mSizeOther 0, // mParameters &g_fopScn_Method.mBase, // mSubMtd - 0, // mpMtd - 0 // padding + NULL, // mpMtd }; /* 803C32D8-803C3300 -00001 0028+00 0/0 0/0 1/0 .data g_profile_WARNING2_SCENE */ extern scene_process_profile_definition g_profile_WARNING2_SCENE = { - 0, // mLayerID + fpcLy_ROOT_e, // mLayerID 1, // mListID - -3, // mListPrio + fpcPi_CURRENT_e, // mListPrio PROC_WARNING2_SCENE, // mProcName &g_fpcNd_Method.mBase, // mSubMtd - 0x00000204, // mSize + 0x204, // mSize 0, // mSizeOther 0, // mParameters &g_fopScn_Method.mBase, // mSubMtd - 0, // mpMtd - 0 // padding + NULL, // mpMtd }; diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index c0495bbc022..37abc24c049 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -35,22 +35,22 @@ u32 fopAc_ac_c::stopStatus; /* 80018D0C-80018DD8 01364C 00CC+00 1/0 0/0 0/0 .text fopAc_Draw__FPv */ static int fopAc_Draw(void* i_this) { - fopAc_ac_c* _this = (fopAc_ac_c*)i_this; + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; int ret = 1; if (!dComIfGp_isPauseFlag()) { - if ((dComIfGp_event_moveApproval(_this) == 2 || - (!fopAcM_checkStatus(_this, fopAc_ac_c::stopStatus) && - (!fopAcM_checkStatus(_this, 0x100) || !fopAcM_cullingCheck(_this)))) && - !fopAcM_checkStatus(_this, 0x21000000)) + if ((dComIfGp_event_moveApproval(a_this) == 2 || + (!fopAcM_checkStatus(a_this, fopAc_ac_c::stopStatus) && + (!fopAcM_checkStatus(a_this, fopAcStts_CULL_e) || !fopAcM_cullingCheck(a_this)))) && + !fopAcM_checkStatus(a_this, 0x21000000)) { - fopAcM_OffCondition(_this, 4); - ret = fpcLf_DrawMethod((leafdraw_method_class*)_this->mSubMtd, _this); + fopAcM_OffCondition(a_this, fopAcCnd_NODRAW_e); + ret = fpcLf_DrawMethod((leafdraw_method_class*)a_this->mSubMtd, a_this); } else { - fopAcM_OnCondition(_this, 4); + fopAcM_OnCondition(a_this, fopAcCnd_NODRAW_e); } - fopAcM_OffStatus(_this, 0x1000000); + fopAcM_OffStatus(a_this, fopAcStts_NODRAW_e); } return ret; @@ -58,40 +58,40 @@ static int fopAc_Draw(void* i_this) { /* 80018DD8-80018F78 013718 01A0+00 1/0 0/0 0/0 .text fopAc_Execute__FPv */ static int fopAc_Execute(void* i_this) { - fopAc_ac_c* _this = (fopAc_ac_c*)i_this; + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; int ret = 1; if (!dComIfGp_isPauseFlag() && dScnPly_c::isPause()) { if (!dComIfA_PauseCheck()) { - daSus_c::check(_this); - _this->mEvtInfo.beforeProc(); + daSus_c::check(a_this); + a_this->mEvtInfo.beforeProc(); s32 move = dComIfGp_event_moveApproval(i_this); - fopAcM_OffStatus(_this, 0x40000000); + fopAcM_OffStatus(a_this, 0x40000000); - if (!fopAcM_checkStatus(_this, 0x20000000) && + if (!fopAcM_checkStatus(a_this, 0x20000000) && (move == 2 || - (move != 0 && !fopAcM_checkStatus(_this, fopAc_ac_c::stopStatus) && - (!fopAcM_checkStatus(_this, 0x80) || !fopAcM_CheckCondition(_this, 4))))) + (move != 0 && !fopAcM_checkStatus(a_this, fopAc_ac_c::stopStatus) && + (!fopAcM_checkStatus(a_this, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(a_this, 4))))) { - fopAcM_OffCondition(_this, 2); - _this->next = _this->current; - ret = fpcMtd_Execute((process_method_class*)_this->mSubMtd, _this); + fopAcM_OffCondition(a_this, fopAcCnd_NOEXEC_e); + a_this->next = a_this->current; + ret = fpcMtd_Execute((process_method_class*)a_this->mSubMtd, a_this); } else { - _this->mEvtInfo.suspendProc(_this); - fopAcM_OnCondition(_this, 2); + a_this->mEvtInfo.suspendProc(a_this); + fopAcM_OnCondition(a_this, fopAcCnd_NOEXEC_e); } - if (fopAcM_checkStatus(_this, 0x20) && - _this->orig.pos.y - _this->current.pos.y > 5000.0f) + if (fopAcM_checkStatus(a_this, 0x20) && + a_this->orig.pos.y - a_this->current.pos.y > 5000.0f) { - fopAcM_delete(_this); + fopAcM_delete(a_this); } - if (_this->current.pos.y < -1e31f) { - _this->current.pos.y = -1e31f; + if (a_this->current.pos.y < -1e31f) { + a_this->current.pos.y = -1e31f; } - dKy_depth_dist_set(_this); + dKy_depth_dist_set(a_this); } } @@ -100,11 +100,11 @@ static int fopAc_Execute(void* i_this) { /* 80018F78-80018FCC 0138B8 0054+00 1/0 0/0 0/0 .text fopAc_IsDelete__FPv */ static int fopAc_IsDelete(void* i_this) { - fopAc_ac_c* _this = (fopAc_ac_c*)i_this; + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - int isDelete = fpcMtd_IsDelete((process_method_class*)_this->mSubMtd, _this); + int isDelete = fpcMtd_IsDelete((process_method_class*)a_this->mSubMtd, a_this); if (isDelete == true) { - fopDwTg_DrawQTo(&_this->mDwTg); + fopDwTg_DrawQTo(&a_this->mDwTg); } return isDelete; @@ -112,15 +112,15 @@ static int fopAc_IsDelete(void* i_this) { /* 80018FCC-8001904C 01390C 0080+00 1/0 0/0 0/0 .text fopAc_Delete__FPv */ static int fopAc_Delete(void* i_this) { - fopAc_ac_c* _this = (fopAc_ac_c*)i_this; + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - int deleted = fpcMtd_Delete((process_method_class*)_this->mSubMtd, _this); + int deleted = fpcMtd_Delete((process_method_class*)a_this->mSubMtd, a_this); if (deleted == true) { - fopAcTg_ActorQTo(&_this->mAcTg); - fopDwTg_DrawQTo(&_this->mDwTg); - fopAcM_DeleteHeap(_this); + fopAcTg_ActorQTo(&a_this->mAcTg); + fopDwTg_DrawQTo(&a_this->mDwTg); + fopAcM_DeleteHeap(a_this); - dDemo_actor_c* demoAc = dDemo_c::getActor(_this->mDemoActorId); + dDemo_actor_c* demoAc = dDemo_c::getActor(a_this->mDemoActorId); if (demoAc != NULL) { demoAc->setActor(NULL); } @@ -131,52 +131,52 @@ static int fopAc_Delete(void* i_this) { /* 8001904C-800193FC 01398C 03B0+00 1/0 0/0 0/0 .text fopAc_Create__FPv */ static int fopAc_Create(void* i_this) { - fopAc_ac_c* _this = (fopAc_ac_c*)i_this; + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; if (fpcM_IsFirstCreating(i_this)) { actor_process_profile_definition* profile = (actor_process_profile_definition*)fpcM_GetProfile(i_this); - _this->mAcType = fpcBs_MakeOfType(&g_fopAc_type); - _this->mSubMtd = (profile_method_class*)profile->mSubMtd; + a_this->mAcType = fpcBs_MakeOfType(&g_fopAc_type); + a_this->mSubMtd = (profile_method_class*)profile->mSubMtd; - fopAcTg_Init(&_this->mAcTg, _this); - fopAcTg_ToActorQ(&_this->mAcTg); - fopDwTg_Init(&_this->mDwTg, _this); + fopAcTg_Init(&a_this->mAcTg, a_this); + fopAcTg_ToActorQ(&a_this->mAcTg); + fopDwTg_Init(&a_this->mDwTg, a_this); - _this->mStatus = profile->mStatus; - _this->mGroup = profile->mActorType; - _this->mCullType = profile->mCullType; + a_this->mStatus = profile->mStatus; + a_this->mGroup = profile->mActorType; + a_this->mCullType = profile->mCullType; - fopAcM_prm_class* append = fopAcM_GetAppend(_this); + fopAcM_prm_class* append = fopAcM_GetAppend(a_this); if (append != NULL) { - fopAcM_SetParam(_this, append->mParameter); - _this->orig.pos = append->mPos; - _this->orig.angle = append->mAngle; - _this->shape_angle = append->mAngle; - _this->mParentPcId = append->mParentPId; - _this->mSubtype = append->mSubtype; - _this->mScale.set(append->mScale[0] * 0.1f, append->mScale[1] * 0.1f, + fopAcM_SetParam(a_this, append->mParameter); + a_this->orig.pos = append->mPos; + a_this->orig.angle = append->mAngle; + a_this->shape_angle = append->mAngle; + a_this->mParentPcId = append->mParentPId; + a_this->mSubtype = append->mSubtype; + a_this->mScale.set(append->mScale[0] * 0.1f, append->mScale[1] * 0.1f, append->mScale[2] * 0.1f); - _this->mSetID = append->mEnemyNo; - _this->orig.roomNo = append->mRoomNo; + a_this->mSetID = append->mEnemyNo; + a_this->orig.roomNo = append->mRoomNo; } - _this->next = _this->orig; - _this->current = _this->orig; - _this->mEyePos = _this->orig.pos; - _this->mMaxFallSpeed = -100.0f; - _this->mAttentionInfo.field_0x0[0] = 1; - _this->mAttentionInfo.field_0x0[1] = 2; - _this->mAttentionInfo.field_0x0[2] = 3; - _this->mAttentionInfo.field_0x0[3] = 5; - _this->mAttentionInfo.field_0x0[4] = 6; - _this->mAttentionInfo.field_0x0[7] = 14; - _this->mAttentionInfo.field_0x0[5] = 15; - _this->mAttentionInfo.field_0x0[6] = 15; - _this->mAttentionInfo.field_0x0[8] = 51; - _this->mAttentionInfo.mPosition = _this->orig.pos; - _this->mAttentionInfo.field_0xa = 30; - dKy_tevstr_init(&_this->mTevStr, _this->orig.roomNo, -1); + a_this->next = a_this->orig; + a_this->current = a_this->orig; + a_this->mEyePos = a_this->orig.pos; + a_this->mMaxFallSpeed = -100.0f; + a_this->mAttentionInfo.field_0x0[0] = 1; + a_this->mAttentionInfo.field_0x0[1] = 2; + a_this->mAttentionInfo.field_0x0[2] = 3; + a_this->mAttentionInfo.field_0x0[3] = 5; + a_this->mAttentionInfo.field_0x0[4] = 6; + a_this->mAttentionInfo.field_0x0[7] = 14; + a_this->mAttentionInfo.field_0x0[5] = 15; + a_this->mAttentionInfo.field_0x0[6] = 15; + a_this->mAttentionInfo.field_0x0[8] = 51; + a_this->mAttentionInfo.mPosition = a_this->orig.pos; + a_this->mAttentionInfo.field_0xa = 30; + dKy_tevstr_init(&a_this->mTevStr, a_this->orig.roomNo, -1); int roomNo = dComIfGp_roomControl_getStayNo(); if (roomNo >= 0) { @@ -184,23 +184,23 @@ static int fopAc_Create(void* i_this) { } dStage_FileList_dt_c* filelist = NULL; - if (_this->orig.roomNo >= 0) { + if (a_this->orig.roomNo >= 0) { filelist = - dComIfGp_roomControl_getStatusRoomDt(_this->orig.roomNo)->mRoomDt.getFileListInfo(); + dComIfGp_roomControl_getStatusRoomDt(a_this->orig.roomNo)->mRoomDt.getFileListInfo(); } if (filelist != NULL) { if (!dStage_FileList_dt_GetEnemyAppear1Flag(filelist)) { u32 sw = dStage_FileList_dt_GetBitSw(filelist); - if (sw != 0xFF && dComIfGs_isSwitch(sw, _this->orig.roomNo) && - profile->mActorType == ACTOR_TYPE_ENEMY) + if (sw != 0xFF && dComIfGs_isSwitch(sw, a_this->orig.roomNo) && + profile->mActorType == fopAc_ENEMY_e) { return cPhs_ERROR_e; } } else { u32 sw = dStage_FileList_dt_GetBitSw(filelist); - if (sw != 0xFF && !dComIfGs_isSwitch(sw, _this->orig.roomNo) && - profile->mActorType == ACTOR_TYPE_ENEMY) + if (sw != 0xFF && !dComIfGs_isSwitch(sw, a_this->orig.roomNo) && + profile->mActorType == fopAc_ENEMY_e) { return cPhs_ERROR_e; } @@ -208,12 +208,12 @@ static int fopAc_Create(void* i_this) { } } - int ret = fpcMtd_Create((process_method_class*)_this->mSubMtd, _this); + int ret = fpcMtd_Create((process_method_class*)a_this->mSubMtd, a_this); if (ret == cPhs_COMPLEATE_e) { - s32 priority = fpcLf_GetPriority(_this); - fopDwTg_ToDrawQ(&_this->mDwTg, priority); + s32 priority = fpcLf_GetPriority(a_this); + fopDwTg_ToDrawQ(&a_this->mDwTg, priority); } else if (ret == cPhs_ERROR_e) { - fopAcM_OnCondition(_this, 0x10); + fopAcM_OnCondition(a_this, 0x10); } return ret; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 39305b381c5..79534bc01dd 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1905,7 +1905,7 @@ s32 fopAc_IsActor(void*); /* 8001C9CC-8001CA1C 01730C 0050+00 1/1 0/0 0/0 .text enemySearchJugge__FPvPv */ void* enemySearchJugge(void* i_actor, void* i_data) { if (i_actor != NULL && fopAc_IsActor(i_actor) && - static_cast(i_actor)->mGroup == ACTOR_TYPE_ENEMY) + static_cast(i_actor)->mGroup == fopAc_ENEMY_e) { return i_actor; } else { diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 4bacc5f0aa3..4630e0c4f64 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -163,7 +163,11 @@ void HeapCheck::heapDisplay() const { } /* 80450580-80450584 000000 0004+00 3/3 6/6 0/0 .sdata None */ +#ifdef DEBUG +s8 mDoMain::developmentMode = 1; +#else s8 mDoMain::developmentMode = -1; +#endif /* 80450584-80450588 000004 0004+00 0/0 1/1 0/0 .sdata memMargin__7mDoMain */ u32 mDoMain::memMargin = 0xFFFFFFFF;