Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish matching zNPCGoalTiki #333

Merged
merged 1 commit into from
Jul 21, 2024
Merged

Finish matching zNPCGoalTiki #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
Object(NonMatching, "SB/Game/zNPCGoalCommon.cpp"), # wrong function order
Object(NonMatching, "SB/Game/zNPCGoalStd.cpp"),
Object(NonMatching, "SB/Game/zNPCGoalRobo.cpp"),
Object(NonMatching, "SB/Game/zNPCGoalTiki.cpp"),
Object(Matching, "SB/Game/zNPCGoalTiki.cpp", extra_cflags=["-sym on"]),
Object(NonMatching, "SB/Game/zNPCMessenger.cpp"),
Object(NonMatching, "SB/Game/zNPCMgr.cpp"),
Object(Matching, "SB/Game/zNPCTypes.cpp"),
Expand Down
13 changes: 4 additions & 9 deletions src/SB/Game/zNPCGoalTiki.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
#include "xEvent.h"
#include "zNPCTypes.h"

extern F32 _836_0;
extern F32 _837_3;
extern F32 _862_2;
extern F32 _863_1;

xFactoryInst* GOALCreate_Tiki(S32 who, RyzMemGrow* grow, void*)
{
xGoal* goal;
Expand Down Expand Up @@ -64,11 +59,11 @@ S32 zNPCGoalTikiIdle::Enter(F32, void*)

if (tiki->SelfType() == NPC_TYPE_TIKI_THUNDER)
{
tmr_wait = _836_0;
tmr_wait = 0.1f;
}
else if (!tiki->nav_dest)
{
tmr_wait = _837_3;
tmr_wait = 2.0f;
}
else
{
Expand Down Expand Up @@ -112,10 +107,10 @@ S32 zNPCGoalTikiCount::Enter(F32, void*)
{
zNPCTiki* tiki = (zNPCTiki*)GetOwner();

tmr_count = _862_2;
tmr_count = 3.0f;
beingCarried = 0;

tiki->t1 = _863_1;
tiki->t1 = 0.0f;

return 0;
}
Expand Down