diff --git a/source/player/player.cpp b/source/player/player.cpp
index 187790bf5..80fb74e54 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -112,9 +112,9 @@
 #include <ACTOR_SPONGEBOB_GLASSES_Anim.h>
 #endif
 
-//#ifndef	__ANIM_SPONGEBOB_WAND_HEADER__
-//#include <ACTOR_SPONGEBOB_WAND_Anim.h>
-//#endif
+#ifndef	__ANIM_SPONGEBOB_WAND_HEADER__
+#include <ACTOR_SPONGEBOB_WAND_Anim.h>
+#endif
 
 #ifndef	__ANIM_SPONGEBOB_JELLYFISH_HEADER__
 #include <ACTOR_SPONGEBOB_JELLYFISH_Anim.h>
@@ -288,7 +288,7 @@ FileEquate		s_addonActorPoolNames[NUM_PLAYER_ADDONS]=
 	ACTORS_SPONGEBOB_CORALBLOWER_SBK,			// PLAYER_ADDON_CORALBLOWER
 	ACTORS_SPONGEBOB_JELLYLAUNCHER_SBK,			// PLAYER_ADDON_JELLYLAUNCHER
 	ACTORS_SPONGEBOB_GLASSES_SBK,				// PLAYER_ADDON_GLASSES
-	(FileEquate)-1,					// PLAYER_ADDON_BUBBLEWAND
+	ACTORS_SPONGEBOB_WAND_SBK,					// PLAYER_ADDON_BUBBLEWAND
 	ACTORS_SPONGEBOB_JELLYFISH_SBK,				// PLAYER_ADDON_JELLYFISHINNET
 	ACTORS_SPONGEBOB_GLOVE_SBK,					// PLAYER_ADDON_GLOVE
 };
@@ -445,36 +445,36 @@ static s8 s_animMapNet[NUM_PLAYER_ADDONS][NUM_ANIM_SPONGEBOB]=
 
 	// PLAYER_ADDON_BUBBLEWAND,
 	{
-	-1,				// ANIM_SPONGEBOB_BUTTBOUNCEEND,
-	-1,			// ANIM_SPONGEBOB_BUTTBOUNCESTART,
-	-1,				// ANIM_SPONGEBOB_FALL,
-	-1,				// ANIM_SPONGEBOB_GETUP,
-	-1,			// ANIM_SPONGEBOB_HITGROUND,
-	-1,			// ANIM_SPONGEBOB_IDLEBREATH,
-	-1,			// ANIM_SPONGEBOB_IDLEWIND,
-	-1,				// ANIM_SPONGEBOB_JUMPEND,
-	-1,				// ANIM_SPONGEBOB_JUMP,
-	-1,					// ANIM_SPONGEBOB_RUN,
-	-1,				// ANIM_SPONGEBOB_RUNSTOP,
-	-1,			// ANIM_SPONGEBOB_RUNSTART,
-	-1,				// ANIM_SPONGEBOB_SOAKUP,
-	-1,			// ANIM_SPONGEBOB_TEETERBACK,
-	-1,			// ANIM_SPONGEBOB_TEETERFRONT,
-	-1,				// ANIM_SPONGEBOB_SWIPE,
-	-1,			// ANIM_SPONGEBOB_DEATHFORWARDS,
-	-1,				// ANIM_SPONGEBOB_DEATHSQUASH,
-	-1,			// ANIM_SPONGEBOB_DEATHSPIN,
+	ANIM_SPONGEBOB_WAND_BUTTBOUNCEEND,				// ANIM_SPONGEBOB_BUTTBOUNCEEND,
+	ANIM_SPONGEBOB_WAND_BUTTBOUNCESTART,			// ANIM_SPONGEBOB_BUTTBOUNCESTART,
+	ANIM_SPONGEBOB_WAND_FALL,						// ANIM_SPONGEBOB_FALL,
+	ANIM_SPONGEBOB_WAND_GETUP,						// ANIM_SPONGEBOB_GETUP,
+	ANIM_SPONGEBOB_WAND_HITGROUND,					// ANIM_SPONGEBOB_HITGROUND,
+	ANIM_SPONGEBOB_WAND_IDLEBREATH,					// ANIM_SPONGEBOB_IDLEBREATH,
+	ANIM_SPONGEBOB_WAND_IDLEWIND,					// ANIM_SPONGEBOB_IDLEWIND,
+	ANIM_SPONGEBOB_WAND_JUMPEND,					// ANIM_SPONGEBOB_JUMPEND,
+	ANIM_SPONGEBOB_WAND_JUMP,						// ANIM_SPONGEBOB_JUMP,
+	ANIM_SPONGEBOB_WAND_RUN,						// ANIM_SPONGEBOB_RUN,
+	ANIM_SPONGEBOB_WAND_RUNSTOP,					// ANIM_SPONGEBOB_RUNSTOP,
+	ANIM_SPONGEBOB_WAND_RUNSTART,					// ANIM_SPONGEBOB_RUNSTART,
+	-1,												// ANIM_SPONGEBOB_SOAKUP,
+	ANIM_SPONGEBOB_WAND_TEETERBACK,					// ANIM_SPONGEBOB_TEETERBACK,
+	ANIM_SPONGEBOB_WAND_TEETERFRONT,				// ANIM_SPONGEBOB_TEETERFRONT,
+	-1,												// ANIM_SPONGEBOB_SWIPE,
+	ANIM_SPONGEBOB_WAND_DEATHFORWARDS,				// ANIM_SPONGEBOB_DEATHFORWARDS,
+	ANIM_SPONGEBOB_WAND_DEATHSQUASH,				// ANIM_SPONGEBOB_DEATHSQUASH,
+	ANIM_SPONGEBOB_WAND_DEATHSPIN,					// ANIM_SPONGEBOB_DEATHSPIN,
 	-1,												// ANIM_SPONGEBOB_DEATHDRY
-	-1,										// ANIM_SPONGEBOB_BALLOONJUMP,
-	-1,					// ANIM_SPONGEBOB_BLOWBUBBLE,
-	-1,										// ANIM_SPONGEBOB_FIREEND,
-	-1,										// ANIM_SPONGEBOB_FIRESTART,
-	-1,										// ANIM_SPONGEBOB_IDLEWEAPON,
-	-1,										// ANIM_SPONGEBOB_WALK,
-	-1,										// ANIM_SPONGEBOB_KARATE,
-	-1,					// ANIM_SPONGEBOB_GETHIT
-	-1,					// ANIM_SPONGEBOB_CROUCHDOWN
-	-1,						// ANIM_SPONGEBOB_CROUCHUP
+	-1,												// ANIM_SPONGEBOB_BALLOONJUMP,
+	ANIM_SPONGEBOB_WAND_BLOWBUBBLE,					// ANIM_SPONGEBOB_BLOWBUBBLE,
+	-1,												// ANIM_SPONGEBOB_FIREEND,
+	-1,												// ANIM_SPONGEBOB_FIRESTART,
+	-1,												// ANIM_SPONGEBOB_IDLEWEAPON,
+	-1,												// ANIM_SPONGEBOB_WALK,
+	-1,												// ANIM_SPONGEBOB_KARATE,
+	ANIM_SPONGEBOB_WAND_GETHIT,						// ANIM_SPONGEBOB_GETHIT
+	ANIM_SPONGEBOB_WAND_CROUCHDOWN,					// ANIM_SPONGEBOB_CROUCHDOWN
+	ANIM_SPONGEBOB_WAND_CROUCHUP,					// ANIM_SPONGEBOB_CROUCHUP
 	},
 
 	// PLAYER_ADDON_JELLYFISHINNET
@@ -1400,10 +1400,7 @@ void CPlayer::registerAddon(PLAYER_ADDONS _addon)
 	{
 		FileEquate	sbk;
 		sbk=s_addonActorPoolNames[_addon];
-		if(sbk!=-1)
-		{
-			s_addonActorGfx[_addon]=CActorPool::GetActor(sbk);
-		}
+		s_addonActorGfx[_addon]=CActorPool::GetActor(sbk);
 	}
 }