encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Misc Changes (#306)

Browse Source
This commit is contained in:
Pheenoh
2023-03-07 18:03:46 -07:00
committed by GitHub
parent 6c2e18af70
commit f31ab5ae0b
89 changed files with 11095 additions and 1436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Progress.md
+7 -7
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 | 25.561317% | 919324 | 3596544
.text | 25.584339% | 920152 | 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 | 33.408843% | 1343260 | 4020672
Total | 33.429437% | 1344088 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 33.408843% | 1343260 | 4020672
RELs | 33.385425% | 3839432 | 11500324
Total | 33.391491% | 5182692 | 15520996
main.dol | 33.429437% | 1344088 | 4020672
RELs | 33.387651% | 3839688 | 11500324
Total | 33.398475% | 5183776 | 15520996
## RELs
@@ -745,7 +745,7 @@ d_a_tag_mhint | 35.576923% | 1332 | 3744
d_a_tag_mist | 43.436293% | 900 | 2072
d_a_tag_mmsg | 100.000000% | 1960 | 1960
d_a_tag_msg | 37.563971% | 1468 | 3908
d_a_tag_mstop | 36.151961% | 1180 | 3264
d_a_tag_mstop | 43.995098% | 1436 | 3264
d_a_tag_mwait | 35.082873% | 1016 | 2896
d_a_tag_myna2 | 47.260274% | 828 | 1752
d_a_tag_myna_light | 36.747759% | 1148 | 3124
@@ -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.385425% | 3839432 | 11500324
Total | 33.387651% | 3839688 | 11500324
asm/d/msg/d_msg_flow/query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-31
View File
@@ -1,31 +0,0 @@
lbl_8024B250:
/* 8024B250 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B254 7C 08 02 A6 */ mflr r0
/* 8024B258 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B25C A0 04 00 04 */ lhz r0, 4(r4)
/* 8024B260 28 00 00 00 */ cmplwi r0, 0
/* 8024B264 40 82 00 30 */ bne lbl_8024B294
/* 8024B268 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B26C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B270 4B DE 78 39 */ bl getRupeeMax__21dSv_player_status_a_cCFv
/* 8024B274 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B278 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B27C A0 84 00 04 */ lhz r4, 4(r4)
/* 8024B280 54 60 04 3E */ clrlwi r0, r3, 0x10
/* 8024B284 7C 00 20 50 */ subf r0, r0, r4
/* 8024B288 54 00 0F FE */ srwi r0, r0, 0x1f
/* 8024B28C 7C 03 03 78 */ mr r3, r0
/* 8024B290 48 00 00 20 */ b lbl_8024B2B0
lbl_8024B294:
/* 8024B294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B298 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B29C A0 63 00 04 */ lhz r3, 4(r3)
/* 8024B2A0 54 00 04 3E */ clrlwi r0, r0, 0x10
/* 8024B2A4 7C 00 18 50 */ subf r0, r0, r3
/* 8024B2A8 54 00 0F FE */ srwi r0, r0, 0x1f
/* 8024B2AC 7C 03 03 78 */ mr r3, r0
lbl_8024B2B0:
/* 8024B2B0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B2B4 7C 08 03 A6 */ mtlr r0
/* 8024B2B8 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B2BC 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8024B504:
/* 8024B504 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B508 7C 08 02 A6 */ mflr r0
/* 8024B50C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B518 38 63 0D D8 */ addi r3, r3, 0xdd8
/* 8024B51C A0 04 00 04 */ lhz r0, 4(r4)
/* 8024B520 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e
/* 8024B524 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */
/* 8024B528 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */
/* 8024B52C 7C 84 02 2E */ lhzx r4, r4, r0
/* 8024B530 4B DE 94 8D */ bl isEventBit__11dSv_event_cCFUs
/* 8024B534 7C 60 00 34 */ cntlzw r0, r3
/* 8024B538 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B53C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B540 7C 08 03 A6 */ mtlr r0
/* 8024B544 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B548 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-15
View File
@@ -1,15 +0,0 @@
lbl_8024B54C:
/* 8024B54C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B550 7C 08 02 A6 */ mflr r0
/* 8024B554 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B55C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B560 38 63 09 58 */ addi r3, r3, 0x958
/* 8024B564 A0 84 00 04 */ lhz r4, 4(r4)
/* 8024B568 4B DE 92 81 */ bl isTbox__12dSv_memBit_cCFi
/* 8024B56C 7C 60 00 34 */ cntlzw r0, r3
/* 8024B570 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B574 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B578 7C 08 03 A6 */ mtlr r0
/* 8024B57C 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B580 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-15
View File
@@ -1,15 +0,0 @@
lbl_8024B584:
/* 8024B584 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B588 7C 08 02 A6 */ mflr r0
/* 8024B58C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B598 38 63 09 58 */ addi r3, r3, 0x958
/* 8024B59C A0 84 00 04 */ lhz r4, 4(r4)
/* 8024B5A0 4B DE 92 C1 */ bl isSwitch__12dSv_memBit_cCFi
/* 8024B5A4 7C 60 00 34 */ cntlzw r0, r3
/* 8024B5A8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B5AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B5B0 7C 08 03 A6 */ mtlr r0
/* 8024B5B4 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B5B8 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-15
View File
@@ -1,15 +0,0 @@
lbl_8024B5BC:
/* 8024B5BC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B5C0 7C 08 02 A6 */ mflr r0
/* 8024B5C4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B5C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B5CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B5D0 38 63 09 58 */ addi r3, r3, 0x958
/* 8024B5D4 A0 84 00 04 */ lhz r4, 4(r4)
/* 8024B5D8 4B DE 93 15 */ bl isItem__12dSv_memBit_cCFi
/* 8024B5DC 7C 60 00 34 */ cntlzw r0, r3
/* 8024B5E0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B5E4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B5E8 7C 08 03 A6 */ mtlr r0
/* 8024B5EC 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B5F0 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-15
View File
@@ -1,15 +0,0 @@
lbl_8024B5F4:
/* 8024B5F4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B5F8 7C 08 02 A6 */ mflr r0
/* 8024B5FC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B600 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B604 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B608 38 63 09 78 */ addi r3, r3, 0x978
/* 8024B60C A0 84 00 04 */ lhz r4, 4(r4)
/* 8024B610 4B DE 95 D9 */ bl isSwitch__12dSv_danBit_cCFi
/* 8024B614 7C 60 00 34 */ cntlzw r0, r3
/* 8024B618 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B61C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B620 7C 08 03 A6 */ mtlr r0
/* 8024B624 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B628 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-15
View File
@@ -1,15 +0,0 @@
lbl_8024B62C:
/* 8024B62C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B630 7C 08 02 A6 */ mflr r0
/* 8024B634 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024B63C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024B640 38 63 09 78 */ addi r3, r3, 0x978
/* 8024B644 A0 84 00 04 */ lhz r4, 4(r4)
/* 8024B648 4B DE 96 2D */ bl isItem__12dSv_danBit_cCFi
/* 8024B64C 7C 60 00 34 */ cntlzw r0, r3
/* 8024B650 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B654 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B658 7C 08 03 A6 */ mtlr r0
/* 8024B65C 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B660 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8024B664:
/* 8024B664 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B668 7C 08 02 A6 */ mflr r0
/* 8024B66C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B670 A0 64 00 04 */ lhz r3, 4(r4)
/* 8024B674 38 80 FF FF */ li r4, -1
/* 8024B678 28 05 00 00 */ cmplwi r5, 0
/* 8024B67C 41 82 00 10 */ beq lbl_8024B68C
/* 8024B680 88 05 04 E2 */ lbz r0, 0x4e2(r5)
/* 8024B684 7C 00 07 74 */ extsb r0, r0
/* 8024B688 7C 04 03 78 */ mr r4, r0
lbl_8024B68C:
/* 8024B68C 4B DE 23 A5 */ bl dComIfGs_isZoneSwitch__Fii
/* 8024B690 7C 60 00 34 */ cntlzw r0, r3
/* 8024B694 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B698 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B69C 7C 08 03 A6 */ mtlr r0
/* 8024B6A0 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B6A4 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8024B6A8:
/* 8024B6A8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B6AC 7C 08 02 A6 */ mflr r0
/* 8024B6B0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B6B4 A0 64 00 04 */ lhz r3, 4(r4)
/* 8024B6B8 38 80 FF FF */ li r4, -1
/* 8024B6BC 28 05 00 00 */ cmplwi r5, 0
/* 8024B6C0 41 82 00 10 */ beq lbl_8024B6D0
/* 8024B6C4 88 05 04 E2 */ lbz r0, 0x4e2(r5)
/* 8024B6C8 7C 00 07 74 */ extsb r0, r0
/* 8024B6CC 7C 04 03 78 */ mr r4, r0
lbl_8024B6D0:
/* 8024B6D0 4B DE 25 01 */ bl dComIfGs_isZoneItem__Fii
/* 8024B6D4 7C 60 00 34 */ cntlzw r0, r3
/* 8024B6D8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B6DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B6E0 7C 08 03 A6 */ mtlr r0
/* 8024B6E4 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B6E8 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8024B6EC:
/* 8024B6EC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B6F0 7C 08 02 A6 */ mflr r0
/* 8024B6F4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B6F8 A0 64 00 04 */ lhz r3, 4(r4)
/* 8024B6FC 38 80 FF FF */ li r4, -1
/* 8024B700 28 05 00 00 */ cmplwi r5, 0
/* 8024B704 41 82 00 10 */ beq lbl_8024B714
/* 8024B708 88 05 04 E2 */ lbz r0, 0x4e2(r5)
/* 8024B70C 7C 00 07 74 */ extsb r0, r0
/* 8024B710 7C 04 03 78 */ mr r4, r0
lbl_8024B714:
/* 8024B714 4B DE 24 51 */ bl dComIfGs_isOneZoneSwitch__Fii
/* 8024B718 7C 60 00 34 */ cntlzw r0, r3
/* 8024B71C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B720 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B724 7C 08 03 A6 */ mtlr r0
/* 8024B728 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B72C 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-19
View File
@@ -1,19 +0,0 @@
lbl_8024B730:
/* 8024B730 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024B734 7C 08 02 A6 */ mflr r0
/* 8024B738 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024B73C A0 64 00 04 */ lhz r3, 4(r4)
/* 8024B740 38 80 FF FF */ li r4, -1
/* 8024B744 28 05 00 00 */ cmplwi r5, 0
/* 8024B748 41 82 00 10 */ beq lbl_8024B758
/* 8024B74C 88 05 04 E2 */ lbz r0, 0x4e2(r5)
/* 8024B750 7C 00 07 74 */ extsb r0, r0
/* 8024B754 7C 04 03 78 */ mr r4, r0
lbl_8024B758:
/* 8024B758 4B DE 24 E5 */ bl dComIfGs_isOneZoneItem__Fii
/* 8024B75C 7C 60 00 34 */ cntlzw r0, r3
/* 8024B760 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 8024B764 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024B768 7C 08 03 A6 */ mtlr r0
/* 8024B76C 38 21 00 10 */ addi r1, r1, 0x10
/* 8024B770 4E 80 00 20 */ blr
asm/d/msg/d_msg_flow/query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s
-29
View File
@@ -1,29 +0,0 @@
lbl_8024C2A0:
/* 8024C2A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8024C2A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8024C2A8 88 03 01 0C */ lbz r0, 0x10c(r3)
/* 8024C2AC 28 00 00 00 */ cmplwi r0, 0
/* 8024C2B0 40 82 00 0C */ bne lbl_8024C2BC
/* 8024C2B4 38 00 00 00 */ li r0, 0
/* 8024C2B8 48 00 00 3C */ b lbl_8024C2F4
lbl_8024C2BC:
/* 8024C2BC 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 8024C2C0 28 00 00 13 */ cmplwi r0, 0x13
/* 8024C2C4 41 81 00 0C */ bgt lbl_8024C2D0
/* 8024C2C8 38 00 00 01 */ li r0, 1
/* 8024C2CC 48 00 00 28 */ b lbl_8024C2F4
lbl_8024C2D0:
/* 8024C2D0 28 00 00 27 */ cmplwi r0, 0x27
/* 8024C2D4 41 81 00 0C */ bgt lbl_8024C2E0
/* 8024C2D8 38 00 00 02 */ li r0, 2
/* 8024C2DC 48 00 00 18 */ b lbl_8024C2F4
lbl_8024C2E0:
/* 8024C2E0 28 00 00 3B */ cmplwi r0, 0x3b
/* 8024C2E4 41 81 00 0C */ bgt lbl_8024C2F0
/* 8024C2E8 38 00 00 03 */ li r0, 3
/* 8024C2EC 48 00 00 08 */ b lbl_8024C2F4
lbl_8024C2F0:
/* 8024C2F0 38 00 00 04 */ li r0, 4
lbl_8024C2F4:
/* 8024C2F4 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8024C2F8 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/__dt__12daTagMstop_cFv.s
-27
View File
@@ -1,27 +0,0 @@
lbl_805A6338:
/* 805A6338 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805A633C 7C 08 02 A6 */ mflr r0
/* 805A6340 90 01 00 14 */ stw r0, 0x14(r1)
/* 805A6344 93 E1 00 0C */ stw r31, 0xc(r1)
/* 805A6348 93 C1 00 08 */ stw r30, 8(r1)
/* 805A634C 7C 7E 1B 79 */ or. r30, r3, r3
/* 805A6350 7C 9F 23 78 */ mr r31, r4
/* 805A6354 41 82 00 2C */ beq lbl_805A6380
/* 805A6358 38 7E 05 74 */ addi r3, r30, 0x574
/* 805A635C 38 80 FF FF */ li r4, -1
/* 805A6360 4B CA 3B E9 */ bl __dt__10dMsgFlow_cFv
/* 805A6364 7F C3 F3 78 */ mr r3, r30
/* 805A6368 38 80 00 00 */ li r4, 0
/* 805A636C 4B A7 29 21 */ bl __dt__10fopAc_ac_cFv
/* 805A6370 7F E0 07 35 */ extsh. r0, r31
/* 805A6374 40 81 00 0C */ ble lbl_805A6380
/* 805A6378 7F C3 F3 78 */ mr r3, r30
/* 805A637C 4B D2 89 C1 */ bl __dl__FPv
lbl_805A6380:
/* 805A6380 7F C3 F3 78 */ mr r3, r30
/* 805A6384 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 805A6388 83 C1 00 08 */ lwz r30, 8(r1)
/* 805A638C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805A6390 7C 08 03 A6 */ mtlr r0
/* 805A6394 38 21 00 10 */ addi r1, r1, 0x10
/* 805A6398 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Create__FP10fopAc_ac_c.s
-9
View File
@@ -1,9 +0,0 @@
lbl_805A6318:
/* 805A6318 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805A631C 7C 08 02 A6 */ mflr r0
/* 805A6320 90 01 00 14 */ stw r0, 0x14(r1)
/* 805A6324 4B FF FE 15 */ bl create__12daTagMstop_cFv
/* 805A6328 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805A632C 7C 08 03 A6 */ mtlr r0
/* 805A6330 38 21 00 10 */ addi r1, r1, 0x10
/* 805A6334 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Delete__FP12daTagMstop_c.s
-11
View File
@@ -1,11 +0,0 @@
lbl_805A639C:
/* 805A639C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805A63A0 7C 08 02 A6 */ mflr r0
/* 805A63A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 805A63A8 38 80 FF FF */ li r4, -1
/* 805A63AC 4B FF FF 8D */ bl __dt__12daTagMstop_cFv
/* 805A63B0 38 60 00 01 */ li r3, 1
/* 805A63B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805A63B8 7C 08 03 A6 */ mtlr r0
/* 805A63BC 38 21 00 10 */ addi r1, r1, 0x10
/* 805A63C0 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Execute__FP12daTagMstop_c.s
-9
View File
@@ -1,9 +0,0 @@
lbl_805A693C:
/* 805A693C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805A6940 7C 08 02 A6 */ mflr r0
/* 805A6944 90 01 00 14 */ stw r0, 0x14(r1)
/* 805A6948 4B FF FA B1 */ bl execute__12daTagMstop_cFv
/* 805A694C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805A6950 7C 08 03 A6 */ mtlr r0
/* 805A6954 38 21 00 10 */ addi r1, r1, 0x10
/* 805A6958 4E 80 00 20 */ blr
asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/eventOrder__12daTagMstop_cFv.s
-14
View File
@@ -1,14 +0,0 @@
lbl_805A63C4:
/* 805A63C4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 805A63C8 7C 08 02 A6 */ mflr r0
/* 805A63CC 90 01 00 14 */ stw r0, 0x14(r1)
/* 805A63D0 A0 03 00 FA */ lhz r0, 0xfa(r3)
/* 805A63D4 60 00 00 01 */ ori r0, r0, 1
/* 805A63D8 B0 03 00 FA */ sth r0, 0xfa(r3)
/* 805A63DC 38 80 00 00 */ li r4, 0
/* 805A63E0 38 A0 00 00 */ li r5, 0
/* 805A63E4 4B A7 4D B9 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs
/* 805A63E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 805A63EC 7C 08 03 A6 */ mtlr r0
/* 805A63F0 38 21 00 10 */ addi r1, r1, 0x10
/* 805A63F4 4E 80 00 20 */ blr
include/d/a/d_a_alink.h
+47 -4
View File
@@ -6260,6 +6260,7 @@ public:
enum daMidna_FLG1 {
FLG1_FORCE_NORMAL_COL = 8,
FLG1_FORCE_TIRED_COL = 4,
FLG1_SHADOW_MODEL_DRAW_DEMO_FORCE = 2,
};
enum daMidna_ANM {};
@@ -6327,6 +6328,48 @@ public:
BOOL checkNoDraw() const { return checkStateFlg0(FLG0_NO_DRAW); }
BOOL checkNoInput() const { return checkStateFlg0(FLG0_NO_INPUT); }
int checkMetamorphoseEnable() { return (this->*mpFunc)(); }
int checkShadowModelDrawDemoForce() const { return checkStateFlg1(FLG1_SHADOW_MODEL_DRAW_DEMO_FORCE); }
bool checkShadowModelDrawSmode() const {
if (field_0x84e != 3 && field_0x84e != 4) {
if (field_0x84e == 2) {
return false;
} else {
return true;
}
}
}
int checkShadowModelDraw() const {
int ret = 0;
if (checkShadowModelDrawDemoForce() == 0) {
if (checkShadowModelDrawSmode() != 0) {
ret = 0;
}
}
return ret;
}
int checkShadowReturnEnd() const {
if (field_0x5e4[0].getIdx() == 0x21c && !field_0x578->isStop()) {
return 1;
}
return 0;
}
int checkShadowModeTalkWait() const {
if (mDemoType != 2 && mDemoType != 1) {
return 0;
}
return 1;
}
void setShadowReturn() { mDemoType = 4; }
bool checkPortalObjRide() const {
return checkStateFlg0(FLG0_UNK_8000000) && checkStateFlg0(FLG0_UNK_200);
@@ -6342,7 +6385,7 @@ private:
/* 0x0570 */ J3DModel* field_0x570;
/* 0x0574 */ J3DModel* field_0x574;
/* 0x0578 */ mDoExt_McaMorfSO* field_0x578;
/* 0x057C */ mDoExt_McaMorfCallBack1_c* field_0x57c;
/* 0x057C */ mDoExt_McaMorfCallBack1_c* field_0x57c; // this is really daMidna_McaMorfCB1_c. fix later
/* 0x0580 */ cXyz* field_0x580;
/* 0x0584 */ mDoExt_bckAnm field_0x584;
/* 0x05A0 */ mDoExt_bckAnm field_0x5a0;
@@ -6395,7 +6438,7 @@ private:
/* 0x06DC */ mDoExt_bckAnm* mpDemoHDTmpBck;
/* 0x06E0 */ J3DGXColorS10 field_0x6e0;
/* 0x06E8 */ J3DGXColor field_0x6e8;
/* 0x06EC */ u8 field_0x6ec;
/* 0x06EC */ u8 field_0x6ec; // this is probably J3DGXColor. fix later
/* 0x06ED */ u8 field_0x6ed;
/* 0x06EE */ u8 field_0x6ee;
/* 0x06EF */ u8 field_0x6ef;
@@ -6414,7 +6457,7 @@ private:
/* 0x085A */ s16 field_0x85a;
/* 0x085C */ u8 field_0x85c[0x22];
/* 0x087E */ s16 field_0x87e;
/* 0x0880 */ u8 field_0x880[0xC];
/* 0x0880 */ u8 field_0x880[0xC]; // csXyz in here, fix later
/* 0x088C */ int mStaffID;
/* 0x0890 */ u32 mStateFlg0;
/* 0x0894 */ u32 mStateFlg1;
@@ -6426,7 +6469,7 @@ private:
/* 0x08CC */ u8 field_0x8cc[0x14];
/* 0x08E0 */ cXyz field_0x8e0[5];
/* 0x091C */ cXyz field_0x91c[5];
/* 0x0958 */ u8 field_0x958[0xC];
/* 0x0958 */ u8 field_0x958[0xC]; // cXyz here, fix later
/* 0x0964 */ cXyz field_0x964[5];
/* 0x09A0 */ u8 field_0x9a0[0x14];
/* 0x09C4 */ cXyz field_0x9c4;
include/d/a/d_a_player.h
+18
View File
@@ -160,6 +160,10 @@ public:
s16 getMoveAngle() const { return mDemoMoveAngle; }
f32 getStick() { return mStick; }
int getParam0() const { return mParam0; }
void setParam0(int value) { mParam0 = value;}
void setParam1(int value) { mParam1 = value;}
void setParam2(int value) { mParam2 = value;}
void setPos0(const cXyz* pos) { mDemoPos0 = *pos;}
private:
/* 0x00 */ u16 mDemoType;
@@ -761,6 +765,20 @@ public:
u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
void i_changeOriginalDemo() {
mDemo.setOriginalDemoType();
mDemo.setParam0(0);
}
void i_changeDemoMode(u32 i_demoMode,int i_param0,int i_param1,s16 i_param2) {
mDemo.setDemoMode(i_demoMode);
mDemo.setParam0(i_param0);
mDemo.setParam1(i_param1);
mDemo.setParam2(i_param2);
}
void i_changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); }
inline static u32 i_getLastSceneMode();
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip();

Some files were not shown because too many files have changed in this diff Show More