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

Link npc_zra (#2853)

This commit is contained in:
YunataSavior 2025-11-23 21:10:24 -08:00 committed by GitHub
parent 6067c05f14
commit 0cc9ebd724
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1961,7 +1961,7 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zelR"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zelRo"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zelda"),
ActorRel(Equivalent, "d_a_npc_zra"), # weak func order
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zra"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zrc"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zrz"),
ActorRel(MatchingFor(ALL_GCN), "d_a_obj_Lv5Key"),

1
include/d/actor/d_a_npc_zra.h
View File

@ -22,7 +22,6 @@ public:
/* 80B78CA0 */ BOOL chkPassedChase(u16, cXyz);
/* 80B78CFC */ int getDstPosChase(u16, cXyz, cXyz&);
/* 80B78E08 */ f32 chkPassDst(u16, cXyz);
/* 80B7EF88 */ ~daNpc_zrA_Path_c() {}
int getEndIdx() { return mPathInfo->m_num - 1; }
};

6
src/d/actor/d_a_npc_zra.cpp
View File

@ -2327,6 +2327,12 @@ void daNpc_zrA_c::setExpressionTalkAfter() {
}
}
// fakematch to get the clib_calctimer functions to appear in the correct order.
// Perhaps clever inline keyword usage can fix the problem, but this is easier.
int dummy_clib_u8(u8* arg) {
return cLib_calcTimer<u8>(arg);
}
/* 80B7EBA0-80B7EC54 006780 00B4+00 1/1 0/0 0/0 .text setPrtcl__11daNpc_zrA_cFv */
void daNpc_zrA_c::setPrtcl() {
u32 flags = 0x40002;