diff --git a/Graphics/characters/BarnacleBoy/AnimList.Txt b/Graphics/characters/BarnacleBoy/AnimList.Txt
index e69de29bb..5a4c9d355 100644
--- a/Graphics/characters/BarnacleBoy/AnimList.Txt
+++ b/Graphics/characters/BarnacleBoy/AnimList.Txt
@@ -0,0 +1 @@
+Idle
\ No newline at end of file
diff --git a/Graphics/characters/Krusty/AnimList.Txt b/Graphics/characters/Krusty/AnimList.Txt
index e69de29bb..1841f3ff4 100644
--- a/Graphics/characters/Krusty/AnimList.Txt
+++ b/Graphics/characters/Krusty/AnimList.Txt
@@ -0,0 +1,2 @@
+IdleBreathe
+idleJig
\ No newline at end of file
diff --git a/data/DataCache.scr b/data/DataCache.scr
index d64678ef9..42d020687 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -146,6 +146,8 @@ actors/SPONGEBOB_CORALBLOWER.SBK
 actors/SPONGEBOB_JELLYLAUNCHER.SBK
 actors/SPONGEBOB_NET.SBK
 
+actors/BARNACLEBOY.SBK
+actors/KRUSTY.SBK
 actors/SQUIDWARD.SBK
 
 actors/ANENOME.SBK
diff --git a/makefile.gfx b/makefile.gfx
index 5be6ec6c1..f7b407db6 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -108,7 +108,7 @@ ACTOR_MAKEFILE_DIR :=	$(TEMP_BUILD_DIR)/actor
 ACTOR_DIRS_TO_MAKE :=	$(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
 
 ACTOR_SPONGEBOB :=		SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net
-ACTOR_NPC :=			Squidward
+ACTOR_NPC :=			BarnacleBoy Krusty Squidward
 #						BarnacleBoy Gary Krusty MermaidMan Patrick Plankton Sandy Squidward
 
 ACTOR_ENEMY :=			Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
diff --git a/source/friend/fdata.cpp b/source/friend/fdata.cpp
index a544c80db..e87e1aa18 100644
--- a/source/friend/fdata.cpp
+++ b/source/friend/fdata.cpp
@@ -15,6 +15,14 @@
 #include "friend\friend.h"
 #endif
 
+#ifndef	__ANIM_BARNACLEBOY_HEADER__
+#include <ACTOR_BARNACLEBOY_Anim.h>
+#endif
+
+#ifndef	__ANIM_KRUSTY_HEADER__
+#include <ACTOR_KRUSTY_Anim.h>
+#endif
+
 #ifndef	__ANIM_SQUIDWARD_HEADER__
 #include <ACTOR_SQUIDWARD_Anim.h>
 #endif
@@ -28,7 +36,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
 		128,
 		false,
 		DAMAGE__HIT_ENEMY,
-		0,
+		ANIM_BARNACLEBOY_IDLE,
 	},
 
 	{	// NPC_FRIEND_GARY
@@ -48,7 +56,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
 		128,
 		false,
 		DAMAGE__HIT_ENEMY,
-		0,
+		ANIM_KRUSTY_IDLEJIG,
 	},
 
 	{	// NPC_FRIEND_MERMAID_MAN
diff --git a/source/friend/friend.cpp b/source/friend/friend.cpp
index 39c72453b..ad92b3573 100644
--- a/source/friend/friend.cpp
+++ b/source/friend/friend.cpp
@@ -137,7 +137,7 @@ CNpcFriend	*CNpcFriend::Create(sThingActor *ThisActor)
 
 	DVECTOR startPos;
 	startPos.vx = newXPos << 4;
-	startPos.vy = newYPos << 4;
+	startPos.vy = ( newYPos + 1 ) << 4;
 
 	friendNpc->init( startPos );
 
@@ -194,13 +194,6 @@ void CNpcFriend::shutdown()
 
 void CNpcFriend::think(int _frames)
 {
-	if ( _frames > 2 )
-	{
-		// make sure enemies don't go berserk if too many frames are dropped
-
-		_frames = 2;
-	}
-
 	CNpcThing::think(_frames);
 
 	if ( m_animPlaying )
@@ -221,35 +214,11 @@ void CNpcFriend::think(int _frames)
 			m_animPlaying = false;
 		}
 	}
-
-	s32 fallSpeed = 3;
-	s8 yMovement = fallSpeed * _frames;
-	s8 groundHeight;
-
-	// check vertical collision
-
-	groundHeight = m_layerCollision->getHeightFromGround( Pos.vx, Pos.vy, yMovement + 16 );
-
-	if ( groundHeight <= 0 )
-	{
-		// make sure we are on the ground, not below it
-
-		Pos.vy += groundHeight;
-	}
 	else
 	{
-		// above ground
-
-		if ( groundHeight < yMovement )
-		{
-			// colliding with ground
-
-			Pos.vy += groundHeight;
-		}
-		else
-		{
-			Pos.vy += yMovement;
-		}
+		m_animNo = m_data[m_type].idleAnim;
+		m_animPlaying = true;
+		m_frame = 0;
 	}
 }
 
diff --git a/tools/MapEdit/actor.ini b/tools/MapEdit/actor.ini
index 22815e9e9..56752fe15 100644
--- a/tools/MapEdit/actor.ini
+++ b/tools/MapEdit/actor.ini
@@ -21,14 +21,14 @@ Player=1
 ################################################
 # Friends
 ################################################
-#[BarnacleBoy]
-#Gfx=..\..\graphics\characters\
-#WayPoints=0
-#Speed=0
-#TurnRate=0
-#Collision=0
-#Health=0
-#AttackStrength=0
+[BarnacleBoy]
+Gfx=..\..\graphics\characters\BarnacleBoy\render\psx\BarnacleBoy_Idle0000.bmp
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
 
 #[Gary]
 #Gfx=..\..\graphics\characters\
@@ -39,14 +39,14 @@ Player=1
 #Health=0
 #AttackStrength=0
 
-#[Krusty]
-#Gfx=..\..\graphics\characters\
-#WayPoints=0
-#Speed=0
-#TurnRate=0
-#Collision=0
-#Health=0
-#AttackStrength=0
+[Krusty]
+Gfx=..\..\graphics\characters\Krusty\render\psx\Krusty_IdleBreathe0000.bmp
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
 
 #[MermaidMan]
 #Gfx=..\..\graphics\characters\
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 3f6cc49c1..0b67caa70 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -1680,6 +1680,10 @@ SOURCE=..\..\..\out\USA\include\ACTOR_BALLBLOB_Anim.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\out\USA\include\ACTOR_BARNACLEBOY_Anim.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\out\USA\include\ACTOR_CATERPILLAR_Anim.h
 # End Source File
 # Begin Source File
@@ -1720,6 +1724,10 @@ SOURCE=..\..\..\out\USA\include\ACTOR_JELLYFISH1_Anim.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\out\USA\include\ACTOR_KRUSTY_Anim.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\out\USA\include\ACTOR_LRGJELLYFISH_Anim.h
 # End Source File
 # Begin Source File