From 6061ee9bb70e5d860599ab29bbf2613990f81f78 Mon Sep 17 00:00:00 2001 From: Daveo Date: Sat, 30 Jun 2001 21:04:25 +0000 Subject: [PATCH] --- source/friend/fdata.cpp | 4 ++-- tools/Data/bin/MkActor.exe | Bin 73728 -> 73728 bytes tools/Data/include/dstructs.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) 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 8b585014abb93fa3cb5d21e79e03af2f38462d1e..b307594e69110c311c5916bf68c2386b5efb7102 100644 GIT binary patch delta 6974 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 delta 7034 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