Skip to content

zNPCTypeTiki: Progress #707

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

Merged
JoshSanch merged 3 commits into from
Dec 20, 2025
Merged

zNPCTypeTiki: Progress #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80222d8
zNPCTypeTiki: Progress
bluisblu Dec 17, 2025
25994f9
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb into main
bluisblu Dec 20, 2025
7648db0
Regression fix attempt
bluisblu Dec 20, 2025
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 @@ -558,7 +558,7 @@ def MatchingFor(*versions):
Object(NonMatching, "SB/Game/zNPCTypeRobot.cpp"),
Object(NonMatching, "SB/Game/zNPCTypeVillager.cpp"),
Object(NonMatching, "SB/Game/zNPCTypeAmbient.cpp"),
Object(NonMatching, "SB/Game/zNPCTypeTiki.cpp"),
Object(NonMatching, "SB/Game/zNPCTypeTiki.cpp", extra_cflags=["-sym on"]),
Object(NonMatching, "SB/Core/x/xBehaveMgr.cpp"),
Object(Matching, "SB/Core/x/xBehaviour.cpp", extra_cflags=["-sym on"]),
Object(Matching, "SB/Core/x/xBehaveGoalSimple.cpp", extra_cflags=["-sym on"]),
Expand Down
16 changes: 0 additions & 16 deletions src/SB/Game/zEntPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,8 +2312,6 @@ static U32 BounceCheck(xAnimTransition*, xAnimSingle*, void*)
return globals.player.Bounced == 1;
}



// Equivalent: sda relocation scheduling + regswap
static U32 BounceCB(xAnimTransition*, xAnimSingle*, void*)
{
Expand Down Expand Up @@ -3530,7 +3528,6 @@ static U32 LassoSwingReleaseCB(xAnimTransition* tran, xAnimSingle* anim, void* o
return 0;
}


static U8 StunBubbleTrail(xAnimSingle* anim)
{
S32 ret = 0;
Expand Down Expand Up @@ -3570,7 +3567,6 @@ static U8 BubbleBounceContrails(xAnimSingle* anim)
return ret;
}


static U32 StunStartFallCB(xAnimTransition*, xAnimSingle*, void*)
{
stun_power_tmr = 0;
Expand Down Expand Up @@ -3624,8 +3620,6 @@ static S32 MeleeAttackBoundCollide(xEnt* ent, zScene* zscn, xBound* meleeB)
return cbdata.hitsomething;
}



static S32 CheckObjectAgainstMeleeBound(xEnt* ent, void* data)
{
return 0;
Expand Down Expand Up @@ -3709,10 +3703,6 @@ static U32 count_talk_anims(xAnimTable* anims)
return talkAnimCount;
}





static void load_player_ini(zPlayerSettings& ps, xModelInstance& model, xModelAssetParam* modelass,
U32 params_size)
{
Expand Down Expand Up @@ -7579,12 +7569,6 @@ WEAK xVec3* NPCC_upDir(xEnt* ent)
return (xVec3*)&ent->model->Mat->up;
}

WEAK S32 zGooIs(xEnt* ent)
{
F32 temp;
return zGooIs(ent, temp, 0);
}

WEAK S32 zNPCCommon::SetCarryState(en_NPC_CARRY_STATE)
{
return 0;
Expand Down
5 changes: 5 additions & 0 deletions src/SB/Game/zGoo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ void zGooInit(S32 nobj);
void zGooExit();
S32 zGooAdd(xEnt* obj, F32 depth, S32 freezeGroup);
S32 zGooIs(xEnt* obj, F32& depth, U32 playerCheck);
inline S32 zGooIs(xEnt* ent)
{
F32 temp;
return zGooIs(ent, temp, 0);
};
void zGooCollsBegin();
void zGooCollsEnd();
void zGooStopTide();
Expand Down
Loading