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

Fix d_msg_flow linkage (#1975)

This commit is contained in:
Caroline Madsen 2023-11-03 19:16:36 -04:00 committed by GitHub
parent b344f3b796
commit 2b766ef3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/d/msg/d_msg_flow/event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s Normal file
View File

@ -0,0 +1,11 @@
lbl_8024CD84:
/* 8024CD84 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8024CD88 7C 08 02 A6 */ mflr r0
/* 8024CD8C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8024CD90 38 63 00 3C */ addi r3, r3, 0x3c
/* 8024CD94 48 00 0D 1D */ bl func_8024DAB0
/* 8024CD98 38 60 00 01 */ li r3, 1
/* 8024CD9C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8024CDA0 7C 08 03 A6 */ mtlr r0
/* 8024CDA4 38 21 00 10 */ addi r1, r1, 0x10
/* 8024CDA8 4E 80 00 20 */ blr

9
asm/d/msg/d_msg_flow/func_8024DAB0.s Normal file
View File

@ -0,0 +1,9 @@
lbl_8024DAB0:
/* 8024DAB0 80 83 00 00 */ lwz r4, 0(r3)
/* 8024DAB4 2C 04 00 00 */ cmpwi r4, 0
/* 8024DAB8 41 82 00 0C */ beq lbl_8024DAC4
/* 8024DABC 38 04 FF FF */ addi r0, r4, -1
/* 8024DAC0 90 03 00 00 */ stw r0, 0(r3)
lbl_8024DAC4:
/* 8024DAC4 80 63 00 00 */ lwz r3, 0(r3)
/* 8024DAC8 4E 80 00 20 */ blr

21
src/d/msg/d_msg_flow.cpp
View File

@ -2114,10 +2114,21 @@ int dMsgFlow_c::event020(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) {
/* 8024CD84-8024CDAC 2476C4 0028+00 1/0 0/0 0/0 .text
* event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */
#ifdef NONMATCHING
int dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) {
cLib_calcTimer(&field_0x3c);
return 1;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) {
nofralloc
#include "asm/d/msg/d_msg_flow/event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80454DA8-80454DAC 0033A8 0004+00 1/1 0/0 0/0 .sdata2 @6273 */
@ -2605,4 +2616,14 @@ int dMsgFlow_c::event042(mesg_flow_node_event*, fopAc_ac_c*) {
return 1;
}
/* 8024DAB0-8024DACC 2483F0 001C+00 3/3 0/0 0/0 .text cLib_calcTimer<l>__FPl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
extern "C" asm void func_8024DAB0(void* _this, s32* param_0) {
nofralloc
#include "asm/d/msg/d_msg_flow/func_8024DAB0.s"
}
#pragma pop
/* 80399CB0-80399CB0 026310 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */