diff --git a/source/friend/fdata.cpp b/source/friend/fdata.cpp index 78f0dc9ce..2ba962498 100644 --- a/source/friend/fdata.cpp +++ b/source/friend/fdata.cpp @@ -56,7 +56,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] = 128, false, DAMAGE__HIT_ENEMY, - ANIM_BARNACLEBOY_IDLEBREATHE, + ANIM_BARNACLEBOY_IDLE, }, { // NPC_FRIEND_GARY @@ -83,7 +83,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] = 128, false, DAMAGE__HIT_ENEMY, - ANIM_MERMAIDMAN_IDLEBREATHE, + ANIM_MERMAIDMAN_IDLE, }, { // NPC_FRIEND_PATRICK diff --git a/tools/Data/bin/MkActor.exe b/tools/Data/bin/MkActor.exe index 8b585014a..b307594e6 100644 Binary files a/tools/Data/bin/MkActor.exe and b/tools/Data/bin/MkActor.exe differ diff --git a/tools/Data/include/dstructs.h b/tools/Data/include/dstructs.h index 8d3f87d55..c2a6cd023 100644 --- a/tools/Data/include/dstructs.h +++ b/tools/Data/include/dstructs.h @@ -155,7 +155,8 @@ struct sElem3d u16 QuadStart; u16 QuadCount; u16 VtxStart; - u16 VtxCount; + u8 TVtxCount; + u8 SVtxCount; }; // 12 //***************************************************************************