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

d_a_guard_mng OK, d_a_obj_smoke OK, d_a_tag_smk_emt OK, d_a_hitobj OK (#298) 

* d_a_guard_mng OK

* d_a_obj_smoke OK

* d_a_tag_smk_emt OK

* d_a_hitobj attempt

* fixes

* rm comment

* cc_sph_src

* rename and move mGuardDataTbl
This commit is contained in:
Pheenoh 2023-02-20 00:53:33 -07:00 committed by GitHub
parent 8471d1d6cc
commit fa1f47f7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 422 additions and 1477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Progress.md
View File

@ -21,8 +21,8 @@ Total | 32.620219% | 1311552 | 4020672
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 32.620219% | 1311552 | 4020672
RELs | 33.262680% | 3825316 | 11500324
Total | 33.096252% | 5136868 | 15520996
RELs | 33.287306% | 3828148 | 11500324
Total | 33.114499% | 5139700 | 15520996
## RELs
@ -185,8 +185,8 @@ d_a_ep | 30.950696% | 5248 | 16956
d_a_formation_mng | 27.806286% | 3468 | 12472
d_a_fr | 34.866377% | 4488 | 12872
d_a_grass | 49.074395% | 28312 | 57692
d_a_guard_mng | 53.457447% | 804 | 1504
d_a_hitobj | 62.682927% | 1028 | 1640
d_a_guard_mng | 100.000000% | 1504 | 1504
d_a_hitobj | 100.000000% | 1640 | 1640
d_a_horse | 22.301298% | 15668 | 70256
d_a_hozelda | 28.805621% | 4920 | 17080
d_a_izumi_gate | 57.729941% | 1180 | 2044
@ -598,7 +598,7 @@ d_a_obj_shield | 34.160959% | 3192 | 9344
d_a_obj_sm_door | 39.302885% | 2616 | 6656
d_a_obj_smallkey | 31.464798% | 3772 | 11988
d_a_obj_smgdoor | 41.383095% | 3016 | 7288
d_a_obj_smoke | 51.322751% | 776 | 1512
d_a_obj_smoke | 100.000000% | 1512 | 1512
d_a_obj_smtile | 35.912938% | 2376 | 6616
d_a_obj_smw_stone | 40.435606% | 1708 | 4224
d_a_obj_snowEffTag | 46.419098% | 1400 | 3016
@ -761,7 +761,7 @@ d_a_tag_setBall | 100.000000% | 880 | 880
d_a_tag_setrestart | 100.000000% | 1840 | 1840
d_a_tag_shop_camera | 100.000000% | 1196 | 1196
d_a_tag_shop_item | 41.944848% | 1156 | 2756
d_a_tag_smk_emt | 50.127226% | 788 | 1572
d_a_tag_smk_emt | 100.000000% | 1572 | 1572
d_a_tag_spinner | 90.663900% | 1748 | 1928
d_a_tag_sppath | 33.333333% | 2040 | 6120
d_a_tag_spring | 100.000000% | 1896 | 1896
@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244
d_a_warp_bug | 54.940711% | 1112 | 2024
d_a_ykgr | 44.400631% | 2252 | 5072
f_pc_profile_lst | 100.000000% | 28156 | 28156
Total | 33.262680% | 3825316 | 11500324
Total | 33.287306% | 3828148 | 11500324

34
asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkAppearTag__12daGuardMng_cFP12daTagGuard_c.s
View File

@ -1,34 +0,0 @@
lbl_80837BEC:
/* 80837BEC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80837BF0 7C 08 02 A6 */ mflr r0
/* 80837BF4 90 01 00 24 */ stw r0, 0x24(r1)
/* 80837BF8 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80837BFC 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80837C00 7C 7E 1B 78 */ mr r30, r3
/* 80837C04 7C 9F 23 78 */ mr r31, r4
/* 80837C08 7F E3 FB 78 */ mr r3, r31
/* 80837C0C 38 81 00 08 */ addi r4, r1, 8
/* 80837C10 48 52 1B E9 */ bl getAppearPoint__12daTagGuard_cFP3Vec
/* 80837C14 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80837C18 41 82 00 3C */ beq lbl_80837C54
/* 80837C1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80837C20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80837C24 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 80837C28 38 83 04 D0 */ addi r4, r3, 0x4d0
/* 80837C2C 38 61 00 08 */ addi r3, r1, 8
/* 80837C30 7C 65 1B 78 */ mr r5, r3
/* 80837C34 4B B0 F4 81 */ bl PSVECSubtract
/* 80837C38 38 61 00 08 */ addi r3, r1, 8
/* 80837C3C 4B B0 F4 FD */ bl PSVECSquareMag
/* 80837C40 C0 1E 05 6C */ lfs f0, 0x56c(r30)
/* 80837C44 FC 00 08 40 */ fcmpo cr0, f0, f1
/* 80837C48 40 81 00 0C */ ble lbl_80837C54
/* 80837C4C 93 FE 05 68 */ stw r31, 0x568(r30)
/* 80837C50 D0 3E 05 6C */ stfs f1, 0x56c(r30)
lbl_80837C54:
/* 80837C54 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80837C58 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 80837C5C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80837C60 7C 08 03 A6 */ mtlr r0
/* 80837C64 38 21 00 20 */ addi r1, r1, 0x20
/* 80837C68 4E 80 00 20 */ blr

21
asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkMerchantNum__12daGuardMng_cFv.s
View File

@ -1,21 +0,0 @@
lbl_80837B9C:
/* 80837B9C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80837BA0 7C 08 02 A6 */ mflr r0
/* 80837BA4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80837BA8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80837BAC 7C 7F 1B 78 */ mr r31, r3
/* 80837BB0 3C 60 80 83 */ lis r3, lit_3663@ha /* 0x80837DEC@ha */
/* 80837BB4 C0 03 7D EC */ lfs f0, lit_3663@l(r3) /* 0x80837DEC@l */
/* 80837BB8 D0 1F 05 6C */ stfs f0, 0x56c(r31)
/* 80837BBC 38 00 00 00 */ li r0, 0
/* 80837BC0 98 1F 05 70 */ stb r0, 0x570(r31)
/* 80837BC4 3C 60 80 83 */ lis r3, s_sub__FPvPv@ha /* 0x80837B18@ha */
/* 80837BC8 38 63 7B 18 */ addi r3, r3, s_sub__FPvPv@l /* 0x80837B18@l */
/* 80837BCC 7F E4 FB 78 */ mr r4, r31
/* 80837BD0 4B 7E 97 69 */ bl fpcEx_Search__FPFPvPv_PvPv
/* 80837BD4 88 7F 05 70 */ lbz r3, 0x570(r31)
/* 80837BD8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80837BDC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80837BE0 7C 08 03 A6 */ mtlr r0
/* 80837BE4 38 21 00 10 */ addi r1, r1, 0x10
/* 80837BE8 4E 80 00 20 */ blr

27
asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Create__FP10fopAc_ac_c.s
View File

@ -1,27 +0,0 @@
lbl_80837D7C:
/* 80837D7C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80837D80 7C 08 02 A6 */ mflr r0
/* 80837D84 90 01 00 14 */ stw r0, 0x14(r1)
/* 80837D88 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80837D8C 7C 7F 1B 78 */ mr r31, r3
/* 80837D90 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80837D94 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80837D98 40 82 00 1C */ bne lbl_80837DB4
/* 80837D9C 28 1F 00 00 */ cmplwi r31, 0
/* 80837DA0 41 82 00 08 */ beq lbl_80837DA8
/* 80837DA4 4B 7E 0D C1 */ bl __ct__10fopAc_ac_cFv
lbl_80837DA8:
/* 80837DA8 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80837DAC 60 00 00 08 */ ori r0, r0, 8
/* 80837DB0 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80837DB4:
/* 80837DB4 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80837DB8 98 1F 05 72 */ stb r0, 0x572(r31)
/* 80837DBC 38 00 00 00 */ li r0, 0
/* 80837DC0 98 1F 05 73 */ stb r0, 0x573(r31)
/* 80837DC4 38 60 00 04 */ li r3, 4
/* 80837DC8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80837DCC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80837DD0 7C 08 03 A6 */ mtlr r0
/* 80837DD4 38 21 00 10 */ addi r1, r1, 0x10
/* 80837DD8 4E 80 00 20 */ blr

14
asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Delete__FP12daGuardMng_c.s
View File

@ -1,14 +0,0 @@
lbl_80837D4C:
/* 80837D4C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80837D50 7C 08 02 A6 */ mflr r0
/* 80837D54 90 01 00 14 */ stw r0, 0x14(r1)
/* 80837D58 28 03 00 00 */ cmplwi r3, 0
/* 80837D5C 41 82 00 0C */ beq lbl_80837D68
/* 80837D60 38 80 00 00 */ li r4, 0
/* 80837D64 4B 7E 0F 29 */ bl __dt__10fopAc_ac_cFv
lbl_80837D68:
/* 80837D68 38 60 00 01 */ li r3, 1
/* 80837D6C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80837D70 7C 08 03 A6 */ mtlr r0
/* 80837D74 38 21 00 10 */ addi r1, r1, 0x10
/* 80837D78 4E 80 00 20 */ blr

60
asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Execute__FP12daGuardMng_c.s
View File

@ -1,60 +0,0 @@
lbl_80837C6C:
/* 80837C6C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80837C70 7C 08 02 A6 */ mflr r0
/* 80837C74 90 01 00 14 */ stw r0, 0x14(r1)
/* 80837C78 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80837C7C 7C 7F 1B 78 */ mr r31, r3
/* 80837C80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80837C84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80837C88 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80837C8C 80 03 05 74 */ lwz r0, 0x574(r3)
/* 80837C90 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
/* 80837C94 41 82 00 14 */ beq lbl_80837CA8
/* 80837C98 88 7F 05 73 */ lbz r3, 0x573(r31)
/* 80837C9C 88 1F 05 72 */ lbz r0, 0x572(r31)
/* 80837CA0 7C 03 00 40 */ cmplw r3, r0
/* 80837CA4 41 80 00 0C */ blt lbl_80837CB0
lbl_80837CA8:
/* 80837CA8 38 60 00 01 */ li r3, 1
/* 80837CAC 48 00 00 84 */ b lbl_80837D30
lbl_80837CB0:
/* 80837CB0 88 1F 05 71 */ lbz r0, 0x571(r31)
/* 80837CB4 88 7F 05 70 */ lbz r3, 0x570(r31)
/* 80837CB8 7C 00 18 40 */ cmplw r0, r3
/* 80837CBC 40 80 00 08 */ bge lbl_80837CC4
/* 80837CC0 98 7F 05 71 */ stb r3, 0x571(r31)
lbl_80837CC4:
/* 80837CC4 7F E3 FB 78 */ mr r3, r31
/* 80837CC8 4B FF FE D5 */ bl checkMerchantNum__12daGuardMng_cFv
/* 80837CCC 80 7F 05 68 */ lwz r3, 0x568(r31)
/* 80837CD0 28 03 00 00 */ cmplwi r3, 0
/* 80837CD4 41 82 00 58 */ beq lbl_80837D2C
/* 80837CD8 88 9F 05 71 */ lbz r4, 0x571(r31)
/* 80837CDC 88 1F 05 70 */ lbz r0, 0x570(r31)
/* 80837CE0 7C 04 00 40 */ cmplw r4, r0
/* 80837CE4 40 81 00 48 */ ble lbl_80837D2C
/* 80837CE8 7C 00 20 50 */ subf r0, r0, r4
/* 80837CEC 2C 00 00 03 */ cmpwi r0, 3
/* 80837CF0 40 81 00 3C */ ble lbl_80837D2C
/* 80837CF4 3C 80 80 83 */ lis r4, data_80837DE4@ha /* 0x80837DE4@ha */
/* 80837CF8 38 84 7D E4 */ addi r4, r4, data_80837DE4@l /* 0x80837DE4@l */
/* 80837CFC 80 84 00 00 */ lwz r4, 0(r4)
/* 80837D00 48 52 1B 5D */ bl createGuard__12daTagGuard_cFUl
/* 80837D04 88 7F 05 73 */ lbz r3, 0x573(r31)
/* 80837D08 38 03 00 01 */ addi r0, r3, 1
/* 80837D0C 98 1F 05 73 */ stb r0, 0x573(r31)
/* 80837D10 88 1F 05 70 */ lbz r0, 0x570(r31)
/* 80837D14 98 1F 05 71 */ stb r0, 0x571(r31)
/* 80837D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80837D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80837D20 38 63 09 78 */ addi r3, r3, 0x978
/* 80837D24 38 80 00 3C */ li r4, 0x3c
/* 80837D28 4B 7F CE 71 */ bl onSwitch__12dSv_danBit_cFi
lbl_80837D2C:
/* 80837D2C 38 60 00 01 */ li r3, 1
lbl_80837D30:
/* 80837D30 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80837D34 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80837D38 7C 08 03 A6 */ mtlr r0
/* 80837D3C 38 21 00 10 */ addi r1, r1, 0x10
/* 80837D40 4E 80 00 20 */ blr

37
asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/s_sub__FPvPv.s
View File

@ -1,37 +0,0 @@
lbl_80837B18:
/* 80837B18 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80837B1C 7C 08 02 A6 */ mflr r0
/* 80837B20 90 01 00 14 */ stw r0, 0x14(r1)
/* 80837B24 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80837B28 93 C1 00 08 */ stw r30, 8(r1)
/* 80837B2C 7C 7E 1B 78 */ mr r30, r3
/* 80837B30 7C 9F 23 78 */ mr r31, r4
/* 80837B34 4B 7E 11 AD */ bl fopAc_IsActor__FPv
/* 80837B38 2C 03 00 00 */ cmpwi r3, 0
/* 80837B3C 41 82 00 44 */ beq lbl_80837B80
/* 80837B40 A8 1E 00 08 */ lha r0, 8(r30)
/* 80837B44 2C 00 02 88 */ cmpwi r0, 0x288
/* 80837B48 41 82 00 14 */ beq lbl_80837B5C
/* 80837B4C 2C 00 02 8F */ cmpwi r0, 0x28f
/* 80837B50 41 82 00 0C */ beq lbl_80837B5C
/* 80837B54 2C 00 02 94 */ cmpwi r0, 0x294
/* 80837B58 40 82 00 14 */ bne lbl_80837B6C
lbl_80837B5C:
/* 80837B5C 88 7F 05 70 */ lbz r3, 0x570(r31)
/* 80837B60 38 03 00 01 */ addi r0, r3, 1
/* 80837B64 98 1F 05 70 */ stb r0, 0x570(r31)
/* 80837B68 48 00 00 18 */ b lbl_80837B80
lbl_80837B6C:
/* 80837B6C 2C 00 02 96 */ cmpwi r0, 0x296
/* 80837B70 40 82 00 10 */ bne lbl_80837B80
/* 80837B74 7F E3 FB 78 */ mr r3, r31
/* 80837B78 7F C4 F3 78 */ mr r4, r30
/* 80837B7C 48 00 00 71 */ bl checkAppearTag__12daGuardMng_cFP12daTagGuard_c
lbl_80837B80:
/* 80837B80 38 60 00 00 */ li r3, 0
/* 80837B84 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80837B88 83 C1 00 08 */ lwz r30, 8(r1)
/* 80837B8C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80837B90 7C 08 03 A6 */ mtlr r0
/* 80837B94 38 21 00 10 */ addi r1, r1, 0x10
/* 80837B98 4E 80 00 20 */ blr

20
asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGAabFv.s
View File

@ -1,20 +0,0 @@
lbl_8046B584:
/* 8046B584 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046B588 7C 08 02 A6 */ mflr r0
/* 8046B58C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046B590 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046B594 7C 7F 1B 79 */ or. r31, r3, r3
/* 8046B598 41 82 00 1C */ beq lbl_8046B5B4
/* 8046B59C 3C A0 80 47 */ lis r5, __vt__8cM3dGAab@ha /* 0x8046B678@ha */
/* 8046B5A0 38 05 B6 78 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8046B678@l */
/* 8046B5A4 90 1F 00 18 */ stw r0, 0x18(r31)
/* 8046B5A8 7C 80 07 35 */ extsh. r0, r4
/* 8046B5AC 40 81 00 08 */ ble lbl_8046B5B4
/* 8046B5B0 4B E6 37 8D */ bl __dl__FPv
lbl_8046B5B4:
/* 8046B5B4 7F E3 FB 78 */ mr r3, r31
/* 8046B5B8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046B5BC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046B5C0 7C 08 03 A6 */ mtlr r0
/* 8046B5C4 38 21 00 10 */ addi r1, r1, 0x10
/* 8046B5C8 4E 80 00 20 */ blr

20
asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGSphFv.s
View File

@ -1,20 +0,0 @@
lbl_8046B53C:
/* 8046B53C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046B540 7C 08 02 A6 */ mflr r0
/* 8046B544 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046B548 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046B54C 7C 7F 1B 79 */ or. r31, r3, r3
/* 8046B550 41 82 00 1C */ beq lbl_8046B56C
/* 8046B554 3C A0 80 47 */ lis r5, __vt__8cM3dGSph@ha /* 0x8046B66C@ha */
/* 8046B558 38 05 B6 6C */ addi r0, r5, __vt__8cM3dGSph@l /* 0x8046B66C@l */
/* 8046B55C 90 1F 00 10 */ stw r0, 0x10(r31)
/* 8046B560 7C 80 07 35 */ extsh. r0, r4
/* 8046B564 40 81 00 08 */ ble lbl_8046B56C
/* 8046B568 4B E6 37 D5 */ bl __dl__FPv
lbl_8046B56C:
/* 8046B56C 7F E3 FB 78 */ mr r3, r31
/* 8046B570 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046B574 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046B578 7C 08 03 A6 */ mtlr r0
/* 8046B57C 38 21 00 10 */ addi r1, r1, 0x10
/* 8046B580 4E 80 00 20 */ blr

83
asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Create__FP10fopAc_ac_c.s
View File

@ -1,83 +0,0 @@
lbl_8046B400:
/* 8046B400 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046B404 7C 08 02 A6 */ mflr r0
/* 8046B408 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046B40C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046B410 93 C1 00 08 */ stw r30, 8(r1)
/* 8046B414 7C 7F 1B 78 */ mr r31, r3
/* 8046B418 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 8046B41C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 8046B420 40 82 00 A8 */ bne lbl_8046B4C8
/* 8046B424 7F E0 FB 79 */ or. r0, r31, r31
/* 8046B428 41 82 00 94 */ beq lbl_8046B4BC
/* 8046B42C 7C 1E 03 78 */ mr r30, r0
/* 8046B430 4B BA D7 35 */ bl __ct__10fopAc_ac_cFv
/* 8046B434 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */
/* 8046B438 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */
/* 8046B43C 90 1E 05 8C */ stw r0, 0x58c(r30)
/* 8046B440 38 7E 05 90 */ addi r3, r30, 0x590
/* 8046B444 4B C1 83 1D */ bl __ct__10dCcD_GSttsFv
/* 8046B448 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */
/* 8046B44C 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */
/* 8046B450 90 7E 05 8C */ stw r3, 0x58c(r30)
/* 8046B454 38 03 00 20 */ addi r0, r3, 0x20
/* 8046B458 90 1E 05 90 */ stw r0, 0x590(r30)
/* 8046B45C 3B DE 05 B0 */ addi r30, r30, 0x5b0
/* 8046B460 7F C3 F3 78 */ mr r3, r30
/* 8046B464 4B C1 85 C5 */ bl __ct__12dCcD_GObjInfFv
/* 8046B468 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */
/* 8046B46C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */
/* 8046B470 90 1E 01 20 */ stw r0, 0x120(r30)
/* 8046B474 3C 60 80 47 */ lis r3, __vt__8cM3dGAab@ha /* 0x8046B678@ha */
/* 8046B478 38 03 B6 78 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8046B678@l */
/* 8046B47C 90 1E 01 1C */ stw r0, 0x11c(r30)
/* 8046B480 3C 60 80 47 */ lis r3, __vt__8cM3dGSph@ha /* 0x8046B66C@ha */
/* 8046B484 38 03 B6 6C */ addi r0, r3, __vt__8cM3dGSph@l /* 0x8046B66C@l */
/* 8046B488 90 1E 01 34 */ stw r0, 0x134(r30)
/* 8046B48C 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */
/* 8046B490 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */
/* 8046B494 90 7E 01 20 */ stw r3, 0x120(r30)
/* 8046B498 38 03 00 58 */ addi r0, r3, 0x58
/* 8046B49C 90 1E 01 34 */ stw r0, 0x134(r30)
/* 8046B4A0 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */
/* 8046B4A4 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */
/* 8046B4A8 90 7E 00 3C */ stw r3, 0x3c(r30)
/* 8046B4AC 38 03 00 2C */ addi r0, r3, 0x2c
/* 8046B4B0 90 1E 01 20 */ stw r0, 0x120(r30)
/* 8046B4B4 38 03 00 84 */ addi r0, r3, 0x84
/* 8046B4B8 90 1E 01 34 */ stw r0, 0x134(r30)
lbl_8046B4BC:
/* 8046B4BC 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 8046B4C0 60 00 00 08 */ ori r0, r0, 8
/* 8046B4C4 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_8046B4C8:
/* 8046B4C8 38 7F 05 68 */ addi r3, r31, 0x568
/* 8046B4CC 3C 80 80 47 */ lis r4, d_a_hitobj__stringBase0@ha /* 0x8046B5D4@ha */
/* 8046B4D0 38 84 B5 D4 */ addi r4, r4, d_a_hitobj__stringBase0@l /* 0x8046B5D4@l */
/* 8046B4D4 4B BC 19 E9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
/* 8046B4D8 7C 7E 1B 78 */ mr r30, r3
/* 8046B4DC 2C 1E 00 04 */ cmpwi r30, 4
/* 8046B4E0 40 82 00 40 */ bne lbl_8046B520
/* 8046B4E4 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 8046B4E8 98 1F 05 70 */ stb r0, 0x570(r31)
/* 8046B4EC 38 7F 05 74 */ addi r3, r31, 0x574
/* 8046B4F0 38 80 00 FF */ li r4, 0xff
/* 8046B4F4 38 A0 00 FF */ li r5, 0xff
/* 8046B4F8 7F E6 FB 78 */ mr r6, r31
/* 8046B4FC 4B C1 83 65 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c
/* 8046B500 38 7F 05 B0 */ addi r3, r31, 0x5b0
/* 8046B504 3C 80 80 47 */ lis r4, cc_sph_src@ha /* 0x8046B5DC@ha */
/* 8046B508 38 84 B5 DC */ addi r4, r4, cc_sph_src@l /* 0x8046B5DC@l */
/* 8046B50C 4B C1 95 29 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph
/* 8046B510 38 1F 05 74 */ addi r0, r31, 0x574
/* 8046B514 90 1F 05 F4 */ stw r0, 0x5f4(r31)
/* 8046B518 38 00 00 03 */ li r0, 3
/* 8046B51C B0 1F 05 72 */ sth r0, 0x572(r31)
lbl_8046B520:
/* 8046B520 7F C3 F3 78 */ mr r3, r30
/* 8046B524 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046B528 83 C1 00 08 */ lwz r30, 8(r1)
/* 8046B52C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046B530 7C 08 03 A6 */ mtlr r0
/* 8046B534 38 21 00 10 */ addi r1, r1, 0x10
/* 8046B538 4E 80 00 20 */ blr

13
asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Delete__FP12hitobj_class.s
View File

@ -1,13 +0,0 @@
lbl_8046B3D0:
/* 8046B3D0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046B3D4 7C 08 02 A6 */ mflr r0
/* 8046B3D8 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046B3DC 3C 80 80 47 */ lis r4, d_a_hitobj__stringBase0@ha /* 0x8046B5D4@ha */
/* 8046B3E0 38 84 B5 D4 */ addi r4, r4, d_a_hitobj__stringBase0@l /* 0x8046B5D4@l */
/* 8046B3E4 38 63 05 68 */ addi r3, r3, 0x568
/* 8046B3E8 4B BC 1C 21 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
/* 8046B3EC 38 60 00 01 */ li r3, 1
/* 8046B3F0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046B3F4 7C 08 03 A6 */ mtlr r0
/* 8046B3F8 38 21 00 10 */ addi r1, r1, 0x10
/* 8046B3FC 4E 80 00 20 */ blr

29
asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Execute__FP12hitobj_class.s
View File

@ -1,29 +0,0 @@
lbl_8046B360:
/* 8046B360 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8046B364 7C 08 02 A6 */ mflr r0
/* 8046B368 90 01 00 14 */ stw r0, 0x14(r1)
/* 8046B36C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8046B370 7C 7F 1B 78 */ mr r31, r3
/* 8046B374 A8 83 05 72 */ lha r4, 0x572(r3)
/* 8046B378 2C 04 00 00 */ cmpwi r4, 0
/* 8046B37C 41 82 00 30 */ beq lbl_8046B3AC
/* 8046B380 38 04 FF FF */ addi r0, r4, -1
/* 8046B384 B0 1F 05 72 */ sth r0, 0x572(r31)
/* 8046B388 38 7F 06 D4 */ addi r3, r31, 0x6d4
/* 8046B38C 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8046B390 4B E0 42 B9 */ bl SetC__8cM3dGSphFRC4cXyz
/* 8046B394 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8046B398 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8046B39C 38 63 23 3C */ addi r3, r3, 0x233c
/* 8046B3A0 38 9F 05 B0 */ addi r4, r31, 0x5b0
/* 8046B3A4 4B DF 98 05 */ bl Set__4cCcSFP8cCcD_Obj
/* 8046B3A8 48 00 00 08 */ b lbl_8046B3B0
lbl_8046B3AC:
/* 8046B3AC 4B BB 43 9D */ bl fopKyM_Delete__FPv
lbl_8046B3B0:
/* 8046B3B0 38 60 00 01 */ li r3, 1
/* 8046B3B4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8046B3B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8046B3BC 7C 08 03 A6 */ mtlr r0
/* 8046B3C0 38 21 00 10 */ addi r1, r1, 0x10
/* 8046B3C4 4E 80 00 20 */ blr

45
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/Create__12daObjSmoke_cFv.s
View File

@ -1,45 +0,0 @@
lbl_80CDCEF0:
/* 80CDCEF0 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80CDCEF4 7C 08 02 A6 */ mflr r0
/* 80CDCEF8 90 01 00 34 */ stw r0, 0x34(r1)
/* 80CDCEFC 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 80CDCF00 7C 7F 1B 78 */ mr r31, r3
/* 80CDCF04 4B FF FF 75 */ bl initBaseMtx__12daObjSmoke_cFv
/* 80CDCF08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80CDCF0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80CDCF10 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80CDCF14 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80CDCF18 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80CDCF1C 7C 05 07 74 */ extsb r5, r0
/* 80CDCF20 4B 35 84 41 */ bl isSwitch__10dSv_info_cCFii
/* 80CDCF24 2C 03 00 00 */ cmpwi r3, 0
/* 80CDCF28 41 82 00 5C */ beq lbl_80CDCF84
/* 80CDCF2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80CDCF30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80CDCF34 80 63 5D 3C */ lwz r3, 0x5d3c(r3)
/* 80CDCF38 38 80 00 00 */ li r4, 0
/* 80CDCF3C 90 81 00 08 */ stw r4, 8(r1)
/* 80CDCF40 38 00 FF FF */ li r0, -1
/* 80CDCF44 90 01 00 0C */ stw r0, 0xc(r1)
/* 80CDCF48 90 81 00 10 */ stw r4, 0x10(r1)
/* 80CDCF4C 90 81 00 14 */ stw r4, 0x14(r1)
/* 80CDCF50 90 81 00 18 */ stw r4, 0x18(r1)
/* 80CDCF54 38 80 00 00 */ li r4, 0
/* 80CDCF58 3C A0 00 01 */ lis r5, 0x0001 /* 0x000085A6@ha */
/* 80CDCF5C 38 A5 85 A6 */ addi r5, r5, 0x85A6 /* 0x000085A6@l */
/* 80CDCF60 38 DF 04 D0 */ addi r6, r31, 0x4d0
/* 80CDCF64 38 E0 00 00 */ li r7, 0
/* 80CDCF68 39 1F 04 DC */ addi r8, r31, 0x4dc
/* 80CDCF6C 39 3F 04 EC */ addi r9, r31, 0x4ec
/* 80CDCF70 39 40 00 FF */ li r10, 0xff
/* 80CDCF74 3D 60 80 CE */ lis r11, lit_3655@ha /* 0x80CDD160@ha */
/* 80CDCF78 C0 2B D1 60 */ lfs f1, lit_3655@l(r11) /* 0x80CDD160@l */
/* 80CDCF7C 4B 36 FB 15 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
/* 80CDCF80 90 7F 05 68 */ stw r3, 0x568(r31)
lbl_80CDCF84:
/* 80CDCF84 38 60 00 01 */ li r3, 1
/* 80CDCF88 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 80CDCF8C 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80CDCF90 7C 08 03 A6 */ mtlr r0
/* 80CDCF94 38 21 00 30 */ addi r1, r1, 0x30
/* 80CDCF98 4E 80 00 20 */ blr

18
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/_delete__12daObjSmoke_cFv.s
View File

@ -1,18 +0,0 @@
lbl_80CDD0B8:
/* 80CDD0B8 80 83 05 68 */ lwz r4, 0x568(r3)
/* 80CDD0BC 28 04 00 00 */ cmplwi r4, 0
/* 80CDD0C0 41 82 00 30 */ beq lbl_80CDD0F0
/* 80CDD0C4 80 04 00 F4 */ lwz r0, 0xf4(r4)
/* 80CDD0C8 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18
/* 80CDD0CC 90 04 00 F4 */ stw r0, 0xf4(r4)
/* 80CDD0D0 80 83 05 68 */ lwz r4, 0x568(r3)
/* 80CDD0D4 80 04 00 F4 */ lwz r0, 0xf4(r4)
/* 80CDD0D8 60 00 00 01 */ ori r0, r0, 1
/* 80CDD0DC 90 04 00 F4 */ stw r0, 0xf4(r4)
/* 80CDD0E0 38 00 00 01 */ li r0, 1
/* 80CDD0E4 90 04 00 24 */ stw r0, 0x24(r4)
/* 80CDD0E8 38 00 00 00 */ li r0, 0
/* 80CDD0EC 90 03 05 68 */ stw r0, 0x568(r3)
lbl_80CDD0F0:
/* 80CDD0F0 38 60 00 01 */ li r3, 1
/* 80CDD0F4 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Create__FP10fopAc_ac_c.s
View File

@ -1,9 +0,0 @@
lbl_80CDD138:
/* 80CDD138 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80CDD13C 7C 08 02 A6 */ mflr r0
/* 80CDD140 90 01 00 14 */ stw r0, 0x14(r1)
/* 80CDD144 4B FF FE 59 */ bl create__12daObjSmoke_cFv
/* 80CDD148 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80CDD14C 7C 08 03 A6 */ mtlr r0
/* 80CDD150 38 21 00 10 */ addi r1, r1, 0x10
/* 80CDD154 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Delete__FP12daObjSmoke_c.s
View File

@ -1,9 +0,0 @@
lbl_80CDD118:
/* 80CDD118 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80CDD11C 7C 08 02 A6 */ mflr r0
/* 80CDD120 90 01 00 14 */ stw r0, 0x14(r1)
/* 80CDD124 4B FF FF 95 */ bl _delete__12daObjSmoke_cFv
/* 80CDD128 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80CDD12C 7C 08 03 A6 */ mtlr r0
/* 80CDD130 38 21 00 10 */ addi r1, r1, 0x10
/* 80CDD134 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Execute__FP12daObjSmoke_c.s
View File

@ -1,9 +0,0 @@
lbl_80CDD0F8:
/* 80CDD0F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80CDD0FC 7C 08 02 A6 */ mflr r0
/* 80CDD100 90 01 00 14 */ stw r0, 0x14(r1)
/* 80CDD104 4B FF FF 01 */ bl execute__12daObjSmoke_cFv
/* 80CDD108 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80CDD10C 7C 08 03 A6 */ mtlr r0
/* 80CDD110 38 21 00 10 */ addi r1, r1, 0x10
/* 80CDD114 4E 80 00 20 */ blr

47
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/execute__12daObjSmoke_cFv.s
View File

@ -1,47 +0,0 @@
lbl_80CDD004:
/* 80CDD004 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80CDD008 7C 08 02 A6 */ mflr r0
/* 80CDD00C 90 01 00 34 */ stw r0, 0x34(r1)
/* 80CDD010 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 80CDD014 7C 7F 1B 78 */ mr r31, r3
/* 80CDD018 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80CDD01C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80CDD020 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80CDD024 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80CDD028 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80CDD02C 7C 05 07 74 */ extsb r5, r0
/* 80CDD030 4B 35 83 31 */ bl isSwitch__10dSv_info_cCFii
/* 80CDD034 2C 03 00 00 */ cmpwi r3, 0
/* 80CDD038 41 82 00 68 */ beq lbl_80CDD0A0
/* 80CDD03C 80 1F 05 68 */ lwz r0, 0x568(r31)
/* 80CDD040 28 00 00 00 */ cmplwi r0, 0
/* 80CDD044 40 82 00 5C */ bne lbl_80CDD0A0
/* 80CDD048 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80CDD04C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80CDD050 80 63 5D 3C */ lwz r3, 0x5d3c(r3)
/* 80CDD054 38 80 00 00 */ li r4, 0
/* 80CDD058 90 81 00 08 */ stw r4, 8(r1)
/* 80CDD05C 38 00 FF FF */ li r0, -1
/* 80CDD060 90 01 00 0C */ stw r0, 0xc(r1)
/* 80CDD064 90 81 00 10 */ stw r4, 0x10(r1)
/* 80CDD068 90 81 00 14 */ stw r4, 0x14(r1)
/* 80CDD06C 90 81 00 18 */ stw r4, 0x18(r1)
/* 80CDD070 38 80 00 00 */ li r4, 0
/* 80CDD074 3C A0 00 01 */ lis r5, 0x0001 /* 0x000085A6@ha */
/* 80CDD078 38 A5 85 A6 */ addi r5, r5, 0x85A6 /* 0x000085A6@l */
/* 80CDD07C 38 DF 04 D0 */ addi r6, r31, 0x4d0
/* 80CDD080 38 E0 00 00 */ li r7, 0
/* 80CDD084 39 1F 04 DC */ addi r8, r31, 0x4dc
/* 80CDD088 39 3F 04 EC */ addi r9, r31, 0x4ec
/* 80CDD08C 39 40 00 FF */ li r10, 0xff
/* 80CDD090 3D 60 80 CE */ lis r11, lit_3655@ha /* 0x80CDD160@ha */
/* 80CDD094 C0 2B D1 60 */ lfs f1, lit_3655@l(r11) /* 0x80CDD160@l */
/* 80CDD098 4B 36 F9 F9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
/* 80CDD09C 90 7F 05 68 */ stw r3, 0x568(r31)
lbl_80CDD0A0:
/* 80CDD0A0 38 60 00 01 */ li r3, 1
/* 80CDD0A4 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 80CDD0A8 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80CDD0AC 7C 08 03 A6 */ mtlr r0
/* 80CDD0B0 38 21 00 30 */ addi r1, r1, 0x30
/* 80CDD0B4 4E 80 00 20 */ blr

31
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/func_80CDCF9C.s
View File

@ -1,31 +0,0 @@
lbl_80CDCF9C:
/* 80CDCF9C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80CDCFA0 7C 08 02 A6 */ mflr r0
/* 80CDCFA4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80CDCFA8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80CDCFAC 7C 7F 1B 78 */ mr r31, r3
/* 80CDCFB0 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80CDCFB4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80CDCFB8 40 82 00 1C */ bne lbl_80CDCFD4
/* 80CDCFBC 28 1F 00 00 */ cmplwi r31, 0
/* 80CDCFC0 41 82 00 08 */ beq lbl_80CDCFC8
/* 80CDCFC4 4B 33 BB A1 */ bl __ct__10fopAc_ac_cFv
lbl_80CDCFC8:
/* 80CDCFC8 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80CDCFCC 60 00 00 08 */ ori r0, r0, 8
/* 80CDCFD0 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80CDCFD4:
/* 80CDCFD4 7F E3 FB 78 */ mr r3, r31
/* 80CDCFD8 4B FF FF 19 */ bl Create__12daObjSmoke_cFv
/* 80CDCFDC 2C 03 00 00 */ cmpwi r3, 0
/* 80CDCFE0 40 82 00 0C */ bne lbl_80CDCFEC
/* 80CDCFE4 38 60 00 05 */ li r3, 5
/* 80CDCFE8 48 00 00 08 */ b lbl_80CDCFF0
lbl_80CDCFEC:
/* 80CDCFEC 38 60 00 04 */ li r3, 4
lbl_80CDCFF0:
/* 80CDCFF0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80CDCFF4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80CDCFF8 7C 08 03 A6 */ mtlr r0
/* 80CDCFFC 38 21 00 10 */ addi r1, r1, 0x10
/* 80CDD000 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/initBaseMtx__12daObjSmoke_cFv.s
View File

@ -1,9 +0,0 @@
lbl_80CDCE78:
/* 80CDCE78 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80CDCE7C 7C 08 02 A6 */ mflr r0
/* 80CDCE80 90 01 00 14 */ stw r0, 0x14(r1)
/* 80CDCE84 48 00 00 15 */ bl setBaseMtx__12daObjSmoke_cFv
/* 80CDCE88 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80CDCE8C 7C 08 03 A6 */ mtlr r0
/* 80CDCE90 38 21 00 10 */ addi r1, r1, 0x10
/* 80CDCE94 4E 80 00 20 */ blr

23
asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/setBaseMtx__12daObjSmoke_cFv.s
View File

@ -1,23 +0,0 @@
lbl_80CDCE98:
/* 80CDCE98 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80CDCE9C 7C 08 02 A6 */ mflr r0
/* 80CDCEA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80CDCEA4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80CDCEA8 7C 7F 1B 78 */ mr r31, r3
/* 80CDCEAC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80CDCEB0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80CDCEB4 C0 3F 04 D0 */ lfs f1, 0x4d0(r31)
/* 80CDCEB8 C0 5F 04 D4 */ lfs f2, 0x4d4(r31)
/* 80CDCEBC C0 7F 04 D8 */ lfs f3, 0x4d8(r31)
/* 80CDCEC0 4B 66 9A 29 */ bl PSMTXTrans
/* 80CDCEC4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80CDCEC8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80CDCECC A8 9F 04 E4 */ lha r4, 0x4e4(r31)
/* 80CDCED0 A8 BF 04 E6 */ lha r5, 0x4e6(r31)
/* 80CDCED4 A8 DF 04 E8 */ lha r6, 0x4e8(r31)
/* 80CDCED8 4B 32 F3 C9 */ bl mDoMtx_ZXYrotM__FPA4_fsss
/* 80CDCEDC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80CDCEE0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80CDCEE4 7C 08 03 A6 */ mtlr r0
/* 80CDCEE8 38 21 00 10 */ addi r1, r1, 0x10
/* 80CDCEEC 4E 80 00 20 */ blr

10
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/Delete__13daTagSmkEmt_cFv.s
View File

@ -1,10 +0,0 @@
lbl_80D613DC:
/* 80D613DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D613E0 7C 08 02 A6 */ mflr r0
/* 80D613E4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D613E8 48 00 01 19 */ bl deleteSmkEmt__13daTagSmkEmt_cFv
/* 80D613EC 38 60 00 01 */ li r3, 1
/* 80D613F0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D613F4 7C 08 03 A6 */ mtlr r0
/* 80D613F8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D613FC 4E 80 00 20 */ blr

20
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__ct__13daTagSmkEmt_cFv.s
View File

@ -1,20 +0,0 @@
lbl_80D612D8:
/* 80D612D8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D612DC 7C 08 02 A6 */ mflr r0
/* 80D612E0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D612E4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D612E8 7C 7F 1B 78 */ mr r31, r3
/* 80D612EC 4B 2B 78 79 */ bl __ct__10fopAc_ac_cFv
/* 80D612F0 3C 60 80 D6 */ lis r3, __vt__13daTagSmkEmt_c@ha /* 0x80D6165C@ha */
/* 80D612F4 38 03 16 5C */ addi r0, r3, __vt__13daTagSmkEmt_c@l /* 0x80D6165C@l */
/* 80D612F8 90 1F 05 68 */ stw r0, 0x568(r31)
/* 80D612FC 38 7F 05 6C */ addi r3, r31, 0x56c
/* 80D61300 38 80 00 00 */ li r4, 0
/* 80D61304 38 A0 00 0C */ li r5, 0xc
/* 80D61308 4B 2A 21 51 */ bl memset
/* 80D6130C 7F E3 FB 78 */ mr r3, r31
/* 80D61310 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D61314 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D61318 7C 08 03 A6 */ mtlr r0
/* 80D6131C 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61320 4E 80 00 20 */ blr

26
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__dt__13daTagSmkEmt_cFv.s
View File

@ -1,26 +0,0 @@
lbl_80D61324:
/* 80D61324 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61328 7C 08 02 A6 */ mflr r0
/* 80D6132C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61330 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D61334 93 C1 00 08 */ stw r30, 8(r1)
/* 80D61338 7C 7E 1B 79 */ or. r30, r3, r3
/* 80D6133C 7C 9F 23 78 */ mr r31, r4
/* 80D61340 41 82 00 28 */ beq lbl_80D61368
/* 80D61344 3C 80 80 D6 */ lis r4, __vt__13daTagSmkEmt_c@ha /* 0x80D6165C@ha */
/* 80D61348 38 04 16 5C */ addi r0, r4, __vt__13daTagSmkEmt_c@l /* 0x80D6165C@l */
/* 80D6134C 90 1E 05 68 */ stw r0, 0x568(r30)
/* 80D61350 38 80 00 00 */ li r4, 0
/* 80D61354 4B 2B 79 39 */ bl __dt__10fopAc_ac_cFv
/* 80D61358 7F E0 07 35 */ extsh. r0, r31
/* 80D6135C 40 81 00 0C */ ble lbl_80D61368
/* 80D61360 7F C3 F3 78 */ mr r3, r30
/* 80D61364 4B 56 D9 D9 */ bl __dl__FPv
lbl_80D61368:
/* 80D61368 7F C3 F3 78 */ mr r3, r30
/* 80D6136C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D61370 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D61374 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D61378 7C 08 03 A6 */ mtlr r0
/* 80D6137C 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61380 4E 80 00 20 */ blr

62
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/createSmkEmt__13daTagSmkEmt_cFv.s
View File

@ -1,62 +0,0 @@
lbl_80D61410:
/* 80D61410 94 21 FF A0 */ stwu r1, -0x60(r1)
/* 80D61414 7C 08 02 A6 */ mflr r0
/* 80D61418 90 01 00 64 */ stw r0, 0x64(r1)
/* 80D6141C 39 61 00 60 */ addi r11, r1, 0x60
/* 80D61420 4B 60 0D AD */ bl _savegpr_25
/* 80D61424 7C 79 1B 78 */ mr r25, r3
/* 80D61428 C0 03 04 D0 */ lfs f0, 0x4d0(r3)
/* 80D6142C D0 01 00 34 */ stfs f0, 0x34(r1)
/* 80D61430 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
/* 80D61434 D0 01 00 38 */ stfs f0, 0x38(r1)
/* 80D61438 C0 03 04 D8 */ lfs f0, 0x4d8(r3)
/* 80D6143C D0 01 00 3C */ stfs f0, 0x3c(r1)
/* 80D61440 38 61 00 20 */ addi r3, r1, 0x20
/* 80D61444 38 80 00 00 */ li r4, 0
/* 80D61448 38 A0 00 00 */ li r5, 0
/* 80D6144C 38 C0 00 00 */ li r6, 0
/* 80D61450 4B 50 5F A5 */ bl __ct__5csXyzFsss
/* 80D61454 3C 60 80 D6 */ lis r3, lit_3677@ha /* 0x80D61608@ha */
/* 80D61458 3B 63 16 08 */ addi r27, r3, lit_3677@l /* 0x80D61608@l */
/* 80D6145C C0 1B 00 00 */ lfs f0, 0(r27)
/* 80D61460 D0 01 00 28 */ stfs f0, 0x28(r1)
/* 80D61464 D0 01 00 2C */ stfs f0, 0x2c(r1)
/* 80D61468 D0 01 00 30 */ stfs f0, 0x30(r1)
/* 80D6146C 3B 40 00 00 */ li r26, 0
/* 80D61470 3B E0 00 00 */ li r31, 0
/* 80D61474 3B C0 00 00 */ li r30, 0
/* 80D61478 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D6147C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D61480 3C 60 80 D6 */ lis r3, PARTICLE_NAME@ha /* 0x80D61600@ha */
/* 80D61484 3B A3 16 00 */ addi r29, r3, PARTICLE_NAME@l /* 0x80D61600@l */
lbl_80D61488:
/* 80D61488 80 7C 5D 3C */ lwz r3, 0x5d3c(r28)
/* 80D6148C 38 80 00 00 */ li r4, 0
/* 80D61490 90 81 00 08 */ stw r4, 8(r1)
/* 80D61494 38 00 FF FF */ li r0, -1
/* 80D61498 90 01 00 0C */ stw r0, 0xc(r1)
/* 80D6149C 90 81 00 10 */ stw r4, 0x10(r1)
/* 80D614A0 90 81 00 14 */ stw r4, 0x14(r1)
/* 80D614A4 90 81 00 18 */ stw r4, 0x18(r1)
/* 80D614A8 38 80 00 00 */ li r4, 0
/* 80D614AC 7C BD F2 2E */ lhzx r5, r29, r30
/* 80D614B0 38 C1 00 34 */ addi r6, r1, 0x34
/* 80D614B4 38 E0 00 00 */ li r7, 0
/* 80D614B8 39 01 00 20 */ addi r8, r1, 0x20
/* 80D614BC 39 21 00 28 */ addi r9, r1, 0x28
/* 80D614C0 39 40 00 FF */ li r10, 0xff
/* 80D614C4 C0 3B 00 00 */ lfs f1, 0(r27)
/* 80D614C8 4B 2E B5 C9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
/* 80D614CC 38 1F 05 6C */ addi r0, r31, 0x56c
/* 80D614D0 7C 79 01 2E */ stwx r3, r25, r0
/* 80D614D4 3B 5A 00 01 */ addi r26, r26, 1
/* 80D614D8 2C 1A 00 03 */ cmpwi r26, 3
/* 80D614DC 3B FF 00 04 */ addi r31, r31, 4
/* 80D614E0 3B DE 00 02 */ addi r30, r30, 2
/* 80D614E4 41 80 FF A4 */ blt lbl_80D61488
/* 80D614E8 39 61 00 60 */ addi r11, r1, 0x60
/* 80D614EC 4B 60 0D 2D */ bl _restgpr_25
/* 80D614F0 80 01 00 64 */ lwz r0, 0x64(r1)
/* 80D614F4 7C 08 03 A6 */ mtlr r0
/* 80D614F8 38 21 00 60 */ addi r1, r1, 0x60
/* 80D614FC 4E 80 00 20 */ blr

25
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/create__13daTagSmkEmt_cFv.s
View File

@ -1,25 +0,0 @@
lbl_80D61384:
/* 80D61384 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61388 7C 08 02 A6 */ mflr r0
/* 80D6138C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61390 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D61394 7C 7F 1B 78 */ mr r31, r3
/* 80D61398 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D6139C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D613A0 40 82 00 1C */ bne lbl_80D613BC
/* 80D613A4 28 1F 00 00 */ cmplwi r31, 0
/* 80D613A8 41 82 00 08 */ beq lbl_80D613B0
/* 80D613AC 4B FF FF 2D */ bl __ct__13daTagSmkEmt_cFv
lbl_80D613B0:
/* 80D613B0 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80D613B4 60 00 00 08 */ ori r0, r0, 8
/* 80D613B8 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80D613BC:
/* 80D613BC 7F E3 FB 78 */ mr r3, r31
/* 80D613C0 48 00 00 51 */ bl createSmkEmt__13daTagSmkEmt_cFv
/* 80D613C4 38 60 00 04 */ li r3, 4
/* 80D613C8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D613CC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D613D0 7C 08 03 A6 */ mtlr r0
/* 80D613D4 38 21 00 10 */ addi r1, r1, 0x10
/* 80D613D8 4E 80 00 20 */ blr

9
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_Delete__FP13daTagSmkEmt_c.s
View File

@ -1,9 +0,0 @@
lbl_80D61598:
/* 80D61598 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D6159C 7C 08 02 A6 */ mflr r0
/* 80D615A0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D615A4 4B FF FE 39 */ bl Delete__13daTagSmkEmt_cFv
/* 80D615A8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D615AC 7C 08 03 A6 */ mtlr r0
/* 80D615B0 38 21 00 10 */ addi r1, r1, 0x10
/* 80D615B4 4E 80 00 20 */ blr

24
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_create__FP13daTagSmkEmt_c.s
View File

@ -1,24 +0,0 @@
lbl_80D61544:
/* 80D61544 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D61548 7C 08 02 A6 */ mflr r0
/* 80D6154C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D61550 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D61554 7C 7F 1B 78 */ mr r31, r3
/* 80D61558 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D6155C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D61560 40 82 00 1C */ bne lbl_80D6157C
/* 80D61564 28 1F 00 00 */ cmplwi r31, 0
/* 80D61568 41 82 00 08 */ beq lbl_80D61570
/* 80D6156C 4B FF FD 6D */ bl __ct__13daTagSmkEmt_cFv
lbl_80D61570:
/* 80D61570 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80D61574 60 00 00 08 */ ori r0, r0, 8
/* 80D61578 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80D6157C:
/* 80D6157C 7F E3 FB 78 */ mr r3, r31
/* 80D61580 4B FF FE 05 */ bl create__13daTagSmkEmt_cFv
/* 80D61584 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D61588 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D6158C 7C 08 03 A6 */ mtlr r0
/* 80D61590 38 21 00 10 */ addi r1, r1, 0x10
/* 80D61594 4E 80 00 20 */ blr

9
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_draw__FP13daTagSmkEmt_c.s
View File

@ -1,9 +0,0 @@
lbl_80D615D8:
/* 80D615D8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D615DC 7C 08 02 A6 */ mflr r0
/* 80D615E0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D615E4 4B FF FE 1D */ bl draw__13daTagSmkEmt_cFv
/* 80D615E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D615EC 7C 08 03 A6 */ mtlr r0
/* 80D615F0 38 21 00 10 */ addi r1, r1, 0x10
/* 80D615F4 4E 80 00 20 */ blr

9
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_execute__FP13daTagSmkEmt_c.s
View File

@ -1,9 +0,0 @@
lbl_80D615B8:
/* 80D615B8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D615BC 7C 08 02 A6 */ mflr r0
/* 80D615C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D615C4 4B FF FE 45 */ bl execute__13daTagSmkEmt_cFv
/* 80D615C8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D615CC 7C 08 03 A6 */ mtlr r0
/* 80D615D0 38 21 00 10 */ addi r1, r1, 0x10
/* 80D615D4 4E 80 00 20 */ blr

20
asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/deleteSmkEmt__13daTagSmkEmt_cFv.s
View File

@ -1,20 +0,0 @@
lbl_80D61500:
/* 80D61500 38 80 00 00 */ li r4, 0
/* 80D61504 38 C0 00 01 */ li r6, 1
/* 80D61508 7C 85 23 78 */ mr r5, r4
/* 80D6150C 38 00 00 03 */ li r0, 3
/* 80D61510 7C 09 03 A6 */ mtctr r0
lbl_80D61514:
/* 80D61514 39 04 05 6C */ addi r8, r4, 0x56c
/* 80D61518 7C E3 40 2E */ lwzx r7, r3, r8
/* 80D6151C 28 07 00 00 */ cmplwi r7, 0
/* 80D61520 41 82 00 18 */ beq lbl_80D61538
/* 80D61524 80 07 00 F4 */ lwz r0, 0xf4(r7)
/* 80D61528 60 00 00 01 */ ori r0, r0, 1
/* 80D6152C 90 07 00 F4 */ stw r0, 0xf4(r7)
/* 80D61530 90 C7 00 24 */ stw r6, 0x24(r7)
/* 80D61534 7C A3 41 2E */ stwx r5, r3, r8
lbl_80D61538:
/* 80D61538 38 84 00 04 */ addi r4, r4, 4
/* 80D6153C 42 00 FF D8 */ bdnz lbl_80D61514
/* 80D61540 4E 80 00 20 */ blr

66
include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h
View File

@ -1,6 +1,70 @@
#ifndef D_A_GUARD_MNG_H
#define D_A_GUARD_MNG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h"
#include "d/com/d_com_inf_game.h"
class daGuardMng_c : public fopAc_ac_c {
public:
void countMerchantNum() {
mMerchantNum++;
}
int execute() {
static u32 const mGuardDataTbl[2] = {
0x00000200, 0x00000201,
};
if (!daPy_py_c::i_checkNowWolf() || field_0x573 >= mLimitNum) {
return 1;
} else {
if (field_0x571 < mMerchantNum) {
field_0x571 = mMerchantNum;
}
checkMerchantNum();
if (mpTagGuard) {
if (field_0x571 > mMerchantNum && 3 < (field_0x571 - mMerchantNum)) {
mpTagGuard->createGuard(mGuardDataTbl[0]);
field_0x573++;
field_0x571 = mMerchantNum;
dComIfGs_onSaveDunSwitch(0x3c);
}
}
}
return 1;
}
u8 getLimitNum() {
return fopAcM_GetParam(this) & 0xff;
}
void create_init() {
mLimitNum = getLimitNum();
field_0x573 = 0;
}
int create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daGuardMng_c();
fopAcM_OnCondition(this, 8);
}
create_init();
return cPhs_COMPLEATE_e;
}
/* 80837B9C */ u8 checkMerchantNum();
/* 80837BEC */ void checkAppearTag(daTagGuard_c*);
/* 0x568 */ daTagGuard_c* mpTagGuard;
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ u8 mMerchantNum;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 mLimitNum;
/* 0x573 */ u8 field_0x573;
};
#endif /* D_A_GUARD_MNG_H */

13
include/rel/d/a/d_a_hitobj/d_a_hitobj.h
View File

@ -1,6 +1,17 @@
#ifndef D_A_HITOBJ_H
#define D_A_HITOBJ_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class hitobj_class : public fopAc_ac_c {
public:
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ u8 field_0x570;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ s16 field_0x572;
/* 0x574 */ dCcD_Stts field_0x574;
/* 0x5B0 */ dCcD_Sph field_0x5b0;
};
#endif /* D_A_HITOBJ_H */

19
include/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h
View File

@ -1,6 +1,23 @@
#ifndef D_A_OBJ_SMOKE_H
#define D_A_OBJ_SMOKE_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daObjSmoke_c : public fopAc_ac_c {
public:
u8 getSwbit() {
return fopAcM_GetParamBit(this,0,8);
}
/* 80CDCE78 */ void initBaseMtx();
/* 80CDCE98 */ void setBaseMtx();
/* 80CDCEF0 */ int Create();
/* 80CDCF9C */ int create();
/* 80CDD004 */ int execute();
/* 80CDD0B8 */ int _delete();
/* 0x568 */ JPABaseEmitter* mParticle;
};
#endif /* D_A_OBJ_SMOKE_H */

17
include/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.h
View File

@ -1,6 +1,21 @@
#ifndef D_A_TAG_SMK_EMT_H
#define D_A_TAG_SMK_EMT_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daTagSmkEmt_c : public fopAc_ac_c {
public:
/* 80D612D8 */ daTagSmkEmt_c();
/* 80D61324 */ virtual ~daTagSmkEmt_c();
/* 80D61384 */ int create();
/* 80D613DC */ int Delete();
/* 80D61400 */ int draw();
/* 80D61408 */ int execute();
/* 80D61410 */ void createSmkEmt();
/* 80D61500 */ void deleteSmkEmt();
/* 0x56C */ JPABaseEmitter* mParticles[3];
};
#endif /* D_A_TAG_SMK_EMT_H */

204
rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp
View File

@ -1,171 +1,101 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_guard_mng
//
/**
* d_a_guard_mng.cpp
* Guard
*/
#include "rel/d/a/d_a_guard_mng/d_a_guard_mng.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
struct Vec {};
struct daTagGuard_c {
/* 80D597F8 */ void getAppearPoint(Vec*);
/* 80D5985C */ void createGuard(u32);
};
struct daGuardMng_c {
/* 80837B9C */ void checkMerchantNum();
/* 80837BEC */ void checkAppearTag(daTagGuard_c*);
};
struct dSv_danBit_c {
/* 80034B98 */ void onSwitch(int);
};
//
// Forward References:
//
extern "C" static void s_sub__FPvPv();
extern "C" void checkMerchantNum__12daGuardMng_cFv();
extern "C" void checkAppearTag__12daGuardMng_cFP12daTagGuard_c();
extern "C" static void daGuardMng_Execute__FP12daGuardMng_c();
extern "C" static bool daGuardMng_IsDelete__FP12daGuardMng_c();
extern "C" static void daGuardMng_Delete__FP12daGuardMng_c();
extern "C" static void daGuardMng_Create__FP10fopAc_ac_c();
extern "C" extern void* g_profile_GUARD_MNG[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAc_IsActor__FPv();
extern "C" void fpcEx_Search__FPFPvPv_PvPv();
extern "C" void onSwitch__12dSv_danBit_cFi();
extern "C" void PSVECSubtract();
extern "C" void PSVECSquareMag();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void getAppearPoint__12daTagGuard_cFP3Vec();
extern "C" void createGuard__12daTagGuard_cFUl();
//
// Declarations:
//
#include "f_pc/f_pc_executor.h"
/* 80837B18-80837B9C 000078 0084+00 1/1 0/0 0/0 .text s_sub__FPvPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void s_sub(void* param_0, void* param_1) {
nofralloc
#include "asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/s_sub__FPvPv.s"
static void* s_sub(void* i_actorP, void* i_this) {
if (fopAcM_IsActor(i_actorP)) {
if (fopAcM_GetName(i_actorP) == PROC_NPC_CD3 || fopAcM_GetName(i_actorP) == PROC_NPC_PASSER || fopAcM_GetName(i_actorP) == PROC_NPC_FGUARD) {
static_cast<daGuardMng_c*>(i_this)->countMerchantNum();
} else {
if (fopAcM_GetName(i_actorP) == PROC_TAG_GUARD) {
static_cast<daGuardMng_c*>(i_this)->checkAppearTag((daTagGuard_c *)i_actorP);
}
}
}
return 0;
}
#pragma pop
/* ############################################################################################## */
/* 80837DE4-80837DEC 000000 0008+00 1/1 0/0 0/0 .rodata
* mGuardDataTbl$localstatic3$getGuardParam__12daGuardMng_cFv */
SECTION_RODATA static u8 const data_80837DE4[8] = {
0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x01,
};
COMPILER_STRIP_GATE(0x80837DE4, &data_80837DE4);
/* 80837DEC-80837DF0 000008 0004+00 1/1 0/0 0/0 .rodata @3663 */
SECTION_RODATA static f32 const lit_3663 = 1000000000.0f;
COMPILER_STRIP_GATE(0x80837DEC, &lit_3663);
/* 80837B9C-80837BEC 0000FC 0050+00 1/1 0/0 0/0 .text checkMerchantNum__12daGuardMng_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daGuardMng_c::checkMerchantNum() {
nofralloc
#include "asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkMerchantNum__12daGuardMng_cFv.s"
u8 daGuardMng_c::checkMerchantNum() {
field_0x56c = 1000000000.0f;
mMerchantNum = 0;
i_fpcM_Search(s_sub,this);
return mMerchantNum;
}
#pragma pop
/* 80837BEC-80837C6C 00014C 0080+00 1/1 0/0 0/0 .text
* checkAppearTag__12daGuardMng_cFP12daTagGuard_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daGuardMng_c::checkAppearTag(daTagGuard_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/checkAppearTag__12daGuardMng_cFP12daTagGuard_c.s"
void daGuardMng_c::checkAppearTag(daTagGuard_c* i_this) {
cXyz pos;
if ((u8)i_this->getAppearPoint(&pos) != 0) {
pos -= fopAcM_GetPosition_p(dComIfGp_getPlayer(0));
f32 pos_abs = pos.abs2();
if (field_0x56c > pos_abs) {
mpTagGuard = i_this;
field_0x56c = pos_abs;
}
}
}
#pragma pop
/* 80837C6C-80837D44 0001CC 00D8+00 1/0 0/0 0/0 .text daGuardMng_Execute__FP12daGuardMng_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daGuardMng_Execute(daGuardMng_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Execute__FP12daGuardMng_c.s"
static int daGuardMng_Execute(daGuardMng_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80837D44-80837D4C 0002A4 0008+00 1/0 0/0 0/0 .text daGuardMng_IsDelete__FP12daGuardMng_c */
static bool daGuardMng_IsDelete(daGuardMng_c* param_0) {
return true;
static int daGuardMng_IsDelete(daGuardMng_c* param_0) {
return 1;
}
/* 80837D4C-80837D7C 0002AC 0030+00 1/0 0/0 0/0 .text daGuardMng_Delete__FP12daGuardMng_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daGuardMng_Delete(daGuardMng_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Delete__FP12daGuardMng_c.s"
static int daGuardMng_Delete(daGuardMng_c* i_this) {
i_this->~daGuardMng_c();
return 1;
}
#pragma pop
/* 80837D7C-80837DDC 0002DC 0060+00 1/0 0/0 0/0 .text daGuardMng_Create__FP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daGuardMng_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_guard_mng/d_a_guard_mng/daGuardMng_Create__FP10fopAc_ac_c.s"
static int daGuardMng_Create(fopAc_ac_c* i_this) {
return static_cast<daGuardMng_c*>(i_this)->create();
}
#pragma pop
/* ############################################################################################## */
/* 80837DF0-80837E10 -00001 0020+00 1/0 0/0 0/0 .data l_daGuardMng_Method */
SECTION_DATA static void* l_daGuardMng_Method[8] = {
(void*)daGuardMng_Create__FP10fopAc_ac_c,
(void*)daGuardMng_Delete__FP12daGuardMng_c,
(void*)daGuardMng_Execute__FP12daGuardMng_c,
(void*)daGuardMng_IsDelete__FP12daGuardMng_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daGuardMng_Method = {
(process_method_func)daGuardMng_Create,
(process_method_func)daGuardMng_Delete,
(process_method_func)daGuardMng_Execute,
(process_method_func)daGuardMng_IsDelete
};
/* 80837E10-80837E40 -00001 0030+00 0/0 0/0 1/0 .data g_profile_GUARD_MNG */
SECTION_DATA extern void* g_profile_GUARD_MNG[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02950000, (void*)&g_fpcLf_Method,
(void*)0x00000574, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01970000, (void*)&l_daGuardMng_Method,
(void*)0x00040100, (void*)NULL,
extern actor_process_profile_definition g_profile_GUARD_MNG = {
-3, // mLayerID
7, // mListID
-3, // mListPrio
PROC_GUARD_MNG, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daGuardMng_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0197, // mPriority
0, // padding
0, // padding
&l_daGuardMng_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
};

270
rel/d/a/d_a_hitobj/d_a_hitobj.cpp
View File

@ -1,215 +1,107 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_hitobj
//
/**
* d_a_hitobj.cpp
*
*/
#include "rel/d/a/d_a_hitobj/d_a_hitobj.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct request_of_phase_process_class {};
struct hitobj_class {};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct dCcD_Stts {
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
};
struct dCcD_SrcSph {};
struct dCcD_Sph {
/* 80084A34 */ void Set(dCcD_SrcSph const&);
};
struct dCcD_GStts {
/* 80083760 */ dCcD_GStts();
};
struct dCcD_GObjInf {
/* 80083A28 */ dCcD_GObjInf();
};
struct cXyz {};
struct cM3dGSph {
/* 8026F648 */ void SetC(cXyz const&);
/* 8046B53C */ ~cM3dGSph();
};
struct cM3dGAab {
/* 8046B584 */ ~cM3dGAab();
};
struct cCcD_Obj {};
struct cCcS {
/* 80264BA8 */ void Set(cCcD_Obj*);
};
//
// Forward References:
//
extern "C" static bool daHitobj_Draw__FP12hitobj_class();
extern "C" static void daHitobj_Execute__FP12hitobj_class();
extern "C" static bool daHitobj_IsDelete__FP12hitobj_class();
extern "C" static void daHitobj_Delete__FP12hitobj_class();
extern "C" static void daHitobj_Create__FP10fopAc_ac_c();
extern "C" void __dt__8cM3dGSphFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" extern char const* const d_a_hitobj__stringBase0;
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopKyM_Delete__FPv();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void SetC__8cM3dGSphFRC4cXyz();
extern "C" void __dl__FPv();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
#include "f_op/f_op_kankyo_mng.h"
/* 8046B358-8046B360 000078 0008+00 1/0 0/0 0/0 .text daHitobj_Draw__FP12hitobj_class */
static bool daHitobj_Draw(hitobj_class* param_0) {
return true;
static int daHitobj_Draw(hitobj_class* i_this) {
return 1;
}
/* 8046B360-8046B3C8 000080 0068+00 1/0 0/0 0/0 .text daHitobj_Execute__FP12hitobj_class
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daHitobj_Execute(hitobj_class* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Execute__FP12hitobj_class.s"
static int daHitobj_Execute(hitobj_class* i_this) {
if (i_this->field_0x572 != 0) {
i_this->field_0x572--;
i_this->field_0x5b0.SetC(i_this->current.pos);
dComIfG_Ccsp()->Set(&i_this->field_0x5b0);
} else {
fopKyM_Delete(i_this);
}
return 1;
}
#pragma pop
/* 8046B3C8-8046B3D0 0000E8 0008+00 1/0 0/0 0/0 .text daHitobj_IsDelete__FP12hitobj_class
*/
static bool daHitobj_IsDelete(hitobj_class* param_0) {
return true;
static int daHitobj_IsDelete(hitobj_class* i_this) {
return 1;
}
/* ############################################################################################## */
/* 8046B5D4-8046B5D4 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8046B5D4 = "Hitobj";
/* @stringBase0 padding */
SECTION_DEAD static char const* const pad_8046B5DB = "";
#pragma pop
/* 8046B3D0-8046B400 0000F0 0030+00 1/0 0/0 0/0 .text daHitobj_Delete__FP12hitobj_class
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daHitobj_Delete(hitobj_class* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Delete__FP12hitobj_class.s"
static int daHitobj_Delete(hitobj_class* i_this) {
dComIfG_resDelete(&i_this->mPhase,"Hitobj");
return 1;
}
#pragma pop
/* ############################################################################################## */
/* 8046B5DC-8046B61C 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src$3657 */
SECTION_DATA static u8 cc_sph_src[64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00,
};
/* 8046B61C-8046B63C -00001 0020+00 1/0 0/0 0/0 .data l_daHitobj_Method */
SECTION_DATA static void* l_daHitobj_Method[8] = {
(void*)daHitobj_Create__FP10fopAc_ac_c,
(void*)daHitobj_Delete__FP12hitobj_class,
(void*)daHitobj_Execute__FP12hitobj_class,
(void*)daHitobj_IsDelete__FP12hitobj_class,
(void*)daHitobj_Draw__FP12hitobj_class,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 8046B63C-8046B66C -00001 0030+00 0/0 0/0 1/0 .data g_profile_HITOBJ */
SECTION_DATA extern void* g_profile_HITOBJ[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x01040000, (void*)&g_fpcLf_Method,
(void*)0x000006E8, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02B20000, (void*)&l_daHitobj_Method,
(void*)0x00040000, (void*)NULL,
};
/* 8046B66C-8046B678 000090 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */
SECTION_DATA extern void* __vt__8cM3dGSph[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGSphFv,
};
/* 8046B678-8046B684 00009C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
static dCcD_SrcSph cc_sph_src = {
{
{0, {{0, 0, 0x13}, {0, 3}, 0}},
{dCcD_SE_NONE, 0, 0, 0, {0}},
{dCcD_SE_NONE, 0, 0, 0, {0}},
{0},
},
{
{0.0f, 0.0f, 0.0f},
100.0f,
},
};
/* 8046B400-8046B53C 000120 013C+00 1/0 0/0 0/0 .text daHitobj_Create__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daHitobj_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_hitobj/d_a_hitobj/daHitobj_Create__FP10fopAc_ac_c.s"
}
#pragma pop
static int daHitobj_Create(fopAc_ac_c* i_this) {
hitobj_class* hitobj = (hitobj_class*)i_this;
if (!fopAcM_CheckCondition(hitobj, 8)) {
new (hitobj) hitobj_class();
fopAcM_OnCondition(hitobj, 8);
}
/* 8046B53C-8046B584 00025C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cM3dGSph::~cM3dGSph() {
nofralloc
#include "asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGSphFv.s"
}
#pragma pop
int ret = dComIfG_resLoad(&hitobj->mPhase,"Hitobj");
/* 8046B584-8046B5CC 0002A4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cM3dGAab::~cM3dGAab() {
nofralloc
#include "asm/rel/d/a/d_a_hitobj/d_a_hitobj/__dt__8cM3dGAabFv.s"
}
#pragma pop
if (ret == cPhs_COMPLEATE_e) {
hitobj->field_0x570 = fopAcM_GetParam(hitobj);
hitobj->field_0x574.Init(0xff,0xff,hitobj);
hitobj->field_0x5b0.Set(cc_sph_src);
hitobj->field_0x5b0.SetStts(&hitobj->field_0x574);
hitobj->field_0x572 = 3;
}
/* 8046B5D4-8046B5D4 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
return ret;
}
/* 8046B61C-8046B63C -00001 0020+00 1/0 0/0 0/0 .data l_daHitobj_Method */
static actor_method_class l_daHitobj_Method = {
(process_method_func)daHitobj_Create,
(process_method_func)daHitobj_Delete,
(process_method_func)daHitobj_Execute,
(process_method_func)daHitobj_IsDelete,
(process_method_func)daHitobj_Draw
};
/* 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
7, // mListID
-3, // mListPrio
PROC_HITOBJ, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(hitobj_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x02B2, // mPriority
0, // padding
0, // padding
&l_daHitobj_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0, // mCullType
0, // padding
0 // padding
};

235
rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp
View File

@ -1,203 +1,108 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_obj_smoke
//
/**
* d_a_obj_smoke.cpp
* Object - Smoke
*/
#include "rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct daObjSmoke_c {
/* 80CDCE78 */ void initBaseMtx();
/* 80CDCE98 */ void setBaseMtx();
/* 80CDCEF0 */ void Create();
/* 80CDCF9C */ void create();
/* 80CDD004 */ void execute();
/* 80CDD0B8 */ void _delete();
};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dPa_levelEcallBack {};
struct dKy_tevstr_c {};
struct csXyz {};
struct _GXColor {};
struct cXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
cXyz const*, f32);
};
//
// Forward References:
//
extern "C" void initBaseMtx__12daObjSmoke_cFv();
extern "C" void setBaseMtx__12daObjSmoke_cFv();
extern "C" void Create__12daObjSmoke_cFv();
extern "C" void create__12daObjSmoke_cFv();
extern "C" void execute__12daObjSmoke_cFv();
extern "C" void _delete__12daObjSmoke_cFv();
extern "C" static void daObjSmoke_Execute__FP12daObjSmoke_c();
extern "C" static void daObjSmoke_Delete__FP12daObjSmoke_c();
extern "C" static void daObjSmoke_Create__FP10fopAc_ac_c();
extern "C" extern void* g_profile_Obj_Smoke[12];
//
// External References:
//
extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void PSMTXTrans();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* 80CDCE78-80CDCE98 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__12daObjSmoke_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjSmoke_c::initBaseMtx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/initBaseMtx__12daObjSmoke_cFv.s"
void daObjSmoke_c::initBaseMtx() {
setBaseMtx();
}
#pragma pop
/* 80CDCE98-80CDCEF0 000098 0058+00 1/1 0/0 0/0 .text setBaseMtx__12daObjSmoke_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjSmoke_c::setBaseMtx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/setBaseMtx__12daObjSmoke_cFv.s"
void daObjSmoke_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x,current.pos.y,current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x,shape_angle.y,shape_angle.z);
}
#pragma pop
/* ############################################################################################## */
/* 80CDD160-80CDD164 000000 0004+00 2/2 0/0 0/0 .rodata @3655 */
SECTION_RODATA static f32 const lit_3655 = 1.0f;
COMPILER_STRIP_GATE(0x80CDD160, &lit_3655);
/* 80CDCEF0-80CDCF9C 0000F0 00AC+00 1/1 0/0 0/0 .text Create__12daObjSmoke_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjSmoke_c::Create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/Create__12daObjSmoke_cFv.s"
int daObjSmoke_c::Create() {
initBaseMtx();
if (i_fopAcM_isSwitch(this,getSwbit())) {
mParticle = dComIfGp_particle_set(0x85a6,&current.pos,&current.angle,&mScale,0xff,0,0xffffffff,0,0,0);
}
return 1;
}
#pragma pop
/* 80CDCF9C-80CDD004 00019C 0068+00 1/1 0/0 0/0 .text create__12daObjSmoke_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjSmoke_c::create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/func_80CDCF9C.s"
int daObjSmoke_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daObjSmoke_c();
fopAcM_OnCondition(this, 8);
}
if (Create() == 0) {
return cPhs_ERROR_e;
}
return cPhs_COMPLEATE_e;
}
#pragma pop
/* 80CDD004-80CDD0B8 000204 00B4+00 1/1 0/0 0/0 .text execute__12daObjSmoke_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjSmoke_c::execute() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/execute__12daObjSmoke_cFv.s"
int daObjSmoke_c::execute() {
if (i_fopAcM_isSwitch(this,getSwbit()) && !mParticle) {
mParticle = dComIfGp_particle_set(0x85a6,&current.pos,&current.angle,&mScale,0xff,0,0xffffffff,0,0,0);
}
return 1;
}
#pragma pop
/* 80CDD0B8-80CDD0F8 0002B8 0040+00 1/1 0/0 0/0 .text _delete__12daObjSmoke_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjSmoke_c::_delete() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/_delete__12daObjSmoke_cFv.s"
int daObjSmoke_c::_delete() {
if (mParticle) {
mParticle->quitImmortalEmitter();
mParticle->becomeInvalidEmitter();
mParticle = 0;
}
return 1;
}
#pragma pop
/* 80CDD0F8-80CDD118 0002F8 0020+00 1/0 0/0 0/0 .text daObjSmoke_Execute__FP12daObjSmoke_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daObjSmoke_Execute(daObjSmoke_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Execute__FP12daObjSmoke_c.s"
static int daObjSmoke_Execute(daObjSmoke_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80CDD118-80CDD138 000318 0020+00 1/0 0/0 0/0 .text daObjSmoke_Delete__FP12daObjSmoke_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daObjSmoke_Delete(daObjSmoke_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Delete__FP12daObjSmoke_c.s"
static int daObjSmoke_Delete(daObjSmoke_c* i_this) {
return i_this->_delete();
}
#pragma pop
/* 80CDD138-80CDD158 000338 0020+00 1/0 0/0 0/0 .text daObjSmoke_Create__FP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daObjSmoke_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke/daObjSmoke_Create__FP10fopAc_ac_c.s"
static int daObjSmoke_Create(fopAc_ac_c* i_this) {
return static_cast<daObjSmoke_c*>(i_this)->create();
}
#pragma pop
/* ############################################################################################## */
/* 80CDD164-80CDD184 -00001 0020+00 1/0 0/0 0/0 .data l_daObjSmoke_Method */
SECTION_DATA static void* l_daObjSmoke_Method[8] = {
(void*)daObjSmoke_Create__FP10fopAc_ac_c,
(void*)daObjSmoke_Delete__FP12daObjSmoke_c,
(void*)daObjSmoke_Execute__FP12daObjSmoke_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daObjSmoke_Method = {
(process_method_func)daObjSmoke_Create,
(process_method_func)daObjSmoke_Delete,
(process_method_func)daObjSmoke_Execute
};
/* 80CDD184-80CDD1B4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Smoke */
SECTION_DATA extern void* g_profile_Obj_Smoke[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x01760000, (void*)&g_fpcLf_Method,
(void*)0x0000056C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02780000, (void*)&l_daObjSmoke_Method,
(void*)0x00040100, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_Obj_Smoke = {
-3, // mLayerID
7, // mListID
-3, // mListPrio
PROC_Obj_Smoke, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daObjSmoke_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0278, // mPriority
0, // padding
0, // padding
&l_daObjSmoke_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0, // padding
};

2
rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp
View File

@ -1,6 +1,6 @@
/**
* d_a_tag_guard.cpp
*
* Tag - Guard
*/
#include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h"

287
rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp
View File

@ -1,244 +1,127 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_smk_emt
//
/**
* d_a_tag_smk_emt.cpp
* Tag - Smoke Emit
*/
#include "rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
struct daTagSmkEmt_c {
/* 80D612D8 */ daTagSmkEmt_c();
/* 80D61324 */ ~daTagSmkEmt_c();
/* 80D61384 */ void create();
/* 80D613DC */ void Delete();
/* 80D61400 */ bool draw();
/* 80D61408 */ bool execute();
/* 80D61410 */ void createSmkEmt();
/* 80D61500 */ void deleteSmkEmt();
};
struct dPa_levelEcallBack {};
struct dKy_tevstr_c {};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct _GXColor {};
struct cXyz {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
cXyz const*, f32);
};
//
// Forward References:
//
extern "C" void __ct__13daTagSmkEmt_cFv();
extern "C" void __dt__13daTagSmkEmt_cFv();
extern "C" void create__13daTagSmkEmt_cFv();
extern "C" void Delete__13daTagSmkEmt_cFv();
extern "C" bool draw__13daTagSmkEmt_cFv();
extern "C" bool execute__13daTagSmkEmt_cFv();
extern "C" void createSmkEmt__13daTagSmkEmt_cFv();
extern "C" void deleteSmkEmt__13daTagSmkEmt_cFv();
extern "C" static void daTagSmkEmt_create__FP13daTagSmkEmt_c();
extern "C" static void daTagSmkEmt_Delete__FP13daTagSmkEmt_c();
extern "C" static void daTagSmkEmt_execute__FP13daTagSmkEmt_c();
extern "C" static void daTagSmkEmt_draw__FP13daTagSmkEmt_c();
//
// External References:
//
SECTION_INIT void memset();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void
set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void __ct__5csXyzFsss();
extern "C" void __dl__FPv();
extern "C" void _savegpr_25();
extern "C" void _restgpr_25();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* ############################################################################################## */
/* 80D6160C-80D6162C -00001 0020+00 1/0 0/0 0/0 .data daTagSmkEmt_METHODS */
SECTION_DATA static void* daTagSmkEmt_METHODS[8] = {
(void*)daTagSmkEmt_create__FP13daTagSmkEmt_c,
(void*)daTagSmkEmt_Delete__FP13daTagSmkEmt_c,
(void*)daTagSmkEmt_execute__FP13daTagSmkEmt_c,
(void*)NULL,
(void*)daTagSmkEmt_draw__FP13daTagSmkEmt_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 80D6162C-80D6165C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SmkEmt */
SECTION_DATA extern void* g_profile_Tag_SmkEmt[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x01A00000, (void*)&g_fpcLf_Method,
(void*)0x00000578, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02E70000, (void*)&daTagSmkEmt_METHODS,
(void*)0x00040000, (void*)0x000E0000,
};
/* 80D6165C-80D61668 000050 000C+00 2/2 0/0 0/0 .data __vt__13daTagSmkEmt_c */
SECTION_DATA extern void* __vt__13daTagSmkEmt_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__13daTagSmkEmt_cFv,
};
/* 80D612D8-80D61324 000078 004C+00 2/2 0/0 0/0 .text __ct__13daTagSmkEmt_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daTagSmkEmt_c::daTagSmkEmt_c() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__ct__13daTagSmkEmt_cFv.s"
daTagSmkEmt_c::daTagSmkEmt_c() {
memset(&mParticles,0,0xc);
}
#pragma pop
/* 80D61324-80D61384 0000C4 0060+00 1/0 0/0 0/0 .text __dt__13daTagSmkEmt_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daTagSmkEmt_c::~daTagSmkEmt_c() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/__dt__13daTagSmkEmt_cFv.s"
}
#pragma pop
daTagSmkEmt_c::~daTagSmkEmt_c() {}
/* 80D61384-80D613DC 000124 0058+00 1/1 0/0 0/0 .text create__13daTagSmkEmt_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTagSmkEmt_c::create() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/create__13daTagSmkEmt_cFv.s"
int daTagSmkEmt_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daTagSmkEmt_c();
fopAcM_OnCondition(this, 8);
}
createSmkEmt();
return cPhs_COMPLEATE_e;
}
#pragma pop
/* 80D613DC-80D61400 00017C 0024+00 1/1 0/0 0/0 .text Delete__13daTagSmkEmt_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTagSmkEmt_c::Delete() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/Delete__13daTagSmkEmt_cFv.s"
int daTagSmkEmt_c::Delete() {
deleteSmkEmt();
return 1;
}
#pragma pop
/* 80D61400-80D61408 0001A0 0008+00 1/1 0/0 0/0 .text draw__13daTagSmkEmt_cFv */
bool daTagSmkEmt_c::draw() {
return true;
int daTagSmkEmt_c::draw() {
return 1;
}
/* 80D61408-80D61410 0001A8 0008+00 1/1 0/0 0/0 .text execute__13daTagSmkEmt_cFv */
bool daTagSmkEmt_c::execute() {
return true;
int daTagSmkEmt_c::execute() {
return 1;
}
/* ############################################################################################## */
/* 80D61600-80D61608 000000 0006+02 1/1 0/0 0/0 .rodata PARTICLE_NAME$3654 */
SECTION_RODATA static u8 const PARTICLE_NAME[6 + 2 /* padding */] = {
0x87,
0xE7,
0x87,
0xE8,
0x87,
0xE9,
/* padding */
0x00,
0x00,
static u16 const PARTICLE_NAME[3] = {
0x87E7,
0x87E8,
0x87E9
};
COMPILER_STRIP_GATE(0x80D61600, &PARTICLE_NAME);
/* 80D61608-80D6160C 000008 0004+00 1/1 0/0 0/0 .rodata @3677 */
SECTION_RODATA static f32 const lit_3677 = 1.0f;
COMPILER_STRIP_GATE(0x80D61608, &lit_3677);
/* 80D61410-80D61500 0001B0 00F0+00 1/1 0/0 0/0 .text createSmkEmt__13daTagSmkEmt_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTagSmkEmt_c::createSmkEmt() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/createSmkEmt__13daTagSmkEmt_cFv.s"
void daTagSmkEmt_c::createSmkEmt() {
cXyz pos(current.pos);
csXyz angle(0,0,0);
cXyz pos2(1.0f,1.0f,1.0f);
for (int i = 0; i < 3; i++) {
mParticles[i] = dComIfGp_particle_set(PARTICLE_NAME[i],&pos,&angle,&pos2);
}
}
#pragma pop
/* 80D61500-80D61544 0002A0 0044+00 1/1 0/0 0/0 .text deleteSmkEmt__13daTagSmkEmt_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTagSmkEmt_c::deleteSmkEmt() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/deleteSmkEmt__13daTagSmkEmt_cFv.s"
void daTagSmkEmt_c::deleteSmkEmt() {
for (int i = 0; i < 3; i++) {
if (mParticles[i]) {
mParticles[i]->becomeInvalidEmitter();
mParticles[i] = 0;
}
}
}
#pragma pop
/* 80D61544-80D61598 0002E4 0054+00 1/0 0/0 0/0 .text daTagSmkEmt_create__FP13daTagSmkEmt_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTagSmkEmt_create(daTagSmkEmt_c* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_create__FP13daTagSmkEmt_c.s"
static int daTagSmkEmt_create(daTagSmkEmt_c* i_this) {
if (!fopAcM_CheckCondition(i_this, 8)) {
new (i_this) daTagSmkEmt_c();
fopAcM_OnCondition(i_this, 8);
}
return i_this->create();
}
#pragma pop
/* 80D61598-80D615B8 000338 0020+00 1/0 0/0 0/0 .text daTagSmkEmt_Delete__FP13daTagSmkEmt_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTagSmkEmt_Delete(daTagSmkEmt_c* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_Delete__FP13daTagSmkEmt_c.s"
static int daTagSmkEmt_Delete(daTagSmkEmt_c* i_this) {
return i_this->Delete();
}
#pragma pop
/* 80D615B8-80D615D8 000358 0020+00 1/0 0/0 0/0 .text daTagSmkEmt_execute__FP13daTagSmkEmt_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTagSmkEmt_execute(daTagSmkEmt_c* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_execute__FP13daTagSmkEmt_c.s"
static int daTagSmkEmt_execute(daTagSmkEmt_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80D615D8-80D615F8 000378 0020+00 1/0 0/0 0/0 .text daTagSmkEmt_draw__FP13daTagSmkEmt_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTagSmkEmt_draw(daTagSmkEmt_c* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt/daTagSmkEmt_draw__FP13daTagSmkEmt_c.s"
static int daTagSmkEmt_draw(daTagSmkEmt_c* i_this) {
return i_this->draw();
}
#pragma pop
/* ############################################################################################## */
/* 80D6160C-80D6162C -00001 0020+00 1/0 0/0 0/0 .data daTagSmkEmt_METHODS */
static actor_method_class daTagSmkEmt_METHODS = {
(process_method_func)daTagSmkEmt_create,
(process_method_func)daTagSmkEmt_Delete,
(process_method_func)daTagSmkEmt_execute,
(process_method_func)0,
(process_method_func)daTagSmkEmt_draw
};
/* 80D6162C-80D6165C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SmkEmt */
extern actor_process_profile_definition g_profile_Tag_SmkEmt = {
-3, // mLayerID
7, // mListID
-3, // mListPrio
PROC_Tag_SmkEmt, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagSmkEmt_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x02E7, // mPriority
0, // padding
0, // padding
&daTagSmkEmt_METHODS, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};