diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp
index 0fe4efa54..8da2ec4a2 100644
--- a/source/enemy/npcdata.cpp
+++ b/source/enemy/npcdata.cpp
@@ -266,8 +266,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 		0,
 		ANIM_SKELETALFISH_SWIM,
 		NPC_SHOT_GENERIC,
-		ANIM_SKELETALFISH_DIE,
-		ANIM_SKELETALFISH_GETHIT,
+		0,
+		0,
 		false,
 		false,
 		false,
@@ -381,8 +381,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 		9,
 		ANIM_CATERPILLAR_CRAWL,
 		NPC_SHOT_GENERIC,
-		ANIM_CATERPILLAR_DIE,
-		ANIM_CATERPILLAR_GETHIT,
+		0,
+		0,
 		false,
 		false,
 		false,
@@ -473,8 +473,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 		14,
 		ANIM_HERMITCRAB_SCUTTLE,
 		NPC_SHOT_GENERIC,
-		ANIM_HERMITCRAB_DIE,
-		ANIM_HERMITCRAB_DIE,
+		0,
+		0,
 		false,
 		false,
 		false,
@@ -542,8 +542,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 		0,
 		ANIM_SPIDERCRAB_RUN,
 		NPC_SHOT_GENERIC,
-		ANIM_SPIDERCRAB_DIE,
-		ANIM_SPIDERCRAB_HIT,
+		0,
+		0,
 		false,
 		false,
 		false,
@@ -565,8 +565,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 		0,
 		ANIM_SPIDERCRAB_RUN,
 		NPC_SHOT_NONE,
-		ANIM_SPIDERCRAB_DIE,
-		ANIM_SPIDERCRAB_HIT,
+		0,
+		0,
 		false,
 		false,
 		false,
@@ -598,7 +598,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 
 	{	// NPC_BABY_OCTOPUS
 		ACTORS_BABYOCTOPUS_SBK,
-		ANIM_BABYOCTOPUS_IDLE,
+		ANIM_BABYOCTOPUS_SWIM,
 		NPC_SENSOR_USER_CLOSE,
 		NPC_MOVEMENT_FIXED_PATH,
 		NPC_CLOSE_NONE,
@@ -611,8 +611,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 		32,
 		ANIM_BABYOCTOPUS_SWIM,
 		NPC_SHOT_GENERIC,
-		ANIM_BABYOCTOPUS_DIE,
-		ANIM_BABYOCTOPUS_HIT,
+		0,
+		0,
 		false,
 		false,
 		false,
@@ -749,8 +749,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
 		16,
 		ANIM_SHARKMAN_RUN,
 		NPC_SHOT_GENERIC,
-		ANIM_SHARKMAN_DIE,
-		ANIM_SHARKMAN_BLOCK,
+		0,
+		0,
 		false,
 		false,
 		false,