mirror of https://github.com/zeldaret/tp.git
k_wmark / k_wpillar OK, fop actor enums / debug building (#1946)
* d_k_wmark / d_k_wpillar OK * make debug buildable / add assert functionality * add more fop actor enums * remove asm
This commit is contained in:
TakaRikka
GitHub
parent
9b4c375741
commit
84e4135053
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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<JAUSection> * 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue