Skip to content

Commit

Permalink
ZNPC_AnimTable_Jelly 99% match
Browse files Browse the repository at this point in the history
  • Loading branch information
mattbruv committed Jul 7, 2024
1 parent 07781fb commit 4f61ec2
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions src/SB/Game/zNPCTypeAmbient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ void ZNPC_Destroy_Ambient(xFactoryInst* inst)
{
delete inst;
}

xAnimTable* ZNPC_AnimTable_Ambient()
{
xAnimTable* table = (xAnimTable*)xAnimTableNew(zNPCTypeAmbient_stringBase0 + 0x60, NULL, 0);
Expand All @@ -89,6 +90,33 @@ xAnimTable* ZNPC_AnimTable_Ambient()
return table;
}

xAnimTable* ZNPC_AnimTable_Jelly()
{
xAnimTable* table = (xAnimTable*)xAnimTableNew("zNPCJelly", NULL, 0);

int32 local_887[] = {
1, 7, 4, 8, 11, 0,
};

#define f882 1.0f
#define f883 0.0f

xAnimTableNewState(table, g_strz_ambianim[1], 0x110, 1, f882, 0, 0, f883, 0, 0,
xAnimDefaultBeforeEnter, 0x0, 0x0);
xAnimTableNewState(table, g_strz_ambianim[7], 0x110, 1, f882, 0, 0, f883, 0, 0,
xAnimDefaultBeforeEnter, 0x0, 0x0);
xAnimTableNewState(table, g_strz_ambianim[4], 0x20, 1, f882, 0, 0, f883, 0, 0,
xAnimDefaultBeforeEnter, 0x0, 0x0);
xAnimTableNewState(table, g_strz_ambianim[8], 0x10, 1, f882, 0, 0, f883, 0, 0,
xAnimDefaultBeforeEnter, 0x0, 0x0);
xAnimTableNewState(table, g_strz_ambianim[11], 0x10, 1, f882, 0, 0, f883, 0, 0,
xAnimDefaultBeforeEnter, 0x0, 0x0);

NPCC_BuildStandardAnimTran(table, g_strz_ambianim, local_887, 1, 0.2f);

return table;
}

/* This should be 100% matching but it causes a vtable duplication error for some reason
void zNPCAmbient::Init(xEntAsset* asset)
{
Expand Down

0 comments on commit 4f61ec2

Please sign in to comment.