mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-25 15:25:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

work on d_a_npc, d_a_npc_ash, d_a_tag_evtarea (#345)

Browse Source 
All credit goes to randomsalience
This commit is contained in:
hatal175
2023-06-06 20:32:17 +03:00
committed by GitHub
parent 565453690e
commit 98582af6d2
60 changed files with 2654 additions and 2908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Progress.md
+8 -8
View File
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 27.332573% | 983028 | 3596544
.text | 27.346475% | 983528 | 3596544
.ctors | 100.000000% | 448 | 448
.dtors | 100.000000% | 32 | 32
.rodata | 100.000000% | 193856 | 193856
.data | 100.000000% | 197632 | 197632
.sdata | 100.000000% | 1408 | 1408
.sdata2 | 100.000000% | 20832 | 20832
Total | 34.993255% | 1406964 | 4020672
Total | 35.005691% | 1407464 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 34.993255% | 1406964 | 4020672
RELs | 33.600166% | 3864128 | 11500324
Total | 33.961042% | 5271092 | 15520996
main.dol | 35.005691% | 1407464 | 4020672
RELs | 33.644652% | 3869244 | 11500324
Total | 33.997225% | 5276708 | 15520996
## RELs
@@ -220,7 +220,7 @@ d_a_myna | 30.876570% | 9736 | 31532
d_a_nbomb | 28.739233% | 8808 | 30648
d_a_ni | 27.299309% | 8216 | 30096
d_a_npc_aru | 34.812103% | 12932 | 37148
d_a_npc_ash | 31.737680% | 9892 | 31168
d_a_npc_ash | 40.990760% | 12776 | 31168
d_a_npc_ashB | 32.906995% | 8336 | 25332
d_a_npc_bans | 34.954955% | 11640 | 33300
d_a_npc_besu | 38.726854% | 19492 | 50332
@@ -722,7 +722,7 @@ d_a_tag_csw | 35.869565% | 3696 | 10304
d_a_tag_escape | 100.000000% | 712 | 712
d_a_tag_event | 31.075697% | 1248 | 4016
d_a_tag_evt | 37.815126% | 1620 | 4284
d_a_tag_evtarea | 37.091319% | 1316 | 3548
d_a_tag_evtarea | 100.000000% | 3548 | 3548
d_a_tag_evtmsg | 39.491150% | 1428 | 3616
d_a_tag_firewall | 35.325132% | 1608 | 4552
d_a_tag_gra | 100.000000% | 800 | 800
@@ -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.600166% | 3864128 | 11500324
Total | 33.644652% | 3869244 | 11500324
asm/d/a/d_a_npc/getTevRegKeyAnmP__8daNpcF_cFPci.s
-16
View File
@@ -1,16 +0,0 @@
lbl_80152BE0:
/* 80152BE0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152BE4 7C 08 02 A6 */ mflr r0
/* 80152BE8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152BEC 7C 83 23 78 */ mr r3, r4
/* 80152BF0 7C A4 2B 78 */ mr r4, r5
/* 80152BF4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80152BF8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80152BFC 3C A5 00 02 */ addis r5, r5, 2
/* 80152C00 38 C0 00 80 */ li r6, 0x80
/* 80152C04 38 A5 C2 F8 */ addi r5, r5, -15624
/* 80152C08 4B EE 96 E5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80152C0C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152C10 7C 08 03 A6 */ mtlr r0
/* 80152C14 38 21 00 10 */ addi r1, r1, 0x10
/* 80152C18 4E 80 00 20 */ blr
asm/d/a/d_a_npc/getTexPtrnAnmP__8daNpcF_cFPci.s
-16
View File
@@ -1,16 +0,0 @@
lbl_80152B68:
/* 80152B68 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152B6C 7C 08 02 A6 */ mflr r0
/* 80152B70 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152B74 7C 83 23 78 */ mr r3, r4
/* 80152B78 7C A4 2B 78 */ mr r4, r5
/* 80152B7C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80152B80 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80152B84 3C A5 00 02 */ addis r5, r5, 2
/* 80152B88 38 C0 00 80 */ li r6, 0x80
/* 80152B8C 38 A5 C2 F8 */ addi r5, r5, -15624
/* 80152B90 4B EE 97 5D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80152B94 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152B98 7C 08 03 A6 */ mtlr r0
/* 80152B9C 38 21 00 10 */ addi r1, r1, 0x10
/* 80152BA0 4E 80 00 20 */ blr
asm/d/a/d_a_npc/getTexSRTKeyAnmP__8daNpcF_cFPci.s
-16
View File
@@ -1,16 +0,0 @@
lbl_80152BA4:
/* 80152BA4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152BA8 7C 08 02 A6 */ mflr r0
/* 80152BAC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152BB0 7C 83 23 78 */ mr r3, r4
/* 80152BB4 7C A4 2B 78 */ mr r4, r5
/* 80152BB8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80152BBC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80152BC0 3C A5 00 02 */ addis r5, r5, 2
/* 80152BC4 38 C0 00 80 */ li r6, 0x80
/* 80152BC8 38 A5 C2 F8 */ addi r5, r5, -15624
/* 80152BCC 4B EE 97 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80152BD0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152BD4 7C 08 03 A6 */ mtlr r0
/* 80152BD8 38 21 00 10 */ addi r1, r1, 0x10
/* 80152BDC 4E 80 00 20 */ blr
asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__8daNpcF_cFPci.s
-16
View File
@@ -1,16 +0,0 @@
lbl_80152B2C:
/* 80152B2C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152B30 7C 08 02 A6 */ mflr r0
/* 80152B34 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152B38 7C 83 23 78 */ mr r3, r4
/* 80152B3C 7C A4 2B 78 */ mr r4, r5
/* 80152B40 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80152B44 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80152B48 3C A5 00 02 */ addis r5, r5, 2
/* 80152B4C 38 C0 00 80 */ li r6, 0x80
/* 80152B50 38 A5 C2 F8 */ addi r5, r5, -15624
/* 80152B54 4B EE 97 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80152B58 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152B5C 7C 08 03 A6 */ mtlr r0
/* 80152B60 38 21 00 10 */ addi r1, r1, 0x10
/* 80152B64 4E 80 00 20 */ blr
asm/d/a/d_a_npc/setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib.s
-18
View File
@@ -1,18 +0,0 @@
lbl_80152C80:
/* 80152C80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152C84 7C 08 02 A6 */ mflr r0
/* 80152C88 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152C8C 7C AB 2B 78 */ mr r11, r5
/* 80152C90 7C CA 33 78 */ mr r10, r6
/* 80152C94 7C E0 3B 78 */ mr r0, r7
/* 80152C98 7D 09 43 78 */ mr r9, r8
/* 80152C9C 38 A0 00 01 */ li r5, 1
/* 80152CA0 7D 66 5B 78 */ mr r6, r11
/* 80152CA4 7D 47 07 34 */ extsh r7, r10
/* 80152CA8 7C 08 07 34 */ extsh r8, r0
/* 80152CAC 38 63 05 6C */ addi r3, r3, 0x56c
/* 80152CB0 4B EB AB 2D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb
/* 80152CB4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152CB8 7C 08 03 A6 */ mtlr r0
/* 80152CBC 38 21 00 10 */ addi r1, r1, 0x10
/* 80152CC0 4E 80 00 20 */ blr
asm/d/a/d_a_npc/setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi.s
-17
View File
@@ -1,17 +0,0 @@
lbl_80152D44:
/* 80152D44 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152D48 7C 08 02 A6 */ mflr r0
/* 80152D4C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152D50 7C 80 23 78 */ mr r0, r4
/* 80152D54 7C C7 33 78 */ mr r7, r6
/* 80152D58 38 85 00 58 */ addi r4, r5, 0x58
/* 80152D5C 7C 05 03 78 */ mr r5, r0
/* 80152D60 38 C0 00 01 */ li r6, 1
/* 80152D64 39 00 00 00 */ li r8, 0
/* 80152D68 39 20 FF FF */ li r9, -1
/* 80152D6C 38 63 05 B8 */ addi r3, r3, 0x5b8
/* 80152D70 4B EB A9 9D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss
/* 80152D74 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152D78 7C 08 03 A6 */ mtlr r0
/* 80152D7C 38 21 00 10 */ addi r1, r1, 0x10
/* 80152D80 4E 80 00 20 */ blr
asm/d/a/d_a_npc/setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi.s
-17
View File
@@ -1,17 +0,0 @@
lbl_80152D04:
/* 80152D04 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152D08 7C 08 02 A6 */ mflr r0
/* 80152D0C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152D10 7C 80 23 78 */ mr r0, r4
/* 80152D14 7C C7 33 78 */ mr r7, r6
/* 80152D18 38 85 00 58 */ addi r4, r5, 0x58
/* 80152D1C 7C 05 03 78 */ mr r5, r0
/* 80152D20 38 C0 00 01 */ li r6, 1
/* 80152D24 39 00 00 00 */ li r8, 0
/* 80152D28 39 20 FF FF */ li r9, -1
/* 80152D2C 38 63 05 A0 */ addi r3, r3, 0x5a0
/* 80152D30 4B EB A9 0D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss
/* 80152D34 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152D38 7C 08 03 A6 */ mtlr r0
/* 80152D3C 38 21 00 10 */ addi r1, r1, 0x10
/* 80152D40 4E 80 00 20 */ blr
asm/d/a/d_a_npc/setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi.s
-17
View File
@@ -1,17 +0,0 @@
lbl_80152CC4:
/* 80152CC4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80152CC8 7C 08 02 A6 */ mflr r0
/* 80152CCC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80152CD0 7C 80 23 78 */ mr r0, r4
/* 80152CD4 7C C7 33 78 */ mr r7, r6
/* 80152CD8 38 85 00 58 */ addi r4, r5, 0x58
/* 80152CDC 7C 05 03 78 */ mr r5, r0
/* 80152CE0 38 C0 00 01 */ li r6, 1
/* 80152CE4 39 00 00 00 */ li r8, 0
/* 80152CE8 39 20 FF FF */ li r9, -1
/* 80152CEC 38 63 05 88 */ addi r3, r3, 0x588
/* 80152CF0 4B EB A8 5D */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss
/* 80152CF4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80152CF8 7C 08 03 A6 */ mtlr r0
/* 80152CFC 38 21 00 10 */ addi r1, r1, 0x10
/* 80152D00 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Create__10daNpcAsh_cFv.s
-260
View File
@@ -1,260 +0,0 @@
lbl_809587A0:
/* 809587A0 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 809587A4 7C 08 02 A6 */ mflr r0
/* 809587A8 90 01 00 44 */ stw r0, 0x44(r1)
/* 809587AC 39 61 00 40 */ addi r11, r1, 0x40
/* 809587B0 4B A0 9A 19 */ bl _savegpr_24
/* 809587B4 7C 7C 1B 78 */ mr r28, r3
/* 809587B8 3C 80 80 96 */ lis r4, m__16daNpcAsh_Param_c@ha /* 0x8095D640@ha */
/* 809587BC 3B E4 D6 40 */ addi r31, r4, m__16daNpcAsh_Param_c@l /* 0x8095D640@l */
/* 809587C0 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 809587C4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 809587C8 40 82 00 1C */ bne lbl_809587E4
/* 809587CC 28 1C 00 00 */ cmplwi r28, 0
/* 809587D0 41 82 00 08 */ beq lbl_809587D8
/* 809587D4 4B FF FB 19 */ bl __ct__10daNpcAsh_cFv
lbl_809587D8:
/* 809587D8 80 1C 04 A0 */ lwz r0, 0x4a0(r28)
/* 809587DC 60 00 00 08 */ ori r0, r0, 8
/* 809587E0 90 1C 04 A0 */ stw r0, 0x4a0(r28)
lbl_809587E4:
/* 809587E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 809587E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 809587EC 3B C3 0F 38 */ addi r30, r3, 0xf38
/* 809587F0 3B 1E 3E C8 */ addi r24, r30, 0x3ec8
/* 809587F4 7F 03 C3 78 */ mr r3, r24
/* 809587F8 3C 80 80 96 */ lis r4, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */
/* 809587FC 38 84 D9 10 */ addi r4, r4, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */
/* 80958800 38 84 00 6C */ addi r4, r4, 0x6c
/* 80958804 4B A1 01 91 */ bl strcmp
/* 80958808 2C 03 00 00 */ cmpwi r3, 0
/* 8095880C 40 82 00 64 */ bne lbl_80958870
/* 80958810 38 60 00 00 */ li r3, 0
/* 80958814 4B 6D 41 69 */ bl getLayerNo__14dComIfG_play_cFi
/* 80958818 2C 03 00 04 */ cmpwi r3, 4
/* 8095881C 40 82 00 54 */ bne lbl_80958870
/* 80958820 38 60 01 69 */ li r3, 0x169
/* 80958824 4B 7F CE 11 */ bl daNpcF_chkEvtBit__FUl
/* 80958828 2C 03 00 00 */ cmpwi r3, 0
/* 8095882C 41 82 00 1C */ beq lbl_80958848
/* 80958830 38 60 01 0A */ li r3, 0x10a
/* 80958834 4B 7F CE 01 */ bl daNpcF_chkEvtBit__FUl
/* 80958838 2C 03 00 00 */ cmpwi r3, 0
/* 8095883C 40 82 00 0C */ bne lbl_80958848
/* 80958840 38 60 00 05 */ li r3, 5
/* 80958844 48 00 03 0C */ b lbl_80958B50
lbl_80958848:
/* 80958848 38 60 00 18 */ li r3, 0x18
/* 8095884C 38 80 00 4B */ li r4, 0x4b
/* 80958850 4B 6D 4E F1 */ bl dComIfGs_isStageSwitch__Fii
/* 80958854 2C 03 00 00 */ cmpwi r3, 0
/* 80958858 41 82 00 0C */ beq lbl_80958864
/* 8095885C 38 60 00 05 */ li r3, 5
/* 80958860 48 00 02 F0 */ b lbl_80958B50
lbl_80958864:
/* 80958864 38 00 00 00 */ li r0, 0
/* 80958868 98 1C 0F 60 */ stb r0, 0xf60(r28)
/* 8095886C 48 00 00 58 */ b lbl_809588C4
lbl_80958870:
/* 80958870 7F 03 C3 78 */ mr r3, r24
/* 80958874 3C 80 80 96 */ lis r4, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */
/* 80958878 38 84 D9 10 */ addi r4, r4, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */
/* 8095887C 38 84 00 74 */ addi r4, r4, 0x74
/* 80958880 4B A1 01 15 */ bl strcmp
/* 80958884 2C 03 00 00 */ cmpwi r3, 0
/* 80958888 40 82 00 3C */ bne lbl_809588C4
/* 8095888C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80958890 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80958894 38 63 09 58 */ addi r3, r3, 0x958
/* 80958898 38 80 00 14 */ li r4, 0x14
/* 8095889C 4B 6D BF C5 */ bl isSwitch__12dSv_memBit_cCFi
/* 809588A0 2C 03 00 00 */ cmpwi r3, 0
/* 809588A4 41 82 00 0C */ beq lbl_809588B0
/* 809588A8 38 60 00 05 */ li r3, 5
/* 809588AC 48 00 02 A4 */ b lbl_80958B50
lbl_809588B0:
/* 809588B0 80 1C 04 9C */ lwz r0, 0x49c(r28)
/* 809588B4 60 00 40 00 */ ori r0, r0, 0x4000
/* 809588B8 90 1C 04 9C */ stw r0, 0x49c(r28)
/* 809588BC 38 00 00 01 */ li r0, 1
/* 809588C0 98 1C 0F 60 */ stb r0, 0xf60(r28)
lbl_809588C4:
/* 809588C4 A8 1C 04 E4 */ lha r0, 0x4e4(r28)
/* 809588C8 B0 1C 0F 58 */ sth r0, 0xf58(r28)
/* 809588CC 3B A0 00 05 */ li r29, 5
/* 809588D0 3B 60 00 00 */ li r27, 0
/* 809588D4 3B 40 00 00 */ li r26, 0
/* 809588D8 3C 60 80 96 */ lis r3, l_arcNames@ha /* 0x8095DAC0@ha */
/* 809588DC 3B 03 DA C0 */ addi r24, r3, l_arcNames@l /* 0x8095DAC0@l */
/* 809588E0 3C 60 80 96 */ lis r3, l_loadRes_list@ha /* 0x8095DAB8@ha */
/* 809588E4 3B 23 DA B8 */ addi r25, r3, l_loadRes_list@l /* 0x8095DAB8@l */
/* 809588E8 48 00 00 30 */ b lbl_80958918
lbl_809588EC:
/* 809588EC 38 7A 0F 3C */ addi r3, r26, 0xf3c
/* 809588F0 7C 7C 1A 14 */ add r3, r28, r3
/* 809588F4 54 00 10 3A */ slwi r0, r0, 2
/* 809588F8 7C 98 00 2E */ lwzx r4, r24, r0
/* 809588FC 4B 6D 45 C1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
/* 80958900 7C 7D 1B 78 */ mr r29, r3
/* 80958904 2C 1D 00 04 */ cmpwi r29, 4
/* 80958908 41 82 00 08 */ beq lbl_80958910
/* 8095890C 48 00 02 44 */ b lbl_80958B50
lbl_80958910:
/* 80958910 3B 7B 00 04 */ addi r27, r27, 4
/* 80958914 3B 5A 00 08 */ addi r26, r26, 8
lbl_80958918:
/* 80958918 88 9C 0F 60 */ lbz r4, 0xf60(r28)
/* 8095891C 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d
/* 80958920 7C 79 00 2E */ lwzx r3, r25, r0
/* 80958924 7C 03 D8 2E */ lwzx r0, r3, r27
/* 80958928 2C 00 00 00 */ cmpwi r0, 0
/* 8095892C 40 80 FF C0 */ bge lbl_809588EC
/* 80958930 2C 1D 00 04 */ cmpwi r29, 4
/* 80958934 40 82 02 18 */ bne lbl_80958B4C
/* 80958938 38 A0 00 00 */ li r5, 0
/* 8095893C 2C 04 00 01 */ cmpwi r4, 1
/* 80958940 41 82 00 1C */ beq lbl_8095895C
/* 80958944 40 80 00 1C */ bge lbl_80958960
/* 80958948 2C 04 00 00 */ cmpwi r4, 0
/* 8095894C 40 80 00 08 */ bge lbl_80958954
/* 80958950 48 00 00 10 */ b lbl_80958960
lbl_80958954:
/* 80958954 38 A0 42 10 */ li r5, 0x4210
/* 80958958 48 00 00 08 */ b lbl_80958960
lbl_8095895C:
/* 8095895C 38 A0 58 B0 */ li r5, 0x58b0
lbl_80958960:
/* 80958960 7F 83 E3 78 */ mr r3, r28
/* 80958964 3C 80 80 96 */ lis r4, createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c@ha /* 0x80959458@ha */
/* 80958968 38 84 94 58 */ addi r4, r4, createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c@l /* 0x80959458@l */
/* 8095896C 4B 6C 1B 45 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 80958970 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80958974 40 82 00 0C */ bne lbl_80958980
/* 80958978 38 60 00 05 */ li r3, 5
/* 8095897C 48 00 01 D4 */ b lbl_80958B50
lbl_80958980:
/* 80958980 80 7C 05 68 */ lwz r3, 0x568(r28)
/* 80958984 80 63 00 04 */ lwz r3, 4(r3)
/* 80958988 38 03 00 24 */ addi r0, r3, 0x24
/* 8095898C 90 1C 05 04 */ stw r0, 0x504(r28)
/* 80958990 7F 83 E3 78 */ mr r3, r28
/* 80958994 C0 3F 00 6C */ lfs f1, 0x6c(r31)
/* 80958998 C0 5F 00 70 */ lfs f2, 0x70(r31)
/* 8095899C FC 60 08 90 */ fmr f3, f1
/* 809589A0 C0 9F 00 74 */ lfs f4, 0x74(r31)
/* 809589A4 C0 BF 00 78 */ lfs f5, 0x78(r31)
/* 809589A8 FC C0 20 90 */ fmr f6, f4
/* 809589AC 4B 6C 1B 9D */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff
/* 809589B0 38 7C 0B 48 */ addi r3, r28, 0xb48
/* 809589B4 38 9C 04 D0 */ addi r4, r28, 0x4d0
/* 809589B8 38 BC 05 38 */ addi r5, r28, 0x538
/* 809589BC 38 C0 00 03 */ li r6, 3
/* 809589C0 38 E0 00 01 */ li r7, 1
/* 809589C4 4B 96 7B 6D */ bl init__10Z2CreatureFP3VecP3VecUcUc
/* 809589C8 38 7C 07 E4 */ addi r3, r28, 0x7e4
/* 809589CC 38 9F 00 00 */ addi r4, r31, 0
/* 809589D0 C0 24 00 1C */ lfs f1, 0x1c(r4)
/* 809589D4 C0 44 00 18 */ lfs f2, 0x18(r4)
/* 809589D8 4B 71 D5 81 */ bl SetWall__12dBgS_AcchCirFff
/* 809589DC 38 1C 04 E4 */ addi r0, r28, 0x4e4
/* 809589E0 90 01 00 08 */ stw r0, 8(r1)
/* 809589E4 38 7C 05 D0 */ addi r3, r28, 0x5d0
/* 809589E8 38 9C 04 D0 */ addi r4, r28, 0x4d0
/* 809589EC 38 BC 04 BC */ addi r5, r28, 0x4bc
/* 809589F0 7F 86 E3 78 */ mr r6, r28
/* 809589F4 38 E0 00 01 */ li r7, 1
/* 809589F8 39 1C 07 E4 */ addi r8, r28, 0x7e4
/* 809589FC 39 3C 04 F8 */ addi r9, r28, 0x4f8
/* 80958A00 39 5C 04 DC */ addi r10, r28, 0x4dc
/* 80958A04 4B 71 D8 45 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz
/* 80958A08 80 1C 05 FC */ lwz r0, 0x5fc(r28)
/* 80958A0C 60 00 00 08 */ ori r0, r0, 8
/* 80958A10 90 1C 05 FC */ stw r0, 0x5fc(r28)
/* 80958A14 80 1C 05 FC */ lwz r0, 0x5fc(r28)
/* 80958A18 60 00 04 00 */ ori r0, r0, 0x400
/* 80958A1C 90 1C 05 FC */ stw r0, 0x5fc(r28)
/* 80958A20 38 7C 05 D0 */ addi r3, r28, 0x5d0
/* 80958A24 7F C4 F3 78 */ mr r4, r30
/* 80958A28 4B 71 E0 85 */ bl CrrPos__9dBgS_AcchFR4dBgS
/* 80958A2C 38 7C 07 A8 */ addi r3, r28, 0x7a8
/* 80958A30 38 9F 00 00 */ addi r4, r31, 0
/* 80958A34 C0 04 00 10 */ lfs f0, 0x10(r4)
/* 80958A38 FC 00 00 1E */ fctiwz f0, f0
/* 80958A3C D8 01 00 10 */ stfd f0, 0x10(r1)
/* 80958A40 80 81 00 14 */ lwz r4, 0x14(r1)
/* 80958A44 38 A0 00 00 */ li r5, 0
/* 80958A48 7F 86 E3 78 */ mr r6, r28
/* 80958A4C 4B 72 AE 15 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c
/* 80958A50 38 7C 0C B8 */ addi r3, r28, 0xcb8
/* 80958A54 3C 80 80 3B */ lis r4, mCcDCyl__8daNpcF_c@ha /* 0x803B37E0@ha */
/* 80958A58 38 84 37 E0 */ addi r4, r4, mCcDCyl__8daNpcF_c@l /* 0x803B37E0@l */
/* 80958A5C 4B 72 BE 59 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl
/* 80958A60 38 1C 07 A8 */ addi r0, r28, 0x7a8
/* 80958A64 90 1C 0C FC */ stw r0, 0xcfc(r28)
/* 80958A68 38 00 00 00 */ li r0, 0
/* 80958A6C 90 1C 0C E0 */ stw r0, 0xce0(r28)
/* 80958A70 90 1C 0C D0 */ stw r0, 0xcd0(r28)
/* 80958A74 88 1C 0F 60 */ lbz r0, 0xf60(r28)
/* 80958A78 28 00 00 00 */ cmplwi r0, 0
/* 80958A7C 40 82 00 30 */ bne lbl_80958AAC
/* 80958A80 38 7C 0D F4 */ addi r3, r28, 0xdf4
/* 80958A84 3C 80 80 3B */ lis r4, mCcDCyl__8daNpcF_c@ha /* 0x803B37E0@ha */
/* 80958A88 38 84 37 E0 */ addi r4, r4, mCcDCyl__8daNpcF_c@l /* 0x803B37E0@l */
/* 80958A8C 4B 72 BE 29 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl
/* 80958A90 38 1C 07 A8 */ addi r0, r28, 0x7a8
/* 80958A94 90 1C 0E 38 */ stw r0, 0xe38(r28)
/* 80958A98 38 00 00 00 */ li r0, 0
/* 80958A9C 90 1C 0E 1C */ stw r0, 0xe1c(r28)
/* 80958AA0 90 1C 0E 0C */ stw r0, 0xe0c(r28)
/* 80958AA4 38 00 00 19 */ li r0, 0x19
/* 80958AA8 90 1C 0E 20 */ stw r0, 0xe20(r28)
lbl_80958AAC:
/* 80958AAC 80 1C 06 AC */ lwz r0, 0x6ac(r28)
/* 80958AB0 90 1C 0A 44 */ stw r0, 0xa44(r28)
/* 80958AB4 80 1C 06 B0 */ lwz r0, 0x6b0(r28)
/* 80958AB8 90 1C 0A 48 */ stw r0, 0xa48(r28)
/* 80958ABC 80 1C 06 B4 */ lwz r0, 0x6b4(r28)
/* 80958AC0 90 1C 0A 4C */ stw r0, 0xa4c(r28)
/* 80958AC4 88 1C 06 B8 */ lbz r0, 0x6b8(r28)
/* 80958AC8 98 1C 0A 50 */ stb r0, 0xa50(r28)
/* 80958ACC A0 1C 06 C0 */ lhz r0, 0x6c0(r28)
/* 80958AD0 B0 1C 0A 58 */ sth r0, 0xa58(r28)
/* 80958AD4 A0 1C 06 C2 */ lhz r0, 0x6c2(r28)
/* 80958AD8 B0 1C 0A 5A */ sth r0, 0xa5a(r28)
/* 80958ADC 80 1C 06 C4 */ lwz r0, 0x6c4(r28)
/* 80958AE0 90 1C 0A 5C */ stw r0, 0xa5c(r28)
/* 80958AE4 80 1C 06 C8 */ lwz r0, 0x6c8(r28)
/* 80958AE8 90 1C 0A 60 */ stw r0, 0xa60(r28)
/* 80958AEC C0 1C 06 D0 */ lfs f0, 0x6d0(r28)
/* 80958AF0 D0 1C 0A 68 */ stfs f0, 0xa68(r28)
/* 80958AF4 C0 1C 06 D4 */ lfs f0, 0x6d4(r28)
/* 80958AF8 D0 1C 0A 6C */ stfs f0, 0xa6c(r28)
/* 80958AFC C0 1C 06 D8 */ lfs f0, 0x6d8(r28)
/* 80958B00 D0 1C 0A 70 */ stfs f0, 0xa70(r28)
/* 80958B04 80 1C 06 DC */ lwz r0, 0x6dc(r28)
/* 80958B08 90 1C 0A 74 */ stw r0, 0xa74(r28)
/* 80958B0C C0 1C 06 E0 */ lfs f0, 0x6e0(r28)
/* 80958B10 D0 1C 0A 78 */ stfs f0, 0xa78(r28)
/* 80958B14 80 1C 06 E4 */ lwz r0, 0x6e4(r28)
/* 80958B18 90 1C 0A 7C */ stw r0, 0xa7c(r28)
/* 80958B1C C0 1C 06 68 */ lfs f0, 0x668(r28)
/* 80958B20 D0 1C 09 80 */ stfs f0, 0x980(r28)
/* 80958B24 7F 83 E3 78 */ mr r3, r28
/* 80958B28 4B 7F A2 5D */ bl setEnvTevColor__8daNpcF_cFv
/* 80958B2C 7F 83 E3 78 */ mr r3, r28
/* 80958B30 4B 7F A2 B1 */ bl setRoomNo__8daNpcF_cFv
/* 80958B34 80 7C 05 68 */ lwz r3, 0x568(r28)
/* 80958B38 4B 6B 86 B5 */ bl modelCalc__16mDoExt_McaMorfSOFv
/* 80958B3C 7F 83 E3 78 */ mr r3, r28
/* 80958B40 48 00 0D D1 */ bl reset__10daNpcAsh_cFv
/* 80958B44 7F 83 E3 78 */ mr r3, r28
/* 80958B48 48 00 05 B1 */ bl Execute__10daNpcAsh_cFv
lbl_80958B4C:
/* 80958B4C 7F A3 EB 78 */ mr r3, r29
lbl_80958B50:
/* 80958B50 39 61 00 40 */ addi r11, r1, 0x40
/* 80958B54 4B A0 96 C1 */ bl _restgpr_24
/* 80958B58 80 01 00 44 */ lwz r0, 0x44(r1)
/* 80958B5C 7C 08 03 A6 */ mtlr r0
/* 80958B60 38 21 00 40 */ addi r1, r1, 0x40
/* 80958B64 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Delete__10daNpcAsh_cFv.s
-14
View File
@@ -1,14 +0,0 @@
lbl_809590C4:
/* 809590C4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 809590C8 7C 08 02 A6 */ mflr r0
/* 809590CC 90 01 00 14 */ stw r0, 0x14(r1)
/* 809590D0 38 80 FF FF */ li r4, -1
/* 809590D4 81 83 0B 44 */ lwz r12, 0xb44(r3)
/* 809590D8 81 8C 00 08 */ lwz r12, 8(r12)
/* 809590DC 7D 89 03 A6 */ mtctr r12
/* 809590E0 4E 80 04 21 */ bctrl
/* 809590E4 38 60 00 01 */ li r3, 1
/* 809590E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 809590EC 7C 08 03 A6 */ mtlr r0
/* 809590F0 38 21 00 10 */ addi r1, r1, 0x10
/* 809590F4 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Draw__10daNpcAsh_cFv.s
-73
View File
@@ -1,73 +0,0 @@
lbl_8095911C:
/* 8095911C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80959120 7C 08 02 A6 */ mflr r0
/* 80959124 90 01 00 14 */ stw r0, 0x14(r1)
/* 80959128 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8095912C 7C 7F 1B 78 */ mr r31, r3
/* 80959130 80 83 05 68 */ lwz r4, 0x568(r3)
/* 80959134 80 84 00 04 */ lwz r4, 4(r4)
/* 80959138 80 84 00 04 */ lwz r4, 4(r4)
/* 8095913C 80 84 00 60 */ lwz r4, 0x60(r4)
/* 80959140 80 84 00 08 */ lwz r4, 8(r4)
/* 80959144 80 03 0B E0 */ lwz r0, 0xbe0(r3)
/* 80959148 90 04 00 3C */ stw r0, 0x3c(r4)
/* 8095914C 38 80 00 00 */ li r4, 0
/* 80959150 38 A0 00 00 */ li r5, 0
/* 80959154 3C C0 80 96 */ lis r6, m__16daNpcAsh_Param_c@ha /* 0x8095D640@ha */
/* 80959158 38 C6 D6 40 */ addi r6, r6, m__16daNpcAsh_Param_c@l /* 0x8095D640@l */
/* 8095915C C0 26 00 0C */ lfs f1, 0xc(r6)
/* 80959160 38 C0 00 00 */ li r6, 0
/* 80959164 38 E0 00 00 */ li r7, 0
/* 80959168 4B 7F 91 45 */ bl draw__8daNpcF_cFiifP11_GXColorS10i
/* 8095916C 88 1F 0F 60 */ lbz r0, 0xf60(r31)
/* 80959170 28 00 00 01 */ cmplwi r0, 1
/* 80959174 40 82 00 AC */ bne lbl_80959220
/* 80959178 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 8095917C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80959180 80 9F 0B D8 */ lwz r4, 0xbd8(r31)
/* 80959184 80 84 00 04 */ lwz r4, 4(r4)
/* 80959188 38 BF 01 0C */ addi r5, r31, 0x10c
/* 8095918C 4B 84 BC 15 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
/* 80959190 80 7F 05 68 */ lwz r3, 0x568(r31)
/* 80959194 80 63 00 04 */ lwz r3, 4(r3)
/* 80959198 80 63 00 84 */ lwz r3, 0x84(r3)
/* 8095919C 80 63 00 0C */ lwz r3, 0xc(r3)
/* 809591A0 38 63 03 00 */ addi r3, r3, 0x300
/* 809591A4 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 809591A8 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 809591AC 4B 9E D3 05 */ bl PSMTXCopy
/* 809591B0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 809591B4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 809591B8 80 9F 0B D8 */ lwz r4, 0xbd8(r31)
/* 809591BC 38 84 00 24 */ addi r4, r4, 0x24
/* 809591C0 4B 9E D2 F1 */ bl PSMTXCopy
/* 809591C4 80 7F 0B D8 */ lwz r3, 0xbd8(r31)
/* 809591C8 4B 6B 4A FD */ bl mDoExt_modelUpdateDL__FP8J3DModel
/* 809591CC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 809591D0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 809591D4 80 9F 0B DC */ lwz r4, 0xbdc(r31)
/* 809591D8 80 84 00 04 */ lwz r4, 4(r4)
/* 809591DC 38 BF 01 0C */ addi r5, r31, 0x10c
/* 809591E0 4B 84 BB C1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
/* 809591E4 80 7F 05 68 */ lwz r3, 0x568(r31)
/* 809591E8 80 63 00 04 */ lwz r3, 4(r3)
/* 809591EC 80 63 00 84 */ lwz r3, 0x84(r3)
/* 809591F0 80 63 00 0C */ lwz r3, 0xc(r3)
/* 809591F4 38 63 00 60 */ addi r3, r3, 0x60
/* 809591F8 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 809591FC 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80959200 4B 9E D2 B1 */ bl PSMTXCopy
/* 80959204 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80959208 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 8095920C 80 9F 0B DC */ lwz r4, 0xbdc(r31)
/* 80959210 38 84 00 24 */ addi r4, r4, 0x24
/* 80959214 4B 9E D2 9D */ bl PSMTXCopy
/* 80959218 80 7F 0B DC */ lwz r3, 0xbdc(r31)
/* 8095921C 4B 6B 4A A9 */ bl mDoExt_modelUpdateDL__FP8J3DModel
lbl_80959220:
/* 80959220 38 60 00 01 */ li r3, 1
/* 80959224 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80959228 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8095922C 7C 08 03 A6 */ mtlr r0
/* 80959230 38 21 00 10 */ addi r1, r1, 0x10
/* 80959234 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/EvCut_Introduction__10daNpcAsh_cFi.s
-75
View File
@@ -1,75 +0,0 @@
lbl_8095B48C:
/* 8095B48C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8095B490 7C 08 02 A6 */ mflr r0
/* 8095B494 90 01 00 24 */ stw r0, 0x24(r1)
/* 8095B498 39 61 00 20 */ addi r11, r1, 0x20
/* 8095B49C 4B A0 6D 3D */ bl _savegpr_28
/* 8095B4A0 7C 7C 1B 78 */ mr r28, r3
/* 8095B4A4 7C 9D 23 78 */ mr r29, r4
/* 8095B4A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8095B4AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8095B4B0 3B C3 4F F8 */ addi r30, r3, 0x4ff8
/* 8095B4B4 7F C3 F3 78 */ mr r3, r30
/* 8095B4B8 3C A0 80 96 */ lis r5, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */
/* 8095B4BC 38 A5 D9 10 */ addi r5, r5, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */
/* 8095B4C0 38 A5 00 7B */ addi r5, r5, 0x7b
/* 8095B4C4 38 C0 00 03 */ li r6, 3
/* 8095B4C8 4B 6E CC 25 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
/* 8095B4CC 7C 7F 1B 79 */ or. r31, r3, r3
/* 8095B4D0 40 82 00 0C */ bne lbl_8095B4DC
/* 8095B4D4 38 60 00 00 */ li r3, 0
/* 8095B4D8 48 00 00 9C */ b lbl_8095B574
lbl_8095B4DC:
/* 8095B4DC 7F C3 F3 78 */ mr r3, r30
/* 8095B4E0 7F A4 EB 78 */ mr r4, r29
/* 8095B4E4 4B 6E C8 69 */ bl getIsAddvance__16dEvent_manager_cFi
/* 8095B4E8 2C 03 00 00 */ cmpwi r3, 0
/* 8095B4EC 41 82 00 84 */ beq lbl_8095B570
/* 8095B4F0 80 1F 00 00 */ lwz r0, 0(r31)
/* 8095B4F4 2C 00 00 01 */ cmpwi r0, 1
/* 8095B4F8 41 82 00 48 */ beq lbl_8095B540
/* 8095B4FC 40 80 00 10 */ bge lbl_8095B50C
/* 8095B500 2C 00 00 00 */ cmpwi r0, 0
/* 8095B504 40 80 00 10 */ bge lbl_8095B514
/* 8095B508 48 00 00 68 */ b lbl_8095B570
lbl_8095B50C:
/* 8095B50C 2C 00 00 03 */ cmpwi r0, 3
/* 8095B510 40 80 00 60 */ bge lbl_8095B570
lbl_8095B514:
/* 8095B514 A8 1C 0F 5A */ lha r0, 0xf5a(r28)
/* 8095B518 2C 00 00 00 */ cmpwi r0, 0
/* 8095B51C 40 82 00 10 */ bne lbl_8095B52C
/* 8095B520 80 1C 0C B0 */ lwz r0, 0xcb0(r28)
/* 8095B524 28 00 00 00 */ cmplwi r0, 0
/* 8095B528 41 82 00 10 */ beq lbl_8095B538
lbl_8095B52C:
/* 8095B52C 38 00 00 00 */ li r0, 0
/* 8095B530 B0 1C 0F 5A */ sth r0, 0xf5a(r28)
/* 8095B534 90 1C 0C B0 */ stw r0, 0xcb0(r28)
lbl_8095B538:
/* 8095B538 38 60 00 01 */ li r3, 1
/* 8095B53C 48 00 00 38 */ b lbl_8095B574
lbl_8095B540:
/* 8095B540 A8 1C 0F 5A */ lha r0, 0xf5a(r28)
/* 8095B544 2C 00 00 02 */ cmpwi r0, 2
/* 8095B548 40 82 00 10 */ bne lbl_8095B558
/* 8095B54C 80 1C 0C B0 */ lwz r0, 0xcb0(r28)
/* 8095B550 28 00 00 00 */ cmplwi r0, 0
/* 8095B554 41 82 00 14 */ beq lbl_8095B568
lbl_8095B558:
/* 8095B558 38 00 00 02 */ li r0, 2
/* 8095B55C B0 1C 0F 5A */ sth r0, 0xf5a(r28)
/* 8095B560 38 00 00 00 */ li r0, 0
/* 8095B564 90 1C 0C B0 */ stw r0, 0xcb0(r28)
lbl_8095B568:
/* 8095B568 38 60 00 01 */ li r3, 1
/* 8095B56C 48 00 00 08 */ b lbl_8095B574
lbl_8095B570:
/* 8095B570 38 60 00 00 */ li r3, 0
lbl_8095B574:
/* 8095B574 39 61 00 20 */ addi r11, r1, 0x20
/* 8095B578 4B A0 6C AD */ bl _restgpr_28
/* 8095B57C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8095B580 7C 08 03 A6 */ mtlr r0
/* 8095B584 38 21 00 20 */ addi r1, r1, 0x20
/* 8095B588 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/Execute__10daNpcAsh_cFv.s
-10
View File
@@ -1,10 +0,0 @@
lbl_809590F8:
/* 809590F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 809590FC 7C 08 02 A6 */ mflr r0
/* 80959100 90 01 00 14 */ stw r0, 0x14(r1)
/* 80959104 4B 7F 8F 11 */ bl execute__8daNpcF_cFv
/* 80959108 38 60 00 01 */ li r3, 1
/* 8095910C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80959110 7C 08 03 A6 */ mtlr r0
/* 80959114 38 21 00 10 */ addi r1, r1, 0x10
/* 80959118 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c.s
-9
View File
@@ -1,9 +0,0 @@
lbl_80959458:
/* 80959458 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8095945C 7C 08 02 A6 */ mflr r0
/* 80959460 90 01 00 14 */ stw r0, 0x14(r1)
/* 80959464 4B FF F7 05 */ bl CreateHeap__10daNpcAsh_cFv
/* 80959468 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8095946C 7C 08 03 A6 */ mtlr r0
/* 80959470 38 21 00 10 */ addi r1, r1, 0x10
/* 80959474 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/ctrlJointCallBack__10daNpcAsh_cFP8J3DJointi.s
-21
View File
@@ -1,21 +0,0 @@
lbl_80959478:
/* 80959478 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8095947C 7C 08 02 A6 */ mflr r0
/* 80959480 90 01 00 14 */ stw r0, 0x14(r1)
/* 80959484 7C 60 1B 78 */ mr r0, r3
/* 80959488 2C 04 00 00 */ cmpwi r4, 0
/* 8095948C 40 82 00 24 */ bne lbl_809594B0
/* 80959490 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 80959494 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
/* 80959498 80 A3 00 38 */ lwz r5, 0x38(r3)
/* 8095949C 80 65 00 14 */ lwz r3, 0x14(r5)
/* 809594A0 28 03 00 00 */ cmplwi r3, 0
/* 809594A4 41 82 00 0C */ beq lbl_809594B0
/* 809594A8 7C 04 03 78 */ mr r4, r0
/* 809594AC 4B FF FD 8D */ bl ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel
lbl_809594B0:
/* 809594B0 38 60 00 01 */ li r3, 1
/* 809594B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 809594B8 7C 08 03 A6 */ mtlr r0
/* 809594BC 38 21 00 10 */ addi r1, r1, 0x10
/* 809594C0 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Create__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8095BC38:
/* 8095BC38 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8095BC3C 7C 08 02 A6 */ mflr r0
/* 8095BC40 90 01 00 14 */ stw r0, 0x14(r1)
/* 8095BC44 4B FF CB 5D */ bl Create__10daNpcAsh_cFv
/* 8095BC48 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8095BC4C 7C 08 03 A6 */ mtlr r0
/* 8095BC50 38 21 00 10 */ addi r1, r1, 0x10
/* 8095BC54 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Delete__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8095BC58:
/* 8095BC58 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8095BC5C 7C 08 02 A6 */ mflr r0
/* 8095BC60 90 01 00 14 */ stw r0, 0x14(r1)
/* 8095BC64 4B FF D4 61 */ bl Delete__10daNpcAsh_cFv
/* 8095BC68 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8095BC6C 7C 08 03 A6 */ mtlr r0
/* 8095BC70 38 21 00 10 */ addi r1, r1, 0x10
/* 8095BC74 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Draw__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8095BC98:
/* 8095BC98 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8095BC9C 7C 08 02 A6 */ mflr r0
/* 8095BCA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8095BCA4 4B FF D4 79 */ bl Draw__10daNpcAsh_cFv
/* 8095BCA8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8095BCAC 7C 08 03 A6 */ mtlr r0
/* 8095BCB0 38 21 00 10 */ addi r1, r1, 0x10
/* 8095BCB4 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/daNpcAsh_Execute__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8095BC78:
/* 8095BC78 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8095BC7C 7C 08 02 A6 */ mflr r0
/* 8095BC80 90 01 00 14 */ stw r0, 0x14(r1)
/* 8095BC84 4B FF D4 75 */ bl Execute__10daNpcAsh_cFv
/* 8095BC88 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8095BC8C 7C 08 03 A6 */ mtlr r0
/* 8095BC90 38 21 00 10 */ addi r1, r1, 0x10
/* 8095BC94 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/isSneaking__10daNpcAsh_cFv.s
-31
View File
@@ -1,31 +0,0 @@
lbl_80959BD0:
/* 80959BD0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80959BD4 7C 08 02 A6 */ mflr r0
/* 80959BD8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80959BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80959BE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80959BE4 38 63 4E 00 */ addi r3, r3, 0x4e00
/* 80959BE8 3C 80 80 96 */ lis r4, d_a_npc_ash__stringBase0@ha /* 0x8095D910@ha */
/* 80959BEC 38 84 D9 10 */ addi r4, r4, d_a_npc_ash__stringBase0@l /* 0x8095D910@l */
/* 80959BF0 38 84 00 6C */ addi r4, r4, 0x6c
/* 80959BF4 4B A0 ED A1 */ bl strcmp
/* 80959BF8 2C 03 00 00 */ cmpwi r3, 0
/* 80959BFC 40 82 00 30 */ bne lbl_80959C2C
/* 80959C00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80959C04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80959C08 88 03 4E 0A */ lbz r0, 0x4e0a(r3)
/* 80959C0C 2C 00 00 05 */ cmpwi r0, 5
/* 80959C10 40 82 00 1C */ bne lbl_80959C2C
/* 80959C14 38 60 00 00 */ li r3, 0
/* 80959C18 4B 6D 2D 65 */ bl getLayerNo__14dComIfG_play_cFi
/* 80959C1C 2C 03 00 02 */ cmpwi r3, 2
/* 80959C20 40 82 00 0C */ bne lbl_80959C2C
/* 80959C24 38 60 00 01 */ li r3, 1
/* 80959C28 48 00 00 08 */ b lbl_80959C30
lbl_80959C2C:
/* 80959C2C 38 60 00 00 */ li r3, 0
lbl_80959C30:
/* 80959C30 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80959C34 7C 08 03 A6 */ mtlr r0
/* 80959C38 38 21 00 10 */ addi r1, r1, 0x10
/* 80959C3C 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/main__10daNpcAsh_cFv.s
-170
View File
@@ -1,170 +0,0 @@
lbl_8095BF6C:
/* 8095BF6C 94 21 FF 50 */ stwu r1, -0xb0(r1)
/* 8095BF70 7C 08 02 A6 */ mflr r0
/* 8095BF74 90 01 00 B4 */ stw r0, 0xb4(r1)
/* 8095BF78 93 E1 00 AC */ stw r31, 0xac(r1)
/* 8095BF7C 93 C1 00 A8 */ stw r30, 0xa8(r1)
/* 8095BF80 7C 7E 1B 78 */ mr r30, r3
/* 8095BF84 3C 60 80 96 */ lis r3, m__16daNpcAsh_Param_c@ha /* 0x8095D640@ha */
/* 8095BF88 3B E3 D6 40 */ addi r31, r3, m__16daNpcAsh_Param_c@l /* 0x8095D640@l */
/* 8095BF8C 38 7E 0F 30 */ addi r3, r30, 0xf30
/* 8095BF90 4B A0 60 89 */ bl __ptmf_test
/* 8095BF94 2C 03 00 00 */ cmpwi r3, 0
/* 8095BF98 41 82 00 18 */ beq lbl_8095BFB0
/* 8095BF9C 7F C3 F3 78 */ mr r3, r30
/* 8095BFA0 38 80 00 00 */ li r4, 0
/* 8095BFA4 39 9E 0F 30 */ addi r12, r30, 0xf30
/* 8095BFA8 4B A0 60 DD */ bl __ptmf_scall
/* 8095BFAC 60 00 00 00 */ nop
lbl_8095BFB0:
/* 8095BFB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8095BFB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8095BFB8 88 03 4F AD */ lbz r0, 0x4fad(r3)
/* 8095BFBC 28 00 00 00 */ cmplwi r0, 0
/* 8095BFC0 41 82 00 30 */ beq lbl_8095BFF0
/* 8095BFC4 A0 1E 00 F8 */ lhz r0, 0xf8(r30)
/* 8095BFC8 28 00 00 01 */ cmplwi r0, 1
/* 8095BFCC 41 82 00 24 */ beq lbl_8095BFF0
/* 8095BFD0 80 9E 0F 4C */ lwz r4, 0xf4c(r30)
/* 8095BFD4 3C 04 00 01 */ addis r0, r4, 1
/* 8095BFD8 28 00 FF FF */ cmplwi r0, 0xffff
/* 8095BFDC 41 82 00 14 */ beq lbl_8095BFF0
/* 8095BFE0 38 63 4E C8 */ addi r3, r3, 0x4ec8
/* 8095BFE4 4B 6E 77 09 */ bl setPtI_Id__14dEvt_control_cFUi
/* 8095BFE8 38 00 FF FF */ li r0, -1
/* 8095BFEC 90 1E 0F 4C */ stw r0, 0xf4c(r30)
lbl_8095BFF0:
/* 8095BFF0 80 7F 00 90 */ lwz r3, 0x90(r31)
/* 8095BFF4 80 1F 00 94 */ lwz r0, 0x94(r31)
/* 8095BFF8 90 61 00 28 */ stw r3, 0x28(r1)
/* 8095BFFC 90 01 00 2C */ stw r0, 0x2c(r1)
/* 8095C000 80 1F 00 98 */ lwz r0, 0x98(r31)
/* 8095C004 90 01 00 30 */ stw r0, 0x30(r1)
/* 8095C008 38 7F 00 00 */ addi r3, r31, 0
/* 8095C00C C0 03 00 44 */ lfs f0, 0x44(r3)
/* 8095C010 D0 01 00 2C */ stfs f0, 0x2c(r1)
/* 8095C014 80 1F 00 9C */ lwz r0, 0x9c(r31)
/* 8095C018 90 01 00 08 */ stw r0, 8(r1)
/* 8095C01C 38 01 00 28 */ addi r0, r1, 0x28
/* 8095C020 90 01 00 08 */ stw r0, 8(r1)
/* 8095C024 80 7F 00 A0 */ lwz r3, 0xa0(r31)
/* 8095C028 80 1F 00 A4 */ lwz r0, 0xa4(r31)
/* 8095C02C 90 61 00 34 */ stw r3, 0x34(r1)
/* 8095C030 90 01 00 38 */ stw r0, 0x38(r1)
/* 8095C034 80 1F 00 A8 */ lwz r0, 0xa8(r31)
/* 8095C038 90 01 00 3C */ stw r0, 0x3c(r1)
/* 8095C03C D0 01 00 38 */ stfs f0, 0x38(r1)
/* 8095C040 80 1F 00 AC */ lwz r0, 0xac(r31)
/* 8095C044 90 01 00 0C */ stw r0, 0xc(r1)
/* 8095C048 38 01 00 34 */ addi r0, r1, 0x34
/* 8095C04C 90 01 00 0C */ stw r0, 0xc(r1)
/* 8095C050 80 7F 00 B0 */ lwz r3, 0xb0(r31)
/* 8095C054 80 1F 00 B4 */ lwz r0, 0xb4(r31)
/* 8095C058 90 61 00 40 */ stw r3, 0x40(r1)
/* 8095C05C 90 01 00 44 */ stw r0, 0x44(r1)
/* 8095C060 80 1F 00 B8 */ lwz r0, 0xb8(r31)
/* 8095C064 90 01 00 48 */ stw r0, 0x48(r1)
/* 8095C068 D0 01 00 44 */ stfs f0, 0x44(r1)
/* 8095C06C 80 1F 00 BC */ lwz r0, 0xbc(r31)
/* 8095C070 90 01 00 10 */ stw r0, 0x10(r1)
/* 8095C074 38 01 00 40 */ addi r0, r1, 0x40
/* 8095C078 90 01 00 10 */ stw r0, 0x10(r1)
/* 8095C07C 80 7F 00 C0 */ lwz r3, 0xc0(r31)
/* 8095C080 80 1F 00 C4 */ lwz r0, 0xc4(r31)
/* 8095C084 90 61 00 4C */ stw r3, 0x4c(r1)
/* 8095C088 90 01 00 50 */ stw r0, 0x50(r1)
/* 8095C08C 80 1F 00 C8 */ lwz r0, 0xc8(r31)
/* 8095C090 90 01 00 54 */ stw r0, 0x54(r1)
/* 8095C094 D0 01 00 50 */ stfs f0, 0x50(r1)
/* 8095C098 80 1F 00 CC */ lwz r0, 0xcc(r31)
/* 8095C09C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8095C0A0 38 01 00 4C */ addi r0, r1, 0x4c
/* 8095C0A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8095C0A8 80 7F 00 D0 */ lwz r3, 0xd0(r31)
/* 8095C0AC 80 1F 00 D4 */ lwz r0, 0xd4(r31)
/* 8095C0B0 90 61 00 58 */ stw r3, 0x58(r1)
/* 8095C0B4 90 01 00 5C */ stw r0, 0x5c(r1)
/* 8095C0B8 80 1F 00 D8 */ lwz r0, 0xd8(r31)
/* 8095C0BC 90 01 00 60 */ stw r0, 0x60(r1)
/* 8095C0C0 D0 01 00 5C */ stfs f0, 0x5c(r1)
/* 8095C0C4 80 1F 00 DC */ lwz r0, 0xdc(r31)
/* 8095C0C8 90 01 00 18 */ stw r0, 0x18(r1)
/* 8095C0CC 38 01 00 58 */ addi r0, r1, 0x58
/* 8095C0D0 90 01 00 18 */ stw r0, 0x18(r1)
/* 8095C0D4 80 7F 00 E0 */ lwz r3, 0xe0(r31)
/* 8095C0D8 80 1F 00 E4 */ lwz r0, 0xe4(r31)
/* 8095C0DC 90 61 00 64 */ stw r3, 0x64(r1)
/* 8095C0E0 90 01 00 68 */ stw r0, 0x68(r1)
/* 8095C0E4 80 1F 00 E8 */ lwz r0, 0xe8(r31)
/* 8095C0E8 90 01 00 6C */ stw r0, 0x6c(r1)
/* 8095C0EC D0 01 00 68 */ stfs f0, 0x68(r1)
/* 8095C0F0 80 1F 00 EC */ lwz r0, 0xec(r31)
/* 8095C0F4 90 01 00 1C */ stw r0, 0x1c(r1)
/* 8095C0F8 38 01 00 64 */ addi r0, r1, 0x64
/* 8095C0FC 90 01 00 1C */ stw r0, 0x1c(r1)
/* 8095C100 80 7F 00 F0 */ lwz r3, 0xf0(r31)
/* 8095C104 80 1F 00 F4 */ lwz r0, 0xf4(r31)
/* 8095C108 90 61 00 70 */ stw r3, 0x70(r1)
/* 8095C10C 90 01 00 74 */ stw r0, 0x74(r1)
/* 8095C110 80 1F 00 F8 */ lwz r0, 0xf8(r31)
/* 8095C114 90 01 00 78 */ stw r0, 0x78(r1)
/* 8095C118 D0 01 00 74 */ stfs f0, 0x74(r1)
/* 8095C11C 80 1F 00 FC */ lwz r0, 0xfc(r31)
/* 8095C120 90 01 00 20 */ stw r0, 0x20(r1)
/* 8095C124 38 01 00 70 */ addi r0, r1, 0x70
/* 8095C128 90 01 00 20 */ stw r0, 0x20(r1)
/* 8095C12C 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8095C130 80 1F 01 04 */ lwz r0, 0x104(r31)
/* 8095C134 90 61 00 7C */ stw r3, 0x7c(r1)
/* 8095C138 90 01 00 80 */ stw r0, 0x80(r1)
/* 8095C13C 80 1F 01 08 */ lwz r0, 0x108(r31)
/* 8095C140 90 01 00 84 */ stw r0, 0x84(r1)
/* 8095C144 D0 01 00 80 */ stfs f0, 0x80(r1)
/* 8095C148 80 1F 01 0C */ lwz r0, 0x10c(r31)
/* 8095C14C 90 01 00 24 */ stw r0, 0x24(r1)
/* 8095C150 38 01 00 7C */ addi r0, r1, 0x7c
/* 8095C154 90 01 00 24 */ stw r0, 0x24(r1)
/* 8095C158 38 A1 00 84 */ addi r5, r1, 0x84
/* 8095C15C 38 9F 01 0C */ addi r4, r31, 0x10c
/* 8095C160 38 00 00 04 */ li r0, 4
/* 8095C164 7C 09 03 A6 */ mtctr r0
lbl_8095C168:
/* 8095C168 80 64 00 04 */ lwz r3, 4(r4)
/* 8095C16C 84 04 00 08 */ lwzu r0, 8(r4)
/* 8095C170 90 65 00 04 */ stw r3, 4(r5)
/* 8095C174 94 05 00 08 */ stwu r0, 8(r5)
/* 8095C178 42 00 FF F0 */ bdnz lbl_8095C168
/* 8095C17C 38 01 00 08 */ addi r0, r1, 8
/* 8095C180 90 01 00 88 */ stw r0, 0x88(r1)
/* 8095C184 38 01 00 0C */ addi r0, r1, 0xc
/* 8095C188 90 01 00 8C */ stw r0, 0x8c(r1)
/* 8095C18C 38 01 00 10 */ addi r0, r1, 0x10
/* 8095C190 90 01 00 90 */ stw r0, 0x90(r1)
/* 8095C194 38 01 00 14 */ addi r0, r1, 0x14
/* 8095C198 90 01 00 94 */ stw r0, 0x94(r1)
/* 8095C19C 38 01 00 18 */ addi r0, r1, 0x18
/* 8095C1A0 90 01 00 98 */ stw r0, 0x98(r1)
/* 8095C1A4 38 01 00 1C */ addi r0, r1, 0x1c
/* 8095C1A8 90 01 00 9C */ stw r0, 0x9c(r1)
/* 8095C1AC 38 01 00 20 */ addi r0, r1, 0x20
/* 8095C1B0 90 01 00 A0 */ stw r0, 0xa0(r1)
/* 8095C1B4 38 01 00 24 */ addi r0, r1, 0x24
/* 8095C1B8 90 01 00 A4 */ stw r0, 0xa4(r1)
/* 8095C1BC A8 7E 09 DE */ lha r3, 0x9de(r30)
/* 8095C1C0 7C 60 07 35 */ extsh. r0, r3
/* 8095C1C4 41 80 00 18 */ blt lbl_8095C1DC
/* 8095C1C8 2C 03 00 08 */ cmpwi r3, 8
/* 8095C1CC 40 80 00 10 */ bge lbl_8095C1DC
/* 8095C1D0 7F C3 F3 78 */ mr r3, r30
/* 8095C1D4 38 81 00 88 */ addi r4, r1, 0x88
/* 8095C1D8 4B 7F 6F 79 */ bl playExpressionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData
lbl_8095C1DC:
/* 8095C1DC 7F C3 F3 78 */ mr r3, r30
/* 8095C1E0 48 00 00 21 */ bl playMotion__10daNpcAsh_cFv
/* 8095C1E4 38 60 00 01 */ li r3, 1
/* 8095C1E8 83 E1 00 AC */ lwz r31, 0xac(r1)
/* 8095C1EC 83 C1 00 A8 */ lwz r30, 0xa8(r1)
/* 8095C1F0 80 01 00 B4 */ lwz r0, 0xb4(r1)
/* 8095C1F4 7C 08 03 A6 */ mtlr r0
/* 8095C1F8 38 21 00 B0 */ addi r1, r1, 0xb0
/* 8095C1FC 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b.s
-45
View File
@@ -1,45 +0,0 @@
lbl_80959B28:
/* 80959B28 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80959B2C 7C 08 02 A6 */ mflr r0
/* 80959B30 90 01 00 14 */ stw r0, 0x14(r1)
/* 80959B34 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80959B38 93 C1 00 08 */ stw r30, 8(r1)
/* 80959B3C 7C 7E 1B 78 */ mr r30, r3
/* 80959B40 7C 9F 23 78 */ mr r31, r4
/* 80959B44 38 00 00 03 */ li r0, 3
/* 80959B48 B0 03 0F 5C */ sth r0, 0xf5c(r3)
/* 80959B4C 38 7E 0F 30 */ addi r3, r30, 0xf30
/* 80959B50 4B A0 84 C9 */ bl __ptmf_test
/* 80959B54 2C 03 00 00 */ cmpwi r3, 0
/* 80959B58 41 82 00 18 */ beq lbl_80959B70
/* 80959B5C 7F C3 F3 78 */ mr r3, r30
/* 80959B60 38 80 00 00 */ li r4, 0
/* 80959B64 39 9E 0F 30 */ addi r12, r30, 0xf30
/* 80959B68 4B A0 85 1D */ bl __ptmf_scall
/* 80959B6C 60 00 00 00 */ nop
lbl_80959B70:
/* 80959B70 38 00 00 00 */ li r0, 0
/* 80959B74 B0 1E 0F 5C */ sth r0, 0xf5c(r30)
/* 80959B78 80 7F 00 00 */ lwz r3, 0(r31)
/* 80959B7C 80 1F 00 04 */ lwz r0, 4(r31)
/* 80959B80 90 7E 0F 30 */ stw r3, 0xf30(r30)
/* 80959B84 90 1E 0F 34 */ stw r0, 0xf34(r30)
/* 80959B88 80 1F 00 08 */ lwz r0, 8(r31)
/* 80959B8C 90 1E 0F 38 */ stw r0, 0xf38(r30)
/* 80959B90 38 7E 0F 30 */ addi r3, r30, 0xf30
/* 80959B94 4B A0 84 85 */ bl __ptmf_test
/* 80959B98 2C 03 00 00 */ cmpwi r3, 0
/* 80959B9C 41 82 00 18 */ beq lbl_80959BB4
/* 80959BA0 7F C3 F3 78 */ mr r3, r30
/* 80959BA4 38 80 00 00 */ li r4, 0
/* 80959BA8 39 9E 0F 30 */ addi r12, r30, 0xf30
/* 80959BAC 4B A0 84 D9 */ bl __ptmf_scall
/* 80959BB0 60 00 00 00 */ nop
lbl_80959BB4:
/* 80959BB4 38 60 00 01 */ li r3, 1
/* 80959BB8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80959BBC 83 C1 00 08 */ lwz r30, 8(r1)
/* 80959BC0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80959BC4 7C 08 03 A6 */ mtlr r0
/* 80959BC8 38 21 00 10 */ addi r1, r1, 0x10
/* 80959BCC 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setExpression__10daNpcAsh_cFif.s
-12
View File
@@ -1,12 +0,0 @@
lbl_8095A6C0:
/* 8095A6C0 2C 04 00 00 */ cmpwi r4, 0
/* 8095A6C4 4D 80 00 20 */ bltlr
/* 8095A6C8 2C 04 00 08 */ cmpwi r4, 8
/* 8095A6CC 4C 80 00 20 */ bgelr
/* 8095A6D0 B0 83 09 DE */ sth r4, 0x9de(r3)
/* 8095A6D4 D0 23 09 74 */ stfs f1, 0x974(r3)
/* 8095A6D8 38 00 FF FF */ li r0, -1
/* 8095A6DC B0 03 09 D8 */ sth r0, 0x9d8(r3)
/* 8095A6E0 38 00 00 00 */ li r0, 0
/* 8095A6E4 B0 03 09 D6 */ sth r0, 0x9d6(r3)
/* 8095A6E8 4E 80 00 20 */ blr
asm/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash/setMotion__10daNpcAsh_cFifi.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8095A67C:
/* 8095A67C 7C 86 07 34 */ extsh r6, r4
/* 8095A680 2C 05 00 00 */ cmpwi r5, 0
/* 8095A684 40 82 00 10 */ bne lbl_8095A694
/* 8095A688 A8 03 09 E0 */ lha r0, 0x9e0(r3)
/* 8095A68C 7C 00 30 00 */ cmpw r0, r6
/* 8095A690 4D 82 00 20 */ beqlr
lbl_8095A694:
/* 8095A694 2C 04 00 00 */ cmpwi r4, 0
/* 8095A698 4D 80 00 20 */ bltlr
/* 8095A69C 2C 04 00 0A */ cmpwi r4, 0xa
/* 8095A6A0 4C 80 00 20 */ bgelr
/* 8095A6A4 B0 C3 09 E0 */ sth r6, 0x9e0(r3)
/* 8095A6A8 D0 23 09 7C */ stfs f1, 0x97c(r3)
/* 8095A6AC 38 00 FF FF */ li r0, -1
/* 8095A6B0 B0 03 09 DC */ sth r0, 0x9dc(r3)
/* 8095A6B4 38 00 00 00 */ li r0, 0
/* 8095A6B8 B0 03 09 DA */ sth r0, 0x9da(r3)
/* 8095A6BC 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s
-95
View File
@@ -1,95 +0,0 @@
lbl_8048C730:
/* 8048C730 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8048C734 7C 08 02 A6 */ mflr r0
/* 8048C738 90 01 00 24 */ stw r0, 0x24(r1)
/* 8048C73C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8048C740 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8048C744 7C 7F 1B 78 */ mr r31, r3
/* 8048C748 88 03 04 BA */ lbz r0, 0x4ba(r3)
/* 8048C74C 7C 05 07 74 */ extsb r5, r0
/* 8048C750 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */
/* 8048C754 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */
/* 8048C758 7C 00 07 74 */ extsb r0, r0
/* 8048C75C 7C 05 00 00 */ cmpw r5, r0
/* 8048C760 40 82 01 18 */ bne lbl_8048C878
/* 8048C764 48 00 01 39 */ bl isDelete__15daTag_EvtArea_cFv
/* 8048C768 2C 03 00 00 */ cmpwi r3, 0
/* 8048C76C 41 82 00 14 */ beq lbl_8048C780
/* 8048C770 7F E3 FB 78 */ mr r3, r31
/* 8048C774 4B B8 D5 09 */ bl fopAcM_delete__FP10fopAc_ac_c
/* 8048C778 38 60 00 01 */ li r3, 1
/* 8048C77C 48 00 01 00 */ b lbl_8048C87C
lbl_8048C780:
/* 8048C780 C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
/* 8048C784 D0 1F 05 50 */ stfs f0, 0x550(r31)
/* 8048C788 C0 1F 04 D4 */ lfs f0, 0x4d4(r31)
/* 8048C78C D0 1F 05 54 */ stfs f0, 0x554(r31)
/* 8048C790 C0 1F 04 D8 */ lfs f0, 0x4d8(r31)
/* 8048C794 D0 1F 05 58 */ stfs f0, 0x558(r31)
/* 8048C798 A8 1F 04 E8 */ lha r0, 0x4e8(r31)
/* 8048C79C 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8048C7A0 38 03 FF 01 */ addi r0, r3, -255
/* 8048C7A4 30 00 FF FF */ addic r0, r0, -1
/* 8048C7A8 7C 00 01 10 */ subfe r0, r0, r0
/* 8048C7AC 7C 60 00 78 */ andc r0, r3, r0
/* 8048C7B0 2C 00 00 08 */ cmpwi r0, 8
/* 8048C7B4 40 82 00 18 */ bne lbl_8048C7CC
/* 8048C7B8 C0 3F 05 54 */ lfs f1, 0x554(r31)
/* 8048C7BC 3C 60 80 49 */ lis r3, lit_3853@ha /* 0x8048CDD0@ha */
/* 8048C7C0 C0 03 CD D0 */ lfs f0, lit_3853@l(r3) /* 0x8048CDD0@l */
/* 8048C7C4 EC 01 00 2A */ fadds f0, f1, f0
/* 8048C7C8 D0 1F 05 54 */ stfs f0, 0x554(r31)
lbl_8048C7CC:
/* 8048C7CC 38 00 00 00 */ li r0, 0
/* 8048C7D0 98 1F 04 96 */ stb r0, 0x496(r31)
/* 8048C7D4 C0 1F 05 50 */ lfs f0, 0x550(r31)
/* 8048C7D8 D0 1F 05 38 */ stfs f0, 0x538(r31)
/* 8048C7DC C0 1F 05 54 */ lfs f0, 0x554(r31)
/* 8048C7E0 D0 1F 05 3C */ stfs f0, 0x53c(r31)
/* 8048C7E4 C0 1F 05 58 */ lfs f0, 0x558(r31)
/* 8048C7E8 D0 1F 05 40 */ stfs f0, 0x540(r31)
/* 8048C7EC A8 1F 04 E8 */ lha r0, 0x4e8(r31)
/* 8048C7F0 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8048C7F4 38 03 FF 01 */ addi r0, r3, -255
/* 8048C7F8 30 00 FF FF */ addic r0, r0, -1
/* 8048C7FC 7C 00 01 10 */ subfe r0, r0, r0
/* 8048C800 7C 60 00 78 */ andc r0, r3, r0
/* 8048C804 2C 00 00 0F */ cmpwi r0, 0xf
/* 8048C808 40 82 00 60 */ bne lbl_8048C868
/* 8048C80C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8048C810 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8048C814 80 7E 5D AC */ lwz r3, 0x5dac(r30)
/* 8048C818 C0 03 04 D0 */ lfs f0, 0x4d0(r3)
/* 8048C81C D0 01 00 08 */ stfs f0, 8(r1)
/* 8048C820 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
/* 8048C824 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 8048C828 C0 03 04 D8 */ lfs f0, 0x4d8(r3)
/* 8048C82C D0 01 00 10 */ stfs f0, 0x10(r1)
/* 8048C830 7F E3 FB 78 */ mr r3, r31
/* 8048C834 38 81 00 08 */ addi r4, r1, 8
/* 8048C838 48 00 04 D1 */ bl chkPointInArea__15daTag_EvtArea_cF4cXyz
/* 8048C83C 2C 03 00 00 */ cmpwi r3, 0
/* 8048C840 41 82 00 28 */ beq lbl_8048C868
/* 8048C844 80 7E 5D AC */ lwz r3, 0x5dac(r30)
/* 8048C848 C0 03 05 38 */ lfs f0, 0x538(r3)
/* 8048C84C D0 1F 05 38 */ stfs f0, 0x538(r31)
/* 8048C850 C0 03 05 3C */ lfs f0, 0x53c(r3)
/* 8048C854 D0 1F 05 3C */ stfs f0, 0x53c(r31)
/* 8048C858 C0 03 05 40 */ lfs f0, 0x540(r3)
/* 8048C85C D0 1F 05 40 */ stfs f0, 0x540(r31)
/* 8048C860 38 00 00 04 */ li r0, 4
/* 8048C864 98 1F 04 96 */ stb r0, 0x496(r31)
lbl_8048C868:
/* 8048C868 38 00 00 00 */ li r0, 0
/* 8048C86C 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 8048C870 38 60 00 01 */ li r3, 1
/* 8048C874 48 00 00 08 */ b lbl_8048C87C
lbl_8048C878:
/* 8048C878 38 60 00 00 */ li r3, 0
lbl_8048C87C:
/* 8048C87C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8048C880 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 8048C884 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8048C888 7C 08 03 A6 */ mtlr r0
/* 8048C88C 38 21 00 20 */ addi r1, r1, 0x20
/* 8048C890 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/__dt__15daTag_EvtArea_cFv.s
-26
View File
@@ -1,26 +0,0 @@
lbl_8048CD68:
/* 8048CD68 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8048CD6C 7C 08 02 A6 */ mflr r0
/* 8048CD70 90 01 00 14 */ stw r0, 0x14(r1)
/* 8048CD74 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8048CD78 93 C1 00 08 */ stw r30, 8(r1)
/* 8048CD7C 7C 7E 1B 79 */ or. r30, r3, r3
/* 8048CD80 7C 9F 23 78 */ mr r31, r4
/* 8048CD84 41 82 00 28 */ beq lbl_8048CDAC
/* 8048CD88 3C 80 80 49 */ lis r4, __vt__15daTag_EvtArea_c@ha /* 0x8048CE98@ha */
/* 8048CD8C 38 04 CE 98 */ addi r0, r4, __vt__15daTag_EvtArea_c@l /* 0x8048CE98@l */
/* 8048CD90 90 1E 05 68 */ stw r0, 0x568(r30)
/* 8048CD94 38 80 00 00 */ li r4, 0
/* 8048CD98 4B B8 BE F5 */ bl __dt__10fopAc_ac_cFv
/* 8048CD9C 7F E0 07 35 */ extsh. r0, r31
/* 8048CDA0 40 81 00 0C */ ble lbl_8048CDAC
/* 8048CDA4 7F C3 F3 78 */ mr r3, r30
/* 8048CDA8 4B E4 1F 95 */ bl __dl__FPv
lbl_8048CDAC:
/* 8048CDAC 7F C3 F3 78 */ mr r3, r30
/* 8048CDB0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8048CDB4 83 C1 00 08 */ lwz r30, 8(r1)
/* 8048CDB8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8048CDBC 7C 08 03 A6 */ mtlr r0
/* 8048CDC0 38 21 00 10 */ addi r1, r1, 0x10
/* 8048CDC4 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz.s
-25
View File
@@ -1,25 +0,0 @@
lbl_8048CD08:
/* 8048CD08 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8048CD0C 7C 08 02 A6 */ mflr r0
/* 8048CD10 90 01 00 34 */ stw r0, 0x34(r1)
/* 8048CD14 3C A0 80 49 */ lis r5, lit_3922@ha /* 0x8048CDE0@ha */
/* 8048CD18 C0 25 CD E0 */ lfs f1, lit_3922@l(r5) /* 0x8048CDE0@l */
/* 8048CD1C D0 21 00 20 */ stfs f1, 0x20(r1)
/* 8048CD20 D0 21 00 24 */ stfs f1, 0x24(r1)
/* 8048CD24 D0 21 00 28 */ stfs f1, 0x28(r1)
/* 8048CD28 C0 04 00 00 */ lfs f0, 0(r4)
/* 8048CD2C D0 01 00 14 */ stfs f0, 0x14(r1)
/* 8048CD30 C0 04 00 04 */ lfs f0, 4(r4)
/* 8048CD34 D0 01 00 18 */ stfs f0, 0x18(r1)
/* 8048CD38 C0 04 00 08 */ lfs f0, 8(r4)
/* 8048CD3C D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 8048CD40 D0 21 00 08 */ stfs f1, 8(r1)
/* 8048CD44 D0 21 00 0C */ stfs f1, 0xc(r1)
/* 8048CD48 D0 21 00 10 */ stfs f1, 0x10(r1)
/* 8048CD4C 38 81 00 14 */ addi r4, r1, 0x14
/* 8048CD50 38 A1 00 08 */ addi r5, r1, 8
/* 8048CD54 4B FF FB F9 */ bl chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz
/* 8048CD58 80 01 00 34 */ lwz r0, 0x34(r1)
/* 8048CD5C 7C 08 03 A6 */ mtlr r0
/* 8048CD60 38 21 00 30 */ addi r1, r1, 0x30
/* 8048CD64 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz.s
-217
View File
@@ -1,217 +0,0 @@
lbl_8048C94C:
/* 8048C94C 94 21 FF 20 */ stwu r1, -0xe0(r1)
/* 8048C950 7C 08 02 A6 */ mflr r0
/* 8048C954 90 01 00 E4 */ stw r0, 0xe4(r1)
/* 8048C958 39 61 00 E0 */ addi r11, r1, 0xe0
/* 8048C95C 4B ED 58 81 */ bl _savegpr_29
/* 8048C960 7C 7D 1B 78 */ mr r29, r3
/* 8048C964 7C 9E 23 78 */ mr r30, r4
/* 8048C968 7C BF 2B 78 */ mr r31, r5
/* 8048C96C 88 03 05 6C */ lbz r0, 0x56c(r3)
/* 8048C970 28 00 00 00 */ cmplwi r0, 0
/* 8048C974 40 82 02 F0 */ bne lbl_8048CC64
/* 8048C978 80 1D 00 B0 */ lwz r0, 0xb0(r29)
/* 8048C97C 54 04 05 3E */ clrlwi r4, r0, 0x14
/* 8048C980 28 04 0F FF */ cmplwi r4, 0xfff
/* 8048C984 38 60 FF FF */ li r3, -1
/* 8048C988 41 82 00 08 */ beq lbl_8048C990
/* 8048C98C 7C 83 23 78 */ mr r3, r4
lbl_8048C990:
/* 8048C990 3C 03 00 01 */ addis r0, r3, 1
/* 8048C994 28 00 FF FF */ cmplwi r0, 0xffff
/* 8048C998 41 82 00 20 */ beq lbl_8048C9B8
/* 8048C99C 28 04 0F FF */ cmplwi r4, 0xfff
/* 8048C9A0 38 60 FF FF */ li r3, -1
/* 8048C9A4 41 82 00 08 */ beq lbl_8048C9AC
/* 8048C9A8 7C 83 23 78 */ mr r3, r4
lbl_8048C9AC:
/* 8048C9AC 4B CC 01 01 */ bl daNpcT_chkEvtBit__FUl
/* 8048C9B0 2C 03 00 00 */ cmpwi r3, 0
/* 8048C9B4 40 82 00 64 */ bne lbl_8048CA18
lbl_8048C9B8:
/* 8048C9B8 A8 1D 04 B4 */ lha r0, 0x4b4(r29)
/* 8048C9BC 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8048C9C0 28 04 00 FF */ cmplwi r4, 0xff
/* 8048C9C4 41 82 00 20 */ beq lbl_8048C9E4
/* 8048C9C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8048C9CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8048C9D0 88 1D 04 E2 */ lbz r0, 0x4e2(r29)
/* 8048C9D4 7C 05 07 74 */ extsb r5, r0
/* 8048C9D8 4B BA 89 89 */ bl isSwitch__10dSv_info_cCFii
/* 8048C9DC 2C 03 00 00 */ cmpwi r3, 0
/* 8048C9E0 40 82 00 38 */ bne lbl_8048CA18
lbl_8048C9E4:
/* 8048C9E4 80 1D 00 B0 */ lwz r0, 0xb0(r29)
/* 8048C9E8 54 00 05 3E */ clrlwi r0, r0, 0x14
/* 8048C9EC 28 00 0F FF */ cmplwi r0, 0xfff
/* 8048C9F0 38 60 FF FF */ li r3, -1
/* 8048C9F4 41 82 00 08 */ beq lbl_8048C9FC
/* 8048C9F8 7C 03 03 78 */ mr r3, r0
lbl_8048C9FC:
/* 8048C9FC 3C 03 00 01 */ addis r0, r3, 1
/* 8048CA00 28 00 FF FF */ cmplwi r0, 0xffff
/* 8048CA04 40 82 02 60 */ bne lbl_8048CC64
/* 8048CA08 A8 1D 04 B4 */ lha r0, 0x4b4(r29)
/* 8048CA0C 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 8048CA10 28 00 00 FF */ cmplwi r0, 0xff
/* 8048CA14 40 82 02 50 */ bne lbl_8048CC64
lbl_8048CA18:
/* 8048CA18 38 61 00 5C */ addi r3, r1, 0x5c
/* 8048CA1C 38 9D 04 EC */ addi r4, r29, 0x4ec
/* 8048CA20 7F E5 FB 78 */ mr r5, r31
/* 8048CA24 4B DD A0 C1 */ bl __pl__4cXyzCFRC3Vec
/* 8048CA28 C0 C1 00 5C */ lfs f6, 0x5c(r1)
/* 8048CA2C D0 C1 00 8C */ stfs f6, 0x8c(r1)
/* 8048CA30 C0 A1 00 60 */ lfs f5, 0x60(r1)
/* 8048CA34 D0 A1 00 90 */ stfs f5, 0x90(r1)
/* 8048CA38 C0 81 00 64 */ lfs f4, 0x64(r1)
/* 8048CA3C D0 81 00 94 */ stfs f4, 0x94(r1)
/* 8048CA40 A8 1D 04 E8 */ lha r0, 0x4e8(r29)
/* 8048CA44 54 05 06 3E */ clrlwi r5, r0, 0x18
/* 8048CA48 38 85 FF 01 */ addi r4, r5, -255
/* 8048CA4C 30 04 FF FF */ addic r0, r4, -1
/* 8048CA50 7C 00 01 10 */ subfe r0, r0, r0
/* 8048CA54 7C A0 00 78 */ andc r0, r5, r0
/* 8048CA58 2C 00 00 0F */ cmpwi r0, 0xf
/* 8048CA5C 41 82 00 18 */ beq lbl_8048CA74
/* 8048CA60 30 04 FF FF */ addic r0, r4, -1
/* 8048CA64 7C 00 01 10 */ subfe r0, r0, r0
/* 8048CA68 7C A0 00 78 */ andc r0, r5, r0
/* 8048CA6C 2C 00 00 10 */ cmpwi r0, 0x10
/* 8048CA70 40 82 01 20 */ bne lbl_8048CB90
lbl_8048CA74:
/* 8048CA74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8048CA78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8048CA7C 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 8048CA80 C0 03 04 D0 */ lfs f0, 0x4d0(r3)
/* 8048CA84 D0 01 00 74 */ stfs f0, 0x74(r1)
/* 8048CA88 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
/* 8048CA8C D0 01 00 78 */ stfs f0, 0x78(r1)
/* 8048CA90 C0 03 04 D8 */ lfs f0, 0x4d8(r3)
/* 8048CA94 D0 01 00 7C */ stfs f0, 0x7c(r1)
/* 8048CA98 38 61 00 74 */ addi r3, r1, 0x74
/* 8048CA9C 38 9D 04 A8 */ addi r4, r29, 0x4a8
/* 8048CAA0 7C 65 1B 78 */ mr r5, r3
/* 8048CAA4 4B EB A6 11 */ bl PSVECSubtract
/* 8048CAA8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 8048CAAC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 8048CAB0 A8 1D 04 DE */ lha r0, 0x4de(r29)
/* 8048CAB4 7C 00 00 D0 */ neg r0, r0
/* 8048CAB8 7C 04 07 34 */ extsh r4, r0
/* 8048CABC 4B B7 F9 21 */ bl mDoMtx_YrotS__FPA4_fs
/* 8048CAC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 8048CAC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 8048CAC8 38 81 00 74 */ addi r4, r1, 0x74
/* 8048CACC 7C 85 23 78 */ mr r5, r4
/* 8048CAD0 4B EB A2 9D */ bl PSMTXMultVec
/* 8048CAD4 C0 21 00 8C */ lfs f1, 0x8c(r1)
/* 8048CAD8 FC 00 08 50 */ fneg f0, f1
/* 8048CADC D0 01 00 98 */ stfs f0, 0x98(r1)
/* 8048CAE0 C0 61 00 94 */ lfs f3, 0x94(r1)
/* 8048CAE4 FC 40 18 50 */ fneg f2, f3
/* 8048CAE8 D0 41 00 A0 */ stfs f2, 0xa0(r1)
/* 8048CAEC D0 21 00 A4 */ stfs f1, 0xa4(r1)
/* 8048CAF0 D0 41 00 AC */ stfs f2, 0xac(r1)
/* 8048CAF4 D0 21 00 B0 */ stfs f1, 0xb0(r1)
/* 8048CAF8 D0 61 00 B8 */ stfs f3, 0xb8(r1)
/* 8048CAFC D0 01 00 BC */ stfs f0, 0xbc(r1)
/* 8048CB00 D0 61 00 C4 */ stfs f3, 0xc4(r1)
/* 8048CB04 FC 00 00 18 */ frsp f0, f0
/* 8048CB08 C0 81 00 74 */ lfs f4, 0x74(r1)
/* 8048CB0C FC 00 20 40 */ fcmpo cr0, f0, f4
/* 8048CB10 40 80 01 54 */ bge lbl_8048CC64
/* 8048CB14 FC 00 10 18 */ frsp f0, f2
/* 8048CB18 C0 41 00 7C */ lfs f2, 0x7c(r1)
/* 8048CB1C FC 00 10 40 */ fcmpo cr0, f0, f2
/* 8048CB20 40 80 01 44 */ bge lbl_8048CC64
/* 8048CB24 FC 01 20 40 */ fcmpo cr0, f1, f4
/* 8048CB28 40 81 01 3C */ ble lbl_8048CC64
/* 8048CB2C FC 03 10 40 */ fcmpo cr0, f3, f2
/* 8048CB30 40 81 01 34 */ ble lbl_8048CC64
/* 8048CB34 38 61 00 50 */ addi r3, r1, 0x50
/* 8048CB38 7F C4 F3 78 */ mr r4, r30
/* 8048CB3C 38 BD 04 D0 */ addi r5, r29, 0x4d0
/* 8048CB40 4B DD 9F F5 */ bl __mi__4cXyzCFRC3Vec
/* 8048CB44 C0 01 00 50 */ lfs f0, 0x50(r1)
/* 8048CB48 D0 01 00 68 */ stfs f0, 0x68(r1)
/* 8048CB4C C0 21 00 54 */ lfs f1, 0x54(r1)
/* 8048CB50 D0 21 00 6C */ stfs f1, 0x6c(r1)
/* 8048CB54 C0 01 00 58 */ lfs f0, 0x58(r1)
/* 8048CB58 D0 01 00 70 */ stfs f0, 0x70(r1)
/* 8048CB5C FC 00 08 1E */ fctiwz f0, f1
/* 8048CB60 D8 01 00 C8 */ stfd f0, 0xc8(r1)
/* 8048CB64 80 61 00 CC */ lwz r3, 0xcc(r1)
/* 8048CB68 2C 03 00 00 */ cmpwi r3, 0
/* 8048CB6C 41 80 00 F8 */ blt lbl_8048CC64
/* 8048CB70 C0 01 00 90 */ lfs f0, 0x90(r1)
/* 8048CB74 FC 00 00 1E */ fctiwz f0, f0
/* 8048CB78 D8 01 00 C8 */ stfd f0, 0xc8(r1)
/* 8048CB7C 80 01 00 CC */ lwz r0, 0xcc(r1)
/* 8048CB80 7C 03 00 00 */ cmpw r3, r0
/* 8048CB84 40 80 00 E0 */ bge lbl_8048CC64
/* 8048CB88 38 60 00 01 */ li r3, 1
/* 8048CB8C 48 00 00 DC */ b lbl_8048CC68
lbl_8048CB90:
/* 8048CB90 C0 7D 04 D0 */ lfs f3, 0x4d0(r29)
/* 8048CB94 D0 61 00 80 */ stfs f3, 0x80(r1)
/* 8048CB98 C0 3D 04 D4 */ lfs f1, 0x4d4(r29)
/* 8048CB9C D0 21 00 84 */ stfs f1, 0x84(r1)
/* 8048CBA0 C0 5D 04 D8 */ lfs f2, 0x4d8(r29)
/* 8048CBA4 D0 41 00 88 */ stfs f2, 0x88(r1)
/* 8048CBA8 3C 60 80 49 */ lis r3, lit_4146@ha /* 0x8048CDE4@ha */
/* 8048CBAC C0 03 CD E4 */ lfs f0, lit_4146@l(r3) /* 0x8048CDE4@l */
/* 8048CBB0 EC 21 00 28 */ fsubs f1, f1, f0
/* 8048CBB4 D0 21 00 84 */ stfs f1, 0x84(r1)
/* 8048CBB8 30 04 FF FF */ addic r0, r4, -1
/* 8048CBBC 7C 00 01 10 */ subfe r0, r0, r0
/* 8048CBC0 7C A0 00 78 */ andc r0, r5, r0
/* 8048CBC4 2C 00 00 15 */ cmpwi r0, 0x15
/* 8048CBC8 40 82 00 50 */ bne lbl_8048CC18
/* 8048CBCC C0 1E 00 00 */ lfs f0, 0(r30)
/* 8048CBD0 D0 01 00 44 */ stfs f0, 0x44(r1)
/* 8048CBD4 C0 1E 00 04 */ lfs f0, 4(r30)
/* 8048CBD8 D0 01 00 48 */ stfs f0, 0x48(r1)
/* 8048CBDC C0 1E 00 08 */ lfs f0, 8(r30)
/* 8048CBE0 D0 01 00 4C */ stfs f0, 0x4c(r1)
/* 8048CBE4 D0 61 00 38 */ stfs f3, 0x38(r1)
/* 8048CBE8 D0 21 00 3C */ stfs f1, 0x3c(r1)
/* 8048CBEC D0 41 00 40 */ stfs f2, 0x40(r1)
/* 8048CBF0 D0 C1 00 2C */ stfs f6, 0x2c(r1)
/* 8048CBF4 D0 A1 00 30 */ stfs f5, 0x30(r1)
/* 8048CBF8 D0 81 00 34 */ stfs f4, 0x34(r1)
/* 8048CBFC 38 61 00 44 */ addi r3, r1, 0x44
/* 8048CC00 38 81 00 38 */ addi r4, r1, 0x38
/* 8048CC04 38 A1 00 2C */ addi r5, r1, 0x2c
/* 8048CC08 A8 DD 04 E6 */ lha r6, 0x4e6(r29)
/* 8048CC0C 38 E0 00 00 */ li r7, 0
/* 8048CC10 4B CB F7 75 */ bl daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi
/* 8048CC14 48 00 00 54 */ b lbl_8048CC68
lbl_8048CC18:
/* 8048CC18 C0 1E 00 00 */ lfs f0, 0(r30)
/* 8048CC1C D0 01 00 20 */ stfs f0, 0x20(r1)
/* 8048CC20 C0 1E 00 04 */ lfs f0, 4(r30)
/* 8048CC24 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 8048CC28 C0 1E 00 08 */ lfs f0, 8(r30)
/* 8048CC2C D0 01 00 28 */ stfs f0, 0x28(r1)
/* 8048CC30 D0 61 00 14 */ stfs f3, 0x14(r1)
/* 8048CC34 D0 21 00 18 */ stfs f1, 0x18(r1)
/* 8048CC38 D0 41 00 1C */ stfs f2, 0x1c(r1)
/* 8048CC3C D0 C1 00 08 */ stfs f6, 8(r1)
/* 8048CC40 D0 A1 00 0C */ stfs f5, 0xc(r1)
/* 8048CC44 D0 81 00 10 */ stfs f4, 0x10(r1)
/* 8048CC48 38 61 00 20 */ addi r3, r1, 0x20
/* 8048CC4C 38 81 00 14 */ addi r4, r1, 0x14
/* 8048CC50 38 A1 00 08 */ addi r5, r1, 8
/* 8048CC54 A8 DD 04 E6 */ lha r6, 0x4e6(r29)
/* 8048CC58 38 E0 00 01 */ li r7, 1
/* 8048CC5C 4B CB F7 29 */ bl daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi
/* 8048CC60 48 00 00 08 */ b lbl_8048CC68
lbl_8048CC64:
/* 8048CC64 38 60 00 00 */ li r3, 0
lbl_8048CC68:
/* 8048CC68 39 61 00 E0 */ addi r11, r1, 0xe0
/* 8048CC6C 4B ED 55 BD */ bl _restgpr_29
/* 8048CC70 80 01 00 E4 */ lwz r0, 0xe4(r1)
/* 8048CC74 7C 08 03 A6 */ mtlr r0
/* 8048CC78 38 21 00 E0 */ addi r1, r1, 0xe0
/* 8048CC7C 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/create__15daTag_EvtArea_cFv.s
-154
View File
@@ -1,154 +0,0 @@
lbl_8048C4F8:
/* 8048C4F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8048C4FC 7C 08 02 A6 */ mflr r0
/* 8048C500 90 01 00 14 */ stw r0, 0x14(r1)
/* 8048C504 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8048C508 93 C1 00 08 */ stw r30, 8(r1)
/* 8048C50C 7C 7F 1B 78 */ mr r31, r3
/* 8048C510 3C 80 80 49 */ lis r4, lit_3853@ha /* 0x8048CDD0@ha */
/* 8048C514 3B C4 CD D0 */ addi r30, r4, lit_3853@l /* 0x8048CDD0@l */
/* 8048C518 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 8048C51C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 8048C520 40 82 00 28 */ bne lbl_8048C548
/* 8048C524 28 1F 00 00 */ cmplwi r31, 0
/* 8048C528 41 82 00 14 */ beq lbl_8048C53C
/* 8048C52C 4B B8 C6 39 */ bl __ct__10fopAc_ac_cFv
/* 8048C530 3C 60 80 49 */ lis r3, __vt__15daTag_EvtArea_c@ha /* 0x8048CE98@ha */
/* 8048C534 38 03 CE 98 */ addi r0, r3, __vt__15daTag_EvtArea_c@l /* 0x8048CE98@l */
/* 8048C538 90 1F 05 68 */ stw r0, 0x568(r31)
lbl_8048C53C:
/* 8048C53C 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 8048C540 60 00 00 08 */ ori r0, r0, 8
/* 8048C544 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_8048C548:
/* 8048C548 A8 1F 04 E8 */ lha r0, 0x4e8(r31)
/* 8048C54C 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8048C550 38 03 FF 01 */ addi r0, r3, -255
/* 8048C554 30 00 FF FF */ addic r0, r0, -1
/* 8048C558 7C 00 01 10 */ subfe r0, r0, r0
/* 8048C55C 7C 60 00 78 */ andc r0, r3, r0
/* 8048C560 28 00 00 17 */ cmplwi r0, 0x17
/* 8048C564 41 81 01 60 */ bgt lbl_8048C6C4
/* 8048C568 3C 60 80 49 */ lis r3, lit_3857@ha /* 0x8048CDE8@ha */
/* 8048C56C 38 63 CD E8 */ addi r3, r3, lit_3857@l /* 0x8048CDE8@l */
/* 8048C570 54 00 10 3A */ slwi r0, r0, 2
/* 8048C574 7C 03 00 2E */ lwzx r0, r3, r0
/* 8048C578 7C 09 03 A6 */ mtctr r0
/* 8048C57C 4E 80 04 20 */ bctr
lbl_8048C580:
/* 8048C580 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C584 C0 3E 00 00 */ lfs f1, 0(r30)
/* 8048C588 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C58C D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C590 C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 8048C594 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C598 D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 8048C59C C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C5A0 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C5A4 D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C5A8 48 00 01 44 */ b lbl_8048C6EC
lbl_8048C5AC:
/* 8048C5AC C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C5B0 C0 3E 00 04 */ lfs f1, 4(r30)
/* 8048C5B4 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C5B8 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C5BC C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 8048C5C0 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C5C4 D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 8048C5C8 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C5CC EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C5D0 D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C5D4 48 00 01 18 */ b lbl_8048C6EC
lbl_8048C5D8:
/* 8048C5D8 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C5DC C0 3E 00 00 */ lfs f1, 0(r30)
/* 8048C5E0 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C5E4 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C5E8 C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 8048C5EC EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C5F0 D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 8048C5F4 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C5F8 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C5FC D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C600 48 00 00 EC */ b lbl_8048C6EC
lbl_8048C604:
/* 8048C604 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C608 C0 3E 00 08 */ lfs f1, 8(r30)
/* 8048C60C EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C610 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C614 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C618 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C61C D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C620 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C624 C0 3E 00 0C */ lfs f1, 0xc(r30)
/* 8048C628 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C62C D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C630 C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 8048C634 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C638 D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 8048C63C C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C640 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C644 D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C648 48 00 00 A4 */ b lbl_8048C6EC
lbl_8048C64C:
/* 8048C64C C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C650 C0 3E 00 00 */ lfs f1, 0(r30)
/* 8048C654 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C658 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C65C C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 8048C660 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C664 D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 8048C668 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C66C EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C670 D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C674 48 00 00 78 */ b lbl_8048C6EC
lbl_8048C678:
/* 8048C678 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C67C C0 3E 00 0C */ lfs f1, 0xc(r30)
/* 8048C680 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C684 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C688 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C68C EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C690 D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C694 48 00 00 58 */ b lbl_8048C6EC
lbl_8048C698:
/* 8048C698 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C69C C0 3E 00 00 */ lfs f1, 0(r30)
/* 8048C6A0 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C6A4 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C6A8 C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 8048C6AC EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C6B0 D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 8048C6B4 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C6B8 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C6BC D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 8048C6C0 48 00 00 2C */ b lbl_8048C6EC
lbl_8048C6C4:
/* 8048C6C4 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 8048C6C8 C0 3E 00 00 */ lfs f1, 0(r30)
/* 8048C6CC EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C6D0 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 8048C6D4 C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 8048C6D8 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C6DC D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 8048C6E0 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 8048C6E4 EC 00 00 72 */ fmuls f0, f0, f1
/* 8048C6E8 D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
lbl_8048C6EC:
/* 8048C6EC 7F E3 FB 78 */ mr r3, r31
/* 8048C6F0 48 00 01 AD */ bl isDelete__15daTag_EvtArea_cFv
/* 8048C6F4 2C 03 00 00 */ cmpwi r3, 0
/* 8048C6F8 41 82 00 0C */ beq lbl_8048C704
/* 8048C6FC 38 60 00 05 */ li r3, 5
/* 8048C700 48 00 00 10 */ b lbl_8048C710
lbl_8048C704:
/* 8048C704 38 00 00 00 */ li r0, 0
/* 8048C708 98 1F 05 6C */ stb r0, 0x56c(r31)
/* 8048C70C 38 60 00 04 */ li r3, 4
lbl_8048C710:
/* 8048C710 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8048C714 83 C1 00 08 */ lwz r30, 8(r1)
/* 8048C718 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8048C71C 7C 08 03 A6 */ mtlr r0
/* 8048C720 38 21 00 10 */ addi r1, r1, 0x10
/* 8048C724 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Create__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8048CC80:
/* 8048CC80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8048CC84 7C 08 02 A6 */ mflr r0
/* 8048CC88 90 01 00 14 */ stw r0, 0x14(r1)
/* 8048CC8C 4B FF F8 6D */ bl create__15daTag_EvtArea_cFv
/* 8048CC90 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8048CC94 7C 08 03 A6 */ mtlr r0
/* 8048CC98 38 21 00 10 */ addi r1, r1, 0x10
/* 8048CC9C 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Delete__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8048CCA0:
/* 8048CCA0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8048CCA4 7C 08 02 A6 */ mflr r0
/* 8048CCA8 90 01 00 14 */ stw r0, 0x14(r1)
/* 8048CCAC 4B FF FA 7D */ bl Delete__15daTag_EvtArea_cFv
/* 8048CCB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8048CCB4 7C 08 03 A6 */ mtlr r0
/* 8048CCB8 38 21 00 10 */ addi r1, r1, 0x10
/* 8048CCBC 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Draw__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8048CCE0:
/* 8048CCE0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8048CCE4 7C 08 02 A6 */ mflr r0
/* 8048CCE8 90 01 00 14 */ stw r0, 0x14(r1)
/* 8048CCEC 4B FF FB A9 */ bl Draw__15daTag_EvtArea_cFv
/* 8048CCF0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8048CCF4 7C 08 03 A6 */ mtlr r0
/* 8048CCF8 38 21 00 10 */ addi r1, r1, 0x10
/* 8048CCFC 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Execute__FPv.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8048CCC0:
/* 8048CCC0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8048CCC4 7C 08 02 A6 */ mflr r0
/* 8048CCC8 90 01 00 14 */ stw r0, 0x14(r1)
/* 8048CCCC 4B FF FA 65 */ bl Execute__15daTag_EvtArea_cFv
/* 8048CCD0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8048CCD4 7C 08 03 A6 */ mtlr r0
/* 8048CCD8 38 21 00 10 */ addi r1, r1, 0x10
/* 8048CCDC 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/isDelete__15daTag_EvtArea_cFv.s
-50
View File
@@ -1,50 +0,0 @@
lbl_8048C89C:
/* 8048C89C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8048C8A0 7C 08 02 A6 */ mflr r0
/* 8048C8A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8048C8A8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8048C8AC 93 C1 00 08 */ stw r30, 8(r1)
/* 8048C8B0 7C 7E 1B 78 */ mr r30, r3
/* 8048C8B4 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 8048C8B8 54 04 A5 3E */ rlwinm r4, r0, 0x14, 0x14, 0x1f
/* 8048C8BC 28 04 0F FF */ cmplwi r4, 0xfff
/* 8048C8C0 38 60 FF FF */ li r3, -1
/* 8048C8C4 41 82 00 08 */ beq lbl_8048C8CC
/* 8048C8C8 7C 83 23 78 */ mr r3, r4
lbl_8048C8CC:
/* 8048C8CC 3C 03 00 01 */ addis r0, r3, 1
/* 8048C8D0 28 00 FF FF */ cmplwi r0, 0xffff
/* 8048C8D4 41 82 00 28 */ beq lbl_8048C8FC
/* 8048C8D8 28 04 0F FF */ cmplwi r4, 0xfff
/* 8048C8DC 38 60 FF FF */ li r3, -1
/* 8048C8E0 41 82 00 08 */ beq lbl_8048C8E8
/* 8048C8E4 7C 83 23 78 */ mr r3, r4
lbl_8048C8E8:
/* 8048C8E8 4B CC 01 C5 */ bl daNpcT_chkEvtBit__FUl
/* 8048C8EC 2C 03 00 00 */ cmpwi r3, 0
/* 8048C8F0 41 82 00 0C */ beq lbl_8048C8FC
/* 8048C8F4 38 60 00 01 */ li r3, 1
/* 8048C8F8 48 00 00 3C */ b lbl_8048C934
lbl_8048C8FC:
/* 8048C8FC 3B E0 00 00 */ li r31, 0
/* 8048C900 A8 1E 04 B4 */ lha r0, 0x4b4(r30)
/* 8048C904 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f
/* 8048C908 28 04 00 FF */ cmplwi r4, 0xff
/* 8048C90C 41 82 00 24 */ beq lbl_8048C930
/* 8048C910 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8048C914 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8048C918 88 1E 04 E2 */ lbz r0, 0x4e2(r30)
/* 8048C91C 7C 05 07 74 */ extsb r5, r0
/* 8048C920 4B BA 8A 41 */ bl isSwitch__10dSv_info_cCFii
/* 8048C924 2C 03 00 00 */ cmpwi r3, 0
/* 8048C928 41 82 00 08 */ beq lbl_8048C930
/* 8048C92C 3B E0 00 01 */ li r31, 1
lbl_8048C930:
/* 8048C930 57 E3 06 3E */ clrlwi r3, r31, 0x18
lbl_8048C934:
/* 8048C934 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8048C938 83 C1 00 08 */ lwz r30, 8(r1)
/* 8048C93C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8048C940 7C 08 03 A6 */ mtlr r0
/* 8048C944 38 21 00 10 */ addi r1, r1, 0x10
/* 8048C948 4E 80 00 20 */ blr
include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
+12 -12
View File
@@ -9,8 +9,8 @@ typedef struct _GXColorS10 GXColorS10;
class J3DMatColorAnm {
public:
/* 8003B2B8 */ ~J3DMatColorAnm();
/* 8003B2F4 */ J3DMatColorAnm();
/* 8003B2B8 */ ~J3DMatColorAnm() {};
/* 8003B2F4 */ J3DMatColorAnm() {};
void operator=(J3DMatColorAnm const& other) {
mAnmColor = other.mAnmColor;
@@ -30,9 +30,9 @@ private:
class J3DTexNoAnm {
public:
/* 8003B1F8 */ ~J3DTexNoAnm();
/* 8003B240 */ J3DTexNoAnm();
/* 8003C82C */ virtual void calc(u16*) const;
/* 8003B1F8 */ ~J3DTexNoAnm() {};
/* 8003B240 */ J3DTexNoAnm() {};
/* 8003C82C */ virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); }
void operator=(J3DTexNoAnm const& other) {
mAnmTexPattern = other.mAnmTexPattern;
@@ -52,8 +52,8 @@ private:
class J3DTexMtxAnm {
public:
/* 8003B264 */ ~J3DTexMtxAnm();
/* 8003B2A0 */ J3DTexMtxAnm();
/* 8003B264 */ ~J3DTexMtxAnm() {};
/* 8003B2A0 */ J3DTexMtxAnm() {};
void operator=(J3DTexMtxAnm const& other) {
mAnmTransform = other.mAnmTransform;
@@ -75,8 +75,8 @@ private:
class J3DTevKColorAnm {
public:
/* 8003B150 */ ~J3DTevKColorAnm();
/* 8003B18C */ J3DTevKColorAnm();
/* 8003B150 */ ~J3DTevKColorAnm() {};
/* 8003B18C */ J3DTevKColorAnm() {};
void operator=(J3DTevKColorAnm const& other) {
mAnmTevReg = other.mAnmTevReg;
@@ -96,8 +96,8 @@ private:
class J3DTevColorAnm {
public:
/* 8003B1A4 */ ~J3DTevColorAnm();
/* 8003B1E0 */ J3DTevColorAnm();
/* 8003B1A4 */ ~J3DTevColorAnm() {};
/* 8003B1E0 */ J3DTevColorAnm() {};
void operator=(J3DTevColorAnm const& other) {
mAnmTevReg = other.mAnmTevReg;
@@ -126,7 +126,7 @@ public:
/* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*);
/* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*);
/* 800A4820 */ virtual ~J3DMaterialAnm();
/* 800A4820 */ virtual ~J3DMaterialAnm() {};
/* 8032C3C4 */ virtual void calc(J3DMaterial*) const;
const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; }
include/SSystem/SComponent/c_cc_d.h
+1
View File
@@ -458,6 +458,7 @@ public:
void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); }
void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); }
void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); }
void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); }
void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); }
}; // Size = 0x40
include/SSystem/SComponent/c_lib.h
+5
View File
@@ -94,6 +94,11 @@ T cLib_calcTimer(T* value) {
return *value;
}
template <typename T>
T cLib_getRndValue(T min, T range) {
return (T)(min + cM_rndF((f32)range));
}
void MtxInit(void);
void MtxTrans(f32, f32, f32, u8);
void MtxScale(f32, f32, f32, u8);
include/SSystem/SComponent/c_math.h
+2 -2
View File
@@ -18,11 +18,11 @@ float cM_rndF2(float);
float cM_rndFX2(float);
inline f32 cM_scos(s16 s) {
return JMath::sincosTable_.table[static_cast<u16>(s) >> 3].second;
return JMASCos(s);
}
inline f32 cM_ssin(s16 s) {
return JMath::sincosTable_.table[static_cast<u16>(s) >> 3].first;
return JMASSin(s);
}
inline s16 cM_deg2s(f32 val) {
include/d/a/d_a_npc.h
+157 -95
View File
@@ -4,12 +4,31 @@
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/com/d_com_inf_game.h"
#include "d/a/d_a_player.h"
#include "d/d_path.h"
#include "d/msg/d_msg_flow.h"
#include "d/particle/d_particle_copoly.h"
#include "dolphin/types.h"
#include "global.h"
struct bckGetParam {
/* 0x00 */ int bckIdx;
/* 0x04 */ int bckAttr;
/* 0x08 */ int arcIdx;
};
struct btpGetParam {
/* 0x00 */ int btpIdx;
/* 0x04 */ int btpAttr;
/* 0x08 */ int arcIdx;
};
struct btkGetParam {
/* 0x00 */ int btkIdx;
/* 0x04 */ int btkAttr;
/* 0x08 */ int arcIdx;
};
struct dPnt {};
class daNpcT_ActorMngr_c {
@@ -407,11 +426,16 @@ public:
STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40);
BOOL daNpcT_chkEvtBit(u32 i_idx);
BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4);
class daNpcF_ActorMngr_c {
private:
/* 0x0 */ u32 mActorID;
public:
daNpcF_ActorMngr_c() { initialize(); }
/* 801506B0 */ void initialize();
/* 801506D8 */ void entry(unsigned int);
/* 801506BC */ void entry(fopAc_ac_c*);
@@ -422,19 +446,19 @@ public:
};
class daNpcF_c : public fopAc_ac_c {
private:
protected:
/* 0x568 */ mDoExt_McaMorfSO* mMcaMorf;
/* 0x56C */ mDoExt_bckAnm mBckAnm;
/* 0x588 */ mDoExt_btpAnm mBtpAnm;
/* 0x5A0 */ mDoExt_btkAnm mBtkAnm;
/* 0x5B8 */ mDoExt_brkAnm mBrkAnm;
/* 0x5D0 */ dBgS_ObjAcch field_0x5d0;
/* 0x7A8 */ dCcD_Stts field_0x7a8;
/* 0x7E4 */ dBgS_AcchCir field_0x7e4;
/* 0x5D0 */ dBgS_ObjAcch mAcch;
/* 0x7A8 */ dCcD_Stts mStts;
/* 0x7E4 */ dBgS_AcchCir mAcchCir;
/* 0x824 */ daNpcF_ActorMngr_c field_0x824;
/* 0x82C */ daNpcF_ActorMngr_c field_0x82c[5];
/* 0x854 */ cXyz field_0x854[3];
/* 0x878 */ cXyz field_0x878;
/* 0x854 */ cXyz mLookatPos[3];
/* 0x878 */ cXyz mLookPos;
/* 0x884 */ cXyz field_0x884;
/* 0x890 */ cXyz field_0x890;
/* 0x89C */ cXyz field_0x89c;
@@ -443,20 +467,20 @@ private:
/* 0x8C0 */ cXyz field_0x8c0;
/* 0x8CC */ cXyz field_0x8cc;
/* 0x8D8 */ cXyz field_0x8d8;
/* 0x8E4 */ cXyz field_0x8e4;
/* 0x8E4 */ cXyz mHeadPos;
/* 0x8F0 */ csXyz field_0x8f0;
/* 0x8F6 */ csXyz field_0x8f6;
/* 0x8FC */ csXyz field_0x8fc;
/* 0x902 */ csXyz field_0x902;
/* 0x908 */ csXyz field_0x908[3];
/* 0x91A */ csXyz field_0x91a[3];
/* 0x92C */ int field_0x92c;
/* 0x92C */ int mCutIndex;
/* 0x930 */ u32 field_0x930;
/* 0x934 */ u32 field_0x934;
/* 0x938 */ u32 field_0x938;
/* 0x93C */ u32 field_0x93c[5];
/* 0x934 */ int field_0x934; // index in 0x93c to not decrement timer (if 0x938 is nonzero)
/* 0x938 */ int field_0x938; // controls whether to use field 0x934
/* 0x93C */ int field_0x93c[5]; // timers for removing actors from 0x82c
/* 0x950 */ int field_0x950;
/* 0x954 */ int field_0x954;
/* 0x954 */ int field_0x954; // a timer
/* 0x958 */ int field_0x958;
/* 0x95C */ int field_0x95c;
/* 0x960 */ int field_0x960;
@@ -464,19 +488,19 @@ private:
/* 0x968 */ int field_0x968;
/* 0x96C */ int field_0x96c;
/* 0x970 */ f32 field_0x970;
/* 0x974 */ f32 field_0x974;
/* 0x978 */ f32 field_0x978;
/* 0x97C */ f32 field_0x97c;
/* 0x974 */ f32 mExpressionMorfOverride;
/* 0x978 */ f32 mExpressionMorf;
/* 0x97C */ f32 mMotionMorfOverride;
/* 0x980 */ f32 field_0x980;
/* 0x984 */ f32 field_0x984[3];
/* 0x990 */ u16 field_0x990;
/* 0x990 */ u16 field_0x992;
/* 0x990 */ u16 field_0x994;
/* 0x990 */ u16 field_0x996;
/* 0x992 */ u16 field_0x992;
/* 0x994 */ u16 field_0x994;
/* 0x996 */ s16 field_0x996;
/* 0x998 */ u16 field_0x998;
/* 0x99C */ u32 field_0x99c;
/* 0x99C */ u32 mAnmFlags;
/* 0x9A0 */ u32 field_0x9a0;
/* 0x9A4 */ int field_0x9a4;
/* 0x9A4 */ profile_method_class* field_0x9a4;
/* 0x9A8 */ int field_0x9a8;
/* 0x9AC */ int field_0x9ac;
/* 0x9B0 */ u32 field_0x9b0;
@@ -485,17 +509,17 @@ private:
/* 0x9C4 */ cXyz field_0x9c4;
/* 0x9D0 */ u16 field_0x9d0;
/* 0x9D2 */ u16 field_0x9d2;
/* 0x9D4 */ u16 field_0x9d4;
/* 0x9D6 */ u16 field_0x9d6;
/* 0x9D8 */ u16 field_0x9d8;
/* 0x9DA */ u16 field_0x9da;
/* 0x9DC */ u16 field_0x9dc;
/* 0x9DE */ u16 field_0x9de;
/* 0x9E0 */ u16 field_0x9e0;
/* 0x9E2 */ u16 field_0x9e2;
/* 0x9E4 */ u16 field_0x9e4;
/* 0x9E6 */ u16 field_0x9e6;
/* 0x9E8 */ u8 field_0x9e8;
/* 0x9D4 */ s16 field_0x9d4;
/* 0x9D6 */ s16 mExpressionPhase;
/* 0x9D8 */ s16 mExpressionPrevPhase;
/* 0x9DA */ s16 mMotionPhase;
/* 0x9DC */ s16 mMotionPrevPhase;
/* 0x9DE */ s16 mExpression;
/* 0x9E0 */ s16 mMotion;
/* 0x9E2 */ u16 mMotionLoops;
/* 0x9E4 */ u16 mExpressionLoops;
/* 0x9E6 */ u16 mOrderEvtNo;
/* 0x9E8 */ s8 field_0x9e8;
/* 0x9E9 */ u8 field_0x9e9;
/* 0x9EA */ u8 field_0x9ea;
/* 0x9EB */ u8 field_0x9eb;
@@ -507,7 +531,7 @@ private:
/* 0x9F1 */ u8 field_0x9f1;
/* 0x9F2 */ bool mHide;
/* 0x9f3 */ u8 field_0x9f3;
/* 0x9F4 */ u8 field_0x9f4;
/* 0x9F4 */ bool field_0x9f4; // controls whether setHitodamaPrtcl is called
/* 0x9F5 */ u8 field_0x9f5;
/* 0x9F6 */ u8 field_0x9f6;
/* 0x9F8 */ dMsgFlow_c mFlow;
@@ -516,50 +540,73 @@ private:
/* 0xAD4 */ dBgS_LinChk field_0xad4;
public:
struct daNpcF_anmPlayData {};
struct daNpcF_anmPlayData {
u16 idx;
f32 morf;
s32 numLoops;
};
/* 80152014 */ void execute();
/* 801522AC */ void draw(int, int, f32, _GXColorS10*, int);
enum AnmFlags {
ANM_PAUSE_MORF = 0x0001,
ANM_PAUSE_BTK = 0x0002,
ANM_PAUSE_BRK = 0x0004,
ANM_PLAY_MORF = 0x0008,
ANM_PLAY_BTK = 0x0010,
ANM_PLAY_BRK = 0x0020,
ANM_PAUSE_BCK = 0x0040,
ANM_PAUSE_BTP = 0x0080,
ANM_PLAY_BCK = 0x0100,
ANM_PLAY_BTP = 0x0200,
ANM_FLAG_400 = 0x0400,
ANM_FLAG_800 = 0x0800,
ANM_PAUSE_EXPRESSION = 0x1000,
ANM_MOTION_FLAGS = ANM_PAUSE_MORF | ANM_PAUSE_BTK | ANM_PAUSE_BRK | ANM_PLAY_MORF | ANM_PLAY_BTK | ANM_PLAY_BRK,
ANM_EXPRESSION_FLAGS = ANM_PAUSE_BCK | ANM_PAUSE_BTP | ANM_PLAY_BCK | ANM_PLAY_BTP | ANM_FLAG_400 | ANM_FLAG_800 | ANM_PAUSE_EXPRESSION,
ANM_PAUSE_ALL = ANM_PAUSE_MORF | ANM_PAUSE_BTK | ANM_PAUSE_BRK | ANM_PAUSE_BCK | ANM_PAUSE_BTP | ANM_PAUSE_EXPRESSION,
};
/* 80152014 */ BOOL execute();
/* 801522AC */ BOOL draw(int, int, f32, _GXColorS10*, int);
/* 80152614 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80152654 */ void srchAttnActor1(void*, void*);
/* 801526E8 */ void* srchActor(void*, void*);
/* 801528C8 */ void initialize();
/* 80152B2C */ void getTrnsfrmKeyAnmP(char*, int);
/* 80152B68 */ void getTexPtrnAnmP(char*, int);
/* 80152BA4 */ void getTexSRTKeyAnmP(char*, int);
/* 80152BE0 */ void getTevRegKeyAnmP(char*, int);
/* 80152C1C */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
/* 80152C80 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 80152CC4 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
/* 80152D04 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
/* 80152D44 */ void setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int);
/* 80152B2C */ J3DAnmTransformKey* getTrnsfrmKeyAnmP(char*, int);
/* 80152B68 */ J3DAnmTexPattern* getTexPtrnAnmP(char*, int);
/* 80152BA4 */ J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char*, int);
/* 80152BE0 */ J3DAnmTevRegKey* getTevRegKeyAnmP(char*, int);
/* 80152C1C */ BOOL setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr, int i_start, int i_end);
/* 80152C80 */ BOOL setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start, int i_end, bool i_modify);
/* 80152CC4 */ BOOL setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_rate, int i_attr);
/* 80152D04 */ BOOL setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_rate, int i_attr);
/* 80152D44 */ BOOL setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32 i_rate, int i_attr);
/* 80152D84 */ void setEnvTevColor();
/* 80152DE0 */ void setRoomNo();
/* 80152E24 */ void chkEndAnm(f32);
/* 80152EC4 */ void chkEndAnm(J3DFrameCtrl*, f32);
/* 80152F40 */ void playAllAnm();
/* 80152E24 */ BOOL chkEndAnm(f32);
/* 80152EC4 */ BOOL chkEndAnm(J3DFrameCtrl*, f32);
/* 80152F40 */ BOOL playAllAnm();
/* 80153150 */ void playExpressionAnm(daNpcF_c::daNpcF_anmPlayData***);
/* 80153264 */ void playMotionAnm(daNpcF_c::daNpcF_anmPlayData***);
/* 8015337C */ void setLookatMtx(int, int*, f32);
/* 80153578 */ void hitChk2(dCcD_Cyl*, int, int);
/* 80153658 */ void setDamage(int, int, int);
/* 80153718 */ void ctrlMsgAnm(int&, int&, fopAc_ac_c*, int);
/* 80153718 */ int ctrlMsgAnm(int&, int&, fopAc_ac_c*, int);
/* 8015387C */ void orderEvent(int, char*, u16, u16, u8, u16);
/* 80153954 */ void changeEvent(char*, char*, u16, u16);
/* 801539F0 */ void chkActorInSight(fopAc_ac_c*, f32);
/* 80153A78 */ void chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16);
/* 80153BDC */ void chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int);
/* 801539F0 */ BOOL chkActorInSight(fopAc_ac_c*, f32);
/* 80153A78 */ BOOL chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16);
/* 80153BDC */ BOOL chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int);
/* 80153D1C */ int initTalk(int, fopAc_ac_c**);
/* 80153D84 */ void talkProc(int*, int, fopAc_ac_c**);
/* 80153EF4 */ void turn(s16, f32, int);
/* 80153D84 */ BOOL talkProc(int*, int, fopAc_ac_c**);
/* 80153EF4 */ BOOL turn(s16, f32, int);
/* 801540A4 */ void step(s16, int, int, int);
/* 80154250 */ void setAngle(s16);
/* 80154278 */ void getDistTableIdx(int, int);
/* 801542A0 */ int getEvtAreaTagP(int, int);
/* 80154278 */ u8 getDistTableIdx(int, int);
/* 801542A0 */ fopAc_ac_c* getEvtAreaTagP(int, int);
/* 8015436C */ void getAttnActorP(int, void* (*)(void*, void*), f32, f32, f32, f32, s16, int,
int);
/* 80154730 */ void chkActorInSight2(fopAc_ac_c*, f32, s16);
/* 80154730 */ BOOL chkActorInSight2(fopAc_ac_c*, f32, s16);
/* 80154834 */ bool chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
/* 801548F4 */ bool chkPointInArea(cXyz, cXyz, cXyz, s16);
/* 8015496C */ cXyz getAttentionPos(fopAc_ac_c*);
@@ -568,23 +615,29 @@ public:
/* 80155BF4 */ virtual ~daNpcF_c();
/* 80155BC8 */ virtual void setParam();
/* 80155BC0 */ virtual bool main();
/* 80155BD8 */ virtual bool ctrlBtk();
/* 80155BC0 */ virtual BOOL main();
/* 80155BD8 */ virtual BOOL ctrlBtk();
/* 80155BBC */ virtual void adjustShapeAngle();
/* 8015276C */ virtual void setMtx();
/* 801527FC */ virtual void setMtx2();
/* 80155BB8 */ virtual void setAttnPos();
/* 80155BB4 */ virtual void setCollisions();
/* 80155BE0 */ virtual bool setExpressionAnm(int, bool);
/* 80155EC8 */ virtual bool setExpressionBtp(int);
/* 80155BF0 */ virtual void setExpression(int, f32);
/* 80155BE8 */ virtual void setMotionAnm(int, f32);
/* 80155BEC */ virtual void setMotion(int, f32, int);
/* 80155BD0 */ virtual bool drawDbgInfo();
/* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify);
/* 80155EC8 */ virtual bool setExpressionBtp(int i_idx);
/* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf);
/* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf);
/* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart);
/* 80155BD0 */ virtual BOOL drawDbgInfo();
/* 80155BCC */ virtual void drawOtherMdls();
BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) { return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[3]); }
BOOL chkPlayerInSpeakArea(fopAc_ac_c* i_actor) { return chkActorInSpeakArea(daPy_getPlayerActorClass(), i_actor); }
BOOL chkActorInTalkArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) { return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[1]); }
BOOL chkPlayerInTalkArea(fopAc_ac_c* i_actor) { return chkActorInTalkArea(daPy_getPlayerActorClass(), i_actor); }
BOOL checkHide() { return mHide || (field_0x9f4 && !dComIfGs_wolfeye_effect_check()); }
static u8 const mCcDObjInfo[48];
static u8 mCcDCyl[68];
static dCcD_SrcCyl mCcDCyl;
static u8 mCcDSph[64];
static u8 mFindActorPList[400];
static s32 mFindCount;
@@ -593,8 +646,12 @@ public:
STATIC_ASSERT(sizeof(daNpcF_c) == 0xB48);
BOOL daNpcF_chkEvtBit(u32 i_idx);
BOOL daNpcF_chkTmpBit(u32 i_idx);
void daNpcF_offTmpBit(u32 i_idx);
int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2,
csXyz& param_3);
int daNpcF_getGroundAngle(cBgS_PolyInfo*, s16);
struct daBaseNpc_matAnm_c {
/* 8014D884 */ void calc(J3DMaterial*) const;
@@ -765,20 +822,23 @@ public:
static u8 m_set_func[4];
};
class daNpcF_MatAnm_c {
class daNpcF_MatAnm_c : public J3DMaterialAnm {
private:
/* 0x000 */ J3DMaterialAnm mMaterialAnm;
/* 0x0F4 */ mutable f32 field_0xF4;
/* 0x0F8 */ mutable f32 field_0xF8;
/* 0x0FC */ f32 mTranslationX;
/* 0x100 */ f32 mTranslationY;
/* 0x104 */ u8 field_0x104;
/* 0x0FC */ f32 mNowOffsetX;
/* 0x100 */ f32 mNowOffsetY;
/* 0x104 */ u8 mEyeMoveFlag;
/* 0x105 */ u8 field_0x105;
public:
daNpcF_MatAnm_c() { initialize(); }
/* 80150738 */ void initialize();
/* 8015075C */ void calc(J3DMaterial*) const;
/* 80155ED0 */ ~daNpcF_MatAnm_c();
void setNowOffsetX(float i_nowOffsetX) { mNowOffsetX = i_nowOffsetX; }
void setNowOffsetY(float i_nowOffsetY) { mNowOffsetY = i_nowOffsetY; }
void onEyeMoveFlag() { mEyeMoveFlag = 1; }
};
class daNpcF_SPCurve_c {
@@ -824,6 +884,33 @@ public:
cXyz* getPntPos(); // finish
};
class daNpcF_Lookat_c {
private:
/* 0x00 */ cXyz field_0x00[4];
/* 0x30 */ cXyz* mAttnPos;
/* 0x34 */ csXyz field_0x34[4];
/* 0x4C */ csXyz field_0x4c[4];
/* 0x64 */ csXyz field_0x64[4];
/* 0x7C */ csXyz mRotAngle[4];
/* 0x94 */ u8 field_0x94[4];
/* 0x98 vtable */
public:
/* 80151038 */ void initialize();
/* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16,
cXyz*);
/* 80151350 */ void calc(fopAc_ac_c*, f32 (*)[4], csXyz**, int, int, int);
/* 801515D4 */ void adjustMoveDisAngle(s16&, s16, s16, s16);
/* 80151648 */ void initCalc(fopAc_ac_c*, f32 (*)[4], cXyz*, csXyz*, f32*, cXyz&, int);
/* 80151A54 */ void update(cXyz*, csXyz*, f32*);
/* 80151B68 */ void calcMoveDisAngle(int, cXyz*, csXyz*, cXyz, int, int);
/* 80151F54 */ void setRotAngle();
/* 80151FE0 */ void clrRotAngle();
virtual ~daNpcF_Lookat_c() {}
cXyz* getAttnPos() { return mAttnPos; }
void setAttnPos(cXyz* i_attnPos) { mAttnPos = i_attnPos; }
};
class daNpcF_MoveBgActor_c {
private:
@@ -839,29 +926,4 @@ public:
/* 80155EC0 */ bool ToBack();
};
class daNpcF_Lookat_c {
private:
/* 0x00 */ cXyz field_0x00[4];
/* 0x30 */ int field_0x30;
/* 0x34 */ csXyz field_0x34[4];
/* 0x4C */ csXyz field_0x4c[4];
/* 0x64 */ csXyz field_0x64[4];
/* 0x7C */ csXyz mRotAngle[4];
/* 0x94 */ u8 field_0x94[4];
/* 0x98 */ void* vtable;
public:
/* 80151038 */ void initialize();
/* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16,
cXyz*);
/* 80151350 */ void calc(fopAc_ac_c*, f32 (*)[4], csXyz**, int, int, int);
/* 801515D4 */ void adjustMoveDisAngle(s16&, s16, s16, s16);
/* 80151648 */ void initCalc(fopAc_ac_c*, f32 (*)[4], cXyz*, csXyz*, f32*, cXyz&, int);
/* 80151A54 */ void update(cXyz*, csXyz*, f32*);
/* 80151B68 */ void calcMoveDisAngle(int, cXyz*, csXyz*, cXyz, int, int);
/* 80151F54 */ void setRotAngle();
/* 80151FE0 */ void clrRotAngle();
};
#endif /* D_A_D_A_NPC_H */
include/d/bg/d_bg_s_acch.h
+1
View File
@@ -126,6 +126,7 @@ public:
void ClrWallHit() { m_flags &= ~WALL_HIT; }
void SetRoofNone() { m_flags |= ROOF_NONE; }
void SetRoofHit() { m_flags |= ROOF_HIT; }
void SetWaterNone() { m_flags |= WATER_NONE; }
bool ChkWallHit() { return m_flags & WALL_HIT; }
void OffLineCheckHit() { m_flags &= ~LINE_CHECK_HIT; }
void OffLineCheck() { m_flags &= ~LINE_CHECK; }
include/d/com/d_com_inf_game.h
+13 -5
View File
@@ -924,7 +924,7 @@ void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo);
void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo);
s8 dComIfGp_getReverb(int i_roomNo);
void dComIfGs_gameStart();
bool dComIfGs_wolfeye_effect_check();
BOOL dComIfGs_wolfeye_effect_check();
BOOL dComIfGs_Wolf_Change_Check();
void dComIfGs_onVisitedRoom(int param_0);
void dComIfGs_offVisitedRoom(int param_0);
@@ -2883,22 +2883,22 @@ inline int dComIfGp_evmng_startDemo(int param_0) {
return dComIfGp_getPEvtManager()->setStartDemo(param_0);
}
inline void* dComIfGp_event_getTalkPartner() {
inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
u32 t = g_dComIfG_gameInfo.play.getEvent().mPtT;
return g_dComIfG_gameInfo.play.getEvent().convPId(t);
}
inline void* dComIfGp_event_getItemPartner() {
inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
u32 i = g_dComIfG_gameInfo.play.getEvent().mPtI;
return g_dComIfG_gameInfo.play.getEvent().convPId(i);
}
inline void* dComIfGp_event_getPt1() {
inline fopAc_ac_c* dComIfGp_event_getPt1() {
u32 pt1 = g_dComIfG_gameInfo.play.getEvent().mPt1;
return g_dComIfG_gameInfo.play.getEvent().convPId(pt1);
}
inline void* dComIfGp_event_getPt2() {
inline fopAc_ac_c* dComIfGp_event_getPt2() {
u32 pt2 = g_dComIfG_gameInfo.play.getEvent().mPt2;
return g_dComIfG_gameInfo.play.getEvent().convPId(pt2);
}
@@ -2922,6 +2922,10 @@ inline u16 i_dComIfGp_event_chkEventFlag(u16 flag) {
return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag);
}
inline BOOL dComIfGp_event_chkTalkXY() {
return g_dComIfG_gameInfo.play.getEvent().chkTalkXY();
}
inline void dComIfGp_event_setCullRate(f32 f) {
g_dComIfG_gameInfo.play.getEvent().setCullRate(f);
}
@@ -2954,6 +2958,10 @@ inline int dComIfGp_evmng_getMySubstanceNum(int index, char* name) {
return dComIfGp_getPEvtManager()->getMySubstanceNum(index, name);
}
inline BOOL dComIfGp_evmng_ChkPresentEnd() {
return dComIfGp_getPEvtManager()->ChkPresentEnd();
}
inline int dComIfGp_evmng_checkStartDemo() {
return dComIfGp_getPEvtManager()->checkStartDemo();
}
include/d/event/d_event.h
+5 -4
View File
@@ -125,7 +125,7 @@ public:
dStage_MapEvent_dt_c* getStageEventDt();
void sceneChange(int exitId);
u32 getPId(void*);
void* convPId(unsigned int);
fopAc_ac_c* convPId(unsigned int);
void* getStbDemoData(char* resName);
static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID, s32 roomNo);
static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID);
@@ -154,11 +154,12 @@ public:
void onFlag2(u16 flag) { mFlag2 |= flag; }
void offFlag2(u16 flag) { mFlag2 &= ~flag; }
void setCullRate(f32 f) { mCullRate = f; }
BOOL chkTalkXY() { return field_0xed == 1 || field_0xed == 2; }
bool i_isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
void* getPt1() { return convPId(mPt1); }
void* getPt2() { return convPId(mPt2); }
void* getPtT() { return convPId(mPtT); }
fopAc_ac_c* getPt1() { return convPId(mPt1); }
fopAc_ac_c* getPt2() { return convPId(mPt2); }
fopAc_ac_c* getPtT() { return convPId(mPtT); }
bool isChangeOK(void* param_0) { return mChangeOK == param_0; }
u8 getPreItemNo() { return mPreItemNo; }
include/d/msg/d_msg_object.h
+1 -1
View File
@@ -136,7 +136,7 @@ public:
/* 80238320 */ static void onMsgSend();
/* 8023834C */ void offMsgSend();
/* 80238378 */ void isMsgSend();
/* 802383A4 */ bool isMouthCheck();
/* 802383A4 */ static bool isMouthCheck();
/* 802383D0 */ static u32 getMessageID();
/* 802383E4 */ void getSmellTypeMessageID();
/* 80238410 */ static void setSmellType(u8);
include/f_op/f_op_actor_mng.h
+3 -3
View File
@@ -473,9 +473,9 @@ s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c*, u8, s16, u16, u16, u16);
s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16);
s32 fopAcM_orderItemEvent(fopAc_ac_c*, u16, u16);
s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16);
void* fopAcM_getTalkEventPartner(const fopAc_ac_c*);
void* fopAcM_getItemEventPartner(const fopAc_ac_c*);
void* fopAcM_getEventPartner(const fopAc_ac_c*);
fopAc_ac_c* fopAcM_getTalkEventPartner(const fopAc_ac_c*);
fopAc_ac_c* fopAcM_getItemEventPartner(const fopAc_ac_c*);
fopAc_ac_c* fopAcM_getEventPartner(const fopAc_ac_c*);
static void fopAcM_onSwitch(fopAc_ac_c const* param_0, int param_1);
s32 fopAcM_createItemForPresentDemo(cXyz const* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo,
include/m_Do/m_Do_ext.h
+4 -1
View File
@@ -26,6 +26,8 @@ public:
s16 i_endF);
/* 8000D428 */ int play();
J3DFrameCtrl* getFrameCtrl() { return &mFrameCtrl; }
f32 getPlaySpeed() { return mFrameCtrl.getRate(); }
void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); }
f32 getFrame() { return mFrameCtrl.getFrame(); }
f32 getEndFrame() { return mFrameCtrl.getEnd(); }
@@ -272,6 +274,7 @@ public:
f32 getEndFrame() { return mFrameCtrl.getEnd(); }
BOOL checkFrame(f32 frame) { return mFrameCtrl.checkPass(frame); }
J3DAnmTransform* getAnm() { return mpAnm; }
void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; }
bool isStop() {
bool stopped = true;
@@ -299,7 +302,7 @@ public:
int, Z2Creature*, u32, u32);
/* 800108F0 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32);
/* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
/* 80010E70 */ void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate, f32 i_start, f32 i_end);
/* 800110B0 */ int play(u32, s8);
/* 80011154 */ void updateDL();
/* 800111C0 */ void entryDL();
include/m_Do/m_Do_mtx.h
+4
View File
@@ -59,6 +59,10 @@ inline void cMtx_multVec(Mtx mtx, const Vec* src, Vec* dst) {
mDoMtx_multVec(mtx, src, dst);
}
inline void cMtx_copy(const Mtx src, Mtx dst) {
mDoMtx_copy(src, dst);
}
inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) {
param_1->x = param_0[0][3];
param_1->y = param_0[1][3];
include/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.h
+118
View File
@@ -2,5 +2,123 @@
#define D_A_NPC_ASH_H
#include "dolphin/types.h"
#include "d/a/d_a_npc.h"
class daNpcAsh_c;
typedef bool (daNpcAsh_c::*daNpcAsh_actionFn)(void*);
typedef BOOL (daNpcAsh_c::*daNpcAsh_eventFn)(int);
class daNpcAsh_c : public daNpcF_c {
private:
/* 0xB48 */ Z2Creature mZ2;
/* 0xBD8 */ J3DModel* mModelBow;
/* 0xBDC */ J3DModel* mModelQuiver;
/* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBE4 */ daNpcF_Lookat_c mLookat;
/* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[6];
/* 0xCB0 */ fopAc_ac_c* mTalkPartner;
/* 0xCB4 */ u32 field_0xcb4; // unused
/* 0xCB8 */ dCcD_Cyl mCcCyl[2];
/* 0xF30 */ daNpcAsh_actionFn mpActionFn;
/* 0xF3C */ request_of_phase_process_class mPhase[2];
/* 0xF4C */ u32 mItemPartnerId;
/* 0xF50 */ u32 field_0xf50; // unused
/* 0xF54 */ u32 field_0xf54;
/* 0xF58 */ s16 mMessageNo;
/* 0xF5A */ s16 mLookMode;
/* 0xF5C */ u16 field_0xf5c;
/* 0xF5E */ u8 mMapToolId;
/* 0xF5F */ u8 field_0xf5f;
/* 0xF60 */ u8 field_0xf60;
public:
/* 809582EC */ daNpcAsh_c();
/* 80958610 */ ~daNpcAsh_c();
/* 809587A0 */ cPhs__Step Create();
/* 80958B68 */ BOOL CreateHeap();
/* 809590C4 */ int Delete();
/* 809590F8 */ int Execute();
/* 8095911C */ int Draw();
/* 80959238 */ bool ctrlJoint(J3DJoint*, J3DModel*);
/* 80959458 */ static BOOL createHeapCallBack(fopAc_ac_c*);
/* 80959478 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
/* 809594C4 */ bool setExpressionAnm(int, bool);
/* 809596E0 */ bool setExpressionBtp(int);
/* 809597C0 */ void setMotionAnm(int i_idx, f32 i_morf);
/* 80959910 */ void reset();
/* 80959B28 */ /* inline */ bool setAction(daNpcAsh_actionFn);
/* 80959BD0 */ /* inline */ bool isSneaking();
/* 80959C40 */ bool wait_type0(void*);
/* 8095A67C */ void setMotion(int, f32, int);
/* 8095A6C0 */ void setExpression(int, f32);
/* 8095A6EC */ bool wait_type1(void*);
/* 8095A8EC */ bool talk(void*);
/* 8095AD28 */ bool demo(void*);
/* 8095B164 */ bool leave(void*);
/* 8095B48C */ BOOL EvCut_Introduction(int cutIndex);
/* 8095B58C */ BOOL EvCut_Meeting(int cutIndex);
/* 8095B83C */ BOOL EvCut_WiretapSponsor(int cutIndex);
/* 8095BA80 */ BOOL EvCut_WiretapEntrant(int cutIndex);
/* 8095BCF0 */ void setParam();
/* 8095BF6C */ BOOL main();
/* 8095C200 */ /* inline */ void playMotion();
/* 8095C520 */ BOOL ctrlBtk();
/* 8095C5C4 */ void setAttnPos();
/* 8095C9BC */ void lookat();
/* 8095CC8C */ BOOL drawDbgInfo();
s16 getMessageNo() { return shape_angle.x; }
bool isMap() { return !(daNpcF_chkEvtBit(0x10c) || !daNpcF_chkEvtBit(0x108)); }
inline void setExpressionTalkAfter() { setExpression(7, -1.0f); }
inline void setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner);
inline void searchActors();
inline BOOL chkFindPlayer();
inline bool step(s16, bool);
inline void playExpression();
#ifdef NONMATCHING
static daNpcAsh_eventFn mEvtSeqList[6];
#else
static u8 mEvtSeqList[72];
#endif
};
STATIC_ASSERT(sizeof(daNpcAsh_c) == 0xF64);
class daNpcAsh_Param_c {
public:
/* 8095D5D4 */ virtual ~daNpcAsh_Param_c();
struct param {
/* 0x00 */ f32 m00;
/* 0x04 */ f32 mGravity;
/* 0x08 */ f32 m08;
/* 0x0C */ f32 mShadow;
/* 0x10 */ f32 mSttsWeight;
/* 0x14 */ f32 m14;
/* 0x18 */ f32 m18;
/* 0x1C */ f32 m1C;
/* 0x20 */ f32 m20;
/* 0x24 */ f32 m24;
/* 0x28 */ f32 m28;
/* 0x2C */ f32 m2C;
/* 0x30 */ f32 m30;
/* 0x34 */ f32 m34;
/* 0x38 */ f32 m38;
/* 0x3C */ f32 m3C;
/* 0x40 */ f32 mLookatScl;
/* 0x44 */ f32 m44;
/* 0x48 */ s16 m48;
/* 0x4A */ s16 m4A;
/* 0x4C */ s16 m4C;
/* 0x4E */ s16 m4E;
/* 0x50 */ f32 mSightAngle;
/* 0x54 */ f32 m54[3];
/* 0x60 */ u16 m60[6];
};
static param const m;
};
#endif /* D_A_NPC_ASH_H */
include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h
+25 -1
View File
@@ -1,6 +1,30 @@
#ifndef D_A_TAG_EVTAREA_H
#define D_A_TAG_EVTAREA_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daTag_EvtArea_c : public fopAc_ac_c {
public:
/* 8048C4F8 */ cPhs__Step create();
/* 8048C728 */ bool Delete();
/* 8048C730 */ bool Execute();
/* 8048C894 */ bool Draw();
/* 8048C89C */ BOOL isDelete();
/* 8048C94C */ BOOL chkPointInArea(cXyz, cXyz);
/* 8048CD08 */ BOOL chkPointInArea(cXyz);
/* 8048CD68 */ virtual ~daTag_EvtArea_c();
inline s32 getType();
inline u32 getOnEvtBit();
inline u32 getOffEvtBit();
inline u8 getBitSW();
inline u8 getBitSW2();
private:
/* 0x568 vtable */
/* 0x56C */ u8 field_0x56c;
};
STATIC_ASSERT(sizeof(daTag_EvtArea_c) == 0x570);
#endif /* D_A_TAG_EVTAREA_H */
rel/d/a/d_a_bg/d_a_bg.cpp
+20 -10
View File
@@ -208,7 +208,8 @@ static asm int createMatAnm(J3DModelData* param_0, u16 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevKColorAnm::~J3DTevKColorAnm() {
// asm J3DTevKColorAnm::~J3DTevKColorAnm() {
extern "C" asm void __dt__15J3DTevKColorAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__15J3DTevKColorAnmFv.s"
}
@@ -218,7 +219,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevKColorAnm::J3DTevKColorAnm() {
// asm J3DTevKColorAnm::J3DTevKColorAnm() {
extern "C" asm void __ct__15J3DTevKColorAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__15J3DTevKColorAnmFv.s"
}
@@ -228,7 +230,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevColorAnm::~J3DTevColorAnm() {
// asm J3DTevColorAnm::~J3DTevColorAnm() {
extern "C" asm void __dt__14J3DTevColorAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__14J3DTevColorAnmFv.s"
}
@@ -238,7 +241,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevColorAnm::J3DTevColorAnm() {
// asm J3DTevColorAnm::J3DTevColorAnm() {
extern "C" asm void __ct__14J3DTevColorAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__14J3DTevColorAnmFv.s"
}
@@ -323,7 +327,8 @@ extern "C" asm void __dt__11J3DTexNoAnmFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexNoAnm::J3DTexNoAnm() {
// asm J3DTexNoAnm::J3DTexNoAnm() {
extern "C" asm void __ct__11J3DTexNoAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__11J3DTexNoAnmFv.s"
}
@@ -333,7 +338,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexMtxAnm::~J3DTexMtxAnm() {
// asm J3DTexMtxAnm::~J3DTexMtxAnm() {
extern "C" asm void __dt__12J3DTexMtxAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__12J3DTexMtxAnmFv.s"
}
@@ -343,7 +349,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexMtxAnm::J3DTexMtxAnm() {
// asm J3DTexMtxAnm::J3DTexMtxAnm() {
extern "C" asm void __ct__12J3DTexMtxAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__12J3DTexMtxAnmFv.s"
}
@@ -353,7 +360,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DMatColorAnm::~J3DMatColorAnm() {
// asm J3DMatColorAnm::~J3DMatColorAnm() {
extern "C" asm void __dt__14J3DMatColorAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__dt__14J3DMatColorAnmFv.s"
}
@@ -363,7 +371,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DMatColorAnm::J3DMatColorAnm() {
// asm J3DMatColorAnm::J3DMatColorAnm() {
extern "C" asm void __ct__14J3DMatColorAnmFv() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/__ct__14J3DMatColorAnmFv.s"
}
@@ -1091,7 +1100,8 @@ asm int daBg_c::create() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTexNoAnm::calc(u16* param_0) const {
// asm void J3DTexNoAnm::calc(u16* param_0) const {
extern "C" asm void calc__11J3DTexNoAnmCFPUs() {
nofralloc
#include "asm/rel/d/a/d_a_bg/d_a_bg/calc__11J3DTexNoAnmCFPUs.s"
}
rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp
+1354 -815
View File
File diff suppressed because it is too large Load Diff
rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp
+209 -238
View File
@@ -4,161 +4,107 @@
//
#include "rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "d/a/d_a_npc.h"
#include "d/d_procname.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
s32 daTag_EvtArea_c::getType() {
u8 type = (u8)shape_angle.z;
return type == 0xff ? 0 : type;
}
struct mDoMtx_stack_c {
static u8 now[48];
};
u32 daTag_EvtArea_c::getOnEvtBit() {
u32 ret = fopAcM_GetParam(this) & 0xfff;
return ret == 0xfff ? -1 : ret;
}
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
u32 daTag_EvtArea_c::getOffEvtBit() {
u32 ret = (fopAcM_GetParam(this) & 0xfff000) >> 12;
return ret == 0xfff ? -1 : ret;
}
struct Vec {};
u8 daTag_EvtArea_c::getBitSW() {
return orig.angle.x & 0xff;
}
struct cXyz {
/* 80266AE4 */ void operator+(Vec const&) const;
/* 80266B34 */ void operator-(Vec const&) const;
};
struct daTag_EvtArea_c {
/* 8048C4F8 */ void create();
/* 8048C728 */ bool Delete();
/* 8048C730 */ void Execute();
/* 8048C894 */ bool Draw();
/* 8048C89C */ void isDelete();
/* 8048CD08 */ void chkPointInArea(cXyz);
/* 8048C94C */ void chkPointInArea(cXyz, cXyz);
/* 8048CD68 */ ~daTag_EvtArea_c();
};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
//
// Forward References:
//
extern "C" void create__15daTag_EvtArea_cFv();
extern "C" bool Delete__15daTag_EvtArea_cFv();
extern "C" void Execute__15daTag_EvtArea_cFv();
extern "C" bool Draw__15daTag_EvtArea_cFv();
extern "C" void isDelete__15daTag_EvtArea_cFv();
extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz();
extern "C" static void daTag_EvtArea_Create__FPv();
extern "C" static void daTag_EvtArea_Delete__FPv();
extern "C" static void daTag_EvtArea_Execute__FPv();
extern "C" static void daTag_EvtArea_Draw__FPv();
extern "C" static bool daTag_EvtArea_IsDelete__FPv();
extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz();
extern "C" void __dt__15daTag_EvtArea_cFv();
//
// External References:
//
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi();
extern "C" void daNpcT_chkEvtBit__FUl();
extern "C" void __pl__4cXyzCFRC3Vec();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __dl__FPv();
extern "C" void PSMTXMultVec();
extern "C" void PSVECSubtract();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
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];
extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
//
// Declarations:
//
/* ############################################################################################## */
/* 8048CDD0-8048CDD4 000000 0004+00 2/2 0/0 0/0 .rodata @3853 */
SECTION_RODATA static f32 const lit_3853 = 100.0f;
COMPILER_STRIP_GATE(0x8048CDD0, &lit_3853);
/* 8048CDE8-8048CE48 -00001 0060+00 1/1 0/0 0/0 .data @3857 */
SECTION_DATA static void* lit_3857[24] = {
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x88),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0xB4),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0xE0),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x10C),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x154),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x180),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x1A0),
(void*)(((char*)create__15daTag_EvtArea_cFv) + 0x1A0),
};
/* 8048CE48-8048CE68 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtArea_MethodTable */
SECTION_DATA static void* daTag_EvtArea_MethodTable[8] = {
(void*)daTag_EvtArea_Create__FPv,
(void*)daTag_EvtArea_Delete__FPv,
(void*)daTag_EvtArea_Execute__FPv,
(void*)daTag_EvtArea_IsDelete__FPv,
(void*)daTag_EvtArea_Draw__FPv,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 8048CE68-8048CE98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTAREA */
SECTION_DATA extern void* g_profile_TAG_EVTAREA[12] = {
(void*)0xFFFFFFFD, (void*)0x0008FFFD,
(void*)0x02E90000, (void*)&g_fpcLf_Method,
(void*)0x00000570, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x011F0000, (void*)&daTag_EvtArea_MethodTable,
(void*)0x00044000, (void*)0x000E0000,
};
/* 8048CE98-8048CEA4 0000B0 000C+00 2/2 0/0 0/0 .data __vt__15daTag_EvtArea_c */
SECTION_DATA extern void* __vt__15daTag_EvtArea_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__15daTag_EvtArea_cFv,
};
u8 daTag_EvtArea_c::getBitSW2() {
return (orig.angle.x & 0xff00) >> 8;
}
/* 8048C4F8-8048C728 000078 0230+00 2/1 0/0 0/0 .text create__15daTag_EvtArea_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTag_EvtArea_c::create() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/create__15daTag_EvtArea_cFv.s"
cPhs__Step daTag_EvtArea_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daTag_EvtArea_c();
fopAcM_OnCondition(this, 8);
}
switch (getType()) {
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case 9:
case 10:
case 11:
case 12:
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 100.0f;
break;
case 13:
mScale.x *= 200.0f;
mScale.y *= 200.0f;
mScale.z *= 200.0f;
break;
case 14:
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 100.0f;
break;
case 15:
mScale.x *= 0.5f;
mScale.z *= 0.5f;
mScale.x *= 1000.0f;
mScale.y *= 1000.0f;
mScale.z *= 1000.0f;
break;
case 16:
case 17:
case 18:
case 19:
case 20:
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 100.0f;
break;
case 21:
mScale.x *= 1000.0f;
mScale.z *= 1000.0f;
break;
case 22:
case 23:
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 100.0f;
break;
default:
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 100.0f;
}
if (isDelete()) {
return cPhs_ERROR_e;
} else {
field_0x56c = 0;
return cPhs_COMPLEATE_e;
}
}
#pragma pop
/* 8048C728-8048C730 0002A8 0008+00 1/1 0/0 0/0 .text Delete__15daTag_EvtArea_cFv */
bool daTag_EvtArea_c::Delete() {
@@ -166,14 +112,31 @@ bool daTag_EvtArea_c::Delete() {
}
/* 8048C730-8048C894 0002B0 0164+00 1/1 0/0 0/0 .text Execute__15daTag_EvtArea_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTag_EvtArea_c::Execute() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s"
bool daTag_EvtArea_c::Execute() {
if (orig.roomNo == dComIfGp_roomControl_getStayNo()) {
if (isDelete()) {
fopAcM_delete(this);
return true;
} else {
mAttentionInfo.mPosition = current.pos;
if (getType() == 8) {
mAttentionInfo.mPosition.y += 100.0f;
}
mGroup = 0;
mEyePos = mAttentionInfo.mPosition;
if (getType() == 15) {
if (chkPointInArea(daPy_getPlayerActorClass()->current.pos)) {
mEyePos = daPy_getPlayerActorClass()->mEyePos;
mGroup = 4;
}
}
mAttentionInfo.mFlags = 0;
return true;
}
} else {
return false;
}
}
#pragma pop
/* 8048C894-8048C89C 000414 0008+00 1/1 0/0 0/0 .text Draw__15daTag_EvtArea_cFv */
bool daTag_EvtArea_c::Draw() {
@@ -181,44 +144,24 @@ bool daTag_EvtArea_c::Draw() {
}
/* 8048C89C-8048C94C 00041C 00B0+00 2/2 0/0 0/0 .text isDelete__15daTag_EvtArea_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTag_EvtArea_c::isDelete() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/isDelete__15daTag_EvtArea_cFv.s"
BOOL daTag_EvtArea_c::isDelete() {
bool ret;
if (getOffEvtBit() != -1) {
if (daNpcT_chkEvtBit(getOffEvtBit())) {
return true;
}
}
ret = false;
if (getBitSW2() != 0xff) {
if (dComIfGs_isSwitch(getBitSW2(), fopAcM_GetRoomNo(this))) {
ret = true;
}
}
return ret;
}
#pragma pop
/* ############################################################################################## */
/* 8048CDD4-8048CDD8 000004 0004+00 0/0 0/0 0/0 .rodata @3854 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3854 = 200.0f;
COMPILER_STRIP_GATE(0x8048CDD4, &lit_3854);
#pragma pop
/* 8048CDD8-8048CDDC 000008 0004+00 0/0 0/0 0/0 .rodata @3855 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3855 = 0.5f;
COMPILER_STRIP_GATE(0x8048CDD8, &lit_3855);
#pragma pop
/* 8048CDDC-8048CDE0 00000C 0004+00 0/0 0/0 0/0 .rodata @3856 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3856 = 1000.0f;
COMPILER_STRIP_GATE(0x8048CDDC, &lit_3856);
#pragma pop
/* 8048CDE0-8048CDE4 000010 0004+00 1/1 0/0 0/0 .rodata @3922 */
SECTION_RODATA static u8 const lit_3922[4] = {
0x00,
0x00,
0x00,
0x00,
};
SECTION_RODATA static f32 const lit_3922 = 0.0f;
COMPILER_STRIP_GATE(0x8048CDE0, &lit_3922);
/* 8048CDE4-8048CDE8 000014 0004+00 1/1 0/0 0/0 .rodata @4146 */
@@ -227,76 +170,104 @@ COMPILER_STRIP_GATE(0x8048CDE4, &lit_4146);
/* 8048C94C-8048CC80 0004CC 0334+00 1/1 0/0 16/16 .text
* chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz.s"
BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) {
cXyz local_24, local_30, local_3c, local_48, local_84, local_cc, local_6c, local_90;
if (field_0x56c == 0) {
if ((getOnEvtBit() != -1 && daNpcT_chkEvtBit(getOnEvtBit()))
|| (getBitSW() != 0xff && dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this)))
|| (getOnEvtBit() == -1 && getBitSW() == 0xff)) {
local_84 = mScale + param_1;
if (getType() == 15 || getType() == 16) {
local_6c = daPy_getPlayerActorClass()->current.pos;
local_6c -= orig.pos;
mDoMtx_YrotS(mDoMtx_stack_c::now, -current.angle.y);
mDoMtx_stack_c::multVec(&local_6c, &local_6c);
local_48.x = -local_84.x;
local_48.z = -local_84.z;
local_3c.x = local_84.x;
local_3c.z = -local_84.z;
local_30.x = local_84.x;
local_30.z = local_84.z;
local_24.x = -local_84.x;
local_24.z = local_84.z;
if (local_48.x < local_6c.x && local_48.z < local_6c.z && local_84.x > local_6c.x && local_84.z > local_6c.z) {
local_90 = param_0 - current.pos;
if (0 <= (s32)local_90.y && (s32)local_90.y < (s32)local_84.y) {
return true;
}
}
} else {
local_cc = current.pos;
local_cc.y -= FLOAT_LABEL(lit_4146);
if (getType() == 21) {
return daNpcT_chkPointInArea(param_0, local_cc, local_84, shape_angle.y, 0);
}
return daNpcT_chkPointInArea(param_0, local_cc, local_84, shape_angle.y, 1);
}
}
}
return false;
}
#pragma pop
/* 8048CC80-8048CCA0 000800 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Create__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTag_EvtArea_Create(void* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Create__FPv.s"
static cPhs__Step daTag_EvtArea_Create(void* i_this) {
return static_cast<daTag_EvtArea_c*>(i_this)->create();
}
#pragma pop
/* 8048CCA0-8048CCC0 000820 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Delete__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTag_EvtArea_Delete(void* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Delete__FPv.s"
static bool daTag_EvtArea_Delete(void* i_this) {
return static_cast<daTag_EvtArea_c*>(i_this)->Delete();
}
#pragma pop
/* 8048CCC0-8048CCE0 000840 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Execute__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTag_EvtArea_Execute(void* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Execute__FPv.s"
static bool daTag_EvtArea_Execute(void* i_this) {
return static_cast<daTag_EvtArea_c*>(i_this)->Execute();
}
#pragma pop
/* 8048CCE0-8048CD00 000860 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Draw__FPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTag_EvtArea_Draw(void* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/daTag_EvtArea_Draw__FPv.s"
static bool daTag_EvtArea_Draw(void* i_this) {
return static_cast<daTag_EvtArea_c*>(i_this)->Draw();
}
#pragma pop
/* 8048CD00-8048CD08 000880 0008+00 1/0 0/0 0/0 .text daTag_EvtArea_IsDelete__FPv */
static bool daTag_EvtArea_IsDelete(void* param_0) {
static bool daTag_EvtArea_IsDelete(void* i_this) {
return true;
}
/* 8048CD08-8048CD68 000888 0060+00 1/1 0/0 0/0 .text chkPointInArea__15daTag_EvtArea_cF4cXyz */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTag_EvtArea_c::chkPointInArea(cXyz param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/chkPointInArea__15daTag_EvtArea_cF4cXyz.s"
BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0) {
cXyz local_28;
local_28.set(FLOAT_LABEL(lit_3922), FLOAT_LABEL(lit_3922), FLOAT_LABEL(lit_3922));
return chkPointInArea(param_0, local_28);
}
#pragma pop
/* 8048CD68-8048CDC8 0008E8 0060+00 1/0 0/0 0/0 .text __dt__15daTag_EvtArea_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daTag_EvtArea_c::~daTag_EvtArea_c() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/__dt__15daTag_EvtArea_cFv.s"
daTag_EvtArea_c::~daTag_EvtArea_c() {
}
#pragma pop
/* 8048CE48-8048CE68 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtArea_MethodTable */
static actor_method_class daTag_EvtArea_MethodTable = {
(process_method_func)daTag_EvtArea_Create,
(process_method_func)daTag_EvtArea_Delete,
(process_method_func)daTag_EvtArea_Execute,
(process_method_func)daTag_EvtArea_IsDelete,
(process_method_func)daTag_EvtArea_Draw,
};
/* 8048CE68-8048CE98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVTAREA */
extern actor_process_profile_definition g_profile_TAG_EVTAREA = {
-3,
8,
-3,
PROC_TAG_EVTAREA,
&g_fpcLf_Method.mBase,
sizeof(daTag_EvtArea_c),
0,
0,
&g_fopAc_Method.base,
0x011F,
&daTag_EvtArea_MethodTable,
0x00044000,
0,
14,
};
src/d/a/d_a_alink_demo.inc
+3 -3
View File
@@ -128,11 +128,11 @@ asm void daAlink_c::endDemoMode() {
#ifdef NONMATCHING
fopAc_ac_c* daAlink_c::getDemoLookActor() {
if (mDemo.getParam0() == 1) {
return (fopAc_ac_c*)dComIfGp_event_getPt1();
return dComIfGp_event_getPt1();
} else if (mDemo.getParam0() == 2) {
return (fopAc_ac_c*)dComIfGp_event_getPt2();
return dComIfGp_event_getPt2();
} else if (mDemo.getParam0() == 3) {
return (fopAc_ac_c*)fopAcM_getTalkEventPartner(this);
return fopAcM_getTalkEventPartner(this);
} else if (mDemo.getParam0() == 4) {
return getMidnaActor();
}
src/d/a/d_a_npc.cpp
+666 -170
View File
File diff suppressed because it is too large Load Diff
src/d/com/d_com_inf_game.cpp
+6 -2
View File
@@ -2388,10 +2388,14 @@ bool dComIfGs_shake_kandelaar_check() {
/* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text dComIfGs_wolfeye_effect_check__Fv
*/
bool dComIfGs_wolfeye_effect_check() {
BOOL dComIfGs_wolfeye_effect_check() {
dScnKy_env_light_c* env_light = i_dKy_getEnvlight();
BOOL ret = false;
return env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6;
if (env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6) {
ret = true;
}
return ret;
}
void dComIfGs_Grass_hide_Set(s8 param_0) {
src/d/d_resorce.cpp
+20 -10
View File
@@ -380,7 +380,8 @@ asm J3DModelData* dRes_info_c::loaderBasicBmd(u32 param_0, void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevKColorAnm::~J3DTevKColorAnm() {
// asm J3DTevKColorAnm::~J3DTevKColorAnm() {
extern "C" asm void __dt__15J3DTevKColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__15J3DTevKColorAnmFv.s"
}
@@ -390,7 +391,8 @@ asm J3DTevKColorAnm::~J3DTevKColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevKColorAnm::J3DTevKColorAnm() {
// asm J3DTevKColorAnm::J3DTevKColorAnm() {
extern "C" asm void __ct__15J3DTevKColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__15J3DTevKColorAnmFv.s"
}
@@ -400,7 +402,8 @@ asm J3DTevKColorAnm::J3DTevKColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevColorAnm::~J3DTevColorAnm() {
// asm J3DTevColorAnm::~J3DTevColorAnm() {
extern "C" asm void __dt__14J3DTevColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__14J3DTevColorAnmFv.s"
}
@@ -410,7 +413,8 @@ asm J3DTevColorAnm::~J3DTevColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTevColorAnm::J3DTevColorAnm() {
// asm J3DTevColorAnm::J3DTevColorAnm() {
extern "C" asm void __ct__14J3DTevColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__14J3DTevColorAnmFv.s"
}
@@ -474,7 +478,8 @@ extern "C" asm void __dt__11J3DTexNoAnmFv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexNoAnm::J3DTexNoAnm() {
// asm J3DTexNoAnm::J3DTexNoAnm() {
extern "C" asm void __ct__11J3DTexNoAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__11J3DTexNoAnmFv.s"
}
@@ -484,7 +489,8 @@ asm J3DTexNoAnm::J3DTexNoAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexMtxAnm::~J3DTexMtxAnm() {
// asm J3DTexMtxAnm::~J3DTexMtxAnm() {
extern "C" asm void __dt__12J3DTexMtxAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__12J3DTexMtxAnmFv.s"
}
@@ -494,7 +500,8 @@ asm J3DTexMtxAnm::~J3DTexMtxAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DTexMtxAnm::J3DTexMtxAnm() {
// asm J3DTexMtxAnm::J3DTexMtxAnm() {
extern "C" asm void __ct__12J3DTexMtxAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__12J3DTexMtxAnmFv.s"
}
@@ -504,7 +511,8 @@ asm J3DTexMtxAnm::J3DTexMtxAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DMatColorAnm::~J3DMatColorAnm() {
// asm J3DMatColorAnm::~J3DMatColorAnm() {
extern "C" asm void __dt__14J3DMatColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__dt__14J3DMatColorAnmFv.s"
}
@@ -514,7 +522,8 @@ asm J3DMatColorAnm::~J3DMatColorAnm() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DMatColorAnm::J3DMatColorAnm() {
// asm J3DMatColorAnm::J3DMatColorAnm() {
extern "C" asm void __ct__14J3DMatColorAnmFv() {
nofralloc
#include "asm/d/d_resorce/__ct__14J3DMatColorAnmFv.s"
}
@@ -1114,7 +1123,8 @@ asm void J3DAnmTransformKey::getTransform(u16 param_0, J3DTransformInfo* param_1
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTexNoAnm::calc(u16* param_0) const {
// asm void J3DTexNoAnm::calc(u16* param_0) const {
extern "C" asm void calc__11J3DTexNoAnmCFPUs() {
nofralloc
#include "asm/d/d_resorce/calc__11J3DTexNoAnmCFPUs.s"
}
src/d/event/d_event.cpp
+11 -11
View File
@@ -489,12 +489,12 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) {
/* 80041D34-80041DDC 03C674 00A8+00 1/1 0/0 0/0 .text talkEnd__14dEvt_control_cFv */
int dEvt_control_c::talkEnd() {
fopAc_ac_c* actor = (fopAc_ac_c*)getPt1();
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
actor = (fopAc_ac_c*)getPt2();
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
@@ -560,12 +560,12 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
/* 80041F18-80041FA0 03C858 0088+00 1/1 0/0 0/0 .text demoEnd__14dEvt_control_cFv */
int dEvt_control_c::demoEnd() {
fopAc_ac_c* actor = (fopAc_ac_c*)getPt1();
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
actor = (fopAc_ac_c*)getPt2();
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
}
@@ -597,7 +597,7 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) {
if (commonCheck(p_order, 4, 3)) {
mMode = EVT_MODE_DEMO;
fopAc_ac_c* actor2 = (fopAc_ac_c*)getPt2();
fopAc_ac_c* actor2 = getPt2();
if (actor2 != NULL) {
i_dComIfGp_getEventManager().setObjectArchive(actor2->mEvtInfo.getArchiveName());
}
@@ -754,9 +754,9 @@ int dEvt_control_c::entry() {
/* 80042468-80042518 03CDA8 00B0+00 1/1 8/8 388/388 .text reset__14dEvt_control_cFv */
void dEvt_control_c::reset() {
if (field_0xec != 0xFF) {
void* pt1 = getPt1();
fopAc_ac_c* pt1 = getPt1();
s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1);
void* pt2 = getPt2();
fopAc_ac_c* pt2 = getPt2();
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec);
mChangeOK = pt1;
@@ -769,7 +769,7 @@ void dEvt_control_c::reset() {
void dEvt_control_c::reset(void* param_0) {
if (field_0xec != 0xFF) {
s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx((fopAc_ac_c*)param_0, field_0xec);
void* pt2 = getPt2();
fopAc_ac_c* pt2 = getPt2();
order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, param_0, pt2, eventIdx, field_0xec);
}
@@ -970,7 +970,7 @@ bool dEvt_control_c::skipper() {
if (startSkip) {
dMsgObject_onKillMessageFlag();
void* ptr = convPId(field_0x104);
fopAc_ac_c* ptr = convPId(field_0x104);
if (ptr == NULL) {
ptr = dComIfGp_getPlayer(0);
}
@@ -1240,8 +1240,8 @@ u32 dEvt_control_c::getPId(void* actor) {
}
/* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text convPId__14dEvt_control_cFUi */
void* dEvt_control_c::convPId(unsigned int id) {
return fopAcIt_Judge(fpcSch_JudgeByID, &id);
fopAc_ac_c* dEvt_control_c::convPId(unsigned int id) {
return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeByID, &id);
}
/* 8004331C-800433F0 03DC5C 00D4+00 0/0 1/1 0/0 .text getStbDemoData__14dEvt_control_cFPc
src/d/event/d_event_manager.cpp
+1 -1
View File
@@ -464,7 +464,7 @@ void dEvent_manager_c::Sequencer() {
evtControl.onSkipFade();
}
void* actor = evtControl.getPt1();
fopAc_ac_c* actor = evtControl.getPt1();
if (actor == NULL) {
actor = evtControl.getPt2();
}
src/f_op/f_op_actor_mng.cpp
+3 -3
View File
@@ -1435,18 +1435,18 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priori
/* 8001BB14-8001BB44 016454 0030+00 0/0 11/11 10/10 .text
* fopAcM_getTalkEventPartner__FPC10fopAc_ac_c */
void* fopAcM_getTalkEventPartner(fopAc_ac_c const*) {
fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c const*) {
return dComIfGp_event_getTalkPartner();
}
/* 8001BB44-8001BB74 016484 0030+00 0/0 5/5 0/0 .text fopAcM_getItemEventPartner__FPC10fopAc_ac_c
*/
void* fopAcM_getItemEventPartner(fopAc_ac_c const*) {
fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c const*) {
return dComIfGp_event_getItemPartner();
}
/* 8001BB74-8001BBE8 0164B4 0074+00 0/0 1/1 0/0 .text fopAcM_getEventPartner__FPC10fopAc_ac_c */
void* fopAcM_getEventPartner(fopAc_ac_c const* actor) {
fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* actor) {
if (dComIfGp_event_getPt1() != actor) {
return dComIfGp_event_getPt1();
}
src/m_Do/m_Do_ext.cpp
+2 -2
View File
@@ -2828,8 +2828,8 @@ asm void mDoExt_McaMorfSO::calc() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* param_0, int param_1, f32 param_2, f32 param_3,
f32 param_4, f32 param_5) {
asm void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate,
f32 i_start, f32 i_end) {
nofralloc
#include "asm/m_Do/m_Do_ext/setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff.s"
}