falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_b_ds mostly done (#2098)

This commit is contained in:
Caroline Madsen 2024-03-17 18:53:08 -04:00 committed by GitHub
parent df77eae2b3
commit 38e0f8927a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
33 changed files with 6120 additions and 1243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Progress.md
View File

@ -21,8 +21,8 @@ Total | 52.690694% | 2118520 | 4020672
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 52.690694% | 2118520 | 4020672
RELs | 36.707175% | 4221444 | 11500324
Total | 40.847662% | 6339964 | 15520996
RELs | 36.717122% | 4222588 | 11500324
Total | 40.855033% | 6341108 | 15520996
## RELs
@ -39,7 +39,7 @@ d_a_b_bh | 24.452445% | 6520 | 26664
d_a_b_bq | 28.033347% | 11164 | 39824
d_a_b_dr | 27.536664% | 18476 | 67096
d_a_b_dre | 27.912731% | 4964 | 17784
d_a_b_ds | 26.627364% | 26016 | 97704
d_a_b_ds | 27.798248% | 27160 | 97704
d_a_b_gg | 22.324410% | 17380 | 77852
d_a_b_gm | 30.376176% | 11628 | 38280
d_a_b_gnd | 25.489573% | 19264 | 75576
@ -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 | 36.707175% | 4221444 | 11500324
Total | 36.717122% | 4222588 | 11500324

21
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/JointCallBack__8daB_DS_cFP8J3DJointi.s
View File

@ -1,21 +0,0 @@
lbl_805CB4A4:
/* 805CB4A4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805CB4A8 7C 08 02 A6 */ mflr r0
/* 805CB4AC 90 01 00 14 */ stw r0, 0x14(r1)
/* 805CB4B0 7C 60 1B 78 */ mr r0, r3
/* 805CB4B4 2C 04 00 00 */ cmpwi r4, 0
/* 805CB4B8 40 82 00 24 */ bne lbl_805CB4DC
/* 805CB4BC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 805CB4C0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
/* 805CB4C4 80 A3 00 38 */ lwz r5, 0x38(r3)
/* 805CB4C8 80 65 00 14 */ lwz r3, 0x14(r5)
/* 805CB4CC 28 03 00 00 */ cmplwi r3, 0
/* 805CB4D0 41 82 00 0C */ beq lbl_805CB4DC
/* 805CB4D4 7C 04 03 78 */ mr r4, r0
/* 805CB4D8 4B FF FE 3D */ bl ctrlJoint__8daB_DS_cFP8J3DJointP8J3DModel
lbl_805CB4DC:
/* 805CB4DC 38 60 00 01 */ li r3, 1
/* 805CB4E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805CB4E4 7C 08 03 A6 */ mtlr r0
/* 805CB4E8 38 21 00 10 */ addi r1, r1, 0x10
/* 805CB4EC 4E 80 00 20 */ blr

44
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/_delete__8daB_DS_cFv.s
View File

@ -1,44 +0,0 @@
lbl_805DB1AC:
/* 805DB1AC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805DB1B0 7C 08 02 A6 */ mflr r0
/* 805DB1B4 90 01 00 14 */ stw r0, 0x14(r1)
/* 805DB1B8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 805DB1BC 7C 7F 1B 78 */ mr r31, r3
/* 805DB1C0 38 7F 05 AC */ addi r3, r31, 0x5ac
/* 805DB1C4 3C 80 80 5E */ lis r4, d_a_b_ds__stringBase0@ha /* 0x805DD22C@ha */
/* 805DB1C8 38 84 D2 2C */ addi r4, r4, d_a_b_ds__stringBase0@l /* 0x805DD22C@l */
/* 805DB1CC 4B A5 1E 3D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
/* 805DB1D0 88 1F 08 56 */ lbz r0, 0x856(r31)
/* 805DB1D4 28 00 00 01 */ cmplwi r0, 1
/* 805DB1D8 41 82 00 14 */ beq lbl_805DB1EC
/* 805DB1DC 28 00 00 03 */ cmplwi r0, 3
/* 805DB1E0 41 82 00 0C */ beq lbl_805DB1EC
/* 805DB1E4 28 00 00 04 */ cmplwi r0, 4
/* 805DB1E8 40 82 00 0C */ bne lbl_805DB1F4
lbl_805DB1EC:
/* 805DB1EC 38 60 00 01 */ li r3, 1
/* 805DB1F0 48 00 00 40 */ b lbl_805DB230
lbl_805DB1F4:
/* 805DB1F4 88 1F 2E C8 */ lbz r0, 0x2ec8(r31)
/* 805DB1F8 28 00 00 00 */ cmplwi r0, 0
/* 805DB1FC 41 82 00 10 */ beq lbl_805DB20C
/* 805DB200 38 00 00 00 */ li r0, 0
/* 805DB204 3C 60 80 5E */ lis r3, struct_805DDAAC+0x1@ha /* 0x805DDAAD@ha */
/* 805DB208 98 03 DA AD */ stb r0, struct_805DDAAC+0x1@l(r3) /* 0x805DDAAD@l */
lbl_805DB20C:
/* 805DB20C 80 1F 00 F0 */ lwz r0, 0xf0(r31)
/* 805DB210 28 00 00 00 */ cmplwi r0, 0
/* 805DB214 41 82 00 18 */ beq lbl_805DB22C
/* 805DB218 38 7F 05 DC */ addi r3, r31, 0x5dc
/* 805DB21C 81 9F 05 DC */ lwz r12, 0x5dc(r31)
/* 805DB220 81 8C 00 08 */ lwz r12, 8(r12)
/* 805DB224 7D 89 03 A6 */ mtctr r12
/* 805DB228 4E 80 04 21 */ bctrl
lbl_805DB22C:
/* 805DB22C 38 60 00 01 */ li r3, 1
lbl_805DB230:
/* 805DB230 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 805DB234 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805DB238 7C 08 03 A6 */ mtlr r0
/* 805DB23C 38 21 00 10 */ addi r1, r1, 0x10
/* 805DB240 4E 80 00 20 */ blr

9
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/daB_DS_Delete__FP8daB_DS_c.s
View File

@ -1,9 +0,0 @@
lbl_805DB244:
/* 805DB244 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805DB248 7C 08 02 A6 */ mflr r0
/* 805DB24C 90 01 00 14 */ stw r0, 0x14(r1)
/* 805DB250 4B FF FF 5D */ bl _delete__8daB_DS_cFv
/* 805DB254 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805DB258 7C 08 03 A6 */ mtlr r0
/* 805DB25C 38 21 00 10 */ addi r1, r1, 0x10
/* 805DB260 4E 80 00 20 */ blr

9
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/daB_DS_Draw__FP8daB_DS_c.s
View File

@ -1,9 +0,0 @@
lbl_805CBAA8:
/* 805CBAA8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805CBAAC 7C 08 02 A6 */ mflr r0
/* 805CBAB0 90 01 00 14 */ stw r0, 0x14(r1)
/* 805CBAB4 4B FF FA 3D */ bl draw__8daB_DS_cFv
/* 805CBAB8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805CBABC 7C 08 03 A6 */ mtlr r0
/* 805CBAC0 38 21 00 10 */ addi r1, r1, 0x10
/* 805CBAC4 4E 80 00 20 */ blr

9
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/daB_DS_Execute__FP8daB_DS_c.s
View File

@ -1,9 +0,0 @@
lbl_805DB184:
/* 805DB184 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805DB188 7C 08 02 A6 */ mflr r0
/* 805DB18C 90 01 00 14 */ stw r0, 0x14(r1)
/* 805DB190 4B FF FC 35 */ bl execute__8daB_DS_cFv
/* 805DB194 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805DB198 7C 08 03 A6 */ mtlr r0
/* 805DB19C 38 21 00 10 */ addi r1, r1, 0x10
/* 805DB1A0 4E 80 00 20 */ blr

36
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/doYoMessage__8daB_DS_cFv.s
View File

@ -1,36 +0,0 @@
lbl_805CDA44:
/* 805CDA44 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805CDA48 7C 08 02 A6 */ mflr r0
/* 805CDA4C 90 01 00 14 */ stw r0, 0x14(r1)
/* 805CDA50 93 E1 00 0C */ stw r31, 0xc(r1)
/* 805CDA54 7C 7F 1B 78 */ mr r31, r3
/* 805CDA58 80 63 08 6C */ lwz r3, 0x86c(r3)
/* 805CDA5C 28 03 00 00 */ cmplwi r3, 0
/* 805CDA60 41 82 00 3C */ beq lbl_805CDA9C
/* 805CDA64 A0 03 00 F8 */ lhz r0, 0xf8(r3)
/* 805CDA68 28 00 00 0E */ cmplwi r0, 0xe
/* 805CDA6C 40 82 00 10 */ bne lbl_805CDA7C
/* 805CDA70 38 00 00 10 */ li r0, 0x10
/* 805CDA74 B0 03 00 F8 */ sth r0, 0xf8(r3)
/* 805CDA78 48 00 00 30 */ b lbl_805CDAA8
lbl_805CDA7C:
/* 805CDA7C 28 00 00 12 */ cmplwi r0, 0x12
/* 805CDA80 40 82 00 28 */ bne lbl_805CDAA8
/* 805CDA84 38 00 00 13 */ li r0, 0x13
/* 805CDA88 B0 03 00 F8 */ sth r0, 0xf8(r3)
/* 805CDA8C 38 00 FF FF */ li r0, -1
/* 805CDA90 90 1F 08 68 */ stw r0, 0x868(r31)
/* 805CDA94 38 60 00 01 */ li r3, 1
/* 805CDA98 48 00 00 14 */ b lbl_805CDAAC
lbl_805CDA9C:
/* 805CDA9C 80 7F 08 68 */ lwz r3, 0x868(r31)
/* 805CDAA0 4B A5 1F 85 */ bl fopMsgM_SearchByID__FUi
/* 805CDAA4 90 7F 08 6C */ stw r3, 0x86c(r31)
lbl_805CDAA8:
/* 805CDAA8 38 60 00 00 */ li r3, 0
lbl_805CDAAC:
/* 805CDAAC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 805CDAB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805CDAB4 7C 08 03 A6 */ mtlr r0
/* 805CDAB8 38 21 00 10 */ addi r1, r1, 0x10
/* 805CDABC 4E 80 00 20 */ blr

32
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/hand_smokeSet__8daB_DS_cFUc.s
View File

@ -1,32 +0,0 @@
lbl_805CC158:
/* 805CC158 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805CC15C 7C 08 02 A6 */ mflr r0
/* 805CC160 90 01 00 14 */ stw r0, 0x14(r1)
/* 805CC164 93 E1 00 0C */ stw r31, 0xc(r1)
/* 805CC168 93 C1 00 08 */ stw r30, 8(r1)
/* 805CC16C 7C 7E 1B 78 */ mr r30, r3
/* 805CC170 7C 9F 23 78 */ mr r31, r4
/* 805CC174 54 80 06 3F */ clrlwi. r0, r4, 0x18
/* 805CC178 41 82 00 0C */ beq lbl_805CC184
/* 805CC17C 28 00 00 01 */ cmplwi r0, 1
/* 805CC180 40 82 00 10 */ bne lbl_805CC190
lbl_805CC184:
/* 805CC184 7F C3 F3 78 */ mr r3, r30
/* 805CC188 38 80 00 00 */ li r4, 0
/* 805CC18C 4B FF FD 45 */ bl handSPosSet__8daB_DS_cFi
lbl_805CC190:
/* 805CC190 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 805CC194 41 82 00 0C */ beq lbl_805CC1A0
/* 805CC198 28 00 00 02 */ cmplwi r0, 2
/* 805CC19C 40 82 00 10 */ bne lbl_805CC1AC
lbl_805CC1A0:
/* 805CC1A0 7F C3 F3 78 */ mr r3, r30
/* 805CC1A4 38 80 00 01 */ li r4, 1
/* 805CC1A8 4B FF FD 29 */ bl handSPosSet__8daB_DS_cFi
lbl_805CC1AC:
/* 805CC1AC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 805CC1B0 83 C1 00 08 */ lwz r30, 8(r1)
/* 805CC1B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805CC1B8 7C 08 03 A6 */ mtlr r0
/* 805CC1BC 38 21 00 10 */ addi r1, r1, 0x10
/* 805CC1C0 4E 80 00 20 */ blr

30
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/mBattle2BreathFireSet__8daB_DS_cFUl.s
View File

@ -1,30 +0,0 @@
lbl_805D3D14:
/* 805D3D14 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 805D3D18 7C 08 02 A6 */ mflr r0
/* 805D3D1C 90 01 00 24 */ stw r0, 0x24(r1)
/* 805D3D20 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 805D3D24 7C 7F 1B 79 */ or. r31, r3, r3
/* 805D3D28 7C 85 23 78 */ mr r5, r4
/* 805D3D2C 88 03 04 E2 */ lbz r0, 0x4e2(r3)
/* 805D3D30 7C 07 07 74 */ extsb r7, r0
/* 805D3D34 38 00 00 00 */ li r0, 0
/* 805D3D38 90 01 00 08 */ stw r0, 8(r1)
/* 805D3D3C 38 60 00 F6 */ li r3, 0xf6
/* 805D3D40 41 82 00 0C */ beq lbl_805D3D4C
/* 805D3D44 80 9F 00 04 */ lwz r4, 4(r31)
/* 805D3D48 48 00 00 08 */ b lbl_805D3D50
lbl_805D3D4C:
/* 805D3D4C 38 80 FF FF */ li r4, -1
lbl_805D3D50:
/* 805D3D50 38 DF 07 00 */ addi r6, r31, 0x700
/* 805D3D54 39 1F 04 E4 */ addi r8, r31, 0x4e4
/* 805D3D58 39 20 00 00 */ li r9, 0
/* 805D3D5C 39 40 FF FF */ li r10, -1
/* 805D3D60 4B A4 61 91 */ bl fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i
/* 805D3D64 38 00 00 00 */ li r0, 0
/* 805D3D68 98 1F 08 5A */ stb r0, 0x85a(r31)
/* 805D3D6C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 805D3D70 80 01 00 24 */ lwz r0, 0x24(r1)
/* 805D3D74 7C 08 03 A6 */ mtlr r0
/* 805D3D78 38 21 00 20 */ addi r1, r1, 0x20
/* 805D3D7C 4E 80 00 20 */ blr

33
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/mBreakBoneSUB__8daB_DS_cFv.s
View File

@ -1,33 +0,0 @@
lbl_805D02F8:
/* 805D02F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805D02FC 7C 08 02 A6 */ mflr r0
/* 805D0300 90 01 00 14 */ stw r0, 0x14(r1)
/* 805D0304 93 E1 00 0C */ stw r31, 0xc(r1)
/* 805D0308 7C 7F 1B 78 */ mr r31, r3
/* 805D030C 88 83 08 59 */ lbz r4, 0x859(r3)
/* 805D0310 28 04 00 FF */ cmplwi r4, 0xff
/* 805D0314 41 82 00 4C */ beq lbl_805D0360
/* 805D0318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 805D031C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 805D0320 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 805D0324 7C 05 07 74 */ extsb r5, r0
/* 805D0328 4B A6 4F 89 */ bl offSwitch__10dSv_info_cFii
/* 805D032C C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
/* 805D0330 D0 1F 06 C4 */ stfs f0, 0x6c4(r31)
/* 805D0334 C0 1F 04 D4 */ lfs f0, 0x4d4(r31)
/* 805D0338 D0 1F 06 C8 */ stfs f0, 0x6c8(r31)
/* 805D033C C0 1F 04 D8 */ lfs f0, 0x4d8(r31)
/* 805D0340 D0 1F 06 CC */ stfs f0, 0x6cc(r31)
/* 805D0344 38 7F 05 DC */ addi r3, r31, 0x5dc
/* 805D0348 3C 80 00 04 */ lis r4, 4
/* 805D034C 38 A0 00 1F */ li r5, 0x1f
/* 805D0350 81 9F 05 DC */ lwz r12, 0x5dc(r31)
/* 805D0354 81 8C 00 2C */ lwz r12, 0x2c(r12)
/* 805D0358 7D 89 03 A6 */ mtctr r12
/* 805D035C 4E 80 04 21 */ bctrl
lbl_805D0360:
/* 805D0360 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 805D0364 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805D0368 7C 08 03 A6 */ mtlr r0
/* 805D036C 38 21 00 10 */ addi r1, r1, 0x10
/* 805D0370 4E 80 00 20 */ blr

43
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/mClearTrap__8daB_DS_cFb.s
View File

@ -1,43 +0,0 @@
lbl_805CC80C:
/* 805CC80C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 805CC810 7C 08 02 A6 */ mflr r0
/* 805CC814 90 01 00 34 */ stw r0, 0x34(r1)
/* 805CC818 39 61 00 30 */ addi r11, r1, 0x30
/* 805CC81C 4B D9 59 B9 */ bl _savegpr_27
/* 805CC820 7C 7B 1B 78 */ mr r27, r3
/* 805CC824 7C 9C 23 78 */ mr r28, r4
/* 805CC828 3B A0 00 00 */ li r29, 0
/* 805CC82C 3B E0 00 00 */ li r31, 0
lbl_805CC830:
/* 805CC830 3B DF 2D 78 */ addi r30, r31, 0x2d78
/* 805CC834 7C 7B F0 2E */ lwzx r3, r27, r30
/* 805CC838 28 03 00 00 */ cmplwi r3, 0
/* 805CC83C 41 82 00 40 */ beq lbl_805CC87C
/* 805CC840 38 81 00 08 */ addi r4, r1, 8
/* 805CC844 4B A4 D1 79 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c
/* 805CC848 2C 03 00 00 */ cmpwi r3, 0
/* 805CC84C 41 82 00 30 */ beq lbl_805CC87C
/* 805CC850 80 61 00 08 */ lwz r3, 8(r1)
/* 805CC854 28 03 00 00 */ cmplwi r3, 0
/* 805CC858 41 82 00 24 */ beq lbl_805CC87C
/* 805CC85C 57 80 06 3F */ clrlwi. r0, r28, 0x18
/* 805CC860 41 82 00 0C */ beq lbl_805CC86C
/* 805CC864 4B A4 D4 19 */ bl fopAcM_delete__FP10fopAc_ac_c
/* 805CC868 48 00 00 0C */ b lbl_805CC874
lbl_805CC86C:
/* 805CC86C 38 00 00 00 */ li r0, 0
/* 805CC870 B0 03 05 62 */ sth r0, 0x562(r3)
lbl_805CC874:
/* 805CC874 38 00 00 00 */ li r0, 0
/* 805CC878 7C 1B F1 2E */ stwx r0, r27, r30
lbl_805CC87C:
/* 805CC87C 3B BD 00 01 */ addi r29, r29, 1
/* 805CC880 2C 1D 00 14 */ cmpwi r29, 0x14
/* 805CC884 3B FF 00 04 */ addi r31, r31, 4
/* 805CC888 41 80 FF A8 */ blt lbl_805CC830
/* 805CC88C 39 61 00 30 */ addi r11, r1, 0x30
/* 805CC890 4B D9 59 91 */ bl _restgpr_27
/* 805CC894 80 01 00 34 */ lwz r0, 0x34(r1)
/* 805CC898 7C 08 03 A6 */ mtlr r0
/* 805CC89C 38 21 00 30 */ addi r1, r1, 0x30
/* 805CC8A0 4E 80 00 20 */ blr

26
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/mHeadAngle_Clear__8daB_DS_cFv.s
View File

@ -1,26 +0,0 @@
lbl_805CBD00:
/* 805CBD00 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805CBD04 7C 08 02 A6 */ mflr r0
/* 805CBD08 90 01 00 14 */ stw r0, 0x14(r1)
/* 805CBD0C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 805CBD10 7C 7F 1B 78 */ mr r31, r3
/* 805CBD14 38 7F 07 A8 */ addi r3, r31, 0x7a8
/* 805CBD18 38 80 00 00 */ li r4, 0
/* 805CBD1C 38 A0 00 14 */ li r5, 0x14
/* 805CBD20 38 C0 01 00 */ li r6, 0x100
/* 805CBD24 4B CA 48 E5 */ bl cLib_addCalcAngleS2__FPssss
/* 805CBD28 38 7F 07 AA */ addi r3, r31, 0x7aa
/* 805CBD2C 38 80 00 00 */ li r4, 0
/* 805CBD30 38 A0 00 14 */ li r5, 0x14
/* 805CBD34 38 C0 01 00 */ li r6, 0x100
/* 805CBD38 4B CA 48 D1 */ bl cLib_addCalcAngleS2__FPssss
/* 805CBD3C 38 7F 07 AC */ addi r3, r31, 0x7ac
/* 805CBD40 38 80 00 00 */ li r4, 0
/* 805CBD44 38 A0 00 14 */ li r5, 0x14
/* 805CBD48 38 C0 01 00 */ li r6, 0x100
/* 805CBD4C 4B CA 48 BD */ bl cLib_addCalcAngleS2__FPssss
/* 805CBD50 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 805CBD54 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805CBD58 7C 08 03 A6 */ mtlr r0
/* 805CBD5C 38 21 00 10 */ addi r1, r1, 0x10
/* 805CBD60 4E 80 00 20 */ blr

4
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/setActionMode__8daB_DS_cFii.s
View File

@ -1,4 +0,0 @@
lbl_805CBB74:
/* 805CBB74 90 83 06 80 */ stw r4, 0x680(r3)
/* 805CBB78 90 A3 06 84 */ stw r5, 0x684(r3)
/* 805CBB7C 4E 80 00 20 */ blr

16
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/setYoMessage__8daB_DS_cFi.s
View File

@ -1,16 +0,0 @@
lbl_805CDA08:
/* 805CDA08 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805CDA0C 7C 08 02 A6 */ mflr r0
/* 805CDA10 90 01 00 14 */ stw r0, 0x14(r1)
/* 805CDA14 93 E1 00 0C */ stw r31, 0xc(r1)
/* 805CDA18 7C 7F 1B 78 */ mr r31, r3
/* 805CDA1C 90 83 08 64 */ stw r4, 0x864(r3)
/* 805CDA20 7C 83 23 78 */ mr r3, r4
/* 805CDA24 38 80 03 E8 */ li r4, 0x3e8
/* 805CDA28 4B A5 24 5D */ bl fopMsgM_messageSet__FUlUl
/* 805CDA2C 90 7F 08 68 */ stw r3, 0x868(r31)
/* 805CDA30 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 805CDA34 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805CDA38 7C 08 03 A6 */ mtlr r0
/* 805CDA3C 38 21 00 10 */ addi r1, r1, 0x10
/* 805CDA40 4E 80 00 20 */ blr

9
asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/useHeapInit__FP10fopAc_ac_c.s
View File

@ -1,9 +0,0 @@
lbl_805DB954:
/* 805DB954 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805DB958 7C 08 02 A6 */ mflr r0
/* 805DB95C 90 01 00 14 */ stw r0, 0x14(r1)
/* 805DB960 4B FF F9 05 */ bl CreateHeap__8daB_DS_cFv
/* 805DB964 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805DB968 7C 08 03 A6 */ mtlr r0
/* 805DB96C 38 21 00 10 */ addi r1, r1, 0x10
/* 805DB970 4E 80 00 20 */ blr

5
include/JSystem/JParticle/JPAEmitter.h
View File

@ -106,6 +106,7 @@ public:
void setEmitterCallBackPtr(JPAEmitterCallBack* ptr) { mpEmtrCallBack = ptr; }
void setGlobalRTMatrix(const Mtx m) { JPASetRMtxTVecfromMtx(m, mGlobalRot, &mGlobalTrs); }
void setGlobalTranslation(f32 x, f32 y, f32 z) { mGlobalTrs.set(x, y, z); }
void setGlobalTranslation(const JGeometry::TVec3<f32>& trs) { mGlobalTrs.set(trs); }
void getLocalTranslation(JGeometry::TVec3<f32>& vec) { vec.set(mLocalTrs); }
void setGlobalRotation(const JGeometry::TVec3<s16>& rot) {
JPAGetXYZRotateMtx(rot.x, rot.y, rot.z, mGlobalRot);
@ -131,6 +132,10 @@ public:
mGlobalScl.set(scale);
mGlobalPScl.set(scale.x ,scale.y);
}
void setGlobalSRTMatrix(const MtxP matrix) {
JPASetRMtxSTVecfromMtx(matrix, mGlobalRot, &mGlobalScl, &mGlobalTrs);
mGlobalPScl.set(mGlobalScl.x, mGlobalScl.y);
}
f32 get_r_f() { return mRndm.get_rndm_f(); }
f32 get_r_zp() { return mRndm.get_rndm_zp(); }

3
include/SSystem/SComponent/c_cc_d.h
View File

@ -11,6 +11,9 @@ typedef struct _GXColor GXColor;
class fopAc_ac_c;
enum CcG_Tg_HitMark {
CcG_Tg_UNK_MARK_0 = 0,
CcG_Tg_UNK_MARK_2 = 2,
CcG_Tg_UNK_MARK_3 = 3,
CcG_Tg_UNK_MARK_6 = 6,
CcG_Tg_UNK_MARK_8 = 8,
};

4
include/d/a/d_a_alink.h
View File

@ -3031,7 +3031,7 @@ public:
virtual f32 getBaseAnimeFrameRate() const;
virtual f32 getBaseAnimeFrame() const;
virtual void setAnimeFrame(f32);
virtual bool checkWolfLock(fopAc_ac_c*) const;
virtual BOOL checkWolfLock(fopAc_ac_c*) const;
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const;
virtual s32 getItemID() const;
@ -3070,7 +3070,7 @@ public:
virtual u32 checkCanoeRide() const;
virtual u32 checkBoardRide() const;
virtual u32 checkSpinnerRide() const;
virtual fopAc_ac_c* getSpinnerActor();
virtual daSpinner_c* getSpinnerActor();
virtual BOOL checkHorseRideNotReady() const;
virtual bool checkArrowChargeEnd() const;
virtual f32 getSearchBallScale() const;

9
include/d/a/d_a_player.h
View File

@ -183,6 +183,7 @@ private:
}; // Size: 0x24
class daMidna_c;
class daSpinner_c;
class daPy_py_c;
inline daPy_py_c* dComIfGp_getLinkPlayer();
inline BOOL i_dComIfGs_isEventBit(const u16);
@ -340,7 +341,7 @@ public:
ERFLG0_UNK_20000000 = 0x20000000,
ERFLG0_UNK_10000000 = 0x10000000,
ERFLG0_UNK_8000000 = 0x8000000,
ERFLG0_UNK_2000000 = 0x2000000,
ERFLG0_BOSS_ROOM_WAIT = 0x2000000,
ERFLG0_UNK_1000000 = 0x1000000,
ERFLG0_UNK_800000 = 0x800000,
ERFLG0_UNK_400000 = 0x400000,
@ -610,7 +611,7 @@ public:
virtual f32 getBaseAnimeFrameRate() const;
virtual f32 getBaseAnimeFrame() const;
virtual void setAnimeFrame(f32);
virtual bool checkWolfLock(fopAc_ac_c*) const;
virtual BOOL checkWolfLock(fopAc_ac_c*) const;
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const { return -1; }
virtual s32 getItemID() const;
@ -654,7 +655,7 @@ public:
virtual u32 checkCanoeRide() const { return 0; }
virtual u32 checkBoardRide() const { return 0; }
virtual u32 checkSpinnerRide() const { return 0; }
virtual fopAc_ac_c* getSpinnerActor();
virtual daSpinner_c* getSpinnerActor();
virtual BOOL checkHorseRideNotReady() const;
virtual bool checkArrowChargeEnd() const;
virtual f32 getSearchBallScale() const;
@ -748,6 +749,7 @@ public:
bool i_checkGoronSideMove() const { return mSpecialMode == 0x2B; }
u8 getCutType() const { return mCutType; }
u16 getSwordAtUpTime() const { return mSwordUpTimer; }
s16 getDamageWaitTimer() const { return mDamageTimer; }
bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); }
bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); }
bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
@ -757,6 +759,7 @@ public:
bool getGrabUpEnd() const { return i_checkResetFlg0(RFLG0_GRAB_UP_END); }
bool getGrabPutStart() const { return i_checkResetFlg0(RFLG0_GRAB_PUT_START); }
void onBossRoomWait() { i_onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); }

9
include/d/cc/d_cc_d.h
View File

@ -237,6 +237,7 @@ public:
void SetRVec(cXyz& vec) { mRVec = vec; }
cXyz* GetVecP() { return &mVec; }
void SetHitPos(cXyz& pos) { mHitPos = pos; }
cXyz* GetHitPosP() { return &mHitPos; }
private:
/* 0x1C */ u8 mSe;
@ -294,6 +295,9 @@ public:
void OnAtNoConHit() { mGObjAt.OnSPrm(1); }
void OffAtNoConHit() { mGObjAt.OffSPrm(1); }
void OnTgNoConHit() { mGObjTg.OnSPrm(2); }
void OffTgNoConHit() { mGObjTg.OffSPrm(2); }
void OnTgStopNoConHit() { mGObjTg.OnSPrm(0x2000); }
void OffTgStopNoConHit() { mGObjTg.OffSPrm(0x2000); }
void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
void SetTgSe(u8 se) { mGObjTg.SetSe(se); }
@ -324,7 +328,11 @@ public:
void OffTgShieldFrontRange() { mGObjTg.OffSPrm(0x8); }
void OnTgSmallShield() { mGObjTg.OnSPrm(0x10); }
void OffTgSmallShield() { mGObjTg.OffSPrm(0x10); }
void OnTgIronBallRebound() { mGObjTg.OnSPrm(0x100); }
void OffTgIronBallRebound() { mGObjTg.OffSPrm(0x100); }
bool ChkTgIronBallRebound() { return mGObjTg.ChkSPrm(0x100); }
void OnTgSpinnerReflect() { mGObjTg.OnSPrm(0x200); }
void OffTgSpinnerReflect() { mGObjTg.OffSPrm(0x200); }
s16* GetTgShieldFrontRangeYAngle() { return mGObjTg.GetShieldFrontRangeYAngle(); }
s16 GetTgShieldRange() { return mGObjTg.GetShieldRange(); }
bool ChkTgShield() { return mGObjTg.ChkSPrm(1); }
@ -380,6 +388,7 @@ public:
void SetAtHitPos(cXyz& pos) { mGObjAt.SetHitPos(pos); }
u32 GetTgHitObjHitSeID(int i_soundID) { return getHitSeID(GetTgHitObjSe(),i_soundID); }
cXyz* GetAtHitPosP() { return mGObjAt.GetHitPosP(); }
cXyz* GetTgHitPosP() { return mGObjTg.GetHitPosP(); }
bool ChkTgHookshotThrough() { return mGObjTg.ChkSPrm(0x80); }
static const Z2SoundID m_hitSeID[24];

1
include/d/cc/d_cc_uty.h
View File

@ -31,5 +31,6 @@ struct dCcU_AtInfo {
fopAc_ac_c* cc_at_check(fopAc_ac_c*,dCcU_AtInfo*);
fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo);
void def_se_set(Z2Creature* p_sound, cCcD_Obj* p_collider, u32 map_info, fopAc_ac_c* p_actor);
#endif /* D_CC_D_CC_UTY_H */

5
include/d/com/d_com_inf_game.h
View File

@ -824,6 +824,7 @@ int dComIfG_TimerDeleteRequest(int i_mode);
int dComIfG_TimerStart(int i_mode, s16 i_time);
bool dComIfGp_isLightDropMapVisible();
int dComIfG_TimerEnd(int i_mode, int param_1);
void dComIfGs_onStageBossEnemy(int i_stageNo);
inline void dComIfG_setBrightness(u8 brightness) {
g_dComIfG_gameInfo.mFadeBrightness = brightness;
@ -1344,6 +1345,10 @@ inline s32 dComIfGs_isStageBossEnemy() {
return g_dComIfG_gameInfo.info.getMemory().getBit().isStageBossEnemy();
}
inline s32 dComIfGs_isStageLife() {
return g_dComIfG_gameInfo.info.getMemory().getBit().isStageLife();
}
inline void dComIfGs_setKeyNum(u8 i_keyNum) {
g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(i_keyNum);
}

1
include/d/save/d_save.h
View File

@ -852,6 +852,7 @@ public:
}
s32 isStageBossEnemy() const { return isDungeonItem(STAGE_BOSS_ENEMY); }
s32 isStageBossEnemy2() const { return isDungeonItem(STAGE_BOSS_ENEMY_2); }
s32 isStageLife() const { return isDungeonItem(STAGE_LIFE); }
s32 isDungeonItemWarp() const { return isDungeonItem(OOCCOO_NOTE); }
void onStageLife() { onDungeonItem(STAGE_LIFE); }

1
include/f_op/f_op_actor.h
View File

@ -251,6 +251,7 @@ public:
void onWolfBiteDamage() { mFlags |= 0x40; }
void onWolfDownStartFlg() { mFlags |= 0x14; }
void onWolfDownPullEndFlg() { mFlags |= 0x20; }
void onWolfNoLock() { mFlags |= 0x200; }
void setThrowModeCatch() { mThrowMode |= 2; }
void setThrowModeDash() { mThrowMode |= 4; }

4
include/f_op/f_op_actor_mng.h
View File

@ -195,6 +195,10 @@ inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) {
return p_actor->group;
}
inline void fopAcM_SetGroup(fopAc_ac_c* p_actor, u8 group) {
p_actor->group = group;
}
inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) {
pActor->actor_status |= flag;
}

2
include/m_Do/m_Do_ext.h
View File

@ -273,7 +273,7 @@ public:
void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; }
u8 getPlayMode() { return mFrameCtrl.getAttribute(); }
void setPlayMode(int mode) { mFrameCtrl.setAttribute(mode); }
bool isStop() { return mFrameCtrl.checkState(1) || mFrameCtrl.getRate() == 0.0f; }
BOOL isStop() { return mFrameCtrl.checkState(1) || mFrameCtrl.getRate() == 0.0f; }
bool isLoop() { return mFrameCtrl.checkState(2); }
f32 getStartFrame() { return mFrameCtrl.getStart(); }
void setStartFrame(f32 frame) { mFrameCtrl.setStart(frame); }

355
include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h
View File

@ -1,6 +1,359 @@
#ifndef D_A_B_DS_H
#define D_A_B_DS_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor.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 "d/msg/d_msg_flow.h"
#include "m_Do/m_Do_ext.h"
class daB_DS_c : public fopEn_enemy_c {
public:
enum Type {
/* 0 */ PHASE_1,
/* 1 */ BULLET_A,
/* 2 */ PHASE_2,
/* 3 */ BULLET_B,
/* 4 */ BULLET_C,
};
enum Action {
/* 0 */ ACT_WAIT,
/* 1 */ ACT_OPENING_DEMO,
/* 2 */ ACT_CIRCLE,
/* 3 */ ACT_DAMAGE,
/* 4 */ ACT_ETC_DAMAGE,
/* 5 */ ACT_HAND_ATTACK,
/* 6 */ ACT_BREATH_ATTACK,
/* 7 */ ACT_BREATH_SEARCH,
};
enum B2Action {
/* 0 */ ACT_B2_OPENING_DEMO,
/* 1 */ ACT_B2_WAIT,
/* 2 */ ACT_B2_F_MOVE,
/* 3 */ ACT_B2_TIRED,
/* 4 */ ACT_B2_DAMAGE,
/* 5 */ ACT_B2_DEAD,
};
enum AnmID {
/* 0x06 */ ANM_ATTACK01_A = 6,
/* 0x07 */ ANM_ATTACK01_B,
/* 0x08 */ ANM_ATTACK01_C,
/* 0x09 */ ANM_ATTACK02_A_A,
/* 0x0A */ ANM_ATTACK02_A_B,
/* 0x0B */ ANM_ATTACK02_A_C,
/* 0x0C */ ANM_ATTACK02_B_A,
/* 0x0D */ ANM_ATTACK02_B_B,
/* 0x0E */ ANM_ATTACK02_B_C,
/* 0x0F */ ANM_ATTACK02_C_A,
/* 0x10 */ ANM_ATTACK02_C_B,
/* 0x11 */ ANM_ATTACK02_C_C,
/* 0x12 */ ANM_ATTACK_L_A,
/* 0x13 */ ANM_ATTACK_L_B,
/* 0x14 */ ANM_ATTACK_L_C,
/* 0x15 */ ANM_ATTACK_R_A,
/* 0x16 */ ANM_ATTACK_R_B,
/* 0x17 */ ANM_ATTACK_R_C,
/* 0x18 */ ANM_CIRCLE_L_A,
/* 0x19 */ ANM_CIRCLE_L_B,
/* 0x1A */ ANM_CIRCLE_L_C,
/* 0x1B */ ANM_CIRCLE_R_A,
/* 0x1C */ ANM_CIRCLE_R_B,
/* 0x1D */ ANM_CIRCLE_R_C,
/* 0x1E */ ANM_DAMAGE_A,
/* 0x1F */ ANM_DAMAGE_A_WAIT,
/* 0x20 */ ANM_DAMAGE_B,
/* 0x21 */ ANM_DAMAGE_B_WAIT,
/* 0x22 */ ANM_ENDDEMO,
/* 0x23 */ ANM_HEAD_DAMAGE,
/* 0x24 */ ANM_HEAD_DIE,
/* 0x25 */ ANM_HEAD_DIEB,
/* 0x26 */ ANM_HEAD_DOWN,
/* 0x27 */ ANM_HEAD_DOWN_DAMAGE,
/* 0x28 */ ANM_HEAD_DOWN_UP,
/* 0x29 */ ANM_HEAD_FATTACK_A,
/* 0x2A */ ANM_HEAD_FATTACK_B,
/* 0x2B */ ANM_HEAD_FATTACK_C,
/* 0x2C */ ANM_HEAD_FWAIT,
/* 0x2D */ ANM_HEAD_RETURN,
/* 0x2E */ ANM_HEAD_TIRED,
/* 0x2F */ ANM_LASTDAMAGE,
/* 0x30 */ ANM_LASTDAMAGE_WAIT,
/* 0x31 */ ANM_NODAMAGE_01_A,
/* 0x32 */ ANM_NODAMAGE_01_B,
/* 0x33 */ ANM_NODAMAGE_01_C,
/* 0x34 */ ANM_NODAMAGE_02_A,
/* 0x35 */ ANM_NODAMAGE_02_B,
/* 0x36 */ ANM_NODAMAGE_02_C,
/* 0x37 */ ANM_NODAMAGE_03_A,
/* 0x38 */ ANM_NODAMAGE_03_B,
/* 0x39 */ ANM_NODAMAGE_03_C,
/* 0x3A */ ANM_OPDEMO,
/* 0x3B */ ANM_REVIVAL,
/* 0x3C */ ANM_WAIT01_A,
/* 0x3D */ ANM_WAIT01_B,
/* 0x3E */ ANM_WAIT01_C,
};
/* 805CB314 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 805CB4A4 */ static int JointCallBack(J3DJoint*, int);
/* 805CB4F0 */ int draw();
/* 805CBAC8 */ void setBck(int, u8, f32, f32);
/* 805CBB74 */ void setActionMode(int, int);
/* 805CBB80 */ void mSmokeSet();
/* 805CBD00 */ void mHeadAngle_Clear();
/* 805CBD64 */ void HandHitSoundSet(bool);
/* 805CBED0 */ void handSPosSet(int);
/* 805CC158 */ void hand_smokeSet(u8);
/* 805CC1C4 */ void mZsMoveChk();
/* 805CC454 */ void mZsMoveChk_Guard();
/* 805CC6F4 */ void mTrapScale();
/* 805CC80C */ void mClearTrap(bool);
/* 805CC8A4 */ void mCreateTrap(bool);
/* 805CCEB4 */ void mChangeVer2();
/* 805CD074 */ void damage_check();
/* 805CD628 */ void neck_set();
/* 805CD844 */ bool mCutTypeCheck();
/* 805CD8D8 */ bool startDemoCheck();
/* 805CDA08 */ void setYoMessage(int);
/* 805CDA44 */ bool doYoMessage();
/* 805CDAC0 */ void executeOpeningDemo();
/* 805CFC8C */ bool mHandBreathChk();
/* 805D002C */ void executeWait();
/* 805D0194 */ void executeCircle();
/* 805D02F8 */ void mBreakBoneSUB();
/* 805D0374 */ void damageSet();
/* 805D03EC */ void damageHitCamera();
/* 805D0584 */ void damageDownCheck();
/* 805D074C */ void executeDamage();
/* 805D1E30 */ void executeEtcDamage();
/* 805D203C */ void breath_smokeSet();
/* 805D226C */ void executeBreathAttack();
/* 805D2520 */ void executeHandAttack();
/* 805D272C */ void executeBreathSearch();
/* 805D28D0 */ void executeBattle2OpeningDemo();
/* 805D3900 */ void mFlyBMove(f32);
/* 805D39A4 */ void mFuwafuwaSet(bool);
/* 805D3D14 */ void mBattle2BreathFireSet(u32);
/* 805D3D80 */ bool mNeckAngleSet();
/* 805D3EA0 */ void mSetFirstPos();
/* 805D3F90 */ bool mChkScreenIn();
/* 805D4054 */ bool mRailInOutCheck();
/* 805D41CC */ void executeBattle2Wait();
/* 805D429C */ bool mBattle2MoveFSet();
/* 805D497C */ void executeBattle2FMove();
/* 805D5040 */ void executeBattle2Tired();
/* 805D52D4 */ void executeBattle2Damage();
/* 805D60BC */ bool mDeadMove();
/* 805D6534 */ void executeBattle2Dead();
/* 805D7C10 */ void executeBullet();
/* 805D8078 */ void mBulletAction();
/* 805D80F0 */ void mSoundSE_Set();
/* 805D8D04 */ void action();
/* 805D91A4 */ void mtx_set();
/* 805D951C */ void cc_set();
/* 805D9A40 */ void cc_etc_set();
/* 805D9B74 */ void mBattle2Action();
/* 805D9CFC */ void mBattle2_spinner_damage_check();
/* 805D9FF4 */ bool mBattle2_damage_check();
/* 805DA584 */ void mBattle2_mtx_set();
/* 805DA9A4 */ void mBattle2_cc_etc_set();
/* 805DAA98 */ void mBattle2_cc_set();
/* 805DADC4 */ int execute();
/* 805DB1AC */ int _delete();
/* 805DB264 */ int CreateHeap();
/* 805DB974 */ cPhs__Step create();
/* 805DC1E8 */ daB_DS_c();
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
/* 0x05B8 */ mDoExt_McaMorfSO* mpSwordMorf;
/* 0x05BC */ mDoExt_McaMorfSO* mpZantMorf;
/* 0x05C0 */ J3DModel* mpOpPatternModel;
/* 0x05C4 */ J3DModel* mpPatternModel;
/* 0x05C8 */ mDoExt_brkAnm* mpSwordBrkAnm;
/* 0x05CC */ mDoExt_brkAnm* mpOpPatternBrkAnm;
/* 0x05D0 */ mDoExt_btkAnm* mpOpPatternBtkAnm;
/* 0x05D4 */ mDoExt_brkAnm* mpPatternBrkAnm;
/* 0x05D8 */ mDoExt_btkAnm* mpPatternBtkAnm;
/* 0x05DC */ Z2CreatureEnemy mSound;
/* 0x0680 */ int mAction;
/* 0x0684 */ int mMode;
/* 0x0688 */ int mHitLocation;
/* 0x068C */ int mAnmID;
/* 0x0690 */ int mBirthTrapTimerF;
/* 0x0694 */ int mPedestalFallTimer;
/* 0x0698 */ int mSandFallTimer;
/* 0x069C */ int mSwordTimer;
/* 0x06A0 */ int mHintTimer1;
/* 0x06A4 */ int mHintTimer2;
/* 0x06A8 */ int field_0x6a8;
/* 0x06AC */ cXyz mZantScale;
/* 0x06B8 */ cXyz mSwordScale;
/* 0x06C4 */ cXyz mSoundPos;
/* 0x06D0 */ cXyz field_0x6d0;
/* 0x06DC */ cXyz mZantEyePos;
/* 0x06E8 */ cXyz mSwordPos;
/* 0x06F4 */ cXyz field_0x6f4;
/* 0x0700 */ cXyz mMouthPos;
/* 0x070C */ cXyz mBulletPos;
/* 0x0718 */ cXyz field_0x718;
/* 0x0724 */ cXyz field_0x724;
/* 0x0730 */ cXyz mSandPos;
/* 0x073C */ cXyz mBackbonePos;
/* 0x0748 */ cXyz mZantPos;
/* 0x0754 */ cXyz mHeadPos;
/* 0x0760 */ cXyz mHandPos[2];
/* 0x0778 */ cXyz mFingerPos[2];
/* 0x0790 */ cXyz field_0x790;
/* 0x079C */ cXyz field_0x79c;
/* 0x07A8 */ csXyz mHeadAngle;
/* 0x07AE */ csXyz field_0x7ae;
/* 0x07B4 */ u8 field_0x7b4[6];
/* 0x07BA */ csXyz field_0x7ba;
/* 0x07C0 */ csXyz field_0x7c0;
/* 0x07C6 */ u8 field_0x7c6[4];
/* 0x07CA */ s16 field_0x7ca;
/* 0x07CC */ s16 mBh2AttackAngleF;
/* 0x07CE */ s16 field_0x7ce;
/* 0x07D0 */ s16 field_0x7d0;
/* 0x07D2 */ s16 field_0x7d2;
/* 0x07D4 */ f32 mBreathTimerBase;
/* 0x07D8 */ f32 mBulletRadius;
/* 0x07DC */ f32 field_0x7dc[3];
/* 0x07E8 */ f32 field_0x7e8;
/* 0x07EC */ f32 field_0x7ec;
/* 0x07F0 */ f32 mBulletDistance;
/* 0x07F4 */ f32 mChkHigh;
/* 0x07F8 */ f32 field_0x7f8;
/* 0x07FC */ f32 mColBlend;
/* 0x0800 */ f32 mGroundUpY;
/* 0x0804 */ f32 field_0x804;
/* 0x0808 */ f32 field_0x808;
/* 0x080C */ f32 field_0x80c;
/* 0x0810 */ f32 mWallR;
/* 0x0814 */ int mBrokenBone;
/* 0x0818 */ int mTimerCount;
/* 0x081C */ int mActionTimer;
/* 0x0820 */ int mHitTimer;
/* 0x0824 */ u8 field_0x824[4];
/* 0x0828 */ int mP2FallTimer;
/* 0x082C */ int field_0x82c;
/* 0x0830 */ int mBreathTimeCount;
/* 0x0834 */ int mOutTimer;
/* 0x0838 */ int mSmokeCount;
/* 0x083C */ int field_0x83c;
/* 0x0840 */ int field_0x840;
/* 0x0844 */ u8 field_0x844[4];
/* 0x0848 */ u32 mShadowKey;
/* 0x084C */ u8 mAttackingHand;
/* 0x084D */ u8 field_0x84d;
/* 0x084E */ u8 mDamageTimer;
/* 0x084F */ u8 mBackboneJoint;
/* 0x0850 */ bool mDead;
/* 0x0851 */ bool mIsDemo;
/* 0x0852 */ u8 mBossPhase;
/* 0x0853 */ bool mIsOpeningDemo;
/* 0x0854 */ bool mIsAppear;
/* 0x0855 */ bool mIsAppearG;
/* 0x0856 */ u8 mType;
/* 0x0857 */ u8 mBitSw;
/* 0x0858 */ u8 mBitSw2;
/* 0x0859 */ u8 mBitSw3;
/* 0x085A */ bool mCreateFireBreath;
/* 0x085B */ bool mNoDrawSword;
/* 0x085C */ bool mDrawZant;
/* 0x085D */ bool mDrawZantSword;
/* 0x085E */ bool field_0x85e;
/* 0x085F */ bool mPlayPatternAnm;
/* 0x0860 */ bool mTrapCreate;
/* 0x0861 */ bool field_0x861;
/* 0x0862 */ u8 field_0x862[1];
/* 0x0864 */ u32 mMsgIdx;
/* 0x0868 */ u32 mMsgPcID;
/* 0x086C */ msg_class* mpMsg;
/* 0x0870 */ dBgS_AcchCir mAcchCir;
/* 0x08B0 */ dBgS_ObjAcch mAcch;
/* 0x0A88 */ dCcD_Stts mCcStts;
/* 0x0AC4 */ dCcD_Sph mWeakSph;
/* 0x0BFC */ dCcD_Sph mHeadSph[5];
/* 0x1214 */ dCcD_Sph mBreathAtSph;
/* 0x134C */ dCcD_Sph mEtcSph[18];
/* 0x293C */ dCcD_Cyl mBackboneCyl;
/* 0x2A78 */ dCcD_Cyl mHandAtLCyl;
/* 0x2BB4 */ dCcD_Cyl mHandAtRCyl;
/* 0x2CF0 */ dCcU_AtInfo mAtInfo;
/* 0x2D14 */ cXyz mCameraEye;
/* 0x2D20 */ cXyz mCameraCenter;
/* 0x2D2C */ f32 mCameraFovy;
/* 0x2D30 */ u8 field_0x2d30[0xc];
/* 0x2D3C */ u32 mStaltroopID[15];
/* 0x2D78 */ u32 mTrapID[20];
/* 0x2DC8 */ u32 mStaltroop2ID[5];
/* 0x2DDC */ u32 mHandSmokeParticleKey[4];
/* 0x2DEC */ u32 mHitParticleKey[2];
/* 0x2DF4 */ u32 mDeathParticleKey;
/* 0x2DF8 */ u8 field_0x2df8[0xc];
/* 0x2E04 */ u32 mBackboneParticleKey[2];
/* 0x2E0C */ u32 mSandParticleKey[2];
/* 0x2E14 */ u32 mParticleKey1;
/* 0x2E18 */ u32 mParticleKey2;
/* 0x2E1C */ u32 mSmokeParticleKey[20];
/* 0x2E6C */ u32 mStartingParticleKey[16];
/* 0x2EAC */ u32 mBreathSmokeParticleKey[3];
/* 0x2EB8 */ u32 mBulletParticleKey[4];
/* 0x2EC8 */ bool mHIOInit;
/* 0x2EC9 */ u8 field_0x2ec9[0x13];
/* 0x2EDC */ dMsgFlow_c mMsgFlow;
};
STATIC_ASSERT(sizeof(daB_DS_c) == 0x2F28);
class daB_DS_HIO_c {
public:
/* 805CB22C */ daB_DS_HIO_c();
#ifdef NONMATCHING
/* 805DC89C */ virtual ~daB_DS_HIO_c() {}
#else
/* 805DC89C */ ~daB_DS_HIO_c();
#endif
#ifndef NONMATCHING
/* 0x00 */ void* _vtable;
#endif
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mModelSize;
/* 0x0C */ f32 mHandRange;
/* 0x10 */ f32 mBreathRange;
/* 0x14 */ f32 mGuardSpawnRange;
/* 0x18 */ f32 mNoSearchRange;
/* 0x1C */ f32 mP2MoveAxis;
/* 0x20 */ f32 mP2ModelSize;
/* 0x24 */ f32 mP2AttackHeight;
/* 0x28 */ s16 mP2FallTime;
/* 0x2A */ s16 mPedestalFallTime;
/* 0x2C */ s16 mSandFallWaitTime;
/* 0x2E */ s16 mP2BulletFireTime;
/* 0x30 */ s16 mP2OuterWallAttackTime;
/* 0x32 */ s16 mP2TrapCreateWaitTime1;
/* 0x34 */ s16 mP2TrapCreateWaitTime2;
/* 0x36 */ s16 mP2TrapCreateID1;
/* 0x38 */ s16 mP2TrapCreateID2;
/* 0x3A */ s16 mHintTime1;
/* 0x3C */ s16 mHintTime2;
/* 0x3E */ s16 mP2OuterWallTrapSpeed;
/* 0x40 */ s16 mTowerTrapSpeed;
/* 0x42 */ s16 mP2ApproachAccel;
/* 0x44 */ s16 mP2ApproachSpeedMax;
/* 0x46 */ s16 mP2ApproachAfterBullet;
/* 0x48 */ s16 mP2ApproachDist;
/* 0x4A */ s16 mP2Health;
/* 0x4C */ bool mP2HealthDebugOn;
};
#endif /* D_A_B_DS_H */

6618
rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp
View File

File diff suppressed because it is too large Load Diff

6
src/d/a/d_a_alink_link.inc
View File

@ -2508,7 +2508,7 @@ SECTION_DEAD static char const* const pad_8039263C = "\0\0\0";
int daAlink_c::execute() {
loadModelDVD();
if (checkEndResetFlg0(ERFLG0_UNK_2000000) && getMidnaActor() != NULL) {
if (checkEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT) && getMidnaActor() != NULL) {
getMidnaActor()->onNoServiceWait();
}
@ -4696,7 +4696,7 @@ bool daAlink_c::checkAcceptDungeonWarpAlink(int param_0) {
}
/* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */
fopAc_ac_c* daAlink_c::getSpinnerActor() {
daSpinner_c* daAlink_c::getSpinnerActor() {
fopAc_ac_c* spinnerActor;
if (!checkSpinnerRide()) {
@ -4704,7 +4704,7 @@ fopAc_ac_c* daAlink_c::getSpinnerActor() {
} else {
spinnerActor = mRideAcKeep.getActor();
}
return spinnerActor;
return static_cast<daSpinner_c*>(spinnerActor);
}
/* 800D0274-800D027C 0CABB4 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daAlink_cCFv */

4
src/d/a/d_a_alink_weakfn.inc
View File

@ -780,7 +780,7 @@ void daPy_py_c::setAnimeFrame(f32 param_0) {
}
/* 801416A0-801416A8 13BFE0 0008+00 1/0 0/0 0/0 .text checkWolfLock__9daPy_py_cCFP10fopAc_ac_c */
bool daPy_py_c::checkWolfLock(fopAc_ac_c* param_0) const {
BOOL daPy_py_c::checkWolfLock(fopAc_ac_c* param_0) const {
return false;
}
@ -969,7 +969,7 @@ void daPy_py_c::onSceneChangeDead(u8 param_0, int param_1) {
}
/* 80141770-80141778 13C0B0 0008+00 1/0 0/0 0/0 .text getSpinnerActor__9daPy_py_cFv */
fopAc_ac_c* daPy_py_c::getSpinnerActor() {
daSpinner_c* daPy_py_c::getSpinnerActor() {
return NULL;
}

2
src/d/a/d_a_alink_wolf.inc
View File

@ -5594,7 +5594,7 @@ asm void daAlink_c::checkWolfLockData() {
#endif
/* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */
bool daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const {
BOOL daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const {
u32 actor_id = fopAcM_GetID(i_actor);
for (int i = 0; i < mWolfLockNum; i++) {

3
src/d/a/d_a_no_chg_room.cpp
View File

@ -10,6 +10,7 @@
#include "d/d_procname.h"
#include "d/s/d_s_room.h"
#include "rel/d/a/d_a_horse/d_a_horse.h"
#include "rel/d/a/d_a_spinner/d_a_spinner.h"
/* 801451EC-801452DC 13FB2C 00F0+00 1/1 0/0 0/0 .text isLoadRoom__Fi */
static bool isLoadRoom(int i_roomNo) {
@ -56,7 +57,7 @@ int daNocrm_c::execute() {
if (player_p->checkHorseRide()) {
cur_player_pos.y = i_dComIfGp_getHorseActor()->current.pos.y;
} else if (player_p->checkSpinnerRide()) {
fopAc_ac_c* spinner_actor = player_p->getSpinnerActor();
daSpinner_c* spinner_actor = player_p->getSpinnerActor();
if (spinner_actor != NULL) {
cur_player_pos.y = spinner_actor->current.pos.y;

2
src/d/a/d_a_player.cpp
View File

@ -580,7 +580,7 @@ f32 daPy_py_c::getSpinnerRideSpeed() const {
/* 8015F814-8015F89C 15A154 0088+00 0/0 0/0 1/1 .text checkSpinnerReflectEffect__9daPy_py_cFv */
bool daPy_py_c::checkSpinnerReflectEffect() {
daSpinner_c* spinner_p = (daSpinner_c*)getSpinnerActor();
daSpinner_c* spinner_p = getSpinnerActor();
if (spinner_p != NULL && spinner_p->reflectAccept()) {
return true;