diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp
index f1f0cbfe0..605d4359d 100644
--- a/source/player/pmcoral.cpp
+++ b/source/player/pmcoral.cpp
@@ -80,8 +80,8 @@
 
 static	CPlayerState	*s_stateTable[]=
 {
-	&s_stateCoralBlowerIdle,				// STATE_IDLE
-	&s_stateCoralBlowerIdle,				// STATE_IDLETEETER
+	&s_stateWeaponIdle,						// STATE_IDLE
+	&s_stateWeaponIdle,						// STATE_IDLETEETER
 	&s_stateJump,							// STATE_JUMP
 	&s_stateWalk,							// STATE_RUN
 	&s_stateFall,							// STATE_FALL
diff --git a/source/player/psidle.cpp b/source/player/psidle.cpp
index 444fa4b9e..03cf57203 100644
--- a/source/player/psidle.cpp
+++ b/source/player/psidle.cpp
@@ -56,7 +56,7 @@
 
 CPlayerStateUnarmedIdle		s_stateUnarmedIdle;
 CPlayerStateTeeterIdle		s_stateTeeterIdle;
-CPlayerStateCoralBlowerIdle	s_stateCoralBlowerIdle;
+CPlayerStateWeaponIdle		s_stateWeaponIdle;
 
 
 /*----------------------------------------------------------------------
@@ -257,8 +257,8 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
 static IdleAnims s_unarmedIdleAnims[]=
 {
 	//	start frame						loop frame						end frame						loop count
-	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								4	},	// default
-	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								10	},
+	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								15	},	// default
+	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								20	},
 	{	-1,								ANIM_SPONGEBOB_IDLEWIND,		-1,								1	},
 
 };
@@ -280,22 +280,22 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-static IdleAnims s_coralBlowerIdleAnims[]=
+static IdleAnims s_weaponIdleAnims[]=
 {
 	//	start frame						loop frame						end frame						loop count
-	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								4	}, // default
-	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								10	},
-//	{	-1,								ANIM_SPONGEBOB_IDLEWEAPON,		-1,								1	},
+	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								15	}, // default
+	{	-1,								ANIM_SPONGEBOB_IDLEBREATH,		-1,								20	},
+	{	-1,								ANIM_SPONGEBOB_IDLEWEAPON,		-1,								1	},
 };
-static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims);
-IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo)
+static int s_numWeaponIdleAnims=sizeof(s_weaponIdleAnims)/sizeof(IdleAnims);
+IdleAnims *CPlayerStateWeaponIdle::getIdleAnimsDb(int _animNo)
 {
 	ASSERT(_animNo<getNumIdleAnims());
-	return &s_coralBlowerIdleAnims[_animNo];
+	return &s_weaponIdleAnims[_animNo];
 }
-int CPlayerStateCoralBlowerIdle::getNumIdleAnims()
+int CPlayerStateWeaponIdle::getNumIdleAnims()
 {
-	return s_numCoralBlowerIdleAnims;
+	return s_numWeaponIdleAnims;
 }
 
 
diff --git a/source/player/psidle.h b/source/player/psidle.h
index 4bafa173d..b27626de0 100644
--- a/source/player/psidle.h
+++ b/source/player/psidle.h
@@ -94,7 +94,7 @@ private:
 };
 
 
-class CPlayerStateCoralBlowerIdle : public CPlayerStateIdle
+class CPlayerStateWeaponIdle : public CPlayerStateIdle
 {
 private:
 	virtual IdleAnims	*getIdleAnimsDb(int _animNo);
@@ -109,7 +109,7 @@ private:
 
 extern	CPlayerStateUnarmedIdle		s_stateUnarmedIdle;
 extern	CPlayerStateTeeterIdle		s_stateTeeterIdle;
-extern	CPlayerStateCoralBlowerIdle	s_stateCoralBlowerIdle;
+extern	CPlayerStateWeaponIdle		s_stateWeaponIdle;
 
 
 /*----------------------------------------------------------------------