mirror of https://github.com/zeldaret/tp.git
d_a_e_vt mostly done (#2158)
This commit is contained in:
TakaRikka
GitHub
parent
38ac3e9227
commit
411a832fbb
|
|
@ -21,8 +21,8 @@ Total | 54.954197% | 2209528 | 4020672
|
|||
Section | Percentage | Decompiled (bytes) | Total (bytes)
|
||||
---|---|---|---
|
||||
main.dol | 54.954197% | 2209528 | 4020672
|
||||
RELs | 38.671676% | 4447368 | 11500324
|
||||
Total | 42.889619% | 6656896 | 15520996
|
||||
RELs | 38.686284% | 4449048 | 11500324
|
||||
Total | 42.900443% | 6658576 | 15520996
|
||||
|
||||
## RELs
|
||||
|
||||
|
|
@ -162,7 +162,7 @@ d_a_e_tk | 32.077326% | 3916 | 12208
|
|||
d_a_e_tk2 | 33.419577% | 3100 | 9276
|
||||
d_a_e_tk_ball | 33.349562% | 2740 | 8216
|
||||
d_a_e_tt | 27.836991% | 7104 | 25520
|
||||
d_a_e_vt | 24.313702% | 16332 | 67172
|
||||
d_a_e_vt | 26.814744% | 18012 | 67172
|
||||
d_a_e_warpappear | 28.864569% | 4220 | 14620
|
||||
d_a_e_wb | 23.058129% | 20008 | 86772
|
||||
d_a_e_ws | 29.700483% | 6148 | 20700
|
||||
|
|
@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244
|
|||
d_a_warp_bug | 100.000000% | 2024 | 2024
|
||||
d_a_ykgr | 44.400631% | 2252 | 5072
|
||||
f_pc_profile_lst | 100.000000% | 28156 | 28156
|
||||
Total | 38.671676% | 4447368 | 11500324
|
||||
Total | 38.686284% | 4449048 | 11500324
|
||||
|
|
|
|||
|
|
@ -328,8 +328,8 @@ lbl_807CD4DC:
|
|||
/* 807CD4F4 41 80 FF D4 */ blt lbl_807CD4C8
|
||||
/* 807CD4F8 3B 80 00 00 */ li r28, 0
|
||||
/* 807CD4FC 3B A0 00 00 */ li r29, 0
|
||||
/* 807CD500 3C 60 80 7D */ lis r3, data_807CF084@ha /* 0x807CF084@ha */
|
||||
/* 807CD504 38 03 F0 84 */ addi r0, r3, data_807CF084@l /* 0x807CF084@l */
|
||||
/* 807CD500 3C 60 80 7D */ lis r3, va_tag_set_size@ha /* 0x807CF084@ha */
|
||||
/* 807CD504 38 03 F0 84 */ addi r0, r3, va_tag_set_size@l /* 0x807CF084@l */
|
||||
/* 807CD508 3F 20 11 00 */ lis r25, 0x1100
|
||||
/* 807CD50C 7C 1A 03 78 */ mr r26, r0
|
||||
lbl_807CD510:
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
lbl_807C53A8:
|
||||
/* 807C53A8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807C53AC 7C 08 02 A6 */ mflr r0
|
||||
/* 807C53B0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807C53B4 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 807C53B8 41 82 00 10 */ beq lbl_807C53C8
|
||||
/* 807C53BC 4B FF FF 7D */ bl demo_skip__8daE_VA_cFi
|
||||
/* 807C53C0 38 60 00 01 */ li r3, 1
|
||||
/* 807C53C4 48 00 00 08 */ b lbl_807C53CC
|
||||
lbl_807C53C8:
|
||||
/* 807C53C8 38 60 00 00 */ li r3, 0
|
||||
lbl_807C53CC:
|
||||
/* 807C53CC 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807C53D0 7C 08 03 A6 */ mtlr r0
|
||||
/* 807C53D4 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807C53D8 4E 80 00 20 */ blr
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
lbl_807C284C:
|
||||
/* 807C284C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807C2850 7C 08 02 A6 */ mflr r0
|
||||
/* 807C2854 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807C2858 7C 60 1B 78 */ mr r0, r3
|
||||
/* 807C285C 2C 04 00 00 */ cmpwi r4, 0
|
||||
/* 807C2860 40 82 00 24 */ bne lbl_807C2884
|
||||
/* 807C2864 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
|
||||
/* 807C2868 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
|
||||
/* 807C286C 80 A3 00 38 */ lwz r5, 0x38(r3)
|
||||
/* 807C2870 80 65 00 14 */ lwz r3, 0x14(r5)
|
||||
/* 807C2874 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 807C2878 41 82 00 0C */ beq lbl_807C2884
|
||||
/* 807C287C 7C 04 03 78 */ mr r4, r0
|
||||
/* 807C2880 4B FF FD FD */ bl ctrlJoint__8daE_VA_cFP8J3DJointP8J3DModel
|
||||
lbl_807C2884:
|
||||
/* 807C2884 38 60 00 01 */ li r3, 1
|
||||
/* 807C2888 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807C288C 7C 08 03 A6 */ mtlr r0
|
||||
/* 807C2890 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807C2894 4E 80 00 20 */ blr
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
lbl_807CCF64:
|
||||
/* 807CCF64 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 807CCF68 7C 08 02 A6 */ mflr r0
|
||||
/* 807CCF6C 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 807CCF70 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 807CCF74 4B B9 52 65 */ bl _savegpr_28
|
||||
/* 807CCF78 7C 7C 1B 78 */ mr r28, r3
|
||||
/* 807CCF7C 38 7C 05 AC */ addi r3, r28, 0x5ac
|
||||
/* 807CCF80 3C 80 80 7D */ lis r4, d_a_e_vt__stringBase0@ha /* 0x807CEEFC@ha */
|
||||
/* 807CCF84 38 84 EE FC */ addi r4, r4, d_a_e_vt__stringBase0@l /* 0x807CEEFC@l */
|
||||
/* 807CCF88 4B 86 00 81 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
|
||||
/* 807CCF8C 3C 7C 00 01 */ addis r3, r28, 1
|
||||
/* 807CCF90 88 03 0F F8 */ lbz r0, 0xff8(r3)
|
||||
/* 807CCF94 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 807CCF98 41 82 00 10 */ beq lbl_807CCFA8
|
||||
/* 807CCF9C 38 00 00 00 */ li r0, 0
|
||||
/* 807CCFA0 3C 60 80 7D */ lis r3, struct_807CF4B4+0x1@ha /* 0x807CF4B5@ha */
|
||||
/* 807CCFA4 98 03 F4 B5 */ stb r0, struct_807CF4B4+0x1@l(r3) /* 0x807CF4B5@l */
|
||||
lbl_807CCFA8:
|
||||
/* 807CCFA8 3B A0 00 00 */ li r29, 0
|
||||
/* 807CCFAC 3B E0 00 00 */ li r31, 0
|
||||
/* 807CCFB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 807CCFB4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
lbl_807CCFB8:
|
||||
/* 807CCFB8 80 7E 5D 3C */ lwz r3, 0x5d3c(r30)
|
||||
/* 807CCFBC 38 63 02 10 */ addi r3, r3, 0x210
|
||||
/* 807CCFC0 3C 9F 00 01 */ addis r4, r31, 1
|
||||
/* 807CCFC4 38 84 0F 78 */ addi r4, r4, 0xf78
|
||||
/* 807CCFC8 7C 9C 20 2E */ lwzx r4, r28, r4
|
||||
/* 807CCFCC 4B 87 E9 4D */ bl getEmitter__Q213dPa_control_c7level_cFUl
|
||||
/* 807CCFD0 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 807CCFD4 41 82 00 08 */ beq lbl_807CCFDC
|
||||
/* 807CCFD8 4B AB 1C 89 */ bl deleteAllParticle__14JPABaseEmitterFv
|
||||
lbl_807CCFDC:
|
||||
/* 807CCFDC 3B BD 00 01 */ addi r29, r29, 1
|
||||
/* 807CCFE0 2C 1D 00 02 */ cmpwi r29, 2
|
||||
/* 807CCFE4 3B FF 00 04 */ addi r31, r31, 4
|
||||
/* 807CCFE8 41 80 FF D0 */ blt lbl_807CCFB8
|
||||
/* 807CCFEC 80 1C 00 F0 */ lwz r0, 0xf0(r28)
|
||||
/* 807CCFF0 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 807CCFF4 41 82 00 18 */ beq lbl_807CD00C
|
||||
/* 807CCFF8 38 7C 12 54 */ addi r3, r28, 0x1254
|
||||
/* 807CCFFC 81 9C 12 54 */ lwz r12, 0x1254(r28)
|
||||
/* 807CD000 81 8C 00 08 */ lwz r12, 8(r12)
|
||||
/* 807CD004 7D 89 03 A6 */ mtctr r12
|
||||
/* 807CD008 4E 80 04 21 */ bctrl
|
||||
lbl_807CD00C:
|
||||
/* 807CD00C 38 60 00 01 */ li r3, 1
|
||||
/* 807CD010 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 807CD014 4B B9 52 11 */ bl _restgpr_28
|
||||
/* 807CD018 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 807CD01C 7C 08 03 A6 */ mtlr r0
|
||||
/* 807CD020 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 807CD024 4E 80 00 20 */ blr
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
lbl_807C2898:
|
||||
/* 807C2898 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807C289C 7C 08 02 A6 */ mflr r0
|
||||
/* 807C28A0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807C28A4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 807C28A8 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 807C28AC 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 807C28B0 88 03 13 91 */ lbz r0, 0x1391(r3)
|
||||
/* 807C28B4 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 807C28B8 41 82 01 2C */ beq lbl_807C29E4
|
||||
/* 807C28BC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 807C28C0 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 807C28C4 80 9F 5D AC */ lwz r4, 0x5dac(r31)
|
||||
/* 807C28C8 4B 85 7E 49 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
|
||||
/* 807C28CC A8 1E 04 E6 */ lha r0, 0x4e6(r30)
|
||||
/* 807C28D0 7C 00 18 50 */ subf r0, r0, r3
|
||||
/* 807C28D4 7C 04 07 34 */ extsh r4, r0
|
||||
/* 807C28D8 2C 04 30 00 */ cmpwi r4, 0x3000
|
||||
/* 807C28DC 40 81 00 08 */ ble lbl_807C28E4
|
||||
/* 807C28E0 38 80 30 00 */ li r4, 0x3000
|
||||
lbl_807C28E4:
|
||||
/* 807C28E4 7C 80 07 34 */ extsh r0, r4
|
||||
/* 807C28E8 2C 00 D0 00 */ cmpwi r0, -12288
|
||||
/* 807C28EC 40 80 00 08 */ bge lbl_807C28F4
|
||||
/* 807C28F0 38 80 D0 00 */ li r4, -12288
|
||||
lbl_807C28F4:
|
||||
/* 807C28F4 38 7E 13 94 */ addi r3, r30, 0x1394
|
||||
/* 807C28F8 38 A0 00 08 */ li r5, 8
|
||||
/* 807C28FC 38 C0 08 00 */ li r6, 0x800
|
||||
/* 807C2900 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C2904 4B AA DC 3D */ bl cLib_addCalcAngleS__FPsssss
|
||||
/* 807C2908 7F C3 F3 78 */ mr r3, r30
|
||||
/* 807C290C 80 9F 5D AC */ lwz r4, 0x5dac(r31)
|
||||
/* 807C2910 4B 85 7E 29 */ bl fopAcM_searchActorAngleX__FPC10fopAc_ac_cPC10fopAc_ac_c
|
||||
/* 807C2914 20 03 14 00 */ subfic r0, r3, 0x1400
|
||||
/* 807C2918 7C 04 07 34 */ extsh r4, r0
|
||||
/* 807C291C 2C 04 30 00 */ cmpwi r4, 0x3000
|
||||
/* 807C2920 40 81 00 08 */ ble lbl_807C2928
|
||||
/* 807C2924 38 80 30 00 */ li r4, 0x3000
|
||||
lbl_807C2928:
|
||||
/* 807C2928 7C 80 07 34 */ extsh r0, r4
|
||||
/* 807C292C 2C 00 D0 00 */ cmpwi r0, -12288
|
||||
/* 807C2930 40 80 00 08 */ bge lbl_807C2938
|
||||
/* 807C2934 38 80 D0 00 */ li r4, -12288
|
||||
lbl_807C2938:
|
||||
/* 807C2938 38 7E 13 96 */ addi r3, r30, 0x1396
|
||||
/* 807C293C 38 A0 00 08 */ li r5, 8
|
||||
/* 807C2940 38 C0 08 00 */ li r6, 0x800
|
||||
/* 807C2944 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C2948 4B AA DB F9 */ bl cLib_addCalcAngleS__FPsssss
|
||||
/* 807C294C 7F C3 F3 78 */ mr r3, r30
|
||||
/* 807C2950 38 80 00 1F */ li r4, 0x1f
|
||||
/* 807C2954 48 00 0F 69 */ bl checkBck__8daE_VA_cFi
|
||||
/* 807C2958 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 807C295C 40 82 00 18 */ bne lbl_807C2974
|
||||
/* 807C2960 7F C3 F3 78 */ mr r3, r30
|
||||
/* 807C2964 38 80 00 20 */ li r4, 0x20
|
||||
/* 807C2968 48 00 0F 55 */ bl checkBck__8daE_VA_cFi
|
||||
/* 807C296C 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 807C2970 41 82 00 20 */ beq lbl_807C2990
|
||||
lbl_807C2974:
|
||||
/* 807C2974 38 7E 13 98 */ addi r3, r30, 0x1398
|
||||
/* 807C2978 38 80 F8 00 */ li r4, -2048
|
||||
/* 807C297C 38 A0 00 08 */ li r5, 8
|
||||
/* 807C2980 38 C0 00 80 */ li r6, 0x80
|
||||
/* 807C2984 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C2988 4B AA DB B9 */ bl cLib_addCalcAngleS__FPsssss
|
||||
/* 807C298C 48 00 00 4C */ b lbl_807C29D8
|
||||
lbl_807C2990:
|
||||
/* 807C2990 7F C3 F3 78 */ mr r3, r30
|
||||
/* 807C2994 38 80 00 21 */ li r4, 0x21
|
||||
/* 807C2998 48 00 0F 25 */ bl checkBck__8daE_VA_cFi
|
||||
/* 807C299C 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 807C29A0 41 82 00 20 */ beq lbl_807C29C0
|
||||
/* 807C29A4 38 7E 13 98 */ addi r3, r30, 0x1398
|
||||
/* 807C29A8 38 80 E8 00 */ li r4, -6144
|
||||
/* 807C29AC 38 A0 00 08 */ li r5, 8
|
||||
/* 807C29B0 38 C0 00 80 */ li r6, 0x80
|
||||
/* 807C29B4 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C29B8 4B AA DB 89 */ bl cLib_addCalcAngleS__FPsssss
|
||||
/* 807C29BC 48 00 00 1C */ b lbl_807C29D8
|
||||
lbl_807C29C0:
|
||||
/* 807C29C0 38 7E 13 98 */ addi r3, r30, 0x1398
|
||||
/* 807C29C4 38 80 E8 00 */ li r4, -6144
|
||||
/* 807C29C8 38 A0 00 08 */ li r5, 8
|
||||
/* 807C29CC 38 C0 01 00 */ li r6, 0x100
|
||||
/* 807C29D0 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C29D4 4B AA DB 6D */ bl cLib_addCalcAngleS__FPsssss
|
||||
lbl_807C29D8:
|
||||
/* 807C29D8 88 1E 13 91 */ lbz r0, 0x1391(r30)
|
||||
/* 807C29DC 98 1E 13 92 */ stb r0, 0x1392(r30)
|
||||
/* 807C29E0 48 00 00 54 */ b lbl_807C2A34
|
||||
lbl_807C29E4:
|
||||
/* 807C29E4 88 1E 13 92 */ lbz r0, 0x1392(r30)
|
||||
/* 807C29E8 98 1E 13 91 */ stb r0, 0x1391(r30)
|
||||
/* 807C29EC 38 7E 13 94 */ addi r3, r30, 0x1394
|
||||
/* 807C29F0 38 80 00 00 */ li r4, 0
|
||||
/* 807C29F4 38 A0 00 08 */ li r5, 8
|
||||
/* 807C29F8 38 C0 01 00 */ li r6, 0x100
|
||||
/* 807C29FC 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C2A00 4B AA DB 41 */ bl cLib_addCalcAngleS__FPsssss
|
||||
/* 807C2A04 38 7E 13 96 */ addi r3, r30, 0x1396
|
||||
/* 807C2A08 38 80 00 00 */ li r4, 0
|
||||
/* 807C2A0C 38 A0 00 08 */ li r5, 8
|
||||
/* 807C2A10 38 C0 01 00 */ li r6, 0x100
|
||||
/* 807C2A14 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C2A18 4B AA DB 29 */ bl cLib_addCalcAngleS__FPsssss
|
||||
/* 807C2A1C 38 7E 13 98 */ addi r3, r30, 0x1398
|
||||
/* 807C2A20 38 80 00 00 */ li r4, 0
|
||||
/* 807C2A24 38 A0 00 08 */ li r5, 8
|
||||
/* 807C2A28 38 C0 01 00 */ li r6, 0x100
|
||||
/* 807C2A2C 38 E0 00 40 */ li r7, 0x40
|
||||
/* 807C2A30 4B AA DB 11 */ bl cLib_addCalcAngleS__FPsssss
|
||||
lbl_807C2A34:
|
||||
/* 807C2A34 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 807C2A38 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 807C2A3C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807C2A40 7C 08 03 A6 */ mtlr r0
|
||||
/* 807C2A44 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807C2A48 4E 80 00 20 */ blr
|
||||
|
|
@ -554,8 +554,8 @@ lbl_807C5C1C:
|
|||
/* 807C5C34 41 80 FD 94 */ blt lbl_807C59C8
|
||||
/* 807C5C38 39 C0 00 00 */ li r14, 0
|
||||
/* 807C5C3C 39 E0 00 00 */ li r15, 0
|
||||
/* 807C5C40 3C 60 80 7D */ lis r3, data_807CF0AC@ha /* 0x807CF0AC@ha */
|
||||
/* 807C5C44 38 03 F0 AC */ addi r0, r3, data_807CF0AC@l /* 0x807CF0AC@l */
|
||||
/* 807C5C40 3C 60 80 7D */ lis r3, va_tag_set_num@ha /* 0x807CF0AC@ha */
|
||||
/* 807C5C44 38 03 F0 AC */ addi r0, r3, va_tag_set_num@l /* 0x807CF0AC@l */
|
||||
/* 807C5C48 7C 10 03 78 */ mr r16, r0
|
||||
lbl_807C5C4C:
|
||||
/* 807C5C4C 88 B0 00 00 */ lbz r5, 0(r16)
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ lbl_807C61D4:
|
|||
lbl_807C61DC:
|
||||
/* 807C61DC C3 FF 00 70 */ lfs f31, 0x70(r31)
|
||||
lbl_807C61E0:
|
||||
/* 807C61E0 3C 60 80 7D */ lis r3, data_807CF0AC@ha /* 0x807CF0AC@ha */
|
||||
/* 807C61E4 38 63 F0 AC */ addi r3, r3, data_807CF0AC@l /* 0x807CF0AC@l */
|
||||
/* 807C61E0 3C 60 80 7D */ lis r3, va_tag_set_num@ha /* 0x807CF0AC@ha */
|
||||
/* 807C61E4 38 63 F0 AC */ addi r3, r3, va_tag_set_num@l /* 0x807CF0AC@l */
|
||||
/* 807C61E8 7C 03 E0 AE */ lbzx r0, r3, r28
|
||||
/* 807C61EC 1C 60 00 0C */ mulli r3, r0, 0xc
|
||||
/* 807C61F0 38 03 09 98 */ addi r0, r3, 0x998
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
lbl_807C38BC:
|
||||
/* 807C38BC 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807C38C0 7C 08 02 A6 */ mflr r0
|
||||
/* 807C38C4 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807C38C8 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 807C38CC 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 807C38D0 3C 60 80 7D */ lis r3, d_a_e_vt__stringBase0@ha /* 0x807CEEFC@ha */
|
||||
/* 807C38D4 38 63 EE FC */ addi r3, r3, d_a_e_vt__stringBase0@l /* 0x807CEEFC@l */
|
||||
/* 807C38D8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 807C38DC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 807C38E0 3C A5 00 02 */ addis r5, r5, 2
|
||||
/* 807C38E4 38 C0 00 80 */ li r6, 0x80
|
||||
/* 807C38E8 38 A5 C2 F8 */ addi r5, r5, -15624
|
||||
/* 807C38EC 4B 87 8A 01 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
|
||||
/* 807C38F0 80 9F 05 B4 */ lwz r4, 0x5b4(r31)
|
||||
/* 807C38F4 80 04 00 08 */ lwz r0, 8(r4)
|
||||
/* 807C38F8 7C 00 18 50 */ subf r0, r0, r3
|
||||
/* 807C38FC 7C 00 00 34 */ cntlzw r0, r0
|
||||
/* 807C3900 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
|
||||
/* 807C3904 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 807C3908 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807C390C 7C 08 03 A6 */ mtlr r0
|
||||
/* 807C3910 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807C3914 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_807CE244:
|
||||
/* 807CE244 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807CE248 7C 08 02 A6 */ mflr r0
|
||||
/* 807CE24C 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807CE250 4B FF F4 19 */ bl create__8daE_VA_cFv
|
||||
/* 807CE254 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807CE258 7C 08 03 A6 */ mtlr r0
|
||||
/* 807CE25C 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807CE260 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_807CD028:
|
||||
/* 807CD028 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807CD02C 7C 08 02 A6 */ mflr r0
|
||||
/* 807CD030 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807CD034 4B FF FF 31 */ bl _delete__8daE_VA_cFv
|
||||
/* 807CD038 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807CD03C 7C 08 03 A6 */ mtlr r0
|
||||
/* 807CD040 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807CD044 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_807C37F8:
|
||||
/* 807C37F8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807C37FC 7C 08 02 A6 */ mflr r0
|
||||
/* 807C3800 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807C3804 4B FF FA 61 */ bl draw__8daE_VA_cFv
|
||||
/* 807C3808 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807C380C 7C 08 03 A6 */ mtlr r0
|
||||
/* 807C3810 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807C3814 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_807CCF3C:
|
||||
/* 807CCF3C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807CCF40 7C 08 02 A6 */ mflr r0
|
||||
/* 807CCF44 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807CCF48 4B FF FD DD */ bl execute__8daE_VA_cFv
|
||||
/* 807CCF4C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807CCF50 7C 08 03 A6 */ mtlr r0
|
||||
/* 807CCF54 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807CCF58 4E 80 00 20 */ blr
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
lbl_807C39C4:
|
||||
/* 807C39C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 807C39C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 807C39CC 80 63 5D AC */ lwz r3, 0x5dac(r3)
|
||||
/* 807C39D0 88 03 05 68 */ lbz r0, 0x568(r3)
|
||||
/* 807C39D4 2C 00 00 37 */ cmpwi r0, 0x37
|
||||
/* 807C39D8 40 80 00 18 */ bge lbl_807C39F0
|
||||
/* 807C39DC 2C 00 00 2E */ cmpwi r0, 0x2e
|
||||
/* 807C39E0 40 80 00 2C */ bge lbl_807C3A0C
|
||||
/* 807C39E4 2C 00 00 2C */ cmpwi r0, 0x2c
|
||||
/* 807C39E8 40 80 00 14 */ bge lbl_807C39FC
|
||||
/* 807C39EC 48 00 00 28 */ b lbl_807C3A14
|
||||
lbl_807C39F0:
|
||||
/* 807C39F0 2C 00 00 39 */ cmpwi r0, 0x39
|
||||
/* 807C39F4 41 82 00 10 */ beq lbl_807C3A04
|
||||
/* 807C39F8 48 00 00 1C */ b lbl_807C3A14
|
||||
lbl_807C39FC:
|
||||
/* 807C39FC 38 60 00 01 */ li r3, 1
|
||||
/* 807C3A00 4E 80 00 20 */ blr
|
||||
lbl_807C3A04:
|
||||
/* 807C3A04 38 60 00 02 */ li r3, 2
|
||||
/* 807C3A08 4E 80 00 20 */ blr
|
||||
lbl_807C3A0C:
|
||||
/* 807C3A0C 38 60 00 03 */ li r3, 3
|
||||
/* 807C3A10 4E 80 00 20 */ blr
|
||||
lbl_807C3A14:
|
||||
/* 807C3A14 38 60 00 00 */ li r3, 0
|
||||
/* 807C3A18 4E 80 00 20 */ blr
|
||||
|
|
@ -145,10 +145,10 @@ lbl_807CC6F8:
|
|||
/* 807CC6F8 3B C0 00 00 */ li r30, 0
|
||||
/* 807CC6FC 3B 80 00 00 */ li r28, 0
|
||||
/* 807CC700 3B 60 00 00 */ li r27, 0
|
||||
/* 807CC704 3C 60 80 7D */ lis r3, data_807CF0AC@ha /* 0x807CF0AC@ha */
|
||||
/* 807CC708 3B 03 F0 AC */ addi r24, r3, data_807CF0AC@l /* 0x807CF0AC@l */
|
||||
/* 807CC70C 3C 60 80 7D */ lis r3, data_807CF0D4@ha /* 0x807CF0D4@ha */
|
||||
/* 807CC710 3B 23 F0 D4 */ addi r25, r3, data_807CF0D4@l /* 0x807CF0D4@l */
|
||||
/* 807CC704 3C 60 80 7D */ lis r3, va_tag_set_num@ha /* 0x807CF0AC@ha */
|
||||
/* 807CC708 3B 03 F0 AC */ addi r24, r3, va_tag_set_num@l /* 0x807CF0AC@l */
|
||||
/* 807CC70C 3C 60 80 7D */ lis r3, va_tag_offset@ha /* 0x807CF0D4@ha */
|
||||
/* 807CC710 3B 23 F0 D4 */ addi r25, r3, va_tag_offset@l /* 0x807CF0D4@l */
|
||||
/* 807CC714 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
|
||||
/* 807CC718 3B 43 D4 70 */ addi r26, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
|
||||
lbl_807CC71C:
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
lbl_807C3A50:
|
||||
/* 807C3A50 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 807C3A54 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 807C3A58 80 84 5D AC */ lwz r4, 0x5dac(r4)
|
||||
/* 807C3A5C 88 04 05 68 */ lbz r0, 0x568(r4)
|
||||
/* 807C3A60 28 00 00 39 */ cmplwi r0, 0x39
|
||||
/* 807C3A64 4C 82 00 20 */ bnelr
|
||||
/* 807C3A68 38 00 00 03 */ li r0, 3
|
||||
/* 807C3A6C B0 03 13 3E */ sth r0, 0x133e(r3)
|
||||
/* 807C3A70 38 80 00 00 */ li r4, 0
|
||||
/* 807C3A74 38 00 00 04 */ li r0, 4
|
||||
/* 807C3A78 7C 09 03 A6 */ mtctr r0
|
||||
lbl_807C3A7C:
|
||||
/* 807C3A7C 7C A3 22 14 */ add r5, r3, r4
|
||||
/* 807C3A80 80 05 20 90 */ lwz r0, 0x2090(r5)
|
||||
/* 807C3A84 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e
|
||||
/* 807C3A88 90 05 20 90 */ stw r0, 0x2090(r5)
|
||||
/* 807C3A8C 80 05 21 00 */ lwz r0, 0x2100(r5)
|
||||
/* 807C3A90 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e
|
||||
/* 807C3A94 90 05 21 00 */ stw r0, 0x2100(r5)
|
||||
/* 807C3A98 80 05 21 00 */ lwz r0, 0x2100(r5)
|
||||
/* 807C3A9C 60 00 00 04 */ ori r0, r0, 4
|
||||
/* 807C3AA0 90 05 21 00 */ stw r0, 0x2100(r5)
|
||||
/* 807C3AA4 38 84 01 38 */ addi r4, r4, 0x138
|
||||
/* 807C3AA8 42 00 FF D4 */ bdnz lbl_807C3A7C
|
||||
/* 807C3AAC 4E 80 00 20 */ blr
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
lbl_807C5CF0:
|
||||
/* 807C5CF0 94 21 FF D0 */ stwu r1, -0x30(r1)
|
||||
/* 807C5CF4 7C 08 02 A6 */ mflr r0
|
||||
/* 807C5CF8 90 01 00 34 */ stw r0, 0x34(r1)
|
||||
/* 807C5CFC 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 807C5D00 4B B9 C4 C9 */ bl _savegpr_24
|
||||
/* 807C5D04 7C 7B 1B 78 */ mr r27, r3
|
||||
/* 807C5D08 7C BC 2B 78 */ mr r28, r5
|
||||
/* 807C5D0C 7C DD 33 78 */ mr r29, r6
|
||||
/* 807C5D10 1F E4 00 0A */ mulli r31, r4, 0xa
|
||||
/* 807C5D14 3B C0 00 00 */ li r30, 0
|
||||
lbl_807C5D18:
|
||||
/* 807C5D18 7F 1F F2 14 */ add r24, r31, r30
|
||||
/* 807C5D1C 2C 1D 00 00 */ cmpwi r29, 0
|
||||
/* 807C5D20 40 82 00 14 */ bne lbl_807C5D34
|
||||
/* 807C5D24 38 78 10 9C */ addi r3, r24, 0x109c
|
||||
/* 807C5D28 7C 1B 18 AE */ lbzx r0, r27, r3
|
||||
/* 807C5D2C 60 00 00 10 */ ori r0, r0, 0x10
|
||||
/* 807C5D30 7C 1B 19 AE */ stbx r0, r27, r3
|
||||
lbl_807C5D34:
|
||||
/* 807C5D34 7C 1E E0 00 */ cmpw r30, r28
|
||||
/* 807C5D38 40 80 00 6C */ bge lbl_807C5DA4
|
||||
/* 807C5D3C 38 78 10 9C */ addi r3, r24, 0x109c
|
||||
/* 807C5D40 7C 1B 18 AE */ lbzx r0, r27, r3
|
||||
/* 807C5D44 60 00 00 02 */ ori r0, r0, 2
|
||||
/* 807C5D48 7C 1B 19 AE */ stbx r0, r27, r3
|
||||
/* 807C5D4C 2C 1D 00 00 */ cmpwi r29, 0
|
||||
/* 807C5D50 40 82 00 80 */ bne lbl_807C5DD0
|
||||
/* 807C5D54 38 18 FF FF */ addi r0, r24, -1
|
||||
/* 807C5D58 1C 60 00 0C */ mulli r3, r0, 0xc
|
||||
/* 807C5D5C 3B 23 09 94 */ addi r25, r3, 0x994
|
||||
/* 807C5D60 7F 3B CA 14 */ add r25, r27, r25
|
||||
/* 807C5D64 7F 23 CB 78 */ mr r3, r25
|
||||
/* 807C5D68 1C 98 00 0C */ mulli r4, r24, 0xc
|
||||
/* 807C5D6C 3B 44 09 94 */ addi r26, r4, 0x994
|
||||
/* 807C5D70 7F 5B D2 14 */ add r26, r27, r26
|
||||
/* 807C5D74 7F 44 D3 78 */ mr r4, r26
|
||||
/* 807C5D78 4B AA AE FD */ bl cLib_targetAngleX__FPC4cXyzPC4cXyz
|
||||
/* 807C5D7C 1C 18 00 06 */ mulli r0, r24, 6
|
||||
/* 807C5D80 7F 1B 02 14 */ add r24, r27, r0
|
||||
/* 807C5D84 B0 78 0E 44 */ sth r3, 0xe44(r24)
|
||||
/* 807C5D88 7F 23 CB 78 */ mr r3, r25
|
||||
/* 807C5D8C 7F 44 D3 78 */ mr r4, r26
|
||||
/* 807C5D90 4B AA AE 75 */ bl cLib_targetAngleY__FPC3VecPC3Vec
|
||||
/* 807C5D94 B0 78 0E 46 */ sth r3, 0xe46(r24)
|
||||
/* 807C5D98 38 00 00 00 */ li r0, 0
|
||||
/* 807C5D9C B0 18 0E 48 */ sth r0, 0xe48(r24)
|
||||
/* 807C5DA0 48 00 00 30 */ b lbl_807C5DD0
|
||||
lbl_807C5DA4:
|
||||
/* 807C5DA4 2C 1D 00 00 */ cmpwi r29, 0
|
||||
/* 807C5DA8 40 82 00 18 */ bne lbl_807C5DC0
|
||||
/* 807C5DAC 38 78 10 9C */ addi r3, r24, 0x109c
|
||||
/* 807C5DB0 7C 1B 18 AE */ lbzx r0, r27, r3
|
||||
/* 807C5DB4 60 00 00 04 */ ori r0, r0, 4
|
||||
/* 807C5DB8 7C 1B 19 AE */ stbx r0, r27, r3
|
||||
/* 807C5DBC 48 00 00 14 */ b lbl_807C5DD0
|
||||
lbl_807C5DC0:
|
||||
/* 807C5DC0 38 78 10 9C */ addi r3, r24, 0x109c
|
||||
/* 807C5DC4 7C 1B 18 AE */ lbzx r0, r27, r3
|
||||
/* 807C5DC8 60 00 00 08 */ ori r0, r0, 8
|
||||
/* 807C5DCC 7C 1B 19 AE */ stbx r0, r27, r3
|
||||
lbl_807C5DD0:
|
||||
/* 807C5DD0 3B DE 00 01 */ addi r30, r30, 1
|
||||
/* 807C5DD4 2C 1E 00 0A */ cmpwi r30, 0xa
|
||||
/* 807C5DD8 41 80 FF 40 */ blt lbl_807C5D18
|
||||
/* 807C5DDC 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 807C5DE0 4B B9 C4 35 */ bl _restgpr_24
|
||||
/* 807C5DE4 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 807C5DE8 7C 08 03 A6 */ mtlr r0
|
||||
/* 807C5DEC 38 21 00 30 */ addi r1, r1, 0x30
|
||||
/* 807C5DF0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
lbl_807C3A1C:
|
||||
/* 807C3A1C 80 03 20 64 */ lwz r0, 0x2064(r3)
|
||||
/* 807C3A20 60 00 00 01 */ ori r0, r0, 1
|
||||
/* 807C3A24 90 03 20 64 */ stw r0, 0x2064(r3)
|
||||
/* 807C3A28 80 03 21 9C */ lwz r0, 0x219c(r3)
|
||||
/* 807C3A2C 60 00 00 01 */ ori r0, r0, 1
|
||||
/* 807C3A30 90 03 21 9C */ stw r0, 0x219c(r3)
|
||||
/* 807C3A34 80 03 22 D4 */ lwz r0, 0x22d4(r3)
|
||||
/* 807C3A38 60 00 00 01 */ ori r0, r0, 1
|
||||
/* 807C3A3C 90 03 22 D4 */ stw r0, 0x22d4(r3)
|
||||
/* 807C3A40 80 03 24 0C */ lwz r0, 0x240c(r3)
|
||||
/* 807C3A44 60 00 00 01 */ ori r0, r0, 1
|
||||
/* 807C3A48 90 03 24 0C */ stw r0, 0x240c(r3)
|
||||
/* 807C3A4C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
lbl_807C3918:
|
||||
/* 807C3918 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 807C391C 7C 08 02 A6 */ mflr r0
|
||||
/* 807C3920 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 807C3924 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 807C3928 4B B9 E8 B5 */ bl _savegpr_29
|
||||
/* 807C392C 7C 7D 1B 78 */ mr r29, r3
|
||||
/* 807C3930 7C 9E 23 78 */ mr r30, r4
|
||||
/* 807C3934 7C BF 2B 78 */ mr r31, r5
|
||||
/* 807C3938 38 60 00 06 */ li r3, 6
|
||||
/* 807C393C 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
|
||||
/* 807C3940 7C 04 07 74 */ extsb r4, r0
|
||||
/* 807C3944 4B 86 A2 21 */ bl dComIfGs_isOneZoneSwitch__Fii
|
||||
/* 807C3948 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 807C394C 41 82 00 4C */ beq lbl_807C3998
|
||||
/* 807C3950 2C 1E 00 0D */ cmpwi r30, 0xd
|
||||
/* 807C3954 41 82 00 44 */ beq lbl_807C3998
|
||||
/* 807C3958 2C 1E 00 0E */ cmpwi r30, 0xe
|
||||
/* 807C395C 41 82 00 3C */ beq lbl_807C3998
|
||||
/* 807C3960 38 60 00 06 */ li r3, 6
|
||||
/* 807C3964 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
|
||||
/* 807C3968 7C 04 07 74 */ extsb r4, r0
|
||||
/* 807C396C 4B 86 A1 95 */ bl dComIfGs_offOneZoneSwitch__Fii
|
||||
/* 807C3970 38 60 00 07 */ li r3, 7
|
||||
/* 807C3974 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
|
||||
/* 807C3978 7C 04 07 74 */ extsb r4, r0
|
||||
/* 807C397C 4B 86 A1 E9 */ bl dComIfGs_isOneZoneSwitch__Fii
|
||||
/* 807C3980 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 807C3984 40 82 00 14 */ bne lbl_807C3998
|
||||
/* 807C3988 38 60 00 07 */ li r3, 7
|
||||
/* 807C398C 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
|
||||
/* 807C3990 7C 04 07 74 */ extsb r4, r0
|
||||
/* 807C3994 4B 86 A1 09 */ bl dComIfGs_onOneZoneSwitch__Fii
|
||||
lbl_807C3998:
|
||||
/* 807C3998 38 00 00 00 */ li r0, 0
|
||||
/* 807C399C 98 1D 13 81 */ stb r0, 0x1381(r29)
|
||||
/* 807C39A0 93 DD 13 1C */ stw r30, 0x131c(r29)
|
||||
/* 807C39A4 93 FD 13 20 */ stw r31, 0x1320(r29)
|
||||
/* 807C39A8 98 1D 13 7F */ stb r0, 0x137f(r29)
|
||||
/* 807C39AC 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 807C39B0 4B B9 E8 79 */ bl _restgpr_29
|
||||
/* 807C39B4 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 807C39B8 7C 08 03 A6 */ mtlr r0
|
||||
/* 807C39BC 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 807C39C0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_807CD648:
|
||||
/* 807CD648 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 807CD64C 7C 08 02 A6 */ mflr r0
|
||||
/* 807CD650 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 807CD654 4B FF F9 F5 */ bl CreateHeap__8daE_VA_cFv
|
||||
/* 807CD658 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 807CD65C 7C 08 03 A6 */ mtlr r0
|
||||
/* 807CD660 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 807CD664 4E 80 00 20 */ blr
|
||||
|
|
@ -617,6 +617,8 @@ struct J3DZModeInfo {
|
|||
/* 0x3 */ u8 pad;
|
||||
};
|
||||
|
||||
extern u8 j3dZModeTable[96];
|
||||
|
||||
/**
|
||||
* @ingroup jsystem-j3d
|
||||
*
|
||||
|
|
@ -629,6 +631,14 @@ struct J3DZMode {
|
|||
mZModeID = calcZModeID(info.field_0x0, info.field_0x1, info.field_0x2);
|
||||
}
|
||||
|
||||
void setCompareEnable(u8 i_compare) {
|
||||
mZModeID = calcZModeID(i_compare, j3dZModeTable[mZModeID * 3 + 1], j3dZModeTable[mZModeID * 3 + 2]);
|
||||
}
|
||||
|
||||
void setUpdateEnable(u8 i_enable) {
|
||||
mZModeID = calcZModeID(j3dZModeTable[mZModeID * 3], j3dZModeTable[mZModeID * 3 + 1], i_enable);
|
||||
}
|
||||
|
||||
/* 0x0 */ u16 mZModeID;
|
||||
};
|
||||
|
||||
|
|
@ -655,6 +665,8 @@ extern const J3DBlendInfo j3dDefaultBlendInfo;
|
|||
struct J3DBlend : public J3DBlendInfo {
|
||||
J3DBlend() : J3DBlendInfo(j3dDefaultBlendInfo) {}
|
||||
J3DBlend(J3DBlendInfo const& info) : J3DBlendInfo(info) {}
|
||||
|
||||
void setDstFactor(u8 i_factor) { mDstFactor = i_factor; }
|
||||
};
|
||||
|
||||
extern const J3DFogInfo j3dDefaultFogInfo;
|
||||
|
|
@ -746,7 +758,7 @@ public:
|
|||
/* 8000DF54 */ virtual J3DAlphaComp* getAlphaComp();
|
||||
/* 80317370 */ virtual void setBlend(J3DBlend const*);
|
||||
/* 8000E018 */ virtual void setBlend(J3DBlend const&);
|
||||
/* 8000DF4C */ virtual bool getBlend();
|
||||
/* 8000DF4C */ virtual J3DBlend* getBlend();
|
||||
/* 80317374 */ virtual void setZMode(J3DZMode const*);
|
||||
/* 8000E014 */ virtual void setZMode(J3DZMode);
|
||||
/* 8000DF44 */ virtual J3DZMode* getZMode();
|
||||
|
|
@ -834,7 +846,7 @@ public:
|
|||
/* 803219E0 */ virtual J3DAlphaComp* getAlphaComp();
|
||||
/* 803219F4 */ virtual void setBlend(J3DBlend const*);
|
||||
/* 803219E8 */ virtual void setBlend(J3DBlend const&);
|
||||
/* 80321A00 */ virtual bool getBlend();
|
||||
/* 80321A00 */ virtual J3DBlend* getBlend();
|
||||
/* 80321A14 */ virtual void setZMode(J3DZMode const*);
|
||||
/* 80321A08 */ virtual void setZMode(J3DZMode);
|
||||
/* 80321A20 */ virtual J3DZMode* getZMode();
|
||||
|
|
@ -879,7 +891,7 @@ public:
|
|||
/* 80321B44 */ virtual J3DAlphaComp* getAlphaComp();
|
||||
/* 80321B58 */ virtual void setBlend(J3DBlend const*);
|
||||
/* 80321B4C */ virtual void setBlend(J3DBlend const&);
|
||||
/* 80321B64 */ virtual bool getBlend();
|
||||
/* 80321B64 */ virtual J3DBlend* getBlend();
|
||||
/* 80321B78 */ virtual void setZMode(J3DZMode const*);
|
||||
/* 80321B6C */ virtual void setZMode(J3DZMode);
|
||||
/* 80321B84 */ virtual J3DZMode* getZMode();
|
||||
|
|
|
|||
|
|
@ -76,12 +76,16 @@ public:
|
|||
u32 getTexGenNum() const { return mTexGenBlock->getTexGenNum(); }
|
||||
u8 getTevStageNum() const { return mTevBlock->getTevStageNum(); }
|
||||
J3DTexCoord* getTexCoord(u32 idx) { return mTexGenBlock->getTexCoord(idx); }
|
||||
J3DZMode* getZMode() { return mPEBlock->getZMode(); }
|
||||
J3DBlend* getBlend() { return mPEBlock->getBlend(); }
|
||||
|
||||
void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
|
||||
void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); }
|
||||
void setMaterialAnm(J3DMaterialAnm* i_anm) { mMaterialAnm = i_anm; }
|
||||
void setCullMode(u8 i_mode) { mColorBlock->setCullMode(i_mode); }
|
||||
void setTexMtx(u32 idx, J3DTexMtx* mtx) { mTexGenBlock->setTexMtx(idx, mtx); }
|
||||
void setZCompLoc(u8 i_comploc) { mPEBlock->setZCompLoc(i_comploc); }
|
||||
void setMaterialMode(u32 i_mode) { mMaterialMode = i_mode; }
|
||||
|
||||
public:
|
||||
/* 0x04 */ J3DMaterial* mNext;
|
||||
|
|
|
|||
|
|
@ -100,6 +100,10 @@ struct TVec3<f32> : public Vec {
|
|||
setTVec3f(&i_vec.x, &x);
|
||||
}
|
||||
|
||||
TVec3(f32 x, f32 y, f32 z) {
|
||||
set(x, y, z);
|
||||
}
|
||||
|
||||
TVec3() {}
|
||||
|
||||
operator Vec*() { return (Vec*)&x; }
|
||||
|
|
|
|||
|
|
@ -449,11 +449,14 @@ public:
|
|||
/* 0x06 */ CUT_TYPE_FINISH_LEFT,
|
||||
/* 0x07 */ CUT_TYPE_FINISH_VERTICAL,
|
||||
/* 0x08 */ CUT_TYPE_TURN_RIGHT,
|
||||
/* 0x0A */ CUT_TYPE_JUMP = 10,
|
||||
/* 0x09 */ CUT_TYPE_UNK_9,
|
||||
/* 0x0A */ CUT_TYPE_JUMP,
|
||||
/* 0x0B */ CUT_TYPE_DASH_UNK_B,
|
||||
/* 0x0C */ CUT_TYPE_DASH_UNK_C,
|
||||
/* 0x0D */ CUT_TYPE_DASH_UNK_D,
|
||||
/* 0x10 */ CUT_TYPE_AIR = 0x10,
|
||||
/* 0x0E */ CUT_TYPE_UNK_E,
|
||||
/* 0x0F */ CUT_TYPE_UNK_F,
|
||||
/* 0x10 */ CUT_TYPE_AIR,
|
||||
/* 0x11 */ CUT_TYPE_DASH_UNK_11,
|
||||
/* 0x12 */ CUT_TYPE_LARGE_JUMP_INIT,
|
||||
/* 0x13 */ CUT_TYPE_LARGE_JUMP,
|
||||
|
|
@ -462,30 +465,39 @@ public:
|
|||
/* 0x16 */ CUT_TYPE_TURN_LEFT,
|
||||
/* 0x17 */ CUT_TYPE_LARGE_TURN_LEFT,
|
||||
/* 0x18 */ CUT_TYPE_LARGE_TURN_RIGHT,
|
||||
/* 0x1A */ CUT_TYPE_MORTAL_DRAW_A = 0x1A,
|
||||
/* 0x1E */ CUT_TYPE_TWIRL = 0x1E, // Back Slice
|
||||
/* 0x19 */ CUT_TYPE_UNK_19,
|
||||
/* 0x1A */ CUT_TYPE_MORTAL_DRAW_A,
|
||||
/* 0x1B */ CUT_TYPE_UNK_1B,
|
||||
/* 0x1C */ CUT_TYPE_UNK_1C,
|
||||
/* 0x1D */ CUT_TYPE_UNK_1D,
|
||||
/* 0x1E */ CUT_TYPE_TWIRL, // Back Slice
|
||||
/* 0x1F */ CUT_TYPE_MORTAL_DRAW_B,
|
||||
/* 0x20 */ CUT_TYPE_FINISH_STAB,
|
||||
/* 0x21 */ CUT_TYPE_COMBO_STAB,
|
||||
/* 0x22 */ CUT_TYPE_HORSE_UNK_22,
|
||||
/* 0x23 */ CUT_TYPE_HORSE_UNK_23,
|
||||
/* 0x25 */ CUT_TYPE_DASH_UNK_25 = 0x25,
|
||||
/* 0x26 */ CUT_TYPE_DASH_UNK_26 = 0x26,
|
||||
/* 0x24 */ CUT_TYPE_UNK_24,
|
||||
/* 0x25 */ CUT_TYPE_DASH_UNK_25,
|
||||
/* 0x26 */ CUT_TYPE_DASH_UNK_26,
|
||||
/* 0x27 */ CUT_TYPE_DOWN,
|
||||
/* 0x29 */ CUT_TYPE_GUARD_ATTACK = 0x29,
|
||||
/* 0x28 */ CUT_TYPE_UNK_28,
|
||||
/* 0x29 */ CUT_TYPE_GUARD_ATTACK,
|
||||
/* 0x2A */ CUT_TYPE_HORSE_UNK_2A,
|
||||
/* 0x2B */ CUT_TYPE_HORSE_TURN,
|
||||
/* 0x2C */ CUT_TYPE_WOLF_B_LEFT,
|
||||
/* 0x2D */ CUT_TYPE_WOLF_B_RIGHT,
|
||||
/* 0x2E */ CUT_TYPE_WOLF_B_FRONT,
|
||||
/* 0x2F */ CUT_TYPE_WOLF_B_BACK,
|
||||
/* 0x31 */ CUT_TYPE_WOLF_UNK_31 = 0x31,
|
||||
/* 0x32 */ CUT_TYPE_WOLF_UNK_32,
|
||||
/* 0x30 */ CUT_TYPE_WOLF_UNK_30,
|
||||
/* 0x31 */ CUT_TYPE_WOLF_JUMP_S,
|
||||
/* 0x32 */ CUT_TYPE_WOLF_JUMP_S_FINISH,
|
||||
/* 0x33 */ CUT_TYPE_WOLF_TURN_LEFT,
|
||||
/* 0x34 */ CUT_TYPE_WOLF_TURN_RIGHT,
|
||||
/* 0x36 */ CUT_TYPE_WOLF_LOCK = 0x36,
|
||||
/* 0x38 */ CUT_TYPE_DASH_UNK_38 = 0x38,
|
||||
/* 0x39 */ CUT_TYPE_WOLF_UNK_39,
|
||||
/* 0x35 */ CUT_TYPE_WOLF_UNK_35,
|
||||
/* 0x36 */ CUT_TYPE_WOLF_LOCK,
|
||||
/* 0x37 */ CUT_TYPE_WOLF_UNK_37,
|
||||
/* 0x38 */ CUT_TYPE_DASH_UNK_38,
|
||||
/* 0x39 */ CUT_TYPE_WOLF_JUMP,
|
||||
};
|
||||
|
||||
static u32 setParamData(int, int, int, int);
|
||||
|
|
@ -754,6 +766,7 @@ public:
|
|||
BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); }
|
||||
|
||||
void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
|
||||
bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); }
|
||||
|
||||
void setCanoeSlider() { mSpecialMode = 0x2D; }
|
||||
|
||||
|
|
@ -863,7 +876,7 @@ public:
|
|||
inline BOOL i_checkSwordGet();
|
||||
inline bool i_checkShieldGet() const;
|
||||
inline static BOOL checkNowWolf();
|
||||
inline static BOOL i_checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); }
|
||||
inline static u32 i_checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); }
|
||||
inline bool checkZoraWearFlg() const;
|
||||
inline bool checkMagicArmorWearFlg() const;
|
||||
inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
|
||||
|
|
@ -875,6 +888,7 @@ public:
|
|||
// static void onWolfEnemyCatch(fopAc_ac_c* i_actorP) { onWolfEnemyBiteAll(i_actorP,8);}
|
||||
|
||||
bool checkWolfEnemyCatchOwn(fopAc_ac_c* i_actorP) { return checkWolfEnemyBiteAllOwn(i_actorP); }
|
||||
bool checkWolfEnemyHangBiteOwn(fopAc_ac_c* i_actorP) const { return checkWolfEnemyBiteAllOwn(i_actorP); }
|
||||
bool checkWolfEnemyLeftThrow() const { return checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); }
|
||||
|
||||
static daMidna_c* m_midnaActor;
|
||||
|
|
|
|||
|
|
@ -1365,6 +1365,10 @@ inline void dComIfGs_onStageBossEnemy() {
|
|||
g_dComIfG_gameInfo.info.getMemory().getBit().onStageBossEnemy();
|
||||
}
|
||||
|
||||
inline void dComIfGs_onStageMiddleBoss() {
|
||||
g_dComIfG_gameInfo.info.getMemory().getBit().onStageBossEnemy2();
|
||||
}
|
||||
|
||||
inline s32 dComIfGs_isDungeonItemWarp() {
|
||||
return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemWarp();
|
||||
}
|
||||
|
|
@ -3996,6 +4000,10 @@ inline void dComIfGd_set3DlineMat(mDoExt_3DlineMat_c *param_0) {
|
|||
g_dComIfG_gameInfo.drawlist.set3DlineMat(param_0);
|
||||
}
|
||||
|
||||
inline void dComIfGd_set3DlineMatDark(mDoExt_3DlineMat_c *param_0) {
|
||||
g_dComIfG_gameInfo.drawlist.set3DlineMatDark(param_0);
|
||||
}
|
||||
|
||||
inline daPy_py_c* daPy_getLinkPlayerActorClass() {
|
||||
return dComIfGp_getLinkPlayer();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -348,6 +348,12 @@ public:
|
|||
#endif
|
||||
}
|
||||
|
||||
void set3DlineMatDark(mDoExt_3DlineMat_c *param_1) {
|
||||
#ifndef NON_VIRTUAL_3DLINEMAT
|
||||
m3DLineMatSortPacket[param_1->getMaterialID()].setMatDark(param_1);
|
||||
#endif
|
||||
}
|
||||
|
||||
void peekZdata() { mPeekZ.peekData(); }
|
||||
void entryZSortListZxlu(J3DPacket* i_packet, cXyz& param_1) {
|
||||
entryZSortXluDrawList(mDrawBuffers[DB_LIST_Z_XLU], i_packet, param_1);
|
||||
|
|
|
|||
|
|
@ -856,6 +856,7 @@ public:
|
|||
onDungeonItem(STAGE_BOSS_ENEMY);
|
||||
onDungeonItem(OOCCOO_NOTE);
|
||||
}
|
||||
void onStageBossEnemy2() { onDungeonItem(STAGE_BOSS_ENEMY_2); }
|
||||
s32 isStageBossEnemy() const { return isDungeonItem(STAGE_BOSS_ENEMY); }
|
||||
s32 isStageBossEnemy2() const { return isDungeonItem(STAGE_BOSS_ENEMY_2); }
|
||||
s32 isStageLife() const { return isDungeonItem(STAGE_LIFE); }
|
||||
|
|
|
|||
|
|
@ -273,6 +273,7 @@ public:
|
|||
void offWolfBiteDamage() { mFlags &= ~0x40; }
|
||||
void offCutDownHitFlg() { mFlags &= ~0x2; }
|
||||
void offDownFlg() { mFlags &= ~0x17; }
|
||||
void offWolfNoLock() { mFlags &= ~0x200; }
|
||||
|
||||
void setMidnaBindMode(u8 i_bindMode) { mMidnaBindMode = i_bindMode; }
|
||||
void setMidnaBindID(u8 i_idx, u32 i_bindID) { mMidnaBindID[i_idx] = i_bindID; }
|
||||
|
|
|
|||
|
|
@ -727,4 +727,76 @@ inline bool fopAcM_CheckFoodStatus(const fopAc_ac_c* actor, fopAcM_FOOD status)
|
|||
return actor->field_0x567 == status;
|
||||
}
|
||||
|
||||
/* static inline int setMidnaBindEffect(fopEn_enemy_c* i_actorP, Z2CreatureEnemy* i_creatureP, cXyz* param_2,
|
||||
cXyz* param_3) {
|
||||
static GXColor e_prim[] = {
|
||||
{0xFF, 0x78, 0x00, 0x00},
|
||||
{0xFF, 0x64, 0x78, 0x00},
|
||||
};
|
||||
static GXColor e_env[] = {
|
||||
{0x5A, 0x2D, 0x2D, 0x00},
|
||||
{0x3C, 0x1E, 0x1E, 0x00},
|
||||
};
|
||||
|
||||
daPy_py_c* player = daPy_getPlayerActorClass();
|
||||
fopAc_ac_c* a_this = (fopAc_ac_c*)i_actorP;
|
||||
|
||||
if (player->getMidnaActor() && player->checkWolfLock(a_this)) {
|
||||
cXyz sp48;
|
||||
|
||||
BOOL darkworld_check;
|
||||
if (dKy_darkworld_check()) {
|
||||
darkworld_check = 1;
|
||||
} else {
|
||||
darkworld_check = 0;
|
||||
}
|
||||
|
||||
if (i_actorP->getMidnaBindMode() == 0) {
|
||||
i_actorP->setMidnaBindMode(1);
|
||||
|
||||
csXyz sp68;
|
||||
MTXCopy(player->getMidnaActor()->getMtxHairTop(), mDoMtx_stack_c::get());
|
||||
|
||||
cXyz sp54(nREG_F(8) + 100.0f, nREG_F(9), nREG_F(10));
|
||||
mDoMtx_stack_c::multVec(&sp54, &sp48);
|
||||
|
||||
cXyz sp60 = sp48 - *param_2;
|
||||
|
||||
sp68.y = cM_atan2s(sp60.x, sp60.z);
|
||||
sp68.x = -cM_atan2s(sp60.y, JMAFastSqrt(sp60.x * sp60.x + sp60.z * sp60.z));
|
||||
sp68.z = 0;
|
||||
|
||||
JPABaseEmitter* emitter = dComIfGp_particle_set(
|
||||
0x29B, param_2, &a_this->tevStr, &sp68, param_3, 0xFF, NULL, fopAcM_GetRoomNo(a_this),
|
||||
&e_prim[darkworld_check], &e_env[darkworld_check], NULL);
|
||||
|
||||
if (emitter != NULL) {
|
||||
emitter->setGlobalParticleHeightScale((JREG_F(7) + 0.01f) * sp60.abs());
|
||||
}
|
||||
|
||||
dComIfGp_particle_set(0x29C, param_2, &a_this->tevStr, &a_this->shape_angle,
|
||||
param_3, 0xFF, NULL, fopAcM_GetRoomNo(a_this), &e_prim[darkworld_check],
|
||||
&e_env[darkworld_check], NULL);
|
||||
|
||||
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
|
||||
}
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
static u16 eff_id[] = {0x29D, 0x29E, 0x29F};
|
||||
|
||||
u32* bind_id = i_actorP->getMidnaBindID(i);
|
||||
*bind_id = dComIfGp_particle_set(*bind_id, eff_id[i], param_2, &a_this->tevStr,
|
||||
&a_this->shape_angle, param_3, 0xFF, NULL, fopAcM_GetRoomNo(a_this),
|
||||
&e_prim[darkworld_check], &e_env[darkworld_check], NULL);
|
||||
|
||||
}
|
||||
|
||||
i_creatureP->startCreatureSound(Z2SE_MIDNA_BIND_LOCK_SUS, 0, -1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
i_actorP->setMidnaBindMode(0);
|
||||
return 0;
|
||||
} */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -485,6 +485,7 @@ public:
|
|||
mDoExt_3DlineMatSortPacket() { mp3DlineMat = NULL; }
|
||||
|
||||
void reset() { mp3DlineMat = NULL; }
|
||||
void setMatDark(mDoExt_3DlineMat_c* i_mat) { setMat(i_mat); }
|
||||
|
||||
/* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
|
||||
virtual void draw();
|
||||
|
|
@ -497,7 +498,7 @@ private:
|
|||
class dKy_tevstr_c;
|
||||
class mDoExt_3DlineMat1_c : public mDoExt_3DlineMat_c {
|
||||
public:
|
||||
/* 80013360 */ void init(u16, u16, ResTIMG*, int);
|
||||
/* 80013360 */ int init(u16, u16, ResTIMG*, int);
|
||||
/* 80013FB0 */ void update(int, GXColor&, dKy_tevstr_c*);
|
||||
/* 8001373C */ void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
|
||||
/* 80014E7C */ int getMaterialID();
|
||||
|
|
@ -505,6 +506,7 @@ public:
|
|||
/* 800135D0 */ void draw();
|
||||
|
||||
cXyz* getPos(int i_idx) { return field_0x38[i_idx].field_0x0; }
|
||||
f32* getSize(int i_idx) { return field_0x38[i_idx].field_0x4; }
|
||||
|
||||
private:
|
||||
/* 0x08 */ GXTexObj field_0x8;
|
||||
|
|
|
|||
|
|
@ -1,27 +1,97 @@
|
|||
#ifndef D_A_E_VT_H
|
||||
#define D_A_E_VT_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "Z2AudioLib/Z2Creature.h"
|
||||
#include "d/bg/d_bg_s_acch.h"
|
||||
#include "d/cc/d_cc_d.h"
|
||||
#include "d/cc/d_cc_uty.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-enemies
|
||||
* @class daE_VA_c
|
||||
* @brief ???
|
||||
*
|
||||
* @details
|
||||
*
|
||||
* @brief Death Sword
|
||||
*
|
||||
* @details
|
||||
*
|
||||
*/
|
||||
class daE_VA_c : public fopEn_enemy_c {
|
||||
/* 807C267C */ void ctrlJoint(J3DJoint*, J3DModel*);
|
||||
/* 807C284C */ void JointCallBack(J3DJoint*, int);
|
||||
public:
|
||||
enum daE_VA_ACTION {
|
||||
ACTION_DEMO_OP_WAIT_e,
|
||||
ACTION_DEMO_OP_e,
|
||||
ACTION_CLEAR_WAIT_e,
|
||||
ACTION_CLEAR_CHASE_e,
|
||||
ACTION_CLEAR_ATTACK_e,
|
||||
ACTION_TRANS_WAIT_e,
|
||||
ACTION_TRANS_ATTACK_e,
|
||||
ACTION_TRANS_CHASE_e,
|
||||
ACTION_TRANS_DAMAGE_e,
|
||||
ACTION_TRANS_BITE_DAMAGE_e,
|
||||
ACTION_TRANS_THROUGH_e,
|
||||
ACTION_OPACI_WAIT_e,
|
||||
ACTION_OPACI_FLY_e,
|
||||
ACTION_OPACI_DOWN_e,
|
||||
ACTION_OPACI_DOWN_DAMAGE_e,
|
||||
ACTION_OPACI_CHASE_e,
|
||||
ACTION_OPACI_ATTACK_e,
|
||||
ACTION_OPACI_DAMAGE_e,
|
||||
ACTION_OPACI_FLIP_e,
|
||||
ACTION_OPACI_FADE_AWAY_e,
|
||||
ACTION_OPACI_DEATH_e,
|
||||
};
|
||||
|
||||
enum daE_ANM_e {
|
||||
ANM_END_EF_e = 7,
|
||||
ANM_FLOAT_ATTACK_e,
|
||||
ANM_FLOAT_DMG_A_e,
|
||||
ANM_FLOAT_DMG_B_e,
|
||||
ANM_FLOAT_DMG_C_e,
|
||||
ANM_FLOAT_WAIT_e,
|
||||
ANM_INVI_ATTACK_A_e,
|
||||
ANM_INVI_NOTICE_e,
|
||||
ANM_INVI_WAIT_e,
|
||||
ANM_INVI_WALK_e,
|
||||
ANM_OP_ATTACK_A_e,
|
||||
ANM_SUBS_ATTACK_A1_e,
|
||||
ANM_SUBS_ATTACK_A3_e,
|
||||
ANM_SUBS_ATTACK_B_e,
|
||||
ANM_SUBS_AVOID_e,
|
||||
ANM_SUBS_DOWN_e,
|
||||
ANM_SUBS_DOWN_DMG_A1_e,
|
||||
ANM_SUBS_DOWN_DMG_A2_e,
|
||||
ANM_SUBS_DOWN_DIE_e,
|
||||
ANM_SUBS_DOWN_D_STAND_e,
|
||||
ANM_SUBS_DOWN_STAGGER_e,
|
||||
ANM_SUBS_DOWN_STAND_e,
|
||||
ANM_SUBS_DOWN_WAIT_e,
|
||||
ANM_SUBS_FLY_e,
|
||||
ANM_SUBS_INVITE_A_e,
|
||||
ANM_SUBS_INVITE_B_e,
|
||||
ANM_SUBS_INVITE_C_e,
|
||||
ANM_SUBS_STAGGER_e,
|
||||
ANM_SUBS_TO_TRANS_e,
|
||||
ANM_SUBS_WAIT_e,
|
||||
ANM_TRANS_ATTACK_A1_e,
|
||||
ANM_TRANS_ATTACK_A2_e,
|
||||
ANM_TRANS_ATTACK_A3_e,
|
||||
ANM_TRANS_NECK_DMG_e,
|
||||
ANM_TRANS_NECK_PAT_e,
|
||||
ANM_TRANS_STRUGGLE_e,
|
||||
ANM_TRANS_THROUGH_e,
|
||||
ANM_TRANS_WAIT_e,
|
||||
ANM_TRANS_WALK_e,
|
||||
};
|
||||
|
||||
/* 807C267C */ int ctrlJoint(J3DJoint*, J3DModel*);
|
||||
/* 807C284C */ static int JointCallBack(J3DJoint*, int);
|
||||
/* 807C2898 */ void calcJointNeck();
|
||||
/* 807C2A4C */ void calcJointSleeve();
|
||||
/* 807C3264 */ void draw();
|
||||
/* 807C3264 */ int draw();
|
||||
/* 807C3818 */ void setBck(int, u8, f32, f32);
|
||||
/* 807C38BC */ void checkBck(int);
|
||||
/* 807C38BC */ bool checkBck(int);
|
||||
/* 807C3918 */ void setActionMode(int, int);
|
||||
/* 807C39C4 */ void getWolfCutType();
|
||||
/* 807C39C4 */ int getWolfCutType();
|
||||
/* 807C3A1C */ void onSwordAtBit();
|
||||
/* 807C3A50 */ void offSwordShield();
|
||||
/* 807C3AB0 */ void setTransDamage(cXyz*);
|
||||
|
|
@ -36,8 +106,8 @@ class daE_VA_c : public fopEn_enemy_c {
|
|||
/* 807C5188 */ void setMagicEffect(int);
|
||||
/* 807C5258 */ void setMagicHitEffect(int);
|
||||
/* 807C5338 */ void demo_skip(int);
|
||||
/* 807C53A8 */ void DemoSkipCallBack(void*, int);
|
||||
/* 807C53DC */ void getRopeLength(int);
|
||||
/* 807C53A8 */ static int DemoSkipCallBack(void*, int);
|
||||
/* 807C53DC */ f32 getRopeLength(int);
|
||||
/* 807C53FC */ void calcOpRopePos();
|
||||
/* 807C5CF0 */ void onRopeCutStatus(int, int, int);
|
||||
/* 807C5DF4 */ void setVibRope(f32, f32);
|
||||
|
|
@ -70,20 +140,167 @@ class daE_VA_c : public fopEn_enemy_c {
|
|||
/* 807CC004 */ void action();
|
||||
/* 807CC4D0 */ void mtx_set();
|
||||
/* 807CC864 */ void cc_set();
|
||||
/* 807CCD24 */ void execute();
|
||||
/* 807CCF64 */ void _delete();
|
||||
/* 807CD048 */ void CreateHeap();
|
||||
/* 807CD668 */ void create();
|
||||
/* 807CCD24 */ int execute();
|
||||
/* 807CCF64 */ int _delete();
|
||||
/* 807CD048 */ int CreateHeap();
|
||||
/* 807CD668 */ int create();
|
||||
/* 807CDAD8 */ daE_VA_c();
|
||||
private:
|
||||
/* 0x5ac */ u8 field_0x5ac[0x10ffc - 0x5ac];
|
||||
|
||||
/* 0x005AC */ request_of_phase_process_class mPhase;
|
||||
/* 0x005B4 */ mDoExt_McaMorfSO* mpMorf;
|
||||
/* 0x005B8 */ mDoExt_McaMorfSO* mpEndEfMorf;
|
||||
/* 0x005BC */ J3DModel* mpWeaponModel;
|
||||
/* 0x005C0 */ J3DModel* mpCardModels[40];
|
||||
/* 0x00660 */ csXyz field_0x660[40];
|
||||
/* 0x00750 */ csXyz field_0x750[40];
|
||||
/* 0x00840 */ csXyz field_0x840[40];
|
||||
/* 0x00930 */ u8 mCardFlags[40];
|
||||
/* 0x00958 */ mDoExt_3DlineMat1_c mRope;
|
||||
/* 0x00994 */ cXyz field_0x994[100];
|
||||
/* 0x00E44 */ csXyz field_0xe44[100];
|
||||
/* 0x0109C */ u8 mRopeCutStatus[10];
|
||||
/* 0x010A6 */ u8 field_0x10A6[0x01100 - 0x010A6];
|
||||
/* 0x01100 */ u8 mDrawRopes;
|
||||
/* 0x01101 */ u8 field_0x1101[0x01104 - 0x01101];
|
||||
/* 0x01104 */ f32 field_0x1104[10];
|
||||
/* 0x0112C */ s16 field_0x112c[10];
|
||||
/* 0x01140 */ cXyz field_0x1140[10];
|
||||
/* 0x011B8 */ f32 field_0x11b8[10];
|
||||
/* 0x011E0 */ cXyz mMagicPos[2];
|
||||
/* 0x011F8 */ cXyz mMagicOldPos[2];
|
||||
/* 0x01210 */ cXyz mMagicSpeed[2];
|
||||
/* 0x01228 */ u8 field_0x1228[3];
|
||||
/* 0x0122C */ cXyz field_0x122c;
|
||||
/* 0x01238 */ csXyz field_0x1238;
|
||||
/* 0x0123E */ s16 field_0x123e;
|
||||
/* 0x01240 */ u8 field_0x1240;
|
||||
/* 0x01244 */ mDoExt_invisibleModel mInvisModel;
|
||||
/* 0x0124C */ mDoExt_brkAnm* mpWeaponBrk;
|
||||
/* 0x01250 */ mDoExt_brkAnm* mpEndEfBrk;
|
||||
/* 0x01254 */ Z2CreatureEnemy mSound;
|
||||
/* 0x012F8 */ cXyz field_0x12f8;
|
||||
/* 0x01304 */ csXyz field_0x1304;
|
||||
/* 0x0130A */ u8 field_0x130A[0x0130C - 0x0130A];
|
||||
/* 0x0130C */ s16 field_0x130c;
|
||||
/* 0x0130E */ s16 field_0x130e;
|
||||
/* 0x01310 */ f32 field_0x1310;
|
||||
/* 0x01314 */ f32 mKankyoColBlend;
|
||||
/* 0x01318 */ f32 field_0x1318;
|
||||
/* 0x0131C */ int mAction;
|
||||
/* 0x01320 */ int mMode;
|
||||
/* 0x01324 */ int field_0x1324;
|
||||
/* 0x01328 */ u8 field_0x1328[0x0132C - 0x01328];
|
||||
/* 0x0132C */ u32 mShadowKey;
|
||||
/* 0x01330 */ s16 field_0x1330;
|
||||
/* 0x01332 */ s16 field_0x1332;
|
||||
/* 0x01334 */ s16 field_0x1334;
|
||||
/* 0x01336 */ s16 field_0x1336;
|
||||
/* 0x01338 */ s16 mAttackSphIFrameTimer;
|
||||
/* 0x0133A */ s16 mNeckSphIFrameTimer;
|
||||
/* 0x0133C */ s16 mBodyCylIFrameTimer;
|
||||
/* 0x0133E */ s16 mOffTgTimer;
|
||||
/* 0x01340 */ int mDemoModeTimer;
|
||||
/* 0x01344 */ int mDownTimer;
|
||||
/* 0x01348 */ int field_0x1348;
|
||||
/* 0x0134C */ int mFadeAwayTimer;
|
||||
/* 0x01350 */ int field_0x1350;
|
||||
/* 0x01354 */ int field_0x1354;
|
||||
/* 0x01358 */ int field_0x1358;
|
||||
/* 0x0135C */ int field_0x135c;
|
||||
/* 0x01360 */ u8 field_0x1360[0x01364 - 0x01360];
|
||||
/* 0x01364 */ int field_0x1364;
|
||||
/* 0x01368 */ int field_0x1368;
|
||||
/* 0x0136C */ u8 field_0x136C[0x01370 - 0x0136C];
|
||||
/* 0x01370 */ int mAlphaType;
|
||||
/* 0x01374 */ int mKankyoColType;
|
||||
/* 0x01378 */ u8 mGlowLightA;
|
||||
/* 0x01379 */ u8 mFootSmokeAlpha;
|
||||
/* 0x0137A */ u8 mEyeAlpha;
|
||||
/* 0x0137B */ u8 field_0x137b;
|
||||
/* 0x0137C */ u8 mGlowLightR;
|
||||
/* 0x0137D */ u8 mGlowLightG;
|
||||
/* 0x0137E */ u8 mGlowLightB;
|
||||
/* 0x0137F */ u8 mGlowBody;
|
||||
/* 0x01380 */ u8 field_0x1380;
|
||||
/* 0x01381 */ u8 field_0x1381;
|
||||
/* 0x01382 */ u8 field_0x1382;
|
||||
/* 0x01383 */ u8 field_0x1383;
|
||||
/* 0x01384 */ u8 field_0x1384;
|
||||
/* 0x01385 */ u8 field_0x1385;
|
||||
/* 0x01386 */ u8 field_0x1386;
|
||||
/* 0x01387 */ u8 mRopesEnabled;
|
||||
/* 0x01388 */ u8 field_0x1388;
|
||||
/* 0x01389 */ u8 mWeponEfMode;
|
||||
/* 0x0138A */ u8 mPlayEndEf;
|
||||
/* 0x0138B */ u8 field_0x138b;
|
||||
/* 0x0138C */ u8 mSwNo;
|
||||
/* 0x0138D */ u8 field_0x138d;
|
||||
/* 0x0138E */ u8 field_0x138e;
|
||||
/* 0x0138F */ u8 field_0x138f;
|
||||
/* 0x01390 */ u8 field_0x1390;
|
||||
/* 0x01391 */ u8 field_0x1391;
|
||||
/* 0x01392 */ u8 field_0x1392;
|
||||
/* 0x01393 */ u8 field_0x1393;
|
||||
/* 0x01394 */ s16 field_0x1394;
|
||||
/* 0x01396 */ s16 field_0x1396;
|
||||
/* 0x01398 */ s16 field_0x1398;
|
||||
/* 0x0139C */ mDoExt_3DlineMat0_c field_0x139c;
|
||||
/* 0x013B8 */ cXyz field_0x13b8;
|
||||
/* 0x013C4 */ cXyz field_0x13c4;
|
||||
/* 0x013D0 */ cXyz field_0x13d0[5];
|
||||
/* 0x0140C */ cXyz field_0x140c[5];
|
||||
/* 0x01448 */ csXyz field_0x1448[5];
|
||||
/* 0x01466 */ csXyz field_0x1466[5];
|
||||
/* 0x01484 */ u8 field_0x1484;
|
||||
/* 0x01485 */ u8 field_0x1485;
|
||||
/* 0x01486 */ u8 field_0x1486;
|
||||
/* 0x01488 */ cXyz mDemoCamCenter;
|
||||
/* 0x01494 */ cXyz mDemoCamEye;
|
||||
/* 0x014A0 */ f32 mDemoCamBank;
|
||||
/* 0x014A4 */ f32 field_0x14a4;
|
||||
/* 0x014A8 */ f32 field_0x14a8;
|
||||
/* 0x014AC */ s16 field_0x14ac;
|
||||
/* 0x014B0 */ f32 field_0x14b0;
|
||||
/* 0x014B4 */ u8 field_0x14B4[0x014B8 - 0x014B4];
|
||||
/* 0x014B8 */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x014F8 */ dBgS_ObjAcch mAcch;
|
||||
/* 0x016D0 */ dBgS_AcchCir mMagicAcchCir[2];
|
||||
/* 0x01750 */ dBgS_ObjAcch mMagicAcch[2];
|
||||
/* 0x01B00 */ dCcD_Stts mBodyCcStts;
|
||||
/* 0x01B3C */ dCcD_Stts field_0x1b3c;
|
||||
/* 0x01B78 */ dCcD_Sph mNeckSph;
|
||||
/* 0x01CB0 */ dCcD_Cyl mBodyCyls[3];
|
||||
/* 0x02064 */ dCcD_Sph mAttackSphs[4];
|
||||
/* 0x02544 */ dCcD_Sph mLineSphs[190];
|
||||
/* 0x10CD4 */ dCcD_Sph mMagicSphs[2];
|
||||
/* 0x10F44 */ dCcU_AtInfo mAtInfo;
|
||||
/* 0x10F68 */ u32 mWeponEffEmtrIDs[3];
|
||||
/* 0x10F74 */ u32 field_0x10f74;
|
||||
/* 0x10F78 */ u32 mFootSmokeEmtrIDs[2];
|
||||
/* 0x10F80 */ u32 field_0x10f80[30];
|
||||
/* 0x10FF8 */ u8 mInitHIO;
|
||||
};
|
||||
STATIC_ASSERT(sizeof(daE_VA_c) == 0x10ffc);
|
||||
|
||||
class daE_VA_HIO_c {
|
||||
public:
|
||||
/* 807C25EC */ daE_VA_HIO_c();
|
||||
/* 807CE2AC */ ~daE_VA_HIO_c();
|
||||
/* 807CE2AC */ virtual ~daE_VA_HIO_c();
|
||||
|
||||
/* 0x04 */ s8 field_0x04;
|
||||
/* 0x08 */ f32 mModelSize;
|
||||
/* 0x0C */ f32 mAttackRange;
|
||||
/* 0x10 */ f32 mBiteCount;
|
||||
/* 0x14 */ f32 mCircleAttackRadius;
|
||||
/* 0x18 */ f32 mFadeAwayTime;
|
||||
/* 0x1C */ f32 mDownTime;
|
||||
/* 0x20 */ f32 mDownHP;
|
||||
/* 0x24 */ f32 field_0x24;
|
||||
/* 0x28 */ f32 field_0x28;
|
||||
/* 0x2C */ f32 field_0x2c;
|
||||
/* 0x30 */ f32 mKRegLightR;
|
||||
/* 0x34 */ f32 mKRegLightG;
|
||||
/* 0x38 */ f32 mKRegLightB;
|
||||
/* 0x3C */ f32 mKRegLightA;
|
||||
};
|
||||
|
||||
|
||||
#endif /* D_A_E_VT_H */
|
||||
|
|
|
|||
|
|
@ -2177,7 +2177,7 @@ asm void J3DPEBlockFull::setBlend(J3DBlend const* param_0) {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm bool J3DPEBlockFull::getBlend() {
|
||||
asm J3DBlend* J3DPEBlockFull::getBlend() {
|
||||
nofralloc
|
||||
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__14J3DPEBlockFullFv.s"
|
||||
}
|
||||
|
|
@ -2399,7 +2399,7 @@ asm void J3DPEBlockFogOff::setBlend(J3DBlend const* param_0) {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm bool J3DPEBlockFogOff::getBlend() {
|
||||
asm J3DBlend* J3DPEBlockFogOff::getBlend() {
|
||||
nofralloc
|
||||
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getBlend__16J3DPEBlockFogOffFv.s"
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1686,8 +1686,8 @@ J3DZMode* J3DPEBlock::getZMode() {
|
|||
}
|
||||
|
||||
/* 8000DF4C-8000DF54 00888C 0008+00 0/0 5/0 0/0 .text getBlend__10J3DPEBlockFv */
|
||||
bool J3DPEBlock::getBlend() {
|
||||
return false;
|
||||
J3DBlend* J3DPEBlock::getBlend() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 8000DF54-8000DF5C 008894 0008+00 0/0 5/0 0/0 .text getAlphaComp__10J3DPEBlockFv */
|
||||
|
|
@ -3823,7 +3823,7 @@ SECTION_SDATA2 static f32 lit_7625 = 1.0f / 100.0f;
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void mDoExt_3DlineMat1_c::init(u16 param_0, u16 param_1, ResTIMG* param_2, int param_3) {
|
||||
asm int mDoExt_3DlineMat1_c::init(u16 param_0, u16 param_1, ResTIMG* param_2, int param_3) {
|
||||
nofralloc
|
||||
#include "asm/m_Do/m_Do_ext/init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi.s"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue